diff options
Diffstat (limited to 'arch')
503 files changed, 15285 insertions, 9256 deletions
diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile index 4e1a8e2c4541..4759fe751aa1 100644 --- a/arch/alpha/Makefile +++ b/arch/alpha/Makefile | |||
@@ -13,6 +13,7 @@ NM := $(NM) -B | |||
13 | LDFLAGS_vmlinux := -static -N #-relax | 13 | LDFLAGS_vmlinux := -static -N #-relax |
14 | CHECKFLAGS += -D__alpha__ -m64 | 14 | CHECKFLAGS += -D__alpha__ -m64 |
15 | cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data | 15 | cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data |
16 | cflags-y += $(call cc-option, -fno-jump-tables) | ||
16 | 17 | ||
17 | cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 | 18 | cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 |
18 | cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 | 19 | cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 |
diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c index c0750291b44a..d9980d47ab81 100644 --- a/arch/alpha/kernel/core_t2.c +++ b/arch/alpha/kernel/core_t2.c | |||
@@ -74,6 +74,8 @@ | |||
74 | # define DBG(args) | 74 | # define DBG(args) |
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | DEFINE_SPINLOCK(t2_hae_lock); | ||
78 | |||
77 | static volatile unsigned int t2_mcheck_any_expected; | 79 | static volatile unsigned int t2_mcheck_any_expected; |
78 | static volatile unsigned int t2_mcheck_last_taken; | 80 | static volatile unsigned int t2_mcheck_last_taken; |
79 | 81 | ||
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 36ab22a7ea12..5cf45fc51343 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
@@ -71,6 +71,23 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_i | |||
71 | static void __init | 71 | static void __init |
72 | quirk_cypress(struct pci_dev *dev) | 72 | quirk_cypress(struct pci_dev *dev) |
73 | { | 73 | { |
74 | /* The Notorious Cy82C693 chip. */ | ||
75 | |||
76 | /* The generic legacy mode IDE fixup in drivers/pci/probe.c | ||
77 | doesn't work correctly with the Cypress IDE controller as | ||
78 | it has non-standard register layout. Fix that. */ | ||
79 | if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE) { | ||
80 | dev->resource[2].start = dev->resource[3].start = 0; | ||
81 | dev->resource[2].end = dev->resource[3].end = 0; | ||
82 | dev->resource[2].flags = dev->resource[3].flags = 0; | ||
83 | if (PCI_FUNC(dev->devfn) == 2) { | ||
84 | dev->resource[0].start = 0x170; | ||
85 | dev->resource[0].end = 0x177; | ||
86 | dev->resource[1].start = 0x376; | ||
87 | dev->resource[1].end = 0x376; | ||
88 | } | ||
89 | } | ||
90 | |||
74 | /* The Cypress bridge responds on the PCI bus in the address range | 91 | /* The Cypress bridge responds on the PCI bus in the address range |
75 | 0xffff0000-0xffffffff (conventional x86 BIOS ROM). There is no | 92 | 0xffff0000-0xffffffff (conventional x86 BIOS ROM). There is no |
76 | way to turn this off. The bridge also supports several extended | 93 | way to turn this off. The bridge also supports several extended |
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index dc57790250d2..c778779007fc 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c | |||
@@ -447,7 +447,7 @@ struct unaligned_stat { | |||
447 | 447 | ||
448 | 448 | ||
449 | /* Macro for exception fixup code to access integer registers. */ | 449 | /* Macro for exception fixup code to access integer registers. */ |
450 | #define una_reg(r) (regs->regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) | 450 | #define una_reg(r) (_regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) |
451 | 451 | ||
452 | 452 | ||
453 | asmlinkage void | 453 | asmlinkage void |
@@ -456,6 +456,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, | |||
456 | { | 456 | { |
457 | long error, tmp1, tmp2, tmp3, tmp4; | 457 | long error, tmp1, tmp2, tmp3, tmp4; |
458 | unsigned long pc = regs->pc - 4; | 458 | unsigned long pc = regs->pc - 4; |
459 | unsigned long *_regs = regs->regs; | ||
459 | const struct exception_table_entry *fixup; | 460 | const struct exception_table_entry *fixup; |
460 | 461 | ||
461 | unaligned[0].count++; | 462 | unaligned[0].count++; |
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index f13249be17c5..ef37fc1acaea 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S | |||
@@ -25,6 +25,13 @@ SECTIONS | |||
25 | } :kernel | 25 | } :kernel |
26 | _etext = .; /* End of text section */ | 26 | _etext = .; /* End of text section */ |
27 | 27 | ||
28 | NOTES :kernel :note | ||
29 | .dummy : { | ||
30 | *(.dummy) | ||
31 | } :kernel | ||
32 | |||
33 | RODATA | ||
34 | |||
28 | /* Exception table */ | 35 | /* Exception table */ |
29 | . = ALIGN(16); | 36 | . = ALIGN(16); |
30 | __ex_table : { | 37 | __ex_table : { |
@@ -33,13 +40,6 @@ SECTIONS | |||
33 | __stop___ex_table = .; | 40 | __stop___ex_table = .; |
34 | } | 41 | } |
35 | 42 | ||
36 | NOTES :kernel :note | ||
37 | .dummy : { | ||
38 | *(.dummy) | ||
39 | } :kernel | ||
40 | |||
41 | RODATA | ||
42 | |||
43 | /* Will be freed after init */ | 43 | /* Will be freed after init */ |
44 | . = ALIGN(PAGE_SIZE); | 44 | . = ALIGN(PAGE_SIZE); |
45 | /* Init code and data */ | 45 | /* Init code and data */ |
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index 67ea99ef6521..dd3fbd6766e1 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S | |||
@@ -33,10 +33,6 @@ __XScale_start: | |||
33 | bic r0, r0, #0x1000 @ clear Icache | 33 | bic r0, r0, #0x1000 @ clear Icache |
34 | mcr p15, 0, r0, c1, c0, 0 | 34 | mcr p15, 0, r0, c1, c0, 0 |
35 | 35 | ||
36 | #ifdef CONFIG_ARCH_COTULLA_IDP | ||
37 | mov r7, #MACH_TYPE_COTULLA_IDP | ||
38 | #endif | ||
39 | |||
40 | #ifdef CONFIG_ARCH_IXP2000 | 36 | #ifdef CONFIG_ARCH_IXP2000 |
41 | mov r1, #-1 | 37 | mov r1, #-1 |
42 | mov r0, #0xd6000000 | 38 | mov r0, #0xd6000000 |
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index 52fc6a883281..2744673314b4 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c | |||
@@ -650,7 +650,8 @@ EXPORT_SYMBOL(dma_map_sg); | |||
650 | EXPORT_SYMBOL(dma_unmap_sg); | 650 | EXPORT_SYMBOL(dma_unmap_sg); |
651 | EXPORT_SYMBOL(dma_sync_single_for_cpu); | 651 | EXPORT_SYMBOL(dma_sync_single_for_cpu); |
652 | EXPORT_SYMBOL(dma_sync_single_for_device); | 652 | EXPORT_SYMBOL(dma_sync_single_for_device); |
653 | EXPORT_SYMBOL(dma_sync_sg); | 653 | EXPORT_SYMBOL(dma_sync_sg_for_cpu); |
654 | EXPORT_SYMBOL(dma_sync_sg_for_device); | ||
654 | EXPORT_SYMBOL(dmabounce_register_dev); | 655 | EXPORT_SYMBOL(dmabounce_register_dev); |
655 | EXPORT_SYMBOL(dmabounce_unregister_dev); | 656 | EXPORT_SYMBOL(dmabounce_unregister_dev); |
656 | 657 | ||
diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c index 1de121fc55f4..f44647738ee4 100644 --- a/arch/arm/mach-at91/at91x40.c +++ b/arch/arm/mach-at91/at91x40.c | |||
@@ -16,16 +16,32 @@ | |||
16 | #include <asm/mach/arch.h> | 16 | #include <asm/mach/arch.h> |
17 | #include <asm/arch/at91x40.h> | 17 | #include <asm/arch/at91x40.h> |
18 | #include <asm/arch/at91_st.h> | 18 | #include <asm/arch/at91_st.h> |
19 | #include <asm/arch/timex.h> | ||
19 | #include "generic.h" | 20 | #include "generic.h" |
20 | 21 | ||
21 | /* | 22 | /* |
22 | * This is used in the gpio code, stub locally. | 23 | * Export the clock functions for the AT91X40. Some external code common |
24 | * to all AT91 family parts relys on this, like the gpio and serial support. | ||
23 | */ | 25 | */ |
24 | int clk_enable(struct clk *clk) | 26 | int clk_enable(struct clk *clk) |
25 | { | 27 | { |
26 | return 0; | 28 | return 0; |
27 | } | 29 | } |
28 | 30 | ||
31 | void clk_disable(struct clk *clk) | ||
32 | { | ||
33 | } | ||
34 | |||
35 | unsigned long clk_get_rate(struct clk *clk) | ||
36 | { | ||
37 | return AT91X40_MASTER_CLOCK; | ||
38 | } | ||
39 | |||
40 | struct clk *clk_get(struct device *dev, const char *id) | ||
41 | { | ||
42 | return NULL; | ||
43 | } | ||
44 | |||
29 | void __init at91x40_initialize(unsigned long main_clock) | 45 | void __init at91x40_initialize(unsigned long main_clock) |
30 | { | 46 | { |
31 | at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1) | 47 | at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1) |
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index 92d79fb39311..62e653a3ea1a 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
@@ -369,7 +369,8 @@ static int impd1_probe(struct lm_device *dev) | |||
369 | 369 | ||
370 | lm_set_drvdata(dev, impd1); | 370 | lm_set_drvdata(dev, impd1); |
371 | 371 | ||
372 | printk("IM-PD1 found at 0x%08lx\n", dev->resource.start); | 372 | printk("IM-PD1 found at 0x%08lx\n", |
373 | (unsigned long)dev->resource.start); | ||
373 | 374 | ||
374 | for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) { | 375 | for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) { |
375 | impd1->vcos[i].owner = THIS_MODULE, | 376 | impd1->vcos[i].owner = THIS_MODULE, |
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index d55fa4e9bb43..c07f497000ca 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c | |||
@@ -405,7 +405,6 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
405 | addr, fsr, pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255, | 405 | addr, fsr, pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255, |
406 | v3_readb(V3_LB_ISTAT)); | 406 | v3_readb(V3_LB_ISTAT)); |
407 | printk(KERN_DEBUG "%s", buf); | 407 | printk(KERN_DEBUG "%s", buf); |
408 | printascii(buf); | ||
409 | #endif | 408 | #endif |
410 | 409 | ||
411 | v3_writeb(V3_LB_ISTAT, 0); | 410 | v3_writeb(V3_LB_ISTAT, 0); |
@@ -447,6 +446,7 @@ static irqreturn_t v3_irq(int dummy, void *devid) | |||
447 | unsigned long pc = instruction_pointer(regs); | 446 | unsigned long pc = instruction_pointer(regs); |
448 | unsigned long instr = *(unsigned long *)pc; | 447 | unsigned long instr = *(unsigned long *)pc; |
449 | char buf[128]; | 448 | char buf[128]; |
449 | extern void printascii(const char *); | ||
450 | 450 | ||
451 | sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x " | 451 | sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x " |
452 | "ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr, | 452 | "ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr, |
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index a0b16a7e8a04..a4d20127a60e 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/mtd/mtd.h> | 24 | #include <linux/mtd/mtd.h> |
25 | #include <linux/mtd/partitions.h> | 25 | #include <linux/mtd/partitions.h> |
26 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
27 | #include <linux/spi/tsc2102.h> | ||
28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
29 | #include <linux/apm-emulation.h> | 28 | #include <linux/apm-emulation.h> |
30 | 29 | ||
@@ -315,14 +314,6 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery) | |||
315 | #define palmte_get_power_status NULL | 314 | #define palmte_get_power_status NULL |
316 | #endif | 315 | #endif |
317 | 316 | ||
318 | static struct tsc2102_config palmte_tsc2102_config = { | ||
319 | .use_internal = 0, | ||
320 | .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP, | ||
321 | .temp_at25c = { 2200, 2615 }, | ||
322 | .apm_report = palmte_get_power_status, | ||
323 | .alsa_config = &palmte_alsa_config, | ||
324 | }; | ||
325 | |||
326 | static struct omap_board_config_kernel palmte_config[] __initdata = { | 317 | static struct omap_board_config_kernel palmte_config[] __initdata = { |
327 | { OMAP_TAG_USB, &palmte_usb_config }, | 318 | { OMAP_TAG_USB, &palmte_usb_config }, |
328 | { OMAP_TAG_MMC, &palmte_mmc_config }, | 319 | { OMAP_TAG_MMC, &palmte_mmc_config }, |
@@ -336,7 +327,6 @@ static struct spi_board_info palmte_spi_info[] __initdata = { | |||
336 | .bus_num = 2, /* uWire (officially) */ | 327 | .bus_num = 2, /* uWire (officially) */ |
337 | .chip_select = 0, /* As opposed to 3 */ | 328 | .chip_select = 0, /* As opposed to 3 */ |
338 | .irq = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO), | 329 | .irq = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO), |
339 | .platform_data = &palmte_tsc2102_config, | ||
340 | .max_speed_hz = 8000000, | 330 | .max_speed_hz = 8000000, |
341 | }, | 331 | }, |
342 | }; | 332 | }; |
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 02cede295e89..dbf68dc50ae2 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #define GPMC_STATUS 0x54 | 42 | #define GPMC_STATUS 0x54 |
43 | #define GPMC_PREFETCH_CONFIG1 0x1e0 | 43 | #define GPMC_PREFETCH_CONFIG1 0x1e0 |
44 | #define GPMC_PREFETCH_CONFIG2 0x1e4 | 44 | #define GPMC_PREFETCH_CONFIG2 0x1e4 |
45 | #define GPMC_PREFETCH_CONTROL 0x1e8 | 45 | #define GPMC_PREFETCH_CONTROL 0x1ec |
46 | #define GPMC_PREFETCH_STATUS 0x1f0 | 46 | #define GPMC_PREFETCH_STATUS 0x1f0 |
47 | #define GPMC_ECC_CONFIG 0x1f4 | 47 | #define GPMC_ECC_CONFIG 0x1f4 |
48 | #define GPMC_ECC_CONTROL 0x1f8 | 48 | #define GPMC_ECC_CONTROL 0x1f8 |
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index 6d4416a4f378..f5851d1adc25 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c | |||
@@ -59,7 +59,7 @@ static struct resource cmx270_dm9k_resource[] = { | |||
59 | [2] = { | 59 | [2] = { |
60 | .start = CMX270_ETHIRQ, | 60 | .start = CMX270_ETHIRQ, |
61 | .end = CMX270_ETHIRQ, | 61 | .end = CMX270_ETHIRQ, |
62 | .flags = IORESOURCE_IRQ, | 62 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
63 | } | 63 | } |
64 | }; | 64 | }; |
65 | 65 | ||
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index edc4f07a230d..9c57700ee5c2 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -50,7 +50,7 @@ static struct resource em_x270_dm9k_resource[] = { | |||
50 | [2] = { | 50 | [2] = { |
51 | .start = EM_X270_ETHIRQ, | 51 | .start = EM_X270_ETHIRQ, |
52 | .end = EM_X270_ETHIRQ, | 52 | .end = EM_X270_ETHIRQ, |
53 | .flags = IORESOURCE_IRQ, | 53 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
54 | } | 54 | } |
55 | }; | 55 | }; |
56 | 56 | ||
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index dace3820f1ee..e7d0fcd9b43f 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <asm/arch/pxa-regs.h> | 38 | #include <asm/arch/pxa-regs.h> |
39 | #include <asm/arch/pxa2xx-regs.h> | 39 | #include <asm/arch/pxa2xx-regs.h> |
40 | #include <asm/arch/pxa2xx-gpio.h> | 40 | #include <asm/arch/pxa2xx-gpio.h> |
41 | #include <asm/arch/pxa27x-udc.h> | ||
42 | #include <asm/arch/irda.h> | 41 | #include <asm/arch/irda.h> |
43 | #include <asm/arch/mmc.h> | 42 | #include <asm/arch/mmc.h> |
44 | #include <asm/arch/ohci.h> | 43 | #include <asm/arch/ohci.h> |
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c index 00af7f2fed66..0bb31982fb6f 100644 --- a/arch/arm/mach-pxa/ssp.c +++ b/arch/arm/mach-pxa/ssp.c | |||
@@ -330,7 +330,7 @@ struct ssp_device *ssp_request(int port, const char *label) | |||
330 | 330 | ||
331 | mutex_unlock(&ssp_lock); | 331 | mutex_unlock(&ssp_lock); |
332 | 332 | ||
333 | if (ssp->port_id != port) | 333 | if (&ssp->node == &ssp_list) |
334 | return NULL; | 334 | return NULL; |
335 | 335 | ||
336 | return ssp; | 336 | return ssp; |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index c2cbd66db814..ab4a9f579913 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -467,8 +467,8 @@ static struct platform_device *devices[] __initdata = { | |||
467 | 467 | ||
468 | static void tosa_poweroff(void) | 468 | static void tosa_poweroff(void) |
469 | { | 469 | { |
470 | pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT); | 470 | gpio_direction_output(TOSA_GPIO_ON_RESET, 0); |
471 | GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET); | 471 | gpio_set_value(TOSA_GPIO_ON_RESET, 1); |
472 | 472 | ||
473 | mdelay(1000); | 473 | mdelay(1000); |
474 | arm_machine_restart('h'); | 474 | arm_machine_restart('h'); |
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index 3e57428affee..8e813ed57519 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c | |||
@@ -74,6 +74,8 @@ static DEFINE_SPINLOCK(boot_lock); | |||
74 | 74 | ||
75 | void __cpuinit platform_secondary_init(unsigned int cpu) | 75 | void __cpuinit platform_secondary_init(unsigned int cpu) |
76 | { | 76 | { |
77 | trace_hardirqs_off(); | ||
78 | |||
77 | /* | 79 | /* |
78 | * the primary core may have used a "cross call" soft interrupt | 80 | * the primary core may have used a "cross call" soft interrupt |
79 | * to get this processor out of WFI in the BootMonitor - make | 81 | * to get this processor out of WFI in the BootMonitor - make |
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 661a2358ac22..27f63d5d3a7b 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
@@ -374,7 +374,7 @@ static struct resource bast_dm9k_resource[] = { | |||
374 | [2] = { | 374 | [2] = { |
375 | .start = IRQ_DM9000, | 375 | .start = IRQ_DM9000, |
376 | .end = IRQ_DM9000, | 376 | .end = IRQ_DM9000, |
377 | .flags = IORESOURCE_IRQ, | 377 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH, |
378 | } | 378 | } |
379 | 379 | ||
380 | }; | 380 | }; |
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index c56423373ff3..4c4b5c4207c4 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
@@ -263,7 +263,7 @@ static struct resource vr1000_dm9k0_resource[] = { | |||
263 | [2] = { | 263 | [2] = { |
264 | .start = IRQ_VR1000_DM9000A, | 264 | .start = IRQ_VR1000_DM9000A, |
265 | .end = IRQ_VR1000_DM9000A, | 265 | .end = IRQ_VR1000_DM9000A, |
266 | .flags = IORESOURCE_IRQ | 266 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH, |
267 | } | 267 | } |
268 | 268 | ||
269 | }; | 269 | }; |
@@ -282,7 +282,7 @@ static struct resource vr1000_dm9k1_resource[] = { | |||
282 | [2] = { | 282 | [2] = { |
283 | .start = IRQ_VR1000_DM9000N, | 283 | .start = IRQ_VR1000_DM9000N, |
284 | .end = IRQ_VR1000_DM9000N, | 284 | .end = IRQ_VR1000_DM9000N, |
285 | .flags = IORESOURCE_IRQ | 285 | .flags = IORESOURCE_IRQ | IRQF_TRIGGER_HIGH, |
286 | } | 286 | } |
287 | }; | 287 | }; |
288 | 288 | ||
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 6496eb645cee..2f772a3965c4 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
@@ -225,26 +225,28 @@ static void __init collie_init(void) | |||
225 | int ret = 0; | 225 | int ret = 0; |
226 | 226 | ||
227 | /* cpu initialize */ | 227 | /* cpu initialize */ |
228 | GAFR = ( GPIO_SSP_TXD | \ | 228 | GAFR = GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SSP_CLK | |
229 | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SSP_CLK | GPIO_TIC_ACK | \ | 229 | GPIO_MCP_CLK | GPIO_32_768kHz; |
230 | GPIO_32_768kHz ); | 230 | |
231 | 231 | GPDR = GPIO_LDD8 | GPIO_LDD9 | GPIO_LDD10 | GPIO_LDD11 | GPIO_LDD12 | | |
232 | GPDR = ( GPIO_LDD8 | GPIO_LDD9 | GPIO_LDD10 | GPIO_LDD11 | GPIO_LDD12 | \ | 232 | GPIO_LDD13 | GPIO_LDD14 | GPIO_LDD15 | GPIO_SSP_TXD | |
233 | GPIO_LDD13 | GPIO_LDD14 | GPIO_LDD15 | GPIO_SSP_TXD | \ | 233 | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SDLC_SCLK | |
234 | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SDLC_SCLK | \ | 234 | COLLIE_GPIO_UCB1x00_RESET | COLLIE_GPIO_nMIC_ON | |
235 | GPIO_SDLC_AAF | GPIO_UART_SCLK1 | GPIO_32_768kHz ); | 235 | COLLIE_GPIO_nREMOCON_ON | GPIO_32_768kHz; |
236 | GPLR = GPIO_GPIO18; | 236 | |
237 | 237 | PPDR = PPC_LDD0 | PPC_LDD1 | PPC_LDD2 | PPC_LDD3 | PPC_LDD4 | PPC_LDD5 | | |
238 | // PPC pin setting | 238 | PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | |
239 | PPDR = ( PPC_LDD0 | PPC_LDD1 | PPC_LDD2 | PPC_LDD3 | PPC_LDD4 | PPC_LDD5 | \ | 239 | PPC_TXD1 | PPC_TXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM; |
240 | PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | \ | 240 | |
241 | PPC_TXD1 | PPC_TXD2 | PPC_RXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM ); | 241 | PWER = COLLIE_GPIO_AC_IN | COLLIE_GPIO_CO | COLLIE_GPIO_ON_KEY | |
242 | 242 | COLLIE_GPIO_WAKEUP | COLLIE_GPIO_nREMOCON_INT | PWER_RTC; | |
243 | PSDR = ( PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4 ); | 243 | |
244 | 244 | PGSR = COLLIE_GPIO_nREMOCON_ON; | |
245 | GAFR |= GPIO_32_768kHz; | 245 | |
246 | GPDR |= GPIO_32_768kHz; | 246 | PSDR = PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4; |
247 | TUCR = TUCR_32_768kHz; | 247 | |
248 | PCFR = PCFR_OPDE; | ||
249 | |||
248 | 250 | ||
249 | platform_scoop_config = &collie_pcmcia_config; | 251 | platform_scoop_config = &collie_pcmcia_config; |
250 | 252 | ||
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 2946c193a7d6..2db5580048d8 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/cpufreq.h> | ||
24 | 25 | ||
25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
26 | 27 | ||
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c00eda588cd8..39c637b0ffea 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -501,8 +501,6 @@ static inline void omap_enable_channel_irq(int lch) | |||
501 | 501 | ||
502 | /* Enable some nice interrupts. */ | 502 | /* Enable some nice interrupts. */ |
503 | OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; | 503 | OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; |
504 | |||
505 | dma_chan[lch].flags |= OMAP_DMA_ACTIVE; | ||
506 | } | 504 | } |
507 | 505 | ||
508 | static void omap_disable_channel_irq(int lch) | 506 | static void omap_disable_channel_irq(int lch) |
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index f197bb3a2366..2f01af5f64c4 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c | |||
@@ -65,6 +65,7 @@ void __init s3c244x_map_io(struct map_desc *mach_desc, int size) | |||
65 | 65 | ||
66 | /* rename any peripherals used differing from the s3c2410 */ | 66 | /* rename any peripherals used differing from the s3c2410 */ |
67 | 67 | ||
68 | s3c_device_sdi.name = "s3c2440-sdi"; | ||
68 | s3c_device_i2c.name = "s3c2440-i2c"; | 69 | s3c_device_i2c.name = "s3c2440-i2c"; |
69 | s3c_device_nand.name = "s3c2440-nand"; | 70 | s3c_device_nand.name = "s3c2440-nand"; |
70 | s3c_device_usbgadget.name = "s3c2440-usbgadget"; | 71 | s3c_device_usbgadget.name = "s3c2440-usbgadget"; |
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig index 06046074d68b..119edb839ac3 100644 --- a/arch/avr32/configs/atngw100_defconfig +++ b/arch/avr32/configs/atngw100_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-rc7 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Wed Jan 9 23:20:41 2008 | 4 | # Mon May 26 13:30:59 2008 |
5 | # | 5 | # |
6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
@@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y | |||
13 | CONFIG_GENERIC_IRQ_PROBE=y | 13 | CONFIG_GENERIC_IRQ_PROBE=y |
14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
15 | CONFIG_GENERIC_TIME=y | 15 | CONFIG_GENERIC_TIME=y |
16 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
16 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 17 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
17 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
19 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
20 | CONFIG_GENERIC_HWEIGHT=y | 20 | CONFIG_GENERIC_HWEIGHT=y |
21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
22 | CONFIG_GENERIC_BUG=y | 22 | CONFIG_GENERIC_BUG=y |
@@ -37,17 +37,15 @@ CONFIG_POSIX_MQUEUE=y | |||
37 | CONFIG_BSD_PROCESS_ACCT=y | 37 | CONFIG_BSD_PROCESS_ACCT=y |
38 | CONFIG_BSD_PROCESS_ACCT_V3=y | 38 | CONFIG_BSD_PROCESS_ACCT_V3=y |
39 | # CONFIG_TASKSTATS is not set | 39 | # CONFIG_TASKSTATS is not set |
40 | # CONFIG_USER_NS is not set | ||
41 | # CONFIG_PID_NS is not set | ||
42 | # CONFIG_AUDIT is not set | 40 | # CONFIG_AUDIT is not set |
43 | # CONFIG_IKCONFIG is not set | 41 | # CONFIG_IKCONFIG is not set |
44 | CONFIG_LOG_BUF_SHIFT=14 | 42 | CONFIG_LOG_BUF_SHIFT=14 |
45 | # CONFIG_CGROUPS is not set | 43 | # CONFIG_CGROUPS is not set |
46 | CONFIG_FAIR_GROUP_SCHED=y | 44 | # CONFIG_GROUP_SCHED is not set |
47 | CONFIG_FAIR_USER_SCHED=y | ||
48 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
49 | CONFIG_SYSFS_DEPRECATED=y | 45 | CONFIG_SYSFS_DEPRECATED=y |
46 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
50 | # CONFIG_RELAY is not set | 47 | # CONFIG_RELAY is not set |
48 | # CONFIG_NAMESPACES is not set | ||
51 | CONFIG_BLK_DEV_INITRD=y | 49 | CONFIG_BLK_DEV_INITRD=y |
52 | CONFIG_INITRAMFS_SOURCE="" | 50 | CONFIG_INITRAMFS_SOURCE="" |
53 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -61,11 +59,13 @@ CONFIG_HOTPLUG=y | |||
61 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
62 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
63 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | ||
64 | # CONFIG_BASE_FULL is not set | 63 | # CONFIG_BASE_FULL is not set |
65 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
66 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
67 | CONFIG_EPOLL=y | 66 | CONFIG_EPOLL=y |
68 | CONFIG_SIGNALFD=y | 67 | CONFIG_SIGNALFD=y |
68 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | 69 | CONFIG_EVENTFD=y |
70 | CONFIG_SHMEM=y | 70 | CONFIG_SHMEM=y |
71 | CONFIG_VM_EVENT_COUNTERS=y | 71 | CONFIG_VM_EVENT_COUNTERS=y |
@@ -73,11 +73,21 @@ CONFIG_SLUB_DEBUG=y | |||
73 | # CONFIG_SLAB is not set | 73 | # CONFIG_SLAB is not set |
74 | CONFIG_SLUB=y | 74 | CONFIG_SLUB=y |
75 | # CONFIG_SLOB is not set | 75 | # CONFIG_SLOB is not set |
76 | CONFIG_PROFILING=y | ||
77 | # CONFIG_MARKERS is not set | ||
78 | CONFIG_OPROFILE=m | ||
79 | CONFIG_HAVE_OPROFILE=y | ||
80 | CONFIG_KPROBES=y | ||
81 | CONFIG_HAVE_KPROBES=y | ||
82 | # CONFIG_HAVE_KRETPROBES is not set | ||
83 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
84 | CONFIG_PROC_PAGE_MONITOR=y | ||
76 | CONFIG_SLABINFO=y | 85 | CONFIG_SLABINFO=y |
77 | CONFIG_RT_MUTEXES=y | 86 | CONFIG_RT_MUTEXES=y |
78 | # CONFIG_TINY_SHMEM is not set | 87 | # CONFIG_TINY_SHMEM is not set |
79 | CONFIG_BASE_SMALL=1 | 88 | CONFIG_BASE_SMALL=1 |
80 | CONFIG_MODULES=y | 89 | CONFIG_MODULES=y |
90 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
81 | CONFIG_MODULE_UNLOAD=y | 91 | CONFIG_MODULE_UNLOAD=y |
82 | CONFIG_MODULE_FORCE_UNLOAD=y | 92 | CONFIG_MODULE_FORCE_UNLOAD=y |
83 | # CONFIG_MODVERSIONS is not set | 93 | # CONFIG_MODVERSIONS is not set |
@@ -101,10 +111,15 @@ CONFIG_IOSCHED_CFQ=y | |||
101 | CONFIG_DEFAULT_CFQ=y | 111 | CONFIG_DEFAULT_CFQ=y |
102 | # CONFIG_DEFAULT_NOOP is not set | 112 | # CONFIG_DEFAULT_NOOP is not set |
103 | CONFIG_DEFAULT_IOSCHED="cfq" | 113 | CONFIG_DEFAULT_IOSCHED="cfq" |
114 | CONFIG_CLASSIC_RCU=y | ||
104 | 115 | ||
105 | # | 116 | # |
106 | # System Type and features | 117 | # System Type and features |
107 | # | 118 | # |
119 | CONFIG_TICK_ONESHOT=y | ||
120 | CONFIG_NO_HZ=y | ||
121 | CONFIG_HIGH_RES_TIMERS=y | ||
122 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
108 | CONFIG_SUBARCH_AVR32B=y | 123 | CONFIG_SUBARCH_AVR32B=y |
109 | CONFIG_MMU=y | 124 | CONFIG_MMU=y |
110 | CONFIG_PERFORMANCE_COUNTERS=y | 125 | CONFIG_PERFORMANCE_COUNTERS=y |
@@ -141,16 +156,19 @@ CONFIG_FLATMEM=y | |||
141 | CONFIG_FLAT_NODE_MEM_MAP=y | 156 | CONFIG_FLAT_NODE_MEM_MAP=y |
142 | # CONFIG_SPARSEMEM_STATIC is not set | 157 | # CONFIG_SPARSEMEM_STATIC is not set |
143 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 158 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
159 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
144 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 160 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
145 | # CONFIG_RESOURCES_64BIT is not set | 161 | # CONFIG_RESOURCES_64BIT is not set |
146 | CONFIG_ZONE_DMA_FLAG=0 | 162 | CONFIG_ZONE_DMA_FLAG=0 |
147 | CONFIG_VIRT_TO_BUS=y | 163 | CONFIG_VIRT_TO_BUS=y |
148 | # CONFIG_OWNERSHIP_TRACE is not set | 164 | # CONFIG_OWNERSHIP_TRACE is not set |
165 | CONFIG_NMI_DEBUGGING=y | ||
149 | # CONFIG_HZ_100 is not set | 166 | # CONFIG_HZ_100 is not set |
150 | CONFIG_HZ_250=y | 167 | CONFIG_HZ_250=y |
151 | # CONFIG_HZ_300 is not set | 168 | # CONFIG_HZ_300 is not set |
152 | # CONFIG_HZ_1000 is not set | 169 | # CONFIG_HZ_1000 is not set |
153 | CONFIG_HZ=250 | 170 | CONFIG_HZ=250 |
171 | # CONFIG_SCHED_HRTICK is not set | ||
154 | CONFIG_CMDLINE="" | 172 | CONFIG_CMDLINE="" |
155 | 173 | ||
156 | # | 174 | # |
@@ -164,9 +182,10 @@ CONFIG_CPU_FREQ=y | |||
164 | CONFIG_CPU_FREQ_TABLE=y | 182 | CONFIG_CPU_FREQ_TABLE=y |
165 | # CONFIG_CPU_FREQ_DEBUG is not set | 183 | # CONFIG_CPU_FREQ_DEBUG is not set |
166 | # CONFIG_CPU_FREQ_STAT is not set | 184 | # CONFIG_CPU_FREQ_STAT is not set |
167 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 185 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
186 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
168 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 187 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
169 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 188 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
170 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 189 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
171 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 190 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
172 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 191 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
@@ -202,6 +221,7 @@ CONFIG_XFRM=y | |||
202 | CONFIG_XFRM_USER=y | 221 | CONFIG_XFRM_USER=y |
203 | # CONFIG_XFRM_SUB_POLICY is not set | 222 | # CONFIG_XFRM_SUB_POLICY is not set |
204 | # CONFIG_XFRM_MIGRATE is not set | 223 | # CONFIG_XFRM_MIGRATE is not set |
224 | # CONFIG_XFRM_STATISTICS is not set | ||
205 | CONFIG_NET_KEY=y | 225 | CONFIG_NET_KEY=y |
206 | # CONFIG_NET_KEY_MIGRATE is not set | 226 | # CONFIG_NET_KEY_MIGRATE is not set |
207 | CONFIG_INET=y | 227 | CONFIG_INET=y |
@@ -255,87 +275,40 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
255 | CONFIG_INET6_XFRM_MODE_BEET=y | 275 | CONFIG_INET6_XFRM_MODE_BEET=y |
256 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 276 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
257 | CONFIG_IPV6_SIT=y | 277 | CONFIG_IPV6_SIT=y |
278 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
258 | # CONFIG_IPV6_TUNNEL is not set | 279 | # CONFIG_IPV6_TUNNEL is not set |
259 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 280 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
281 | # CONFIG_IPV6_MROUTE is not set | ||
260 | # CONFIG_NETWORK_SECMARK is not set | 282 | # CONFIG_NETWORK_SECMARK is not set |
261 | CONFIG_NETFILTER=y | 283 | CONFIG_NETFILTER=y |
262 | # CONFIG_NETFILTER_DEBUG is not set | 284 | # CONFIG_NETFILTER_DEBUG is not set |
263 | CONFIG_BRIDGE_NETFILTER=y | 285 | # CONFIG_NETFILTER_ADVANCED is not set |
264 | 286 | ||
265 | # | 287 | # |
266 | # Core Netfilter Configuration | 288 | # Core Netfilter Configuration |
267 | # | 289 | # |
268 | # CONFIG_NETFILTER_NETLINK is not set | 290 | CONFIG_NETFILTER_NETLINK=m |
269 | CONFIG_NF_CONNTRACK_ENABLED=m | 291 | CONFIG_NETFILTER_NETLINK_LOG=m |
270 | CONFIG_NF_CONNTRACK=m | 292 | CONFIG_NF_CONNTRACK=m |
271 | CONFIG_NF_CT_ACCT=y | ||
272 | CONFIG_NF_CONNTRACK_MARK=y | ||
273 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
274 | CONFIG_NF_CT_PROTO_GRE=m | ||
275 | # CONFIG_NF_CT_PROTO_SCTP is not set | ||
276 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | ||
277 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
278 | CONFIG_NF_CONNTRACK_FTP=m | 293 | CONFIG_NF_CONNTRACK_FTP=m |
279 | CONFIG_NF_CONNTRACK_H323=m | ||
280 | CONFIG_NF_CONNTRACK_IRC=m | 294 | CONFIG_NF_CONNTRACK_IRC=m |
281 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
282 | CONFIG_NF_CONNTRACK_PPTP=m | ||
283 | CONFIG_NF_CONNTRACK_SANE=m | ||
284 | CONFIG_NF_CONNTRACK_SIP=m | 295 | CONFIG_NF_CONNTRACK_SIP=m |
285 | CONFIG_NF_CONNTRACK_TFTP=m | 296 | CONFIG_NF_CT_NETLINK=m |
286 | CONFIG_NETFILTER_XTABLES=y | 297 | CONFIG_NETFILTER_XTABLES=y |
287 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
288 | # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set | ||
289 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | ||
290 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 298 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
291 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
292 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 299 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
293 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set | ||
294 | # CONFIG_NETFILTER_XT_TARGET_TRACE is not set | ||
295 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 300 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
296 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
297 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
298 | # CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set | ||
299 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
300 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 301 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
301 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | ||
302 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | ||
303 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
304 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
305 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
306 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
307 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
308 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 302 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
309 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 303 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
310 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
311 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | ||
312 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
313 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
314 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
315 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set | ||
316 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 304 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
317 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
318 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
319 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
320 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set | ||
321 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
322 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
323 | 305 | ||
324 | # | 306 | # |
325 | # IP: Netfilter Configuration | 307 | # IP: Netfilter Configuration |
326 | # | 308 | # |
327 | CONFIG_NF_CONNTRACK_IPV4=m | 309 | CONFIG_NF_CONNTRACK_IPV4=m |
328 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 310 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
329 | # CONFIG_IP_NF_QUEUE is not set | ||
330 | CONFIG_IP_NF_IPTABLES=m | 311 | CONFIG_IP_NF_IPTABLES=m |
331 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
332 | CONFIG_IP_NF_MATCH_TOS=m | ||
333 | CONFIG_IP_NF_MATCH_RECENT=m | ||
334 | CONFIG_IP_NF_MATCH_ECN=m | ||
335 | CONFIG_IP_NF_MATCH_AH=m | ||
336 | CONFIG_IP_NF_MATCH_TTL=m | ||
337 | CONFIG_IP_NF_MATCH_OWNER=m | ||
338 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
339 | CONFIG_IP_NF_FILTER=m | 312 | CONFIG_IP_NF_FILTER=m |
340 | CONFIG_IP_NF_TARGET_REJECT=m | 313 | CONFIG_IP_NF_TARGET_REJECT=m |
341 | CONFIG_IP_NF_TARGET_LOG=m | 314 | CONFIG_IP_NF_TARGET_LOG=m |
@@ -343,54 +316,25 @@ CONFIG_IP_NF_TARGET_LOG=m | |||
343 | CONFIG_NF_NAT=m | 316 | CONFIG_NF_NAT=m |
344 | CONFIG_NF_NAT_NEEDED=y | 317 | CONFIG_NF_NAT_NEEDED=y |
345 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 318 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
346 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
347 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
348 | CONFIG_IP_NF_TARGET_SAME=m | ||
349 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
350 | CONFIG_NF_NAT_PROTO_GRE=m | ||
351 | CONFIG_NF_NAT_FTP=m | 319 | CONFIG_NF_NAT_FTP=m |
352 | CONFIG_NF_NAT_IRC=m | 320 | CONFIG_NF_NAT_IRC=m |
353 | CONFIG_NF_NAT_TFTP=m | 321 | # CONFIG_NF_NAT_TFTP is not set |
354 | CONFIG_NF_NAT_AMANDA=m | 322 | # CONFIG_NF_NAT_AMANDA is not set |
355 | CONFIG_NF_NAT_PPTP=m | 323 | # CONFIG_NF_NAT_PPTP is not set |
356 | CONFIG_NF_NAT_H323=m | 324 | # CONFIG_NF_NAT_H323 is not set |
357 | CONFIG_NF_NAT_SIP=m | 325 | CONFIG_NF_NAT_SIP=m |
358 | CONFIG_IP_NF_MANGLE=m | 326 | CONFIG_IP_NF_MANGLE=m |
359 | CONFIG_IP_NF_TARGET_TOS=m | ||
360 | CONFIG_IP_NF_TARGET_ECN=m | ||
361 | CONFIG_IP_NF_TARGET_TTL=m | ||
362 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
363 | CONFIG_IP_NF_RAW=m | ||
364 | CONFIG_IP_NF_ARPTABLES=m | ||
365 | CONFIG_IP_NF_ARPFILTER=m | ||
366 | CONFIG_IP_NF_ARP_MANGLE=m | ||
367 | 327 | ||
368 | # | 328 | # |
369 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 329 | # IPv6: Netfilter Configuration |
370 | # | 330 | # |
371 | CONFIG_NF_CONNTRACK_IPV6=m | 331 | CONFIG_NF_CONNTRACK_IPV6=m |
372 | CONFIG_IP6_NF_QUEUE=m | ||
373 | CONFIG_IP6_NF_IPTABLES=m | 332 | CONFIG_IP6_NF_IPTABLES=m |
374 | CONFIG_IP6_NF_MATCH_RT=m | ||
375 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
376 | CONFIG_IP6_NF_MATCH_FRAG=m | ||
377 | CONFIG_IP6_NF_MATCH_HL=m | ||
378 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
379 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 333 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
380 | CONFIG_IP6_NF_MATCH_AH=m | ||
381 | CONFIG_IP6_NF_MATCH_MH=m | ||
382 | CONFIG_IP6_NF_MATCH_EUI64=m | ||
383 | CONFIG_IP6_NF_FILTER=m | 334 | CONFIG_IP6_NF_FILTER=m |
384 | CONFIG_IP6_NF_TARGET_LOG=m | 335 | CONFIG_IP6_NF_TARGET_LOG=m |
385 | CONFIG_IP6_NF_TARGET_REJECT=m | 336 | CONFIG_IP6_NF_TARGET_REJECT=m |
386 | CONFIG_IP6_NF_MANGLE=m | 337 | CONFIG_IP6_NF_MANGLE=m |
387 | CONFIG_IP6_NF_TARGET_HL=m | ||
388 | CONFIG_IP6_NF_RAW=m | ||
389 | |||
390 | # | ||
391 | # Bridge: Netfilter Configuration | ||
392 | # | ||
393 | # CONFIG_BRIDGE_NF_EBTABLES is not set | ||
394 | # CONFIG_IP_DCCP is not set | 338 | # CONFIG_IP_DCCP is not set |
395 | # CONFIG_IP_SCTP is not set | 339 | # CONFIG_IP_SCTP is not set |
396 | # CONFIG_TIPC is not set | 340 | # CONFIG_TIPC is not set |
@@ -407,7 +351,6 @@ CONFIG_LLC=m | |||
407 | # CONFIG_ECONET is not set | 351 | # CONFIG_ECONET is not set |
408 | # CONFIG_WAN_ROUTER is not set | 352 | # CONFIG_WAN_ROUTER is not set |
409 | # CONFIG_NET_SCHED is not set | 353 | # CONFIG_NET_SCHED is not set |
410 | CONFIG_NET_CLS_ROUTE=y | ||
411 | 354 | ||
412 | # | 355 | # |
413 | # Network testing | 356 | # Network testing |
@@ -415,6 +358,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
415 | # CONFIG_NET_PKTGEN is not set | 358 | # CONFIG_NET_PKTGEN is not set |
416 | # CONFIG_NET_TCPPROBE is not set | 359 | # CONFIG_NET_TCPPROBE is not set |
417 | # CONFIG_HAMRADIO is not set | 360 | # CONFIG_HAMRADIO is not set |
361 | # CONFIG_CAN is not set | ||
418 | # CONFIG_IRDA is not set | 362 | # CONFIG_IRDA is not set |
419 | # CONFIG_BT is not set | 363 | # CONFIG_BT is not set |
420 | # CONFIG_AF_RXRPC is not set | 364 | # CONFIG_AF_RXRPC is not set |
@@ -450,6 +394,7 @@ CONFIG_MTD=y | |||
450 | CONFIG_MTD_PARTITIONS=y | 394 | CONFIG_MTD_PARTITIONS=y |
451 | # CONFIG_MTD_REDBOOT_PARTS is not set | 395 | # CONFIG_MTD_REDBOOT_PARTS is not set |
452 | CONFIG_MTD_CMDLINE_PARTS=y | 396 | CONFIG_MTD_CMDLINE_PARTS=y |
397 | # CONFIG_MTD_AR7_PARTS is not set | ||
453 | 398 | ||
454 | # | 399 | # |
455 | # User Modules And Translation Layers | 400 | # User Modules And Translation Layers |
@@ -531,11 +476,18 @@ CONFIG_BLK_DEV_NBD=m | |||
531 | CONFIG_BLK_DEV_RAM=m | 476 | CONFIG_BLK_DEV_RAM=m |
532 | CONFIG_BLK_DEV_RAM_COUNT=16 | 477 | CONFIG_BLK_DEV_RAM_COUNT=16 |
533 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 478 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
534 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 479 | # CONFIG_BLK_DEV_XIP is not set |
535 | # CONFIG_CDROM_PKTCDVD is not set | 480 | # CONFIG_CDROM_PKTCDVD is not set |
536 | # CONFIG_ATA_OVER_ETH is not set | 481 | # CONFIG_ATA_OVER_ETH is not set |
537 | # CONFIG_MISC_DEVICES is not set | 482 | CONFIG_MISC_DEVICES=y |
538 | # CONFIG_IDE is not set | 483 | # CONFIG_ATMEL_PWM is not set |
484 | CONFIG_ATMEL_TCLIB=y | ||
485 | CONFIG_ATMEL_TCB_CLKSRC=y | ||
486 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | ||
487 | # CONFIG_EEPROM_93CX6 is not set | ||
488 | # CONFIG_ATMEL_SSC is not set | ||
489 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
490 | # CONFIG_HAVE_IDE is not set | ||
539 | 491 | ||
540 | # | 492 | # |
541 | # SCSI device support | 493 | # SCSI device support |
@@ -568,11 +520,13 @@ CONFIG_PHYLIB=y | |||
568 | # CONFIG_SMSC_PHY is not set | 520 | # CONFIG_SMSC_PHY is not set |
569 | # CONFIG_BROADCOM_PHY is not set | 521 | # CONFIG_BROADCOM_PHY is not set |
570 | # CONFIG_ICPLUS_PHY is not set | 522 | # CONFIG_ICPLUS_PHY is not set |
523 | # CONFIG_REALTEK_PHY is not set | ||
571 | # CONFIG_FIXED_PHY is not set | 524 | # CONFIG_FIXED_PHY is not set |
572 | # CONFIG_MDIO_BITBANG is not set | 525 | # CONFIG_MDIO_BITBANG is not set |
573 | CONFIG_NET_ETHERNET=y | 526 | CONFIG_NET_ETHERNET=y |
574 | # CONFIG_MII is not set | 527 | # CONFIG_MII is not set |
575 | CONFIG_MACB=y | 528 | CONFIG_MACB=y |
529 | # CONFIG_ENC28J60 is not set | ||
576 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 530 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
577 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
578 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
@@ -586,6 +540,7 @@ CONFIG_MACB=y | |||
586 | # | 540 | # |
587 | # CONFIG_WLAN_PRE80211 is not set | 541 | # CONFIG_WLAN_PRE80211 is not set |
588 | # CONFIG_WLAN_80211 is not set | 542 | # CONFIG_WLAN_80211 is not set |
543 | # CONFIG_IWLWIFI_LEDS is not set | ||
589 | # CONFIG_WAN is not set | 544 | # CONFIG_WAN is not set |
590 | CONFIG_PPP=m | 545 | CONFIG_PPP=m |
591 | # CONFIG_PPP_MULTILINK is not set | 546 | # CONFIG_PPP_MULTILINK is not set |
@@ -599,7 +554,6 @@ CONFIG_PPPOE=m | |||
599 | # CONFIG_PPPOL2TP is not set | 554 | # CONFIG_PPPOL2TP is not set |
600 | # CONFIG_SLIP is not set | 555 | # CONFIG_SLIP is not set |
601 | CONFIG_SLHC=m | 556 | CONFIG_SLHC=m |
602 | # CONFIG_SHAPER is not set | ||
603 | # CONFIG_NETCONSOLE is not set | 557 | # CONFIG_NETCONSOLE is not set |
604 | # CONFIG_NETPOLL is not set | 558 | # CONFIG_NETPOLL is not set |
605 | # CONFIG_NET_POLL_CONTROLLER is not set | 559 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -621,6 +575,7 @@ CONFIG_SLHC=m | |||
621 | # Character devices | 575 | # Character devices |
622 | # | 576 | # |
623 | # CONFIG_VT is not set | 577 | # CONFIG_VT is not set |
578 | # CONFIG_DEVKMEM is not set | ||
624 | # CONFIG_SERIAL_NONSTANDARD is not set | 579 | # CONFIG_SERIAL_NONSTANDARD is not set |
625 | 580 | ||
626 | # | 581 | # |
@@ -633,6 +588,7 @@ CONFIG_SLHC=m | |||
633 | # | 588 | # |
634 | CONFIG_SERIAL_ATMEL=y | 589 | CONFIG_SERIAL_ATMEL=y |
635 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 590 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
591 | CONFIG_SERIAL_ATMEL_PDC=y | ||
636 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | 592 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
637 | CONFIG_SERIAL_CORE=y | 593 | CONFIG_SERIAL_CORE=y |
638 | CONFIG_SERIAL_CORE_CONSOLE=y | 594 | CONFIG_SERIAL_CORE_CONSOLE=y |
@@ -640,21 +596,13 @@ CONFIG_UNIX98_PTYS=y | |||
640 | # CONFIG_LEGACY_PTYS is not set | 596 | # CONFIG_LEGACY_PTYS is not set |
641 | # CONFIG_IPMI_HANDLER is not set | 597 | # CONFIG_IPMI_HANDLER is not set |
642 | # CONFIG_HW_RANDOM is not set | 598 | # CONFIG_HW_RANDOM is not set |
643 | # CONFIG_RTC is not set | ||
644 | # CONFIG_GEN_RTC is not set | ||
645 | # CONFIG_R3964 is not set | 599 | # CONFIG_R3964 is not set |
646 | # CONFIG_RAW_DRIVER is not set | 600 | # CONFIG_RAW_DRIVER is not set |
647 | # CONFIG_TCG_TPM is not set | 601 | # CONFIG_TCG_TPM is not set |
648 | CONFIG_I2C=m | 602 | CONFIG_I2C=m |
649 | CONFIG_I2C_BOARDINFO=y | 603 | CONFIG_I2C_BOARDINFO=y |
650 | CONFIG_I2C_CHARDEV=m | 604 | CONFIG_I2C_CHARDEV=m |
651 | |||
652 | # | ||
653 | # I2C Algorithms | ||
654 | # | ||
655 | CONFIG_I2C_ALGOBIT=m | 605 | CONFIG_I2C_ALGOBIT=m |
656 | # CONFIG_I2C_ALGOPCF is not set | ||
657 | # CONFIG_I2C_ALGOPCA is not set | ||
658 | 606 | ||
659 | # | 607 | # |
660 | # I2C Hardware Bus support | 608 | # I2C Hardware Bus support |
@@ -665,27 +613,23 @@ CONFIG_I2C_GPIO=m | |||
665 | # CONFIG_I2C_SIMTEC is not set | 613 | # CONFIG_I2C_SIMTEC is not set |
666 | # CONFIG_I2C_TAOS_EVM is not set | 614 | # CONFIG_I2C_TAOS_EVM is not set |
667 | # CONFIG_I2C_STUB is not set | 615 | # CONFIG_I2C_STUB is not set |
616 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
668 | 617 | ||
669 | # | 618 | # |
670 | # Miscellaneous I2C Chip support | 619 | # Miscellaneous I2C Chip support |
671 | # | 620 | # |
672 | # CONFIG_SENSORS_DS1337 is not set | ||
673 | # CONFIG_SENSORS_DS1374 is not set | ||
674 | # CONFIG_DS1682 is not set | 621 | # CONFIG_DS1682 is not set |
675 | # CONFIG_SENSORS_EEPROM is not set | 622 | # CONFIG_SENSORS_EEPROM is not set |
676 | # CONFIG_SENSORS_PCF8574 is not set | 623 | # CONFIG_SENSORS_PCF8574 is not set |
677 | # CONFIG_SENSORS_PCA9539 is not set | 624 | # CONFIG_PCF8575 is not set |
678 | # CONFIG_SENSORS_PCF8591 is not set | 625 | # CONFIG_SENSORS_PCF8591 is not set |
626 | # CONFIG_TPS65010 is not set | ||
679 | # CONFIG_SENSORS_MAX6875 is not set | 627 | # CONFIG_SENSORS_MAX6875 is not set |
680 | # CONFIG_SENSORS_TSL2550 is not set | 628 | # CONFIG_SENSORS_TSL2550 is not set |
681 | # CONFIG_I2C_DEBUG_CORE is not set | 629 | # CONFIG_I2C_DEBUG_CORE is not set |
682 | # CONFIG_I2C_DEBUG_ALGO is not set | 630 | # CONFIG_I2C_DEBUG_ALGO is not set |
683 | # CONFIG_I2C_DEBUG_BUS is not set | 631 | # CONFIG_I2C_DEBUG_BUS is not set |
684 | # CONFIG_I2C_DEBUG_CHIP is not set | 632 | # CONFIG_I2C_DEBUG_CHIP is not set |
685 | |||
686 | # | ||
687 | # SPI support | ||
688 | # | ||
689 | CONFIG_SPI=y | 633 | CONFIG_SPI=y |
690 | # CONFIG_SPI_DEBUG is not set | 634 | # CONFIG_SPI_DEBUG is not set |
691 | CONFIG_SPI_MASTER=y | 635 | CONFIG_SPI_MASTER=y |
@@ -702,9 +646,27 @@ CONFIG_SPI_ATMEL=y | |||
702 | # CONFIG_SPI_AT25 is not set | 646 | # CONFIG_SPI_AT25 is not set |
703 | CONFIG_SPI_SPIDEV=m | 647 | CONFIG_SPI_SPIDEV=m |
704 | # CONFIG_SPI_TLE62X0 is not set | 648 | # CONFIG_SPI_TLE62X0 is not set |
649 | CONFIG_HAVE_GPIO_LIB=y | ||
650 | |||
651 | # | ||
652 | # GPIO Support | ||
653 | # | ||
654 | # CONFIG_DEBUG_GPIO is not set | ||
655 | |||
656 | # | ||
657 | # I2C GPIO expanders: | ||
658 | # | ||
659 | # CONFIG_GPIO_PCA953X is not set | ||
660 | # CONFIG_GPIO_PCF857X is not set | ||
661 | |||
662 | # | ||
663 | # SPI GPIO expanders: | ||
664 | # | ||
665 | # CONFIG_GPIO_MCP23S08 is not set | ||
705 | # CONFIG_W1 is not set | 666 | # CONFIG_W1 is not set |
706 | # CONFIG_POWER_SUPPLY is not set | 667 | # CONFIG_POWER_SUPPLY is not set |
707 | # CONFIG_HWMON is not set | 668 | # CONFIG_HWMON is not set |
669 | # CONFIG_THERMAL is not set | ||
708 | CONFIG_WATCHDOG=y | 670 | CONFIG_WATCHDOG=y |
709 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 671 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
710 | 672 | ||
@@ -724,12 +686,22 @@ CONFIG_SSB_POSSIBLE=y | |||
724 | # Multifunction device drivers | 686 | # Multifunction device drivers |
725 | # | 687 | # |
726 | # CONFIG_MFD_SM501 is not set | 688 | # CONFIG_MFD_SM501 is not set |
689 | # CONFIG_HTC_PASIC3 is not set | ||
727 | 690 | ||
728 | # | 691 | # |
729 | # Multimedia devices | 692 | # Multimedia devices |
730 | # | 693 | # |
694 | |||
695 | # | ||
696 | # Multimedia core support | ||
697 | # | ||
731 | # CONFIG_VIDEO_DEV is not set | 698 | # CONFIG_VIDEO_DEV is not set |
732 | # CONFIG_DVB_CORE is not set | 699 | # CONFIG_DVB_CORE is not set |
700 | # CONFIG_VIDEO_MEDIA is not set | ||
701 | |||
702 | # | ||
703 | # Multimedia drivers | ||
704 | # | ||
733 | # CONFIG_DAB is not set | 705 | # CONFIG_DAB is not set |
734 | 706 | ||
735 | # | 707 | # |
@@ -753,14 +725,12 @@ CONFIG_USB_SUPPORT=y | |||
753 | # CONFIG_USB_ARCH_HAS_HCD is not set | 725 | # CONFIG_USB_ARCH_HAS_HCD is not set |
754 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 726 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
755 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 727 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
728 | # CONFIG_USB_OTG_WHITELIST is not set | ||
729 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
756 | 730 | ||
757 | # | 731 | # |
758 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 732 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
759 | # | 733 | # |
760 | |||
761 | # | ||
762 | # USB Gadget Support | ||
763 | # | ||
764 | CONFIG_USB_GADGET=y | 734 | CONFIG_USB_GADGET=y |
765 | # CONFIG_USB_GADGET_DEBUG is not set | 735 | # CONFIG_USB_GADGET_DEBUG is not set |
766 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 736 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
@@ -772,6 +742,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
772 | # CONFIG_USB_GADGET_NET2280 is not set | 742 | # CONFIG_USB_GADGET_NET2280 is not set |
773 | # CONFIG_USB_GADGET_PXA2XX is not set | 743 | # CONFIG_USB_GADGET_PXA2XX is not set |
774 | # CONFIG_USB_GADGET_M66592 is not set | 744 | # CONFIG_USB_GADGET_M66592 is not set |
745 | # CONFIG_USB_GADGET_PXA27X is not set | ||
775 | # CONFIG_USB_GADGET_GOKU is not set | 746 | # CONFIG_USB_GADGET_GOKU is not set |
776 | # CONFIG_USB_GADGET_LH7A40X is not set | 747 | # CONFIG_USB_GADGET_LH7A40X is not set |
777 | # CONFIG_USB_GADGET_OMAP is not set | 748 | # CONFIG_USB_GADGET_OMAP is not set |
@@ -787,6 +758,7 @@ CONFIG_USB_FILE_STORAGE=m | |||
787 | # CONFIG_USB_FILE_STORAGE_TEST is not set | 758 | # CONFIG_USB_FILE_STORAGE_TEST is not set |
788 | CONFIG_USB_G_SERIAL=m | 759 | CONFIG_USB_G_SERIAL=m |
789 | # CONFIG_USB_MIDI_GADGET is not set | 760 | # CONFIG_USB_MIDI_GADGET is not set |
761 | # CONFIG_USB_G_PRINTER is not set | ||
790 | CONFIG_MMC=m | 762 | CONFIG_MMC=m |
791 | # CONFIG_MMC_DEBUG is not set | 763 | # CONFIG_MMC_DEBUG is not set |
792 | # CONFIG_MMC_UNSAFE_RESUME is not set | 764 | # CONFIG_MMC_UNSAFE_RESUME is not set |
@@ -797,11 +769,13 @@ CONFIG_MMC=m | |||
797 | CONFIG_MMC_BLOCK=m | 769 | CONFIG_MMC_BLOCK=m |
798 | CONFIG_MMC_BLOCK_BOUNCE=y | 770 | CONFIG_MMC_BLOCK_BOUNCE=y |
799 | # CONFIG_SDIO_UART is not set | 771 | # CONFIG_SDIO_UART is not set |
772 | # CONFIG_MMC_TEST is not set | ||
800 | 773 | ||
801 | # | 774 | # |
802 | # MMC/SD Host Controller Drivers | 775 | # MMC/SD Host Controller Drivers |
803 | # | 776 | # |
804 | CONFIG_MMC_SPI=m | 777 | CONFIG_MMC_SPI=m |
778 | # CONFIG_MEMSTICK is not set | ||
805 | CONFIG_NEW_LEDS=y | 779 | CONFIG_NEW_LEDS=y |
806 | CONFIG_LEDS_CLASS=y | 780 | CONFIG_LEDS_CLASS=y |
807 | 781 | ||
@@ -816,6 +790,8 @@ CONFIG_LEDS_GPIO=y | |||
816 | CONFIG_LEDS_TRIGGERS=y | 790 | CONFIG_LEDS_TRIGGERS=y |
817 | CONFIG_LEDS_TRIGGER_TIMER=y | 791 | CONFIG_LEDS_TRIGGER_TIMER=y |
818 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 792 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
793 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
794 | # CONFIG_ACCESSIBILITY is not set | ||
819 | CONFIG_RTC_LIB=y | 795 | CONFIG_RTC_LIB=y |
820 | CONFIG_RTC_CLASS=y | 796 | CONFIG_RTC_CLASS=y |
821 | CONFIG_RTC_HCTOSYS=y | 797 | CONFIG_RTC_HCTOSYS=y |
@@ -844,19 +820,22 @@ CONFIG_RTC_INTF_DEV=y | |||
844 | # CONFIG_RTC_DRV_PCF8563 is not set | 820 | # CONFIG_RTC_DRV_PCF8563 is not set |
845 | # CONFIG_RTC_DRV_PCF8583 is not set | 821 | # CONFIG_RTC_DRV_PCF8583 is not set |
846 | # CONFIG_RTC_DRV_M41T80 is not set | 822 | # CONFIG_RTC_DRV_M41T80 is not set |
823 | # CONFIG_RTC_DRV_S35390A is not set | ||
847 | 824 | ||
848 | # | 825 | # |
849 | # SPI RTC drivers | 826 | # SPI RTC drivers |
850 | # | 827 | # |
851 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
852 | # CONFIG_RTC_DRV_MAX6902 is not set | 828 | # CONFIG_RTC_DRV_MAX6902 is not set |
829 | # CONFIG_RTC_DRV_R9701 is not set | ||
830 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
853 | 831 | ||
854 | # | 832 | # |
855 | # Platform RTC drivers | 833 | # Platform RTC drivers |
856 | # | 834 | # |
835 | # CONFIG_RTC_DRV_DS1511 is not set | ||
857 | # CONFIG_RTC_DRV_DS1553 is not set | 836 | # CONFIG_RTC_DRV_DS1553 is not set |
858 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
859 | # CONFIG_RTC_DRV_DS1742 is not set | 837 | # CONFIG_RTC_DRV_DS1742 is not set |
838 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
860 | # CONFIG_RTC_DRV_M48T86 is not set | 839 | # CONFIG_RTC_DRV_M48T86 is not set |
861 | # CONFIG_RTC_DRV_M48T59 is not set | 840 | # CONFIG_RTC_DRV_M48T59 is not set |
862 | # CONFIG_RTC_DRV_V3020 is not set | 841 | # CONFIG_RTC_DRV_V3020 is not set |
@@ -865,10 +844,6 @@ CONFIG_RTC_INTF_DEV=y | |||
865 | # on-CPU RTC drivers | 844 | # on-CPU RTC drivers |
866 | # | 845 | # |
867 | CONFIG_RTC_DRV_AT32AP700X=y | 846 | CONFIG_RTC_DRV_AT32AP700X=y |
868 | |||
869 | # | ||
870 | # Userspace I/O | ||
871 | # | ||
872 | # CONFIG_UIO is not set | 847 | # CONFIG_UIO is not set |
873 | 848 | ||
874 | # | 849 | # |
@@ -885,14 +860,11 @@ CONFIG_JBD=m | |||
885 | # CONFIG_JFS_FS is not set | 860 | # CONFIG_JFS_FS is not set |
886 | # CONFIG_FS_POSIX_ACL is not set | 861 | # CONFIG_FS_POSIX_ACL is not set |
887 | # CONFIG_XFS_FS is not set | 862 | # CONFIG_XFS_FS is not set |
888 | # CONFIG_GFS2_FS is not set | ||
889 | # CONFIG_OCFS2_FS is not set | 863 | # CONFIG_OCFS2_FS is not set |
890 | # CONFIG_MINIX_FS is not set | 864 | # CONFIG_DNOTIFY is not set |
891 | # CONFIG_ROMFS_FS is not set | ||
892 | CONFIG_INOTIFY=y | 865 | CONFIG_INOTIFY=y |
893 | CONFIG_INOTIFY_USER=y | 866 | CONFIG_INOTIFY_USER=y |
894 | # CONFIG_QUOTA is not set | 867 | # CONFIG_QUOTA is not set |
895 | # CONFIG_DNOTIFY is not set | ||
896 | # CONFIG_AUTOFS_FS is not set | 868 | # CONFIG_AUTOFS_FS is not set |
897 | # CONFIG_AUTOFS4_FS is not set | 869 | # CONFIG_AUTOFS4_FS is not set |
898 | CONFIG_FUSE_FS=m | 870 | CONFIG_FUSE_FS=m |
@@ -948,8 +920,10 @@ CONFIG_JFFS2_RTIME=y | |||
948 | # CONFIG_JFFS2_RUBIN is not set | 920 | # CONFIG_JFFS2_RUBIN is not set |
949 | # CONFIG_CRAMFS is not set | 921 | # CONFIG_CRAMFS is not set |
950 | # CONFIG_VXFS_FS is not set | 922 | # CONFIG_VXFS_FS is not set |
923 | # CONFIG_MINIX_FS is not set | ||
951 | # CONFIG_HPFS_FS is not set | 924 | # CONFIG_HPFS_FS is not set |
952 | # CONFIG_QNX4FS_FS is not set | 925 | # CONFIG_QNX4FS_FS is not set |
926 | # CONFIG_ROMFS_FS is not set | ||
953 | # CONFIG_SYSV_FS is not set | 927 | # CONFIG_SYSV_FS is not set |
954 | # CONFIG_UFS_FS is not set | 928 | # CONFIG_UFS_FS is not set |
955 | CONFIG_NETWORK_FILESYSTEMS=y | 929 | CONFIG_NETWORK_FILESYSTEMS=y |
@@ -957,12 +931,10 @@ CONFIG_NFS_FS=y | |||
957 | CONFIG_NFS_V3=y | 931 | CONFIG_NFS_V3=y |
958 | # CONFIG_NFS_V3_ACL is not set | 932 | # CONFIG_NFS_V3_ACL is not set |
959 | # CONFIG_NFS_V4 is not set | 933 | # CONFIG_NFS_V4 is not set |
960 | # CONFIG_NFS_DIRECTIO is not set | ||
961 | CONFIG_NFSD=m | 934 | CONFIG_NFSD=m |
962 | CONFIG_NFSD_V3=y | 935 | CONFIG_NFSD_V3=y |
963 | # CONFIG_NFSD_V3_ACL is not set | 936 | # CONFIG_NFSD_V3_ACL is not set |
964 | # CONFIG_NFSD_V4 is not set | 937 | # CONFIG_NFSD_V4 is not set |
965 | CONFIG_NFSD_TCP=y | ||
966 | CONFIG_ROOT_NFS=y | 938 | CONFIG_ROOT_NFS=y |
967 | CONFIG_LOCKD=y | 939 | CONFIG_LOCKD=y |
968 | CONFIG_LOCKD_V4=y | 940 | CONFIG_LOCKD_V4=y |
@@ -1030,11 +1002,6 @@ CONFIG_NLS_ISO8859_1=m | |||
1030 | # CONFIG_NLS_KOI8_U is not set | 1002 | # CONFIG_NLS_KOI8_U is not set |
1031 | CONFIG_NLS_UTF8=m | 1003 | CONFIG_NLS_UTF8=m |
1032 | # CONFIG_DLM is not set | 1004 | # CONFIG_DLM is not set |
1033 | CONFIG_INSTRUMENTATION=y | ||
1034 | CONFIG_PROFILING=y | ||
1035 | CONFIG_OPROFILE=m | ||
1036 | CONFIG_KPROBES=y | ||
1037 | # CONFIG_MARKERS is not set | ||
1038 | 1005 | ||
1039 | # | 1006 | # |
1040 | # Kernel hacking | 1007 | # Kernel hacking |
@@ -1042,6 +1009,7 @@ CONFIG_KPROBES=y | |||
1042 | # CONFIG_PRINTK_TIME is not set | 1009 | # CONFIG_PRINTK_TIME is not set |
1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1010 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1044 | CONFIG_ENABLE_MUST_CHECK=y | 1011 | CONFIG_ENABLE_MUST_CHECK=y |
1012 | CONFIG_FRAME_WARN=1024 | ||
1045 | CONFIG_MAGIC_SYSRQ=y | 1013 | CONFIG_MAGIC_SYSRQ=y |
1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1014 | # CONFIG_UNUSED_SYMBOLS is not set |
1047 | # CONFIG_DEBUG_FS is not set | 1015 | # CONFIG_DEBUG_FS is not set |
@@ -1052,7 +1020,9 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1052 | CONFIG_SCHED_DEBUG=y | 1020 | CONFIG_SCHED_DEBUG=y |
1053 | # CONFIG_SCHEDSTATS is not set | 1021 | # CONFIG_SCHEDSTATS is not set |
1054 | # CONFIG_TIMER_STATS is not set | 1022 | # CONFIG_TIMER_STATS is not set |
1023 | # CONFIG_DEBUG_OBJECTS is not set | ||
1055 | # CONFIG_SLUB_DEBUG_ON is not set | 1024 | # CONFIG_SLUB_DEBUG_ON is not set |
1025 | # CONFIG_SLUB_STATS is not set | ||
1056 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1026 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1057 | # CONFIG_RT_MUTEX_TESTER is not set | 1027 | # CONFIG_RT_MUTEX_TESTER is not set |
1058 | # CONFIG_DEBUG_SPINLOCK is not set | 1028 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1066,12 +1036,14 @@ CONFIG_SCHED_DEBUG=y | |||
1066 | CONFIG_DEBUG_BUGVERBOSE=y | 1036 | CONFIG_DEBUG_BUGVERBOSE=y |
1067 | # CONFIG_DEBUG_INFO is not set | 1037 | # CONFIG_DEBUG_INFO is not set |
1068 | # CONFIG_DEBUG_VM is not set | 1038 | # CONFIG_DEBUG_VM is not set |
1039 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1069 | # CONFIG_DEBUG_LIST is not set | 1040 | # CONFIG_DEBUG_LIST is not set |
1070 | # CONFIG_DEBUG_SG is not set | 1041 | # CONFIG_DEBUG_SG is not set |
1071 | CONFIG_FRAME_POINTER=y | 1042 | CONFIG_FRAME_POINTER=y |
1072 | # CONFIG_FORCED_INLINING is not set | ||
1073 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1043 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1074 | # CONFIG_RCU_TORTURE_TEST is not set | 1044 | # CONFIG_RCU_TORTURE_TEST is not set |
1045 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
1046 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1075 | # CONFIG_LKDTM is not set | 1047 | # CONFIG_LKDTM is not set |
1076 | # CONFIG_FAULT_INJECTION is not set | 1048 | # CONFIG_FAULT_INJECTION is not set |
1077 | # CONFIG_SAMPLES is not set | 1049 | # CONFIG_SAMPLES is not set |
@@ -1083,52 +1055,90 @@ CONFIG_FRAME_POINTER=y | |||
1083 | # CONFIG_SECURITY is not set | 1055 | # CONFIG_SECURITY is not set |
1084 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1056 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1085 | CONFIG_CRYPTO=y | 1057 | CONFIG_CRYPTO=y |
1058 | |||
1059 | # | ||
1060 | # Crypto core or helper | ||
1061 | # | ||
1086 | CONFIG_CRYPTO_ALGAPI=y | 1062 | CONFIG_CRYPTO_ALGAPI=y |
1063 | CONFIG_CRYPTO_AEAD=y | ||
1087 | CONFIG_CRYPTO_BLKCIPHER=y | 1064 | CONFIG_CRYPTO_BLKCIPHER=y |
1088 | CONFIG_CRYPTO_HASH=y | 1065 | CONFIG_CRYPTO_HASH=y |
1089 | CONFIG_CRYPTO_MANAGER=y | 1066 | CONFIG_CRYPTO_MANAGER=y |
1067 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1068 | # CONFIG_CRYPTO_NULL is not set | ||
1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1070 | CONFIG_CRYPTO_AUTHENC=y | ||
1071 | # CONFIG_CRYPTO_TEST is not set | ||
1072 | |||
1073 | # | ||
1074 | # Authenticated Encryption with Associated Data | ||
1075 | # | ||
1076 | # CONFIG_CRYPTO_CCM is not set | ||
1077 | # CONFIG_CRYPTO_GCM is not set | ||
1078 | # CONFIG_CRYPTO_SEQIV is not set | ||
1079 | |||
1080 | # | ||
1081 | # Block modes | ||
1082 | # | ||
1083 | CONFIG_CRYPTO_CBC=y | ||
1084 | # CONFIG_CRYPTO_CTR is not set | ||
1085 | # CONFIG_CRYPTO_CTS is not set | ||
1086 | CONFIG_CRYPTO_ECB=m | ||
1087 | # CONFIG_CRYPTO_LRW is not set | ||
1088 | CONFIG_CRYPTO_PCBC=m | ||
1089 | # CONFIG_CRYPTO_XTS is not set | ||
1090 | |||
1091 | # | ||
1092 | # Hash modes | ||
1093 | # | ||
1090 | CONFIG_CRYPTO_HMAC=y | 1094 | CONFIG_CRYPTO_HMAC=y |
1091 | # CONFIG_CRYPTO_XCBC is not set | 1095 | # CONFIG_CRYPTO_XCBC is not set |
1092 | # CONFIG_CRYPTO_NULL is not set | 1096 | |
1097 | # | ||
1098 | # Digest | ||
1099 | # | ||
1100 | # CONFIG_CRYPTO_CRC32C is not set | ||
1093 | # CONFIG_CRYPTO_MD4 is not set | 1101 | # CONFIG_CRYPTO_MD4 is not set |
1094 | CONFIG_CRYPTO_MD5=y | 1102 | CONFIG_CRYPTO_MD5=y |
1103 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1095 | CONFIG_CRYPTO_SHA1=y | 1104 | CONFIG_CRYPTO_SHA1=y |
1096 | # CONFIG_CRYPTO_SHA256 is not set | 1105 | # CONFIG_CRYPTO_SHA256 is not set |
1097 | # CONFIG_CRYPTO_SHA512 is not set | 1106 | # CONFIG_CRYPTO_SHA512 is not set |
1098 | # CONFIG_CRYPTO_WP512 is not set | ||
1099 | # CONFIG_CRYPTO_TGR192 is not set | 1107 | # CONFIG_CRYPTO_TGR192 is not set |
1100 | # CONFIG_CRYPTO_GF128MUL is not set | 1108 | # CONFIG_CRYPTO_WP512 is not set |
1101 | CONFIG_CRYPTO_ECB=m | 1109 | |
1102 | CONFIG_CRYPTO_CBC=y | 1110 | # |
1103 | CONFIG_CRYPTO_PCBC=m | 1111 | # Ciphers |
1104 | # CONFIG_CRYPTO_LRW is not set | 1112 | # |
1105 | # CONFIG_CRYPTO_XTS is not set | ||
1106 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1107 | CONFIG_CRYPTO_DES=y | ||
1108 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1109 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1110 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1111 | # CONFIG_CRYPTO_SERPENT is not set | ||
1112 | # CONFIG_CRYPTO_AES is not set | 1113 | # CONFIG_CRYPTO_AES is not set |
1114 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1115 | CONFIG_CRYPTO_ARC4=m | ||
1116 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1117 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1113 | # CONFIG_CRYPTO_CAST5 is not set | 1118 | # CONFIG_CRYPTO_CAST5 is not set |
1114 | # CONFIG_CRYPTO_CAST6 is not set | 1119 | # CONFIG_CRYPTO_CAST6 is not set |
1115 | # CONFIG_CRYPTO_TEA is not set | 1120 | CONFIG_CRYPTO_DES=y |
1116 | CONFIG_CRYPTO_ARC4=m | 1121 | # CONFIG_CRYPTO_FCRYPT is not set |
1117 | # CONFIG_CRYPTO_KHAZAD is not set | 1122 | # CONFIG_CRYPTO_KHAZAD is not set |
1118 | # CONFIG_CRYPTO_ANUBIS is not set | 1123 | # CONFIG_CRYPTO_SALSA20 is not set |
1119 | # CONFIG_CRYPTO_SEED is not set | 1124 | # CONFIG_CRYPTO_SEED is not set |
1125 | # CONFIG_CRYPTO_SERPENT is not set | ||
1126 | # CONFIG_CRYPTO_TEA is not set | ||
1127 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1128 | |||
1129 | # | ||
1130 | # Compression | ||
1131 | # | ||
1120 | CONFIG_CRYPTO_DEFLATE=y | 1132 | CONFIG_CRYPTO_DEFLATE=y |
1121 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1133 | # CONFIG_CRYPTO_LZO is not set |
1122 | # CONFIG_CRYPTO_CRC32C is not set | ||
1123 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1124 | # CONFIG_CRYPTO_TEST is not set | ||
1125 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1126 | CONFIG_CRYPTO_HW=y | 1134 | CONFIG_CRYPTO_HW=y |
1127 | 1135 | ||
1128 | # | 1136 | # |
1129 | # Library routines | 1137 | # Library routines |
1130 | # | 1138 | # |
1131 | CONFIG_BITREVERSE=y | 1139 | CONFIG_BITREVERSE=y |
1140 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1141 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1132 | CONFIG_CRC_CCITT=m | 1142 | CONFIG_CRC_CCITT=m |
1133 | # CONFIG_CRC16 is not set | 1143 | # CONFIG_CRC16 is not set |
1134 | CONFIG_CRC_ITU_T=m | 1144 | CONFIG_CRC_ITU_T=m |
@@ -1137,10 +1147,6 @@ CONFIG_CRC7=m | |||
1137 | # CONFIG_LIBCRC32C is not set | 1147 | # CONFIG_LIBCRC32C is not set |
1138 | CONFIG_ZLIB_INFLATE=y | 1148 | CONFIG_ZLIB_INFLATE=y |
1139 | CONFIG_ZLIB_DEFLATE=y | 1149 | CONFIG_ZLIB_DEFLATE=y |
1140 | CONFIG_TEXTSEARCH=y | ||
1141 | CONFIG_TEXTSEARCH_KMP=m | ||
1142 | CONFIG_TEXTSEARCH_BM=m | ||
1143 | CONFIG_TEXTSEARCH_FSM=m | ||
1144 | CONFIG_PLIST=y | 1150 | CONFIG_PLIST=y |
1145 | CONFIG_HAS_IOMEM=y | 1151 | CONFIG_HAS_IOMEM=y |
1146 | CONFIG_HAS_IOPORT=y | 1152 | CONFIG_HAS_IOPORT=y |
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig index 2fb2ede5f2b4..c6d02eac8791 100644 --- a/arch/avr32/configs/atstk1002_defconfig +++ b/arch/avr32/configs/atstk1002_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-rc7 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Wed Jan 9 23:07:43 2008 | 4 | # Mon May 26 13:30:20 2008 |
5 | # | 5 | # |
6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
@@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y | |||
13 | CONFIG_GENERIC_IRQ_PROBE=y | 13 | CONFIG_GENERIC_IRQ_PROBE=y |
14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
15 | CONFIG_GENERIC_TIME=y | 15 | CONFIG_GENERIC_TIME=y |
16 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
16 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 17 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
17 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
19 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
20 | CONFIG_GENERIC_HWEIGHT=y | 20 | CONFIG_GENERIC_HWEIGHT=y |
21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
22 | CONFIG_GENERIC_BUG=y | 22 | CONFIG_GENERIC_BUG=y |
@@ -36,15 +36,15 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
36 | CONFIG_POSIX_MQUEUE=y | 36 | CONFIG_POSIX_MQUEUE=y |
37 | # CONFIG_BSD_PROCESS_ACCT is not set | 37 | # CONFIG_BSD_PROCESS_ACCT is not set |
38 | # CONFIG_TASKSTATS is not set | 38 | # CONFIG_TASKSTATS is not set |
39 | # CONFIG_USER_NS is not set | ||
40 | # CONFIG_PID_NS is not set | ||
41 | # CONFIG_AUDIT is not set | 39 | # CONFIG_AUDIT is not set |
42 | # CONFIG_IKCONFIG is not set | 40 | # CONFIG_IKCONFIG is not set |
43 | CONFIG_LOG_BUF_SHIFT=14 | 41 | CONFIG_LOG_BUF_SHIFT=14 |
44 | # CONFIG_CGROUPS is not set | 42 | # CONFIG_CGROUPS is not set |
45 | # CONFIG_FAIR_GROUP_SCHED is not set | 43 | # CONFIG_GROUP_SCHED is not set |
46 | CONFIG_SYSFS_DEPRECATED=y | 44 | CONFIG_SYSFS_DEPRECATED=y |
45 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
47 | CONFIG_RELAY=y | 46 | CONFIG_RELAY=y |
47 | # CONFIG_NAMESPACES is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | 48 | CONFIG_BLK_DEV_INITRD=y |
49 | CONFIG_INITRAMFS_SOURCE="" | 49 | CONFIG_INITRAMFS_SOURCE="" |
50 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 50 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -58,11 +58,13 @@ CONFIG_HOTPLUG=y | |||
58 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
59 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
60 | CONFIG_ELF_CORE=y | 60 | CONFIG_ELF_CORE=y |
61 | # CONFIG_COMPAT_BRK is not set | ||
61 | # CONFIG_BASE_FULL is not set | 62 | # CONFIG_BASE_FULL is not set |
62 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
63 | CONFIG_ANON_INODES=y | 64 | CONFIG_ANON_INODES=y |
64 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
65 | CONFIG_SIGNALFD=y | 66 | CONFIG_SIGNALFD=y |
67 | CONFIG_TIMERFD=y | ||
66 | CONFIG_EVENTFD=y | 68 | CONFIG_EVENTFD=y |
67 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
68 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
@@ -70,11 +72,21 @@ CONFIG_SLUB_DEBUG=y | |||
70 | # CONFIG_SLAB is not set | 72 | # CONFIG_SLAB is not set |
71 | CONFIG_SLUB=y | 73 | CONFIG_SLUB=y |
72 | # CONFIG_SLOB is not set | 74 | # CONFIG_SLOB is not set |
75 | CONFIG_PROFILING=y | ||
76 | # CONFIG_MARKERS is not set | ||
77 | CONFIG_OPROFILE=m | ||
78 | CONFIG_HAVE_OPROFILE=y | ||
79 | CONFIG_KPROBES=y | ||
80 | CONFIG_HAVE_KPROBES=y | ||
81 | # CONFIG_HAVE_KRETPROBES is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | CONFIG_PROC_PAGE_MONITOR=y | ||
73 | CONFIG_SLABINFO=y | 84 | CONFIG_SLABINFO=y |
74 | CONFIG_RT_MUTEXES=y | 85 | CONFIG_RT_MUTEXES=y |
75 | # CONFIG_TINY_SHMEM is not set | 86 | # CONFIG_TINY_SHMEM is not set |
76 | CONFIG_BASE_SMALL=1 | 87 | CONFIG_BASE_SMALL=1 |
77 | CONFIG_MODULES=y | 88 | CONFIG_MODULES=y |
89 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
78 | CONFIG_MODULE_UNLOAD=y | 90 | CONFIG_MODULE_UNLOAD=y |
79 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 91 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
80 | # CONFIG_MODVERSIONS is not set | 92 | # CONFIG_MODVERSIONS is not set |
@@ -98,10 +110,15 @@ CONFIG_IOSCHED_CFQ=y | |||
98 | CONFIG_DEFAULT_CFQ=y | 110 | CONFIG_DEFAULT_CFQ=y |
99 | # CONFIG_DEFAULT_NOOP is not set | 111 | # CONFIG_DEFAULT_NOOP is not set |
100 | CONFIG_DEFAULT_IOSCHED="cfq" | 112 | CONFIG_DEFAULT_IOSCHED="cfq" |
113 | CONFIG_CLASSIC_RCU=y | ||
101 | 114 | ||
102 | # | 115 | # |
103 | # System Type and features | 116 | # System Type and features |
104 | # | 117 | # |
118 | CONFIG_TICK_ONESHOT=y | ||
119 | CONFIG_NO_HZ=y | ||
120 | CONFIG_HIGH_RES_TIMERS=y | ||
121 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
105 | CONFIG_SUBARCH_AVR32B=y | 122 | CONFIG_SUBARCH_AVR32B=y |
106 | CONFIG_MMU=y | 123 | CONFIG_MMU=y |
107 | CONFIG_PERFORMANCE_COUNTERS=y | 124 | CONFIG_PERFORMANCE_COUNTERS=y |
@@ -147,16 +164,19 @@ CONFIG_FLATMEM=y | |||
147 | CONFIG_FLAT_NODE_MEM_MAP=y | 164 | CONFIG_FLAT_NODE_MEM_MAP=y |
148 | # CONFIG_SPARSEMEM_STATIC is not set | 165 | # CONFIG_SPARSEMEM_STATIC is not set |
149 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 166 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
167 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 168 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
151 | # CONFIG_RESOURCES_64BIT is not set | 169 | # CONFIG_RESOURCES_64BIT is not set |
152 | CONFIG_ZONE_DMA_FLAG=0 | 170 | CONFIG_ZONE_DMA_FLAG=0 |
153 | CONFIG_VIRT_TO_BUS=y | 171 | CONFIG_VIRT_TO_BUS=y |
154 | # CONFIG_OWNERSHIP_TRACE is not set | 172 | # CONFIG_OWNERSHIP_TRACE is not set |
173 | CONFIG_NMI_DEBUGGING=y | ||
155 | # CONFIG_HZ_100 is not set | 174 | # CONFIG_HZ_100 is not set |
156 | CONFIG_HZ_250=y | 175 | CONFIG_HZ_250=y |
157 | # CONFIG_HZ_300 is not set | 176 | # CONFIG_HZ_300 is not set |
158 | # CONFIG_HZ_1000 is not set | 177 | # CONFIG_HZ_1000 is not set |
159 | CONFIG_HZ=250 | 178 | CONFIG_HZ=250 |
179 | # CONFIG_SCHED_HRTICK is not set | ||
160 | CONFIG_CMDLINE="" | 180 | CONFIG_CMDLINE="" |
161 | 181 | ||
162 | # | 182 | # |
@@ -170,9 +190,10 @@ CONFIG_CPU_FREQ=y | |||
170 | CONFIG_CPU_FREQ_TABLE=y | 190 | CONFIG_CPU_FREQ_TABLE=y |
171 | # CONFIG_CPU_FREQ_DEBUG is not set | 191 | # CONFIG_CPU_FREQ_DEBUG is not set |
172 | # CONFIG_CPU_FREQ_STAT is not set | 192 | # CONFIG_CPU_FREQ_STAT is not set |
173 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 193 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
194 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
174 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
175 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 196 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
176 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 197 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
177 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 198 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
178 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 199 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
@@ -208,6 +229,7 @@ CONFIG_XFRM=y | |||
208 | CONFIG_XFRM_USER=m | 229 | CONFIG_XFRM_USER=m |
209 | # CONFIG_XFRM_SUB_POLICY is not set | 230 | # CONFIG_XFRM_SUB_POLICY is not set |
210 | # CONFIG_XFRM_MIGRATE is not set | 231 | # CONFIG_XFRM_MIGRATE is not set |
232 | # CONFIG_XFRM_STATISTICS is not set | ||
211 | CONFIG_NET_KEY=m | 233 | CONFIG_NET_KEY=m |
212 | # CONFIG_NET_KEY_MIGRATE is not set | 234 | # CONFIG_NET_KEY_MIGRATE is not set |
213 | CONFIG_INET=y | 235 | CONFIG_INET=y |
@@ -252,8 +274,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
252 | CONFIG_INET6_XFRM_MODE_BEET=m | 274 | CONFIG_INET6_XFRM_MODE_BEET=m |
253 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 275 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
254 | CONFIG_IPV6_SIT=m | 276 | CONFIG_IPV6_SIT=m |
277 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
255 | CONFIG_IPV6_TUNNEL=m | 278 | CONFIG_IPV6_TUNNEL=m |
256 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 279 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
280 | # CONFIG_IPV6_MROUTE is not set | ||
257 | # CONFIG_NETWORK_SECMARK is not set | 281 | # CONFIG_NETWORK_SECMARK is not set |
258 | # CONFIG_NETFILTER is not set | 282 | # CONFIG_NETFILTER is not set |
259 | # CONFIG_IP_DCCP is not set | 283 | # CONFIG_IP_DCCP is not set |
@@ -279,6 +303,7 @@ CONFIG_LLC=m | |||
279 | # CONFIG_NET_PKTGEN is not set | 303 | # CONFIG_NET_PKTGEN is not set |
280 | # CONFIG_NET_TCPPROBE is not set | 304 | # CONFIG_NET_TCPPROBE is not set |
281 | # CONFIG_HAMRADIO is not set | 305 | # CONFIG_HAMRADIO is not set |
306 | # CONFIG_CAN is not set | ||
282 | # CONFIG_IRDA is not set | 307 | # CONFIG_IRDA is not set |
283 | # CONFIG_BT is not set | 308 | # CONFIG_BT is not set |
284 | # CONFIG_AF_RXRPC is not set | 309 | # CONFIG_AF_RXRPC is not set |
@@ -314,6 +339,7 @@ CONFIG_MTD=y | |||
314 | CONFIG_MTD_PARTITIONS=y | 339 | CONFIG_MTD_PARTITIONS=y |
315 | # CONFIG_MTD_REDBOOT_PARTS is not set | 340 | # CONFIG_MTD_REDBOOT_PARTS is not set |
316 | CONFIG_MTD_CMDLINE_PARTS=y | 341 | CONFIG_MTD_CMDLINE_PARTS=y |
342 | # CONFIG_MTD_AR7_PARTS is not set | ||
317 | 343 | ||
318 | # | 344 | # |
319 | # User Modules And Translation Layers | 345 | # User Modules And Translation Layers |
@@ -368,6 +394,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
368 | # | 394 | # |
369 | CONFIG_MTD_DATAFLASH=m | 395 | CONFIG_MTD_DATAFLASH=m |
370 | CONFIG_MTD_M25P80=m | 396 | CONFIG_MTD_M25P80=m |
397 | CONFIG_M25PXX_USE_FAST_READ=y | ||
371 | # CONFIG_MTD_SLRAM is not set | 398 | # CONFIG_MTD_SLRAM is not set |
372 | # CONFIG_MTD_PHRAM is not set | 399 | # CONFIG_MTD_PHRAM is not set |
373 | # CONFIG_MTD_MTDRAM is not set | 400 | # CONFIG_MTD_MTDRAM is not set |
@@ -395,13 +422,18 @@ CONFIG_BLK_DEV_NBD=m | |||
395 | CONFIG_BLK_DEV_RAM=m | 422 | CONFIG_BLK_DEV_RAM=m |
396 | CONFIG_BLK_DEV_RAM_COUNT=16 | 423 | CONFIG_BLK_DEV_RAM_COUNT=16 |
397 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 424 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
398 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 425 | # CONFIG_BLK_DEV_XIP is not set |
399 | # CONFIG_CDROM_PKTCDVD is not set | 426 | # CONFIG_CDROM_PKTCDVD is not set |
400 | # CONFIG_ATA_OVER_ETH is not set | 427 | # CONFIG_ATA_OVER_ETH is not set |
401 | CONFIG_MISC_DEVICES=y | 428 | CONFIG_MISC_DEVICES=y |
429 | CONFIG_ATMEL_PWM=m | ||
430 | CONFIG_ATMEL_TCLIB=y | ||
431 | CONFIG_ATMEL_TCB_CLKSRC=y | ||
432 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | ||
402 | # CONFIG_EEPROM_93CX6 is not set | 433 | # CONFIG_EEPROM_93CX6 is not set |
403 | CONFIG_ATMEL_SSC=m | 434 | CONFIG_ATMEL_SSC=m |
404 | # CONFIG_IDE is not set | 435 | # CONFIG_ENCLOSURE_SERVICES is not set |
436 | # CONFIG_HAVE_IDE is not set | ||
405 | 437 | ||
406 | # | 438 | # |
407 | # SCSI device support | 439 | # SCSI device support |
@@ -444,6 +476,9 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
444 | # CONFIG_SCSI_LOWLEVEL is not set | 476 | # CONFIG_SCSI_LOWLEVEL is not set |
445 | CONFIG_ATA=m | 477 | CONFIG_ATA=m |
446 | # CONFIG_ATA_NONSTANDARD is not set | 478 | # CONFIG_ATA_NONSTANDARD is not set |
479 | # CONFIG_SATA_PMP is not set | ||
480 | CONFIG_ATA_SFF=y | ||
481 | # CONFIG_SATA_MV is not set | ||
447 | CONFIG_PATA_AT32=m | 482 | CONFIG_PATA_AT32=m |
448 | # CONFIG_PATA_PLATFORM is not set | 483 | # CONFIG_PATA_PLATFORM is not set |
449 | # CONFIG_MD is not set | 484 | # CONFIG_MD is not set |
@@ -469,11 +504,13 @@ CONFIG_PHYLIB=y | |||
469 | # CONFIG_SMSC_PHY is not set | 504 | # CONFIG_SMSC_PHY is not set |
470 | # CONFIG_BROADCOM_PHY is not set | 505 | # CONFIG_BROADCOM_PHY is not set |
471 | # CONFIG_ICPLUS_PHY is not set | 506 | # CONFIG_ICPLUS_PHY is not set |
507 | # CONFIG_REALTEK_PHY is not set | ||
472 | # CONFIG_FIXED_PHY is not set | 508 | # CONFIG_FIXED_PHY is not set |
473 | # CONFIG_MDIO_BITBANG is not set | 509 | # CONFIG_MDIO_BITBANG is not set |
474 | CONFIG_NET_ETHERNET=y | 510 | CONFIG_NET_ETHERNET=y |
475 | # CONFIG_MII is not set | 511 | # CONFIG_MII is not set |
476 | CONFIG_MACB=y | 512 | CONFIG_MACB=y |
513 | # CONFIG_ENC28J60 is not set | ||
477 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 514 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
478 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 515 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
479 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 516 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
@@ -487,6 +524,7 @@ CONFIG_MACB=y | |||
487 | # | 524 | # |
488 | # CONFIG_WLAN_PRE80211 is not set | 525 | # CONFIG_WLAN_PRE80211 is not set |
489 | # CONFIG_WLAN_80211 is not set | 526 | # CONFIG_WLAN_80211 is not set |
527 | # CONFIG_IWLWIFI_LEDS is not set | ||
490 | # CONFIG_WAN is not set | 528 | # CONFIG_WAN is not set |
491 | CONFIG_PPP=m | 529 | CONFIG_PPP=m |
492 | # CONFIG_PPP_MULTILINK is not set | 530 | # CONFIG_PPP_MULTILINK is not set |
@@ -500,7 +538,6 @@ CONFIG_PPP_BSDCOMP=m | |||
500 | # CONFIG_PPPOL2TP is not set | 538 | # CONFIG_PPPOL2TP is not set |
501 | # CONFIG_SLIP is not set | 539 | # CONFIG_SLIP is not set |
502 | CONFIG_SLHC=m | 540 | CONFIG_SLHC=m |
503 | # CONFIG_SHAPER is not set | ||
504 | # CONFIG_NETCONSOLE is not set | 541 | # CONFIG_NETCONSOLE is not set |
505 | # CONFIG_NETPOLL is not set | 542 | # CONFIG_NETPOLL is not set |
506 | # CONFIG_NET_POLL_CONTROLLER is not set | 543 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -556,6 +593,7 @@ CONFIG_MOUSE_GPIO=m | |||
556 | # Character devices | 593 | # Character devices |
557 | # | 594 | # |
558 | # CONFIG_VT is not set | 595 | # CONFIG_VT is not set |
596 | # CONFIG_DEVKMEM is not set | ||
559 | # CONFIG_SERIAL_NONSTANDARD is not set | 597 | # CONFIG_SERIAL_NONSTANDARD is not set |
560 | 598 | ||
561 | # | 599 | # |
@@ -568,6 +606,7 @@ CONFIG_MOUSE_GPIO=m | |||
568 | # | 606 | # |
569 | CONFIG_SERIAL_ATMEL=y | 607 | CONFIG_SERIAL_ATMEL=y |
570 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 608 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
609 | CONFIG_SERIAL_ATMEL_PDC=y | ||
571 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | 610 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
572 | CONFIG_SERIAL_CORE=y | 611 | CONFIG_SERIAL_CORE=y |
573 | CONFIG_SERIAL_CORE_CONSOLE=y | 612 | CONFIG_SERIAL_CORE_CONSOLE=y |
@@ -575,21 +614,13 @@ CONFIG_UNIX98_PTYS=y | |||
575 | # CONFIG_LEGACY_PTYS is not set | 614 | # CONFIG_LEGACY_PTYS is not set |
576 | # CONFIG_IPMI_HANDLER is not set | 615 | # CONFIG_IPMI_HANDLER is not set |
577 | # CONFIG_HW_RANDOM is not set | 616 | # CONFIG_HW_RANDOM is not set |
578 | # CONFIG_RTC is not set | ||
579 | # CONFIG_GEN_RTC is not set | ||
580 | # CONFIG_R3964 is not set | 617 | # CONFIG_R3964 is not set |
581 | # CONFIG_RAW_DRIVER is not set | 618 | # CONFIG_RAW_DRIVER is not set |
582 | # CONFIG_TCG_TPM is not set | 619 | # CONFIG_TCG_TPM is not set |
583 | CONFIG_I2C=m | 620 | CONFIG_I2C=m |
584 | CONFIG_I2C_BOARDINFO=y | 621 | CONFIG_I2C_BOARDINFO=y |
585 | CONFIG_I2C_CHARDEV=m | 622 | CONFIG_I2C_CHARDEV=m |
586 | |||
587 | # | ||
588 | # I2C Algorithms | ||
589 | # | ||
590 | CONFIG_I2C_ALGOBIT=m | 623 | CONFIG_I2C_ALGOBIT=m |
591 | # CONFIG_I2C_ALGOPCF is not set | ||
592 | # CONFIG_I2C_ALGOPCA is not set | ||
593 | 624 | ||
594 | # | 625 | # |
595 | # I2C Hardware Bus support | 626 | # I2C Hardware Bus support |
@@ -600,27 +631,23 @@ CONFIG_I2C_GPIO=m | |||
600 | # CONFIG_I2C_SIMTEC is not set | 631 | # CONFIG_I2C_SIMTEC is not set |
601 | # CONFIG_I2C_TAOS_EVM is not set | 632 | # CONFIG_I2C_TAOS_EVM is not set |
602 | # CONFIG_I2C_STUB is not set | 633 | # CONFIG_I2C_STUB is not set |
634 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
603 | 635 | ||
604 | # | 636 | # |
605 | # Miscellaneous I2C Chip support | 637 | # Miscellaneous I2C Chip support |
606 | # | 638 | # |
607 | # CONFIG_SENSORS_DS1337 is not set | ||
608 | # CONFIG_SENSORS_DS1374 is not set | ||
609 | # CONFIG_DS1682 is not set | 639 | # CONFIG_DS1682 is not set |
610 | # CONFIG_SENSORS_EEPROM is not set | 640 | # CONFIG_SENSORS_EEPROM is not set |
611 | # CONFIG_SENSORS_PCF8574 is not set | 641 | # CONFIG_SENSORS_PCF8574 is not set |
612 | # CONFIG_SENSORS_PCA9539 is not set | 642 | # CONFIG_PCF8575 is not set |
613 | # CONFIG_SENSORS_PCF8591 is not set | 643 | # CONFIG_SENSORS_PCF8591 is not set |
644 | # CONFIG_TPS65010 is not set | ||
614 | # CONFIG_SENSORS_MAX6875 is not set | 645 | # CONFIG_SENSORS_MAX6875 is not set |
615 | # CONFIG_SENSORS_TSL2550 is not set | 646 | # CONFIG_SENSORS_TSL2550 is not set |
616 | # CONFIG_I2C_DEBUG_CORE is not set | 647 | # CONFIG_I2C_DEBUG_CORE is not set |
617 | # CONFIG_I2C_DEBUG_ALGO is not set | 648 | # CONFIG_I2C_DEBUG_ALGO is not set |
618 | # CONFIG_I2C_DEBUG_BUS is not set | 649 | # CONFIG_I2C_DEBUG_BUS is not set |
619 | # CONFIG_I2C_DEBUG_CHIP is not set | 650 | # CONFIG_I2C_DEBUG_CHIP is not set |
620 | |||
621 | # | ||
622 | # SPI support | ||
623 | # | ||
624 | CONFIG_SPI=y | 651 | CONFIG_SPI=y |
625 | # CONFIG_SPI_DEBUG is not set | 652 | # CONFIG_SPI_DEBUG is not set |
626 | CONFIG_SPI_MASTER=y | 653 | CONFIG_SPI_MASTER=y |
@@ -637,9 +664,27 @@ CONFIG_SPI_ATMEL=y | |||
637 | # CONFIG_SPI_AT25 is not set | 664 | # CONFIG_SPI_AT25 is not set |
638 | CONFIG_SPI_SPIDEV=m | 665 | CONFIG_SPI_SPIDEV=m |
639 | # CONFIG_SPI_TLE62X0 is not set | 666 | # CONFIG_SPI_TLE62X0 is not set |
667 | CONFIG_HAVE_GPIO_LIB=y | ||
668 | |||
669 | # | ||
670 | # GPIO Support | ||
671 | # | ||
672 | # CONFIG_DEBUG_GPIO is not set | ||
673 | |||
674 | # | ||
675 | # I2C GPIO expanders: | ||
676 | # | ||
677 | # CONFIG_GPIO_PCA953X is not set | ||
678 | # CONFIG_GPIO_PCF857X is not set | ||
679 | |||
680 | # | ||
681 | # SPI GPIO expanders: | ||
682 | # | ||
683 | # CONFIG_GPIO_MCP23S08 is not set | ||
640 | # CONFIG_W1 is not set | 684 | # CONFIG_W1 is not set |
641 | # CONFIG_POWER_SUPPLY is not set | 685 | # CONFIG_POWER_SUPPLY is not set |
642 | # CONFIG_HWMON is not set | 686 | # CONFIG_HWMON is not set |
687 | # CONFIG_THERMAL is not set | ||
643 | CONFIG_WATCHDOG=y | 688 | CONFIG_WATCHDOG=y |
644 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 689 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
645 | 690 | ||
@@ -659,12 +704,22 @@ CONFIG_SSB_POSSIBLE=y | |||
659 | # Multifunction device drivers | 704 | # Multifunction device drivers |
660 | # | 705 | # |
661 | # CONFIG_MFD_SM501 is not set | 706 | # CONFIG_MFD_SM501 is not set |
707 | # CONFIG_HTC_PASIC3 is not set | ||
662 | 708 | ||
663 | # | 709 | # |
664 | # Multimedia devices | 710 | # Multimedia devices |
665 | # | 711 | # |
712 | |||
713 | # | ||
714 | # Multimedia core support | ||
715 | # | ||
666 | # CONFIG_VIDEO_DEV is not set | 716 | # CONFIG_VIDEO_DEV is not set |
667 | # CONFIG_DVB_CORE is not set | 717 | # CONFIG_DVB_CORE is not set |
718 | # CONFIG_VIDEO_MEDIA is not set | ||
719 | |||
720 | # | ||
721 | # Multimedia drivers | ||
722 | # | ||
668 | # CONFIG_DAB is not set | 723 | # CONFIG_DAB is not set |
669 | 724 | ||
670 | # | 725 | # |
@@ -682,8 +737,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
682 | # CONFIG_FB_SYS_FILLRECT is not set | 737 | # CONFIG_FB_SYS_FILLRECT is not set |
683 | # CONFIG_FB_SYS_COPYAREA is not set | 738 | # CONFIG_FB_SYS_COPYAREA is not set |
684 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 739 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
740 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
685 | # CONFIG_FB_SYS_FOPS is not set | 741 | # CONFIG_FB_SYS_FOPS is not set |
686 | CONFIG_FB_DEFERRED_IO=y | ||
687 | # CONFIG_FB_SVGALIB is not set | 742 | # CONFIG_FB_SVGALIB is not set |
688 | # CONFIG_FB_MACMODES is not set | 743 | # CONFIG_FB_MACMODES is not set |
689 | # CONFIG_FB_BACKLIGHT is not set | 744 | # CONFIG_FB_BACKLIGHT is not set |
@@ -749,7 +804,11 @@ CONFIG_SND_AT73C213_TARGET_BITRATE=48000 | |||
749 | # CONFIG_SND_SOC is not set | 804 | # CONFIG_SND_SOC is not set |
750 | 805 | ||
751 | # | 806 | # |
752 | # SoC Audio support for SuperH | 807 | # ALSA SoC audio for Freescale SOCs |
808 | # | ||
809 | |||
810 | # | ||
811 | # SoC Audio for the Texas Instruments OMAP | ||
753 | # | 812 | # |
754 | 813 | ||
755 | # | 814 | # |
@@ -761,14 +820,12 @@ CONFIG_USB_SUPPORT=y | |||
761 | # CONFIG_USB_ARCH_HAS_HCD is not set | 820 | # CONFIG_USB_ARCH_HAS_HCD is not set |
762 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 821 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
763 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 822 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
823 | # CONFIG_USB_OTG_WHITELIST is not set | ||
824 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
764 | 825 | ||
765 | # | 826 | # |
766 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 827 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
767 | # | 828 | # |
768 | |||
769 | # | ||
770 | # USB Gadget Support | ||
771 | # | ||
772 | CONFIG_USB_GADGET=y | 829 | CONFIG_USB_GADGET=y |
773 | # CONFIG_USB_GADGET_DEBUG is not set | 830 | # CONFIG_USB_GADGET_DEBUG is not set |
774 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 831 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
@@ -781,6 +838,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
781 | # CONFIG_USB_GADGET_NET2280 is not set | 838 | # CONFIG_USB_GADGET_NET2280 is not set |
782 | # CONFIG_USB_GADGET_PXA2XX is not set | 839 | # CONFIG_USB_GADGET_PXA2XX is not set |
783 | # CONFIG_USB_GADGET_M66592 is not set | 840 | # CONFIG_USB_GADGET_M66592 is not set |
841 | # CONFIG_USB_GADGET_PXA27X is not set | ||
784 | # CONFIG_USB_GADGET_GOKU is not set | 842 | # CONFIG_USB_GADGET_GOKU is not set |
785 | # CONFIG_USB_GADGET_LH7A40X is not set | 843 | # CONFIG_USB_GADGET_LH7A40X is not set |
786 | # CONFIG_USB_GADGET_OMAP is not set | 844 | # CONFIG_USB_GADGET_OMAP is not set |
@@ -796,6 +854,7 @@ CONFIG_USB_FILE_STORAGE=m | |||
796 | # CONFIG_USB_FILE_STORAGE_TEST is not set | 854 | # CONFIG_USB_FILE_STORAGE_TEST is not set |
797 | CONFIG_USB_G_SERIAL=m | 855 | CONFIG_USB_G_SERIAL=m |
798 | # CONFIG_USB_MIDI_GADGET is not set | 856 | # CONFIG_USB_MIDI_GADGET is not set |
857 | # CONFIG_USB_G_PRINTER is not set | ||
799 | CONFIG_MMC=m | 858 | CONFIG_MMC=m |
800 | # CONFIG_MMC_DEBUG is not set | 859 | # CONFIG_MMC_DEBUG is not set |
801 | # CONFIG_MMC_UNSAFE_RESUME is not set | 860 | # CONFIG_MMC_UNSAFE_RESUME is not set |
@@ -806,17 +865,20 @@ CONFIG_MMC=m | |||
806 | CONFIG_MMC_BLOCK=m | 865 | CONFIG_MMC_BLOCK=m |
807 | CONFIG_MMC_BLOCK_BOUNCE=y | 866 | CONFIG_MMC_BLOCK_BOUNCE=y |
808 | # CONFIG_SDIO_UART is not set | 867 | # CONFIG_SDIO_UART is not set |
868 | CONFIG_MMC_TEST=m | ||
809 | 869 | ||
810 | # | 870 | # |
811 | # MMC/SD Host Controller Drivers | 871 | # MMC/SD Host Controller Drivers |
812 | # | 872 | # |
813 | CONFIG_MMC_SPI=m | 873 | CONFIG_MMC_SPI=m |
874 | # CONFIG_MEMSTICK is not set | ||
814 | CONFIG_NEW_LEDS=y | 875 | CONFIG_NEW_LEDS=y |
815 | CONFIG_LEDS_CLASS=m | 876 | CONFIG_LEDS_CLASS=m |
816 | 877 | ||
817 | # | 878 | # |
818 | # LED drivers | 879 | # LED drivers |
819 | # | 880 | # |
881 | CONFIG_LEDS_ATMEL_PWM=m | ||
820 | CONFIG_LEDS_GPIO=m | 882 | CONFIG_LEDS_GPIO=m |
821 | 883 | ||
822 | # | 884 | # |
@@ -825,6 +887,8 @@ CONFIG_LEDS_GPIO=m | |||
825 | CONFIG_LEDS_TRIGGERS=y | 887 | CONFIG_LEDS_TRIGGERS=y |
826 | CONFIG_LEDS_TRIGGER_TIMER=m | 888 | CONFIG_LEDS_TRIGGER_TIMER=m |
827 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 889 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
890 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | ||
891 | # CONFIG_ACCESSIBILITY is not set | ||
828 | CONFIG_RTC_LIB=y | 892 | CONFIG_RTC_LIB=y |
829 | CONFIG_RTC_CLASS=y | 893 | CONFIG_RTC_CLASS=y |
830 | CONFIG_RTC_HCTOSYS=y | 894 | CONFIG_RTC_HCTOSYS=y |
@@ -853,19 +917,22 @@ CONFIG_RTC_INTF_DEV=y | |||
853 | # CONFIG_RTC_DRV_PCF8563 is not set | 917 | # CONFIG_RTC_DRV_PCF8563 is not set |
854 | # CONFIG_RTC_DRV_PCF8583 is not set | 918 | # CONFIG_RTC_DRV_PCF8583 is not set |
855 | # CONFIG_RTC_DRV_M41T80 is not set | 919 | # CONFIG_RTC_DRV_M41T80 is not set |
920 | # CONFIG_RTC_DRV_S35390A is not set | ||
856 | 921 | ||
857 | # | 922 | # |
858 | # SPI RTC drivers | 923 | # SPI RTC drivers |
859 | # | 924 | # |
860 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
861 | # CONFIG_RTC_DRV_MAX6902 is not set | 925 | # CONFIG_RTC_DRV_MAX6902 is not set |
926 | # CONFIG_RTC_DRV_R9701 is not set | ||
927 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
862 | 928 | ||
863 | # | 929 | # |
864 | # Platform RTC drivers | 930 | # Platform RTC drivers |
865 | # | 931 | # |
932 | # CONFIG_RTC_DRV_DS1511 is not set | ||
866 | # CONFIG_RTC_DRV_DS1553 is not set | 933 | # CONFIG_RTC_DRV_DS1553 is not set |
867 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
868 | # CONFIG_RTC_DRV_DS1742 is not set | 934 | # CONFIG_RTC_DRV_DS1742 is not set |
935 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
869 | # CONFIG_RTC_DRV_M48T86 is not set | 936 | # CONFIG_RTC_DRV_M48T86 is not set |
870 | # CONFIG_RTC_DRV_M48T59 is not set | 937 | # CONFIG_RTC_DRV_M48T59 is not set |
871 | # CONFIG_RTC_DRV_V3020 is not set | 938 | # CONFIG_RTC_DRV_V3020 is not set |
@@ -874,10 +941,6 @@ CONFIG_RTC_INTF_DEV=y | |||
874 | # on-CPU RTC drivers | 941 | # on-CPU RTC drivers |
875 | # | 942 | # |
876 | CONFIG_RTC_DRV_AT32AP700X=y | 943 | CONFIG_RTC_DRV_AT32AP700X=y |
877 | |||
878 | # | ||
879 | # Userspace I/O | ||
880 | # | ||
881 | # CONFIG_UIO is not set | 944 | # CONFIG_UIO is not set |
882 | 945 | ||
883 | # | 946 | # |
@@ -895,14 +958,11 @@ CONFIG_JBD=m | |||
895 | # CONFIG_JFS_FS is not set | 958 | # CONFIG_JFS_FS is not set |
896 | # CONFIG_FS_POSIX_ACL is not set | 959 | # CONFIG_FS_POSIX_ACL is not set |
897 | # CONFIG_XFS_FS is not set | 960 | # CONFIG_XFS_FS is not set |
898 | # CONFIG_GFS2_FS is not set | ||
899 | # CONFIG_OCFS2_FS is not set | 961 | # CONFIG_OCFS2_FS is not set |
900 | CONFIG_MINIX_FS=m | 962 | # CONFIG_DNOTIFY is not set |
901 | # CONFIG_ROMFS_FS is not set | ||
902 | CONFIG_INOTIFY=y | 963 | CONFIG_INOTIFY=y |
903 | CONFIG_INOTIFY_USER=y | 964 | CONFIG_INOTIFY_USER=y |
904 | # CONFIG_QUOTA is not set | 965 | # CONFIG_QUOTA is not set |
905 | # CONFIG_DNOTIFY is not set | ||
906 | # CONFIG_AUTOFS_FS is not set | 966 | # CONFIG_AUTOFS_FS is not set |
907 | # CONFIG_AUTOFS4_FS is not set | 967 | # CONFIG_AUTOFS4_FS is not set |
908 | CONFIG_FUSE_FS=m | 968 | CONFIG_FUSE_FS=m |
@@ -957,8 +1017,10 @@ CONFIG_JFFS2_RTIME=y | |||
957 | # CONFIG_JFFS2_RUBIN is not set | 1017 | # CONFIG_JFFS2_RUBIN is not set |
958 | # CONFIG_CRAMFS is not set | 1018 | # CONFIG_CRAMFS is not set |
959 | # CONFIG_VXFS_FS is not set | 1019 | # CONFIG_VXFS_FS is not set |
1020 | CONFIG_MINIX_FS=m | ||
960 | # CONFIG_HPFS_FS is not set | 1021 | # CONFIG_HPFS_FS is not set |
961 | # CONFIG_QNX4FS_FS is not set | 1022 | # CONFIG_QNX4FS_FS is not set |
1023 | # CONFIG_ROMFS_FS is not set | ||
962 | # CONFIG_SYSV_FS is not set | 1024 | # CONFIG_SYSV_FS is not set |
963 | # CONFIG_UFS_FS is not set | 1025 | # CONFIG_UFS_FS is not set |
964 | CONFIG_NETWORK_FILESYSTEMS=y | 1026 | CONFIG_NETWORK_FILESYSTEMS=y |
@@ -966,7 +1028,6 @@ CONFIG_NFS_FS=y | |||
966 | CONFIG_NFS_V3=y | 1028 | CONFIG_NFS_V3=y |
967 | # CONFIG_NFS_V3_ACL is not set | 1029 | # CONFIG_NFS_V3_ACL is not set |
968 | # CONFIG_NFS_V4 is not set | 1030 | # CONFIG_NFS_V4 is not set |
969 | # CONFIG_NFS_DIRECTIO is not set | ||
970 | # CONFIG_NFSD is not set | 1031 | # CONFIG_NFSD is not set |
971 | CONFIG_ROOT_NFS=y | 1032 | CONFIG_ROOT_NFS=y |
972 | CONFIG_LOCKD=y | 1033 | CONFIG_LOCKD=y |
@@ -1028,11 +1089,6 @@ CONFIG_NLS_ISO8859_1=m | |||
1028 | # CONFIG_NLS_KOI8_U is not set | 1089 | # CONFIG_NLS_KOI8_U is not set |
1029 | CONFIG_NLS_UTF8=m | 1090 | CONFIG_NLS_UTF8=m |
1030 | # CONFIG_DLM is not set | 1091 | # CONFIG_DLM is not set |
1031 | CONFIG_INSTRUMENTATION=y | ||
1032 | CONFIG_PROFILING=y | ||
1033 | CONFIG_OPROFILE=m | ||
1034 | CONFIG_KPROBES=y | ||
1035 | # CONFIG_MARKERS is not set | ||
1036 | 1092 | ||
1037 | # | 1093 | # |
1038 | # Kernel hacking | 1094 | # Kernel hacking |
@@ -1040,6 +1096,7 @@ CONFIG_KPROBES=y | |||
1040 | # CONFIG_PRINTK_TIME is not set | 1096 | # CONFIG_PRINTK_TIME is not set |
1041 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1097 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1042 | CONFIG_ENABLE_MUST_CHECK=y | 1098 | CONFIG_ENABLE_MUST_CHECK=y |
1099 | CONFIG_FRAME_WARN=1024 | ||
1043 | CONFIG_MAGIC_SYSRQ=y | 1100 | CONFIG_MAGIC_SYSRQ=y |
1044 | # CONFIG_UNUSED_SYMBOLS is not set | 1101 | # CONFIG_UNUSED_SYMBOLS is not set |
1045 | CONFIG_DEBUG_FS=y | 1102 | CONFIG_DEBUG_FS=y |
@@ -1050,7 +1107,9 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1050 | CONFIG_SCHED_DEBUG=y | 1107 | CONFIG_SCHED_DEBUG=y |
1051 | # CONFIG_SCHEDSTATS is not set | 1108 | # CONFIG_SCHEDSTATS is not set |
1052 | # CONFIG_TIMER_STATS is not set | 1109 | # CONFIG_TIMER_STATS is not set |
1110 | # CONFIG_DEBUG_OBJECTS is not set | ||
1053 | # CONFIG_SLUB_DEBUG_ON is not set | 1111 | # CONFIG_SLUB_DEBUG_ON is not set |
1112 | # CONFIG_SLUB_STATS is not set | ||
1054 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1113 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1055 | # CONFIG_RT_MUTEX_TESTER is not set | 1114 | # CONFIG_RT_MUTEX_TESTER is not set |
1056 | # CONFIG_DEBUG_SPINLOCK is not set | 1115 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1064,12 +1123,14 @@ CONFIG_SCHED_DEBUG=y | |||
1064 | CONFIG_DEBUG_BUGVERBOSE=y | 1123 | CONFIG_DEBUG_BUGVERBOSE=y |
1065 | # CONFIG_DEBUG_INFO is not set | 1124 | # CONFIG_DEBUG_INFO is not set |
1066 | # CONFIG_DEBUG_VM is not set | 1125 | # CONFIG_DEBUG_VM is not set |
1126 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1067 | # CONFIG_DEBUG_LIST is not set | 1127 | # CONFIG_DEBUG_LIST is not set |
1068 | # CONFIG_DEBUG_SG is not set | 1128 | # CONFIG_DEBUG_SG is not set |
1069 | CONFIG_FRAME_POINTER=y | 1129 | CONFIG_FRAME_POINTER=y |
1070 | CONFIG_FORCED_INLINING=y | ||
1071 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1130 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1072 | # CONFIG_RCU_TORTURE_TEST is not set | 1131 | # CONFIG_RCU_TORTURE_TEST is not set |
1132 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
1133 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1073 | # CONFIG_LKDTM is not set | 1134 | # CONFIG_LKDTM is not set |
1074 | # CONFIG_FAULT_INJECTION is not set | 1135 | # CONFIG_FAULT_INJECTION is not set |
1075 | # CONFIG_SAMPLES is not set | 1136 | # CONFIG_SAMPLES is not set |
@@ -1081,52 +1142,90 @@ CONFIG_FORCED_INLINING=y | |||
1081 | # CONFIG_SECURITY is not set | 1142 | # CONFIG_SECURITY is not set |
1082 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1143 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1083 | CONFIG_CRYPTO=y | 1144 | CONFIG_CRYPTO=y |
1145 | |||
1146 | # | ||
1147 | # Crypto core or helper | ||
1148 | # | ||
1084 | CONFIG_CRYPTO_ALGAPI=m | 1149 | CONFIG_CRYPTO_ALGAPI=m |
1150 | CONFIG_CRYPTO_AEAD=m | ||
1085 | CONFIG_CRYPTO_BLKCIPHER=m | 1151 | CONFIG_CRYPTO_BLKCIPHER=m |
1086 | CONFIG_CRYPTO_HASH=m | 1152 | CONFIG_CRYPTO_HASH=m |
1087 | CONFIG_CRYPTO_MANAGER=m | 1153 | CONFIG_CRYPTO_MANAGER=m |
1154 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1155 | # CONFIG_CRYPTO_NULL is not set | ||
1156 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1157 | CONFIG_CRYPTO_AUTHENC=m | ||
1158 | # CONFIG_CRYPTO_TEST is not set | ||
1159 | |||
1160 | # | ||
1161 | # Authenticated Encryption with Associated Data | ||
1162 | # | ||
1163 | # CONFIG_CRYPTO_CCM is not set | ||
1164 | # CONFIG_CRYPTO_GCM is not set | ||
1165 | # CONFIG_CRYPTO_SEQIV is not set | ||
1166 | |||
1167 | # | ||
1168 | # Block modes | ||
1169 | # | ||
1170 | CONFIG_CRYPTO_CBC=m | ||
1171 | # CONFIG_CRYPTO_CTR is not set | ||
1172 | # CONFIG_CRYPTO_CTS is not set | ||
1173 | # CONFIG_CRYPTO_ECB is not set | ||
1174 | # CONFIG_CRYPTO_LRW is not set | ||
1175 | # CONFIG_CRYPTO_PCBC is not set | ||
1176 | # CONFIG_CRYPTO_XTS is not set | ||
1177 | |||
1178 | # | ||
1179 | # Hash modes | ||
1180 | # | ||
1088 | CONFIG_CRYPTO_HMAC=m | 1181 | CONFIG_CRYPTO_HMAC=m |
1089 | # CONFIG_CRYPTO_XCBC is not set | 1182 | # CONFIG_CRYPTO_XCBC is not set |
1090 | # CONFIG_CRYPTO_NULL is not set | 1183 | |
1184 | # | ||
1185 | # Digest | ||
1186 | # | ||
1187 | # CONFIG_CRYPTO_CRC32C is not set | ||
1091 | # CONFIG_CRYPTO_MD4 is not set | 1188 | # CONFIG_CRYPTO_MD4 is not set |
1092 | CONFIG_CRYPTO_MD5=m | 1189 | CONFIG_CRYPTO_MD5=m |
1190 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1093 | CONFIG_CRYPTO_SHA1=m | 1191 | CONFIG_CRYPTO_SHA1=m |
1094 | # CONFIG_CRYPTO_SHA256 is not set | 1192 | # CONFIG_CRYPTO_SHA256 is not set |
1095 | # CONFIG_CRYPTO_SHA512 is not set | 1193 | # CONFIG_CRYPTO_SHA512 is not set |
1096 | # CONFIG_CRYPTO_WP512 is not set | ||
1097 | # CONFIG_CRYPTO_TGR192 is not set | 1194 | # CONFIG_CRYPTO_TGR192 is not set |
1098 | # CONFIG_CRYPTO_GF128MUL is not set | 1195 | # CONFIG_CRYPTO_WP512 is not set |
1099 | # CONFIG_CRYPTO_ECB is not set | 1196 | |
1100 | CONFIG_CRYPTO_CBC=m | 1197 | # |
1101 | # CONFIG_CRYPTO_PCBC is not set | 1198 | # Ciphers |
1102 | # CONFIG_CRYPTO_LRW is not set | 1199 | # |
1103 | # CONFIG_CRYPTO_XTS is not set | ||
1104 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1105 | CONFIG_CRYPTO_DES=m | ||
1106 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1107 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1108 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1109 | # CONFIG_CRYPTO_SERPENT is not set | ||
1110 | # CONFIG_CRYPTO_AES is not set | 1200 | # CONFIG_CRYPTO_AES is not set |
1201 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1202 | # CONFIG_CRYPTO_ARC4 is not set | ||
1203 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1204 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1111 | # CONFIG_CRYPTO_CAST5 is not set | 1205 | # CONFIG_CRYPTO_CAST5 is not set |
1112 | # CONFIG_CRYPTO_CAST6 is not set | 1206 | # CONFIG_CRYPTO_CAST6 is not set |
1113 | # CONFIG_CRYPTO_TEA is not set | 1207 | CONFIG_CRYPTO_DES=m |
1114 | # CONFIG_CRYPTO_ARC4 is not set | 1208 | # CONFIG_CRYPTO_FCRYPT is not set |
1115 | # CONFIG_CRYPTO_KHAZAD is not set | 1209 | # CONFIG_CRYPTO_KHAZAD is not set |
1116 | # CONFIG_CRYPTO_ANUBIS is not set | 1210 | # CONFIG_CRYPTO_SALSA20 is not set |
1117 | # CONFIG_CRYPTO_SEED is not set | 1211 | # CONFIG_CRYPTO_SEED is not set |
1212 | # CONFIG_CRYPTO_SERPENT is not set | ||
1213 | # CONFIG_CRYPTO_TEA is not set | ||
1214 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1215 | |||
1216 | # | ||
1217 | # Compression | ||
1218 | # | ||
1118 | CONFIG_CRYPTO_DEFLATE=m | 1219 | CONFIG_CRYPTO_DEFLATE=m |
1119 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1220 | # CONFIG_CRYPTO_LZO is not set |
1120 | # CONFIG_CRYPTO_CRC32C is not set | ||
1121 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1122 | # CONFIG_CRYPTO_TEST is not set | ||
1123 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1124 | # CONFIG_CRYPTO_HW is not set | 1221 | # CONFIG_CRYPTO_HW is not set |
1125 | 1222 | ||
1126 | # | 1223 | # |
1127 | # Library routines | 1224 | # Library routines |
1128 | # | 1225 | # |
1129 | CONFIG_BITREVERSE=y | 1226 | CONFIG_BITREVERSE=y |
1227 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1228 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1130 | CONFIG_CRC_CCITT=m | 1229 | CONFIG_CRC_CCITT=m |
1131 | # CONFIG_CRC16 is not set | 1230 | # CONFIG_CRC16 is not set |
1132 | CONFIG_CRC_ITU_T=m | 1231 | CONFIG_CRC_ITU_T=m |
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig index 45e23e03f074..5a4ae6b5d28f 100644 --- a/arch/avr32/configs/atstk1003_defconfig +++ b/arch/avr32/configs/atstk1003_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-rc7 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Wed Jan 9 22:54:34 2008 | 4 | # Mon May 26 13:33:05 2008 |
5 | # | 5 | # |
6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
@@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y | |||
13 | CONFIG_GENERIC_IRQ_PROBE=y | 13 | CONFIG_GENERIC_IRQ_PROBE=y |
14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
15 | CONFIG_GENERIC_TIME=y | 15 | CONFIG_GENERIC_TIME=y |
16 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
16 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 17 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
17 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
19 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
20 | CONFIG_GENERIC_HWEIGHT=y | 20 | CONFIG_GENERIC_HWEIGHT=y |
21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
22 | CONFIG_GENERIC_BUG=y | 22 | CONFIG_GENERIC_BUG=y |
@@ -39,17 +39,15 @@ CONFIG_BSD_PROCESS_ACCT_V3=y | |||
39 | CONFIG_TASKSTATS=y | 39 | CONFIG_TASKSTATS=y |
40 | CONFIG_TASK_DELAY_ACCT=y | 40 | CONFIG_TASK_DELAY_ACCT=y |
41 | # CONFIG_TASK_XACCT is not set | 41 | # CONFIG_TASK_XACCT is not set |
42 | # CONFIG_USER_NS is not set | ||
43 | # CONFIG_PID_NS is not set | ||
44 | CONFIG_AUDIT=y | 42 | CONFIG_AUDIT=y |
45 | # CONFIG_IKCONFIG is not set | 43 | # CONFIG_IKCONFIG is not set |
46 | CONFIG_LOG_BUF_SHIFT=14 | 44 | CONFIG_LOG_BUF_SHIFT=14 |
47 | # CONFIG_CGROUPS is not set | 45 | # CONFIG_CGROUPS is not set |
48 | CONFIG_FAIR_GROUP_SCHED=y | 46 | # CONFIG_GROUP_SCHED is not set |
49 | CONFIG_FAIR_USER_SCHED=y | ||
50 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
51 | CONFIG_SYSFS_DEPRECATED=y | 47 | CONFIG_SYSFS_DEPRECATED=y |
48 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
52 | CONFIG_RELAY=y | 49 | CONFIG_RELAY=y |
50 | # CONFIG_NAMESPACES is not set | ||
53 | CONFIG_BLK_DEV_INITRD=y | 51 | CONFIG_BLK_DEV_INITRD=y |
54 | CONFIG_INITRAMFS_SOURCE="" | 52 | CONFIG_INITRAMFS_SOURCE="" |
55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 53 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -63,11 +61,13 @@ CONFIG_HOTPLUG=y | |||
63 | CONFIG_PRINTK=y | 61 | CONFIG_PRINTK=y |
64 | CONFIG_BUG=y | 62 | CONFIG_BUG=y |
65 | CONFIG_ELF_CORE=y | 63 | CONFIG_ELF_CORE=y |
64 | # CONFIG_COMPAT_BRK is not set | ||
66 | # CONFIG_BASE_FULL is not set | 65 | # CONFIG_BASE_FULL is not set |
67 | CONFIG_FUTEX=y | 66 | CONFIG_FUTEX=y |
68 | CONFIG_ANON_INODES=y | 67 | CONFIG_ANON_INODES=y |
69 | CONFIG_EPOLL=y | 68 | CONFIG_EPOLL=y |
70 | CONFIG_SIGNALFD=y | 69 | CONFIG_SIGNALFD=y |
70 | CONFIG_TIMERFD=y | ||
71 | CONFIG_EVENTFD=y | 71 | CONFIG_EVENTFD=y |
72 | CONFIG_SHMEM=y | 72 | CONFIG_SHMEM=y |
73 | CONFIG_VM_EVENT_COUNTERS=y | 73 | CONFIG_VM_EVENT_COUNTERS=y |
@@ -75,11 +75,20 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
75 | # CONFIG_SLAB is not set | 75 | # CONFIG_SLAB is not set |
76 | CONFIG_SLUB=y | 76 | CONFIG_SLUB=y |
77 | # CONFIG_SLOB is not set | 77 | # CONFIG_SLOB is not set |
78 | CONFIG_SLABINFO=y | 78 | CONFIG_PROFILING=y |
79 | # CONFIG_MARKERS is not set | ||
80 | CONFIG_OPROFILE=m | ||
81 | CONFIG_HAVE_OPROFILE=y | ||
82 | CONFIG_KPROBES=y | ||
83 | CONFIG_HAVE_KPROBES=y | ||
84 | # CONFIG_HAVE_KRETPROBES is not set | ||
85 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
86 | CONFIG_PROC_PAGE_MONITOR=y | ||
79 | CONFIG_RT_MUTEXES=y | 87 | CONFIG_RT_MUTEXES=y |
80 | # CONFIG_TINY_SHMEM is not set | 88 | # CONFIG_TINY_SHMEM is not set |
81 | CONFIG_BASE_SMALL=1 | 89 | CONFIG_BASE_SMALL=1 |
82 | CONFIG_MODULES=y | 90 | CONFIG_MODULES=y |
91 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
83 | CONFIG_MODULE_UNLOAD=y | 92 | CONFIG_MODULE_UNLOAD=y |
84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 93 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
85 | # CONFIG_MODVERSIONS is not set | 94 | # CONFIG_MODVERSIONS is not set |
@@ -103,10 +112,15 @@ CONFIG_IOSCHED_CFQ=y | |||
103 | CONFIG_DEFAULT_CFQ=y | 112 | CONFIG_DEFAULT_CFQ=y |
104 | # CONFIG_DEFAULT_NOOP is not set | 113 | # CONFIG_DEFAULT_NOOP is not set |
105 | CONFIG_DEFAULT_IOSCHED="cfq" | 114 | CONFIG_DEFAULT_IOSCHED="cfq" |
115 | CONFIG_CLASSIC_RCU=y | ||
106 | 116 | ||
107 | # | 117 | # |
108 | # System Type and features | 118 | # System Type and features |
109 | # | 119 | # |
120 | CONFIG_TICK_ONESHOT=y | ||
121 | CONFIG_NO_HZ=y | ||
122 | CONFIG_HIGH_RES_TIMERS=y | ||
123 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
110 | CONFIG_SUBARCH_AVR32B=y | 124 | CONFIG_SUBARCH_AVR32B=y |
111 | CONFIG_MMU=y | 125 | CONFIG_MMU=y |
112 | CONFIG_PERFORMANCE_COUNTERS=y | 126 | CONFIG_PERFORMANCE_COUNTERS=y |
@@ -152,16 +166,19 @@ CONFIG_FLATMEM=y | |||
152 | CONFIG_FLAT_NODE_MEM_MAP=y | 166 | CONFIG_FLAT_NODE_MEM_MAP=y |
153 | # CONFIG_SPARSEMEM_STATIC is not set | 167 | # CONFIG_SPARSEMEM_STATIC is not set |
154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 168 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
169 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
155 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 170 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
156 | # CONFIG_RESOURCES_64BIT is not set | 171 | # CONFIG_RESOURCES_64BIT is not set |
157 | CONFIG_ZONE_DMA_FLAG=0 | 172 | CONFIG_ZONE_DMA_FLAG=0 |
158 | CONFIG_VIRT_TO_BUS=y | 173 | CONFIG_VIRT_TO_BUS=y |
159 | # CONFIG_OWNERSHIP_TRACE is not set | 174 | # CONFIG_OWNERSHIP_TRACE is not set |
175 | CONFIG_NMI_DEBUGGING=y | ||
160 | # CONFIG_HZ_100 is not set | 176 | # CONFIG_HZ_100 is not set |
161 | CONFIG_HZ_250=y | 177 | CONFIG_HZ_250=y |
162 | # CONFIG_HZ_300 is not set | 178 | # CONFIG_HZ_300 is not set |
163 | # CONFIG_HZ_1000 is not set | 179 | # CONFIG_HZ_1000 is not set |
164 | CONFIG_HZ=250 | 180 | CONFIG_HZ=250 |
181 | # CONFIG_SCHED_HRTICK is not set | ||
165 | CONFIG_CMDLINE="" | 182 | CONFIG_CMDLINE="" |
166 | 183 | ||
167 | # | 184 | # |
@@ -175,9 +192,10 @@ CONFIG_CPU_FREQ=y | |||
175 | CONFIG_CPU_FREQ_TABLE=y | 192 | CONFIG_CPU_FREQ_TABLE=y |
176 | # CONFIG_CPU_FREQ_DEBUG is not set | 193 | # CONFIG_CPU_FREQ_DEBUG is not set |
177 | # CONFIG_CPU_FREQ_STAT is not set | 194 | # CONFIG_CPU_FREQ_STAT is not set |
178 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
196 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
179 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 197 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
180 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 198 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
181 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 199 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
182 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 200 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
183 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 201 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
@@ -234,8 +252,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
234 | CONFIG_DEFAULT_TCP_CONG="cubic" | 252 | CONFIG_DEFAULT_TCP_CONG="cubic" |
235 | # CONFIG_TCP_MD5SIG is not set | 253 | # CONFIG_TCP_MD5SIG is not set |
236 | # CONFIG_IPV6 is not set | 254 | # CONFIG_IPV6 is not set |
237 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
238 | # CONFIG_INET6_TUNNEL is not set | ||
239 | # CONFIG_NETWORK_SECMARK is not set | 255 | # CONFIG_NETWORK_SECMARK is not set |
240 | # CONFIG_NETFILTER is not set | 256 | # CONFIG_NETFILTER is not set |
241 | # CONFIG_IP_DCCP is not set | 257 | # CONFIG_IP_DCCP is not set |
@@ -260,6 +276,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
260 | # CONFIG_NET_PKTGEN is not set | 276 | # CONFIG_NET_PKTGEN is not set |
261 | # CONFIG_NET_TCPPROBE is not set | 277 | # CONFIG_NET_TCPPROBE is not set |
262 | # CONFIG_HAMRADIO is not set | 278 | # CONFIG_HAMRADIO is not set |
279 | # CONFIG_CAN is not set | ||
263 | # CONFIG_IRDA is not set | 280 | # CONFIG_IRDA is not set |
264 | # CONFIG_BT is not set | 281 | # CONFIG_BT is not set |
265 | # CONFIG_AF_RXRPC is not set | 282 | # CONFIG_AF_RXRPC is not set |
@@ -295,6 +312,7 @@ CONFIG_MTD=y | |||
295 | CONFIG_MTD_PARTITIONS=y | 312 | CONFIG_MTD_PARTITIONS=y |
296 | # CONFIG_MTD_REDBOOT_PARTS is not set | 313 | # CONFIG_MTD_REDBOOT_PARTS is not set |
297 | CONFIG_MTD_CMDLINE_PARTS=y | 314 | CONFIG_MTD_CMDLINE_PARTS=y |
315 | # CONFIG_MTD_AR7_PARTS is not set | ||
298 | 316 | ||
299 | # | 317 | # |
300 | # User Modules And Translation Layers | 318 | # User Modules And Translation Layers |
@@ -349,6 +367,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
349 | # | 367 | # |
350 | CONFIG_MTD_DATAFLASH=m | 368 | CONFIG_MTD_DATAFLASH=m |
351 | CONFIG_MTD_M25P80=m | 369 | CONFIG_MTD_M25P80=m |
370 | CONFIG_M25PXX_USE_FAST_READ=y | ||
352 | # CONFIG_MTD_SLRAM is not set | 371 | # CONFIG_MTD_SLRAM is not set |
353 | # CONFIG_MTD_PHRAM is not set | 372 | # CONFIG_MTD_PHRAM is not set |
354 | # CONFIG_MTD_MTDRAM is not set | 373 | # CONFIG_MTD_MTDRAM is not set |
@@ -376,13 +395,18 @@ CONFIG_BLK_DEV_NBD=m | |||
376 | CONFIG_BLK_DEV_RAM=m | 395 | CONFIG_BLK_DEV_RAM=m |
377 | CONFIG_BLK_DEV_RAM_COUNT=16 | 396 | CONFIG_BLK_DEV_RAM_COUNT=16 |
378 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 397 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
379 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 398 | # CONFIG_BLK_DEV_XIP is not set |
380 | # CONFIG_CDROM_PKTCDVD is not set | 399 | # CONFIG_CDROM_PKTCDVD is not set |
381 | # CONFIG_ATA_OVER_ETH is not set | 400 | # CONFIG_ATA_OVER_ETH is not set |
382 | CONFIG_MISC_DEVICES=y | 401 | CONFIG_MISC_DEVICES=y |
402 | CONFIG_ATMEL_PWM=m | ||
403 | CONFIG_ATMEL_TCLIB=y | ||
404 | CONFIG_ATMEL_TCB_CLKSRC=y | ||
405 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | ||
383 | # CONFIG_EEPROM_93CX6 is not set | 406 | # CONFIG_EEPROM_93CX6 is not set |
384 | CONFIG_ATMEL_SSC=m | 407 | CONFIG_ATMEL_SSC=m |
385 | # CONFIG_IDE is not set | 408 | # CONFIG_ENCLOSURE_SERVICES is not set |
409 | # CONFIG_HAVE_IDE is not set | ||
386 | 410 | ||
387 | # | 411 | # |
388 | # SCSI device support | 412 | # SCSI device support |
@@ -427,6 +451,9 @@ CONFIG_SCSI_LOWLEVEL=y | |||
427 | # CONFIG_SCSI_DEBUG is not set | 451 | # CONFIG_SCSI_DEBUG is not set |
428 | CONFIG_ATA=m | 452 | CONFIG_ATA=m |
429 | # CONFIG_ATA_NONSTANDARD is not set | 453 | # CONFIG_ATA_NONSTANDARD is not set |
454 | # CONFIG_SATA_PMP is not set | ||
455 | CONFIG_ATA_SFF=y | ||
456 | # CONFIG_SATA_MV is not set | ||
430 | CONFIG_PATA_AT32=m | 457 | CONFIG_PATA_AT32=m |
431 | # CONFIG_PATA_PLATFORM is not set | 458 | # CONFIG_PATA_PLATFORM is not set |
432 | # CONFIG_MD is not set | 459 | # CONFIG_MD is not set |
@@ -447,6 +474,7 @@ CONFIG_NETDEVICES=y | |||
447 | # | 474 | # |
448 | # CONFIG_WLAN_PRE80211 is not set | 475 | # CONFIG_WLAN_PRE80211 is not set |
449 | # CONFIG_WLAN_80211 is not set | 476 | # CONFIG_WLAN_80211 is not set |
477 | # CONFIG_IWLWIFI_LEDS is not set | ||
450 | # CONFIG_WAN is not set | 478 | # CONFIG_WAN is not set |
451 | CONFIG_PPP=m | 479 | CONFIG_PPP=m |
452 | # CONFIG_PPP_MULTILINK is not set | 480 | # CONFIG_PPP_MULTILINK is not set |
@@ -460,7 +488,6 @@ CONFIG_PPP_BSDCOMP=m | |||
460 | # CONFIG_PPPOL2TP is not set | 488 | # CONFIG_PPPOL2TP is not set |
461 | # CONFIG_SLIP is not set | 489 | # CONFIG_SLIP is not set |
462 | CONFIG_SLHC=m | 490 | CONFIG_SLHC=m |
463 | # CONFIG_SHAPER is not set | ||
464 | # CONFIG_NETCONSOLE is not set | 491 | # CONFIG_NETCONSOLE is not set |
465 | # CONFIG_NETPOLL is not set | 492 | # CONFIG_NETPOLL is not set |
466 | # CONFIG_NET_POLL_CONTROLLER is not set | 493 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -516,6 +543,7 @@ CONFIG_MOUSE_GPIO=m | |||
516 | # Character devices | 543 | # Character devices |
517 | # | 544 | # |
518 | # CONFIG_VT is not set | 545 | # CONFIG_VT is not set |
546 | # CONFIG_DEVKMEM is not set | ||
519 | # CONFIG_SERIAL_NONSTANDARD is not set | 547 | # CONFIG_SERIAL_NONSTANDARD is not set |
520 | 548 | ||
521 | # | 549 | # |
@@ -528,6 +556,7 @@ CONFIG_MOUSE_GPIO=m | |||
528 | # | 556 | # |
529 | CONFIG_SERIAL_ATMEL=y | 557 | CONFIG_SERIAL_ATMEL=y |
530 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 558 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
559 | CONFIG_SERIAL_ATMEL_PDC=y | ||
531 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | 560 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
532 | CONFIG_SERIAL_CORE=y | 561 | CONFIG_SERIAL_CORE=y |
533 | CONFIG_SERIAL_CORE_CONSOLE=y | 562 | CONFIG_SERIAL_CORE_CONSOLE=y |
@@ -535,21 +564,13 @@ CONFIG_UNIX98_PTYS=y | |||
535 | # CONFIG_LEGACY_PTYS is not set | 564 | # CONFIG_LEGACY_PTYS is not set |
536 | # CONFIG_IPMI_HANDLER is not set | 565 | # CONFIG_IPMI_HANDLER is not set |
537 | # CONFIG_HW_RANDOM is not set | 566 | # CONFIG_HW_RANDOM is not set |
538 | # CONFIG_RTC is not set | ||
539 | # CONFIG_GEN_RTC is not set | ||
540 | # CONFIG_R3964 is not set | 567 | # CONFIG_R3964 is not set |
541 | # CONFIG_RAW_DRIVER is not set | 568 | # CONFIG_RAW_DRIVER is not set |
542 | # CONFIG_TCG_TPM is not set | 569 | # CONFIG_TCG_TPM is not set |
543 | CONFIG_I2C=m | 570 | CONFIG_I2C=m |
544 | CONFIG_I2C_BOARDINFO=y | 571 | CONFIG_I2C_BOARDINFO=y |
545 | CONFIG_I2C_CHARDEV=m | 572 | CONFIG_I2C_CHARDEV=m |
546 | |||
547 | # | ||
548 | # I2C Algorithms | ||
549 | # | ||
550 | CONFIG_I2C_ALGOBIT=m | 573 | CONFIG_I2C_ALGOBIT=m |
551 | # CONFIG_I2C_ALGOPCF is not set | ||
552 | # CONFIG_I2C_ALGOPCA is not set | ||
553 | 574 | ||
554 | # | 575 | # |
555 | # I2C Hardware Bus support | 576 | # I2C Hardware Bus support |
@@ -560,27 +581,23 @@ CONFIG_I2C_GPIO=m | |||
560 | # CONFIG_I2C_SIMTEC is not set | 581 | # CONFIG_I2C_SIMTEC is not set |
561 | # CONFIG_I2C_TAOS_EVM is not set | 582 | # CONFIG_I2C_TAOS_EVM is not set |
562 | # CONFIG_I2C_STUB is not set | 583 | # CONFIG_I2C_STUB is not set |
584 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
563 | 585 | ||
564 | # | 586 | # |
565 | # Miscellaneous I2C Chip support | 587 | # Miscellaneous I2C Chip support |
566 | # | 588 | # |
567 | # CONFIG_SENSORS_DS1337 is not set | ||
568 | # CONFIG_SENSORS_DS1374 is not set | ||
569 | # CONFIG_DS1682 is not set | 589 | # CONFIG_DS1682 is not set |
570 | # CONFIG_SENSORS_EEPROM is not set | 590 | # CONFIG_SENSORS_EEPROM is not set |
571 | # CONFIG_SENSORS_PCF8574 is not set | 591 | # CONFIG_SENSORS_PCF8574 is not set |
572 | # CONFIG_SENSORS_PCA9539 is not set | 592 | # CONFIG_PCF8575 is not set |
573 | # CONFIG_SENSORS_PCF8591 is not set | 593 | # CONFIG_SENSORS_PCF8591 is not set |
594 | # CONFIG_TPS65010 is not set | ||
574 | # CONFIG_SENSORS_MAX6875 is not set | 595 | # CONFIG_SENSORS_MAX6875 is not set |
575 | # CONFIG_SENSORS_TSL2550 is not set | 596 | # CONFIG_SENSORS_TSL2550 is not set |
576 | # CONFIG_I2C_DEBUG_CORE is not set | 597 | # CONFIG_I2C_DEBUG_CORE is not set |
577 | # CONFIG_I2C_DEBUG_ALGO is not set | 598 | # CONFIG_I2C_DEBUG_ALGO is not set |
578 | # CONFIG_I2C_DEBUG_BUS is not set | 599 | # CONFIG_I2C_DEBUG_BUS is not set |
579 | # CONFIG_I2C_DEBUG_CHIP is not set | 600 | # CONFIG_I2C_DEBUG_CHIP is not set |
580 | |||
581 | # | ||
582 | # SPI support | ||
583 | # | ||
584 | CONFIG_SPI=y | 601 | CONFIG_SPI=y |
585 | # CONFIG_SPI_DEBUG is not set | 602 | # CONFIG_SPI_DEBUG is not set |
586 | CONFIG_SPI_MASTER=y | 603 | CONFIG_SPI_MASTER=y |
@@ -597,9 +614,27 @@ CONFIG_SPI_ATMEL=y | |||
597 | # CONFIG_SPI_AT25 is not set | 614 | # CONFIG_SPI_AT25 is not set |
598 | CONFIG_SPI_SPIDEV=m | 615 | CONFIG_SPI_SPIDEV=m |
599 | # CONFIG_SPI_TLE62X0 is not set | 616 | # CONFIG_SPI_TLE62X0 is not set |
617 | CONFIG_HAVE_GPIO_LIB=y | ||
618 | |||
619 | # | ||
620 | # GPIO Support | ||
621 | # | ||
622 | # CONFIG_DEBUG_GPIO is not set | ||
623 | |||
624 | # | ||
625 | # I2C GPIO expanders: | ||
626 | # | ||
627 | # CONFIG_GPIO_PCA953X is not set | ||
628 | # CONFIG_GPIO_PCF857X is not set | ||
629 | |||
630 | # | ||
631 | # SPI GPIO expanders: | ||
632 | # | ||
633 | # CONFIG_GPIO_MCP23S08 is not set | ||
600 | # CONFIG_W1 is not set | 634 | # CONFIG_W1 is not set |
601 | # CONFIG_POWER_SUPPLY is not set | 635 | # CONFIG_POWER_SUPPLY is not set |
602 | # CONFIG_HWMON is not set | 636 | # CONFIG_HWMON is not set |
637 | # CONFIG_THERMAL is not set | ||
603 | CONFIG_WATCHDOG=y | 638 | CONFIG_WATCHDOG=y |
604 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 639 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
605 | 640 | ||
@@ -619,12 +654,22 @@ CONFIG_SSB_POSSIBLE=y | |||
619 | # Multifunction device drivers | 654 | # Multifunction device drivers |
620 | # | 655 | # |
621 | # CONFIG_MFD_SM501 is not set | 656 | # CONFIG_MFD_SM501 is not set |
657 | # CONFIG_HTC_PASIC3 is not set | ||
622 | 658 | ||
623 | # | 659 | # |
624 | # Multimedia devices | 660 | # Multimedia devices |
625 | # | 661 | # |
662 | |||
663 | # | ||
664 | # Multimedia core support | ||
665 | # | ||
626 | # CONFIG_VIDEO_DEV is not set | 666 | # CONFIG_VIDEO_DEV is not set |
627 | # CONFIG_DVB_CORE is not set | 667 | # CONFIG_DVB_CORE is not set |
668 | # CONFIG_VIDEO_MEDIA is not set | ||
669 | |||
670 | # | ||
671 | # Multimedia drivers | ||
672 | # | ||
628 | # CONFIG_DAB is not set | 673 | # CONFIG_DAB is not set |
629 | 674 | ||
630 | # | 675 | # |
@@ -682,7 +727,11 @@ CONFIG_SND_AT73C213_TARGET_BITRATE=48000 | |||
682 | # CONFIG_SND_SOC is not set | 727 | # CONFIG_SND_SOC is not set |
683 | 728 | ||
684 | # | 729 | # |
685 | # SoC Audio support for SuperH | 730 | # ALSA SoC audio for Freescale SOCs |
731 | # | ||
732 | |||
733 | # | ||
734 | # SoC Audio for the Texas Instruments OMAP | ||
686 | # | 735 | # |
687 | 736 | ||
688 | # | 737 | # |
@@ -694,14 +743,12 @@ CONFIG_USB_SUPPORT=y | |||
694 | # CONFIG_USB_ARCH_HAS_HCD is not set | 743 | # CONFIG_USB_ARCH_HAS_HCD is not set |
695 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 744 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
696 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 745 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
746 | # CONFIG_USB_OTG_WHITELIST is not set | ||
747 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
697 | 748 | ||
698 | # | 749 | # |
699 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 750 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
700 | # | 751 | # |
701 | |||
702 | # | ||
703 | # USB Gadget Support | ||
704 | # | ||
705 | CONFIG_USB_GADGET=y | 752 | CONFIG_USB_GADGET=y |
706 | # CONFIG_USB_GADGET_DEBUG is not set | 753 | # CONFIG_USB_GADGET_DEBUG is not set |
707 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 754 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
@@ -714,6 +761,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
714 | # CONFIG_USB_GADGET_NET2280 is not set | 761 | # CONFIG_USB_GADGET_NET2280 is not set |
715 | # CONFIG_USB_GADGET_PXA2XX is not set | 762 | # CONFIG_USB_GADGET_PXA2XX is not set |
716 | # CONFIG_USB_GADGET_M66592 is not set | 763 | # CONFIG_USB_GADGET_M66592 is not set |
764 | # CONFIG_USB_GADGET_PXA27X is not set | ||
717 | # CONFIG_USB_GADGET_GOKU is not set | 765 | # CONFIG_USB_GADGET_GOKU is not set |
718 | # CONFIG_USB_GADGET_LH7A40X is not set | 766 | # CONFIG_USB_GADGET_LH7A40X is not set |
719 | # CONFIG_USB_GADGET_OMAP is not set | 767 | # CONFIG_USB_GADGET_OMAP is not set |
@@ -729,6 +777,7 @@ CONFIG_USB_FILE_STORAGE=m | |||
729 | # CONFIG_USB_FILE_STORAGE_TEST is not set | 777 | # CONFIG_USB_FILE_STORAGE_TEST is not set |
730 | CONFIG_USB_G_SERIAL=m | 778 | CONFIG_USB_G_SERIAL=m |
731 | # CONFIG_USB_MIDI_GADGET is not set | 779 | # CONFIG_USB_MIDI_GADGET is not set |
780 | # CONFIG_USB_G_PRINTER is not set | ||
732 | CONFIG_MMC=m | 781 | CONFIG_MMC=m |
733 | # CONFIG_MMC_DEBUG is not set | 782 | # CONFIG_MMC_DEBUG is not set |
734 | # CONFIG_MMC_UNSAFE_RESUME is not set | 783 | # CONFIG_MMC_UNSAFE_RESUME is not set |
@@ -739,17 +788,20 @@ CONFIG_MMC=m | |||
739 | CONFIG_MMC_BLOCK=m | 788 | CONFIG_MMC_BLOCK=m |
740 | # CONFIG_MMC_BLOCK_BOUNCE is not set | 789 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
741 | # CONFIG_SDIO_UART is not set | 790 | # CONFIG_SDIO_UART is not set |
791 | # CONFIG_MMC_TEST is not set | ||
742 | 792 | ||
743 | # | 793 | # |
744 | # MMC/SD Host Controller Drivers | 794 | # MMC/SD Host Controller Drivers |
745 | # | 795 | # |
746 | CONFIG_MMC_SPI=m | 796 | CONFIG_MMC_SPI=m |
797 | # CONFIG_MEMSTICK is not set | ||
747 | CONFIG_NEW_LEDS=y | 798 | CONFIG_NEW_LEDS=y |
748 | CONFIG_LEDS_CLASS=y | 799 | CONFIG_LEDS_CLASS=y |
749 | 800 | ||
750 | # | 801 | # |
751 | # LED drivers | 802 | # LED drivers |
752 | # | 803 | # |
804 | CONFIG_LEDS_ATMEL_PWM=m | ||
753 | CONFIG_LEDS_GPIO=y | 805 | CONFIG_LEDS_GPIO=y |
754 | 806 | ||
755 | # | 807 | # |
@@ -758,6 +810,8 @@ CONFIG_LEDS_GPIO=y | |||
758 | CONFIG_LEDS_TRIGGERS=y | 810 | CONFIG_LEDS_TRIGGERS=y |
759 | CONFIG_LEDS_TRIGGER_TIMER=y | 811 | CONFIG_LEDS_TRIGGER_TIMER=y |
760 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 812 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
813 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
814 | # CONFIG_ACCESSIBILITY is not set | ||
761 | CONFIG_RTC_LIB=y | 815 | CONFIG_RTC_LIB=y |
762 | CONFIG_RTC_CLASS=y | 816 | CONFIG_RTC_CLASS=y |
763 | CONFIG_RTC_HCTOSYS=y | 817 | CONFIG_RTC_HCTOSYS=y |
@@ -786,19 +840,22 @@ CONFIG_RTC_INTF_DEV=y | |||
786 | # CONFIG_RTC_DRV_PCF8563 is not set | 840 | # CONFIG_RTC_DRV_PCF8563 is not set |
787 | # CONFIG_RTC_DRV_PCF8583 is not set | 841 | # CONFIG_RTC_DRV_PCF8583 is not set |
788 | # CONFIG_RTC_DRV_M41T80 is not set | 842 | # CONFIG_RTC_DRV_M41T80 is not set |
843 | # CONFIG_RTC_DRV_S35390A is not set | ||
789 | 844 | ||
790 | # | 845 | # |
791 | # SPI RTC drivers | 846 | # SPI RTC drivers |
792 | # | 847 | # |
793 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
794 | # CONFIG_RTC_DRV_MAX6902 is not set | 848 | # CONFIG_RTC_DRV_MAX6902 is not set |
849 | # CONFIG_RTC_DRV_R9701 is not set | ||
850 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
795 | 851 | ||
796 | # | 852 | # |
797 | # Platform RTC drivers | 853 | # Platform RTC drivers |
798 | # | 854 | # |
855 | # CONFIG_RTC_DRV_DS1511 is not set | ||
799 | # CONFIG_RTC_DRV_DS1553 is not set | 856 | # CONFIG_RTC_DRV_DS1553 is not set |
800 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
801 | # CONFIG_RTC_DRV_DS1742 is not set | 857 | # CONFIG_RTC_DRV_DS1742 is not set |
858 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
802 | # CONFIG_RTC_DRV_M48T86 is not set | 859 | # CONFIG_RTC_DRV_M48T86 is not set |
803 | # CONFIG_RTC_DRV_M48T59 is not set | 860 | # CONFIG_RTC_DRV_M48T59 is not set |
804 | # CONFIG_RTC_DRV_V3020 is not set | 861 | # CONFIG_RTC_DRV_V3020 is not set |
@@ -807,11 +864,8 @@ CONFIG_RTC_INTF_DEV=y | |||
807 | # on-CPU RTC drivers | 864 | # on-CPU RTC drivers |
808 | # | 865 | # |
809 | CONFIG_RTC_DRV_AT32AP700X=y | 866 | CONFIG_RTC_DRV_AT32AP700X=y |
810 | |||
811 | # | ||
812 | # Userspace I/O | ||
813 | # | ||
814 | CONFIG_UIO=m | 867 | CONFIG_UIO=m |
868 | # CONFIG_UIO_SMX is not set | ||
815 | 869 | ||
816 | # | 870 | # |
817 | # File systems | 871 | # File systems |
@@ -828,14 +882,11 @@ CONFIG_JBD=m | |||
828 | # CONFIG_JFS_FS is not set | 882 | # CONFIG_JFS_FS is not set |
829 | # CONFIG_FS_POSIX_ACL is not set | 883 | # CONFIG_FS_POSIX_ACL is not set |
830 | # CONFIG_XFS_FS is not set | 884 | # CONFIG_XFS_FS is not set |
831 | # CONFIG_GFS2_FS is not set | ||
832 | # CONFIG_OCFS2_FS is not set | 885 | # CONFIG_OCFS2_FS is not set |
833 | # CONFIG_MINIX_FS is not set | 886 | # CONFIG_DNOTIFY is not set |
834 | # CONFIG_ROMFS_FS is not set | ||
835 | CONFIG_INOTIFY=y | 887 | CONFIG_INOTIFY=y |
836 | CONFIG_INOTIFY_USER=y | 888 | CONFIG_INOTIFY_USER=y |
837 | # CONFIG_QUOTA is not set | 889 | # CONFIG_QUOTA is not set |
838 | # CONFIG_DNOTIFY is not set | ||
839 | # CONFIG_AUTOFS_FS is not set | 890 | # CONFIG_AUTOFS_FS is not set |
840 | # CONFIG_AUTOFS4_FS is not set | 891 | # CONFIG_AUTOFS4_FS is not set |
841 | CONFIG_FUSE_FS=m | 892 | CONFIG_FUSE_FS=m |
@@ -891,8 +942,10 @@ CONFIG_JFFS2_RTIME=y | |||
891 | # CONFIG_JFFS2_RUBIN is not set | 942 | # CONFIG_JFFS2_RUBIN is not set |
892 | # CONFIG_CRAMFS is not set | 943 | # CONFIG_CRAMFS is not set |
893 | # CONFIG_VXFS_FS is not set | 944 | # CONFIG_VXFS_FS is not set |
945 | # CONFIG_MINIX_FS is not set | ||
894 | # CONFIG_HPFS_FS is not set | 946 | # CONFIG_HPFS_FS is not set |
895 | # CONFIG_QNX4FS_FS is not set | 947 | # CONFIG_QNX4FS_FS is not set |
948 | # CONFIG_ROMFS_FS is not set | ||
896 | # CONFIG_SYSV_FS is not set | 949 | # CONFIG_SYSV_FS is not set |
897 | # CONFIG_UFS_FS is not set | 950 | # CONFIG_UFS_FS is not set |
898 | # CONFIG_NETWORK_FILESYSTEMS is not set | 951 | # CONFIG_NETWORK_FILESYSTEMS is not set |
@@ -943,11 +996,6 @@ CONFIG_NLS_ISO8859_1=m | |||
943 | # CONFIG_NLS_KOI8_U is not set | 996 | # CONFIG_NLS_KOI8_U is not set |
944 | CONFIG_NLS_UTF8=m | 997 | CONFIG_NLS_UTF8=m |
945 | # CONFIG_DLM is not set | 998 | # CONFIG_DLM is not set |
946 | CONFIG_INSTRUMENTATION=y | ||
947 | CONFIG_PROFILING=y | ||
948 | CONFIG_OPROFILE=m | ||
949 | CONFIG_KPROBES=y | ||
950 | # CONFIG_MARKERS is not set | ||
951 | 999 | ||
952 | # | 1000 | # |
953 | # Kernel hacking | 1001 | # Kernel hacking |
@@ -955,6 +1003,7 @@ CONFIG_KPROBES=y | |||
955 | # CONFIG_PRINTK_TIME is not set | 1003 | # CONFIG_PRINTK_TIME is not set |
956 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1004 | CONFIG_ENABLE_WARN_DEPRECATED=y |
957 | CONFIG_ENABLE_MUST_CHECK=y | 1005 | CONFIG_ENABLE_MUST_CHECK=y |
1006 | CONFIG_FRAME_WARN=1024 | ||
958 | CONFIG_MAGIC_SYSRQ=y | 1007 | CONFIG_MAGIC_SYSRQ=y |
959 | # CONFIG_UNUSED_SYMBOLS is not set | 1008 | # CONFIG_UNUSED_SYMBOLS is not set |
960 | CONFIG_DEBUG_FS=y | 1009 | CONFIG_DEBUG_FS=y |
@@ -965,6 +1014,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
965 | CONFIG_SCHED_DEBUG=y | 1014 | CONFIG_SCHED_DEBUG=y |
966 | # CONFIG_SCHEDSTATS is not set | 1015 | # CONFIG_SCHEDSTATS is not set |
967 | # CONFIG_TIMER_STATS is not set | 1016 | # CONFIG_TIMER_STATS is not set |
1017 | # CONFIG_DEBUG_OBJECTS is not set | ||
968 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1018 | # CONFIG_DEBUG_RT_MUTEXES is not set |
969 | # CONFIG_RT_MUTEX_TESTER is not set | 1019 | # CONFIG_RT_MUTEX_TESTER is not set |
970 | # CONFIG_DEBUG_SPINLOCK is not set | 1020 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -978,12 +1028,14 @@ CONFIG_SCHED_DEBUG=y | |||
978 | CONFIG_DEBUG_BUGVERBOSE=y | 1028 | CONFIG_DEBUG_BUGVERBOSE=y |
979 | # CONFIG_DEBUG_INFO is not set | 1029 | # CONFIG_DEBUG_INFO is not set |
980 | # CONFIG_DEBUG_VM is not set | 1030 | # CONFIG_DEBUG_VM is not set |
1031 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
981 | # CONFIG_DEBUG_LIST is not set | 1032 | # CONFIG_DEBUG_LIST is not set |
982 | # CONFIG_DEBUG_SG is not set | 1033 | # CONFIG_DEBUG_SG is not set |
983 | CONFIG_FRAME_POINTER=y | 1034 | CONFIG_FRAME_POINTER=y |
984 | CONFIG_FORCED_INLINING=y | ||
985 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1035 | # CONFIG_BOOT_PRINTK_DELAY is not set |
986 | # CONFIG_RCU_TORTURE_TEST is not set | 1036 | # CONFIG_RCU_TORTURE_TEST is not set |
1037 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
1038 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
987 | # CONFIG_LKDTM is not set | 1039 | # CONFIG_LKDTM is not set |
988 | # CONFIG_FAULT_INJECTION is not set | 1040 | # CONFIG_FAULT_INJECTION is not set |
989 | # CONFIG_SAMPLES is not set | 1041 | # CONFIG_SAMPLES is not set |
@@ -1000,6 +1052,8 @@ CONFIG_FORCED_INLINING=y | |||
1000 | # Library routines | 1052 | # Library routines |
1001 | # | 1053 | # |
1002 | CONFIG_BITREVERSE=y | 1054 | CONFIG_BITREVERSE=y |
1055 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1056 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1003 | CONFIG_CRC_CCITT=m | 1057 | CONFIG_CRC_CCITT=m |
1004 | # CONFIG_CRC16 is not set | 1058 | # CONFIG_CRC16 is not set |
1005 | CONFIG_CRC_ITU_T=m | 1059 | CONFIG_CRC_ITU_T=m |
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig index 634c52760349..a0912fb7c92e 100644 --- a/arch/avr32/configs/atstk1004_defconfig +++ b/arch/avr32/configs/atstk1004_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-rc7 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Wed Jan 9 23:04:20 2008 | 4 | # Mon May 26 13:34:57 2008 |
5 | # | 5 | # |
6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
@@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y | |||
13 | CONFIG_GENERIC_IRQ_PROBE=y | 13 | CONFIG_GENERIC_IRQ_PROBE=y |
14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
15 | CONFIG_GENERIC_TIME=y | 15 | CONFIG_GENERIC_TIME=y |
16 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
16 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 17 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
17 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
19 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
20 | CONFIG_GENERIC_HWEIGHT=y | 20 | CONFIG_GENERIC_HWEIGHT=y |
21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
22 | CONFIG_GENERIC_BUG=y | 22 | CONFIG_GENERIC_BUG=y |
@@ -34,15 +34,15 @@ CONFIG_LOCALVERSION="" | |||
34 | # CONFIG_POSIX_MQUEUE is not set | 34 | # CONFIG_POSIX_MQUEUE is not set |
35 | # CONFIG_BSD_PROCESS_ACCT is not set | 35 | # CONFIG_BSD_PROCESS_ACCT is not set |
36 | # CONFIG_TASKSTATS is not set | 36 | # CONFIG_TASKSTATS is not set |
37 | # CONFIG_USER_NS is not set | ||
38 | # CONFIG_PID_NS is not set | ||
39 | # CONFIG_AUDIT is not set | 37 | # CONFIG_AUDIT is not set |
40 | # CONFIG_IKCONFIG is not set | 38 | # CONFIG_IKCONFIG is not set |
41 | CONFIG_LOG_BUF_SHIFT=14 | 39 | CONFIG_LOG_BUF_SHIFT=14 |
42 | # CONFIG_CGROUPS is not set | 40 | # CONFIG_CGROUPS is not set |
43 | # CONFIG_FAIR_GROUP_SCHED is not set | 41 | # CONFIG_GROUP_SCHED is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | 42 | CONFIG_SYSFS_DEPRECATED=y |
43 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
45 | # CONFIG_RELAY is not set | 44 | # CONFIG_RELAY is not set |
45 | # CONFIG_NAMESPACES is not set | ||
46 | # CONFIG_BLK_DEV_INITRD is not set | 46 | # CONFIG_BLK_DEV_INITRD is not set |
47 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 47 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
48 | CONFIG_SYSCTL=y | 48 | CONFIG_SYSCTL=y |
@@ -54,24 +54,38 @@ CONFIG_HOTPLUG=y | |||
54 | CONFIG_PRINTK=y | 54 | CONFIG_PRINTK=y |
55 | CONFIG_BUG=y | 55 | CONFIG_BUG=y |
56 | CONFIG_ELF_CORE=y | 56 | CONFIG_ELF_CORE=y |
57 | # CONFIG_COMPAT_BRK is not set | ||
57 | # CONFIG_BASE_FULL is not set | 58 | # CONFIG_BASE_FULL is not set |
58 | # CONFIG_FUTEX is not set | 59 | # CONFIG_FUTEX is not set |
59 | # CONFIG_EPOLL is not set | 60 | # CONFIG_EPOLL is not set |
60 | # CONFIG_SIGNALFD is not set | 61 | # CONFIG_SIGNALFD is not set |
62 | # CONFIG_TIMERFD is not set | ||
61 | # CONFIG_EVENTFD is not set | 63 | # CONFIG_EVENTFD is not set |
62 | CONFIG_SHMEM=y | 64 | CONFIG_SHMEM=y |
63 | CONFIG_VM_EVENT_COUNTERS=y | 65 | CONFIG_VM_EVENT_COUNTERS=y |
64 | # CONFIG_SLAB is not set | 66 | # CONFIG_SLAB is not set |
65 | # CONFIG_SLUB is not set | 67 | # CONFIG_SLUB is not set |
66 | CONFIG_SLOB=y | 68 | CONFIG_SLOB=y |
69 | # CONFIG_PROFILING is not set | ||
70 | # CONFIG_MARKERS is not set | ||
71 | CONFIG_HAVE_OPROFILE=y | ||
72 | CONFIG_HAVE_KPROBES=y | ||
73 | # CONFIG_HAVE_KRETPROBES is not set | ||
74 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
75 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
67 | # CONFIG_TINY_SHMEM is not set | 76 | # CONFIG_TINY_SHMEM is not set |
68 | CONFIG_BASE_SMALL=1 | 77 | CONFIG_BASE_SMALL=1 |
69 | # CONFIG_MODULES is not set | 78 | # CONFIG_MODULES is not set |
70 | # CONFIG_BLOCK is not set | 79 | # CONFIG_BLOCK is not set |
80 | CONFIG_CLASSIC_RCU=y | ||
71 | 81 | ||
72 | # | 82 | # |
73 | # System Type and features | 83 | # System Type and features |
74 | # | 84 | # |
85 | # CONFIG_TICK_ONESHOT is not set | ||
86 | # CONFIG_NO_HZ is not set | ||
87 | # CONFIG_HIGH_RES_TIMERS is not set | ||
88 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
75 | CONFIG_SUBARCH_AVR32B=y | 89 | CONFIG_SUBARCH_AVR32B=y |
76 | CONFIG_MMU=y | 90 | CONFIG_MMU=y |
77 | CONFIG_PERFORMANCE_COUNTERS=y | 91 | CONFIG_PERFORMANCE_COUNTERS=y |
@@ -115,16 +129,19 @@ CONFIG_FLATMEM=y | |||
115 | CONFIG_FLAT_NODE_MEM_MAP=y | 129 | CONFIG_FLAT_NODE_MEM_MAP=y |
116 | # CONFIG_SPARSEMEM_STATIC is not set | 130 | # CONFIG_SPARSEMEM_STATIC is not set |
117 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 131 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
132 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
118 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 133 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
119 | # CONFIG_RESOURCES_64BIT is not set | 134 | # CONFIG_RESOURCES_64BIT is not set |
120 | CONFIG_ZONE_DMA_FLAG=0 | 135 | CONFIG_ZONE_DMA_FLAG=0 |
121 | CONFIG_VIRT_TO_BUS=y | 136 | CONFIG_VIRT_TO_BUS=y |
122 | # CONFIG_OWNERSHIP_TRACE is not set | 137 | # CONFIG_OWNERSHIP_TRACE is not set |
138 | # CONFIG_NMI_DEBUGGING is not set | ||
123 | # CONFIG_HZ_100 is not set | 139 | # CONFIG_HZ_100 is not set |
124 | CONFIG_HZ_250=y | 140 | CONFIG_HZ_250=y |
125 | # CONFIG_HZ_300 is not set | 141 | # CONFIG_HZ_300 is not set |
126 | # CONFIG_HZ_1000 is not set | 142 | # CONFIG_HZ_1000 is not set |
127 | CONFIG_HZ=250 | 143 | CONFIG_HZ=250 |
144 | # CONFIG_SCHED_HRTICK is not set | ||
128 | CONFIG_CMDLINE="" | 145 | CONFIG_CMDLINE="" |
129 | 146 | ||
130 | # | 147 | # |
@@ -134,20 +151,7 @@ CONFIG_CMDLINE="" | |||
134 | # | 151 | # |
135 | # CPU Frequency scaling | 152 | # CPU Frequency scaling |
136 | # | 153 | # |
137 | CONFIG_CPU_FREQ=y | 154 | # CONFIG_CPU_FREQ is not set |
138 | CONFIG_CPU_FREQ_TABLE=y | ||
139 | # CONFIG_CPU_FREQ_DEBUG is not set | ||
140 | # CONFIG_CPU_FREQ_STAT is not set | ||
141 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | ||
142 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | ||
143 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
144 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
145 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | ||
146 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | ||
147 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | ||
148 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | ||
149 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | ||
150 | CONFIG_CPU_FREQ_AT32AP=y | ||
151 | 155 | ||
152 | # | 156 | # |
153 | # Bus options | 157 | # Bus options |
@@ -197,8 +201,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
197 | CONFIG_DEFAULT_TCP_CONG="cubic" | 201 | CONFIG_DEFAULT_TCP_CONG="cubic" |
198 | # CONFIG_TCP_MD5SIG is not set | 202 | # CONFIG_TCP_MD5SIG is not set |
199 | # CONFIG_IPV6 is not set | 203 | # CONFIG_IPV6 is not set |
200 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
201 | # CONFIG_INET6_TUNNEL is not set | ||
202 | # CONFIG_NETWORK_SECMARK is not set | 204 | # CONFIG_NETWORK_SECMARK is not set |
203 | # CONFIG_NETFILTER is not set | 205 | # CONFIG_NETFILTER is not set |
204 | # CONFIG_IP_DCCP is not set | 206 | # CONFIG_IP_DCCP is not set |
@@ -222,6 +224,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
222 | # | 224 | # |
223 | # CONFIG_NET_PKTGEN is not set | 225 | # CONFIG_NET_PKTGEN is not set |
224 | # CONFIG_HAMRADIO is not set | 226 | # CONFIG_HAMRADIO is not set |
227 | # CONFIG_CAN is not set | ||
225 | # CONFIG_IRDA is not set | 228 | # CONFIG_IRDA is not set |
226 | # CONFIG_BT is not set | 229 | # CONFIG_BT is not set |
227 | # CONFIG_AF_RXRPC is not set | 230 | # CONFIG_AF_RXRPC is not set |
@@ -255,6 +258,7 @@ CONFIG_MTD=y | |||
255 | CONFIG_MTD_PARTITIONS=y | 258 | CONFIG_MTD_PARTITIONS=y |
256 | # CONFIG_MTD_REDBOOT_PARTS is not set | 259 | # CONFIG_MTD_REDBOOT_PARTS is not set |
257 | CONFIG_MTD_CMDLINE_PARTS=y | 260 | CONFIG_MTD_CMDLINE_PARTS=y |
261 | # CONFIG_MTD_AR7_PARTS is not set | ||
258 | 262 | ||
259 | # | 263 | # |
260 | # User Modules And Translation Layers | 264 | # User Modules And Translation Layers |
@@ -321,6 +325,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
321 | # CONFIG_MTD_UBI is not set | 325 | # CONFIG_MTD_UBI is not set |
322 | # CONFIG_PARPORT is not set | 326 | # CONFIG_PARPORT is not set |
323 | # CONFIG_MISC_DEVICES is not set | 327 | # CONFIG_MISC_DEVICES is not set |
328 | # CONFIG_HAVE_IDE is not set | ||
324 | 329 | ||
325 | # | 330 | # |
326 | # SCSI device support | 331 | # SCSI device support |
@@ -346,6 +351,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
346 | # Character devices | 351 | # Character devices |
347 | # | 352 | # |
348 | # CONFIG_VT is not set | 353 | # CONFIG_VT is not set |
354 | # CONFIG_DEVKMEM is not set | ||
349 | # CONFIG_SERIAL_NONSTANDARD is not set | 355 | # CONFIG_SERIAL_NONSTANDARD is not set |
350 | 356 | ||
351 | # | 357 | # |
@@ -358,6 +364,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
358 | # | 364 | # |
359 | CONFIG_SERIAL_ATMEL=y | 365 | CONFIG_SERIAL_ATMEL=y |
360 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 366 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
367 | # CONFIG_SERIAL_ATMEL_PDC is not set | ||
361 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | 368 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
362 | CONFIG_SERIAL_CORE=y | 369 | CONFIG_SERIAL_CORE=y |
363 | CONFIG_SERIAL_CORE_CONSOLE=y | 370 | CONFIG_SERIAL_CORE_CONSOLE=y |
@@ -365,15 +372,9 @@ CONFIG_UNIX98_PTYS=y | |||
365 | # CONFIG_LEGACY_PTYS is not set | 372 | # CONFIG_LEGACY_PTYS is not set |
366 | # CONFIG_IPMI_HANDLER is not set | 373 | # CONFIG_IPMI_HANDLER is not set |
367 | # CONFIG_HW_RANDOM is not set | 374 | # CONFIG_HW_RANDOM is not set |
368 | # CONFIG_RTC is not set | ||
369 | # CONFIG_GEN_RTC is not set | ||
370 | # CONFIG_R3964 is not set | 375 | # CONFIG_R3964 is not set |
371 | # CONFIG_TCG_TPM is not set | 376 | # CONFIG_TCG_TPM is not set |
372 | # CONFIG_I2C is not set | 377 | # CONFIG_I2C is not set |
373 | |||
374 | # | ||
375 | # SPI support | ||
376 | # | ||
377 | CONFIG_SPI=y | 378 | CONFIG_SPI=y |
378 | CONFIG_SPI_MASTER=y | 379 | CONFIG_SPI_MASTER=y |
379 | 380 | ||
@@ -389,9 +390,24 @@ CONFIG_SPI_ATMEL=y | |||
389 | # CONFIG_SPI_AT25 is not set | 390 | # CONFIG_SPI_AT25 is not set |
390 | # CONFIG_SPI_SPIDEV is not set | 391 | # CONFIG_SPI_SPIDEV is not set |
391 | # CONFIG_SPI_TLE62X0 is not set | 392 | # CONFIG_SPI_TLE62X0 is not set |
393 | CONFIG_HAVE_GPIO_LIB=y | ||
394 | |||
395 | # | ||
396 | # GPIO Support | ||
397 | # | ||
398 | |||
399 | # | ||
400 | # I2C GPIO expanders: | ||
401 | # | ||
402 | |||
403 | # | ||
404 | # SPI GPIO expanders: | ||
405 | # | ||
406 | # CONFIG_GPIO_MCP23S08 is not set | ||
392 | # CONFIG_W1 is not set | 407 | # CONFIG_W1 is not set |
393 | # CONFIG_POWER_SUPPLY is not set | 408 | # CONFIG_POWER_SUPPLY is not set |
394 | # CONFIG_HWMON is not set | 409 | # CONFIG_HWMON is not set |
410 | # CONFIG_THERMAL is not set | ||
395 | CONFIG_WATCHDOG=y | 411 | CONFIG_WATCHDOG=y |
396 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 412 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
397 | 413 | ||
@@ -411,12 +427,22 @@ CONFIG_SSB_POSSIBLE=y | |||
411 | # Multifunction device drivers | 427 | # Multifunction device drivers |
412 | # | 428 | # |
413 | # CONFIG_MFD_SM501 is not set | 429 | # CONFIG_MFD_SM501 is not set |
430 | # CONFIG_HTC_PASIC3 is not set | ||
414 | 431 | ||
415 | # | 432 | # |
416 | # Multimedia devices | 433 | # Multimedia devices |
417 | # | 434 | # |
435 | |||
436 | # | ||
437 | # Multimedia core support | ||
438 | # | ||
418 | # CONFIG_VIDEO_DEV is not set | 439 | # CONFIG_VIDEO_DEV is not set |
419 | # CONFIG_DVB_CORE is not set | 440 | # CONFIG_DVB_CORE is not set |
441 | # CONFIG_VIDEO_MEDIA is not set | ||
442 | |||
443 | # | ||
444 | # Multimedia drivers | ||
445 | # | ||
420 | # CONFIG_DAB is not set | 446 | # CONFIG_DAB is not set |
421 | 447 | ||
422 | # | 448 | # |
@@ -434,8 +460,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
434 | # CONFIG_FB_SYS_FILLRECT is not set | 460 | # CONFIG_FB_SYS_FILLRECT is not set |
435 | # CONFIG_FB_SYS_COPYAREA is not set | 461 | # CONFIG_FB_SYS_COPYAREA is not set |
436 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 462 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
463 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
437 | # CONFIG_FB_SYS_FOPS is not set | 464 | # CONFIG_FB_SYS_FOPS is not set |
438 | CONFIG_FB_DEFERRED_IO=y | ||
439 | # CONFIG_FB_SVGALIB is not set | 465 | # CONFIG_FB_SVGALIB is not set |
440 | # CONFIG_FB_MACMODES is not set | 466 | # CONFIG_FB_MACMODES is not set |
441 | # CONFIG_FB_BACKLIGHT is not set | 467 | # CONFIG_FB_BACKLIGHT is not set |
@@ -467,14 +493,12 @@ CONFIG_USB_SUPPORT=y | |||
467 | # CONFIG_USB_ARCH_HAS_HCD is not set | 493 | # CONFIG_USB_ARCH_HAS_HCD is not set |
468 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 494 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
469 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 495 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
496 | # CONFIG_USB_OTG_WHITELIST is not set | ||
497 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
470 | 498 | ||
471 | # | 499 | # |
472 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 500 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
473 | # | 501 | # |
474 | |||
475 | # | ||
476 | # USB Gadget Support | ||
477 | # | ||
478 | CONFIG_USB_GADGET=y | 502 | CONFIG_USB_GADGET=y |
479 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 503 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
480 | CONFIG_USB_GADGET_SELECTED=y | 504 | CONFIG_USB_GADGET_SELECTED=y |
@@ -485,6 +509,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
485 | # CONFIG_USB_GADGET_NET2280 is not set | 509 | # CONFIG_USB_GADGET_NET2280 is not set |
486 | # CONFIG_USB_GADGET_PXA2XX is not set | 510 | # CONFIG_USB_GADGET_PXA2XX is not set |
487 | # CONFIG_USB_GADGET_M66592 is not set | 511 | # CONFIG_USB_GADGET_M66592 is not set |
512 | # CONFIG_USB_GADGET_PXA27X is not set | ||
488 | # CONFIG_USB_GADGET_GOKU is not set | 513 | # CONFIG_USB_GADGET_GOKU is not set |
489 | # CONFIG_USB_GADGET_LH7A40X is not set | 514 | # CONFIG_USB_GADGET_LH7A40X is not set |
490 | # CONFIG_USB_GADGET_OMAP is not set | 515 | # CONFIG_USB_GADGET_OMAP is not set |
@@ -499,8 +524,11 @@ CONFIG_USB_ETH=y | |||
499 | # CONFIG_USB_FILE_STORAGE is not set | 524 | # CONFIG_USB_FILE_STORAGE is not set |
500 | # CONFIG_USB_G_SERIAL is not set | 525 | # CONFIG_USB_G_SERIAL is not set |
501 | # CONFIG_USB_MIDI_GADGET is not set | 526 | # CONFIG_USB_MIDI_GADGET is not set |
527 | # CONFIG_USB_G_PRINTER is not set | ||
502 | # CONFIG_MMC is not set | 528 | # CONFIG_MMC is not set |
529 | # CONFIG_MEMSTICK is not set | ||
503 | # CONFIG_NEW_LEDS is not set | 530 | # CONFIG_NEW_LEDS is not set |
531 | # CONFIG_ACCESSIBILITY is not set | ||
504 | CONFIG_RTC_LIB=y | 532 | CONFIG_RTC_LIB=y |
505 | CONFIG_RTC_CLASS=y | 533 | CONFIG_RTC_CLASS=y |
506 | CONFIG_RTC_HCTOSYS=y | 534 | CONFIG_RTC_HCTOSYS=y |
@@ -519,15 +547,17 @@ CONFIG_RTC_INTF_DEV=y | |||
519 | # | 547 | # |
520 | # SPI RTC drivers | 548 | # SPI RTC drivers |
521 | # | 549 | # |
522 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
523 | # CONFIG_RTC_DRV_MAX6902 is not set | 550 | # CONFIG_RTC_DRV_MAX6902 is not set |
551 | # CONFIG_RTC_DRV_R9701 is not set | ||
552 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
524 | 553 | ||
525 | # | 554 | # |
526 | # Platform RTC drivers | 555 | # Platform RTC drivers |
527 | # | 556 | # |
557 | # CONFIG_RTC_DRV_DS1511 is not set | ||
528 | # CONFIG_RTC_DRV_DS1553 is not set | 558 | # CONFIG_RTC_DRV_DS1553 is not set |
529 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
530 | # CONFIG_RTC_DRV_DS1742 is not set | 559 | # CONFIG_RTC_DRV_DS1742 is not set |
560 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
531 | # CONFIG_RTC_DRV_M48T86 is not set | 561 | # CONFIG_RTC_DRV_M48T86 is not set |
532 | # CONFIG_RTC_DRV_M48T59 is not set | 562 | # CONFIG_RTC_DRV_M48T59 is not set |
533 | # CONFIG_RTC_DRV_V3020 is not set | 563 | # CONFIG_RTC_DRV_V3020 is not set |
@@ -536,18 +566,14 @@ CONFIG_RTC_INTF_DEV=y | |||
536 | # on-CPU RTC drivers | 566 | # on-CPU RTC drivers |
537 | # | 567 | # |
538 | CONFIG_RTC_DRV_AT32AP700X=y | 568 | CONFIG_RTC_DRV_AT32AP700X=y |
539 | |||
540 | # | ||
541 | # Userspace I/O | ||
542 | # | ||
543 | # CONFIG_UIO is not set | 569 | # CONFIG_UIO is not set |
544 | 570 | ||
545 | # | 571 | # |
546 | # File systems | 572 | # File systems |
547 | # | 573 | # |
574 | # CONFIG_DNOTIFY is not set | ||
548 | # CONFIG_INOTIFY is not set | 575 | # CONFIG_INOTIFY is not set |
549 | # CONFIG_QUOTA is not set | 576 | # CONFIG_QUOTA is not set |
550 | # CONFIG_DNOTIFY is not set | ||
551 | # CONFIG_AUTOFS_FS is not set | 577 | # CONFIG_AUTOFS_FS is not set |
552 | # CONFIG_AUTOFS4_FS is not set | 578 | # CONFIG_AUTOFS4_FS is not set |
553 | # CONFIG_FUSE_FS is not set | 579 | # CONFIG_FUSE_FS is not set |
@@ -580,7 +606,6 @@ CONFIG_JFFS2_RTIME=y | |||
580 | # CONFIG_NETWORK_FILESYSTEMS is not set | 606 | # CONFIG_NETWORK_FILESYSTEMS is not set |
581 | # CONFIG_NLS is not set | 607 | # CONFIG_NLS is not set |
582 | # CONFIG_DLM is not set | 608 | # CONFIG_DLM is not set |
583 | # CONFIG_INSTRUMENTATION is not set | ||
584 | 609 | ||
585 | # | 610 | # |
586 | # Kernel hacking | 611 | # Kernel hacking |
@@ -588,6 +613,7 @@ CONFIG_JFFS2_RTIME=y | |||
588 | # CONFIG_PRINTK_TIME is not set | 613 | # CONFIG_PRINTK_TIME is not set |
589 | CONFIG_ENABLE_WARN_DEPRECATED=y | 614 | CONFIG_ENABLE_WARN_DEPRECATED=y |
590 | CONFIG_ENABLE_MUST_CHECK=y | 615 | CONFIG_ENABLE_MUST_CHECK=y |
616 | CONFIG_FRAME_WARN=1024 | ||
591 | CONFIG_MAGIC_SYSRQ=y | 617 | CONFIG_MAGIC_SYSRQ=y |
592 | # CONFIG_UNUSED_SYMBOLS is not set | 618 | # CONFIG_UNUSED_SYMBOLS is not set |
593 | # CONFIG_DEBUG_FS is not set | 619 | # CONFIG_DEBUG_FS is not set |
@@ -608,6 +634,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
608 | # Library routines | 634 | # Library routines |
609 | # | 635 | # |
610 | CONFIG_BITREVERSE=y | 636 | CONFIG_BITREVERSE=y |
637 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
638 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
611 | # CONFIG_CRC_CCITT is not set | 639 | # CONFIG_CRC_CCITT is not set |
612 | # CONFIG_CRC16 is not set | 640 | # CONFIG_CRC16 is not set |
613 | # CONFIG_CRC_ITU_T is not set | 641 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c index 80f55f8dbf1c..84a7d44edc67 100644 --- a/arch/avr32/kernel/avr32_ksyms.c +++ b/arch/avr32/kernel/avr32_ksyms.c | |||
@@ -29,7 +29,9 @@ EXPORT_SYMBOL(__avr32_asr64); | |||
29 | */ | 29 | */ |
30 | EXPORT_SYMBOL(memset); | 30 | EXPORT_SYMBOL(memset); |
31 | EXPORT_SYMBOL(memcpy); | 31 | EXPORT_SYMBOL(memcpy); |
32 | |||
32 | EXPORT_SYMBOL(clear_page); | 33 | EXPORT_SYMBOL(clear_page); |
34 | EXPORT_SYMBOL(copy_page); | ||
33 | 35 | ||
34 | /* | 36 | /* |
35 | * Userspace access stuff. | 37 | * Userspace access stuff. |
@@ -41,6 +43,8 @@ EXPORT_SYMBOL(strncpy_from_user); | |||
41 | EXPORT_SYMBOL(__strncpy_from_user); | 43 | EXPORT_SYMBOL(__strncpy_from_user); |
42 | EXPORT_SYMBOL(clear_user); | 44 | EXPORT_SYMBOL(clear_user); |
43 | EXPORT_SYMBOL(__clear_user); | 45 | EXPORT_SYMBOL(__clear_user); |
46 | EXPORT_SYMBOL(strnlen_user); | ||
47 | |||
44 | EXPORT_SYMBOL(csum_partial); | 48 | EXPORT_SYMBOL(csum_partial); |
45 | EXPORT_SYMBOL(csum_partial_copy_generic); | 49 | EXPORT_SYMBOL(csum_partial_copy_generic); |
46 | 50 | ||
diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/arch/avr32/mach-at32ap/cpufreq.c index 235524b79193..5dd8d25428bf 100644 --- a/arch/avr32/mach-at32ap/cpufreq.c +++ b/arch/avr32/mach-at32ap/cpufreq.c | |||
@@ -108,5 +108,4 @@ static int __init at32_cpufreq_init(void) | |||
108 | { | 108 | { |
109 | return cpufreq_register_driver(&at32_driver); | 109 | return cpufreq_register_driver(&at32_driver); |
110 | } | 110 | } |
111 | 111 | late_initcall(at32_cpufreq_init); | |
112 | arch_initcall(at32_cpufreq_init); | ||
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index 917325bfbd84..6be0c50122e8 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c | |||
@@ -254,7 +254,8 @@ close_cplbtab(struct cplb_tab *table) | |||
254 | } | 254 | } |
255 | 255 | ||
256 | /* helper function */ | 256 | /* helper function */ |
257 | static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | 257 | static void __init |
258 | __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | ||
258 | { | 259 | { |
259 | if (cplb_data[i].psize) { | 260 | if (cplb_data[i].psize) { |
260 | fill_cplbtab(t, | 261 | fill_cplbtab(t, |
@@ -291,7 +292,8 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_en | |||
291 | } | 292 | } |
292 | } | 293 | } |
293 | 294 | ||
294 | static void __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | 295 | static void __init |
296 | __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | ||
295 | { | 297 | { |
296 | if (cplb_data[i].psize) { | 298 | if (cplb_data[i].psize) { |
297 | fill_cplbtab(t, | 299 | fill_cplbtab(t, |
diff --git a/arch/blackfin/kernel/gptimers.c b/arch/blackfin/kernel/gptimers.c index e698554895a7..3a3e9615b002 100644 --- a/arch/blackfin/kernel/gptimers.c +++ b/arch/blackfin/kernel/gptimers.c | |||
@@ -10,8 +10,8 @@ | |||
10 | 10 | ||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/io.h> | ||
13 | 14 | ||
14 | #include <asm/io.h> | ||
15 | #include <asm/blackfin.h> | 15 | #include <asm/blackfin.h> |
16 | #include <asm/gptimers.h> | 16 | #include <asm/gptimers.h> |
17 | 17 | ||
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index 73647c158774..07402f57c9de 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c | |||
@@ -60,9 +60,14 @@ static struct irq_chip bad_chip = { | |||
60 | }; | 60 | }; |
61 | 61 | ||
62 | static struct irq_desc bad_irq_desc = { | 62 | static struct irq_desc bad_irq_desc = { |
63 | .status = IRQ_DISABLED, | ||
63 | .chip = &bad_chip, | 64 | .chip = &bad_chip, |
64 | .handle_irq = handle_bad_irq, | 65 | .handle_irq = handle_bad_irq, |
65 | .depth = 1, | 66 | .depth = 1, |
67 | .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), | ||
68 | #ifdef CONFIG_SMP | ||
69 | .affinity = CPU_MASK_ALL | ||
70 | #endif | ||
66 | }; | 71 | }; |
67 | 72 | ||
68 | int show_interrupts(struct seq_file *p, void *v) | 73 | int show_interrupts(struct seq_file *p, void *v) |
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 7bfbd958980c..f061f5181623 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
@@ -67,7 +67,7 @@ void __init trap_init(void) | |||
67 | CSYNC(); | 67 | CSYNC(); |
68 | } | 68 | } |
69 | 69 | ||
70 | void *saved_icplb_fault_addr, *saved_dcplb_fault_addr; | 70 | unsigned long saved_icplb_fault_addr, saved_dcplb_fault_addr; |
71 | 71 | ||
72 | int kstack_depth_to_print = 48; | 72 | int kstack_depth_to_print = 48; |
73 | 73 | ||
@@ -366,7 +366,7 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
366 | info.si_code = ILL_CPLB_MULHIT; | 366 | info.si_code = ILL_CPLB_MULHIT; |
367 | sig = SIGSEGV; | 367 | sig = SIGSEGV; |
368 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO | 368 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO |
369 | if (saved_dcplb_fault_addr < (void *)FIXED_CODE_START) | 369 | if (saved_dcplb_fault_addr < FIXED_CODE_START) |
370 | printk(KERN_NOTICE "NULL pointer access\n"); | 370 | printk(KERN_NOTICE "NULL pointer access\n"); |
371 | else | 371 | else |
372 | #endif | 372 | #endif |
@@ -421,7 +421,7 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
421 | info.si_code = ILL_CPLB_MULHIT; | 421 | info.si_code = ILL_CPLB_MULHIT; |
422 | sig = SIGSEGV; | 422 | sig = SIGSEGV; |
423 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO | 423 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO |
424 | if (saved_icplb_fault_addr < (void *)FIXED_CODE_START) | 424 | if (saved_icplb_fault_addr < FIXED_CODE_START) |
425 | printk(KERN_NOTICE "Jump to NULL address\n"); | 425 | printk(KERN_NOTICE "Jump to NULL address\n"); |
426 | else | 426 | else |
427 | #endif | 427 | #endif |
@@ -939,8 +939,6 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp) | |||
939 | 939 | ||
940 | oops_in_progress = 1; | 940 | oops_in_progress = 1; |
941 | 941 | ||
942 | printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", saved_dcplb_fault_addr); | ||
943 | printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", saved_icplb_fault_addr); | ||
944 | dump_bfin_process(fp); | 942 | dump_bfin_process(fp); |
945 | dump_bfin_mem(fp); | 943 | dump_bfin_mem(fp); |
946 | show_regs(fp); | 944 | show_regs(fp); |
diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S index 3daf96035bf6..4685b7aa0080 100644 --- a/arch/blackfin/lib/outs.S +++ b/arch/blackfin/lib/outs.S | |||
@@ -76,4 +76,4 @@ ENTRY(_outsw_8) | |||
76 | R0 = R0 + R1; | 76 | R0 = R0 + R1; |
77 | .Lword8_loop_e: W[P0] = R0; | 77 | .Lword8_loop_e: W[P0] = R0; |
78 | RTS; | 78 | RTS; |
79 | ENDPROC(_outsw) | 79 | ENDPROC(_outsw_8) |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index bb6d58c931de..5958eecefcf1 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -451,9 +451,6 @@ static struct platform_device net2272_bfin_device = { | |||
451 | }; | 451 | }; |
452 | #endif | 452 | #endif |
453 | 453 | ||
454 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
455 | /* all SPI peripherals info goes here */ | ||
456 | |||
457 | #if defined(CONFIG_MTD_M25P80) \ | 454 | #if defined(CONFIG_MTD_M25P80) \ |
458 | || defined(CONFIG_MTD_M25P80_MODULE) | 455 | || defined(CONFIG_MTD_M25P80_MODULE) |
459 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 456 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
@@ -647,10 +644,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
647 | { | 644 | { |
648 | .modalias = "ad7877", | 645 | .modalias = "ad7877", |
649 | .platform_data = &bfin_ad7877_ts_info, | 646 | .platform_data = &bfin_ad7877_ts_info, |
650 | .irq = IRQ_PF6, | 647 | .irq = IRQ_PF8, |
651 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 648 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
652 | .bus_num = 0, | 649 | .bus_num = 0, |
653 | .chip_select = 1, | 650 | .chip_select = 2, |
654 | .controller_data = &spi_ad7877_chip_info, | 651 | .controller_data = &spi_ad7877_chip_info, |
655 | }, | 652 | }, |
656 | #endif | 653 | #endif |
@@ -676,6 +673,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
676 | #endif | 673 | #endif |
677 | }; | 674 | }; |
678 | 675 | ||
676 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
679 | /* SPI controller data */ | 677 | /* SPI controller data */ |
680 | static struct bfin5xx_spi_master bfin_spi0_info = { | 678 | static struct bfin5xx_spi_master bfin_spi0_info = { |
681 | .num_chipselect = 8, | 679 | .num_chipselect = 8, |
@@ -1018,10 +1016,7 @@ static int __init stamp_init(void) | |||
1018 | #endif | 1016 | #endif |
1019 | 1017 | ||
1020 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 1018 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
1021 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 1019 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
1022 | spi_register_board_info(bfin_spi_board_info, | ||
1023 | ARRAY_SIZE(bfin_spi_board_info)); | ||
1024 | #endif | ||
1025 | 1020 | ||
1026 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 1021 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
1027 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 1022 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 9d28415163ea..079389cbd859 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -87,9 +87,6 @@ static struct platform_device smc91x_device = { | |||
87 | }; | 87 | }; |
88 | #endif | 88 | #endif |
89 | 89 | ||
90 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
91 | /* all SPI peripherals info goes here */ | ||
92 | |||
93 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 90 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
94 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 91 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
95 | { | 92 | { |
@@ -189,6 +186,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
189 | #endif | 186 | #endif |
190 | }; | 187 | }; |
191 | 188 | ||
189 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
192 | /* SPI (0) */ | 190 | /* SPI (0) */ |
193 | static struct resource bfin_spi0_resource[] = { | 191 | static struct resource bfin_spi0_resource[] = { |
194 | [0] = { | 192 | [0] = { |
@@ -425,9 +423,7 @@ static int __init ezkit_init(void) | |||
425 | { | 423 | { |
426 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 424 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
427 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 425 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
428 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
429 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 426 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
430 | #endif | ||
431 | 427 | ||
432 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 428 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
433 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 429 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index ec05b236dc3f..13ae49515f73 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -161,9 +161,6 @@ static struct platform_device stamp_flash_device = { | |||
161 | }; | 161 | }; |
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
165 | /* all SPI peripherals info goes here */ | ||
166 | |||
167 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 164 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
168 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 165 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
169 | { | 166 | { |
@@ -320,6 +317,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
320 | #endif | 317 | #endif |
321 | }; | 318 | }; |
322 | 319 | ||
320 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
323 | /* SPI (0) */ | 321 | /* SPI (0) */ |
324 | static struct resource bfin_spi0_resource[] = { | 322 | static struct resource bfin_spi0_resource[] = { |
325 | [0] = { | 323 | [0] = { |
@@ -626,10 +624,8 @@ static int __init stamp_init(void) | |||
626 | SSYNC(); | 624 | SSYNC(); |
627 | #endif | 625 | #endif |
628 | 626 | ||
629 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 627 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
630 | spi_register_board_info(bfin_spi_board_info, | 628 | |
631 | ARRAY_SIZE(bfin_spi_board_info)); | ||
632 | #endif | ||
633 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 629 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
634 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 630 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
635 | #endif | 631 | #endif |
diff --git a/arch/blackfin/mach-bf537/boards/Makefile b/arch/blackfin/mach-bf537/boards/Makefile index 87e450f29e37..c94f7a5b8211 100644 --- a/arch/blackfin/mach-bf537/boards/Makefile +++ b/arch/blackfin/mach-bf537/boards/Makefile | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o | 5 | obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o |
6 | obj-$(CONFIG_BFIN537_STAMP) += stamp.o led.o | 6 | obj-$(CONFIG_BFIN537_STAMP) += stamp.o |
7 | obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o | 7 | obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o |
8 | obj-$(CONFIG_PNAV10) += pnav10.o | 8 | obj-$(CONFIG_PNAV10) += pnav10.o |
9 | obj-$(CONFIG_CAMSIG_MINOTAUR) += minotaur.o | 9 | obj-$(CONFIG_CAMSIG_MINOTAUR) += minotaur.o |
diff --git a/arch/blackfin/mach-bf537/boards/led.S b/arch/blackfin/mach-bf537/boards/led.S deleted file mode 100644 index 4e9ea4283e5f..000000000000 --- a/arch/blackfin/mach-bf537/boards/led.S +++ /dev/null | |||
@@ -1,183 +0,0 @@ | |||
1 | /**************************************************** | ||
2 | * LED1 ---- PF6 LED2 ---- PF7 * | ||
3 | * LED3 ---- PF8 LED4 ---- PF9 * | ||
4 | * LED5 ---- PF10 LED6 ---- PF11 * | ||
5 | ****************************************************/ | ||
6 | |||
7 | #include <linux/linkage.h> | ||
8 | #include <asm/blackfin.h> | ||
9 | |||
10 | /* All functions in this file save the registers they uses. | ||
11 | So there is no need to save any registers before calling them. */ | ||
12 | |||
13 | .text; | ||
14 | |||
15 | /* Initialize LEDs. */ | ||
16 | |||
17 | ENTRY(_led_init) | ||
18 | LINK 12; | ||
19 | [--SP] = P0; | ||
20 | [--SP] = R0; | ||
21 | [--SP] = R1; | ||
22 | [--SP] = R2; | ||
23 | R1 = PF6|PF7|PF8|PF9|PF10|PF11 (Z); | ||
24 | R2 = ~R1; | ||
25 | |||
26 | P0.H = hi(PORTF_FER); | ||
27 | P0.L = lo(PORTF_FER); | ||
28 | R0 = W[P0](Z); | ||
29 | SSYNC; | ||
30 | R0 = R0 & R2; | ||
31 | W[P0] = R0.L; | ||
32 | SSYNC; | ||
33 | |||
34 | P0.H = hi(PORTFIO_DIR); | ||
35 | P0.L = lo(PORTFIO_DIR); | ||
36 | R0 = W[P0](Z); | ||
37 | SSYNC; | ||
38 | R0 = R0 | R1; | ||
39 | W[P0] = R0.L; | ||
40 | SSYNC; | ||
41 | |||
42 | P0.H = hi(PORTFIO_INEN); | ||
43 | P0.L = lo(PORTFIO_INEN); | ||
44 | R0 = W[P0](Z); | ||
45 | SSYNC; | ||
46 | R0 = R0 & R2; | ||
47 | W[P0] = R0.L; | ||
48 | SSYNC; | ||
49 | |||
50 | R2 = [SP++]; | ||
51 | R1 = [SP++]; | ||
52 | R0 = [SP++]; | ||
53 | P0 = [SP++]; | ||
54 | UNLINK; | ||
55 | RTS; | ||
56 | .size _led_init, .-_led_init | ||
57 | |||
58 | /* Set one LED on. Leave other LEDs unchanged. | ||
59 | It expects the LED number passed through R0. */ | ||
60 | |||
61 | ENTRY(_led_on) | ||
62 | LINK 12; | ||
63 | [--SP] = P0; | ||
64 | [--SP] = R1; | ||
65 | CALL _led_init; | ||
66 | R1 = 1; | ||
67 | R0 += 5; | ||
68 | R1 <<= R0; | ||
69 | P0.H = hi(PORTFIO); | ||
70 | P0.L = lo(PORTFIO); | ||
71 | R0 = W[P0](Z); | ||
72 | SSYNC; | ||
73 | R0 = R0 | R1; | ||
74 | W[P0] = R0.L; | ||
75 | SSYNC; | ||
76 | R1 = [SP++]; | ||
77 | P0 = [SP++]; | ||
78 | UNLINK; | ||
79 | RTS; | ||
80 | .size _led_on, .-_led_on | ||
81 | |||
82 | /* Set one LED off. Leave other LEDs unchanged. */ | ||
83 | |||
84 | ENTRY(_led_off) | ||
85 | LINK 12; | ||
86 | [--SP] = P0; | ||
87 | [--SP] = R1; | ||
88 | CALL _led_init; | ||
89 | R1 = 1; | ||
90 | R0 += 5; | ||
91 | R1 <<= R0; | ||
92 | R1 = ~R1; | ||
93 | P0.H = hi(PORTFIO); | ||
94 | P0.L = lo(PORTFIO); | ||
95 | R0 = W[P0](Z); | ||
96 | SSYNC; | ||
97 | R0 = R0 & R1; | ||
98 | W[P0] = R0.L; | ||
99 | SSYNC; | ||
100 | R1 = [SP++]; | ||
101 | P0 = [SP++]; | ||
102 | UNLINK; | ||
103 | RTS; | ||
104 | .size _led_off, .-_led_off | ||
105 | |||
106 | /* Toggle one LED. Leave other LEDs unchanged. */ | ||
107 | |||
108 | ENTRY(_led_toggle) | ||
109 | LINK 12; | ||
110 | [--SP] = P0; | ||
111 | [--SP] = R1; | ||
112 | CALL _led_init; | ||
113 | R1 = 1; | ||
114 | R0 += 5; | ||
115 | R1 <<= R0; | ||
116 | P0.H = hi(PORTFIO); | ||
117 | P0.L = lo(PORTFIO); | ||
118 | R0 = W[P0](Z); | ||
119 | SSYNC; | ||
120 | R0 = R0 ^ R1; | ||
121 | W[P0] = R0.L; | ||
122 | SSYNC; | ||
123 | R1 = [SP++]; | ||
124 | P0 = [SP++]; | ||
125 | UNLINK; | ||
126 | RTS; | ||
127 | .size _led_toggle, .-_led_toggle | ||
128 | |||
129 | /* Display the number using LEDs in binary format. */ | ||
130 | |||
131 | ENTRY(_led_disp_num) | ||
132 | LINK 12; | ||
133 | [--SP] = P0; | ||
134 | [--SP] = R1; | ||
135 | [--SP] = R2; | ||
136 | CALL _led_init; | ||
137 | R1 = 0x3f(X); | ||
138 | R0 = R0 & R1; | ||
139 | R2 = 6(X); | ||
140 | R0 <<= R2; | ||
141 | R1 <<= R2; | ||
142 | P0.H = hi(PORTFIO); | ||
143 | P0.L = lo(PORTFIO); | ||
144 | R2 = W[P0](Z); | ||
145 | SSYNC; | ||
146 | R1 = ~R1; | ||
147 | R2 = R2 & R1; | ||
148 | R2 = R2 | R0; | ||
149 | W[P0] = R2.L; | ||
150 | SSYNC; | ||
151 | R2 = [SP++]; | ||
152 | R1 = [SP++]; | ||
153 | P0 = [SP++]; | ||
154 | UNLINK; | ||
155 | RTS; | ||
156 | .size _led_disp_num, .-_led_disp_num | ||
157 | |||
158 | /* Toggle the number using LEDs in binary format. */ | ||
159 | |||
160 | ENTRY(_led_toggle_num) | ||
161 | LINK 12; | ||
162 | [--SP] = P0; | ||
163 | [--SP] = R1; | ||
164 | [--SP] = R2; | ||
165 | CALL _led_init; | ||
166 | R1 = 0x3f(X); | ||
167 | R0 = R0 & R1; | ||
168 | R1 = 6(X); | ||
169 | R0 <<= R1; | ||
170 | P0.H = hi(PORTFIO); | ||
171 | P0.L = lo(PORTFIO); | ||
172 | R1 = W[P0](Z); | ||
173 | SSYNC; | ||
174 | R1 = R1 ^ R0; | ||
175 | W[P0] = R1.L; | ||
176 | SSYNC; | ||
177 | R2 = [SP++]; | ||
178 | R1 = [SP++]; | ||
179 | P0 = [SP++]; | ||
180 | UNLINK; | ||
181 | RTS; | ||
182 | .size _led_toggle_num, .-_led_toggle_num | ||
183 | |||
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 9a756d1f3d73..671f9d67f23a 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -400,9 +400,6 @@ static struct platform_device stamp_flash_device = { | |||
400 | }; | 400 | }; |
401 | #endif | 401 | #endif |
402 | 402 | ||
403 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
404 | /* all SPI peripherals info goes here */ | ||
405 | |||
406 | #if defined(CONFIG_MTD_M25P80) \ | 403 | #if defined(CONFIG_MTD_M25P80) \ |
407 | || defined(CONFIG_MTD_M25P80_MODULE) | 404 | || defined(CONFIG_MTD_M25P80_MODULE) |
408 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 405 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
@@ -629,6 +626,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
629 | #endif | 626 | #endif |
630 | }; | 627 | }; |
631 | 628 | ||
629 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
632 | /* SPI controller data */ | 630 | /* SPI controller data */ |
633 | static struct bfin5xx_spi_master bfin_spi0_info = { | 631 | static struct bfin5xx_spi_master bfin_spi0_info = { |
634 | .num_chipselect = 8, | 632 | .num_chipselect = 8, |
@@ -939,10 +937,7 @@ static int __init stamp_init(void) | |||
939 | #endif | 937 | #endif |
940 | 938 | ||
941 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 939 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
942 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 940 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
943 | spi_register_board_info(bfin_spi_board_info, | ||
944 | ARRAY_SIZE(bfin_spi_board_info)); | ||
945 | #endif | ||
946 | 941 | ||
947 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 942 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
948 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 943 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
diff --git a/arch/blackfin/mach-bf548/boards/Makefile b/arch/blackfin/mach-bf548/boards/Makefile index eed161dd7845..319ef54c4221 100644 --- a/arch/blackfin/mach-bf548/boards/Makefile +++ b/arch/blackfin/mach-bf548/boards/Makefile | |||
@@ -2,5 +2,5 @@ | |||
2 | # arch/blackfin/mach-bf548/boards/Makefile | 2 | # arch/blackfin/mach-bf548/boards/Makefile |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_BFIN548_EZKIT) += ezkit.o led.o | 5 | obj-$(CONFIG_BFIN548_EZKIT) += ezkit.o |
6 | obj-$(CONFIG_BFIN548_BLUETECHNIX_CM) += cm_bf548.o | 6 | obj-$(CONFIG_BFIN548_BLUETECHNIX_CM) += cm_bf548.o |
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 3b74f96d3590..4f4ae8787edf 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
@@ -684,7 +684,7 @@ static struct platform_device *cm_bf548_devices[] __initdata = { | |||
684 | 684 | ||
685 | static int __init cm_bf548_init(void) | 685 | static int __init cm_bf548_init(void) |
686 | { | 686 | { |
687 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | 687 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
688 | platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices)); | 688 | platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices)); |
689 | 689 | ||
690 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 690 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index d1682bb37509..af7c211a580e 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -412,8 +412,6 @@ static struct platform_device ezkit_flash_device = { | |||
412 | }; | 412 | }; |
413 | #endif | 413 | #endif |
414 | 414 | ||
415 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
416 | /* all SPI peripherals info goes here */ | ||
417 | #if defined(CONFIG_MTD_M25P80) \ | 415 | #if defined(CONFIG_MTD_M25P80) \ |
418 | || defined(CONFIG_MTD_M25P80_MODULE) | 416 | || defined(CONFIG_MTD_M25P80_MODULE) |
419 | /* SPI flash chip (m25p16) */ | 417 | /* SPI flash chip (m25p16) */ |
@@ -481,7 +479,7 @@ static struct bfin5xx_spi_chip spidev_chip_info = { | |||
481 | }; | 479 | }; |
482 | #endif | 480 | #endif |
483 | 481 | ||
484 | static struct spi_board_info bf54x_spi_board_info[] __initdata = { | 482 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
485 | #if defined(CONFIG_MTD_M25P80) \ | 483 | #if defined(CONFIG_MTD_M25P80) \ |
486 | || defined(CONFIG_MTD_M25P80_MODULE) | 484 | || defined(CONFIG_MTD_M25P80_MODULE) |
487 | { | 485 | { |
@@ -527,6 +525,7 @@ static struct spi_board_info bf54x_spi_board_info[] __initdata = { | |||
527 | #endif | 525 | #endif |
528 | }; | 526 | }; |
529 | 527 | ||
528 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
530 | /* SPI (0) */ | 529 | /* SPI (0) */ |
531 | static struct resource bfin_spi0_resource[] = { | 530 | static struct resource bfin_spi0_resource[] = { |
532 | [0] = { | 531 | [0] = { |
@@ -800,10 +799,7 @@ static int __init ezkit_init(void) | |||
800 | 799 | ||
801 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 800 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
802 | 801 | ||
803 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 802 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
804 | spi_register_board_info(bf54x_spi_board_info, | ||
805 | ARRAY_SIZE(bf54x_spi_board_info)); | ||
806 | #endif | ||
807 | 803 | ||
808 | return 0; | 804 | return 0; |
809 | } | 805 | } |
diff --git a/arch/blackfin/mach-bf548/boards/led.S b/arch/blackfin/mach-bf548/boards/led.S deleted file mode 100644 index f47daf3770d0..000000000000 --- a/arch/blackfin/mach-bf548/boards/led.S +++ /dev/null | |||
@@ -1,172 +0,0 @@ | |||
1 | /**************************************************** | ||
2 | * LED1 ---- PG6 LED2 ---- PG7 * | ||
3 | * LED3 ---- PG8 LED4 ---- PG9 * | ||
4 | * LED5 ---- PG10 LED6 ---- PG11 * | ||
5 | ****************************************************/ | ||
6 | |||
7 | #include <linux/linkage.h> | ||
8 | #include <asm/blackfin.h> | ||
9 | |||
10 | /* All functions in this file save the registers they uses. | ||
11 | So there is no need to save any registers before calling them. */ | ||
12 | |||
13 | .text; | ||
14 | |||
15 | /* Initialize LEDs. */ | ||
16 | |||
17 | ENTRY(_led_init) | ||
18 | LINK 0; | ||
19 | [--SP] = P0; | ||
20 | [--SP] = R0; | ||
21 | [--SP] = R1; | ||
22 | [--SP] = R2; | ||
23 | R1 = (PG6|PG7|PG8|PG9|PG10|PG11)(Z); | ||
24 | R2 = ~R1; | ||
25 | |||
26 | P0.H = hi(PORTG_FER); | ||
27 | P0.L = lo(PORTG_FER); | ||
28 | R0 = W[P0](Z); | ||
29 | SSYNC; | ||
30 | R0 = R0 & R2; | ||
31 | W[P0] = R0.L; | ||
32 | SSYNC; | ||
33 | |||
34 | P0.H = hi(PORTG_DIR_SET); | ||
35 | P0.L = lo(PORTG_DIR_SET); | ||
36 | W[P0] = R1.L; | ||
37 | SSYNC; | ||
38 | |||
39 | P0.H = hi(PORTG_INEN); | ||
40 | P0.L = lo(PORTG_INEN); | ||
41 | R0 = W[P0](Z); | ||
42 | SSYNC; | ||
43 | R0 = R0 & R2; | ||
44 | W[P0] = R0.L; | ||
45 | SSYNC; | ||
46 | |||
47 | R2 = [SP++]; | ||
48 | R1 = [SP++]; | ||
49 | R0 = [SP++]; | ||
50 | P0 = [SP++]; | ||
51 | RTS; | ||
52 | .size _led_init, .-_led_init | ||
53 | |||
54 | /* Set one LED on. Leave other LEDs unchanged. | ||
55 | It expects the LED number passed through R0. */ | ||
56 | |||
57 | ENTRY(_led_on) | ||
58 | LINK 0; | ||
59 | [--SP] = P0; | ||
60 | [--SP] = R1; | ||
61 | CALL _led_init; | ||
62 | R1 = 1; | ||
63 | R0 += 5; | ||
64 | R1 <<= R0; | ||
65 | P0.H = hi(PORTG_SET); | ||
66 | P0.L = lo(PORTG_SET); | ||
67 | W[P0] = R1.L; | ||
68 | SSYNC; | ||
69 | R1 = [SP++]; | ||
70 | P0 = [SP++]; | ||
71 | UNLINK; | ||
72 | RTS; | ||
73 | .size _led_on, .-_led_on | ||
74 | |||
75 | /* Set one LED off. Leave other LEDs unchanged. */ | ||
76 | |||
77 | ENTRY(_led_off) | ||
78 | LINK 0; | ||
79 | [--SP] = P0; | ||
80 | [--SP] = R1; | ||
81 | CALL _led_init; | ||
82 | R1 = 1; | ||
83 | R0 += 5; | ||
84 | R1 <<= R0; | ||
85 | P0.H = hi(PORTG_CLEAR); | ||
86 | P0.L = lo(PORTG_CLEAR); | ||
87 | W[P0] = R1.L; | ||
88 | SSYNC; | ||
89 | R1 = [SP++]; | ||
90 | P0 = [SP++]; | ||
91 | UNLINK; | ||
92 | RTS; | ||
93 | .size _led_off, .-_led_off | ||
94 | |||
95 | /* Toggle one LED. Leave other LEDs unchanged. */ | ||
96 | |||
97 | ENTRY(_led_toggle) | ||
98 | LINK 0; | ||
99 | [--SP] = P0; | ||
100 | [--SP] = R1; | ||
101 | CALL _led_init; | ||
102 | R1 = 1; | ||
103 | R0 += 5; | ||
104 | R1 <<= R0; | ||
105 | P0.H = hi(PORTG); | ||
106 | P0.L = lo(PORTG); | ||
107 | R0 = W[P0](Z); | ||
108 | SSYNC; | ||
109 | R0 = R0 ^ R1; | ||
110 | W[P0] = R0.L; | ||
111 | SSYNC; | ||
112 | R1 = [SP++]; | ||
113 | P0 = [SP++]; | ||
114 | UNLINK; | ||
115 | RTS; | ||
116 | .size _led_toggle, .-_led_toggle | ||
117 | |||
118 | /* Display the number using LEDs in binary format. */ | ||
119 | |||
120 | ENTRY(_led_disp_num) | ||
121 | LINK 0; | ||
122 | [--SP] = P0; | ||
123 | [--SP] = R1; | ||
124 | [--SP] = R2; | ||
125 | CALL _led_init; | ||
126 | R1 = 0x3f(X); | ||
127 | R0 = R0 & R1; | ||
128 | R2 = 6(X); | ||
129 | R0 <<= R2; | ||
130 | R1 <<= R2; | ||
131 | P0.H = hi(PORTG); | ||
132 | P0.L = lo(PORTG); | ||
133 | R2 = W[P0](Z); | ||
134 | SSYNC; | ||
135 | R1 = ~R1; | ||
136 | R2 = R2 & R1; | ||
137 | R2 = R2 | R0; | ||
138 | W[P0] = R2.L; | ||
139 | SSYNC; | ||
140 | R2 = [SP++]; | ||
141 | R1 = [SP++]; | ||
142 | P0 = [SP++]; | ||
143 | UNLINK; | ||
144 | RTS; | ||
145 | .size _led_disp_num, .-_led_disp_num | ||
146 | |||
147 | /* Toggle the number using LEDs in binary format. */ | ||
148 | |||
149 | ENTRY(_led_toggle_num) | ||
150 | LINK 0; | ||
151 | [--SP] = P0; | ||
152 | [--SP] = R1; | ||
153 | [--SP] = R2; | ||
154 | CALL _led_init; | ||
155 | R1 = 0x3f(X); | ||
156 | R0 = R0 & R1; | ||
157 | R1 = 6(X); | ||
158 | R0 <<= R1; | ||
159 | P0.H = hi(PORTG); | ||
160 | P0.L = lo(PORTG); | ||
161 | R1 = W[P0](Z); | ||
162 | SSYNC; | ||
163 | R1 = R1 ^ R0; | ||
164 | W[P0] = R1.L; | ||
165 | SSYNC; | ||
166 | R2 = [SP++]; | ||
167 | R1 = [SP++]; | ||
168 | P0 = [SP++]; | ||
169 | UNLINK; | ||
170 | RTS; | ||
171 | .size _led_toggle_num, .-_led_toggle_num | ||
172 | |||
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index 61d8f7648b24..bc6feded8569 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -280,7 +280,6 @@ static struct platform_device ezkit_flash_device = { | |||
280 | }; | 280 | }; |
281 | #endif | 281 | #endif |
282 | 282 | ||
283 | #ifdef CONFIG_SPI_BFIN | ||
284 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 283 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
285 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 284 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
286 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 285 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
@@ -295,8 +294,8 @@ static struct bfin5xx_spi_chip spidev_chip_info = { | |||
295 | .bits_per_word = 8, | 294 | .bits_per_word = 8, |
296 | }; | 295 | }; |
297 | #endif | 296 | #endif |
298 | #endif | ||
299 | 297 | ||
298 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
300 | /* SPI (0) */ | 299 | /* SPI (0) */ |
301 | static struct resource bfin_spi0_resource[] = { | 300 | static struct resource bfin_spi0_resource[] = { |
302 | [0] = { | 301 | [0] = { |
@@ -327,6 +326,7 @@ static struct platform_device bfin_spi0_device = { | |||
327 | .platform_data = &bfin_spi0_info, /* Passed to driver */ | 326 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
328 | }, | 327 | }, |
329 | }; | 328 | }; |
329 | #endif | ||
330 | 330 | ||
331 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 331 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
332 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 332 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
@@ -537,10 +537,7 @@ static int __init ezkit_init(void) | |||
537 | SSYNC(); | 537 | SSYNC(); |
538 | #endif | 538 | #endif |
539 | 539 | ||
540 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 540 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
541 | spi_register_board_info(bfin_spi_board_info, | ||
542 | ARRAY_SIZE(bfin_spi_board_info)); | ||
543 | #endif | ||
544 | 541 | ||
545 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 542 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
546 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 543 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
diff --git a/arch/frv/kernel/cmode.S b/arch/frv/kernel/cmode.S index 81ba28ad2207..53deeb5d7e87 100644 --- a/arch/frv/kernel/cmode.S +++ b/arch/frv/kernel/cmode.S | |||
@@ -1,7 +1,7 @@ | |||
1 | /* cmode.S: clock mode management | 1 | /* cmode.S: clock mode management |
2 | * | 2 | * |
3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. |
4 | * Written by David Woodhouse (dwmw2@redhat.com) | 4 | * Written by David Woodhouse (dwmw2@infradead.org) |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
diff --git a/arch/frv/kernel/sleep.S b/arch/frv/kernel/sleep.S index c9b2d51ab9ad..f67bf73cd2cc 100644 --- a/arch/frv/kernel/sleep.S +++ b/arch/frv/kernel/sleep.S | |||
@@ -1,7 +1,7 @@ | |||
1 | /* sleep.S: power saving mode entry | 1 | /* sleep.S: power saving mode entry |
2 | * | 2 | * |
3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. |
4 | * Written by David Woodhouse (dwmw2@redhat.com) | 4 | * Written by David Woodhouse (dwmw2@infradead.org) |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c index 4985466b1a7c..64ee58d748be 100644 --- a/arch/frv/mb93090-mb00/pci-dma-nommu.c +++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* pci-dma-nommu.c: Dynamic DMA mapping support for the FRV | 1 | /* pci-dma-nommu.c: Dynamic DMA mapping support for the FRV |
2 | * | 2 | * |
3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. |
4 | * Written by David Woodhouse (dwmw2@redhat.com) | 4 | * Written by David Woodhouse (dwmw2@infradead.org) |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c index b841ecfd5d5a..9af7740f32fb 100644 --- a/arch/frv/mm/init.c +++ b/arch/frv/mm/init.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
27 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
28 | #include <linux/highmem.h> | 28 | #include <linux/highmem.h> |
29 | #include <linux/module.h> | ||
29 | 30 | ||
30 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
31 | #include <asm/segment.h> | 32 | #include <asm/segment.h> |
@@ -56,7 +57,9 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
56 | */ | 57 | */ |
57 | static unsigned long empty_bad_page_table; | 58 | static unsigned long empty_bad_page_table; |
58 | static unsigned long empty_bad_page; | 59 | static unsigned long empty_bad_page; |
60 | |||
59 | unsigned long empty_zero_page; | 61 | unsigned long empty_zero_page; |
62 | EXPORT_SYMBOL(empty_zero_page); | ||
60 | 63 | ||
61 | /*****************************************************************************/ | 64 | /*****************************************************************************/ |
62 | /* | 65 | /* |
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 88f1a55c6c94..e67ee3f27698 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
@@ -57,6 +57,7 @@ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ | |||
57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ | 57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ |
58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ | 58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ |
59 | core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ | 59 | core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ |
60 | core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ | ||
60 | core-$(CONFIG_KVM) += arch/ia64/kvm/ | 61 | core-$(CONFIG_KVM) += arch/ia64/kvm/ |
61 | 62 | ||
62 | drivers-$(CONFIG_PCI) += arch/ia64/pci/ | 63 | drivers-$(CONFIG_PCI) += arch/ia64/pci/ |
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 853d1f11be00..43687cc60dfb 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -465,7 +465,6 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | |||
465 | printk(KERN_ERR | 465 | printk(KERN_ERR |
466 | "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n", | 466 | "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n", |
467 | len, slit->header.length); | 467 | len, slit->header.length); |
468 | memset(numa_slit, 10, sizeof(numa_slit)); | ||
469 | return; | 468 | return; |
470 | } | 469 | } |
471 | slit_table = slit; | 470 | slit_table = slit; |
@@ -574,8 +573,14 @@ void __init acpi_numa_arch_fixup(void) | |||
574 | printk(KERN_INFO "Number of memory chunks in system = %d\n", | 573 | printk(KERN_INFO "Number of memory chunks in system = %d\n", |
575 | num_node_memblks); | 574 | num_node_memblks); |
576 | 575 | ||
577 | if (!slit_table) | 576 | if (!slit_table) { |
577 | for (i = 0; i < MAX_NUMNODES; i++) | ||
578 | for (j = 0; j < MAX_NUMNODES; j++) | ||
579 | node_distance(i, j) = i == j ? LOCAL_DISTANCE : | ||
580 | REMOTE_DISTANCE; | ||
578 | return; | 581 | return; |
582 | } | ||
583 | |||
579 | memset(numa_slit, -1, sizeof(numa_slit)); | 584 | memset(numa_slit, -1, sizeof(numa_slit)); |
580 | for (i = 0; i < slit_table->locality_count; i++) { | 585 | for (i = 0; i < slit_table->locality_count; i++) { |
581 | if (!pxm_bit_test(i)) | 586 | if (!pxm_bit_test(i)) |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 082c31dcfd99..39752cdef6ff 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -558,8 +558,6 @@ static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void) | |||
558 | if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) { | 558 | if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) { |
559 | rte = alloc_bootmem(sizeof(struct iosapic_rte_info) * | 559 | rte = alloc_bootmem(sizeof(struct iosapic_rte_info) * |
560 | NR_PREALLOCATE_RTE_ENTRIES); | 560 | NR_PREALLOCATE_RTE_ENTRIES); |
561 | if (!rte) | ||
562 | return NULL; | ||
563 | for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++) | 561 | for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++) |
564 | list_add(&rte->rte_list, &free_rte_list); | 562 | list_add(&rte->rte_list, &free_rte_list); |
565 | } | 563 | } |
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S index 6678c49daba3..80b44ea052d7 100644 --- a/arch/ia64/kernel/ivt.S +++ b/arch/ia64/kernel/ivt.S | |||
@@ -1076,48 +1076,6 @@ END(ia64_syscall_setup) | |||
1076 | DBG_FAULT(15) | 1076 | DBG_FAULT(15) |
1077 | FAULT(15) | 1077 | FAULT(15) |
1078 | 1078 | ||
1079 | /* | ||
1080 | * Squatting in this space ... | ||
1081 | * | ||
1082 | * This special case dispatcher for illegal operation faults allows preserved | ||
1083 | * registers to be modified through a callback function (asm only) that is handed | ||
1084 | * back from the fault handler in r8. Up to three arguments can be passed to the | ||
1085 | * callback function by returning an aggregate with the callback as its first | ||
1086 | * element, followed by the arguments. | ||
1087 | */ | ||
1088 | ENTRY(dispatch_illegal_op_fault) | ||
1089 | .prologue | ||
1090 | .body | ||
1091 | SAVE_MIN_WITH_COVER | ||
1092 | ssm psr.ic | PSR_DEFAULT_BITS | ||
1093 | ;; | ||
1094 | srlz.i // guarantee that interruption collection is on | ||
1095 | ;; | ||
1096 | (p15) ssm psr.i // restore psr.i | ||
1097 | adds r3=8,r2 // set up second base pointer for SAVE_REST | ||
1098 | ;; | ||
1099 | alloc r14=ar.pfs,0,0,1,0 // must be first in insn group | ||
1100 | mov out0=ar.ec | ||
1101 | ;; | ||
1102 | SAVE_REST | ||
1103 | PT_REGS_UNWIND_INFO(0) | ||
1104 | ;; | ||
1105 | br.call.sptk.many rp=ia64_illegal_op_fault | ||
1106 | .ret0: ;; | ||
1107 | alloc r14=ar.pfs,0,0,3,0 // must be first in insn group | ||
1108 | mov out0=r9 | ||
1109 | mov out1=r10 | ||
1110 | mov out2=r11 | ||
1111 | movl r15=ia64_leave_kernel | ||
1112 | ;; | ||
1113 | mov rp=r15 | ||
1114 | mov b6=r8 | ||
1115 | ;; | ||
1116 | cmp.ne p6,p0=0,r8 | ||
1117 | (p6) br.call.dpnt.many b6=b6 // call returns to ia64_leave_kernel | ||
1118 | br.sptk.many ia64_leave_kernel | ||
1119 | END(dispatch_illegal_op_fault) | ||
1120 | |||
1121 | .org ia64_ivt+0x4000 | 1079 | .org ia64_ivt+0x4000 |
1122 | ///////////////////////////////////////////////////////////////////////////////////////// | 1080 | ///////////////////////////////////////////////////////////////////////////////////////// |
1123 | // 0x4000 Entry 16 (size 64 bundles) Reserved | 1081 | // 0x4000 Entry 16 (size 64 bundles) Reserved |
@@ -1715,6 +1673,48 @@ END(ia32_interrupt) | |||
1715 | DBG_FAULT(67) | 1673 | DBG_FAULT(67) |
1716 | FAULT(67) | 1674 | FAULT(67) |
1717 | 1675 | ||
1676 | /* | ||
1677 | * Squatting in this space ... | ||
1678 | * | ||
1679 | * This special case dispatcher for illegal operation faults allows preserved | ||
1680 | * registers to be modified through a callback function (asm only) that is handed | ||
1681 | * back from the fault handler in r8. Up to three arguments can be passed to the | ||
1682 | * callback function by returning an aggregate with the callback as its first | ||
1683 | * element, followed by the arguments. | ||
1684 | */ | ||
1685 | ENTRY(dispatch_illegal_op_fault) | ||
1686 | .prologue | ||
1687 | .body | ||
1688 | SAVE_MIN_WITH_COVER | ||
1689 | ssm psr.ic | PSR_DEFAULT_BITS | ||
1690 | ;; | ||
1691 | srlz.i // guarantee that interruption collection is on | ||
1692 | ;; | ||
1693 | (p15) ssm psr.i // restore psr.i | ||
1694 | adds r3=8,r2 // set up second base pointer for SAVE_REST | ||
1695 | ;; | ||
1696 | alloc r14=ar.pfs,0,0,1,0 // must be first in insn group | ||
1697 | mov out0=ar.ec | ||
1698 | ;; | ||
1699 | SAVE_REST | ||
1700 | PT_REGS_UNWIND_INFO(0) | ||
1701 | ;; | ||
1702 | br.call.sptk.many rp=ia64_illegal_op_fault | ||
1703 | .ret0: ;; | ||
1704 | alloc r14=ar.pfs,0,0,3,0 // must be first in insn group | ||
1705 | mov out0=r9 | ||
1706 | mov out1=r10 | ||
1707 | mov out2=r11 | ||
1708 | movl r15=ia64_leave_kernel | ||
1709 | ;; | ||
1710 | mov rp=r15 | ||
1711 | mov b6=r8 | ||
1712 | ;; | ||
1713 | cmp.ne p6,p0=0,r8 | ||
1714 | (p6) br.call.dpnt.many b6=b6 // call returns to ia64_leave_kernel | ||
1715 | br.sptk.many ia64_leave_kernel | ||
1716 | END(dispatch_illegal_op_fault) | ||
1717 | |||
1718 | #ifdef CONFIG_IA32_SUPPORT | 1718 | #ifdef CONFIG_IA32_SUPPORT |
1719 | 1719 | ||
1720 | /* | 1720 | /* |
diff --git a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h index 7c548ac52bbc..74b6d670aaef 100644 --- a/arch/ia64/kernel/minstate.h +++ b/arch/ia64/kernel/minstate.h | |||
@@ -15,6 +15,9 @@ | |||
15 | #define ACCOUNT_SYS_ENTER | 15 | #define ACCOUNT_SYS_ENTER |
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | .section ".data.patch.rse", "a" | ||
19 | .previous | ||
20 | |||
18 | /* | 21 | /* |
19 | * DO_SAVE_MIN switches to the kernel stacks (if necessary) and saves | 22 | * DO_SAVE_MIN switches to the kernel stacks (if necessary) and saves |
20 | * the minimum state necessary that allows us to turn psr.ic back | 23 | * the minimum state necessary that allows us to turn psr.ic back |
@@ -40,7 +43,7 @@ | |||
40 | * Note that psr.ic is NOT turned on by this macro. This is so that | 43 | * Note that psr.ic is NOT turned on by this macro. This is so that |
41 | * we can pass interruption state as arguments to a handler. | 44 | * we can pass interruption state as arguments to a handler. |
42 | */ | 45 | */ |
43 | #define DO_SAVE_MIN(COVER,SAVE_IFS,EXTRA) \ | 46 | #define DO_SAVE_MIN(COVER,SAVE_IFS,EXTRA,WORKAROUND) \ |
44 | mov r16=IA64_KR(CURRENT); /* M */ \ | 47 | mov r16=IA64_KR(CURRENT); /* M */ \ |
45 | mov r27=ar.rsc; /* M */ \ | 48 | mov r27=ar.rsc; /* M */ \ |
46 | mov r20=r1; /* A */ \ | 49 | mov r20=r1; /* A */ \ |
@@ -87,6 +90,7 @@ | |||
87 | tbit.nz p15,p0=r29,IA64_PSR_I_BIT; \ | 90 | tbit.nz p15,p0=r29,IA64_PSR_I_BIT; \ |
88 | mov r29=b0 \ | 91 | mov r29=b0 \ |
89 | ;; \ | 92 | ;; \ |
93 | WORKAROUND; \ | ||
90 | adds r16=PT(R8),r1; /* initialize first base pointer */ \ | 94 | adds r16=PT(R8),r1; /* initialize first base pointer */ \ |
91 | adds r17=PT(R9),r1; /* initialize second base pointer */ \ | 95 | adds r17=PT(R9),r1; /* initialize second base pointer */ \ |
92 | (pKStk) mov r18=r0; /* make sure r18 isn't NaT */ \ | 96 | (pKStk) mov r18=r0; /* make sure r18 isn't NaT */ \ |
@@ -206,6 +210,40 @@ | |||
206 | st8 [r25]=r10; /* ar.ssd */ \ | 210 | st8 [r25]=r10; /* ar.ssd */ \ |
207 | ;; | 211 | ;; |
208 | 212 | ||
209 | #define SAVE_MIN_WITH_COVER DO_SAVE_MIN(cover, mov r30=cr.ifs,) | 213 | #define RSE_WORKAROUND \ |
210 | #define SAVE_MIN_WITH_COVER_R19 DO_SAVE_MIN(cover, mov r30=cr.ifs, mov r15=r19) | 214 | (pUStk) extr.u r17=r18,3,6; \ |
211 | #define SAVE_MIN DO_SAVE_MIN( , mov r30=r0, ) | 215 | (pUStk) sub r16=r18,r22; \ |
216 | [1:](pKStk) br.cond.sptk.many 1f; \ | ||
217 | .xdata4 ".data.patch.rse",1b-. \ | ||
218 | ;; \ | ||
219 | cmp.ge p6,p7 = 33,r17; \ | ||
220 | ;; \ | ||
221 | (p6) mov r17=0x310; \ | ||
222 | (p7) mov r17=0x308; \ | ||
223 | ;; \ | ||
224 | cmp.leu p1,p0=r16,r17; \ | ||
225 | (p1) br.cond.sptk.many 1f; \ | ||
226 | dep.z r17=r26,0,62; \ | ||
227 | movl r16=2f; \ | ||
228 | ;; \ | ||
229 | mov ar.pfs=r17; \ | ||
230 | dep r27=r0,r27,16,14; \ | ||
231 | mov b0=r16; \ | ||
232 | ;; \ | ||
233 | br.ret.sptk b0; \ | ||
234 | ;; \ | ||
235 | 2: \ | ||
236 | mov ar.rsc=r0 \ | ||
237 | ;; \ | ||
238 | flushrs; \ | ||
239 | ;; \ | ||
240 | mov ar.bspstore=r22 \ | ||
241 | ;; \ | ||
242 | mov r18=ar.bsp; \ | ||
243 | ;; \ | ||
244 | 1: \ | ||
245 | .pred.rel "mutex", pKStk, pUStk | ||
246 | |||
247 | #define SAVE_MIN_WITH_COVER DO_SAVE_MIN(cover, mov r30=cr.ifs, , RSE_WORKAROUND) | ||
248 | #define SAVE_MIN_WITH_COVER_R19 DO_SAVE_MIN(cover, mov r30=cr.ifs, mov r15=r19, RSE_WORKAROUND) | ||
249 | #define SAVE_MIN DO_SAVE_MIN( , mov r30=r0, , ) | ||
diff --git a/arch/ia64/kernel/patch.c b/arch/ia64/kernel/patch.c index e0dca8743dbb..b83b2c516008 100644 --- a/arch/ia64/kernel/patch.c +++ b/arch/ia64/kernel/patch.c | |||
@@ -115,6 +115,29 @@ ia64_patch_vtop (unsigned long start, unsigned long end) | |||
115 | ia64_srlz_i(); | 115 | ia64_srlz_i(); |
116 | } | 116 | } |
117 | 117 | ||
118 | /* | ||
119 | * Disable the RSE workaround by turning the conditional branch | ||
120 | * that we tagged in each place the workaround was used into an | ||
121 | * unconditional branch. | ||
122 | */ | ||
123 | void __init | ||
124 | ia64_patch_rse (unsigned long start, unsigned long end) | ||
125 | { | ||
126 | s32 *offp = (s32 *) start; | ||
127 | u64 ip, *b; | ||
128 | |||
129 | while (offp < (s32 *) end) { | ||
130 | ip = (u64) offp + *offp; | ||
131 | |||
132 | b = (u64 *)(ip & -16); | ||
133 | b[1] &= ~0xf800000L; | ||
134 | ia64_fc((void *) ip); | ||
135 | ++offp; | ||
136 | } | ||
137 | ia64_sync_i(); | ||
138 | ia64_srlz_i(); | ||
139 | } | ||
140 | |||
118 | void __init | 141 | void __init |
119 | ia64_patch_mckinley_e9 (unsigned long start, unsigned long end) | 142 | ia64_patch_mckinley_e9 (unsigned long start, unsigned long end) |
120 | { | 143 | { |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 71d05133f556..7714a97b0104 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -1864,11 +1864,6 @@ pfm_flush(struct file *filp, fl_owner_t id) | |||
1864 | * invoked after, it will find an empty queue and no | 1864 | * invoked after, it will find an empty queue and no |
1865 | * signal will be sent. In both case, we are safe | 1865 | * signal will be sent. In both case, we are safe |
1866 | */ | 1866 | */ |
1867 | if (filp->f_flags & FASYNC) { | ||
1868 | DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue)); | ||
1869 | pfm_do_fasync (-1, filp, ctx, 0); | ||
1870 | } | ||
1871 | |||
1872 | PROTECT_CTX(ctx, flags); | 1867 | PROTECT_CTX(ctx, flags); |
1873 | 1868 | ||
1874 | state = ctx->ctx_state; | 1869 | state = ctx->ctx_state; |
@@ -1999,6 +1994,11 @@ pfm_close(struct inode *inode, struct file *filp) | |||
1999 | return -EBADF; | 1994 | return -EBADF; |
2000 | } | 1995 | } |
2001 | 1996 | ||
1997 | if (filp->f_flags & FASYNC) { | ||
1998 | DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue)); | ||
1999 | pfm_do_fasync(-1, filp, ctx, 0); | ||
2000 | } | ||
2001 | |||
2002 | PROTECT_CTX(ctx, flags); | 2002 | PROTECT_CTX(ctx, flags); |
2003 | 2003 | ||
2004 | state = ctx->ctx_state; | 2004 | state = ctx->ctx_state; |
diff --git a/arch/ia64/kernel/sal.c b/arch/ia64/kernel/sal.c index 7e0259709c04..0464173ea568 100644 --- a/arch/ia64/kernel/sal.c +++ b/arch/ia64/kernel/sal.c | |||
@@ -252,11 +252,10 @@ check_sal_cache_flush (void) | |||
252 | local_irq_save(flags); | 252 | local_irq_save(flags); |
253 | 253 | ||
254 | /* | 254 | /* |
255 | * Schedule a timer interrupt, wait until it's reported, and see if | 255 | * Send ourselves a timer interrupt, wait until it's reported, and see |
256 | * SAL_CACHE_FLUSH drops it. | 256 | * if SAL_CACHE_FLUSH drops it. |
257 | */ | 257 | */ |
258 | ia64_set_itv(IA64_TIMER_VECTOR); | 258 | platform_send_ipi(cpu, IA64_TIMER_VECTOR, IA64_IPI_DM_INT, 0); |
259 | ia64_set_itm(ia64_get_itc() + 1000); | ||
260 | 259 | ||
261 | while (!ia64_get_irr(IA64_TIMER_VECTOR)) | 260 | while (!ia64_get_irr(IA64_TIMER_VECTOR)) |
262 | cpu_relax(); | 261 | cpu_relax(); |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index e9596cd0cdab..632cda8f2e76 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -547,7 +547,8 @@ setup_arch (char **cmdline_p) | |||
547 | # ifdef CONFIG_ACPI_NUMA | 547 | # ifdef CONFIG_ACPI_NUMA |
548 | acpi_numa_init(); | 548 | acpi_numa_init(); |
549 | per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ? | 549 | per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ? |
550 | 32 : cpus_weight(early_cpu_possible_map)), additional_cpus); | 550 | 32 : cpus_weight(early_cpu_possible_map)), |
551 | additional_cpus > 0 ? additional_cpus : 0); | ||
551 | # endif | 552 | # endif |
552 | #else | 553 | #else |
553 | # ifdef CONFIG_SMP | 554 | # ifdef CONFIG_SMP |
@@ -560,6 +561,17 @@ setup_arch (char **cmdline_p) | |||
560 | /* process SAL system table: */ | 561 | /* process SAL system table: */ |
561 | ia64_sal_init(__va(efi.sal_systab)); | 562 | ia64_sal_init(__va(efi.sal_systab)); |
562 | 563 | ||
564 | #ifdef CONFIG_ITANIUM | ||
565 | ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist); | ||
566 | #else | ||
567 | { | ||
568 | u64 num_phys_stacked; | ||
569 | |||
570 | if (ia64_pal_rse_info(&num_phys_stacked, 0) == 0 && num_phys_stacked > 96) | ||
571 | ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist); | ||
572 | } | ||
573 | #endif | ||
574 | |||
563 | #ifdef CONFIG_SMP | 575 | #ifdef CONFIG_SMP |
564 | cpu_physical_id(0) = hard_smp_processor_id(); | 576 | cpu_physical_id(0) = hard_smp_processor_id(); |
565 | #endif | 577 | #endif |
@@ -567,8 +579,6 @@ setup_arch (char **cmdline_p) | |||
567 | cpu_init(); /* initialize the bootstrap CPU */ | 579 | cpu_init(); /* initialize the bootstrap CPU */ |
568 | mmu_context_init(); /* initialize context_id bitmap */ | 580 | mmu_context_init(); /* initialize context_id bitmap */ |
569 | 581 | ||
570 | check_sal_cache_flush(); | ||
571 | |||
572 | #ifdef CONFIG_ACPI | 582 | #ifdef CONFIG_ACPI |
573 | acpi_boot_init(); | 583 | acpi_boot_init(); |
574 | #endif | 584 | #endif |
@@ -596,6 +606,7 @@ setup_arch (char **cmdline_p) | |||
596 | ia64_mca_init(); | 606 | ia64_mca_init(); |
597 | 607 | ||
598 | platform_setup(cmdline_p); | 608 | platform_setup(cmdline_p); |
609 | check_sal_cache_flush(); | ||
599 | paging_init(); | 610 | paging_init(); |
600 | } | 611 | } |
601 | 612 | ||
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 8c73643f2d66..aad1b7b1fff9 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -117,6 +117,7 @@ void account_system_vtime(struct task_struct *tsk) | |||
117 | 117 | ||
118 | local_irq_restore(flags); | 118 | local_irq_restore(flags); |
119 | } | 119 | } |
120 | EXPORT_SYMBOL_GPL(account_system_vtime); | ||
120 | 121 | ||
121 | /* | 122 | /* |
122 | * Called from the timer interrupt handler to charge accumulated user time | 123 | * Called from the timer interrupt handler to charge accumulated user time |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 80622acc95de..5929ab10a289 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
@@ -156,6 +156,13 @@ SECTIONS | |||
156 | __end___vtop_patchlist = .; | 156 | __end___vtop_patchlist = .; |
157 | } | 157 | } |
158 | 158 | ||
159 | .data.patch.rse : AT(ADDR(.data.patch.rse) - LOAD_OFFSET) | ||
160 | { | ||
161 | __start___rse_patchlist = .; | ||
162 | *(.data.patch.rse) | ||
163 | __end___rse_patchlist = .; | ||
164 | } | ||
165 | |||
159 | .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET) | 166 | .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET) |
160 | { | 167 | { |
161 | __start___mckinley_e9_bundles = .; | 168 | __start___mckinley_e9_bundles = .; |
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c index 351bf70da463..7f1a858bc69f 100644 --- a/arch/ia64/kvm/mmio.c +++ b/arch/ia64/kvm/mmio.c | |||
@@ -159,7 +159,8 @@ static void mmio_access(struct kvm_vcpu *vcpu, u64 src_pa, u64 *dest, | |||
159 | 159 | ||
160 | if (p->u.ioreq.state == STATE_IORESP_READY) { | 160 | if (p->u.ioreq.state == STATE_IORESP_READY) { |
161 | if (dir == IOREQ_READ) | 161 | if (dir == IOREQ_READ) |
162 | *dest = p->u.ioreq.data; | 162 | /* it's necessary to ensure zero extending */ |
163 | *dest = p->u.ioreq.data & (~0UL >> (64-(s*8))); | ||
163 | } else | 164 | } else |
164 | panic_vm(vcpu); | 165 | panic_vm(vcpu); |
165 | out: | 166 | out: |
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 49d3120415eb..e585f9a2afb9 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c | |||
@@ -512,6 +512,8 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si | |||
512 | int cpu; | 512 | int cpu; |
513 | char optstr[64]; | 513 | char optstr[64]; |
514 | 514 | ||
515 | if (count == 0 || count > sizeof(optstr)) | ||
516 | return -EINVAL; | ||
515 | if (copy_from_user(optstr, user, count)) | 517 | if (copy_from_user(optstr, user, count)) |
516 | return -EFAULT; | 518 | return -EFAULT; |
517 | optstr[count - 1] = '\0'; | 519 | optstr[count - 1] = '\0'; |
diff --git a/arch/ia64/uv/kernel/setup.c b/arch/ia64/uv/kernel/setup.c index 9aa743203c3c..cf5f28ae96c4 100644 --- a/arch/ia64/uv/kernel/setup.c +++ b/arch/ia64/uv/kernel/setup.c | |||
@@ -17,6 +17,9 @@ | |||
17 | DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); | 17 | DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); |
18 | EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); | 18 | EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); |
19 | 19 | ||
20 | #ifdef CONFIG_IA64_SGI_UV | ||
21 | int sn_prom_type; | ||
22 | #endif | ||
20 | 23 | ||
21 | struct redir_addr { | 24 | struct redir_addr { |
22 | unsigned long redirect; | 25 | unsigned long redirect; |
@@ -64,6 +67,15 @@ void __init uv_setup(char **cmdline_p) | |||
64 | m_n_config.s.m_skt = 37; | 67 | m_n_config.s.m_skt = 37; |
65 | m_n_config.s.n_skt = 0; | 68 | m_n_config.s.n_skt = 0; |
66 | mmr_base = 0; | 69 | mmr_base = 0; |
70 | #if 0 | ||
71 | /* Need BIOS calls - TDB */ | ||
72 | if (!ia64_sn_is_fake_prom()) | ||
73 | sn_prom_type = 1; | ||
74 | else | ||
75 | #endif | ||
76 | sn_prom_type = 2; | ||
77 | printk(KERN_INFO "Running on medusa with %s PROM\n", | ||
78 | (sn_prom_type == 1) ? "real" : "fake"); | ||
67 | } else { | 79 | } else { |
68 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); | 80 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); |
69 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); | 81 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index dca50da9ffd0..8e2a0f5faf53 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:41 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index c3cd5b749d2c..e2d511e2a1d1 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:42 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 073ae4bbe264..6e20d656adaf 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:43 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 0789ede2e9ee..a0a9b30bb502 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:45 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 3e140bf49b22..6778041de262 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:46 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index ba3a91792cbf..7cd375740348 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:47 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 4d23f99227f9..0747fa3984df 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:42:31 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 188847fed824..e7a8246840b5 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:49 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 983e53d990c8..ab536eb172bb 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:50 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 7707f3fb0a70..e05be687b500 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:51 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index a765f6f15d2c..296340d2b315 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:53 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 431513937498..8d3a416c92bf 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Sun May 18 14:44:54 2008 | 4 | # Wed May 28 22:47:35 2008 |
5 | # | 5 | # |
6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c index 891e1347bc4e..4253f870e54f 100644 --- a/arch/m68k/lib/string.c +++ b/arch/m68k/lib/string.c | |||
@@ -15,6 +15,12 @@ char *strcpy(char *dest, const char *src) | |||
15 | } | 15 | } |
16 | EXPORT_SYMBOL(strcpy); | 16 | EXPORT_SYMBOL(strcpy); |
17 | 17 | ||
18 | char *strcat(char *dest, const char *src) | ||
19 | { | ||
20 | return __kernel_strcpy(dest + __kernel_strlen(dest), src); | ||
21 | } | ||
22 | EXPORT_SYMBOL(strcat); | ||
23 | |||
18 | void *memset(void *s, int c, size_t count) | 24 | void *memset(void *s, int c, size_t count) |
19 | { | 25 | { |
20 | void *xs = s; | 26 | void *xs = s; |
diff --git a/arch/m68knommu/platform/coldfire/timers.c b/arch/m68knommu/platform/coldfire/timers.c index ba5a9f32ebd4..454f25493491 100644 --- a/arch/m68knommu/platform/coldfire/timers.c +++ b/arch/m68knommu/platform/coldfire/timers.c | |||
@@ -111,7 +111,13 @@ void hw_timer_init(void) | |||
111 | 111 | ||
112 | __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); | 112 | __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); |
113 | mcftmr_cycles_per_jiffy = FREQ / HZ; | 113 | mcftmr_cycles_per_jiffy = FREQ / HZ; |
114 | __raw_writetrr(mcftmr_cycles_per_jiffy, TA(MCFTIMER_TRR)); | 114 | /* |
115 | * The coldfire timer runs from 0 to TRR included, then 0 | ||
116 | * again and so on. It counts thus actually TRR + 1 steps | ||
117 | * for 1 tick, not TRR. So if you want n cycles, | ||
118 | * initialize TRR with n - 1. | ||
119 | */ | ||
120 | __raw_writetrr(mcftmr_cycles_per_jiffy - 1, TA(MCFTIMER_TRR)); | ||
115 | __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | | 121 | __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | |
116 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); | 122 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); |
117 | 123 | ||
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e5a7c5d96364..24c5dee91768 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1006,7 +1006,7 @@ config BOOT_ELF32 | |||
1006 | config MIPS_L1_CACHE_SHIFT | 1006 | config MIPS_L1_CACHE_SHIFT |
1007 | int | 1007 | int |
1008 | default "4" if MACH_DECSTATION | 1008 | default "4" if MACH_DECSTATION |
1009 | default "7" if SGI_IP27 || SGI_IP28 || SNI_RM | 1009 | default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM |
1010 | default "4" if PMC_MSP4200_EVAL | 1010 | default "4" if PMC_MSP4200_EVAL |
1011 | default "5" | 1011 | default "5" |
1012 | 1012 | ||
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 69648d01acc0..ad36c946ff96 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -538,19 +538,19 @@ cflags-$(CONFIG_SIBYTE_BCM1x80) += -Iinclude/asm-mips/mach-sibyte \ | |||
538 | # Sibyte SWARM board | 538 | # Sibyte SWARM board |
539 | # Sibyte BCM91x80 (BigSur) board | 539 | # Sibyte BCM91x80 (BigSur) board |
540 | # | 540 | # |
541 | libs-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/ | 541 | core-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/ |
542 | load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000 | 542 | load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000 |
543 | libs-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/ | 543 | core-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/ |
544 | load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000 | 544 | load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000 |
545 | libs-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/ | 545 | core-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/ |
546 | load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000 | 546 | load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000 |
547 | libs-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/ | 547 | core-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/ |
548 | load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000 | 548 | load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000 |
549 | libs-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ | 549 | core-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ |
550 | load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000 | 550 | load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000 |
551 | libs-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/ | 551 | core-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/ |
552 | load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000 | 552 | load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000 |
553 | libs-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ | 553 | core-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ |
554 | load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 | 554 | load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 |
555 | 555 | ||
556 | # | 556 | # |
@@ -565,7 +565,11 @@ load-$(CONFIG_BCM47XX) := 0xffffffff80001000 | |||
565 | # | 565 | # |
566 | core-$(CONFIG_SNI_RM) += arch/mips/sni/ | 566 | core-$(CONFIG_SNI_RM) += arch/mips/sni/ |
567 | cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm | 567 | cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm |
568 | ifdef CONFIG_CPU_LITTLE_ENDIAN | ||
568 | load-$(CONFIG_SNI_RM) += 0xffffffff80600000 | 569 | load-$(CONFIG_SNI_RM) += 0xffffffff80600000 |
570 | else | ||
571 | load-$(CONFIG_SNI_RM) += 0xffffffff80030000 | ||
572 | endif | ||
569 | all-$(CONFIG_SNI_RM) := vmlinux.ecoff | 573 | all-$(CONFIG_SNI_RM) := vmlinux.ecoff |
570 | 574 | ||
571 | # | 575 | # |
diff --git a/arch/mips/au1000/common/clocks.c b/arch/mips/au1000/common/clocks.c index 46f8ee0e2657..043429d17c5f 100644 --- a/arch/mips/au1000/common/clocks.c +++ b/arch/mips/au1000/common/clocks.c | |||
@@ -45,6 +45,7 @@ unsigned int get_au1x00_speed(void) | |||
45 | { | 45 | { |
46 | return au1x00_clock; | 46 | return au1x00_clock; |
47 | } | 47 | } |
48 | EXPORT_SYMBOL(get_au1x00_speed); | ||
48 | 49 | ||
49 | /* | 50 | /* |
50 | * The UART baud base is not known at compile time ... if | 51 | * The UART baud base is not known at compile time ... if |
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index 42d555236de1..601ee9180ee4 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
@@ -216,6 +216,17 @@ u32 au1xxx_ddma_add_device(dbdev_tab_t *dev) | |||
216 | } | 216 | } |
217 | EXPORT_SYMBOL(au1xxx_ddma_add_device); | 217 | EXPORT_SYMBOL(au1xxx_ddma_add_device); |
218 | 218 | ||
219 | void au1xxx_ddma_del_device(u32 devid) | ||
220 | { | ||
221 | dbdev_tab_t *p = find_dbdev_id(devid); | ||
222 | |||
223 | if (p != NULL) { | ||
224 | memset(p, 0, sizeof(dbdev_tab_t)); | ||
225 | p->dev_id = ~0; | ||
226 | } | ||
227 | } | ||
228 | EXPORT_SYMBOL(au1xxx_ddma_del_device); | ||
229 | |||
219 | /* Allocate a channel and return a non-zero descriptor if successful. */ | 230 | /* Allocate a channel and return a non-zero descriptor if successful. */ |
220 | u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, | 231 | u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, |
221 | void (*callback)(int, void *), void *callparam) | 232 | void (*callback)(int, void *), void *callparam) |
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 8cae7753ef79..74d6d4a593be 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
@@ -165,12 +165,12 @@ static struct resource au1xxx_usb_gdt_resources[] = { | |||
165 | static struct resource au1xxx_mmc_resources[] = { | 165 | static struct resource au1xxx_mmc_resources[] = { |
166 | [0] = { | 166 | [0] = { |
167 | .start = SD0_PHYS_ADDR, | 167 | .start = SD0_PHYS_ADDR, |
168 | .end = SD0_PHYS_ADDR + 0x40, | 168 | .end = SD0_PHYS_ADDR + 0x7ffff, |
169 | .flags = IORESOURCE_MEM, | 169 | .flags = IORESOURCE_MEM, |
170 | }, | 170 | }, |
171 | [1] = { | 171 | [1] = { |
172 | .start = SD1_PHYS_ADDR, | 172 | .start = SD1_PHYS_ADDR, |
173 | .end = SD1_PHYS_ADDR + 0x40, | 173 | .end = SD1_PHYS_ADDR + 0x7ffff, |
174 | .flags = IORESOURCE_MEM, | 174 | .flags = IORESOURCE_MEM, |
175 | }, | 175 | }, |
176 | [2] = { | 176 | [2] = { |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 117470b60e34..4b8799802788 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
@@ -1,67 +1,58 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.25 |
4 | # Tue Feb 20 21:47:40 2007 | 4 | # Sat May 3 00:38:11 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
13 | # CONFIG_BCM47XX is not set | ||
26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LASAT is not set | ||
18 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 21 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 22 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 23 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 24 | # CONFIG_MACH_VR41XX is not set |
36 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
38 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_MARKEINS is not set | ||
41 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
42 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
31 | # CONFIG_SGI_IP28 is not set | ||
43 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
44 | # CONFIG_SIBYTE_BIGSUR is not set | ||
45 | CONFIG_SIBYTE_SWARM=y | ||
46 | # CONFIG_SIBYTE_SENTOSA is not set | ||
47 | # CONFIG_SIBYTE_RHONE is not set | ||
48 | # CONFIG_SIBYTE_CARMEL is not set | ||
49 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
50 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
34 | # CONFIG_SIBYTE_CARMEL is not set | ||
51 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
36 | # CONFIG_SIBYTE_RHONE is not set | ||
37 | CONFIG_SIBYTE_SWARM=y | ||
38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
52 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
53 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
54 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_TOSHIBA_RBTX4927 is not set |
55 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_TOSHIBA_RBTX4938 is not set |
45 | # CONFIG_WR_PPMC is not set | ||
56 | CONFIG_SIBYTE_SB1250=y | 46 | CONFIG_SIBYTE_SB1250=y |
57 | CONFIG_SIBYTE_SB1xxx_SOC=y | 47 | CONFIG_SIBYTE_SB1xxx_SOC=y |
58 | CONFIG_CPU_SB1_PASS_1=y | 48 | # CONFIG_CPU_SB1_PASS_1 is not set |
59 | # CONFIG_CPU_SB1_PASS_2_1250 is not set | 49 | # CONFIG_CPU_SB1_PASS_2_1250 is not set |
60 | # CONFIG_CPU_SB1_PASS_2_2 is not set | 50 | CONFIG_CPU_SB1_PASS_2_2=y |
61 | # CONFIG_CPU_SB1_PASS_4 is not set | 51 | # CONFIG_CPU_SB1_PASS_4 is not set |
62 | # CONFIG_CPU_SB1_PASS_2_112x is not set | 52 | # CONFIG_CPU_SB1_PASS_2_112x is not set |
63 | # CONFIG_CPU_SB1_PASS_3 is not set | 53 | # CONFIG_CPU_SB1_PASS_3 is not set |
64 | CONFIG_SIBYTE_HAS_LDT=y | 54 | CONFIG_SIBYTE_HAS_LDT=y |
55 | CONFIG_SIBYTE_ENABLE_LDT_IF_PCI=y | ||
65 | # CONFIG_SIMULATION is not set | 56 | # CONFIG_SIMULATION is not set |
66 | # CONFIG_SB1_CEX_ALWAYS_FATAL is not set | 57 | # CONFIG_SB1_CEX_ALWAYS_FATAL is not set |
67 | # CONFIG_SB1_CERR_STALL is not set | 58 | # CONFIG_SB1_CERR_STALL is not set |
@@ -69,20 +60,32 @@ CONFIG_SIBYTE_CFE=y | |||
69 | # CONFIG_SIBYTE_CFE_CONSOLE is not set | 60 | # CONFIG_SIBYTE_CFE_CONSOLE is not set |
70 | # CONFIG_SIBYTE_BUS_WATCHER is not set | 61 | # CONFIG_SIBYTE_BUS_WATCHER is not set |
71 | # CONFIG_SIBYTE_TBPROF is not set | 62 | # CONFIG_SIBYTE_TBPROF is not set |
63 | CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y | ||
72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 64 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
73 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 65 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
74 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 66 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
67 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
75 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
76 | CONFIG_GENERIC_HWEIGHT=y | 69 | CONFIG_GENERIC_HWEIGHT=y |
77 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
71 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
78 | CONFIG_GENERIC_TIME=y | 72 | CONFIG_GENERIC_TIME=y |
73 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
79 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 74 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
80 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 75 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
76 | CONFIG_CEVT_SB1250=y | ||
77 | CONFIG_CSRC_SB1250=y | ||
78 | CONFIG_CFE=y | ||
81 | CONFIG_DMA_COHERENT=y | 79 | CONFIG_DMA_COHERENT=y |
80 | CONFIG_EARLY_PRINTK=y | ||
81 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
82 | # CONFIG_HOTPLUG_CPU is not set | ||
83 | # CONFIG_NO_IOPORT is not set | ||
82 | CONFIG_CPU_BIG_ENDIAN=y | 84 | CONFIG_CPU_BIG_ENDIAN=y |
83 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 85 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
84 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 86 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
85 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 87 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
88 | CONFIG_IRQ_CPU=y | ||
86 | CONFIG_SWAP_IO_SPACE=y | 89 | CONFIG_SWAP_IO_SPACE=y |
87 | CONFIG_BOOT_ELF32=y | 90 | CONFIG_BOOT_ELF32=y |
88 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 91 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
@@ -90,6 +93,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
90 | # | 93 | # |
91 | # CPU selection | 94 | # CPU selection |
92 | # | 95 | # |
96 | # CONFIG_CPU_LOONGSON2 is not set | ||
93 | # CONFIG_CPU_MIPS32_R1 is not set | 97 | # CONFIG_CPU_MIPS32_R1 is not set |
94 | # CONFIG_CPU_MIPS32_R2 is not set | 98 | # CONFIG_CPU_MIPS32_R2 is not set |
95 | # CONFIG_CPU_MIPS64_R1 is not set | 99 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -130,8 +134,7 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
130 | CONFIG_MIPS_MT_DISABLED=y | 134 | CONFIG_MIPS_MT_DISABLED=y |
131 | # CONFIG_MIPS_MT_SMP is not set | 135 | # CONFIG_MIPS_MT_SMP is not set |
132 | # CONFIG_MIPS_MT_SMTC is not set | 136 | # CONFIG_MIPS_MT_SMTC is not set |
133 | # CONFIG_MIPS_VPE_LOADER is not set | 137 | CONFIG_SB1_PASS_2_WORKAROUNDS=y |
134 | CONFIG_SB1_PASS_1_WORKAROUNDS=y | ||
135 | CONFIG_CPU_HAS_LLSC=y | 138 | CONFIG_CPU_HAS_LLSC=y |
136 | CONFIG_CPU_HAS_SYNC=y | 139 | CONFIG_CPU_HAS_SYNC=y |
137 | CONFIG_GENERIC_HARDIRQS=y | 140 | CONFIG_GENERIC_HARDIRQS=y |
@@ -140,6 +143,7 @@ CONFIG_IRQ_PER_CPU=y | |||
140 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 143 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
141 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | 144 | CONFIG_SYS_SUPPORTS_HIGHMEM=y |
142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 145 | CONFIG_ARCH_FLATMEM_ENABLE=y |
146 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
143 | CONFIG_SELECT_MEMORY_MODEL=y | 147 | CONFIG_SELECT_MEMORY_MODEL=y |
144 | CONFIG_FLATMEM_MANUAL=y | 148 | CONFIG_FLATMEM_MANUAL=y |
145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 149 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -147,13 +151,19 @@ CONFIG_FLATMEM_MANUAL=y | |||
147 | CONFIG_FLATMEM=y | 151 | CONFIG_FLATMEM=y |
148 | CONFIG_FLAT_NODE_MEM_MAP=y | 152 | CONFIG_FLAT_NODE_MEM_MAP=y |
149 | # CONFIG_SPARSEMEM_STATIC is not set | 153 | # CONFIG_SPARSEMEM_STATIC is not set |
154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
151 | CONFIG_RESOURCES_64BIT=y | 156 | CONFIG_RESOURCES_64BIT=y |
152 | CONFIG_ZONE_DMA_FLAG=1 | 157 | CONFIG_ZONE_DMA_FLAG=0 |
158 | CONFIG_VIRT_TO_BUS=y | ||
153 | CONFIG_SMP=y | 159 | CONFIG_SMP=y |
154 | CONFIG_SYS_SUPPORTS_SMP=y | 160 | CONFIG_SYS_SUPPORTS_SMP=y |
155 | CONFIG_NR_CPUS_DEFAULT_2=y | 161 | CONFIG_NR_CPUS_DEFAULT_2=y |
156 | CONFIG_NR_CPUS=2 | 162 | CONFIG_NR_CPUS=2 |
163 | CONFIG_TICK_ONESHOT=y | ||
164 | # CONFIG_NO_HZ is not set | ||
165 | CONFIG_HIGH_RES_TIMERS=y | ||
166 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
157 | # CONFIG_HZ_48 is not set | 167 | # CONFIG_HZ_48 is not set |
158 | # CONFIG_HZ_100 is not set | 168 | # CONFIG_HZ_100 is not set |
159 | # CONFIG_HZ_128 is not set | 169 | # CONFIG_HZ_128 is not set |
@@ -166,38 +176,49 @@ CONFIG_HZ=1000 | |||
166 | CONFIG_PREEMPT_NONE=y | 176 | CONFIG_PREEMPT_NONE=y |
167 | # CONFIG_PREEMPT_VOLUNTARY is not set | 177 | # CONFIG_PREEMPT_VOLUNTARY is not set |
168 | # CONFIG_PREEMPT is not set | 178 | # CONFIG_PREEMPT is not set |
169 | CONFIG_PREEMPT_BKL=y | ||
170 | # CONFIG_KEXEC is not set | 179 | # CONFIG_KEXEC is not set |
180 | CONFIG_SECCOMP=y | ||
171 | CONFIG_LOCKDEP_SUPPORT=y | 181 | CONFIG_LOCKDEP_SUPPORT=y |
172 | CONFIG_STACKTRACE_SUPPORT=y | 182 | CONFIG_STACKTRACE_SUPPORT=y |
173 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 183 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
174 | 184 | ||
175 | # | 185 | # |
176 | # Code maturity level options | 186 | # General setup |
177 | # | 187 | # |
178 | CONFIG_EXPERIMENTAL=y | 188 | CONFIG_EXPERIMENTAL=y |
179 | CONFIG_LOCK_KERNEL=y | 189 | CONFIG_LOCK_KERNEL=y |
180 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 190 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
181 | |||
182 | # | ||
183 | # General setup | ||
184 | # | ||
185 | CONFIG_LOCALVERSION="" | 191 | CONFIG_LOCALVERSION="" |
186 | CONFIG_LOCALVERSION_AUTO=y | 192 | CONFIG_LOCALVERSION_AUTO=y |
187 | CONFIG_SWAP=y | 193 | CONFIG_SWAP=y |
188 | CONFIG_SYSVIPC=y | 194 | CONFIG_SYSVIPC=y |
189 | # CONFIG_IPC_NS is not set | ||
190 | CONFIG_SYSVIPC_SYSCTL=y | 195 | CONFIG_SYSVIPC_SYSCTL=y |
191 | # CONFIG_POSIX_MQUEUE is not set | 196 | # CONFIG_POSIX_MQUEUE is not set |
192 | # CONFIG_BSD_PROCESS_ACCT is not set | 197 | # CONFIG_BSD_PROCESS_ACCT is not set |
193 | # CONFIG_TASKSTATS is not set | 198 | # CONFIG_TASKSTATS is not set |
194 | # CONFIG_UTS_NS is not set | ||
195 | # CONFIG_AUDIT is not set | 199 | # CONFIG_AUDIT is not set |
196 | # CONFIG_IKCONFIG is not set | 200 | # CONFIG_IKCONFIG is not set |
201 | CONFIG_LOG_BUF_SHIFT=15 | ||
197 | CONFIG_CGROUPS=y | 202 | CONFIG_CGROUPS=y |
203 | # CONFIG_CGROUP_DEBUG is not set | ||
204 | # CONFIG_CGROUP_NS is not set | ||
198 | CONFIG_CPUSETS=y | 205 | CONFIG_CPUSETS=y |
199 | CONFIG_SYSFS_DEPRECATED=y | 206 | CONFIG_GROUP_SCHED=y |
207 | CONFIG_FAIR_GROUP_SCHED=y | ||
208 | # CONFIG_RT_GROUP_SCHED is not set | ||
209 | CONFIG_USER_SCHED=y | ||
210 | # CONFIG_CGROUP_SCHED is not set | ||
211 | CONFIG_CGROUP_CPUACCT=y | ||
212 | # CONFIG_RESOURCE_COUNTERS is not set | ||
213 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
214 | # CONFIG_PROC_PID_CPUSET is not set | ||
200 | CONFIG_RELAY=y | 215 | CONFIG_RELAY=y |
216 | CONFIG_NAMESPACES=y | ||
217 | # CONFIG_UTS_NS is not set | ||
218 | # CONFIG_IPC_NS is not set | ||
219 | # CONFIG_USER_NS is not set | ||
220 | # CONFIG_PID_NS is not set | ||
221 | CONFIG_BLK_DEV_INITRD=y | ||
201 | CONFIG_INITRAMFS_SOURCE="" | 222 | CONFIG_INITRAMFS_SOURCE="" |
202 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 223 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
203 | CONFIG_SYSCTL=y | 224 | CONFIG_SYSCTL=y |
@@ -209,20 +230,29 @@ CONFIG_HOTPLUG=y | |||
209 | CONFIG_PRINTK=y | 230 | CONFIG_PRINTK=y |
210 | CONFIG_BUG=y | 231 | CONFIG_BUG=y |
211 | CONFIG_ELF_CORE=y | 232 | CONFIG_ELF_CORE=y |
233 | # CONFIG_COMPAT_BRK is not set | ||
212 | CONFIG_BASE_FULL=y | 234 | CONFIG_BASE_FULL=y |
213 | CONFIG_FUTEX=y | 235 | CONFIG_FUTEX=y |
236 | CONFIG_ANON_INODES=y | ||
214 | CONFIG_EPOLL=y | 237 | CONFIG_EPOLL=y |
238 | CONFIG_SIGNALFD=y | ||
239 | CONFIG_TIMERFD=y | ||
240 | CONFIG_EVENTFD=y | ||
215 | CONFIG_SHMEM=y | 241 | CONFIG_SHMEM=y |
216 | CONFIG_SLAB=y | ||
217 | CONFIG_VM_EVENT_COUNTERS=y | 242 | CONFIG_VM_EVENT_COUNTERS=y |
243 | CONFIG_SLAB=y | ||
244 | # CONFIG_SLUB is not set | ||
245 | # CONFIG_SLOB is not set | ||
246 | # CONFIG_PROFILING is not set | ||
247 | # CONFIG_MARKERS is not set | ||
248 | CONFIG_HAVE_OPROFILE=y | ||
249 | # CONFIG_HAVE_KPROBES is not set | ||
250 | # CONFIG_HAVE_KRETPROBES is not set | ||
251 | CONFIG_PROC_PAGE_MONITOR=y | ||
252 | CONFIG_SLABINFO=y | ||
218 | CONFIG_RT_MUTEXES=y | 253 | CONFIG_RT_MUTEXES=y |
219 | # CONFIG_TINY_SHMEM is not set | 254 | # CONFIG_TINY_SHMEM is not set |
220 | CONFIG_BASE_SMALL=0 | 255 | CONFIG_BASE_SMALL=0 |
221 | # CONFIG_SLOB is not set | ||
222 | |||
223 | # | ||
224 | # Loadable module support | ||
225 | # | ||
226 | CONFIG_MODULES=y | 256 | CONFIG_MODULES=y |
227 | CONFIG_MODULE_UNLOAD=y | 257 | CONFIG_MODULE_UNLOAD=y |
228 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 258 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
@@ -230,12 +260,10 @@ CONFIG_MODVERSIONS=y | |||
230 | CONFIG_MODULE_SRCVERSION_ALL=y | 260 | CONFIG_MODULE_SRCVERSION_ALL=y |
231 | CONFIG_KMOD=y | 261 | CONFIG_KMOD=y |
232 | CONFIG_STOP_MACHINE=y | 262 | CONFIG_STOP_MACHINE=y |
233 | |||
234 | # | ||
235 | # Block layer | ||
236 | # | ||
237 | CONFIG_BLOCK=y | 263 | CONFIG_BLOCK=y |
238 | # CONFIG_BLK_DEV_IO_TRACE is not set | 264 | # CONFIG_BLK_DEV_IO_TRACE is not set |
265 | CONFIG_BLK_DEV_BSG=y | ||
266 | CONFIG_BLOCK_COMPAT=y | ||
239 | 267 | ||
240 | # | 268 | # |
241 | # IO Schedulers | 269 | # IO Schedulers |
@@ -249,22 +277,19 @@ CONFIG_DEFAULT_AS=y | |||
249 | # CONFIG_DEFAULT_CFQ is not set | 277 | # CONFIG_DEFAULT_CFQ is not set |
250 | # CONFIG_DEFAULT_NOOP is not set | 278 | # CONFIG_DEFAULT_NOOP is not set |
251 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 279 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
280 | CONFIG_CLASSIC_RCU=y | ||
252 | 281 | ||
253 | # | 282 | # |
254 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 283 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
255 | # | 284 | # |
256 | CONFIG_HW_HAS_PCI=y | 285 | CONFIG_HW_HAS_PCI=y |
257 | CONFIG_PCI=y | 286 | CONFIG_PCI=y |
287 | CONFIG_PCI_DOMAINS=y | ||
288 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
289 | # CONFIG_PCI_LEGACY is not set | ||
258 | CONFIG_MMU=y | 290 | CONFIG_MMU=y |
259 | 291 | CONFIG_ZONE_DMA32=y | |
260 | # | ||
261 | # PCCARD (PCMCIA/CardBus) support | ||
262 | # | ||
263 | # CONFIG_PCCARD is not set | 292 | # CONFIG_PCCARD is not set |
264 | |||
265 | # | ||
266 | # PCI Hotplug Support | ||
267 | # | ||
268 | # CONFIG_HOTPLUG_PCI is not set | 293 | # CONFIG_HOTPLUG_PCI is not set |
269 | 294 | ||
270 | # | 295 | # |
@@ -272,7 +297,6 @@ CONFIG_MMU=y | |||
272 | # | 297 | # |
273 | CONFIG_BINFMT_ELF=y | 298 | CONFIG_BINFMT_ELF=y |
274 | # CONFIG_BINFMT_MISC is not set | 299 | # CONFIG_BINFMT_MISC is not set |
275 | # CONFIG_BUILD_ELF64 is not set | ||
276 | CONFIG_MIPS32_COMPAT=y | 300 | CONFIG_MIPS32_COMPAT=y |
277 | CONFIG_COMPAT=y | 301 | CONFIG_COMPAT=y |
278 | CONFIG_SYSVIPC_COMPAT=y | 302 | CONFIG_SYSVIPC_COMPAT=y |
@@ -286,7 +310,6 @@ CONFIG_BINFMT_ELF32=y | |||
286 | CONFIG_PM=y | 310 | CONFIG_PM=y |
287 | # CONFIG_PM_LEGACY is not set | 311 | # CONFIG_PM_LEGACY is not set |
288 | # CONFIG_PM_DEBUG is not set | 312 | # CONFIG_PM_DEBUG is not set |
289 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
290 | 313 | ||
291 | # | 314 | # |
292 | # Networking | 315 | # Networking |
@@ -296,7 +319,6 @@ CONFIG_NET=y | |||
296 | # | 319 | # |
297 | # Networking options | 320 | # Networking options |
298 | # | 321 | # |
299 | # CONFIG_NETDEBUG is not set | ||
300 | CONFIG_PACKET=y | 322 | CONFIG_PACKET=y |
301 | CONFIG_PACKET_MMAP=y | 323 | CONFIG_PACKET_MMAP=y |
302 | CONFIG_UNIX=y | 324 | CONFIG_UNIX=y |
@@ -304,6 +326,7 @@ CONFIG_XFRM=y | |||
304 | CONFIG_XFRM_USER=m | 326 | CONFIG_XFRM_USER=m |
305 | # CONFIG_XFRM_SUB_POLICY is not set | 327 | # CONFIG_XFRM_SUB_POLICY is not set |
306 | CONFIG_XFRM_MIGRATE=y | 328 | CONFIG_XFRM_MIGRATE=y |
329 | # CONFIG_XFRM_STATISTICS is not set | ||
307 | CONFIG_NET_KEY=y | 330 | CONFIG_NET_KEY=y |
308 | CONFIG_NET_KEY_MIGRATE=y | 331 | CONFIG_NET_KEY_MIGRATE=y |
309 | CONFIG_INET=y | 332 | CONFIG_INET=y |
@@ -326,6 +349,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
326 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 349 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
327 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 350 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
328 | CONFIG_INET_XFRM_MODE_BEET=m | 351 | CONFIG_INET_XFRM_MODE_BEET=m |
352 | CONFIG_INET_LRO=m | ||
329 | CONFIG_INET_DIAG=y | 353 | CONFIG_INET_DIAG=y |
330 | CONFIG_INET_TCP_DIAG=y | 354 | CONFIG_INET_TCP_DIAG=y |
331 | # CONFIG_TCP_CONG_ADVANCED is not set | 355 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -333,24 +357,15 @@ CONFIG_TCP_CONG_CUBIC=y | |||
333 | CONFIG_DEFAULT_TCP_CONG="cubic" | 357 | CONFIG_DEFAULT_TCP_CONG="cubic" |
334 | CONFIG_TCP_MD5SIG=y | 358 | CONFIG_TCP_MD5SIG=y |
335 | # CONFIG_IPV6 is not set | 359 | # CONFIG_IPV6 is not set |
336 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
337 | # CONFIG_INET6_TUNNEL is not set | ||
338 | CONFIG_NETWORK_SECMARK=y | 360 | CONFIG_NETWORK_SECMARK=y |
339 | # CONFIG_NETFILTER is not set | 361 | # CONFIG_NETFILTER is not set |
340 | |||
341 | # | ||
342 | # DCCP Configuration (EXPERIMENTAL) | ||
343 | # | ||
344 | # CONFIG_IP_DCCP is not set | 362 | # CONFIG_IP_DCCP is not set |
345 | 363 | CONFIG_IP_SCTP=m | |
346 | # | 364 | # CONFIG_SCTP_DBG_MSG is not set |
347 | # SCTP Configuration (EXPERIMENTAL) | 365 | # CONFIG_SCTP_DBG_OBJCNT is not set |
348 | # | 366 | # CONFIG_SCTP_HMAC_NONE is not set |
349 | # CONFIG_IP_SCTP is not set | 367 | # CONFIG_SCTP_HMAC_SHA1 is not set |
350 | 368 | CONFIG_SCTP_HMAC_MD5=y | |
351 | # | ||
352 | # TIPC Configuration (EXPERIMENTAL) | ||
353 | # | ||
354 | # CONFIG_TIPC is not set | 369 | # CONFIG_TIPC is not set |
355 | # CONFIG_ATM is not set | 370 | # CONFIG_ATM is not set |
356 | # CONFIG_BRIDGE is not set | 371 | # CONFIG_BRIDGE is not set |
@@ -363,26 +378,52 @@ CONFIG_NETWORK_SECMARK=y | |||
363 | # CONFIG_LAPB is not set | 378 | # CONFIG_LAPB is not set |
364 | # CONFIG_ECONET is not set | 379 | # CONFIG_ECONET is not set |
365 | # CONFIG_WAN_ROUTER is not set | 380 | # CONFIG_WAN_ROUTER is not set |
366 | |||
367 | # | ||
368 | # QoS and/or fair queueing | ||
369 | # | ||
370 | # CONFIG_NET_SCHED is not set | 381 | # CONFIG_NET_SCHED is not set |
382 | CONFIG_NET_SCH_FIFO=y | ||
371 | 383 | ||
372 | # | 384 | # |
373 | # Network testing | 385 | # Network testing |
374 | # | 386 | # |
375 | # CONFIG_NET_PKTGEN is not set | 387 | # CONFIG_NET_PKTGEN is not set |
376 | # CONFIG_HAMRADIO is not set | 388 | # CONFIG_HAMRADIO is not set |
389 | # CONFIG_CAN is not set | ||
377 | # CONFIG_IRDA is not set | 390 | # CONFIG_IRDA is not set |
378 | # CONFIG_BT is not set | 391 | # CONFIG_BT is not set |
392 | # CONFIG_AF_RXRPC is not set | ||
393 | |||
394 | # | ||
395 | # Wireless | ||
396 | # | ||
397 | CONFIG_CFG80211=m | ||
398 | CONFIG_NL80211=y | ||
399 | CONFIG_WIRELESS_EXT=y | ||
400 | CONFIG_MAC80211=m | ||
401 | |||
402 | # | ||
403 | # Rate control algorithm selection | ||
404 | # | ||
405 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
406 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
407 | |||
408 | # | ||
409 | # Selecting 'y' for an algorithm will | ||
410 | # | ||
411 | |||
412 | # | ||
413 | # build the algorithm into mac80211. | ||
414 | # | ||
415 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
416 | CONFIG_MAC80211_RC_PID=y | ||
417 | # CONFIG_MAC80211_MESH is not set | ||
418 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
419 | # CONFIG_MAC80211_DEBUG is not set | ||
379 | CONFIG_IEEE80211=m | 420 | CONFIG_IEEE80211=m |
380 | # CONFIG_IEEE80211_DEBUG is not set | 421 | # CONFIG_IEEE80211_DEBUG is not set |
381 | CONFIG_IEEE80211_CRYPT_WEP=m | 422 | CONFIG_IEEE80211_CRYPT_WEP=m |
382 | CONFIG_IEEE80211_CRYPT_CCMP=m | 423 | CONFIG_IEEE80211_CRYPT_CCMP=m |
383 | CONFIG_IEEE80211_SOFTMAC=m | 424 | CONFIG_IEEE80211_CRYPT_TKIP=m |
384 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 425 | CONFIG_RFKILL=m |
385 | CONFIG_WIRELESS_EXT=y | 426 | # CONFIG_NET_9P is not set |
386 | 427 | ||
387 | # | 428 | # |
388 | # Device Drivers | 429 | # Device Drivers |
@@ -391,34 +432,15 @@ CONFIG_WIRELESS_EXT=y | |||
391 | # | 432 | # |
392 | # Generic Driver Options | 433 | # Generic Driver Options |
393 | # | 434 | # |
435 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
394 | CONFIG_STANDALONE=y | 436 | CONFIG_STANDALONE=y |
395 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 437 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
396 | CONFIG_FW_LOADER=m | 438 | CONFIG_FW_LOADER=m |
397 | # CONFIG_SYS_HYPERVISOR is not set | 439 | # CONFIG_SYS_HYPERVISOR is not set |
398 | |||
399 | # | ||
400 | # Connector - unified userspace <-> kernelspace linker | ||
401 | # | ||
402 | CONFIG_CONNECTOR=m | 440 | CONFIG_CONNECTOR=m |
403 | |||
404 | # | ||
405 | # Memory Technology Devices (MTD) | ||
406 | # | ||
407 | # CONFIG_MTD is not set | 441 | # CONFIG_MTD is not set |
408 | |||
409 | # | ||
410 | # Parallel port support | ||
411 | # | ||
412 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
413 | 443 | CONFIG_BLK_DEV=y | |
414 | # | ||
415 | # Plug and Play support | ||
416 | # | ||
417 | # CONFIG_PNPACPI is not set | ||
418 | |||
419 | # | ||
420 | # Block devices | ||
421 | # | ||
422 | # CONFIG_BLK_CPQ_DA is not set | 444 | # CONFIG_BLK_CPQ_DA is not set |
423 | # CONFIG_BLK_CPQ_CISS_DA is not set | 445 | # CONFIG_BLK_CPQ_CISS_DA is not set |
424 | # CONFIG_BLK_DEV_DAC960 is not set | 446 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -427,49 +449,77 @@ CONFIG_CONNECTOR=m | |||
427 | # CONFIG_BLK_DEV_LOOP is not set | 449 | # CONFIG_BLK_DEV_LOOP is not set |
428 | # CONFIG_BLK_DEV_NBD is not set | 450 | # CONFIG_BLK_DEV_NBD is not set |
429 | # CONFIG_BLK_DEV_SX8 is not set | 451 | # CONFIG_BLK_DEV_SX8 is not set |
452 | # CONFIG_BLK_DEV_UB is not set | ||
430 | CONFIG_BLK_DEV_RAM=y | 453 | CONFIG_BLK_DEV_RAM=y |
431 | CONFIG_BLK_DEV_RAM_COUNT=16 | 454 | CONFIG_BLK_DEV_RAM_COUNT=16 |
432 | CONFIG_BLK_DEV_RAM_SIZE=9220 | 455 | CONFIG_BLK_DEV_RAM_SIZE=9220 |
433 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 456 | # CONFIG_BLK_DEV_XIP is not set |
434 | CONFIG_BLK_DEV_INITRD=y | ||
435 | CONFIG_CDROM_PKTCDVD=m | 457 | CONFIG_CDROM_PKTCDVD=m |
436 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 458 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
437 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 459 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
438 | CONFIG_ATA_OVER_ETH=m | 460 | CONFIG_ATA_OVER_ETH=m |
439 | 461 | CONFIG_MISC_DEVICES=y | |
440 | # | 462 | # CONFIG_PHANTOM is not set |
441 | # Misc devices | 463 | # CONFIG_EEPROM_93CX6 is not set |
442 | # | ||
443 | CONFIG_SGI_IOC4=m | 464 | CONFIG_SGI_IOC4=m |
444 | # CONFIG_TIFM_CORE is not set | 465 | # CONFIG_TIFM_CORE is not set |
445 | 466 | # CONFIG_ENCLOSURE_SERVICES is not set | |
446 | # | 467 | CONFIG_HAVE_IDE=y |
447 | # ATA/ATAPI/MFM/RLL support | ||
448 | # | ||
449 | CONFIG_IDE=y | 468 | CONFIG_IDE=y |
450 | CONFIG_IDE_MAX_HWIFS=4 | 469 | CONFIG_IDE_MAX_HWIFS=4 |
451 | CONFIG_BLK_DEV_IDE=y | 470 | CONFIG_BLK_DEV_IDE=y |
452 | 471 | ||
453 | # | 472 | # |
454 | # Please see Documentation/ide.txt for help/info on IDE drives | 473 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
455 | # | 474 | # |
456 | # CONFIG_BLK_DEV_IDE_SATA is not set | 475 | # CONFIG_BLK_DEV_IDE_SATA is not set |
457 | CONFIG_BLK_DEV_IDEDISK=y | 476 | CONFIG_BLK_DEV_IDEDISK=y |
458 | # CONFIG_IDEDISK_MULTI_MODE is not set | 477 | # CONFIG_IDEDISK_MULTI_MODE is not set |
459 | CONFIG_BLK_DEV_IDECD=y | 478 | CONFIG_BLK_DEV_IDECD=y |
479 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
460 | CONFIG_BLK_DEV_IDETAPE=y | 480 | CONFIG_BLK_DEV_IDETAPE=y |
461 | CONFIG_BLK_DEV_IDEFLOPPY=y | 481 | CONFIG_BLK_DEV_IDEFLOPPY=y |
462 | # CONFIG_IDE_TASK_IOCTL is not set | 482 | # CONFIG_IDE_TASK_IOCTL is not set |
483 | CONFIG_IDE_PROC_FS=y | ||
463 | 484 | ||
464 | # | 485 | # |
465 | # IDE chipset support/bugfixes | 486 | # IDE chipset support/bugfixes |
466 | # | 487 | # |
467 | CONFIG_IDE_GENERIC=y | 488 | # CONFIG_IDE_GENERIC is not set |
468 | # CONFIG_BLK_DEV_IDEPCI is not set | 489 | # CONFIG_BLK_DEV_PLATFORM is not set |
490 | |||
491 | # | ||
492 | # PCI IDE chipsets support | ||
493 | # | ||
494 | # CONFIG_BLK_DEV_GENERIC is not set | ||
495 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
496 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
497 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
498 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
499 | # CONFIG_BLK_DEV_CMD64X is not set | ||
500 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
501 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
502 | # CONFIG_BLK_DEV_CS5520 is not set | ||
503 | # CONFIG_BLK_DEV_CS5530 is not set | ||
504 | # CONFIG_BLK_DEV_HPT34X is not set | ||
505 | # CONFIG_BLK_DEV_HPT366 is not set | ||
506 | # CONFIG_BLK_DEV_JMICRON is not set | ||
507 | # CONFIG_BLK_DEV_SC1200 is not set | ||
508 | # CONFIG_BLK_DEV_PIIX is not set | ||
509 | # CONFIG_BLK_DEV_IT8213 is not set | ||
510 | # CONFIG_BLK_DEV_IT821X is not set | ||
511 | # CONFIG_BLK_DEV_NS87415 is not set | ||
512 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
513 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
514 | # CONFIG_BLK_DEV_SVWKS is not set | ||
515 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
516 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
517 | # CONFIG_BLK_DEV_TRM290 is not set | ||
518 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
519 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
469 | CONFIG_BLK_DEV_IDE_SWARM=y | 520 | CONFIG_BLK_DEV_IDE_SWARM=y |
470 | # CONFIG_IDE_ARM is not set | ||
471 | # CONFIG_BLK_DEV_IDEDMA is not set | 521 | # CONFIG_BLK_DEV_IDEDMA is not set |
472 | # CONFIG_IDEDMA_AUTO is not set | 522 | # CONFIG_BLK_DEV_HD_ONLY is not set |
473 | # CONFIG_BLK_DEV_HD is not set | 523 | # CONFIG_BLK_DEV_HD is not set |
474 | 524 | ||
475 | # | 525 | # |
@@ -477,89 +527,68 @@ CONFIG_BLK_DEV_IDE_SWARM=y | |||
477 | # | 527 | # |
478 | CONFIG_RAID_ATTRS=m | 528 | CONFIG_RAID_ATTRS=m |
479 | # CONFIG_SCSI is not set | 529 | # CONFIG_SCSI is not set |
530 | # CONFIG_SCSI_DMA is not set | ||
480 | # CONFIG_SCSI_NETLINK is not set | 531 | # CONFIG_SCSI_NETLINK is not set |
481 | |||
482 | # | ||
483 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
484 | # | ||
485 | # CONFIG_ATA is not set | 532 | # CONFIG_ATA is not set |
486 | |||
487 | # | ||
488 | # Multi-device support (RAID and LVM) | ||
489 | # | ||
490 | # CONFIG_MD is not set | 533 | # CONFIG_MD is not set |
491 | |||
492 | # | ||
493 | # Fusion MPT device support | ||
494 | # | ||
495 | # CONFIG_FUSION is not set | 534 | # CONFIG_FUSION is not set |
496 | 535 | ||
497 | # | 536 | # |
498 | # IEEE 1394 (FireWire) support | 537 | # IEEE 1394 (FireWire) support |
499 | # | 538 | # |
539 | # CONFIG_FIREWIRE is not set | ||
500 | # CONFIG_IEEE1394 is not set | 540 | # CONFIG_IEEE1394 is not set |
501 | |||
502 | # | ||
503 | # I2O device support | ||
504 | # | ||
505 | # CONFIG_I2O is not set | 541 | # CONFIG_I2O is not set |
506 | |||
507 | # | ||
508 | # Network device support | ||
509 | # | ||
510 | CONFIG_NETDEVICES=y | 542 | CONFIG_NETDEVICES=y |
543 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
511 | # CONFIG_DUMMY is not set | 544 | # CONFIG_DUMMY is not set |
512 | # CONFIG_BONDING is not set | 545 | # CONFIG_BONDING is not set |
546 | CONFIG_MACVLAN=m | ||
513 | # CONFIG_EQUALIZER is not set | 547 | # CONFIG_EQUALIZER is not set |
514 | # CONFIG_TUN is not set | 548 | # CONFIG_TUN is not set |
515 | 549 | # CONFIG_VETH is not set | |
516 | # | ||
517 | # ARCnet devices | ||
518 | # | ||
519 | # CONFIG_ARCNET is not set | 550 | # CONFIG_ARCNET is not set |
520 | 551 | CONFIG_PHYLIB=y | |
521 | # | ||
522 | # PHY device support | ||
523 | # | ||
524 | CONFIG_PHYLIB=m | ||
525 | 552 | ||
526 | # | 553 | # |
527 | # MII PHY device drivers | 554 | # MII PHY device drivers |
528 | # | 555 | # |
529 | CONFIG_MARVELL_PHY=m | 556 | # CONFIG_MARVELL_PHY is not set |
530 | CONFIG_DAVICOM_PHY=m | 557 | # CONFIG_DAVICOM_PHY is not set |
531 | CONFIG_QSEMI_PHY=m | 558 | # CONFIG_QSEMI_PHY is not set |
532 | CONFIG_LXT_PHY=m | 559 | # CONFIG_LXT_PHY is not set |
533 | CONFIG_CICADA_PHY=m | 560 | # CONFIG_CICADA_PHY is not set |
534 | CONFIG_VITESSE_PHY=m | 561 | # CONFIG_VITESSE_PHY is not set |
535 | CONFIG_SMSC_PHY=m | 562 | # CONFIG_SMSC_PHY is not set |
536 | # CONFIG_BROADCOM_PHY is not set | 563 | CONFIG_BROADCOM_PHY=y |
564 | # CONFIG_ICPLUS_PHY is not set | ||
565 | # CONFIG_REALTEK_PHY is not set | ||
537 | # CONFIG_FIXED_PHY is not set | 566 | # CONFIG_FIXED_PHY is not set |
538 | 567 | # CONFIG_MDIO_BITBANG is not set | |
539 | # | ||
540 | # Ethernet (10 or 100Mbit) | ||
541 | # | ||
542 | CONFIG_NET_ETHERNET=y | 568 | CONFIG_NET_ETHERNET=y |
543 | CONFIG_MII=y | 569 | CONFIG_MII=y |
570 | # CONFIG_AX88796 is not set | ||
544 | # CONFIG_HAPPYMEAL is not set | 571 | # CONFIG_HAPPYMEAL is not set |
545 | # CONFIG_SUNGEM is not set | 572 | # CONFIG_SUNGEM is not set |
546 | # CONFIG_CASSINI is not set | 573 | # CONFIG_CASSINI is not set |
547 | # CONFIG_NET_VENDOR_3COM is not set | 574 | # CONFIG_NET_VENDOR_3COM is not set |
548 | # CONFIG_DM9000 is not set | 575 | # CONFIG_DM9000 is not set |
549 | |||
550 | # | ||
551 | # Tulip family network device support | ||
552 | # | ||
553 | # CONFIG_NET_TULIP is not set | 576 | # CONFIG_NET_TULIP is not set |
554 | # CONFIG_HP100 is not set | 577 | # CONFIG_HP100 is not set |
578 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
579 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
580 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
581 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
555 | # CONFIG_NET_PCI is not set | 582 | # CONFIG_NET_PCI is not set |
556 | 583 | # CONFIG_B44 is not set | |
557 | # | 584 | CONFIG_NETDEV_1000=y |
558 | # Ethernet (1000 Mbit) | ||
559 | # | ||
560 | # CONFIG_ACENIC is not set | 585 | # CONFIG_ACENIC is not set |
561 | # CONFIG_DL2K is not set | 586 | # CONFIG_DL2K is not set |
562 | # CONFIG_E1000 is not set | 587 | # CONFIG_E1000 is not set |
588 | # CONFIG_E1000E is not set | ||
589 | # CONFIG_E1000E_ENABLED is not set | ||
590 | # CONFIG_IP1000 is not set | ||
591 | # CONFIG_IGB is not set | ||
563 | # CONFIG_NS83820 is not set | 592 | # CONFIG_NS83820 is not set |
564 | # CONFIG_HAMACHI is not set | 593 | # CONFIG_HAMACHI is not set |
565 | # CONFIG_YELLOWFIN is not set | 594 | # CONFIG_YELLOWFIN is not set |
@@ -568,53 +597,70 @@ CONFIG_SB1250_MAC=y | |||
568 | # CONFIG_SIS190 is not set | 597 | # CONFIG_SIS190 is not set |
569 | # CONFIG_SKGE is not set | 598 | # CONFIG_SKGE is not set |
570 | # CONFIG_SKY2 is not set | 599 | # CONFIG_SKY2 is not set |
571 | # CONFIG_SK98LIN is not set | 600 | # CONFIG_VIA_VELOCITY is not set |
572 | # CONFIG_TIGON3 is not set | 601 | # CONFIG_TIGON3 is not set |
573 | # CONFIG_BNX2 is not set | 602 | # CONFIG_BNX2 is not set |
574 | CONFIG_QLA3XXX=m | 603 | # CONFIG_QLA3XXX is not set |
575 | # CONFIG_ATL1 is not set | 604 | # CONFIG_ATL1 is not set |
576 | 605 | CONFIG_NETDEV_10000=y | |
577 | # | ||
578 | # Ethernet (10000 Mbit) | ||
579 | # | ||
580 | # CONFIG_CHELSIO_T1 is not set | 606 | # CONFIG_CHELSIO_T1 is not set |
581 | CONFIG_CHELSIO_T3=m | 607 | # CONFIG_CHELSIO_T3 is not set |
608 | # CONFIG_IXGBE is not set | ||
582 | # CONFIG_IXGB is not set | 609 | # CONFIG_IXGB is not set |
583 | # CONFIG_S2IO is not set | 610 | # CONFIG_S2IO is not set |
584 | # CONFIG_MYRI10GE is not set | 611 | # CONFIG_MYRI10GE is not set |
585 | CONFIG_NETXEN_NIC=m | 612 | # CONFIG_NETXEN_NIC is not set |
586 | 613 | # CONFIG_NIU is not set | |
587 | # | 614 | # CONFIG_MLX4_CORE is not set |
588 | # Token Ring devices | 615 | # CONFIG_TEHUTI is not set |
589 | # | 616 | # CONFIG_BNX2X is not set |
590 | # CONFIG_TR is not set | 617 | # CONFIG_TR is not set |
591 | 618 | ||
592 | # | 619 | # |
593 | # Wireless LAN (non-hamradio) | 620 | # Wireless LAN |
594 | # | 621 | # |
595 | # CONFIG_NET_RADIO is not set | 622 | # CONFIG_WLAN_PRE80211 is not set |
596 | 623 | CONFIG_WLAN_80211=y | |
597 | # | 624 | # CONFIG_IPW2100 is not set |
598 | # Wan interfaces | 625 | # CONFIG_IPW2200 is not set |
599 | # | 626 | # CONFIG_LIBERTAS is not set |
627 | # CONFIG_HERMES is not set | ||
628 | # CONFIG_ATMEL is not set | ||
629 | # CONFIG_PRISM54 is not set | ||
630 | # CONFIG_USB_ZD1201 is not set | ||
631 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
632 | # CONFIG_RTL8180 is not set | ||
633 | # CONFIG_RTL8187 is not set | ||
634 | # CONFIG_ADM8211 is not set | ||
635 | # CONFIG_P54_COMMON is not set | ||
636 | # CONFIG_ATH5K is not set | ||
637 | # CONFIG_IWLCORE is not set | ||
638 | # CONFIG_IWLWIFI_LEDS is not set | ||
639 | # CONFIG_IWL4965 is not set | ||
640 | # CONFIG_IWL3945 is not set | ||
641 | # CONFIG_HOSTAP is not set | ||
642 | # CONFIG_B43 is not set | ||
643 | # CONFIG_B43LEGACY is not set | ||
644 | # CONFIG_ZD1211RW is not set | ||
645 | # CONFIG_RT2X00 is not set | ||
646 | |||
647 | # | ||
648 | # USB Network Adapters | ||
649 | # | ||
650 | # CONFIG_USB_CATC is not set | ||
651 | # CONFIG_USB_KAWETH is not set | ||
652 | # CONFIG_USB_PEGASUS is not set | ||
653 | # CONFIG_USB_RTL8150 is not set | ||
654 | # CONFIG_USB_USBNET is not set | ||
600 | # CONFIG_WAN is not set | 655 | # CONFIG_WAN is not set |
601 | # CONFIG_FDDI is not set | 656 | # CONFIG_FDDI is not set |
602 | # CONFIG_HIPPI is not set | 657 | # CONFIG_HIPPI is not set |
603 | # CONFIG_PPP is not set | 658 | # CONFIG_PPP is not set |
604 | # CONFIG_SLIP is not set | 659 | # CONFIG_SLIP is not set |
605 | # CONFIG_SHAPER is not set | ||
606 | # CONFIG_NETCONSOLE is not set | 660 | # CONFIG_NETCONSOLE is not set |
607 | # CONFIG_NETPOLL is not set | 661 | # CONFIG_NETPOLL is not set |
608 | # CONFIG_NET_POLL_CONTROLLER is not set | 662 | # CONFIG_NET_POLL_CONTROLLER is not set |
609 | |||
610 | # | ||
611 | # ISDN subsystem | ||
612 | # | ||
613 | # CONFIG_ISDN is not set | 663 | # CONFIG_ISDN is not set |
614 | |||
615 | # | ||
616 | # Telephony Support | ||
617 | # | ||
618 | # CONFIG_PHONE is not set | 664 | # CONFIG_PHONE is not set |
619 | 665 | ||
620 | # | 666 | # |
@@ -637,24 +683,8 @@ CONFIG_SERIO_RAW=m | |||
637 | # Character devices | 683 | # Character devices |
638 | # | 684 | # |
639 | # CONFIG_VT is not set | 685 | # CONFIG_VT is not set |
640 | CONFIG_SERIAL_NONSTANDARD=y | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
641 | # CONFIG_COMPUTONE is not set | 687 | # CONFIG_NOZOMI is not set |
642 | # CONFIG_ROCKETPORT is not set | ||
643 | # CONFIG_CYCLADES is not set | ||
644 | # CONFIG_DIGIEPCA is not set | ||
645 | # CONFIG_MOXA_INTELLIO is not set | ||
646 | # CONFIG_MOXA_SMARTIO is not set | ||
647 | CONFIG_MOXA_SMARTIO_NEW=m | ||
648 | # CONFIG_ISI is not set | ||
649 | # CONFIG_SYNCLINKMP is not set | ||
650 | # CONFIG_SYNCLINK_GT is not set | ||
651 | # CONFIG_N_HDLC is not set | ||
652 | # CONFIG_SPECIALIX is not set | ||
653 | # CONFIG_SX is not set | ||
654 | # CONFIG_RIO is not set | ||
655 | # CONFIG_STALDRV is not set | ||
656 | CONFIG_SERIAL_SB1250_DUART=y | ||
657 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
658 | 688 | ||
659 | # | 689 | # |
660 | # Serial drivers | 690 | # Serial drivers |
@@ -664,37 +694,22 @@ CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | |||
664 | # | 694 | # |
665 | # Non-8250 serial port support | 695 | # Non-8250 serial port support |
666 | # | 696 | # |
697 | CONFIG_SERIAL_SB1250_DUART=y | ||
698 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
699 | CONFIG_SERIAL_CORE=y | ||
700 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
667 | # CONFIG_SERIAL_JSM is not set | 701 | # CONFIG_SERIAL_JSM is not set |
668 | CONFIG_UNIX98_PTYS=y | 702 | CONFIG_UNIX98_PTYS=y |
669 | CONFIG_LEGACY_PTYS=y | 703 | CONFIG_LEGACY_PTYS=y |
670 | CONFIG_LEGACY_PTY_COUNT=256 | 704 | CONFIG_LEGACY_PTY_COUNT=256 |
671 | |||
672 | # | ||
673 | # IPMI | ||
674 | # | ||
675 | # CONFIG_IPMI_HANDLER is not set | 705 | # CONFIG_IPMI_HANDLER is not set |
676 | |||
677 | # | ||
678 | # Watchdog Cards | ||
679 | # | ||
680 | # CONFIG_WATCHDOG is not set | ||
681 | # CONFIG_HW_RANDOM is not set | 706 | # CONFIG_HW_RANDOM is not set |
682 | # CONFIG_RTC is not set | 707 | # CONFIG_RTC is not set |
683 | # CONFIG_GEN_RTC is not set | ||
684 | # CONFIG_DTLK is not set | ||
685 | # CONFIG_R3964 is not set | 708 | # CONFIG_R3964 is not set |
686 | # CONFIG_APPLICOM is not set | 709 | # CONFIG_APPLICOM is not set |
687 | # CONFIG_DRM is not set | ||
688 | # CONFIG_RAW_DRIVER is not set | 710 | # CONFIG_RAW_DRIVER is not set |
689 | |||
690 | # | ||
691 | # TPM devices | ||
692 | # | ||
693 | # CONFIG_TCG_TPM is not set | 711 | # CONFIG_TCG_TPM is not set |
694 | 712 | CONFIG_DEVPORT=y | |
695 | # | ||
696 | # I2C support | ||
697 | # | ||
698 | # CONFIG_I2C is not set | 713 | # CONFIG_I2C is not set |
699 | 714 | ||
700 | # | 715 | # |
@@ -702,109 +717,139 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
702 | # | 717 | # |
703 | # CONFIG_SPI is not set | 718 | # CONFIG_SPI is not set |
704 | # CONFIG_SPI_MASTER is not set | 719 | # CONFIG_SPI_MASTER is not set |
720 | # CONFIG_W1 is not set | ||
721 | # CONFIG_POWER_SUPPLY is not set | ||
722 | # CONFIG_HWMON is not set | ||
723 | # CONFIG_THERMAL is not set | ||
724 | # CONFIG_WATCHDOG is not set | ||
705 | 725 | ||
706 | # | 726 | # |
707 | # Dallas's 1-wire bus | 727 | # Sonics Silicon Backplane |
708 | # | 728 | # |
709 | # CONFIG_W1 is not set | 729 | CONFIG_SSB_POSSIBLE=y |
730 | # CONFIG_SSB is not set | ||
710 | 731 | ||
711 | # | 732 | # |
712 | # Hardware Monitoring support | 733 | # Multifunction device drivers |
713 | # | 734 | # |
714 | # CONFIG_HWMON is not set | 735 | # CONFIG_MFD_SM501 is not set |
715 | # CONFIG_HWMON_VID is not set | ||
716 | 736 | ||
717 | # | 737 | # |
718 | # Multimedia devices | 738 | # Multimedia devices |
719 | # | 739 | # |
720 | # CONFIG_VIDEO_DEV is not set | 740 | # CONFIG_VIDEO_DEV is not set |
721 | 741 | # CONFIG_DVB_CORE is not set | |
722 | # | 742 | # CONFIG_DAB is not set |
723 | # Digital Video Broadcasting Devices | ||
724 | # | ||
725 | # CONFIG_DVB is not set | ||
726 | 743 | ||
727 | # | 744 | # |
728 | # Graphics support | 745 | # Graphics support |
729 | # | 746 | # |
730 | # CONFIG_FIRMWARE_EDID is not set | 747 | # CONFIG_DRM is not set |
748 | # CONFIG_VGASTATE is not set | ||
749 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
731 | # CONFIG_FB is not set | 750 | # CONFIG_FB is not set |
732 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 751 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
733 | 752 | ||
734 | # | 753 | # |
735 | # Sound | 754 | # Display device support |
736 | # | 755 | # |
737 | # CONFIG_SOUND is not set | 756 | # CONFIG_DISPLAY_SUPPORT is not set |
738 | 757 | ||
739 | # | 758 | # |
740 | # USB support | 759 | # Sound |
741 | # | 760 | # |
761 | # CONFIG_SOUND is not set | ||
762 | CONFIG_USB_SUPPORT=y | ||
742 | CONFIG_USB_ARCH_HAS_HCD=y | 763 | CONFIG_USB_ARCH_HAS_HCD=y |
743 | CONFIG_USB_ARCH_HAS_OHCI=y | 764 | CONFIG_USB_ARCH_HAS_OHCI=y |
744 | CONFIG_USB_ARCH_HAS_EHCI=y | 765 | CONFIG_USB_ARCH_HAS_EHCI=y |
745 | # CONFIG_USB is not set | 766 | CONFIG_USB=y |
746 | 767 | # CONFIG_USB_DEBUG is not set | |
747 | # | 768 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set |
748 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
749 | # | ||
750 | 769 | ||
751 | # | 770 | # |
752 | # USB Gadget Support | 771 | # Miscellaneous USB options |
753 | # | 772 | # |
754 | # CONFIG_USB_GADGET is not set | 773 | CONFIG_USB_DEVICEFS=y |
774 | CONFIG_USB_DEVICE_CLASS=y | ||
775 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
776 | # CONFIG_USB_SUSPEND is not set | ||
777 | # CONFIG_USB_PERSIST is not set | ||
778 | # CONFIG_USB_OTG is not set | ||
755 | 779 | ||
756 | # | 780 | # |
757 | # MMC/SD Card support | 781 | # USB Host Controller Drivers |
758 | # | 782 | # |
759 | # CONFIG_MMC is not set | 783 | # CONFIG_USB_EHCI_HCD is not set |
784 | # CONFIG_USB_ISP116X_HCD is not set | ||
785 | CONFIG_USB_OHCI_HCD=y | ||
786 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
787 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
788 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
789 | # CONFIG_USB_UHCI_HCD is not set | ||
790 | # CONFIG_USB_SL811_HCD is not set | ||
791 | # CONFIG_USB_R8A66597_HCD is not set | ||
760 | 792 | ||
761 | # | 793 | # |
762 | # LED devices | 794 | # USB Device Class drivers |
763 | # | 795 | # |
764 | # CONFIG_NEW_LEDS is not set | 796 | # CONFIG_USB_ACM is not set |
797 | # CONFIG_USB_PRINTER is not set | ||
765 | 798 | ||
766 | # | 799 | # |
767 | # LED drivers | 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
768 | # | 801 | # |
769 | 802 | ||
770 | # | 803 | # |
771 | # LED Triggers | 804 | # may also be needed; see USB_STORAGE Help for more information |
772 | # | 805 | # |
806 | # CONFIG_USB_LIBUSUAL is not set | ||
773 | 807 | ||
774 | # | 808 | # |
775 | # InfiniBand support | 809 | # USB Imaging devices |
776 | # | 810 | # |
777 | # CONFIG_INFINIBAND is not set | 811 | # CONFIG_USB_MDC800 is not set |
812 | CONFIG_USB_MON=y | ||
778 | 813 | ||
779 | # | 814 | # |
780 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 815 | # USB port drivers |
781 | # | 816 | # |
817 | # CONFIG_USB_SERIAL is not set | ||
782 | 818 | ||
783 | # | 819 | # |
784 | # Real Time Clock | 820 | # USB Miscellaneous drivers |
785 | # | 821 | # |
822 | # CONFIG_USB_EMI62 is not set | ||
823 | # CONFIG_USB_EMI26 is not set | ||
824 | # CONFIG_USB_ADUTUX is not set | ||
825 | # CONFIG_USB_AUERSWALD is not set | ||
826 | # CONFIG_USB_RIO500 is not set | ||
827 | # CONFIG_USB_LEGOTOWER is not set | ||
828 | # CONFIG_USB_LCD is not set | ||
829 | # CONFIG_USB_BERRY_CHARGE is not set | ||
830 | # CONFIG_USB_LED is not set | ||
831 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
832 | # CONFIG_USB_CYTHERM is not set | ||
833 | # CONFIG_USB_PHIDGET is not set | ||
834 | # CONFIG_USB_IDMOUSE is not set | ||
835 | # CONFIG_USB_FTDI_ELAN is not set | ||
836 | # CONFIG_USB_APPLEDISPLAY is not set | ||
837 | # CONFIG_USB_LD is not set | ||
838 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
839 | # CONFIG_USB_IOWARRIOR is not set | ||
840 | # CONFIG_USB_TEST is not set | ||
841 | # CONFIG_USB_GADGET is not set | ||
842 | # CONFIG_MMC is not set | ||
843 | # CONFIG_MEMSTICK is not set | ||
844 | # CONFIG_NEW_LEDS is not set | ||
845 | # CONFIG_INFINIBAND is not set | ||
846 | CONFIG_RTC_LIB=y | ||
786 | # CONFIG_RTC_CLASS is not set | 847 | # CONFIG_RTC_CLASS is not set |
787 | 848 | ||
788 | # | 849 | # |
789 | # DMA Engine support | 850 | # Userspace I/O |
790 | # | ||
791 | # CONFIG_DMA_ENGINE is not set | ||
792 | |||
793 | # | ||
794 | # DMA Clients | ||
795 | # | ||
796 | |||
797 | # | ||
798 | # DMA Devices | ||
799 | # | ||
800 | |||
801 | # | ||
802 | # Auxiliary Display support | ||
803 | # | ||
804 | |||
805 | # | ||
806 | # Virtualization | ||
807 | # | 851 | # |
852 | # CONFIG_UIO is not set | ||
808 | 853 | ||
809 | # | 854 | # |
810 | # File systems | 855 | # File systems |
@@ -823,15 +868,14 @@ CONFIG_FS_POSIX_ACL=y | |||
823 | # CONFIG_XFS_FS is not set | 868 | # CONFIG_XFS_FS is not set |
824 | # CONFIG_GFS2_FS is not set | 869 | # CONFIG_GFS2_FS is not set |
825 | # CONFIG_OCFS2_FS is not set | 870 | # CONFIG_OCFS2_FS is not set |
826 | # CONFIG_MINIX_FS is not set | 871 | CONFIG_DNOTIFY=y |
827 | # CONFIG_ROMFS_FS is not set | ||
828 | CONFIG_INOTIFY=y | 872 | CONFIG_INOTIFY=y |
829 | CONFIG_INOTIFY_USER=y | 873 | CONFIG_INOTIFY_USER=y |
830 | # CONFIG_QUOTA is not set | 874 | # CONFIG_QUOTA is not set |
831 | CONFIG_DNOTIFY=y | ||
832 | # CONFIG_AUTOFS_FS is not set | 875 | # CONFIG_AUTOFS_FS is not set |
833 | # CONFIG_AUTOFS4_FS is not set | 876 | # CONFIG_AUTOFS4_FS is not set |
834 | CONFIG_FUSE_FS=m | 877 | CONFIG_FUSE_FS=m |
878 | CONFIG_GENERIC_ACL=y | ||
835 | 879 | ||
836 | # | 880 | # |
837 | # CD-ROM/DVD Filesystems | 881 | # CD-ROM/DVD Filesystems |
@@ -853,9 +897,9 @@ CONFIG_PROC_FS=y | |||
853 | CONFIG_PROC_KCORE=y | 897 | CONFIG_PROC_KCORE=y |
854 | CONFIG_PROC_SYSCTL=y | 898 | CONFIG_PROC_SYSCTL=y |
855 | CONFIG_SYSFS=y | 899 | CONFIG_SYSFS=y |
856 | # CONFIG_TMPFS is not set | 900 | CONFIG_TMPFS=y |
901 | CONFIG_TMPFS_POSIX_ACL=y | ||
857 | # CONFIG_HUGETLB_PAGE is not set | 902 | # CONFIG_HUGETLB_PAGE is not set |
858 | CONFIG_RAMFS=y | ||
859 | CONFIG_CONFIGFS_FS=m | 903 | CONFIG_CONFIGFS_FS=m |
860 | 904 | ||
861 | # | 905 | # |
@@ -871,14 +915,13 @@ CONFIG_CONFIGFS_FS=m | |||
871 | # CONFIG_EFS_FS is not set | 915 | # CONFIG_EFS_FS is not set |
872 | # CONFIG_CRAMFS is not set | 916 | # CONFIG_CRAMFS is not set |
873 | # CONFIG_VXFS_FS is not set | 917 | # CONFIG_VXFS_FS is not set |
918 | # CONFIG_MINIX_FS is not set | ||
874 | # CONFIG_HPFS_FS is not set | 919 | # CONFIG_HPFS_FS is not set |
875 | # CONFIG_QNX4FS_FS is not set | 920 | # CONFIG_QNX4FS_FS is not set |
921 | # CONFIG_ROMFS_FS is not set | ||
876 | # CONFIG_SYSV_FS is not set | 922 | # CONFIG_SYSV_FS is not set |
877 | # CONFIG_UFS_FS is not set | 923 | # CONFIG_UFS_FS is not set |
878 | 924 | CONFIG_NETWORK_FILESYSTEMS=y | |
879 | # | ||
880 | # Network File Systems | ||
881 | # | ||
882 | CONFIG_NFS_FS=y | 925 | CONFIG_NFS_FS=y |
883 | CONFIG_NFS_V3=y | 926 | CONFIG_NFS_V3=y |
884 | # CONFIG_NFS_V3_ACL is not set | 927 | # CONFIG_NFS_V3_ACL is not set |
@@ -890,6 +933,7 @@ CONFIG_LOCKD=y | |||
890 | CONFIG_LOCKD_V4=y | 933 | CONFIG_LOCKD_V4=y |
891 | CONFIG_NFS_COMMON=y | 934 | CONFIG_NFS_COMMON=y |
892 | CONFIG_SUNRPC=y | 935 | CONFIG_SUNRPC=y |
936 | # CONFIG_SUNRPC_BIND34 is not set | ||
893 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 937 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
894 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 938 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
895 | # CONFIG_SMB_FS is not set | 939 | # CONFIG_SMB_FS is not set |
@@ -897,45 +941,29 @@ CONFIG_SUNRPC=y | |||
897 | # CONFIG_NCP_FS is not set | 941 | # CONFIG_NCP_FS is not set |
898 | # CONFIG_CODA_FS is not set | 942 | # CONFIG_CODA_FS is not set |
899 | # CONFIG_AFS_FS is not set | 943 | # CONFIG_AFS_FS is not set |
900 | # CONFIG_9P_FS is not set | ||
901 | 944 | ||
902 | # | 945 | # |
903 | # Partition Types | 946 | # Partition Types |
904 | # | 947 | # |
905 | # CONFIG_PARTITION_ADVANCED is not set | 948 | # CONFIG_PARTITION_ADVANCED is not set |
906 | CONFIG_MSDOS_PARTITION=y | 949 | CONFIG_MSDOS_PARTITION=y |
907 | |||
908 | # | ||
909 | # Native Language Support | ||
910 | # | ||
911 | # CONFIG_NLS is not set | 950 | # CONFIG_NLS is not set |
912 | |||
913 | # | ||
914 | # Distributed Lock Manager | ||
915 | # | ||
916 | CONFIG_DLM=m | 951 | CONFIG_DLM=m |
917 | CONFIG_DLM_TCP=y | ||
918 | # CONFIG_DLM_SCTP is not set | ||
919 | # CONFIG_DLM_DEBUG is not set | 952 | # CONFIG_DLM_DEBUG is not set |
920 | 953 | ||
921 | # | 954 | # |
922 | # Profiling support | ||
923 | # | ||
924 | # CONFIG_PROFILING is not set | ||
925 | |||
926 | # | ||
927 | # Kernel hacking | 955 | # Kernel hacking |
928 | # | 956 | # |
929 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 957 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
930 | # CONFIG_PRINTK_TIME is not set | 958 | # CONFIG_PRINTK_TIME is not set |
959 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
931 | CONFIG_ENABLE_MUST_CHECK=y | 960 | CONFIG_ENABLE_MUST_CHECK=y |
932 | # CONFIG_MAGIC_SYSRQ is not set | 961 | # CONFIG_MAGIC_SYSRQ is not set |
933 | # CONFIG_UNUSED_SYMBOLS is not set | 962 | # CONFIG_UNUSED_SYMBOLS is not set |
934 | # CONFIG_DEBUG_FS is not set | 963 | # CONFIG_DEBUG_FS is not set |
935 | # CONFIG_HEADERS_CHECK is not set | 964 | # CONFIG_HEADERS_CHECK is not set |
936 | # CONFIG_DEBUG_KERNEL is not set | 965 | # CONFIG_DEBUG_KERNEL is not set |
937 | CONFIG_LOG_BUF_SHIFT=15 | 966 | # CONFIG_SAMPLES is not set |
938 | CONFIG_CROSSCOMPILE=y | ||
939 | CONFIG_CMDLINE="" | 967 | CONFIG_CMDLINE="" |
940 | CONFIG_SYS_SUPPORTS_KGDB=y | 968 | CONFIG_SYS_SUPPORTS_KGDB=y |
941 | # CONFIG_SB1XXX_CORELIS is not set | 969 | # CONFIG_SB1XXX_CORELIS is not set |
@@ -946,13 +974,12 @@ CONFIG_SYS_SUPPORTS_KGDB=y | |||
946 | CONFIG_KEYS=y | 974 | CONFIG_KEYS=y |
947 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 975 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
948 | # CONFIG_SECURITY is not set | 976 | # CONFIG_SECURITY is not set |
949 | 977 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
950 | # | ||
951 | # Cryptographic options | ||
952 | # | ||
953 | CONFIG_CRYPTO=y | 978 | CONFIG_CRYPTO=y |
954 | CONFIG_CRYPTO_ALGAPI=y | 979 | CONFIG_CRYPTO_ALGAPI=y |
980 | CONFIG_CRYPTO_AEAD=m | ||
955 | CONFIG_CRYPTO_BLKCIPHER=m | 981 | CONFIG_CRYPTO_BLKCIPHER=m |
982 | CONFIG_CRYPTO_SEQIV=m | ||
956 | CONFIG_CRYPTO_HASH=y | 983 | CONFIG_CRYPTO_HASH=y |
957 | CONFIG_CRYPTO_MANAGER=y | 984 | CONFIG_CRYPTO_MANAGER=y |
958 | CONFIG_CRYPTO_HMAC=y | 985 | CONFIG_CRYPTO_HMAC=y |
@@ -970,6 +997,11 @@ CONFIG_CRYPTO_ECB=m | |||
970 | CONFIG_CRYPTO_CBC=m | 997 | CONFIG_CRYPTO_CBC=m |
971 | CONFIG_CRYPTO_PCBC=m | 998 | CONFIG_CRYPTO_PCBC=m |
972 | CONFIG_CRYPTO_LRW=m | 999 | CONFIG_CRYPTO_LRW=m |
1000 | CONFIG_CRYPTO_XTS=m | ||
1001 | CONFIG_CRYPTO_CTR=m | ||
1002 | CONFIG_CRYPTO_GCM=m | ||
1003 | CONFIG_CRYPTO_CCM=m | ||
1004 | CONFIG_CRYPTO_CRYPTD=m | ||
973 | CONFIG_CRYPTO_DES=m | 1005 | CONFIG_CRYPTO_DES=m |
974 | CONFIG_CRYPTO_FCRYPT=m | 1006 | CONFIG_CRYPTO_FCRYPT=m |
975 | CONFIG_CRYPTO_BLOWFISH=m | 1007 | CONFIG_CRYPTO_BLOWFISH=m |
@@ -983,15 +1015,16 @@ CONFIG_CRYPTO_TEA=m | |||
983 | CONFIG_CRYPTO_ARC4=m | 1015 | CONFIG_CRYPTO_ARC4=m |
984 | CONFIG_CRYPTO_KHAZAD=m | 1016 | CONFIG_CRYPTO_KHAZAD=m |
985 | CONFIG_CRYPTO_ANUBIS=m | 1017 | CONFIG_CRYPTO_ANUBIS=m |
1018 | CONFIG_CRYPTO_SEED=m | ||
1019 | CONFIG_CRYPTO_SALSA20=m | ||
986 | CONFIG_CRYPTO_DEFLATE=m | 1020 | CONFIG_CRYPTO_DEFLATE=m |
987 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1021 | CONFIG_CRYPTO_MICHAEL_MIC=m |
988 | CONFIG_CRYPTO_CRC32C=m | 1022 | CONFIG_CRYPTO_CRC32C=m |
989 | CONFIG_CRYPTO_CAMELLIA=m | 1023 | CONFIG_CRYPTO_CAMELLIA=m |
990 | # CONFIG_CRYPTO_TEST is not set | 1024 | # CONFIG_CRYPTO_TEST is not set |
991 | 1025 | CONFIG_CRYPTO_AUTHENC=m | |
992 | # | 1026 | CONFIG_CRYPTO_LZO=m |
993 | # Hardware crypto devices | 1027 | # CONFIG_CRYPTO_HW is not set |
994 | # | ||
995 | 1028 | ||
996 | # | 1029 | # |
997 | # Library routines | 1030 | # Library routines |
@@ -999,10 +1032,15 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
999 | CONFIG_BITREVERSE=y | 1032 | CONFIG_BITREVERSE=y |
1000 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
1001 | CONFIG_CRC16=m | 1034 | CONFIG_CRC16=m |
1035 | # CONFIG_CRC_ITU_T is not set | ||
1002 | CONFIG_CRC32=y | 1036 | CONFIG_CRC32=y |
1037 | # CONFIG_CRC7 is not set | ||
1003 | CONFIG_LIBCRC32C=m | 1038 | CONFIG_LIBCRC32C=m |
1004 | CONFIG_ZLIB_INFLATE=m | 1039 | CONFIG_ZLIB_INFLATE=m |
1005 | CONFIG_ZLIB_DEFLATE=m | 1040 | CONFIG_ZLIB_DEFLATE=m |
1041 | CONFIG_LZO_COMPRESS=m | ||
1042 | CONFIG_LZO_DECOMPRESS=m | ||
1006 | CONFIG_PLIST=y | 1043 | CONFIG_PLIST=y |
1007 | CONFIG_HAS_IOMEM=y | 1044 | CONFIG_HAS_IOMEM=y |
1008 | CONFIG_HAS_IOPORT=y | 1045 | CONFIG_HAS_IOPORT=y |
1046 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig index af82e1a1823c..8dd3ae39bcad 100644 --- a/arch/mips/configs/tb0219_defconfig +++ b/arch/mips/configs/tb0219_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.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
4 | # Wed Aug 8 16:11:47 2007 | 4 | # Mon May 12 11:54:51 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
10 | # | 10 | # |
11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
13 | # CONFIG_BCM47XX is not set | ||
13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LASAT is not set | ||
16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
@@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
31 | # CONFIG_SGI_IP28 is not set | ||
29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
@@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
68 | CONFIG_CEVT_R4K=y | ||
69 | CONFIG_CSRC_R4K=y | ||
62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
@@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
138 | # CONFIG_TICK_ONESHOT is not set | ||
139 | # CONFIG_NO_HZ is not set | ||
140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
@@ -156,23 +171,29 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
159 | # CONFIG_USER_NS is not set | ||
160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
177 | # CONFIG_CGROUPS is not set | ||
178 | # CONFIG_GROUP_SCHED is not set | ||
163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
182 | # CONFIG_NAMESPACES is not set | ||
165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
168 | CONFIG_EMBEDDED=y | 186 | CONFIG_EMBEDDED=y |
169 | CONFIG_SYSCTL_SYSCALL=y | 187 | CONFIG_SYSCTL_SYSCALL=y |
188 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
170 | CONFIG_KALLSYMS=y | 189 | CONFIG_KALLSYMS=y |
171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 190 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
172 | CONFIG_HOTPLUG=y | 191 | CONFIG_HOTPLUG=y |
173 | CONFIG_PRINTK=y | 192 | CONFIG_PRINTK=y |
174 | CONFIG_BUG=y | 193 | CONFIG_BUG=y |
175 | CONFIG_ELF_CORE=y | 194 | CONFIG_ELF_CORE=y |
195 | # CONFIG_PCSPKR_PLATFORM is not set | ||
196 | CONFIG_COMPAT_BRK=y | ||
176 | CONFIG_BASE_FULL=y | 197 | CONFIG_BASE_FULL=y |
177 | CONFIG_FUTEX=y | 198 | CONFIG_FUTEX=y |
178 | CONFIG_ANON_INODES=y | 199 | CONFIG_ANON_INODES=y |
@@ -185,10 +206,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
185 | CONFIG_SLAB=y | 206 | CONFIG_SLAB=y |
186 | # CONFIG_SLUB is not set | 207 | # CONFIG_SLUB is not set |
187 | # CONFIG_SLOB is not set | 208 | # CONFIG_SLOB is not set |
209 | # CONFIG_PROFILING is not set | ||
210 | # CONFIG_MARKERS is not set | ||
211 | CONFIG_HAVE_OPROFILE=y | ||
212 | # CONFIG_HAVE_KPROBES is not set | ||
213 | # CONFIG_HAVE_KRETPROBES is not set | ||
214 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
215 | CONFIG_PROC_PAGE_MONITOR=y | ||
216 | CONFIG_SLABINFO=y | ||
188 | CONFIG_RT_MUTEXES=y | 217 | CONFIG_RT_MUTEXES=y |
189 | # CONFIG_TINY_SHMEM is not set | 218 | # CONFIG_TINY_SHMEM is not set |
190 | CONFIG_BASE_SMALL=0 | 219 | CONFIG_BASE_SMALL=0 |
191 | CONFIG_MODULES=y | 220 | CONFIG_MODULES=y |
221 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
192 | CONFIG_MODULE_UNLOAD=y | 222 | CONFIG_MODULE_UNLOAD=y |
193 | CONFIG_MODULE_FORCE_UNLOAD=y | 223 | CONFIG_MODULE_FORCE_UNLOAD=y |
194 | CONFIG_MODVERSIONS=y | 224 | CONFIG_MODVERSIONS=y |
@@ -212,18 +242,17 @@ CONFIG_DEFAULT_AS=y | |||
212 | # CONFIG_DEFAULT_CFQ is not set | 242 | # CONFIG_DEFAULT_CFQ is not set |
213 | # CONFIG_DEFAULT_NOOP is not set | 243 | # CONFIG_DEFAULT_NOOP is not set |
214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 244 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
245 | CONFIG_CLASSIC_RCU=y | ||
215 | 246 | ||
216 | # | 247 | # |
217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 248 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
218 | # | 249 | # |
219 | CONFIG_HW_HAS_PCI=y | 250 | CONFIG_HW_HAS_PCI=y |
220 | CONFIG_PCI=y | 251 | CONFIG_PCI=y |
252 | CONFIG_PCI_DOMAINS=y | ||
221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 253 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
254 | CONFIG_PCI_LEGACY=y | ||
222 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
223 | |||
224 | # | ||
225 | # PCCARD (PCMCIA/CardBus) support | ||
226 | # | ||
227 | # CONFIG_PCCARD is not set | 256 | # CONFIG_PCCARD is not set |
228 | # CONFIG_HOTPLUG_PCI is not set | 257 | # CONFIG_HOTPLUG_PCI is not set |
229 | 258 | ||
@@ -237,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y | |||
237 | # | 266 | # |
238 | # Power management options | 267 | # Power management options |
239 | # | 268 | # |
269 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
240 | # CONFIG_PM is not set | 270 | # CONFIG_PM is not set |
241 | 271 | ||
242 | # | 272 | # |
@@ -278,6 +308,7 @@ CONFIG_INET_TUNNEL=m | |||
278 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 308 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
279 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 309 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
280 | # CONFIG_INET_XFRM_MODE_BEET is not set | 310 | # CONFIG_INET_XFRM_MODE_BEET is not set |
311 | # CONFIG_INET_LRO is not set | ||
281 | CONFIG_INET_DIAG=y | 312 | CONFIG_INET_DIAG=y |
282 | CONFIG_INET_TCP_DIAG=y | 313 | CONFIG_INET_TCP_DIAG=y |
283 | # CONFIG_TCP_CONG_ADVANCED is not set | 314 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -285,15 +316,10 @@ CONFIG_TCP_CONG_CUBIC=y | |||
285 | CONFIG_DEFAULT_TCP_CONG="cubic" | 316 | CONFIG_DEFAULT_TCP_CONG="cubic" |
286 | # CONFIG_TCP_MD5SIG is not set | 317 | # CONFIG_TCP_MD5SIG is not set |
287 | # CONFIG_IPV6 is not set | 318 | # CONFIG_IPV6 is not set |
288 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
289 | # CONFIG_INET6_TUNNEL is not set | ||
290 | CONFIG_NETWORK_SECMARK=y | 319 | CONFIG_NETWORK_SECMARK=y |
291 | # CONFIG_NETFILTER is not set | 320 | # CONFIG_NETFILTER is not set |
292 | # CONFIG_IP_DCCP is not set | 321 | # CONFIG_IP_DCCP is not set |
293 | # CONFIG_IP_SCTP is not set | 322 | # CONFIG_IP_SCTP is not set |
294 | # CONFIG_SCTP_HMAC_NONE is not set | ||
295 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
296 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
297 | # CONFIG_TIPC is not set | 323 | # CONFIG_TIPC is not set |
298 | # CONFIG_ATM is not set | 324 | # CONFIG_ATM is not set |
299 | # CONFIG_BRIDGE is not set | 325 | # CONFIG_BRIDGE is not set |
@@ -306,10 +332,6 @@ CONFIG_NETWORK_SECMARK=y | |||
306 | # CONFIG_LAPB is not set | 332 | # CONFIG_LAPB is not set |
307 | # CONFIG_ECONET is not set | 333 | # CONFIG_ECONET is not set |
308 | # CONFIG_WAN_ROUTER is not set | 334 | # CONFIG_WAN_ROUTER is not set |
309 | |||
310 | # | ||
311 | # QoS and/or fair queueing | ||
312 | # | ||
313 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
314 | 336 | ||
315 | # | 337 | # |
@@ -317,6 +339,7 @@ CONFIG_NETWORK_SECMARK=y | |||
317 | # | 339 | # |
318 | # CONFIG_NET_PKTGEN is not set | 340 | # CONFIG_NET_PKTGEN is not set |
319 | # CONFIG_HAMRADIO is not set | 341 | # CONFIG_HAMRADIO is not set |
342 | # CONFIG_CAN is not set | ||
320 | # CONFIG_IRDA is not set | 343 | # CONFIG_IRDA is not set |
321 | # CONFIG_BT is not set | 344 | # CONFIG_BT is not set |
322 | # CONFIG_AF_RXRPC is not set | 345 | # CONFIG_AF_RXRPC is not set |
@@ -339,6 +362,7 @@ CONFIG_FIB_RULES=y | |||
339 | # | 362 | # |
340 | # Generic Driver Options | 363 | # Generic Driver Options |
341 | # | 364 | # |
365 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
342 | CONFIG_STANDALONE=y | 366 | CONFIG_STANDALONE=y |
343 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 367 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
344 | CONFIG_FW_LOADER=m | 368 | CONFIG_FW_LOADER=m |
@@ -360,10 +384,11 @@ CONFIG_BLK_DEV_NBD=m | |||
360 | CONFIG_BLK_DEV_RAM=y | 384 | CONFIG_BLK_DEV_RAM=y |
361 | CONFIG_BLK_DEV_RAM_COUNT=16 | 385 | CONFIG_BLK_DEV_RAM_COUNT=16 |
362 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 386 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
363 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 387 | CONFIG_BLK_DEV_XIP=y |
364 | # CONFIG_CDROM_PKTCDVD is not set | 388 | # CONFIG_CDROM_PKTCDVD is not set |
365 | # CONFIG_ATA_OVER_ETH is not set | 389 | # CONFIG_ATA_OVER_ETH is not set |
366 | # CONFIG_MISC_DEVICES is not set | 390 | # CONFIG_MISC_DEVICES is not set |
391 | CONFIG_HAVE_IDE=y | ||
367 | # CONFIG_IDE is not set | 392 | # CONFIG_IDE is not set |
368 | 393 | ||
369 | # | 394 | # |
@@ -375,10 +400,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
375 | # CONFIG_SCSI_NETLINK is not set | 400 | # CONFIG_SCSI_NETLINK is not set |
376 | # CONFIG_ATA is not set | 401 | # CONFIG_ATA is not set |
377 | # CONFIG_MD is not set | 402 | # CONFIG_MD is not set |
378 | |||
379 | # | ||
380 | # Fusion MPT device support | ||
381 | # | ||
382 | # CONFIG_FUSION is not set | 403 | # CONFIG_FUSION is not set |
383 | 404 | ||
384 | # | 405 | # |
@@ -394,6 +415,7 @@ CONFIG_NETDEVICES=y | |||
394 | # CONFIG_MACVLAN is not set | 415 | # CONFIG_MACVLAN is not set |
395 | # CONFIG_EQUALIZER is not set | 416 | # CONFIG_EQUALIZER is not set |
396 | # CONFIG_TUN is not set | 417 | # CONFIG_TUN is not set |
418 | # CONFIG_VETH is not set | ||
397 | # CONFIG_ARCNET is not set | 419 | # CONFIG_ARCNET is not set |
398 | CONFIG_PHYLIB=m | 420 | CONFIG_PHYLIB=m |
399 | 421 | ||
@@ -409,7 +431,8 @@ CONFIG_VITESSE_PHY=m | |||
409 | CONFIG_SMSC_PHY=m | 431 | CONFIG_SMSC_PHY=m |
410 | # CONFIG_BROADCOM_PHY is not set | 432 | # CONFIG_BROADCOM_PHY is not set |
411 | # CONFIG_ICPLUS_PHY is not set | 433 | # CONFIG_ICPLUS_PHY is not set |
412 | # CONFIG_FIXED_PHY is not set | 434 | # CONFIG_REALTEK_PHY is not set |
435 | # CONFIG_MDIO_BITBANG is not set | ||
413 | CONFIG_NET_ETHERNET=y | 436 | CONFIG_NET_ETHERNET=y |
414 | CONFIG_MII=y | 437 | CONFIG_MII=y |
415 | # CONFIG_AX88796 is not set | 438 | # CONFIG_AX88796 is not set |
@@ -420,6 +443,10 @@ CONFIG_MII=y | |||
420 | # CONFIG_DM9000 is not set | 443 | # CONFIG_DM9000 is not set |
421 | # CONFIG_NET_TULIP is not set | 444 | # CONFIG_NET_TULIP is not set |
422 | # CONFIG_HP100 is not set | 445 | # CONFIG_HP100 is not set |
446 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
447 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
448 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
449 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
423 | CONFIG_NET_PCI=y | 450 | CONFIG_NET_PCI=y |
424 | # CONFIG_PCNET32 is not set | 451 | # CONFIG_PCNET32 is not set |
425 | # CONFIG_AMD8111_ETH is not set | 452 | # CONFIG_AMD8111_ETH is not set |
@@ -427,7 +454,6 @@ CONFIG_NET_PCI=y | |||
427 | # CONFIG_B44 is not set | 454 | # CONFIG_B44 is not set |
428 | # CONFIG_FORCEDETH is not set | 455 | # CONFIG_FORCEDETH is not set |
429 | # CONFIG_TC35815 is not set | 456 | # CONFIG_TC35815 is not set |
430 | # CONFIG_DGRS is not set | ||
431 | # CONFIG_EEPRO100 is not set | 457 | # CONFIG_EEPRO100 is not set |
432 | # CONFIG_E100 is not set | 458 | # CONFIG_E100 is not set |
433 | # CONFIG_FEALNX is not set | 459 | # CONFIG_FEALNX is not set |
@@ -439,6 +465,7 @@ CONFIG_8139TOO_PIO=y | |||
439 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 465 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
440 | # CONFIG_8139TOO_8129 is not set | 466 | # CONFIG_8139TOO_8129 is not set |
441 | # CONFIG_8139_OLD_RX_RESET is not set | 467 | # CONFIG_8139_OLD_RX_RESET is not set |
468 | # CONFIG_R6040 is not set | ||
442 | # CONFIG_SIS900 is not set | 469 | # CONFIG_SIS900 is not set |
443 | # CONFIG_EPIC100 is not set | 470 | # CONFIG_EPIC100 is not set |
444 | # CONFIG_SUNDANCE is not set | 471 | # CONFIG_SUNDANCE is not set |
@@ -451,6 +478,10 @@ CONFIG_NETDEV_1000=y | |||
451 | # CONFIG_ACENIC is not set | 478 | # CONFIG_ACENIC is not set |
452 | # CONFIG_DL2K is not set | 479 | # CONFIG_DL2K is not set |
453 | # CONFIG_E1000 is not set | 480 | # CONFIG_E1000 is not set |
481 | # CONFIG_E1000E is not set | ||
482 | # CONFIG_E1000E_ENABLED is not set | ||
483 | # CONFIG_IP1000 is not set | ||
484 | # CONFIG_IGB is not set | ||
454 | # CONFIG_NS83820 is not set | 485 | # CONFIG_NS83820 is not set |
455 | # CONFIG_HAMACHI is not set | 486 | # CONFIG_HAMACHI is not set |
456 | # CONFIG_YELLOWFIN is not set | 487 | # CONFIG_YELLOWFIN is not set |
@@ -472,6 +503,7 @@ CONFIG_VIA_VELOCITY=y | |||
472 | # | 503 | # |
473 | # CONFIG_WLAN_PRE80211 is not set | 504 | # CONFIG_WLAN_PRE80211 is not set |
474 | # CONFIG_WLAN_80211 is not set | 505 | # CONFIG_WLAN_80211 is not set |
506 | # CONFIG_IWLWIFI_LEDS is not set | ||
475 | 507 | ||
476 | # | 508 | # |
477 | # USB Network Adapters | 509 | # USB Network Adapters |
@@ -480,14 +512,12 @@ CONFIG_VIA_VELOCITY=y | |||
480 | # CONFIG_USB_KAWETH is not set | 512 | # CONFIG_USB_KAWETH is not set |
481 | # CONFIG_USB_PEGASUS is not set | 513 | # CONFIG_USB_PEGASUS is not set |
482 | # CONFIG_USB_RTL8150 is not set | 514 | # CONFIG_USB_RTL8150 is not set |
483 | # CONFIG_USB_USBNET_MII is not set | ||
484 | # CONFIG_USB_USBNET is not set | 515 | # CONFIG_USB_USBNET is not set |
485 | # CONFIG_WAN is not set | 516 | # CONFIG_WAN is not set |
486 | # CONFIG_FDDI is not set | 517 | # CONFIG_FDDI is not set |
487 | # CONFIG_HIPPI is not set | 518 | # CONFIG_HIPPI is not set |
488 | # CONFIG_PPP is not set | 519 | # CONFIG_PPP is not set |
489 | # CONFIG_SLIP is not set | 520 | # CONFIG_SLIP is not set |
490 | # CONFIG_SHAPER is not set | ||
491 | # CONFIG_NETCONSOLE is not set | 521 | # CONFIG_NETCONSOLE is not set |
492 | # CONFIG_NETPOLL is not set | 522 | # CONFIG_NETPOLL is not set |
493 | # CONFIG_NET_POLL_CONTROLLER is not set | 523 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -506,7 +536,6 @@ CONFIG_INPUT=y | |||
506 | # | 536 | # |
507 | # CONFIG_INPUT_MOUSEDEV is not set | 537 | # CONFIG_INPUT_MOUSEDEV is not set |
508 | # CONFIG_INPUT_JOYDEV is not set | 538 | # CONFIG_INPUT_JOYDEV is not set |
509 | # CONFIG_INPUT_TSDEV is not set | ||
510 | # CONFIG_INPUT_EVDEV is not set | 539 | # CONFIG_INPUT_EVDEV is not set |
511 | # CONFIG_INPUT_EVBUG is not set | 540 | # CONFIG_INPUT_EVBUG is not set |
512 | 541 | ||
@@ -533,7 +562,9 @@ CONFIG_VT=y | |||
533 | CONFIG_VT_CONSOLE=y | 562 | CONFIG_VT_CONSOLE=y |
534 | CONFIG_HW_CONSOLE=y | 563 | CONFIG_HW_CONSOLE=y |
535 | CONFIG_VT_HW_CONSOLE_BINDING=y | 564 | CONFIG_VT_HW_CONSOLE_BINDING=y |
565 | # CONFIG_DEVKMEM is not set | ||
536 | # CONFIG_SERIAL_NONSTANDARD is not set | 566 | # CONFIG_SERIAL_NONSTANDARD is not set |
567 | # CONFIG_NOZOMI is not set | ||
537 | 568 | ||
538 | # | 569 | # |
539 | # Serial drivers | 570 | # Serial drivers |
@@ -552,52 +583,62 @@ CONFIG_UNIX98_PTYS=y | |||
552 | CONFIG_LEGACY_PTYS=y | 583 | CONFIG_LEGACY_PTYS=y |
553 | CONFIG_LEGACY_PTY_COUNT=256 | 584 | CONFIG_LEGACY_PTY_COUNT=256 |
554 | # CONFIG_IPMI_HANDLER is not set | 585 | # CONFIG_IPMI_HANDLER is not set |
555 | # CONFIG_WATCHDOG is not set | ||
556 | # CONFIG_HW_RANDOM is not set | 586 | # CONFIG_HW_RANDOM is not set |
557 | # CONFIG_RTC is not set | ||
558 | # CONFIG_R3964 is not set | 587 | # CONFIG_R3964 is not set |
559 | # CONFIG_APPLICOM is not set | 588 | # CONFIG_APPLICOM is not set |
560 | CONFIG_GPIO_TB0219=y | 589 | CONFIG_GPIO_TB0219=y |
561 | # CONFIG_DRM is not set | ||
562 | CONFIG_GPIO_VR41XX=y | 590 | CONFIG_GPIO_VR41XX=y |
563 | # CONFIG_RAW_DRIVER is not set | 591 | # CONFIG_RAW_DRIVER is not set |
564 | # CONFIG_TCG_TPM is not set | 592 | # CONFIG_TCG_TPM is not set |
565 | CONFIG_DEVPORT=y | 593 | CONFIG_DEVPORT=y |
566 | # CONFIG_I2C is not set | 594 | # CONFIG_I2C is not set |
567 | |||
568 | # | ||
569 | # SPI support | ||
570 | # | ||
571 | # CONFIG_SPI is not set | 595 | # CONFIG_SPI is not set |
572 | # CONFIG_SPI_MASTER is not set | ||
573 | # CONFIG_W1 is not set | 596 | # CONFIG_W1 is not set |
574 | # CONFIG_POWER_SUPPLY is not set | 597 | # CONFIG_POWER_SUPPLY is not set |
575 | # CONFIG_HWMON is not set | 598 | # CONFIG_HWMON is not set |
599 | # CONFIG_THERMAL is not set | ||
600 | # CONFIG_WATCHDOG is not set | ||
601 | |||
602 | # | ||
603 | # Sonics Silicon Backplane | ||
604 | # | ||
605 | CONFIG_SSB_POSSIBLE=y | ||
606 | # CONFIG_SSB is not set | ||
576 | 607 | ||
577 | # | 608 | # |
578 | # Multifunction device drivers | 609 | # Multifunction device drivers |
579 | # | 610 | # |
580 | # CONFIG_MFD_SM501 is not set | 611 | # CONFIG_MFD_SM501 is not set |
612 | # CONFIG_HTC_PASIC3 is not set | ||
581 | 613 | ||
582 | # | 614 | # |
583 | # Multimedia devices | 615 | # Multimedia devices |
584 | # | 616 | # |
617 | |||
618 | # | ||
619 | # Multimedia core support | ||
620 | # | ||
585 | # CONFIG_VIDEO_DEV is not set | 621 | # CONFIG_VIDEO_DEV is not set |
586 | # CONFIG_DVB_CORE is not set | 622 | # CONFIG_DVB_CORE is not set |
623 | |||
624 | # | ||
625 | # Multimedia drivers | ||
626 | # | ||
587 | # CONFIG_DAB is not set | 627 | # CONFIG_DAB is not set |
588 | 628 | ||
589 | # | 629 | # |
590 | # Graphics support | 630 | # Graphics support |
591 | # | 631 | # |
632 | # CONFIG_DRM is not set | ||
633 | # CONFIG_VGASTATE is not set | ||
634 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
635 | # CONFIG_FB is not set | ||
592 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 636 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
593 | 637 | ||
594 | # | 638 | # |
595 | # Display device support | 639 | # Display device support |
596 | # | 640 | # |
597 | # CONFIG_DISPLAY_SUPPORT is not set | 641 | # CONFIG_DISPLAY_SUPPORT is not set |
598 | # CONFIG_VGASTATE is not set | ||
599 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
600 | # CONFIG_FB is not set | ||
601 | 642 | ||
602 | # | 643 | # |
603 | # Console display driver support | 644 | # Console display driver support |
@@ -616,6 +657,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
616 | CONFIG_USB_ARCH_HAS_EHCI=y | 657 | CONFIG_USB_ARCH_HAS_EHCI=y |
617 | CONFIG_USB=m | 658 | CONFIG_USB=m |
618 | # CONFIG_USB_DEBUG is not set | 659 | # CONFIG_USB_DEBUG is not set |
660 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
619 | 661 | ||
620 | # | 662 | # |
621 | # Miscellaneous USB options | 663 | # Miscellaneous USB options |
@@ -624,15 +666,18 @@ CONFIG_USB_DEVICEFS=y | |||
624 | CONFIG_USB_DEVICE_CLASS=y | 666 | CONFIG_USB_DEVICE_CLASS=y |
625 | # CONFIG_USB_DYNAMIC_MINORS is not set | 667 | # CONFIG_USB_DYNAMIC_MINORS is not set |
626 | # CONFIG_USB_OTG is not set | 668 | # CONFIG_USB_OTG is not set |
669 | # CONFIG_USB_OTG_WHITELIST is not set | ||
670 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
627 | 671 | ||
628 | # | 672 | # |
629 | # USB Host Controller Drivers | 673 | # USB Host Controller Drivers |
630 | # | 674 | # |
675 | # CONFIG_USB_C67X00_HCD is not set | ||
631 | CONFIG_USB_EHCI_HCD=m | 676 | CONFIG_USB_EHCI_HCD=m |
632 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
633 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 677 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
634 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 678 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
635 | # CONFIG_USB_ISP116X_HCD is not set | 679 | # CONFIG_USB_ISP116X_HCD is not set |
680 | # CONFIG_USB_ISP1760_HCD is not set | ||
636 | CONFIG_USB_OHCI_HCD=m | 681 | CONFIG_USB_OHCI_HCD=m |
637 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 682 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
638 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 683 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -665,10 +710,6 @@ CONFIG_USB_MON=y | |||
665 | # | 710 | # |
666 | # USB port drivers | 711 | # USB port drivers |
667 | # | 712 | # |
668 | |||
669 | # | ||
670 | # USB Serial Converter support | ||
671 | # | ||
672 | # CONFIG_USB_SERIAL is not set | 713 | # CONFIG_USB_SERIAL is not set |
673 | 714 | ||
674 | # | 715 | # |
@@ -694,17 +735,11 @@ CONFIG_USB_MON=y | |||
694 | # CONFIG_USB_TRANCEVIBRATOR is not set | 735 | # CONFIG_USB_TRANCEVIBRATOR is not set |
695 | # CONFIG_USB_IOWARRIOR is not set | 736 | # CONFIG_USB_IOWARRIOR is not set |
696 | # CONFIG_USB_TEST is not set | 737 | # CONFIG_USB_TEST is not set |
697 | |||
698 | # | ||
699 | # USB DSL modem support | ||
700 | # | ||
701 | |||
702 | # | ||
703 | # USB Gadget Support | ||
704 | # | ||
705 | # CONFIG_USB_GADGET is not set | 738 | # CONFIG_USB_GADGET is not set |
706 | # CONFIG_MMC is not set | 739 | # CONFIG_MMC is not set |
740 | # CONFIG_MEMSTICK is not set | ||
707 | # CONFIG_NEW_LEDS is not set | 741 | # CONFIG_NEW_LEDS is not set |
742 | # CONFIG_ACCESSIBILITY is not set | ||
708 | # CONFIG_INFINIBAND is not set | 743 | # CONFIG_INFINIBAND is not set |
709 | CONFIG_RTC_LIB=y | 744 | CONFIG_RTC_LIB=y |
710 | CONFIG_RTC_CLASS=y | 745 | CONFIG_RTC_CLASS=y |
@@ -729,9 +764,10 @@ CONFIG_RTC_INTF_DEV=y | |||
729 | # Platform RTC drivers | 764 | # Platform RTC drivers |
730 | # | 765 | # |
731 | # CONFIG_RTC_DRV_CMOS is not set | 766 | # CONFIG_RTC_DRV_CMOS is not set |
767 | # CONFIG_RTC_DRV_DS1511 is not set | ||
732 | # CONFIG_RTC_DRV_DS1553 is not set | 768 | # CONFIG_RTC_DRV_DS1553 is not set |
733 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
734 | # CONFIG_RTC_DRV_DS1742 is not set | 769 | # CONFIG_RTC_DRV_DS1742 is not set |
770 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
735 | # CONFIG_RTC_DRV_M48T86 is not set | 771 | # CONFIG_RTC_DRV_M48T86 is not set |
736 | # CONFIG_RTC_DRV_M48T59 is not set | 772 | # CONFIG_RTC_DRV_M48T59 is not set |
737 | # CONFIG_RTC_DRV_V3020 is not set | 773 | # CONFIG_RTC_DRV_V3020 is not set |
@@ -740,23 +776,6 @@ CONFIG_RTC_INTF_DEV=y | |||
740 | # on-CPU RTC drivers | 776 | # on-CPU RTC drivers |
741 | # | 777 | # |
742 | CONFIG_RTC_DRV_VR41XX=y | 778 | CONFIG_RTC_DRV_VR41XX=y |
743 | |||
744 | # | ||
745 | # DMA Engine support | ||
746 | # | ||
747 | # CONFIG_DMA_ENGINE is not set | ||
748 | |||
749 | # | ||
750 | # DMA Clients | ||
751 | # | ||
752 | |||
753 | # | ||
754 | # DMA Devices | ||
755 | # | ||
756 | |||
757 | # | ||
758 | # Userspace I/O | ||
759 | # | ||
760 | # CONFIG_UIO is not set | 779 | # CONFIG_UIO is not set |
761 | 780 | ||
762 | # | 781 | # |
@@ -771,20 +790,16 @@ CONFIG_EXT3_FS_XATTR=y | |||
771 | # CONFIG_EXT3_FS_SECURITY is not set | 790 | # CONFIG_EXT3_FS_SECURITY is not set |
772 | # CONFIG_EXT4DEV_FS is not set | 791 | # CONFIG_EXT4DEV_FS is not set |
773 | CONFIG_JBD=y | 792 | CONFIG_JBD=y |
774 | # CONFIG_JBD_DEBUG is not set | ||
775 | CONFIG_FS_MBCACHE=y | 793 | CONFIG_FS_MBCACHE=y |
776 | # CONFIG_REISERFS_FS is not set | 794 | # CONFIG_REISERFS_FS is not set |
777 | # CONFIG_JFS_FS is not set | 795 | # CONFIG_JFS_FS is not set |
778 | CONFIG_FS_POSIX_ACL=y | 796 | CONFIG_FS_POSIX_ACL=y |
779 | # CONFIG_XFS_FS is not set | 797 | # CONFIG_XFS_FS is not set |
780 | # CONFIG_GFS2_FS is not set | ||
781 | # CONFIG_OCFS2_FS is not set | 798 | # CONFIG_OCFS2_FS is not set |
782 | # CONFIG_MINIX_FS is not set | 799 | CONFIG_DNOTIFY=y |
783 | CONFIG_ROMFS_FS=m | ||
784 | CONFIG_INOTIFY=y | 800 | CONFIG_INOTIFY=y |
785 | CONFIG_INOTIFY_USER=y | 801 | CONFIG_INOTIFY_USER=y |
786 | # CONFIG_QUOTA is not set | 802 | # CONFIG_QUOTA is not set |
787 | CONFIG_DNOTIFY=y | ||
788 | # CONFIG_AUTOFS_FS is not set | 803 | # CONFIG_AUTOFS_FS is not set |
789 | CONFIG_AUTOFS4_FS=y | 804 | CONFIG_AUTOFS4_FS=y |
790 | # CONFIG_FUSE_FS is not set | 805 | # CONFIG_FUSE_FS is not set |
@@ -813,7 +828,6 @@ CONFIG_SYSFS=y | |||
813 | CONFIG_TMPFS=y | 828 | CONFIG_TMPFS=y |
814 | CONFIG_TMPFS_POSIX_ACL=y | 829 | CONFIG_TMPFS_POSIX_ACL=y |
815 | # CONFIG_HUGETLB_PAGE is not set | 830 | # CONFIG_HUGETLB_PAGE is not set |
816 | CONFIG_RAMFS=y | ||
817 | # CONFIG_CONFIGFS_FS is not set | 831 | # CONFIG_CONFIGFS_FS is not set |
818 | 832 | ||
819 | # | 833 | # |
@@ -828,24 +842,21 @@ CONFIG_RAMFS=y | |||
828 | # CONFIG_EFS_FS is not set | 842 | # CONFIG_EFS_FS is not set |
829 | CONFIG_CRAMFS=m | 843 | CONFIG_CRAMFS=m |
830 | # CONFIG_VXFS_FS is not set | 844 | # CONFIG_VXFS_FS is not set |
845 | # CONFIG_MINIX_FS is not set | ||
831 | # CONFIG_HPFS_FS is not set | 846 | # CONFIG_HPFS_FS is not set |
832 | # CONFIG_QNX4FS_FS is not set | 847 | # CONFIG_QNX4FS_FS is not set |
848 | CONFIG_ROMFS_FS=m | ||
833 | # CONFIG_SYSV_FS is not set | 849 | # CONFIG_SYSV_FS is not set |
834 | # CONFIG_UFS_FS is not set | 850 | # CONFIG_UFS_FS is not set |
835 | 851 | CONFIG_NETWORK_FILESYSTEMS=y | |
836 | # | ||
837 | # Network File Systems | ||
838 | # | ||
839 | CONFIG_NFS_FS=y | 852 | CONFIG_NFS_FS=y |
840 | CONFIG_NFS_V3=y | 853 | CONFIG_NFS_V3=y |
841 | # CONFIG_NFS_V3_ACL is not set | 854 | # CONFIG_NFS_V3_ACL is not set |
842 | # CONFIG_NFS_V4 is not set | 855 | # CONFIG_NFS_V4 is not set |
843 | # CONFIG_NFS_DIRECTIO is not set | ||
844 | CONFIG_NFSD=y | 856 | CONFIG_NFSD=y |
845 | CONFIG_NFSD_V3=y | 857 | CONFIG_NFSD_V3=y |
846 | # CONFIG_NFSD_V3_ACL is not set | 858 | # CONFIG_NFSD_V3_ACL is not set |
847 | # CONFIG_NFSD_V4 is not set | 859 | # CONFIG_NFSD_V4 is not set |
848 | CONFIG_NFSD_TCP=y | ||
849 | CONFIG_ROOT_NFS=y | 860 | CONFIG_ROOT_NFS=y |
850 | CONFIG_LOCKD=y | 861 | CONFIG_LOCKD=y |
851 | CONFIG_LOCKD_V4=y | 862 | CONFIG_LOCKD_V4=y |
@@ -866,47 +877,38 @@ CONFIG_SUNRPC=y | |||
866 | # | 877 | # |
867 | # CONFIG_PARTITION_ADVANCED is not set | 878 | # CONFIG_PARTITION_ADVANCED is not set |
868 | CONFIG_MSDOS_PARTITION=y | 879 | CONFIG_MSDOS_PARTITION=y |
869 | |||
870 | # | ||
871 | # Native Language Support | ||
872 | # | ||
873 | # CONFIG_NLS is not set | 880 | # CONFIG_NLS is not set |
874 | |||
875 | # | ||
876 | # Distributed Lock Manager | ||
877 | # | ||
878 | # CONFIG_DLM is not set | 881 | # CONFIG_DLM is not set |
879 | 882 | ||
880 | # | 883 | # |
881 | # Profiling support | ||
882 | # | ||
883 | # CONFIG_PROFILING is not set | ||
884 | |||
885 | # | ||
886 | # Kernel hacking | 884 | # Kernel hacking |
887 | # | 885 | # |
888 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 886 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
889 | # CONFIG_PRINTK_TIME is not set | 887 | # CONFIG_PRINTK_TIME is not set |
888 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
890 | CONFIG_ENABLE_MUST_CHECK=y | 889 | CONFIG_ENABLE_MUST_CHECK=y |
890 | CONFIG_FRAME_WARN=1024 | ||
891 | # CONFIG_MAGIC_SYSRQ is not set | 891 | # CONFIG_MAGIC_SYSRQ is not set |
892 | # CONFIG_UNUSED_SYMBOLS is not set | 892 | # CONFIG_UNUSED_SYMBOLS is not set |
893 | # CONFIG_DEBUG_FS is not set | 893 | # CONFIG_DEBUG_FS is not set |
894 | # CONFIG_HEADERS_CHECK is not set | 894 | # CONFIG_HEADERS_CHECK is not set |
895 | # CONFIG_DEBUG_KERNEL is not set | 895 | # CONFIG_DEBUG_KERNEL is not set |
896 | CONFIG_CROSSCOMPILE=y | 896 | # CONFIG_SAMPLES is not set |
897 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 897 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
898 | 898 | ||
899 | # | 899 | # |
900 | # Security options | 900 | # Security options |
901 | # | 901 | # |
902 | # CONFIG_KEYS is not set | 902 | # CONFIG_KEYS is not set |
903 | # CONFIG_SECURITY is not set | 903 | # CONFIG_SECURITY is not set |
904 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
904 | # CONFIG_CRYPTO is not set | 905 | # CONFIG_CRYPTO is not set |
905 | 906 | ||
906 | # | 907 | # |
907 | # Library routines | 908 | # Library routines |
908 | # | 909 | # |
909 | CONFIG_BITREVERSE=y | 910 | CONFIG_BITREVERSE=y |
911 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
910 | CONFIG_CRC_CCITT=y | 912 | CONFIG_CRC_CCITT=y |
911 | # CONFIG_CRC16 is not set | 913 | # CONFIG_CRC16 is not set |
912 | # CONFIG_CRC_ITU_T is not set | 914 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index a95385b24546..2ba240e897c6 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_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.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
4 | # Thu Aug 9 11:16:55 2007 | 4 | # Mon May 12 11:53:54 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
10 | # | 10 | # |
11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
13 | # CONFIG_BCM47XX is not set | ||
13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LASAT is not set | ||
16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
@@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
31 | # CONFIG_SGI_IP28 is not set | ||
29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
@@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
68 | CONFIG_CEVT_R4K=y | ||
69 | CONFIG_CSRC_R4K=y | ||
62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
@@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
138 | # CONFIG_TICK_ONESHOT is not set | ||
139 | # CONFIG_NO_HZ is not set | ||
140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
@@ -156,23 +171,29 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
159 | # CONFIG_USER_NS is not set | ||
160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
177 | # CONFIG_CGROUPS is not set | ||
178 | # CONFIG_GROUP_SCHED is not set | ||
163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
182 | # CONFIG_NAMESPACES is not set | ||
165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
168 | CONFIG_EMBEDDED=y | 186 | CONFIG_EMBEDDED=y |
169 | CONFIG_SYSCTL_SYSCALL=y | 187 | CONFIG_SYSCTL_SYSCALL=y |
188 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
170 | CONFIG_KALLSYMS=y | 189 | CONFIG_KALLSYMS=y |
171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 190 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
172 | CONFIG_HOTPLUG=y | 191 | CONFIG_HOTPLUG=y |
173 | CONFIG_PRINTK=y | 192 | CONFIG_PRINTK=y |
174 | CONFIG_BUG=y | 193 | CONFIG_BUG=y |
175 | CONFIG_ELF_CORE=y | 194 | CONFIG_ELF_CORE=y |
195 | # CONFIG_PCSPKR_PLATFORM is not set | ||
196 | CONFIG_COMPAT_BRK=y | ||
176 | CONFIG_BASE_FULL=y | 197 | CONFIG_BASE_FULL=y |
177 | CONFIG_FUTEX=y | 198 | CONFIG_FUTEX=y |
178 | CONFIG_ANON_INODES=y | 199 | CONFIG_ANON_INODES=y |
@@ -185,10 +206,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
185 | CONFIG_SLAB=y | 206 | CONFIG_SLAB=y |
186 | # CONFIG_SLUB is not set | 207 | # CONFIG_SLUB is not set |
187 | # CONFIG_SLOB is not set | 208 | # CONFIG_SLOB is not set |
209 | # CONFIG_PROFILING is not set | ||
210 | # CONFIG_MARKERS is not set | ||
211 | CONFIG_HAVE_OPROFILE=y | ||
212 | # CONFIG_HAVE_KPROBES is not set | ||
213 | # CONFIG_HAVE_KRETPROBES is not set | ||
214 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
215 | CONFIG_PROC_PAGE_MONITOR=y | ||
216 | CONFIG_SLABINFO=y | ||
188 | CONFIG_RT_MUTEXES=y | 217 | CONFIG_RT_MUTEXES=y |
189 | # CONFIG_TINY_SHMEM is not set | 218 | # CONFIG_TINY_SHMEM is not set |
190 | CONFIG_BASE_SMALL=0 | 219 | CONFIG_BASE_SMALL=0 |
191 | CONFIG_MODULES=y | 220 | CONFIG_MODULES=y |
221 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
192 | CONFIG_MODULE_UNLOAD=y | 222 | CONFIG_MODULE_UNLOAD=y |
193 | CONFIG_MODULE_FORCE_UNLOAD=y | 223 | CONFIG_MODULE_FORCE_UNLOAD=y |
194 | CONFIG_MODVERSIONS=y | 224 | CONFIG_MODVERSIONS=y |
@@ -212,18 +242,17 @@ CONFIG_DEFAULT_AS=y | |||
212 | # CONFIG_DEFAULT_CFQ is not set | 242 | # CONFIG_DEFAULT_CFQ is not set |
213 | # CONFIG_DEFAULT_NOOP is not set | 243 | # CONFIG_DEFAULT_NOOP is not set |
214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 244 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
245 | CONFIG_CLASSIC_RCU=y | ||
215 | 246 | ||
216 | # | 247 | # |
217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 248 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
218 | # | 249 | # |
219 | CONFIG_HW_HAS_PCI=y | 250 | CONFIG_HW_HAS_PCI=y |
220 | CONFIG_PCI=y | 251 | CONFIG_PCI=y |
252 | CONFIG_PCI_DOMAINS=y | ||
221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 253 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
254 | CONFIG_PCI_LEGACY=y | ||
222 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
223 | |||
224 | # | ||
225 | # PCCARD (PCMCIA/CardBus) support | ||
226 | # | ||
227 | # CONFIG_PCCARD is not set | 256 | # CONFIG_PCCARD is not set |
228 | # CONFIG_HOTPLUG_PCI is not set | 257 | # CONFIG_HOTPLUG_PCI is not set |
229 | 258 | ||
@@ -237,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y | |||
237 | # | 266 | # |
238 | # Power management options | 267 | # Power management options |
239 | # | 268 | # |
269 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
240 | # CONFIG_PM is not set | 270 | # CONFIG_PM is not set |
241 | 271 | ||
242 | # | 272 | # |
@@ -277,6 +307,7 @@ CONFIG_SYN_COOKIES=y | |||
277 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 307 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
278 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 308 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
279 | # CONFIG_INET_XFRM_MODE_BEET is not set | 309 | # CONFIG_INET_XFRM_MODE_BEET is not set |
310 | # CONFIG_INET_LRO is not set | ||
280 | CONFIG_INET_DIAG=y | 311 | CONFIG_INET_DIAG=y |
281 | CONFIG_INET_TCP_DIAG=y | 312 | CONFIG_INET_TCP_DIAG=y |
282 | # CONFIG_TCP_CONG_ADVANCED is not set | 313 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -284,15 +315,10 @@ CONFIG_TCP_CONG_CUBIC=y | |||
284 | CONFIG_DEFAULT_TCP_CONG="cubic" | 315 | CONFIG_DEFAULT_TCP_CONG="cubic" |
285 | # CONFIG_TCP_MD5SIG is not set | 316 | # CONFIG_TCP_MD5SIG is not set |
286 | # CONFIG_IPV6 is not set | 317 | # CONFIG_IPV6 is not set |
287 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
288 | # CONFIG_INET6_TUNNEL is not set | ||
289 | CONFIG_NETWORK_SECMARK=y | 318 | CONFIG_NETWORK_SECMARK=y |
290 | # CONFIG_NETFILTER is not set | 319 | # CONFIG_NETFILTER is not set |
291 | # CONFIG_IP_DCCP is not set | 320 | # CONFIG_IP_DCCP is not set |
292 | # CONFIG_IP_SCTP is not set | 321 | # CONFIG_IP_SCTP is not set |
293 | # CONFIG_SCTP_HMAC_NONE is not set | ||
294 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
295 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
296 | # CONFIG_TIPC is not set | 322 | # CONFIG_TIPC is not set |
297 | # CONFIG_ATM is not set | 323 | # CONFIG_ATM is not set |
298 | # CONFIG_BRIDGE is not set | 324 | # CONFIG_BRIDGE is not set |
@@ -305,10 +331,6 @@ CONFIG_NETWORK_SECMARK=y | |||
305 | # CONFIG_LAPB is not set | 331 | # CONFIG_LAPB is not set |
306 | # CONFIG_ECONET is not set | 332 | # CONFIG_ECONET is not set |
307 | # CONFIG_WAN_ROUTER is not set | 333 | # CONFIG_WAN_ROUTER is not set |
308 | |||
309 | # | ||
310 | # QoS and/or fair queueing | ||
311 | # | ||
312 | # CONFIG_NET_SCHED is not set | 334 | # CONFIG_NET_SCHED is not set |
313 | 335 | ||
314 | # | 336 | # |
@@ -316,6 +338,7 @@ CONFIG_NETWORK_SECMARK=y | |||
316 | # | 338 | # |
317 | # CONFIG_NET_PKTGEN is not set | 339 | # CONFIG_NET_PKTGEN is not set |
318 | # CONFIG_HAMRADIO is not set | 340 | # CONFIG_HAMRADIO is not set |
341 | # CONFIG_CAN is not set | ||
319 | # CONFIG_IRDA is not set | 342 | # CONFIG_IRDA is not set |
320 | # CONFIG_BT is not set | 343 | # CONFIG_BT is not set |
321 | # CONFIG_AF_RXRPC is not set | 344 | # CONFIG_AF_RXRPC is not set |
@@ -338,6 +361,7 @@ CONFIG_FIB_RULES=y | |||
338 | # | 361 | # |
339 | # Generic Driver Options | 362 | # Generic Driver Options |
340 | # | 363 | # |
364 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
341 | CONFIG_STANDALONE=y | 365 | CONFIG_STANDALONE=y |
342 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 366 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
343 | CONFIG_FW_LOADER=y | 367 | CONFIG_FW_LOADER=y |
@@ -359,10 +383,11 @@ CONFIG_BLK_DEV_NBD=m | |||
359 | CONFIG_BLK_DEV_RAM=y | 383 | CONFIG_BLK_DEV_RAM=y |
360 | CONFIG_BLK_DEV_RAM_COUNT=16 | 384 | CONFIG_BLK_DEV_RAM_COUNT=16 |
361 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 385 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
362 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 386 | CONFIG_BLK_DEV_XIP=y |
363 | # CONFIG_CDROM_PKTCDVD is not set | 387 | # CONFIG_CDROM_PKTCDVD is not set |
364 | # CONFIG_ATA_OVER_ETH is not set | 388 | # CONFIG_ATA_OVER_ETH is not set |
365 | # CONFIG_MISC_DEVICES is not set | 389 | # CONFIG_MISC_DEVICES is not set |
390 | CONFIG_HAVE_IDE=y | ||
366 | # CONFIG_IDE is not set | 391 | # CONFIG_IDE is not set |
367 | 392 | ||
368 | # | 393 | # |
@@ -402,18 +427,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
402 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 427 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
403 | CONFIG_SCSI_SAS_ATTRS=m | 428 | CONFIG_SCSI_SAS_ATTRS=m |
404 | CONFIG_SCSI_SAS_LIBSAS=m | 429 | CONFIG_SCSI_SAS_LIBSAS=m |
430 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
405 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 431 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
432 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
406 | # CONFIG_SCSI_LOWLEVEL is not set | 433 | # CONFIG_SCSI_LOWLEVEL is not set |
407 | # CONFIG_ATA is not set | 434 | # CONFIG_ATA is not set |
408 | # CONFIG_MD is not set | 435 | # CONFIG_MD is not set |
409 | |||
410 | # | ||
411 | # Fusion MPT device support | ||
412 | # | ||
413 | # CONFIG_FUSION is not set | 436 | # CONFIG_FUSION is not set |
414 | # CONFIG_FUSION_SPI is not set | ||
415 | # CONFIG_FUSION_FC is not set | ||
416 | # CONFIG_FUSION_SAS is not set | ||
417 | 437 | ||
418 | # | 438 | # |
419 | # IEEE 1394 (FireWire) support | 439 | # IEEE 1394 (FireWire) support |
@@ -428,6 +448,7 @@ CONFIG_NETDEVICES=y | |||
428 | # CONFIG_MACVLAN is not set | 448 | # CONFIG_MACVLAN is not set |
429 | # CONFIG_EQUALIZER is not set | 449 | # CONFIG_EQUALIZER is not set |
430 | # CONFIG_TUN is not set | 450 | # CONFIG_TUN is not set |
451 | # CONFIG_VETH is not set | ||
431 | # CONFIG_ARCNET is not set | 452 | # CONFIG_ARCNET is not set |
432 | # CONFIG_PHYLIB is not set | 453 | # CONFIG_PHYLIB is not set |
433 | CONFIG_NET_ETHERNET=y | 454 | CONFIG_NET_ETHERNET=y |
@@ -440,6 +461,10 @@ CONFIG_MII=y | |||
440 | # CONFIG_DM9000 is not set | 461 | # CONFIG_DM9000 is not set |
441 | # CONFIG_NET_TULIP is not set | 462 | # CONFIG_NET_TULIP is not set |
442 | # CONFIG_HP100 is not set | 463 | # CONFIG_HP100 is not set |
464 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
465 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
466 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
467 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
443 | CONFIG_NET_PCI=y | 468 | CONFIG_NET_PCI=y |
444 | # CONFIG_PCNET32 is not set | 469 | # CONFIG_PCNET32 is not set |
445 | # CONFIG_AMD8111_ETH is not set | 470 | # CONFIG_AMD8111_ETH is not set |
@@ -447,7 +472,6 @@ CONFIG_NET_PCI=y | |||
447 | # CONFIG_B44 is not set | 472 | # CONFIG_B44 is not set |
448 | # CONFIG_FORCEDETH is not set | 473 | # CONFIG_FORCEDETH is not set |
449 | # CONFIG_TC35815 is not set | 474 | # CONFIG_TC35815 is not set |
450 | # CONFIG_DGRS is not set | ||
451 | # CONFIG_EEPRO100 is not set | 475 | # CONFIG_EEPRO100 is not set |
452 | CONFIG_E100=y | 476 | CONFIG_E100=y |
453 | # CONFIG_FEALNX is not set | 477 | # CONFIG_FEALNX is not set |
@@ -455,6 +479,7 @@ CONFIG_E100=y | |||
455 | # CONFIG_NE2K_PCI is not set | 479 | # CONFIG_NE2K_PCI is not set |
456 | # CONFIG_8139CP is not set | 480 | # CONFIG_8139CP is not set |
457 | # CONFIG_8139TOO is not set | 481 | # CONFIG_8139TOO is not set |
482 | # CONFIG_R6040 is not set | ||
458 | # CONFIG_SIS900 is not set | 483 | # CONFIG_SIS900 is not set |
459 | # CONFIG_EPIC100 is not set | 484 | # CONFIG_EPIC100 is not set |
460 | # CONFIG_SUNDANCE is not set | 485 | # CONFIG_SUNDANCE is not set |
@@ -470,6 +495,7 @@ CONFIG_E100=y | |||
470 | # | 495 | # |
471 | # CONFIG_WLAN_PRE80211 is not set | 496 | # CONFIG_WLAN_PRE80211 is not set |
472 | # CONFIG_WLAN_80211 is not set | 497 | # CONFIG_WLAN_80211 is not set |
498 | # CONFIG_IWLWIFI_LEDS is not set | ||
473 | 499 | ||
474 | # | 500 | # |
475 | # USB Network Adapters | 501 | # USB Network Adapters |
@@ -478,7 +504,6 @@ CONFIG_USB_CATC=m | |||
478 | CONFIG_USB_KAWETH=m | 504 | CONFIG_USB_KAWETH=m |
479 | CONFIG_USB_PEGASUS=m | 505 | CONFIG_USB_PEGASUS=m |
480 | CONFIG_USB_RTL8150=m | 506 | CONFIG_USB_RTL8150=m |
481 | # CONFIG_USB_USBNET_MII is not set | ||
482 | # CONFIG_USB_USBNET is not set | 507 | # CONFIG_USB_USBNET is not set |
483 | # CONFIG_WAN is not set | 508 | # CONFIG_WAN is not set |
484 | # CONFIG_FDDI is not set | 509 | # CONFIG_FDDI is not set |
@@ -486,7 +511,6 @@ CONFIG_USB_RTL8150=m | |||
486 | # CONFIG_PPP is not set | 511 | # CONFIG_PPP is not set |
487 | # CONFIG_SLIP is not set | 512 | # CONFIG_SLIP is not set |
488 | # CONFIG_NET_FC is not set | 513 | # CONFIG_NET_FC is not set |
489 | # CONFIG_SHAPER is not set | ||
490 | # CONFIG_NETCONSOLE is not set | 514 | # CONFIG_NETCONSOLE is not set |
491 | # CONFIG_NETPOLL is not set | 515 | # CONFIG_NETPOLL is not set |
492 | # CONFIG_NET_POLL_CONTROLLER is not set | 516 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -505,7 +529,6 @@ CONFIG_INPUT=y | |||
505 | # | 529 | # |
506 | # CONFIG_INPUT_MOUSEDEV is not set | 530 | # CONFIG_INPUT_MOUSEDEV is not set |
507 | # CONFIG_INPUT_JOYDEV is not set | 531 | # CONFIG_INPUT_JOYDEV is not set |
508 | # CONFIG_INPUT_TSDEV is not set | ||
509 | # CONFIG_INPUT_EVDEV is not set | 532 | # CONFIG_INPUT_EVDEV is not set |
510 | # CONFIG_INPUT_EVBUG is not set | 533 | # CONFIG_INPUT_EVBUG is not set |
511 | 534 | ||
@@ -532,7 +555,9 @@ CONFIG_VT=y | |||
532 | CONFIG_VT_CONSOLE=y | 555 | CONFIG_VT_CONSOLE=y |
533 | CONFIG_HW_CONSOLE=y | 556 | CONFIG_HW_CONSOLE=y |
534 | CONFIG_VT_HW_CONSOLE_BINDING=y | 557 | CONFIG_VT_HW_CONSOLE_BINDING=y |
558 | # CONFIG_DEVKMEM is not set | ||
535 | # CONFIG_SERIAL_NONSTANDARD is not set | 559 | # CONFIG_SERIAL_NONSTANDARD is not set |
560 | # CONFIG_NOZOMI is not set | ||
536 | 561 | ||
537 | # | 562 | # |
538 | # Serial drivers | 563 | # Serial drivers |
@@ -551,52 +576,62 @@ CONFIG_UNIX98_PTYS=y | |||
551 | CONFIG_LEGACY_PTYS=y | 576 | CONFIG_LEGACY_PTYS=y |
552 | CONFIG_LEGACY_PTY_COUNT=256 | 577 | CONFIG_LEGACY_PTY_COUNT=256 |
553 | # CONFIG_IPMI_HANDLER is not set | 578 | # CONFIG_IPMI_HANDLER is not set |
554 | # CONFIG_WATCHDOG is not set | ||
555 | # CONFIG_HW_RANDOM is not set | 579 | # CONFIG_HW_RANDOM is not set |
556 | # CONFIG_RTC is not set | ||
557 | # CONFIG_R3964 is not set | 580 | # CONFIG_R3964 is not set |
558 | # CONFIG_APPLICOM is not set | 581 | # CONFIG_APPLICOM is not set |
559 | # CONFIG_GPIO_TB0219 is not set | 582 | # CONFIG_GPIO_TB0219 is not set |
560 | # CONFIG_DRM is not set | ||
561 | CONFIG_GPIO_VR41XX=y | 583 | CONFIG_GPIO_VR41XX=y |
562 | # CONFIG_RAW_DRIVER is not set | 584 | # CONFIG_RAW_DRIVER is not set |
563 | # CONFIG_TCG_TPM is not set | 585 | # CONFIG_TCG_TPM is not set |
564 | CONFIG_DEVPORT=y | 586 | CONFIG_DEVPORT=y |
565 | # CONFIG_I2C is not set | 587 | # CONFIG_I2C is not set |
566 | |||
567 | # | ||
568 | # SPI support | ||
569 | # | ||
570 | # CONFIG_SPI is not set | 588 | # CONFIG_SPI is not set |
571 | # CONFIG_SPI_MASTER is not set | ||
572 | # CONFIG_W1 is not set | 589 | # CONFIG_W1 is not set |
573 | # CONFIG_POWER_SUPPLY is not set | 590 | # CONFIG_POWER_SUPPLY is not set |
574 | # CONFIG_HWMON is not set | 591 | # CONFIG_HWMON is not set |
592 | # CONFIG_THERMAL is not set | ||
593 | # CONFIG_WATCHDOG is not set | ||
594 | |||
595 | # | ||
596 | # Sonics Silicon Backplane | ||
597 | # | ||
598 | CONFIG_SSB_POSSIBLE=y | ||
599 | # CONFIG_SSB is not set | ||
575 | 600 | ||
576 | # | 601 | # |
577 | # Multifunction device drivers | 602 | # Multifunction device drivers |
578 | # | 603 | # |
579 | # CONFIG_MFD_SM501 is not set | 604 | # CONFIG_MFD_SM501 is not set |
605 | # CONFIG_HTC_PASIC3 is not set | ||
580 | 606 | ||
581 | # | 607 | # |
582 | # Multimedia devices | 608 | # Multimedia devices |
583 | # | 609 | # |
610 | |||
611 | # | ||
612 | # Multimedia core support | ||
613 | # | ||
584 | # CONFIG_VIDEO_DEV is not set | 614 | # CONFIG_VIDEO_DEV is not set |
585 | # CONFIG_DVB_CORE is not set | 615 | # CONFIG_DVB_CORE is not set |
616 | |||
617 | # | ||
618 | # Multimedia drivers | ||
619 | # | ||
586 | # CONFIG_DAB is not set | 620 | # CONFIG_DAB is not set |
587 | 621 | ||
588 | # | 622 | # |
589 | # Graphics support | 623 | # Graphics support |
590 | # | 624 | # |
625 | # CONFIG_DRM is not set | ||
626 | # CONFIG_VGASTATE is not set | ||
627 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
628 | # CONFIG_FB is not set | ||
591 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 629 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
592 | 630 | ||
593 | # | 631 | # |
594 | # Display device support | 632 | # Display device support |
595 | # | 633 | # |
596 | # CONFIG_DISPLAY_SUPPORT is not set | 634 | # CONFIG_DISPLAY_SUPPORT is not set |
597 | # CONFIG_VGASTATE is not set | ||
598 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
599 | # CONFIG_FB is not set | ||
600 | 635 | ||
601 | # | 636 | # |
602 | # Console display driver support | 637 | # Console display driver support |
@@ -615,6 +650,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
615 | CONFIG_USB_ARCH_HAS_EHCI=y | 650 | CONFIG_USB_ARCH_HAS_EHCI=y |
616 | CONFIG_USB=y | 651 | CONFIG_USB=y |
617 | # CONFIG_USB_DEBUG is not set | 652 | # CONFIG_USB_DEBUG is not set |
653 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
618 | 654 | ||
619 | # | 655 | # |
620 | # Miscellaneous USB options | 656 | # Miscellaneous USB options |
@@ -623,15 +659,18 @@ CONFIG_USB_DEVICEFS=y | |||
623 | CONFIG_USB_DEVICE_CLASS=y | 659 | CONFIG_USB_DEVICE_CLASS=y |
624 | # CONFIG_USB_DYNAMIC_MINORS is not set | 660 | # CONFIG_USB_DYNAMIC_MINORS is not set |
625 | # CONFIG_USB_OTG is not set | 661 | # CONFIG_USB_OTG is not set |
662 | # CONFIG_USB_OTG_WHITELIST is not set | ||
663 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
626 | 664 | ||
627 | # | 665 | # |
628 | # USB Host Controller Drivers | 666 | # USB Host Controller Drivers |
629 | # | 667 | # |
668 | # CONFIG_USB_C67X00_HCD is not set | ||
630 | CONFIG_USB_EHCI_HCD=y | 669 | CONFIG_USB_EHCI_HCD=y |
631 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
632 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 670 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
633 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 671 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
634 | # CONFIG_USB_ISP116X_HCD is not set | 672 | # CONFIG_USB_ISP116X_HCD is not set |
673 | # CONFIG_USB_ISP1760_HCD is not set | ||
635 | CONFIG_USB_OHCI_HCD=y | 674 | CONFIG_USB_OHCI_HCD=y |
636 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 675 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
637 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 676 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -657,13 +696,16 @@ CONFIG_USB_STORAGE=y | |||
657 | # CONFIG_USB_STORAGE_DEBUG is not set | 696 | # CONFIG_USB_STORAGE_DEBUG is not set |
658 | # CONFIG_USB_STORAGE_DATAFAB is not set | 697 | # CONFIG_USB_STORAGE_DATAFAB is not set |
659 | # CONFIG_USB_STORAGE_FREECOM is not set | 698 | # CONFIG_USB_STORAGE_FREECOM is not set |
699 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
660 | # CONFIG_USB_STORAGE_DPCM is not set | 700 | # CONFIG_USB_STORAGE_DPCM is not set |
661 | # CONFIG_USB_STORAGE_USBAT is not set | 701 | # CONFIG_USB_STORAGE_USBAT is not set |
662 | # CONFIG_USB_STORAGE_SDDR09 is not set | 702 | # CONFIG_USB_STORAGE_SDDR09 is not set |
663 | # CONFIG_USB_STORAGE_SDDR55 is not set | 703 | # CONFIG_USB_STORAGE_SDDR55 is not set |
664 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 704 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
665 | # CONFIG_USB_STORAGE_ALAUDA is not set | 705 | # CONFIG_USB_STORAGE_ALAUDA is not set |
706 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
666 | # CONFIG_USB_STORAGE_KARMA is not set | 707 | # CONFIG_USB_STORAGE_KARMA is not set |
708 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
667 | # CONFIG_USB_LIBUSUAL is not set | 709 | # CONFIG_USB_LIBUSUAL is not set |
668 | 710 | ||
669 | # | 711 | # |
@@ -676,10 +718,6 @@ CONFIG_USB_STORAGE=y | |||
676 | # | 718 | # |
677 | # USB port drivers | 719 | # USB port drivers |
678 | # | 720 | # |
679 | |||
680 | # | ||
681 | # USB Serial Converter support | ||
682 | # | ||
683 | # CONFIG_USB_SERIAL is not set | 721 | # CONFIG_USB_SERIAL is not set |
684 | 722 | ||
685 | # | 723 | # |
@@ -705,17 +743,11 @@ CONFIG_USB_STORAGE=y | |||
705 | # CONFIG_USB_TRANCEVIBRATOR is not set | 743 | # CONFIG_USB_TRANCEVIBRATOR is not set |
706 | # CONFIG_USB_IOWARRIOR is not set | 744 | # CONFIG_USB_IOWARRIOR is not set |
707 | # CONFIG_USB_TEST is not set | 745 | # CONFIG_USB_TEST is not set |
708 | |||
709 | # | ||
710 | # USB DSL modem support | ||
711 | # | ||
712 | |||
713 | # | ||
714 | # USB Gadget Support | ||
715 | # | ||
716 | # CONFIG_USB_GADGET is not set | 746 | # CONFIG_USB_GADGET is not set |
717 | # CONFIG_MMC is not set | 747 | # CONFIG_MMC is not set |
748 | # CONFIG_MEMSTICK is not set | ||
718 | # CONFIG_NEW_LEDS is not set | 749 | # CONFIG_NEW_LEDS is not set |
750 | # CONFIG_ACCESSIBILITY is not set | ||
719 | # CONFIG_INFINIBAND is not set | 751 | # CONFIG_INFINIBAND is not set |
720 | CONFIG_RTC_LIB=y | 752 | CONFIG_RTC_LIB=y |
721 | CONFIG_RTC_CLASS=y | 753 | CONFIG_RTC_CLASS=y |
@@ -740,9 +772,10 @@ CONFIG_RTC_INTF_DEV=y | |||
740 | # Platform RTC drivers | 772 | # Platform RTC drivers |
741 | # | 773 | # |
742 | # CONFIG_RTC_DRV_CMOS is not set | 774 | # CONFIG_RTC_DRV_CMOS is not set |
775 | # CONFIG_RTC_DRV_DS1511 is not set | ||
743 | # CONFIG_RTC_DRV_DS1553 is not set | 776 | # CONFIG_RTC_DRV_DS1553 is not set |
744 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
745 | # CONFIG_RTC_DRV_DS1742 is not set | 777 | # CONFIG_RTC_DRV_DS1742 is not set |
778 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
746 | # CONFIG_RTC_DRV_M48T86 is not set | 779 | # CONFIG_RTC_DRV_M48T86 is not set |
747 | # CONFIG_RTC_DRV_M48T59 is not set | 780 | # CONFIG_RTC_DRV_M48T59 is not set |
748 | # CONFIG_RTC_DRV_V3020 is not set | 781 | # CONFIG_RTC_DRV_V3020 is not set |
@@ -751,23 +784,6 @@ CONFIG_RTC_INTF_DEV=y | |||
751 | # on-CPU RTC drivers | 784 | # on-CPU RTC drivers |
752 | # | 785 | # |
753 | CONFIG_RTC_DRV_VR41XX=y | 786 | CONFIG_RTC_DRV_VR41XX=y |
754 | |||
755 | # | ||
756 | # DMA Engine support | ||
757 | # | ||
758 | # CONFIG_DMA_ENGINE is not set | ||
759 | |||
760 | # | ||
761 | # DMA Clients | ||
762 | # | ||
763 | |||
764 | # | ||
765 | # DMA Devices | ||
766 | # | ||
767 | |||
768 | # | ||
769 | # Userspace I/O | ||
770 | # | ||
771 | # CONFIG_UIO is not set | 787 | # CONFIG_UIO is not set |
772 | 788 | ||
773 | # | 789 | # |
@@ -782,14 +798,11 @@ CONFIG_EXT2_FS=y | |||
782 | # CONFIG_JFS_FS is not set | 798 | # CONFIG_JFS_FS is not set |
783 | CONFIG_FS_POSIX_ACL=y | 799 | CONFIG_FS_POSIX_ACL=y |
784 | # CONFIG_XFS_FS is not set | 800 | # CONFIG_XFS_FS is not set |
785 | # CONFIG_GFS2_FS is not set | ||
786 | # CONFIG_OCFS2_FS is not set | 801 | # CONFIG_OCFS2_FS is not set |
787 | # CONFIG_MINIX_FS is not set | 802 | CONFIG_DNOTIFY=y |
788 | CONFIG_ROMFS_FS=m | ||
789 | CONFIG_INOTIFY=y | 803 | CONFIG_INOTIFY=y |
790 | CONFIG_INOTIFY_USER=y | 804 | CONFIG_INOTIFY_USER=y |
791 | # CONFIG_QUOTA is not set | 805 | # CONFIG_QUOTA is not set |
792 | CONFIG_DNOTIFY=y | ||
793 | # CONFIG_AUTOFS_FS is not set | 806 | # CONFIG_AUTOFS_FS is not set |
794 | CONFIG_AUTOFS4_FS=y | 807 | CONFIG_AUTOFS4_FS=y |
795 | # CONFIG_FUSE_FS is not set | 808 | # CONFIG_FUSE_FS is not set |
@@ -818,7 +831,6 @@ CONFIG_SYSFS=y | |||
818 | CONFIG_TMPFS=y | 831 | CONFIG_TMPFS=y |
819 | CONFIG_TMPFS_POSIX_ACL=y | 832 | CONFIG_TMPFS_POSIX_ACL=y |
820 | # CONFIG_HUGETLB_PAGE is not set | 833 | # CONFIG_HUGETLB_PAGE is not set |
821 | CONFIG_RAMFS=y | ||
822 | # CONFIG_CONFIGFS_FS is not set | 834 | # CONFIG_CONFIGFS_FS is not set |
823 | 835 | ||
824 | # | 836 | # |
@@ -833,24 +845,21 @@ CONFIG_RAMFS=y | |||
833 | # CONFIG_EFS_FS is not set | 845 | # CONFIG_EFS_FS is not set |
834 | CONFIG_CRAMFS=m | 846 | CONFIG_CRAMFS=m |
835 | # CONFIG_VXFS_FS is not set | 847 | # CONFIG_VXFS_FS is not set |
848 | # CONFIG_MINIX_FS is not set | ||
836 | # CONFIG_HPFS_FS is not set | 849 | # CONFIG_HPFS_FS is not set |
837 | # CONFIG_QNX4FS_FS is not set | 850 | # CONFIG_QNX4FS_FS is not set |
851 | CONFIG_ROMFS_FS=m | ||
838 | # CONFIG_SYSV_FS is not set | 852 | # CONFIG_SYSV_FS is not set |
839 | # CONFIG_UFS_FS is not set | 853 | # CONFIG_UFS_FS is not set |
840 | 854 | CONFIG_NETWORK_FILESYSTEMS=y | |
841 | # | ||
842 | # Network File Systems | ||
843 | # | ||
844 | CONFIG_NFS_FS=y | 855 | CONFIG_NFS_FS=y |
845 | CONFIG_NFS_V3=y | 856 | CONFIG_NFS_V3=y |
846 | # CONFIG_NFS_V3_ACL is not set | 857 | # CONFIG_NFS_V3_ACL is not set |
847 | # CONFIG_NFS_V4 is not set | 858 | # CONFIG_NFS_V4 is not set |
848 | # CONFIG_NFS_DIRECTIO is not set | ||
849 | CONFIG_NFSD=m | 859 | CONFIG_NFSD=m |
850 | CONFIG_NFSD_V3=y | 860 | CONFIG_NFSD_V3=y |
851 | # CONFIG_NFSD_V3_ACL is not set | 861 | # CONFIG_NFSD_V3_ACL is not set |
852 | # CONFIG_NFSD_V4 is not set | 862 | # CONFIG_NFSD_V4 is not set |
853 | # CONFIG_NFSD_TCP is not set | ||
854 | CONFIG_ROOT_NFS=y | 863 | CONFIG_ROOT_NFS=y |
855 | CONFIG_LOCKD=y | 864 | CONFIG_LOCKD=y |
856 | CONFIG_LOCKD_V4=y | 865 | CONFIG_LOCKD_V4=y |
@@ -871,47 +880,38 @@ CONFIG_SUNRPC=y | |||
871 | # | 880 | # |
872 | # CONFIG_PARTITION_ADVANCED is not set | 881 | # CONFIG_PARTITION_ADVANCED is not set |
873 | CONFIG_MSDOS_PARTITION=y | 882 | CONFIG_MSDOS_PARTITION=y |
874 | |||
875 | # | ||
876 | # Native Language Support | ||
877 | # | ||
878 | # CONFIG_NLS is not set | 883 | # CONFIG_NLS is not set |
879 | |||
880 | # | ||
881 | # Distributed Lock Manager | ||
882 | # | ||
883 | # CONFIG_DLM is not set | 884 | # CONFIG_DLM is not set |
884 | 885 | ||
885 | # | 886 | # |
886 | # Profiling support | ||
887 | # | ||
888 | # CONFIG_PROFILING is not set | ||
889 | |||
890 | # | ||
891 | # Kernel hacking | 887 | # Kernel hacking |
892 | # | 888 | # |
893 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 889 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
894 | # CONFIG_PRINTK_TIME is not set | 890 | # CONFIG_PRINTK_TIME is not set |
891 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
895 | CONFIG_ENABLE_MUST_CHECK=y | 892 | CONFIG_ENABLE_MUST_CHECK=y |
893 | CONFIG_FRAME_WARN=1024 | ||
896 | # CONFIG_MAGIC_SYSRQ is not set | 894 | # CONFIG_MAGIC_SYSRQ is not set |
897 | # CONFIG_UNUSED_SYMBOLS is not set | 895 | # CONFIG_UNUSED_SYMBOLS is not set |
898 | # CONFIG_DEBUG_FS is not set | 896 | # CONFIG_DEBUG_FS is not set |
899 | # CONFIG_HEADERS_CHECK is not set | 897 | # CONFIG_HEADERS_CHECK is not set |
900 | # CONFIG_DEBUG_KERNEL is not set | 898 | # CONFIG_DEBUG_KERNEL is not set |
901 | CONFIG_CROSSCOMPILE=y | 899 | # CONFIG_SAMPLES is not set |
902 | CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" | 900 | CONFIG_CMDLINE="cca=3 mem=32M console=ttyVR0,115200" |
903 | 901 | ||
904 | # | 902 | # |
905 | # Security options | 903 | # Security options |
906 | # | 904 | # |
907 | # CONFIG_KEYS is not set | 905 | # CONFIG_KEYS is not set |
908 | # CONFIG_SECURITY is not set | 906 | # CONFIG_SECURITY is not set |
907 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
909 | # CONFIG_CRYPTO is not set | 908 | # CONFIG_CRYPTO is not set |
910 | 909 | ||
911 | # | 910 | # |
912 | # Library routines | 911 | # Library routines |
913 | # | 912 | # |
914 | CONFIG_BITREVERSE=m | 913 | CONFIG_BITREVERSE=m |
914 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
915 | # CONFIG_CRC_CCITT is not set | 915 | # CONFIG_CRC_CCITT is not set |
916 | # CONFIG_CRC16 is not set | 916 | # CONFIG_CRC16 is not set |
917 | # CONFIG_CRC_ITU_T is not set | 917 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 40d4a40a970e..a5d0f3c55ed1 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_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.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
4 | # Thu Aug 9 14:03:54 2007 | 4 | # Mon May 12 11:55:55 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
10 | # | 10 | # |
11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
13 | # CONFIG_BCM47XX is not set | ||
13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LASAT is not set | ||
16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
@@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
31 | # CONFIG_SGI_IP28 is not set | ||
29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
@@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
68 | CONFIG_CEVT_R4K=y | ||
69 | CONFIG_CSRC_R4K=y | ||
62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
@@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
138 | # CONFIG_TICK_ONESHOT is not set | ||
139 | # CONFIG_NO_HZ is not set | ||
140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
@@ -156,12 +171,15 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
159 | # CONFIG_USER_NS is not set | ||
160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
177 | # CONFIG_CGROUPS is not set | ||
178 | # CONFIG_GROUP_SCHED is not set | ||
163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
182 | # CONFIG_NAMESPACES is not set | ||
165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
@@ -173,6 +191,8 @@ CONFIG_HOTPLUG=y | |||
173 | CONFIG_PRINTK=y | 191 | CONFIG_PRINTK=y |
174 | CONFIG_BUG=y | 192 | CONFIG_BUG=y |
175 | CONFIG_ELF_CORE=y | 193 | CONFIG_ELF_CORE=y |
194 | # CONFIG_PCSPKR_PLATFORM is not set | ||
195 | CONFIG_COMPAT_BRK=y | ||
176 | CONFIG_BASE_FULL=y | 196 | CONFIG_BASE_FULL=y |
177 | CONFIG_FUTEX=y | 197 | CONFIG_FUTEX=y |
178 | CONFIG_ANON_INODES=y | 198 | CONFIG_ANON_INODES=y |
@@ -185,10 +205,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
185 | CONFIG_SLAB=y | 205 | CONFIG_SLAB=y |
186 | # CONFIG_SLUB is not set | 206 | # CONFIG_SLUB is not set |
187 | # CONFIG_SLOB is not set | 207 | # CONFIG_SLOB is not set |
208 | # CONFIG_PROFILING is not set | ||
209 | # CONFIG_MARKERS is not set | ||
210 | CONFIG_HAVE_OPROFILE=y | ||
211 | # CONFIG_HAVE_KPROBES is not set | ||
212 | # CONFIG_HAVE_KRETPROBES is not set | ||
213 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
214 | CONFIG_PROC_PAGE_MONITOR=y | ||
215 | CONFIG_SLABINFO=y | ||
188 | CONFIG_RT_MUTEXES=y | 216 | CONFIG_RT_MUTEXES=y |
189 | # CONFIG_TINY_SHMEM is not set | 217 | # CONFIG_TINY_SHMEM is not set |
190 | CONFIG_BASE_SMALL=0 | 218 | CONFIG_BASE_SMALL=0 |
191 | CONFIG_MODULES=y | 219 | CONFIG_MODULES=y |
220 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
192 | CONFIG_MODULE_UNLOAD=y | 221 | CONFIG_MODULE_UNLOAD=y |
193 | CONFIG_MODULE_FORCE_UNLOAD=y | 222 | CONFIG_MODULE_FORCE_UNLOAD=y |
194 | CONFIG_MODVERSIONS=y | 223 | CONFIG_MODVERSIONS=y |
@@ -212,18 +241,17 @@ CONFIG_DEFAULT_AS=y | |||
212 | # CONFIG_DEFAULT_CFQ is not set | 241 | # CONFIG_DEFAULT_CFQ is not set |
213 | # CONFIG_DEFAULT_NOOP is not set | 242 | # CONFIG_DEFAULT_NOOP is not set |
214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 243 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
244 | CONFIG_CLASSIC_RCU=y | ||
215 | 245 | ||
216 | # | 246 | # |
217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 247 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
218 | # | 248 | # |
219 | CONFIG_HW_HAS_PCI=y | 249 | CONFIG_HW_HAS_PCI=y |
220 | CONFIG_PCI=y | 250 | CONFIG_PCI=y |
251 | CONFIG_PCI_DOMAINS=y | ||
221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 252 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
253 | CONFIG_PCI_LEGACY=y | ||
222 | CONFIG_MMU=y | 254 | CONFIG_MMU=y |
223 | |||
224 | # | ||
225 | # PCCARD (PCMCIA/CardBus) support | ||
226 | # | ||
227 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
228 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
229 | 257 | ||
@@ -237,6 +265,7 @@ CONFIG_TRAD_SIGNALS=y | |||
237 | # | 265 | # |
238 | # Power management options | 266 | # Power management options |
239 | # | 267 | # |
268 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
240 | # CONFIG_PM is not set | 269 | # CONFIG_PM is not set |
241 | 270 | ||
242 | # | 271 | # |
@@ -278,6 +307,7 @@ CONFIG_INET_TUNNEL=m | |||
278 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 307 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
279 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 308 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
280 | # CONFIG_INET_XFRM_MODE_BEET is not set | 309 | # CONFIG_INET_XFRM_MODE_BEET is not set |
310 | # CONFIG_INET_LRO is not set | ||
281 | CONFIG_INET_DIAG=y | 311 | CONFIG_INET_DIAG=y |
282 | CONFIG_INET_TCP_DIAG=y | 312 | CONFIG_INET_TCP_DIAG=y |
283 | CONFIG_TCP_CONG_ADVANCED=y | 313 | CONFIG_TCP_CONG_ADVANCED=y |
@@ -302,8 +332,6 @@ CONFIG_DEFAULT_BIC=y | |||
302 | CONFIG_DEFAULT_TCP_CONG="bic" | 332 | CONFIG_DEFAULT_TCP_CONG="bic" |
303 | # CONFIG_TCP_MD5SIG is not set | 333 | # CONFIG_TCP_MD5SIG is not set |
304 | # CONFIG_IPV6 is not set | 334 | # CONFIG_IPV6 is not set |
305 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
306 | # CONFIG_INET6_TUNNEL is not set | ||
307 | CONFIG_NETWORK_SECMARK=y | 335 | CONFIG_NETWORK_SECMARK=y |
308 | # CONFIG_NETFILTER is not set | 336 | # CONFIG_NETFILTER is not set |
309 | # CONFIG_IP_DCCP is not set | 337 | # CONFIG_IP_DCCP is not set |
@@ -320,10 +348,6 @@ CONFIG_NETWORK_SECMARK=y | |||
320 | # CONFIG_LAPB is not set | 348 | # CONFIG_LAPB is not set |
321 | # CONFIG_ECONET is not set | 349 | # CONFIG_ECONET is not set |
322 | # CONFIG_WAN_ROUTER is not set | 350 | # CONFIG_WAN_ROUTER is not set |
323 | |||
324 | # | ||
325 | # QoS and/or fair queueing | ||
326 | # | ||
327 | # CONFIG_NET_SCHED is not set | 351 | # CONFIG_NET_SCHED is not set |
328 | 352 | ||
329 | # | 353 | # |
@@ -331,6 +355,7 @@ CONFIG_NETWORK_SECMARK=y | |||
331 | # | 355 | # |
332 | # CONFIG_NET_PKTGEN is not set | 356 | # CONFIG_NET_PKTGEN is not set |
333 | # CONFIG_HAMRADIO is not set | 357 | # CONFIG_HAMRADIO is not set |
358 | # CONFIG_CAN is not set | ||
334 | # CONFIG_IRDA is not set | 359 | # CONFIG_IRDA is not set |
335 | # CONFIG_BT is not set | 360 | # CONFIG_BT is not set |
336 | # CONFIG_AF_RXRPC is not set | 361 | # CONFIG_AF_RXRPC is not set |
@@ -353,6 +378,7 @@ CONFIG_FIB_RULES=y | |||
353 | # | 378 | # |
354 | # Generic Driver Options | 379 | # Generic Driver Options |
355 | # | 380 | # |
381 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
356 | CONFIG_STANDALONE=y | 382 | CONFIG_STANDALONE=y |
357 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 383 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
358 | CONFIG_FW_LOADER=m | 384 | CONFIG_FW_LOADER=m |
@@ -374,10 +400,11 @@ CONFIG_BLK_DEV_NBD=m | |||
374 | CONFIG_BLK_DEV_RAM=y | 400 | CONFIG_BLK_DEV_RAM=y |
375 | CONFIG_BLK_DEV_RAM_COUNT=16 | 401 | CONFIG_BLK_DEV_RAM_COUNT=16 |
376 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 402 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
377 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 403 | CONFIG_BLK_DEV_XIP=y |
378 | # CONFIG_CDROM_PKTCDVD is not set | 404 | # CONFIG_CDROM_PKTCDVD is not set |
379 | # CONFIG_ATA_OVER_ETH is not set | 405 | # CONFIG_ATA_OVER_ETH is not set |
380 | # CONFIG_MISC_DEVICES is not set | 406 | # CONFIG_MISC_DEVICES is not set |
407 | CONFIG_HAVE_IDE=y | ||
381 | # CONFIG_IDE is not set | 408 | # CONFIG_IDE is not set |
382 | 409 | ||
383 | # | 410 | # |
@@ -416,10 +443,14 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
416 | # CONFIG_SCSI_FC_ATTRS is not set | 443 | # CONFIG_SCSI_FC_ATTRS is not set |
417 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 444 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
418 | # CONFIG_SCSI_SAS_LIBSAS is not set | 445 | # CONFIG_SCSI_SAS_LIBSAS is not set |
446 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
419 | # CONFIG_SCSI_LOWLEVEL is not set | 447 | # CONFIG_SCSI_LOWLEVEL is not set |
420 | CONFIG_ATA=y | 448 | CONFIG_ATA=y |
421 | # CONFIG_ATA_NONSTANDARD is not set | 449 | # CONFIG_ATA_NONSTANDARD is not set |
450 | CONFIG_SATA_PMP=y | ||
422 | # CONFIG_SATA_AHCI is not set | 451 | # CONFIG_SATA_AHCI is not set |
452 | # CONFIG_SATA_SIL24 is not set | ||
453 | CONFIG_ATA_SFF=y | ||
423 | # CONFIG_SATA_SVW is not set | 454 | # CONFIG_SATA_SVW is not set |
424 | # CONFIG_ATA_PIIX is not set | 455 | # CONFIG_ATA_PIIX is not set |
425 | # CONFIG_SATA_MV is not set | 456 | # CONFIG_SATA_MV is not set |
@@ -429,7 +460,6 @@ CONFIG_ATA=y | |||
429 | # CONFIG_SATA_PROMISE is not set | 460 | # CONFIG_SATA_PROMISE is not set |
430 | # CONFIG_SATA_SX4 is not set | 461 | # CONFIG_SATA_SX4 is not set |
431 | # CONFIG_SATA_SIL is not set | 462 | # CONFIG_SATA_SIL is not set |
432 | # CONFIG_SATA_SIL24 is not set | ||
433 | # CONFIG_SATA_SIS is not set | 463 | # CONFIG_SATA_SIS is not set |
434 | # CONFIG_SATA_ULI is not set | 464 | # CONFIG_SATA_ULI is not set |
435 | # CONFIG_SATA_VIA is not set | 465 | # CONFIG_SATA_VIA is not set |
@@ -458,7 +488,9 @@ CONFIG_ATA=y | |||
458 | # CONFIG_PATA_MPIIX is not set | 488 | # CONFIG_PATA_MPIIX is not set |
459 | # CONFIG_PATA_OLDPIIX is not set | 489 | # CONFIG_PATA_OLDPIIX is not set |
460 | # CONFIG_PATA_NETCELL is not set | 490 | # CONFIG_PATA_NETCELL is not set |
491 | # CONFIG_PATA_NINJA32 is not set | ||
461 | # CONFIG_PATA_NS87410 is not set | 492 | # CONFIG_PATA_NS87410 is not set |
493 | # CONFIG_PATA_NS87415 is not set | ||
462 | # CONFIG_PATA_OPTI is not set | 494 | # CONFIG_PATA_OPTI is not set |
463 | # CONFIG_PATA_OPTIDMA is not set | 495 | # CONFIG_PATA_OPTIDMA is not set |
464 | # CONFIG_PATA_PDC_OLD is not set | 496 | # CONFIG_PATA_PDC_OLD is not set |
@@ -472,15 +504,9 @@ CONFIG_PATA_SIL680=y | |||
472 | # CONFIG_PATA_VIA is not set | 504 | # CONFIG_PATA_VIA is not set |
473 | # CONFIG_PATA_WINBOND is not set | 505 | # CONFIG_PATA_WINBOND is not set |
474 | # CONFIG_PATA_PLATFORM is not set | 506 | # CONFIG_PATA_PLATFORM is not set |
507 | # CONFIG_PATA_SCH is not set | ||
475 | # CONFIG_MD is not set | 508 | # CONFIG_MD is not set |
476 | |||
477 | # | ||
478 | # Fusion MPT device support | ||
479 | # | ||
480 | # CONFIG_FUSION is not set | 509 | # CONFIG_FUSION is not set |
481 | # CONFIG_FUSION_SPI is not set | ||
482 | # CONFIG_FUSION_FC is not set | ||
483 | # CONFIG_FUSION_SAS is not set | ||
484 | 510 | ||
485 | # | 511 | # |
486 | # IEEE 1394 (FireWire) support | 512 | # IEEE 1394 (FireWire) support |
@@ -520,6 +546,7 @@ CONFIG_NETDEVICES=y | |||
520 | # CONFIG_MACVLAN is not set | 546 | # CONFIG_MACVLAN is not set |
521 | # CONFIG_EQUALIZER is not set | 547 | # CONFIG_EQUALIZER is not set |
522 | # CONFIG_TUN is not set | 548 | # CONFIG_TUN is not set |
549 | # CONFIG_VETH is not set | ||
523 | # CONFIG_ARCNET is not set | 550 | # CONFIG_ARCNET is not set |
524 | # CONFIG_PHYLIB is not set | 551 | # CONFIG_PHYLIB is not set |
525 | CONFIG_NET_ETHERNET=y | 552 | CONFIG_NET_ETHERNET=y |
@@ -532,6 +559,10 @@ CONFIG_MII=y | |||
532 | # CONFIG_DM9000 is not set | 559 | # CONFIG_DM9000 is not set |
533 | # CONFIG_NET_TULIP is not set | 560 | # CONFIG_NET_TULIP is not set |
534 | # CONFIG_HP100 is not set | 561 | # CONFIG_HP100 is not set |
562 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
563 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
564 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
565 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
535 | CONFIG_NET_PCI=y | 566 | CONFIG_NET_PCI=y |
536 | # CONFIG_PCNET32 is not set | 567 | # CONFIG_PCNET32 is not set |
537 | # CONFIG_AMD8111_ETH is not set | 568 | # CONFIG_AMD8111_ETH is not set |
@@ -539,7 +570,6 @@ CONFIG_NET_PCI=y | |||
539 | # CONFIG_B44 is not set | 570 | # CONFIG_B44 is not set |
540 | # CONFIG_FORCEDETH is not set | 571 | # CONFIG_FORCEDETH is not set |
541 | # CONFIG_TC35815 is not set | 572 | # CONFIG_TC35815 is not set |
542 | # CONFIG_DGRS is not set | ||
543 | # CONFIG_EEPRO100 is not set | 573 | # CONFIG_EEPRO100 is not set |
544 | # CONFIG_E100 is not set | 574 | # CONFIG_E100 is not set |
545 | # CONFIG_FEALNX is not set | 575 | # CONFIG_FEALNX is not set |
@@ -551,6 +581,7 @@ CONFIG_8139TOO_PIO=y | |||
551 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 581 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
552 | # CONFIG_8139TOO_8129 is not set | 582 | # CONFIG_8139TOO_8129 is not set |
553 | # CONFIG_8139_OLD_RX_RESET is not set | 583 | # CONFIG_8139_OLD_RX_RESET is not set |
584 | # CONFIG_R6040 is not set | ||
554 | # CONFIG_SIS900 is not set | 585 | # CONFIG_SIS900 is not set |
555 | # CONFIG_EPIC100 is not set | 586 | # CONFIG_EPIC100 is not set |
556 | # CONFIG_SUNDANCE is not set | 587 | # CONFIG_SUNDANCE is not set |
@@ -563,6 +594,10 @@ CONFIG_NETDEV_1000=y | |||
563 | # CONFIG_ACENIC is not set | 594 | # CONFIG_ACENIC is not set |
564 | # CONFIG_DL2K is not set | 595 | # CONFIG_DL2K is not set |
565 | # CONFIG_E1000 is not set | 596 | # CONFIG_E1000 is not set |
597 | # CONFIG_E1000E is not set | ||
598 | # CONFIG_E1000E_ENABLED is not set | ||
599 | # CONFIG_IP1000 is not set | ||
600 | # CONFIG_IGB is not set | ||
566 | # CONFIG_NS83820 is not set | 601 | # CONFIG_NS83820 is not set |
567 | # CONFIG_HAMACHI is not set | 602 | # CONFIG_HAMACHI is not set |
568 | # CONFIG_YELLOWFIN is not set | 603 | # CONFIG_YELLOWFIN is not set |
@@ -584,6 +619,7 @@ CONFIG_VIA_VELOCITY=y | |||
584 | # | 619 | # |
585 | # CONFIG_WLAN_PRE80211 is not set | 620 | # CONFIG_WLAN_PRE80211 is not set |
586 | # CONFIG_WLAN_80211 is not set | 621 | # CONFIG_WLAN_80211 is not set |
622 | # CONFIG_IWLWIFI_LEDS is not set | ||
587 | 623 | ||
588 | # | 624 | # |
589 | # USB Network Adapters | 625 | # USB Network Adapters |
@@ -592,7 +628,6 @@ CONFIG_VIA_VELOCITY=y | |||
592 | # CONFIG_USB_KAWETH is not set | 628 | # CONFIG_USB_KAWETH is not set |
593 | # CONFIG_USB_PEGASUS is not set | 629 | # CONFIG_USB_PEGASUS is not set |
594 | # CONFIG_USB_RTL8150 is not set | 630 | # CONFIG_USB_RTL8150 is not set |
595 | # CONFIG_USB_USBNET_MII is not set | ||
596 | # CONFIG_USB_USBNET is not set | 631 | # CONFIG_USB_USBNET is not set |
597 | # CONFIG_WAN is not set | 632 | # CONFIG_WAN is not set |
598 | # CONFIG_FDDI is not set | 633 | # CONFIG_FDDI is not set |
@@ -600,7 +635,6 @@ CONFIG_VIA_VELOCITY=y | |||
600 | # CONFIG_PPP is not set | 635 | # CONFIG_PPP is not set |
601 | # CONFIG_SLIP is not set | 636 | # CONFIG_SLIP is not set |
602 | # CONFIG_NET_FC is not set | 637 | # CONFIG_NET_FC is not set |
603 | # CONFIG_SHAPER is not set | ||
604 | # CONFIG_NETCONSOLE is not set | 638 | # CONFIG_NETCONSOLE is not set |
605 | # CONFIG_NETPOLL is not set | 639 | # CONFIG_NETPOLL is not set |
606 | # CONFIG_NET_POLL_CONTROLLER is not set | 640 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -622,7 +656,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
622 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 656 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
623 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 657 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
624 | # CONFIG_INPUT_JOYDEV is not set | 658 | # CONFIG_INPUT_JOYDEV is not set |
625 | # CONFIG_INPUT_TSDEV is not set | ||
626 | # CONFIG_INPUT_EVDEV is not set | 659 | # CONFIG_INPUT_EVDEV is not set |
627 | # CONFIG_INPUT_EVBUG is not set | 660 | # CONFIG_INPUT_EVBUG is not set |
628 | 661 | ||
@@ -649,7 +682,9 @@ CONFIG_VT=y | |||
649 | CONFIG_VT_CONSOLE=y | 682 | CONFIG_VT_CONSOLE=y |
650 | CONFIG_HW_CONSOLE=y | 683 | CONFIG_HW_CONSOLE=y |
651 | CONFIG_VT_HW_CONSOLE_BINDING=y | 684 | CONFIG_VT_HW_CONSOLE_BINDING=y |
685 | # CONFIG_DEVKMEM is not set | ||
652 | # CONFIG_SERIAL_NONSTANDARD is not set | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
687 | # CONFIG_NOZOMI is not set | ||
653 | 688 | ||
654 | # | 689 | # |
655 | # Serial drivers | 690 | # Serial drivers |
@@ -668,49 +703,53 @@ CONFIG_UNIX98_PTYS=y | |||
668 | CONFIG_LEGACY_PTYS=y | 703 | CONFIG_LEGACY_PTYS=y |
669 | CONFIG_LEGACY_PTY_COUNT=256 | 704 | CONFIG_LEGACY_PTY_COUNT=256 |
670 | # CONFIG_IPMI_HANDLER is not set | 705 | # CONFIG_IPMI_HANDLER is not set |
671 | # CONFIG_WATCHDOG is not set | ||
672 | # CONFIG_HW_RANDOM is not set | 706 | # CONFIG_HW_RANDOM is not set |
673 | # CONFIG_RTC is not set | ||
674 | # CONFIG_R3964 is not set | 707 | # CONFIG_R3964 is not set |
675 | # CONFIG_APPLICOM is not set | 708 | # CONFIG_APPLICOM is not set |
676 | # CONFIG_GPIO_TB0219 is not set | 709 | # CONFIG_GPIO_TB0219 is not set |
677 | # CONFIG_DRM is not set | ||
678 | CONFIG_GPIO_VR41XX=y | 710 | CONFIG_GPIO_VR41XX=y |
679 | # CONFIG_RAW_DRIVER is not set | 711 | # CONFIG_RAW_DRIVER is not set |
680 | # CONFIG_TCG_TPM is not set | 712 | # CONFIG_TCG_TPM is not set |
681 | CONFIG_DEVPORT=y | 713 | CONFIG_DEVPORT=y |
682 | # CONFIG_I2C is not set | 714 | # CONFIG_I2C is not set |
683 | |||
684 | # | ||
685 | # SPI support | ||
686 | # | ||
687 | # CONFIG_SPI is not set | 715 | # CONFIG_SPI is not set |
688 | # CONFIG_SPI_MASTER is not set | ||
689 | # CONFIG_W1 is not set | 716 | # CONFIG_W1 is not set |
690 | # CONFIG_POWER_SUPPLY is not set | 717 | # CONFIG_POWER_SUPPLY is not set |
691 | # CONFIG_HWMON is not set | 718 | # CONFIG_HWMON is not set |
719 | # CONFIG_THERMAL is not set | ||
720 | # CONFIG_WATCHDOG is not set | ||
721 | |||
722 | # | ||
723 | # Sonics Silicon Backplane | ||
724 | # | ||
725 | CONFIG_SSB_POSSIBLE=y | ||
726 | # CONFIG_SSB is not set | ||
692 | 727 | ||
693 | # | 728 | # |
694 | # Multifunction device drivers | 729 | # Multifunction device drivers |
695 | # | 730 | # |
696 | CONFIG_MFD_SM501=y | 731 | CONFIG_MFD_SM501=y |
732 | # CONFIG_HTC_PASIC3 is not set | ||
697 | 733 | ||
698 | # | 734 | # |
699 | # Multimedia devices | 735 | # Multimedia devices |
700 | # | 736 | # |
737 | |||
738 | # | ||
739 | # Multimedia core support | ||
740 | # | ||
701 | # CONFIG_VIDEO_DEV is not set | 741 | # CONFIG_VIDEO_DEV is not set |
702 | # CONFIG_DVB_CORE is not set | 742 | # CONFIG_DVB_CORE is not set |
703 | # CONFIG_DAB is not set | ||
704 | 743 | ||
705 | # | 744 | # |
706 | # Graphics support | 745 | # Multimedia drivers |
707 | # | 746 | # |
708 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 747 | # CONFIG_DAB is not set |
709 | 748 | ||
710 | # | 749 | # |
711 | # Display device support | 750 | # Graphics support |
712 | # | 751 | # |
713 | # CONFIG_DISPLAY_SUPPORT is not set | 752 | # CONFIG_DRM is not set |
714 | # CONFIG_VGASTATE is not set | 753 | # CONFIG_VGASTATE is not set |
715 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 754 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
716 | CONFIG_FB=y | 755 | CONFIG_FB=y |
@@ -719,9 +758,11 @@ CONFIG_FB=y | |||
719 | CONFIG_FB_CFB_FILLRECT=y | 758 | CONFIG_FB_CFB_FILLRECT=y |
720 | CONFIG_FB_CFB_COPYAREA=y | 759 | CONFIG_FB_CFB_COPYAREA=y |
721 | CONFIG_FB_CFB_IMAGEBLIT=y | 760 | CONFIG_FB_CFB_IMAGEBLIT=y |
761 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
722 | # CONFIG_FB_SYS_FILLRECT is not set | 762 | # CONFIG_FB_SYS_FILLRECT is not set |
723 | # CONFIG_FB_SYS_COPYAREA is not set | 763 | # CONFIG_FB_SYS_COPYAREA is not set |
724 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 764 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
765 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
725 | # CONFIG_FB_SYS_FOPS is not set | 766 | # CONFIG_FB_SYS_FOPS is not set |
726 | CONFIG_FB_DEFERRED_IO=y | 767 | CONFIG_FB_DEFERRED_IO=y |
727 | # CONFIG_FB_SVGALIB is not set | 768 | # CONFIG_FB_SVGALIB is not set |
@@ -757,7 +798,14 @@ CONFIG_FB_DEFERRED_IO=y | |||
757 | # CONFIG_FB_ARK is not set | 798 | # CONFIG_FB_ARK is not set |
758 | # CONFIG_FB_PM3 is not set | 799 | # CONFIG_FB_PM3 is not set |
759 | CONFIG_FB_SM501=y | 800 | CONFIG_FB_SM501=y |
801 | # CONFIG_FB_COBALT is not set | ||
760 | # CONFIG_FB_VIRTUAL is not set | 802 | # CONFIG_FB_VIRTUAL is not set |
803 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
804 | |||
805 | # | ||
806 | # Display device support | ||
807 | # | ||
808 | # CONFIG_DISPLAY_SUPPORT is not set | ||
761 | 809 | ||
762 | # | 810 | # |
763 | # Console display driver support | 811 | # Console display driver support |
@@ -787,6 +835,7 @@ CONFIG_FONT_8x16=y | |||
787 | CONFIG_HID_SUPPORT=y | 835 | CONFIG_HID_SUPPORT=y |
788 | CONFIG_HID=y | 836 | CONFIG_HID=y |
789 | # CONFIG_HID_DEBUG is not set | 837 | # CONFIG_HID_DEBUG is not set |
838 | # CONFIG_HIDRAW is not set | ||
790 | 839 | ||
791 | # | 840 | # |
792 | # USB Input Devices | 841 | # USB Input Devices |
@@ -807,6 +856,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
807 | CONFIG_USB_ARCH_HAS_EHCI=y | 856 | CONFIG_USB_ARCH_HAS_EHCI=y |
808 | CONFIG_USB=m | 857 | CONFIG_USB=m |
809 | # CONFIG_USB_DEBUG is not set | 858 | # CONFIG_USB_DEBUG is not set |
859 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
810 | 860 | ||
811 | # | 861 | # |
812 | # Miscellaneous USB options | 862 | # Miscellaneous USB options |
@@ -815,15 +865,18 @@ CONFIG_USB=m | |||
815 | CONFIG_USB_DEVICE_CLASS=y | 865 | CONFIG_USB_DEVICE_CLASS=y |
816 | # CONFIG_USB_DYNAMIC_MINORS is not set | 866 | # CONFIG_USB_DYNAMIC_MINORS is not set |
817 | # CONFIG_USB_OTG is not set | 867 | # CONFIG_USB_OTG is not set |
868 | # CONFIG_USB_OTG_WHITELIST is not set | ||
869 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
818 | 870 | ||
819 | # | 871 | # |
820 | # USB Host Controller Drivers | 872 | # USB Host Controller Drivers |
821 | # | 873 | # |
874 | # CONFIG_USB_C67X00_HCD is not set | ||
822 | CONFIG_USB_EHCI_HCD=m | 875 | CONFIG_USB_EHCI_HCD=m |
823 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
824 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 876 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
825 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 877 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
826 | # CONFIG_USB_ISP116X_HCD is not set | 878 | # CONFIG_USB_ISP116X_HCD is not set |
879 | # CONFIG_USB_ISP1760_HCD is not set | ||
827 | CONFIG_USB_OHCI_HCD=m | 880 | CONFIG_USB_OHCI_HCD=m |
828 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 881 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
829 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 882 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -849,13 +902,16 @@ CONFIG_USB_STORAGE=m | |||
849 | # CONFIG_USB_STORAGE_DEBUG is not set | 902 | # CONFIG_USB_STORAGE_DEBUG is not set |
850 | # CONFIG_USB_STORAGE_DATAFAB is not set | 903 | # CONFIG_USB_STORAGE_DATAFAB is not set |
851 | # CONFIG_USB_STORAGE_FREECOM is not set | 904 | # CONFIG_USB_STORAGE_FREECOM is not set |
905 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
852 | # CONFIG_USB_STORAGE_DPCM is not set | 906 | # CONFIG_USB_STORAGE_DPCM is not set |
853 | # CONFIG_USB_STORAGE_USBAT is not set | 907 | # CONFIG_USB_STORAGE_USBAT is not set |
854 | # CONFIG_USB_STORAGE_SDDR09 is not set | 908 | # CONFIG_USB_STORAGE_SDDR09 is not set |
855 | # CONFIG_USB_STORAGE_SDDR55 is not set | 909 | # CONFIG_USB_STORAGE_SDDR55 is not set |
856 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 910 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
857 | # CONFIG_USB_STORAGE_ALAUDA is not set | 911 | # CONFIG_USB_STORAGE_ALAUDA is not set |
912 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
858 | # CONFIG_USB_STORAGE_KARMA is not set | 913 | # CONFIG_USB_STORAGE_KARMA is not set |
914 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
859 | # CONFIG_USB_LIBUSUAL is not set | 915 | # CONFIG_USB_LIBUSUAL is not set |
860 | 916 | ||
861 | # | 917 | # |
@@ -868,10 +924,6 @@ CONFIG_USB_MON=y | |||
868 | # | 924 | # |
869 | # USB port drivers | 925 | # USB port drivers |
870 | # | 926 | # |
871 | |||
872 | # | ||
873 | # USB Serial Converter support | ||
874 | # | ||
875 | # CONFIG_USB_SERIAL is not set | 927 | # CONFIG_USB_SERIAL is not set |
876 | 928 | ||
877 | # | 929 | # |
@@ -896,36 +948,14 @@ CONFIG_USB_MON=y | |||
896 | # CONFIG_USB_LD is not set | 948 | # CONFIG_USB_LD is not set |
897 | # CONFIG_USB_TRANCEVIBRATOR is not set | 949 | # CONFIG_USB_TRANCEVIBRATOR is not set |
898 | # CONFIG_USB_IOWARRIOR is not set | 950 | # CONFIG_USB_IOWARRIOR is not set |
899 | |||
900 | # | ||
901 | # USB DSL modem support | ||
902 | # | ||
903 | |||
904 | # | ||
905 | # USB Gadget Support | ||
906 | # | ||
907 | # CONFIG_USB_GADGET is not set | 951 | # CONFIG_USB_GADGET is not set |
908 | # CONFIG_MMC is not set | 952 | # CONFIG_MMC is not set |
953 | # CONFIG_MEMSTICK is not set | ||
909 | # CONFIG_NEW_LEDS is not set | 954 | # CONFIG_NEW_LEDS is not set |
955 | # CONFIG_ACCESSIBILITY is not set | ||
910 | # CONFIG_INFINIBAND is not set | 956 | # CONFIG_INFINIBAND is not set |
957 | CONFIG_RTC_LIB=y | ||
911 | # CONFIG_RTC_CLASS is not set | 958 | # CONFIG_RTC_CLASS is not set |
912 | |||
913 | # | ||
914 | # DMA Engine support | ||
915 | # | ||
916 | # CONFIG_DMA_ENGINE is not set | ||
917 | |||
918 | # | ||
919 | # DMA Clients | ||
920 | # | ||
921 | |||
922 | # | ||
923 | # DMA Devices | ||
924 | # | ||
925 | |||
926 | # | ||
927 | # Userspace I/O | ||
928 | # | ||
929 | # CONFIG_UIO is not set | 959 | # CONFIG_UIO is not set |
930 | 960 | ||
931 | # | 961 | # |
@@ -940,25 +970,21 @@ CONFIG_EXT3_FS_XATTR=y | |||
940 | # CONFIG_EXT3_FS_SECURITY is not set | 970 | # CONFIG_EXT3_FS_SECURITY is not set |
941 | # CONFIG_EXT4DEV_FS is not set | 971 | # CONFIG_EXT4DEV_FS is not set |
942 | CONFIG_JBD=y | 972 | CONFIG_JBD=y |
943 | # CONFIG_JBD_DEBUG is not set | ||
944 | CONFIG_FS_MBCACHE=y | 973 | CONFIG_FS_MBCACHE=y |
945 | # CONFIG_REISERFS_FS is not set | 974 | # CONFIG_REISERFS_FS is not set |
946 | # CONFIG_JFS_FS is not set | 975 | # CONFIG_JFS_FS is not set |
947 | CONFIG_FS_POSIX_ACL=y | 976 | CONFIG_FS_POSIX_ACL=y |
948 | CONFIG_XFS_FS=y | 977 | CONFIG_XFS_FS=y |
949 | CONFIG_XFS_QUOTA=y | 978 | CONFIG_XFS_QUOTA=y |
950 | # CONFIG_XFS_SECURITY is not set | ||
951 | CONFIG_XFS_POSIX_ACL=y | 979 | CONFIG_XFS_POSIX_ACL=y |
952 | # CONFIG_XFS_RT is not set | 980 | # CONFIG_XFS_RT is not set |
953 | # CONFIG_GFS2_FS is not set | 981 | # CONFIG_XFS_DEBUG is not set |
954 | # CONFIG_OCFS2_FS is not set | 982 | # CONFIG_OCFS2_FS is not set |
955 | # CONFIG_MINIX_FS is not set | 983 | CONFIG_DNOTIFY=y |
956 | CONFIG_ROMFS_FS=m | ||
957 | CONFIG_INOTIFY=y | 984 | CONFIG_INOTIFY=y |
958 | CONFIG_INOTIFY_USER=y | 985 | CONFIG_INOTIFY_USER=y |
959 | # CONFIG_QUOTA is not set | 986 | # CONFIG_QUOTA is not set |
960 | CONFIG_QUOTACTL=y | 987 | CONFIG_QUOTACTL=y |
961 | CONFIG_DNOTIFY=y | ||
962 | # CONFIG_AUTOFS_FS is not set | 988 | # CONFIG_AUTOFS_FS is not set |
963 | CONFIG_AUTOFS4_FS=y | 989 | CONFIG_AUTOFS4_FS=y |
964 | # CONFIG_FUSE_FS is not set | 990 | # CONFIG_FUSE_FS is not set |
@@ -987,7 +1013,6 @@ CONFIG_SYSFS=y | |||
987 | CONFIG_TMPFS=y | 1013 | CONFIG_TMPFS=y |
988 | CONFIG_TMPFS_POSIX_ACL=y | 1014 | CONFIG_TMPFS_POSIX_ACL=y |
989 | # CONFIG_HUGETLB_PAGE is not set | 1015 | # CONFIG_HUGETLB_PAGE is not set |
990 | CONFIG_RAMFS=y | ||
991 | # CONFIG_CONFIGFS_FS is not set | 1016 | # CONFIG_CONFIGFS_FS is not set |
992 | 1017 | ||
993 | # | 1018 | # |
@@ -1002,24 +1027,21 @@ CONFIG_RAMFS=y | |||
1002 | # CONFIG_EFS_FS is not set | 1027 | # CONFIG_EFS_FS is not set |
1003 | CONFIG_CRAMFS=m | 1028 | CONFIG_CRAMFS=m |
1004 | # CONFIG_VXFS_FS is not set | 1029 | # CONFIG_VXFS_FS is not set |
1030 | # CONFIG_MINIX_FS is not set | ||
1005 | # CONFIG_HPFS_FS is not set | 1031 | # CONFIG_HPFS_FS is not set |
1006 | # CONFIG_QNX4FS_FS is not set | 1032 | # CONFIG_QNX4FS_FS is not set |
1033 | CONFIG_ROMFS_FS=m | ||
1007 | # CONFIG_SYSV_FS is not set | 1034 | # CONFIG_SYSV_FS is not set |
1008 | # CONFIG_UFS_FS is not set | 1035 | # CONFIG_UFS_FS is not set |
1009 | 1036 | CONFIG_NETWORK_FILESYSTEMS=y | |
1010 | # | ||
1011 | # Network File Systems | ||
1012 | # | ||
1013 | CONFIG_NFS_FS=y | 1037 | CONFIG_NFS_FS=y |
1014 | CONFIG_NFS_V3=y | 1038 | CONFIG_NFS_V3=y |
1015 | # CONFIG_NFS_V3_ACL is not set | 1039 | # CONFIG_NFS_V3_ACL is not set |
1016 | # CONFIG_NFS_V4 is not set | 1040 | # CONFIG_NFS_V4 is not set |
1017 | # CONFIG_NFS_DIRECTIO is not set | ||
1018 | CONFIG_NFSD=m | 1041 | CONFIG_NFSD=m |
1019 | CONFIG_NFSD_V3=y | 1042 | CONFIG_NFSD_V3=y |
1020 | # CONFIG_NFSD_V3_ACL is not set | 1043 | # CONFIG_NFSD_V3_ACL is not set |
1021 | # CONFIG_NFSD_V4 is not set | 1044 | # CONFIG_NFSD_V4 is not set |
1022 | CONFIG_NFSD_TCP=y | ||
1023 | CONFIG_ROOT_NFS=y | 1045 | CONFIG_ROOT_NFS=y |
1024 | CONFIG_LOCKD=y | 1046 | CONFIG_LOCKD=y |
1025 | CONFIG_LOCKD_V4=y | 1047 | CONFIG_LOCKD_V4=y |
@@ -1040,47 +1062,38 @@ CONFIG_SUNRPC=y | |||
1040 | # | 1062 | # |
1041 | # CONFIG_PARTITION_ADVANCED is not set | 1063 | # CONFIG_PARTITION_ADVANCED is not set |
1042 | CONFIG_MSDOS_PARTITION=y | 1064 | CONFIG_MSDOS_PARTITION=y |
1043 | |||
1044 | # | ||
1045 | # Native Language Support | ||
1046 | # | ||
1047 | # CONFIG_NLS is not set | 1065 | # CONFIG_NLS is not set |
1048 | |||
1049 | # | ||
1050 | # Distributed Lock Manager | ||
1051 | # | ||
1052 | # CONFIG_DLM is not set | 1066 | # CONFIG_DLM is not set |
1053 | 1067 | ||
1054 | # | 1068 | # |
1055 | # Profiling support | ||
1056 | # | ||
1057 | # CONFIG_PROFILING is not set | ||
1058 | |||
1059 | # | ||
1060 | # Kernel hacking | 1069 | # Kernel hacking |
1061 | # | 1070 | # |
1062 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1071 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
1063 | # CONFIG_PRINTK_TIME is not set | 1072 | # CONFIG_PRINTK_TIME is not set |
1073 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1064 | CONFIG_ENABLE_MUST_CHECK=y | 1074 | CONFIG_ENABLE_MUST_CHECK=y |
1075 | CONFIG_FRAME_WARN=1024 | ||
1065 | # CONFIG_MAGIC_SYSRQ is not set | 1076 | # CONFIG_MAGIC_SYSRQ is not set |
1066 | # CONFIG_UNUSED_SYMBOLS is not set | 1077 | # CONFIG_UNUSED_SYMBOLS is not set |
1067 | # CONFIG_DEBUG_FS is not set | 1078 | # CONFIG_DEBUG_FS is not set |
1068 | # CONFIG_HEADERS_CHECK is not set | 1079 | # CONFIG_HEADERS_CHECK is not set |
1069 | # CONFIG_DEBUG_KERNEL is not set | 1080 | # CONFIG_DEBUG_KERNEL is not set |
1070 | CONFIG_CROSSCOMPILE=y | 1081 | # CONFIG_SAMPLES is not set |
1071 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 1082 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
1072 | 1083 | ||
1073 | # | 1084 | # |
1074 | # Security options | 1085 | # Security options |
1075 | # | 1086 | # |
1076 | # CONFIG_KEYS is not set | 1087 | # CONFIG_KEYS is not set |
1077 | # CONFIG_SECURITY is not set | 1088 | # CONFIG_SECURITY is not set |
1089 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1078 | # CONFIG_CRYPTO is not set | 1090 | # CONFIG_CRYPTO is not set |
1079 | 1091 | ||
1080 | # | 1092 | # |
1081 | # Library routines | 1093 | # Library routines |
1082 | # | 1094 | # |
1083 | CONFIG_BITREVERSE=y | 1095 | CONFIG_BITREVERSE=y |
1096 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1084 | CONFIG_CRC_CCITT=y | 1097 | CONFIG_CRC_CCITT=y |
1085 | # CONFIG_CRC16 is not set | 1098 | # CONFIG_CRC16 is not set |
1086 | # CONFIG_CRC_ITU_T is not set | 1099 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c index 28dfd2e2989a..23066985a734 100644 --- a/arch/mips/fw/arc/identify.c +++ b/arch/mips/fw/arc/identify.c | |||
@@ -67,6 +67,11 @@ static struct smatch mach_table[] = { | |||
67 | .liname = "SNI RM200_PCI", | 67 | .liname = "SNI RM200_PCI", |
68 | .type = MACH_SNI_RM200_PCI, | 68 | .type = MACH_SNI_RM200_PCI, |
69 | .flags = PROM_FLAG_DONT_FREE_TEMP, | 69 | .flags = PROM_FLAG_DONT_FREE_TEMP, |
70 | }, { | ||
71 | .arcname = "RM200PCI-R5K", | ||
72 | .liname = "SNI RM200_PCI-R5K", | ||
73 | .type = MACH_SNI_RM200_PCI, | ||
74 | .flags = PROM_FLAG_DONT_FREE_TEMP, | ||
70 | } | 75 | } |
71 | }; | 76 | }; |
72 | 77 | ||
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index cc0244036aec..65e46a6d4178 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
@@ -30,7 +30,6 @@ obj-$(CONFIG_CPU_LOONGSON2) += r4k_fpu.o r4k_switch.o | |||
30 | obj-$(CONFIG_CPU_MIPS32) += r4k_fpu.o r4k_switch.o | 30 | obj-$(CONFIG_CPU_MIPS32) += r4k_fpu.o r4k_switch.o |
31 | obj-$(CONFIG_CPU_MIPS64) += r4k_fpu.o r4k_switch.o | 31 | obj-$(CONFIG_CPU_MIPS64) += r4k_fpu.o r4k_switch.o |
32 | obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o | 32 | obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o |
33 | obj-$(CONFIG_CPU_R4000) += r4k_fpu.o r4k_switch.o | ||
34 | obj-$(CONFIG_CPU_R4300) += r4k_fpu.o r4k_switch.o | 33 | obj-$(CONFIG_CPU_R4300) += r4k_fpu.o r4k_switch.o |
35 | obj-$(CONFIG_CPU_R4X00) += r4k_fpu.o r4k_switch.o | 34 | obj-$(CONFIG_CPU_R4X00) += r4k_fpu.o r4k_switch.o |
36 | obj-$(CONFIG_CPU_R5000) += r4k_fpu.o r4k_switch.o | 35 | obj-$(CONFIG_CPU_R5000) += r4k_fpu.o r4k_switch.o |
diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c index 795cb8fb0d74..b5fc4eb412d2 100644 --- a/arch/mips/kernel/cevt-txx9.c +++ b/arch/mips/kernel/cevt-txx9.c | |||
@@ -161,6 +161,9 @@ void __init txx9_tmr_init(unsigned long baseaddr) | |||
161 | struct txx9_tmr_reg __iomem *tmrptr; | 161 | struct txx9_tmr_reg __iomem *tmrptr; |
162 | 162 | ||
163 | tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg)); | 163 | tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg)); |
164 | /* Start once to make CounterResetEnable effective */ | ||
165 | __raw_writel(TXx9_TMTCR_CRE | TXx9_TMTCR_TCE, &tmrptr->tcr); | ||
166 | /* Stop and reset the counter */ | ||
164 | __raw_writel(TXx9_TMTCR_CRE, &tmrptr->tcr); | 167 | __raw_writel(TXx9_TMTCR_CRE, &tmrptr->tcr); |
165 | __raw_writel(0, &tmrptr->tisr); | 168 | __raw_writel(0, &tmrptr->tisr); |
166 | __raw_writel(0xffffffff, &tmrptr->cpra); | 169 | __raw_writel(0xffffffff, &tmrptr->cpra); |
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 63370cdd3c90..cdf87a9dd4ba 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
@@ -216,6 +216,7 @@ int smp_call_function(void (*func) (void *info), void *info, int retry, | |||
216 | { | 216 | { |
217 | return smp_call_function_mask(cpu_online_map, func, info, retry, wait); | 217 | return smp_call_function_mask(cpu_online_map, func, info, retry, wait); |
218 | } | 218 | } |
219 | EXPORT_SYMBOL(smp_call_function); | ||
219 | 220 | ||
220 | void smp_call_function_interrupt(void) | 221 | void smp_call_function_interrupt(void) |
221 | { | 222 | { |
@@ -271,6 +272,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
271 | put_cpu(); | 272 | put_cpu(); |
272 | return 0; | 273 | return 0; |
273 | } | 274 | } |
275 | EXPORT_SYMBOL(smp_call_function_single); | ||
274 | 276 | ||
275 | static void stop_this_cpu(void *dummy) | 277 | static void stop_this_cpu(void *dummy) |
276 | { | 278 | { |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index cb8b0e2c7954..f9165d1a17bf 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
@@ -88,15 +88,17 @@ static void show_raw_backtrace(unsigned long reg29) | |||
88 | #ifdef CONFIG_KALLSYMS | 88 | #ifdef CONFIG_KALLSYMS |
89 | printk("\n"); | 89 | printk("\n"); |
90 | #endif | 90 | #endif |
91 | #define IS_KVA01(a) ((((unsigned int)a) & 0xc0000000) == 0x80000000) | 91 | while (!kstack_end(sp)) { |
92 | if (IS_KVA01(sp)) { | 92 | unsigned long __user *p = |
93 | while (!kstack_end(sp)) { | 93 | (unsigned long __user *)(unsigned long)sp++; |
94 | addr = *sp++; | 94 | if (__get_user(addr, p)) { |
95 | if (__kernel_text_address(addr)) | 95 | printk(" (Bad stack address)"); |
96 | print_ip_sym(addr); | 96 | break; |
97 | } | 97 | } |
98 | printk("\n"); | 98 | if (__kernel_text_address(addr)) |
99 | print_ip_sym(addr); | ||
99 | } | 100 | } |
101 | printk("\n"); | ||
100 | } | 102 | } |
101 | 103 | ||
102 | #ifdef CONFIG_KALLSYMS | 104 | #ifdef CONFIG_KALLSYMS |
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index cfeab669782f..a56c15026965 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
@@ -34,11 +34,13 @@ static volatile int lasat_int_mask_shift; | |||
34 | 34 | ||
35 | void disable_lasat_irq(unsigned int irq_nr) | 35 | void disable_lasat_irq(unsigned int irq_nr) |
36 | { | 36 | { |
37 | irq_nr -= LASAT_IRQ_BASE; | ||
37 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; | 38 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; |
38 | } | 39 | } |
39 | 40 | ||
40 | void enable_lasat_irq(unsigned int irq_nr) | 41 | void enable_lasat_irq(unsigned int irq_nr) |
41 | { | 42 | { |
43 | irq_nr -= LASAT_IRQ_BASE; | ||
42 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; | 44 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; |
43 | } | 45 | } |
44 | 46 | ||
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c index ec2f658c3709..31e328b3814d 100644 --- a/arch/mips/lasat/lasat_board.c +++ b/arch/mips/lasat/lasat_board.c | |||
@@ -23,18 +23,19 @@ | |||
23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
24 | #include <linux/string.h> | 24 | #include <linux/string.h> |
25 | #include <linux/ctype.h> | 25 | #include <linux/ctype.h> |
26 | #include <linux/mutex.h> | ||
26 | #include <asm/bootinfo.h> | 27 | #include <asm/bootinfo.h> |
27 | #include <asm/addrspace.h> | 28 | #include <asm/addrspace.h> |
28 | #include "at93c.h" | 29 | #include "at93c.h" |
29 | /* New model description table */ | 30 | /* New model description table */ |
30 | #include "lasat_models.h" | 31 | #include "lasat_models.h" |
31 | 32 | ||
33 | static DEFINE_MUTEX(lasat_eeprom_mutex); | ||
34 | |||
32 | #define EEPROM_CRC(data, len) (~crc32(~0, data, len)) | 35 | #define EEPROM_CRC(data, len) (~crc32(~0, data, len)) |
33 | 36 | ||
34 | struct lasat_info lasat_board_info; | 37 | struct lasat_info lasat_board_info; |
35 | 38 | ||
36 | void update_bcastaddr(void); | ||
37 | |||
38 | int EEPROMRead(unsigned int pos, unsigned char *data, int len) | 39 | int EEPROMRead(unsigned int pos, unsigned char *data, int len) |
39 | { | 40 | { |
40 | int i; | 41 | int i; |
@@ -258,10 +259,6 @@ int lasat_init_board_info(void) | |||
258 | sprintf(lasat_board_info.li_typestr, "%d", 10 * c); | 259 | sprintf(lasat_board_info.li_typestr, "%d", 10 * c); |
259 | } | 260 | } |
260 | 261 | ||
261 | #if defined(CONFIG_INET) && defined(CONFIG_SYSCTL) | ||
262 | update_bcastaddr(); | ||
263 | #endif | ||
264 | |||
265 | return 0; | 262 | return 0; |
266 | } | 263 | } |
267 | 264 | ||
@@ -269,6 +266,8 @@ void lasat_write_eeprom_info(void) | |||
269 | { | 266 | { |
270 | unsigned long crc; | 267 | unsigned long crc; |
271 | 268 | ||
269 | mutex_lock(&lasat_eeprom_mutex); | ||
270 | |||
272 | /* Generate the CRC */ | 271 | /* Generate the CRC */ |
273 | crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info), | 272 | crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info), |
274 | sizeof(struct lasat_eeprom_struct) - 4); | 273 | sizeof(struct lasat_eeprom_struct) - 4); |
@@ -277,4 +276,6 @@ void lasat_write_eeprom_info(void) | |||
277 | /* Write the EEPROM info */ | 276 | /* Write the EEPROM info */ |
278 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, | 277 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, |
279 | sizeof(struct lasat_eeprom_struct)); | 278 | sizeof(struct lasat_eeprom_struct)); |
279 | |||
280 | mutex_unlock(&lasat_eeprom_mutex); | ||
280 | } | 281 | } |
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 389336c4ecc5..866881ec0cf8 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
@@ -29,15 +29,13 @@ | |||
29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
30 | #include <linux/net.h> | 30 | #include <linux/net.h> |
31 | #include <linux/inet.h> | 31 | #include <linux/inet.h> |
32 | #include <linux/mutex.h> | ||
33 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
34 | 33 | ||
35 | #include <asm/time.h> | 34 | #include <asm/time.h> |
36 | 35 | ||
37 | #include "sysctl.h" | 36 | #ifdef CONFIG_DS1603 |
38 | #include "ds1603.h" | 37 | #include "ds1603.h" |
39 | 38 | #endif | |
40 | static DEFINE_MUTEX(lasat_info_mutex); | ||
41 | 39 | ||
42 | /* Strategy function to write EEPROM after changing string entry */ | 40 | /* Strategy function to write EEPROM after changing string entry */ |
43 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | 41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, |
@@ -46,18 +44,15 @@ int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | |||
46 | { | 44 | { |
47 | int r; | 45 | int r; |
48 | 46 | ||
49 | mutex_lock(&lasat_info_mutex); | ||
50 | r = sysctl_string(table, name, | 47 | r = sysctl_string(table, name, |
51 | nlen, oldval, oldlenp, newval, newlen); | 48 | nlen, oldval, oldlenp, newval, newlen); |
52 | if (r < 0) { | 49 | if (r < 0) |
53 | mutex_unlock(&lasat_info_mutex); | ||
54 | return r; | 50 | return r; |
55 | } | 51 | |
56 | if (newval && newlen) | 52 | if (newval && newlen) |
57 | lasat_write_eeprom_info(); | 53 | lasat_write_eeprom_info(); |
58 | mutex_unlock(&lasat_info_mutex); | ||
59 | 54 | ||
60 | return 1; | 55 | return 0; |
61 | } | 56 | } |
62 | 57 | ||
63 | 58 | ||
@@ -67,14 +62,11 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp, | |||
67 | { | 62 | { |
68 | int r; | 63 | int r; |
69 | 64 | ||
70 | mutex_lock(&lasat_info_mutex); | ||
71 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); | 65 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); |
72 | if ((!write) || r) { | 66 | if ((!write) || r) |
73 | mutex_unlock(&lasat_info_mutex); | ||
74 | return r; | 67 | return r; |
75 | } | 68 | |
76 | lasat_write_eeprom_info(); | 69 | lasat_write_eeprom_info(); |
77 | mutex_unlock(&lasat_info_mutex); | ||
78 | 70 | ||
79 | return 0; | 71 | return 0; |
80 | } | 72 | } |
@@ -85,28 +77,24 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp, | |||
85 | { | 77 | { |
86 | int r; | 78 | int r; |
87 | 79 | ||
88 | mutex_lock(&lasat_info_mutex); | ||
89 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 80 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
90 | if ((!write) || r) { | 81 | if ((!write) || r) |
91 | mutex_unlock(&lasat_info_mutex); | ||
92 | return r; | 82 | return r; |
93 | } | 83 | |
94 | lasat_write_eeprom_info(); | 84 | lasat_write_eeprom_info(); |
95 | mutex_unlock(&lasat_info_mutex); | ||
96 | 85 | ||
97 | return 0; | 86 | return 0; |
98 | } | 87 | } |
99 | 88 | ||
89 | #ifdef CONFIG_DS1603 | ||
100 | static int rtctmp; | 90 | static int rtctmp; |
101 | 91 | ||
102 | #ifdef CONFIG_DS1603 | ||
103 | /* proc function to read/write RealTime Clock */ | 92 | /* proc function to read/write RealTime Clock */ |
104 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | 93 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, |
105 | void *buffer, size_t *lenp, loff_t *ppos) | 94 | void *buffer, size_t *lenp, loff_t *ppos) |
106 | { | 95 | { |
107 | int r; | 96 | int r; |
108 | 97 | ||
109 | mutex_lock(&lasat_info_mutex); | ||
110 | if (!write) { | 98 | if (!write) { |
111 | rtctmp = read_persistent_clock(); | 99 | rtctmp = read_persistent_clock(); |
112 | /* check for time < 0 and set to 0 */ | 100 | /* check for time < 0 and set to 0 */ |
@@ -114,12 +102,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | |||
114 | rtctmp = 0; | 102 | rtctmp = 0; |
115 | } | 103 | } |
116 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 104 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
117 | if ((!write) || r) { | 105 | if (r) |
118 | mutex_unlock(&lasat_info_mutex); | ||
119 | return r; | 106 | return r; |
120 | } | 107 | |
121 | rtc_mips_set_mmss(rtctmp); | 108 | if (write) |
122 | mutex_unlock(&lasat_info_mutex); | 109 | rtc_mips_set_mmss(rtctmp); |
123 | 110 | ||
124 | return 0; | 111 | return 0; |
125 | } | 112 | } |
@@ -132,17 +119,14 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen, | |||
132 | { | 119 | { |
133 | int r; | 120 | int r; |
134 | 121 | ||
135 | mutex_lock(&lasat_info_mutex); | ||
136 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 122 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
137 | if (r < 0) { | 123 | if (r < 0) |
138 | mutex_unlock(&lasat_info_mutex); | ||
139 | return r; | 124 | return r; |
140 | } | 125 | |
141 | if (newval && newlen) | 126 | if (newval && newlen) |
142 | lasat_write_eeprom_info(); | 127 | lasat_write_eeprom_info(); |
143 | mutex_unlock(&lasat_info_mutex); | ||
144 | 128 | ||
145 | return 1; | 129 | return 0; |
146 | } | 130 | } |
147 | 131 | ||
148 | #ifdef CONFIG_DS1603 | 132 | #ifdef CONFIG_DS1603 |
@@ -153,50 +137,27 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen, | |||
153 | { | 137 | { |
154 | int r; | 138 | int r; |
155 | 139 | ||
156 | mutex_lock(&lasat_info_mutex); | ||
157 | rtctmp = read_persistent_clock(); | 140 | rtctmp = read_persistent_clock(); |
158 | if (rtctmp < 0) | 141 | if (rtctmp < 0) |
159 | rtctmp = 0; | 142 | rtctmp = 0; |
160 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 143 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
161 | if (r < 0) { | 144 | if (r < 0) |
162 | mutex_unlock(&lasat_info_mutex); | ||
163 | return r; | 145 | return r; |
164 | } | ||
165 | if (newval && newlen) | 146 | if (newval && newlen) |
166 | rtc_mips_set_mmss(rtctmp); | 147 | rtc_mips_set_mmss(rtctmp); |
167 | mutex_unlock(&lasat_info_mutex); | ||
168 | 148 | ||
169 | return 1; | 149 | return r; |
170 | } | 150 | } |
171 | #endif | 151 | #endif |
172 | 152 | ||
173 | #ifdef CONFIG_INET | 153 | #ifdef CONFIG_INET |
174 | static char lasat_bcastaddr[16]; | ||
175 | |||
176 | void update_bcastaddr(void) | ||
177 | { | ||
178 | unsigned int ip; | ||
179 | |||
180 | ip = (lasat_board_info.li_eeprom_info.ipaddr & | ||
181 | lasat_board_info.li_eeprom_info.netmask) | | ||
182 | ~lasat_board_info.li_eeprom_info.netmask; | ||
183 | |||
184 | sprintf(lasat_bcastaddr, "%d.%d.%d.%d", | ||
185 | (ip) & 0xff, | ||
186 | (ip >> 8) & 0xff, | ||
187 | (ip >> 16) & 0xff, | ||
188 | (ip >> 24) & 0xff); | ||
189 | } | ||
190 | |||
191 | static char proc_lasat_ipbuf[32]; | ||
192 | |||
193 | /* Parsing of IP address */ | ||
194 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | 154 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, |
195 | void *buffer, size_t *lenp, loff_t *ppos) | 155 | void *buffer, size_t *lenp, loff_t *ppos) |
196 | { | 156 | { |
197 | unsigned int ip; | 157 | unsigned int ip; |
198 | char *p, c; | 158 | char *p, c; |
199 | int len; | 159 | int len; |
160 | char ipbuf[32]; | ||
200 | 161 | ||
201 | if (!table->data || !table->maxlen || !*lenp || | 162 | if (!table->data || !table->maxlen || !*lenp || |
202 | (*ppos && !write)) { | 163 | (*ppos && !write)) { |
@@ -204,117 +165,88 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
204 | return 0; | 165 | return 0; |
205 | } | 166 | } |
206 | 167 | ||
207 | mutex_lock(&lasat_info_mutex); | ||
208 | if (write) { | 168 | if (write) { |
209 | len = 0; | 169 | len = 0; |
210 | p = buffer; | 170 | p = buffer; |
211 | while (len < *lenp) { | 171 | while (len < *lenp) { |
212 | if (get_user(c, p++)) { | 172 | if (get_user(c, p++)) |
213 | mutex_unlock(&lasat_info_mutex); | ||
214 | return -EFAULT; | 173 | return -EFAULT; |
215 | } | ||
216 | if (c == 0 || c == '\n') | 174 | if (c == 0 || c == '\n') |
217 | break; | 175 | break; |
218 | len++; | 176 | len++; |
219 | } | 177 | } |
220 | if (len >= sizeof(proc_lasat_ipbuf)-1) | 178 | if (len >= sizeof(ipbuf)-1) |
221 | len = sizeof(proc_lasat_ipbuf) - 1; | 179 | len = sizeof(ipbuf) - 1; |
222 | if (copy_from_user(proc_lasat_ipbuf, buffer, len)) { | 180 | if (copy_from_user(ipbuf, buffer, len)) |
223 | mutex_unlock(&lasat_info_mutex); | ||
224 | return -EFAULT; | 181 | return -EFAULT; |
225 | } | 182 | ipbuf[len] = 0; |
226 | proc_lasat_ipbuf[len] = 0; | ||
227 | *ppos += *lenp; | 183 | *ppos += *lenp; |
228 | /* Now see if we can convert it to a valid IP */ | 184 | /* Now see if we can convert it to a valid IP */ |
229 | ip = in_aton(proc_lasat_ipbuf); | 185 | ip = in_aton(ipbuf); |
230 | *(unsigned int *)(table->data) = ip; | 186 | *(unsigned int *)(table->data) = ip; |
231 | lasat_write_eeprom_info(); | 187 | lasat_write_eeprom_info(); |
232 | } else { | 188 | } else { |
233 | ip = *(unsigned int *)(table->data); | 189 | ip = *(unsigned int *)(table->data); |
234 | sprintf(proc_lasat_ipbuf, "%d.%d.%d.%d", | 190 | sprintf(ipbuf, "%d.%d.%d.%d", |
235 | (ip) & 0xff, | 191 | (ip) & 0xff, |
236 | (ip >> 8) & 0xff, | 192 | (ip >> 8) & 0xff, |
237 | (ip >> 16) & 0xff, | 193 | (ip >> 16) & 0xff, |
238 | (ip >> 24) & 0xff); | 194 | (ip >> 24) & 0xff); |
239 | len = strlen(proc_lasat_ipbuf); | 195 | len = strlen(ipbuf); |
240 | if (len > *lenp) | 196 | if (len > *lenp) |
241 | len = *lenp; | 197 | len = *lenp; |
242 | if (len) | 198 | if (len) |
243 | if (copy_to_user(buffer, proc_lasat_ipbuf, len)) { | 199 | if (copy_to_user(buffer, ipbuf, len)) |
244 | mutex_unlock(&lasat_info_mutex); | ||
245 | return -EFAULT; | 200 | return -EFAULT; |
246 | } | ||
247 | if (len < *lenp) { | 201 | if (len < *lenp) { |
248 | if (put_user('\n', ((char *) buffer) + len)) { | 202 | if (put_user('\n', ((char *) buffer) + len)) |
249 | mutex_unlock(&lasat_info_mutex); | ||
250 | return -EFAULT; | 203 | return -EFAULT; |
251 | } | ||
252 | len++; | 204 | len++; |
253 | } | 205 | } |
254 | *lenp = len; | 206 | *lenp = len; |
255 | *ppos += len; | 207 | *ppos += len; |
256 | } | 208 | } |
257 | update_bcastaddr(); | ||
258 | mutex_unlock(&lasat_info_mutex); | ||
259 | 209 | ||
260 | return 0; | 210 | return 0; |
261 | } | 211 | } |
262 | #endif /* defined(CONFIG_INET) */ | 212 | #endif |
263 | 213 | ||
264 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, | 214 | static int sysctl_lasat_prid(ctl_table *table, int *name, int nlen, |
265 | void *oldval, size_t *oldlenp, | 215 | void *oldval, size_t *oldlenp, |
266 | void *newval, size_t newlen) | 216 | void *newval, size_t newlen) |
267 | { | 217 | { |
268 | int r; | 218 | int r; |
269 | 219 | ||
270 | mutex_lock(&lasat_info_mutex); | ||
271 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 220 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
272 | if (r < 0) { | 221 | if (r < 0) |
273 | mutex_unlock(&lasat_info_mutex); | ||
274 | return r; | 222 | return r; |
275 | } | ||
276 | |||
277 | if (newval && newlen) { | 223 | if (newval && newlen) { |
278 | if (name && *name == LASAT_PRID) | 224 | lasat_board_info.li_eeprom_info.prid = *(int *)newval; |
279 | lasat_board_info.li_eeprom_info.prid = *(int *)newval; | ||
280 | |||
281 | lasat_write_eeprom_info(); | 225 | lasat_write_eeprom_info(); |
282 | lasat_init_board_info(); | 226 | lasat_init_board_info(); |
283 | } | 227 | } |
284 | mutex_unlock(&lasat_info_mutex); | ||
285 | |||
286 | return 0; | 228 | return 0; |
287 | } | 229 | } |
288 | 230 | ||
289 | int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp, | 231 | int proc_lasat_prid(ctl_table *table, int write, struct file *filp, |
290 | void *buffer, size_t *lenp, loff_t *ppos) | 232 | void *buffer, size_t *lenp, loff_t *ppos) |
291 | { | 233 | { |
292 | int r; | 234 | int r; |
293 | 235 | ||
294 | mutex_lock(&lasat_info_mutex); | ||
295 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 236 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
296 | if ((!write) || r) { | 237 | if (r < 0) |
297 | mutex_unlock(&lasat_info_mutex); | ||
298 | return r; | 238 | return r; |
239 | if (write) { | ||
240 | lasat_board_info.li_eeprom_info.prid = | ||
241 | lasat_board_info.li_prid; | ||
242 | lasat_write_eeprom_info(); | ||
243 | lasat_init_board_info(); | ||
299 | } | 244 | } |
300 | if (filp && filp->f_path.dentry) { | ||
301 | if (!strcmp(filp->f_path.dentry->d_name.name, "prid")) | ||
302 | lasat_board_info.li_eeprom_info.prid = | ||
303 | lasat_board_info.li_prid; | ||
304 | if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess")) | ||
305 | lasat_board_info.li_eeprom_info.debugaccess = | ||
306 | lasat_board_info.li_debugaccess; | ||
307 | } | ||
308 | lasat_write_eeprom_info(); | ||
309 | mutex_unlock(&lasat_info_mutex); | ||
310 | |||
311 | return 0; | 245 | return 0; |
312 | } | 246 | } |
313 | 247 | ||
314 | extern int lasat_boot_to_service; | 248 | extern int lasat_boot_to_service; |
315 | 249 | ||
316 | #ifdef CONFIG_SYSCTL | ||
317 | |||
318 | static ctl_table lasat_table[] = { | 250 | static ctl_table lasat_table[] = { |
319 | { | 251 | { |
320 | .ctl_name = CTL_UNNUMBERED, | 252 | .ctl_name = CTL_UNNUMBERED, |
@@ -349,8 +281,8 @@ static ctl_table lasat_table[] = { | |||
349 | .data = &lasat_board_info.li_prid, | 281 | .data = &lasat_board_info.li_prid, |
350 | .maxlen = sizeof(int), | 282 | .maxlen = sizeof(int), |
351 | .mode = 0644, | 283 | .mode = 0644, |
352 | .proc_handler = &proc_lasat_eeprom_value, | 284 | .proc_handler = &proc_lasat_prid, |
353 | .strategy = &sysctl_lasat_eeprom_value | 285 | .strategy = &sysctl_lasat_prid |
354 | }, | 286 | }, |
355 | #ifdef CONFIG_INET | 287 | #ifdef CONFIG_INET |
356 | { | 288 | { |
@@ -363,7 +295,7 @@ static ctl_table lasat_table[] = { | |||
363 | .strategy = &sysctl_lasat_intvec | 295 | .strategy = &sysctl_lasat_intvec |
364 | }, | 296 | }, |
365 | { | 297 | { |
366 | .ctl_name = LASAT_NETMASK, | 298 | .ctl_name = CTL_UNNUMBERED, |
367 | .procname = "netmask", | 299 | .procname = "netmask", |
368 | .data = &lasat_board_info.li_eeprom_info.netmask, | 300 | .data = &lasat_board_info.li_eeprom_info.netmask, |
369 | .maxlen = sizeof(int), | 301 | .maxlen = sizeof(int), |
@@ -371,15 +303,6 @@ static ctl_table lasat_table[] = { | |||
371 | .proc_handler = &proc_lasat_ip, | 303 | .proc_handler = &proc_lasat_ip, |
372 | .strategy = &sysctl_lasat_intvec | 304 | .strategy = &sysctl_lasat_intvec |
373 | }, | 305 | }, |
374 | { | ||
375 | .ctl_name = CTL_UNNUMBERED, | ||
376 | .procname = "bcastaddr", | ||
377 | .data = &lasat_bcastaddr, | ||
378 | .maxlen = sizeof(lasat_bcastaddr), | ||
379 | .mode = 0600, | ||
380 | .proc_handler = &proc_dostring, | ||
381 | .strategy = &sysctl_string | ||
382 | }, | ||
383 | #endif | 306 | #endif |
384 | { | 307 | { |
385 | .ctl_name = CTL_UNNUMBERED, | 308 | .ctl_name = CTL_UNNUMBERED, |
@@ -417,7 +340,7 @@ static ctl_table lasat_table[] = { | |||
417 | .data = &lasat_board_info.li_namestr, | 340 | .data = &lasat_board_info.li_namestr, |
418 | .maxlen = sizeof(lasat_board_info.li_namestr), | 341 | .maxlen = sizeof(lasat_board_info.li_namestr), |
419 | .mode = 0444, | 342 | .mode = 0444, |
420 | .proc_handler = &proc_dostring, | 343 | .proc_handler = &proc_dostring, |
421 | .strategy = &sysctl_string | 344 | .strategy = &sysctl_string |
422 | }, | 345 | }, |
423 | { | 346 | { |
@@ -448,9 +371,12 @@ static int __init lasat_register_sysctl(void) | |||
448 | 371 | ||
449 | lasat_table_header = | 372 | lasat_table_header = |
450 | register_sysctl_table(lasat_root_table); | 373 | register_sysctl_table(lasat_root_table); |
374 | if (!lasat_table_header) { | ||
375 | printk(KERN_ERR "Unable to register LASAT sysctl\n"); | ||
376 | return -ENOMEM; | ||
377 | } | ||
451 | 378 | ||
452 | return 0; | 379 | return 0; |
453 | } | 380 | } |
454 | 381 | ||
455 | __initcall(lasat_register_sysctl); | 382 | __initcall(lasat_register_sysctl); |
456 | #endif /* CONFIG_SYSCTL */ | ||
diff --git a/arch/mips/lasat/sysctl.h b/arch/mips/lasat/sysctl.h deleted file mode 100644 index 341b97933423..000000000000 --- a/arch/mips/lasat/sysctl.h +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* | ||
2 | * LASAT sysctl values | ||
3 | */ | ||
4 | |||
5 | #ifndef _LASAT_SYSCTL_H | ||
6 | #define _LASAT_SYSCTL_H | ||
7 | |||
8 | /* /proc/sys/lasat */ | ||
9 | enum { | ||
10 | LASAT_CPU_HZ = 1, | ||
11 | LASAT_BUS_HZ, | ||
12 | LASAT_MODEL, | ||
13 | LASAT_PRID, | ||
14 | LASAT_IPADDR, | ||
15 | LASAT_NETMASK, | ||
16 | LASAT_BCAST, | ||
17 | LASAT_PASSWORD, | ||
18 | LASAT_SBOOT, | ||
19 | LASAT_RTC, | ||
20 | LASAT_NAMESTR, | ||
21 | LASAT_TYPESTR, | ||
22 | }; | ||
23 | |||
24 | #endif /* _LASAT_SYSCTL_H */ | ||
diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c index b7633fda4180..96236bf33838 100644 --- a/arch/mips/mips-boards/generic/amon.c +++ b/arch/mips/mips-boards/generic/amon.c | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | int amon_cpu_avail(int cpu) | 29 | int amon_cpu_avail(int cpu) |
30 | { | 30 | { |
31 | struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); | 31 | struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); |
32 | 32 | ||
33 | if (cpu < 0 || cpu >= NCPULAUNCH) { | 33 | if (cpu < 0 || cpu >= NCPULAUNCH) { |
34 | pr_debug("avail: cpu%d is out of range\n", cpu); | 34 | pr_debug("avail: cpu%d is out of range\n", cpu); |
@@ -53,7 +53,7 @@ void amon_cpu_start(int cpu, | |||
53 | unsigned long gp, unsigned long a0) | 53 | unsigned long gp, unsigned long a0) |
54 | { | 54 | { |
55 | volatile struct cpulaunch *launch = | 55 | volatile struct cpulaunch *launch = |
56 | (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); | 56 | (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); |
57 | 57 | ||
58 | if (!amon_cpu_avail(cpu)) | 58 | if (!amon_cpu_avail(cpu)) |
59 | return; | 59 | return; |
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 008fd82b5840..fe2cac1b4514 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -58,27 +58,8 @@ static int mips_cpu_timer_irq; | |||
58 | static int mips_cpu_perf_irq; | 58 | static int mips_cpu_perf_irq; |
59 | extern int cp0_perfcount_irq; | 59 | extern int cp0_perfcount_irq; |
60 | 60 | ||
61 | DEFINE_PER_CPU(unsigned int, tickcount); | ||
62 | #define tickcount_this_cpu __get_cpu_var(tickcount) | ||
63 | static unsigned long ledbitmask; | ||
64 | |||
65 | static void mips_timer_dispatch(void) | 61 | static void mips_timer_dispatch(void) |
66 | { | 62 | { |
67 | #if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_ATLAS) | ||
68 | /* | ||
69 | * Yes, this is very tacky, won't work as expected with SMTC and | ||
70 | * dyntick will break it, | ||
71 | * but it gives me a nice warm feeling during debug | ||
72 | */ | ||
73 | #define LEDBAR 0xbf000408 | ||
74 | if (tickcount_this_cpu++ >= HZ) { | ||
75 | tickcount_this_cpu = 0; | ||
76 | change_bit(smp_processor_id(), &ledbitmask); | ||
77 | smp_wmb(); /* Make sure every one else sees the change */ | ||
78 | /* This will pick up any recent changes made by other CPU's */ | ||
79 | *(unsigned int *)LEDBAR = ledbitmask; | ||
80 | } | ||
81 | #endif | ||
82 | do_IRQ(mips_cpu_timer_irq); | 63 | do_IRQ(mips_cpu_timer_irq); |
83 | } | 64 | } |
84 | 65 | ||
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile index 8dc6e2ac4c03..db4ad654a6d3 100644 --- a/arch/mips/mips-boards/malta/Makefile +++ b/arch/mips/mips-boards/malta/Makefile | |||
@@ -19,9 +19,8 @@ | |||
19 | # under Linux. | 19 | # under Linux. |
20 | # | 20 | # |
21 | 21 | ||
22 | obj-y := malta_int.o malta_platform.o malta_setup.o | 22 | obj-y := malta_int.o malta_mtd.o malta_platform.o malta_setup.o |
23 | 23 | ||
24 | obj-$(CONFIG_MTD) += malta_mtd.o | ||
25 | # FIXME FIXME FIXME | 24 | # FIXME FIXME FIXME |
26 | obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o | 25 | obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o |
27 | 26 | ||
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 643c8bcffff3..27096751ddce 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -446,6 +446,7 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
446 | struct page *page = pfn_to_page(fcp_args->pfn); | 446 | struct page *page = pfn_to_page(fcp_args->pfn); |
447 | int exec = vma->vm_flags & VM_EXEC; | 447 | int exec = vma->vm_flags & VM_EXEC; |
448 | struct mm_struct *mm = vma->vm_mm; | 448 | struct mm_struct *mm = vma->vm_mm; |
449 | int map_coherent = 0; | ||
449 | pgd_t *pgdp; | 450 | pgd_t *pgdp; |
450 | pud_t *pudp; | 451 | pud_t *pudp; |
451 | pmd_t *pmdp; | 452 | pmd_t *pmdp; |
@@ -479,7 +480,9 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
479 | * Use kmap_coherent or kmap_atomic to do flushes for | 480 | * Use kmap_coherent or kmap_atomic to do flushes for |
480 | * another ASID than the current one. | 481 | * another ASID than the current one. |
481 | */ | 482 | */ |
482 | if (cpu_has_dc_aliases) | 483 | map_coherent = (cpu_has_dc_aliases && |
484 | page_mapped(page) && !Page_dcache_dirty(page)); | ||
485 | if (map_coherent) | ||
483 | vaddr = kmap_coherent(page, addr); | 486 | vaddr = kmap_coherent(page, addr); |
484 | else | 487 | else |
485 | vaddr = kmap_atomic(page, KM_USER0); | 488 | vaddr = kmap_atomic(page, KM_USER0); |
@@ -502,7 +505,7 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
502 | } | 505 | } |
503 | 506 | ||
504 | if (vaddr) { | 507 | if (vaddr) { |
505 | if (cpu_has_dc_aliases) | 508 | if (map_coherent) |
506 | kunmap_coherent(); | 509 | kunmap_coherent(); |
507 | else | 510 | else |
508 | kunmap_atomic(vaddr, KM_USER0); | 511 | kunmap_atomic(vaddr, KM_USER0); |
@@ -1226,6 +1229,28 @@ void au1x00_fixup_config_od(void) | |||
1226 | } | 1229 | } |
1227 | } | 1230 | } |
1228 | 1231 | ||
1232 | /* CP0 hazard avoidance. */ | ||
1233 | #define NXP_BARRIER() \ | ||
1234 | __asm__ __volatile__( \ | ||
1235 | ".set noreorder\n\t" \ | ||
1236 | "nop; nop; nop; nop; nop; nop;\n\t" \ | ||
1237 | ".set reorder\n\t") | ||
1238 | |||
1239 | static void nxp_pr4450_fixup_config(void) | ||
1240 | { | ||
1241 | unsigned long config0; | ||
1242 | |||
1243 | config0 = read_c0_config(); | ||
1244 | |||
1245 | /* clear all three cache coherency fields */ | ||
1246 | config0 &= ~(0x7 | (7 << 25) | (7 << 28)); | ||
1247 | config0 |= (((_page_cachable_default >> _CACHE_SHIFT) << 0) | | ||
1248 | ((_page_cachable_default >> _CACHE_SHIFT) << 25) | | ||
1249 | ((_page_cachable_default >> _CACHE_SHIFT) << 28)); | ||
1250 | write_c0_config(config0); | ||
1251 | NXP_BARRIER(); | ||
1252 | } | ||
1253 | |||
1229 | static int __cpuinitdata cca = -1; | 1254 | static int __cpuinitdata cca = -1; |
1230 | 1255 | ||
1231 | static int __init cca_setup(char *str) | 1256 | static int __init cca_setup(char *str) |
@@ -1271,6 +1296,10 @@ static void __cpuinit coherency_setup(void) | |||
1271 | case CPU_AU1500: /* rev. AB */ | 1296 | case CPU_AU1500: /* rev. AB */ |
1272 | au1x00_fixup_config_od(); | 1297 | au1x00_fixup_config_od(); |
1273 | break; | 1298 | break; |
1299 | |||
1300 | case PRID_IMP_PR4450: | ||
1301 | nxp_pr4450_fixup_config(); | ||
1302 | break; | ||
1274 | } | 1303 | } |
1275 | } | 1304 | } |
1276 | 1305 | ||
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index ecd562d2c348..137c14bafd6b 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -71,6 +71,7 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
71 | * don't have to care about aliases on other CPUs. | 71 | * don't have to care about aliases on other CPUs. |
72 | */ | 72 | */ |
73 | unsigned long empty_zero_page, zero_page_mask; | 73 | unsigned long empty_zero_page, zero_page_mask; |
74 | EXPORT_SYMBOL_GPL(empty_zero_page); | ||
74 | 75 | ||
75 | /* | 76 | /* |
76 | * Not static inline because used by IP27 special magic initialization code | 77 | * Not static inline because used by IP27 special magic initialization code |
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c index d827d6144369..1edf0cbbeede 100644 --- a/arch/mips/mm/page.c +++ b/arch/mips/mm/page.c | |||
@@ -310,8 +310,8 @@ void __cpuinit build_clear_page(void) | |||
310 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) | 310 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) |
311 | uasm_i_lui(&buf, AT, 0xa000); | 311 | uasm_i_lui(&buf, AT, 0xa000); |
312 | 312 | ||
313 | off = min(8, pref_bias_clear_store / cache_line_size) * | 313 | off = cache_line_size ? min(8, pref_bias_clear_store / cache_line_size) |
314 | cache_line_size; | 314 | * cache_line_size : 0; |
315 | while (off) { | 315 | while (off) { |
316 | build_clear_pref(&buf, -off); | 316 | build_clear_pref(&buf, -off); |
317 | off -= cache_line_size; | 317 | off -= cache_line_size; |
@@ -454,12 +454,14 @@ void __cpuinit build_copy_page(void) | |||
454 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) | 454 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) |
455 | uasm_i_lui(&buf, AT, 0xa000); | 455 | uasm_i_lui(&buf, AT, 0xa000); |
456 | 456 | ||
457 | off = min(8, pref_bias_copy_load / cache_line_size) * cache_line_size; | 457 | off = cache_line_size ? min(8, pref_bias_copy_load / cache_line_size) * |
458 | cache_line_size : 0; | ||
458 | while (off) { | 459 | while (off) { |
459 | build_copy_load_pref(&buf, -off); | 460 | build_copy_load_pref(&buf, -off); |
460 | off -= cache_line_size; | 461 | off -= cache_line_size; |
461 | } | 462 | } |
462 | off = min(8, pref_bias_copy_store / cache_line_size) * cache_line_size; | 463 | off = cache_line_size ? min(8, pref_bias_copy_store / cache_line_size) * |
464 | cache_line_size : 0; | ||
463 | while (off) { | 465 | while (off) { |
464 | build_copy_store_pref(&buf, -off); | 466 | build_copy_store_pref(&buf, -off); |
465 | off -= cache_line_size; | 467 | off -= cache_line_size; |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 382738ca8a0b..76da73a5ab3c 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
@@ -224,8 +224,9 @@ static u32 final_handler[64] __cpuinitdata; | |||
224 | static void __cpuinit __maybe_unused build_tlb_probe_entry(u32 **p) | 224 | static void __cpuinit __maybe_unused build_tlb_probe_entry(u32 **p) |
225 | { | 225 | { |
226 | switch (current_cpu_type()) { | 226 | switch (current_cpu_type()) { |
227 | /* Found by experiment: R4600 v2.0 needs this, too. */ | 227 | /* Found by experiment: R4600 v2.0/R4700 needs this, too. */ |
228 | case CPU_R4600: | 228 | case CPU_R4600: |
229 | case CPU_R4700: | ||
229 | case CPU_R5000: | 230 | case CPU_R5000: |
230 | case CPU_R5000A: | 231 | case CPU_R5000A: |
231 | case CPU_NEVADA: | 232 | case CPU_NEVADA: |
diff --git a/arch/mips/nxp/pnx8550/jbs/board_setup.c b/arch/mips/nxp/pnx8550/jbs/board_setup.c index f92826e0096d..57dd903ca408 100644 --- a/arch/mips/nxp/pnx8550/jbs/board_setup.c +++ b/arch/mips/nxp/pnx8550/jbs/board_setup.c | |||
@@ -47,16 +47,7 @@ | |||
47 | 47 | ||
48 | void __init board_setup(void) | 48 | void __init board_setup(void) |
49 | { | 49 | { |
50 | unsigned long config0, configpr; | 50 | unsigned long configpr; |
51 | |||
52 | config0 = read_c0_config(); | ||
53 | |||
54 | /* clear all three cache coherency fields */ | ||
55 | config0 &= ~(0x7 | (7<<25) | (7<<28)); | ||
56 | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) | | ||
57 | (CONF_CM_DEFAULT<<28)); | ||
58 | write_c0_config(config0); | ||
59 | BARRIER; | ||
60 | 51 | ||
61 | configpr = read_c0_config7(); | 52 | configpr = read_c0_config7(); |
62 | configpr |= (1<<19); /* enable tlb */ | 53 | configpr |= (1<<19); /* enable tlb */ |
diff --git a/arch/mips/nxp/pnx8550/stb810/board_setup.c b/arch/mips/nxp/pnx8550/stb810/board_setup.c index 1282c27cfcb7..af2a55e0b4e9 100644 --- a/arch/mips/nxp/pnx8550/stb810/board_setup.c +++ b/arch/mips/nxp/pnx8550/stb810/board_setup.c | |||
@@ -33,15 +33,7 @@ | |||
33 | 33 | ||
34 | void __init board_setup(void) | 34 | void __init board_setup(void) |
35 | { | 35 | { |
36 | unsigned long config0, configpr; | 36 | unsigned long configpr; |
37 | |||
38 | config0 = read_c0_config(); | ||
39 | |||
40 | /* clear all three cache coherency fields */ | ||
41 | config0 &= ~(0x7 | (7<<25) | (7<<28)); | ||
42 | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) | | ||
43 | (CONF_CM_DEFAULT<<28)); | ||
44 | write_c0_config(config0); | ||
45 | 37 | ||
46 | configpr = read_c0_config7(); | 38 | configpr = read_c0_config7(); |
47 | configpr |= (1<<19); /* enable tlb */ | 39 | configpr |= (1<<19); /* enable tlb */ |
diff --git a/arch/mips/pci/ops-bridge.c b/arch/mips/pci/ops-bridge.c index 1fa09929cd7a..b46b3e211775 100644 --- a/arch/mips/pci/ops-bridge.c +++ b/arch/mips/pci/ops-bridge.c | |||
@@ -14,6 +14,22 @@ | |||
14 | #include <asm/sn/sn0/hub.h> | 14 | #include <asm/sn/sn0/hub.h> |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Most of the IOC3 PCI config register aren't present | ||
18 | * we emulate what is needed for a normal PCI enumeration | ||
19 | */ | ||
20 | static u32 emulate_ioc3_cfg(int where, int size) | ||
21 | { | ||
22 | if (size == 1 && where == 0x3d) | ||
23 | return 0x01; | ||
24 | else if (size == 2 && where == 0x3c) | ||
25 | return 0x0100; | ||
26 | else if (size == 4 && where == 0x3c) | ||
27 | return 0x00000100; | ||
28 | |||
29 | return 0; | ||
30 | } | ||
31 | |||
32 | /* | ||
17 | * The Bridge ASIC supports both type 0 and type 1 access. Type 1 is | 33 | * The Bridge ASIC supports both type 0 and type 1 access. Type 1 is |
18 | * not really documented, so right now I can't write code which uses it. | 34 | * not really documented, so right now I can't write code which uses it. |
19 | * Therefore we use type 0 accesses for now even though they won't work | 35 | * Therefore we use type 0 accesses for now even though they won't work |
@@ -64,7 +80,7 @@ oh_my_gawd: | |||
64 | * generic PCI code a chance to look at the wrong register. | 80 | * generic PCI code a chance to look at the wrong register. |
65 | */ | 81 | */ |
66 | if ((where >= 0x14 && where < 0x40) || (where >= 0x48)) { | 82 | if ((where >= 0x14 && where < 0x40) || (where >= 0x48)) { |
67 | *value = 0; | 83 | *value = emulate_ioc3_cfg(where, size); |
68 | return PCIBIOS_SUCCESSFUL; | 84 | return PCIBIOS_SUCCESSFUL; |
69 | } | 85 | } |
70 | 86 | ||
@@ -127,7 +143,7 @@ oh_my_gawd: | |||
127 | * generic PCI code a chance to look at the wrong register. | 143 | * generic PCI code a chance to look at the wrong register. |
128 | */ | 144 | */ |
129 | if ((where >= 0x14 && where < 0x40) || (where >= 0x48)) { | 145 | if ((where >= 0x14 && where < 0x40) || (where >= 0x48)) { |
130 | *value = 0; | 146 | *value = emulate_ioc3_cfg(where, size); |
131 | return PCIBIOS_SUCCESSFUL; | 147 | return PCIBIOS_SUCCESSFUL; |
132 | } | 148 | } |
133 | 149 | ||
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index bb64828a92fe..a18516925cdd 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c | |||
@@ -47,6 +47,9 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid) | |||
47 | static int num_bridges = 0; | 47 | static int num_bridges = 0; |
48 | bridge_t *bridge; | 48 | bridge_t *bridge; |
49 | int slot; | 49 | int slot; |
50 | extern int pci_probe_only; | ||
51 | |||
52 | pci_probe_only = 1; | ||
50 | 53 | ||
51 | printk("a bridge\n"); | 54 | printk("a bridge\n"); |
52 | 55 | ||
@@ -100,6 +103,11 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid) | |||
100 | */ | 103 | */ |
101 | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | | 104 | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | |
102 | BRIDGE_CTRL_MEM_SWAP; | 105 | BRIDGE_CTRL_MEM_SWAP; |
106 | #ifdef CONFIG_PAGE_SIZE_4KB | ||
107 | bridge->b_wid_control &= ~BRIDGE_CTRL_PAGE_SIZE; | ||
108 | #else /* 16kB or larger */ | ||
109 | bridge->b_wid_control |= BRIDGE_CTRL_PAGE_SIZE; | ||
110 | #endif | ||
103 | 111 | ||
104 | /* | 112 | /* |
105 | * Hmm... IRIX sets additional bits in the address which | 113 | * Hmm... IRIX sets additional bits in the address which |
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index 42e4d2c800fa..2a09ad91ec8c 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
@@ -207,6 +207,7 @@ struct pci_controller sb1250_controller = { | |||
207 | 207 | ||
208 | static int __init sb1250_pcibios_init(void) | 208 | static int __init sb1250_pcibios_init(void) |
209 | { | 209 | { |
210 | void __iomem *io_map_base; | ||
210 | uint32_t cmdreg; | 211 | uint32_t cmdreg; |
211 | uint64_t reg; | 212 | uint64_t reg; |
212 | extern int pci_probe_only; | 213 | extern int pci_probe_only; |
@@ -253,12 +254,13 @@ static int __init sb1250_pcibios_init(void) | |||
253 | * works correctly with most of Linux's drivers. | 254 | * works correctly with most of Linux's drivers. |
254 | * XXX ehs: Should this happen in PCI Device mode? | 255 | * XXX ehs: Should this happen in PCI Device mode? |
255 | */ | 256 | */ |
256 | |||
257 | set_io_port_base((unsigned long) | ||
258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 65536)); | ||
259 | isa_slot_offset = (unsigned long) | 257 | isa_slot_offset = (unsigned long) |
260 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); | 258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); |
261 | 259 | ||
260 | io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024); | ||
261 | sb1250_controller.io_map_base = io_map_base; | ||
262 | set_io_port_base((unsigned long)io_map_base); | ||
263 | |||
262 | #ifdef CONFIG_SIBYTE_HAS_LDT | 264 | #ifdef CONFIG_SIBYTE_HAS_LDT |
263 | /* | 265 | /* |
264 | * Also check the LDT bridge's enable, just in case we didn't | 266 | * Also check the LDT bridge's enable, just in case we didn't |
diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c index 33c4f683d067..d1e049b55f34 100644 --- a/arch/mips/pci/pci-vr41xx.c +++ b/arch/mips/pci/pci-vr41xx.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001-2003 MontaVista Software Inc. | 4 | * Copyright (C) 2001-2003 MontaVista Software Inc. |
5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> | 5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> |
6 | * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 6 | * Copyright (C) 2004-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> |
7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
@@ -300,6 +300,18 @@ static int __init vr41xx_pciu_init(void) | |||
300 | ioport_resource.end = IO_PORT_RESOURCE_END; | 300 | ioport_resource.end = IO_PORT_RESOURCE_END; |
301 | } | 301 | } |
302 | 302 | ||
303 | if (setup->master_io) { | ||
304 | void __iomem *io_map_base; | ||
305 | struct resource *res = vr41xx_pci_controller.io_resource; | ||
306 | master = setup->master_io; | ||
307 | io_map_base = ioremap(master->bus_base_address, | ||
308 | res->end - res->start + 1); | ||
309 | if (!io_map_base) | ||
310 | return -EBUSY; | ||
311 | |||
312 | vr41xx_pci_controller.io_map_base = (unsigned long)io_map_base; | ||
313 | } | ||
314 | |||
303 | register_pci_controller(&vr41xx_pci_controller); | 315 | register_pci_controller(&vr41xx_pci_controller); |
304 | 316 | ||
305 | return 0; | 317 | return 0; |
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c index 7093e7c573a4..4a500e8cd3cc 100644 --- a/arch/mips/sgi-ip27/ip27-init.c +++ b/arch/mips/sgi-ip27/ip27-init.c | |||
@@ -161,27 +161,6 @@ cnodeid_t get_compact_nodeid(void) | |||
161 | return NASID_TO_COMPACT_NODEID(get_nasid()); | 161 | return NASID_TO_COMPACT_NODEID(get_nasid()); |
162 | } | 162 | } |
163 | 163 | ||
164 | /* Extracted from the IOC3 meta driver. FIXME. */ | ||
165 | static inline void ioc3_sio_init(void) | ||
166 | { | ||
167 | struct ioc3 *ioc3; | ||
168 | nasid_t nid; | ||
169 | long loops; | ||
170 | |||
171 | nid = get_nasid(); | ||
172 | ioc3 = (struct ioc3 *) KL_CONFIG_CH_CONS_INFO(nid)->memory_base; | ||
173 | |||
174 | ioc3->sscr_a = 0; /* PIO mode for uarta. */ | ||
175 | ioc3->sscr_b = 0; /* PIO mode for uartb. */ | ||
176 | ioc3->sio_iec = ~0; | ||
177 | ioc3->sio_ies = (SIO_IR_SA_INT | SIO_IR_SB_INT); | ||
178 | |||
179 | loops=1000000; while(loops--); | ||
180 | ioc3->sregs.uarta.iu_fcr = 0; | ||
181 | ioc3->sregs.uartb.iu_fcr = 0; | ||
182 | loops=1000000; while(loops--); | ||
183 | } | ||
184 | |||
185 | static inline void ioc3_eth_init(void) | 164 | static inline void ioc3_eth_init(void) |
186 | { | 165 | { |
187 | struct ioc3 *ioc3; | 166 | struct ioc3 *ioc3; |
@@ -234,7 +213,6 @@ void __init plat_mem_setup(void) | |||
234 | panic("Kernel compiled for N mode."); | 213 | panic("Kernel compiled for N mode."); |
235 | #endif | 214 | #endif |
236 | 215 | ||
237 | ioc3_sio_init(); | ||
238 | ioc3_eth_init(); | 216 | ioc3_eth_init(); |
239 | per_cpu_init(); | 217 | per_cpu_init(); |
240 | 218 | ||
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index bf438d02366e..42cd10956306 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
@@ -33,10 +33,6 @@ | |||
33 | #define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) | 33 | #define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) |
34 | #define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) | 34 | #define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) |
35 | 35 | ||
36 | #define SLOT_IGNORED 0xffff | ||
37 | |||
38 | static short __initdata slot_lastfilled_cache[MAX_COMPACT_NODES]; | ||
39 | static unsigned short __initdata slot_psize_cache[MAX_COMPACT_NODES][MAX_MEM_SLOTS]; | ||
40 | static struct bootmem_data __initdata plat_node_bdata[MAX_COMPACT_NODES]; | 36 | static struct bootmem_data __initdata plat_node_bdata[MAX_COMPACT_NODES]; |
41 | 37 | ||
42 | struct node_data *__node_data[MAX_COMPACT_NODES]; | 38 | struct node_data *__node_data[MAX_COMPACT_NODES]; |
@@ -267,51 +263,6 @@ static pfn_t __init slot_getbasepfn(cnodeid_t cnode, int slot) | |||
267 | return ((pfn_t)nasid << PFN_NASIDSHFT) | (slot << SLOT_PFNSHIFT); | 263 | return ((pfn_t)nasid << PFN_NASIDSHFT) | (slot << SLOT_PFNSHIFT); |
268 | } | 264 | } |
269 | 265 | ||
270 | /* | ||
271 | * Return the number of pages of memory provided by the given slot | ||
272 | * on the specified node. | ||
273 | */ | ||
274 | static pfn_t __init slot_getsize(cnodeid_t node, int slot) | ||
275 | { | ||
276 | return (pfn_t) slot_psize_cache[node][slot]; | ||
277 | } | ||
278 | |||
279 | /* | ||
280 | * Return highest slot filled | ||
281 | */ | ||
282 | static int __init node_getlastslot(cnodeid_t node) | ||
283 | { | ||
284 | return (int) slot_lastfilled_cache[node]; | ||
285 | } | ||
286 | |||
287 | /* | ||
288 | * Return the pfn of the last free page of memory on a node. | ||
289 | */ | ||
290 | static pfn_t __init node_getmaxclick(cnodeid_t node) | ||
291 | { | ||
292 | pfn_t slot_psize; | ||
293 | int slot; | ||
294 | |||
295 | /* | ||
296 | * Start at the top slot. When we find a slot with memory in it, | ||
297 | * that's the winner. | ||
298 | */ | ||
299 | for (slot = (MAX_MEM_SLOTS - 1); slot >= 0; slot--) { | ||
300 | if ((slot_psize = slot_getsize(node, slot))) { | ||
301 | if (slot_psize == SLOT_IGNORED) | ||
302 | continue; | ||
303 | /* Return the basepfn + the slot size, minus 1. */ | ||
304 | return slot_getbasepfn(node, slot) + slot_psize - 1; | ||
305 | } | ||
306 | } | ||
307 | |||
308 | /* | ||
309 | * If there's no memory on the node, return 0. This is likely | ||
310 | * to cause problems. | ||
311 | */ | ||
312 | return 0; | ||
313 | } | ||
314 | |||
315 | static pfn_t __init slot_psize_compute(cnodeid_t node, int slot) | 266 | static pfn_t __init slot_psize_compute(cnodeid_t node, int slot) |
316 | { | 267 | { |
317 | nasid_t nasid; | 268 | nasid_t nasid; |
@@ -404,13 +355,13 @@ static void __init mlreset(void) | |||
404 | static void __init szmem(void) | 355 | static void __init szmem(void) |
405 | { | 356 | { |
406 | pfn_t slot_psize, slot0sz = 0, nodebytes; /* Hack to detect problem configs */ | 357 | pfn_t slot_psize, slot0sz = 0, nodebytes; /* Hack to detect problem configs */ |
407 | int slot, ignore; | 358 | int slot; |
408 | cnodeid_t node; | 359 | cnodeid_t node; |
409 | 360 | ||
410 | num_physpages = 0; | 361 | num_physpages = 0; |
411 | 362 | ||
412 | for_each_online_node(node) { | 363 | for_each_online_node(node) { |
413 | ignore = nodebytes = 0; | 364 | nodebytes = 0; |
414 | for (slot = 0; slot < MAX_MEM_SLOTS; slot++) { | 365 | for (slot = 0; slot < MAX_MEM_SLOTS; slot++) { |
415 | slot_psize = slot_psize_compute(node, slot); | 366 | slot_psize = slot_psize_compute(node, slot); |
416 | if (slot == 0) | 367 | if (slot == 0) |
@@ -420,21 +371,20 @@ static void __init szmem(void) | |||
420 | * kernel text. | 371 | * kernel text. |
421 | */ | 372 | */ |
422 | nodebytes += (1LL << SLOT_SHIFT); | 373 | nodebytes += (1LL << SLOT_SHIFT); |
374 | |||
375 | if (!slot_psize) | ||
376 | continue; | ||
377 | |||
423 | if ((nodebytes >> PAGE_SHIFT) * (sizeof(struct page)) > | 378 | if ((nodebytes >> PAGE_SHIFT) * (sizeof(struct page)) > |
424 | (slot0sz << PAGE_SHIFT)) | 379 | (slot0sz << PAGE_SHIFT)) { |
425 | ignore = 1; | ||
426 | if (ignore && slot_psize) { | ||
427 | printk("Ignoring slot %d onwards on node %d\n", | 380 | printk("Ignoring slot %d onwards on node %d\n", |
428 | slot, node); | 381 | slot, node); |
429 | slot_psize_cache[node][slot] = SLOT_IGNORED; | ||
430 | slot = MAX_MEM_SLOTS; | 382 | slot = MAX_MEM_SLOTS; |
431 | continue; | 383 | continue; |
432 | } | 384 | } |
433 | num_physpages += slot_psize; | 385 | num_physpages += slot_psize; |
434 | slot_psize_cache[node][slot] = | 386 | add_active_range(node, slot_getbasepfn(node, slot), |
435 | (unsigned short) slot_psize; | 387 | slot_getbasepfn(node, slot) + slot_psize); |
436 | if (slot_psize) | ||
437 | slot_lastfilled_cache[node] = slot; | ||
438 | } | 388 | } |
439 | } | 389 | } |
440 | } | 390 | } |
@@ -442,18 +392,20 @@ static void __init szmem(void) | |||
442 | static void __init node_mem_init(cnodeid_t node) | 392 | static void __init node_mem_init(cnodeid_t node) |
443 | { | 393 | { |
444 | pfn_t slot_firstpfn = slot_getbasepfn(node, 0); | 394 | pfn_t slot_firstpfn = slot_getbasepfn(node, 0); |
445 | pfn_t slot_lastpfn = slot_firstpfn + slot_getsize(node, 0); | ||
446 | pfn_t slot_freepfn = node_getfirstfree(node); | 395 | pfn_t slot_freepfn = node_getfirstfree(node); |
447 | struct pglist_data *pd; | ||
448 | unsigned long bootmap_size; | 396 | unsigned long bootmap_size; |
397 | pfn_t start_pfn, end_pfn; | ||
398 | |||
399 | get_pfn_range_for_nid(node, &start_pfn, &end_pfn); | ||
449 | 400 | ||
450 | /* | 401 | /* |
451 | * Allocate the node data structures on the node first. | 402 | * Allocate the node data structures on the node first. |
452 | */ | 403 | */ |
453 | __node_data[node] = __va(slot_freepfn << PAGE_SHIFT); | 404 | __node_data[node] = __va(slot_freepfn << PAGE_SHIFT); |
454 | 405 | ||
455 | pd = NODE_DATA(node); | 406 | NODE_DATA(node)->bdata = &plat_node_bdata[node]; |
456 | pd->bdata = &plat_node_bdata[node]; | 407 | NODE_DATA(node)->node_start_pfn = start_pfn; |
408 | NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn; | ||
457 | 409 | ||
458 | cpus_clear(hub_data(node)->h_cpus); | 410 | cpus_clear(hub_data(node)->h_cpus); |
459 | 411 | ||
@@ -461,12 +413,12 @@ static void __init node_mem_init(cnodeid_t node) | |||
461 | sizeof(struct hub_data)); | 413 | sizeof(struct hub_data)); |
462 | 414 | ||
463 | bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn, | 415 | bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn, |
464 | slot_firstpfn, slot_lastpfn); | 416 | start_pfn, end_pfn); |
465 | free_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, | 417 | free_bootmem_with_active_regions(node, end_pfn); |
466 | (slot_lastpfn - slot_firstpfn) << PAGE_SHIFT); | ||
467 | reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, | 418 | reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, |
468 | ((slot_freepfn - slot_firstpfn) << PAGE_SHIFT) + bootmap_size, | 419 | ((slot_freepfn - slot_firstpfn) << PAGE_SHIFT) + bootmap_size, |
469 | BOOTMEM_DEFAULT); | 420 | BOOTMEM_DEFAULT); |
421 | sparse_memory_present_with_active_regions(node); | ||
470 | } | 422 | } |
471 | 423 | ||
472 | /* | 424 | /* |
@@ -515,16 +467,15 @@ void __init paging_init(void) | |||
515 | pagetable_init(); | 467 | pagetable_init(); |
516 | 468 | ||
517 | for_each_online_node(node) { | 469 | for_each_online_node(node) { |
518 | pfn_t start_pfn = slot_getbasepfn(node, 0); | 470 | pfn_t start_pfn, end_pfn; |
519 | pfn_t end_pfn = node_getmaxclick(node) + 1; | ||
520 | 471 | ||
521 | zones_size[ZONE_NORMAL] = end_pfn - start_pfn; | 472 | get_pfn_range_for_nid(node, &start_pfn, &end_pfn); |
522 | free_area_init_node(node, NODE_DATA(node), | ||
523 | zones_size, start_pfn, NULL); | ||
524 | 473 | ||
525 | if (end_pfn > max_low_pfn) | 474 | if (end_pfn > max_low_pfn) |
526 | max_low_pfn = end_pfn; | 475 | max_low_pfn = end_pfn; |
527 | } | 476 | } |
477 | zones_size[ZONE_NORMAL] = max_low_pfn; | ||
478 | free_area_init_nodes(zones_size); | ||
528 | } | 479 | } |
529 | 480 | ||
530 | void __init mem_init(void) | 481 | void __init mem_init(void) |
@@ -535,34 +486,10 @@ void __init mem_init(void) | |||
535 | high_memory = (void *) __va(num_physpages << PAGE_SHIFT); | 486 | high_memory = (void *) __va(num_physpages << PAGE_SHIFT); |
536 | 487 | ||
537 | for_each_online_node(node) { | 488 | for_each_online_node(node) { |
538 | unsigned slot, numslots; | ||
539 | struct page *end, *p; | ||
540 | |||
541 | /* | 489 | /* |
542 | * This will free up the bootmem, ie, slot 0 memory. | 490 | * This will free up the bootmem, ie, slot 0 memory. |
543 | */ | 491 | */ |
544 | totalram_pages += free_all_bootmem_node(NODE_DATA(node)); | 492 | totalram_pages += free_all_bootmem_node(NODE_DATA(node)); |
545 | |||
546 | /* | ||
547 | * We need to manually do the other slots. | ||
548 | */ | ||
549 | numslots = node_getlastslot(node); | ||
550 | for (slot = 1; slot <= numslots; slot++) { | ||
551 | p = nid_page_nr(node, slot_getbasepfn(node, slot) - | ||
552 | slot_getbasepfn(node, 0)); | ||
553 | |||
554 | /* | ||
555 | * Free valid memory in current slot. | ||
556 | */ | ||
557 | for (end = p + slot_getsize(node, slot); p < end; p++) { | ||
558 | /* if (!page_is_ram(pgnr)) continue; */ | ||
559 | /* commented out until page_is_ram works */ | ||
560 | ClearPageReserved(p); | ||
561 | init_page_count(p); | ||
562 | __free_page(p); | ||
563 | totalram_pages++; | ||
564 | } | ||
565 | } | ||
566 | } | 493 | } |
567 | 494 | ||
568 | totalram_pages -= setup_zero_pages(); /* This comes from node 0 */ | 495 | totalram_pages -= setup_zero_pages(); /* This comes from node 0 */ |
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c index f15fc93d6b35..ba5cdebeaf0d 100644 --- a/arch/mips/sgi-ip27/ip27-smp.c +++ b/arch/mips/sgi-ip27/ip27-smp.c | |||
@@ -176,11 +176,14 @@ static void ip27_send_ipi_mask(cpumask_t mask, unsigned int action) | |||
176 | static void __cpuinit ip27_init_secondary(void) | 176 | static void __cpuinit ip27_init_secondary(void) |
177 | { | 177 | { |
178 | per_cpu_init(); | 178 | per_cpu_init(); |
179 | local_irq_enable(); | ||
180 | } | 179 | } |
181 | 180 | ||
182 | static void __cpuinit ip27_smp_finish(void) | 181 | static void __cpuinit ip27_smp_finish(void) |
183 | { | 182 | { |
183 | extern void hub_rt_clock_event_init(void); | ||
184 | |||
185 | hub_rt_clock_event_init(); | ||
186 | local_irq_enable(); | ||
184 | } | 187 | } |
185 | 188 | ||
186 | static void __init ip27_cpus_done(void) | 189 | static void __init ip27_cpus_done(void) |
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index 9cebc9e7da63..8b4e854af925 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c | |||
@@ -160,10 +160,13 @@ static void rt_set_mode(enum clock_event_mode mode, | |||
160 | 160 | ||
161 | int rt_timer_irq; | 161 | int rt_timer_irq; |
162 | 162 | ||
163 | static DEFINE_PER_CPU(struct clock_event_device, hub_rt_clockevent); | ||
164 | static DEFINE_PER_CPU(char [11], hub_rt_name); | ||
165 | |||
163 | static irqreturn_t hub_rt_counter_handler(int irq, void *dev_id) | 166 | static irqreturn_t hub_rt_counter_handler(int irq, void *dev_id) |
164 | { | 167 | { |
165 | struct clock_event_device *cd = dev_id; | ||
166 | unsigned int cpu = smp_processor_id(); | 168 | unsigned int cpu = smp_processor_id(); |
169 | struct clock_event_device *cd = &per_cpu(hub_rt_clockevent, cpu); | ||
167 | int slice = cputoslice(cpu); | 170 | int slice = cputoslice(cpu); |
168 | 171 | ||
169 | /* | 172 | /* |
@@ -192,10 +195,7 @@ struct irqaction hub_rt_irqaction = { | |||
192 | #define NSEC_PER_CYCLE 800 | 195 | #define NSEC_PER_CYCLE 800 |
193 | #define CYCLES_PER_SEC (NSEC_PER_SEC / NSEC_PER_CYCLE) | 196 | #define CYCLES_PER_SEC (NSEC_PER_SEC / NSEC_PER_CYCLE) |
194 | 197 | ||
195 | static DEFINE_PER_CPU(struct clock_event_device, hub_rt_clockevent); | 198 | void __cpuinit hub_rt_clock_event_init(void) |
196 | static DEFINE_PER_CPU(char [11], hub_rt_name); | ||
197 | |||
198 | static void __cpuinit hub_rt_clock_event_init(void) | ||
199 | { | 199 | { |
200 | unsigned int cpu = smp_processor_id(); | 200 | unsigned int cpu = smp_processor_id(); |
201 | struct clock_event_device *cd = &per_cpu(hub_rt_clockevent, cpu); | 201 | struct clock_event_device *cd = &per_cpu(hub_rt_clockevent, cpu); |
@@ -203,17 +203,16 @@ static void __cpuinit hub_rt_clock_event_init(void) | |||
203 | int irq = rt_timer_irq; | 203 | int irq = rt_timer_irq; |
204 | 204 | ||
205 | sprintf(name, "hub-rt %d", cpu); | 205 | sprintf(name, "hub-rt %d", cpu); |
206 | cd->name = "HUB-RT", | 206 | cd->name = name; |
207 | cd->features = CLOCK_EVT_FEAT_ONESHOT, | 207 | cd->features = CLOCK_EVT_FEAT_ONESHOT; |
208 | clockevent_set_clock(cd, CYCLES_PER_SEC); | 208 | clockevent_set_clock(cd, CYCLES_PER_SEC); |
209 | cd->max_delta_ns = clockevent_delta2ns(0xfffffffffffff, cd); | 209 | cd->max_delta_ns = clockevent_delta2ns(0xfffffffffffff, cd); |
210 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); | 210 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); |
211 | cd->rating = 200, | 211 | cd->rating = 200; |
212 | cd->irq = irq, | 212 | cd->irq = irq; |
213 | cd->cpumask = cpumask_of_cpu(cpu), | 213 | cd->cpumask = cpumask_of_cpu(cpu); |
214 | cd->rating = 300, | 214 | cd->set_next_event = rt_next_event; |
215 | cd->set_next_event = rt_next_event, | 215 | cd->set_mode = rt_set_mode; |
216 | cd->set_mode = rt_set_mode, | ||
217 | clockevents_register_device(cd); | 216 | clockevents_register_device(cd); |
218 | } | 217 | } |
219 | 218 | ||
@@ -261,6 +260,7 @@ void __init plat_time_init(void) | |||
261 | { | 260 | { |
262 | hub_rt_clocksource_init(); | 261 | hub_rt_clocksource_init(); |
263 | hub_rt_clock_event_global_init(); | 262 | hub_rt_clock_event_global_init(); |
263 | hub_rt_clock_event_init(); | ||
264 | } | 264 | } |
265 | 265 | ||
266 | void __cpuinit cpu_time_init(void) | 266 | void __cpuinit cpu_time_init(void) |
@@ -281,7 +281,6 @@ void __cpuinit cpu_time_init(void) | |||
281 | 281 | ||
282 | printk("CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed); | 282 | printk("CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed); |
283 | 283 | ||
284 | hub_rt_clock_event_init(); | ||
285 | set_c0_status(SRB_TIMOCLK); | 284 | set_c0_status(SRB_TIMOCLK); |
286 | } | 285 | } |
287 | 286 | ||
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index b0ea0e43ba48..0d6b6663d5f6 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c | |||
@@ -425,6 +425,11 @@ static void ip32_irq0(void) | |||
425 | BUILD_BUG_ON(MACEISA_SERIAL2_RDMAOR_IRQ - MACEISA_AUDIO_SW_IRQ != 31); | 425 | BUILD_BUG_ON(MACEISA_SERIAL2_RDMAOR_IRQ - MACEISA_AUDIO_SW_IRQ != 31); |
426 | 426 | ||
427 | crime_int = crime->istat & crime_mask; | 427 | crime_int = crime->istat & crime_mask; |
428 | |||
429 | /* crime sometime delivers spurious interrupts, ignore them */ | ||
430 | if (unlikely(crime_int == 0)) | ||
431 | return; | ||
432 | |||
428 | irq = MACE_VID_IN1_IRQ + __ffs(crime_int); | 433 | irq = MACE_VID_IN1_IRQ + __ffs(crime_int); |
429 | 434 | ||
430 | if (crime_int & CRIME_MACEISA_INT_MASK) { | 435 | if (crime_int & CRIME_MACEISA_INT_MASK) { |
diff --git a/arch/mips/sibyte/swarm/Makefile b/arch/mips/sibyte/swarm/Makefile index 2d626039195c..1775755a2619 100644 --- a/arch/mips/sibyte/swarm/Makefile +++ b/arch/mips/sibyte/swarm/Makefile | |||
@@ -1,3 +1,3 @@ | |||
1 | lib-y = setup.o rtc_xicor1241.o rtc_m41t81.o | 1 | obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o |
2 | 2 | ||
3 | lib-$(CONFIG_KGDB) += dbg_io.o | 3 | obj-$(CONFIG_KGDB) += dbg_io.o |
diff --git a/arch/mn10300/kernel/mn10300_ksyms.c b/arch/mn10300/kernel/mn10300_ksyms.c index 6d19628634e3..f9eb9753a404 100644 --- a/arch/mn10300/kernel/mn10300_ksyms.c +++ b/arch/mn10300/kernel/mn10300_ksyms.c | |||
@@ -10,8 +10,11 @@ | |||
10 | */ | 10 | */ |
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
13 | #include <asm/pgtable.h> | ||
13 | 14 | ||
14 | 15 | ||
16 | EXPORT_SYMBOL(empty_zero_page); | ||
17 | |||
15 | EXPORT_SYMBOL(change_bit); | 18 | EXPORT_SYMBOL(change_bit); |
16 | EXPORT_SYMBOL(test_and_change_bit); | 19 | EXPORT_SYMBOL(test_and_change_bit); |
17 | 20 | ||
@@ -31,7 +34,9 @@ extern u64 __ashrdi3(u64, unsigned); | |||
31 | extern u64 __ashldi3(u64, unsigned); | 34 | extern u64 __ashldi3(u64, unsigned); |
32 | extern u64 __lshrdi3(u64, unsigned); | 35 | extern u64 __lshrdi3(u64, unsigned); |
33 | extern s64 __negdi2(s64); | 36 | extern s64 __negdi2(s64); |
37 | extern int __ucmpdi2(u64, u64); | ||
34 | EXPORT_SYMBOL(__ashrdi3); | 38 | EXPORT_SYMBOL(__ashrdi3); |
35 | EXPORT_SYMBOL(__ashldi3); | 39 | EXPORT_SYMBOL(__ashldi3); |
36 | EXPORT_SYMBOL(__lshrdi3); | 40 | EXPORT_SYMBOL(__lshrdi3); |
37 | EXPORT_SYMBOL(__negdi2); | 41 | EXPORT_SYMBOL(__negdi2); |
42 | EXPORT_SYMBOL(__ucmpdi2); | ||
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c index 3b0d579fc15d..b28c9a60445b 100644 --- a/arch/mn10300/kernel/process.c +++ b/arch/mn10300/kernel/process.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/ptrace.h> | 20 | #include <linux/ptrace.h> |
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | #include <linux/user.h> | 22 | #include <linux/user.h> |
23 | #include <linux/a.out.h> | ||
24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
26 | #include <linux/reboot.h> | 25 | #include <linux/reboot.h> |
@@ -154,6 +153,7 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | |||
154 | return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, | 153 | return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, |
155 | NULL, NULL); | 154 | NULL, NULL); |
156 | } | 155 | } |
156 | EXPORT_SYMBOL(kernel_thread); | ||
157 | 157 | ||
158 | /* | 158 | /* |
159 | * free current thread data structures etc.. | 159 | * free current thread data structures etc.. |
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 6b7ce2636851..017121ce896f 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/ptrace.h> | 17 | #include <linux/ptrace.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/user.h> | 19 | #include <linux/user.h> |
20 | #include <linux/a.out.h> | ||
21 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/arch/mn10300/lib/Makefile b/arch/mn10300/lib/Makefile index fdfa9ec5b5bb..0cd2346f4c13 100644 --- a/arch/mn10300/lib/Makefile +++ b/arch/mn10300/lib/Makefile | |||
@@ -4,4 +4,4 @@ | |||
4 | 4 | ||
5 | lib-y = delay.o usercopy.o checksum.o bitops.o memcpy.o memmove.o memset.o | 5 | lib-y = delay.o usercopy.o checksum.o bitops.o memcpy.o memmove.o memset.o |
6 | lib-y += do_csum.o | 6 | lib-y += do_csum.o |
7 | lib-y += __ashldi3.o __ashrdi3.o __lshrdi3.o negdi2.o | 7 | lib-y += __ashldi3.o __ashrdi3.o __lshrdi3.o negdi2.o __ucmpdi2.o |
diff --git a/arch/mn10300/lib/__ucmpdi2.S b/arch/mn10300/lib/__ucmpdi2.S new file mode 100644 index 000000000000..60dcbdfe386c --- /dev/null +++ b/arch/mn10300/lib/__ucmpdi2.S | |||
@@ -0,0 +1,43 @@ | |||
1 | /* __ucmpdi2.S: 64-bit unsigned compare | ||
2 | * | ||
3 | * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | |||
13 | .text | ||
14 | .p2align 4 | ||
15 | |||
16 | ############################################################################### | ||
17 | # | ||
18 | # int __ucmpdi2(unsigned long long a [D0:D1], | ||
19 | # unsigned long long b [(SP,12),(SP,16)]) | ||
20 | # | ||
21 | # - returns 0, 1, or 2 as a <, =, > b respectively. | ||
22 | # | ||
23 | ############################################################################### | ||
24 | .globl __ucmpdi2 | ||
25 | .type __ucmpdi2,@function | ||
26 | __ucmpdi2: | ||
27 | mov (12,sp),a0 # b.lsw | ||
28 | mov (16,sp),a1 # b.msw | ||
29 | |||
30 | sub a0,d0 | ||
31 | subc a1,d1 # may clear Z, never sets it | ||
32 | bne __ucmpdi2_differ # a.msw != b.msw | ||
33 | mov +1,d0 | ||
34 | rets | ||
35 | |||
36 | __ucmpdi2_differ: | ||
37 | # C flag is set if LE, clear if GE | ||
38 | subc d0,d0 # -1 if LE, 0 if GE | ||
39 | add +1,d0 # 0 if LE, 1 if GE | ||
40 | add d0,d0 # 0 if LE, 2 if GE | ||
41 | rets | ||
42 | |||
43 | .size __ucmpdi2, .-__ucmpdi2 | ||
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S index f0b18ce89842..38a1c1b8d4e8 100644 --- a/arch/parisc/hpux/gate.S +++ b/arch/parisc/hpux/gate.S | |||
@@ -13,10 +13,9 @@ | |||
13 | #include <asm/unistd.h> | 13 | #include <asm/unistd.h> |
14 | #include <asm/errno.h> | 14 | #include <asm/errno.h> |
15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
16 | #include <linux/init.h> | ||
17 | 16 | ||
18 | .level LEVEL | 17 | .level LEVEL |
19 | __HEAD | 18 | .text |
20 | 19 | ||
21 | .import hpux_call_table | 20 | .import hpux_call_table |
22 | .import hpux_syscall_exit,code | 21 | .import hpux_syscall_exit,code |
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S index ccd3a50c0995..58c53c879c02 100644 --- a/arch/parisc/hpux/wrappers.S +++ b/arch/parisc/hpux/wrappers.S | |||
@@ -28,10 +28,9 @@ | |||
28 | #include <asm/assembly.h> | 28 | #include <asm/assembly.h> |
29 | #include <asm/signal.h> | 29 | #include <asm/signal.h> |
30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
31 | #include <linux/init.h> | ||
32 | 31 | ||
33 | .level LEVEL | 32 | .level LEVEL |
34 | __HEAD | 33 | .text |
35 | 34 | ||
36 | /* These should probably go in a header file somewhere. | 35 | /* These should probably go in a header file somewhere. |
37 | * They are duplicated in kernel/wrappers.S | 36 | * They are duplicated in kernel/wrappers.S |
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 5d0837458c19..d1fa4edd2d80 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <asm/thread_info.h> | 38 | #include <asm/thread_info.h> |
39 | 39 | ||
40 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
41 | #include <linux/init.h> | ||
42 | 41 | ||
43 | #ifdef CONFIG_64BIT | 42 | #ifdef CONFIG_64BIT |
44 | .level 2.0w | 43 | .level 2.0w |
@@ -622,7 +621,7 @@ | |||
622 | * the static part of the kernel address space. | 621 | * the static part of the kernel address space. |
623 | */ | 622 | */ |
624 | 623 | ||
625 | __HEAD | 624 | .text |
626 | 625 | ||
627 | .align PAGE_SIZE | 626 | .align PAGE_SIZE |
628 | 627 | ||
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 5680a2c3b13d..a84e31e82876 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
@@ -33,6 +33,7 @@ ENTRY(boot_args) | |||
33 | END(boot_args) | 33 | END(boot_args) |
34 | 34 | ||
35 | __HEAD | 35 | __HEAD |
36 | |||
36 | .align 4 | 37 | .align 4 |
37 | .import init_thread_union,data | 38 | .import init_thread_union,data |
38 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ | 39 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ |
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S index 068322eb8c9b..2cbf13b3ef11 100644 --- a/arch/parisc/kernel/hpmc.S +++ b/arch/parisc/kernel/hpmc.S | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <asm/pdc.h> | 47 | #include <asm/pdc.h> |
48 | 48 | ||
49 | #include <linux/linkage.h> | 49 | #include <linux/linkage.h> |
50 | #include <linux/init.h> | ||
51 | 50 | ||
52 | /* | 51 | /* |
53 | * stack for os_hpmc, the HPMC handler. | 52 | * stack for os_hpmc, the HPMC handler. |
@@ -77,7 +76,7 @@ ENTRY(hpmc_pim_data) | |||
77 | .block HPMC_PIM_DATA_SIZE | 76 | .block HPMC_PIM_DATA_SIZE |
78 | END(hpmc_pim_data) | 77 | END(hpmc_pim_data) |
79 | 78 | ||
80 | __HEAD | 79 | .text |
81 | 80 | ||
82 | .import intr_save, code | 81 | .import intr_save, code |
83 | ENTRY(os_hpmc) | 82 | ENTRY(os_hpmc) |
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index e3246a5ca74f..09b77b2553c6 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
@@ -37,9 +37,8 @@ | |||
37 | #include <asm/pgtable.h> | 37 | #include <asm/pgtable.h> |
38 | #include <asm/cache.h> | 38 | #include <asm/cache.h> |
39 | #include <linux/linkage.h> | 39 | #include <linux/linkage.h> |
40 | #include <linux/init.h> | ||
41 | 40 | ||
42 | __HEAD | 41 | .text |
43 | .align 128 | 42 | .align 128 |
44 | 43 | ||
45 | ENTRY(flush_tlb_all_local) | 44 | ENTRY(flush_tlb_all_local) |
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 5b7fc4aa044d..0eecfbbc59cd 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c | |||
@@ -152,3 +152,6 @@ EXPORT_SYMBOL($$dyncall); | |||
152 | EXPORT_SYMBOL(node_data); | 152 | EXPORT_SYMBOL(node_data); |
153 | EXPORT_SYMBOL(pfnnid_map); | 153 | EXPORT_SYMBOL(pfnnid_map); |
154 | #endif | 154 | #endif |
155 | |||
156 | /* from pacache.S -- needed for copy_page */ | ||
157 | EXPORT_SYMBOL(copy_user_page_asm); | ||
diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S index d411dfb5b6d1..fa6ea99bb324 100644 --- a/arch/parisc/kernel/perf_asm.S +++ b/arch/parisc/kernel/perf_asm.S | |||
@@ -43,7 +43,7 @@ | |||
43 | ; The coprocessor only needs to be enabled when | 43 | ; The coprocessor only needs to be enabled when |
44 | ; starting/stopping the coprocessor with the pmenb/pmdis. | 44 | ; starting/stopping the coprocessor with the pmenb/pmdis. |
45 | ; | 45 | ; |
46 | __HEAD | 46 | .text |
47 | 47 | ||
48 | ENTRY(perf_intrigue_enable_perf_counters) | 48 | ENTRY(perf_intrigue_enable_perf_counters) |
49 | .proc | 49 | .proc |
diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S index 47fbdae6efd5..7a92695d95a6 100644 --- a/arch/parisc/kernel/real2.S +++ b/arch/parisc/kernel/real2.S | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <asm/assembly.h> | 12 | #include <asm/assembly.h> |
13 | 13 | ||
14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
15 | #include <linux/init.h> | ||
16 | 15 | ||
17 | .section .bss | 16 | .section .bss |
18 | .export real_stack | 17 | .export real_stack |
@@ -40,7 +39,7 @@ save_cr_end: | |||
40 | /************************ 32-bit real-mode calls ***********************/ | 39 | /************************ 32-bit real-mode calls ***********************/ |
41 | /* This can be called in both narrow and wide kernels */ | 40 | /* This can be called in both narrow and wide kernels */ |
42 | 41 | ||
43 | __HEAD | 42 | .text |
44 | 43 | ||
45 | /* unsigned long real32_call_asm(unsigned int *sp, | 44 | /* unsigned long real32_call_asm(unsigned int *sp, |
46 | * unsigned int *arg0p, | 45 | * unsigned int *arg0p, |
@@ -114,7 +113,7 @@ ENDPROC(real32_call_asm) | |||
114 | # define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where) | 113 | # define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where) |
115 | # define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r | 114 | # define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r |
116 | 115 | ||
117 | __HEAD | 116 | .text |
118 | save_control_regs: | 117 | save_control_regs: |
119 | load32 PA(save_cr_space), %r28 | 118 | load32 PA(save_cr_space), %r28 |
120 | PUSH_CR(%cr24, %r28) | 119 | PUSH_CR(%cr24, %r28) |
@@ -146,7 +145,7 @@ restore_control_regs: | |||
146 | /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for | 145 | /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for |
147 | * more general-purpose use by the several places which need RFIs | 146 | * more general-purpose use by the several places which need RFIs |
148 | */ | 147 | */ |
149 | __HEAD | 148 | .text |
150 | .align 128 | 149 | .align 128 |
151 | rfi_virt2real: | 150 | rfi_virt2real: |
152 | /* switch to real mode... */ | 151 | /* switch to real mode... */ |
@@ -181,7 +180,7 @@ rfi_v2r_1: | |||
181 | bv 0(%r2) | 180 | bv 0(%r2) |
182 | nop | 181 | nop |
183 | 182 | ||
184 | __HEAD | 183 | .text |
185 | .align 128 | 184 | .align 128 |
186 | rfi_real2virt: | 185 | rfi_real2virt: |
187 | rsm PSW_SM_I,%r0 | 186 | rsm PSW_SM_I,%r0 |
@@ -219,7 +218,7 @@ rfi_r2v_1: | |||
219 | 218 | ||
220 | /************************ 64-bit real-mode calls ***********************/ | 219 | /************************ 64-bit real-mode calls ***********************/ |
221 | /* This is only usable in wide kernels right now and will probably stay so */ | 220 | /* This is only usable in wide kernels right now and will probably stay so */ |
222 | __HEAD | 221 | .text |
223 | /* unsigned long real64_call_asm(unsigned long *sp, | 222 | /* unsigned long real64_call_asm(unsigned long *sp, |
224 | * unsigned long *arg0p, | 223 | * unsigned long *arg0p, |
225 | * unsigned long fn) | 224 | * unsigned long fn) |
@@ -277,7 +276,7 @@ ENDPROC(real64_call_asm) | |||
277 | 276 | ||
278 | #endif | 277 | #endif |
279 | 278 | ||
280 | __HEAD | 279 | .text |
281 | /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html | 280 | /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html |
282 | ** GCC 3.3 and later has a new function in libgcc.a for | 281 | ** GCC 3.3 and later has a new function in libgcc.a for |
283 | ** comparing function pointers. | 282 | ** comparing function pointers. |
diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c index db94affe5c71..fb59852006de 100644 --- a/arch/parisc/kernel/signal32.c +++ b/arch/parisc/kernel/signal32.c | |||
@@ -289,7 +289,7 @@ setup_sigcontext32(struct compat_sigcontext __user *sc, struct compat_regfile __ | |||
289 | &sc->sc_iaoq[0], compat_reg); | 289 | &sc->sc_iaoq[0], compat_reg); |
290 | 290 | ||
291 | /* Store upper half */ | 291 | /* Store upper half */ |
292 | compat_reg = (compat_uint_t)(regs->gr[32] >> 32); | 292 | compat_reg = (compat_uint_t)(regs->gr[31] >> 32); |
293 | err |= __put_user(compat_reg, &rf->rf_iaoq[0]); | 293 | err |= __put_user(compat_reg, &rf->rf_iaoq[0]); |
294 | DBG(2,"setup_sigcontext32: upper half iaoq[0] = %#x\n", compat_reg); | 294 | DBG(2,"setup_sigcontext32: upper half iaoq[0] = %#x\n", compat_reg); |
295 | 295 | ||
@@ -299,7 +299,7 @@ setup_sigcontext32(struct compat_sigcontext __user *sc, struct compat_regfile __ | |||
299 | DBG(2,"setup_sigcontext32: sc->sc_iaoq[1] = %p <= %#x\n", | 299 | DBG(2,"setup_sigcontext32: sc->sc_iaoq[1] = %p <= %#x\n", |
300 | &sc->sc_iaoq[1], compat_reg); | 300 | &sc->sc_iaoq[1], compat_reg); |
301 | /* Store upper half */ | 301 | /* Store upper half */ |
302 | compat_reg = (compat_uint_t)((regs->gr[32]+4) >> 32); | 302 | compat_reg = (compat_uint_t)((regs->gr[31]+4) >> 32); |
303 | err |= __put_user(compat_reg, &rf->rf_iaoq[1]); | 303 | err |= __put_user(compat_reg, &rf->rf_iaoq[1]); |
304 | DBG(2,"setup_sigcontext32: upper half iaoq[1] = %#x\n", compat_reg); | 304 | DBG(2,"setup_sigcontext32: upper half iaoq[1] = %#x\n", compat_reg); |
305 | 305 | ||
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index ae509d8cd03f..69b6eebc466e 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
18 | 18 | ||
19 | #include <linux/linkage.h> | 19 | #include <linux/linkage.h> |
20 | #include <linux/init.h> | ||
21 | 20 | ||
22 | /* We fill the empty parts of the gateway page with | 21 | /* We fill the empty parts of the gateway page with |
23 | * something that will kill the kernel or a | 22 | * something that will kill the kernel or a |
@@ -27,7 +26,7 @@ | |||
27 | 26 | ||
28 | .level LEVEL | 27 | .level LEVEL |
29 | 28 | ||
30 | __HEAD | 29 | .text |
31 | 30 | ||
32 | .import syscall_exit,code | 31 | .import syscall_exit,code |
33 | .import syscall_exit_rfi,code | 32 | .import syscall_exit_rfi,code |
@@ -637,7 +636,7 @@ END(sys_call_table64) | |||
637 | All light-weight-syscall atomic operations | 636 | All light-weight-syscall atomic operations |
638 | will use this set of locks | 637 | will use this set of locks |
639 | */ | 638 | */ |
640 | .section .data, "aw" | 639 | .section .data |
641 | .align PAGE_SIZE | 640 | .align PAGE_SIZE |
642 | ENTRY(lws_lock_start) | 641 | ENTRY(lws_lock_start) |
643 | /* lws locks */ | 642 | /* lws locks */ |
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 50b4a3a25d0a..2e516b871752 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
@@ -50,6 +50,7 @@ SECTIONS | |||
50 | 50 | ||
51 | _text = .; /* Text and read-only data */ | 51 | _text = .; /* Text and read-only data */ |
52 | .text ALIGN(16) : { | 52 | .text ALIGN(16) : { |
53 | HEAD_TEXT | ||
53 | TEXT_TEXT | 54 | TEXT_TEXT |
54 | SCHED_TEXT | 55 | SCHED_TEXT |
55 | LOCK_TEXT | 56 | LOCK_TEXT |
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index 4821ad6d5269..d172d4245cdc 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <asm/assembly.h> | 23 | #include <asm/assembly.h> |
24 | #include <asm/errno.h> | 24 | #include <asm/errno.h> |
25 | #include <linux/linkage.h> | 25 | #include <linux/linkage.h> |
26 | #include <linux/init.h> | ||
27 | 26 | ||
28 | #ifdef CONFIG_SMP | 27 | #ifdef CONFIG_SMP |
29 | .macro get_fault_ip t1 t2 | 28 | .macro get_fault_ip t1 t2 |
@@ -56,7 +55,7 @@ | |||
56 | 55 | ||
57 | .level LEVEL | 56 | .level LEVEL |
58 | 57 | ||
59 | __HEAD | 58 | .text |
60 | .section .fixup, "ax" | 59 | .section .fixup, "ax" |
61 | 60 | ||
62 | /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */ | 61 | /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */ |
diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S index b0d885350846..1bd23ccec17b 100644 --- a/arch/parisc/lib/lusercopy.S +++ b/arch/parisc/lib/lusercopy.S | |||
@@ -33,12 +33,11 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | 35 | ||
36 | .text | ||
37 | |||
36 | #include <asm/assembly.h> | 38 | #include <asm/assembly.h> |
37 | #include <asm/errno.h> | 39 | #include <asm/errno.h> |
38 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
39 | #include <linux/init.h> | ||
40 | |||
41 | __HEAD | ||
42 | 41 | ||
43 | /* | 42 | /* |
44 | * get_sr gets the appropriate space value into | 43 | * get_sr gets the appropriate space value into |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 78fe252b92c3..ce0da689a89d 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
@@ -547,6 +547,7 @@ void __init mem_init(void) | |||
547 | } | 547 | } |
548 | 548 | ||
549 | unsigned long *empty_zero_page __read_mostly; | 549 | unsigned long *empty_zero_page __read_mostly; |
550 | EXPORT_SYMBOL(empty_zero_page); | ||
550 | 551 | ||
551 | void show_mem(void) | 552 | void show_mem(void) |
552 | { | 553 | { |
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 9dcdc036cdf7..b7d4c4ce2fe6 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
@@ -96,6 +96,8 @@ endif | |||
96 | else | 96 | else |
97 | KBUILD_CFLAGS += $(call cc-option,-mtune=power4) | 97 | KBUILD_CFLAGS += $(call cc-option,-mtune=power4) |
98 | endif | 98 | endif |
99 | else | ||
100 | LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o | ||
99 | endif | 101 | endif |
100 | 102 | ||
101 | ifeq ($(CONFIG_TUNE_CELL),y) | 103 | ifeq ($(CONFIG_TUNE_CELL),y) |
@@ -154,7 +156,7 @@ all: zImage | |||
154 | 156 | ||
155 | CPPFLAGS_vmlinux.lds := -Upowerpc | 157 | CPPFLAGS_vmlinux.lds := -Upowerpc |
156 | 158 | ||
157 | BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% | 159 | BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.% |
158 | 160 | ||
159 | PHONY += $(BOOT_TARGETS) | 161 | PHONY += $(BOOT_TARGETS) |
160 | 162 | ||
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore index 2347294ff35b..2f50acd11a60 100644 --- a/arch/powerpc/boot/.gitignore +++ b/arch/powerpc/boot/.gitignore | |||
@@ -20,21 +20,19 @@ kernel-vmlinux.strip.gz | |||
20 | mktree | 20 | mktree |
21 | uImage | 21 | uImage |
22 | cuImage.* | 22 | cuImage.* |
23 | dtbImage.* | ||
23 | treeImage.* | 24 | treeImage.* |
24 | zImage | 25 | zImage |
26 | zImage.initrd | ||
25 | zImage.bin.* | 27 | zImage.bin.* |
26 | zImage.chrp | 28 | zImage.chrp |
27 | zImage.coff | 29 | zImage.coff |
28 | zImage.coff.lds | 30 | zImage.holly |
29 | zImage.ep* | ||
30 | zImage.iseries | 31 | zImage.iseries |
31 | zImage.*lds | 32 | zImage.*lds |
32 | zImage.miboot | 33 | zImage.miboot |
33 | zImage.pmac | 34 | zImage.pmac |
34 | zImage.pseries | 35 | zImage.pseries |
35 | zImage.redboot* | ||
36 | zImage.sandpoint | ||
37 | zImage.vmode | ||
38 | zconf.h | 36 | zconf.h |
39 | zlib.h | 37 | zlib.h |
40 | zutil.h | 38 | zutil.h |
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 7822d25c9d31..095e04db1c0e 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
@@ -51,7 +51,7 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ | |||
51 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) | 51 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) |
52 | 52 | ||
53 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c | 53 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c |
54 | src-wlib := string.S crt0.S stdio.c main.c \ | 54 | src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \ |
55 | $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \ | 55 | $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \ |
56 | ns16550.c serial.c simple_alloc.c div64.S util.S \ | 56 | ns16550.c serial.c simple_alloc.c div64.S util.S \ |
57 | gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ | 57 | gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ |
@@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct | |||
99 | @cp $< $@ | 99 | @cp $< $@ |
100 | 100 | ||
101 | clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \ | 101 | clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \ |
102 | empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds | 102 | empty.c zImage.coff.lds zImage.ps3.lds zImage.lds |
103 | 103 | ||
104 | quiet_cmd_bootcc = BOOTCC $@ | 104 | quiet_cmd_bootcc = BOOTCC $@ |
105 | cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< | 105 | cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< |
@@ -221,8 +221,8 @@ image-$(CONFIG_WARP) += cuImage.warp | |||
221 | image-$(CONFIG_YOSEMITE) += cuImage.yosemite | 221 | image-$(CONFIG_YOSEMITE) += cuImage.yosemite |
222 | 222 | ||
223 | # Board ports in arch/powerpc/platform/8xx/Kconfig | 223 | # Board ports in arch/powerpc/platform/8xx/Kconfig |
224 | image-$(CONFIG_PPC_MPC86XADS) += cuImage.mpc866ads | 224 | image-$(CONFIG_MPC86XADS) += cuImage.mpc866ads |
225 | image-$(CONFIG_PPC_MPC885ADS) += cuImage.mpc885ads | 225 | image-$(CONFIG_MPC885ADS) += cuImage.mpc885ads |
226 | image-$(CONFIG_PPC_EP88XC) += dtbImage.ep88xc | 226 | image-$(CONFIG_PPC_EP88XC) += dtbImage.ep88xc |
227 | image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \ | 227 | image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \ |
228 | dtbImage.adder875-redboot | 228 | dtbImage.adder875-redboot |
@@ -273,7 +273,8 @@ endif | |||
273 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) | 273 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) |
274 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ | 274 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ |
275 | $(patsubst dtbImage%, dtbImage.initrd%, \ | 275 | $(patsubst dtbImage%, dtbImage.initrd%, \ |
276 | $(patsubst treeImage%, treeImage.initrd%, $(image-y)))) | 276 | $(patsubst simpleImage%, simpleImage.initrd%, \ |
277 | $(patsubst treeImage%, treeImage.initrd%, $(image-y))))) | ||
277 | initrd-y := $(filter-out $(image-y), $(initrd-y)) | 278 | initrd-y := $(filter-out $(image-y), $(initrd-y)) |
278 | targets += $(image-y) $(initrd-y) | 279 | targets += $(image-y) $(initrd-y) |
279 | 280 | ||
@@ -339,7 +340,9 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) | |||
339 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< | 340 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< |
340 | 341 | ||
341 | # anything not in $(targets) | 342 | # anything not in $(targets) |
342 | clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \ | 343 | clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ |
344 | zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ | ||
345 | zImage.iseries zImage.miboot zImage.pmac zImage.pseries \ | ||
343 | otheros.bld *.dtb | 346 | otheros.bld *.dtb |
344 | 347 | ||
345 | # clean up files cached by wrapper | 348 | # clean up files cached by wrapper |
diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S new file mode 100644 index 000000000000..f3d9b35c07d4 --- /dev/null +++ b/arch/powerpc/boot/crtsavres.S | |||
@@ -0,0 +1,233 @@ | |||
1 | /* | ||
2 | * Special support for eabi and SVR4 | ||
3 | * | ||
4 | * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. | ||
5 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
6 | * Written By Michael Meissner | ||
7 | * | ||
8 | * Based on gcc/config/rs6000/crtsavres.asm from gcc | ||
9 | * | ||
10 | * This file is free software; you can redistribute it and/or modify it | ||
11 | * under the terms of the GNU General Public License as published by the | ||
12 | * Free Software Foundation; either version 2, or (at your option) any | ||
13 | * later version. | ||
14 | * | ||
15 | * In addition to the permissions in the GNU General Public License, the | ||
16 | * Free Software Foundation gives you unlimited permission to link the | ||
17 | * compiled version of this file with other programs, and to distribute | ||
18 | * those programs without any restriction coming from the use of this | ||
19 | * file. (The General Public License restrictions do apply in other | ||
20 | * respects; for example, they cover modification of the file, and | ||
21 | * distribution when not linked into another program.) | ||
22 | * | ||
23 | * This file is distributed in the hope that it will be useful, but | ||
24 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
26 | * General Public License for more details. | ||
27 | * | ||
28 | * You should have received a copy of the GNU General Public License | ||
29 | * along with this program; see the file COPYING. If not, write to | ||
30 | * the Free Software Foundation, 51 Franklin Street, Fifth Floor, | ||
31 | * Boston, MA 02110-1301, USA. | ||
32 | * | ||
33 | * As a special exception, if you link this library with files | ||
34 | * compiled with GCC to produce an executable, this does not cause | ||
35 | * the resulting executable to be covered by the GNU General Public License. | ||
36 | * This exception does not however invalidate any other reasons why | ||
37 | * the executable file might be covered by the GNU General Public License. | ||
38 | */ | ||
39 | |||
40 | .file "crtsavres.S" | ||
41 | .section ".text" | ||
42 | |||
43 | /* On PowerPC64 Linux, these functions are provided by the linker. */ | ||
44 | #ifndef __powerpc64__ | ||
45 | |||
46 | #define _GLOBAL(name) \ | ||
47 | .type name,@function; \ | ||
48 | .globl name; \ | ||
49 | name: | ||
50 | |||
51 | /* Routines for saving integer registers, called by the compiler. */ | ||
52 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
53 | /* function, just beyond the end of the integer save area. */ | ||
54 | |||
55 | _GLOBAL(_savegpr_14) | ||
56 | _GLOBAL(_save32gpr_14) | ||
57 | stw 14,-72(11) /* save gp registers */ | ||
58 | _GLOBAL(_savegpr_15) | ||
59 | _GLOBAL(_save32gpr_15) | ||
60 | stw 15,-68(11) | ||
61 | _GLOBAL(_savegpr_16) | ||
62 | _GLOBAL(_save32gpr_16) | ||
63 | stw 16,-64(11) | ||
64 | _GLOBAL(_savegpr_17) | ||
65 | _GLOBAL(_save32gpr_17) | ||
66 | stw 17,-60(11) | ||
67 | _GLOBAL(_savegpr_18) | ||
68 | _GLOBAL(_save32gpr_18) | ||
69 | stw 18,-56(11) | ||
70 | _GLOBAL(_savegpr_19) | ||
71 | _GLOBAL(_save32gpr_19) | ||
72 | stw 19,-52(11) | ||
73 | _GLOBAL(_savegpr_20) | ||
74 | _GLOBAL(_save32gpr_20) | ||
75 | stw 20,-48(11) | ||
76 | _GLOBAL(_savegpr_21) | ||
77 | _GLOBAL(_save32gpr_21) | ||
78 | stw 21,-44(11) | ||
79 | _GLOBAL(_savegpr_22) | ||
80 | _GLOBAL(_save32gpr_22) | ||
81 | stw 22,-40(11) | ||
82 | _GLOBAL(_savegpr_23) | ||
83 | _GLOBAL(_save32gpr_23) | ||
84 | stw 23,-36(11) | ||
85 | _GLOBAL(_savegpr_24) | ||
86 | _GLOBAL(_save32gpr_24) | ||
87 | stw 24,-32(11) | ||
88 | _GLOBAL(_savegpr_25) | ||
89 | _GLOBAL(_save32gpr_25) | ||
90 | stw 25,-28(11) | ||
91 | _GLOBAL(_savegpr_26) | ||
92 | _GLOBAL(_save32gpr_26) | ||
93 | stw 26,-24(11) | ||
94 | _GLOBAL(_savegpr_27) | ||
95 | _GLOBAL(_save32gpr_27) | ||
96 | stw 27,-20(11) | ||
97 | _GLOBAL(_savegpr_28) | ||
98 | _GLOBAL(_save32gpr_28) | ||
99 | stw 28,-16(11) | ||
100 | _GLOBAL(_savegpr_29) | ||
101 | _GLOBAL(_save32gpr_29) | ||
102 | stw 29,-12(11) | ||
103 | _GLOBAL(_savegpr_30) | ||
104 | _GLOBAL(_save32gpr_30) | ||
105 | stw 30,-8(11) | ||
106 | _GLOBAL(_savegpr_31) | ||
107 | _GLOBAL(_save32gpr_31) | ||
108 | stw 31,-4(11) | ||
109 | blr | ||
110 | |||
111 | /* Routines for restoring integer registers, called by the compiler. */ | ||
112 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
113 | /* function, just beyond the end of the integer restore area. */ | ||
114 | |||
115 | _GLOBAL(_restgpr_14) | ||
116 | _GLOBAL(_rest32gpr_14) | ||
117 | lwz 14,-72(11) /* restore gp registers */ | ||
118 | _GLOBAL(_restgpr_15) | ||
119 | _GLOBAL(_rest32gpr_15) | ||
120 | lwz 15,-68(11) | ||
121 | _GLOBAL(_restgpr_16) | ||
122 | _GLOBAL(_rest32gpr_16) | ||
123 | lwz 16,-64(11) | ||
124 | _GLOBAL(_restgpr_17) | ||
125 | _GLOBAL(_rest32gpr_17) | ||
126 | lwz 17,-60(11) | ||
127 | _GLOBAL(_restgpr_18) | ||
128 | _GLOBAL(_rest32gpr_18) | ||
129 | lwz 18,-56(11) | ||
130 | _GLOBAL(_restgpr_19) | ||
131 | _GLOBAL(_rest32gpr_19) | ||
132 | lwz 19,-52(11) | ||
133 | _GLOBAL(_restgpr_20) | ||
134 | _GLOBAL(_rest32gpr_20) | ||
135 | lwz 20,-48(11) | ||
136 | _GLOBAL(_restgpr_21) | ||
137 | _GLOBAL(_rest32gpr_21) | ||
138 | lwz 21,-44(11) | ||
139 | _GLOBAL(_restgpr_22) | ||
140 | _GLOBAL(_rest32gpr_22) | ||
141 | lwz 22,-40(11) | ||
142 | _GLOBAL(_restgpr_23) | ||
143 | _GLOBAL(_rest32gpr_23) | ||
144 | lwz 23,-36(11) | ||
145 | _GLOBAL(_restgpr_24) | ||
146 | _GLOBAL(_rest32gpr_24) | ||
147 | lwz 24,-32(11) | ||
148 | _GLOBAL(_restgpr_25) | ||
149 | _GLOBAL(_rest32gpr_25) | ||
150 | lwz 25,-28(11) | ||
151 | _GLOBAL(_restgpr_26) | ||
152 | _GLOBAL(_rest32gpr_26) | ||
153 | lwz 26,-24(11) | ||
154 | _GLOBAL(_restgpr_27) | ||
155 | _GLOBAL(_rest32gpr_27) | ||
156 | lwz 27,-20(11) | ||
157 | _GLOBAL(_restgpr_28) | ||
158 | _GLOBAL(_rest32gpr_28) | ||
159 | lwz 28,-16(11) | ||
160 | _GLOBAL(_restgpr_29) | ||
161 | _GLOBAL(_rest32gpr_29) | ||
162 | lwz 29,-12(11) | ||
163 | _GLOBAL(_restgpr_30) | ||
164 | _GLOBAL(_rest32gpr_30) | ||
165 | lwz 30,-8(11) | ||
166 | _GLOBAL(_restgpr_31) | ||
167 | _GLOBAL(_rest32gpr_31) | ||
168 | lwz 31,-4(11) | ||
169 | blr | ||
170 | |||
171 | /* Routines for restoring integer registers, called by the compiler. */ | ||
172 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
173 | /* function, just beyond the end of the integer restore area. */ | ||
174 | |||
175 | _GLOBAL(_restgpr_14_x) | ||
176 | _GLOBAL(_rest32gpr_14_x) | ||
177 | lwz 14,-72(11) /* restore gp registers */ | ||
178 | _GLOBAL(_restgpr_15_x) | ||
179 | _GLOBAL(_rest32gpr_15_x) | ||
180 | lwz 15,-68(11) | ||
181 | _GLOBAL(_restgpr_16_x) | ||
182 | _GLOBAL(_rest32gpr_16_x) | ||
183 | lwz 16,-64(11) | ||
184 | _GLOBAL(_restgpr_17_x) | ||
185 | _GLOBAL(_rest32gpr_17_x) | ||
186 | lwz 17,-60(11) | ||
187 | _GLOBAL(_restgpr_18_x) | ||
188 | _GLOBAL(_rest32gpr_18_x) | ||
189 | lwz 18,-56(11) | ||
190 | _GLOBAL(_restgpr_19_x) | ||
191 | _GLOBAL(_rest32gpr_19_x) | ||
192 | lwz 19,-52(11) | ||
193 | _GLOBAL(_restgpr_20_x) | ||
194 | _GLOBAL(_rest32gpr_20_x) | ||
195 | lwz 20,-48(11) | ||
196 | _GLOBAL(_restgpr_21_x) | ||
197 | _GLOBAL(_rest32gpr_21_x) | ||
198 | lwz 21,-44(11) | ||
199 | _GLOBAL(_restgpr_22_x) | ||
200 | _GLOBAL(_rest32gpr_22_x) | ||
201 | lwz 22,-40(11) | ||
202 | _GLOBAL(_restgpr_23_x) | ||
203 | _GLOBAL(_rest32gpr_23_x) | ||
204 | lwz 23,-36(11) | ||
205 | _GLOBAL(_restgpr_24_x) | ||
206 | _GLOBAL(_rest32gpr_24_x) | ||
207 | lwz 24,-32(11) | ||
208 | _GLOBAL(_restgpr_25_x) | ||
209 | _GLOBAL(_rest32gpr_25_x) | ||
210 | lwz 25,-28(11) | ||
211 | _GLOBAL(_restgpr_26_x) | ||
212 | _GLOBAL(_rest32gpr_26_x) | ||
213 | lwz 26,-24(11) | ||
214 | _GLOBAL(_restgpr_27_x) | ||
215 | _GLOBAL(_rest32gpr_27_x) | ||
216 | lwz 27,-20(11) | ||
217 | _GLOBAL(_restgpr_28_x) | ||
218 | _GLOBAL(_rest32gpr_28_x) | ||
219 | lwz 28,-16(11) | ||
220 | _GLOBAL(_restgpr_29_x) | ||
221 | _GLOBAL(_rest32gpr_29_x) | ||
222 | lwz 29,-12(11) | ||
223 | _GLOBAL(_restgpr_30_x) | ||
224 | _GLOBAL(_rest32gpr_30_x) | ||
225 | lwz 30,-8(11) | ||
226 | _GLOBAL(_restgpr_31_x) | ||
227 | _GLOBAL(_rest32gpr_31_x) | ||
228 | lwz 0,4(11) | ||
229 | lwz 31,-4(11) | ||
230 | mtlr 0 | ||
231 | mr 1,11 | ||
232 | blr | ||
233 | #endif | ||
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index 1e7802cc31ae..fea592574004 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
@@ -271,27 +271,35 @@ | |||
271 | dma@82a8 { | 271 | dma@82a8 { |
272 | #address-cells = <1>; | 272 | #address-cells = <1>; |
273 | #size-cells = <1>; | 273 | #size-cells = <1>; |
274 | compatible = "fsl,mpc8349-dma"; | 274 | compatible = "fsl,mpc8377-dma", "fsl,elo-dma"; |
275 | reg = <0x82a8 4>; | 275 | reg = <0x82a8 4>; |
276 | ranges = <0 0x8100 0x1a8>; | 276 | ranges = <0 0x8100 0x1a8>; |
277 | interrupt-parent = <&ipic>; | 277 | interrupt-parent = <&ipic>; |
278 | interrupts = <0x47 8>; | 278 | interrupts = <0x47 8>; |
279 | cell-index = <0>; | 279 | cell-index = <0>; |
280 | dma-channel@0 { | 280 | dma-channel@0 { |
281 | compatible = "fsl,mpc8349-dma-channel"; | 281 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
282 | reg = <0 0x80>; | 282 | reg = <0 0x80>; |
283 | interrupt-parent = <&ipic>; | ||
284 | interrupts = <0x47 8>; | ||
283 | }; | 285 | }; |
284 | dma-channel@80 { | 286 | dma-channel@80 { |
285 | compatible = "fsl,mpc8349-dma-channel"; | 287 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
286 | reg = <0x80 0x80>; | 288 | reg = <0x80 0x80>; |
289 | interrupt-parent = <&ipic>; | ||
290 | interrupts = <0x47 8>; | ||
287 | }; | 291 | }; |
288 | dma-channel@100 { | 292 | dma-channel@100 { |
289 | compatible = "fsl,mpc8349-dma-channel"; | 293 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
290 | reg = <0x100 0x80>; | 294 | reg = <0x100 0x80>; |
295 | interrupt-parent = <&ipic>; | ||
296 | interrupts = <0x47 8>; | ||
291 | }; | 297 | }; |
292 | dma-channel@180 { | 298 | dma-channel@180 { |
293 | compatible = "fsl,mpc8349-dma-channel"; | 299 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
294 | reg = <0x180 0x28>; | 300 | reg = <0x180 0x28>; |
301 | interrupt-parent = <&ipic>; | ||
302 | interrupts = <0x47 8>; | ||
295 | }; | 303 | }; |
296 | }; | 304 | }; |
297 | 305 | ||
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 5bc09ad016f5..f3083c779b66 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
@@ -164,12 +164,6 @@ | |||
164 | reg = <0x2>; | 164 | reg = <0x2>; |
165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
166 | }; | 166 | }; |
167 | phy3: ethernet-phy@3 { | ||
168 | interrupt-parent = <&ipic>; | ||
169 | interrupts = <18 0x8>; | ||
170 | reg = <0x3>; | ||
171 | device_type = "ethernet-phy"; | ||
172 | }; | ||
173 | }; | 167 | }; |
174 | 168 | ||
175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
@@ -195,7 +189,7 @@ | |||
195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
199 | }; | 193 | }; |
200 | 194 | ||
201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 711f9a30f9ab..0e872a60e091 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
@@ -164,12 +164,6 @@ | |||
164 | reg = <0x2>; | 164 | reg = <0x2>; |
165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
166 | }; | 166 | }; |
167 | phy3: ethernet-phy@3 { | ||
168 | interrupt-parent = <&ipic>; | ||
169 | interrupts = <18 0x8>; | ||
170 | reg = <0x3>; | ||
171 | device_type = "ethernet-phy"; | ||
172 | }; | ||
173 | }; | 167 | }; |
174 | 168 | ||
175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
@@ -195,7 +189,7 @@ | |||
195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
199 | }; | 193 | }; |
200 | 194 | ||
201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index c11ceb7d3299..1eb8defaff6f 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
@@ -164,12 +164,6 @@ | |||
164 | reg = <0x2>; | 164 | reg = <0x2>; |
165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
166 | }; | 166 | }; |
167 | phy3: ethernet-phy@3 { | ||
168 | interrupt-parent = <&ipic>; | ||
169 | interrupts = <18 0x8>; | ||
170 | reg = <0x3>; | ||
171 | device_type = "ethernet-phy"; | ||
172 | }; | ||
173 | }; | 167 | }; |
174 | 168 | ||
175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
@@ -195,7 +189,7 @@ | |||
195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
199 | }; | 193 | }; |
200 | 194 | ||
201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index fa298a8c81cc..4811b8107415 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -409,7 +409,7 @@ | |||
409 | interrupts = <26 2>; | 409 | interrupts = <26 2>; |
410 | bus-range = <0 255>; | 410 | bus-range = <0 255>; |
411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 | 411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 |
412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>; | 412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>; |
413 | clock-frequency = <33333333>; | 413 | clock-frequency = <33333333>; |
414 | #interrupt-cells = <1>; | 414 | #interrupt-cells = <1>; |
415 | #size-cells = <2>; | 415 | #size-cells = <2>; |
@@ -428,7 +428,7 @@ | |||
428 | 428 | ||
429 | 0x1000000 0x0 0x0 | 429 | 0x1000000 0x0 0x0 |
430 | 0x1000000 0x0 0x0 | 430 | 0x1000000 0x0 0x0 |
431 | 0x0 0x8000000>; | 431 | 0x0 0x100000>; |
432 | }; | 432 | }; |
433 | }; | 433 | }; |
434 | }; | 434 | }; |
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 08a780d89807..fa9b6bbeb5af 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
@@ -251,14 +251,14 @@ | |||
251 | dma@c300 { | 251 | dma@c300 { |
252 | #address-cells = <1>; | 252 | #address-cells = <1>; |
253 | #size-cells = <1>; | 253 | #size-cells = <1>; |
254 | compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma"; | 254 | compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma"; |
255 | cell-index = <1>; | 255 | cell-index = <1>; |
256 | reg = <0xc300 0x4>; /* DMA general status register */ | 256 | reg = <0xc300 0x4>; /* DMA general status register */ |
257 | ranges = <0x0 0xc100 0x200>; | 257 | ranges = <0x0 0xc100 0x200>; |
258 | 258 | ||
259 | dma-channel@0 { | 259 | dma-channel@0 { |
260 | compatible = "fsl,mpc8610-dma-channel", | 260 | compatible = "fsl,mpc8610-dma-channel", |
261 | "fsl,mpc8540-dma-channel"; | 261 | "fsl,eloplus-dma-channel"; |
262 | cell-index = <0>; | 262 | cell-index = <0>; |
263 | reg = <0x0 0x80>; | 263 | reg = <0x0 0x80>; |
264 | interrupt-parent = <&mpic>; | 264 | interrupt-parent = <&mpic>; |
@@ -266,7 +266,7 @@ | |||
266 | }; | 266 | }; |
267 | dma-channel@1 { | 267 | dma-channel@1 { |
268 | compatible = "fsl,mpc8610-dma-channel", | 268 | compatible = "fsl,mpc8610-dma-channel", |
269 | "fsl,mpc8540-dma-channel"; | 269 | "fsl,eloplus-dma-channel"; |
270 | cell-index = <1>; | 270 | cell-index = <1>; |
271 | reg = <0x80 0x80>; | 271 | reg = <0x80 0x80>; |
272 | interrupt-parent = <&mpic>; | 272 | interrupt-parent = <&mpic>; |
@@ -274,7 +274,7 @@ | |||
274 | }; | 274 | }; |
275 | dma-channel@2 { | 275 | dma-channel@2 { |
276 | compatible = "fsl,mpc8610-dma-channel", | 276 | compatible = "fsl,mpc8610-dma-channel", |
277 | "fsl,mpc8540-dma-channel"; | 277 | "fsl,eloplus-dma-channel"; |
278 | cell-index = <2>; | 278 | cell-index = <2>; |
279 | reg = <0x100 0x80>; | 279 | reg = <0x100 0x80>; |
280 | interrupt-parent = <&mpic>; | 280 | interrupt-parent = <&mpic>; |
@@ -282,7 +282,7 @@ | |||
282 | }; | 282 | }; |
283 | dma-channel@3 { | 283 | dma-channel@3 { |
284 | compatible = "fsl,mpc8610-dma-channel", | 284 | compatible = "fsl,mpc8610-dma-channel", |
285 | "fsl,mpc8540-dma-channel"; | 285 | "fsl,eloplus-dma-channel"; |
286 | cell-index = <3>; | 286 | cell-index = <3>; |
287 | reg = <0x180 0x80>; | 287 | reg = <0x180 0x80>; |
288 | interrupt-parent = <&mpic>; | 288 | interrupt-parent = <&mpic>; |
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 7d18440e398f..5428f9f5ed85 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Fri Apr 11 11:10:09 2008 | 4 | # Mon Jun 9 08:52:21 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
@@ -196,7 +201,6 @@ CONFIG_PREEMPT_NONE=y | |||
196 | # CONFIG_PREEMPT is not set | 201 | # CONFIG_PREEMPT is not set |
197 | CONFIG_BINFMT_ELF=y | 202 | CONFIG_BINFMT_ELF=y |
198 | # CONFIG_BINFMT_MISC is not set | 203 | # CONFIG_BINFMT_MISC is not set |
199 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
200 | # CONFIG_IOMMU_HELPER is not set | 204 | # CONFIG_IOMMU_HELPER is not set |
201 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
202 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -211,11 +215,13 @@ CONFIG_FLATMEM=y | |||
211 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
212 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
215 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
216 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
217 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
218 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
219 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
220 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
221 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
@@ -239,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
239 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
240 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
241 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
248 | # CONFIG_HAS_RAPIDIO is not set | ||
242 | 249 | ||
243 | # | 250 | # |
244 | # Advanced setup | 251 | # Advanced setup |
@@ -248,11 +255,11 @@ CONFIG_PCI_LEGACY=y | |||
248 | # | 255 | # |
249 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
250 | # | 257 | # |
251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
252 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
253 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
261 | CONFIG_PHYSICAL_START=0x00000000 | ||
254 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
255 | CONFIG_BOOT_LOAD=0x00800000 | ||
256 | 263 | ||
257 | # | 264 | # |
258 | # Networking | 265 | # Networking |
@@ -300,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 307 | CONFIG_DEFAULT_TCP_CONG="cubic" |
301 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
302 | # CONFIG_IPV6 is not set | 309 | # CONFIG_IPV6 is not set |
303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
304 | # CONFIG_INET6_TUNNEL is not set | ||
305 | # CONFIG_NETWORK_SECMARK is not set | 310 | # CONFIG_NETWORK_SECMARK is not set |
306 | # CONFIG_NETFILTER is not set | 311 | # CONFIG_NETFILTER is not set |
307 | # CONFIG_IP_DCCP is not set | 312 | # CONFIG_IP_DCCP is not set |
@@ -362,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y | |||
362 | # CONFIG_MTD_REDBOOT_PARTS is not set | 367 | # CONFIG_MTD_REDBOOT_PARTS is not set |
363 | # CONFIG_MTD_CMDLINE_PARTS is not set | 368 | # CONFIG_MTD_CMDLINE_PARTS is not set |
364 | CONFIG_MTD_OF_PARTS=y | 369 | CONFIG_MTD_OF_PARTS=y |
370 | # CONFIG_MTD_AR7_PARTS is not set | ||
365 | 371 | ||
366 | # | 372 | # |
367 | # User Modules And Translation Layers | 373 | # User Modules And Translation Layers |
@@ -445,6 +451,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
445 | # | 451 | # |
446 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
447 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
454 | CONFIG_OF_I2C=y | ||
448 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
449 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
450 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
@@ -641,7 +648,6 @@ CONFIG_NETDEV_1000=y | |||
641 | # CONFIG_SIS190 is not set | 648 | # CONFIG_SIS190 is not set |
642 | # CONFIG_SKGE is not set | 649 | # CONFIG_SKGE is not set |
643 | # CONFIG_SKY2 is not set | 650 | # CONFIG_SKY2 is not set |
644 | # CONFIG_SK98LIN is not set | ||
645 | # CONFIG_VIA_VELOCITY is not set | 651 | # CONFIG_VIA_VELOCITY is not set |
646 | # CONFIG_TIGON3 is not set | 652 | # CONFIG_TIGON3 is not set |
647 | # CONFIG_BNX2 is not set | 653 | # CONFIG_BNX2 is not set |
@@ -661,6 +667,7 @@ CONFIG_NETDEV_10000=y | |||
661 | # CONFIG_MLX4_CORE is not set | 667 | # CONFIG_MLX4_CORE is not set |
662 | # CONFIG_TEHUTI is not set | 668 | # CONFIG_TEHUTI is not set |
663 | # CONFIG_BNX2X is not set | 669 | # CONFIG_BNX2X is not set |
670 | # CONFIG_SFC is not set | ||
664 | # CONFIG_TR is not set | 671 | # CONFIG_TR is not set |
665 | 672 | ||
666 | # | 673 | # |
@@ -668,6 +675,7 @@ CONFIG_NETDEV_10000=y | |||
668 | # | 675 | # |
669 | # CONFIG_WLAN_PRE80211 is not set | 676 | # CONFIG_WLAN_PRE80211 is not set |
670 | # CONFIG_WLAN_80211 is not set | 677 | # CONFIG_WLAN_80211 is not set |
678 | # CONFIG_IWLWIFI_LEDS is not set | ||
671 | 679 | ||
672 | # | 680 | # |
673 | # USB Network Adapters | 681 | # USB Network Adapters |
@@ -724,6 +732,7 @@ CONFIG_INPUT=y | |||
724 | # Character devices | 732 | # Character devices |
725 | # | 733 | # |
726 | # CONFIG_VT is not set | 734 | # CONFIG_VT is not set |
735 | CONFIG_DEVKMEM=y | ||
727 | # CONFIG_SERIAL_NONSTANDARD is not set | 736 | # CONFIG_SERIAL_NONSTANDARD is not set |
728 | # CONFIG_NOZOMI is not set | 737 | # CONFIG_NOZOMI is not set |
729 | 738 | ||
@@ -751,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
751 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
752 | CONFIG_HW_RANDOM=y | 761 | CONFIG_HW_RANDOM=y |
753 | # CONFIG_NVRAM is not set | 762 | # CONFIG_NVRAM is not set |
754 | # CONFIG_GEN_RTC is not set | ||
755 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
756 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
757 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
@@ -762,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
762 | CONFIG_I2C_CHARDEV=y | 770 | CONFIG_I2C_CHARDEV=y |
763 | 771 | ||
764 | # | 772 | # |
765 | # I2C Algorithms | ||
766 | # | ||
767 | # CONFIG_I2C_ALGOBIT is not set | ||
768 | # CONFIG_I2C_ALGOPCF is not set | ||
769 | # CONFIG_I2C_ALGOPCA is not set | ||
770 | |||
771 | # | ||
772 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
773 | # | 774 | # |
774 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
@@ -795,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
795 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
796 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
797 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
798 | 800 | ||
799 | # | 801 | # |
800 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
@@ -804,17 +806,12 @@ CONFIG_I2C_MPC=y | |||
804 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
805 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
806 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
807 | # CONFIG_TPS65010 is not set | ||
808 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
809 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
810 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
811 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
812 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
813 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
814 | |||
815 | # | ||
816 | # SPI support | ||
817 | # | ||
818 | CONFIG_SPI=y | 815 | CONFIG_SPI=y |
819 | # CONFIG_SPI_DEBUG is not set | 816 | # CONFIG_SPI_DEBUG is not set |
820 | CONFIG_SPI_MASTER=y | 817 | CONFIG_SPI_MASTER=y |
@@ -919,12 +916,22 @@ CONFIG_SSB_POSSIBLE=y | |||
919 | # Multifunction device drivers | 916 | # Multifunction device drivers |
920 | # | 917 | # |
921 | # CONFIG_MFD_SM501 is not set | 918 | # CONFIG_MFD_SM501 is not set |
919 | # CONFIG_HTC_PASIC3 is not set | ||
922 | 920 | ||
923 | # | 921 | # |
924 | # Multimedia devices | 922 | # Multimedia devices |
925 | # | 923 | # |
924 | |||
925 | # | ||
926 | # Multimedia core support | ||
927 | # | ||
926 | # CONFIG_VIDEO_DEV is not set | 928 | # CONFIG_VIDEO_DEV is not set |
927 | # CONFIG_DVB_CORE is not set | 929 | # CONFIG_DVB_CORE is not set |
930 | # CONFIG_VIDEO_MEDIA is not set | ||
931 | |||
932 | # | ||
933 | # Multimedia drivers | ||
934 | # | ||
928 | CONFIG_DAB=y | 935 | CONFIG_DAB=y |
929 | # CONFIG_USB_DABUSB is not set | 936 | # CONFIG_USB_DABUSB is not set |
930 | 937 | ||
@@ -977,16 +984,20 @@ CONFIG_USB_DEVICEFS=y | |||
977 | CONFIG_USB_DEVICE_CLASS=y | 984 | CONFIG_USB_DEVICE_CLASS=y |
978 | # CONFIG_USB_DYNAMIC_MINORS is not set | 985 | # CONFIG_USB_DYNAMIC_MINORS is not set |
979 | # CONFIG_USB_OTG is not set | 986 | # CONFIG_USB_OTG is not set |
987 | # CONFIG_USB_OTG_WHITELIST is not set | ||
988 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
980 | 989 | ||
981 | # | 990 | # |
982 | # USB Host Controller Drivers | 991 | # USB Host Controller Drivers |
983 | # | 992 | # |
993 | # CONFIG_USB_C67X00_HCD is not set | ||
984 | CONFIG_USB_EHCI_HCD=y | 994 | CONFIG_USB_EHCI_HCD=y |
985 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 995 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
986 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 996 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
987 | CONFIG_USB_EHCI_FSL=y | 997 | CONFIG_USB_EHCI_FSL=y |
988 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 998 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
989 | # CONFIG_USB_ISP116X_HCD is not set | 999 | # CONFIG_USB_ISP116X_HCD is not set |
1000 | # CONFIG_USB_ISP1760_HCD is not set | ||
990 | CONFIG_USB_OHCI_HCD=y | 1001 | CONFIG_USB_OHCI_HCD=y |
991 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1002 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
992 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1003 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1004,6 +1015,7 @@ CONFIG_USB_UHCI_HCD=y | |||
1004 | # | 1015 | # |
1005 | # CONFIG_USB_ACM is not set | 1016 | # CONFIG_USB_ACM is not set |
1006 | # CONFIG_USB_PRINTER is not set | 1017 | # CONFIG_USB_PRINTER is not set |
1018 | # CONFIG_USB_WDM is not set | ||
1007 | 1019 | ||
1008 | # | 1020 | # |
1009 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1021 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1023,7 +1035,9 @@ CONFIG_USB_STORAGE=y | |||
1023 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1035 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1024 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1036 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1025 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1037 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1038 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1026 | # CONFIG_USB_STORAGE_KARMA is not set | 1039 | # CONFIG_USB_STORAGE_KARMA is not set |
1040 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1027 | # CONFIG_USB_LIBUSUAL is not set | 1041 | # CONFIG_USB_LIBUSUAL is not set |
1028 | 1042 | ||
1029 | # | 1043 | # |
@@ -1061,6 +1075,7 @@ CONFIG_USB_MON=y | |||
1061 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1075 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1062 | # CONFIG_USB_IOWARRIOR is not set | 1076 | # CONFIG_USB_IOWARRIOR is not set |
1063 | # CONFIG_USB_TEST is not set | 1077 | # CONFIG_USB_TEST is not set |
1078 | # CONFIG_USB_ISIGHTFW is not set | ||
1064 | CONFIG_USB_GADGET=y | 1079 | CONFIG_USB_GADGET=y |
1065 | # CONFIG_USB_GADGET_DEBUG is not set | 1080 | # CONFIG_USB_GADGET_DEBUG is not set |
1066 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1081 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
@@ -1072,6 +1087,7 @@ CONFIG_USB_GADGET_NET2280=y | |||
1072 | CONFIG_USB_NET2280=y | 1087 | CONFIG_USB_NET2280=y |
1073 | # CONFIG_USB_GADGET_PXA2XX is not set | 1088 | # CONFIG_USB_GADGET_PXA2XX is not set |
1074 | # CONFIG_USB_GADGET_M66592 is not set | 1089 | # CONFIG_USB_GADGET_M66592 is not set |
1090 | # CONFIG_USB_GADGET_PXA27X is not set | ||
1075 | # CONFIG_USB_GADGET_GOKU is not set | 1091 | # CONFIG_USB_GADGET_GOKU is not set |
1076 | # CONFIG_USB_GADGET_LH7A40X is not set | 1092 | # CONFIG_USB_GADGET_LH7A40X is not set |
1077 | # CONFIG_USB_GADGET_OMAP is not set | 1093 | # CONFIG_USB_GADGET_OMAP is not set |
@@ -1090,6 +1106,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
1090 | # CONFIG_MMC is not set | 1106 | # CONFIG_MMC is not set |
1091 | # CONFIG_MEMSTICK is not set | 1107 | # CONFIG_MEMSTICK is not set |
1092 | # CONFIG_NEW_LEDS is not set | 1108 | # CONFIG_NEW_LEDS is not set |
1109 | # CONFIG_ACCESSIBILITY is not set | ||
1093 | # CONFIG_INFINIBAND is not set | 1110 | # CONFIG_INFINIBAND is not set |
1094 | # CONFIG_EDAC is not set | 1111 | # CONFIG_EDAC is not set |
1095 | CONFIG_RTC_LIB=y | 1112 | CONFIG_RTC_LIB=y |
@@ -1144,11 +1161,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
1144 | # | 1161 | # |
1145 | # on-CPU RTC drivers | 1162 | # on-CPU RTC drivers |
1146 | # | 1163 | # |
1164 | # CONFIG_RTC_DRV_PPC is not set | ||
1147 | # CONFIG_DMADEVICES is not set | 1165 | # CONFIG_DMADEVICES is not set |
1148 | |||
1149 | # | ||
1150 | # Userspace I/O | ||
1151 | # | ||
1152 | # CONFIG_UIO is not set | 1166 | # CONFIG_UIO is not set |
1153 | 1167 | ||
1154 | # | 1168 | # |
@@ -1168,7 +1182,6 @@ CONFIG_FS_MBCACHE=y | |||
1168 | # CONFIG_JFS_FS is not set | 1182 | # CONFIG_JFS_FS is not set |
1169 | # CONFIG_FS_POSIX_ACL is not set | 1183 | # CONFIG_FS_POSIX_ACL is not set |
1170 | # CONFIG_XFS_FS is not set | 1184 | # CONFIG_XFS_FS is not set |
1171 | # CONFIG_GFS2_FS is not set | ||
1172 | # CONFIG_OCFS2_FS is not set | 1185 | # CONFIG_OCFS2_FS is not set |
1173 | CONFIG_DNOTIFY=y | 1186 | CONFIG_DNOTIFY=y |
1174 | CONFIG_INOTIFY=y | 1187 | CONFIG_INOTIFY=y |
@@ -1237,7 +1250,6 @@ CONFIG_NFS_FS=y | |||
1237 | CONFIG_NFS_V3=y | 1250 | CONFIG_NFS_V3=y |
1238 | # CONFIG_NFS_V3_ACL is not set | 1251 | # CONFIG_NFS_V3_ACL is not set |
1239 | CONFIG_NFS_V4=y | 1252 | CONFIG_NFS_V4=y |
1240 | # CONFIG_NFS_DIRECTIO is not set | ||
1241 | # CONFIG_NFSD is not set | 1253 | # CONFIG_NFSD is not set |
1242 | CONFIG_ROOT_NFS=y | 1254 | CONFIG_ROOT_NFS=y |
1243 | CONFIG_LOCKD=y | 1255 | CONFIG_LOCKD=y |
@@ -1282,6 +1294,7 @@ CONFIG_MSDOS_PARTITION=y | |||
1282 | # Library routines | 1294 | # Library routines |
1283 | # | 1295 | # |
1284 | CONFIG_BITREVERSE=y | 1296 | CONFIG_BITREVERSE=y |
1297 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1285 | # CONFIG_CRC_CCITT is not set | 1298 | # CONFIG_CRC_CCITT is not set |
1286 | # CONFIG_CRC16 is not set | 1299 | # CONFIG_CRC16 is not set |
1287 | # CONFIG_CRC_ITU_T is not set | 1300 | # CONFIG_CRC_ITU_T is not set |
@@ -1302,6 +1315,7 @@ CONFIG_HAVE_LMB=y | |||
1302 | # CONFIG_PRINTK_TIME is not set | 1315 | # CONFIG_PRINTK_TIME is not set |
1303 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1316 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1304 | CONFIG_ENABLE_MUST_CHECK=y | 1317 | CONFIG_ENABLE_MUST_CHECK=y |
1318 | CONFIG_FRAME_WARN=1024 | ||
1305 | # CONFIG_MAGIC_SYSRQ is not set | 1319 | # CONFIG_MAGIC_SYSRQ is not set |
1306 | # CONFIG_UNUSED_SYMBOLS is not set | 1320 | # CONFIG_UNUSED_SYMBOLS is not set |
1307 | # CONFIG_DEBUG_FS is not set | 1321 | # CONFIG_DEBUG_FS is not set |
@@ -1312,6 +1326,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1312 | CONFIG_SCHED_DEBUG=y | 1326 | CONFIG_SCHED_DEBUG=y |
1313 | # CONFIG_SCHEDSTATS is not set | 1327 | # CONFIG_SCHEDSTATS is not set |
1314 | # CONFIG_TIMER_STATS is not set | 1328 | # CONFIG_TIMER_STATS is not set |
1329 | # CONFIG_DEBUG_OBJECTS is not set | ||
1315 | # CONFIG_SLUB_DEBUG_ON is not set | 1330 | # CONFIG_SLUB_DEBUG_ON is not set |
1316 | # CONFIG_SLUB_STATS is not set | 1331 | # CONFIG_SLUB_STATS is not set |
1317 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1332 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1324,6 +1339,7 @@ CONFIG_SCHED_DEBUG=y | |||
1324 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1339 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1325 | # CONFIG_DEBUG_INFO is not set | 1340 | # CONFIG_DEBUG_INFO is not set |
1326 | # CONFIG_DEBUG_VM is not set | 1341 | # CONFIG_DEBUG_VM is not set |
1342 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1327 | # CONFIG_DEBUG_LIST is not set | 1343 | # CONFIG_DEBUG_LIST is not set |
1328 | # CONFIG_DEBUG_SG is not set | 1344 | # CONFIG_DEBUG_SG is not set |
1329 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1345 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1335,6 +1351,7 @@ CONFIG_SCHED_DEBUG=y | |||
1335 | # CONFIG_DEBUG_STACK_USAGE is not set | 1351 | # CONFIG_DEBUG_STACK_USAGE is not set |
1336 | # CONFIG_DEBUG_PAGEALLOC is not set | 1352 | # CONFIG_DEBUG_PAGEALLOC is not set |
1337 | # CONFIG_DEBUGGER is not set | 1353 | # CONFIG_DEBUGGER is not set |
1354 | # CONFIG_IRQSTACKS is not set | ||
1338 | # CONFIG_BDI_SWITCH is not set | 1355 | # CONFIG_BDI_SWITCH is not set |
1339 | # CONFIG_PPC_EARLY_DEBUG is not set | 1356 | # CONFIG_PPC_EARLY_DEBUG is not set |
1340 | 1357 | ||
@@ -1345,51 +1362,81 @@ CONFIG_SCHED_DEBUG=y | |||
1345 | # CONFIG_SECURITY is not set | 1362 | # CONFIG_SECURITY is not set |
1346 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1363 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1347 | CONFIG_CRYPTO=y | 1364 | CONFIG_CRYPTO=y |
1365 | |||
1366 | # | ||
1367 | # Crypto core or helper | ||
1368 | # | ||
1348 | CONFIG_CRYPTO_ALGAPI=y | 1369 | CONFIG_CRYPTO_ALGAPI=y |
1349 | CONFIG_CRYPTO_BLKCIPHER=y | 1370 | CONFIG_CRYPTO_BLKCIPHER=y |
1350 | # CONFIG_CRYPTO_SEQIV is not set | ||
1351 | CONFIG_CRYPTO_MANAGER=y | 1371 | CONFIG_CRYPTO_MANAGER=y |
1372 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1373 | # CONFIG_CRYPTO_NULL is not set | ||
1374 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1375 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1376 | # CONFIG_CRYPTO_TEST is not set | ||
1377 | |||
1378 | # | ||
1379 | # Authenticated Encryption with Associated Data | ||
1380 | # | ||
1381 | # CONFIG_CRYPTO_CCM is not set | ||
1382 | # CONFIG_CRYPTO_GCM is not set | ||
1383 | # CONFIG_CRYPTO_SEQIV is not set | ||
1384 | |||
1385 | # | ||
1386 | # Block modes | ||
1387 | # | ||
1388 | CONFIG_CRYPTO_CBC=y | ||
1389 | # CONFIG_CRYPTO_CTR is not set | ||
1390 | # CONFIG_CRYPTO_CTS is not set | ||
1391 | # CONFIG_CRYPTO_ECB is not set | ||
1392 | # CONFIG_CRYPTO_LRW is not set | ||
1393 | CONFIG_CRYPTO_PCBC=m | ||
1394 | # CONFIG_CRYPTO_XTS is not set | ||
1395 | |||
1396 | # | ||
1397 | # Hash modes | ||
1398 | # | ||
1352 | # CONFIG_CRYPTO_HMAC is not set | 1399 | # CONFIG_CRYPTO_HMAC is not set |
1353 | # CONFIG_CRYPTO_XCBC is not set | 1400 | # CONFIG_CRYPTO_XCBC is not set |
1354 | # CONFIG_CRYPTO_NULL is not set | 1401 | |
1402 | # | ||
1403 | # Digest | ||
1404 | # | ||
1405 | # CONFIG_CRYPTO_CRC32C is not set | ||
1355 | # CONFIG_CRYPTO_MD4 is not set | 1406 | # CONFIG_CRYPTO_MD4 is not set |
1356 | CONFIG_CRYPTO_MD5=y | 1407 | CONFIG_CRYPTO_MD5=y |
1408 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1357 | # CONFIG_CRYPTO_SHA1 is not set | 1409 | # CONFIG_CRYPTO_SHA1 is not set |
1358 | # CONFIG_CRYPTO_SHA256 is not set | 1410 | # CONFIG_CRYPTO_SHA256 is not set |
1359 | # CONFIG_CRYPTO_SHA512 is not set | 1411 | # CONFIG_CRYPTO_SHA512 is not set |
1360 | # CONFIG_CRYPTO_WP512 is not set | ||
1361 | # CONFIG_CRYPTO_TGR192 is not set | 1412 | # CONFIG_CRYPTO_TGR192 is not set |
1362 | # CONFIG_CRYPTO_GF128MUL is not set | 1413 | # CONFIG_CRYPTO_WP512 is not set |
1363 | # CONFIG_CRYPTO_ECB is not set | 1414 | |
1364 | CONFIG_CRYPTO_CBC=y | 1415 | # |
1365 | CONFIG_CRYPTO_PCBC=m | 1416 | # Ciphers |
1366 | # CONFIG_CRYPTO_LRW is not set | 1417 | # |
1367 | # CONFIG_CRYPTO_XTS is not set | ||
1368 | # CONFIG_CRYPTO_CTR is not set | ||
1369 | # CONFIG_CRYPTO_GCM is not set | ||
1370 | # CONFIG_CRYPTO_CCM is not set | ||
1371 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1372 | CONFIG_CRYPTO_DES=y | ||
1373 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1374 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1375 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1376 | # CONFIG_CRYPTO_SERPENT is not set | ||
1377 | # CONFIG_CRYPTO_AES is not set | 1418 | # CONFIG_CRYPTO_AES is not set |
1419 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1420 | # CONFIG_CRYPTO_ARC4 is not set | ||
1421 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1422 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1378 | # CONFIG_CRYPTO_CAST5 is not set | 1423 | # CONFIG_CRYPTO_CAST5 is not set |
1379 | # CONFIG_CRYPTO_CAST6 is not set | 1424 | # CONFIG_CRYPTO_CAST6 is not set |
1380 | # CONFIG_CRYPTO_TEA is not set | 1425 | CONFIG_CRYPTO_DES=y |
1381 | # CONFIG_CRYPTO_ARC4 is not set | 1426 | # CONFIG_CRYPTO_FCRYPT is not set |
1382 | # CONFIG_CRYPTO_KHAZAD is not set | 1427 | # CONFIG_CRYPTO_KHAZAD is not set |
1383 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1384 | # CONFIG_CRYPTO_SEED is not set | ||
1385 | # CONFIG_CRYPTO_SALSA20 is not set | 1428 | # CONFIG_CRYPTO_SALSA20 is not set |
1429 | # CONFIG_CRYPTO_SEED is not set | ||
1430 | # CONFIG_CRYPTO_SERPENT is not set | ||
1431 | # CONFIG_CRYPTO_TEA is not set | ||
1432 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1433 | |||
1434 | # | ||
1435 | # Compression | ||
1436 | # | ||
1386 | # CONFIG_CRYPTO_DEFLATE is not set | 1437 | # CONFIG_CRYPTO_DEFLATE is not set |
1387 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1388 | # CONFIG_CRYPTO_CRC32C is not set | ||
1389 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1390 | # CONFIG_CRYPTO_TEST is not set | ||
1391 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1392 | # CONFIG_CRYPTO_LZO is not set | 1438 | # CONFIG_CRYPTO_LZO is not set |
1393 | CONFIG_CRYPTO_HW=y | 1439 | CONFIG_CRYPTO_HW=y |
1394 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1440 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1395 | # CONFIG_PPC_CLOCK is not set | 1441 | # CONFIG_PPC_CLOCK is not set |
1442 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index 1f57456dd81e..9bc3a03ae264 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:15 2008 | 4 | # Mon Jun 9 08:52:21 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
@@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
@@ -238,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
238 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
239 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
240 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
248 | # CONFIG_HAS_RAPIDIO is not set | ||
241 | 249 | ||
242 | # | 250 | # |
243 | # Advanced setup | 251 | # Advanced setup |
@@ -247,11 +255,11 @@ CONFIG_PCI_LEGACY=y | |||
247 | # | 255 | # |
248 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
249 | # | 257 | # |
250 | CONFIG_HIGHMEM_START=0xfe000000 | ||
251 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
252 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
261 | CONFIG_PHYSICAL_START=0x00000000 | ||
253 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
254 | CONFIG_BOOT_LOAD=0x00800000 | ||
255 | 263 | ||
256 | # | 264 | # |
257 | # Networking | 265 | # Networking |
@@ -299,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 307 | CONFIG_DEFAULT_TCP_CONG="cubic" |
300 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
301 | # CONFIG_IPV6 is not set | 309 | # CONFIG_IPV6 is not set |
302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
303 | # CONFIG_INET6_TUNNEL is not set | ||
304 | # CONFIG_NETWORK_SECMARK is not set | 310 | # CONFIG_NETWORK_SECMARK is not set |
305 | # CONFIG_NETFILTER is not set | 311 | # CONFIG_NETFILTER is not set |
306 | # CONFIG_IP_DCCP is not set | 312 | # CONFIG_IP_DCCP is not set |
@@ -361,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y | |||
361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 367 | # CONFIG_MTD_REDBOOT_PARTS is not set |
362 | # CONFIG_MTD_CMDLINE_PARTS is not set | 368 | # CONFIG_MTD_CMDLINE_PARTS is not set |
363 | # CONFIG_MTD_OF_PARTS is not set | 369 | # CONFIG_MTD_OF_PARTS is not set |
370 | # CONFIG_MTD_AR7_PARTS is not set | ||
364 | 371 | ||
365 | # | 372 | # |
366 | # User Modules And Translation Layers | 373 | # User Modules And Translation Layers |
@@ -444,6 +451,7 @@ CONFIG_MTD_NAND_IDS=y | |||
444 | # | 451 | # |
445 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
446 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
454 | CONFIG_OF_I2C=y | ||
447 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
448 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
449 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
@@ -549,7 +557,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
549 | # CONFIG_SCSI_SRP is not set | 557 | # CONFIG_SCSI_SRP is not set |
550 | CONFIG_ATA=y | 558 | CONFIG_ATA=y |
551 | # CONFIG_ATA_NONSTANDARD is not set | 559 | # CONFIG_ATA_NONSTANDARD is not set |
560 | CONFIG_SATA_PMP=y | ||
552 | # CONFIG_SATA_AHCI is not set | 561 | # CONFIG_SATA_AHCI is not set |
562 | # CONFIG_SATA_SIL24 is not set | ||
563 | CONFIG_SATA_FSL=y | ||
564 | CONFIG_ATA_SFF=y | ||
553 | # CONFIG_SATA_SVW is not set | 565 | # CONFIG_SATA_SVW is not set |
554 | # CONFIG_ATA_PIIX is not set | 566 | # CONFIG_ATA_PIIX is not set |
555 | # CONFIG_SATA_MV is not set | 567 | # CONFIG_SATA_MV is not set |
@@ -559,13 +571,11 @@ CONFIG_ATA=y | |||
559 | # CONFIG_SATA_PROMISE is not set | 571 | # CONFIG_SATA_PROMISE is not set |
560 | # CONFIG_SATA_SX4 is not set | 572 | # CONFIG_SATA_SX4 is not set |
561 | # CONFIG_SATA_SIL is not set | 573 | # CONFIG_SATA_SIL is not set |
562 | # CONFIG_SATA_SIL24 is not set | ||
563 | # CONFIG_SATA_SIS is not set | 574 | # CONFIG_SATA_SIS is not set |
564 | # CONFIG_SATA_ULI is not set | 575 | # CONFIG_SATA_ULI is not set |
565 | # CONFIG_SATA_VIA is not set | 576 | # CONFIG_SATA_VIA is not set |
566 | # CONFIG_SATA_VITESSE is not set | 577 | # CONFIG_SATA_VITESSE is not set |
567 | # CONFIG_SATA_INIC162X is not set | 578 | # CONFIG_SATA_INIC162X is not set |
568 | CONFIG_SATA_FSL=y | ||
569 | # CONFIG_PATA_ALI is not set | 579 | # CONFIG_PATA_ALI is not set |
570 | # CONFIG_PATA_AMD is not set | 580 | # CONFIG_PATA_AMD is not set |
571 | # CONFIG_PATA_ARTOP is not set | 581 | # CONFIG_PATA_ARTOP is not set |
@@ -605,6 +615,7 @@ CONFIG_SATA_FSL=y | |||
605 | # CONFIG_PATA_VIA is not set | 615 | # CONFIG_PATA_VIA is not set |
606 | # CONFIG_PATA_WINBOND is not set | 616 | # CONFIG_PATA_WINBOND is not set |
607 | # CONFIG_PATA_PLATFORM is not set | 617 | # CONFIG_PATA_PLATFORM is not set |
618 | # CONFIG_PATA_SCH is not set | ||
608 | CONFIG_MD=y | 619 | CONFIG_MD=y |
609 | CONFIG_BLK_DEV_MD=y | 620 | CONFIG_BLK_DEV_MD=y |
610 | CONFIG_MD_LINEAR=y | 621 | CONFIG_MD_LINEAR=y |
@@ -698,7 +709,6 @@ CONFIG_NETDEV_1000=y | |||
698 | # CONFIG_SIS190 is not set | 709 | # CONFIG_SIS190 is not set |
699 | # CONFIG_SKGE is not set | 710 | # CONFIG_SKGE is not set |
700 | # CONFIG_SKY2 is not set | 711 | # CONFIG_SKY2 is not set |
701 | # CONFIG_SK98LIN is not set | ||
702 | # CONFIG_VIA_VELOCITY is not set | 712 | # CONFIG_VIA_VELOCITY is not set |
703 | # CONFIG_TIGON3 is not set | 713 | # CONFIG_TIGON3 is not set |
704 | # CONFIG_BNX2 is not set | 714 | # CONFIG_BNX2 is not set |
@@ -718,6 +728,7 @@ CONFIG_NETDEV_10000=y | |||
718 | # CONFIG_MLX4_CORE is not set | 728 | # CONFIG_MLX4_CORE is not set |
719 | # CONFIG_TEHUTI is not set | 729 | # CONFIG_TEHUTI is not set |
720 | # CONFIG_BNX2X is not set | 730 | # CONFIG_BNX2X is not set |
731 | # CONFIG_SFC is not set | ||
721 | # CONFIG_TR is not set | 732 | # CONFIG_TR is not set |
722 | 733 | ||
723 | # | 734 | # |
@@ -725,6 +736,7 @@ CONFIG_NETDEV_10000=y | |||
725 | # | 736 | # |
726 | # CONFIG_WLAN_PRE80211 is not set | 737 | # CONFIG_WLAN_PRE80211 is not set |
727 | # CONFIG_WLAN_80211 is not set | 738 | # CONFIG_WLAN_80211 is not set |
739 | # CONFIG_IWLWIFI_LEDS is not set | ||
728 | 740 | ||
729 | # | 741 | # |
730 | # USB Network Adapters | 742 | # USB Network Adapters |
@@ -781,6 +793,7 @@ CONFIG_INPUT=y | |||
781 | # Character devices | 793 | # Character devices |
782 | # | 794 | # |
783 | # CONFIG_VT is not set | 795 | # CONFIG_VT is not set |
796 | CONFIG_DEVKMEM=y | ||
784 | # CONFIG_SERIAL_NONSTANDARD is not set | 797 | # CONFIG_SERIAL_NONSTANDARD is not set |
785 | # CONFIG_NOZOMI is not set | 798 | # CONFIG_NOZOMI is not set |
786 | 799 | ||
@@ -808,7 +821,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
808 | # CONFIG_IPMI_HANDLER is not set | 821 | # CONFIG_IPMI_HANDLER is not set |
809 | CONFIG_HW_RANDOM=y | 822 | CONFIG_HW_RANDOM=y |
810 | # CONFIG_NVRAM is not set | 823 | # CONFIG_NVRAM is not set |
811 | # CONFIG_GEN_RTC is not set | ||
812 | # CONFIG_R3964 is not set | 824 | # CONFIG_R3964 is not set |
813 | # CONFIG_APPLICOM is not set | 825 | # CONFIG_APPLICOM is not set |
814 | # CONFIG_RAW_DRIVER is not set | 826 | # CONFIG_RAW_DRIVER is not set |
@@ -819,13 +831,6 @@ CONFIG_I2C_BOARDINFO=y | |||
819 | CONFIG_I2C_CHARDEV=y | 831 | CONFIG_I2C_CHARDEV=y |
820 | 832 | ||
821 | # | 833 | # |
822 | # I2C Algorithms | ||
823 | # | ||
824 | # CONFIG_I2C_ALGOBIT is not set | ||
825 | # CONFIG_I2C_ALGOPCF is not set | ||
826 | # CONFIG_I2C_ALGOPCA is not set | ||
827 | |||
828 | # | ||
829 | # I2C Hardware Bus support | 834 | # I2C Hardware Bus support |
830 | # | 835 | # |
831 | # CONFIG_I2C_ALI1535 is not set | 836 | # CONFIG_I2C_ALI1535 is not set |
@@ -852,6 +857,7 @@ CONFIG_I2C_MPC=y | |||
852 | # CONFIG_I2C_VIA is not set | 857 | # CONFIG_I2C_VIA is not set |
853 | # CONFIG_I2C_VIAPRO is not set | 858 | # CONFIG_I2C_VIAPRO is not set |
854 | # CONFIG_I2C_VOODOO3 is not set | 859 | # CONFIG_I2C_VOODOO3 is not set |
860 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
855 | 861 | ||
856 | # | 862 | # |
857 | # Miscellaneous I2C Chip support | 863 | # Miscellaneous I2C Chip support |
@@ -861,17 +867,12 @@ CONFIG_I2C_MPC=y | |||
861 | # CONFIG_SENSORS_PCF8574 is not set | 867 | # CONFIG_SENSORS_PCF8574 is not set |
862 | # CONFIG_PCF8575 is not set | 868 | # CONFIG_PCF8575 is not set |
863 | # CONFIG_SENSORS_PCF8591 is not set | 869 | # CONFIG_SENSORS_PCF8591 is not set |
864 | # CONFIG_TPS65010 is not set | ||
865 | # CONFIG_SENSORS_MAX6875 is not set | 870 | # CONFIG_SENSORS_MAX6875 is not set |
866 | # CONFIG_SENSORS_TSL2550 is not set | 871 | # CONFIG_SENSORS_TSL2550 is not set |
867 | # CONFIG_I2C_DEBUG_CORE is not set | 872 | # CONFIG_I2C_DEBUG_CORE is not set |
868 | # CONFIG_I2C_DEBUG_ALGO is not set | 873 | # CONFIG_I2C_DEBUG_ALGO is not set |
869 | # CONFIG_I2C_DEBUG_BUS is not set | 874 | # CONFIG_I2C_DEBUG_BUS is not set |
870 | # CONFIG_I2C_DEBUG_CHIP is not set | 875 | # CONFIG_I2C_DEBUG_CHIP is not set |
871 | |||
872 | # | ||
873 | # SPI support | ||
874 | # | ||
875 | CONFIG_SPI=y | 876 | CONFIG_SPI=y |
876 | # CONFIG_SPI_DEBUG is not set | 877 | # CONFIG_SPI_DEBUG is not set |
877 | CONFIG_SPI_MASTER=y | 878 | CONFIG_SPI_MASTER=y |
@@ -976,12 +977,22 @@ CONFIG_SSB_POSSIBLE=y | |||
976 | # Multifunction device drivers | 977 | # Multifunction device drivers |
977 | # | 978 | # |
978 | # CONFIG_MFD_SM501 is not set | 979 | # CONFIG_MFD_SM501 is not set |
980 | # CONFIG_HTC_PASIC3 is not set | ||
979 | 981 | ||
980 | # | 982 | # |
981 | # Multimedia devices | 983 | # Multimedia devices |
982 | # | 984 | # |
985 | |||
986 | # | ||
987 | # Multimedia core support | ||
988 | # | ||
983 | # CONFIG_VIDEO_DEV is not set | 989 | # CONFIG_VIDEO_DEV is not set |
984 | # CONFIG_DVB_CORE is not set | 990 | # CONFIG_DVB_CORE is not set |
991 | # CONFIG_VIDEO_MEDIA is not set | ||
992 | |||
993 | # | ||
994 | # Multimedia drivers | ||
995 | # | ||
985 | CONFIG_DAB=y | 996 | CONFIG_DAB=y |
986 | # CONFIG_USB_DABUSB is not set | 997 | # CONFIG_USB_DABUSB is not set |
987 | 998 | ||
@@ -1034,16 +1045,20 @@ CONFIG_USB_DEVICEFS=y | |||
1034 | CONFIG_USB_DEVICE_CLASS=y | 1045 | CONFIG_USB_DEVICE_CLASS=y |
1035 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1046 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1036 | # CONFIG_USB_OTG is not set | 1047 | # CONFIG_USB_OTG is not set |
1048 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1049 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1037 | 1050 | ||
1038 | # | 1051 | # |
1039 | # USB Host Controller Drivers | 1052 | # USB Host Controller Drivers |
1040 | # | 1053 | # |
1054 | # CONFIG_USB_C67X00_HCD is not set | ||
1041 | CONFIG_USB_EHCI_HCD=y | 1055 | CONFIG_USB_EHCI_HCD=y |
1042 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1056 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1043 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1057 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1044 | CONFIG_USB_EHCI_FSL=y | 1058 | CONFIG_USB_EHCI_FSL=y |
1045 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1059 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1046 | # CONFIG_USB_ISP116X_HCD is not set | 1060 | # CONFIG_USB_ISP116X_HCD is not set |
1061 | # CONFIG_USB_ISP1760_HCD is not set | ||
1047 | CONFIG_USB_OHCI_HCD=y | 1062 | CONFIG_USB_OHCI_HCD=y |
1048 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1063 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
1049 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1064 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1061,6 +1076,7 @@ CONFIG_USB_UHCI_HCD=y | |||
1061 | # | 1076 | # |
1062 | # CONFIG_USB_ACM is not set | 1077 | # CONFIG_USB_ACM is not set |
1063 | # CONFIG_USB_PRINTER is not set | 1078 | # CONFIG_USB_PRINTER is not set |
1079 | # CONFIG_USB_WDM is not set | ||
1064 | 1080 | ||
1065 | # | 1081 | # |
1066 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1082 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1080,7 +1096,9 @@ CONFIG_USB_STORAGE=y | |||
1080 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1096 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1081 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1097 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1082 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1098 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1099 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1083 | # CONFIG_USB_STORAGE_KARMA is not set | 1100 | # CONFIG_USB_STORAGE_KARMA is not set |
1101 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1084 | # CONFIG_USB_LIBUSUAL is not set | 1102 | # CONFIG_USB_LIBUSUAL is not set |
1085 | 1103 | ||
1086 | # | 1104 | # |
@@ -1118,6 +1136,7 @@ CONFIG_USB_MON=y | |||
1118 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1136 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1119 | # CONFIG_USB_IOWARRIOR is not set | 1137 | # CONFIG_USB_IOWARRIOR is not set |
1120 | # CONFIG_USB_TEST is not set | 1138 | # CONFIG_USB_TEST is not set |
1139 | # CONFIG_USB_ISIGHTFW is not set | ||
1121 | CONFIG_USB_GADGET=y | 1140 | CONFIG_USB_GADGET=y |
1122 | # CONFIG_USB_GADGET_DEBUG is not set | 1141 | # CONFIG_USB_GADGET_DEBUG is not set |
1123 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1142 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
@@ -1129,6 +1148,7 @@ CONFIG_USB_GADGET_NET2280=y | |||
1129 | CONFIG_USB_NET2280=y | 1148 | CONFIG_USB_NET2280=y |
1130 | # CONFIG_USB_GADGET_PXA2XX is not set | 1149 | # CONFIG_USB_GADGET_PXA2XX is not set |
1131 | # CONFIG_USB_GADGET_M66592 is not set | 1150 | # CONFIG_USB_GADGET_M66592 is not set |
1151 | # CONFIG_USB_GADGET_PXA27X is not set | ||
1132 | # CONFIG_USB_GADGET_GOKU is not set | 1152 | # CONFIG_USB_GADGET_GOKU is not set |
1133 | # CONFIG_USB_GADGET_LH7A40X is not set | 1153 | # CONFIG_USB_GADGET_LH7A40X is not set |
1134 | # CONFIG_USB_GADGET_OMAP is not set | 1154 | # CONFIG_USB_GADGET_OMAP is not set |
@@ -1147,6 +1167,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
1147 | # CONFIG_MMC is not set | 1167 | # CONFIG_MMC is not set |
1148 | # CONFIG_MEMSTICK is not set | 1168 | # CONFIG_MEMSTICK is not set |
1149 | # CONFIG_NEW_LEDS is not set | 1169 | # CONFIG_NEW_LEDS is not set |
1170 | # CONFIG_ACCESSIBILITY is not set | ||
1150 | # CONFIG_INFINIBAND is not set | 1171 | # CONFIG_INFINIBAND is not set |
1151 | # CONFIG_EDAC is not set | 1172 | # CONFIG_EDAC is not set |
1152 | CONFIG_RTC_LIB=y | 1173 | CONFIG_RTC_LIB=y |
@@ -1201,11 +1222,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
1201 | # | 1222 | # |
1202 | # on-CPU RTC drivers | 1223 | # on-CPU RTC drivers |
1203 | # | 1224 | # |
1225 | # CONFIG_RTC_DRV_PPC is not set | ||
1204 | # CONFIG_DMADEVICES is not set | 1226 | # CONFIG_DMADEVICES is not set |
1205 | |||
1206 | # | ||
1207 | # Userspace I/O | ||
1208 | # | ||
1209 | # CONFIG_UIO is not set | 1227 | # CONFIG_UIO is not set |
1210 | 1228 | ||
1211 | # | 1229 | # |
@@ -1225,7 +1243,6 @@ CONFIG_FS_MBCACHE=y | |||
1225 | # CONFIG_JFS_FS is not set | 1243 | # CONFIG_JFS_FS is not set |
1226 | # CONFIG_FS_POSIX_ACL is not set | 1244 | # CONFIG_FS_POSIX_ACL is not set |
1227 | # CONFIG_XFS_FS is not set | 1245 | # CONFIG_XFS_FS is not set |
1228 | # CONFIG_GFS2_FS is not set | ||
1229 | # CONFIG_OCFS2_FS is not set | 1246 | # CONFIG_OCFS2_FS is not set |
1230 | CONFIG_DNOTIFY=y | 1247 | CONFIG_DNOTIFY=y |
1231 | CONFIG_INOTIFY=y | 1248 | CONFIG_INOTIFY=y |
@@ -1294,7 +1311,6 @@ CONFIG_NFS_FS=y | |||
1294 | CONFIG_NFS_V3=y | 1311 | CONFIG_NFS_V3=y |
1295 | # CONFIG_NFS_V3_ACL is not set | 1312 | # CONFIG_NFS_V3_ACL is not set |
1296 | CONFIG_NFS_V4=y | 1313 | CONFIG_NFS_V4=y |
1297 | # CONFIG_NFS_DIRECTIO is not set | ||
1298 | # CONFIG_NFSD is not set | 1314 | # CONFIG_NFSD is not set |
1299 | CONFIG_ROOT_NFS=y | 1315 | CONFIG_ROOT_NFS=y |
1300 | CONFIG_LOCKD=y | 1316 | CONFIG_LOCKD=y |
@@ -1339,6 +1355,7 @@ CONFIG_MSDOS_PARTITION=y | |||
1339 | # Library routines | 1355 | # Library routines |
1340 | # | 1356 | # |
1341 | CONFIG_BITREVERSE=y | 1357 | CONFIG_BITREVERSE=y |
1358 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1342 | # CONFIG_CRC_CCITT is not set | 1359 | # CONFIG_CRC_CCITT is not set |
1343 | # CONFIG_CRC16 is not set | 1360 | # CONFIG_CRC16 is not set |
1344 | # CONFIG_CRC_ITU_T is not set | 1361 | # CONFIG_CRC_ITU_T is not set |
@@ -1351,6 +1368,7 @@ CONFIG_PLIST=y | |||
1351 | CONFIG_HAS_IOMEM=y | 1368 | CONFIG_HAS_IOMEM=y |
1352 | CONFIG_HAS_IOPORT=y | 1369 | CONFIG_HAS_IOPORT=y |
1353 | CONFIG_HAS_DMA=y | 1370 | CONFIG_HAS_DMA=y |
1371 | CONFIG_HAVE_LMB=y | ||
1354 | 1372 | ||
1355 | # | 1373 | # |
1356 | # Kernel hacking | 1374 | # Kernel hacking |
@@ -1358,6 +1376,7 @@ CONFIG_HAS_DMA=y | |||
1358 | # CONFIG_PRINTK_TIME is not set | 1376 | # CONFIG_PRINTK_TIME is not set |
1359 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1377 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1360 | CONFIG_ENABLE_MUST_CHECK=y | 1378 | CONFIG_ENABLE_MUST_CHECK=y |
1379 | CONFIG_FRAME_WARN=1024 | ||
1361 | # CONFIG_MAGIC_SYSRQ is not set | 1380 | # CONFIG_MAGIC_SYSRQ is not set |
1362 | # CONFIG_UNUSED_SYMBOLS is not set | 1381 | # CONFIG_UNUSED_SYMBOLS is not set |
1363 | # CONFIG_DEBUG_FS is not set | 1382 | # CONFIG_DEBUG_FS is not set |
@@ -1368,6 +1387,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1368 | CONFIG_SCHED_DEBUG=y | 1387 | CONFIG_SCHED_DEBUG=y |
1369 | # CONFIG_SCHEDSTATS is not set | 1388 | # CONFIG_SCHEDSTATS is not set |
1370 | # CONFIG_TIMER_STATS is not set | 1389 | # CONFIG_TIMER_STATS is not set |
1390 | # CONFIG_DEBUG_OBJECTS is not set | ||
1371 | # CONFIG_SLUB_DEBUG_ON is not set | 1391 | # CONFIG_SLUB_DEBUG_ON is not set |
1372 | # CONFIG_SLUB_STATS is not set | 1392 | # CONFIG_SLUB_STATS is not set |
1373 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1393 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1380,6 +1400,7 @@ CONFIG_SCHED_DEBUG=y | |||
1380 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1400 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1381 | # CONFIG_DEBUG_INFO is not set | 1401 | # CONFIG_DEBUG_INFO is not set |
1382 | # CONFIG_DEBUG_VM is not set | 1402 | # CONFIG_DEBUG_VM is not set |
1403 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1383 | # CONFIG_DEBUG_LIST is not set | 1404 | # CONFIG_DEBUG_LIST is not set |
1384 | # CONFIG_DEBUG_SG is not set | 1405 | # CONFIG_DEBUG_SG is not set |
1385 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1406 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1391,6 +1412,7 @@ CONFIG_SCHED_DEBUG=y | |||
1391 | # CONFIG_DEBUG_STACK_USAGE is not set | 1412 | # CONFIG_DEBUG_STACK_USAGE is not set |
1392 | # CONFIG_DEBUG_PAGEALLOC is not set | 1413 | # CONFIG_DEBUG_PAGEALLOC is not set |
1393 | # CONFIG_DEBUGGER is not set | 1414 | # CONFIG_DEBUGGER is not set |
1415 | # CONFIG_IRQSTACKS is not set | ||
1394 | # CONFIG_BDI_SWITCH is not set | 1416 | # CONFIG_BDI_SWITCH is not set |
1395 | # CONFIG_PPC_EARLY_DEBUG is not set | 1417 | # CONFIG_PPC_EARLY_DEBUG is not set |
1396 | 1418 | ||
@@ -1401,51 +1423,81 @@ CONFIG_SCHED_DEBUG=y | |||
1401 | # CONFIG_SECURITY is not set | 1423 | # CONFIG_SECURITY is not set |
1402 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1424 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1403 | CONFIG_CRYPTO=y | 1425 | CONFIG_CRYPTO=y |
1426 | |||
1427 | # | ||
1428 | # Crypto core or helper | ||
1429 | # | ||
1404 | CONFIG_CRYPTO_ALGAPI=y | 1430 | CONFIG_CRYPTO_ALGAPI=y |
1405 | CONFIG_CRYPTO_BLKCIPHER=y | 1431 | CONFIG_CRYPTO_BLKCIPHER=y |
1406 | # CONFIG_CRYPTO_SEQIV is not set | ||
1407 | CONFIG_CRYPTO_MANAGER=y | 1432 | CONFIG_CRYPTO_MANAGER=y |
1433 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1434 | # CONFIG_CRYPTO_NULL is not set | ||
1435 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1436 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1437 | # CONFIG_CRYPTO_TEST is not set | ||
1438 | |||
1439 | # | ||
1440 | # Authenticated Encryption with Associated Data | ||
1441 | # | ||
1442 | # CONFIG_CRYPTO_CCM is not set | ||
1443 | # CONFIG_CRYPTO_GCM is not set | ||
1444 | # CONFIG_CRYPTO_SEQIV is not set | ||
1445 | |||
1446 | # | ||
1447 | # Block modes | ||
1448 | # | ||
1449 | CONFIG_CRYPTO_CBC=y | ||
1450 | # CONFIG_CRYPTO_CTR is not set | ||
1451 | # CONFIG_CRYPTO_CTS is not set | ||
1452 | # CONFIG_CRYPTO_ECB is not set | ||
1453 | # CONFIG_CRYPTO_LRW is not set | ||
1454 | CONFIG_CRYPTO_PCBC=m | ||
1455 | # CONFIG_CRYPTO_XTS is not set | ||
1456 | |||
1457 | # | ||
1458 | # Hash modes | ||
1459 | # | ||
1408 | # CONFIG_CRYPTO_HMAC is not set | 1460 | # CONFIG_CRYPTO_HMAC is not set |
1409 | # CONFIG_CRYPTO_XCBC is not set | 1461 | # CONFIG_CRYPTO_XCBC is not set |
1410 | # CONFIG_CRYPTO_NULL is not set | 1462 | |
1463 | # | ||
1464 | # Digest | ||
1465 | # | ||
1466 | # CONFIG_CRYPTO_CRC32C is not set | ||
1411 | # CONFIG_CRYPTO_MD4 is not set | 1467 | # CONFIG_CRYPTO_MD4 is not set |
1412 | CONFIG_CRYPTO_MD5=y | 1468 | CONFIG_CRYPTO_MD5=y |
1469 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1413 | # CONFIG_CRYPTO_SHA1 is not set | 1470 | # CONFIG_CRYPTO_SHA1 is not set |
1414 | # CONFIG_CRYPTO_SHA256 is not set | 1471 | # CONFIG_CRYPTO_SHA256 is not set |
1415 | # CONFIG_CRYPTO_SHA512 is not set | 1472 | # CONFIG_CRYPTO_SHA512 is not set |
1416 | # CONFIG_CRYPTO_WP512 is not set | ||
1417 | # CONFIG_CRYPTO_TGR192 is not set | 1473 | # CONFIG_CRYPTO_TGR192 is not set |
1418 | # CONFIG_CRYPTO_GF128MUL is not set | 1474 | # CONFIG_CRYPTO_WP512 is not set |
1419 | # CONFIG_CRYPTO_ECB is not set | 1475 | |
1420 | CONFIG_CRYPTO_CBC=y | 1476 | # |
1421 | CONFIG_CRYPTO_PCBC=m | 1477 | # Ciphers |
1422 | # CONFIG_CRYPTO_LRW is not set | 1478 | # |
1423 | # CONFIG_CRYPTO_XTS is not set | ||
1424 | # CONFIG_CRYPTO_CTR is not set | ||
1425 | # CONFIG_CRYPTO_GCM is not set | ||
1426 | # CONFIG_CRYPTO_CCM is not set | ||
1427 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1428 | CONFIG_CRYPTO_DES=y | ||
1429 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1430 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1431 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1432 | # CONFIG_CRYPTO_SERPENT is not set | ||
1433 | # CONFIG_CRYPTO_AES is not set | 1479 | # CONFIG_CRYPTO_AES is not set |
1480 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1481 | # CONFIG_CRYPTO_ARC4 is not set | ||
1482 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1483 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1434 | # CONFIG_CRYPTO_CAST5 is not set | 1484 | # CONFIG_CRYPTO_CAST5 is not set |
1435 | # CONFIG_CRYPTO_CAST6 is not set | 1485 | # CONFIG_CRYPTO_CAST6 is not set |
1436 | # CONFIG_CRYPTO_TEA is not set | 1486 | CONFIG_CRYPTO_DES=y |
1437 | # CONFIG_CRYPTO_ARC4 is not set | 1487 | # CONFIG_CRYPTO_FCRYPT is not set |
1438 | # CONFIG_CRYPTO_KHAZAD is not set | 1488 | # CONFIG_CRYPTO_KHAZAD is not set |
1439 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1440 | # CONFIG_CRYPTO_SEED is not set | ||
1441 | # CONFIG_CRYPTO_SALSA20 is not set | 1489 | # CONFIG_CRYPTO_SALSA20 is not set |
1490 | # CONFIG_CRYPTO_SEED is not set | ||
1491 | # CONFIG_CRYPTO_SERPENT is not set | ||
1492 | # CONFIG_CRYPTO_TEA is not set | ||
1493 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1494 | |||
1495 | # | ||
1496 | # Compression | ||
1497 | # | ||
1442 | # CONFIG_CRYPTO_DEFLATE is not set | 1498 | # CONFIG_CRYPTO_DEFLATE is not set |
1443 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1444 | # CONFIG_CRYPTO_CRC32C is not set | ||
1445 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1446 | # CONFIG_CRYPTO_TEST is not set | ||
1447 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1448 | # CONFIG_CRYPTO_LZO is not set | 1499 | # CONFIG_CRYPTO_LZO is not set |
1449 | CONFIG_CRYPTO_HW=y | 1500 | CONFIG_CRYPTO_HW=y |
1450 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1501 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1451 | # CONFIG_PPC_CLOCK is not set | 1502 | # CONFIG_PPC_CLOCK is not set |
1503 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index 50cceda8994f..1eca26f3659a 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:36:51 2008 | 4 | # Mon Jun 9 08:52:22 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
@@ -212,11 +217,13 @@ CONFIG_FLATMEM=y | |||
212 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
213 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
216 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
217 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
218 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
219 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
220 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
221 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
222 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
@@ -239,6 +246,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
239 | CONFIG_PCI_LEGACY=y | 246 | CONFIG_PCI_LEGACY=y |
240 | # CONFIG_PCCARD is not set | 247 | # CONFIG_PCCARD is not set |
241 | # CONFIG_HOTPLUG_PCI is not set | 248 | # CONFIG_HOTPLUG_PCI is not set |
249 | # CONFIG_HAS_RAPIDIO is not set | ||
242 | 250 | ||
243 | # | 251 | # |
244 | # Advanced setup | 252 | # Advanced setup |
@@ -248,11 +256,11 @@ CONFIG_PCI_LEGACY=y | |||
248 | # | 256 | # |
249 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
250 | # | 258 | # |
251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
252 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
253 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
262 | CONFIG_PHYSICAL_START=0x00000000 | ||
254 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
255 | CONFIG_BOOT_LOAD=0x00800000 | ||
256 | 264 | ||
257 | # | 265 | # |
258 | # Networking | 266 | # Networking |
@@ -300,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
301 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
302 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
304 | # CONFIG_INET6_TUNNEL is not set | ||
305 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
306 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
307 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
@@ -355,6 +361,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
355 | # CONFIG_CONNECTOR is not set | 361 | # CONFIG_CONNECTOR is not set |
356 | # CONFIG_MTD is not set | 362 | # CONFIG_MTD is not set |
357 | CONFIG_OF_DEVICE=y | 363 | CONFIG_OF_DEVICE=y |
364 | CONFIG_OF_I2C=y | ||
358 | # CONFIG_PARPORT is not set | 365 | # CONFIG_PARPORT is not set |
359 | CONFIG_BLK_DEV=y | 366 | CONFIG_BLK_DEV=y |
360 | # CONFIG_BLK_DEV_FD is not set | 367 | # CONFIG_BLK_DEV_FD is not set |
@@ -522,7 +529,6 @@ CONFIG_NETDEV_1000=y | |||
522 | # CONFIG_SIS190 is not set | 529 | # CONFIG_SIS190 is not set |
523 | # CONFIG_SKGE is not set | 530 | # CONFIG_SKGE is not set |
524 | # CONFIG_SKY2 is not set | 531 | # CONFIG_SKY2 is not set |
525 | # CONFIG_SK98LIN is not set | ||
526 | # CONFIG_VIA_VELOCITY is not set | 532 | # CONFIG_VIA_VELOCITY is not set |
527 | # CONFIG_TIGON3 is not set | 533 | # CONFIG_TIGON3 is not set |
528 | # CONFIG_BNX2 is not set | 534 | # CONFIG_BNX2 is not set |
@@ -546,6 +552,7 @@ CONFIG_NETDEV_10000=y | |||
546 | # CONFIG_MLX4_CORE is not set | 552 | # CONFIG_MLX4_CORE is not set |
547 | # CONFIG_TEHUTI is not set | 553 | # CONFIG_TEHUTI is not set |
548 | # CONFIG_BNX2X is not set | 554 | # CONFIG_BNX2X is not set |
555 | # CONFIG_SFC is not set | ||
549 | # CONFIG_TR is not set | 556 | # CONFIG_TR is not set |
550 | 557 | ||
551 | # | 558 | # |
@@ -553,6 +560,7 @@ CONFIG_NETDEV_10000=y | |||
553 | # | 560 | # |
554 | # CONFIG_WLAN_PRE80211 is not set | 561 | # CONFIG_WLAN_PRE80211 is not set |
555 | # CONFIG_WLAN_80211 is not set | 562 | # CONFIG_WLAN_80211 is not set |
563 | # CONFIG_IWLWIFI_LEDS is not set | ||
556 | # CONFIG_WAN is not set | 564 | # CONFIG_WAN is not set |
557 | # CONFIG_FDDI is not set | 565 | # CONFIG_FDDI is not set |
558 | # CONFIG_HIPPI is not set | 566 | # CONFIG_HIPPI is not set |
@@ -600,6 +608,7 @@ CONFIG_INPUT=y | |||
600 | # Character devices | 608 | # Character devices |
601 | # | 609 | # |
602 | # CONFIG_VT is not set | 610 | # CONFIG_VT is not set |
611 | CONFIG_DEVKMEM=y | ||
603 | # CONFIG_SERIAL_NONSTANDARD is not set | 612 | # CONFIG_SERIAL_NONSTANDARD is not set |
604 | # CONFIG_NOZOMI is not set | 613 | # CONFIG_NOZOMI is not set |
605 | 614 | ||
@@ -628,7 +637,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
628 | # CONFIG_IPMI_HANDLER is not set | 637 | # CONFIG_IPMI_HANDLER is not set |
629 | CONFIG_HW_RANDOM=y | 638 | CONFIG_HW_RANDOM=y |
630 | # CONFIG_NVRAM is not set | 639 | # CONFIG_NVRAM is not set |
631 | # CONFIG_GEN_RTC is not set | ||
632 | # CONFIG_R3964 is not set | 640 | # CONFIG_R3964 is not set |
633 | # CONFIG_APPLICOM is not set | 641 | # CONFIG_APPLICOM is not set |
634 | # CONFIG_RAW_DRIVER is not set | 642 | # CONFIG_RAW_DRIVER is not set |
@@ -639,13 +647,6 @@ CONFIG_I2C_BOARDINFO=y | |||
639 | CONFIG_I2C_CHARDEV=y | 647 | CONFIG_I2C_CHARDEV=y |
640 | 648 | ||
641 | # | 649 | # |
642 | # I2C Algorithms | ||
643 | # | ||
644 | # CONFIG_I2C_ALGOBIT is not set | ||
645 | # CONFIG_I2C_ALGOPCF is not set | ||
646 | # CONFIG_I2C_ALGOPCA is not set | ||
647 | |||
648 | # | ||
649 | # I2C Hardware Bus support | 650 | # I2C Hardware Bus support |
650 | # | 651 | # |
651 | # CONFIG_I2C_ALI1535 is not set | 652 | # CONFIG_I2C_ALI1535 is not set |
@@ -671,6 +672,7 @@ CONFIG_I2C_MPC=y | |||
671 | # CONFIG_I2C_VIA is not set | 672 | # CONFIG_I2C_VIA is not set |
672 | # CONFIG_I2C_VIAPRO is not set | 673 | # CONFIG_I2C_VIAPRO is not set |
673 | # CONFIG_I2C_VOODOO3 is not set | 674 | # CONFIG_I2C_VOODOO3 is not set |
675 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
674 | 676 | ||
675 | # | 677 | # |
676 | # Miscellaneous I2C Chip support | 678 | # Miscellaneous I2C Chip support |
@@ -680,19 +682,13 @@ CONFIG_I2C_MPC=y | |||
680 | # CONFIG_SENSORS_PCF8574 is not set | 682 | # CONFIG_SENSORS_PCF8574 is not set |
681 | # CONFIG_PCF8575 is not set | 683 | # CONFIG_PCF8575 is not set |
682 | # CONFIG_SENSORS_PCF8591 is not set | 684 | # CONFIG_SENSORS_PCF8591 is not set |
683 | # CONFIG_TPS65010 is not set | ||
684 | # CONFIG_SENSORS_MAX6875 is not set | 685 | # CONFIG_SENSORS_MAX6875 is not set |
685 | # CONFIG_SENSORS_TSL2550 is not set | 686 | # CONFIG_SENSORS_TSL2550 is not set |
686 | # CONFIG_I2C_DEBUG_CORE is not set | 687 | # CONFIG_I2C_DEBUG_CORE is not set |
687 | # CONFIG_I2C_DEBUG_ALGO is not set | 688 | # CONFIG_I2C_DEBUG_ALGO is not set |
688 | # CONFIG_I2C_DEBUG_BUS is not set | 689 | # CONFIG_I2C_DEBUG_BUS is not set |
689 | # CONFIG_I2C_DEBUG_CHIP is not set | 690 | # CONFIG_I2C_DEBUG_CHIP is not set |
690 | |||
691 | # | ||
692 | # SPI support | ||
693 | # | ||
694 | # CONFIG_SPI is not set | 691 | # CONFIG_SPI is not set |
695 | # CONFIG_SPI_MASTER is not set | ||
696 | # CONFIG_W1 is not set | 692 | # CONFIG_W1 is not set |
697 | # CONFIG_POWER_SUPPLY is not set | 693 | # CONFIG_POWER_SUPPLY is not set |
698 | CONFIG_HWMON=y | 694 | CONFIG_HWMON=y |
@@ -775,12 +771,22 @@ CONFIG_SSB_POSSIBLE=y | |||
775 | # Multifunction device drivers | 771 | # Multifunction device drivers |
776 | # | 772 | # |
777 | # CONFIG_MFD_SM501 is not set | 773 | # CONFIG_MFD_SM501 is not set |
774 | # CONFIG_HTC_PASIC3 is not set | ||
778 | 775 | ||
779 | # | 776 | # |
780 | # Multimedia devices | 777 | # Multimedia devices |
781 | # | 778 | # |
779 | |||
780 | # | ||
781 | # Multimedia core support | ||
782 | # | ||
782 | # CONFIG_VIDEO_DEV is not set | 783 | # CONFIG_VIDEO_DEV is not set |
783 | # CONFIG_DVB_CORE is not set | 784 | # CONFIG_DVB_CORE is not set |
785 | # CONFIG_VIDEO_MEDIA is not set | ||
786 | |||
787 | # | ||
788 | # Multimedia drivers | ||
789 | # | ||
784 | CONFIG_DAB=y | 790 | CONFIG_DAB=y |
785 | 791 | ||
786 | # | 792 | # |
@@ -811,6 +817,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
811 | CONFIG_USB_ARCH_HAS_OHCI=y | 817 | CONFIG_USB_ARCH_HAS_OHCI=y |
812 | CONFIG_USB_ARCH_HAS_EHCI=y | 818 | CONFIG_USB_ARCH_HAS_EHCI=y |
813 | # CONFIG_USB is not set | 819 | # CONFIG_USB is not set |
820 | # CONFIG_USB_OTG_WHITELIST is not set | ||
821 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
814 | 822 | ||
815 | # | 823 | # |
816 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 824 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -819,6 +827,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
819 | # CONFIG_MMC is not set | 827 | # CONFIG_MMC is not set |
820 | # CONFIG_MEMSTICK is not set | 828 | # CONFIG_MEMSTICK is not set |
821 | # CONFIG_NEW_LEDS is not set | 829 | # CONFIG_NEW_LEDS is not set |
830 | # CONFIG_ACCESSIBILITY is not set | ||
822 | # CONFIG_INFINIBAND is not set | 831 | # CONFIG_INFINIBAND is not set |
823 | # CONFIG_EDAC is not set | 832 | # CONFIG_EDAC is not set |
824 | CONFIG_RTC_LIB=y | 833 | CONFIG_RTC_LIB=y |
@@ -870,11 +879,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
870 | # | 879 | # |
871 | # on-CPU RTC drivers | 880 | # on-CPU RTC drivers |
872 | # | 881 | # |
882 | # CONFIG_RTC_DRV_PPC is not set | ||
873 | # CONFIG_DMADEVICES is not set | 883 | # CONFIG_DMADEVICES is not set |
874 | |||
875 | # | ||
876 | # Userspace I/O | ||
877 | # | ||
878 | # CONFIG_UIO is not set | 884 | # CONFIG_UIO is not set |
879 | 885 | ||
880 | # | 886 | # |
@@ -894,7 +900,6 @@ CONFIG_FS_MBCACHE=y | |||
894 | # CONFIG_JFS_FS is not set | 900 | # CONFIG_JFS_FS is not set |
895 | # CONFIG_FS_POSIX_ACL is not set | 901 | # CONFIG_FS_POSIX_ACL is not set |
896 | # CONFIG_XFS_FS is not set | 902 | # CONFIG_XFS_FS is not set |
897 | # CONFIG_GFS2_FS is not set | ||
898 | # CONFIG_OCFS2_FS is not set | 903 | # CONFIG_OCFS2_FS is not set |
899 | CONFIG_DNOTIFY=y | 904 | CONFIG_DNOTIFY=y |
900 | CONFIG_INOTIFY=y | 905 | CONFIG_INOTIFY=y |
@@ -952,7 +957,6 @@ CONFIG_NFS_FS=y | |||
952 | CONFIG_NFS_V3=y | 957 | CONFIG_NFS_V3=y |
953 | # CONFIG_NFS_V3_ACL is not set | 958 | # CONFIG_NFS_V3_ACL is not set |
954 | CONFIG_NFS_V4=y | 959 | CONFIG_NFS_V4=y |
955 | # CONFIG_NFS_DIRECTIO is not set | ||
956 | # CONFIG_NFSD is not set | 960 | # CONFIG_NFSD is not set |
957 | CONFIG_ROOT_NFS=y | 961 | CONFIG_ROOT_NFS=y |
958 | CONFIG_LOCKD=y | 962 | CONFIG_LOCKD=y |
@@ -995,6 +999,7 @@ CONFIG_UCC=y | |||
995 | # Library routines | 999 | # Library routines |
996 | # | 1000 | # |
997 | CONFIG_BITREVERSE=y | 1001 | CONFIG_BITREVERSE=y |
1002 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
998 | # CONFIG_CRC_CCITT is not set | 1003 | # CONFIG_CRC_CCITT is not set |
999 | # CONFIG_CRC16 is not set | 1004 | # CONFIG_CRC16 is not set |
1000 | # CONFIG_CRC_ITU_T is not set | 1005 | # CONFIG_CRC_ITU_T is not set |
@@ -1005,6 +1010,7 @@ CONFIG_PLIST=y | |||
1005 | CONFIG_HAS_IOMEM=y | 1010 | CONFIG_HAS_IOMEM=y |
1006 | CONFIG_HAS_IOPORT=y | 1011 | CONFIG_HAS_IOPORT=y |
1007 | CONFIG_HAS_DMA=y | 1012 | CONFIG_HAS_DMA=y |
1013 | CONFIG_HAVE_LMB=y | ||
1008 | 1014 | ||
1009 | # | 1015 | # |
1010 | # Kernel hacking | 1016 | # Kernel hacking |
@@ -1012,6 +1018,7 @@ CONFIG_HAS_DMA=y | |||
1012 | # CONFIG_PRINTK_TIME is not set | 1018 | # CONFIG_PRINTK_TIME is not set |
1013 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1019 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1014 | CONFIG_ENABLE_MUST_CHECK=y | 1020 | CONFIG_ENABLE_MUST_CHECK=y |
1021 | CONFIG_FRAME_WARN=1024 | ||
1015 | # CONFIG_MAGIC_SYSRQ is not set | 1022 | # CONFIG_MAGIC_SYSRQ is not set |
1016 | # CONFIG_UNUSED_SYMBOLS is not set | 1023 | # CONFIG_UNUSED_SYMBOLS is not set |
1017 | # CONFIG_DEBUG_FS is not set | 1024 | # CONFIG_DEBUG_FS is not set |
@@ -1021,6 +1028,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1021 | # CONFIG_SLUB_STATS is not set | 1028 | # CONFIG_SLUB_STATS is not set |
1022 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1029 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1023 | # CONFIG_SAMPLES is not set | 1030 | # CONFIG_SAMPLES is not set |
1031 | # CONFIG_IRQSTACKS is not set | ||
1024 | # CONFIG_PPC_EARLY_DEBUG is not set | 1032 | # CONFIG_PPC_EARLY_DEBUG is not set |
1025 | 1033 | ||
1026 | # | 1034 | # |
@@ -1030,52 +1038,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1030 | # CONFIG_SECURITY is not set | 1038 | # CONFIG_SECURITY is not set |
1031 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1039 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1032 | CONFIG_CRYPTO=y | 1040 | CONFIG_CRYPTO=y |
1041 | |||
1042 | # | ||
1043 | # Crypto core or helper | ||
1044 | # | ||
1033 | CONFIG_CRYPTO_ALGAPI=y | 1045 | CONFIG_CRYPTO_ALGAPI=y |
1034 | CONFIG_CRYPTO_BLKCIPHER=y | 1046 | CONFIG_CRYPTO_BLKCIPHER=y |
1035 | # CONFIG_CRYPTO_SEQIV is not set | ||
1036 | CONFIG_CRYPTO_MANAGER=y | 1047 | CONFIG_CRYPTO_MANAGER=y |
1048 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1049 | # CONFIG_CRYPTO_NULL is not set | ||
1050 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1051 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1052 | # CONFIG_CRYPTO_TEST is not set | ||
1053 | |||
1054 | # | ||
1055 | # Authenticated Encryption with Associated Data | ||
1056 | # | ||
1057 | # CONFIG_CRYPTO_CCM is not set | ||
1058 | # CONFIG_CRYPTO_GCM is not set | ||
1059 | # CONFIG_CRYPTO_SEQIV is not set | ||
1060 | |||
1061 | # | ||
1062 | # Block modes | ||
1063 | # | ||
1064 | CONFIG_CRYPTO_CBC=y | ||
1065 | # CONFIG_CRYPTO_CTR is not set | ||
1066 | # CONFIG_CRYPTO_CTS is not set | ||
1067 | CONFIG_CRYPTO_ECB=m | ||
1068 | # CONFIG_CRYPTO_LRW is not set | ||
1069 | CONFIG_CRYPTO_PCBC=m | ||
1070 | # CONFIG_CRYPTO_XTS is not set | ||
1071 | |||
1072 | # | ||
1073 | # Hash modes | ||
1074 | # | ||
1037 | # CONFIG_CRYPTO_HMAC is not set | 1075 | # CONFIG_CRYPTO_HMAC is not set |
1038 | # CONFIG_CRYPTO_XCBC is not set | 1076 | # CONFIG_CRYPTO_XCBC is not set |
1039 | # CONFIG_CRYPTO_NULL is not set | 1077 | |
1078 | # | ||
1079 | # Digest | ||
1080 | # | ||
1081 | # CONFIG_CRYPTO_CRC32C is not set | ||
1040 | # CONFIG_CRYPTO_MD4 is not set | 1082 | # CONFIG_CRYPTO_MD4 is not set |
1041 | CONFIG_CRYPTO_MD5=y | 1083 | CONFIG_CRYPTO_MD5=y |
1084 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1042 | # CONFIG_CRYPTO_SHA1 is not set | 1085 | # CONFIG_CRYPTO_SHA1 is not set |
1043 | # CONFIG_CRYPTO_SHA256 is not set | 1086 | # CONFIG_CRYPTO_SHA256 is not set |
1044 | # CONFIG_CRYPTO_SHA512 is not set | 1087 | # CONFIG_CRYPTO_SHA512 is not set |
1045 | # CONFIG_CRYPTO_WP512 is not set | ||
1046 | # CONFIG_CRYPTO_TGR192 is not set | 1088 | # CONFIG_CRYPTO_TGR192 is not set |
1047 | # CONFIG_CRYPTO_GF128MUL is not set | 1089 | # CONFIG_CRYPTO_WP512 is not set |
1048 | CONFIG_CRYPTO_ECB=m | 1090 | |
1049 | CONFIG_CRYPTO_CBC=y | 1091 | # |
1050 | CONFIG_CRYPTO_PCBC=m | 1092 | # Ciphers |
1051 | # CONFIG_CRYPTO_LRW is not set | 1093 | # |
1052 | # CONFIG_CRYPTO_XTS is not set | ||
1053 | # CONFIG_CRYPTO_CTR is not set | ||
1054 | # CONFIG_CRYPTO_GCM is not set | ||
1055 | # CONFIG_CRYPTO_CCM is not set | ||
1056 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1057 | CONFIG_CRYPTO_DES=y | ||
1058 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1059 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1060 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1061 | # CONFIG_CRYPTO_SERPENT is not set | ||
1062 | # CONFIG_CRYPTO_AES is not set | 1094 | # CONFIG_CRYPTO_AES is not set |
1095 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1096 | # CONFIG_CRYPTO_ARC4 is not set | ||
1097 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1098 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1063 | # CONFIG_CRYPTO_CAST5 is not set | 1099 | # CONFIG_CRYPTO_CAST5 is not set |
1064 | # CONFIG_CRYPTO_CAST6 is not set | 1100 | # CONFIG_CRYPTO_CAST6 is not set |
1065 | # CONFIG_CRYPTO_TEA is not set | 1101 | CONFIG_CRYPTO_DES=y |
1066 | # CONFIG_CRYPTO_ARC4 is not set | 1102 | # CONFIG_CRYPTO_FCRYPT is not set |
1067 | # CONFIG_CRYPTO_KHAZAD is not set | 1103 | # CONFIG_CRYPTO_KHAZAD is not set |
1068 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1069 | # CONFIG_CRYPTO_SEED is not set | ||
1070 | # CONFIG_CRYPTO_SALSA20 is not set | 1104 | # CONFIG_CRYPTO_SALSA20 is not set |
1105 | # CONFIG_CRYPTO_SEED is not set | ||
1106 | # CONFIG_CRYPTO_SERPENT is not set | ||
1107 | # CONFIG_CRYPTO_TEA is not set | ||
1108 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1109 | |||
1110 | # | ||
1111 | # Compression | ||
1112 | # | ||
1071 | # CONFIG_CRYPTO_DEFLATE is not set | 1113 | # CONFIG_CRYPTO_DEFLATE is not set |
1072 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1073 | # CONFIG_CRYPTO_CRC32C is not set | ||
1074 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1075 | # CONFIG_CRYPTO_TEST is not set | ||
1076 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1077 | # CONFIG_CRYPTO_LZO is not set | 1114 | # CONFIG_CRYPTO_LZO is not set |
1078 | CONFIG_CRYPTO_HW=y | 1115 | CONFIG_CRYPTO_HW=y |
1079 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1116 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1080 | # CONFIG_PPC_CLOCK is not set | 1117 | # CONFIG_PPC_CLOCK is not set |
1081 | CONFIG_PPC_LIB_RHEAP=y | 1118 | CONFIG_PPC_LIB_RHEAP=y |
1119 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index ac913025713e..de95d327463c 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:16 2008 | 4 | # Mon Jun 9 08:52:24 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
@@ -212,11 +217,13 @@ CONFIG_FLATMEM=y | |||
212 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
213 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
216 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
217 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
218 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
219 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
220 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
221 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
222 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
@@ -239,6 +246,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
239 | CONFIG_PCI_LEGACY=y | 246 | CONFIG_PCI_LEGACY=y |
240 | # CONFIG_PCCARD is not set | 247 | # CONFIG_PCCARD is not set |
241 | # CONFIG_HOTPLUG_PCI is not set | 248 | # CONFIG_HOTPLUG_PCI is not set |
249 | # CONFIG_HAS_RAPIDIO is not set | ||
242 | 250 | ||
243 | # | 251 | # |
244 | # Advanced setup | 252 | # Advanced setup |
@@ -248,11 +256,11 @@ CONFIG_PCI_LEGACY=y | |||
248 | # | 256 | # |
249 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
250 | # | 258 | # |
251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
252 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
253 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
262 | CONFIG_PHYSICAL_START=0x00000000 | ||
254 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
255 | CONFIG_BOOT_LOAD=0x00800000 | ||
256 | 264 | ||
257 | # | 265 | # |
258 | # Networking | 266 | # Networking |
@@ -300,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
301 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
302 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
304 | # CONFIG_INET6_TUNNEL is not set | ||
305 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
306 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
307 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
@@ -355,6 +361,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
355 | # CONFIG_CONNECTOR is not set | 361 | # CONFIG_CONNECTOR is not set |
356 | # CONFIG_MTD is not set | 362 | # CONFIG_MTD is not set |
357 | CONFIG_OF_DEVICE=y | 363 | CONFIG_OF_DEVICE=y |
364 | CONFIG_OF_I2C=y | ||
358 | # CONFIG_PARPORT is not set | 365 | # CONFIG_PARPORT is not set |
359 | CONFIG_BLK_DEV=y | 366 | CONFIG_BLK_DEV=y |
360 | # CONFIG_BLK_DEV_FD is not set | 367 | # CONFIG_BLK_DEV_FD is not set |
@@ -526,7 +533,6 @@ CONFIG_E1000=y | |||
526 | # CONFIG_SIS190 is not set | 533 | # CONFIG_SIS190 is not set |
527 | # CONFIG_SKGE is not set | 534 | # CONFIG_SKGE is not set |
528 | # CONFIG_SKY2 is not set | 535 | # CONFIG_SKY2 is not set |
529 | # CONFIG_SK98LIN is not set | ||
530 | # CONFIG_VIA_VELOCITY is not set | 536 | # CONFIG_VIA_VELOCITY is not set |
531 | # CONFIG_TIGON3 is not set | 537 | # CONFIG_TIGON3 is not set |
532 | # CONFIG_BNX2 is not set | 538 | # CONFIG_BNX2 is not set |
@@ -550,6 +556,7 @@ CONFIG_NETDEV_10000=y | |||
550 | # CONFIG_MLX4_CORE is not set | 556 | # CONFIG_MLX4_CORE is not set |
551 | # CONFIG_TEHUTI is not set | 557 | # CONFIG_TEHUTI is not set |
552 | # CONFIG_BNX2X is not set | 558 | # CONFIG_BNX2X is not set |
559 | # CONFIG_SFC is not set | ||
553 | # CONFIG_TR is not set | 560 | # CONFIG_TR is not set |
554 | 561 | ||
555 | # | 562 | # |
@@ -557,6 +564,7 @@ CONFIG_NETDEV_10000=y | |||
557 | # | 564 | # |
558 | # CONFIG_WLAN_PRE80211 is not set | 565 | # CONFIG_WLAN_PRE80211 is not set |
559 | # CONFIG_WLAN_80211 is not set | 566 | # CONFIG_WLAN_80211 is not set |
567 | # CONFIG_IWLWIFI_LEDS is not set | ||
560 | 568 | ||
561 | # | 569 | # |
562 | # USB Network Adapters | 570 | # USB Network Adapters |
@@ -613,6 +621,7 @@ CONFIG_INPUT=y | |||
613 | # Character devices | 621 | # Character devices |
614 | # | 622 | # |
615 | # CONFIG_VT is not set | 623 | # CONFIG_VT is not set |
624 | CONFIG_DEVKMEM=y | ||
616 | # CONFIG_SERIAL_NONSTANDARD is not set | 625 | # CONFIG_SERIAL_NONSTANDARD is not set |
617 | # CONFIG_NOZOMI is not set | 626 | # CONFIG_NOZOMI is not set |
618 | 627 | ||
@@ -653,13 +662,6 @@ CONFIG_I2C_BOARDINFO=y | |||
653 | CONFIG_I2C_CHARDEV=y | 662 | CONFIG_I2C_CHARDEV=y |
654 | 663 | ||
655 | # | 664 | # |
656 | # I2C Algorithms | ||
657 | # | ||
658 | # CONFIG_I2C_ALGOBIT is not set | ||
659 | # CONFIG_I2C_ALGOPCF is not set | ||
660 | # CONFIG_I2C_ALGOPCA is not set | ||
661 | |||
662 | # | ||
663 | # I2C Hardware Bus support | 665 | # I2C Hardware Bus support |
664 | # | 666 | # |
665 | # CONFIG_I2C_ALI1535 is not set | 667 | # CONFIG_I2C_ALI1535 is not set |
@@ -686,6 +688,7 @@ CONFIG_I2C_MPC=y | |||
686 | # CONFIG_I2C_VIA is not set | 688 | # CONFIG_I2C_VIA is not set |
687 | # CONFIG_I2C_VIAPRO is not set | 689 | # CONFIG_I2C_VIAPRO is not set |
688 | # CONFIG_I2C_VOODOO3 is not set | 690 | # CONFIG_I2C_VOODOO3 is not set |
691 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
689 | 692 | ||
690 | # | 693 | # |
691 | # Miscellaneous I2C Chip support | 694 | # Miscellaneous I2C Chip support |
@@ -695,17 +698,12 @@ CONFIG_I2C_MPC=y | |||
695 | # CONFIG_SENSORS_PCF8574 is not set | 698 | # CONFIG_SENSORS_PCF8574 is not set |
696 | # CONFIG_PCF8575 is not set | 699 | # CONFIG_PCF8575 is not set |
697 | # CONFIG_SENSORS_PCF8591 is not set | 700 | # CONFIG_SENSORS_PCF8591 is not set |
698 | # CONFIG_TPS65010 is not set | ||
699 | # CONFIG_SENSORS_MAX6875 is not set | 701 | # CONFIG_SENSORS_MAX6875 is not set |
700 | # CONFIG_SENSORS_TSL2550 is not set | 702 | # CONFIG_SENSORS_TSL2550 is not set |
701 | # CONFIG_I2C_DEBUG_CORE is not set | 703 | # CONFIG_I2C_DEBUG_CORE is not set |
702 | # CONFIG_I2C_DEBUG_ALGO is not set | 704 | # CONFIG_I2C_DEBUG_ALGO is not set |
703 | # CONFIG_I2C_DEBUG_BUS is not set | 705 | # CONFIG_I2C_DEBUG_BUS is not set |
704 | # CONFIG_I2C_DEBUG_CHIP is not set | 706 | # CONFIG_I2C_DEBUG_CHIP is not set |
705 | |||
706 | # | ||
707 | # SPI support | ||
708 | # | ||
709 | CONFIG_SPI=y | 707 | CONFIG_SPI=y |
710 | CONFIG_SPI_MASTER=y | 708 | CONFIG_SPI_MASTER=y |
711 | 709 | ||
@@ -809,12 +807,22 @@ CONFIG_SSB_POSSIBLE=y | |||
809 | # Multifunction device drivers | 807 | # Multifunction device drivers |
810 | # | 808 | # |
811 | # CONFIG_MFD_SM501 is not set | 809 | # CONFIG_MFD_SM501 is not set |
810 | # CONFIG_HTC_PASIC3 is not set | ||
812 | 811 | ||
813 | # | 812 | # |
814 | # Multimedia devices | 813 | # Multimedia devices |
815 | # | 814 | # |
815 | |||
816 | # | ||
817 | # Multimedia core support | ||
818 | # | ||
816 | # CONFIG_VIDEO_DEV is not set | 819 | # CONFIG_VIDEO_DEV is not set |
817 | # CONFIG_DVB_CORE is not set | 820 | # CONFIG_DVB_CORE is not set |
821 | # CONFIG_VIDEO_MEDIA is not set | ||
822 | |||
823 | # | ||
824 | # Multimedia drivers | ||
825 | # | ||
818 | CONFIG_DAB=y | 826 | CONFIG_DAB=y |
819 | # CONFIG_USB_DABUSB is not set | 827 | # CONFIG_USB_DABUSB is not set |
820 | 828 | ||
@@ -867,16 +875,20 @@ CONFIG_USB_DEVICEFS=y | |||
867 | CONFIG_USB_DEVICE_CLASS=y | 875 | CONFIG_USB_DEVICE_CLASS=y |
868 | # CONFIG_USB_DYNAMIC_MINORS is not set | 876 | # CONFIG_USB_DYNAMIC_MINORS is not set |
869 | # CONFIG_USB_OTG is not set | 877 | # CONFIG_USB_OTG is not set |
878 | # CONFIG_USB_OTG_WHITELIST is not set | ||
879 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
870 | 880 | ||
871 | # | 881 | # |
872 | # USB Host Controller Drivers | 882 | # USB Host Controller Drivers |
873 | # | 883 | # |
884 | # CONFIG_USB_C67X00_HCD is not set | ||
874 | CONFIG_USB_EHCI_HCD=y | 885 | CONFIG_USB_EHCI_HCD=y |
875 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 886 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
876 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 887 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
877 | # CONFIG_USB_EHCI_FSL is not set | 888 | # CONFIG_USB_EHCI_FSL is not set |
878 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 889 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
879 | # CONFIG_USB_ISP116X_HCD is not set | 890 | # CONFIG_USB_ISP116X_HCD is not set |
891 | # CONFIG_USB_ISP1760_HCD is not set | ||
880 | CONFIG_USB_OHCI_HCD=y | 892 | CONFIG_USB_OHCI_HCD=y |
881 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 893 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
882 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 894 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -894,6 +906,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
894 | # | 906 | # |
895 | # CONFIG_USB_ACM is not set | 907 | # CONFIG_USB_ACM is not set |
896 | # CONFIG_USB_PRINTER is not set | 908 | # CONFIG_USB_PRINTER is not set |
909 | # CONFIG_USB_WDM is not set | ||
897 | 910 | ||
898 | # | 911 | # |
899 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 912 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -913,7 +926,9 @@ CONFIG_USB_STORAGE=y | |||
913 | # CONFIG_USB_STORAGE_SDDR55 is not set | 926 | # CONFIG_USB_STORAGE_SDDR55 is not set |
914 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 927 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
915 | # CONFIG_USB_STORAGE_ALAUDA is not set | 928 | # CONFIG_USB_STORAGE_ALAUDA is not set |
929 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
916 | # CONFIG_USB_STORAGE_KARMA is not set | 930 | # CONFIG_USB_STORAGE_KARMA is not set |
931 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
917 | # CONFIG_USB_LIBUSUAL is not set | 932 | # CONFIG_USB_LIBUSUAL is not set |
918 | 933 | ||
919 | # | 934 | # |
@@ -951,6 +966,7 @@ CONFIG_USB_MON=y | |||
951 | # CONFIG_USB_TRANCEVIBRATOR is not set | 966 | # CONFIG_USB_TRANCEVIBRATOR is not set |
952 | # CONFIG_USB_IOWARRIOR is not set | 967 | # CONFIG_USB_IOWARRIOR is not set |
953 | # CONFIG_USB_TEST is not set | 968 | # CONFIG_USB_TEST is not set |
969 | # CONFIG_USB_ISIGHTFW is not set | ||
954 | # CONFIG_USB_GADGET is not set | 970 | # CONFIG_USB_GADGET is not set |
955 | CONFIG_MMC=y | 971 | CONFIG_MMC=y |
956 | # CONFIG_MMC_DEBUG is not set | 972 | # CONFIG_MMC_DEBUG is not set |
@@ -962,6 +978,7 @@ CONFIG_MMC=y | |||
962 | CONFIG_MMC_BLOCK=y | 978 | CONFIG_MMC_BLOCK=y |
963 | CONFIG_MMC_BLOCK_BOUNCE=y | 979 | CONFIG_MMC_BLOCK_BOUNCE=y |
964 | # CONFIG_SDIO_UART is not set | 980 | # CONFIG_SDIO_UART is not set |
981 | # CONFIG_MMC_TEST is not set | ||
965 | 982 | ||
966 | # | 983 | # |
967 | # MMC/SD Host Controller Drivers | 984 | # MMC/SD Host Controller Drivers |
@@ -972,14 +989,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
972 | CONFIG_MMC_SPI=y | 989 | CONFIG_MMC_SPI=y |
973 | # CONFIG_MEMSTICK is not set | 990 | # CONFIG_MEMSTICK is not set |
974 | # CONFIG_NEW_LEDS is not set | 991 | # CONFIG_NEW_LEDS is not set |
992 | # CONFIG_ACCESSIBILITY is not set | ||
975 | # CONFIG_INFINIBAND is not set | 993 | # CONFIG_INFINIBAND is not set |
976 | # CONFIG_EDAC is not set | 994 | # CONFIG_EDAC is not set |
977 | # CONFIG_RTC_CLASS is not set | 995 | # CONFIG_RTC_CLASS is not set |
978 | # CONFIG_DMADEVICES is not set | 996 | # CONFIG_DMADEVICES is not set |
979 | |||
980 | # | ||
981 | # Userspace I/O | ||
982 | # | ||
983 | # CONFIG_UIO is not set | 997 | # CONFIG_UIO is not set |
984 | 998 | ||
985 | # | 999 | # |
@@ -999,7 +1013,6 @@ CONFIG_FS_MBCACHE=y | |||
999 | # CONFIG_JFS_FS is not set | 1013 | # CONFIG_JFS_FS is not set |
1000 | # CONFIG_FS_POSIX_ACL is not set | 1014 | # CONFIG_FS_POSIX_ACL is not set |
1001 | # CONFIG_XFS_FS is not set | 1015 | # CONFIG_XFS_FS is not set |
1002 | # CONFIG_GFS2_FS is not set | ||
1003 | # CONFIG_OCFS2_FS is not set | 1016 | # CONFIG_OCFS2_FS is not set |
1004 | CONFIG_DNOTIFY=y | 1017 | CONFIG_DNOTIFY=y |
1005 | CONFIG_INOTIFY=y | 1018 | CONFIG_INOTIFY=y |
@@ -1060,7 +1073,6 @@ CONFIG_NFS_FS=y | |||
1060 | CONFIG_NFS_V3=y | 1073 | CONFIG_NFS_V3=y |
1061 | # CONFIG_NFS_V3_ACL is not set | 1074 | # CONFIG_NFS_V3_ACL is not set |
1062 | CONFIG_NFS_V4=y | 1075 | CONFIG_NFS_V4=y |
1063 | # CONFIG_NFS_DIRECTIO is not set | ||
1064 | # CONFIG_NFSD is not set | 1076 | # CONFIG_NFSD is not set |
1065 | CONFIG_ROOT_NFS=y | 1077 | CONFIG_ROOT_NFS=y |
1066 | CONFIG_LOCKD=y | 1078 | CONFIG_LOCKD=y |
@@ -1147,6 +1159,7 @@ CONFIG_UCC=y | |||
1147 | # Library routines | 1159 | # Library routines |
1148 | # | 1160 | # |
1149 | CONFIG_BITREVERSE=y | 1161 | CONFIG_BITREVERSE=y |
1162 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1150 | # CONFIG_CRC_CCITT is not set | 1163 | # CONFIG_CRC_CCITT is not set |
1151 | # CONFIG_CRC16 is not set | 1164 | # CONFIG_CRC16 is not set |
1152 | CONFIG_CRC_ITU_T=y | 1165 | CONFIG_CRC_ITU_T=y |
@@ -1157,6 +1170,7 @@ CONFIG_PLIST=y | |||
1157 | CONFIG_HAS_IOMEM=y | 1170 | CONFIG_HAS_IOMEM=y |
1158 | CONFIG_HAS_IOPORT=y | 1171 | CONFIG_HAS_IOPORT=y |
1159 | CONFIG_HAS_DMA=y | 1172 | CONFIG_HAS_DMA=y |
1173 | CONFIG_HAVE_LMB=y | ||
1160 | 1174 | ||
1161 | # | 1175 | # |
1162 | # Kernel hacking | 1176 | # Kernel hacking |
@@ -1164,6 +1178,7 @@ CONFIG_HAS_DMA=y | |||
1164 | # CONFIG_PRINTK_TIME is not set | 1178 | # CONFIG_PRINTK_TIME is not set |
1165 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1179 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1166 | CONFIG_ENABLE_MUST_CHECK=y | 1180 | CONFIG_ENABLE_MUST_CHECK=y |
1181 | CONFIG_FRAME_WARN=1024 | ||
1167 | # CONFIG_MAGIC_SYSRQ is not set | 1182 | # CONFIG_MAGIC_SYSRQ is not set |
1168 | # CONFIG_UNUSED_SYMBOLS is not set | 1183 | # CONFIG_UNUSED_SYMBOLS is not set |
1169 | # CONFIG_DEBUG_FS is not set | 1184 | # CONFIG_DEBUG_FS is not set |
@@ -1173,6 +1188,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1173 | # CONFIG_SLUB_STATS is not set | 1188 | # CONFIG_SLUB_STATS is not set |
1174 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1189 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1175 | # CONFIG_SAMPLES is not set | 1190 | # CONFIG_SAMPLES is not set |
1191 | # CONFIG_IRQSTACKS is not set | ||
1176 | # CONFIG_PPC_EARLY_DEBUG is not set | 1192 | # CONFIG_PPC_EARLY_DEBUG is not set |
1177 | 1193 | ||
1178 | # | 1194 | # |
@@ -1182,52 +1198,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1182 | # CONFIG_SECURITY is not set | 1198 | # CONFIG_SECURITY is not set |
1183 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1199 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1184 | CONFIG_CRYPTO=y | 1200 | CONFIG_CRYPTO=y |
1201 | |||
1202 | # | ||
1203 | # Crypto core or helper | ||
1204 | # | ||
1185 | CONFIG_CRYPTO_ALGAPI=y | 1205 | CONFIG_CRYPTO_ALGAPI=y |
1186 | CONFIG_CRYPTO_BLKCIPHER=y | 1206 | CONFIG_CRYPTO_BLKCIPHER=y |
1187 | # CONFIG_CRYPTO_SEQIV is not set | ||
1188 | CONFIG_CRYPTO_MANAGER=y | 1207 | CONFIG_CRYPTO_MANAGER=y |
1208 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1209 | # CONFIG_CRYPTO_NULL is not set | ||
1210 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1211 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1212 | # CONFIG_CRYPTO_TEST is not set | ||
1213 | |||
1214 | # | ||
1215 | # Authenticated Encryption with Associated Data | ||
1216 | # | ||
1217 | # CONFIG_CRYPTO_CCM is not set | ||
1218 | # CONFIG_CRYPTO_GCM is not set | ||
1219 | # CONFIG_CRYPTO_SEQIV is not set | ||
1220 | |||
1221 | # | ||
1222 | # Block modes | ||
1223 | # | ||
1224 | CONFIG_CRYPTO_CBC=y | ||
1225 | # CONFIG_CRYPTO_CTR is not set | ||
1226 | # CONFIG_CRYPTO_CTS is not set | ||
1227 | CONFIG_CRYPTO_ECB=m | ||
1228 | # CONFIG_CRYPTO_LRW is not set | ||
1229 | CONFIG_CRYPTO_PCBC=m | ||
1230 | # CONFIG_CRYPTO_XTS is not set | ||
1231 | |||
1232 | # | ||
1233 | # Hash modes | ||
1234 | # | ||
1189 | # CONFIG_CRYPTO_HMAC is not set | 1235 | # CONFIG_CRYPTO_HMAC is not set |
1190 | # CONFIG_CRYPTO_XCBC is not set | 1236 | # CONFIG_CRYPTO_XCBC is not set |
1191 | # CONFIG_CRYPTO_NULL is not set | 1237 | |
1238 | # | ||
1239 | # Digest | ||
1240 | # | ||
1241 | # CONFIG_CRYPTO_CRC32C is not set | ||
1192 | # CONFIG_CRYPTO_MD4 is not set | 1242 | # CONFIG_CRYPTO_MD4 is not set |
1193 | CONFIG_CRYPTO_MD5=y | 1243 | CONFIG_CRYPTO_MD5=y |
1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1194 | # CONFIG_CRYPTO_SHA1 is not set | 1245 | # CONFIG_CRYPTO_SHA1 is not set |
1195 | # CONFIG_CRYPTO_SHA256 is not set | 1246 | # CONFIG_CRYPTO_SHA256 is not set |
1196 | # CONFIG_CRYPTO_SHA512 is not set | 1247 | # CONFIG_CRYPTO_SHA512 is not set |
1197 | # CONFIG_CRYPTO_WP512 is not set | ||
1198 | # CONFIG_CRYPTO_TGR192 is not set | 1248 | # CONFIG_CRYPTO_TGR192 is not set |
1199 | # CONFIG_CRYPTO_GF128MUL is not set | 1249 | # CONFIG_CRYPTO_WP512 is not set |
1200 | CONFIG_CRYPTO_ECB=m | 1250 | |
1201 | CONFIG_CRYPTO_CBC=y | 1251 | # |
1202 | CONFIG_CRYPTO_PCBC=m | 1252 | # Ciphers |
1203 | # CONFIG_CRYPTO_LRW is not set | 1253 | # |
1204 | # CONFIG_CRYPTO_XTS is not set | ||
1205 | # CONFIG_CRYPTO_CTR is not set | ||
1206 | # CONFIG_CRYPTO_GCM is not set | ||
1207 | # CONFIG_CRYPTO_CCM is not set | ||
1208 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1209 | CONFIG_CRYPTO_DES=y | ||
1210 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1211 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1212 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1213 | # CONFIG_CRYPTO_SERPENT is not set | ||
1214 | # CONFIG_CRYPTO_AES is not set | 1254 | # CONFIG_CRYPTO_AES is not set |
1255 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1256 | # CONFIG_CRYPTO_ARC4 is not set | ||
1257 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1258 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1215 | # CONFIG_CRYPTO_CAST5 is not set | 1259 | # CONFIG_CRYPTO_CAST5 is not set |
1216 | # CONFIG_CRYPTO_CAST6 is not set | 1260 | # CONFIG_CRYPTO_CAST6 is not set |
1217 | # CONFIG_CRYPTO_TEA is not set | 1261 | CONFIG_CRYPTO_DES=y |
1218 | # CONFIG_CRYPTO_ARC4 is not set | 1262 | # CONFIG_CRYPTO_FCRYPT is not set |
1219 | # CONFIG_CRYPTO_KHAZAD is not set | 1263 | # CONFIG_CRYPTO_KHAZAD is not set |
1220 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1221 | # CONFIG_CRYPTO_SEED is not set | ||
1222 | # CONFIG_CRYPTO_SALSA20 is not set | 1264 | # CONFIG_CRYPTO_SALSA20 is not set |
1265 | # CONFIG_CRYPTO_SEED is not set | ||
1266 | # CONFIG_CRYPTO_SERPENT is not set | ||
1267 | # CONFIG_CRYPTO_TEA is not set | ||
1268 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1269 | |||
1270 | # | ||
1271 | # Compression | ||
1272 | # | ||
1223 | # CONFIG_CRYPTO_DEFLATE is not set | 1273 | # CONFIG_CRYPTO_DEFLATE is not set |
1224 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1225 | # CONFIG_CRYPTO_CRC32C is not set | ||
1226 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1227 | # CONFIG_CRYPTO_TEST is not set | ||
1228 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1229 | # CONFIG_CRYPTO_LZO is not set | 1274 | # CONFIG_CRYPTO_LZO is not set |
1230 | CONFIG_CRYPTO_HW=y | 1275 | CONFIG_CRYPTO_HW=y |
1231 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1276 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1232 | # CONFIG_PPC_CLOCK is not set | 1277 | # CONFIG_PPC_CLOCK is not set |
1233 | CONFIG_PPC_LIB_RHEAP=y | 1278 | CONFIG_PPC_LIB_RHEAP=y |
1279 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index e1de399a7bdd..b47fc9185708 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:17 2008 | 4 | # Mon Jun 9 08:52:25 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
@@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
@@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
247 | # CONFIG_HAS_RAPIDIO is not set | ||
240 | 248 | ||
241 | # | 249 | # |
242 | # Advanced setup | 250 | # Advanced setup |
@@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
246 | # | 254 | # |
247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
248 | # | 256 | # |
249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | ||
252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
253 | CONFIG_BOOT_LOAD=0x00800000 | ||
254 | 262 | ||
255 | # | 263 | # |
256 | # Networking | 264 | # Networking |
@@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
302 | # CONFIG_INET6_TUNNEL is not set | ||
303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
@@ -432,6 +438,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
432 | # | 438 | # |
433 | # CONFIG_MTD_UBI is not set | 439 | # CONFIG_MTD_UBI is not set |
434 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
441 | CONFIG_OF_I2C=y | ||
435 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
436 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
437 | # CONFIG_BLK_DEV_FD is not set | 444 | # CONFIG_BLK_DEV_FD is not set |
@@ -541,7 +548,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
541 | # CONFIG_SCSI_SRP is not set | 548 | # CONFIG_SCSI_SRP is not set |
542 | CONFIG_ATA=y | 549 | CONFIG_ATA=y |
543 | # CONFIG_ATA_NONSTANDARD is not set | 550 | # CONFIG_ATA_NONSTANDARD is not set |
551 | CONFIG_SATA_PMP=y | ||
544 | # CONFIG_SATA_AHCI is not set | 552 | # CONFIG_SATA_AHCI is not set |
553 | # CONFIG_SATA_SIL24 is not set | ||
554 | # CONFIG_SATA_FSL is not set | ||
555 | CONFIG_ATA_SFF=y | ||
545 | # CONFIG_SATA_SVW is not set | 556 | # CONFIG_SATA_SVW is not set |
546 | # CONFIG_ATA_PIIX is not set | 557 | # CONFIG_ATA_PIIX is not set |
547 | # CONFIG_SATA_MV is not set | 558 | # CONFIG_SATA_MV is not set |
@@ -551,13 +562,11 @@ CONFIG_ATA=y | |||
551 | # CONFIG_SATA_PROMISE is not set | 562 | # CONFIG_SATA_PROMISE is not set |
552 | # CONFIG_SATA_SX4 is not set | 563 | # CONFIG_SATA_SX4 is not set |
553 | CONFIG_SATA_SIL=y | 564 | CONFIG_SATA_SIL=y |
554 | # CONFIG_SATA_SIL24 is not set | ||
555 | # CONFIG_SATA_SIS is not set | 565 | # CONFIG_SATA_SIS is not set |
556 | # CONFIG_SATA_ULI is not set | 566 | # CONFIG_SATA_ULI is not set |
557 | # CONFIG_SATA_VIA is not set | 567 | # CONFIG_SATA_VIA is not set |
558 | # CONFIG_SATA_VITESSE is not set | 568 | # CONFIG_SATA_VITESSE is not set |
559 | # CONFIG_SATA_INIC162X is not set | 569 | # CONFIG_SATA_INIC162X is not set |
560 | # CONFIG_SATA_FSL is not set | ||
561 | # CONFIG_PATA_ALI is not set | 570 | # CONFIG_PATA_ALI is not set |
562 | # CONFIG_PATA_AMD is not set | 571 | # CONFIG_PATA_AMD is not set |
563 | # CONFIG_PATA_ARTOP is not set | 572 | # CONFIG_PATA_ARTOP is not set |
@@ -598,6 +607,7 @@ CONFIG_SATA_SIL=y | |||
598 | # CONFIG_PATA_WINBOND is not set | 607 | # CONFIG_PATA_WINBOND is not set |
599 | CONFIG_PATA_PLATFORM=y | 608 | CONFIG_PATA_PLATFORM=y |
600 | CONFIG_PATA_OF_PLATFORM=y | 609 | CONFIG_PATA_OF_PLATFORM=y |
610 | # CONFIG_PATA_SCH is not set | ||
601 | CONFIG_MD=y | 611 | CONFIG_MD=y |
602 | CONFIG_BLK_DEV_MD=y | 612 | CONFIG_BLK_DEV_MD=y |
603 | CONFIG_MD_LINEAR=y | 613 | CONFIG_MD_LINEAR=y |
@@ -659,7 +669,6 @@ CONFIG_NETDEV_1000=y | |||
659 | # CONFIG_SIS190 is not set | 669 | # CONFIG_SIS190 is not set |
660 | # CONFIG_SKGE is not set | 670 | # CONFIG_SKGE is not set |
661 | # CONFIG_SKY2 is not set | 671 | # CONFIG_SKY2 is not set |
662 | # CONFIG_SK98LIN is not set | ||
663 | # CONFIG_VIA_VELOCITY is not set | 672 | # CONFIG_VIA_VELOCITY is not set |
664 | # CONFIG_TIGON3 is not set | 673 | # CONFIG_TIGON3 is not set |
665 | # CONFIG_BNX2 is not set | 674 | # CONFIG_BNX2 is not set |
@@ -679,6 +688,7 @@ CONFIG_NETDEV_10000=y | |||
679 | # CONFIG_MLX4_CORE is not set | 688 | # CONFIG_MLX4_CORE is not set |
680 | # CONFIG_TEHUTI is not set | 689 | # CONFIG_TEHUTI is not set |
681 | # CONFIG_BNX2X is not set | 690 | # CONFIG_BNX2X is not set |
691 | # CONFIG_SFC is not set | ||
682 | # CONFIG_TR is not set | 692 | # CONFIG_TR is not set |
683 | 693 | ||
684 | # | 694 | # |
@@ -686,6 +696,7 @@ CONFIG_NETDEV_10000=y | |||
686 | # | 696 | # |
687 | # CONFIG_WLAN_PRE80211 is not set | 697 | # CONFIG_WLAN_PRE80211 is not set |
688 | # CONFIG_WLAN_80211 is not set | 698 | # CONFIG_WLAN_80211 is not set |
699 | # CONFIG_IWLWIFI_LEDS is not set | ||
689 | 700 | ||
690 | # | 701 | # |
691 | # USB Network Adapters | 702 | # USB Network Adapters |
@@ -722,6 +733,7 @@ CONFIG_NETDEV_10000=y | |||
722 | # Character devices | 733 | # Character devices |
723 | # | 734 | # |
724 | # CONFIG_VT is not set | 735 | # CONFIG_VT is not set |
736 | CONFIG_DEVKMEM=y | ||
725 | # CONFIG_SERIAL_NONSTANDARD is not set | 737 | # CONFIG_SERIAL_NONSTANDARD is not set |
726 | # CONFIG_NOZOMI is not set | 738 | # CONFIG_NOZOMI is not set |
727 | 739 | ||
@@ -749,7 +761,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
749 | # CONFIG_IPMI_HANDLER is not set | 761 | # CONFIG_IPMI_HANDLER is not set |
750 | CONFIG_HW_RANDOM=y | 762 | CONFIG_HW_RANDOM=y |
751 | # CONFIG_NVRAM is not set | 763 | # CONFIG_NVRAM is not set |
752 | # CONFIG_GEN_RTC is not set | ||
753 | # CONFIG_R3964 is not set | 764 | # CONFIG_R3964 is not set |
754 | # CONFIG_APPLICOM is not set | 765 | # CONFIG_APPLICOM is not set |
755 | # CONFIG_RAW_DRIVER is not set | 766 | # CONFIG_RAW_DRIVER is not set |
@@ -760,13 +771,6 @@ CONFIG_I2C_BOARDINFO=y | |||
760 | CONFIG_I2C_CHARDEV=y | 771 | CONFIG_I2C_CHARDEV=y |
761 | 772 | ||
762 | # | 773 | # |
763 | # I2C Algorithms | ||
764 | # | ||
765 | # CONFIG_I2C_ALGOBIT is not set | ||
766 | # CONFIG_I2C_ALGOPCF is not set | ||
767 | # CONFIG_I2C_ALGOPCA is not set | ||
768 | |||
769 | # | ||
770 | # I2C Hardware Bus support | 774 | # I2C Hardware Bus support |
771 | # | 775 | # |
772 | # CONFIG_I2C_ALI1535 is not set | 776 | # CONFIG_I2C_ALI1535 is not set |
@@ -793,6 +797,7 @@ CONFIG_I2C_MPC=y | |||
793 | # CONFIG_I2C_VIA is not set | 797 | # CONFIG_I2C_VIA is not set |
794 | # CONFIG_I2C_VIAPRO is not set | 798 | # CONFIG_I2C_VIAPRO is not set |
795 | # CONFIG_I2C_VOODOO3 is not set | 799 | # CONFIG_I2C_VOODOO3 is not set |
800 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
796 | 801 | ||
797 | # | 802 | # |
798 | # Miscellaneous I2C Chip support | 803 | # Miscellaneous I2C Chip support |
@@ -802,17 +807,12 @@ CONFIG_I2C_MPC=y | |||
802 | CONFIG_SENSORS_PCF8574=y | 807 | CONFIG_SENSORS_PCF8574=y |
803 | # CONFIG_PCF8575 is not set | 808 | # CONFIG_PCF8575 is not set |
804 | # CONFIG_SENSORS_PCF8591 is not set | 809 | # CONFIG_SENSORS_PCF8591 is not set |
805 | # CONFIG_TPS65010 is not set | ||
806 | # CONFIG_SENSORS_MAX6875 is not set | 810 | # CONFIG_SENSORS_MAX6875 is not set |
807 | # CONFIG_SENSORS_TSL2550 is not set | 811 | # CONFIG_SENSORS_TSL2550 is not set |
808 | # CONFIG_I2C_DEBUG_CORE is not set | 812 | # CONFIG_I2C_DEBUG_CORE is not set |
809 | # CONFIG_I2C_DEBUG_ALGO is not set | 813 | # CONFIG_I2C_DEBUG_ALGO is not set |
810 | # CONFIG_I2C_DEBUG_BUS is not set | 814 | # CONFIG_I2C_DEBUG_BUS is not set |
811 | # CONFIG_I2C_DEBUG_CHIP is not set | 815 | # CONFIG_I2C_DEBUG_CHIP is not set |
812 | |||
813 | # | ||
814 | # SPI support | ||
815 | # | ||
816 | CONFIG_SPI=y | 816 | CONFIG_SPI=y |
817 | CONFIG_SPI_MASTER=y | 817 | CONFIG_SPI_MASTER=y |
818 | 818 | ||
@@ -862,12 +862,22 @@ CONFIG_SSB_POSSIBLE=y | |||
862 | # Multifunction device drivers | 862 | # Multifunction device drivers |
863 | # | 863 | # |
864 | # CONFIG_MFD_SM501 is not set | 864 | # CONFIG_MFD_SM501 is not set |
865 | # CONFIG_HTC_PASIC3 is not set | ||
865 | 866 | ||
866 | # | 867 | # |
867 | # Multimedia devices | 868 | # Multimedia devices |
868 | # | 869 | # |
870 | |||
871 | # | ||
872 | # Multimedia core support | ||
873 | # | ||
869 | # CONFIG_VIDEO_DEV is not set | 874 | # CONFIG_VIDEO_DEV is not set |
870 | # CONFIG_DVB_CORE is not set | 875 | # CONFIG_DVB_CORE is not set |
876 | # CONFIG_VIDEO_MEDIA is not set | ||
877 | |||
878 | # | ||
879 | # Multimedia drivers | ||
880 | # | ||
871 | CONFIG_DAB=y | 881 | CONFIG_DAB=y |
872 | # CONFIG_USB_DABUSB is not set | 882 | # CONFIG_USB_DABUSB is not set |
873 | 883 | ||
@@ -905,16 +915,20 @@ CONFIG_USB_DEVICEFS=y | |||
905 | CONFIG_USB_DEVICE_CLASS=y | 915 | CONFIG_USB_DEVICE_CLASS=y |
906 | # CONFIG_USB_DYNAMIC_MINORS is not set | 916 | # CONFIG_USB_DYNAMIC_MINORS is not set |
907 | # CONFIG_USB_OTG is not set | 917 | # CONFIG_USB_OTG is not set |
918 | # CONFIG_USB_OTG_WHITELIST is not set | ||
919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
908 | 920 | ||
909 | # | 921 | # |
910 | # USB Host Controller Drivers | 922 | # USB Host Controller Drivers |
911 | # | 923 | # |
924 | # CONFIG_USB_C67X00_HCD is not set | ||
912 | CONFIG_USB_EHCI_HCD=y | 925 | CONFIG_USB_EHCI_HCD=y |
913 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 926 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
914 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 927 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
915 | CONFIG_USB_EHCI_FSL=y | 928 | CONFIG_USB_EHCI_FSL=y |
916 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 929 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
917 | # CONFIG_USB_ISP116X_HCD is not set | 930 | # CONFIG_USB_ISP116X_HCD is not set |
931 | # CONFIG_USB_ISP1760_HCD is not set | ||
918 | # CONFIG_USB_OHCI_HCD is not set | 932 | # CONFIG_USB_OHCI_HCD is not set |
919 | CONFIG_USB_UHCI_HCD=y | 933 | CONFIG_USB_UHCI_HCD=y |
920 | # CONFIG_USB_SL811_HCD is not set | 934 | # CONFIG_USB_SL811_HCD is not set |
@@ -925,6 +939,7 @@ CONFIG_USB_UHCI_HCD=y | |||
925 | # | 939 | # |
926 | # CONFIG_USB_ACM is not set | 940 | # CONFIG_USB_ACM is not set |
927 | # CONFIG_USB_PRINTER is not set | 941 | # CONFIG_USB_PRINTER is not set |
942 | # CONFIG_USB_WDM is not set | ||
928 | 943 | ||
929 | # | 944 | # |
930 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 945 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -945,6 +960,7 @@ CONFIG_USB_STORAGE=y | |||
945 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 960 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
946 | # CONFIG_USB_STORAGE_ALAUDA is not set | 961 | # CONFIG_USB_STORAGE_ALAUDA is not set |
947 | # CONFIG_USB_STORAGE_KARMA is not set | 962 | # CONFIG_USB_STORAGE_KARMA is not set |
963 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
948 | # CONFIG_USB_LIBUSUAL is not set | 964 | # CONFIG_USB_LIBUSUAL is not set |
949 | 965 | ||
950 | # | 966 | # |
@@ -982,10 +998,12 @@ CONFIG_USB_MON=y | |||
982 | # CONFIG_USB_TRANCEVIBRATOR is not set | 998 | # CONFIG_USB_TRANCEVIBRATOR is not set |
983 | # CONFIG_USB_IOWARRIOR is not set | 999 | # CONFIG_USB_IOWARRIOR is not set |
984 | # CONFIG_USB_TEST is not set | 1000 | # CONFIG_USB_TEST is not set |
1001 | # CONFIG_USB_ISIGHTFW is not set | ||
985 | # CONFIG_USB_GADGET is not set | 1002 | # CONFIG_USB_GADGET is not set |
986 | # CONFIG_MMC is not set | 1003 | # CONFIG_MMC is not set |
987 | # CONFIG_MEMSTICK is not set | 1004 | # CONFIG_MEMSTICK is not set |
988 | # CONFIG_NEW_LEDS is not set | 1005 | # CONFIG_NEW_LEDS is not set |
1006 | # CONFIG_ACCESSIBILITY is not set | ||
989 | # CONFIG_INFINIBAND is not set | 1007 | # CONFIG_INFINIBAND is not set |
990 | # CONFIG_EDAC is not set | 1008 | # CONFIG_EDAC is not set |
991 | CONFIG_RTC_LIB=y | 1009 | CONFIG_RTC_LIB=y |
@@ -1040,11 +1058,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
1040 | # | 1058 | # |
1041 | # on-CPU RTC drivers | 1059 | # on-CPU RTC drivers |
1042 | # | 1060 | # |
1061 | # CONFIG_RTC_DRV_PPC is not set | ||
1043 | # CONFIG_DMADEVICES is not set | 1062 | # CONFIG_DMADEVICES is not set |
1044 | |||
1045 | # | ||
1046 | # Userspace I/O | ||
1047 | # | ||
1048 | # CONFIG_UIO is not set | 1063 | # CONFIG_UIO is not set |
1049 | 1064 | ||
1050 | # | 1065 | # |
@@ -1064,7 +1079,6 @@ CONFIG_FS_MBCACHE=y | |||
1064 | # CONFIG_JFS_FS is not set | 1079 | # CONFIG_JFS_FS is not set |
1065 | # CONFIG_FS_POSIX_ACL is not set | 1080 | # CONFIG_FS_POSIX_ACL is not set |
1066 | # CONFIG_XFS_FS is not set | 1081 | # CONFIG_XFS_FS is not set |
1067 | # CONFIG_GFS2_FS is not set | ||
1068 | # CONFIG_OCFS2_FS is not set | 1082 | # CONFIG_OCFS2_FS is not set |
1069 | CONFIG_DNOTIFY=y | 1083 | CONFIG_DNOTIFY=y |
1070 | CONFIG_INOTIFY=y | 1084 | CONFIG_INOTIFY=y |
@@ -1126,7 +1140,6 @@ CONFIG_NFS_FS=y | |||
1126 | CONFIG_NFS_V3=y | 1140 | CONFIG_NFS_V3=y |
1127 | # CONFIG_NFS_V3_ACL is not set | 1141 | # CONFIG_NFS_V3_ACL is not set |
1128 | CONFIG_NFS_V4=y | 1142 | CONFIG_NFS_V4=y |
1129 | # CONFIG_NFS_DIRECTIO is not set | ||
1130 | # CONFIG_NFSD is not set | 1143 | # CONFIG_NFSD is not set |
1131 | CONFIG_ROOT_NFS=y | 1144 | CONFIG_ROOT_NFS=y |
1132 | CONFIG_LOCKD=y | 1145 | CONFIG_LOCKD=y |
@@ -1210,6 +1223,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1210 | # Library routines | 1223 | # Library routines |
1211 | # | 1224 | # |
1212 | CONFIG_BITREVERSE=y | 1225 | CONFIG_BITREVERSE=y |
1226 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1213 | # CONFIG_CRC_CCITT is not set | 1227 | # CONFIG_CRC_CCITT is not set |
1214 | # CONFIG_CRC16 is not set | 1228 | # CONFIG_CRC16 is not set |
1215 | # CONFIG_CRC_ITU_T is not set | 1229 | # CONFIG_CRC_ITU_T is not set |
@@ -1220,6 +1234,7 @@ CONFIG_PLIST=y | |||
1220 | CONFIG_HAS_IOMEM=y | 1234 | CONFIG_HAS_IOMEM=y |
1221 | CONFIG_HAS_IOPORT=y | 1235 | CONFIG_HAS_IOPORT=y |
1222 | CONFIG_HAS_DMA=y | 1236 | CONFIG_HAS_DMA=y |
1237 | CONFIG_HAVE_LMB=y | ||
1223 | 1238 | ||
1224 | # | 1239 | # |
1225 | # Kernel hacking | 1240 | # Kernel hacking |
@@ -1227,6 +1242,7 @@ CONFIG_HAS_DMA=y | |||
1227 | # CONFIG_PRINTK_TIME is not set | 1242 | # CONFIG_PRINTK_TIME is not set |
1228 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1243 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1229 | CONFIG_ENABLE_MUST_CHECK=y | 1244 | CONFIG_ENABLE_MUST_CHECK=y |
1245 | CONFIG_FRAME_WARN=1024 | ||
1230 | # CONFIG_MAGIC_SYSRQ is not set | 1246 | # CONFIG_MAGIC_SYSRQ is not set |
1231 | # CONFIG_UNUSED_SYMBOLS is not set | 1247 | # CONFIG_UNUSED_SYMBOLS is not set |
1232 | # CONFIG_DEBUG_FS is not set | 1248 | # CONFIG_DEBUG_FS is not set |
@@ -1236,6 +1252,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1236 | # CONFIG_SLUB_STATS is not set | 1252 | # CONFIG_SLUB_STATS is not set |
1237 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1253 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1238 | # CONFIG_SAMPLES is not set | 1254 | # CONFIG_SAMPLES is not set |
1255 | # CONFIG_IRQSTACKS is not set | ||
1239 | # CONFIG_PPC_EARLY_DEBUG is not set | 1256 | # CONFIG_PPC_EARLY_DEBUG is not set |
1240 | 1257 | ||
1241 | # | 1258 | # |
@@ -1245,51 +1262,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1245 | # CONFIG_SECURITY is not set | 1262 | # CONFIG_SECURITY is not set |
1246 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1263 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1247 | CONFIG_CRYPTO=y | 1264 | CONFIG_CRYPTO=y |
1265 | |||
1266 | # | ||
1267 | # Crypto core or helper | ||
1268 | # | ||
1248 | CONFIG_CRYPTO_ALGAPI=y | 1269 | CONFIG_CRYPTO_ALGAPI=y |
1249 | CONFIG_CRYPTO_BLKCIPHER=y | 1270 | CONFIG_CRYPTO_BLKCIPHER=y |
1250 | # CONFIG_CRYPTO_SEQIV is not set | ||
1251 | CONFIG_CRYPTO_MANAGER=y | 1271 | CONFIG_CRYPTO_MANAGER=y |
1272 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1273 | # CONFIG_CRYPTO_NULL is not set | ||
1274 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1275 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1276 | # CONFIG_CRYPTO_TEST is not set | ||
1277 | |||
1278 | # | ||
1279 | # Authenticated Encryption with Associated Data | ||
1280 | # | ||
1281 | # CONFIG_CRYPTO_CCM is not set | ||
1282 | # CONFIG_CRYPTO_GCM is not set | ||
1283 | # CONFIG_CRYPTO_SEQIV is not set | ||
1284 | |||
1285 | # | ||
1286 | # Block modes | ||
1287 | # | ||
1288 | CONFIG_CRYPTO_CBC=y | ||
1289 | # CONFIG_CRYPTO_CTR is not set | ||
1290 | # CONFIG_CRYPTO_CTS is not set | ||
1291 | # CONFIG_CRYPTO_ECB is not set | ||
1292 | # CONFIG_CRYPTO_LRW is not set | ||
1293 | CONFIG_CRYPTO_PCBC=m | ||
1294 | # CONFIG_CRYPTO_XTS is not set | ||
1295 | |||
1296 | # | ||
1297 | # Hash modes | ||
1298 | # | ||
1252 | # CONFIG_CRYPTO_HMAC is not set | 1299 | # CONFIG_CRYPTO_HMAC is not set |
1253 | # CONFIG_CRYPTO_XCBC is not set | 1300 | # CONFIG_CRYPTO_XCBC is not set |
1254 | # CONFIG_CRYPTO_NULL is not set | 1301 | |
1302 | # | ||
1303 | # Digest | ||
1304 | # | ||
1305 | # CONFIG_CRYPTO_CRC32C is not set | ||
1255 | # CONFIG_CRYPTO_MD4 is not set | 1306 | # CONFIG_CRYPTO_MD4 is not set |
1256 | CONFIG_CRYPTO_MD5=y | 1307 | CONFIG_CRYPTO_MD5=y |
1308 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1257 | # CONFIG_CRYPTO_SHA1 is not set | 1309 | # CONFIG_CRYPTO_SHA1 is not set |
1258 | # CONFIG_CRYPTO_SHA256 is not set | 1310 | # CONFIG_CRYPTO_SHA256 is not set |
1259 | # CONFIG_CRYPTO_SHA512 is not set | 1311 | # CONFIG_CRYPTO_SHA512 is not set |
1260 | # CONFIG_CRYPTO_WP512 is not set | ||
1261 | # CONFIG_CRYPTO_TGR192 is not set | 1312 | # CONFIG_CRYPTO_TGR192 is not set |
1262 | # CONFIG_CRYPTO_GF128MUL is not set | 1313 | # CONFIG_CRYPTO_WP512 is not set |
1263 | # CONFIG_CRYPTO_ECB is not set | 1314 | |
1264 | CONFIG_CRYPTO_CBC=y | 1315 | # |
1265 | CONFIG_CRYPTO_PCBC=m | 1316 | # Ciphers |
1266 | # CONFIG_CRYPTO_LRW is not set | 1317 | # |
1267 | # CONFIG_CRYPTO_XTS is not set | ||
1268 | # CONFIG_CRYPTO_CTR is not set | ||
1269 | # CONFIG_CRYPTO_GCM is not set | ||
1270 | # CONFIG_CRYPTO_CCM is not set | ||
1271 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1272 | CONFIG_CRYPTO_DES=y | ||
1273 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1274 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1275 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1276 | # CONFIG_CRYPTO_SERPENT is not set | ||
1277 | # CONFIG_CRYPTO_AES is not set | 1318 | # CONFIG_CRYPTO_AES is not set |
1319 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1320 | # CONFIG_CRYPTO_ARC4 is not set | ||
1321 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1322 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1278 | # CONFIG_CRYPTO_CAST5 is not set | 1323 | # CONFIG_CRYPTO_CAST5 is not set |
1279 | # CONFIG_CRYPTO_CAST6 is not set | 1324 | # CONFIG_CRYPTO_CAST6 is not set |
1280 | # CONFIG_CRYPTO_TEA is not set | 1325 | CONFIG_CRYPTO_DES=y |
1281 | # CONFIG_CRYPTO_ARC4 is not set | 1326 | # CONFIG_CRYPTO_FCRYPT is not set |
1282 | # CONFIG_CRYPTO_KHAZAD is not set | 1327 | # CONFIG_CRYPTO_KHAZAD is not set |
1283 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1284 | # CONFIG_CRYPTO_SEED is not set | ||
1285 | # CONFIG_CRYPTO_SALSA20 is not set | 1328 | # CONFIG_CRYPTO_SALSA20 is not set |
1329 | # CONFIG_CRYPTO_SEED is not set | ||
1330 | # CONFIG_CRYPTO_SERPENT is not set | ||
1331 | # CONFIG_CRYPTO_TEA is not set | ||
1332 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1333 | |||
1334 | # | ||
1335 | # Compression | ||
1336 | # | ||
1286 | # CONFIG_CRYPTO_DEFLATE is not set | 1337 | # CONFIG_CRYPTO_DEFLATE is not set |
1287 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1288 | # CONFIG_CRYPTO_CRC32C is not set | ||
1289 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1290 | # CONFIG_CRYPTO_TEST is not set | ||
1291 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1292 | # CONFIG_CRYPTO_LZO is not set | 1338 | # CONFIG_CRYPTO_LZO is not set |
1293 | CONFIG_CRYPTO_HW=y | 1339 | CONFIG_CRYPTO_HW=y |
1294 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1295 | # CONFIG_PPC_CLOCK is not set | 1341 | # CONFIG_PPC_CLOCK is not set |
1342 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index b4e39cf82a8c..fdac4845bad9 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:18 2008 | 4 | # Mon Jun 9 08:52:26 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
@@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
@@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
247 | # CONFIG_HAS_RAPIDIO is not set | ||
240 | 248 | ||
241 | # | 249 | # |
242 | # Advanced setup | 250 | # Advanced setup |
@@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
246 | # | 254 | # |
247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
248 | # | 256 | # |
249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | ||
252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
253 | CONFIG_BOOT_LOAD=0x00800000 | ||
254 | 262 | ||
255 | # | 263 | # |
256 | # Networking | 264 | # Networking |
@@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
302 | # CONFIG_INET6_TUNNEL is not set | ||
303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
@@ -432,6 +438,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
432 | # | 438 | # |
433 | # CONFIG_MTD_UBI is not set | 439 | # CONFIG_MTD_UBI is not set |
434 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
441 | CONFIG_OF_I2C=y | ||
435 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
436 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
437 | # CONFIG_BLK_DEV_FD is not set | 444 | # CONFIG_BLK_DEV_FD is not set |
@@ -587,7 +594,6 @@ CONFIG_NETDEV_1000=y | |||
587 | # CONFIG_SIS190 is not set | 594 | # CONFIG_SIS190 is not set |
588 | # CONFIG_SKGE is not set | 595 | # CONFIG_SKGE is not set |
589 | # CONFIG_SKY2 is not set | 596 | # CONFIG_SKY2 is not set |
590 | # CONFIG_SK98LIN is not set | ||
591 | # CONFIG_VIA_VELOCITY is not set | 597 | # CONFIG_VIA_VELOCITY is not set |
592 | # CONFIG_TIGON3 is not set | 598 | # CONFIG_TIGON3 is not set |
593 | # CONFIG_BNX2 is not set | 599 | # CONFIG_BNX2 is not set |
@@ -607,6 +613,7 @@ CONFIG_NETDEV_10000=y | |||
607 | # CONFIG_MLX4_CORE is not set | 613 | # CONFIG_MLX4_CORE is not set |
608 | # CONFIG_TEHUTI is not set | 614 | # CONFIG_TEHUTI is not set |
609 | # CONFIG_BNX2X is not set | 615 | # CONFIG_BNX2X is not set |
616 | # CONFIG_SFC is not set | ||
610 | # CONFIG_TR is not set | 617 | # CONFIG_TR is not set |
611 | 618 | ||
612 | # | 619 | # |
@@ -614,6 +621,7 @@ CONFIG_NETDEV_10000=y | |||
614 | # | 621 | # |
615 | # CONFIG_WLAN_PRE80211 is not set | 622 | # CONFIG_WLAN_PRE80211 is not set |
616 | # CONFIG_WLAN_80211 is not set | 623 | # CONFIG_WLAN_80211 is not set |
624 | # CONFIG_IWLWIFI_LEDS is not set | ||
617 | 625 | ||
618 | # | 626 | # |
619 | # USB Network Adapters | 627 | # USB Network Adapters |
@@ -650,6 +658,7 @@ CONFIG_NETDEV_10000=y | |||
650 | # Character devices | 658 | # Character devices |
651 | # | 659 | # |
652 | # CONFIG_VT is not set | 660 | # CONFIG_VT is not set |
661 | CONFIG_DEVKMEM=y | ||
653 | # CONFIG_SERIAL_NONSTANDARD is not set | 662 | # CONFIG_SERIAL_NONSTANDARD is not set |
654 | # CONFIG_NOZOMI is not set | 663 | # CONFIG_NOZOMI is not set |
655 | 664 | ||
@@ -677,7 +686,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
677 | # CONFIG_IPMI_HANDLER is not set | 686 | # CONFIG_IPMI_HANDLER is not set |
678 | CONFIG_HW_RANDOM=y | 687 | CONFIG_HW_RANDOM=y |
679 | # CONFIG_NVRAM is not set | 688 | # CONFIG_NVRAM is not set |
680 | # CONFIG_GEN_RTC is not set | ||
681 | # CONFIG_R3964 is not set | 689 | # CONFIG_R3964 is not set |
682 | # CONFIG_APPLICOM is not set | 690 | # CONFIG_APPLICOM is not set |
683 | # CONFIG_RAW_DRIVER is not set | 691 | # CONFIG_RAW_DRIVER is not set |
@@ -688,13 +696,6 @@ CONFIG_I2C_BOARDINFO=y | |||
688 | CONFIG_I2C_CHARDEV=y | 696 | CONFIG_I2C_CHARDEV=y |
689 | 697 | ||
690 | # | 698 | # |
691 | # I2C Algorithms | ||
692 | # | ||
693 | # CONFIG_I2C_ALGOBIT is not set | ||
694 | # CONFIG_I2C_ALGOPCF is not set | ||
695 | # CONFIG_I2C_ALGOPCA is not set | ||
696 | |||
697 | # | ||
698 | # I2C Hardware Bus support | 699 | # I2C Hardware Bus support |
699 | # | 700 | # |
700 | # CONFIG_I2C_ALI1535 is not set | 701 | # CONFIG_I2C_ALI1535 is not set |
@@ -721,6 +722,7 @@ CONFIG_I2C_MPC=y | |||
721 | # CONFIG_I2C_VIA is not set | 722 | # CONFIG_I2C_VIA is not set |
722 | # CONFIG_I2C_VIAPRO is not set | 723 | # CONFIG_I2C_VIAPRO is not set |
723 | # CONFIG_I2C_VOODOO3 is not set | 724 | # CONFIG_I2C_VOODOO3 is not set |
725 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
724 | 726 | ||
725 | # | 727 | # |
726 | # Miscellaneous I2C Chip support | 728 | # Miscellaneous I2C Chip support |
@@ -730,17 +732,12 @@ CONFIG_I2C_MPC=y | |||
730 | CONFIG_SENSORS_PCF8574=y | 732 | CONFIG_SENSORS_PCF8574=y |
731 | # CONFIG_PCF8575 is not set | 733 | # CONFIG_PCF8575 is not set |
732 | # CONFIG_SENSORS_PCF8591 is not set | 734 | # CONFIG_SENSORS_PCF8591 is not set |
733 | # CONFIG_TPS65010 is not set | ||
734 | # CONFIG_SENSORS_MAX6875 is not set | 735 | # CONFIG_SENSORS_MAX6875 is not set |
735 | # CONFIG_SENSORS_TSL2550 is not set | 736 | # CONFIG_SENSORS_TSL2550 is not set |
736 | # CONFIG_I2C_DEBUG_CORE is not set | 737 | # CONFIG_I2C_DEBUG_CORE is not set |
737 | # CONFIG_I2C_DEBUG_ALGO is not set | 738 | # CONFIG_I2C_DEBUG_ALGO is not set |
738 | # CONFIG_I2C_DEBUG_BUS is not set | 739 | # CONFIG_I2C_DEBUG_BUS is not set |
739 | # CONFIG_I2C_DEBUG_CHIP is not set | 740 | # CONFIG_I2C_DEBUG_CHIP is not set |
740 | |||
741 | # | ||
742 | # SPI support | ||
743 | # | ||
744 | CONFIG_SPI=y | 741 | CONFIG_SPI=y |
745 | CONFIG_SPI_MASTER=y | 742 | CONFIG_SPI_MASTER=y |
746 | 743 | ||
@@ -790,12 +787,22 @@ CONFIG_SSB_POSSIBLE=y | |||
790 | # Multifunction device drivers | 787 | # Multifunction device drivers |
791 | # | 788 | # |
792 | # CONFIG_MFD_SM501 is not set | 789 | # CONFIG_MFD_SM501 is not set |
790 | # CONFIG_HTC_PASIC3 is not set | ||
793 | 791 | ||
794 | # | 792 | # |
795 | # Multimedia devices | 793 | # Multimedia devices |
796 | # | 794 | # |
795 | |||
796 | # | ||
797 | # Multimedia core support | ||
798 | # | ||
797 | # CONFIG_VIDEO_DEV is not set | 799 | # CONFIG_VIDEO_DEV is not set |
798 | # CONFIG_DVB_CORE is not set | 800 | # CONFIG_DVB_CORE is not set |
801 | # CONFIG_VIDEO_MEDIA is not set | ||
802 | |||
803 | # | ||
804 | # Multimedia drivers | ||
805 | # | ||
799 | CONFIG_DAB=y | 806 | CONFIG_DAB=y |
800 | # CONFIG_USB_DABUSB is not set | 807 | # CONFIG_USB_DABUSB is not set |
801 | 808 | ||
@@ -833,16 +840,20 @@ CONFIG_USB=y | |||
833 | CONFIG_USB_DEVICE_CLASS=y | 840 | CONFIG_USB_DEVICE_CLASS=y |
834 | # CONFIG_USB_DYNAMIC_MINORS is not set | 841 | # CONFIG_USB_DYNAMIC_MINORS is not set |
835 | # CONFIG_USB_OTG is not set | 842 | # CONFIG_USB_OTG is not set |
843 | # CONFIG_USB_OTG_WHITELIST is not set | ||
844 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
836 | 845 | ||
837 | # | 846 | # |
838 | # USB Host Controller Drivers | 847 | # USB Host Controller Drivers |
839 | # | 848 | # |
849 | # CONFIG_USB_C67X00_HCD is not set | ||
840 | CONFIG_USB_EHCI_HCD=y | 850 | CONFIG_USB_EHCI_HCD=y |
841 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 851 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
842 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 852 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
843 | CONFIG_USB_EHCI_FSL=y | 853 | CONFIG_USB_EHCI_FSL=y |
844 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 854 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
845 | # CONFIG_USB_ISP116X_HCD is not set | 855 | # CONFIG_USB_ISP116X_HCD is not set |
856 | # CONFIG_USB_ISP1760_HCD is not set | ||
846 | # CONFIG_USB_OHCI_HCD is not set | 857 | # CONFIG_USB_OHCI_HCD is not set |
847 | CONFIG_USB_UHCI_HCD=y | 858 | CONFIG_USB_UHCI_HCD=y |
848 | # CONFIG_USB_SL811_HCD is not set | 859 | # CONFIG_USB_SL811_HCD is not set |
@@ -853,6 +864,7 @@ CONFIG_USB_UHCI_HCD=y | |||
853 | # | 864 | # |
854 | # CONFIG_USB_ACM is not set | 865 | # CONFIG_USB_ACM is not set |
855 | # CONFIG_USB_PRINTER is not set | 866 | # CONFIG_USB_PRINTER is not set |
867 | # CONFIG_USB_WDM is not set | ||
856 | 868 | ||
857 | # | 869 | # |
858 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 870 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -873,6 +885,7 @@ CONFIG_USB_STORAGE=y | |||
873 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
874 | # CONFIG_USB_STORAGE_ALAUDA is not set | 886 | # CONFIG_USB_STORAGE_ALAUDA is not set |
875 | # CONFIG_USB_STORAGE_KARMA is not set | 887 | # CONFIG_USB_STORAGE_KARMA is not set |
888 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
876 | # CONFIG_USB_LIBUSUAL is not set | 889 | # CONFIG_USB_LIBUSUAL is not set |
877 | 890 | ||
878 | # | 891 | # |
@@ -909,10 +922,12 @@ CONFIG_USB_MON=y | |||
909 | # CONFIG_USB_LD is not set | 922 | # CONFIG_USB_LD is not set |
910 | # CONFIG_USB_TRANCEVIBRATOR is not set | 923 | # CONFIG_USB_TRANCEVIBRATOR is not set |
911 | # CONFIG_USB_IOWARRIOR is not set | 924 | # CONFIG_USB_IOWARRIOR is not set |
925 | # CONFIG_USB_ISIGHTFW is not set | ||
912 | # CONFIG_USB_GADGET is not set | 926 | # CONFIG_USB_GADGET is not set |
913 | # CONFIG_MMC is not set | 927 | # CONFIG_MMC is not set |
914 | # CONFIG_MEMSTICK is not set | 928 | # CONFIG_MEMSTICK is not set |
915 | # CONFIG_NEW_LEDS is not set | 929 | # CONFIG_NEW_LEDS is not set |
930 | # CONFIG_ACCESSIBILITY is not set | ||
916 | # CONFIG_INFINIBAND is not set | 931 | # CONFIG_INFINIBAND is not set |
917 | # CONFIG_EDAC is not set | 932 | # CONFIG_EDAC is not set |
918 | CONFIG_RTC_LIB=y | 933 | CONFIG_RTC_LIB=y |
@@ -967,11 +982,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
967 | # | 982 | # |
968 | # on-CPU RTC drivers | 983 | # on-CPU RTC drivers |
969 | # | 984 | # |
985 | # CONFIG_RTC_DRV_PPC is not set | ||
970 | # CONFIG_DMADEVICES is not set | 986 | # CONFIG_DMADEVICES is not set |
971 | |||
972 | # | ||
973 | # Userspace I/O | ||
974 | # | ||
975 | # CONFIG_UIO is not set | 987 | # CONFIG_UIO is not set |
976 | 988 | ||
977 | # | 989 | # |
@@ -991,7 +1003,6 @@ CONFIG_FS_MBCACHE=y | |||
991 | # CONFIG_JFS_FS is not set | 1003 | # CONFIG_JFS_FS is not set |
992 | # CONFIG_FS_POSIX_ACL is not set | 1004 | # CONFIG_FS_POSIX_ACL is not set |
993 | # CONFIG_XFS_FS is not set | 1005 | # CONFIG_XFS_FS is not set |
994 | # CONFIG_GFS2_FS is not set | ||
995 | # CONFIG_OCFS2_FS is not set | 1006 | # CONFIG_OCFS2_FS is not set |
996 | CONFIG_DNOTIFY=y | 1007 | CONFIG_DNOTIFY=y |
997 | CONFIG_INOTIFY=y | 1008 | CONFIG_INOTIFY=y |
@@ -1053,7 +1064,6 @@ CONFIG_NFS_FS=y | |||
1053 | CONFIG_NFS_V3=y | 1064 | CONFIG_NFS_V3=y |
1054 | # CONFIG_NFS_V3_ACL is not set | 1065 | # CONFIG_NFS_V3_ACL is not set |
1055 | CONFIG_NFS_V4=y | 1066 | CONFIG_NFS_V4=y |
1056 | # CONFIG_NFS_DIRECTIO is not set | ||
1057 | # CONFIG_NFSD is not set | 1067 | # CONFIG_NFSD is not set |
1058 | CONFIG_ROOT_NFS=y | 1068 | CONFIG_ROOT_NFS=y |
1059 | CONFIG_LOCKD=y | 1069 | CONFIG_LOCKD=y |
@@ -1137,6 +1147,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1137 | # Library routines | 1147 | # Library routines |
1138 | # | 1148 | # |
1139 | CONFIG_BITREVERSE=y | 1149 | CONFIG_BITREVERSE=y |
1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1140 | # CONFIG_CRC_CCITT is not set | 1151 | # CONFIG_CRC_CCITT is not set |
1141 | # CONFIG_CRC16 is not set | 1152 | # CONFIG_CRC16 is not set |
1142 | # CONFIG_CRC_ITU_T is not set | 1153 | # CONFIG_CRC_ITU_T is not set |
@@ -1147,6 +1158,7 @@ CONFIG_PLIST=y | |||
1147 | CONFIG_HAS_IOMEM=y | 1158 | CONFIG_HAS_IOMEM=y |
1148 | CONFIG_HAS_IOPORT=y | 1159 | CONFIG_HAS_IOPORT=y |
1149 | CONFIG_HAS_DMA=y | 1160 | CONFIG_HAS_DMA=y |
1161 | CONFIG_HAVE_LMB=y | ||
1150 | 1162 | ||
1151 | # | 1163 | # |
1152 | # Kernel hacking | 1164 | # Kernel hacking |
@@ -1154,6 +1166,7 @@ CONFIG_HAS_DMA=y | |||
1154 | # CONFIG_PRINTK_TIME is not set | 1166 | # CONFIG_PRINTK_TIME is not set |
1155 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1167 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1156 | CONFIG_ENABLE_MUST_CHECK=y | 1168 | CONFIG_ENABLE_MUST_CHECK=y |
1169 | CONFIG_FRAME_WARN=1024 | ||
1157 | # CONFIG_MAGIC_SYSRQ is not set | 1170 | # CONFIG_MAGIC_SYSRQ is not set |
1158 | # CONFIG_UNUSED_SYMBOLS is not set | 1171 | # CONFIG_UNUSED_SYMBOLS is not set |
1159 | # CONFIG_DEBUG_FS is not set | 1172 | # CONFIG_DEBUG_FS is not set |
@@ -1163,6 +1176,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1163 | # CONFIG_SLUB_STATS is not set | 1176 | # CONFIG_SLUB_STATS is not set |
1164 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1177 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1165 | # CONFIG_SAMPLES is not set | 1178 | # CONFIG_SAMPLES is not set |
1179 | # CONFIG_IRQSTACKS is not set | ||
1166 | # CONFIG_PPC_EARLY_DEBUG is not set | 1180 | # CONFIG_PPC_EARLY_DEBUG is not set |
1167 | 1181 | ||
1168 | # | 1182 | # |
@@ -1172,51 +1186,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1172 | # CONFIG_SECURITY is not set | 1186 | # CONFIG_SECURITY is not set |
1173 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1187 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1174 | CONFIG_CRYPTO=y | 1188 | CONFIG_CRYPTO=y |
1189 | |||
1190 | # | ||
1191 | # Crypto core or helper | ||
1192 | # | ||
1175 | CONFIG_CRYPTO_ALGAPI=y | 1193 | CONFIG_CRYPTO_ALGAPI=y |
1176 | CONFIG_CRYPTO_BLKCIPHER=y | 1194 | CONFIG_CRYPTO_BLKCIPHER=y |
1177 | # CONFIG_CRYPTO_SEQIV is not set | ||
1178 | CONFIG_CRYPTO_MANAGER=y | 1195 | CONFIG_CRYPTO_MANAGER=y |
1196 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1197 | # CONFIG_CRYPTO_NULL is not set | ||
1198 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1199 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1200 | # CONFIG_CRYPTO_TEST is not set | ||
1201 | |||
1202 | # | ||
1203 | # Authenticated Encryption with Associated Data | ||
1204 | # | ||
1205 | # CONFIG_CRYPTO_CCM is not set | ||
1206 | # CONFIG_CRYPTO_GCM is not set | ||
1207 | # CONFIG_CRYPTO_SEQIV is not set | ||
1208 | |||
1209 | # | ||
1210 | # Block modes | ||
1211 | # | ||
1212 | CONFIG_CRYPTO_CBC=y | ||
1213 | # CONFIG_CRYPTO_CTR is not set | ||
1214 | # CONFIG_CRYPTO_CTS is not set | ||
1215 | # CONFIG_CRYPTO_ECB is not set | ||
1216 | # CONFIG_CRYPTO_LRW is not set | ||
1217 | CONFIG_CRYPTO_PCBC=m | ||
1218 | # CONFIG_CRYPTO_XTS is not set | ||
1219 | |||
1220 | # | ||
1221 | # Hash modes | ||
1222 | # | ||
1179 | # CONFIG_CRYPTO_HMAC is not set | 1223 | # CONFIG_CRYPTO_HMAC is not set |
1180 | # CONFIG_CRYPTO_XCBC is not set | 1224 | # CONFIG_CRYPTO_XCBC is not set |
1181 | # CONFIG_CRYPTO_NULL is not set | 1225 | |
1226 | # | ||
1227 | # Digest | ||
1228 | # | ||
1229 | # CONFIG_CRYPTO_CRC32C is not set | ||
1182 | # CONFIG_CRYPTO_MD4 is not set | 1230 | # CONFIG_CRYPTO_MD4 is not set |
1183 | CONFIG_CRYPTO_MD5=y | 1231 | CONFIG_CRYPTO_MD5=y |
1232 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1184 | # CONFIG_CRYPTO_SHA1 is not set | 1233 | # CONFIG_CRYPTO_SHA1 is not set |
1185 | # CONFIG_CRYPTO_SHA256 is not set | 1234 | # CONFIG_CRYPTO_SHA256 is not set |
1186 | # CONFIG_CRYPTO_SHA512 is not set | 1235 | # CONFIG_CRYPTO_SHA512 is not set |
1187 | # CONFIG_CRYPTO_WP512 is not set | ||
1188 | # CONFIG_CRYPTO_TGR192 is not set | 1236 | # CONFIG_CRYPTO_TGR192 is not set |
1189 | # CONFIG_CRYPTO_GF128MUL is not set | 1237 | # CONFIG_CRYPTO_WP512 is not set |
1190 | # CONFIG_CRYPTO_ECB is not set | 1238 | |
1191 | CONFIG_CRYPTO_CBC=y | 1239 | # |
1192 | CONFIG_CRYPTO_PCBC=m | 1240 | # Ciphers |
1193 | # CONFIG_CRYPTO_LRW is not set | 1241 | # |
1194 | # CONFIG_CRYPTO_XTS is not set | ||
1195 | # CONFIG_CRYPTO_CTR is not set | ||
1196 | # CONFIG_CRYPTO_GCM is not set | ||
1197 | # CONFIG_CRYPTO_CCM is not set | ||
1198 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1199 | CONFIG_CRYPTO_DES=y | ||
1200 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1201 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1202 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1203 | # CONFIG_CRYPTO_SERPENT is not set | ||
1204 | # CONFIG_CRYPTO_AES is not set | 1242 | # CONFIG_CRYPTO_AES is not set |
1243 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1244 | # CONFIG_CRYPTO_ARC4 is not set | ||
1245 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1246 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1205 | # CONFIG_CRYPTO_CAST5 is not set | 1247 | # CONFIG_CRYPTO_CAST5 is not set |
1206 | # CONFIG_CRYPTO_CAST6 is not set | 1248 | # CONFIG_CRYPTO_CAST6 is not set |
1207 | # CONFIG_CRYPTO_TEA is not set | 1249 | CONFIG_CRYPTO_DES=y |
1208 | # CONFIG_CRYPTO_ARC4 is not set | 1250 | # CONFIG_CRYPTO_FCRYPT is not set |
1209 | # CONFIG_CRYPTO_KHAZAD is not set | 1251 | # CONFIG_CRYPTO_KHAZAD is not set |
1210 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1211 | # CONFIG_CRYPTO_SEED is not set | ||
1212 | # CONFIG_CRYPTO_SALSA20 is not set | 1252 | # CONFIG_CRYPTO_SALSA20 is not set |
1253 | # CONFIG_CRYPTO_SEED is not set | ||
1254 | # CONFIG_CRYPTO_SERPENT is not set | ||
1255 | # CONFIG_CRYPTO_TEA is not set | ||
1256 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1257 | |||
1258 | # | ||
1259 | # Compression | ||
1260 | # | ||
1213 | # CONFIG_CRYPTO_DEFLATE is not set | 1261 | # CONFIG_CRYPTO_DEFLATE is not set |
1214 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1215 | # CONFIG_CRYPTO_CRC32C is not set | ||
1216 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1217 | # CONFIG_CRYPTO_TEST is not set | ||
1218 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1219 | # CONFIG_CRYPTO_LZO is not set | 1262 | # CONFIG_CRYPTO_LZO is not set |
1220 | CONFIG_CRYPTO_HW=y | 1263 | CONFIG_CRYPTO_HW=y |
1221 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1264 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1222 | # CONFIG_PPC_CLOCK is not set | 1265 | # CONFIG_PPC_CLOCK is not set |
1266 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index b4e82c0e2be7..c82e96e984fc 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:36:56 2008 | 4 | # Mon Jun 9 08:52:26 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
@@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
@@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
247 | # CONFIG_HAS_RAPIDIO is not set | ||
240 | 248 | ||
241 | # | 249 | # |
242 | # Advanced setup | 250 | # Advanced setup |
@@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
246 | # | 254 | # |
247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
248 | # | 256 | # |
249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | ||
252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
253 | CONFIG_BOOT_LOAD=0x00800000 | ||
254 | 262 | ||
255 | # | 263 | # |
256 | # Networking | 264 | # Networking |
@@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
302 | # CONFIG_INET6_TUNNEL is not set | ||
303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
@@ -353,6 +359,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
353 | # CONFIG_CONNECTOR is not set | 359 | # CONFIG_CONNECTOR is not set |
354 | # CONFIG_MTD is not set | 360 | # CONFIG_MTD is not set |
355 | CONFIG_OF_DEVICE=y | 361 | CONFIG_OF_DEVICE=y |
362 | CONFIG_OF_I2C=y | ||
356 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
357 | CONFIG_BLK_DEV=y | 364 | CONFIG_BLK_DEV=y |
358 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
@@ -471,7 +478,6 @@ CONFIG_NETDEV_1000=y | |||
471 | # CONFIG_SIS190 is not set | 478 | # CONFIG_SIS190 is not set |
472 | # CONFIG_SKGE is not set | 479 | # CONFIG_SKGE is not set |
473 | # CONFIG_SKY2 is not set | 480 | # CONFIG_SKY2 is not set |
474 | # CONFIG_SK98LIN is not set | ||
475 | # CONFIG_VIA_VELOCITY is not set | 481 | # CONFIG_VIA_VELOCITY is not set |
476 | # CONFIG_TIGON3 is not set | 482 | # CONFIG_TIGON3 is not set |
477 | # CONFIG_BNX2 is not set | 483 | # CONFIG_BNX2 is not set |
@@ -491,6 +497,7 @@ CONFIG_NETDEV_10000=y | |||
491 | # CONFIG_MLX4_CORE is not set | 497 | # CONFIG_MLX4_CORE is not set |
492 | # CONFIG_TEHUTI is not set | 498 | # CONFIG_TEHUTI is not set |
493 | # CONFIG_BNX2X is not set | 499 | # CONFIG_BNX2X is not set |
500 | # CONFIG_SFC is not set | ||
494 | # CONFIG_TR is not set | 501 | # CONFIG_TR is not set |
495 | 502 | ||
496 | # | 503 | # |
@@ -498,6 +505,7 @@ CONFIG_NETDEV_10000=y | |||
498 | # | 505 | # |
499 | # CONFIG_WLAN_PRE80211 is not set | 506 | # CONFIG_WLAN_PRE80211 is not set |
500 | # CONFIG_WLAN_80211 is not set | 507 | # CONFIG_WLAN_80211 is not set |
508 | # CONFIG_IWLWIFI_LEDS is not set | ||
501 | # CONFIG_WAN is not set | 509 | # CONFIG_WAN is not set |
502 | # CONFIG_FDDI is not set | 510 | # CONFIG_FDDI is not set |
503 | # CONFIG_HIPPI is not set | 511 | # CONFIG_HIPPI is not set |
@@ -544,6 +552,7 @@ CONFIG_INPUT=y | |||
544 | # Character devices | 552 | # Character devices |
545 | # | 553 | # |
546 | # CONFIG_VT is not set | 554 | # CONFIG_VT is not set |
555 | CONFIG_DEVKMEM=y | ||
547 | # CONFIG_SERIAL_NONSTANDARD is not set | 556 | # CONFIG_SERIAL_NONSTANDARD is not set |
548 | # CONFIG_NOZOMI is not set | 557 | # CONFIG_NOZOMI is not set |
549 | 558 | ||
@@ -571,7 +580,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
571 | # CONFIG_IPMI_HANDLER is not set | 580 | # CONFIG_IPMI_HANDLER is not set |
572 | # CONFIG_HW_RANDOM is not set | 581 | # CONFIG_HW_RANDOM is not set |
573 | # CONFIG_NVRAM is not set | 582 | # CONFIG_NVRAM is not set |
574 | # CONFIG_GEN_RTC is not set | ||
575 | # CONFIG_R3964 is not set | 583 | # CONFIG_R3964 is not set |
576 | # CONFIG_APPLICOM is not set | 584 | # CONFIG_APPLICOM is not set |
577 | # CONFIG_RAW_DRIVER is not set | 585 | # CONFIG_RAW_DRIVER is not set |
@@ -582,13 +590,6 @@ CONFIG_I2C_BOARDINFO=y | |||
582 | CONFIG_I2C_CHARDEV=y | 590 | CONFIG_I2C_CHARDEV=y |
583 | 591 | ||
584 | # | 592 | # |
585 | # I2C Algorithms | ||
586 | # | ||
587 | # CONFIG_I2C_ALGOBIT is not set | ||
588 | # CONFIG_I2C_ALGOPCF is not set | ||
589 | # CONFIG_I2C_ALGOPCA is not set | ||
590 | |||
591 | # | ||
592 | # I2C Hardware Bus support | 593 | # I2C Hardware Bus support |
593 | # | 594 | # |
594 | # CONFIG_I2C_ALI1535 is not set | 595 | # CONFIG_I2C_ALI1535 is not set |
@@ -614,6 +615,7 @@ CONFIG_I2C_MPC=y | |||
614 | # CONFIG_I2C_VIA is not set | 615 | # CONFIG_I2C_VIA is not set |
615 | # CONFIG_I2C_VIAPRO is not set | 616 | # CONFIG_I2C_VIAPRO is not set |
616 | # CONFIG_I2C_VOODOO3 is not set | 617 | # CONFIG_I2C_VOODOO3 is not set |
618 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
617 | 619 | ||
618 | # | 620 | # |
619 | # Miscellaneous I2C Chip support | 621 | # Miscellaneous I2C Chip support |
@@ -623,19 +625,13 @@ CONFIG_I2C_MPC=y | |||
623 | # CONFIG_SENSORS_PCF8574 is not set | 625 | # CONFIG_SENSORS_PCF8574 is not set |
624 | # CONFIG_PCF8575 is not set | 626 | # CONFIG_PCF8575 is not set |
625 | # CONFIG_SENSORS_PCF8591 is not set | 627 | # CONFIG_SENSORS_PCF8591 is not set |
626 | # CONFIG_TPS65010 is not set | ||
627 | # CONFIG_SENSORS_MAX6875 is not set | 628 | # CONFIG_SENSORS_MAX6875 is not set |
628 | # CONFIG_SENSORS_TSL2550 is not set | 629 | # CONFIG_SENSORS_TSL2550 is not set |
629 | # CONFIG_I2C_DEBUG_CORE is not set | 630 | # CONFIG_I2C_DEBUG_CORE is not set |
630 | # CONFIG_I2C_DEBUG_ALGO is not set | 631 | # CONFIG_I2C_DEBUG_ALGO is not set |
631 | # CONFIG_I2C_DEBUG_BUS is not set | 632 | # CONFIG_I2C_DEBUG_BUS is not set |
632 | # CONFIG_I2C_DEBUG_CHIP is not set | 633 | # CONFIG_I2C_DEBUG_CHIP is not set |
633 | |||
634 | # | ||
635 | # SPI support | ||
636 | # | ||
637 | # CONFIG_SPI is not set | 634 | # CONFIG_SPI is not set |
638 | # CONFIG_SPI_MASTER is not set | ||
639 | # CONFIG_W1 is not set | 635 | # CONFIG_W1 is not set |
640 | # CONFIG_POWER_SUPPLY is not set | 636 | # CONFIG_POWER_SUPPLY is not set |
641 | CONFIG_HWMON=y | 637 | CONFIG_HWMON=y |
@@ -718,12 +714,22 @@ CONFIG_SSB_POSSIBLE=y | |||
718 | # Multifunction device drivers | 714 | # Multifunction device drivers |
719 | # | 715 | # |
720 | # CONFIG_MFD_SM501 is not set | 716 | # CONFIG_MFD_SM501 is not set |
717 | # CONFIG_HTC_PASIC3 is not set | ||
721 | 718 | ||
722 | # | 719 | # |
723 | # Multimedia devices | 720 | # Multimedia devices |
724 | # | 721 | # |
722 | |||
723 | # | ||
724 | # Multimedia core support | ||
725 | # | ||
725 | # CONFIG_VIDEO_DEV is not set | 726 | # CONFIG_VIDEO_DEV is not set |
726 | # CONFIG_DVB_CORE is not set | 727 | # CONFIG_DVB_CORE is not set |
728 | # CONFIG_VIDEO_MEDIA is not set | ||
729 | |||
730 | # | ||
731 | # Multimedia drivers | ||
732 | # | ||
727 | CONFIG_DAB=y | 733 | CONFIG_DAB=y |
728 | 734 | ||
729 | # | 735 | # |
@@ -754,6 +760,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
754 | CONFIG_USB_ARCH_HAS_OHCI=y | 760 | CONFIG_USB_ARCH_HAS_OHCI=y |
755 | CONFIG_USB_ARCH_HAS_EHCI=y | 761 | CONFIG_USB_ARCH_HAS_EHCI=y |
756 | # CONFIG_USB is not set | 762 | # CONFIG_USB is not set |
763 | # CONFIG_USB_OTG_WHITELIST is not set | ||
764 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
757 | 765 | ||
758 | # | 766 | # |
759 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 767 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -762,6 +770,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
762 | # CONFIG_MMC is not set | 770 | # CONFIG_MMC is not set |
763 | # CONFIG_MEMSTICK is not set | 771 | # CONFIG_MEMSTICK is not set |
764 | # CONFIG_NEW_LEDS is not set | 772 | # CONFIG_NEW_LEDS is not set |
773 | # CONFIG_ACCESSIBILITY is not set | ||
765 | # CONFIG_INFINIBAND is not set | 774 | # CONFIG_INFINIBAND is not set |
766 | # CONFIG_EDAC is not set | 775 | # CONFIG_EDAC is not set |
767 | CONFIG_RTC_LIB=y | 776 | CONFIG_RTC_LIB=y |
@@ -813,11 +822,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
813 | # | 822 | # |
814 | # on-CPU RTC drivers | 823 | # on-CPU RTC drivers |
815 | # | 824 | # |
825 | # CONFIG_RTC_DRV_PPC is not set | ||
816 | # CONFIG_DMADEVICES is not set | 826 | # CONFIG_DMADEVICES is not set |
817 | |||
818 | # | ||
819 | # Userspace I/O | ||
820 | # | ||
821 | # CONFIG_UIO is not set | 827 | # CONFIG_UIO is not set |
822 | 828 | ||
823 | # | 829 | # |
@@ -837,7 +843,6 @@ CONFIG_FS_MBCACHE=y | |||
837 | # CONFIG_JFS_FS is not set | 843 | # CONFIG_JFS_FS is not set |
838 | # CONFIG_FS_POSIX_ACL is not set | 844 | # CONFIG_FS_POSIX_ACL is not set |
839 | # CONFIG_XFS_FS is not set | 845 | # CONFIG_XFS_FS is not set |
840 | # CONFIG_GFS2_FS is not set | ||
841 | # CONFIG_OCFS2_FS is not set | 846 | # CONFIG_OCFS2_FS is not set |
842 | CONFIG_DNOTIFY=y | 847 | CONFIG_DNOTIFY=y |
843 | CONFIG_INOTIFY=y | 848 | CONFIG_INOTIFY=y |
@@ -895,7 +900,6 @@ CONFIG_NFS_FS=y | |||
895 | CONFIG_NFS_V3=y | 900 | CONFIG_NFS_V3=y |
896 | # CONFIG_NFS_V3_ACL is not set | 901 | # CONFIG_NFS_V3_ACL is not set |
897 | CONFIG_NFS_V4=y | 902 | CONFIG_NFS_V4=y |
898 | # CONFIG_NFS_DIRECTIO is not set | ||
899 | # CONFIG_NFSD is not set | 903 | # CONFIG_NFSD is not set |
900 | CONFIG_ROOT_NFS=y | 904 | CONFIG_ROOT_NFS=y |
901 | CONFIG_LOCKD=y | 905 | CONFIG_LOCKD=y |
@@ -936,6 +940,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
936 | # Library routines | 940 | # Library routines |
937 | # | 941 | # |
938 | CONFIG_BITREVERSE=y | 942 | CONFIG_BITREVERSE=y |
943 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
939 | # CONFIG_CRC_CCITT is not set | 944 | # CONFIG_CRC_CCITT is not set |
940 | # CONFIG_CRC16 is not set | 945 | # CONFIG_CRC16 is not set |
941 | # CONFIG_CRC_ITU_T is not set | 946 | # CONFIG_CRC_ITU_T is not set |
@@ -946,6 +951,7 @@ CONFIG_PLIST=y | |||
946 | CONFIG_HAS_IOMEM=y | 951 | CONFIG_HAS_IOMEM=y |
947 | CONFIG_HAS_IOPORT=y | 952 | CONFIG_HAS_IOPORT=y |
948 | CONFIG_HAS_DMA=y | 953 | CONFIG_HAS_DMA=y |
954 | CONFIG_HAVE_LMB=y | ||
949 | 955 | ||
950 | # | 956 | # |
951 | # Kernel hacking | 957 | # Kernel hacking |
@@ -953,6 +959,7 @@ CONFIG_HAS_DMA=y | |||
953 | # CONFIG_PRINTK_TIME is not set | 959 | # CONFIG_PRINTK_TIME is not set |
954 | CONFIG_ENABLE_WARN_DEPRECATED=y | 960 | CONFIG_ENABLE_WARN_DEPRECATED=y |
955 | CONFIG_ENABLE_MUST_CHECK=y | 961 | CONFIG_ENABLE_MUST_CHECK=y |
962 | CONFIG_FRAME_WARN=1024 | ||
956 | # CONFIG_MAGIC_SYSRQ is not set | 963 | # CONFIG_MAGIC_SYSRQ is not set |
957 | # CONFIG_UNUSED_SYMBOLS is not set | 964 | # CONFIG_UNUSED_SYMBOLS is not set |
958 | # CONFIG_DEBUG_FS is not set | 965 | # CONFIG_DEBUG_FS is not set |
@@ -962,6 +969,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
962 | # CONFIG_SLUB_STATS is not set | 969 | # CONFIG_SLUB_STATS is not set |
963 | # CONFIG_DEBUG_BUGVERBOSE is not set | 970 | # CONFIG_DEBUG_BUGVERBOSE is not set |
964 | # CONFIG_SAMPLES is not set | 971 | # CONFIG_SAMPLES is not set |
972 | # CONFIG_IRQSTACKS is not set | ||
965 | # CONFIG_PPC_EARLY_DEBUG is not set | 973 | # CONFIG_PPC_EARLY_DEBUG is not set |
966 | 974 | ||
967 | # | 975 | # |
@@ -971,51 +979,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
971 | # CONFIG_SECURITY is not set | 979 | # CONFIG_SECURITY is not set |
972 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 980 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
973 | CONFIG_CRYPTO=y | 981 | CONFIG_CRYPTO=y |
982 | |||
983 | # | ||
984 | # Crypto core or helper | ||
985 | # | ||
974 | CONFIG_CRYPTO_ALGAPI=y | 986 | CONFIG_CRYPTO_ALGAPI=y |
975 | CONFIG_CRYPTO_BLKCIPHER=y | 987 | CONFIG_CRYPTO_BLKCIPHER=y |
976 | # CONFIG_CRYPTO_SEQIV is not set | ||
977 | CONFIG_CRYPTO_MANAGER=y | 988 | CONFIG_CRYPTO_MANAGER=y |
989 | # CONFIG_CRYPTO_GF128MUL is not set | ||
990 | # CONFIG_CRYPTO_NULL is not set | ||
991 | # CONFIG_CRYPTO_CRYPTD is not set | ||
992 | # CONFIG_CRYPTO_AUTHENC is not set | ||
993 | # CONFIG_CRYPTO_TEST is not set | ||
994 | |||
995 | # | ||
996 | # Authenticated Encryption with Associated Data | ||
997 | # | ||
998 | # CONFIG_CRYPTO_CCM is not set | ||
999 | # CONFIG_CRYPTO_GCM is not set | ||
1000 | # CONFIG_CRYPTO_SEQIV is not set | ||
1001 | |||
1002 | # | ||
1003 | # Block modes | ||
1004 | # | ||
1005 | CONFIG_CRYPTO_CBC=y | ||
1006 | # CONFIG_CRYPTO_CTR is not set | ||
1007 | # CONFIG_CRYPTO_CTS is not set | ||
1008 | CONFIG_CRYPTO_ECB=m | ||
1009 | # CONFIG_CRYPTO_LRW is not set | ||
1010 | CONFIG_CRYPTO_PCBC=m | ||
1011 | # CONFIG_CRYPTO_XTS is not set | ||
1012 | |||
1013 | # | ||
1014 | # Hash modes | ||
1015 | # | ||
978 | # CONFIG_CRYPTO_HMAC is not set | 1016 | # CONFIG_CRYPTO_HMAC is not set |
979 | # CONFIG_CRYPTO_XCBC is not set | 1017 | # CONFIG_CRYPTO_XCBC is not set |
980 | # CONFIG_CRYPTO_NULL is not set | 1018 | |
1019 | # | ||
1020 | # Digest | ||
1021 | # | ||
1022 | # CONFIG_CRYPTO_CRC32C is not set | ||
981 | # CONFIG_CRYPTO_MD4 is not set | 1023 | # CONFIG_CRYPTO_MD4 is not set |
982 | CONFIG_CRYPTO_MD5=y | 1024 | CONFIG_CRYPTO_MD5=y |
1025 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
983 | # CONFIG_CRYPTO_SHA1 is not set | 1026 | # CONFIG_CRYPTO_SHA1 is not set |
984 | # CONFIG_CRYPTO_SHA256 is not set | 1027 | # CONFIG_CRYPTO_SHA256 is not set |
985 | # CONFIG_CRYPTO_SHA512 is not set | 1028 | # CONFIG_CRYPTO_SHA512 is not set |
986 | # CONFIG_CRYPTO_WP512 is not set | ||
987 | # CONFIG_CRYPTO_TGR192 is not set | 1029 | # CONFIG_CRYPTO_TGR192 is not set |
988 | # CONFIG_CRYPTO_GF128MUL is not set | 1030 | # CONFIG_CRYPTO_WP512 is not set |
989 | CONFIG_CRYPTO_ECB=m | 1031 | |
990 | CONFIG_CRYPTO_CBC=y | 1032 | # |
991 | CONFIG_CRYPTO_PCBC=m | 1033 | # Ciphers |
992 | # CONFIG_CRYPTO_LRW is not set | 1034 | # |
993 | # CONFIG_CRYPTO_XTS is not set | ||
994 | # CONFIG_CRYPTO_CTR is not set | ||
995 | # CONFIG_CRYPTO_GCM is not set | ||
996 | # CONFIG_CRYPTO_CCM is not set | ||
997 | # CONFIG_CRYPTO_CRYPTD is not set | ||
998 | CONFIG_CRYPTO_DES=y | ||
999 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1000 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1001 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1002 | # CONFIG_CRYPTO_SERPENT is not set | ||
1003 | # CONFIG_CRYPTO_AES is not set | 1035 | # CONFIG_CRYPTO_AES is not set |
1036 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1037 | # CONFIG_CRYPTO_ARC4 is not set | ||
1038 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1039 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1004 | # CONFIG_CRYPTO_CAST5 is not set | 1040 | # CONFIG_CRYPTO_CAST5 is not set |
1005 | # CONFIG_CRYPTO_CAST6 is not set | 1041 | # CONFIG_CRYPTO_CAST6 is not set |
1006 | # CONFIG_CRYPTO_TEA is not set | 1042 | CONFIG_CRYPTO_DES=y |
1007 | # CONFIG_CRYPTO_ARC4 is not set | 1043 | # CONFIG_CRYPTO_FCRYPT is not set |
1008 | # CONFIG_CRYPTO_KHAZAD is not set | 1044 | # CONFIG_CRYPTO_KHAZAD is not set |
1009 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1010 | # CONFIG_CRYPTO_SEED is not set | ||
1011 | # CONFIG_CRYPTO_SALSA20 is not set | 1045 | # CONFIG_CRYPTO_SALSA20 is not set |
1046 | # CONFIG_CRYPTO_SEED is not set | ||
1047 | # CONFIG_CRYPTO_SERPENT is not set | ||
1048 | # CONFIG_CRYPTO_TEA is not set | ||
1049 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1050 | |||
1051 | # | ||
1052 | # Compression | ||
1053 | # | ||
1012 | # CONFIG_CRYPTO_DEFLATE is not set | 1054 | # CONFIG_CRYPTO_DEFLATE is not set |
1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1014 | # CONFIG_CRYPTO_CRC32C is not set | ||
1015 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1016 | # CONFIG_CRYPTO_TEST is not set | ||
1017 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1018 | # CONFIG_CRYPTO_LZO is not set | 1055 | # CONFIG_CRYPTO_LZO is not set |
1019 | CONFIG_CRYPTO_HW=y | 1056 | CONFIG_CRYPTO_HW=y |
1020 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1057 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1021 | # CONFIG_PPC_CLOCK is not set | 1058 | # CONFIG_PPC_CLOCK is not set |
1059 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index d50a96eddcdc..20fd9f58cf42 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:36:57 2008 | 4 | # Mon Jun 9 08:52:27 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
@@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
@@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
247 | # CONFIG_HAS_RAPIDIO is not set | ||
240 | 248 | ||
241 | # | 249 | # |
242 | # Advanced setup | 250 | # Advanced setup |
@@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
246 | # | 254 | # |
247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
248 | # | 256 | # |
249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | ||
252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
253 | CONFIG_BOOT_LOAD=0x00800000 | ||
254 | 262 | ||
255 | # | 263 | # |
256 | # Networking | 264 | # Networking |
@@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
302 | # CONFIG_INET6_TUNNEL is not set | ||
303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
@@ -353,6 +359,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
353 | # CONFIG_CONNECTOR is not set | 359 | # CONFIG_CONNECTOR is not set |
354 | # CONFIG_MTD is not set | 360 | # CONFIG_MTD is not set |
355 | CONFIG_OF_DEVICE=y | 361 | CONFIG_OF_DEVICE=y |
362 | CONFIG_OF_I2C=y | ||
356 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
357 | CONFIG_BLK_DEV=y | 364 | CONFIG_BLK_DEV=y |
358 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
@@ -520,7 +527,6 @@ CONFIG_NETDEV_1000=y | |||
520 | # CONFIG_SIS190 is not set | 527 | # CONFIG_SIS190 is not set |
521 | # CONFIG_SKGE is not set | 528 | # CONFIG_SKGE is not set |
522 | # CONFIG_SKY2 is not set | 529 | # CONFIG_SKY2 is not set |
523 | # CONFIG_SK98LIN is not set | ||
524 | # CONFIG_VIA_VELOCITY is not set | 530 | # CONFIG_VIA_VELOCITY is not set |
525 | # CONFIG_TIGON3 is not set | 531 | # CONFIG_TIGON3 is not set |
526 | # CONFIG_BNX2 is not set | 532 | # CONFIG_BNX2 is not set |
@@ -544,6 +550,7 @@ CONFIG_NETDEV_10000=y | |||
544 | # CONFIG_MLX4_CORE is not set | 550 | # CONFIG_MLX4_CORE is not set |
545 | # CONFIG_TEHUTI is not set | 551 | # CONFIG_TEHUTI is not set |
546 | # CONFIG_BNX2X is not set | 552 | # CONFIG_BNX2X is not set |
553 | # CONFIG_SFC is not set | ||
547 | # CONFIG_TR is not set | 554 | # CONFIG_TR is not set |
548 | 555 | ||
549 | # | 556 | # |
@@ -551,6 +558,7 @@ CONFIG_NETDEV_10000=y | |||
551 | # | 558 | # |
552 | # CONFIG_WLAN_PRE80211 is not set | 559 | # CONFIG_WLAN_PRE80211 is not set |
553 | # CONFIG_WLAN_80211 is not set | 560 | # CONFIG_WLAN_80211 is not set |
561 | # CONFIG_IWLWIFI_LEDS is not set | ||
554 | # CONFIG_WAN is not set | 562 | # CONFIG_WAN is not set |
555 | # CONFIG_FDDI is not set | 563 | # CONFIG_FDDI is not set |
556 | # CONFIG_HIPPI is not set | 564 | # CONFIG_HIPPI is not set |
@@ -598,6 +606,7 @@ CONFIG_INPUT=y | |||
598 | # Character devices | 606 | # Character devices |
599 | # | 607 | # |
600 | # CONFIG_VT is not set | 608 | # CONFIG_VT is not set |
609 | CONFIG_DEVKMEM=y | ||
601 | # CONFIG_SERIAL_NONSTANDARD is not set | 610 | # CONFIG_SERIAL_NONSTANDARD is not set |
602 | # CONFIG_NOZOMI is not set | 611 | # CONFIG_NOZOMI is not set |
603 | 612 | ||
@@ -626,7 +635,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
626 | # CONFIG_IPMI_HANDLER is not set | 635 | # CONFIG_IPMI_HANDLER is not set |
627 | CONFIG_HW_RANDOM=y | 636 | CONFIG_HW_RANDOM=y |
628 | # CONFIG_NVRAM is not set | 637 | # CONFIG_NVRAM is not set |
629 | # CONFIG_GEN_RTC is not set | ||
630 | # CONFIG_R3964 is not set | 638 | # CONFIG_R3964 is not set |
631 | # CONFIG_APPLICOM is not set | 639 | # CONFIG_APPLICOM is not set |
632 | # CONFIG_RAW_DRIVER is not set | 640 | # CONFIG_RAW_DRIVER is not set |
@@ -637,13 +645,6 @@ CONFIG_I2C_BOARDINFO=y | |||
637 | CONFIG_I2C_CHARDEV=y | 645 | CONFIG_I2C_CHARDEV=y |
638 | 646 | ||
639 | # | 647 | # |
640 | # I2C Algorithms | ||
641 | # | ||
642 | # CONFIG_I2C_ALGOBIT is not set | ||
643 | # CONFIG_I2C_ALGOPCF is not set | ||
644 | # CONFIG_I2C_ALGOPCA is not set | ||
645 | |||
646 | # | ||
647 | # I2C Hardware Bus support | 648 | # I2C Hardware Bus support |
648 | # | 649 | # |
649 | # CONFIG_I2C_ALI1535 is not set | 650 | # CONFIG_I2C_ALI1535 is not set |
@@ -669,6 +670,7 @@ CONFIG_I2C_MPC=y | |||
669 | # CONFIG_I2C_VIA is not set | 670 | # CONFIG_I2C_VIA is not set |
670 | # CONFIG_I2C_VIAPRO is not set | 671 | # CONFIG_I2C_VIAPRO is not set |
671 | # CONFIG_I2C_VOODOO3 is not set | 672 | # CONFIG_I2C_VOODOO3 is not set |
673 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
672 | 674 | ||
673 | # | 675 | # |
674 | # Miscellaneous I2C Chip support | 676 | # Miscellaneous I2C Chip support |
@@ -678,19 +680,13 @@ CONFIG_I2C_MPC=y | |||
678 | # CONFIG_SENSORS_PCF8574 is not set | 680 | # CONFIG_SENSORS_PCF8574 is not set |
679 | # CONFIG_PCF8575 is not set | 681 | # CONFIG_PCF8575 is not set |
680 | # CONFIG_SENSORS_PCF8591 is not set | 682 | # CONFIG_SENSORS_PCF8591 is not set |
681 | # CONFIG_TPS65010 is not set | ||
682 | # CONFIG_SENSORS_MAX6875 is not set | 683 | # CONFIG_SENSORS_MAX6875 is not set |
683 | # CONFIG_SENSORS_TSL2550 is not set | 684 | # CONFIG_SENSORS_TSL2550 is not set |
684 | # CONFIG_I2C_DEBUG_CORE is not set | 685 | # CONFIG_I2C_DEBUG_CORE is not set |
685 | # CONFIG_I2C_DEBUG_ALGO is not set | 686 | # CONFIG_I2C_DEBUG_ALGO is not set |
686 | # CONFIG_I2C_DEBUG_BUS is not set | 687 | # CONFIG_I2C_DEBUG_BUS is not set |
687 | # CONFIG_I2C_DEBUG_CHIP is not set | 688 | # CONFIG_I2C_DEBUG_CHIP is not set |
688 | |||
689 | # | ||
690 | # SPI support | ||
691 | # | ||
692 | # CONFIG_SPI is not set | 689 | # CONFIG_SPI is not set |
693 | # CONFIG_SPI_MASTER is not set | ||
694 | # CONFIG_W1 is not set | 690 | # CONFIG_W1 is not set |
695 | # CONFIG_POWER_SUPPLY is not set | 691 | # CONFIG_POWER_SUPPLY is not set |
696 | CONFIG_HWMON=y | 692 | CONFIG_HWMON=y |
@@ -773,12 +769,22 @@ CONFIG_SSB_POSSIBLE=y | |||
773 | # Multifunction device drivers | 769 | # Multifunction device drivers |
774 | # | 770 | # |
775 | # CONFIG_MFD_SM501 is not set | 771 | # CONFIG_MFD_SM501 is not set |
772 | # CONFIG_HTC_PASIC3 is not set | ||
776 | 773 | ||
777 | # | 774 | # |
778 | # Multimedia devices | 775 | # Multimedia devices |
779 | # | 776 | # |
777 | |||
778 | # | ||
779 | # Multimedia core support | ||
780 | # | ||
780 | # CONFIG_VIDEO_DEV is not set | 781 | # CONFIG_VIDEO_DEV is not set |
781 | # CONFIG_DVB_CORE is not set | 782 | # CONFIG_DVB_CORE is not set |
783 | # CONFIG_VIDEO_MEDIA is not set | ||
784 | |||
785 | # | ||
786 | # Multimedia drivers | ||
787 | # | ||
782 | CONFIG_DAB=y | 788 | CONFIG_DAB=y |
783 | 789 | ||
784 | # | 790 | # |
@@ -809,6 +815,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
809 | CONFIG_USB_ARCH_HAS_OHCI=y | 815 | CONFIG_USB_ARCH_HAS_OHCI=y |
810 | CONFIG_USB_ARCH_HAS_EHCI=y | 816 | CONFIG_USB_ARCH_HAS_EHCI=y |
811 | # CONFIG_USB is not set | 817 | # CONFIG_USB is not set |
818 | # CONFIG_USB_OTG_WHITELIST is not set | ||
819 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
812 | 820 | ||
813 | # | 821 | # |
814 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 822 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -817,6 +825,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
817 | # CONFIG_MMC is not set | 825 | # CONFIG_MMC is not set |
818 | # CONFIG_MEMSTICK is not set | 826 | # CONFIG_MEMSTICK is not set |
819 | # CONFIG_NEW_LEDS is not set | 827 | # CONFIG_NEW_LEDS is not set |
828 | # CONFIG_ACCESSIBILITY is not set | ||
820 | # CONFIG_INFINIBAND is not set | 829 | # CONFIG_INFINIBAND is not set |
821 | # CONFIG_EDAC is not set | 830 | # CONFIG_EDAC is not set |
822 | CONFIG_RTC_LIB=y | 831 | CONFIG_RTC_LIB=y |
@@ -868,11 +877,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
868 | # | 877 | # |
869 | # on-CPU RTC drivers | 878 | # on-CPU RTC drivers |
870 | # | 879 | # |
880 | # CONFIG_RTC_DRV_PPC is not set | ||
871 | # CONFIG_DMADEVICES is not set | 881 | # CONFIG_DMADEVICES is not set |
872 | |||
873 | # | ||
874 | # Userspace I/O | ||
875 | # | ||
876 | # CONFIG_UIO is not set | 882 | # CONFIG_UIO is not set |
877 | 883 | ||
878 | # | 884 | # |
@@ -892,7 +898,6 @@ CONFIG_FS_MBCACHE=y | |||
892 | # CONFIG_JFS_FS is not set | 898 | # CONFIG_JFS_FS is not set |
893 | # CONFIG_FS_POSIX_ACL is not set | 899 | # CONFIG_FS_POSIX_ACL is not set |
894 | # CONFIG_XFS_FS is not set | 900 | # CONFIG_XFS_FS is not set |
895 | # CONFIG_GFS2_FS is not set | ||
896 | # CONFIG_OCFS2_FS is not set | 901 | # CONFIG_OCFS2_FS is not set |
897 | CONFIG_DNOTIFY=y | 902 | CONFIG_DNOTIFY=y |
898 | CONFIG_INOTIFY=y | 903 | CONFIG_INOTIFY=y |
@@ -950,7 +955,6 @@ CONFIG_NFS_FS=y | |||
950 | CONFIG_NFS_V3=y | 955 | CONFIG_NFS_V3=y |
951 | # CONFIG_NFS_V3_ACL is not set | 956 | # CONFIG_NFS_V3_ACL is not set |
952 | CONFIG_NFS_V4=y | 957 | CONFIG_NFS_V4=y |
953 | # CONFIG_NFS_DIRECTIO is not set | ||
954 | # CONFIG_NFSD is not set | 958 | # CONFIG_NFSD is not set |
955 | CONFIG_ROOT_NFS=y | 959 | CONFIG_ROOT_NFS=y |
956 | CONFIG_LOCKD=y | 960 | CONFIG_LOCKD=y |
@@ -993,6 +997,7 @@ CONFIG_UCC=y | |||
993 | # Library routines | 997 | # Library routines |
994 | # | 998 | # |
995 | CONFIG_BITREVERSE=y | 999 | CONFIG_BITREVERSE=y |
1000 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
996 | # CONFIG_CRC_CCITT is not set | 1001 | # CONFIG_CRC_CCITT is not set |
997 | # CONFIG_CRC16 is not set | 1002 | # CONFIG_CRC16 is not set |
998 | # CONFIG_CRC_ITU_T is not set | 1003 | # CONFIG_CRC_ITU_T is not set |
@@ -1003,6 +1008,7 @@ CONFIG_PLIST=y | |||
1003 | CONFIG_HAS_IOMEM=y | 1008 | CONFIG_HAS_IOMEM=y |
1004 | CONFIG_HAS_IOPORT=y | 1009 | CONFIG_HAS_IOPORT=y |
1005 | CONFIG_HAS_DMA=y | 1010 | CONFIG_HAS_DMA=y |
1011 | CONFIG_HAVE_LMB=y | ||
1006 | 1012 | ||
1007 | # | 1013 | # |
1008 | # Kernel hacking | 1014 | # Kernel hacking |
@@ -1010,6 +1016,7 @@ CONFIG_HAS_DMA=y | |||
1010 | # CONFIG_PRINTK_TIME is not set | 1016 | # CONFIG_PRINTK_TIME is not set |
1011 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1017 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1012 | CONFIG_ENABLE_MUST_CHECK=y | 1018 | CONFIG_ENABLE_MUST_CHECK=y |
1019 | CONFIG_FRAME_WARN=1024 | ||
1013 | # CONFIG_MAGIC_SYSRQ is not set | 1020 | # CONFIG_MAGIC_SYSRQ is not set |
1014 | # CONFIG_UNUSED_SYMBOLS is not set | 1021 | # CONFIG_UNUSED_SYMBOLS is not set |
1015 | # CONFIG_DEBUG_FS is not set | 1022 | # CONFIG_DEBUG_FS is not set |
@@ -1019,6 +1026,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1019 | # CONFIG_SLUB_STATS is not set | 1026 | # CONFIG_SLUB_STATS is not set |
1020 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1027 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1021 | # CONFIG_SAMPLES is not set | 1028 | # CONFIG_SAMPLES is not set |
1029 | # CONFIG_IRQSTACKS is not set | ||
1022 | # CONFIG_PPC_EARLY_DEBUG is not set | 1030 | # CONFIG_PPC_EARLY_DEBUG is not set |
1023 | 1031 | ||
1024 | # | 1032 | # |
@@ -1028,52 +1036,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1028 | # CONFIG_SECURITY is not set | 1036 | # CONFIG_SECURITY is not set |
1029 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1037 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1030 | CONFIG_CRYPTO=y | 1038 | CONFIG_CRYPTO=y |
1039 | |||
1040 | # | ||
1041 | # Crypto core or helper | ||
1042 | # | ||
1031 | CONFIG_CRYPTO_ALGAPI=y | 1043 | CONFIG_CRYPTO_ALGAPI=y |
1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1044 | CONFIG_CRYPTO_BLKCIPHER=y |
1033 | # CONFIG_CRYPTO_SEQIV is not set | ||
1034 | CONFIG_CRYPTO_MANAGER=y | 1045 | CONFIG_CRYPTO_MANAGER=y |
1046 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1047 | # CONFIG_CRYPTO_NULL is not set | ||
1048 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1049 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1050 | # CONFIG_CRYPTO_TEST is not set | ||
1051 | |||
1052 | # | ||
1053 | # Authenticated Encryption with Associated Data | ||
1054 | # | ||
1055 | # CONFIG_CRYPTO_CCM is not set | ||
1056 | # CONFIG_CRYPTO_GCM is not set | ||
1057 | # CONFIG_CRYPTO_SEQIV is not set | ||
1058 | |||
1059 | # | ||
1060 | # Block modes | ||
1061 | # | ||
1062 | CONFIG_CRYPTO_CBC=y | ||
1063 | # CONFIG_CRYPTO_CTR is not set | ||
1064 | # CONFIG_CRYPTO_CTS is not set | ||
1065 | CONFIG_CRYPTO_ECB=m | ||
1066 | # CONFIG_CRYPTO_LRW is not set | ||
1067 | CONFIG_CRYPTO_PCBC=m | ||
1068 | # CONFIG_CRYPTO_XTS is not set | ||
1069 | |||
1070 | # | ||
1071 | # Hash modes | ||
1072 | # | ||
1035 | # CONFIG_CRYPTO_HMAC is not set | 1073 | # CONFIG_CRYPTO_HMAC is not set |
1036 | # CONFIG_CRYPTO_XCBC is not set | 1074 | # CONFIG_CRYPTO_XCBC is not set |
1037 | # CONFIG_CRYPTO_NULL is not set | 1075 | |
1076 | # | ||
1077 | # Digest | ||
1078 | # | ||
1079 | # CONFIG_CRYPTO_CRC32C is not set | ||
1038 | # CONFIG_CRYPTO_MD4 is not set | 1080 | # CONFIG_CRYPTO_MD4 is not set |
1039 | CONFIG_CRYPTO_MD5=y | 1081 | CONFIG_CRYPTO_MD5=y |
1082 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1040 | # CONFIG_CRYPTO_SHA1 is not set | 1083 | # CONFIG_CRYPTO_SHA1 is not set |
1041 | # CONFIG_CRYPTO_SHA256 is not set | 1084 | # CONFIG_CRYPTO_SHA256 is not set |
1042 | # CONFIG_CRYPTO_SHA512 is not set | 1085 | # CONFIG_CRYPTO_SHA512 is not set |
1043 | # CONFIG_CRYPTO_WP512 is not set | ||
1044 | # CONFIG_CRYPTO_TGR192 is not set | 1086 | # CONFIG_CRYPTO_TGR192 is not set |
1045 | # CONFIG_CRYPTO_GF128MUL is not set | 1087 | # CONFIG_CRYPTO_WP512 is not set |
1046 | CONFIG_CRYPTO_ECB=m | 1088 | |
1047 | CONFIG_CRYPTO_CBC=y | 1089 | # |
1048 | CONFIG_CRYPTO_PCBC=m | 1090 | # Ciphers |
1049 | # CONFIG_CRYPTO_LRW is not set | 1091 | # |
1050 | # CONFIG_CRYPTO_XTS is not set | ||
1051 | # CONFIG_CRYPTO_CTR is not set | ||
1052 | # CONFIG_CRYPTO_GCM is not set | ||
1053 | # CONFIG_CRYPTO_CCM is not set | ||
1054 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1055 | CONFIG_CRYPTO_DES=y | ||
1056 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1057 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1058 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1059 | # CONFIG_CRYPTO_SERPENT is not set | ||
1060 | # CONFIG_CRYPTO_AES is not set | 1092 | # CONFIG_CRYPTO_AES is not set |
1093 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1094 | # CONFIG_CRYPTO_ARC4 is not set | ||
1095 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1096 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1061 | # CONFIG_CRYPTO_CAST5 is not set | 1097 | # CONFIG_CRYPTO_CAST5 is not set |
1062 | # CONFIG_CRYPTO_CAST6 is not set | 1098 | # CONFIG_CRYPTO_CAST6 is not set |
1063 | # CONFIG_CRYPTO_TEA is not set | 1099 | CONFIG_CRYPTO_DES=y |
1064 | # CONFIG_CRYPTO_ARC4 is not set | 1100 | # CONFIG_CRYPTO_FCRYPT is not set |
1065 | # CONFIG_CRYPTO_KHAZAD is not set | 1101 | # CONFIG_CRYPTO_KHAZAD is not set |
1066 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1067 | # CONFIG_CRYPTO_SEED is not set | ||
1068 | # CONFIG_CRYPTO_SALSA20 is not set | 1102 | # CONFIG_CRYPTO_SALSA20 is not set |
1103 | # CONFIG_CRYPTO_SEED is not set | ||
1104 | # CONFIG_CRYPTO_SERPENT is not set | ||
1105 | # CONFIG_CRYPTO_TEA is not set | ||
1106 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1107 | |||
1108 | # | ||
1109 | # Compression | ||
1110 | # | ||
1069 | # CONFIG_CRYPTO_DEFLATE is not set | 1111 | # CONFIG_CRYPTO_DEFLATE is not set |
1070 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1071 | # CONFIG_CRYPTO_CRC32C is not set | ||
1072 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1073 | # CONFIG_CRYPTO_TEST is not set | ||
1074 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1075 | # CONFIG_CRYPTO_LZO is not set | 1112 | # CONFIG_CRYPTO_LZO is not set |
1076 | CONFIG_CRYPTO_HW=y | 1113 | CONFIG_CRYPTO_HW=y |
1077 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1114 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1078 | # CONFIG_PPC_CLOCK is not set | 1115 | # CONFIG_PPC_CLOCK is not set |
1079 | CONFIG_PPC_LIB_RHEAP=y | 1116 | CONFIG_PPC_LIB_RHEAP=y |
1117 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index f377cde785b0..0f94d9f56beb 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:23 2008 | 4 | # Mon Jun 9 08:52:28 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
@@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
@@ -211,11 +216,13 @@ CONFIG_FLATMEM=y | |||
211 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
212 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
215 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
216 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
217 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
218 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
219 | CONFIG_PROC_DEVICETREE=y | 226 | CONFIG_PROC_DEVICETREE=y |
220 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
221 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
@@ -234,6 +241,7 @@ CONFIG_FSL_SOC=y | |||
234 | # CONFIG_PCI_SYSCALL is not set | 241 | # CONFIG_PCI_SYSCALL is not set |
235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
236 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
244 | # CONFIG_HAS_RAPIDIO is not set | ||
237 | 245 | ||
238 | # | 246 | # |
239 | # Advanced setup | 247 | # Advanced setup |
@@ -243,11 +251,11 @@ CONFIG_FSL_SOC=y | |||
243 | # | 251 | # |
244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
245 | # | 253 | # |
246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | ||
249 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
250 | CONFIG_BOOT_LOAD=0x00800000 | ||
251 | 259 | ||
252 | # | 260 | # |
253 | # Networking | 261 | # Networking |
@@ -295,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
296 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
297 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
299 | # CONFIG_INET6_TUNNEL is not set | ||
300 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
301 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
302 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
@@ -350,6 +356,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
350 | # CONFIG_CONNECTOR is not set | 356 | # CONFIG_CONNECTOR is not set |
351 | # CONFIG_MTD is not set | 357 | # CONFIG_MTD is not set |
352 | CONFIG_OF_DEVICE=y | 358 | CONFIG_OF_DEVICE=y |
359 | CONFIG_OF_I2C=y | ||
353 | # CONFIG_PARPORT is not set | 360 | # CONFIG_PARPORT is not set |
354 | CONFIG_BLK_DEV=y | 361 | CONFIG_BLK_DEV=y |
355 | # CONFIG_BLK_DEV_FD is not set | 362 | # CONFIG_BLK_DEV_FD is not set |
@@ -411,8 +418,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
411 | # CONFIG_SCSI_DEBUG is not set | 418 | # CONFIG_SCSI_DEBUG is not set |
412 | CONFIG_ATA=y | 419 | CONFIG_ATA=y |
413 | # CONFIG_ATA_NONSTANDARD is not set | 420 | # CONFIG_ATA_NONSTANDARD is not set |
414 | # CONFIG_SATA_MV is not set | 421 | CONFIG_SATA_PMP=y |
415 | CONFIG_SATA_FSL=y | 422 | CONFIG_SATA_FSL=y |
423 | CONFIG_ATA_SFF=y | ||
424 | # CONFIG_SATA_MV is not set | ||
416 | # CONFIG_PATA_PLATFORM is not set | 425 | # CONFIG_PATA_PLATFORM is not set |
417 | # CONFIG_MD is not set | 426 | # CONFIG_MD is not set |
418 | # CONFIG_MACINTOSH_DRIVERS is not set | 427 | # CONFIG_MACINTOSH_DRIVERS is not set |
@@ -459,6 +468,7 @@ CONFIG_NETDEV_10000=y | |||
459 | # | 468 | # |
460 | # CONFIG_WLAN_PRE80211 is not set | 469 | # CONFIG_WLAN_PRE80211 is not set |
461 | # CONFIG_WLAN_80211 is not set | 470 | # CONFIG_WLAN_80211 is not set |
471 | # CONFIG_IWLWIFI_LEDS is not set | ||
462 | # CONFIG_WAN is not set | 472 | # CONFIG_WAN is not set |
463 | # CONFIG_PPP is not set | 473 | # CONFIG_PPP is not set |
464 | # CONFIG_SLIP is not set | 474 | # CONFIG_SLIP is not set |
@@ -503,6 +513,7 @@ CONFIG_INPUT=y | |||
503 | # Character devices | 513 | # Character devices |
504 | # | 514 | # |
505 | # CONFIG_VT is not set | 515 | # CONFIG_VT is not set |
516 | CONFIG_DEVKMEM=y | ||
506 | # CONFIG_SERIAL_NONSTANDARD is not set | 517 | # CONFIG_SERIAL_NONSTANDARD is not set |
507 | 518 | ||
508 | # | 519 | # |
@@ -537,13 +548,6 @@ CONFIG_I2C_BOARDINFO=y | |||
537 | CONFIG_I2C_CHARDEV=y | 548 | CONFIG_I2C_CHARDEV=y |
538 | 549 | ||
539 | # | 550 | # |
540 | # I2C Algorithms | ||
541 | # | ||
542 | # CONFIG_I2C_ALGOBIT is not set | ||
543 | # CONFIG_I2C_ALGOPCF is not set | ||
544 | # CONFIG_I2C_ALGOPCA is not set | ||
545 | |||
546 | # | ||
547 | # I2C Hardware Bus support | 551 | # I2C Hardware Bus support |
548 | # | 552 | # |
549 | CONFIG_I2C_MPC=y | 553 | CONFIG_I2C_MPC=y |
@@ -552,6 +556,7 @@ CONFIG_I2C_MPC=y | |||
552 | # CONFIG_I2C_SIMTEC is not set | 556 | # CONFIG_I2C_SIMTEC is not set |
553 | # CONFIG_I2C_TAOS_EVM is not set | 557 | # CONFIG_I2C_TAOS_EVM is not set |
554 | # CONFIG_I2C_STUB is not set | 558 | # CONFIG_I2C_STUB is not set |
559 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
555 | 560 | ||
556 | # | 561 | # |
557 | # Miscellaneous I2C Chip support | 562 | # Miscellaneous I2C Chip support |
@@ -561,19 +566,13 @@ CONFIG_I2C_MPC=y | |||
561 | # CONFIG_SENSORS_PCF8574 is not set | 566 | # CONFIG_SENSORS_PCF8574 is not set |
562 | # CONFIG_PCF8575 is not set | 567 | # CONFIG_PCF8575 is not set |
563 | # CONFIG_SENSORS_PCF8591 is not set | 568 | # CONFIG_SENSORS_PCF8591 is not set |
564 | # CONFIG_TPS65010 is not set | ||
565 | # CONFIG_SENSORS_MAX6875 is not set | 569 | # CONFIG_SENSORS_MAX6875 is not set |
566 | # CONFIG_SENSORS_TSL2550 is not set | 570 | # CONFIG_SENSORS_TSL2550 is not set |
567 | # CONFIG_I2C_DEBUG_CORE is not set | 571 | # CONFIG_I2C_DEBUG_CORE is not set |
568 | # CONFIG_I2C_DEBUG_ALGO is not set | 572 | # CONFIG_I2C_DEBUG_ALGO is not set |
569 | # CONFIG_I2C_DEBUG_BUS is not set | 573 | # CONFIG_I2C_DEBUG_BUS is not set |
570 | # CONFIG_I2C_DEBUG_CHIP is not set | 574 | # CONFIG_I2C_DEBUG_CHIP is not set |
571 | |||
572 | # | ||
573 | # SPI support | ||
574 | # | ||
575 | # CONFIG_SPI is not set | 575 | # CONFIG_SPI is not set |
576 | # CONFIG_SPI_MASTER is not set | ||
577 | # CONFIG_W1 is not set | 576 | # CONFIG_W1 is not set |
578 | # CONFIG_POWER_SUPPLY is not set | 577 | # CONFIG_POWER_SUPPLY is not set |
579 | CONFIG_HWMON=y | 578 | CONFIG_HWMON=y |
@@ -646,12 +645,22 @@ CONFIG_SSB_POSSIBLE=y | |||
646 | # Multifunction device drivers | 645 | # Multifunction device drivers |
647 | # | 646 | # |
648 | # CONFIG_MFD_SM501 is not set | 647 | # CONFIG_MFD_SM501 is not set |
648 | # CONFIG_HTC_PASIC3 is not set | ||
649 | 649 | ||
650 | # | 650 | # |
651 | # Multimedia devices | 651 | # Multimedia devices |
652 | # | 652 | # |
653 | |||
654 | # | ||
655 | # Multimedia core support | ||
656 | # | ||
653 | # CONFIG_VIDEO_DEV is not set | 657 | # CONFIG_VIDEO_DEV is not set |
654 | # CONFIG_DVB_CORE is not set | 658 | # CONFIG_DVB_CORE is not set |
659 | # CONFIG_VIDEO_MEDIA is not set | ||
660 | |||
661 | # | ||
662 | # Multimedia drivers | ||
663 | # | ||
655 | CONFIG_DAB=y | 664 | CONFIG_DAB=y |
656 | 665 | ||
657 | # | 666 | # |
@@ -680,6 +689,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
680 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 689 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
681 | CONFIG_USB_ARCH_HAS_EHCI=y | 690 | CONFIG_USB_ARCH_HAS_EHCI=y |
682 | # CONFIG_USB is not set | 691 | # CONFIG_USB is not set |
692 | # CONFIG_USB_OTG_WHITELIST is not set | ||
693 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
683 | 694 | ||
684 | # | 695 | # |
685 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -688,13 +699,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
688 | # CONFIG_MMC is not set | 699 | # CONFIG_MMC is not set |
689 | # CONFIG_MEMSTICK is not set | 700 | # CONFIG_MEMSTICK is not set |
690 | # CONFIG_NEW_LEDS is not set | 701 | # CONFIG_NEW_LEDS is not set |
702 | # CONFIG_ACCESSIBILITY is not set | ||
691 | # CONFIG_EDAC is not set | 703 | # CONFIG_EDAC is not set |
692 | # CONFIG_RTC_CLASS is not set | 704 | # CONFIG_RTC_CLASS is not set |
693 | # CONFIG_DMADEVICES is not set | 705 | # CONFIG_DMADEVICES is not set |
694 | |||
695 | # | ||
696 | # Userspace I/O | ||
697 | # | ||
698 | # CONFIG_UIO is not set | 706 | # CONFIG_UIO is not set |
699 | 707 | ||
700 | # | 708 | # |
@@ -714,7 +722,6 @@ CONFIG_FS_MBCACHE=y | |||
714 | # CONFIG_JFS_FS is not set | 722 | # CONFIG_JFS_FS is not set |
715 | # CONFIG_FS_POSIX_ACL is not set | 723 | # CONFIG_FS_POSIX_ACL is not set |
716 | # CONFIG_XFS_FS is not set | 724 | # CONFIG_XFS_FS is not set |
717 | # CONFIG_GFS2_FS is not set | ||
718 | # CONFIG_OCFS2_FS is not set | 725 | # CONFIG_OCFS2_FS is not set |
719 | CONFIG_DNOTIFY=y | 726 | CONFIG_DNOTIFY=y |
720 | CONFIG_INOTIFY=y | 727 | CONFIG_INOTIFY=y |
@@ -772,7 +779,6 @@ CONFIG_NFS_FS=y | |||
772 | CONFIG_NFS_V3=y | 779 | CONFIG_NFS_V3=y |
773 | # CONFIG_NFS_V3_ACL is not set | 780 | # CONFIG_NFS_V3_ACL is not set |
774 | CONFIG_NFS_V4=y | 781 | CONFIG_NFS_V4=y |
775 | # CONFIG_NFS_DIRECTIO is not set | ||
776 | # CONFIG_NFSD is not set | 782 | # CONFIG_NFSD is not set |
777 | CONFIG_ROOT_NFS=y | 783 | CONFIG_ROOT_NFS=y |
778 | CONFIG_LOCKD=y | 784 | CONFIG_LOCKD=y |
@@ -817,6 +823,7 @@ CONFIG_MSDOS_PARTITION=y | |||
817 | # Library routines | 823 | # Library routines |
818 | # | 824 | # |
819 | CONFIG_BITREVERSE=y | 825 | CONFIG_BITREVERSE=y |
826 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
820 | # CONFIG_CRC_CCITT is not set | 827 | # CONFIG_CRC_CCITT is not set |
821 | # CONFIG_CRC16 is not set | 828 | # CONFIG_CRC16 is not set |
822 | # CONFIG_CRC_ITU_T is not set | 829 | # CONFIG_CRC_ITU_T is not set |
@@ -827,6 +834,7 @@ CONFIG_PLIST=y | |||
827 | CONFIG_HAS_IOMEM=y | 834 | CONFIG_HAS_IOMEM=y |
828 | CONFIG_HAS_IOPORT=y | 835 | CONFIG_HAS_IOPORT=y |
829 | CONFIG_HAS_DMA=y | 836 | CONFIG_HAS_DMA=y |
837 | CONFIG_HAVE_LMB=y | ||
830 | 838 | ||
831 | # | 839 | # |
832 | # Kernel hacking | 840 | # Kernel hacking |
@@ -834,6 +842,7 @@ CONFIG_HAS_DMA=y | |||
834 | # CONFIG_PRINTK_TIME is not set | 842 | # CONFIG_PRINTK_TIME is not set |
835 | CONFIG_ENABLE_WARN_DEPRECATED=y | 843 | CONFIG_ENABLE_WARN_DEPRECATED=y |
836 | CONFIG_ENABLE_MUST_CHECK=y | 844 | CONFIG_ENABLE_MUST_CHECK=y |
845 | CONFIG_FRAME_WARN=1024 | ||
837 | # CONFIG_MAGIC_SYSRQ is not set | 846 | # CONFIG_MAGIC_SYSRQ is not set |
838 | # CONFIG_UNUSED_SYMBOLS is not set | 847 | # CONFIG_UNUSED_SYMBOLS is not set |
839 | # CONFIG_DEBUG_FS is not set | 848 | # CONFIG_DEBUG_FS is not set |
@@ -841,6 +850,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
841 | # CONFIG_DEBUG_KERNEL is not set | 850 | # CONFIG_DEBUG_KERNEL is not set |
842 | # CONFIG_DEBUG_BUGVERBOSE is not set | 851 | # CONFIG_DEBUG_BUGVERBOSE is not set |
843 | # CONFIG_SAMPLES is not set | 852 | # CONFIG_SAMPLES is not set |
853 | # CONFIG_IRQSTACKS is not set | ||
844 | # CONFIG_PPC_EARLY_DEBUG is not set | 854 | # CONFIG_PPC_EARLY_DEBUG is not set |
845 | 855 | ||
846 | # | 856 | # |
@@ -850,50 +860,80 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
850 | # CONFIG_SECURITY is not set | 860 | # CONFIG_SECURITY is not set |
851 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 861 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
852 | CONFIG_CRYPTO=y | 862 | CONFIG_CRYPTO=y |
863 | |||
864 | # | ||
865 | # Crypto core or helper | ||
866 | # | ||
853 | CONFIG_CRYPTO_ALGAPI=y | 867 | CONFIG_CRYPTO_ALGAPI=y |
854 | CONFIG_CRYPTO_BLKCIPHER=y | 868 | CONFIG_CRYPTO_BLKCIPHER=y |
855 | # CONFIG_CRYPTO_SEQIV is not set | ||
856 | CONFIG_CRYPTO_MANAGER=y | 869 | CONFIG_CRYPTO_MANAGER=y |
870 | # CONFIG_CRYPTO_GF128MUL is not set | ||
871 | # CONFIG_CRYPTO_NULL is not set | ||
872 | # CONFIG_CRYPTO_CRYPTD is not set | ||
873 | # CONFIG_CRYPTO_AUTHENC is not set | ||
874 | # CONFIG_CRYPTO_TEST is not set | ||
875 | |||
876 | # | ||
877 | # Authenticated Encryption with Associated Data | ||
878 | # | ||
879 | # CONFIG_CRYPTO_CCM is not set | ||
880 | # CONFIG_CRYPTO_GCM is not set | ||
881 | # CONFIG_CRYPTO_SEQIV is not set | ||
882 | |||
883 | # | ||
884 | # Block modes | ||
885 | # | ||
886 | CONFIG_CRYPTO_CBC=y | ||
887 | # CONFIG_CRYPTO_CTR is not set | ||
888 | # CONFIG_CRYPTO_CTS is not set | ||
889 | CONFIG_CRYPTO_ECB=m | ||
890 | # CONFIG_CRYPTO_LRW is not set | ||
891 | CONFIG_CRYPTO_PCBC=m | ||
892 | # CONFIG_CRYPTO_XTS is not set | ||
893 | |||
894 | # | ||
895 | # Hash modes | ||
896 | # | ||
857 | # CONFIG_CRYPTO_HMAC is not set | 897 | # CONFIG_CRYPTO_HMAC is not set |
858 | # CONFIG_CRYPTO_XCBC is not set | 898 | # CONFIG_CRYPTO_XCBC is not set |
859 | # CONFIG_CRYPTO_NULL is not set | 899 | |
900 | # | ||
901 | # Digest | ||
902 | # | ||
903 | # CONFIG_CRYPTO_CRC32C is not set | ||
860 | # CONFIG_CRYPTO_MD4 is not set | 904 | # CONFIG_CRYPTO_MD4 is not set |
861 | CONFIG_CRYPTO_MD5=y | 905 | CONFIG_CRYPTO_MD5=y |
906 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
862 | # CONFIG_CRYPTO_SHA1 is not set | 907 | # CONFIG_CRYPTO_SHA1 is not set |
863 | # CONFIG_CRYPTO_SHA256 is not set | 908 | # CONFIG_CRYPTO_SHA256 is not set |
864 | # CONFIG_CRYPTO_SHA512 is not set | 909 | # CONFIG_CRYPTO_SHA512 is not set |
865 | # CONFIG_CRYPTO_WP512 is not set | ||
866 | # CONFIG_CRYPTO_TGR192 is not set | 910 | # CONFIG_CRYPTO_TGR192 is not set |
867 | # CONFIG_CRYPTO_GF128MUL is not set | 911 | # CONFIG_CRYPTO_WP512 is not set |
868 | CONFIG_CRYPTO_ECB=m | 912 | |
869 | CONFIG_CRYPTO_CBC=y | 913 | # |
870 | CONFIG_CRYPTO_PCBC=m | 914 | # Ciphers |
871 | # CONFIG_CRYPTO_LRW is not set | 915 | # |
872 | # CONFIG_CRYPTO_XTS is not set | ||
873 | # CONFIG_CRYPTO_CTR is not set | ||
874 | # CONFIG_CRYPTO_GCM is not set | ||
875 | # CONFIG_CRYPTO_CCM is not set | ||
876 | # CONFIG_CRYPTO_CRYPTD is not set | ||
877 | CONFIG_CRYPTO_DES=y | ||
878 | # CONFIG_CRYPTO_FCRYPT is not set | ||
879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
880 | # CONFIG_CRYPTO_TWOFISH is not set | ||
881 | # CONFIG_CRYPTO_SERPENT is not set | ||
882 | # CONFIG_CRYPTO_AES is not set | 916 | # CONFIG_CRYPTO_AES is not set |
917 | # CONFIG_CRYPTO_ANUBIS is not set | ||
918 | # CONFIG_CRYPTO_ARC4 is not set | ||
919 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
920 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
883 | # CONFIG_CRYPTO_CAST5 is not set | 921 | # CONFIG_CRYPTO_CAST5 is not set |
884 | # CONFIG_CRYPTO_CAST6 is not set | 922 | # CONFIG_CRYPTO_CAST6 is not set |
885 | # CONFIG_CRYPTO_TEA is not set | 923 | CONFIG_CRYPTO_DES=y |
886 | # CONFIG_CRYPTO_ARC4 is not set | 924 | # CONFIG_CRYPTO_FCRYPT is not set |
887 | # CONFIG_CRYPTO_KHAZAD is not set | 925 | # CONFIG_CRYPTO_KHAZAD is not set |
888 | # CONFIG_CRYPTO_ANUBIS is not set | ||
889 | # CONFIG_CRYPTO_SEED is not set | ||
890 | # CONFIG_CRYPTO_SALSA20 is not set | 926 | # CONFIG_CRYPTO_SALSA20 is not set |
927 | # CONFIG_CRYPTO_SEED is not set | ||
928 | # CONFIG_CRYPTO_SERPENT is not set | ||
929 | # CONFIG_CRYPTO_TEA is not set | ||
930 | # CONFIG_CRYPTO_TWOFISH is not set | ||
931 | |||
932 | # | ||
933 | # Compression | ||
934 | # | ||
891 | # CONFIG_CRYPTO_DEFLATE is not set | 935 | # CONFIG_CRYPTO_DEFLATE is not set |
892 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
893 | # CONFIG_CRYPTO_CRC32C is not set | ||
894 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
895 | # CONFIG_CRYPTO_TEST is not set | ||
896 | # CONFIG_CRYPTO_AUTHENC is not set | ||
897 | # CONFIG_CRYPTO_LZO is not set | 936 | # CONFIG_CRYPTO_LZO is not set |
898 | CONFIG_CRYPTO_HW=y | 937 | CONFIG_CRYPTO_HW=y |
899 | # CONFIG_PPC_CLOCK is not set | 938 | # CONFIG_PPC_CLOCK is not set |
939 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index a6331769d88f..0d448556f53a 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:24 2008 | 4 | # Tue Jun 10 09:17:12 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
@@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
@@ -211,11 +216,13 @@ CONFIG_FLATMEM=y | |||
211 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
212 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
215 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
216 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
217 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
218 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
219 | CONFIG_PROC_DEVICETREE=y | 226 | CONFIG_PROC_DEVICETREE=y |
220 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
221 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
@@ -234,6 +241,7 @@ CONFIG_FSL_SOC=y | |||
234 | # CONFIG_PCI_SYSCALL is not set | 241 | # CONFIG_PCI_SYSCALL is not set |
235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
236 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
244 | # CONFIG_HAS_RAPIDIO is not set | ||
237 | 245 | ||
238 | # | 246 | # |
239 | # Advanced setup | 247 | # Advanced setup |
@@ -243,11 +251,11 @@ CONFIG_FSL_SOC=y | |||
243 | # | 251 | # |
244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
245 | # | 253 | # |
246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | ||
249 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
250 | CONFIG_BOOT_LOAD=0x00800000 | ||
251 | 259 | ||
252 | # | 260 | # |
253 | # Networking | 261 | # Networking |
@@ -290,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
291 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
292 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
294 | # CONFIG_INET6_TUNNEL is not set | ||
295 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
296 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
297 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
@@ -345,6 +351,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
345 | # CONFIG_CONNECTOR is not set | 351 | # CONFIG_CONNECTOR is not set |
346 | # CONFIG_MTD is not set | 352 | # CONFIG_MTD is not set |
347 | CONFIG_OF_DEVICE=y | 353 | CONFIG_OF_DEVICE=y |
354 | CONFIG_OF_I2C=y | ||
348 | # CONFIG_PARPORT is not set | 355 | # CONFIG_PARPORT is not set |
349 | CONFIG_BLK_DEV=y | 356 | CONFIG_BLK_DEV=y |
350 | # CONFIG_BLK_DEV_FD is not set | 357 | # CONFIG_BLK_DEV_FD is not set |
@@ -352,6 +359,7 @@ CONFIG_BLK_DEV=y | |||
352 | CONFIG_BLK_DEV_LOOP=y | 359 | CONFIG_BLK_DEV_LOOP=y |
353 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 360 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
354 | # CONFIG_BLK_DEV_NBD is not set | 361 | # CONFIG_BLK_DEV_NBD is not set |
362 | # CONFIG_BLK_DEV_UB is not set | ||
355 | CONFIG_BLK_DEV_RAM=y | 363 | CONFIG_BLK_DEV_RAM=y |
356 | CONFIG_BLK_DEV_RAM_COUNT=16 | 364 | CONFIG_BLK_DEV_RAM_COUNT=16 |
357 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 365 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
@@ -406,8 +414,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
406 | # CONFIG_SCSI_DEBUG is not set | 414 | # CONFIG_SCSI_DEBUG is not set |
407 | CONFIG_ATA=y | 415 | CONFIG_ATA=y |
408 | # CONFIG_ATA_NONSTANDARD is not set | 416 | # CONFIG_ATA_NONSTANDARD is not set |
409 | # CONFIG_SATA_MV is not set | 417 | CONFIG_SATA_PMP=y |
410 | CONFIG_SATA_FSL=y | 418 | CONFIG_SATA_FSL=y |
419 | CONFIG_ATA_SFF=y | ||
420 | # CONFIG_SATA_MV is not set | ||
411 | # CONFIG_PATA_PLATFORM is not set | 421 | # CONFIG_PATA_PLATFORM is not set |
412 | CONFIG_MD=y | 422 | CONFIG_MD=y |
413 | CONFIG_BLK_DEV_MD=y | 423 | CONFIG_BLK_DEV_MD=y |
@@ -444,7 +454,7 @@ CONFIG_MARVELL_PHY=y | |||
444 | # CONFIG_BROADCOM_PHY is not set | 454 | # CONFIG_BROADCOM_PHY is not set |
445 | # CONFIG_ICPLUS_PHY is not set | 455 | # CONFIG_ICPLUS_PHY is not set |
446 | # CONFIG_REALTEK_PHY is not set | 456 | # CONFIG_REALTEK_PHY is not set |
447 | # CONFIG_FIXED_PHY is not set | 457 | CONFIG_FIXED_PHY=y |
448 | # CONFIG_MDIO_BITBANG is not set | 458 | # CONFIG_MDIO_BITBANG is not set |
449 | CONFIG_NET_ETHERNET=y | 459 | CONFIG_NET_ETHERNET=y |
450 | CONFIG_MII=y | 460 | CONFIG_MII=y |
@@ -464,6 +474,16 @@ CONFIG_GFAR_NAPI=y | |||
464 | # | 474 | # |
465 | # CONFIG_WLAN_PRE80211 is not set | 475 | # CONFIG_WLAN_PRE80211 is not set |
466 | # CONFIG_WLAN_80211 is not set | 476 | # CONFIG_WLAN_80211 is not set |
477 | # CONFIG_IWLWIFI_LEDS is not set | ||
478 | |||
479 | # | ||
480 | # USB Network Adapters | ||
481 | # | ||
482 | # CONFIG_USB_CATC is not set | ||
483 | # CONFIG_USB_KAWETH is not set | ||
484 | # CONFIG_USB_PEGASUS is not set | ||
485 | # CONFIG_USB_RTL8150 is not set | ||
486 | # CONFIG_USB_USBNET is not set | ||
467 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
468 | # CONFIG_PPP is not set | 488 | # CONFIG_PPP is not set |
469 | # CONFIG_SLIP is not set | 489 | # CONFIG_SLIP is not set |
@@ -508,6 +528,7 @@ CONFIG_INPUT=y | |||
508 | # Character devices | 528 | # Character devices |
509 | # | 529 | # |
510 | # CONFIG_VT is not set | 530 | # CONFIG_VT is not set |
531 | CONFIG_DEVKMEM=y | ||
511 | # CONFIG_SERIAL_NONSTANDARD is not set | 532 | # CONFIG_SERIAL_NONSTANDARD is not set |
512 | 533 | ||
513 | # | 534 | # |
@@ -542,13 +563,6 @@ CONFIG_I2C_BOARDINFO=y | |||
542 | CONFIG_I2C_CHARDEV=y | 563 | CONFIG_I2C_CHARDEV=y |
543 | 564 | ||
544 | # | 565 | # |
545 | # I2C Algorithms | ||
546 | # | ||
547 | # CONFIG_I2C_ALGOBIT is not set | ||
548 | # CONFIG_I2C_ALGOPCF is not set | ||
549 | # CONFIG_I2C_ALGOPCA is not set | ||
550 | |||
551 | # | ||
552 | # I2C Hardware Bus support | 566 | # I2C Hardware Bus support |
553 | # | 567 | # |
554 | CONFIG_I2C_MPC=y | 568 | CONFIG_I2C_MPC=y |
@@ -557,6 +571,8 @@ CONFIG_I2C_MPC=y | |||
557 | # CONFIG_I2C_SIMTEC is not set | 571 | # CONFIG_I2C_SIMTEC is not set |
558 | # CONFIG_I2C_TAOS_EVM is not set | 572 | # CONFIG_I2C_TAOS_EVM is not set |
559 | # CONFIG_I2C_STUB is not set | 573 | # CONFIG_I2C_STUB is not set |
574 | # CONFIG_I2C_TINY_USB is not set | ||
575 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
560 | 576 | ||
561 | # | 577 | # |
562 | # Miscellaneous I2C Chip support | 578 | # Miscellaneous I2C Chip support |
@@ -566,19 +582,13 @@ CONFIG_I2C_MPC=y | |||
566 | # CONFIG_SENSORS_PCF8574 is not set | 582 | # CONFIG_SENSORS_PCF8574 is not set |
567 | # CONFIG_PCF8575 is not set | 583 | # CONFIG_PCF8575 is not set |
568 | # CONFIG_SENSORS_PCF8591 is not set | 584 | # CONFIG_SENSORS_PCF8591 is not set |
569 | # CONFIG_TPS65010 is not set | ||
570 | # CONFIG_SENSORS_MAX6875 is not set | 585 | # CONFIG_SENSORS_MAX6875 is not set |
571 | # CONFIG_SENSORS_TSL2550 is not set | 586 | # CONFIG_SENSORS_TSL2550 is not set |
572 | # CONFIG_I2C_DEBUG_CORE is not set | 587 | # CONFIG_I2C_DEBUG_CORE is not set |
573 | # CONFIG_I2C_DEBUG_ALGO is not set | 588 | # CONFIG_I2C_DEBUG_ALGO is not set |
574 | # CONFIG_I2C_DEBUG_BUS is not set | 589 | # CONFIG_I2C_DEBUG_BUS is not set |
575 | # CONFIG_I2C_DEBUG_CHIP is not set | 590 | # CONFIG_I2C_DEBUG_CHIP is not set |
576 | |||
577 | # | ||
578 | # SPI support | ||
579 | # | ||
580 | # CONFIG_SPI is not set | 591 | # CONFIG_SPI is not set |
581 | # CONFIG_SPI_MASTER is not set | ||
582 | # CONFIG_W1 is not set | 592 | # CONFIG_W1 is not set |
583 | # CONFIG_POWER_SUPPLY is not set | 593 | # CONFIG_POWER_SUPPLY is not set |
584 | CONFIG_HWMON=y | 594 | CONFIG_HWMON=y |
@@ -642,6 +652,11 @@ CONFIG_WATCHDOG=y | |||
642 | CONFIG_83xx_WDT=y | 652 | CONFIG_83xx_WDT=y |
643 | 653 | ||
644 | # | 654 | # |
655 | # USB-based Watchdog Cards | ||
656 | # | ||
657 | # CONFIG_USBPCWATCHDOG is not set | ||
658 | |||
659 | # | ||
645 | # Sonics Silicon Backplane | 660 | # Sonics Silicon Backplane |
646 | # | 661 | # |
647 | CONFIG_SSB_POSSIBLE=y | 662 | CONFIG_SSB_POSSIBLE=y |
@@ -651,13 +666,24 @@ CONFIG_SSB_POSSIBLE=y | |||
651 | # Multifunction device drivers | 666 | # Multifunction device drivers |
652 | # | 667 | # |
653 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
669 | # CONFIG_HTC_PASIC3 is not set | ||
654 | 670 | ||
655 | # | 671 | # |
656 | # Multimedia devices | 672 | # Multimedia devices |
657 | # | 673 | # |
674 | |||
675 | # | ||
676 | # Multimedia core support | ||
677 | # | ||
658 | # CONFIG_VIDEO_DEV is not set | 678 | # CONFIG_VIDEO_DEV is not set |
659 | # CONFIG_DVB_CORE is not set | 679 | # CONFIG_DVB_CORE is not set |
680 | # CONFIG_VIDEO_MEDIA is not set | ||
681 | |||
682 | # | ||
683 | # Multimedia drivers | ||
684 | # | ||
660 | CONFIG_DAB=y | 685 | CONFIG_DAB=y |
686 | # CONFIG_USB_DABUSB is not set | ||
661 | 687 | ||
662 | # | 688 | # |
663 | # Graphics support | 689 | # Graphics support |
@@ -680,6 +706,14 @@ CONFIG_HID_SUPPORT=y | |||
680 | CONFIG_HID=y | 706 | CONFIG_HID=y |
681 | # CONFIG_HID_DEBUG is not set | 707 | # CONFIG_HID_DEBUG is not set |
682 | # CONFIG_HIDRAW is not set | 708 | # CONFIG_HIDRAW is not set |
709 | |||
710 | # | ||
711 | # USB Input Devices | ||
712 | # | ||
713 | CONFIG_USB_HID=y | ||
714 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
715 | # CONFIG_HID_FF is not set | ||
716 | # CONFIG_USB_HIDDEV is not set | ||
683 | CONFIG_USB_SUPPORT=y | 717 | CONFIG_USB_SUPPORT=y |
684 | CONFIG_USB_ARCH_HAS_HCD=y | 718 | CONFIG_USB_ARCH_HAS_HCD=y |
685 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 719 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
@@ -695,33 +729,83 @@ CONFIG_USB=y | |||
695 | CONFIG_USB_DEVICE_CLASS=y | 729 | CONFIG_USB_DEVICE_CLASS=y |
696 | # CONFIG_USB_DYNAMIC_MINORS is not set | 730 | # CONFIG_USB_DYNAMIC_MINORS is not set |
697 | # CONFIG_USB_OTG is not set | 731 | # CONFIG_USB_OTG is not set |
732 | # CONFIG_USB_OTG_WHITELIST is not set | ||
733 | # CONFIG_USB_OTG_BLACKLIST_HUB 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_EHCI_HCD=y | 739 | CONFIG_USB_EHCI_HCD=y |
703 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 740 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
704 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 741 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
705 | CONFIG_USB_EHCI_FSL=y | 742 | CONFIG_USB_EHCI_FSL=y |
706 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 743 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
707 | # CONFIG_USB_ISP116X_HCD is not set | 744 | # CONFIG_USB_ISP116X_HCD is not set |
745 | # CONFIG_USB_ISP1760_HCD is not set | ||
708 | # CONFIG_USB_SL811_HCD is not set | 746 | # CONFIG_USB_SL811_HCD is not set |
709 | # CONFIG_USB_R8A66597_HCD is not set | 747 | # CONFIG_USB_R8A66597_HCD is not set |
710 | 748 | ||
711 | # | 749 | # |
750 | # USB Device Class drivers | ||
751 | # | ||
752 | # CONFIG_USB_ACM is not set | ||
753 | # CONFIG_USB_PRINTER is not set | ||
754 | # CONFIG_USB_WDM is not set | ||
755 | |||
756 | # | ||
712 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 757 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
713 | # | 758 | # |
759 | |||
760 | # | ||
761 | # may also be needed; see USB_STORAGE Help for more information | ||
762 | # | ||
763 | # CONFIG_USB_STORAGE is not set | ||
764 | # CONFIG_USB_LIBUSUAL is not set | ||
765 | |||
766 | # | ||
767 | # USB Imaging devices | ||
768 | # | ||
769 | # CONFIG_USB_MDC800 is not set | ||
770 | # CONFIG_USB_MICROTEK is not set | ||
771 | CONFIG_USB_MON=y | ||
772 | |||
773 | # | ||
774 | # USB port drivers | ||
775 | # | ||
776 | # CONFIG_USB_SERIAL is not set | ||
777 | |||
778 | # | ||
779 | # USB Miscellaneous drivers | ||
780 | # | ||
781 | # CONFIG_USB_EMI62 is not set | ||
782 | # CONFIG_USB_EMI26 is not set | ||
783 | # CONFIG_USB_ADUTUX is not set | ||
784 | # CONFIG_USB_AUERSWALD is not set | ||
785 | # CONFIG_USB_RIO500 is not set | ||
786 | # CONFIG_USB_LEGOTOWER is not set | ||
787 | # CONFIG_USB_LCD is not set | ||
788 | # CONFIG_USB_BERRY_CHARGE is not set | ||
789 | # CONFIG_USB_LED is not set | ||
790 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
791 | # CONFIG_USB_CYTHERM is not set | ||
792 | # CONFIG_USB_PHIDGET is not set | ||
793 | # CONFIG_USB_IDMOUSE is not set | ||
794 | # CONFIG_USB_FTDI_ELAN is not set | ||
795 | # CONFIG_USB_APPLEDISPLAY is not set | ||
796 | # CONFIG_USB_SISUSBVGA is not set | ||
797 | # CONFIG_USB_LD is not set | ||
798 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
799 | # CONFIG_USB_IOWARRIOR is not set | ||
800 | # CONFIG_USB_ISIGHTFW is not set | ||
714 | # CONFIG_USB_GADGET is not set | 801 | # CONFIG_USB_GADGET is not set |
715 | # CONFIG_MMC is not set | 802 | # CONFIG_MMC is not set |
716 | # CONFIG_MEMSTICK is not set | 803 | # CONFIG_MEMSTICK is not set |
717 | # CONFIG_NEW_LEDS is not set | 804 | # CONFIG_NEW_LEDS is not set |
805 | # CONFIG_ACCESSIBILITY is not set | ||
718 | # CONFIG_EDAC is not set | 806 | # CONFIG_EDAC is not set |
719 | # CONFIG_RTC_CLASS is not set | 807 | # CONFIG_RTC_CLASS is not set |
720 | # CONFIG_DMADEVICES is not set | 808 | # CONFIG_DMADEVICES is not set |
721 | |||
722 | # | ||
723 | # Userspace I/O | ||
724 | # | ||
725 | # CONFIG_UIO is not set | 809 | # CONFIG_UIO is not set |
726 | 810 | ||
727 | # | 811 | # |
@@ -741,7 +825,6 @@ CONFIG_FS_MBCACHE=y | |||
741 | # CONFIG_JFS_FS is not set | 825 | # CONFIG_JFS_FS is not set |
742 | # CONFIG_FS_POSIX_ACL is not set | 826 | # CONFIG_FS_POSIX_ACL is not set |
743 | # CONFIG_XFS_FS is not set | 827 | # CONFIG_XFS_FS is not set |
744 | # CONFIG_GFS2_FS is not set | ||
745 | # CONFIG_OCFS2_FS is not set | 828 | # CONFIG_OCFS2_FS is not set |
746 | CONFIG_DNOTIFY=y | 829 | CONFIG_DNOTIFY=y |
747 | CONFIG_INOTIFY=y | 830 | CONFIG_INOTIFY=y |
@@ -799,7 +882,6 @@ CONFIG_NFS_FS=y | |||
799 | CONFIG_NFS_V3=y | 882 | CONFIG_NFS_V3=y |
800 | # CONFIG_NFS_V3_ACL is not set | 883 | # CONFIG_NFS_V3_ACL is not set |
801 | CONFIG_NFS_V4=y | 884 | CONFIG_NFS_V4=y |
802 | # CONFIG_NFS_DIRECTIO is not set | ||
803 | # CONFIG_NFSD is not set | 885 | # CONFIG_NFSD is not set |
804 | CONFIG_ROOT_NFS=y | 886 | CONFIG_ROOT_NFS=y |
805 | CONFIG_LOCKD=y | 887 | CONFIG_LOCKD=y |
@@ -844,6 +926,7 @@ CONFIG_MSDOS_PARTITION=y | |||
844 | # Library routines | 926 | # Library routines |
845 | # | 927 | # |
846 | CONFIG_BITREVERSE=y | 928 | CONFIG_BITREVERSE=y |
929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
847 | # CONFIG_CRC_CCITT is not set | 930 | # CONFIG_CRC_CCITT is not set |
848 | # CONFIG_CRC16 is not set | 931 | # CONFIG_CRC16 is not set |
849 | # CONFIG_CRC_ITU_T is not set | 932 | # CONFIG_CRC_ITU_T is not set |
@@ -854,6 +937,7 @@ CONFIG_PLIST=y | |||
854 | CONFIG_HAS_IOMEM=y | 937 | CONFIG_HAS_IOMEM=y |
855 | CONFIG_HAS_IOPORT=y | 938 | CONFIG_HAS_IOPORT=y |
856 | CONFIG_HAS_DMA=y | 939 | CONFIG_HAS_DMA=y |
940 | CONFIG_HAVE_LMB=y | ||
857 | 941 | ||
858 | # | 942 | # |
859 | # Kernel hacking | 943 | # Kernel hacking |
@@ -861,6 +945,7 @@ CONFIG_HAS_DMA=y | |||
861 | # CONFIG_PRINTK_TIME is not set | 945 | # CONFIG_PRINTK_TIME is not set |
862 | CONFIG_ENABLE_WARN_DEPRECATED=y | 946 | CONFIG_ENABLE_WARN_DEPRECATED=y |
863 | # CONFIG_ENABLE_MUST_CHECK is not set | 947 | # CONFIG_ENABLE_MUST_CHECK is not set |
948 | CONFIG_FRAME_WARN=1024 | ||
864 | # CONFIG_MAGIC_SYSRQ is not set | 949 | # CONFIG_MAGIC_SYSRQ is not set |
865 | # CONFIG_UNUSED_SYMBOLS is not set | 950 | # CONFIG_UNUSED_SYMBOLS is not set |
866 | # CONFIG_DEBUG_FS is not set | 951 | # CONFIG_DEBUG_FS is not set |
@@ -868,6 +953,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
868 | # CONFIG_DEBUG_KERNEL is not set | 953 | # CONFIG_DEBUG_KERNEL is not set |
869 | # CONFIG_DEBUG_BUGVERBOSE is not set | 954 | # CONFIG_DEBUG_BUGVERBOSE is not set |
870 | # CONFIG_SAMPLES is not set | 955 | # CONFIG_SAMPLES is not set |
956 | # CONFIG_IRQSTACKS is not set | ||
871 | # CONFIG_PPC_EARLY_DEBUG is not set | 957 | # CONFIG_PPC_EARLY_DEBUG is not set |
872 | 958 | ||
873 | # | 959 | # |
@@ -881,50 +967,80 @@ CONFIG_ASYNC_CORE=y | |||
881 | CONFIG_ASYNC_MEMCPY=y | 967 | CONFIG_ASYNC_MEMCPY=y |
882 | CONFIG_ASYNC_XOR=y | 968 | CONFIG_ASYNC_XOR=y |
883 | CONFIG_CRYPTO=y | 969 | CONFIG_CRYPTO=y |
970 | |||
971 | # | ||
972 | # Crypto core or helper | ||
973 | # | ||
884 | CONFIG_CRYPTO_ALGAPI=y | 974 | CONFIG_CRYPTO_ALGAPI=y |
885 | CONFIG_CRYPTO_BLKCIPHER=y | 975 | CONFIG_CRYPTO_BLKCIPHER=y |
886 | # CONFIG_CRYPTO_SEQIV is not set | ||
887 | CONFIG_CRYPTO_MANAGER=y | 976 | CONFIG_CRYPTO_MANAGER=y |
977 | # CONFIG_CRYPTO_GF128MUL is not set | ||
978 | # CONFIG_CRYPTO_NULL is not set | ||
979 | # CONFIG_CRYPTO_CRYPTD is not set | ||
980 | # CONFIG_CRYPTO_AUTHENC is not set | ||
981 | # CONFIG_CRYPTO_TEST is not set | ||
982 | |||
983 | # | ||
984 | # Authenticated Encryption with Associated Data | ||
985 | # | ||
986 | # CONFIG_CRYPTO_CCM is not set | ||
987 | # CONFIG_CRYPTO_GCM is not set | ||
988 | # CONFIG_CRYPTO_SEQIV is not set | ||
989 | |||
990 | # | ||
991 | # Block modes | ||
992 | # | ||
993 | CONFIG_CRYPTO_CBC=y | ||
994 | # CONFIG_CRYPTO_CTR is not set | ||
995 | # CONFIG_CRYPTO_CTS is not set | ||
996 | CONFIG_CRYPTO_ECB=m | ||
997 | # CONFIG_CRYPTO_LRW is not set | ||
998 | CONFIG_CRYPTO_PCBC=m | ||
999 | # CONFIG_CRYPTO_XTS is not set | ||
1000 | |||
1001 | # | ||
1002 | # Hash modes | ||
1003 | # | ||
888 | # CONFIG_CRYPTO_HMAC is not set | 1004 | # CONFIG_CRYPTO_HMAC is not set |
889 | # CONFIG_CRYPTO_XCBC is not set | 1005 | # CONFIG_CRYPTO_XCBC is not set |
890 | # CONFIG_CRYPTO_NULL is not set | 1006 | |
1007 | # | ||
1008 | # Digest | ||
1009 | # | ||
1010 | # CONFIG_CRYPTO_CRC32C is not set | ||
891 | # CONFIG_CRYPTO_MD4 is not set | 1011 | # CONFIG_CRYPTO_MD4 is not set |
892 | CONFIG_CRYPTO_MD5=y | 1012 | CONFIG_CRYPTO_MD5=y |
1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
893 | # CONFIG_CRYPTO_SHA1 is not set | 1014 | # CONFIG_CRYPTO_SHA1 is not set |
894 | # CONFIG_CRYPTO_SHA256 is not set | 1015 | # CONFIG_CRYPTO_SHA256 is not set |
895 | # CONFIG_CRYPTO_SHA512 is not set | 1016 | # CONFIG_CRYPTO_SHA512 is not set |
896 | # CONFIG_CRYPTO_WP512 is not set | ||
897 | # CONFIG_CRYPTO_TGR192 is not set | 1017 | # CONFIG_CRYPTO_TGR192 is not set |
898 | # CONFIG_CRYPTO_GF128MUL is not set | 1018 | # CONFIG_CRYPTO_WP512 is not set |
899 | CONFIG_CRYPTO_ECB=m | 1019 | |
900 | CONFIG_CRYPTO_CBC=y | 1020 | # |
901 | CONFIG_CRYPTO_PCBC=m | 1021 | # Ciphers |
902 | # CONFIG_CRYPTO_LRW is not set | 1022 | # |
903 | # CONFIG_CRYPTO_XTS is not set | ||
904 | # CONFIG_CRYPTO_CTR is not set | ||
905 | # CONFIG_CRYPTO_GCM is not set | ||
906 | # CONFIG_CRYPTO_CCM is not set | ||
907 | # CONFIG_CRYPTO_CRYPTD is not set | ||
908 | CONFIG_CRYPTO_DES=y | ||
909 | # CONFIG_CRYPTO_FCRYPT is not set | ||
910 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
911 | # CONFIG_CRYPTO_TWOFISH is not set | ||
912 | # CONFIG_CRYPTO_SERPENT is not set | ||
913 | # CONFIG_CRYPTO_AES is not set | 1023 | # CONFIG_CRYPTO_AES is not set |
1024 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1025 | # CONFIG_CRYPTO_ARC4 is not set | ||
1026 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1027 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
914 | # CONFIG_CRYPTO_CAST5 is not set | 1028 | # CONFIG_CRYPTO_CAST5 is not set |
915 | # CONFIG_CRYPTO_CAST6 is not set | 1029 | # CONFIG_CRYPTO_CAST6 is not set |
916 | # CONFIG_CRYPTO_TEA is not set | 1030 | CONFIG_CRYPTO_DES=y |
917 | # CONFIG_CRYPTO_ARC4 is not set | 1031 | # CONFIG_CRYPTO_FCRYPT is not set |
918 | # CONFIG_CRYPTO_KHAZAD is not set | 1032 | # CONFIG_CRYPTO_KHAZAD is not set |
919 | # CONFIG_CRYPTO_ANUBIS is not set | ||
920 | # CONFIG_CRYPTO_SEED is not set | ||
921 | # CONFIG_CRYPTO_SALSA20 is not set | 1033 | # CONFIG_CRYPTO_SALSA20 is not set |
1034 | # CONFIG_CRYPTO_SEED is not set | ||
1035 | # CONFIG_CRYPTO_SERPENT is not set | ||
1036 | # CONFIG_CRYPTO_TEA is not set | ||
1037 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1038 | |||
1039 | # | ||
1040 | # Compression | ||
1041 | # | ||
922 | # CONFIG_CRYPTO_DEFLATE is not set | 1042 | # CONFIG_CRYPTO_DEFLATE is not set |
923 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
924 | # CONFIG_CRYPTO_CRC32C is not set | ||
925 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
926 | # CONFIG_CRYPTO_TEST is not set | ||
927 | # CONFIG_CRYPTO_AUTHENC is not set | ||
928 | # CONFIG_CRYPTO_LZO is not set | 1043 | # CONFIG_CRYPTO_LZO is not set |
929 | CONFIG_CRYPTO_HW=y | 1044 | CONFIG_CRYPTO_HW=y |
930 | # CONFIG_PPC_CLOCK is not set | 1045 | # CONFIG_PPC_CLOCK is not set |
1046 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index 1f1518229f6d..1752918be2c1 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:38 2008 | 4 | # Mon Jun 9 08:52:30 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
@@ -109,12 +112,14 @@ CONFIG_SLAB=y | |||
109 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
110 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
111 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
115 | # CONFIG_TINY_SHMEM is not set | 119 | # CONFIG_TINY_SHMEM is not set |
116 | CONFIG_BASE_SMALL=0 | 120 | CONFIG_BASE_SMALL=0 |
117 | CONFIG_MODULES=y | 121 | CONFIG_MODULES=y |
122 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
118 | CONFIG_MODULE_UNLOAD=y | 123 | CONFIG_MODULE_UNLOAD=y |
119 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
120 | # CONFIG_MODVERSIONS is not set | 125 | # CONFIG_MODVERSIONS is not set |
@@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
217 | CONFIG_PROC_DEVICETREE=y | 224 | CONFIG_PROC_DEVICETREE=y |
218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
@@ -232,6 +239,7 @@ CONFIG_FSL_SOC=y | |||
232 | # CONFIG_PCI_SYSCALL is not set | 239 | # CONFIG_PCI_SYSCALL is not set |
233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
234 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
242 | # CONFIG_HAS_RAPIDIO is not set | ||
235 | 243 | ||
236 | # | 244 | # |
237 | # Advanced setup | 245 | # Advanced setup |
@@ -241,11 +249,11 @@ CONFIG_FSL_SOC=y | |||
241 | # | 249 | # |
242 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
243 | # | 251 | # |
244 | CONFIG_HIGHMEM_START=0xfe000000 | ||
245 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
246 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
255 | CONFIG_PHYSICAL_START=0x00000000 | ||
247 | CONFIG_TASK_SIZE=0xc0000000 | 256 | CONFIG_TASK_SIZE=0xc0000000 |
248 | CONFIG_BOOT_LOAD=0x00800000 | ||
249 | 257 | ||
250 | # | 258 | # |
251 | # Networking | 259 | # Networking |
@@ -293,8 +301,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
293 | CONFIG_DEFAULT_TCP_CONG="cubic" | 301 | CONFIG_DEFAULT_TCP_CONG="cubic" |
294 | # CONFIG_TCP_MD5SIG is not set | 302 | # CONFIG_TCP_MD5SIG is not set |
295 | # CONFIG_IPV6 is not set | 303 | # CONFIG_IPV6 is not set |
296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
297 | # CONFIG_INET6_TUNNEL is not set | ||
298 | # CONFIG_NETWORK_SECMARK is not set | 304 | # CONFIG_NETWORK_SECMARK is not set |
299 | # CONFIG_NETFILTER is not set | 305 | # CONFIG_NETFILTER is not set |
300 | # CONFIG_IP_DCCP is not set | 306 | # CONFIG_IP_DCCP is not set |
@@ -348,6 +354,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
348 | # CONFIG_CONNECTOR is not set | 354 | # CONFIG_CONNECTOR is not set |
349 | # CONFIG_MTD is not set | 355 | # CONFIG_MTD is not set |
350 | CONFIG_OF_DEVICE=y | 356 | CONFIG_OF_DEVICE=y |
357 | CONFIG_OF_I2C=y | ||
351 | # CONFIG_PARPORT is not set | 358 | # CONFIG_PARPORT is not set |
352 | CONFIG_BLK_DEV=y | 359 | CONFIG_BLK_DEV=y |
353 | # CONFIG_BLK_DEV_FD is not set | 360 | # CONFIG_BLK_DEV_FD is not set |
@@ -420,6 +427,7 @@ CONFIG_GIANFAR=y | |||
420 | # | 427 | # |
421 | # CONFIG_WLAN_PRE80211 is not set | 428 | # CONFIG_WLAN_PRE80211 is not set |
422 | # CONFIG_WLAN_80211 is not set | 429 | # CONFIG_WLAN_80211 is not set |
430 | # CONFIG_IWLWIFI_LEDS is not set | ||
423 | # CONFIG_WAN is not set | 431 | # CONFIG_WAN is not set |
424 | # CONFIG_PPP is not set | 432 | # CONFIG_PPP is not set |
425 | # CONFIG_SLIP is not set | 433 | # CONFIG_SLIP is not set |
@@ -464,6 +472,7 @@ CONFIG_INPUT=y | |||
464 | # Character devices | 472 | # Character devices |
465 | # | 473 | # |
466 | # CONFIG_VT is not set | 474 | # CONFIG_VT is not set |
475 | CONFIG_DEVKMEM=y | ||
467 | # CONFIG_SERIAL_NONSTANDARD is not set | 476 | # CONFIG_SERIAL_NONSTANDARD is not set |
468 | 477 | ||
469 | # | 478 | # |
@@ -498,13 +507,6 @@ CONFIG_I2C_BOARDINFO=y | |||
498 | CONFIG_I2C_CHARDEV=y | 507 | CONFIG_I2C_CHARDEV=y |
499 | 508 | ||
500 | # | 509 | # |
501 | # I2C Algorithms | ||
502 | # | ||
503 | # CONFIG_I2C_ALGOBIT is not set | ||
504 | # CONFIG_I2C_ALGOPCF is not set | ||
505 | # CONFIG_I2C_ALGOPCA is not set | ||
506 | |||
507 | # | ||
508 | # I2C Hardware Bus support | 510 | # I2C Hardware Bus support |
509 | # | 511 | # |
510 | CONFIG_I2C_MPC=y | 512 | CONFIG_I2C_MPC=y |
@@ -513,6 +515,7 @@ CONFIG_I2C_MPC=y | |||
513 | # CONFIG_I2C_SIMTEC is not set | 515 | # CONFIG_I2C_SIMTEC is not set |
514 | # CONFIG_I2C_TAOS_EVM is not set | 516 | # CONFIG_I2C_TAOS_EVM is not set |
515 | # CONFIG_I2C_STUB is not set | 517 | # CONFIG_I2C_STUB is not set |
518 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
516 | 519 | ||
517 | # | 520 | # |
518 | # Miscellaneous I2C Chip support | 521 | # Miscellaneous I2C Chip support |
@@ -522,19 +525,13 @@ CONFIG_I2C_MPC=y | |||
522 | # CONFIG_SENSORS_PCF8574 is not set | 525 | # CONFIG_SENSORS_PCF8574 is not set |
523 | # CONFIG_PCF8575 is not set | 526 | # CONFIG_PCF8575 is not set |
524 | # CONFIG_SENSORS_PCF8591 is not set | 527 | # CONFIG_SENSORS_PCF8591 is not set |
525 | # CONFIG_TPS65010 is not set | ||
526 | # CONFIG_SENSORS_MAX6875 is not set | 528 | # CONFIG_SENSORS_MAX6875 is not set |
527 | # CONFIG_SENSORS_TSL2550 is not set | 529 | # CONFIG_SENSORS_TSL2550 is not set |
528 | # CONFIG_I2C_DEBUG_CORE is not set | 530 | # CONFIG_I2C_DEBUG_CORE is not set |
529 | # CONFIG_I2C_DEBUG_ALGO is not set | 531 | # CONFIG_I2C_DEBUG_ALGO is not set |
530 | # CONFIG_I2C_DEBUG_BUS is not set | 532 | # CONFIG_I2C_DEBUG_BUS is not set |
531 | # CONFIG_I2C_DEBUG_CHIP is not set | 533 | # CONFIG_I2C_DEBUG_CHIP is not set |
532 | |||
533 | # | ||
534 | # SPI support | ||
535 | # | ||
536 | # CONFIG_SPI is not set | 534 | # CONFIG_SPI is not set |
537 | # CONFIG_SPI_MASTER is not set | ||
538 | # CONFIG_W1 is not set | 535 | # CONFIG_W1 is not set |
539 | # CONFIG_POWER_SUPPLY is not set | 536 | # CONFIG_POWER_SUPPLY is not set |
540 | CONFIG_HWMON=y | 537 | CONFIG_HWMON=y |
@@ -607,12 +604,22 @@ CONFIG_SSB_POSSIBLE=y | |||
607 | # Multifunction device drivers | 604 | # Multifunction device drivers |
608 | # | 605 | # |
609 | # CONFIG_MFD_SM501 is not set | 606 | # CONFIG_MFD_SM501 is not set |
607 | # CONFIG_HTC_PASIC3 is not set | ||
610 | 608 | ||
611 | # | 609 | # |
612 | # Multimedia devices | 610 | # Multimedia devices |
613 | # | 611 | # |
612 | |||
613 | # | ||
614 | # Multimedia core support | ||
615 | # | ||
614 | # CONFIG_VIDEO_DEV is not set | 616 | # CONFIG_VIDEO_DEV is not set |
615 | # CONFIG_DVB_CORE is not set | 617 | # CONFIG_DVB_CORE is not set |
618 | # CONFIG_VIDEO_MEDIA is not set | ||
619 | |||
620 | # | ||
621 | # Multimedia drivers | ||
622 | # | ||
616 | # CONFIG_DAB is not set | 623 | # CONFIG_DAB is not set |
617 | 624 | ||
618 | # | 625 | # |
@@ -640,13 +647,10 @@ CONFIG_HID=y | |||
640 | # CONFIG_MMC is not set | 647 | # CONFIG_MMC is not set |
641 | # CONFIG_MEMSTICK is not set | 648 | # CONFIG_MEMSTICK is not set |
642 | # CONFIG_NEW_LEDS is not set | 649 | # CONFIG_NEW_LEDS is not set |
650 | # CONFIG_ACCESSIBILITY is not set | ||
643 | # CONFIG_EDAC is not set | 651 | # CONFIG_EDAC is not set |
644 | # CONFIG_RTC_CLASS is not set | 652 | # CONFIG_RTC_CLASS is not set |
645 | # CONFIG_DMADEVICES is not set | 653 | # CONFIG_DMADEVICES is not set |
646 | |||
647 | # | ||
648 | # Userspace I/O | ||
649 | # | ||
650 | # CONFIG_UIO is not set | 654 | # CONFIG_UIO is not set |
651 | 655 | ||
652 | # | 656 | # |
@@ -659,7 +663,6 @@ CONFIG_HID=y | |||
659 | # CONFIG_JFS_FS is not set | 663 | # CONFIG_JFS_FS is not set |
660 | # CONFIG_FS_POSIX_ACL is not set | 664 | # CONFIG_FS_POSIX_ACL is not set |
661 | # CONFIG_XFS_FS is not set | 665 | # CONFIG_XFS_FS is not set |
662 | # CONFIG_GFS2_FS is not set | ||
663 | # CONFIG_OCFS2_FS is not set | 666 | # CONFIG_OCFS2_FS is not set |
664 | CONFIG_DNOTIFY=y | 667 | CONFIG_DNOTIFY=y |
665 | CONFIG_INOTIFY=y | 668 | CONFIG_INOTIFY=y |
@@ -717,7 +720,6 @@ CONFIG_NFS_FS=y | |||
717 | CONFIG_NFS_V3=y | 720 | CONFIG_NFS_V3=y |
718 | # CONFIG_NFS_V3_ACL is not set | 721 | # CONFIG_NFS_V3_ACL is not set |
719 | CONFIG_NFS_V4=y | 722 | CONFIG_NFS_V4=y |
720 | # CONFIG_NFS_DIRECTIO is not set | ||
721 | # CONFIG_NFSD is not set | 723 | # CONFIG_NFSD is not set |
722 | CONFIG_ROOT_NFS=y | 724 | CONFIG_ROOT_NFS=y |
723 | CONFIG_LOCKD=y | 725 | CONFIG_LOCKD=y |
@@ -746,6 +748,7 @@ CONFIG_MSDOS_PARTITION=y | |||
746 | # Library routines | 748 | # Library routines |
747 | # | 749 | # |
748 | CONFIG_BITREVERSE=y | 750 | CONFIG_BITREVERSE=y |
751 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
749 | # CONFIG_CRC_CCITT is not set | 752 | # CONFIG_CRC_CCITT is not set |
750 | # CONFIG_CRC16 is not set | 753 | # CONFIG_CRC16 is not set |
751 | # CONFIG_CRC_ITU_T is not set | 754 | # CONFIG_CRC_ITU_T is not set |
@@ -756,6 +759,7 @@ CONFIG_PLIST=y | |||
756 | CONFIG_HAS_IOMEM=y | 759 | CONFIG_HAS_IOMEM=y |
757 | CONFIG_HAS_IOPORT=y | 760 | CONFIG_HAS_IOPORT=y |
758 | CONFIG_HAS_DMA=y | 761 | CONFIG_HAS_DMA=y |
762 | CONFIG_HAVE_LMB=y | ||
759 | 763 | ||
760 | # | 764 | # |
761 | # Kernel hacking | 765 | # Kernel hacking |
@@ -763,6 +767,7 @@ CONFIG_HAS_DMA=y | |||
763 | # CONFIG_PRINTK_TIME is not set | 767 | # CONFIG_PRINTK_TIME is not set |
764 | CONFIG_ENABLE_WARN_DEPRECATED=y | 768 | CONFIG_ENABLE_WARN_DEPRECATED=y |
765 | CONFIG_ENABLE_MUST_CHECK=y | 769 | CONFIG_ENABLE_MUST_CHECK=y |
770 | CONFIG_FRAME_WARN=1024 | ||
766 | # CONFIG_MAGIC_SYSRQ is not set | 771 | # CONFIG_MAGIC_SYSRQ is not set |
767 | # CONFIG_UNUSED_SYMBOLS is not set | 772 | # CONFIG_UNUSED_SYMBOLS is not set |
768 | # CONFIG_DEBUG_FS is not set | 773 | # CONFIG_DEBUG_FS is not set |
@@ -770,6 +775,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
770 | # CONFIG_DEBUG_KERNEL is not set | 775 | # CONFIG_DEBUG_KERNEL is not set |
771 | # CONFIG_DEBUG_BUGVERBOSE is not set | 776 | # CONFIG_DEBUG_BUGVERBOSE is not set |
772 | # CONFIG_SAMPLES is not set | 777 | # CONFIG_SAMPLES is not set |
778 | # CONFIG_IRQSTACKS is not set | ||
773 | # CONFIG_PPC_EARLY_DEBUG is not set | 779 | # CONFIG_PPC_EARLY_DEBUG is not set |
774 | 780 | ||
775 | # | 781 | # |
@@ -779,50 +785,80 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
779 | # CONFIG_SECURITY is not set | 785 | # CONFIG_SECURITY is not set |
780 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 786 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
781 | CONFIG_CRYPTO=y | 787 | CONFIG_CRYPTO=y |
788 | |||
789 | # | ||
790 | # Crypto core or helper | ||
791 | # | ||
782 | CONFIG_CRYPTO_ALGAPI=y | 792 | CONFIG_CRYPTO_ALGAPI=y |
783 | CONFIG_CRYPTO_BLKCIPHER=y | 793 | CONFIG_CRYPTO_BLKCIPHER=y |
784 | # CONFIG_CRYPTO_SEQIV is not set | ||
785 | CONFIG_CRYPTO_MANAGER=y | 794 | CONFIG_CRYPTO_MANAGER=y |
795 | # CONFIG_CRYPTO_GF128MUL is not set | ||
796 | # CONFIG_CRYPTO_NULL is not set | ||
797 | # CONFIG_CRYPTO_CRYPTD is not set | ||
798 | # CONFIG_CRYPTO_AUTHENC is not set | ||
799 | # CONFIG_CRYPTO_TEST is not set | ||
800 | |||
801 | # | ||
802 | # Authenticated Encryption with Associated Data | ||
803 | # | ||
804 | # CONFIG_CRYPTO_CCM is not set | ||
805 | # CONFIG_CRYPTO_GCM is not set | ||
806 | # CONFIG_CRYPTO_SEQIV is not set | ||
807 | |||
808 | # | ||
809 | # Block modes | ||
810 | # | ||
811 | CONFIG_CRYPTO_CBC=y | ||
812 | # CONFIG_CRYPTO_CTR is not set | ||
813 | # CONFIG_CRYPTO_CTS is not set | ||
814 | CONFIG_CRYPTO_ECB=m | ||
815 | # CONFIG_CRYPTO_LRW is not set | ||
816 | CONFIG_CRYPTO_PCBC=m | ||
817 | # CONFIG_CRYPTO_XTS is not set | ||
818 | |||
819 | # | ||
820 | # Hash modes | ||
821 | # | ||
786 | # CONFIG_CRYPTO_HMAC is not set | 822 | # CONFIG_CRYPTO_HMAC is not set |
787 | # CONFIG_CRYPTO_XCBC is not set | 823 | # CONFIG_CRYPTO_XCBC is not set |
788 | # CONFIG_CRYPTO_NULL is not set | 824 | |
825 | # | ||
826 | # Digest | ||
827 | # | ||
828 | # CONFIG_CRYPTO_CRC32C is not set | ||
789 | # CONFIG_CRYPTO_MD4 is not set | 829 | # CONFIG_CRYPTO_MD4 is not set |
790 | CONFIG_CRYPTO_MD5=y | 830 | CONFIG_CRYPTO_MD5=y |
831 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
791 | # CONFIG_CRYPTO_SHA1 is not set | 832 | # CONFIG_CRYPTO_SHA1 is not set |
792 | # CONFIG_CRYPTO_SHA256 is not set | 833 | # CONFIG_CRYPTO_SHA256 is not set |
793 | # CONFIG_CRYPTO_SHA512 is not set | 834 | # CONFIG_CRYPTO_SHA512 is not set |
794 | # CONFIG_CRYPTO_WP512 is not set | ||
795 | # CONFIG_CRYPTO_TGR192 is not set | 835 | # CONFIG_CRYPTO_TGR192 is not set |
796 | # CONFIG_CRYPTO_GF128MUL is not set | 836 | # CONFIG_CRYPTO_WP512 is not set |
797 | CONFIG_CRYPTO_ECB=m | 837 | |
798 | CONFIG_CRYPTO_CBC=y | 838 | # |
799 | CONFIG_CRYPTO_PCBC=m | 839 | # Ciphers |
800 | # CONFIG_CRYPTO_LRW is not set | 840 | # |
801 | # CONFIG_CRYPTO_XTS is not set | ||
802 | # CONFIG_CRYPTO_CTR is not set | ||
803 | # CONFIG_CRYPTO_GCM is not set | ||
804 | # CONFIG_CRYPTO_CCM is not set | ||
805 | # CONFIG_CRYPTO_CRYPTD is not set | ||
806 | CONFIG_CRYPTO_DES=y | ||
807 | # CONFIG_CRYPTO_FCRYPT is not set | ||
808 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
809 | # CONFIG_CRYPTO_TWOFISH is not set | ||
810 | # CONFIG_CRYPTO_SERPENT is not set | ||
811 | # CONFIG_CRYPTO_AES is not set | 841 | # CONFIG_CRYPTO_AES is not set |
842 | # CONFIG_CRYPTO_ANUBIS is not set | ||
843 | # CONFIG_CRYPTO_ARC4 is not set | ||
844 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
845 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
812 | # CONFIG_CRYPTO_CAST5 is not set | 846 | # CONFIG_CRYPTO_CAST5 is not set |
813 | # CONFIG_CRYPTO_CAST6 is not set | 847 | # CONFIG_CRYPTO_CAST6 is not set |
814 | # CONFIG_CRYPTO_TEA is not set | 848 | CONFIG_CRYPTO_DES=y |
815 | # CONFIG_CRYPTO_ARC4 is not set | 849 | # CONFIG_CRYPTO_FCRYPT is not set |
816 | # CONFIG_CRYPTO_KHAZAD is not set | 850 | # CONFIG_CRYPTO_KHAZAD is not set |
817 | # CONFIG_CRYPTO_ANUBIS is not set | ||
818 | # CONFIG_CRYPTO_SEED is not set | ||
819 | # CONFIG_CRYPTO_SALSA20 is not set | 851 | # CONFIG_CRYPTO_SALSA20 is not set |
852 | # CONFIG_CRYPTO_SEED is not set | ||
853 | # CONFIG_CRYPTO_SERPENT is not set | ||
854 | # CONFIG_CRYPTO_TEA is not set | ||
855 | # CONFIG_CRYPTO_TWOFISH is not set | ||
856 | |||
857 | # | ||
858 | # Compression | ||
859 | # | ||
820 | # CONFIG_CRYPTO_DEFLATE is not set | 860 | # CONFIG_CRYPTO_DEFLATE is not set |
821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
822 | # CONFIG_CRYPTO_CRC32C is not set | ||
823 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
824 | # CONFIG_CRYPTO_TEST is not set | ||
825 | # CONFIG_CRYPTO_AUTHENC is not set | ||
826 | # CONFIG_CRYPTO_LZO is not set | 861 | # CONFIG_CRYPTO_LZO is not set |
827 | # CONFIG_CRYPTO_HW is not set | 862 | # CONFIG_CRYPTO_HW is not set |
828 | # CONFIG_PPC_CLOCK is not set | 863 | # CONFIG_PPC_CLOCK is not set |
864 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index 2d0debcefdbf..b82bb042308a 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.24 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Feb 11 16:25:19 2008 | 4 | # Mon Jun 9 08:52:30 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -68,23 +70,22 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
68 | # CONFIG_POSIX_MQUEUE is not set | 70 | # CONFIG_POSIX_MQUEUE is not set |
69 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
70 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
71 | # CONFIG_USER_NS is not set | ||
72 | # CONFIG_PID_NS is not set | ||
73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
74 | # CONFIG_IKCONFIG is not set | 74 | # CONFIG_IKCONFIG is not set |
75 | CONFIG_LOG_BUF_SHIFT=14 | 75 | CONFIG_LOG_BUF_SHIFT=14 |
76 | # CONFIG_CGROUPS is not set | 76 | # CONFIG_CGROUPS is not set |
77 | CONFIG_FAIR_GROUP_SCHED=y | 77 | # CONFIG_GROUP_SCHED is not set |
78 | CONFIG_FAIR_USER_SCHED=y | ||
79 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
80 | CONFIG_SYSFS_DEPRECATED=y | 78 | CONFIG_SYSFS_DEPRECATED=y |
79 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
81 | # CONFIG_RELAY is not set | 80 | # CONFIG_RELAY is not set |
81 | # CONFIG_NAMESPACES is not set | ||
82 | CONFIG_BLK_DEV_INITRD=y | 82 | CONFIG_BLK_DEV_INITRD=y |
83 | CONFIG_INITRAMFS_SOURCE="" | 83 | CONFIG_INITRAMFS_SOURCE="" |
84 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 84 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
85 | CONFIG_SYSCTL=y | 85 | CONFIG_SYSCTL=y |
86 | CONFIG_EMBEDDED=y | 86 | CONFIG_EMBEDDED=y |
87 | CONFIG_SYSCTL_SYSCALL=y | 87 | CONFIG_SYSCTL_SYSCALL=y |
88 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
88 | CONFIG_KALLSYMS=y | 89 | CONFIG_KALLSYMS=y |
89 | # CONFIG_KALLSYMS_ALL is not set | 90 | # CONFIG_KALLSYMS_ALL is not set |
90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -92,6 +93,7 @@ CONFIG_HOTPLUG=y | |||
92 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
93 | CONFIG_BUG=y | 94 | CONFIG_BUG=y |
94 | CONFIG_ELF_CORE=y | 95 | CONFIG_ELF_CORE=y |
96 | CONFIG_COMPAT_BRK=y | ||
95 | CONFIG_BASE_FULL=y | 97 | CONFIG_BASE_FULL=y |
96 | CONFIG_FUTEX=y | 98 | CONFIG_FUTEX=y |
97 | CONFIG_ANON_INODES=y | 99 | CONFIG_ANON_INODES=y |
@@ -109,6 +111,8 @@ CONFIG_SLUB=y | |||
109 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
110 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
111 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | ||
115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
@@ -134,7 +138,6 @@ CONFIG_DEFAULT_AS=y | |||
134 | # CONFIG_DEFAULT_NOOP is not set | 138 | # CONFIG_DEFAULT_NOOP is not set |
135 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 139 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
136 | CONFIG_CLASSIC_RCU=y | 140 | CONFIG_CLASSIC_RCU=y |
137 | # CONFIG_PREEMPT_RCU is not set | ||
138 | 141 | ||
139 | # | 142 | # |
140 | # Platform support | 143 | # Platform support |
@@ -191,12 +194,13 @@ CONFIG_HZ=250 | |||
191 | CONFIG_PREEMPT_NONE=y | 194 | CONFIG_PREEMPT_NONE=y |
192 | # CONFIG_PREEMPT_VOLUNTARY is not set | 195 | # CONFIG_PREEMPT_VOLUNTARY is not set |
193 | # CONFIG_PREEMPT is not set | 196 | # CONFIG_PREEMPT is not set |
194 | CONFIG_RCU_TRACE=y | ||
195 | CONFIG_BINFMT_ELF=y | 197 | CONFIG_BINFMT_ELF=y |
196 | CONFIG_BINFMT_MISC=y | 198 | CONFIG_BINFMT_MISC=y |
197 | CONFIG_MATH_EMULATION=y | 199 | CONFIG_MATH_EMULATION=y |
198 | # CONFIG_IOMMU_HELPER is not set | 200 | # CONFIG_IOMMU_HELPER is not set |
199 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 201 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
202 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
203 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
200 | CONFIG_ARCH_FLATMEM_ENABLE=y | 204 | CONFIG_ARCH_FLATMEM_ENABLE=y |
201 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 205 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
202 | CONFIG_SELECT_MEMORY_MODEL=y | 206 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -207,16 +211,17 @@ CONFIG_FLATMEM=y | |||
207 | CONFIG_FLAT_NODE_MEM_MAP=y | 211 | CONFIG_FLAT_NODE_MEM_MAP=y |
208 | # CONFIG_SPARSEMEM_STATIC is not set | 212 | # CONFIG_SPARSEMEM_STATIC is not set |
209 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
214 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
211 | # CONFIG_RESOURCES_64BIT is not set | 216 | # CONFIG_RESOURCES_64BIT is not set |
212 | CONFIG_ZONE_DMA_FLAG=1 | 217 | CONFIG_ZONE_DMA_FLAG=1 |
213 | CONFIG_BOUNCE=y | 218 | CONFIG_BOUNCE=y |
214 | CONFIG_VIRT_TO_BUS=y | 219 | CONFIG_VIRT_TO_BUS=y |
220 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
215 | # CONFIG_PROC_DEVICETREE is not set | 221 | # CONFIG_PROC_DEVICETREE is not set |
216 | # CONFIG_CMDLINE_BOOL is not set | 222 | # CONFIG_CMDLINE_BOOL is not set |
217 | # CONFIG_PM is not set | 223 | # CONFIG_PM is not set |
218 | # CONFIG_SECCOMP is not set | 224 | # CONFIG_SECCOMP is not set |
219 | CONFIG_WANT_DEVICE_TREE=y | ||
220 | CONFIG_ISA_DMA_API=y | 225 | CONFIG_ISA_DMA_API=y |
221 | 226 | ||
222 | # | 227 | # |
@@ -229,6 +234,7 @@ CONFIG_FSL_SOC=y | |||
229 | # CONFIG_PCI_SYSCALL is not set | 234 | # CONFIG_PCI_SYSCALL is not set |
230 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
231 | # CONFIG_PCCARD is not set | 236 | # CONFIG_PCCARD is not set |
237 | # CONFIG_HAS_RAPIDIO is not set | ||
232 | 238 | ||
233 | # | 239 | # |
234 | # Advanced setup | 240 | # Advanced setup |
@@ -238,11 +244,12 @@ CONFIG_FSL_SOC=y | |||
238 | # | 244 | # |
239 | # Default settings for advanced configuration options are used | 245 | # Default settings for advanced configuration options are used |
240 | # | 246 | # |
241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
242 | CONFIG_LOWMEM_SIZE=0x30000000 | 247 | CONFIG_LOWMEM_SIZE=0x30000000 |
248 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
243 | CONFIG_KERNEL_START=0xc0000000 | 249 | CONFIG_KERNEL_START=0xc0000000 |
250 | CONFIG_PHYSICAL_START=0x00000000 | ||
251 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
244 | CONFIG_TASK_SIZE=0xc0000000 | 252 | CONFIG_TASK_SIZE=0xc0000000 |
245 | CONFIG_BOOT_LOAD=0x00800000 | ||
246 | 253 | ||
247 | # | 254 | # |
248 | # Networking | 255 | # Networking |
@@ -290,8 +297,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 297 | CONFIG_DEFAULT_TCP_CONG="cubic" |
291 | # CONFIG_TCP_MD5SIG is not set | 298 | # CONFIG_TCP_MD5SIG is not set |
292 | # CONFIG_IPV6 is not set | 299 | # CONFIG_IPV6 is not set |
293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
294 | # CONFIG_INET6_TUNNEL is not set | ||
295 | # CONFIG_NETWORK_SECMARK is not set | 300 | # CONFIG_NETWORK_SECMARK is not set |
296 | # CONFIG_NETFILTER is not set | 301 | # CONFIG_NETFILTER is not set |
297 | # CONFIG_IP_DCCP is not set | 302 | # CONFIG_IP_DCCP is not set |
@@ -351,6 +356,8 @@ CONFIG_MTD_CONCAT=y | |||
351 | CONFIG_MTD_PARTITIONS=y | 356 | CONFIG_MTD_PARTITIONS=y |
352 | # CONFIG_MTD_REDBOOT_PARTS is not set | 357 | # CONFIG_MTD_REDBOOT_PARTS is not set |
353 | # CONFIG_MTD_CMDLINE_PARTS is not set | 358 | # CONFIG_MTD_CMDLINE_PARTS is not set |
359 | # CONFIG_MTD_OF_PARTS is not set | ||
360 | # CONFIG_MTD_AR7_PARTS is not set | ||
354 | 361 | ||
355 | # | 362 | # |
356 | # User Modules And Translation Layers | 363 | # User Modules And Translation Layers |
@@ -430,17 +437,19 @@ CONFIG_BLK_DEV_LOOP=y | |||
430 | CONFIG_BLK_DEV_RAM=y | 437 | CONFIG_BLK_DEV_RAM=y |
431 | CONFIG_BLK_DEV_RAM_COUNT=16 | 438 | CONFIG_BLK_DEV_RAM_COUNT=16 |
432 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 439 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
433 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 440 | # CONFIG_BLK_DEV_XIP is not set |
434 | # CONFIG_CDROM_PKTCDVD is not set | 441 | # CONFIG_CDROM_PKTCDVD is not set |
435 | # CONFIG_ATA_OVER_ETH is not set | 442 | # CONFIG_ATA_OVER_ETH is not set |
436 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
437 | # CONFIG_EEPROM_93CX6 is not set | 444 | # CONFIG_EEPROM_93CX6 is not set |
445 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
446 | CONFIG_HAVE_IDE=y | ||
438 | CONFIG_IDE=y | 447 | CONFIG_IDE=y |
439 | CONFIG_IDE_MAX_HWIFS=4 | 448 | CONFIG_IDE_MAX_HWIFS=4 |
440 | CONFIG_BLK_DEV_IDE=y | 449 | CONFIG_BLK_DEV_IDE=y |
441 | 450 | ||
442 | # | 451 | # |
443 | # Please see Documentation/ide.txt for help/info on IDE drives | 452 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
444 | # | 453 | # |
445 | # CONFIG_BLK_DEV_IDE_SATA is not set | 454 | # CONFIG_BLK_DEV_IDE_SATA is not set |
446 | # CONFIG_BLK_DEV_IDEDISK is not set | 455 | # CONFIG_BLK_DEV_IDEDISK is not set |
@@ -457,7 +466,7 @@ CONFIG_IDE_PROC_FS=y | |||
457 | CONFIG_IDE_GENERIC=y | 466 | CONFIG_IDE_GENERIC=y |
458 | # CONFIG_BLK_DEV_PLATFORM is not set | 467 | # CONFIG_BLK_DEV_PLATFORM is not set |
459 | # CONFIG_BLK_DEV_IDEDMA is not set | 468 | # CONFIG_BLK_DEV_IDEDMA is not set |
460 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 469 | # CONFIG_BLK_DEV_HD_ONLY is not set |
461 | # CONFIG_BLK_DEV_HD is not set | 470 | # CONFIG_BLK_DEV_HD is not set |
462 | 471 | ||
463 | # | 472 | # |
@@ -517,6 +526,7 @@ CONFIG_NETDEV_10000=y | |||
517 | # | 526 | # |
518 | # CONFIG_WLAN_PRE80211 is not set | 527 | # CONFIG_WLAN_PRE80211 is not set |
519 | # CONFIG_WLAN_80211 is not set | 528 | # CONFIG_WLAN_80211 is not set |
529 | # CONFIG_IWLWIFI_LEDS is not set | ||
520 | # CONFIG_WAN is not set | 530 | # CONFIG_WAN is not set |
521 | # CONFIG_PPP is not set | 531 | # CONFIG_PPP is not set |
522 | # CONFIG_SLIP is not set | 532 | # CONFIG_SLIP is not set |
@@ -561,6 +571,7 @@ CONFIG_INPUT=y | |||
561 | # Character devices | 571 | # Character devices |
562 | # | 572 | # |
563 | # CONFIG_VT is not set | 573 | # CONFIG_VT is not set |
574 | CONFIG_DEVKMEM=y | ||
564 | # CONFIG_SERIAL_NONSTANDARD is not set | 575 | # CONFIG_SERIAL_NONSTANDARD is not set |
565 | 576 | ||
566 | # | 577 | # |
@@ -594,12 +605,7 @@ CONFIG_GEN_RTC=y | |||
594 | # CONFIG_RAW_DRIVER is not set | 605 | # CONFIG_RAW_DRIVER is not set |
595 | # CONFIG_TCG_TPM is not set | 606 | # CONFIG_TCG_TPM is not set |
596 | # CONFIG_I2C is not set | 607 | # CONFIG_I2C is not set |
597 | |||
598 | # | ||
599 | # SPI support | ||
600 | # | ||
601 | # CONFIG_SPI is not set | 608 | # CONFIG_SPI is not set |
602 | # CONFIG_SPI_MASTER is not set | ||
603 | # CONFIG_W1 is not set | 609 | # CONFIG_W1 is not set |
604 | # CONFIG_POWER_SUPPLY is not set | 610 | # CONFIG_POWER_SUPPLY is not set |
605 | CONFIG_HWMON=y | 611 | CONFIG_HWMON=y |
@@ -615,6 +621,7 @@ CONFIG_HWMON=y | |||
615 | # CONFIG_SENSORS_W83627HF is not set | 621 | # CONFIG_SENSORS_W83627HF is not set |
616 | # CONFIG_SENSORS_W83627EHF is not set | 622 | # CONFIG_SENSORS_W83627EHF is not set |
617 | # CONFIG_HWMON_DEBUG_CHIP is not set | 623 | # CONFIG_HWMON_DEBUG_CHIP is not set |
624 | # CONFIG_THERMAL is not set | ||
618 | # CONFIG_WATCHDOG is not set | 625 | # CONFIG_WATCHDOG is not set |
619 | 626 | ||
620 | # | 627 | # |
@@ -627,12 +634,22 @@ CONFIG_SSB_POSSIBLE=y | |||
627 | # Multifunction device drivers | 634 | # Multifunction device drivers |
628 | # | 635 | # |
629 | # CONFIG_MFD_SM501 is not set | 636 | # CONFIG_MFD_SM501 is not set |
637 | # CONFIG_HTC_PASIC3 is not set | ||
630 | 638 | ||
631 | # | 639 | # |
632 | # Multimedia devices | 640 | # Multimedia devices |
633 | # | 641 | # |
642 | |||
643 | # | ||
644 | # Multimedia core support | ||
645 | # | ||
634 | # CONFIG_VIDEO_DEV is not set | 646 | # CONFIG_VIDEO_DEV is not set |
635 | # CONFIG_DVB_CORE is not set | 647 | # CONFIG_DVB_CORE is not set |
648 | # CONFIG_VIDEO_MEDIA is not set | ||
649 | |||
650 | # | ||
651 | # Multimedia drivers | ||
652 | # | ||
636 | CONFIG_DAB=y | 653 | CONFIG_DAB=y |
637 | 654 | ||
638 | # | 655 | # |
@@ -660,19 +677,20 @@ CONFIG_USB_SUPPORT=y | |||
660 | # CONFIG_USB_ARCH_HAS_HCD is not set | 677 | # CONFIG_USB_ARCH_HAS_HCD is not set |
661 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 678 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
662 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 679 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
680 | # CONFIG_USB_OTG_WHITELIST is not set | ||
681 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
663 | 682 | ||
664 | # | 683 | # |
665 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 684 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
666 | # | 685 | # |
667 | # CONFIG_USB_GADGET is not set | 686 | # CONFIG_USB_GADGET is not set |
668 | # CONFIG_MMC is not set | 687 | # CONFIG_MMC is not set |
688 | # CONFIG_MEMSTICK is not set | ||
669 | # CONFIG_NEW_LEDS is not set | 689 | # CONFIG_NEW_LEDS is not set |
690 | # CONFIG_ACCESSIBILITY is not set | ||
670 | # CONFIG_EDAC is not set | 691 | # CONFIG_EDAC is not set |
671 | # CONFIG_RTC_CLASS is not set | 692 | # CONFIG_RTC_CLASS is not set |
672 | 693 | # CONFIG_DMADEVICES is not set | |
673 | # | ||
674 | # Userspace I/O | ||
675 | # | ||
676 | # CONFIG_UIO is not set | 694 | # CONFIG_UIO is not set |
677 | 695 | ||
678 | # | 696 | # |
@@ -693,14 +711,11 @@ CONFIG_FS_MBCACHE=y | |||
693 | # CONFIG_JFS_FS is not set | 711 | # CONFIG_JFS_FS is not set |
694 | # CONFIG_FS_POSIX_ACL is not set | 712 | # CONFIG_FS_POSIX_ACL is not set |
695 | # CONFIG_XFS_FS is not set | 713 | # CONFIG_XFS_FS is not set |
696 | # CONFIG_GFS2_FS is not set | ||
697 | # CONFIG_OCFS2_FS is not set | 714 | # CONFIG_OCFS2_FS is not set |
698 | # CONFIG_MINIX_FS is not set | 715 | CONFIG_DNOTIFY=y |
699 | # CONFIG_ROMFS_FS is not set | ||
700 | CONFIG_INOTIFY=y | 716 | CONFIG_INOTIFY=y |
701 | CONFIG_INOTIFY_USER=y | 717 | CONFIG_INOTIFY_USER=y |
702 | # CONFIG_QUOTA is not set | 718 | # CONFIG_QUOTA is not set |
703 | CONFIG_DNOTIFY=y | ||
704 | # CONFIG_AUTOFS_FS is not set | 719 | # CONFIG_AUTOFS_FS is not set |
705 | # CONFIG_AUTOFS4_FS is not set | 720 | # CONFIG_AUTOFS4_FS is not set |
706 | # CONFIG_FUSE_FS is not set | 721 | # CONFIG_FUSE_FS is not set |
@@ -743,15 +758,16 @@ CONFIG_TMPFS=y | |||
743 | # CONFIG_JFFS2_FS is not set | 758 | # CONFIG_JFFS2_FS is not set |
744 | # CONFIG_CRAMFS is not set | 759 | # CONFIG_CRAMFS is not set |
745 | # CONFIG_VXFS_FS is not set | 760 | # CONFIG_VXFS_FS is not set |
761 | # CONFIG_MINIX_FS is not set | ||
746 | # CONFIG_HPFS_FS is not set | 762 | # CONFIG_HPFS_FS is not set |
747 | # CONFIG_QNX4FS_FS is not set | 763 | # CONFIG_QNX4FS_FS is not set |
764 | # CONFIG_ROMFS_FS is not set | ||
748 | # CONFIG_SYSV_FS is not set | 765 | # CONFIG_SYSV_FS is not set |
749 | # CONFIG_UFS_FS is not set | 766 | # CONFIG_UFS_FS is not set |
750 | CONFIG_NETWORK_FILESYSTEMS=y | 767 | CONFIG_NETWORK_FILESYSTEMS=y |
751 | CONFIG_NFS_FS=y | 768 | CONFIG_NFS_FS=y |
752 | # CONFIG_NFS_V3 is not set | 769 | # CONFIG_NFS_V3 is not set |
753 | # CONFIG_NFS_V4 is not set | 770 | # CONFIG_NFS_V4 is not set |
754 | # CONFIG_NFS_DIRECTIO is not set | ||
755 | # CONFIG_NFSD is not set | 771 | # CONFIG_NFSD is not set |
756 | CONFIG_ROOT_NFS=y | 772 | CONFIG_ROOT_NFS=y |
757 | CONFIG_LOCKD=y | 773 | CONFIG_LOCKD=y |
@@ -790,6 +806,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
790 | # Library routines | 806 | # Library routines |
791 | # | 807 | # |
792 | CONFIG_BITREVERSE=y | 808 | CONFIG_BITREVERSE=y |
809 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
793 | # CONFIG_CRC_CCITT is not set | 810 | # CONFIG_CRC_CCITT is not set |
794 | # CONFIG_CRC16 is not set | 811 | # CONFIG_CRC16 is not set |
795 | # CONFIG_CRC_ITU_T is not set | 812 | # CONFIG_CRC_ITU_T is not set |
@@ -800,6 +817,7 @@ CONFIG_PLIST=y | |||
800 | CONFIG_HAS_IOMEM=y | 817 | CONFIG_HAS_IOMEM=y |
801 | CONFIG_HAS_IOPORT=y | 818 | CONFIG_HAS_IOPORT=y |
802 | CONFIG_HAS_DMA=y | 819 | CONFIG_HAS_DMA=y |
820 | CONFIG_HAVE_LMB=y | ||
803 | 821 | ||
804 | # | 822 | # |
805 | # Kernel hacking | 823 | # Kernel hacking |
@@ -807,6 +825,7 @@ CONFIG_HAS_DMA=y | |||
807 | # CONFIG_PRINTK_TIME is not set | 825 | # CONFIG_PRINTK_TIME is not set |
808 | CONFIG_ENABLE_WARN_DEPRECATED=y | 826 | CONFIG_ENABLE_WARN_DEPRECATED=y |
809 | CONFIG_ENABLE_MUST_CHECK=y | 827 | CONFIG_ENABLE_MUST_CHECK=y |
828 | CONFIG_FRAME_WARN=1024 | ||
810 | # CONFIG_MAGIC_SYSRQ is not set | 829 | # CONFIG_MAGIC_SYSRQ is not set |
811 | # CONFIG_UNUSED_SYMBOLS is not set | 830 | # CONFIG_UNUSED_SYMBOLS is not set |
812 | CONFIG_DEBUG_FS=y | 831 | CONFIG_DEBUG_FS=y |
@@ -817,7 +836,9 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
817 | CONFIG_SCHED_DEBUG=y | 836 | CONFIG_SCHED_DEBUG=y |
818 | # CONFIG_SCHEDSTATS is not set | 837 | # CONFIG_SCHEDSTATS is not set |
819 | # CONFIG_TIMER_STATS is not set | 838 | # CONFIG_TIMER_STATS is not set |
839 | # CONFIG_DEBUG_OBJECTS is not set | ||
820 | # CONFIG_SLUB_DEBUG_ON is not set | 840 | # CONFIG_SLUB_DEBUG_ON is not set |
841 | # CONFIG_SLUB_STATS is not set | ||
821 | # CONFIG_DEBUG_RT_MUTEXES is not set | 842 | # CONFIG_DEBUG_RT_MUTEXES is not set |
822 | # CONFIG_RT_MUTEX_TESTER is not set | 843 | # CONFIG_RT_MUTEX_TESTER is not set |
823 | # CONFIG_DEBUG_SPINLOCK is not set | 844 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -829,9 +850,9 @@ CONFIG_DEBUG_MUTEXES=y | |||
829 | # CONFIG_DEBUG_BUGVERBOSE is not set | 850 | # CONFIG_DEBUG_BUGVERBOSE is not set |
830 | # CONFIG_DEBUG_INFO is not set | 851 | # CONFIG_DEBUG_INFO is not set |
831 | # CONFIG_DEBUG_VM is not set | 852 | # CONFIG_DEBUG_VM is not set |
853 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
832 | # CONFIG_DEBUG_LIST is not set | 854 | # CONFIG_DEBUG_LIST is not set |
833 | # CONFIG_DEBUG_SG is not set | 855 | # CONFIG_DEBUG_SG is not set |
834 | CONFIG_FORCED_INLINING=y | ||
835 | # CONFIG_BOOT_PRINTK_DELAY is not set | 856 | # CONFIG_BOOT_PRINTK_DELAY is not set |
836 | # CONFIG_BACKTRACE_SELF_TEST is not set | 857 | # CONFIG_BACKTRACE_SELF_TEST is not set |
837 | # CONFIG_FAULT_INJECTION is not set | 858 | # CONFIG_FAULT_INJECTION is not set |
@@ -841,6 +862,7 @@ CONFIG_FORCED_INLINING=y | |||
841 | # CONFIG_DEBUG_PAGEALLOC is not set | 862 | # CONFIG_DEBUG_PAGEALLOC is not set |
842 | # CONFIG_DEBUGGER is not set | 863 | # CONFIG_DEBUGGER is not set |
843 | # CONFIG_KGDB_CONSOLE is not set | 864 | # CONFIG_KGDB_CONSOLE is not set |
865 | # CONFIG_IRQSTACKS is not set | ||
844 | # CONFIG_VIRQ_DEBUG is not set | 866 | # CONFIG_VIRQ_DEBUG is not set |
845 | # CONFIG_BDI_SWITCH is not set | 867 | # CONFIG_BDI_SWITCH is not set |
846 | # CONFIG_PPC_EARLY_DEBUG is not set | 868 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -852,48 +874,78 @@ CONFIG_FORCED_INLINING=y | |||
852 | # CONFIG_SECURITY is not set | 874 | # CONFIG_SECURITY is not set |
853 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 875 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
854 | CONFIG_CRYPTO=y | 876 | CONFIG_CRYPTO=y |
855 | # CONFIG_CRYPTO_SEQIV is not set | 877 | |
878 | # | ||
879 | # Crypto core or helper | ||
880 | # | ||
856 | # CONFIG_CRYPTO_MANAGER is not set | 881 | # CONFIG_CRYPTO_MANAGER is not set |
882 | # CONFIG_CRYPTO_GF128MUL is not set | ||
883 | # CONFIG_CRYPTO_NULL is not set | ||
884 | # CONFIG_CRYPTO_CRYPTD is not set | ||
885 | # CONFIG_CRYPTO_AUTHENC is not set | ||
886 | |||
887 | # | ||
888 | # Authenticated Encryption with Associated Data | ||
889 | # | ||
890 | # CONFIG_CRYPTO_CCM is not set | ||
891 | # CONFIG_CRYPTO_GCM is not set | ||
892 | # CONFIG_CRYPTO_SEQIV is not set | ||
893 | |||
894 | # | ||
895 | # Block modes | ||
896 | # | ||
897 | # CONFIG_CRYPTO_CBC is not set | ||
898 | # CONFIG_CRYPTO_CTR is not set | ||
899 | # CONFIG_CRYPTO_CTS is not set | ||
900 | # CONFIG_CRYPTO_ECB is not set | ||
901 | # CONFIG_CRYPTO_LRW is not set | ||
902 | # CONFIG_CRYPTO_PCBC is not set | ||
903 | # CONFIG_CRYPTO_XTS is not set | ||
904 | |||
905 | # | ||
906 | # Hash modes | ||
907 | # | ||
857 | # CONFIG_CRYPTO_HMAC is not set | 908 | # CONFIG_CRYPTO_HMAC is not set |
858 | # CONFIG_CRYPTO_XCBC is not set | 909 | # CONFIG_CRYPTO_XCBC is not set |
859 | # CONFIG_CRYPTO_NULL is not set | 910 | |
911 | # | ||
912 | # Digest | ||
913 | # | ||
914 | # CONFIG_CRYPTO_CRC32C is not set | ||
860 | # CONFIG_CRYPTO_MD4 is not set | 915 | # CONFIG_CRYPTO_MD4 is not set |
861 | # CONFIG_CRYPTO_MD5 is not set | 916 | # CONFIG_CRYPTO_MD5 is not set |
917 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
862 | # CONFIG_CRYPTO_SHA1 is not set | 918 | # CONFIG_CRYPTO_SHA1 is not set |
863 | # CONFIG_CRYPTO_SHA256 is not set | 919 | # CONFIG_CRYPTO_SHA256 is not set |
864 | # CONFIG_CRYPTO_SHA512 is not set | 920 | # CONFIG_CRYPTO_SHA512 is not set |
865 | # CONFIG_CRYPTO_WP512 is not set | ||
866 | # CONFIG_CRYPTO_TGR192 is not set | 921 | # CONFIG_CRYPTO_TGR192 is not set |
867 | # CONFIG_CRYPTO_GF128MUL is not set | 922 | # CONFIG_CRYPTO_WP512 is not set |
868 | # CONFIG_CRYPTO_ECB is not set | 923 | |
869 | # CONFIG_CRYPTO_CBC is not set | 924 | # |
870 | # CONFIG_CRYPTO_PCBC is not set | 925 | # Ciphers |
871 | # CONFIG_CRYPTO_LRW is not set | 926 | # |
872 | # CONFIG_CRYPTO_XTS is not set | ||
873 | # CONFIG_CRYPTO_CTR is not set | ||
874 | # CONFIG_CRYPTO_GCM is not set | ||
875 | # CONFIG_CRYPTO_CCM is not set | ||
876 | # CONFIG_CRYPTO_CRYPTD is not set | ||
877 | # CONFIG_CRYPTO_DES is not set | ||
878 | # CONFIG_CRYPTO_FCRYPT is not set | ||
879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
880 | # CONFIG_CRYPTO_TWOFISH is not set | ||
881 | # CONFIG_CRYPTO_SERPENT is not set | ||
882 | # CONFIG_CRYPTO_AES is not set | 927 | # CONFIG_CRYPTO_AES is not set |
928 | # CONFIG_CRYPTO_ANUBIS is not set | ||
929 | # CONFIG_CRYPTO_ARC4 is not set | ||
930 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
931 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
883 | # CONFIG_CRYPTO_CAST5 is not set | 932 | # CONFIG_CRYPTO_CAST5 is not set |
884 | # CONFIG_CRYPTO_CAST6 is not set | 933 | # CONFIG_CRYPTO_CAST6 is not set |
885 | # CONFIG_CRYPTO_TEA is not set | 934 | # CONFIG_CRYPTO_DES is not set |
886 | # CONFIG_CRYPTO_ARC4 is not set | 935 | # CONFIG_CRYPTO_FCRYPT is not set |
887 | # CONFIG_CRYPTO_KHAZAD is not set | 936 | # CONFIG_CRYPTO_KHAZAD is not set |
888 | # CONFIG_CRYPTO_ANUBIS is not set | ||
889 | # CONFIG_CRYPTO_SEED is not set | ||
890 | # CONFIG_CRYPTO_SALSA20 is not set | 937 | # CONFIG_CRYPTO_SALSA20 is not set |
938 | # CONFIG_CRYPTO_SEED is not set | ||
939 | # CONFIG_CRYPTO_SERPENT is not set | ||
940 | # CONFIG_CRYPTO_TEA is not set | ||
941 | # CONFIG_CRYPTO_TWOFISH is not set | ||
942 | |||
943 | # | ||
944 | # Compression | ||
945 | # | ||
891 | # CONFIG_CRYPTO_DEFLATE is not set | 946 | # CONFIG_CRYPTO_DEFLATE is not set |
892 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
893 | # CONFIG_CRYPTO_CRC32C is not set | ||
894 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
895 | # CONFIG_CRYPTO_AUTHENC is not set | ||
896 | # CONFIG_CRYPTO_LZO is not set | 947 | # CONFIG_CRYPTO_LZO is not set |
897 | CONFIG_CRYPTO_HW=y | 948 | CONFIG_CRYPTO_HW=y |
898 | # CONFIG_PPC_CLOCK is not set | 949 | # CONFIG_PPC_CLOCK is not set |
899 | CONFIG_PPC_LIB_RHEAP=y | 950 | CONFIG_PPC_LIB_RHEAP=y |
951 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig index b998539da86e..f33fd516fd54 100644 --- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:25 2008 | 4 | # Mon Jun 9 08:52:31 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
@@ -153,6 +157,7 @@ CONFIG_MPC8540_ADS=y | |||
153 | # CONFIG_MPC85xx_CDS is not set | 157 | # CONFIG_MPC85xx_CDS is not set |
154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
160 | # CONFIG_KSI8560 is not set | ||
156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
@@ -208,11 +213,13 @@ CONFIG_FLATMEM=y | |||
208 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
209 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
212 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
213 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
214 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
215 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
216 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
217 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
218 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
@@ -229,6 +236,7 @@ CONFIG_FSL_SOC=y | |||
229 | # CONFIG_PCI_SYSCALL is not set | 236 | # CONFIG_PCI_SYSCALL is not set |
230 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 237 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
231 | # CONFIG_PCCARD is not set | 238 | # CONFIG_PCCARD is not set |
239 | # CONFIG_HAS_RAPIDIO is not set | ||
232 | 240 | ||
233 | # | 241 | # |
234 | # Advanced setup | 242 | # Advanced setup |
@@ -238,11 +246,12 @@ CONFIG_FSL_SOC=y | |||
238 | # | 246 | # |
239 | # Default settings for advanced configuration options are used | 247 | # Default settings for advanced configuration options are used |
240 | # | 248 | # |
241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
242 | CONFIG_LOWMEM_SIZE=0x30000000 | 249 | CONFIG_LOWMEM_SIZE=0x30000000 |
250 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
243 | CONFIG_KERNEL_START=0xc0000000 | 251 | CONFIG_KERNEL_START=0xc0000000 |
252 | CONFIG_PHYSICAL_START=0x00000000 | ||
253 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
244 | CONFIG_TASK_SIZE=0xc0000000 | 254 | CONFIG_TASK_SIZE=0xc0000000 |
245 | CONFIG_BOOT_LOAD=0x00800000 | ||
246 | 255 | ||
247 | # | 256 | # |
248 | # Networking | 257 | # Networking |
@@ -290,8 +299,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 299 | CONFIG_DEFAULT_TCP_CONG="cubic" |
291 | # CONFIG_TCP_MD5SIG is not set | 300 | # CONFIG_TCP_MD5SIG is not set |
292 | # CONFIG_IPV6 is not set | 301 | # CONFIG_IPV6 is not set |
293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
294 | # CONFIG_INET6_TUNNEL is not set | ||
295 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
296 | # CONFIG_NETFILTER is not set | 303 | # CONFIG_NETFILTER is not set |
297 | # CONFIG_IP_DCCP is not set | 304 | # CONFIG_IP_DCCP is not set |
@@ -419,6 +426,7 @@ CONFIG_NETDEV_10000=y | |||
419 | # | 426 | # |
420 | # CONFIG_WLAN_PRE80211 is not set | 427 | # CONFIG_WLAN_PRE80211 is not set |
421 | # CONFIG_WLAN_80211 is not set | 428 | # CONFIG_WLAN_80211 is not set |
429 | # CONFIG_IWLWIFI_LEDS is not set | ||
422 | # CONFIG_WAN is not set | 430 | # CONFIG_WAN is not set |
423 | # CONFIG_PPP is not set | 431 | # CONFIG_PPP is not set |
424 | # CONFIG_SLIP is not set | 432 | # CONFIG_SLIP is not set |
@@ -463,6 +471,7 @@ CONFIG_INPUT=y | |||
463 | # Character devices | 471 | # Character devices |
464 | # | 472 | # |
465 | # CONFIG_VT is not set | 473 | # CONFIG_VT is not set |
474 | CONFIG_DEVKMEM=y | ||
466 | # CONFIG_SERIAL_NONSTANDARD is not set | 475 | # CONFIG_SERIAL_NONSTANDARD is not set |
467 | 476 | ||
468 | # | 477 | # |
@@ -494,12 +503,7 @@ CONFIG_GEN_RTC=y | |||
494 | # CONFIG_RAW_DRIVER is not set | 503 | # CONFIG_RAW_DRIVER is not set |
495 | # CONFIG_TCG_TPM is not set | 504 | # CONFIG_TCG_TPM is not set |
496 | # CONFIG_I2C is not set | 505 | # CONFIG_I2C is not set |
497 | |||
498 | # | ||
499 | # SPI support | ||
500 | # | ||
501 | # CONFIG_SPI is not set | 506 | # CONFIG_SPI is not set |
502 | # CONFIG_SPI_MASTER is not set | ||
503 | # CONFIG_W1 is not set | 507 | # CONFIG_W1 is not set |
504 | # CONFIG_POWER_SUPPLY is not set | 508 | # CONFIG_POWER_SUPPLY is not set |
505 | CONFIG_HWMON=y | 509 | CONFIG_HWMON=y |
@@ -528,12 +532,22 @@ CONFIG_SSB_POSSIBLE=y | |||
528 | # Multifunction device drivers | 532 | # Multifunction device drivers |
529 | # | 533 | # |
530 | # CONFIG_MFD_SM501 is not set | 534 | # CONFIG_MFD_SM501 is not set |
535 | # CONFIG_HTC_PASIC3 is not set | ||
531 | 536 | ||
532 | # | 537 | # |
533 | # Multimedia devices | 538 | # Multimedia devices |
534 | # | 539 | # |
540 | |||
541 | # | ||
542 | # Multimedia core support | ||
543 | # | ||
535 | # CONFIG_VIDEO_DEV is not set | 544 | # CONFIG_VIDEO_DEV is not set |
536 | # CONFIG_DVB_CORE is not set | 545 | # CONFIG_DVB_CORE is not set |
546 | # CONFIG_VIDEO_MEDIA is not set | ||
547 | |||
548 | # | ||
549 | # Multimedia drivers | ||
550 | # | ||
537 | CONFIG_DAB=y | 551 | CONFIG_DAB=y |
538 | 552 | ||
539 | # | 553 | # |
@@ -561,6 +575,8 @@ CONFIG_USB_SUPPORT=y | |||
561 | # CONFIG_USB_ARCH_HAS_HCD is not set | 575 | # CONFIG_USB_ARCH_HAS_HCD is not set |
562 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 576 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
563 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 577 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
578 | # CONFIG_USB_OTG_WHITELIST is not set | ||
579 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
564 | 580 | ||
565 | # | 581 | # |
566 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 582 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -569,13 +585,10 @@ CONFIG_USB_SUPPORT=y | |||
569 | # CONFIG_MMC is not set | 585 | # CONFIG_MMC is not set |
570 | # CONFIG_MEMSTICK is not set | 586 | # CONFIG_MEMSTICK is not set |
571 | # CONFIG_NEW_LEDS is not set | 587 | # CONFIG_NEW_LEDS is not set |
588 | # CONFIG_ACCESSIBILITY is not set | ||
572 | # CONFIG_EDAC is not set | 589 | # CONFIG_EDAC is not set |
573 | # CONFIG_RTC_CLASS is not set | 590 | # CONFIG_RTC_CLASS is not set |
574 | # CONFIG_DMADEVICES is not set | 591 | # CONFIG_DMADEVICES is not set |
575 | |||
576 | # | ||
577 | # Userspace I/O | ||
578 | # | ||
579 | # CONFIG_UIO is not set | 592 | # CONFIG_UIO is not set |
580 | 593 | ||
581 | # | 594 | # |
@@ -595,7 +608,6 @@ CONFIG_FS_MBCACHE=y | |||
595 | # CONFIG_JFS_FS is not set | 608 | # CONFIG_JFS_FS is not set |
596 | # CONFIG_FS_POSIX_ACL is not set | 609 | # CONFIG_FS_POSIX_ACL is not set |
597 | # CONFIG_XFS_FS is not set | 610 | # CONFIG_XFS_FS is not set |
598 | # CONFIG_GFS2_FS is not set | ||
599 | # CONFIG_OCFS2_FS is not set | 611 | # CONFIG_OCFS2_FS is not set |
600 | CONFIG_DNOTIFY=y | 612 | CONFIG_DNOTIFY=y |
601 | CONFIG_INOTIFY=y | 613 | CONFIG_INOTIFY=y |
@@ -652,7 +664,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
652 | CONFIG_NFS_FS=y | 664 | CONFIG_NFS_FS=y |
653 | # CONFIG_NFS_V3 is not set | 665 | # CONFIG_NFS_V3 is not set |
654 | # CONFIG_NFS_V4 is not set | 666 | # CONFIG_NFS_V4 is not set |
655 | # CONFIG_NFS_DIRECTIO is not set | ||
656 | # CONFIG_NFSD is not set | 667 | # CONFIG_NFSD is not set |
657 | CONFIG_ROOT_NFS=y | 668 | CONFIG_ROOT_NFS=y |
658 | CONFIG_LOCKD=y | 669 | CONFIG_LOCKD=y |
@@ -691,6 +702,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
691 | # Library routines | 702 | # Library routines |
692 | # | 703 | # |
693 | CONFIG_BITREVERSE=y | 704 | CONFIG_BITREVERSE=y |
705 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
694 | # CONFIG_CRC_CCITT is not set | 706 | # CONFIG_CRC_CCITT is not set |
695 | # CONFIG_CRC16 is not set | 707 | # CONFIG_CRC16 is not set |
696 | # CONFIG_CRC_ITU_T is not set | 708 | # CONFIG_CRC_ITU_T is not set |
@@ -701,6 +713,7 @@ CONFIG_PLIST=y | |||
701 | CONFIG_HAS_IOMEM=y | 713 | CONFIG_HAS_IOMEM=y |
702 | CONFIG_HAS_IOPORT=y | 714 | CONFIG_HAS_IOPORT=y |
703 | CONFIG_HAS_DMA=y | 715 | CONFIG_HAS_DMA=y |
716 | CONFIG_HAVE_LMB=y | ||
704 | 717 | ||
705 | # | 718 | # |
706 | # Kernel hacking | 719 | # Kernel hacking |
@@ -708,6 +721,7 @@ CONFIG_HAS_DMA=y | |||
708 | # CONFIG_PRINTK_TIME is not set | 721 | # CONFIG_PRINTK_TIME is not set |
709 | CONFIG_ENABLE_WARN_DEPRECATED=y | 722 | CONFIG_ENABLE_WARN_DEPRECATED=y |
710 | CONFIG_ENABLE_MUST_CHECK=y | 723 | CONFIG_ENABLE_MUST_CHECK=y |
724 | CONFIG_FRAME_WARN=1024 | ||
711 | # CONFIG_MAGIC_SYSRQ is not set | 725 | # CONFIG_MAGIC_SYSRQ is not set |
712 | # CONFIG_UNUSED_SYMBOLS is not set | 726 | # CONFIG_UNUSED_SYMBOLS is not set |
713 | # CONFIG_DEBUG_FS is not set | 727 | # CONFIG_DEBUG_FS is not set |
@@ -718,6 +732,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
718 | CONFIG_SCHED_DEBUG=y | 732 | CONFIG_SCHED_DEBUG=y |
719 | # CONFIG_SCHEDSTATS is not set | 733 | # CONFIG_SCHEDSTATS is not set |
720 | # CONFIG_TIMER_STATS is not set | 734 | # CONFIG_TIMER_STATS is not set |
735 | # CONFIG_DEBUG_OBJECTS is not set | ||
721 | # CONFIG_SLUB_DEBUG_ON is not set | 736 | # CONFIG_SLUB_DEBUG_ON is not set |
722 | # CONFIG_SLUB_STATS is not set | 737 | # CONFIG_SLUB_STATS is not set |
723 | # CONFIG_DEBUG_RT_MUTEXES is not set | 738 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -730,6 +745,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
730 | # CONFIG_DEBUG_BUGVERBOSE is not set | 745 | # CONFIG_DEBUG_BUGVERBOSE is not set |
731 | # CONFIG_DEBUG_INFO is not set | 746 | # CONFIG_DEBUG_INFO is not set |
732 | # CONFIG_DEBUG_VM is not set | 747 | # CONFIG_DEBUG_VM is not set |
748 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
733 | # CONFIG_DEBUG_LIST is not set | 749 | # CONFIG_DEBUG_LIST is not set |
734 | # CONFIG_DEBUG_SG is not set | 750 | # CONFIG_DEBUG_SG is not set |
735 | # CONFIG_BOOT_PRINTK_DELAY is not set | 751 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -740,6 +756,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
740 | # CONFIG_DEBUG_STACK_USAGE is not set | 756 | # CONFIG_DEBUG_STACK_USAGE is not set |
741 | # CONFIG_DEBUG_PAGEALLOC is not set | 757 | # CONFIG_DEBUG_PAGEALLOC is not set |
742 | # CONFIG_DEBUGGER is not set | 758 | # CONFIG_DEBUGGER is not set |
759 | # CONFIG_IRQSTACKS is not set | ||
743 | # CONFIG_BDI_SWITCH is not set | 760 | # CONFIG_BDI_SWITCH is not set |
744 | # CONFIG_PPC_EARLY_DEBUG is not set | 761 | # CONFIG_PPC_EARLY_DEBUG is not set |
745 | 762 | ||
@@ -750,47 +767,77 @@ CONFIG_DEBUG_MUTEXES=y | |||
750 | # CONFIG_SECURITY is not set | 767 | # CONFIG_SECURITY is not set |
751 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 768 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
752 | CONFIG_CRYPTO=y | 769 | CONFIG_CRYPTO=y |
753 | # CONFIG_CRYPTO_SEQIV is not set | 770 | |
771 | # | ||
772 | # Crypto core or helper | ||
773 | # | ||
754 | # CONFIG_CRYPTO_MANAGER is not set | 774 | # CONFIG_CRYPTO_MANAGER is not set |
775 | # CONFIG_CRYPTO_GF128MUL is not set | ||
776 | # CONFIG_CRYPTO_NULL is not set | ||
777 | # CONFIG_CRYPTO_CRYPTD is not set | ||
778 | # CONFIG_CRYPTO_AUTHENC is not set | ||
779 | |||
780 | # | ||
781 | # Authenticated Encryption with Associated Data | ||
782 | # | ||
783 | # CONFIG_CRYPTO_CCM is not set | ||
784 | # CONFIG_CRYPTO_GCM is not set | ||
785 | # CONFIG_CRYPTO_SEQIV is not set | ||
786 | |||
787 | # | ||
788 | # Block modes | ||
789 | # | ||
790 | # CONFIG_CRYPTO_CBC is not set | ||
791 | # CONFIG_CRYPTO_CTR is not set | ||
792 | # CONFIG_CRYPTO_CTS is not set | ||
793 | # CONFIG_CRYPTO_ECB is not set | ||
794 | # CONFIG_CRYPTO_LRW is not set | ||
795 | # CONFIG_CRYPTO_PCBC is not set | ||
796 | # CONFIG_CRYPTO_XTS is not set | ||
797 | |||
798 | # | ||
799 | # Hash modes | ||
800 | # | ||
755 | # CONFIG_CRYPTO_HMAC is not set | 801 | # CONFIG_CRYPTO_HMAC is not set |
756 | # CONFIG_CRYPTO_XCBC is not set | 802 | # CONFIG_CRYPTO_XCBC is not set |
757 | # CONFIG_CRYPTO_NULL is not set | 803 | |
804 | # | ||
805 | # Digest | ||
806 | # | ||
807 | # CONFIG_CRYPTO_CRC32C is not set | ||
758 | # CONFIG_CRYPTO_MD4 is not set | 808 | # CONFIG_CRYPTO_MD4 is not set |
759 | # CONFIG_CRYPTO_MD5 is not set | 809 | # CONFIG_CRYPTO_MD5 is not set |
810 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
760 | # CONFIG_CRYPTO_SHA1 is not set | 811 | # CONFIG_CRYPTO_SHA1 is not set |
761 | # CONFIG_CRYPTO_SHA256 is not set | 812 | # CONFIG_CRYPTO_SHA256 is not set |
762 | # CONFIG_CRYPTO_SHA512 is not set | 813 | # CONFIG_CRYPTO_SHA512 is not set |
763 | # CONFIG_CRYPTO_WP512 is not set | ||
764 | # CONFIG_CRYPTO_TGR192 is not set | 814 | # CONFIG_CRYPTO_TGR192 is not set |
765 | # CONFIG_CRYPTO_GF128MUL is not set | 815 | # CONFIG_CRYPTO_WP512 is not set |
766 | # CONFIG_CRYPTO_ECB is not set | 816 | |
767 | # CONFIG_CRYPTO_CBC is not set | 817 | # |
768 | # CONFIG_CRYPTO_PCBC is not set | 818 | # Ciphers |
769 | # CONFIG_CRYPTO_LRW is not set | 819 | # |
770 | # CONFIG_CRYPTO_XTS is not set | ||
771 | # CONFIG_CRYPTO_CTR is not set | ||
772 | # CONFIG_CRYPTO_GCM is not set | ||
773 | # CONFIG_CRYPTO_CCM is not set | ||
774 | # CONFIG_CRYPTO_CRYPTD is not set | ||
775 | # CONFIG_CRYPTO_DES is not set | ||
776 | # CONFIG_CRYPTO_FCRYPT is not set | ||
777 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
778 | # CONFIG_CRYPTO_TWOFISH is not set | ||
779 | # CONFIG_CRYPTO_SERPENT is not set | ||
780 | # CONFIG_CRYPTO_AES is not set | 820 | # CONFIG_CRYPTO_AES is not set |
821 | # CONFIG_CRYPTO_ANUBIS is not set | ||
822 | # CONFIG_CRYPTO_ARC4 is not set | ||
823 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
824 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
781 | # CONFIG_CRYPTO_CAST5 is not set | 825 | # CONFIG_CRYPTO_CAST5 is not set |
782 | # CONFIG_CRYPTO_CAST6 is not set | 826 | # CONFIG_CRYPTO_CAST6 is not set |
783 | # CONFIG_CRYPTO_TEA is not set | 827 | # CONFIG_CRYPTO_DES is not set |
784 | # CONFIG_CRYPTO_ARC4 is not set | 828 | # CONFIG_CRYPTO_FCRYPT is not set |
785 | # CONFIG_CRYPTO_KHAZAD is not set | 829 | # CONFIG_CRYPTO_KHAZAD is not set |
786 | # CONFIG_CRYPTO_ANUBIS is not set | ||
787 | # CONFIG_CRYPTO_SEED is not set | ||
788 | # CONFIG_CRYPTO_SALSA20 is not set | 830 | # CONFIG_CRYPTO_SALSA20 is not set |
831 | # CONFIG_CRYPTO_SEED is not set | ||
832 | # CONFIG_CRYPTO_SERPENT is not set | ||
833 | # CONFIG_CRYPTO_TEA is not set | ||
834 | # CONFIG_CRYPTO_TWOFISH is not set | ||
835 | |||
836 | # | ||
837 | # Compression | ||
838 | # | ||
789 | # CONFIG_CRYPTO_DEFLATE is not set | 839 | # CONFIG_CRYPTO_DEFLATE is not set |
790 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
791 | # CONFIG_CRYPTO_CRC32C is not set | ||
792 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
793 | # CONFIG_CRYPTO_AUTHENC is not set | ||
794 | # CONFIG_CRYPTO_LZO is not set | 840 | # CONFIG_CRYPTO_LZO is not set |
795 | CONFIG_CRYPTO_HW=y | 841 | CONFIG_CRYPTO_HW=y |
796 | # CONFIG_PPC_CLOCK is not set | 842 | # CONFIG_PPC_CLOCK is not set |
843 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig index a9f113b243ae..042a85ea7b72 100644 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8544_ds_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-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:37:03 2008 | 4 | # Mon Jun 9 08:52:32 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
@@ -203,7 +208,6 @@ CONFIG_PREEMPT_NONE=y | |||
203 | # CONFIG_PREEMPT is not set | 208 | # CONFIG_PREEMPT is not set |
204 | CONFIG_BINFMT_ELF=y | 209 | CONFIG_BINFMT_ELF=y |
205 | CONFIG_BINFMT_MISC=m | 210 | CONFIG_BINFMT_MISC=m |
206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
207 | CONFIG_MATH_EMULATION=y | 211 | CONFIG_MATH_EMULATION=y |
208 | # CONFIG_IOMMU_HELPER is not set | 212 | # CONFIG_IOMMU_HELPER is not set |
209 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 213 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -219,11 +223,13 @@ CONFIG_FLATMEM=y | |||
219 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
220 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
223 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
224 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
225 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
226 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
227 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
228 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
229 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
@@ -248,6 +254,7 @@ CONFIG_PCI_LEGACY=y | |||
248 | # CONFIG_PCI_DEBUG is not set | 254 | # CONFIG_PCI_DEBUG is not set |
249 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
250 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
257 | # CONFIG_HAS_RAPIDIO is not set | ||
251 | 258 | ||
252 | # | 259 | # |
253 | # Advanced setup | 260 | # Advanced setup |
@@ -257,11 +264,12 @@ CONFIG_PCI_LEGACY=y | |||
257 | # | 264 | # |
258 | # Default settings for advanced configuration options are used | 265 | # Default settings for advanced configuration options are used |
259 | # | 266 | # |
260 | CONFIG_HIGHMEM_START=0xfe000000 | ||
261 | CONFIG_LOWMEM_SIZE=0x30000000 | 267 | CONFIG_LOWMEM_SIZE=0x30000000 |
268 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
262 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
270 | CONFIG_PHYSICAL_START=0x00000000 | ||
271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
263 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
264 | CONFIG_BOOT_LOAD=0x00800000 | ||
265 | 273 | ||
266 | # | 274 | # |
267 | # Networking | 275 | # Networking |
@@ -332,8 +340,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
332 | CONFIG_INET6_XFRM_MODE_BEET=y | 340 | CONFIG_INET6_XFRM_MODE_BEET=y |
333 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 341 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
334 | CONFIG_IPV6_SIT=y | 342 | CONFIG_IPV6_SIT=y |
343 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
335 | # CONFIG_IPV6_TUNNEL is not set | 344 | # CONFIG_IPV6_TUNNEL is not set |
336 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 345 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
346 | # CONFIG_IPV6_MROUTE is not set | ||
337 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
338 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
339 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
@@ -395,6 +405,7 @@ CONFIG_FW_LOADER=y | |||
395 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
396 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
397 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
408 | CONFIG_OF_I2C=y | ||
398 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
399 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
400 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
@@ -501,7 +512,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
501 | # CONFIG_SCSI_SRP is not set | 512 | # CONFIG_SCSI_SRP is not set |
502 | CONFIG_ATA=y | 513 | CONFIG_ATA=y |
503 | # CONFIG_ATA_NONSTANDARD is not set | 514 | # CONFIG_ATA_NONSTANDARD is not set |
515 | CONFIG_SATA_PMP=y | ||
504 | CONFIG_SATA_AHCI=y | 516 | CONFIG_SATA_AHCI=y |
517 | # CONFIG_SATA_SIL24 is not set | ||
518 | # CONFIG_SATA_FSL is not set | ||
519 | CONFIG_ATA_SFF=y | ||
505 | # CONFIG_SATA_SVW is not set | 520 | # CONFIG_SATA_SVW is not set |
506 | # CONFIG_ATA_PIIX is not set | 521 | # CONFIG_ATA_PIIX is not set |
507 | # CONFIG_SATA_MV is not set | 522 | # CONFIG_SATA_MV is not set |
@@ -511,13 +526,11 @@ CONFIG_SATA_AHCI=y | |||
511 | # CONFIG_SATA_PROMISE is not set | 526 | # CONFIG_SATA_PROMISE is not set |
512 | # CONFIG_SATA_SX4 is not set | 527 | # CONFIG_SATA_SX4 is not set |
513 | # CONFIG_SATA_SIL is not set | 528 | # CONFIG_SATA_SIL is not set |
514 | # CONFIG_SATA_SIL24 is not set | ||
515 | # CONFIG_SATA_SIS is not set | 529 | # CONFIG_SATA_SIS is not set |
516 | # CONFIG_SATA_ULI is not set | 530 | # CONFIG_SATA_ULI is not set |
517 | # CONFIG_SATA_VIA is not set | 531 | # CONFIG_SATA_VIA is not set |
518 | # CONFIG_SATA_VITESSE is not set | 532 | # CONFIG_SATA_VITESSE is not set |
519 | # CONFIG_SATA_INIC162X is not set | 533 | # CONFIG_SATA_INIC162X is not set |
520 | # CONFIG_SATA_FSL is not set | ||
521 | CONFIG_PATA_ALI=y | 534 | CONFIG_PATA_ALI=y |
522 | # CONFIG_PATA_AMD is not set | 535 | # CONFIG_PATA_AMD is not set |
523 | # CONFIG_PATA_ARTOP is not set | 536 | # CONFIG_PATA_ARTOP is not set |
@@ -557,6 +570,7 @@ CONFIG_PATA_ALI=y | |||
557 | # CONFIG_PATA_VIA is not set | 570 | # CONFIG_PATA_VIA is not set |
558 | # CONFIG_PATA_WINBOND is not set | 571 | # CONFIG_PATA_WINBOND is not set |
559 | # CONFIG_PATA_PLATFORM is not set | 572 | # CONFIG_PATA_PLATFORM is not set |
573 | # CONFIG_PATA_SCH is not set | ||
560 | # CONFIG_MD is not set | 574 | # CONFIG_MD is not set |
561 | # CONFIG_FUSION is not set | 575 | # CONFIG_FUSION is not set |
562 | 576 | ||
@@ -622,7 +636,6 @@ CONFIG_NETDEV_1000=y | |||
622 | # CONFIG_SIS190 is not set | 636 | # CONFIG_SIS190 is not set |
623 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
624 | # CONFIG_SKY2 is not set | 638 | # CONFIG_SKY2 is not set |
625 | # CONFIG_SK98LIN is not set | ||
626 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
627 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
628 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
@@ -642,6 +655,7 @@ CONFIG_NETDEV_10000=y | |||
642 | # CONFIG_MLX4_CORE is not set | 655 | # CONFIG_MLX4_CORE is not set |
643 | # CONFIG_TEHUTI is not set | 656 | # CONFIG_TEHUTI is not set |
644 | # CONFIG_BNX2X is not set | 657 | # CONFIG_BNX2X is not set |
658 | # CONFIG_SFC is not set | ||
645 | # CONFIG_TR is not set | 659 | # CONFIG_TR is not set |
646 | 660 | ||
647 | # | 661 | # |
@@ -649,6 +663,7 @@ CONFIG_NETDEV_10000=y | |||
649 | # | 663 | # |
650 | # CONFIG_WLAN_PRE80211 is not set | 664 | # CONFIG_WLAN_PRE80211 is not set |
651 | # CONFIG_WLAN_80211 is not set | 665 | # CONFIG_WLAN_80211 is not set |
666 | # CONFIG_IWLWIFI_LEDS is not set | ||
652 | 667 | ||
653 | # | 668 | # |
654 | # USB Network Adapters | 669 | # USB Network Adapters |
@@ -713,6 +728,7 @@ CONFIG_VT=y | |||
713 | CONFIG_VT_CONSOLE=y | 728 | CONFIG_VT_CONSOLE=y |
714 | CONFIG_HW_CONSOLE=y | 729 | CONFIG_HW_CONSOLE=y |
715 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
731 | CONFIG_DEVKMEM=y | ||
716 | # CONFIG_SERIAL_NONSTANDARD is not set | 732 | # CONFIG_SERIAL_NONSTANDARD is not set |
717 | # CONFIG_NOZOMI is not set | 733 | # CONFIG_NOZOMI is not set |
718 | 734 | ||
@@ -744,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
744 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
745 | # CONFIG_HW_RANDOM is not set | 761 | # CONFIG_HW_RANDOM is not set |
746 | CONFIG_NVRAM=y | 762 | CONFIG_NVRAM=y |
747 | # CONFIG_GEN_RTC is not set | ||
748 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
749 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
750 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
@@ -755,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
755 | # CONFIG_I2C_CHARDEV is not set | 770 | # CONFIG_I2C_CHARDEV is not set |
756 | 771 | ||
757 | # | 772 | # |
758 | # I2C Algorithms | ||
759 | # | ||
760 | # CONFIG_I2C_ALGOBIT is not set | ||
761 | # CONFIG_I2C_ALGOPCF is not set | ||
762 | # CONFIG_I2C_ALGOPCA is not set | ||
763 | |||
764 | # | ||
765 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
766 | # | 774 | # |
767 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
@@ -788,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
788 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
789 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
790 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
791 | 800 | ||
792 | # | 801 | # |
793 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
@@ -797,19 +806,13 @@ CONFIG_SENSORS_EEPROM=y | |||
797 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
798 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
799 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
800 | # CONFIG_TPS65010 is not set | ||
801 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
802 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
803 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
804 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
805 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
806 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
807 | |||
808 | # | ||
809 | # SPI support | ||
810 | # | ||
811 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
812 | # CONFIG_SPI_MASTER is not set | ||
813 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
814 | # CONFIG_POWER_SUPPLY is not set | 817 | # CONFIG_POWER_SUPPLY is not set |
815 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
@@ -826,13 +829,33 @@ CONFIG_SSB_POSSIBLE=y | |||
826 | # Multifunction device drivers | 829 | # Multifunction device drivers |
827 | # | 830 | # |
828 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
832 | # CONFIG_HTC_PASIC3 is not set | ||
829 | 833 | ||
830 | # | 834 | # |
831 | # Multimedia devices | 835 | # Multimedia devices |
832 | # | 836 | # |
837 | |||
838 | # | ||
839 | # Multimedia core support | ||
840 | # | ||
833 | # CONFIG_VIDEO_DEV is not set | 841 | # CONFIG_VIDEO_DEV is not set |
834 | CONFIG_DVB_CORE=m | 842 | CONFIG_DVB_CORE=m |
835 | # CONFIG_DVB_CORE_ATTACH is not set | 843 | CONFIG_VIDEO_MEDIA=m |
844 | |||
845 | # | ||
846 | # Multimedia drivers | ||
847 | # | ||
848 | # CONFIG_MEDIA_ATTACH is not set | ||
849 | CONFIG_MEDIA_TUNER=m | ||
850 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
851 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
852 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
853 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
854 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
855 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
856 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
857 | CONFIG_MEDIA_TUNER_XC2028=m | ||
858 | CONFIG_MEDIA_TUNER_XC5000=m | ||
836 | CONFIG_DVB_CAPTURE_DRIVERS=y | 859 | CONFIG_DVB_CAPTURE_DRIVERS=y |
837 | 860 | ||
838 | # | 861 | # |
@@ -875,14 +898,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
875 | # | 898 | # |
876 | # DVB-S (satellite) frontends | 899 | # DVB-S (satellite) frontends |
877 | # | 900 | # |
878 | # CONFIG_DVB_STV0299 is not set | ||
879 | # CONFIG_DVB_CX24110 is not set | 901 | # CONFIG_DVB_CX24110 is not set |
880 | # CONFIG_DVB_CX24123 is not set | 902 | # CONFIG_DVB_CX24123 is not set |
881 | # CONFIG_DVB_TDA8083 is not set | ||
882 | # CONFIG_DVB_MT312 is not set | 903 | # CONFIG_DVB_MT312 is not set |
883 | # CONFIG_DVB_VES1X93 is not set | ||
884 | # CONFIG_DVB_S5H1420 is not set | 904 | # CONFIG_DVB_S5H1420 is not set |
905 | # CONFIG_DVB_STV0299 is not set | ||
906 | # CONFIG_DVB_TDA8083 is not set | ||
885 | # CONFIG_DVB_TDA10086 is not set | 907 | # CONFIG_DVB_TDA10086 is not set |
908 | # CONFIG_DVB_VES1X93 is not set | ||
909 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
910 | # CONFIG_DVB_TDA826X is not set | ||
911 | # CONFIG_DVB_TUA6100 is not set | ||
886 | 912 | ||
887 | # | 913 | # |
888 | # DVB-T (terrestrial) frontends | 914 | # DVB-T (terrestrial) frontends |
@@ -900,6 +926,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
900 | # CONFIG_DVB_DIB3000MC is not set | 926 | # CONFIG_DVB_DIB3000MC is not set |
901 | # CONFIG_DVB_DIB7000M is not set | 927 | # CONFIG_DVB_DIB7000M is not set |
902 | # CONFIG_DVB_DIB7000P is not set | 928 | # CONFIG_DVB_DIB7000P is not set |
929 | # CONFIG_DVB_TDA10048 is not set | ||
903 | 930 | ||
904 | # | 931 | # |
905 | # DVB-C (cable) frontends | 932 | # DVB-C (cable) frontends |
@@ -918,27 +945,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
918 | # CONFIG_DVB_BCM3510 is not set | 945 | # CONFIG_DVB_BCM3510 is not set |
919 | # CONFIG_DVB_LGDT330X is not set | 946 | # CONFIG_DVB_LGDT330X is not set |
920 | # CONFIG_DVB_S5H1409 is not set | 947 | # CONFIG_DVB_S5H1409 is not set |
948 | # CONFIG_DVB_AU8522 is not set | ||
949 | # CONFIG_DVB_S5H1411 is not set | ||
921 | 950 | ||
922 | # | 951 | # |
923 | # Tuners/PLL support | 952 | # Digital terrestrial only tuners/PLL |
924 | # | 953 | # |
925 | # CONFIG_DVB_PLL is not set | 954 | # CONFIG_DVB_PLL is not set |
926 | # CONFIG_DVB_TDA826X is not set | ||
927 | # CONFIG_DVB_TDA827X is not set | ||
928 | # CONFIG_DVB_TDA18271 is not set | ||
929 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
930 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
931 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
932 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
933 | # CONFIG_DVB_TUNER_DIB0070 is not set | 955 | # CONFIG_DVB_TUNER_DIB0070 is not set |
934 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
935 | 956 | ||
936 | # | 957 | # |
937 | # Miscellaneous devices | 958 | # SEC control devices for DVB-S |
938 | # | 959 | # |
939 | # CONFIG_DVB_LNBP21 is not set | 960 | # CONFIG_DVB_LNBP21 is not set |
961 | # CONFIG_DVB_ISL6405 is not set | ||
940 | # CONFIG_DVB_ISL6421 is not set | 962 | # CONFIG_DVB_ISL6421 is not set |
941 | # CONFIG_DVB_TUA6100 is not set | ||
942 | CONFIG_DAB=y | 963 | CONFIG_DAB=y |
943 | # CONFIG_USB_DABUSB is not set | 964 | # CONFIG_USB_DABUSB is not set |
944 | 965 | ||
@@ -1005,6 +1026,7 @@ CONFIG_SND_AC97_CODEC=y | |||
1005 | # CONFIG_SND_AU8810 is not set | 1026 | # CONFIG_SND_AU8810 is not set |
1006 | # CONFIG_SND_AU8820 is not set | 1027 | # CONFIG_SND_AU8820 is not set |
1007 | # CONFIG_SND_AU8830 is not set | 1028 | # CONFIG_SND_AU8830 is not set |
1029 | # CONFIG_SND_AW2 is not set | ||
1008 | # CONFIG_SND_AZT3328 is not set | 1030 | # CONFIG_SND_AZT3328 is not set |
1009 | # CONFIG_SND_BT87X is not set | 1031 | # CONFIG_SND_BT87X is not set |
1010 | # CONFIG_SND_CA0106 is not set | 1032 | # CONFIG_SND_CA0106 is not set |
@@ -1079,11 +1101,11 @@ CONFIG_SND_INTEL8X0=y | |||
1079 | # CONFIG_SND_SOC is not set | 1101 | # CONFIG_SND_SOC is not set |
1080 | 1102 | ||
1081 | # | 1103 | # |
1082 | # SoC Audio support for SuperH | 1104 | # ALSA SoC audio for Freescale SOCs |
1083 | # | 1105 | # |
1084 | 1106 | ||
1085 | # | 1107 | # |
1086 | # ALSA SoC audio for Freescale SOCs | 1108 | # SoC Audio for the Texas Instruments OMAP |
1087 | # | 1109 | # |
1088 | 1110 | ||
1089 | # | 1111 | # |
@@ -1118,16 +1140,20 @@ CONFIG_USB_DEVICEFS=y | |||
1118 | CONFIG_USB_DEVICE_CLASS=y | 1140 | CONFIG_USB_DEVICE_CLASS=y |
1119 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1141 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1120 | # CONFIG_USB_OTG is not set | 1142 | # CONFIG_USB_OTG is not set |
1143 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1144 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1121 | 1145 | ||
1122 | # | 1146 | # |
1123 | # USB Host Controller Drivers | 1147 | # USB Host Controller Drivers |
1124 | # | 1148 | # |
1149 | # CONFIG_USB_C67X00_HCD is not set | ||
1125 | CONFIG_USB_EHCI_HCD=y | 1150 | CONFIG_USB_EHCI_HCD=y |
1126 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1151 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1127 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1152 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1128 | # CONFIG_USB_EHCI_FSL is not set | 1153 | # CONFIG_USB_EHCI_FSL is not set |
1129 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1154 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1130 | # CONFIG_USB_ISP116X_HCD is not set | 1155 | # CONFIG_USB_ISP116X_HCD is not set |
1156 | # CONFIG_USB_ISP1760_HCD is not set | ||
1131 | CONFIG_USB_OHCI_HCD=y | 1157 | CONFIG_USB_OHCI_HCD=y |
1132 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1158 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
1133 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1159 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1145,6 +1171,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1145 | # | 1171 | # |
1146 | # CONFIG_USB_ACM is not set | 1172 | # CONFIG_USB_ACM is not set |
1147 | # CONFIG_USB_PRINTER is not set | 1173 | # CONFIG_USB_PRINTER is not set |
1174 | # CONFIG_USB_WDM is not set | ||
1148 | 1175 | ||
1149 | # | 1176 | # |
1150 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1177 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1164,7 +1191,9 @@ CONFIG_USB_STORAGE=y | |||
1164 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1191 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1165 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1192 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1166 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1193 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1194 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1167 | # CONFIG_USB_STORAGE_KARMA is not set | 1195 | # CONFIG_USB_STORAGE_KARMA is not set |
1196 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1168 | # CONFIG_USB_LIBUSUAL is not set | 1197 | # CONFIG_USB_LIBUSUAL is not set |
1169 | 1198 | ||
1170 | # | 1199 | # |
@@ -1202,10 +1231,12 @@ CONFIG_USB_MON=y | |||
1202 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1231 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1203 | # CONFIG_USB_IOWARRIOR is not set | 1232 | # CONFIG_USB_IOWARRIOR is not set |
1204 | # CONFIG_USB_TEST is not set | 1233 | # CONFIG_USB_TEST is not set |
1234 | # CONFIG_USB_ISIGHTFW is not set | ||
1205 | # CONFIG_USB_GADGET is not set | 1235 | # CONFIG_USB_GADGET is not set |
1206 | # CONFIG_MMC is not set | 1236 | # CONFIG_MMC is not set |
1207 | # CONFIG_MEMSTICK is not set | 1237 | # CONFIG_MEMSTICK is not set |
1208 | # CONFIG_NEW_LEDS is not set | 1238 | # CONFIG_NEW_LEDS is not set |
1239 | # CONFIG_ACCESSIBILITY is not set | ||
1209 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
1210 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
1211 | CONFIG_RTC_LIB=y | 1242 | CONFIG_RTC_LIB=y |
@@ -1257,23 +1288,19 @@ CONFIG_RTC_DRV_CMOS=y | |||
1257 | # | 1288 | # |
1258 | # on-CPU RTC drivers | 1289 | # on-CPU RTC drivers |
1259 | # | 1290 | # |
1291 | # CONFIG_RTC_DRV_PPC is not set | ||
1260 | CONFIG_DMADEVICES=y | 1292 | CONFIG_DMADEVICES=y |
1261 | 1293 | ||
1262 | # | 1294 | # |
1263 | # DMA Devices | 1295 | # DMA Devices |
1264 | # | 1296 | # |
1265 | CONFIG_FSL_DMA=y | 1297 | CONFIG_FSL_DMA=y |
1266 | # CONFIG_FSL_DMA_SELFTEST is not set | ||
1267 | CONFIG_DMA_ENGINE=y | 1298 | CONFIG_DMA_ENGINE=y |
1268 | 1299 | ||
1269 | # | 1300 | # |
1270 | # DMA Clients | 1301 | # DMA Clients |
1271 | # | 1302 | # |
1272 | # CONFIG_NET_DMA is not set | 1303 | # CONFIG_NET_DMA is not set |
1273 | |||
1274 | # | ||
1275 | # Userspace I/O | ||
1276 | # | ||
1277 | # CONFIG_UIO is not set | 1304 | # CONFIG_UIO is not set |
1278 | 1305 | ||
1279 | # | 1306 | # |
@@ -1293,7 +1320,6 @@ CONFIG_FS_MBCACHE=y | |||
1293 | # CONFIG_JFS_FS is not set | 1320 | # CONFIG_JFS_FS is not set |
1294 | # CONFIG_FS_POSIX_ACL is not set | 1321 | # CONFIG_FS_POSIX_ACL is not set |
1295 | # CONFIG_XFS_FS is not set | 1322 | # CONFIG_XFS_FS is not set |
1296 | # CONFIG_GFS2_FS is not set | ||
1297 | # CONFIG_OCFS2_FS is not set | 1323 | # CONFIG_OCFS2_FS is not set |
1298 | CONFIG_DNOTIFY=y | 1324 | CONFIG_DNOTIFY=y |
1299 | CONFIG_INOTIFY=y | 1325 | CONFIG_INOTIFY=y |
@@ -1363,10 +1389,9 @@ CONFIG_NFS_FS=y | |||
1363 | CONFIG_NFS_V3=y | 1389 | CONFIG_NFS_V3=y |
1364 | # CONFIG_NFS_V3_ACL is not set | 1390 | # CONFIG_NFS_V3_ACL is not set |
1365 | CONFIG_NFS_V4=y | 1391 | CONFIG_NFS_V4=y |
1366 | # CONFIG_NFS_DIRECTIO is not set | ||
1367 | CONFIG_NFSD=y | 1392 | CONFIG_NFSD=y |
1368 | # CONFIG_NFSD_V3 is not set | 1393 | # CONFIG_NFSD_V3 is not set |
1369 | CONFIG_NFSD_TCP=y | 1394 | # CONFIG_NFSD_V4 is not set |
1370 | CONFIG_ROOT_NFS=y | 1395 | CONFIG_ROOT_NFS=y |
1371 | CONFIG_LOCKD=y | 1396 | CONFIG_LOCKD=y |
1372 | CONFIG_LOCKD_V4=y | 1397 | CONFIG_LOCKD_V4=y |
@@ -1450,9 +1475,10 @@ CONFIG_NLS_UTF8=m | |||
1450 | # Library routines | 1475 | # Library routines |
1451 | # | 1476 | # |
1452 | CONFIG_BITREVERSE=y | 1477 | CONFIG_BITREVERSE=y |
1478 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1453 | # CONFIG_CRC_CCITT is not set | 1479 | # CONFIG_CRC_CCITT is not set |
1454 | # CONFIG_CRC16 is not set | 1480 | # CONFIG_CRC16 is not set |
1455 | # CONFIG_CRC_ITU_T is not set | 1481 | CONFIG_CRC_ITU_T=m |
1456 | CONFIG_CRC32=y | 1482 | CONFIG_CRC32=y |
1457 | # CONFIG_CRC7 is not set | 1483 | # CONFIG_CRC7 is not set |
1458 | CONFIG_LIBCRC32C=m | 1484 | CONFIG_LIBCRC32C=m |
@@ -1469,6 +1495,7 @@ CONFIG_HAVE_LMB=y | |||
1469 | # CONFIG_PRINTK_TIME is not set | 1495 | # CONFIG_PRINTK_TIME is not set |
1470 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1496 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1471 | CONFIG_ENABLE_MUST_CHECK=y | 1497 | CONFIG_ENABLE_MUST_CHECK=y |
1498 | CONFIG_FRAME_WARN=1024 | ||
1472 | # CONFIG_MAGIC_SYSRQ is not set | 1499 | # CONFIG_MAGIC_SYSRQ is not set |
1473 | # CONFIG_UNUSED_SYMBOLS is not set | 1500 | # CONFIG_UNUSED_SYMBOLS is not set |
1474 | # CONFIG_DEBUG_FS is not set | 1501 | # CONFIG_DEBUG_FS is not set |
@@ -1479,6 +1506,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1479 | CONFIG_SCHED_DEBUG=y | 1506 | CONFIG_SCHED_DEBUG=y |
1480 | # CONFIG_SCHEDSTATS is not set | 1507 | # CONFIG_SCHEDSTATS is not set |
1481 | # CONFIG_TIMER_STATS is not set | 1508 | # CONFIG_TIMER_STATS is not set |
1509 | # CONFIG_DEBUG_OBJECTS is not set | ||
1482 | # CONFIG_SLUB_DEBUG_ON is not set | 1510 | # CONFIG_SLUB_DEBUG_ON is not set |
1483 | # CONFIG_SLUB_STATS is not set | 1511 | # CONFIG_SLUB_STATS is not set |
1484 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1512 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1492,6 +1520,7 @@ CONFIG_SCHED_DEBUG=y | |||
1492 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1520 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1493 | CONFIG_DEBUG_INFO=y | 1521 | CONFIG_DEBUG_INFO=y |
1494 | # CONFIG_DEBUG_VM is not set | 1522 | # CONFIG_DEBUG_VM is not set |
1523 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1495 | # CONFIG_DEBUG_LIST is not set | 1524 | # CONFIG_DEBUG_LIST is not set |
1496 | # CONFIG_DEBUG_SG is not set | 1525 | # CONFIG_DEBUG_SG is not set |
1497 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1526 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1503,6 +1532,7 @@ CONFIG_DEBUG_INFO=y | |||
1503 | # CONFIG_DEBUG_STACK_USAGE is not set | 1532 | # CONFIG_DEBUG_STACK_USAGE is not set |
1504 | # CONFIG_DEBUG_PAGEALLOC is not set | 1533 | # CONFIG_DEBUG_PAGEALLOC is not set |
1505 | # CONFIG_DEBUGGER is not set | 1534 | # CONFIG_DEBUGGER is not set |
1535 | # CONFIG_IRQSTACKS is not set | ||
1506 | # CONFIG_BDI_SWITCH is not set | 1536 | # CONFIG_BDI_SWITCH is not set |
1507 | # CONFIG_PPC_EARLY_DEBUG is not set | 1537 | # CONFIG_PPC_EARLY_DEBUG is not set |
1508 | 1538 | ||
@@ -1513,52 +1543,82 @@ CONFIG_DEBUG_INFO=y | |||
1513 | # CONFIG_SECURITY is not set | 1543 | # CONFIG_SECURITY is not set |
1514 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1544 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1515 | CONFIG_CRYPTO=y | 1545 | CONFIG_CRYPTO=y |
1546 | |||
1547 | # | ||
1548 | # Crypto core or helper | ||
1549 | # | ||
1516 | CONFIG_CRYPTO_ALGAPI=y | 1550 | CONFIG_CRYPTO_ALGAPI=y |
1517 | CONFIG_CRYPTO_BLKCIPHER=y | 1551 | CONFIG_CRYPTO_BLKCIPHER=y |
1518 | # CONFIG_CRYPTO_SEQIV is not set | ||
1519 | CONFIG_CRYPTO_HASH=y | 1552 | CONFIG_CRYPTO_HASH=y |
1520 | CONFIG_CRYPTO_MANAGER=y | 1553 | CONFIG_CRYPTO_MANAGER=y |
1554 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1555 | # CONFIG_CRYPTO_NULL is not set | ||
1556 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1557 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1558 | # CONFIG_CRYPTO_TEST is not set | ||
1559 | |||
1560 | # | ||
1561 | # Authenticated Encryption with Associated Data | ||
1562 | # | ||
1563 | # CONFIG_CRYPTO_CCM is not set | ||
1564 | # CONFIG_CRYPTO_GCM is not set | ||
1565 | # CONFIG_CRYPTO_SEQIV is not set | ||
1566 | |||
1567 | # | ||
1568 | # Block modes | ||
1569 | # | ||
1570 | CONFIG_CRYPTO_CBC=y | ||
1571 | # CONFIG_CRYPTO_CTR is not set | ||
1572 | # CONFIG_CRYPTO_CTS is not set | ||
1573 | # CONFIG_CRYPTO_ECB is not set | ||
1574 | # CONFIG_CRYPTO_LRW is not set | ||
1575 | CONFIG_CRYPTO_PCBC=m | ||
1576 | # CONFIG_CRYPTO_XTS is not set | ||
1577 | |||
1578 | # | ||
1579 | # Hash modes | ||
1580 | # | ||
1521 | CONFIG_CRYPTO_HMAC=y | 1581 | CONFIG_CRYPTO_HMAC=y |
1522 | # CONFIG_CRYPTO_XCBC is not set | 1582 | # CONFIG_CRYPTO_XCBC is not set |
1523 | # CONFIG_CRYPTO_NULL is not set | 1583 | |
1584 | # | ||
1585 | # Digest | ||
1586 | # | ||
1587 | # CONFIG_CRYPTO_CRC32C is not set | ||
1524 | # CONFIG_CRYPTO_MD4 is not set | 1588 | # CONFIG_CRYPTO_MD4 is not set |
1525 | CONFIG_CRYPTO_MD5=y | 1589 | CONFIG_CRYPTO_MD5=y |
1590 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1526 | CONFIG_CRYPTO_SHA1=m | 1591 | CONFIG_CRYPTO_SHA1=m |
1527 | # CONFIG_CRYPTO_SHA256 is not set | 1592 | # CONFIG_CRYPTO_SHA256 is not set |
1528 | # CONFIG_CRYPTO_SHA512 is not set | 1593 | # CONFIG_CRYPTO_SHA512 is not set |
1529 | # CONFIG_CRYPTO_WP512 is not set | ||
1530 | # CONFIG_CRYPTO_TGR192 is not set | 1594 | # CONFIG_CRYPTO_TGR192 is not set |
1531 | # CONFIG_CRYPTO_GF128MUL is not set | 1595 | # CONFIG_CRYPTO_WP512 is not set |
1532 | # CONFIG_CRYPTO_ECB is not set | 1596 | |
1533 | CONFIG_CRYPTO_CBC=y | 1597 | # |
1534 | CONFIG_CRYPTO_PCBC=m | 1598 | # Ciphers |
1535 | # CONFIG_CRYPTO_LRW is not set | 1599 | # |
1536 | # CONFIG_CRYPTO_XTS is not set | ||
1537 | # CONFIG_CRYPTO_CTR is not set | ||
1538 | # CONFIG_CRYPTO_GCM is not set | ||
1539 | # CONFIG_CRYPTO_CCM is not set | ||
1540 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1541 | CONFIG_CRYPTO_DES=y | ||
1542 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1543 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1544 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1545 | # CONFIG_CRYPTO_SERPENT is not set | ||
1546 | # CONFIG_CRYPTO_AES is not set | 1600 | # CONFIG_CRYPTO_AES is not set |
1601 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1602 | # CONFIG_CRYPTO_ARC4 is not set | ||
1603 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1604 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1547 | # CONFIG_CRYPTO_CAST5 is not set | 1605 | # CONFIG_CRYPTO_CAST5 is not set |
1548 | # CONFIG_CRYPTO_CAST6 is not set | 1606 | # CONFIG_CRYPTO_CAST6 is not set |
1549 | # CONFIG_CRYPTO_TEA is not set | 1607 | CONFIG_CRYPTO_DES=y |
1550 | # CONFIG_CRYPTO_ARC4 is not set | 1608 | # CONFIG_CRYPTO_FCRYPT is not set |
1551 | # CONFIG_CRYPTO_KHAZAD is not set | 1609 | # CONFIG_CRYPTO_KHAZAD is not set |
1552 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1553 | # CONFIG_CRYPTO_SEED is not set | ||
1554 | # CONFIG_CRYPTO_SALSA20 is not set | 1610 | # CONFIG_CRYPTO_SALSA20 is not set |
1611 | # CONFIG_CRYPTO_SEED is not set | ||
1612 | # CONFIG_CRYPTO_SERPENT is not set | ||
1613 | # CONFIG_CRYPTO_TEA is not set | ||
1614 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1615 | |||
1616 | # | ||
1617 | # Compression | ||
1618 | # | ||
1555 | # CONFIG_CRYPTO_DEFLATE is not set | 1619 | # CONFIG_CRYPTO_DEFLATE is not set |
1556 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1557 | # CONFIG_CRYPTO_CRC32C is not set | ||
1558 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1559 | # CONFIG_CRYPTO_TEST is not set | ||
1560 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1561 | # CONFIG_CRYPTO_LZO is not set | 1620 | # CONFIG_CRYPTO_LZO is not set |
1562 | CONFIG_CRYPTO_HW=y | 1621 | CONFIG_CRYPTO_HW=y |
1563 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1622 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1564 | # CONFIG_PPC_CLOCK is not set | 1623 | # CONFIG_PPC_CLOCK is not set |
1624 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig index 851ac9115617..e19592b42043 100644 --- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:27 2008 | 4 | # Mon Jun 9 08:52:33 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
@@ -153,6 +157,7 @@ CONFIG_MPC8560_ADS=y | |||
153 | # CONFIG_MPC85xx_CDS is not set | 157 | # CONFIG_MPC85xx_CDS is not set |
154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
160 | # CONFIG_KSI8560 is not set | ||
156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
@@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
218 | # CONFIG_PROC_DEVICETREE is not set | 225 | # CONFIG_PROC_DEVICETREE is not set |
219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
@@ -238,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
238 | CONFIG_PCI_DEBUG=y | 245 | CONFIG_PCI_DEBUG=y |
239 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
240 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
248 | # CONFIG_HAS_RAPIDIO is not set | ||
241 | 249 | ||
242 | # | 250 | # |
243 | # Advanced setup | 251 | # Advanced setup |
@@ -247,11 +255,12 @@ CONFIG_PCI_DEBUG=y | |||
247 | # | 255 | # |
248 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
249 | # | 257 | # |
250 | CONFIG_HIGHMEM_START=0xfe000000 | ||
251 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
252 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
261 | CONFIG_PHYSICAL_START=0x00000000 | ||
262 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
253 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
254 | CONFIG_BOOT_LOAD=0x00800000 | ||
255 | 264 | ||
256 | # | 265 | # |
257 | # Networking | 266 | # Networking |
@@ -299,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
300 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
301 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
303 | # CONFIG_INET6_TUNNEL is not set | ||
304 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
305 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
306 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
@@ -462,7 +469,6 @@ CONFIG_E1000_NAPI=y | |||
462 | # CONFIG_SIS190 is not set | 469 | # CONFIG_SIS190 is not set |
463 | # CONFIG_SKGE is not set | 470 | # CONFIG_SKGE is not set |
464 | # CONFIG_SKY2 is not set | 471 | # CONFIG_SKY2 is not set |
465 | # CONFIG_SK98LIN is not set | ||
466 | # CONFIG_VIA_VELOCITY is not set | 472 | # CONFIG_VIA_VELOCITY is not set |
467 | # CONFIG_TIGON3 is not set | 473 | # CONFIG_TIGON3 is not set |
468 | # CONFIG_BNX2 is not set | 474 | # CONFIG_BNX2 is not set |
@@ -482,6 +488,7 @@ CONFIG_NETDEV_10000=y | |||
482 | # CONFIG_MLX4_CORE is not set | 488 | # CONFIG_MLX4_CORE is not set |
483 | # CONFIG_TEHUTI is not set | 489 | # CONFIG_TEHUTI is not set |
484 | # CONFIG_BNX2X is not set | 490 | # CONFIG_BNX2X is not set |
491 | # CONFIG_SFC is not set | ||
485 | # CONFIG_TR is not set | 492 | # CONFIG_TR is not set |
486 | 493 | ||
487 | # | 494 | # |
@@ -489,6 +496,7 @@ CONFIG_NETDEV_10000=y | |||
489 | # | 496 | # |
490 | # CONFIG_WLAN_PRE80211 is not set | 497 | # CONFIG_WLAN_PRE80211 is not set |
491 | # CONFIG_WLAN_80211 is not set | 498 | # CONFIG_WLAN_80211 is not set |
499 | # CONFIG_IWLWIFI_LEDS is not set | ||
492 | # CONFIG_WAN is not set | 500 | # CONFIG_WAN is not set |
493 | # CONFIG_FDDI is not set | 501 | # CONFIG_FDDI is not set |
494 | # CONFIG_HIPPI is not set | 502 | # CONFIG_HIPPI is not set |
@@ -535,6 +543,7 @@ CONFIG_INPUT=y | |||
535 | # Character devices | 543 | # Character devices |
536 | # | 544 | # |
537 | # CONFIG_VT is not set | 545 | # CONFIG_VT is not set |
546 | CONFIG_DEVKMEM=y | ||
538 | # CONFIG_SERIAL_NONSTANDARD is not set | 547 | # CONFIG_SERIAL_NONSTANDARD is not set |
539 | # CONFIG_NOZOMI is not set | 548 | # CONFIG_NOZOMI is not set |
540 | 549 | ||
@@ -572,12 +581,7 @@ CONFIG_GEN_RTC=y | |||
572 | # CONFIG_TCG_TPM is not set | 581 | # CONFIG_TCG_TPM is not set |
573 | CONFIG_DEVPORT=y | 582 | CONFIG_DEVPORT=y |
574 | # CONFIG_I2C is not set | 583 | # CONFIG_I2C is not set |
575 | |||
576 | # | ||
577 | # SPI support | ||
578 | # | ||
579 | # CONFIG_SPI is not set | 584 | # CONFIG_SPI is not set |
580 | # CONFIG_SPI_MASTER is not set | ||
581 | # CONFIG_W1 is not set | 585 | # CONFIG_W1 is not set |
582 | # CONFIG_POWER_SUPPLY is not set | 586 | # CONFIG_POWER_SUPPLY is not set |
583 | CONFIG_HWMON=y | 587 | CONFIG_HWMON=y |
@@ -610,12 +614,22 @@ CONFIG_SSB_POSSIBLE=y | |||
610 | # Multifunction device drivers | 614 | # Multifunction device drivers |
611 | # | 615 | # |
612 | # CONFIG_MFD_SM501 is not set | 616 | # CONFIG_MFD_SM501 is not set |
617 | # CONFIG_HTC_PASIC3 is not set | ||
613 | 618 | ||
614 | # | 619 | # |
615 | # Multimedia devices | 620 | # Multimedia devices |
616 | # | 621 | # |
622 | |||
623 | # | ||
624 | # Multimedia core support | ||
625 | # | ||
617 | # CONFIG_VIDEO_DEV is not set | 626 | # CONFIG_VIDEO_DEV is not set |
618 | # CONFIG_DVB_CORE is not set | 627 | # CONFIG_DVB_CORE is not set |
628 | # CONFIG_VIDEO_MEDIA is not set | ||
629 | |||
630 | # | ||
631 | # Multimedia drivers | ||
632 | # | ||
619 | CONFIG_DAB=y | 633 | CONFIG_DAB=y |
620 | 634 | ||
621 | # | 635 | # |
@@ -646,6 +660,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
646 | CONFIG_USB_ARCH_HAS_OHCI=y | 660 | CONFIG_USB_ARCH_HAS_OHCI=y |
647 | CONFIG_USB_ARCH_HAS_EHCI=y | 661 | CONFIG_USB_ARCH_HAS_EHCI=y |
648 | # CONFIG_USB is not set | 662 | # CONFIG_USB is not set |
663 | # CONFIG_USB_OTG_WHITELIST is not set | ||
664 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
649 | 665 | ||
650 | # | 666 | # |
651 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 667 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -654,14 +670,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
654 | # CONFIG_MMC is not set | 670 | # CONFIG_MMC is not set |
655 | # CONFIG_MEMSTICK is not set | 671 | # CONFIG_MEMSTICK is not set |
656 | # CONFIG_NEW_LEDS is not set | 672 | # CONFIG_NEW_LEDS is not set |
673 | # CONFIG_ACCESSIBILITY is not set | ||
657 | # CONFIG_INFINIBAND is not set | 674 | # CONFIG_INFINIBAND is not set |
658 | # CONFIG_EDAC is not set | 675 | # CONFIG_EDAC is not set |
659 | # CONFIG_RTC_CLASS is not set | 676 | # CONFIG_RTC_CLASS is not set |
660 | # CONFIG_DMADEVICES is not set | 677 | # CONFIG_DMADEVICES is not set |
661 | |||
662 | # | ||
663 | # Userspace I/O | ||
664 | # | ||
665 | # CONFIG_UIO is not set | 678 | # CONFIG_UIO is not set |
666 | 679 | ||
667 | # | 680 | # |
@@ -681,7 +694,6 @@ CONFIG_FS_MBCACHE=y | |||
681 | # CONFIG_JFS_FS is not set | 694 | # CONFIG_JFS_FS is not set |
682 | # CONFIG_FS_POSIX_ACL is not set | 695 | # CONFIG_FS_POSIX_ACL is not set |
683 | # CONFIG_XFS_FS is not set | 696 | # CONFIG_XFS_FS is not set |
684 | # CONFIG_GFS2_FS is not set | ||
685 | # CONFIG_OCFS2_FS is not set | 697 | # CONFIG_OCFS2_FS is not set |
686 | CONFIG_DNOTIFY=y | 698 | CONFIG_DNOTIFY=y |
687 | CONFIG_INOTIFY=y | 699 | CONFIG_INOTIFY=y |
@@ -738,7 +750,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
738 | CONFIG_NFS_FS=y | 750 | CONFIG_NFS_FS=y |
739 | # CONFIG_NFS_V3 is not set | 751 | # CONFIG_NFS_V3 is not set |
740 | # CONFIG_NFS_V4 is not set | 752 | # CONFIG_NFS_V4 is not set |
741 | # CONFIG_NFS_DIRECTIO is not set | ||
742 | # CONFIG_NFSD is not set | 753 | # CONFIG_NFSD is not set |
743 | CONFIG_ROOT_NFS=y | 754 | CONFIG_ROOT_NFS=y |
744 | CONFIG_LOCKD=y | 755 | CONFIG_LOCKD=y |
@@ -777,6 +788,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
777 | # Library routines | 788 | # Library routines |
778 | # | 789 | # |
779 | CONFIG_BITREVERSE=y | 790 | CONFIG_BITREVERSE=y |
791 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
780 | # CONFIG_CRC_CCITT is not set | 792 | # CONFIG_CRC_CCITT is not set |
781 | # CONFIG_CRC16 is not set | 793 | # CONFIG_CRC16 is not set |
782 | # CONFIG_CRC_ITU_T is not set | 794 | # CONFIG_CRC_ITU_T is not set |
@@ -787,6 +799,7 @@ CONFIG_PLIST=y | |||
787 | CONFIG_HAS_IOMEM=y | 799 | CONFIG_HAS_IOMEM=y |
788 | CONFIG_HAS_IOPORT=y | 800 | CONFIG_HAS_IOPORT=y |
789 | CONFIG_HAS_DMA=y | 801 | CONFIG_HAS_DMA=y |
802 | CONFIG_HAVE_LMB=y | ||
790 | 803 | ||
791 | # | 804 | # |
792 | # Kernel hacking | 805 | # Kernel hacking |
@@ -794,6 +807,7 @@ CONFIG_HAS_DMA=y | |||
794 | # CONFIG_PRINTK_TIME is not set | 807 | # CONFIG_PRINTK_TIME is not set |
795 | CONFIG_ENABLE_WARN_DEPRECATED=y | 808 | CONFIG_ENABLE_WARN_DEPRECATED=y |
796 | CONFIG_ENABLE_MUST_CHECK=y | 809 | CONFIG_ENABLE_MUST_CHECK=y |
810 | CONFIG_FRAME_WARN=1024 | ||
797 | # CONFIG_MAGIC_SYSRQ is not set | 811 | # CONFIG_MAGIC_SYSRQ is not set |
798 | # CONFIG_UNUSED_SYMBOLS is not set | 812 | # CONFIG_UNUSED_SYMBOLS is not set |
799 | # CONFIG_DEBUG_FS is not set | 813 | # CONFIG_DEBUG_FS is not set |
@@ -804,6 +818,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
804 | CONFIG_SCHED_DEBUG=y | 818 | CONFIG_SCHED_DEBUG=y |
805 | # CONFIG_SCHEDSTATS is not set | 819 | # CONFIG_SCHEDSTATS is not set |
806 | # CONFIG_TIMER_STATS is not set | 820 | # CONFIG_TIMER_STATS is not set |
821 | # CONFIG_DEBUG_OBJECTS is not set | ||
807 | # CONFIG_SLUB_DEBUG_ON is not set | 822 | # CONFIG_SLUB_DEBUG_ON is not set |
808 | # CONFIG_SLUB_STATS is not set | 823 | # CONFIG_SLUB_STATS is not set |
809 | # CONFIG_DEBUG_RT_MUTEXES is not set | 824 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -816,6 +831,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
816 | # CONFIG_DEBUG_BUGVERBOSE is not set | 831 | # CONFIG_DEBUG_BUGVERBOSE is not set |
817 | # CONFIG_DEBUG_INFO is not set | 832 | # CONFIG_DEBUG_INFO is not set |
818 | # CONFIG_DEBUG_VM is not set | 833 | # CONFIG_DEBUG_VM is not set |
834 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
819 | # CONFIG_DEBUG_LIST is not set | 835 | # CONFIG_DEBUG_LIST is not set |
820 | # CONFIG_DEBUG_SG is not set | 836 | # CONFIG_DEBUG_SG is not set |
821 | # CONFIG_BOOT_PRINTK_DELAY is not set | 837 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -827,6 +843,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
827 | # CONFIG_DEBUG_PAGEALLOC is not set | 843 | # CONFIG_DEBUG_PAGEALLOC is not set |
828 | # CONFIG_DEBUGGER is not set | 844 | # CONFIG_DEBUGGER is not set |
829 | # CONFIG_KGDB_CONSOLE is not set | 845 | # CONFIG_KGDB_CONSOLE is not set |
846 | # CONFIG_IRQSTACKS is not set | ||
830 | # CONFIG_BDI_SWITCH is not set | 847 | # CONFIG_BDI_SWITCH is not set |
831 | # CONFIG_PPC_EARLY_DEBUG is not set | 848 | # CONFIG_PPC_EARLY_DEBUG is not set |
832 | 849 | ||
@@ -837,49 +854,79 @@ CONFIG_DEBUG_MUTEXES=y | |||
837 | # CONFIG_SECURITY is not set | 854 | # CONFIG_SECURITY is not set |
838 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 855 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
839 | CONFIG_CRYPTO=y | 856 | CONFIG_CRYPTO=y |
840 | # CONFIG_CRYPTO_SEQIV is not set | 857 | |
858 | # | ||
859 | # Crypto core or helper | ||
860 | # | ||
841 | # CONFIG_CRYPTO_MANAGER is not set | 861 | # CONFIG_CRYPTO_MANAGER is not set |
862 | # CONFIG_CRYPTO_GF128MUL is not set | ||
863 | # CONFIG_CRYPTO_NULL is not set | ||
864 | # CONFIG_CRYPTO_CRYPTD is not set | ||
865 | # CONFIG_CRYPTO_AUTHENC is not set | ||
866 | |||
867 | # | ||
868 | # Authenticated Encryption with Associated Data | ||
869 | # | ||
870 | # CONFIG_CRYPTO_CCM is not set | ||
871 | # CONFIG_CRYPTO_GCM is not set | ||
872 | # CONFIG_CRYPTO_SEQIV is not set | ||
873 | |||
874 | # | ||
875 | # Block modes | ||
876 | # | ||
877 | # CONFIG_CRYPTO_CBC is not set | ||
878 | # CONFIG_CRYPTO_CTR is not set | ||
879 | # CONFIG_CRYPTO_CTS is not set | ||
880 | # CONFIG_CRYPTO_ECB is not set | ||
881 | # CONFIG_CRYPTO_LRW is not set | ||
882 | # CONFIG_CRYPTO_PCBC is not set | ||
883 | # CONFIG_CRYPTO_XTS is not set | ||
884 | |||
885 | # | ||
886 | # Hash modes | ||
887 | # | ||
842 | # CONFIG_CRYPTO_HMAC is not set | 888 | # CONFIG_CRYPTO_HMAC is not set |
843 | # CONFIG_CRYPTO_XCBC is not set | 889 | # CONFIG_CRYPTO_XCBC is not set |
844 | # CONFIG_CRYPTO_NULL is not set | 890 | |
891 | # | ||
892 | # Digest | ||
893 | # | ||
894 | # CONFIG_CRYPTO_CRC32C is not set | ||
845 | # CONFIG_CRYPTO_MD4 is not set | 895 | # CONFIG_CRYPTO_MD4 is not set |
846 | # CONFIG_CRYPTO_MD5 is not set | 896 | # CONFIG_CRYPTO_MD5 is not set |
897 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
847 | # CONFIG_CRYPTO_SHA1 is not set | 898 | # CONFIG_CRYPTO_SHA1 is not set |
848 | # CONFIG_CRYPTO_SHA256 is not set | 899 | # CONFIG_CRYPTO_SHA256 is not set |
849 | # CONFIG_CRYPTO_SHA512 is not set | 900 | # CONFIG_CRYPTO_SHA512 is not set |
850 | # CONFIG_CRYPTO_WP512 is not set | ||
851 | # CONFIG_CRYPTO_TGR192 is not set | 901 | # CONFIG_CRYPTO_TGR192 is not set |
852 | # CONFIG_CRYPTO_GF128MUL is not set | 902 | # CONFIG_CRYPTO_WP512 is not set |
853 | # CONFIG_CRYPTO_ECB is not set | 903 | |
854 | # CONFIG_CRYPTO_CBC is not set | 904 | # |
855 | # CONFIG_CRYPTO_PCBC is not set | 905 | # Ciphers |
856 | # CONFIG_CRYPTO_LRW is not set | 906 | # |
857 | # CONFIG_CRYPTO_XTS is not set | ||
858 | # CONFIG_CRYPTO_CTR is not set | ||
859 | # CONFIG_CRYPTO_GCM is not set | ||
860 | # CONFIG_CRYPTO_CCM is not set | ||
861 | # CONFIG_CRYPTO_CRYPTD is not set | ||
862 | # CONFIG_CRYPTO_DES is not set | ||
863 | # CONFIG_CRYPTO_FCRYPT is not set | ||
864 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
865 | # CONFIG_CRYPTO_TWOFISH is not set | ||
866 | # CONFIG_CRYPTO_SERPENT is not set | ||
867 | # CONFIG_CRYPTO_AES is not set | 907 | # CONFIG_CRYPTO_AES is not set |
908 | # CONFIG_CRYPTO_ANUBIS is not set | ||
909 | # CONFIG_CRYPTO_ARC4 is not set | ||
910 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
911 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
868 | # CONFIG_CRYPTO_CAST5 is not set | 912 | # CONFIG_CRYPTO_CAST5 is not set |
869 | # CONFIG_CRYPTO_CAST6 is not set | 913 | # CONFIG_CRYPTO_CAST6 is not set |
870 | # CONFIG_CRYPTO_TEA is not set | 914 | # CONFIG_CRYPTO_DES is not set |
871 | # CONFIG_CRYPTO_ARC4 is not set | 915 | # CONFIG_CRYPTO_FCRYPT is not set |
872 | # CONFIG_CRYPTO_KHAZAD is not set | 916 | # CONFIG_CRYPTO_KHAZAD is not set |
873 | # CONFIG_CRYPTO_ANUBIS is not set | ||
874 | # CONFIG_CRYPTO_SEED is not set | ||
875 | # CONFIG_CRYPTO_SALSA20 is not set | 917 | # CONFIG_CRYPTO_SALSA20 is not set |
918 | # CONFIG_CRYPTO_SEED is not set | ||
919 | # CONFIG_CRYPTO_SERPENT is not set | ||
920 | # CONFIG_CRYPTO_TEA is not set | ||
921 | # CONFIG_CRYPTO_TWOFISH is not set | ||
922 | |||
923 | # | ||
924 | # Compression | ||
925 | # | ||
876 | # CONFIG_CRYPTO_DEFLATE is not set | 926 | # CONFIG_CRYPTO_DEFLATE is not set |
877 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
878 | # CONFIG_CRYPTO_CRC32C is not set | ||
879 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
880 | # CONFIG_CRYPTO_AUTHENC is not set | ||
881 | # CONFIG_CRYPTO_LZO is not set | 927 | # CONFIG_CRYPTO_LZO is not set |
882 | CONFIG_CRYPTO_HW=y | 928 | CONFIG_CRYPTO_HW=y |
883 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 929 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
884 | # CONFIG_PPC_CLOCK is not set | 930 | # CONFIG_PPC_CLOCK is not set |
885 | CONFIG_PPC_LIB_RHEAP=y | 931 | CONFIG_PPC_LIB_RHEAP=y |
932 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig index 2b866b385607..28004e93aeee 100644 --- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8568mds_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-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:37:05 2008 | 4 | # Mon Jun 9 08:52:34 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
@@ -111,12 +114,14 @@ CONFIG_SLUB=y | |||
111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
@@ -156,6 +161,7 @@ CONFIG_MPC85xx=y | |||
156 | # CONFIG_MPC85xx_CDS is not set | 161 | # CONFIG_MPC85xx_CDS is not set |
157 | CONFIG_MPC85xx_MDS=y | 162 | CONFIG_MPC85xx_MDS=y |
158 | # CONFIG_MPC85xx_DS is not set | 163 | # CONFIG_MPC85xx_DS is not set |
164 | # CONFIG_KSI8560 is not set | ||
159 | # CONFIG_STX_GP3 is not set | 165 | # CONFIG_STX_GP3 is not set |
160 | # CONFIG_TQM8540 is not set | 166 | # CONFIG_TQM8540 is not set |
161 | # CONFIG_TQM8541 is not set | 167 | # CONFIG_TQM8541 is not set |
@@ -212,11 +218,13 @@ CONFIG_FLATMEM=y | |||
212 | CONFIG_FLAT_NODE_MEM_MAP=y | 218 | CONFIG_FLAT_NODE_MEM_MAP=y |
213 | # CONFIG_SPARSEMEM_STATIC is not set | 219 | # CONFIG_SPARSEMEM_STATIC is not set |
214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
221 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
216 | # CONFIG_RESOURCES_64BIT is not set | 223 | # CONFIG_RESOURCES_64BIT is not set |
217 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
218 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
219 | CONFIG_VIRT_TO_BUS=y | 226 | CONFIG_VIRT_TO_BUS=y |
227 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
220 | CONFIG_PROC_DEVICETREE=y | 228 | CONFIG_PROC_DEVICETREE=y |
221 | # CONFIG_CMDLINE_BOOL is not set | 229 | # CONFIG_CMDLINE_BOOL is not set |
222 | # CONFIG_PM is not set | 230 | # CONFIG_PM is not set |
@@ -240,6 +248,7 @@ CONFIG_PCI_LEGACY=y | |||
240 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
241 | # CONFIG_PCCARD is not set | 249 | # CONFIG_PCCARD is not set |
242 | # CONFIG_HOTPLUG_PCI is not set | 250 | # CONFIG_HOTPLUG_PCI is not set |
251 | # CONFIG_HAS_RAPIDIO is not set | ||
243 | 252 | ||
244 | # | 253 | # |
245 | # Advanced setup | 254 | # Advanced setup |
@@ -249,11 +258,12 @@ CONFIG_PCI_LEGACY=y | |||
249 | # | 258 | # |
250 | # Default settings for advanced configuration options are used | 259 | # Default settings for advanced configuration options are used |
251 | # | 260 | # |
252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
253 | CONFIG_LOWMEM_SIZE=0x30000000 | 261 | CONFIG_LOWMEM_SIZE=0x30000000 |
262 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
254 | CONFIG_KERNEL_START=0xc0000000 | 263 | CONFIG_KERNEL_START=0xc0000000 |
264 | CONFIG_PHYSICAL_START=0x00000000 | ||
265 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
255 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
256 | CONFIG_BOOT_LOAD=0x00800000 | ||
257 | 267 | ||
258 | # | 268 | # |
259 | # Networking | 269 | # Networking |
@@ -301,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
301 | CONFIG_DEFAULT_TCP_CONG="cubic" | 311 | CONFIG_DEFAULT_TCP_CONG="cubic" |
302 | # CONFIG_TCP_MD5SIG is not set | 312 | # CONFIG_TCP_MD5SIG is not set |
303 | # CONFIG_IPV6 is not set | 313 | # CONFIG_IPV6 is not set |
304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
305 | # CONFIG_INET6_TUNNEL is not set | ||
306 | # CONFIG_NETWORK_SECMARK is not set | 314 | # CONFIG_NETWORK_SECMARK is not set |
307 | # CONFIG_NETFILTER is not set | 315 | # CONFIG_NETFILTER is not set |
308 | # CONFIG_IP_DCCP is not set | 316 | # CONFIG_IP_DCCP is not set |
@@ -358,6 +366,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
358 | # CONFIG_CONNECTOR is not set | 366 | # CONFIG_CONNECTOR is not set |
359 | # CONFIG_MTD is not set | 367 | # CONFIG_MTD is not set |
360 | CONFIG_OF_DEVICE=y | 368 | CONFIG_OF_DEVICE=y |
369 | CONFIG_OF_I2C=y | ||
361 | # CONFIG_PARPORT is not set | 370 | # CONFIG_PARPORT is not set |
362 | CONFIG_BLK_DEV=y | 371 | CONFIG_BLK_DEV=y |
363 | # CONFIG_BLK_DEV_FD is not set | 372 | # CONFIG_BLK_DEV_FD is not set |
@@ -525,7 +534,6 @@ CONFIG_NETDEV_1000=y | |||
525 | # CONFIG_SIS190 is not set | 534 | # CONFIG_SIS190 is not set |
526 | # CONFIG_SKGE is not set | 535 | # CONFIG_SKGE is not set |
527 | # CONFIG_SKY2 is not set | 536 | # CONFIG_SKY2 is not set |
528 | # CONFIG_SK98LIN is not set | ||
529 | # CONFIG_VIA_VELOCITY is not set | 537 | # CONFIG_VIA_VELOCITY is not set |
530 | # CONFIG_TIGON3 is not set | 538 | # CONFIG_TIGON3 is not set |
531 | # CONFIG_BNX2 is not set | 539 | # CONFIG_BNX2 is not set |
@@ -546,6 +554,7 @@ CONFIG_NETDEV_10000=y | |||
546 | # CONFIG_MLX4_CORE is not set | 554 | # CONFIG_MLX4_CORE is not set |
547 | # CONFIG_TEHUTI is not set | 555 | # CONFIG_TEHUTI is not set |
548 | # CONFIG_BNX2X is not set | 556 | # CONFIG_BNX2X is not set |
557 | # CONFIG_SFC is not set | ||
549 | # CONFIG_TR is not set | 558 | # CONFIG_TR is not set |
550 | 559 | ||
551 | # | 560 | # |
@@ -553,6 +562,7 @@ CONFIG_NETDEV_10000=y | |||
553 | # | 562 | # |
554 | # CONFIG_WLAN_PRE80211 is not set | 563 | # CONFIG_WLAN_PRE80211 is not set |
555 | # CONFIG_WLAN_80211 is not set | 564 | # CONFIG_WLAN_80211 is not set |
565 | # CONFIG_IWLWIFI_LEDS is not set | ||
556 | # CONFIG_WAN is not set | 566 | # CONFIG_WAN is not set |
557 | # CONFIG_FDDI is not set | 567 | # CONFIG_FDDI is not set |
558 | # CONFIG_HIPPI is not set | 568 | # CONFIG_HIPPI is not set |
@@ -600,6 +610,7 @@ CONFIG_INPUT=y | |||
600 | # Character devices | 610 | # Character devices |
601 | # | 611 | # |
602 | # CONFIG_VT is not set | 612 | # CONFIG_VT is not set |
613 | CONFIG_DEVKMEM=y | ||
603 | # CONFIG_SERIAL_NONSTANDARD is not set | 614 | # CONFIG_SERIAL_NONSTANDARD is not set |
604 | # CONFIG_NOZOMI is not set | 615 | # CONFIG_NOZOMI is not set |
605 | 616 | ||
@@ -629,7 +640,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
629 | # CONFIG_IPMI_HANDLER is not set | 640 | # CONFIG_IPMI_HANDLER is not set |
630 | CONFIG_HW_RANDOM=y | 641 | CONFIG_HW_RANDOM=y |
631 | # CONFIG_NVRAM is not set | 642 | # CONFIG_NVRAM is not set |
632 | # CONFIG_GEN_RTC is not set | ||
633 | # CONFIG_R3964 is not set | 643 | # CONFIG_R3964 is not set |
634 | # CONFIG_APPLICOM is not set | 644 | # CONFIG_APPLICOM is not set |
635 | # CONFIG_RAW_DRIVER is not set | 645 | # CONFIG_RAW_DRIVER is not set |
@@ -640,13 +650,6 @@ CONFIG_I2C_BOARDINFO=y | |||
640 | CONFIG_I2C_CHARDEV=y | 650 | CONFIG_I2C_CHARDEV=y |
641 | 651 | ||
642 | # | 652 | # |
643 | # I2C Algorithms | ||
644 | # | ||
645 | # CONFIG_I2C_ALGOBIT is not set | ||
646 | # CONFIG_I2C_ALGOPCF is not set | ||
647 | # CONFIG_I2C_ALGOPCA is not set | ||
648 | |||
649 | # | ||
650 | # I2C Hardware Bus support | 653 | # I2C Hardware Bus support |
651 | # | 654 | # |
652 | # CONFIG_I2C_ALI1535 is not set | 655 | # CONFIG_I2C_ALI1535 is not set |
@@ -672,6 +675,7 @@ CONFIG_I2C_MPC=y | |||
672 | # CONFIG_I2C_VIA is not set | 675 | # CONFIG_I2C_VIA is not set |
673 | # CONFIG_I2C_VIAPRO is not set | 676 | # CONFIG_I2C_VIAPRO is not set |
674 | # CONFIG_I2C_VOODOO3 is not set | 677 | # CONFIG_I2C_VOODOO3 is not set |
678 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
675 | 679 | ||
676 | # | 680 | # |
677 | # Miscellaneous I2C Chip support | 681 | # Miscellaneous I2C Chip support |
@@ -681,19 +685,13 @@ CONFIG_I2C_MPC=y | |||
681 | # CONFIG_SENSORS_PCF8574 is not set | 685 | # CONFIG_SENSORS_PCF8574 is not set |
682 | # CONFIG_PCF8575 is not set | 686 | # CONFIG_PCF8575 is not set |
683 | # CONFIG_SENSORS_PCF8591 is not set | 687 | # CONFIG_SENSORS_PCF8591 is not set |
684 | # CONFIG_TPS65010 is not set | ||
685 | # CONFIG_SENSORS_MAX6875 is not set | 688 | # CONFIG_SENSORS_MAX6875 is not set |
686 | # CONFIG_SENSORS_TSL2550 is not set | 689 | # CONFIG_SENSORS_TSL2550 is not set |
687 | # CONFIG_I2C_DEBUG_CORE is not set | 690 | # CONFIG_I2C_DEBUG_CORE is not set |
688 | # CONFIG_I2C_DEBUG_ALGO is not set | 691 | # CONFIG_I2C_DEBUG_ALGO is not set |
689 | # CONFIG_I2C_DEBUG_BUS is not set | 692 | # CONFIG_I2C_DEBUG_BUS is not set |
690 | # CONFIG_I2C_DEBUG_CHIP is not set | 693 | # CONFIG_I2C_DEBUG_CHIP is not set |
691 | |||
692 | # | ||
693 | # SPI support | ||
694 | # | ||
695 | # CONFIG_SPI is not set | 694 | # CONFIG_SPI is not set |
696 | # CONFIG_SPI_MASTER is not set | ||
697 | # CONFIG_W1 is not set | 695 | # CONFIG_W1 is not set |
698 | # CONFIG_POWER_SUPPLY is not set | 696 | # CONFIG_POWER_SUPPLY is not set |
699 | CONFIG_HWMON=y | 697 | CONFIG_HWMON=y |
@@ -776,12 +774,22 @@ CONFIG_SSB_POSSIBLE=y | |||
776 | # Multifunction device drivers | 774 | # Multifunction device drivers |
777 | # | 775 | # |
778 | # CONFIG_MFD_SM501 is not set | 776 | # CONFIG_MFD_SM501 is not set |
777 | # CONFIG_HTC_PASIC3 is not set | ||
779 | 778 | ||
780 | # | 779 | # |
781 | # Multimedia devices | 780 | # Multimedia devices |
782 | # | 781 | # |
782 | |||
783 | # | ||
784 | # Multimedia core support | ||
785 | # | ||
783 | # CONFIG_VIDEO_DEV is not set | 786 | # CONFIG_VIDEO_DEV is not set |
784 | # CONFIG_DVB_CORE is not set | 787 | # CONFIG_DVB_CORE is not set |
788 | # CONFIG_VIDEO_MEDIA is not set | ||
789 | |||
790 | # | ||
791 | # Multimedia drivers | ||
792 | # | ||
785 | CONFIG_DAB=y | 793 | CONFIG_DAB=y |
786 | 794 | ||
787 | # | 795 | # |
@@ -812,6 +820,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
812 | CONFIG_USB_ARCH_HAS_OHCI=y | 820 | CONFIG_USB_ARCH_HAS_OHCI=y |
813 | CONFIG_USB_ARCH_HAS_EHCI=y | 821 | CONFIG_USB_ARCH_HAS_EHCI=y |
814 | # CONFIG_USB is not set | 822 | # CONFIG_USB is not set |
823 | # CONFIG_USB_OTG_WHITELIST is not set | ||
824 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
815 | 825 | ||
816 | # | 826 | # |
817 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 827 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -820,6 +830,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
820 | # CONFIG_MMC is not set | 830 | # CONFIG_MMC is not set |
821 | # CONFIG_MEMSTICK is not set | 831 | # CONFIG_MEMSTICK is not set |
822 | # CONFIG_NEW_LEDS is not set | 832 | # CONFIG_NEW_LEDS is not set |
833 | # CONFIG_ACCESSIBILITY is not set | ||
823 | # CONFIG_INFINIBAND is not set | 834 | # CONFIG_INFINIBAND is not set |
824 | # CONFIG_EDAC is not set | 835 | # CONFIG_EDAC is not set |
825 | CONFIG_RTC_LIB=y | 836 | CONFIG_RTC_LIB=y |
@@ -871,11 +882,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
871 | # | 882 | # |
872 | # on-CPU RTC drivers | 883 | # on-CPU RTC drivers |
873 | # | 884 | # |
885 | # CONFIG_RTC_DRV_PPC is not set | ||
874 | # CONFIG_DMADEVICES is not set | 886 | # CONFIG_DMADEVICES is not set |
875 | |||
876 | # | ||
877 | # Userspace I/O | ||
878 | # | ||
879 | # CONFIG_UIO is not set | 887 | # CONFIG_UIO is not set |
880 | 888 | ||
881 | # | 889 | # |
@@ -895,7 +903,6 @@ CONFIG_FS_MBCACHE=y | |||
895 | # CONFIG_JFS_FS is not set | 903 | # CONFIG_JFS_FS is not set |
896 | # CONFIG_FS_POSIX_ACL is not set | 904 | # CONFIG_FS_POSIX_ACL is not set |
897 | # CONFIG_XFS_FS is not set | 905 | # CONFIG_XFS_FS is not set |
898 | # CONFIG_GFS2_FS is not set | ||
899 | # CONFIG_OCFS2_FS is not set | 906 | # CONFIG_OCFS2_FS is not set |
900 | CONFIG_DNOTIFY=y | 907 | CONFIG_DNOTIFY=y |
901 | CONFIG_INOTIFY=y | 908 | CONFIG_INOTIFY=y |
@@ -953,7 +960,6 @@ CONFIG_NFS_FS=y | |||
953 | CONFIG_NFS_V3=y | 960 | CONFIG_NFS_V3=y |
954 | # CONFIG_NFS_V3_ACL is not set | 961 | # CONFIG_NFS_V3_ACL is not set |
955 | CONFIG_NFS_V4=y | 962 | CONFIG_NFS_V4=y |
956 | # CONFIG_NFS_DIRECTIO is not set | ||
957 | # CONFIG_NFSD is not set | 963 | # CONFIG_NFSD is not set |
958 | CONFIG_ROOT_NFS=y | 964 | CONFIG_ROOT_NFS=y |
959 | CONFIG_LOCKD=y | 965 | CONFIG_LOCKD=y |
@@ -994,6 +1000,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
994 | # Library routines | 1000 | # Library routines |
995 | # | 1001 | # |
996 | CONFIG_BITREVERSE=y | 1002 | CONFIG_BITREVERSE=y |
1003 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
997 | # CONFIG_CRC_CCITT is not set | 1004 | # CONFIG_CRC_CCITT is not set |
998 | # CONFIG_CRC16 is not set | 1005 | # CONFIG_CRC16 is not set |
999 | # CONFIG_CRC_ITU_T is not set | 1006 | # CONFIG_CRC_ITU_T is not set |
@@ -1004,6 +1011,7 @@ CONFIG_PLIST=y | |||
1004 | CONFIG_HAS_IOMEM=y | 1011 | CONFIG_HAS_IOMEM=y |
1005 | CONFIG_HAS_IOPORT=y | 1012 | CONFIG_HAS_IOPORT=y |
1006 | CONFIG_HAS_DMA=y | 1013 | CONFIG_HAS_DMA=y |
1014 | CONFIG_HAVE_LMB=y | ||
1007 | 1015 | ||
1008 | # | 1016 | # |
1009 | # Kernel hacking | 1017 | # Kernel hacking |
@@ -1011,6 +1019,7 @@ CONFIG_HAS_DMA=y | |||
1011 | # CONFIG_PRINTK_TIME is not set | 1019 | # CONFIG_PRINTK_TIME is not set |
1012 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1020 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1013 | CONFIG_ENABLE_MUST_CHECK=y | 1021 | CONFIG_ENABLE_MUST_CHECK=y |
1022 | CONFIG_FRAME_WARN=1024 | ||
1014 | # CONFIG_MAGIC_SYSRQ is not set | 1023 | # CONFIG_MAGIC_SYSRQ is not set |
1015 | # CONFIG_UNUSED_SYMBOLS is not set | 1024 | # CONFIG_UNUSED_SYMBOLS is not set |
1016 | # CONFIG_DEBUG_FS is not set | 1025 | # CONFIG_DEBUG_FS is not set |
@@ -1021,6 +1030,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1021 | CONFIG_SCHED_DEBUG=y | 1030 | CONFIG_SCHED_DEBUG=y |
1022 | # CONFIG_SCHEDSTATS is not set | 1031 | # CONFIG_SCHEDSTATS is not set |
1023 | # CONFIG_TIMER_STATS is not set | 1032 | # CONFIG_TIMER_STATS is not set |
1033 | # CONFIG_DEBUG_OBJECTS is not set | ||
1024 | # CONFIG_SLUB_DEBUG_ON is not set | 1034 | # CONFIG_SLUB_DEBUG_ON is not set |
1025 | # CONFIG_SLUB_STATS is not set | 1035 | # CONFIG_SLUB_STATS is not set |
1026 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1036 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1033,6 +1043,7 @@ CONFIG_SCHED_DEBUG=y | |||
1033 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1043 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1034 | # CONFIG_DEBUG_INFO is not set | 1044 | # CONFIG_DEBUG_INFO is not set |
1035 | # CONFIG_DEBUG_VM is not set | 1045 | # CONFIG_DEBUG_VM is not set |
1046 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1036 | # CONFIG_DEBUG_LIST is not set | 1047 | # CONFIG_DEBUG_LIST is not set |
1037 | # CONFIG_DEBUG_SG is not set | 1048 | # CONFIG_DEBUG_SG is not set |
1038 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1049 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1045,6 +1056,7 @@ CONFIG_SCHED_DEBUG=y | |||
1045 | # CONFIG_DEBUG_PAGEALLOC is not set | 1056 | # CONFIG_DEBUG_PAGEALLOC is not set |
1046 | CONFIG_DEBUGGER=y | 1057 | CONFIG_DEBUGGER=y |
1047 | # CONFIG_XMON is not set | 1058 | # CONFIG_XMON is not set |
1059 | # CONFIG_IRQSTACKS is not set | ||
1048 | # CONFIG_BDI_SWITCH is not set | 1060 | # CONFIG_BDI_SWITCH is not set |
1049 | CONFIG_PPC_EARLY_DEBUG=y | 1061 | CONFIG_PPC_EARLY_DEBUG=y |
1050 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 1062 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
@@ -1066,52 +1078,82 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
1066 | # CONFIG_SECURITY is not set | 1078 | # CONFIG_SECURITY is not set |
1067 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1079 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1068 | CONFIG_CRYPTO=y | 1080 | CONFIG_CRYPTO=y |
1081 | |||
1082 | # | ||
1083 | # Crypto core or helper | ||
1084 | # | ||
1069 | CONFIG_CRYPTO_ALGAPI=y | 1085 | CONFIG_CRYPTO_ALGAPI=y |
1070 | CONFIG_CRYPTO_BLKCIPHER=y | 1086 | CONFIG_CRYPTO_BLKCIPHER=y |
1071 | # CONFIG_CRYPTO_SEQIV is not set | ||
1072 | CONFIG_CRYPTO_MANAGER=y | 1087 | CONFIG_CRYPTO_MANAGER=y |
1088 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1089 | # CONFIG_CRYPTO_NULL is not set | ||
1090 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1091 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1092 | # CONFIG_CRYPTO_TEST is not set | ||
1093 | |||
1094 | # | ||
1095 | # Authenticated Encryption with Associated Data | ||
1096 | # | ||
1097 | # CONFIG_CRYPTO_CCM is not set | ||
1098 | # CONFIG_CRYPTO_GCM is not set | ||
1099 | # CONFIG_CRYPTO_SEQIV is not set | ||
1100 | |||
1101 | # | ||
1102 | # Block modes | ||
1103 | # | ||
1104 | CONFIG_CRYPTO_CBC=y | ||
1105 | # CONFIG_CRYPTO_CTR is not set | ||
1106 | # CONFIG_CRYPTO_CTS is not set | ||
1107 | CONFIG_CRYPTO_ECB=m | ||
1108 | # CONFIG_CRYPTO_LRW is not set | ||
1109 | CONFIG_CRYPTO_PCBC=m | ||
1110 | # CONFIG_CRYPTO_XTS is not set | ||
1111 | |||
1112 | # | ||
1113 | # Hash modes | ||
1114 | # | ||
1073 | # CONFIG_CRYPTO_HMAC is not set | 1115 | # CONFIG_CRYPTO_HMAC is not set |
1074 | # CONFIG_CRYPTO_XCBC is not set | 1116 | # CONFIG_CRYPTO_XCBC is not set |
1075 | # CONFIG_CRYPTO_NULL is not set | 1117 | |
1118 | # | ||
1119 | # Digest | ||
1120 | # | ||
1121 | # CONFIG_CRYPTO_CRC32C is not set | ||
1076 | # CONFIG_CRYPTO_MD4 is not set | 1122 | # CONFIG_CRYPTO_MD4 is not set |
1077 | CONFIG_CRYPTO_MD5=y | 1123 | CONFIG_CRYPTO_MD5=y |
1124 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1078 | # CONFIG_CRYPTO_SHA1 is not set | 1125 | # CONFIG_CRYPTO_SHA1 is not set |
1079 | # CONFIG_CRYPTO_SHA256 is not set | 1126 | # CONFIG_CRYPTO_SHA256 is not set |
1080 | # CONFIG_CRYPTO_SHA512 is not set | 1127 | # CONFIG_CRYPTO_SHA512 is not set |
1081 | # CONFIG_CRYPTO_WP512 is not set | ||
1082 | # CONFIG_CRYPTO_TGR192 is not set | 1128 | # CONFIG_CRYPTO_TGR192 is not set |
1083 | # CONFIG_CRYPTO_GF128MUL is not set | 1129 | # CONFIG_CRYPTO_WP512 is not set |
1084 | CONFIG_CRYPTO_ECB=m | 1130 | |
1085 | CONFIG_CRYPTO_CBC=y | 1131 | # |
1086 | CONFIG_CRYPTO_PCBC=m | 1132 | # Ciphers |
1087 | # CONFIG_CRYPTO_LRW is not set | 1133 | # |
1088 | # CONFIG_CRYPTO_XTS is not set | ||
1089 | # CONFIG_CRYPTO_CTR is not set | ||
1090 | # CONFIG_CRYPTO_GCM is not set | ||
1091 | # CONFIG_CRYPTO_CCM is not set | ||
1092 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1093 | CONFIG_CRYPTO_DES=y | ||
1094 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1095 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1096 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1097 | # CONFIG_CRYPTO_SERPENT is not set | ||
1098 | # CONFIG_CRYPTO_AES is not set | 1134 | # CONFIG_CRYPTO_AES is not set |
1135 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1136 | # CONFIG_CRYPTO_ARC4 is not set | ||
1137 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1138 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1099 | # CONFIG_CRYPTO_CAST5 is not set | 1139 | # CONFIG_CRYPTO_CAST5 is not set |
1100 | # CONFIG_CRYPTO_CAST6 is not set | 1140 | # CONFIG_CRYPTO_CAST6 is not set |
1101 | # CONFIG_CRYPTO_TEA is not set | 1141 | CONFIG_CRYPTO_DES=y |
1102 | # CONFIG_CRYPTO_ARC4 is not set | 1142 | # CONFIG_CRYPTO_FCRYPT is not set |
1103 | # CONFIG_CRYPTO_KHAZAD is not set | 1143 | # CONFIG_CRYPTO_KHAZAD is not set |
1104 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1105 | # CONFIG_CRYPTO_SEED is not set | ||
1106 | # CONFIG_CRYPTO_SALSA20 is not set | 1144 | # CONFIG_CRYPTO_SALSA20 is not set |
1145 | # CONFIG_CRYPTO_SEED is not set | ||
1146 | # CONFIG_CRYPTO_SERPENT is not set | ||
1147 | # CONFIG_CRYPTO_TEA is not set | ||
1148 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1149 | |||
1150 | # | ||
1151 | # Compression | ||
1152 | # | ||
1107 | # CONFIG_CRYPTO_DEFLATE is not set | 1153 | # CONFIG_CRYPTO_DEFLATE is not set |
1108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1109 | # CONFIG_CRYPTO_CRC32C is not set | ||
1110 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1111 | # CONFIG_CRYPTO_TEST is not set | ||
1112 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1113 | # CONFIG_CRYPTO_LZO is not set | 1154 | # CONFIG_CRYPTO_LZO is not set |
1114 | CONFIG_CRYPTO_HW=y | 1155 | CONFIG_CRYPTO_HW=y |
1115 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1156 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1116 | # CONFIG_PPC_CLOCK is not set | 1157 | # CONFIG_PPC_CLOCK is not set |
1117 | CONFIG_PPC_LIB_RHEAP=y | 1158 | CONFIG_PPC_LIB_RHEAP=y |
1159 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig index 53aa6f3173a5..03627cfebcb4 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8572_ds_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-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:37:06 2008 | 4 | # Mon Jun 9 08:52:35 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
@@ -162,6 +167,7 @@ CONFIG_MPC85xx=y | |||
162 | # CONFIG_MPC85xx_CDS is not set | 167 | # CONFIG_MPC85xx_CDS is not set |
163 | # CONFIG_MPC85xx_MDS is not set | 168 | # CONFIG_MPC85xx_MDS is not set |
164 | CONFIG_MPC85xx_DS=y | 169 | CONFIG_MPC85xx_DS=y |
170 | # CONFIG_KSI8560 is not set | ||
165 | # CONFIG_STX_GP3 is not set | 171 | # CONFIG_STX_GP3 is not set |
166 | # CONFIG_TQM8540 is not set | 172 | # CONFIG_TQM8540 is not set |
167 | # CONFIG_TQM8541 is not set | 173 | # CONFIG_TQM8541 is not set |
@@ -217,11 +223,13 @@ CONFIG_FLATMEM=y | |||
217 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
218 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
224 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
225 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
@@ -246,6 +254,7 @@ CONFIG_PCI_LEGACY=y | |||
246 | # CONFIG_PCI_DEBUG is not set | 254 | # CONFIG_PCI_DEBUG is not set |
247 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
248 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
257 | # CONFIG_HAS_RAPIDIO is not set | ||
249 | 258 | ||
250 | # | 259 | # |
251 | # Advanced setup | 260 | # Advanced setup |
@@ -255,11 +264,12 @@ CONFIG_PCI_LEGACY=y | |||
255 | # | 264 | # |
256 | # Default settings for advanced configuration options are used | 265 | # Default settings for advanced configuration options are used |
257 | # | 266 | # |
258 | CONFIG_HIGHMEM_START=0xfe000000 | ||
259 | CONFIG_LOWMEM_SIZE=0x30000000 | 267 | CONFIG_LOWMEM_SIZE=0x30000000 |
268 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
260 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
270 | CONFIG_PHYSICAL_START=0x00000000 | ||
271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
261 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
262 | CONFIG_BOOT_LOAD=0x00800000 | ||
263 | 273 | ||
264 | # | 274 | # |
265 | # Networking | 275 | # Networking |
@@ -330,8 +340,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
330 | CONFIG_INET6_XFRM_MODE_BEET=y | 340 | CONFIG_INET6_XFRM_MODE_BEET=y |
331 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 341 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
332 | CONFIG_IPV6_SIT=y | 342 | CONFIG_IPV6_SIT=y |
343 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
333 | # CONFIG_IPV6_TUNNEL is not set | 344 | # CONFIG_IPV6_TUNNEL is not set |
334 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 345 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
346 | # CONFIG_IPV6_MROUTE is not set | ||
335 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
336 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
337 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
@@ -393,6 +405,7 @@ CONFIG_FW_LOADER=y | |||
393 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
394 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
395 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
408 | CONFIG_OF_I2C=y | ||
396 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
397 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
398 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
@@ -499,7 +512,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
499 | # CONFIG_SCSI_SRP is not set | 512 | # CONFIG_SCSI_SRP is not set |
500 | CONFIG_ATA=y | 513 | CONFIG_ATA=y |
501 | # CONFIG_ATA_NONSTANDARD is not set | 514 | # CONFIG_ATA_NONSTANDARD is not set |
515 | CONFIG_SATA_PMP=y | ||
502 | CONFIG_SATA_AHCI=y | 516 | CONFIG_SATA_AHCI=y |
517 | # CONFIG_SATA_SIL24 is not set | ||
518 | # CONFIG_SATA_FSL is not set | ||
519 | CONFIG_ATA_SFF=y | ||
503 | # CONFIG_SATA_SVW is not set | 520 | # CONFIG_SATA_SVW is not set |
504 | # CONFIG_ATA_PIIX is not set | 521 | # CONFIG_ATA_PIIX is not set |
505 | # CONFIG_SATA_MV is not set | 522 | # CONFIG_SATA_MV is not set |
@@ -509,13 +526,11 @@ CONFIG_SATA_AHCI=y | |||
509 | # CONFIG_SATA_PROMISE is not set | 526 | # CONFIG_SATA_PROMISE is not set |
510 | # CONFIG_SATA_SX4 is not set | 527 | # CONFIG_SATA_SX4 is not set |
511 | # CONFIG_SATA_SIL is not set | 528 | # CONFIG_SATA_SIL is not set |
512 | # CONFIG_SATA_SIL24 is not set | ||
513 | # CONFIG_SATA_SIS is not set | 529 | # CONFIG_SATA_SIS is not set |
514 | # CONFIG_SATA_ULI is not set | 530 | # CONFIG_SATA_ULI is not set |
515 | # CONFIG_SATA_VIA is not set | 531 | # CONFIG_SATA_VIA is not set |
516 | # CONFIG_SATA_VITESSE is not set | 532 | # CONFIG_SATA_VITESSE is not set |
517 | # CONFIG_SATA_INIC162X is not set | 533 | # CONFIG_SATA_INIC162X is not set |
518 | # CONFIG_SATA_FSL is not set | ||
519 | CONFIG_PATA_ALI=y | 534 | CONFIG_PATA_ALI=y |
520 | # CONFIG_PATA_AMD is not set | 535 | # CONFIG_PATA_AMD is not set |
521 | # CONFIG_PATA_ARTOP is not set | 536 | # CONFIG_PATA_ARTOP is not set |
@@ -555,6 +570,7 @@ CONFIG_PATA_ALI=y | |||
555 | # CONFIG_PATA_VIA is not set | 570 | # CONFIG_PATA_VIA is not set |
556 | # CONFIG_PATA_WINBOND is not set | 571 | # CONFIG_PATA_WINBOND is not set |
557 | # CONFIG_PATA_PLATFORM is not set | 572 | # CONFIG_PATA_PLATFORM is not set |
573 | # CONFIG_PATA_SCH is not set | ||
558 | # CONFIG_MD is not set | 574 | # CONFIG_MD is not set |
559 | # CONFIG_FUSION is not set | 575 | # CONFIG_FUSION is not set |
560 | 576 | ||
@@ -620,7 +636,6 @@ CONFIG_NETDEV_1000=y | |||
620 | # CONFIG_SIS190 is not set | 636 | # CONFIG_SIS190 is not set |
621 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
622 | # CONFIG_SKY2 is not set | 638 | # CONFIG_SKY2 is not set |
623 | # CONFIG_SK98LIN is not set | ||
624 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
625 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
626 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
@@ -640,6 +655,7 @@ CONFIG_NETDEV_10000=y | |||
640 | # CONFIG_MLX4_CORE is not set | 655 | # CONFIG_MLX4_CORE is not set |
641 | # CONFIG_TEHUTI is not set | 656 | # CONFIG_TEHUTI is not set |
642 | # CONFIG_BNX2X is not set | 657 | # CONFIG_BNX2X is not set |
658 | # CONFIG_SFC is not set | ||
643 | # CONFIG_TR is not set | 659 | # CONFIG_TR is not set |
644 | 660 | ||
645 | # | 661 | # |
@@ -647,6 +663,7 @@ CONFIG_NETDEV_10000=y | |||
647 | # | 663 | # |
648 | # CONFIG_WLAN_PRE80211 is not set | 664 | # CONFIG_WLAN_PRE80211 is not set |
649 | # CONFIG_WLAN_80211 is not set | 665 | # CONFIG_WLAN_80211 is not set |
666 | # CONFIG_IWLWIFI_LEDS is not set | ||
650 | 667 | ||
651 | # | 668 | # |
652 | # USB Network Adapters | 669 | # USB Network Adapters |
@@ -711,6 +728,7 @@ CONFIG_VT=y | |||
711 | CONFIG_VT_CONSOLE=y | 728 | CONFIG_VT_CONSOLE=y |
712 | CONFIG_HW_CONSOLE=y | 729 | CONFIG_HW_CONSOLE=y |
713 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
731 | CONFIG_DEVKMEM=y | ||
714 | # CONFIG_SERIAL_NONSTANDARD is not set | 732 | # CONFIG_SERIAL_NONSTANDARD is not set |
715 | # CONFIG_NOZOMI is not set | 733 | # CONFIG_NOZOMI is not set |
716 | 734 | ||
@@ -742,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
742 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
743 | # CONFIG_HW_RANDOM is not set | 761 | # CONFIG_HW_RANDOM is not set |
744 | CONFIG_NVRAM=y | 762 | CONFIG_NVRAM=y |
745 | # CONFIG_GEN_RTC is not set | ||
746 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
747 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
748 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
@@ -753,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
753 | # CONFIG_I2C_CHARDEV is not set | 770 | # CONFIG_I2C_CHARDEV is not set |
754 | 771 | ||
755 | # | 772 | # |
756 | # I2C Algorithms | ||
757 | # | ||
758 | # CONFIG_I2C_ALGOBIT is not set | ||
759 | # CONFIG_I2C_ALGOPCF is not set | ||
760 | # CONFIG_I2C_ALGOPCA is not set | ||
761 | |||
762 | # | ||
763 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
764 | # | 774 | # |
765 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
@@ -786,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
786 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
787 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
788 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
789 | 800 | ||
790 | # | 801 | # |
791 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
@@ -795,19 +806,13 @@ CONFIG_SENSORS_EEPROM=y | |||
795 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
796 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
797 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
798 | # CONFIG_TPS65010 is not set | ||
799 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
800 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
801 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
802 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
803 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
804 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
805 | |||
806 | # | ||
807 | # SPI support | ||
808 | # | ||
809 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
810 | # CONFIG_SPI_MASTER is not set | ||
811 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
812 | # CONFIG_POWER_SUPPLY is not set | 817 | # CONFIG_POWER_SUPPLY is not set |
813 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
@@ -824,13 +829,33 @@ CONFIG_SSB_POSSIBLE=y | |||
824 | # Multifunction device drivers | 829 | # Multifunction device drivers |
825 | # | 830 | # |
826 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
832 | # CONFIG_HTC_PASIC3 is not set | ||
827 | 833 | ||
828 | # | 834 | # |
829 | # Multimedia devices | 835 | # Multimedia devices |
830 | # | 836 | # |
837 | |||
838 | # | ||
839 | # Multimedia core support | ||
840 | # | ||
831 | # CONFIG_VIDEO_DEV is not set | 841 | # CONFIG_VIDEO_DEV is not set |
832 | CONFIG_DVB_CORE=m | 842 | CONFIG_DVB_CORE=m |
833 | # CONFIG_DVB_CORE_ATTACH is not set | 843 | CONFIG_VIDEO_MEDIA=m |
844 | |||
845 | # | ||
846 | # Multimedia drivers | ||
847 | # | ||
848 | # CONFIG_MEDIA_ATTACH is not set | ||
849 | CONFIG_MEDIA_TUNER=m | ||
850 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
851 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
852 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
853 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
854 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
855 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
856 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
857 | CONFIG_MEDIA_TUNER_XC2028=m | ||
858 | CONFIG_MEDIA_TUNER_XC5000=m | ||
834 | CONFIG_DVB_CAPTURE_DRIVERS=y | 859 | CONFIG_DVB_CAPTURE_DRIVERS=y |
835 | 860 | ||
836 | # | 861 | # |
@@ -873,14 +898,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
873 | # | 898 | # |
874 | # DVB-S (satellite) frontends | 899 | # DVB-S (satellite) frontends |
875 | # | 900 | # |
876 | # CONFIG_DVB_STV0299 is not set | ||
877 | # CONFIG_DVB_CX24110 is not set | 901 | # CONFIG_DVB_CX24110 is not set |
878 | # CONFIG_DVB_CX24123 is not set | 902 | # CONFIG_DVB_CX24123 is not set |
879 | # CONFIG_DVB_TDA8083 is not set | ||
880 | # CONFIG_DVB_MT312 is not set | 903 | # CONFIG_DVB_MT312 is not set |
881 | # CONFIG_DVB_VES1X93 is not set | ||
882 | # CONFIG_DVB_S5H1420 is not set | 904 | # CONFIG_DVB_S5H1420 is not set |
905 | # CONFIG_DVB_STV0299 is not set | ||
906 | # CONFIG_DVB_TDA8083 is not set | ||
883 | # CONFIG_DVB_TDA10086 is not set | 907 | # CONFIG_DVB_TDA10086 is not set |
908 | # CONFIG_DVB_VES1X93 is not set | ||
909 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
910 | # CONFIG_DVB_TDA826X is not set | ||
911 | # CONFIG_DVB_TUA6100 is not set | ||
884 | 912 | ||
885 | # | 913 | # |
886 | # DVB-T (terrestrial) frontends | 914 | # DVB-T (terrestrial) frontends |
@@ -898,6 +926,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
898 | # CONFIG_DVB_DIB3000MC is not set | 926 | # CONFIG_DVB_DIB3000MC is not set |
899 | # CONFIG_DVB_DIB7000M is not set | 927 | # CONFIG_DVB_DIB7000M is not set |
900 | # CONFIG_DVB_DIB7000P is not set | 928 | # CONFIG_DVB_DIB7000P is not set |
929 | # CONFIG_DVB_TDA10048 is not set | ||
901 | 930 | ||
902 | # | 931 | # |
903 | # DVB-C (cable) frontends | 932 | # DVB-C (cable) frontends |
@@ -916,27 +945,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
916 | # CONFIG_DVB_BCM3510 is not set | 945 | # CONFIG_DVB_BCM3510 is not set |
917 | # CONFIG_DVB_LGDT330X is not set | 946 | # CONFIG_DVB_LGDT330X is not set |
918 | # CONFIG_DVB_S5H1409 is not set | 947 | # CONFIG_DVB_S5H1409 is not set |
948 | # CONFIG_DVB_AU8522 is not set | ||
949 | # CONFIG_DVB_S5H1411 is not set | ||
919 | 950 | ||
920 | # | 951 | # |
921 | # Tuners/PLL support | 952 | # Digital terrestrial only tuners/PLL |
922 | # | 953 | # |
923 | # CONFIG_DVB_PLL is not set | 954 | # CONFIG_DVB_PLL is not set |
924 | # CONFIG_DVB_TDA826X is not set | ||
925 | # CONFIG_DVB_TDA827X is not set | ||
926 | # CONFIG_DVB_TDA18271 is not set | ||
927 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
928 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
929 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
930 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
931 | # CONFIG_DVB_TUNER_DIB0070 is not set | 955 | # CONFIG_DVB_TUNER_DIB0070 is not set |
932 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
933 | 956 | ||
934 | # | 957 | # |
935 | # Miscellaneous devices | 958 | # SEC control devices for DVB-S |
936 | # | 959 | # |
937 | # CONFIG_DVB_LNBP21 is not set | 960 | # CONFIG_DVB_LNBP21 is not set |
961 | # CONFIG_DVB_ISL6405 is not set | ||
938 | # CONFIG_DVB_ISL6421 is not set | 962 | # CONFIG_DVB_ISL6421 is not set |
939 | # CONFIG_DVB_TUA6100 is not set | ||
940 | CONFIG_DAB=y | 963 | CONFIG_DAB=y |
941 | # CONFIG_USB_DABUSB is not set | 964 | # CONFIG_USB_DABUSB is not set |
942 | 965 | ||
@@ -1003,6 +1026,7 @@ CONFIG_SND_AC97_CODEC=y | |||
1003 | # CONFIG_SND_AU8810 is not set | 1026 | # CONFIG_SND_AU8810 is not set |
1004 | # CONFIG_SND_AU8820 is not set | 1027 | # CONFIG_SND_AU8820 is not set |
1005 | # CONFIG_SND_AU8830 is not set | 1028 | # CONFIG_SND_AU8830 is not set |
1029 | # CONFIG_SND_AW2 is not set | ||
1006 | # CONFIG_SND_AZT3328 is not set | 1030 | # CONFIG_SND_AZT3328 is not set |
1007 | # CONFIG_SND_BT87X is not set | 1031 | # CONFIG_SND_BT87X is not set |
1008 | # CONFIG_SND_CA0106 is not set | 1032 | # CONFIG_SND_CA0106 is not set |
@@ -1077,11 +1101,11 @@ CONFIG_SND_INTEL8X0=y | |||
1077 | # CONFIG_SND_SOC is not set | 1101 | # CONFIG_SND_SOC is not set |
1078 | 1102 | ||
1079 | # | 1103 | # |
1080 | # SoC Audio support for SuperH | 1104 | # ALSA SoC audio for Freescale SOCs |
1081 | # | 1105 | # |
1082 | 1106 | ||
1083 | # | 1107 | # |
1084 | # ALSA SoC audio for Freescale SOCs | 1108 | # SoC Audio for the Texas Instruments OMAP |
1085 | # | 1109 | # |
1086 | 1110 | ||
1087 | # | 1111 | # |
@@ -1116,16 +1140,20 @@ CONFIG_USB_DEVICEFS=y | |||
1116 | CONFIG_USB_DEVICE_CLASS=y | 1140 | CONFIG_USB_DEVICE_CLASS=y |
1117 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1141 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1118 | # CONFIG_USB_OTG is not set | 1142 | # CONFIG_USB_OTG is not set |
1143 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1144 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1119 | 1145 | ||
1120 | # | 1146 | # |
1121 | # USB Host Controller Drivers | 1147 | # USB Host Controller Drivers |
1122 | # | 1148 | # |
1149 | # CONFIG_USB_C67X00_HCD is not set | ||
1123 | CONFIG_USB_EHCI_HCD=y | 1150 | CONFIG_USB_EHCI_HCD=y |
1124 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1151 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1125 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1152 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1126 | # CONFIG_USB_EHCI_FSL is not set | 1153 | # CONFIG_USB_EHCI_FSL is not set |
1127 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1154 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1128 | # CONFIG_USB_ISP116X_HCD is not set | 1155 | # CONFIG_USB_ISP116X_HCD is not set |
1156 | # CONFIG_USB_ISP1760_HCD is not set | ||
1129 | CONFIG_USB_OHCI_HCD=y | 1157 | CONFIG_USB_OHCI_HCD=y |
1130 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1158 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
1131 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1159 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1143,6 +1171,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1143 | # | 1171 | # |
1144 | # CONFIG_USB_ACM is not set | 1172 | # CONFIG_USB_ACM is not set |
1145 | # CONFIG_USB_PRINTER is not set | 1173 | # CONFIG_USB_PRINTER is not set |
1174 | # CONFIG_USB_WDM is not set | ||
1146 | 1175 | ||
1147 | # | 1176 | # |
1148 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1177 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1162,7 +1191,9 @@ CONFIG_USB_STORAGE=y | |||
1162 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1191 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1163 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1192 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1164 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1193 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1194 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1165 | # CONFIG_USB_STORAGE_KARMA is not set | 1195 | # CONFIG_USB_STORAGE_KARMA is not set |
1196 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1166 | # CONFIG_USB_LIBUSUAL is not set | 1197 | # CONFIG_USB_LIBUSUAL is not set |
1167 | 1198 | ||
1168 | # | 1199 | # |
@@ -1200,10 +1231,12 @@ CONFIG_USB_MON=y | |||
1200 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1231 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1201 | # CONFIG_USB_IOWARRIOR is not set | 1232 | # CONFIG_USB_IOWARRIOR is not set |
1202 | # CONFIG_USB_TEST is not set | 1233 | # CONFIG_USB_TEST is not set |
1234 | # CONFIG_USB_ISIGHTFW is not set | ||
1203 | # CONFIG_USB_GADGET is not set | 1235 | # CONFIG_USB_GADGET is not set |
1204 | # CONFIG_MMC is not set | 1236 | # CONFIG_MMC is not set |
1205 | # CONFIG_MEMSTICK is not set | 1237 | # CONFIG_MEMSTICK is not set |
1206 | # CONFIG_NEW_LEDS is not set | 1238 | # CONFIG_NEW_LEDS is not set |
1239 | # CONFIG_ACCESSIBILITY is not set | ||
1207 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
1208 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
1209 | CONFIG_RTC_LIB=y | 1242 | CONFIG_RTC_LIB=y |
@@ -1255,11 +1288,8 @@ CONFIG_RTC_DRV_CMOS=y | |||
1255 | # | 1288 | # |
1256 | # on-CPU RTC drivers | 1289 | # on-CPU RTC drivers |
1257 | # | 1290 | # |
1291 | # CONFIG_RTC_DRV_PPC is not set | ||
1258 | # CONFIG_DMADEVICES is not set | 1292 | # CONFIG_DMADEVICES is not set |
1259 | |||
1260 | # | ||
1261 | # Userspace I/O | ||
1262 | # | ||
1263 | # CONFIG_UIO is not set | 1293 | # CONFIG_UIO is not set |
1264 | 1294 | ||
1265 | # | 1295 | # |
@@ -1279,7 +1309,6 @@ CONFIG_FS_MBCACHE=y | |||
1279 | # CONFIG_JFS_FS is not set | 1309 | # CONFIG_JFS_FS is not set |
1280 | # CONFIG_FS_POSIX_ACL is not set | 1310 | # CONFIG_FS_POSIX_ACL is not set |
1281 | # CONFIG_XFS_FS is not set | 1311 | # CONFIG_XFS_FS is not set |
1282 | # CONFIG_GFS2_FS is not set | ||
1283 | # CONFIG_OCFS2_FS is not set | 1312 | # CONFIG_OCFS2_FS is not set |
1284 | CONFIG_DNOTIFY=y | 1313 | CONFIG_DNOTIFY=y |
1285 | CONFIG_INOTIFY=y | 1314 | CONFIG_INOTIFY=y |
@@ -1349,10 +1378,9 @@ CONFIG_NFS_FS=y | |||
1349 | CONFIG_NFS_V3=y | 1378 | CONFIG_NFS_V3=y |
1350 | # CONFIG_NFS_V3_ACL is not set | 1379 | # CONFIG_NFS_V3_ACL is not set |
1351 | CONFIG_NFS_V4=y | 1380 | CONFIG_NFS_V4=y |
1352 | # CONFIG_NFS_DIRECTIO is not set | ||
1353 | CONFIG_NFSD=y | 1381 | CONFIG_NFSD=y |
1354 | # CONFIG_NFSD_V3 is not set | 1382 | # CONFIG_NFSD_V3 is not set |
1355 | CONFIG_NFSD_TCP=y | 1383 | # CONFIG_NFSD_V4 is not set |
1356 | CONFIG_ROOT_NFS=y | 1384 | CONFIG_ROOT_NFS=y |
1357 | CONFIG_LOCKD=y | 1385 | CONFIG_LOCKD=y |
1358 | CONFIG_LOCKD_V4=y | 1386 | CONFIG_LOCKD_V4=y |
@@ -1436,9 +1464,10 @@ CONFIG_NLS_UTF8=m | |||
1436 | # Library routines | 1464 | # Library routines |
1437 | # | 1465 | # |
1438 | CONFIG_BITREVERSE=y | 1466 | CONFIG_BITREVERSE=y |
1467 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1439 | # CONFIG_CRC_CCITT is not set | 1468 | # CONFIG_CRC_CCITT is not set |
1440 | # CONFIG_CRC16 is not set | 1469 | # CONFIG_CRC16 is not set |
1441 | # CONFIG_CRC_ITU_T is not set | 1470 | CONFIG_CRC_ITU_T=m |
1442 | CONFIG_CRC32=y | 1471 | CONFIG_CRC32=y |
1443 | # CONFIG_CRC7 is not set | 1472 | # CONFIG_CRC7 is not set |
1444 | CONFIG_LIBCRC32C=m | 1473 | CONFIG_LIBCRC32C=m |
@@ -1447,6 +1476,7 @@ CONFIG_PLIST=y | |||
1447 | CONFIG_HAS_IOMEM=y | 1476 | CONFIG_HAS_IOMEM=y |
1448 | CONFIG_HAS_IOPORT=y | 1477 | CONFIG_HAS_IOPORT=y |
1449 | CONFIG_HAS_DMA=y | 1478 | CONFIG_HAS_DMA=y |
1479 | CONFIG_HAVE_LMB=y | ||
1450 | 1480 | ||
1451 | # | 1481 | # |
1452 | # Kernel hacking | 1482 | # Kernel hacking |
@@ -1454,6 +1484,7 @@ CONFIG_HAS_DMA=y | |||
1454 | # CONFIG_PRINTK_TIME is not set | 1484 | # CONFIG_PRINTK_TIME is not set |
1455 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1485 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1456 | CONFIG_ENABLE_MUST_CHECK=y | 1486 | CONFIG_ENABLE_MUST_CHECK=y |
1487 | CONFIG_FRAME_WARN=1024 | ||
1457 | # CONFIG_MAGIC_SYSRQ is not set | 1488 | # CONFIG_MAGIC_SYSRQ is not set |
1458 | # CONFIG_UNUSED_SYMBOLS is not set | 1489 | # CONFIG_UNUSED_SYMBOLS is not set |
1459 | # CONFIG_DEBUG_FS is not set | 1490 | # CONFIG_DEBUG_FS is not set |
@@ -1464,6 +1495,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1464 | CONFIG_SCHED_DEBUG=y | 1495 | CONFIG_SCHED_DEBUG=y |
1465 | # CONFIG_SCHEDSTATS is not set | 1496 | # CONFIG_SCHEDSTATS is not set |
1466 | # CONFIG_TIMER_STATS is not set | 1497 | # CONFIG_TIMER_STATS is not set |
1498 | # CONFIG_DEBUG_OBJECTS is not set | ||
1467 | # CONFIG_SLUB_DEBUG_ON is not set | 1499 | # CONFIG_SLUB_DEBUG_ON is not set |
1468 | # CONFIG_SLUB_STATS is not set | 1500 | # CONFIG_SLUB_STATS is not set |
1469 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1501 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1477,6 +1509,7 @@ CONFIG_SCHED_DEBUG=y | |||
1477 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1509 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1478 | CONFIG_DEBUG_INFO=y | 1510 | CONFIG_DEBUG_INFO=y |
1479 | # CONFIG_DEBUG_VM is not set | 1511 | # CONFIG_DEBUG_VM is not set |
1512 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1480 | # CONFIG_DEBUG_LIST is not set | 1513 | # CONFIG_DEBUG_LIST is not set |
1481 | # CONFIG_DEBUG_SG is not set | 1514 | # CONFIG_DEBUG_SG is not set |
1482 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1515 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1488,6 +1521,7 @@ CONFIG_DEBUG_INFO=y | |||
1488 | # CONFIG_DEBUG_STACK_USAGE is not set | 1521 | # CONFIG_DEBUG_STACK_USAGE is not set |
1489 | # CONFIG_DEBUG_PAGEALLOC is not set | 1522 | # CONFIG_DEBUG_PAGEALLOC is not set |
1490 | # CONFIG_DEBUGGER is not set | 1523 | # CONFIG_DEBUGGER is not set |
1524 | # CONFIG_IRQSTACKS is not set | ||
1491 | # CONFIG_BDI_SWITCH is not set | 1525 | # CONFIG_BDI_SWITCH is not set |
1492 | # CONFIG_PPC_EARLY_DEBUG is not set | 1526 | # CONFIG_PPC_EARLY_DEBUG is not set |
1493 | 1527 | ||
@@ -1498,52 +1532,82 @@ CONFIG_DEBUG_INFO=y | |||
1498 | # CONFIG_SECURITY is not set | 1532 | # CONFIG_SECURITY is not set |
1499 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1533 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1500 | CONFIG_CRYPTO=y | 1534 | CONFIG_CRYPTO=y |
1535 | |||
1536 | # | ||
1537 | # Crypto core or helper | ||
1538 | # | ||
1501 | CONFIG_CRYPTO_ALGAPI=y | 1539 | CONFIG_CRYPTO_ALGAPI=y |
1502 | CONFIG_CRYPTO_BLKCIPHER=y | 1540 | CONFIG_CRYPTO_BLKCIPHER=y |
1503 | # CONFIG_CRYPTO_SEQIV is not set | ||
1504 | CONFIG_CRYPTO_HASH=y | 1541 | CONFIG_CRYPTO_HASH=y |
1505 | CONFIG_CRYPTO_MANAGER=y | 1542 | CONFIG_CRYPTO_MANAGER=y |
1543 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1544 | # CONFIG_CRYPTO_NULL is not set | ||
1545 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1546 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1547 | # CONFIG_CRYPTO_TEST is not set | ||
1548 | |||
1549 | # | ||
1550 | # Authenticated Encryption with Associated Data | ||
1551 | # | ||
1552 | # CONFIG_CRYPTO_CCM is not set | ||
1553 | # CONFIG_CRYPTO_GCM is not set | ||
1554 | # CONFIG_CRYPTO_SEQIV is not set | ||
1555 | |||
1556 | # | ||
1557 | # Block modes | ||
1558 | # | ||
1559 | CONFIG_CRYPTO_CBC=y | ||
1560 | # CONFIG_CRYPTO_CTR is not set | ||
1561 | # CONFIG_CRYPTO_CTS is not set | ||
1562 | # CONFIG_CRYPTO_ECB is not set | ||
1563 | # CONFIG_CRYPTO_LRW is not set | ||
1564 | CONFIG_CRYPTO_PCBC=m | ||
1565 | # CONFIG_CRYPTO_XTS is not set | ||
1566 | |||
1567 | # | ||
1568 | # Hash modes | ||
1569 | # | ||
1506 | CONFIG_CRYPTO_HMAC=y | 1570 | CONFIG_CRYPTO_HMAC=y |
1507 | # CONFIG_CRYPTO_XCBC is not set | 1571 | # CONFIG_CRYPTO_XCBC is not set |
1508 | # CONFIG_CRYPTO_NULL is not set | 1572 | |
1573 | # | ||
1574 | # Digest | ||
1575 | # | ||
1576 | # CONFIG_CRYPTO_CRC32C is not set | ||
1509 | # CONFIG_CRYPTO_MD4 is not set | 1577 | # CONFIG_CRYPTO_MD4 is not set |
1510 | CONFIG_CRYPTO_MD5=y | 1578 | CONFIG_CRYPTO_MD5=y |
1579 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1511 | CONFIG_CRYPTO_SHA1=m | 1580 | CONFIG_CRYPTO_SHA1=m |
1512 | # CONFIG_CRYPTO_SHA256 is not set | 1581 | # CONFIG_CRYPTO_SHA256 is not set |
1513 | # CONFIG_CRYPTO_SHA512 is not set | 1582 | # CONFIG_CRYPTO_SHA512 is not set |
1514 | # CONFIG_CRYPTO_WP512 is not set | ||
1515 | # CONFIG_CRYPTO_TGR192 is not set | 1583 | # CONFIG_CRYPTO_TGR192 is not set |
1516 | # CONFIG_CRYPTO_GF128MUL is not set | 1584 | # CONFIG_CRYPTO_WP512 is not set |
1517 | # CONFIG_CRYPTO_ECB is not set | 1585 | |
1518 | CONFIG_CRYPTO_CBC=y | 1586 | # |
1519 | CONFIG_CRYPTO_PCBC=m | 1587 | # Ciphers |
1520 | # CONFIG_CRYPTO_LRW is not set | 1588 | # |
1521 | # CONFIG_CRYPTO_XTS is not set | ||
1522 | # CONFIG_CRYPTO_CTR is not set | ||
1523 | # CONFIG_CRYPTO_GCM is not set | ||
1524 | # CONFIG_CRYPTO_CCM is not set | ||
1525 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1526 | CONFIG_CRYPTO_DES=y | ||
1527 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1528 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1529 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1530 | # CONFIG_CRYPTO_SERPENT is not set | ||
1531 | # CONFIG_CRYPTO_AES is not set | 1589 | # CONFIG_CRYPTO_AES is not set |
1590 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1591 | # CONFIG_CRYPTO_ARC4 is not set | ||
1592 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1593 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1532 | # CONFIG_CRYPTO_CAST5 is not set | 1594 | # CONFIG_CRYPTO_CAST5 is not set |
1533 | # CONFIG_CRYPTO_CAST6 is not set | 1595 | # CONFIG_CRYPTO_CAST6 is not set |
1534 | # CONFIG_CRYPTO_TEA is not set | 1596 | CONFIG_CRYPTO_DES=y |
1535 | # CONFIG_CRYPTO_ARC4 is not set | 1597 | # CONFIG_CRYPTO_FCRYPT is not set |
1536 | # CONFIG_CRYPTO_KHAZAD is not set | 1598 | # CONFIG_CRYPTO_KHAZAD is not set |
1537 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1538 | # CONFIG_CRYPTO_SEED is not set | ||
1539 | # CONFIG_CRYPTO_SALSA20 is not set | 1599 | # CONFIG_CRYPTO_SALSA20 is not set |
1600 | # CONFIG_CRYPTO_SEED is not set | ||
1601 | # CONFIG_CRYPTO_SERPENT is not set | ||
1602 | # CONFIG_CRYPTO_TEA is not set | ||
1603 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1604 | |||
1605 | # | ||
1606 | # Compression | ||
1607 | # | ||
1540 | # CONFIG_CRYPTO_DEFLATE is not set | 1608 | # CONFIG_CRYPTO_DEFLATE is not set |
1541 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1542 | # CONFIG_CRYPTO_CRC32C is not set | ||
1543 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1544 | # CONFIG_CRYPTO_TEST is not set | ||
1545 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1546 | # CONFIG_CRYPTO_LZO is not set | 1609 | # CONFIG_CRYPTO_LZO is not set |
1547 | CONFIG_CRYPTO_HW=y | 1610 | CONFIG_CRYPTO_HW=y |
1548 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1611 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1549 | # CONFIG_PPC_CLOCK is not set | 1612 | # CONFIG_PPC_CLOCK is not set |
1613 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig index a469fe918816..b09f0032a10b 100644 --- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:30 2008 | 4 | # Mon Jun 9 08:52:36 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
@@ -153,6 +157,7 @@ CONFIG_MPC85xx=y | |||
153 | CONFIG_MPC85xx_CDS=y | 157 | CONFIG_MPC85xx_CDS=y |
154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
160 | # CONFIG_KSI8560 is not set | ||
156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
@@ -208,11 +213,13 @@ CONFIG_FLATMEM=y | |||
208 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
209 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
212 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
213 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
214 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
215 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
216 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
217 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
218 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
@@ -236,6 +243,7 @@ CONFIG_PCI_LEGACY=y | |||
236 | # CONFIG_PCI_DEBUG is not set | 243 | # CONFIG_PCI_DEBUG is not set |
237 | # CONFIG_PCCARD is not set | 244 | # CONFIG_PCCARD is not set |
238 | # CONFIG_HOTPLUG_PCI is not set | 245 | # CONFIG_HOTPLUG_PCI is not set |
246 | # CONFIG_HAS_RAPIDIO is not set | ||
239 | 247 | ||
240 | # | 248 | # |
241 | # Advanced setup | 249 | # Advanced setup |
@@ -245,11 +253,12 @@ CONFIG_PCI_LEGACY=y | |||
245 | # | 253 | # |
246 | # Default settings for advanced configuration options are used | 254 | # Default settings for advanced configuration options are used |
247 | # | 255 | # |
248 | CONFIG_HIGHMEM_START=0xfe000000 | ||
249 | CONFIG_LOWMEM_SIZE=0x30000000 | 256 | CONFIG_LOWMEM_SIZE=0x30000000 |
257 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
250 | CONFIG_KERNEL_START=0xc0000000 | 258 | CONFIG_KERNEL_START=0xc0000000 |
259 | CONFIG_PHYSICAL_START=0x00000000 | ||
260 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
251 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
252 | CONFIG_BOOT_LOAD=0x00800000 | ||
253 | 262 | ||
254 | # | 263 | # |
255 | # Networking | 264 | # Networking |
@@ -297,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
297 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
298 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
299 | # CONFIG_IPV6 is not set | 308 | # 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 | 309 | # CONFIG_NETWORK_SECMARK is not set |
303 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
304 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
@@ -437,7 +444,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
437 | CONFIG_BLK_DEV_VIA82CXXX=y | 444 | CONFIG_BLK_DEV_VIA82CXXX=y |
438 | # CONFIG_BLK_DEV_TC86C001 is not set | 445 | # CONFIG_BLK_DEV_TC86C001 is not set |
439 | CONFIG_BLK_DEV_IDEDMA=y | 446 | CONFIG_BLK_DEV_IDEDMA=y |
440 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 447 | # CONFIG_BLK_DEV_HD_ONLY is not set |
441 | # CONFIG_BLK_DEV_HD is not set | 448 | # CONFIG_BLK_DEV_HD is not set |
442 | 449 | ||
443 | # | 450 | # |
@@ -515,7 +522,6 @@ CONFIG_E1000_NAPI=y | |||
515 | # CONFIG_SIS190 is not set | 522 | # CONFIG_SIS190 is not set |
516 | # CONFIG_SKGE is not set | 523 | # CONFIG_SKGE is not set |
517 | # CONFIG_SKY2 is not set | 524 | # CONFIG_SKY2 is not set |
518 | # CONFIG_SK98LIN is not set | ||
519 | # CONFIG_VIA_VELOCITY is not set | 525 | # CONFIG_VIA_VELOCITY is not set |
520 | # CONFIG_TIGON3 is not set | 526 | # CONFIG_TIGON3 is not set |
521 | # CONFIG_BNX2 is not set | 527 | # CONFIG_BNX2 is not set |
@@ -535,6 +541,7 @@ CONFIG_NETDEV_10000=y | |||
535 | # CONFIG_MLX4_CORE is not set | 541 | # CONFIG_MLX4_CORE is not set |
536 | # CONFIG_TEHUTI is not set | 542 | # CONFIG_TEHUTI is not set |
537 | # CONFIG_BNX2X is not set | 543 | # CONFIG_BNX2X is not set |
544 | # CONFIG_SFC is not set | ||
538 | # CONFIG_TR is not set | 545 | # CONFIG_TR is not set |
539 | 546 | ||
540 | # | 547 | # |
@@ -542,6 +549,7 @@ CONFIG_NETDEV_10000=y | |||
542 | # | 549 | # |
543 | # CONFIG_WLAN_PRE80211 is not set | 550 | # CONFIG_WLAN_PRE80211 is not set |
544 | # CONFIG_WLAN_80211 is not set | 551 | # CONFIG_WLAN_80211 is not set |
552 | # CONFIG_IWLWIFI_LEDS is not set | ||
545 | # CONFIG_WAN is not set | 553 | # CONFIG_WAN is not set |
546 | # CONFIG_FDDI is not set | 554 | # CONFIG_FDDI is not set |
547 | # CONFIG_HIPPI is not set | 555 | # CONFIG_HIPPI is not set |
@@ -588,6 +596,7 @@ CONFIG_INPUT=y | |||
588 | # Character devices | 596 | # Character devices |
589 | # | 597 | # |
590 | # CONFIG_VT is not set | 598 | # CONFIG_VT is not set |
599 | CONFIG_DEVKMEM=y | ||
591 | # CONFIG_SERIAL_NONSTANDARD is not set | 600 | # CONFIG_SERIAL_NONSTANDARD is not set |
592 | # CONFIG_NOZOMI is not set | 601 | # CONFIG_NOZOMI is not set |
593 | 602 | ||
@@ -624,12 +633,7 @@ CONFIG_GEN_RTC=y | |||
624 | # CONFIG_TCG_TPM is not set | 633 | # CONFIG_TCG_TPM is not set |
625 | CONFIG_DEVPORT=y | 634 | CONFIG_DEVPORT=y |
626 | # CONFIG_I2C is not set | 635 | # CONFIG_I2C is not set |
627 | |||
628 | # | ||
629 | # SPI support | ||
630 | # | ||
631 | # CONFIG_SPI is not set | 636 | # CONFIG_SPI is not set |
632 | # CONFIG_SPI_MASTER is not set | ||
633 | # CONFIG_W1 is not set | 637 | # CONFIG_W1 is not set |
634 | # CONFIG_POWER_SUPPLY is not set | 638 | # CONFIG_POWER_SUPPLY is not set |
635 | CONFIG_HWMON=y | 639 | CONFIG_HWMON=y |
@@ -662,12 +666,22 @@ CONFIG_SSB_POSSIBLE=y | |||
662 | # Multifunction device drivers | 666 | # Multifunction device drivers |
663 | # | 667 | # |
664 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
669 | # CONFIG_HTC_PASIC3 is not set | ||
665 | 670 | ||
666 | # | 671 | # |
667 | # Multimedia devices | 672 | # Multimedia devices |
668 | # | 673 | # |
674 | |||
675 | # | ||
676 | # Multimedia core support | ||
677 | # | ||
669 | # CONFIG_VIDEO_DEV is not set | 678 | # CONFIG_VIDEO_DEV is not set |
670 | # CONFIG_DVB_CORE is not set | 679 | # CONFIG_DVB_CORE is not set |
680 | # CONFIG_VIDEO_MEDIA is not set | ||
681 | |||
682 | # | ||
683 | # Multimedia drivers | ||
684 | # | ||
671 | CONFIG_DAB=y | 685 | CONFIG_DAB=y |
672 | 686 | ||
673 | # | 687 | # |
@@ -698,6 +712,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
698 | CONFIG_USB_ARCH_HAS_OHCI=y | 712 | CONFIG_USB_ARCH_HAS_OHCI=y |
699 | CONFIG_USB_ARCH_HAS_EHCI=y | 713 | CONFIG_USB_ARCH_HAS_EHCI=y |
700 | # CONFIG_USB is not set | 714 | # CONFIG_USB is not set |
715 | # CONFIG_USB_OTG_WHITELIST is not set | ||
716 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
701 | 717 | ||
702 | # | 718 | # |
703 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 719 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -706,14 +722,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
706 | # CONFIG_MMC is not set | 722 | # CONFIG_MMC is not set |
707 | # CONFIG_MEMSTICK is not set | 723 | # CONFIG_MEMSTICK is not set |
708 | # CONFIG_NEW_LEDS is not set | 724 | # CONFIG_NEW_LEDS is not set |
725 | # CONFIG_ACCESSIBILITY is not set | ||
709 | # CONFIG_INFINIBAND is not set | 726 | # CONFIG_INFINIBAND is not set |
710 | # CONFIG_EDAC is not set | 727 | # CONFIG_EDAC is not set |
711 | # CONFIG_RTC_CLASS is not set | 728 | # CONFIG_RTC_CLASS is not set |
712 | # CONFIG_DMADEVICES is not set | 729 | # CONFIG_DMADEVICES is not set |
713 | |||
714 | # | ||
715 | # Userspace I/O | ||
716 | # | ||
717 | # CONFIG_UIO is not set | 730 | # CONFIG_UIO is not set |
718 | 731 | ||
719 | # | 732 | # |
@@ -733,7 +746,6 @@ CONFIG_FS_MBCACHE=y | |||
733 | # CONFIG_JFS_FS is not set | 746 | # CONFIG_JFS_FS is not set |
734 | # CONFIG_FS_POSIX_ACL is not set | 747 | # CONFIG_FS_POSIX_ACL is not set |
735 | # CONFIG_XFS_FS is not set | 748 | # CONFIG_XFS_FS is not set |
736 | # CONFIG_GFS2_FS is not set | ||
737 | # CONFIG_OCFS2_FS is not set | 749 | # CONFIG_OCFS2_FS is not set |
738 | CONFIG_DNOTIFY=y | 750 | CONFIG_DNOTIFY=y |
739 | CONFIG_INOTIFY=y | 751 | CONFIG_INOTIFY=y |
@@ -790,7 +802,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
790 | CONFIG_NFS_FS=y | 802 | CONFIG_NFS_FS=y |
791 | # CONFIG_NFS_V3 is not set | 803 | # CONFIG_NFS_V3 is not set |
792 | # CONFIG_NFS_V4 is not set | 804 | # CONFIG_NFS_V4 is not set |
793 | # CONFIG_NFS_DIRECTIO is not set | ||
794 | # CONFIG_NFSD is not set | 805 | # CONFIG_NFSD is not set |
795 | CONFIG_ROOT_NFS=y | 806 | CONFIG_ROOT_NFS=y |
796 | CONFIG_LOCKD=y | 807 | CONFIG_LOCKD=y |
@@ -829,6 +840,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
829 | # Library routines | 840 | # Library routines |
830 | # | 841 | # |
831 | CONFIG_BITREVERSE=y | 842 | CONFIG_BITREVERSE=y |
843 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
832 | # CONFIG_CRC_CCITT is not set | 844 | # CONFIG_CRC_CCITT is not set |
833 | # CONFIG_CRC16 is not set | 845 | # CONFIG_CRC16 is not set |
834 | # CONFIG_CRC_ITU_T is not set | 846 | # CONFIG_CRC_ITU_T is not set |
@@ -839,6 +851,7 @@ CONFIG_PLIST=y | |||
839 | CONFIG_HAS_IOMEM=y | 851 | CONFIG_HAS_IOMEM=y |
840 | CONFIG_HAS_IOPORT=y | 852 | CONFIG_HAS_IOPORT=y |
841 | CONFIG_HAS_DMA=y | 853 | CONFIG_HAS_DMA=y |
854 | CONFIG_HAVE_LMB=y | ||
842 | 855 | ||
843 | # | 856 | # |
844 | # Kernel hacking | 857 | # Kernel hacking |
@@ -846,6 +859,7 @@ CONFIG_HAS_DMA=y | |||
846 | # CONFIG_PRINTK_TIME is not set | 859 | # CONFIG_PRINTK_TIME is not set |
847 | CONFIG_ENABLE_WARN_DEPRECATED=y | 860 | CONFIG_ENABLE_WARN_DEPRECATED=y |
848 | CONFIG_ENABLE_MUST_CHECK=y | 861 | CONFIG_ENABLE_MUST_CHECK=y |
862 | CONFIG_FRAME_WARN=1024 | ||
849 | # CONFIG_MAGIC_SYSRQ is not set | 863 | # CONFIG_MAGIC_SYSRQ is not set |
850 | # CONFIG_UNUSED_SYMBOLS is not set | 864 | # CONFIG_UNUSED_SYMBOLS is not set |
851 | # CONFIG_DEBUG_FS is not set | 865 | # CONFIG_DEBUG_FS is not set |
@@ -856,6 +870,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
856 | CONFIG_SCHED_DEBUG=y | 870 | CONFIG_SCHED_DEBUG=y |
857 | # CONFIG_SCHEDSTATS is not set | 871 | # CONFIG_SCHEDSTATS is not set |
858 | # CONFIG_TIMER_STATS is not set | 872 | # CONFIG_TIMER_STATS is not set |
873 | # CONFIG_DEBUG_OBJECTS is not set | ||
859 | # CONFIG_SLUB_DEBUG_ON is not set | 874 | # CONFIG_SLUB_DEBUG_ON is not set |
860 | # CONFIG_SLUB_STATS is not set | 875 | # CONFIG_SLUB_STATS is not set |
861 | # CONFIG_DEBUG_RT_MUTEXES is not set | 876 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -868,6 +883,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
868 | # CONFIG_DEBUG_BUGVERBOSE is not set | 883 | # CONFIG_DEBUG_BUGVERBOSE is not set |
869 | # CONFIG_DEBUG_INFO is not set | 884 | # CONFIG_DEBUG_INFO is not set |
870 | # CONFIG_DEBUG_VM is not set | 885 | # CONFIG_DEBUG_VM is not set |
886 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
871 | # CONFIG_DEBUG_LIST is not set | 887 | # CONFIG_DEBUG_LIST is not set |
872 | # CONFIG_DEBUG_SG is not set | 888 | # CONFIG_DEBUG_SG is not set |
873 | # CONFIG_BOOT_PRINTK_DELAY is not set | 889 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -878,6 +894,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
878 | # CONFIG_DEBUG_STACK_USAGE is not set | 894 | # CONFIG_DEBUG_STACK_USAGE is not set |
879 | # CONFIG_DEBUG_PAGEALLOC is not set | 895 | # CONFIG_DEBUG_PAGEALLOC is not set |
880 | # CONFIG_DEBUGGER is not set | 896 | # CONFIG_DEBUGGER is not set |
897 | # CONFIG_IRQSTACKS is not set | ||
881 | # CONFIG_BDI_SWITCH is not set | 898 | # CONFIG_BDI_SWITCH is not set |
882 | # CONFIG_PPC_EARLY_DEBUG is not set | 899 | # CONFIG_PPC_EARLY_DEBUG is not set |
883 | 900 | ||
@@ -888,48 +905,78 @@ CONFIG_DEBUG_MUTEXES=y | |||
888 | # CONFIG_SECURITY is not set | 905 | # CONFIG_SECURITY is not set |
889 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 906 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
890 | CONFIG_CRYPTO=y | 907 | CONFIG_CRYPTO=y |
891 | # CONFIG_CRYPTO_SEQIV is not set | 908 | |
909 | # | ||
910 | # Crypto core or helper | ||
911 | # | ||
892 | # CONFIG_CRYPTO_MANAGER is not set | 912 | # CONFIG_CRYPTO_MANAGER is not set |
913 | # CONFIG_CRYPTO_GF128MUL is not set | ||
914 | # CONFIG_CRYPTO_NULL is not set | ||
915 | # CONFIG_CRYPTO_CRYPTD is not set | ||
916 | # CONFIG_CRYPTO_AUTHENC is not set | ||
917 | |||
918 | # | ||
919 | # Authenticated Encryption with Associated Data | ||
920 | # | ||
921 | # CONFIG_CRYPTO_CCM is not set | ||
922 | # CONFIG_CRYPTO_GCM is not set | ||
923 | # CONFIG_CRYPTO_SEQIV is not set | ||
924 | |||
925 | # | ||
926 | # Block modes | ||
927 | # | ||
928 | # CONFIG_CRYPTO_CBC is not set | ||
929 | # CONFIG_CRYPTO_CTR is not set | ||
930 | # CONFIG_CRYPTO_CTS is not set | ||
931 | # CONFIG_CRYPTO_ECB is not set | ||
932 | # CONFIG_CRYPTO_LRW is not set | ||
933 | # CONFIG_CRYPTO_PCBC is not set | ||
934 | # CONFIG_CRYPTO_XTS is not set | ||
935 | |||
936 | # | ||
937 | # Hash modes | ||
938 | # | ||
893 | # CONFIG_CRYPTO_HMAC is not set | 939 | # CONFIG_CRYPTO_HMAC is not set |
894 | # CONFIG_CRYPTO_XCBC is not set | 940 | # CONFIG_CRYPTO_XCBC is not set |
895 | # CONFIG_CRYPTO_NULL is not set | 941 | |
942 | # | ||
943 | # Digest | ||
944 | # | ||
945 | # CONFIG_CRYPTO_CRC32C is not set | ||
896 | # CONFIG_CRYPTO_MD4 is not set | 946 | # CONFIG_CRYPTO_MD4 is not set |
897 | # CONFIG_CRYPTO_MD5 is not set | 947 | # CONFIG_CRYPTO_MD5 is not set |
948 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
898 | # CONFIG_CRYPTO_SHA1 is not set | 949 | # CONFIG_CRYPTO_SHA1 is not set |
899 | # CONFIG_CRYPTO_SHA256 is not set | 950 | # CONFIG_CRYPTO_SHA256 is not set |
900 | # CONFIG_CRYPTO_SHA512 is not set | 951 | # CONFIG_CRYPTO_SHA512 is not set |
901 | # CONFIG_CRYPTO_WP512 is not set | ||
902 | # CONFIG_CRYPTO_TGR192 is not set | 952 | # CONFIG_CRYPTO_TGR192 is not set |
903 | # CONFIG_CRYPTO_GF128MUL is not set | 953 | # CONFIG_CRYPTO_WP512 is not set |
904 | # CONFIG_CRYPTO_ECB is not set | 954 | |
905 | # CONFIG_CRYPTO_CBC is not set | 955 | # |
906 | # CONFIG_CRYPTO_PCBC is not set | 956 | # Ciphers |
907 | # CONFIG_CRYPTO_LRW is not set | 957 | # |
908 | # CONFIG_CRYPTO_XTS is not set | ||
909 | # CONFIG_CRYPTO_CTR is not set | ||
910 | # CONFIG_CRYPTO_GCM is not set | ||
911 | # CONFIG_CRYPTO_CCM is not set | ||
912 | # CONFIG_CRYPTO_CRYPTD is not set | ||
913 | # CONFIG_CRYPTO_DES is not set | ||
914 | # CONFIG_CRYPTO_FCRYPT is not set | ||
915 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
916 | # CONFIG_CRYPTO_TWOFISH is not set | ||
917 | # CONFIG_CRYPTO_SERPENT is not set | ||
918 | # CONFIG_CRYPTO_AES is not set | 958 | # CONFIG_CRYPTO_AES is not set |
959 | # CONFIG_CRYPTO_ANUBIS is not set | ||
960 | # CONFIG_CRYPTO_ARC4 is not set | ||
961 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
962 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
919 | # CONFIG_CRYPTO_CAST5 is not set | 963 | # CONFIG_CRYPTO_CAST5 is not set |
920 | # CONFIG_CRYPTO_CAST6 is not set | 964 | # CONFIG_CRYPTO_CAST6 is not set |
921 | # CONFIG_CRYPTO_TEA is not set | 965 | # CONFIG_CRYPTO_DES is not set |
922 | # CONFIG_CRYPTO_ARC4 is not set | 966 | # CONFIG_CRYPTO_FCRYPT is not set |
923 | # CONFIG_CRYPTO_KHAZAD is not set | 967 | # CONFIG_CRYPTO_KHAZAD is not set |
924 | # CONFIG_CRYPTO_ANUBIS is not set | ||
925 | # CONFIG_CRYPTO_SEED is not set | ||
926 | # CONFIG_CRYPTO_SALSA20 is not set | 968 | # CONFIG_CRYPTO_SALSA20 is not set |
969 | # CONFIG_CRYPTO_SEED is not set | ||
970 | # CONFIG_CRYPTO_SERPENT is not set | ||
971 | # CONFIG_CRYPTO_TEA is not set | ||
972 | # CONFIG_CRYPTO_TWOFISH is not set | ||
973 | |||
974 | # | ||
975 | # Compression | ||
976 | # | ||
927 | # CONFIG_CRYPTO_DEFLATE is not set | 977 | # CONFIG_CRYPTO_DEFLATE is not set |
928 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
929 | # CONFIG_CRYPTO_CRC32C is not set | ||
930 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
931 | # CONFIG_CRYPTO_AUTHENC is not set | ||
932 | # CONFIG_CRYPTO_LZO is not set | 978 | # CONFIG_CRYPTO_LZO is not set |
933 | CONFIG_CRYPTO_HW=y | 979 | CONFIG_CRYPTO_HW=y |
934 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 980 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
935 | # CONFIG_PPC_CLOCK is not set | 981 | # CONFIG_PPC_CLOCK is not set |
982 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig index 67f67978c742..24f7f44b4821 100644 --- a/arch/powerpc/configs/85xx/sbc8548_defconfig +++ b/arch/powerpc/configs/85xx/sbc8548_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:39 2008 | 4 | # Mon Jun 9 08:52:37 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 94 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
92 | CONFIG_HOTPLUG=y | 95 | CONFIG_HOTPLUG=y |
@@ -111,6 +114,7 @@ CONFIG_SLAB=y | |||
111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
@@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | ||
154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
@@ -206,11 +211,13 @@ CONFIG_FLATMEM=y | |||
206 | CONFIG_FLAT_NODE_MEM_MAP=y | 211 | CONFIG_FLAT_NODE_MEM_MAP=y |
207 | # CONFIG_SPARSEMEM_STATIC is not set | 212 | # CONFIG_SPARSEMEM_STATIC is not set |
208 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
214 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
209 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
210 | # CONFIG_RESOURCES_64BIT is not set | 216 | # CONFIG_RESOURCES_64BIT is not set |
211 | CONFIG_ZONE_DMA_FLAG=1 | 217 | CONFIG_ZONE_DMA_FLAG=1 |
212 | CONFIG_BOUNCE=y | 218 | CONFIG_BOUNCE=y |
213 | CONFIG_VIRT_TO_BUS=y | 219 | CONFIG_VIRT_TO_BUS=y |
220 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
214 | CONFIG_PROC_DEVICETREE=y | 221 | CONFIG_PROC_DEVICETREE=y |
215 | # CONFIG_CMDLINE_BOOL is not set | 222 | # CONFIG_CMDLINE_BOOL is not set |
216 | # CONFIG_PM is not set | 223 | # CONFIG_PM is not set |
@@ -233,6 +240,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
233 | CONFIG_PCI_LEGACY=y | 240 | CONFIG_PCI_LEGACY=y |
234 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
235 | # CONFIG_HOTPLUG_PCI is not set | 242 | # CONFIG_HOTPLUG_PCI is not set |
243 | # CONFIG_HAS_RAPIDIO is not set | ||
236 | 244 | ||
237 | # | 245 | # |
238 | # Advanced setup | 246 | # Advanced setup |
@@ -242,11 +250,12 @@ CONFIG_PCI_LEGACY=y | |||
242 | # | 250 | # |
243 | # Default settings for advanced configuration options are used | 251 | # Default settings for advanced configuration options are used |
244 | # | 252 | # |
245 | CONFIG_HIGHMEM_START=0xfe000000 | ||
246 | CONFIG_LOWMEM_SIZE=0x30000000 | 253 | CONFIG_LOWMEM_SIZE=0x30000000 |
254 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
247 | CONFIG_KERNEL_START=0xc0000000 | 255 | CONFIG_KERNEL_START=0xc0000000 |
256 | CONFIG_PHYSICAL_START=0x00000000 | ||
257 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
248 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
249 | CONFIG_BOOT_LOAD=0x00800000 | ||
250 | 259 | ||
251 | # | 260 | # |
252 | # Networking | 261 | # Networking |
@@ -294,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
295 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
296 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
298 | # CONFIG_INET6_TUNNEL is not set | ||
299 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
300 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
301 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
@@ -449,7 +456,6 @@ CONFIG_NETDEV_1000=y | |||
449 | # CONFIG_SIS190 is not set | 456 | # CONFIG_SIS190 is not set |
450 | # CONFIG_SKGE is not set | 457 | # CONFIG_SKGE is not set |
451 | # CONFIG_SKY2 is not set | 458 | # CONFIG_SKY2 is not set |
452 | # CONFIG_SK98LIN is not set | ||
453 | # CONFIG_VIA_VELOCITY is not set | 459 | # CONFIG_VIA_VELOCITY is not set |
454 | # CONFIG_TIGON3 is not set | 460 | # CONFIG_TIGON3 is not set |
455 | # CONFIG_BNX2 is not set | 461 | # CONFIG_BNX2 is not set |
@@ -469,6 +475,7 @@ CONFIG_NETDEV_10000=y | |||
469 | # CONFIG_MLX4_CORE is not set | 475 | # CONFIG_MLX4_CORE is not set |
470 | # CONFIG_TEHUTI is not set | 476 | # CONFIG_TEHUTI is not set |
471 | # CONFIG_BNX2X is not set | 477 | # CONFIG_BNX2X is not set |
478 | # CONFIG_SFC is not set | ||
472 | # CONFIG_TR is not set | 479 | # CONFIG_TR is not set |
473 | 480 | ||
474 | # | 481 | # |
@@ -476,6 +483,7 @@ CONFIG_NETDEV_10000=y | |||
476 | # | 483 | # |
477 | # CONFIG_WLAN_PRE80211 is not set | 484 | # CONFIG_WLAN_PRE80211 is not set |
478 | # CONFIG_WLAN_80211 is not set | 485 | # CONFIG_WLAN_80211 is not set |
486 | # CONFIG_IWLWIFI_LEDS is not set | ||
479 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
480 | # CONFIG_FDDI is not set | 488 | # CONFIG_FDDI is not set |
481 | # CONFIG_HIPPI is not set | 489 | # CONFIG_HIPPI is not set |
@@ -522,6 +530,7 @@ CONFIG_INPUT=y | |||
522 | # Character devices | 530 | # Character devices |
523 | # | 531 | # |
524 | # CONFIG_VT is not set | 532 | # CONFIG_VT is not set |
533 | CONFIG_DEVKMEM=y | ||
525 | # CONFIG_SERIAL_NONSTANDARD is not set | 534 | # CONFIG_SERIAL_NONSTANDARD is not set |
526 | # CONFIG_NOZOMI is not set | 535 | # CONFIG_NOZOMI is not set |
527 | 536 | ||
@@ -558,12 +567,7 @@ CONFIG_GEN_RTC=y | |||
558 | # CONFIG_TCG_TPM is not set | 567 | # CONFIG_TCG_TPM is not set |
559 | CONFIG_DEVPORT=y | 568 | CONFIG_DEVPORT=y |
560 | # CONFIG_I2C is not set | 569 | # CONFIG_I2C is not set |
561 | |||
562 | # | ||
563 | # SPI support | ||
564 | # | ||
565 | # CONFIG_SPI is not set | 570 | # CONFIG_SPI is not set |
566 | # CONFIG_SPI_MASTER is not set | ||
567 | # CONFIG_W1 is not set | 571 | # CONFIG_W1 is not set |
568 | # CONFIG_POWER_SUPPLY is not set | 572 | # CONFIG_POWER_SUPPLY is not set |
569 | CONFIG_HWMON=y | 573 | CONFIG_HWMON=y |
@@ -596,12 +600,22 @@ CONFIG_SSB_POSSIBLE=y | |||
596 | # Multifunction device drivers | 600 | # Multifunction device drivers |
597 | # | 601 | # |
598 | # CONFIG_MFD_SM501 is not set | 602 | # CONFIG_MFD_SM501 is not set |
603 | # CONFIG_HTC_PASIC3 is not set | ||
599 | 604 | ||
600 | # | 605 | # |
601 | # Multimedia devices | 606 | # Multimedia devices |
602 | # | 607 | # |
608 | |||
609 | # | ||
610 | # Multimedia core support | ||
611 | # | ||
603 | # CONFIG_VIDEO_DEV is not set | 612 | # CONFIG_VIDEO_DEV is not set |
604 | # CONFIG_DVB_CORE is not set | 613 | # CONFIG_DVB_CORE is not set |
614 | # CONFIG_VIDEO_MEDIA is not set | ||
615 | |||
616 | # | ||
617 | # Multimedia drivers | ||
618 | # | ||
605 | CONFIG_DAB=y | 619 | CONFIG_DAB=y |
606 | 620 | ||
607 | # | 621 | # |
@@ -628,14 +642,11 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
628 | # CONFIG_MMC is not set | 642 | # CONFIG_MMC is not set |
629 | # CONFIG_MEMSTICK is not set | 643 | # CONFIG_MEMSTICK is not set |
630 | # CONFIG_NEW_LEDS is not set | 644 | # CONFIG_NEW_LEDS is not set |
645 | # CONFIG_ACCESSIBILITY is not set | ||
631 | # CONFIG_INFINIBAND is not set | 646 | # CONFIG_INFINIBAND is not set |
632 | # CONFIG_EDAC is not set | 647 | # CONFIG_EDAC is not set |
633 | # CONFIG_RTC_CLASS is not set | 648 | # CONFIG_RTC_CLASS is not set |
634 | # CONFIG_DMADEVICES is not set | 649 | # CONFIG_DMADEVICES is not set |
635 | |||
636 | # | ||
637 | # Userspace I/O | ||
638 | # | ||
639 | # CONFIG_UIO is not set | 650 | # CONFIG_UIO is not set |
640 | 651 | ||
641 | # | 652 | # |
@@ -648,7 +659,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
648 | # CONFIG_JFS_FS is not set | 659 | # CONFIG_JFS_FS is not set |
649 | # CONFIG_FS_POSIX_ACL is not set | 660 | # CONFIG_FS_POSIX_ACL is not set |
650 | # CONFIG_XFS_FS is not set | 661 | # CONFIG_XFS_FS is not set |
651 | # CONFIG_GFS2_FS is not set | ||
652 | # CONFIG_OCFS2_FS is not set | 662 | # CONFIG_OCFS2_FS is not set |
653 | CONFIG_DNOTIFY=y | 663 | CONFIG_DNOTIFY=y |
654 | CONFIG_INOTIFY=y | 664 | CONFIG_INOTIFY=y |
@@ -705,7 +715,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
705 | CONFIG_NFS_FS=y | 715 | CONFIG_NFS_FS=y |
706 | # CONFIG_NFS_V3 is not set | 716 | # CONFIG_NFS_V3 is not set |
707 | # CONFIG_NFS_V4 is not set | 717 | # CONFIG_NFS_V4 is not set |
708 | # CONFIG_NFS_DIRECTIO is not set | ||
709 | # CONFIG_NFSD is not set | 718 | # CONFIG_NFSD is not set |
710 | CONFIG_ROOT_NFS=y | 719 | CONFIG_ROOT_NFS=y |
711 | CONFIG_LOCKD=y | 720 | CONFIG_LOCKD=y |
@@ -732,6 +741,7 @@ CONFIG_MSDOS_PARTITION=y | |||
732 | # Library routines | 741 | # Library routines |
733 | # | 742 | # |
734 | CONFIG_BITREVERSE=y | 743 | CONFIG_BITREVERSE=y |
744 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
735 | # CONFIG_CRC_CCITT is not set | 745 | # CONFIG_CRC_CCITT is not set |
736 | # CONFIG_CRC16 is not set | 746 | # CONFIG_CRC16 is not set |
737 | # CONFIG_CRC_ITU_T is not set | 747 | # CONFIG_CRC_ITU_T is not set |
@@ -742,6 +752,7 @@ CONFIG_PLIST=y | |||
742 | CONFIG_HAS_IOMEM=y | 752 | CONFIG_HAS_IOMEM=y |
743 | CONFIG_HAS_IOPORT=y | 753 | CONFIG_HAS_IOPORT=y |
744 | CONFIG_HAS_DMA=y | 754 | CONFIG_HAS_DMA=y |
755 | CONFIG_HAVE_LMB=y | ||
745 | 756 | ||
746 | # | 757 | # |
747 | # Kernel hacking | 758 | # Kernel hacking |
@@ -749,6 +760,7 @@ CONFIG_HAS_DMA=y | |||
749 | # CONFIG_PRINTK_TIME is not set | 760 | # CONFIG_PRINTK_TIME is not set |
750 | CONFIG_ENABLE_WARN_DEPRECATED=y | 761 | CONFIG_ENABLE_WARN_DEPRECATED=y |
751 | CONFIG_ENABLE_MUST_CHECK=y | 762 | CONFIG_ENABLE_MUST_CHECK=y |
763 | CONFIG_FRAME_WARN=1024 | ||
752 | # CONFIG_MAGIC_SYSRQ is not set | 764 | # CONFIG_MAGIC_SYSRQ is not set |
753 | # CONFIG_UNUSED_SYMBOLS is not set | 765 | # CONFIG_UNUSED_SYMBOLS is not set |
754 | # CONFIG_DEBUG_FS is not set | 766 | # CONFIG_DEBUG_FS is not set |
@@ -756,6 +768,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
756 | # CONFIG_DEBUG_KERNEL is not set | 768 | # CONFIG_DEBUG_KERNEL is not set |
757 | # CONFIG_DEBUG_BUGVERBOSE is not set | 769 | # CONFIG_DEBUG_BUGVERBOSE is not set |
758 | # CONFIG_SAMPLES is not set | 770 | # CONFIG_SAMPLES is not set |
771 | # CONFIG_IRQSTACKS is not set | ||
759 | # CONFIG_PPC_EARLY_DEBUG is not set | 772 | # CONFIG_PPC_EARLY_DEBUG is not set |
760 | 773 | ||
761 | # | 774 | # |
@@ -765,48 +778,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
765 | # CONFIG_SECURITY is not set | 778 | # CONFIG_SECURITY is not set |
766 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 779 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
767 | CONFIG_CRYPTO=y | 780 | CONFIG_CRYPTO=y |
768 | # CONFIG_CRYPTO_SEQIV is not set | 781 | |
782 | # | ||
783 | # Crypto core or helper | ||
784 | # | ||
769 | # CONFIG_CRYPTO_MANAGER is not set | 785 | # CONFIG_CRYPTO_MANAGER is not set |
786 | # CONFIG_CRYPTO_GF128MUL is not set | ||
787 | # CONFIG_CRYPTO_NULL is not set | ||
788 | # CONFIG_CRYPTO_CRYPTD is not set | ||
789 | # CONFIG_CRYPTO_AUTHENC is not set | ||
790 | |||
791 | # | ||
792 | # Authenticated Encryption with Associated Data | ||
793 | # | ||
794 | # CONFIG_CRYPTO_CCM is not set | ||
795 | # CONFIG_CRYPTO_GCM is not set | ||
796 | # CONFIG_CRYPTO_SEQIV is not set | ||
797 | |||
798 | # | ||
799 | # Block modes | ||
800 | # | ||
801 | # CONFIG_CRYPTO_CBC is not set | ||
802 | # CONFIG_CRYPTO_CTR is not set | ||
803 | # CONFIG_CRYPTO_CTS is not set | ||
804 | # CONFIG_CRYPTO_ECB is not set | ||
805 | # CONFIG_CRYPTO_LRW is not set | ||
806 | # CONFIG_CRYPTO_PCBC is not set | ||
807 | # CONFIG_CRYPTO_XTS is not set | ||
808 | |||
809 | # | ||
810 | # Hash modes | ||
811 | # | ||
770 | # CONFIG_CRYPTO_HMAC is not set | 812 | # CONFIG_CRYPTO_HMAC is not set |
771 | # CONFIG_CRYPTO_XCBC is not set | 813 | # CONFIG_CRYPTO_XCBC is not set |
772 | # CONFIG_CRYPTO_NULL is not set | 814 | |
815 | # | ||
816 | # Digest | ||
817 | # | ||
818 | # CONFIG_CRYPTO_CRC32C is not set | ||
773 | # CONFIG_CRYPTO_MD4 is not set | 819 | # CONFIG_CRYPTO_MD4 is not set |
774 | # CONFIG_CRYPTO_MD5 is not set | 820 | # CONFIG_CRYPTO_MD5 is not set |
821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
775 | # CONFIG_CRYPTO_SHA1 is not set | 822 | # CONFIG_CRYPTO_SHA1 is not set |
776 | # CONFIG_CRYPTO_SHA256 is not set | 823 | # CONFIG_CRYPTO_SHA256 is not set |
777 | # CONFIG_CRYPTO_SHA512 is not set | 824 | # CONFIG_CRYPTO_SHA512 is not set |
778 | # CONFIG_CRYPTO_WP512 is not set | ||
779 | # CONFIG_CRYPTO_TGR192 is not set | 825 | # CONFIG_CRYPTO_TGR192 is not set |
780 | # CONFIG_CRYPTO_GF128MUL is not set | 826 | # CONFIG_CRYPTO_WP512 is not set |
781 | # CONFIG_CRYPTO_ECB is not set | 827 | |
782 | # CONFIG_CRYPTO_CBC is not set | 828 | # |
783 | # CONFIG_CRYPTO_PCBC is not set | 829 | # Ciphers |
784 | # CONFIG_CRYPTO_LRW is not set | 830 | # |
785 | # CONFIG_CRYPTO_XTS is not set | ||
786 | # CONFIG_CRYPTO_CTR is not set | ||
787 | # CONFIG_CRYPTO_GCM is not set | ||
788 | # CONFIG_CRYPTO_CCM is not set | ||
789 | # CONFIG_CRYPTO_CRYPTD is not set | ||
790 | # CONFIG_CRYPTO_DES is not set | ||
791 | # CONFIG_CRYPTO_FCRYPT is not set | ||
792 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
793 | # CONFIG_CRYPTO_TWOFISH is not set | ||
794 | # CONFIG_CRYPTO_SERPENT is not set | ||
795 | # CONFIG_CRYPTO_AES is not set | 831 | # CONFIG_CRYPTO_AES is not set |
832 | # CONFIG_CRYPTO_ANUBIS is not set | ||
833 | # CONFIG_CRYPTO_ARC4 is not set | ||
834 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
835 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
796 | # CONFIG_CRYPTO_CAST5 is not set | 836 | # CONFIG_CRYPTO_CAST5 is not set |
797 | # CONFIG_CRYPTO_CAST6 is not set | 837 | # CONFIG_CRYPTO_CAST6 is not set |
798 | # CONFIG_CRYPTO_TEA is not set | 838 | # CONFIG_CRYPTO_DES is not set |
799 | # CONFIG_CRYPTO_ARC4 is not set | 839 | # CONFIG_CRYPTO_FCRYPT is not set |
800 | # CONFIG_CRYPTO_KHAZAD is not set | 840 | # CONFIG_CRYPTO_KHAZAD is not set |
801 | # CONFIG_CRYPTO_ANUBIS is not set | ||
802 | # CONFIG_CRYPTO_SEED is not set | ||
803 | # CONFIG_CRYPTO_SALSA20 is not set | 841 | # CONFIG_CRYPTO_SALSA20 is not set |
842 | # CONFIG_CRYPTO_SEED is not set | ||
843 | # CONFIG_CRYPTO_SERPENT is not set | ||
844 | # CONFIG_CRYPTO_TEA is not set | ||
845 | # CONFIG_CRYPTO_TWOFISH is not set | ||
846 | |||
847 | # | ||
848 | # Compression | ||
849 | # | ||
804 | # CONFIG_CRYPTO_DEFLATE is not set | 850 | # CONFIG_CRYPTO_DEFLATE is not set |
805 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
806 | # CONFIG_CRYPTO_CRC32C is not set | ||
807 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
808 | # CONFIG_CRYPTO_AUTHENC is not set | ||
809 | # CONFIG_CRYPTO_LZO is not set | 851 | # CONFIG_CRYPTO_LZO is not set |
810 | CONFIG_CRYPTO_HW=y | 852 | CONFIG_CRYPTO_HW=y |
811 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 853 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
812 | # CONFIG_PPC_CLOCK is not set | 854 | # CONFIG_PPC_CLOCK is not set |
855 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index fef605579e29..655518dcd73f 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:39 2008 | 4 | # Mon Jun 9 08:52:38 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -112,6 +115,7 @@ CONFIG_SLAB=y | |||
112 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
113 | CONFIG_HAVE_KPROBES=y | 116 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | 117 | CONFIG_HAVE_KRETPROBES=y |
118 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_PROC_PAGE_MONITOR=y |
116 | CONFIG_SLABINFO=y | 120 | CONFIG_SLABINFO=y |
117 | CONFIG_RT_MUTEXES=y | 121 | CONFIG_RT_MUTEXES=y |
@@ -152,6 +156,7 @@ CONFIG_MPC85xx=y | |||
152 | # CONFIG_MPC85xx_CDS is not set | 156 | # CONFIG_MPC85xx_CDS is not set |
153 | # CONFIG_MPC85xx_MDS is not set | 157 | # CONFIG_MPC85xx_MDS is not set |
154 | # CONFIG_MPC85xx_DS is not set | 158 | # CONFIG_MPC85xx_DS is not set |
159 | # CONFIG_KSI8560 is not set | ||
155 | # CONFIG_STX_GP3 is not set | 160 | # CONFIG_STX_GP3 is not set |
156 | # CONFIG_TQM8540 is not set | 161 | # CONFIG_TQM8540 is not set |
157 | # CONFIG_TQM8541 is not set | 162 | # CONFIG_TQM8541 is not set |
@@ -207,11 +212,13 @@ CONFIG_FLATMEM=y | |||
207 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
208 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
209 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
211 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
212 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
213 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
214 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
221 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
215 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
216 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
217 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
@@ -228,6 +235,7 @@ CONFIG_FSL_SOC=y | |||
228 | # CONFIG_PCI_SYSCALL is not set | 235 | # CONFIG_PCI_SYSCALL is not set |
229 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
230 | # CONFIG_PCCARD is not set | 237 | # CONFIG_PCCARD is not set |
238 | # CONFIG_HAS_RAPIDIO is not set | ||
231 | 239 | ||
232 | # | 240 | # |
233 | # Advanced setup | 241 | # Advanced setup |
@@ -237,11 +245,12 @@ CONFIG_FSL_SOC=y | |||
237 | # | 245 | # |
238 | # Default settings for advanced configuration options are used | 246 | # Default settings for advanced configuration options are used |
239 | # | 247 | # |
240 | CONFIG_HIGHMEM_START=0xfe000000 | ||
241 | CONFIG_LOWMEM_SIZE=0x30000000 | 248 | CONFIG_LOWMEM_SIZE=0x30000000 |
249 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
242 | CONFIG_KERNEL_START=0xc0000000 | 250 | CONFIG_KERNEL_START=0xc0000000 |
251 | CONFIG_PHYSICAL_START=0x00000000 | ||
252 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
243 | CONFIG_TASK_SIZE=0xc0000000 | 253 | CONFIG_TASK_SIZE=0xc0000000 |
244 | CONFIG_BOOT_LOAD=0x00800000 | ||
245 | 254 | ||
246 | # | 255 | # |
247 | # Networking | 256 | # Networking |
@@ -289,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
289 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
290 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
291 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
292 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
293 | # CONFIG_INET6_TUNNEL is not set | ||
294 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
295 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
296 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
@@ -418,6 +425,7 @@ CONFIG_NETDEV_10000=y | |||
418 | # | 425 | # |
419 | # CONFIG_WLAN_PRE80211 is not set | 426 | # CONFIG_WLAN_PRE80211 is not set |
420 | # CONFIG_WLAN_80211 is not set | 427 | # CONFIG_WLAN_80211 is not set |
428 | # CONFIG_IWLWIFI_LEDS is not set | ||
421 | # CONFIG_WAN is not set | 429 | # CONFIG_WAN is not set |
422 | # CONFIG_PPP is not set | 430 | # CONFIG_PPP is not set |
423 | # CONFIG_SLIP is not set | 431 | # CONFIG_SLIP is not set |
@@ -462,6 +470,7 @@ CONFIG_INPUT=y | |||
462 | # Character devices | 470 | # Character devices |
463 | # | 471 | # |
464 | # CONFIG_VT is not set | 472 | # CONFIG_VT is not set |
473 | CONFIG_DEVKMEM=y | ||
465 | # CONFIG_SERIAL_NONSTANDARD is not set | 474 | # CONFIG_SERIAL_NONSTANDARD is not set |
466 | 475 | ||
467 | # | 476 | # |
@@ -487,17 +496,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
487 | # CONFIG_IPMI_HANDLER is not set | 496 | # CONFIG_IPMI_HANDLER is not set |
488 | # CONFIG_HW_RANDOM is not set | 497 | # CONFIG_HW_RANDOM is not set |
489 | # CONFIG_NVRAM is not set | 498 | # CONFIG_NVRAM is not set |
490 | # CONFIG_GEN_RTC is not set | ||
491 | # CONFIG_R3964 is not set | 499 | # CONFIG_R3964 is not set |
492 | # CONFIG_RAW_DRIVER is not set | 500 | # CONFIG_RAW_DRIVER is not set |
493 | # CONFIG_TCG_TPM is not set | 501 | # CONFIG_TCG_TPM is not set |
494 | # CONFIG_I2C is not set | 502 | # CONFIG_I2C is not set |
495 | |||
496 | # | ||
497 | # SPI support | ||
498 | # | ||
499 | # CONFIG_SPI is not set | 503 | # CONFIG_SPI is not set |
500 | # CONFIG_SPI_MASTER is not set | ||
501 | # CONFIG_W1 is not set | 504 | # CONFIG_W1 is not set |
502 | # CONFIG_POWER_SUPPLY is not set | 505 | # CONFIG_POWER_SUPPLY is not set |
503 | CONFIG_HWMON=y | 506 | CONFIG_HWMON=y |
@@ -526,12 +529,22 @@ CONFIG_SSB_POSSIBLE=y | |||
526 | # Multifunction device drivers | 529 | # Multifunction device drivers |
527 | # | 530 | # |
528 | # CONFIG_MFD_SM501 is not set | 531 | # CONFIG_MFD_SM501 is not set |
532 | # CONFIG_HTC_PASIC3 is not set | ||
529 | 533 | ||
530 | # | 534 | # |
531 | # Multimedia devices | 535 | # Multimedia devices |
532 | # | 536 | # |
537 | |||
538 | # | ||
539 | # Multimedia core support | ||
540 | # | ||
533 | # CONFIG_VIDEO_DEV is not set | 541 | # CONFIG_VIDEO_DEV is not set |
534 | # CONFIG_DVB_CORE is not set | 542 | # CONFIG_DVB_CORE is not set |
543 | # CONFIG_VIDEO_MEDIA is not set | ||
544 | |||
545 | # | ||
546 | # Multimedia drivers | ||
547 | # | ||
535 | CONFIG_DAB=y | 548 | CONFIG_DAB=y |
536 | 549 | ||
537 | # | 550 | # |
@@ -559,6 +572,8 @@ CONFIG_USB_SUPPORT=y | |||
559 | # CONFIG_USB_ARCH_HAS_HCD is not set | 572 | # CONFIG_USB_ARCH_HAS_HCD is not set |
560 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 573 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
561 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 574 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
575 | # CONFIG_USB_OTG_WHITELIST is not set | ||
576 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
562 | 577 | ||
563 | # | 578 | # |
564 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 579 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -567,6 +582,7 @@ CONFIG_USB_SUPPORT=y | |||
567 | # CONFIG_MMC is not set | 582 | # CONFIG_MMC is not set |
568 | # CONFIG_MEMSTICK is not set | 583 | # CONFIG_MEMSTICK is not set |
569 | # CONFIG_NEW_LEDS is not set | 584 | # CONFIG_NEW_LEDS is not set |
585 | # CONFIG_ACCESSIBILITY is not set | ||
570 | # CONFIG_EDAC is not set | 586 | # CONFIG_EDAC is not set |
571 | CONFIG_RTC_LIB=y | 587 | CONFIG_RTC_LIB=y |
572 | CONFIG_RTC_CLASS=y | 588 | CONFIG_RTC_CLASS=y |
@@ -602,11 +618,8 @@ CONFIG_RTC_DRV_M48T59=y | |||
602 | # | 618 | # |
603 | # on-CPU RTC drivers | 619 | # on-CPU RTC drivers |
604 | # | 620 | # |
621 | # CONFIG_RTC_DRV_PPC is not set | ||
605 | # CONFIG_DMADEVICES is not set | 622 | # CONFIG_DMADEVICES is not set |
606 | |||
607 | # | ||
608 | # Userspace I/O | ||
609 | # | ||
610 | # CONFIG_UIO is not set | 623 | # CONFIG_UIO is not set |
611 | 624 | ||
612 | # | 625 | # |
@@ -619,7 +632,6 @@ CONFIG_RTC_DRV_M48T59=y | |||
619 | # CONFIG_JFS_FS is not set | 632 | # CONFIG_JFS_FS is not set |
620 | # CONFIG_FS_POSIX_ACL is not set | 633 | # CONFIG_FS_POSIX_ACL is not set |
621 | # CONFIG_XFS_FS is not set | 634 | # CONFIG_XFS_FS is not set |
622 | # CONFIG_GFS2_FS is not set | ||
623 | # CONFIG_OCFS2_FS is not set | 635 | # CONFIG_OCFS2_FS is not set |
624 | CONFIG_DNOTIFY=y | 636 | CONFIG_DNOTIFY=y |
625 | CONFIG_INOTIFY=y | 637 | CONFIG_INOTIFY=y |
@@ -676,7 +688,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
676 | CONFIG_NFS_FS=y | 688 | CONFIG_NFS_FS=y |
677 | # CONFIG_NFS_V3 is not set | 689 | # CONFIG_NFS_V3 is not set |
678 | # CONFIG_NFS_V4 is not set | 690 | # CONFIG_NFS_V4 is not set |
679 | # CONFIG_NFS_DIRECTIO is not set | ||
680 | # CONFIG_NFSD is not set | 691 | # CONFIG_NFSD is not set |
681 | CONFIG_ROOT_NFS=y | 692 | CONFIG_ROOT_NFS=y |
682 | CONFIG_LOCKD=y | 693 | CONFIG_LOCKD=y |
@@ -715,6 +726,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
715 | # Library routines | 726 | # Library routines |
716 | # | 727 | # |
717 | CONFIG_BITREVERSE=y | 728 | CONFIG_BITREVERSE=y |
729 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
718 | # CONFIG_CRC_CCITT is not set | 730 | # CONFIG_CRC_CCITT is not set |
719 | # CONFIG_CRC16 is not set | 731 | # CONFIG_CRC16 is not set |
720 | # CONFIG_CRC_ITU_T is not set | 732 | # CONFIG_CRC_ITU_T is not set |
@@ -725,6 +737,7 @@ CONFIG_PLIST=y | |||
725 | CONFIG_HAS_IOMEM=y | 737 | CONFIG_HAS_IOMEM=y |
726 | CONFIG_HAS_IOPORT=y | 738 | CONFIG_HAS_IOPORT=y |
727 | CONFIG_HAS_DMA=y | 739 | CONFIG_HAS_DMA=y |
740 | CONFIG_HAVE_LMB=y | ||
728 | 741 | ||
729 | # | 742 | # |
730 | # Kernel hacking | 743 | # Kernel hacking |
@@ -732,6 +745,7 @@ CONFIG_HAS_DMA=y | |||
732 | # CONFIG_PRINTK_TIME is not set | 745 | # CONFIG_PRINTK_TIME is not set |
733 | CONFIG_ENABLE_WARN_DEPRECATED=y | 746 | CONFIG_ENABLE_WARN_DEPRECATED=y |
734 | CONFIG_ENABLE_MUST_CHECK=y | 747 | CONFIG_ENABLE_MUST_CHECK=y |
748 | CONFIG_FRAME_WARN=1024 | ||
735 | CONFIG_MAGIC_SYSRQ=y | 749 | CONFIG_MAGIC_SYSRQ=y |
736 | # CONFIG_UNUSED_SYMBOLS is not set | 750 | # CONFIG_UNUSED_SYMBOLS is not set |
737 | # CONFIG_DEBUG_FS is not set | 751 | # CONFIG_DEBUG_FS is not set |
@@ -742,6 +756,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
742 | CONFIG_SCHED_DEBUG=y | 756 | CONFIG_SCHED_DEBUG=y |
743 | # CONFIG_SCHEDSTATS is not set | 757 | # CONFIG_SCHEDSTATS is not set |
744 | # CONFIG_TIMER_STATS is not set | 758 | # CONFIG_TIMER_STATS is not set |
759 | # CONFIG_DEBUG_OBJECTS is not set | ||
745 | # CONFIG_DEBUG_SLAB is not set | 760 | # CONFIG_DEBUG_SLAB is not set |
746 | # CONFIG_DEBUG_RT_MUTEXES is not set | 761 | # CONFIG_DEBUG_RT_MUTEXES is not set |
747 | # CONFIG_RT_MUTEX_TESTER is not set | 762 | # CONFIG_RT_MUTEX_TESTER is not set |
@@ -753,6 +768,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
753 | # CONFIG_DEBUG_BUGVERBOSE is not set | 768 | # CONFIG_DEBUG_BUGVERBOSE is not set |
754 | # CONFIG_DEBUG_INFO is not set | 769 | # CONFIG_DEBUG_INFO is not set |
755 | # CONFIG_DEBUG_VM is not set | 770 | # CONFIG_DEBUG_VM is not set |
771 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
756 | # CONFIG_DEBUG_LIST is not set | 772 | # CONFIG_DEBUG_LIST is not set |
757 | # CONFIG_DEBUG_SG is not set | 773 | # CONFIG_DEBUG_SG is not set |
758 | # CONFIG_BOOT_PRINTK_DELAY is not set | 774 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -763,6 +779,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
763 | # CONFIG_DEBUG_STACK_USAGE is not set | 779 | # CONFIG_DEBUG_STACK_USAGE is not set |
764 | # CONFIG_DEBUG_PAGEALLOC is not set | 780 | # CONFIG_DEBUG_PAGEALLOC is not set |
765 | # CONFIG_DEBUGGER is not set | 781 | # CONFIG_DEBUGGER is not set |
782 | # CONFIG_IRQSTACKS is not set | ||
766 | # CONFIG_BDI_SWITCH is not set | 783 | # CONFIG_BDI_SWITCH is not set |
767 | CONFIG_PPC_EARLY_DEBUG=y | 784 | CONFIG_PPC_EARLY_DEBUG=y |
768 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 785 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
@@ -784,47 +801,77 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
784 | # CONFIG_SECURITY is not set | 801 | # CONFIG_SECURITY is not set |
785 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 802 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
786 | CONFIG_CRYPTO=y | 803 | CONFIG_CRYPTO=y |
787 | # CONFIG_CRYPTO_SEQIV is not set | 804 | |
805 | # | ||
806 | # Crypto core or helper | ||
807 | # | ||
788 | # CONFIG_CRYPTO_MANAGER is not set | 808 | # CONFIG_CRYPTO_MANAGER is not set |
809 | # CONFIG_CRYPTO_GF128MUL is not set | ||
810 | # CONFIG_CRYPTO_NULL is not set | ||
811 | # CONFIG_CRYPTO_CRYPTD is not set | ||
812 | # CONFIG_CRYPTO_AUTHENC is not set | ||
813 | |||
814 | # | ||
815 | # Authenticated Encryption with Associated Data | ||
816 | # | ||
817 | # CONFIG_CRYPTO_CCM is not set | ||
818 | # CONFIG_CRYPTO_GCM is not set | ||
819 | # CONFIG_CRYPTO_SEQIV is not set | ||
820 | |||
821 | # | ||
822 | # Block modes | ||
823 | # | ||
824 | # CONFIG_CRYPTO_CBC is not set | ||
825 | # CONFIG_CRYPTO_CTR is not set | ||
826 | # CONFIG_CRYPTO_CTS is not set | ||
827 | # CONFIG_CRYPTO_ECB is not set | ||
828 | # CONFIG_CRYPTO_LRW is not set | ||
829 | # CONFIG_CRYPTO_PCBC is not set | ||
830 | # CONFIG_CRYPTO_XTS is not set | ||
831 | |||
832 | # | ||
833 | # Hash modes | ||
834 | # | ||
789 | # CONFIG_CRYPTO_HMAC is not set | 835 | # CONFIG_CRYPTO_HMAC is not set |
790 | # CONFIG_CRYPTO_XCBC is not set | 836 | # CONFIG_CRYPTO_XCBC is not set |
791 | # CONFIG_CRYPTO_NULL is not set | 837 | |
838 | # | ||
839 | # Digest | ||
840 | # | ||
841 | # CONFIG_CRYPTO_CRC32C is not set | ||
792 | # CONFIG_CRYPTO_MD4 is not set | 842 | # CONFIG_CRYPTO_MD4 is not set |
793 | # CONFIG_CRYPTO_MD5 is not set | 843 | # CONFIG_CRYPTO_MD5 is not set |
844 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
794 | # CONFIG_CRYPTO_SHA1 is not set | 845 | # CONFIG_CRYPTO_SHA1 is not set |
795 | # CONFIG_CRYPTO_SHA256 is not set | 846 | # CONFIG_CRYPTO_SHA256 is not set |
796 | # CONFIG_CRYPTO_SHA512 is not set | 847 | # CONFIG_CRYPTO_SHA512 is not set |
797 | # CONFIG_CRYPTO_WP512 is not set | ||
798 | # CONFIG_CRYPTO_TGR192 is not set | 848 | # CONFIG_CRYPTO_TGR192 is not set |
799 | # CONFIG_CRYPTO_GF128MUL is not set | 849 | # CONFIG_CRYPTO_WP512 is not set |
800 | # CONFIG_CRYPTO_ECB is not set | 850 | |
801 | # CONFIG_CRYPTO_CBC is not set | 851 | # |
802 | # CONFIG_CRYPTO_PCBC is not set | 852 | # Ciphers |
803 | # CONFIG_CRYPTO_LRW is not set | 853 | # |
804 | # CONFIG_CRYPTO_XTS is not set | ||
805 | # CONFIG_CRYPTO_CTR is not set | ||
806 | # CONFIG_CRYPTO_GCM is not set | ||
807 | # CONFIG_CRYPTO_CCM is not set | ||
808 | # CONFIG_CRYPTO_CRYPTD is not set | ||
809 | # CONFIG_CRYPTO_DES is not set | ||
810 | # CONFIG_CRYPTO_FCRYPT is not set | ||
811 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
812 | # CONFIG_CRYPTO_TWOFISH is not set | ||
813 | # CONFIG_CRYPTO_SERPENT is not set | ||
814 | # CONFIG_CRYPTO_AES is not set | 854 | # CONFIG_CRYPTO_AES is not set |
855 | # CONFIG_CRYPTO_ANUBIS is not set | ||
856 | # CONFIG_CRYPTO_ARC4 is not set | ||
857 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
858 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
815 | # CONFIG_CRYPTO_CAST5 is not set | 859 | # CONFIG_CRYPTO_CAST5 is not set |
816 | # CONFIG_CRYPTO_CAST6 is not set | 860 | # CONFIG_CRYPTO_CAST6 is not set |
817 | # CONFIG_CRYPTO_TEA is not set | 861 | # CONFIG_CRYPTO_DES is not set |
818 | # CONFIG_CRYPTO_ARC4 is not set | 862 | # CONFIG_CRYPTO_FCRYPT is not set |
819 | # CONFIG_CRYPTO_KHAZAD is not set | 863 | # CONFIG_CRYPTO_KHAZAD is not set |
820 | # CONFIG_CRYPTO_ANUBIS is not set | ||
821 | # CONFIG_CRYPTO_SEED is not set | ||
822 | # CONFIG_CRYPTO_SALSA20 is not set | 864 | # CONFIG_CRYPTO_SALSA20 is not set |
865 | # CONFIG_CRYPTO_SEED is not set | ||
866 | # CONFIG_CRYPTO_SERPENT is not set | ||
867 | # CONFIG_CRYPTO_TEA is not set | ||
868 | # CONFIG_CRYPTO_TWOFISH is not set | ||
869 | |||
870 | # | ||
871 | # Compression | ||
872 | # | ||
823 | # CONFIG_CRYPTO_DEFLATE is not set | 873 | # CONFIG_CRYPTO_DEFLATE is not set |
824 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
825 | # CONFIG_CRYPTO_CRC32C is not set | ||
826 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
827 | # CONFIG_CRYPTO_AUTHENC is not set | ||
828 | # CONFIG_CRYPTO_LZO is not set | 874 | # CONFIG_CRYPTO_LZO is not set |
829 | CONFIG_CRYPTO_HW=y | 875 | CONFIG_CRYPTO_HW=y |
830 | # CONFIG_PPC_CLOCK is not set | 876 | # CONFIG_PPC_CLOCK is not set |
877 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index 1d303c49bb0c..7804ca1ecc94 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:42 2008 | 4 | # Mon Jun 9 08:52:38 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -114,12 +117,14 @@ CONFIG_HAVE_OPROFILE=y | |||
114 | # CONFIG_KPROBES is not set | 117 | # CONFIG_KPROBES is not set |
115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
120 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
118 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
121 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
122 | CONFIG_MODULES=y | 126 | CONFIG_MODULES=y |
127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
123 | # CONFIG_MODULE_UNLOAD is not set | 128 | # CONFIG_MODULE_UNLOAD is not set |
124 | CONFIG_MODVERSIONS=y | 129 | CONFIG_MODVERSIONS=y |
125 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 130 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
@@ -158,6 +163,7 @@ CONFIG_MPC85xx=y | |||
158 | # CONFIG_MPC85xx_CDS is not set | 163 | # CONFIG_MPC85xx_CDS is not set |
159 | # CONFIG_MPC85xx_MDS is not set | 164 | # CONFIG_MPC85xx_MDS is not set |
160 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
166 | # CONFIG_KSI8560 is not set | ||
161 | CONFIG_STX_GP3=y | 167 | CONFIG_STX_GP3=y |
162 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
163 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
@@ -215,11 +221,13 @@ CONFIG_FLATMEM=y | |||
215 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
216 | # CONFIG_SPARSEMEM_STATIC is not set | 222 | # CONFIG_SPARSEMEM_STATIC is not set |
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
219 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
220 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
221 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
222 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
230 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
223 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
224 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
225 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
@@ -243,6 +251,7 @@ CONFIG_PCI_LEGACY=y | |||
243 | # CONFIG_PCI_DEBUG is not set | 251 | # CONFIG_PCI_DEBUG is not set |
244 | # CONFIG_PCCARD is not set | 252 | # CONFIG_PCCARD is not set |
245 | # CONFIG_HOTPLUG_PCI is not set | 253 | # CONFIG_HOTPLUG_PCI is not set |
254 | # CONFIG_HAS_RAPIDIO is not set | ||
246 | 255 | ||
247 | # | 256 | # |
248 | # Advanced setup | 257 | # Advanced setup |
@@ -252,11 +261,12 @@ CONFIG_PCI_LEGACY=y | |||
252 | # | 261 | # |
253 | # Default settings for advanced configuration options are used | 262 | # Default settings for advanced configuration options are used |
254 | # | 263 | # |
255 | CONFIG_HIGHMEM_START=0xfe000000 | ||
256 | CONFIG_LOWMEM_SIZE=0x30000000 | 264 | CONFIG_LOWMEM_SIZE=0x30000000 |
265 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
257 | CONFIG_KERNEL_START=0xc0000000 | 266 | CONFIG_KERNEL_START=0xc0000000 |
267 | CONFIG_PHYSICAL_START=0x00000000 | ||
268 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
258 | CONFIG_TASK_SIZE=0xc0000000 | 269 | CONFIG_TASK_SIZE=0xc0000000 |
259 | CONFIG_BOOT_LOAD=0x00800000 | ||
260 | 270 | ||
261 | # | 271 | # |
262 | # Networking | 272 | # Networking |
@@ -304,8 +314,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
304 | # CONFIG_TCP_MD5SIG is not set | 314 | # CONFIG_TCP_MD5SIG is not set |
305 | # CONFIG_IP_VS is not set | 315 | # CONFIG_IP_VS is not set |
306 | # CONFIG_IPV6 is not set | 316 | # CONFIG_IPV6 is not set |
307 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
308 | # CONFIG_INET6_TUNNEL is not set | ||
309 | # CONFIG_NETWORK_SECMARK is not set | 317 | # CONFIG_NETWORK_SECMARK is not set |
310 | CONFIG_NETFILTER=y | 318 | CONFIG_NETFILTER=y |
311 | # CONFIG_NETFILTER_DEBUG is not set | 319 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -418,6 +426,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
418 | # CONFIG_CONNECTOR is not set | 426 | # CONFIG_CONNECTOR is not set |
419 | # CONFIG_MTD is not set | 427 | # CONFIG_MTD is not set |
420 | CONFIG_OF_DEVICE=y | 428 | CONFIG_OF_DEVICE=y |
429 | CONFIG_OF_I2C=m | ||
421 | CONFIG_PARPORT=m | 430 | CONFIG_PARPORT=m |
422 | CONFIG_PARPORT_PC=m | 431 | CONFIG_PARPORT_PC=m |
423 | # CONFIG_PARPORT_PC_FIFO is not set | 432 | # CONFIG_PARPORT_PC_FIFO is not set |
@@ -505,7 +514,7 @@ CONFIG_IDE_GENERIC=y | |||
505 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 514 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
506 | # CONFIG_BLK_DEV_TC86C001 is not set | 515 | # CONFIG_BLK_DEV_TC86C001 is not set |
507 | # CONFIG_BLK_DEV_IDEDMA is not set | 516 | # CONFIG_BLK_DEV_IDEDMA is not set |
508 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 517 | # CONFIG_BLK_DEV_HD_ONLY is not set |
509 | # CONFIG_BLK_DEV_HD is not set | 518 | # CONFIG_BLK_DEV_HD is not set |
510 | 519 | ||
511 | # | 520 | # |
@@ -653,7 +662,6 @@ CONFIG_NETDEV_1000=y | |||
653 | # CONFIG_SIS190 is not set | 662 | # CONFIG_SIS190 is not set |
654 | # CONFIG_SKGE is not set | 663 | # CONFIG_SKGE is not set |
655 | # CONFIG_SKY2 is not set | 664 | # CONFIG_SKY2 is not set |
656 | # CONFIG_SK98LIN is not set | ||
657 | # CONFIG_VIA_VELOCITY is not set | 665 | # CONFIG_VIA_VELOCITY is not set |
658 | # CONFIG_TIGON3 is not set | 666 | # CONFIG_TIGON3 is not set |
659 | # CONFIG_BNX2 is not set | 667 | # CONFIG_BNX2 is not set |
@@ -673,6 +681,7 @@ CONFIG_NETDEV_10000=y | |||
673 | # CONFIG_MLX4_CORE is not set | 681 | # CONFIG_MLX4_CORE is not set |
674 | # CONFIG_TEHUTI is not set | 682 | # CONFIG_TEHUTI is not set |
675 | # CONFIG_BNX2X is not set | 683 | # CONFIG_BNX2X is not set |
684 | # CONFIG_SFC is not set | ||
676 | # CONFIG_TR is not set | 685 | # CONFIG_TR is not set |
677 | 686 | ||
678 | # | 687 | # |
@@ -680,6 +689,7 @@ CONFIG_NETDEV_10000=y | |||
680 | # | 689 | # |
681 | # CONFIG_WLAN_PRE80211 is not set | 690 | # CONFIG_WLAN_PRE80211 is not set |
682 | # CONFIG_WLAN_80211 is not set | 691 | # CONFIG_WLAN_80211 is not set |
692 | # CONFIG_IWLWIFI_LEDS is not set | ||
683 | # CONFIG_WAN is not set | 693 | # CONFIG_WAN is not set |
684 | # CONFIG_FDDI is not set | 694 | # CONFIG_FDDI is not set |
685 | # CONFIG_HIPPI is not set | 695 | # CONFIG_HIPPI is not set |
@@ -753,6 +763,7 @@ CONFIG_SERIO_LIBPS2=y | |||
753 | # Character devices | 763 | # Character devices |
754 | # | 764 | # |
755 | # CONFIG_VT is not set | 765 | # CONFIG_VT is not set |
766 | CONFIG_DEVKMEM=y | ||
756 | # CONFIG_SERIAL_NONSTANDARD is not set | 767 | # CONFIG_SERIAL_NONSTANDARD is not set |
757 | # CONFIG_NOZOMI is not set | 768 | # CONFIG_NOZOMI is not set |
758 | 769 | ||
@@ -796,13 +807,6 @@ CONFIG_I2C_BOARDINFO=y | |||
796 | CONFIG_I2C_CHARDEV=m | 807 | CONFIG_I2C_CHARDEV=m |
797 | 808 | ||
798 | # | 809 | # |
799 | # I2C Algorithms | ||
800 | # | ||
801 | CONFIG_I2C_ALGOBIT=m | ||
802 | # CONFIG_I2C_ALGOPCF is not set | ||
803 | # CONFIG_I2C_ALGOPCA is not set | ||
804 | |||
805 | # | ||
806 | # I2C Hardware Bus support | 810 | # I2C Hardware Bus support |
807 | # | 811 | # |
808 | # CONFIG_I2C_ALI1535 is not set | 812 | # CONFIG_I2C_ALI1535 is not set |
@@ -829,6 +833,7 @@ CONFIG_I2C_ALGOBIT=m | |||
829 | # CONFIG_I2C_VIA is not set | 833 | # CONFIG_I2C_VIA is not set |
830 | # CONFIG_I2C_VIAPRO is not set | 834 | # CONFIG_I2C_VIAPRO is not set |
831 | # CONFIG_I2C_VOODOO3 is not set | 835 | # CONFIG_I2C_VOODOO3 is not set |
836 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
832 | 837 | ||
833 | # | 838 | # |
834 | # Miscellaneous I2C Chip support | 839 | # Miscellaneous I2C Chip support |
@@ -838,19 +843,13 @@ CONFIG_I2C_ALGOBIT=m | |||
838 | # CONFIG_SENSORS_PCF8574 is not set | 843 | # CONFIG_SENSORS_PCF8574 is not set |
839 | # CONFIG_PCF8575 is not set | 844 | # CONFIG_PCF8575 is not set |
840 | # CONFIG_SENSORS_PCF8591 is not set | 845 | # CONFIG_SENSORS_PCF8591 is not set |
841 | # CONFIG_TPS65010 is not set | ||
842 | # CONFIG_SENSORS_MAX6875 is not set | 846 | # CONFIG_SENSORS_MAX6875 is not set |
843 | # CONFIG_SENSORS_TSL2550 is not set | 847 | # CONFIG_SENSORS_TSL2550 is not set |
844 | # CONFIG_I2C_DEBUG_CORE is not set | 848 | # CONFIG_I2C_DEBUG_CORE is not set |
845 | # CONFIG_I2C_DEBUG_ALGO is not set | 849 | # CONFIG_I2C_DEBUG_ALGO is not set |
846 | # CONFIG_I2C_DEBUG_BUS is not set | 850 | # CONFIG_I2C_DEBUG_BUS is not set |
847 | # CONFIG_I2C_DEBUG_CHIP is not set | 851 | # CONFIG_I2C_DEBUG_CHIP is not set |
848 | |||
849 | # | ||
850 | # SPI support | ||
851 | # | ||
852 | # CONFIG_SPI is not set | 852 | # CONFIG_SPI is not set |
853 | # CONFIG_SPI_MASTER is not set | ||
854 | # CONFIG_W1 is not set | 853 | # CONFIG_W1 is not set |
855 | # CONFIG_POWER_SUPPLY is not set | 854 | # CONFIG_POWER_SUPPLY is not set |
856 | CONFIG_HWMON=y | 855 | CONFIG_HWMON=y |
@@ -920,12 +919,22 @@ CONFIG_SSB_POSSIBLE=y | |||
920 | # Multifunction device drivers | 919 | # Multifunction device drivers |
921 | # | 920 | # |
922 | # CONFIG_MFD_SM501 is not set | 921 | # CONFIG_MFD_SM501 is not set |
922 | # CONFIG_HTC_PASIC3 is not set | ||
923 | 923 | ||
924 | # | 924 | # |
925 | # Multimedia devices | 925 | # Multimedia devices |
926 | # | 926 | # |
927 | |||
928 | # | ||
929 | # Multimedia core support | ||
930 | # | ||
927 | # CONFIG_VIDEO_DEV is not set | 931 | # CONFIG_VIDEO_DEV is not set |
928 | # CONFIG_DVB_CORE is not set | 932 | # CONFIG_DVB_CORE is not set |
933 | # CONFIG_VIDEO_MEDIA is not set | ||
934 | |||
935 | # | ||
936 | # Multimedia drivers | ||
937 | # | ||
929 | CONFIG_DAB=y | 938 | CONFIG_DAB=y |
930 | 939 | ||
931 | # | 940 | # |
@@ -973,6 +982,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
973 | CONFIG_USB_ARCH_HAS_OHCI=y | 982 | CONFIG_USB_ARCH_HAS_OHCI=y |
974 | CONFIG_USB_ARCH_HAS_EHCI=y | 983 | CONFIG_USB_ARCH_HAS_EHCI=y |
975 | # CONFIG_USB is not set | 984 | # CONFIG_USB is not set |
985 | # CONFIG_USB_OTG_WHITELIST is not set | ||
986 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
976 | 987 | ||
977 | # | 988 | # |
978 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 989 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -981,15 +992,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
981 | # CONFIG_MMC is not set | 992 | # CONFIG_MMC is not set |
982 | # CONFIG_MEMSTICK is not set | 993 | # CONFIG_MEMSTICK is not set |
983 | # CONFIG_NEW_LEDS is not set | 994 | # CONFIG_NEW_LEDS is not set |
995 | # CONFIG_ACCESSIBILITY is not set | ||
984 | # CONFIG_INFINIBAND is not set | 996 | # CONFIG_INFINIBAND is not set |
985 | # CONFIG_EDAC is not set | 997 | # CONFIG_EDAC is not set |
986 | # CONFIG_RTC_CLASS is not set | 998 | # CONFIG_RTC_CLASS is not set |
987 | # CONFIG_DMADEVICES is not set | 999 | # CONFIG_DMADEVICES is not set |
988 | # CONFIG_AUXDISPLAY is not set | 1000 | # CONFIG_AUXDISPLAY is not set |
989 | |||
990 | # | ||
991 | # Userspace I/O | ||
992 | # | ||
993 | # CONFIG_UIO is not set | 1001 | # CONFIG_UIO is not set |
994 | 1002 | ||
995 | # | 1003 | # |
@@ -1009,7 +1017,6 @@ CONFIG_FS_MBCACHE=y | |||
1009 | # CONFIG_JFS_FS is not set | 1017 | # CONFIG_JFS_FS is not set |
1010 | # CONFIG_FS_POSIX_ACL is not set | 1018 | # CONFIG_FS_POSIX_ACL is not set |
1011 | # CONFIG_XFS_FS is not set | 1019 | # CONFIG_XFS_FS is not set |
1012 | # CONFIG_GFS2_FS is not set | ||
1013 | # CONFIG_OCFS2_FS is not set | 1020 | # CONFIG_OCFS2_FS is not set |
1014 | CONFIG_DNOTIFY=y | 1021 | CONFIG_DNOTIFY=y |
1015 | CONFIG_INOTIFY=y | 1022 | CONFIG_INOTIFY=y |
@@ -1073,7 +1080,6 @@ CONFIG_NFS_FS=y | |||
1073 | CONFIG_NFS_V3=y | 1080 | CONFIG_NFS_V3=y |
1074 | # CONFIG_NFS_V3_ACL is not set | 1081 | # CONFIG_NFS_V3_ACL is not set |
1075 | # CONFIG_NFS_V4 is not set | 1082 | # CONFIG_NFS_V4 is not set |
1076 | # CONFIG_NFS_DIRECTIO is not set | ||
1077 | # CONFIG_NFSD is not set | 1083 | # CONFIG_NFSD is not set |
1078 | CONFIG_ROOT_NFS=y | 1084 | CONFIG_ROOT_NFS=y |
1079 | CONFIG_LOCKD=y | 1085 | CONFIG_LOCKD=y |
@@ -1141,9 +1147,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1141 | # Library routines | 1147 | # Library routines |
1142 | # | 1148 | # |
1143 | CONFIG_BITREVERSE=y | 1149 | CONFIG_BITREVERSE=y |
1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1144 | CONFIG_CRC_CCITT=y | 1151 | CONFIG_CRC_CCITT=y |
1145 | # CONFIG_CRC16 is not set | 1152 | # CONFIG_CRC16 is not set |
1146 | # CONFIG_CRC_ITU_T is not set | 1153 | CONFIG_CRC_ITU_T=m |
1147 | CONFIG_CRC32=y | 1154 | CONFIG_CRC32=y |
1148 | # CONFIG_CRC7 is not set | 1155 | # CONFIG_CRC7 is not set |
1149 | # CONFIG_LIBCRC32C is not set | 1156 | # CONFIG_LIBCRC32C is not set |
@@ -1152,6 +1159,7 @@ CONFIG_PLIST=y | |||
1152 | CONFIG_HAS_IOMEM=y | 1159 | CONFIG_HAS_IOMEM=y |
1153 | CONFIG_HAS_IOPORT=y | 1160 | CONFIG_HAS_IOPORT=y |
1154 | CONFIG_HAS_DMA=y | 1161 | CONFIG_HAS_DMA=y |
1162 | CONFIG_HAVE_LMB=y | ||
1155 | 1163 | ||
1156 | # | 1164 | # |
1157 | # Kernel hacking | 1165 | # Kernel hacking |
@@ -1159,6 +1167,7 @@ CONFIG_HAS_DMA=y | |||
1159 | # CONFIG_PRINTK_TIME is not set | 1167 | # CONFIG_PRINTK_TIME is not set |
1160 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1168 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1161 | CONFIG_ENABLE_MUST_CHECK=y | 1169 | CONFIG_ENABLE_MUST_CHECK=y |
1170 | CONFIG_FRAME_WARN=1024 | ||
1162 | # CONFIG_MAGIC_SYSRQ is not set | 1171 | # CONFIG_MAGIC_SYSRQ is not set |
1163 | # CONFIG_UNUSED_SYMBOLS is not set | 1172 | # CONFIG_UNUSED_SYMBOLS is not set |
1164 | # CONFIG_DEBUG_FS is not set | 1173 | # CONFIG_DEBUG_FS is not set |
@@ -1169,6 +1178,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1169 | CONFIG_SCHED_DEBUG=y | 1178 | CONFIG_SCHED_DEBUG=y |
1170 | # CONFIG_SCHEDSTATS is not set | 1179 | # CONFIG_SCHEDSTATS is not set |
1171 | # CONFIG_TIMER_STATS is not set | 1180 | # CONFIG_TIMER_STATS is not set |
1181 | # CONFIG_DEBUG_OBJECTS is not set | ||
1172 | # CONFIG_SLUB_DEBUG_ON is not set | 1182 | # CONFIG_SLUB_DEBUG_ON is not set |
1173 | # CONFIG_SLUB_STATS is not set | 1183 | # CONFIG_SLUB_STATS is not set |
1174 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1184 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1182,6 +1192,7 @@ CONFIG_SCHED_DEBUG=y | |||
1182 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1192 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1183 | # CONFIG_DEBUG_INFO is not set | 1193 | # CONFIG_DEBUG_INFO is not set |
1184 | # CONFIG_DEBUG_VM is not set | 1194 | # CONFIG_DEBUG_VM is not set |
1195 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1185 | # CONFIG_DEBUG_LIST is not set | 1196 | # CONFIG_DEBUG_LIST is not set |
1186 | # CONFIG_DEBUG_SG is not set | 1197 | # CONFIG_DEBUG_SG is not set |
1187 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1198 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1194,6 +1205,7 @@ CONFIG_SCHED_DEBUG=y | |||
1194 | # CONFIG_DEBUG_PAGEALLOC is not set | 1205 | # CONFIG_DEBUG_PAGEALLOC is not set |
1195 | # CONFIG_DEBUGGER is not set | 1206 | # CONFIG_DEBUGGER is not set |
1196 | # CONFIG_KGDB_CONSOLE is not set | 1207 | # CONFIG_KGDB_CONSOLE is not set |
1208 | # CONFIG_IRQSTACKS is not set | ||
1197 | CONFIG_BDI_SWITCH=y | 1209 | CONFIG_BDI_SWITCH=y |
1198 | # CONFIG_PPC_EARLY_DEBUG is not set | 1210 | # CONFIG_PPC_EARLY_DEBUG is not set |
1199 | 1211 | ||
@@ -1204,50 +1216,80 @@ CONFIG_BDI_SWITCH=y | |||
1204 | # CONFIG_SECURITY is not set | 1216 | # CONFIG_SECURITY is not set |
1205 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1217 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1206 | CONFIG_CRYPTO=y | 1218 | CONFIG_CRYPTO=y |
1207 | # CONFIG_CRYPTO_SEQIV is not set | 1219 | |
1220 | # | ||
1221 | # Crypto core or helper | ||
1222 | # | ||
1208 | # CONFIG_CRYPTO_MANAGER is not set | 1223 | # CONFIG_CRYPTO_MANAGER is not set |
1224 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1225 | # CONFIG_CRYPTO_NULL is not set | ||
1226 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1227 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1228 | # CONFIG_CRYPTO_TEST is not set | ||
1229 | |||
1230 | # | ||
1231 | # Authenticated Encryption with Associated Data | ||
1232 | # | ||
1233 | # CONFIG_CRYPTO_CCM is not set | ||
1234 | # CONFIG_CRYPTO_GCM is not set | ||
1235 | # CONFIG_CRYPTO_SEQIV is not set | ||
1236 | |||
1237 | # | ||
1238 | # Block modes | ||
1239 | # | ||
1240 | # CONFIG_CRYPTO_CBC is not set | ||
1241 | # CONFIG_CRYPTO_CTR is not set | ||
1242 | # CONFIG_CRYPTO_CTS is not set | ||
1243 | # CONFIG_CRYPTO_ECB is not set | ||
1244 | # CONFIG_CRYPTO_LRW is not set | ||
1245 | # CONFIG_CRYPTO_PCBC is not set | ||
1246 | # CONFIG_CRYPTO_XTS is not set | ||
1247 | |||
1248 | # | ||
1249 | # Hash modes | ||
1250 | # | ||
1209 | # CONFIG_CRYPTO_HMAC is not set | 1251 | # CONFIG_CRYPTO_HMAC is not set |
1210 | # CONFIG_CRYPTO_XCBC is not set | 1252 | # CONFIG_CRYPTO_XCBC is not set |
1211 | # CONFIG_CRYPTO_NULL is not set | 1253 | |
1254 | # | ||
1255 | # Digest | ||
1256 | # | ||
1257 | # CONFIG_CRYPTO_CRC32C is not set | ||
1212 | # CONFIG_CRYPTO_MD4 is not set | 1258 | # CONFIG_CRYPTO_MD4 is not set |
1213 | # CONFIG_CRYPTO_MD5 is not set | 1259 | # CONFIG_CRYPTO_MD5 is not set |
1260 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1214 | # CONFIG_CRYPTO_SHA1 is not set | 1261 | # CONFIG_CRYPTO_SHA1 is not set |
1215 | # CONFIG_CRYPTO_SHA256 is not set | 1262 | # CONFIG_CRYPTO_SHA256 is not set |
1216 | # CONFIG_CRYPTO_SHA512 is not set | 1263 | # CONFIG_CRYPTO_SHA512 is not set |
1217 | # CONFIG_CRYPTO_WP512 is not set | ||
1218 | # CONFIG_CRYPTO_TGR192 is not set | 1264 | # CONFIG_CRYPTO_TGR192 is not set |
1219 | # CONFIG_CRYPTO_GF128MUL is not set | 1265 | # CONFIG_CRYPTO_WP512 is not set |
1220 | # CONFIG_CRYPTO_ECB is not set | 1266 | |
1221 | # CONFIG_CRYPTO_CBC is not set | 1267 | # |
1222 | # CONFIG_CRYPTO_PCBC is not set | 1268 | # Ciphers |
1223 | # CONFIG_CRYPTO_LRW is not set | 1269 | # |
1224 | # CONFIG_CRYPTO_XTS is not set | ||
1225 | # CONFIG_CRYPTO_CTR is not set | ||
1226 | # CONFIG_CRYPTO_GCM is not set | ||
1227 | # CONFIG_CRYPTO_CCM is not set | ||
1228 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1229 | # CONFIG_CRYPTO_DES is not set | ||
1230 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1231 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1232 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1233 | # CONFIG_CRYPTO_SERPENT is not set | ||
1234 | # CONFIG_CRYPTO_AES is not set | 1270 | # CONFIG_CRYPTO_AES is not set |
1271 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1272 | # CONFIG_CRYPTO_ARC4 is not set | ||
1273 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1274 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1235 | # CONFIG_CRYPTO_CAST5 is not set | 1275 | # CONFIG_CRYPTO_CAST5 is not set |
1236 | # CONFIG_CRYPTO_CAST6 is not set | 1276 | # CONFIG_CRYPTO_CAST6 is not set |
1237 | # CONFIG_CRYPTO_TEA is not set | 1277 | # CONFIG_CRYPTO_DES is not set |
1238 | # CONFIG_CRYPTO_ARC4 is not set | 1278 | # CONFIG_CRYPTO_FCRYPT is not set |
1239 | # CONFIG_CRYPTO_KHAZAD is not set | 1279 | # CONFIG_CRYPTO_KHAZAD is not set |
1240 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1241 | # CONFIG_CRYPTO_SEED is not set | ||
1242 | # CONFIG_CRYPTO_SALSA20 is not set | 1280 | # CONFIG_CRYPTO_SALSA20 is not set |
1281 | # CONFIG_CRYPTO_SEED is not set | ||
1282 | # CONFIG_CRYPTO_SERPENT is not set | ||
1283 | # CONFIG_CRYPTO_TEA is not set | ||
1284 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1285 | |||
1286 | # | ||
1287 | # Compression | ||
1288 | # | ||
1243 | # CONFIG_CRYPTO_DEFLATE is not set | 1289 | # CONFIG_CRYPTO_DEFLATE is not set |
1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1245 | # CONFIG_CRYPTO_CRC32C is not set | ||
1246 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1247 | # CONFIG_CRYPTO_TEST is not set | ||
1248 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1249 | # CONFIG_CRYPTO_LZO is not set | 1290 | # CONFIG_CRYPTO_LZO is not set |
1250 | CONFIG_CRYPTO_HW=y | 1291 | CONFIG_CRYPTO_HW=y |
1251 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1292 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1252 | # CONFIG_PPC_CLOCK is not set | 1293 | # CONFIG_PPC_CLOCK is not set |
1253 | CONFIG_PPC_LIB_RHEAP=y | 1294 | CONFIG_PPC_LIB_RHEAP=y |
1295 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index d39ee3b35bfc..e0b5559e84aa 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:43 2008 | 4 | # Mon Jun 9 08:52:39 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
@@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
@@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | ||
154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
155 | CONFIG_TQM8540=y | 160 | CONFIG_TQM8540=y |
156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
@@ -171,7 +176,6 @@ CONFIG_MPIC=y | |||
171 | # CONFIG_GENERIC_IOMAP is not set | 176 | # CONFIG_GENERIC_IOMAP is not set |
172 | # CONFIG_CPU_FREQ is not set | 177 | # CONFIG_CPU_FREQ is not set |
173 | # CONFIG_CPM2 is not set | 178 | # CONFIG_CPM2 is not set |
174 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
175 | # CONFIG_FSL_ULI1575 is not set | 179 | # CONFIG_FSL_ULI1575 is not set |
176 | 180 | ||
177 | # | 181 | # |
@@ -208,11 +212,13 @@ CONFIG_FLATMEM=y | |||
208 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
209 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
212 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
213 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
214 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
215 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
221 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
216 | # CONFIG_PROC_DEVICETREE is not set | 222 | # CONFIG_PROC_DEVICETREE is not set |
217 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
218 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
@@ -233,6 +239,7 @@ CONFIG_PCI_SYSCALL=y | |||
233 | CONFIG_ARCH_SUPPORTS_MSI=y | 239 | CONFIG_ARCH_SUPPORTS_MSI=y |
234 | # CONFIG_PCI_MSI is not set | 240 | # CONFIG_PCI_MSI is not set |
235 | CONFIG_PCI_LEGACY=y | 241 | CONFIG_PCI_LEGACY=y |
242 | # CONFIG_HAS_RAPIDIO is not set | ||
236 | 243 | ||
237 | # | 244 | # |
238 | # Advanced setup | 245 | # Advanced setup |
@@ -242,11 +249,12 @@ CONFIG_PCI_LEGACY=y | |||
242 | # | 249 | # |
243 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
244 | # | 251 | # |
245 | CONFIG_HIGHMEM_START=0xfe000000 | ||
246 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
247 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
255 | CONFIG_PHYSICAL_START=0x00000000 | ||
256 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
248 | CONFIG_TASK_SIZE=0xc0000000 | 257 | CONFIG_TASK_SIZE=0xc0000000 |
249 | CONFIG_BOOT_LOAD=0x00800000 | ||
250 | 258 | ||
251 | # | 259 | # |
252 | # Networking | 260 | # Networking |
@@ -294,8 +302,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 302 | CONFIG_DEFAULT_TCP_CONG="cubic" |
295 | # CONFIG_TCP_MD5SIG is not set | 303 | # CONFIG_TCP_MD5SIG is not set |
296 | # CONFIG_IPV6 is not set | 304 | # CONFIG_IPV6 is not set |
297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
298 | # CONFIG_INET6_TUNNEL is not set | ||
299 | # CONFIG_NETWORK_SECMARK is not set | 305 | # CONFIG_NETWORK_SECMARK is not set |
300 | # CONFIG_NETFILTER is not set | 306 | # CONFIG_NETFILTER is not set |
301 | # CONFIG_IP_DCCP is not set | 307 | # CONFIG_IP_DCCP is not set |
@@ -352,6 +358,7 @@ CONFIG_MTD_PARTITIONS=y | |||
352 | # CONFIG_MTD_REDBOOT_PARTS is not set | 358 | # CONFIG_MTD_REDBOOT_PARTS is not set |
353 | CONFIG_MTD_CMDLINE_PARTS=y | 359 | CONFIG_MTD_CMDLINE_PARTS=y |
354 | # CONFIG_MTD_OF_PARTS is not set | 360 | # CONFIG_MTD_OF_PARTS is not set |
361 | # CONFIG_MTD_AR7_PARTS is not set | ||
355 | 362 | ||
356 | # | 363 | # |
357 | # User Modules And Translation Layers | 364 | # User Modules And Translation Layers |
@@ -423,6 +430,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
423 | # | 430 | # |
424 | # CONFIG_MTD_UBI is not set | 431 | # CONFIG_MTD_UBI is not set |
425 | CONFIG_OF_DEVICE=y | 432 | CONFIG_OF_DEVICE=y |
433 | CONFIG_OF_I2C=y | ||
426 | # CONFIG_PARPORT is not set | 434 | # CONFIG_PARPORT is not set |
427 | CONFIG_BLK_DEV=y | 435 | CONFIG_BLK_DEV=y |
428 | # CONFIG_BLK_DEV_FD is not set | 436 | # CONFIG_BLK_DEV_FD is not set |
@@ -506,7 +514,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
506 | CONFIG_BLK_DEV_VIA82CXXX=y | 514 | CONFIG_BLK_DEV_VIA82CXXX=y |
507 | # CONFIG_BLK_DEV_TC86C001 is not set | 515 | # CONFIG_BLK_DEV_TC86C001 is not set |
508 | CONFIG_BLK_DEV_IDEDMA=y | 516 | CONFIG_BLK_DEV_IDEDMA=y |
509 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 517 | # CONFIG_BLK_DEV_HD_ONLY is not set |
510 | # CONFIG_BLK_DEV_HD is not set | 518 | # CONFIG_BLK_DEV_HD is not set |
511 | 519 | ||
512 | # | 520 | # |
@@ -600,7 +608,6 @@ CONFIG_NETDEV_1000=y | |||
600 | # CONFIG_SIS190 is not set | 608 | # CONFIG_SIS190 is not set |
601 | # CONFIG_SKGE is not set | 609 | # CONFIG_SKGE is not set |
602 | # CONFIG_SKY2 is not set | 610 | # CONFIG_SKY2 is not set |
603 | # CONFIG_SK98LIN is not set | ||
604 | # CONFIG_VIA_VELOCITY is not set | 611 | # CONFIG_VIA_VELOCITY is not set |
605 | # CONFIG_TIGON3 is not set | 612 | # CONFIG_TIGON3 is not set |
606 | # CONFIG_BNX2 is not set | 613 | # CONFIG_BNX2 is not set |
@@ -620,6 +627,7 @@ CONFIG_NETDEV_10000=y | |||
620 | # CONFIG_MLX4_CORE is not set | 627 | # CONFIG_MLX4_CORE is not set |
621 | # CONFIG_TEHUTI is not set | 628 | # CONFIG_TEHUTI is not set |
622 | # CONFIG_BNX2X is not set | 629 | # CONFIG_BNX2X is not set |
630 | # CONFIG_SFC is not set | ||
623 | # CONFIG_TR is not set | 631 | # CONFIG_TR is not set |
624 | 632 | ||
625 | # | 633 | # |
@@ -627,6 +635,7 @@ CONFIG_NETDEV_10000=y | |||
627 | # | 635 | # |
628 | # CONFIG_WLAN_PRE80211 is not set | 636 | # CONFIG_WLAN_PRE80211 is not set |
629 | # CONFIG_WLAN_80211 is not set | 637 | # CONFIG_WLAN_80211 is not set |
638 | # CONFIG_IWLWIFI_LEDS is not set | ||
630 | # CONFIG_WAN is not set | 639 | # CONFIG_WAN is not set |
631 | # CONFIG_FDDI is not set | 640 | # CONFIG_FDDI is not set |
632 | # CONFIG_HIPPI is not set | 641 | # CONFIG_HIPPI is not set |
@@ -673,6 +682,7 @@ CONFIG_INPUT=y | |||
673 | # Character devices | 682 | # Character devices |
674 | # | 683 | # |
675 | # CONFIG_VT is not set | 684 | # CONFIG_VT is not set |
685 | CONFIG_DEVKMEM=y | ||
676 | # CONFIG_SERIAL_NONSTANDARD is not set | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
677 | # CONFIG_NOZOMI is not set | 687 | # CONFIG_NOZOMI is not set |
678 | 688 | ||
@@ -713,13 +723,6 @@ CONFIG_I2C_BOARDINFO=y | |||
713 | CONFIG_I2C_CHARDEV=y | 723 | CONFIG_I2C_CHARDEV=y |
714 | 724 | ||
715 | # | 725 | # |
716 | # I2C Algorithms | ||
717 | # | ||
718 | # CONFIG_I2C_ALGOBIT is not set | ||
719 | # CONFIG_I2C_ALGOPCF is not set | ||
720 | # CONFIG_I2C_ALGOPCA is not set | ||
721 | |||
722 | # | ||
723 | # I2C Hardware Bus support | 726 | # I2C Hardware Bus support |
724 | # | 727 | # |
725 | # CONFIG_I2C_ALI1535 is not set | 728 | # CONFIG_I2C_ALI1535 is not set |
@@ -744,6 +747,7 @@ CONFIG_I2C_MPC=y | |||
744 | # CONFIG_I2C_VIA is not set | 747 | # CONFIG_I2C_VIA is not set |
745 | # CONFIG_I2C_VIAPRO is not set | 748 | # CONFIG_I2C_VIAPRO is not set |
746 | # CONFIG_I2C_VOODOO3 is not set | 749 | # CONFIG_I2C_VOODOO3 is not set |
750 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
747 | 751 | ||
748 | # | 752 | # |
749 | # Miscellaneous I2C Chip support | 753 | # Miscellaneous I2C Chip support |
@@ -753,19 +757,13 @@ CONFIG_I2C_MPC=y | |||
753 | # CONFIG_SENSORS_PCF8574 is not set | 757 | # CONFIG_SENSORS_PCF8574 is not set |
754 | # CONFIG_PCF8575 is not set | 758 | # CONFIG_PCF8575 is not set |
755 | # CONFIG_SENSORS_PCF8591 is not set | 759 | # CONFIG_SENSORS_PCF8591 is not set |
756 | # CONFIG_TPS65010 is not set | ||
757 | # CONFIG_SENSORS_MAX6875 is not set | 760 | # CONFIG_SENSORS_MAX6875 is not set |
758 | # CONFIG_SENSORS_TSL2550 is not set | 761 | # CONFIG_SENSORS_TSL2550 is not set |
759 | # CONFIG_I2C_DEBUG_CORE is not set | 762 | # CONFIG_I2C_DEBUG_CORE is not set |
760 | # CONFIG_I2C_DEBUG_ALGO is not set | 763 | # CONFIG_I2C_DEBUG_ALGO is not set |
761 | # CONFIG_I2C_DEBUG_BUS is not set | 764 | # CONFIG_I2C_DEBUG_BUS is not set |
762 | # CONFIG_I2C_DEBUG_CHIP is not set | 765 | # CONFIG_I2C_DEBUG_CHIP is not set |
763 | |||
764 | # | ||
765 | # SPI support | ||
766 | # | ||
767 | # CONFIG_SPI is not set | 766 | # CONFIG_SPI is not set |
768 | # CONFIG_SPI_MASTER is not set | ||
769 | # CONFIG_W1 is not set | 767 | # CONFIG_W1 is not set |
770 | # CONFIG_POWER_SUPPLY is not set | 768 | # CONFIG_POWER_SUPPLY is not set |
771 | CONFIG_HWMON=y | 769 | CONFIG_HWMON=y |
@@ -835,12 +833,22 @@ CONFIG_SSB_POSSIBLE=y | |||
835 | # Multifunction device drivers | 833 | # Multifunction device drivers |
836 | # | 834 | # |
837 | # CONFIG_MFD_SM501 is not set | 835 | # CONFIG_MFD_SM501 is not set |
836 | # CONFIG_HTC_PASIC3 is not set | ||
838 | 837 | ||
839 | # | 838 | # |
840 | # Multimedia devices | 839 | # Multimedia devices |
841 | # | 840 | # |
841 | |||
842 | # | ||
843 | # Multimedia core support | ||
844 | # | ||
842 | # CONFIG_VIDEO_DEV is not set | 845 | # CONFIG_VIDEO_DEV is not set |
843 | # CONFIG_DVB_CORE is not set | 846 | # CONFIG_DVB_CORE is not set |
847 | # CONFIG_VIDEO_MEDIA is not set | ||
848 | |||
849 | # | ||
850 | # Multimedia drivers | ||
851 | # | ||
844 | CONFIG_DAB=y | 852 | CONFIG_DAB=y |
845 | 853 | ||
846 | # | 854 | # |
@@ -871,6 +879,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
871 | CONFIG_USB_ARCH_HAS_OHCI=y | 879 | CONFIG_USB_ARCH_HAS_OHCI=y |
872 | CONFIG_USB_ARCH_HAS_EHCI=y | 880 | CONFIG_USB_ARCH_HAS_EHCI=y |
873 | # CONFIG_USB is not set | 881 | # CONFIG_USB is not set |
882 | # CONFIG_USB_OTG_WHITELIST is not set | ||
883 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
874 | 884 | ||
875 | # | 885 | # |
876 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -879,14 +889,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
879 | # CONFIG_MMC is not set | 889 | # CONFIG_MMC is not set |
880 | # CONFIG_MEMSTICK is not set | 890 | # CONFIG_MEMSTICK is not set |
881 | # CONFIG_NEW_LEDS is not set | 891 | # CONFIG_NEW_LEDS is not set |
892 | # CONFIG_ACCESSIBILITY is not set | ||
882 | # CONFIG_INFINIBAND is not set | 893 | # CONFIG_INFINIBAND is not set |
883 | # CONFIG_EDAC is not set | 894 | # CONFIG_EDAC is not set |
884 | # CONFIG_RTC_CLASS is not set | 895 | # CONFIG_RTC_CLASS is not set |
885 | # CONFIG_DMADEVICES is not set | 896 | # CONFIG_DMADEVICES is not set |
886 | |||
887 | # | ||
888 | # Userspace I/O | ||
889 | # | ||
890 | # CONFIG_UIO is not set | 897 | # CONFIG_UIO is not set |
891 | 898 | ||
892 | # | 899 | # |
@@ -906,7 +913,6 @@ CONFIG_FS_MBCACHE=y | |||
906 | # CONFIG_JFS_FS is not set | 913 | # CONFIG_JFS_FS is not set |
907 | # CONFIG_FS_POSIX_ACL is not set | 914 | # CONFIG_FS_POSIX_ACL is not set |
908 | # CONFIG_XFS_FS is not set | 915 | # CONFIG_XFS_FS is not set |
909 | # CONFIG_GFS2_FS is not set | ||
910 | # CONFIG_OCFS2_FS is not set | 916 | # CONFIG_OCFS2_FS is not set |
911 | CONFIG_DNOTIFY=y | 917 | CONFIG_DNOTIFY=y |
912 | CONFIG_INOTIFY=y | 918 | CONFIG_INOTIFY=y |
@@ -974,7 +980,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
974 | CONFIG_NFS_FS=y | 980 | CONFIG_NFS_FS=y |
975 | # CONFIG_NFS_V3 is not set | 981 | # CONFIG_NFS_V3 is not set |
976 | # CONFIG_NFS_V4 is not set | 982 | # CONFIG_NFS_V4 is not set |
977 | # CONFIG_NFS_DIRECTIO is not set | ||
978 | # CONFIG_NFSD is not set | 983 | # CONFIG_NFSD is not set |
979 | CONFIG_ROOT_NFS=y | 984 | CONFIG_ROOT_NFS=y |
980 | CONFIG_LOCKD=y | 985 | CONFIG_LOCKD=y |
@@ -1013,6 +1018,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
1013 | # Library routines | 1018 | # Library routines |
1014 | # | 1019 | # |
1015 | CONFIG_BITREVERSE=y | 1020 | CONFIG_BITREVERSE=y |
1021 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1016 | # CONFIG_CRC_CCITT is not set | 1022 | # CONFIG_CRC_CCITT is not set |
1017 | # CONFIG_CRC16 is not set | 1023 | # CONFIG_CRC16 is not set |
1018 | # CONFIG_CRC_ITU_T is not set | 1024 | # CONFIG_CRC_ITU_T is not set |
@@ -1025,6 +1031,7 @@ CONFIG_PLIST=y | |||
1025 | CONFIG_HAS_IOMEM=y | 1031 | CONFIG_HAS_IOMEM=y |
1026 | CONFIG_HAS_IOPORT=y | 1032 | CONFIG_HAS_IOPORT=y |
1027 | CONFIG_HAS_DMA=y | 1033 | CONFIG_HAS_DMA=y |
1034 | CONFIG_HAVE_LMB=y | ||
1028 | 1035 | ||
1029 | # | 1036 | # |
1030 | # Kernel hacking | 1037 | # Kernel hacking |
@@ -1032,6 +1039,7 @@ CONFIG_HAS_DMA=y | |||
1032 | # CONFIG_PRINTK_TIME is not set | 1039 | # CONFIG_PRINTK_TIME is not set |
1033 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1040 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1034 | CONFIG_ENABLE_MUST_CHECK=y | 1041 | CONFIG_ENABLE_MUST_CHECK=y |
1042 | CONFIG_FRAME_WARN=1024 | ||
1035 | # CONFIG_MAGIC_SYSRQ is not set | 1043 | # CONFIG_MAGIC_SYSRQ is not set |
1036 | # CONFIG_UNUSED_SYMBOLS is not set | 1044 | # CONFIG_UNUSED_SYMBOLS is not set |
1037 | # CONFIG_DEBUG_FS is not set | 1045 | # CONFIG_DEBUG_FS is not set |
@@ -1041,6 +1049,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1041 | # CONFIG_SLUB_STATS is not set | 1049 | # CONFIG_SLUB_STATS is not set |
1042 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1050 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1043 | # CONFIG_SAMPLES is not set | 1051 | # CONFIG_SAMPLES is not set |
1052 | # CONFIG_IRQSTACKS is not set | ||
1044 | # CONFIG_PPC_EARLY_DEBUG is not set | 1053 | # CONFIG_PPC_EARLY_DEBUG is not set |
1045 | 1054 | ||
1046 | # | 1055 | # |
@@ -1050,48 +1059,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1050 | # CONFIG_SECURITY is not set | 1059 | # CONFIG_SECURITY is not set |
1051 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1060 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1052 | CONFIG_CRYPTO=y | 1061 | CONFIG_CRYPTO=y |
1053 | # CONFIG_CRYPTO_SEQIV is not set | 1062 | |
1063 | # | ||
1064 | # Crypto core or helper | ||
1065 | # | ||
1054 | # CONFIG_CRYPTO_MANAGER is not set | 1066 | # CONFIG_CRYPTO_MANAGER is not set |
1067 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1068 | # CONFIG_CRYPTO_NULL is not set | ||
1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1070 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1071 | |||
1072 | # | ||
1073 | # Authenticated Encryption with Associated Data | ||
1074 | # | ||
1075 | # CONFIG_CRYPTO_CCM is not set | ||
1076 | # CONFIG_CRYPTO_GCM is not set | ||
1077 | # CONFIG_CRYPTO_SEQIV is not set | ||
1078 | |||
1079 | # | ||
1080 | # Block modes | ||
1081 | # | ||
1082 | # CONFIG_CRYPTO_CBC is not set | ||
1083 | # CONFIG_CRYPTO_CTR is not set | ||
1084 | # CONFIG_CRYPTO_CTS is not set | ||
1085 | # CONFIG_CRYPTO_ECB is not set | ||
1086 | # CONFIG_CRYPTO_LRW is not set | ||
1087 | # CONFIG_CRYPTO_PCBC is not set | ||
1088 | # CONFIG_CRYPTO_XTS is not set | ||
1089 | |||
1090 | # | ||
1091 | # Hash modes | ||
1092 | # | ||
1055 | # CONFIG_CRYPTO_HMAC is not set | 1093 | # CONFIG_CRYPTO_HMAC is not set |
1056 | # CONFIG_CRYPTO_XCBC is not set | 1094 | # CONFIG_CRYPTO_XCBC is not set |
1057 | # CONFIG_CRYPTO_NULL is not set | 1095 | |
1096 | # | ||
1097 | # Digest | ||
1098 | # | ||
1099 | # CONFIG_CRYPTO_CRC32C is not set | ||
1058 | # CONFIG_CRYPTO_MD4 is not set | 1100 | # CONFIG_CRYPTO_MD4 is not set |
1059 | # CONFIG_CRYPTO_MD5 is not set | 1101 | # CONFIG_CRYPTO_MD5 is not set |
1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1060 | # CONFIG_CRYPTO_SHA1 is not set | 1103 | # CONFIG_CRYPTO_SHA1 is not set |
1061 | # CONFIG_CRYPTO_SHA256 is not set | 1104 | # CONFIG_CRYPTO_SHA256 is not set |
1062 | # CONFIG_CRYPTO_SHA512 is not set | 1105 | # CONFIG_CRYPTO_SHA512 is not set |
1063 | # CONFIG_CRYPTO_WP512 is not set | ||
1064 | # CONFIG_CRYPTO_TGR192 is not set | 1106 | # CONFIG_CRYPTO_TGR192 is not set |
1065 | # CONFIG_CRYPTO_GF128MUL is not set | 1107 | # CONFIG_CRYPTO_WP512 is not set |
1066 | # CONFIG_CRYPTO_ECB is not set | 1108 | |
1067 | # CONFIG_CRYPTO_CBC is not set | 1109 | # |
1068 | # CONFIG_CRYPTO_PCBC is not set | 1110 | # Ciphers |
1069 | # CONFIG_CRYPTO_LRW is not set | 1111 | # |
1070 | # CONFIG_CRYPTO_XTS is not set | ||
1071 | # CONFIG_CRYPTO_CTR is not set | ||
1072 | # CONFIG_CRYPTO_GCM is not set | ||
1073 | # CONFIG_CRYPTO_CCM is not set | ||
1074 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1075 | # CONFIG_CRYPTO_DES is not set | ||
1076 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1077 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1078 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1079 | # CONFIG_CRYPTO_SERPENT is not set | ||
1080 | # CONFIG_CRYPTO_AES is not set | 1112 | # CONFIG_CRYPTO_AES is not set |
1113 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1114 | # CONFIG_CRYPTO_ARC4 is not set | ||
1115 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1116 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1081 | # CONFIG_CRYPTO_CAST5 is not set | 1117 | # CONFIG_CRYPTO_CAST5 is not set |
1082 | # CONFIG_CRYPTO_CAST6 is not set | 1118 | # CONFIG_CRYPTO_CAST6 is not set |
1083 | # CONFIG_CRYPTO_TEA is not set | 1119 | # CONFIG_CRYPTO_DES is not set |
1084 | # CONFIG_CRYPTO_ARC4 is not set | 1120 | # CONFIG_CRYPTO_FCRYPT is not set |
1085 | # CONFIG_CRYPTO_KHAZAD is not set | 1121 | # CONFIG_CRYPTO_KHAZAD is not set |
1086 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1087 | # CONFIG_CRYPTO_SEED is not set | ||
1088 | # CONFIG_CRYPTO_SALSA20 is not set | 1122 | # CONFIG_CRYPTO_SALSA20 is not set |
1123 | # CONFIG_CRYPTO_SEED is not set | ||
1124 | # CONFIG_CRYPTO_SERPENT is not set | ||
1125 | # CONFIG_CRYPTO_TEA is not set | ||
1126 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1127 | |||
1128 | # | ||
1129 | # Compression | ||
1130 | # | ||
1089 | # CONFIG_CRYPTO_DEFLATE is not set | 1131 | # CONFIG_CRYPTO_DEFLATE is not set |
1090 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1091 | # CONFIG_CRYPTO_CRC32C is not set | ||
1092 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1093 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1094 | # CONFIG_CRYPTO_LZO is not set | 1132 | # CONFIG_CRYPTO_LZO is not set |
1095 | CONFIG_CRYPTO_HW=y | 1133 | CONFIG_CRYPTO_HW=y |
1096 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1134 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1097 | # CONFIG_PPC_CLOCK is not set | 1135 | # CONFIG_PPC_CLOCK is not set |
1136 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index cbf6ad2d71da..6f9067b49e07 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:44 2008 | 4 | # Mon Jun 9 08:52:40 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
@@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
@@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | ||
154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
156 | CONFIG_TQM8541=y | 161 | CONFIG_TQM8541=y |
@@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
@@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
244 | # CONFIG_HAS_RAPIDIO is not set | ||
237 | 245 | ||
238 | # | 246 | # |
239 | # Advanced setup | 247 | # Advanced setup |
@@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
243 | # | 251 | # |
244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
245 | # | 253 | # |
246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | ||
258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
250 | CONFIG_BOOT_LOAD=0x00800000 | ||
251 | 260 | ||
252 | # | 261 | # |
253 | # Networking | 262 | # Networking |
@@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
299 | # CONFIG_INET6_TUNNEL is not set | ||
300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
@@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
363 | # CONFIG_MTD_AR7_PARTS is not set | ||
356 | 364 | ||
357 | # | 365 | # |
358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
@@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
424 | # | 432 | # |
425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
435 | CONFIG_OF_I2C=y | ||
427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
@@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
512 | 521 | ||
513 | # | 522 | # |
@@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
605 | # CONFIG_SK98LIN is not set | ||
606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
@@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
633 | # CONFIG_SFC is not set | ||
625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
626 | 635 | ||
627 | # | 636 | # |
@@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
629 | # | 638 | # |
630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
641 | # CONFIG_IWLWIFI_LEDS is not set | ||
632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
@@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
675 | # Character devices | 685 | # Character devices |
676 | # | 686 | # |
677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
688 | CONFIG_DEVKMEM=y | ||
678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
680 | 691 | ||
@@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
724 | 735 | ||
725 | # | 736 | # |
726 | # I2C Algorithms | ||
727 | # | ||
728 | # CONFIG_I2C_ALGOBIT is not set | ||
729 | # CONFIG_I2C_ALGOPCF is not set | ||
730 | # CONFIG_I2C_ALGOPCA is not set | ||
731 | |||
732 | # | ||
733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
734 | # | 738 | # |
735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
@@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
757 | 762 | ||
758 | # | 763 | # |
759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
@@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
766 | # CONFIG_TPS65010 is not set | ||
767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
773 | |||
774 | # | ||
775 | # SPI support | ||
776 | # | ||
777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
778 | # CONFIG_SPI_MASTER is not set | ||
779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
@@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
846 | # | 845 | # |
847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
847 | # CONFIG_HTC_PASIC3 is not set | ||
848 | 848 | ||
849 | # | 849 | # |
850 | # Multimedia devices | 850 | # Multimedia devices |
851 | # | 851 | # |
852 | |||
853 | # | ||
854 | # Multimedia core support | ||
855 | # | ||
852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
858 | # CONFIG_VIDEO_MEDIA is not set | ||
859 | |||
860 | # | ||
861 | # Multimedia drivers | ||
862 | # | ||
854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
855 | 864 | ||
856 | # | 865 | # |
@@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
884 | 895 | ||
885 | # | 896 | # |
886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
903 | # CONFIG_ACCESSIBILITY is not set | ||
892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
896 | |||
897 | # | ||
898 | # Userspace I/O | ||
899 | # | ||
900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
901 | 909 | ||
902 | # | 910 | # |
@@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
919 | # CONFIG_GFS2_FS is not set | ||
920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
@@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
987 | # CONFIG_NFS_DIRECTIO is not set | ||
988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
@@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
1023 | # Library routines | 1029 | # Library routines |
1024 | # | 1030 | # |
1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
@@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
1045 | CONFIG_HAVE_LMB=y | ||
1038 | 1046 | ||
1039 | # | 1047 | # |
1040 | # Kernel hacking | 1048 | # Kernel hacking |
@@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
1053 | CONFIG_FRAME_WARN=1024 | ||
1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
@@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
1064 | # CONFIG_IRQSTACKS is not set | ||
1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
1056 | 1066 | ||
1057 | # | 1067 | # |
@@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
1075 | # | ||
1076 | # Crypto core or helper | ||
1077 | # | ||
1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1080 | # CONFIG_CRYPTO_NULL is not set | ||
1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1083 | |||
1084 | # | ||
1085 | # Authenticated Encryption with Associated Data | ||
1086 | # | ||
1087 | # CONFIG_CRYPTO_CCM is not set | ||
1088 | # CONFIG_CRYPTO_GCM is not set | ||
1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
1090 | |||
1091 | # | ||
1092 | # Block modes | ||
1093 | # | ||
1094 | # CONFIG_CRYPTO_CBC is not set | ||
1095 | # CONFIG_CRYPTO_CTR is not set | ||
1096 | # CONFIG_CRYPTO_CTS is not set | ||
1097 | # CONFIG_CRYPTO_ECB is not set | ||
1098 | # CONFIG_CRYPTO_LRW is not set | ||
1099 | # CONFIG_CRYPTO_PCBC is not set | ||
1100 | # CONFIG_CRYPTO_XTS is not set | ||
1101 | |||
1102 | # | ||
1103 | # Hash modes | ||
1104 | # | ||
1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
1108 | # | ||
1109 | # Digest | ||
1110 | # | ||
1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
1074 | # CONFIG_CRYPTO_WP512 is not set | ||
1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
1081 | # CONFIG_CRYPTO_XTS is not set | ||
1082 | # CONFIG_CRYPTO_CTR is not set | ||
1083 | # CONFIG_CRYPTO_GCM is not set | ||
1084 | # CONFIG_CRYPTO_CCM is not set | ||
1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1086 | # CONFIG_CRYPTO_DES is not set | ||
1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1098 | # CONFIG_CRYPTO_SEED is not set | ||
1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
1135 | # CONFIG_CRYPTO_SEED is not set | ||
1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
1137 | # CONFIG_CRYPTO_TEA is not set | ||
1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1139 | |||
1140 | # | ||
1141 | # Compression | ||
1142 | # | ||
1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index bbff962c8472..03120b5b52fa 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:44 2008 | 4 | # Mon Jun 9 08:52:41 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
@@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
@@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | ||
154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
@@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
@@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
244 | # CONFIG_HAS_RAPIDIO is not set | ||
237 | 245 | ||
238 | # | 246 | # |
239 | # Advanced setup | 247 | # Advanced setup |
@@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
243 | # | 251 | # |
244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
245 | # | 253 | # |
246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | ||
258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
250 | CONFIG_BOOT_LOAD=0x00800000 | ||
251 | 260 | ||
252 | # | 261 | # |
253 | # Networking | 262 | # Networking |
@@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
299 | # CONFIG_INET6_TUNNEL is not set | ||
300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
@@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
363 | # CONFIG_MTD_AR7_PARTS is not set | ||
356 | 364 | ||
357 | # | 365 | # |
358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
@@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
424 | # | 432 | # |
425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
435 | CONFIG_OF_I2C=y | ||
427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
@@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
512 | 521 | ||
513 | # | 522 | # |
@@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
605 | # CONFIG_SK98LIN is not set | ||
606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
@@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
633 | # CONFIG_SFC is not set | ||
625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
626 | 635 | ||
627 | # | 636 | # |
@@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
629 | # | 638 | # |
630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
641 | # CONFIG_IWLWIFI_LEDS is not set | ||
632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
@@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
675 | # Character devices | 685 | # Character devices |
676 | # | 686 | # |
677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
688 | CONFIG_DEVKMEM=y | ||
678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
680 | 691 | ||
@@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
724 | 735 | ||
725 | # | 736 | # |
726 | # I2C Algorithms | ||
727 | # | ||
728 | # CONFIG_I2C_ALGOBIT is not set | ||
729 | # CONFIG_I2C_ALGOPCF is not set | ||
730 | # CONFIG_I2C_ALGOPCA is not set | ||
731 | |||
732 | # | ||
733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
734 | # | 738 | # |
735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
@@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
757 | 762 | ||
758 | # | 763 | # |
759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
@@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
766 | # CONFIG_TPS65010 is not set | ||
767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
773 | |||
774 | # | ||
775 | # SPI support | ||
776 | # | ||
777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
778 | # CONFIG_SPI_MASTER is not set | ||
779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
@@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
846 | # | 845 | # |
847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
847 | # CONFIG_HTC_PASIC3 is not set | ||
848 | 848 | ||
849 | # | 849 | # |
850 | # Multimedia devices | 850 | # Multimedia devices |
851 | # | 851 | # |
852 | |||
853 | # | ||
854 | # Multimedia core support | ||
855 | # | ||
852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
858 | # CONFIG_VIDEO_MEDIA is not set | ||
859 | |||
860 | # | ||
861 | # Multimedia drivers | ||
862 | # | ||
854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
855 | 864 | ||
856 | # | 865 | # |
@@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
884 | 895 | ||
885 | # | 896 | # |
886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
903 | # CONFIG_ACCESSIBILITY is not set | ||
892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
896 | |||
897 | # | ||
898 | # Userspace I/O | ||
899 | # | ||
900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
901 | 909 | ||
902 | # | 910 | # |
@@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
919 | # CONFIG_GFS2_FS is not set | ||
920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
@@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
987 | # CONFIG_NFS_DIRECTIO is not set | ||
988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
@@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
1023 | # Library routines | 1029 | # Library routines |
1024 | # | 1030 | # |
1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
@@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
1045 | CONFIG_HAVE_LMB=y | ||
1038 | 1046 | ||
1039 | # | 1047 | # |
1040 | # Kernel hacking | 1048 | # Kernel hacking |
@@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
1053 | CONFIG_FRAME_WARN=1024 | ||
1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
@@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
1064 | # CONFIG_IRQSTACKS is not set | ||
1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
1056 | 1066 | ||
1057 | # | 1067 | # |
@@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
1075 | # | ||
1076 | # Crypto core or helper | ||
1077 | # | ||
1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1080 | # CONFIG_CRYPTO_NULL is not set | ||
1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1083 | |||
1084 | # | ||
1085 | # Authenticated Encryption with Associated Data | ||
1086 | # | ||
1087 | # CONFIG_CRYPTO_CCM is not set | ||
1088 | # CONFIG_CRYPTO_GCM is not set | ||
1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
1090 | |||
1091 | # | ||
1092 | # Block modes | ||
1093 | # | ||
1094 | # CONFIG_CRYPTO_CBC is not set | ||
1095 | # CONFIG_CRYPTO_CTR is not set | ||
1096 | # CONFIG_CRYPTO_CTS is not set | ||
1097 | # CONFIG_CRYPTO_ECB is not set | ||
1098 | # CONFIG_CRYPTO_LRW is not set | ||
1099 | # CONFIG_CRYPTO_PCBC is not set | ||
1100 | # CONFIG_CRYPTO_XTS is not set | ||
1101 | |||
1102 | # | ||
1103 | # Hash modes | ||
1104 | # | ||
1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
1108 | # | ||
1109 | # Digest | ||
1110 | # | ||
1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
1074 | # CONFIG_CRYPTO_WP512 is not set | ||
1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
1081 | # CONFIG_CRYPTO_XTS is not set | ||
1082 | # CONFIG_CRYPTO_CTR is not set | ||
1083 | # CONFIG_CRYPTO_GCM is not set | ||
1084 | # CONFIG_CRYPTO_CCM is not set | ||
1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1086 | # CONFIG_CRYPTO_DES is not set | ||
1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1098 | # CONFIG_CRYPTO_SEED is not set | ||
1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
1135 | # CONFIG_CRYPTO_SEED is not set | ||
1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
1137 | # CONFIG_CRYPTO_TEA is not set | ||
1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1139 | |||
1140 | # | ||
1141 | # Compression | ||
1142 | # | ||
1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index 63c5ec8b6515..3113257edf5a 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:45 2008 | 4 | # Mon Jun 9 08:52:42 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
@@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
@@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | ||
154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
@@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
@@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
244 | # CONFIG_HAS_RAPIDIO is not set | ||
237 | 245 | ||
238 | # | 246 | # |
239 | # Advanced setup | 247 | # Advanced setup |
@@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
243 | # | 251 | # |
244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
245 | # | 253 | # |
246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | ||
258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
250 | CONFIG_BOOT_LOAD=0x00800000 | ||
251 | 260 | ||
252 | # | 261 | # |
253 | # Networking | 262 | # Networking |
@@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
299 | # CONFIG_INET6_TUNNEL is not set | ||
300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
@@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
363 | # CONFIG_MTD_AR7_PARTS is not set | ||
356 | 364 | ||
357 | # | 365 | # |
358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
@@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
424 | # | 432 | # |
425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
435 | CONFIG_OF_I2C=y | ||
427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
@@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
512 | 521 | ||
513 | # | 522 | # |
@@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
605 | # CONFIG_SK98LIN is not set | ||
606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
@@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
633 | # CONFIG_SFC is not set | ||
625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
626 | 635 | ||
627 | # | 636 | # |
@@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
629 | # | 638 | # |
630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
641 | # CONFIG_IWLWIFI_LEDS is not set | ||
632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
@@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
675 | # Character devices | 685 | # Character devices |
676 | # | 686 | # |
677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
688 | CONFIG_DEVKMEM=y | ||
678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
680 | 691 | ||
@@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
724 | 735 | ||
725 | # | 736 | # |
726 | # I2C Algorithms | ||
727 | # | ||
728 | # CONFIG_I2C_ALGOBIT is not set | ||
729 | # CONFIG_I2C_ALGOPCF is not set | ||
730 | # CONFIG_I2C_ALGOPCA is not set | ||
731 | |||
732 | # | ||
733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
734 | # | 738 | # |
735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
@@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
757 | 762 | ||
758 | # | 763 | # |
759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
@@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
766 | # CONFIG_TPS65010 is not set | ||
767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
773 | |||
774 | # | ||
775 | # SPI support | ||
776 | # | ||
777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
778 | # CONFIG_SPI_MASTER is not set | ||
779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
@@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
846 | # | 845 | # |
847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
847 | # CONFIG_HTC_PASIC3 is not set | ||
848 | 848 | ||
849 | # | 849 | # |
850 | # Multimedia devices | 850 | # Multimedia devices |
851 | # | 851 | # |
852 | |||
853 | # | ||
854 | # Multimedia core support | ||
855 | # | ||
852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
858 | # CONFIG_VIDEO_MEDIA is not set | ||
859 | |||
860 | # | ||
861 | # Multimedia drivers | ||
862 | # | ||
854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
855 | 864 | ||
856 | # | 865 | # |
@@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
884 | 895 | ||
885 | # | 896 | # |
886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
903 | # CONFIG_ACCESSIBILITY is not set | ||
892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
896 | |||
897 | # | ||
898 | # Userspace I/O | ||
899 | # | ||
900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
901 | 909 | ||
902 | # | 910 | # |
@@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
919 | # CONFIG_GFS2_FS is not set | ||
920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
@@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
987 | # CONFIG_NFS_DIRECTIO is not set | ||
988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
@@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
1023 | # Library routines | 1029 | # Library routines |
1024 | # | 1030 | # |
1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
@@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
1045 | CONFIG_HAVE_LMB=y | ||
1038 | 1046 | ||
1039 | # | 1047 | # |
1040 | # Kernel hacking | 1048 | # Kernel hacking |
@@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
1053 | CONFIG_FRAME_WARN=1024 | ||
1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
@@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
1064 | # CONFIG_IRQSTACKS is not set | ||
1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
1056 | 1066 | ||
1057 | # | 1067 | # |
@@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
1075 | # | ||
1076 | # Crypto core or helper | ||
1077 | # | ||
1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1080 | # CONFIG_CRYPTO_NULL is not set | ||
1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1083 | |||
1084 | # | ||
1085 | # Authenticated Encryption with Associated Data | ||
1086 | # | ||
1087 | # CONFIG_CRYPTO_CCM is not set | ||
1088 | # CONFIG_CRYPTO_GCM is not set | ||
1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
1090 | |||
1091 | # | ||
1092 | # Block modes | ||
1093 | # | ||
1094 | # CONFIG_CRYPTO_CBC is not set | ||
1095 | # CONFIG_CRYPTO_CTR is not set | ||
1096 | # CONFIG_CRYPTO_CTS is not set | ||
1097 | # CONFIG_CRYPTO_ECB is not set | ||
1098 | # CONFIG_CRYPTO_LRW is not set | ||
1099 | # CONFIG_CRYPTO_PCBC is not set | ||
1100 | # CONFIG_CRYPTO_XTS is not set | ||
1101 | |||
1102 | # | ||
1103 | # Hash modes | ||
1104 | # | ||
1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
1108 | # | ||
1109 | # Digest | ||
1110 | # | ||
1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
1074 | # CONFIG_CRYPTO_WP512 is not set | ||
1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
1081 | # CONFIG_CRYPTO_XTS is not set | ||
1082 | # CONFIG_CRYPTO_CTR is not set | ||
1083 | # CONFIG_CRYPTO_GCM is not set | ||
1084 | # CONFIG_CRYPTO_CCM is not set | ||
1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1086 | # CONFIG_CRYPTO_DES is not set | ||
1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1098 | # CONFIG_CRYPTO_SEED is not set | ||
1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
1135 | # CONFIG_CRYPTO_SEED is not set | ||
1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
1137 | # CONFIG_CRYPTO_TEA is not set | ||
1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1139 | |||
1140 | # | ||
1141 | # Compression | ||
1142 | # | ||
1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index a3cc94a2ff06..6740f2a3aa3d 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc2 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Wed Feb 20 12:26:07 2008 | 4 | # Mon Jun 9 08:52:08 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
31 | CONFIG_STACKTRACE_SUPPORT=y | ||
32 | CONFIG_LOCKDEP_SUPPORT=y | ||
31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
@@ -75,6 +77,7 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
75 | CONFIG_USER_SCHED=y | 77 | CONFIG_USER_SCHED=y |
76 | # CONFIG_CGROUP_SCHED is not set | 78 | # CONFIG_CGROUP_SCHED is not set |
77 | CONFIG_SYSFS_DEPRECATED=y | 79 | CONFIG_SYSFS_DEPRECATED=y |
80 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
78 | # CONFIG_RELAY is not set | 81 | # CONFIG_RELAY is not set |
79 | # CONFIG_NAMESPACES is not set | 82 | # CONFIG_NAMESPACES is not set |
80 | # CONFIG_BLK_DEV_INITRD is not set | 83 | # CONFIG_BLK_DEV_INITRD is not set |
@@ -107,6 +110,8 @@ CONFIG_SLUB=y | |||
107 | # CONFIG_MARKERS is not set | 110 | # CONFIG_MARKERS is not set |
108 | CONFIG_HAVE_OPROFILE=y | 111 | CONFIG_HAVE_OPROFILE=y |
109 | CONFIG_HAVE_KPROBES=y | 112 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | ||
114 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
110 | CONFIG_PROC_PAGE_MONITOR=y | 115 | CONFIG_PROC_PAGE_MONITOR=y |
111 | CONFIG_SLABINFO=y | 116 | CONFIG_SLABINFO=y |
112 | # CONFIG_TINY_SHMEM is not set | 117 | # CONFIG_TINY_SHMEM is not set |
@@ -131,7 +136,6 @@ CONFIG_DEFAULT_DEADLINE=y | |||
131 | # CONFIG_DEFAULT_NOOP is not set | 136 | # CONFIG_DEFAULT_NOOP is not set |
132 | CONFIG_DEFAULT_IOSCHED="deadline" | 137 | CONFIG_DEFAULT_IOSCHED="deadline" |
133 | CONFIG_CLASSIC_RCU=y | 138 | CONFIG_CLASSIC_RCU=y |
134 | # CONFIG_PREEMPT_RCU is not set | ||
135 | 139 | ||
136 | # | 140 | # |
137 | # Platform support | 141 | # Platform support |
@@ -194,7 +198,6 @@ CONFIG_HZ=1000 | |||
194 | CONFIG_PREEMPT_NONE=y | 198 | CONFIG_PREEMPT_NONE=y |
195 | # CONFIG_PREEMPT_VOLUNTARY is not set | 199 | # CONFIG_PREEMPT_VOLUNTARY is not set |
196 | # CONFIG_PREEMPT is not set | 200 | # CONFIG_PREEMPT is not set |
197 | CONFIG_RCU_TRACE=y | ||
198 | CONFIG_BINFMT_ELF=y | 201 | CONFIG_BINFMT_ELF=y |
199 | # CONFIG_BINFMT_MISC is not set | 202 | # CONFIG_BINFMT_MISC is not set |
200 | # CONFIG_MATH_EMULATION is not set | 203 | # CONFIG_MATH_EMULATION is not set |
@@ -213,11 +216,13 @@ CONFIG_FLATMEM=y | |||
213 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
214 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
217 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
218 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
219 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
220 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
221 | # CONFIG_PROC_DEVICETREE is not set | 226 | # CONFIG_PROC_DEVICETREE is not set |
222 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
223 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
@@ -235,6 +240,7 @@ CONFIG_FSL_SOC=y | |||
235 | # CONFIG_PCI_QSPAN is not set | 240 | # CONFIG_PCI_QSPAN is not set |
236 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 241 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
237 | # CONFIG_PCCARD is not set | 242 | # CONFIG_PCCARD is not set |
243 | # CONFIG_HAS_RAPIDIO is not set | ||
238 | 244 | ||
239 | # | 245 | # |
240 | # Advanced setup | 246 | # Advanced setup |
@@ -244,13 +250,13 @@ CONFIG_FSL_SOC=y | |||
244 | # | 250 | # |
245 | # Default settings for advanced configuration options are used | 251 | # Default settings for advanced configuration options are used |
246 | # | 252 | # |
247 | CONFIG_HIGHMEM_START=0xfe000000 | ||
248 | CONFIG_LOWMEM_SIZE=0x30000000 | 253 | CONFIG_LOWMEM_SIZE=0x30000000 |
254 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
249 | CONFIG_KERNEL_START=0xc0000000 | 255 | CONFIG_KERNEL_START=0xc0000000 |
256 | CONFIG_PHYSICAL_START=0x00000000 | ||
250 | CONFIG_TASK_SIZE=0x80000000 | 257 | CONFIG_TASK_SIZE=0x80000000 |
251 | CONFIG_CONSISTENT_START=0xfd000000 | 258 | CONFIG_CONSISTENT_START=0xfd000000 |
252 | CONFIG_CONSISTENT_SIZE=0x00200000 | 259 | CONFIG_CONSISTENT_SIZE=0x00200000 |
253 | CONFIG_BOOT_LOAD=0x00400000 | ||
254 | 260 | ||
255 | # | 261 | # |
256 | # Networking | 262 | # Networking |
@@ -293,8 +299,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
293 | CONFIG_DEFAULT_TCP_CONG="cubic" | 299 | CONFIG_DEFAULT_TCP_CONG="cubic" |
294 | # CONFIG_TCP_MD5SIG is not set | 300 | # CONFIG_TCP_MD5SIG is not set |
295 | # CONFIG_IPV6 is not set | 301 | # CONFIG_IPV6 is not set |
296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
297 | # CONFIG_INET6_TUNNEL is not set | ||
298 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
299 | # CONFIG_NETFILTER is not set | 303 | # CONFIG_NETFILTER is not set |
300 | # CONFIG_IP_DCCP is not set | 304 | # CONFIG_IP_DCCP is not set |
@@ -482,6 +486,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
482 | # | 486 | # |
483 | # CONFIG_WLAN_PRE80211 is not set | 487 | # CONFIG_WLAN_PRE80211 is not set |
484 | # CONFIG_WLAN_80211 is not set | 488 | # CONFIG_WLAN_80211 is not set |
489 | # CONFIG_IWLWIFI_LEDS is not set | ||
485 | # CONFIG_WAN is not set | 490 | # CONFIG_WAN is not set |
486 | # CONFIG_PPP is not set | 491 | # CONFIG_PPP is not set |
487 | # CONFIG_SLIP is not set | 492 | # CONFIG_SLIP is not set |
@@ -548,6 +553,7 @@ CONFIG_SERIO_LIBPS2=y | |||
548 | # Character devices | 553 | # Character devices |
549 | # | 554 | # |
550 | # CONFIG_VT is not set | 555 | # CONFIG_VT is not set |
556 | CONFIG_DEVKMEM=y | ||
551 | # CONFIG_SERIAL_NONSTANDARD is not set | 557 | # CONFIG_SERIAL_NONSTANDARD is not set |
552 | 558 | ||
553 | # | 559 | # |
@@ -580,12 +586,7 @@ CONFIG_GEN_RTC=y | |||
580 | # CONFIG_RAW_DRIVER is not set | 586 | # CONFIG_RAW_DRIVER is not set |
581 | # CONFIG_TCG_TPM is not set | 587 | # CONFIG_TCG_TPM is not set |
582 | # CONFIG_I2C is not set | 588 | # CONFIG_I2C is not set |
583 | |||
584 | # | ||
585 | # SPI support | ||
586 | # | ||
587 | # CONFIG_SPI is not set | 589 | # CONFIG_SPI is not set |
588 | # CONFIG_SPI_MASTER is not set | ||
589 | # CONFIG_W1 is not set | 590 | # CONFIG_W1 is not set |
590 | # CONFIG_POWER_SUPPLY is not set | 591 | # CONFIG_POWER_SUPPLY is not set |
591 | # CONFIG_HWMON is not set | 592 | # CONFIG_HWMON is not set |
@@ -602,12 +603,22 @@ CONFIG_SSB_POSSIBLE=y | |||
602 | # Multifunction device drivers | 603 | # Multifunction device drivers |
603 | # | 604 | # |
604 | # CONFIG_MFD_SM501 is not set | 605 | # CONFIG_MFD_SM501 is not set |
606 | # CONFIG_HTC_PASIC3 is not set | ||
605 | 607 | ||
606 | # | 608 | # |
607 | # Multimedia devices | 609 | # Multimedia devices |
608 | # | 610 | # |
611 | |||
612 | # | ||
613 | # Multimedia core support | ||
614 | # | ||
609 | # CONFIG_VIDEO_DEV is not set | 615 | # CONFIG_VIDEO_DEV is not set |
610 | # CONFIG_DVB_CORE is not set | 616 | # CONFIG_DVB_CORE is not set |
617 | # CONFIG_VIDEO_MEDIA is not set | ||
618 | |||
619 | # | ||
620 | # Multimedia drivers | ||
621 | # | ||
611 | CONFIG_DAB=y | 622 | CONFIG_DAB=y |
612 | 623 | ||
613 | # | 624 | # |
@@ -632,12 +643,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
632 | # CONFIG_MMC is not set | 643 | # CONFIG_MMC is not set |
633 | # CONFIG_MEMSTICK is not set | 644 | # CONFIG_MEMSTICK is not set |
634 | # CONFIG_NEW_LEDS is not set | 645 | # CONFIG_NEW_LEDS is not set |
646 | # CONFIG_ACCESSIBILITY is not set | ||
635 | # CONFIG_EDAC is not set | 647 | # CONFIG_EDAC is not set |
636 | # CONFIG_RTC_CLASS is not set | 648 | # CONFIG_RTC_CLASS is not set |
637 | 649 | # CONFIG_DMADEVICES is not set | |
638 | # | ||
639 | # Userspace I/O | ||
640 | # | ||
641 | # CONFIG_UIO is not set | 650 | # CONFIG_UIO is not set |
642 | 651 | ||
643 | # | 652 | # |
@@ -650,7 +659,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
650 | # CONFIG_JFS_FS is not set | 659 | # CONFIG_JFS_FS is not set |
651 | # CONFIG_FS_POSIX_ACL is not set | 660 | # CONFIG_FS_POSIX_ACL is not set |
652 | # CONFIG_XFS_FS is not set | 661 | # CONFIG_XFS_FS is not set |
653 | # CONFIG_GFS2_FS is not set | ||
654 | # CONFIG_OCFS2_FS is not set | 662 | # CONFIG_OCFS2_FS is not set |
655 | # CONFIG_DNOTIFY is not set | 663 | # CONFIG_DNOTIFY is not set |
656 | # CONFIG_INOTIFY is not set | 664 | # CONFIG_INOTIFY is not set |
@@ -708,7 +716,6 @@ CONFIG_NFS_FS=y | |||
708 | CONFIG_NFS_V3=y | 716 | CONFIG_NFS_V3=y |
709 | # CONFIG_NFS_V3_ACL is not set | 717 | # CONFIG_NFS_V3_ACL is not set |
710 | # CONFIG_NFS_V4 is not set | 718 | # CONFIG_NFS_V4 is not set |
711 | # CONFIG_NFS_DIRECTIO is not set | ||
712 | # CONFIG_NFSD is not set | 719 | # CONFIG_NFSD is not set |
713 | CONFIG_ROOT_NFS=y | 720 | CONFIG_ROOT_NFS=y |
714 | CONFIG_LOCKD=y | 721 | CONFIG_LOCKD=y |
@@ -751,6 +758,7 @@ CONFIG_MSDOS_PARTITION=y | |||
751 | # | 758 | # |
752 | # Library routines | 759 | # Library routines |
753 | # | 760 | # |
761 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
754 | # CONFIG_CRC_CCITT is not set | 762 | # CONFIG_CRC_CCITT is not set |
755 | # CONFIG_CRC16 is not set | 763 | # CONFIG_CRC16 is not set |
756 | # CONFIG_CRC_ITU_T is not set | 764 | # CONFIG_CRC_ITU_T is not set |
@@ -761,6 +769,7 @@ CONFIG_ZLIB_INFLATE=y | |||
761 | CONFIG_HAS_IOMEM=y | 769 | CONFIG_HAS_IOMEM=y |
762 | CONFIG_HAS_IOPORT=y | 770 | CONFIG_HAS_IOPORT=y |
763 | CONFIG_HAS_DMA=y | 771 | CONFIG_HAS_DMA=y |
772 | CONFIG_HAVE_LMB=y | ||
764 | 773 | ||
765 | # | 774 | # |
766 | # Kernel hacking | 775 | # Kernel hacking |
@@ -768,6 +777,7 @@ CONFIG_HAS_DMA=y | |||
768 | # CONFIG_PRINTK_TIME is not set | 777 | # CONFIG_PRINTK_TIME is not set |
769 | CONFIG_ENABLE_WARN_DEPRECATED=y | 778 | CONFIG_ENABLE_WARN_DEPRECATED=y |
770 | CONFIG_ENABLE_MUST_CHECK=y | 779 | CONFIG_ENABLE_MUST_CHECK=y |
780 | CONFIG_FRAME_WARN=1024 | ||
771 | CONFIG_MAGIC_SYSRQ=y | 781 | CONFIG_MAGIC_SYSRQ=y |
772 | # CONFIG_UNUSED_SYMBOLS is not set | 782 | # CONFIG_UNUSED_SYMBOLS is not set |
773 | CONFIG_DEBUG_FS=y | 783 | CONFIG_DEBUG_FS=y |
@@ -778,6 +788,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
778 | CONFIG_SCHED_DEBUG=y | 788 | CONFIG_SCHED_DEBUG=y |
779 | # CONFIG_SCHEDSTATS is not set | 789 | # CONFIG_SCHEDSTATS is not set |
780 | # CONFIG_TIMER_STATS is not set | 790 | # CONFIG_TIMER_STATS is not set |
791 | # CONFIG_DEBUG_OBJECTS is not set | ||
781 | # CONFIG_SLUB_DEBUG_ON is not set | 792 | # CONFIG_SLUB_DEBUG_ON is not set |
782 | # CONFIG_SLUB_STATS is not set | 793 | # CONFIG_SLUB_STATS is not set |
783 | # CONFIG_DEBUG_SPINLOCK is not set | 794 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -788,6 +799,7 @@ CONFIG_SCHED_DEBUG=y | |||
788 | CONFIG_DEBUG_BUGVERBOSE=y | 799 | CONFIG_DEBUG_BUGVERBOSE=y |
789 | CONFIG_DEBUG_INFO=y | 800 | CONFIG_DEBUG_INFO=y |
790 | # CONFIG_DEBUG_VM is not set | 801 | # CONFIG_DEBUG_VM is not set |
802 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
791 | # CONFIG_DEBUG_LIST is not set | 803 | # CONFIG_DEBUG_LIST is not set |
792 | # CONFIG_DEBUG_SG is not set | 804 | # CONFIG_DEBUG_SG is not set |
793 | # CONFIG_BOOT_PRINTK_DELAY is not set | 805 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -798,6 +810,7 @@ CONFIG_DEBUG_INFO=y | |||
798 | # CONFIG_DEBUG_STACK_USAGE is not set | 810 | # CONFIG_DEBUG_STACK_USAGE is not set |
799 | # CONFIG_DEBUG_PAGEALLOC is not set | 811 | # CONFIG_DEBUG_PAGEALLOC is not set |
800 | # CONFIG_DEBUGGER is not set | 812 | # CONFIG_DEBUGGER is not set |
813 | # CONFIG_IRQSTACKS is not set | ||
801 | # CONFIG_VIRQ_DEBUG is not set | 814 | # CONFIG_VIRQ_DEBUG is not set |
802 | # CONFIG_BDI_SWITCH is not set | 815 | # CONFIG_BDI_SWITCH is not set |
803 | # CONFIG_PPC_EARLY_DEBUG is not set | 816 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -811,3 +824,4 @@ CONFIG_DEBUG_INFO=y | |||
811 | # CONFIG_CRYPTO is not set | 824 | # CONFIG_CRYPTO is not set |
812 | # CONFIG_PPC_CLOCK is not set | 825 | # CONFIG_PPC_CLOCK is not set |
813 | CONFIG_PPC_LIB_RHEAP=y | 826 | CONFIG_PPC_LIB_RHEAP=y |
827 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index d7fd298bd234..05360d4ef1b1 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_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-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:55:37 2008 | 4 | # Tue May 20 20:00:44 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -88,6 +90,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 90 | CONFIG_SYSCTL=y |
89 | # CONFIG_EMBEDDED is not set | 91 | # CONFIG_EMBEDDED is not set |
90 | CONFIG_SYSCTL_SYSCALL=y | 92 | CONFIG_SYSCTL_SYSCALL=y |
93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
91 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
92 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -95,6 +98,7 @@ CONFIG_HOTPLUG=y | |||
95 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
96 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
97 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
98 | # CONFIG_COMPAT_BRK is not set | 102 | # CONFIG_COMPAT_BRK is not set |
99 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
100 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -115,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
115 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
116 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
117 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
119 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
122 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
123 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
124 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
125 | CONFIG_MODULE_FORCE_UNLOAD=y | 131 | CONFIG_MODULE_FORCE_UNLOAD=y |
126 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
@@ -217,11 +223,13 @@ CONFIG_FLATMEM=y | |||
217 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
218 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
224 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
225 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
@@ -245,6 +253,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
245 | # CONFIG_PCI_DEBUG is not set | 253 | # CONFIG_PCI_DEBUG is not set |
246 | # CONFIG_PCCARD is not set | 254 | # CONFIG_PCCARD is not set |
247 | # CONFIG_HOTPLUG_PCI is not set | 255 | # CONFIG_HOTPLUG_PCI is not set |
256 | # CONFIG_HAS_RAPIDIO is not set | ||
248 | 257 | ||
249 | # | 258 | # |
250 | # Advanced setup | 259 | # Advanced setup |
@@ -254,11 +263,11 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
254 | # | 263 | # |
255 | # Default settings for advanced configuration options are used | 264 | # Default settings for advanced configuration options are used |
256 | # | 265 | # |
257 | CONFIG_HIGHMEM_START=0xfe000000 | ||
258 | CONFIG_LOWMEM_SIZE=0x30000000 | 266 | CONFIG_LOWMEM_SIZE=0x30000000 |
267 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
259 | CONFIG_KERNEL_START=0xc0000000 | 268 | CONFIG_KERNEL_START=0xc0000000 |
269 | CONFIG_PHYSICAL_START=0x00000000 | ||
260 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
261 | CONFIG_BOOT_LOAD=0x00800000 | ||
262 | 271 | ||
263 | # | 272 | # |
264 | # Networking | 273 | # Networking |
@@ -299,8 +308,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
299 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
300 | # CONFIG_IP_VS is not set | 309 | # CONFIG_IP_VS is not set |
301 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
303 | # CONFIG_INET6_TUNNEL is not set | ||
304 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
305 | CONFIG_NETFILTER=y | 312 | CONFIG_NETFILTER=y |
306 | # CONFIG_NETFILTER_DEBUG is not set | 313 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -398,6 +405,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
398 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
399 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
400 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
408 | CONFIG_OF_I2C=y | ||
401 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
402 | # CONFIG_PNP is not set | 410 | # CONFIG_PNP is not set |
403 | CONFIG_BLK_DEV=y | 411 | CONFIG_BLK_DEV=y |
@@ -484,22 +492,8 @@ CONFIG_BLK_DEV_SL82C105=y | |||
484 | # CONFIG_BLK_DEV_TRM290 is not set | 492 | # CONFIG_BLK_DEV_TRM290 is not set |
485 | CONFIG_BLK_DEV_VIA82CXXX=y | 493 | CONFIG_BLK_DEV_VIA82CXXX=y |
486 | # CONFIG_BLK_DEV_TC86C001 is not set | 494 | # CONFIG_BLK_DEV_TC86C001 is not set |
487 | |||
488 | # | ||
489 | # Other IDE chipsets support | ||
490 | # | ||
491 | |||
492 | # | ||
493 | # Note: most of these also require special kernel boot parameters | ||
494 | # | ||
495 | # CONFIG_BLK_DEV_4DRIVES is not set | ||
496 | # CONFIG_BLK_DEV_ALI14XX is not set | ||
497 | # CONFIG_BLK_DEV_DTC2278 is not set | ||
498 | # CONFIG_BLK_DEV_HT6560B is not set | ||
499 | # CONFIG_BLK_DEV_QD65XX is not set | ||
500 | # CONFIG_BLK_DEV_UMC8672 is not set | ||
501 | CONFIG_BLK_DEV_IDEDMA=y | 495 | CONFIG_BLK_DEV_IDEDMA=y |
502 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 496 | # CONFIG_BLK_DEV_HD_ONLY is not set |
503 | # CONFIG_BLK_DEV_HD is not set | 497 | # CONFIG_BLK_DEV_HD is not set |
504 | 498 | ||
505 | # | 499 | # |
@@ -641,7 +635,6 @@ CONFIG_DE4X5=y | |||
641 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 635 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
642 | CONFIG_NET_PCI=y | 636 | CONFIG_NET_PCI=y |
643 | CONFIG_PCNET32=y | 637 | CONFIG_PCNET32=y |
644 | # CONFIG_PCNET32_NAPI is not set | ||
645 | # CONFIG_AMD8111_ETH is not set | 638 | # CONFIG_AMD8111_ETH is not set |
646 | # CONFIG_ADAPTEC_STARFIRE is not set | 639 | # CONFIG_ADAPTEC_STARFIRE is not set |
647 | # CONFIG_AC3200 is not set | 640 | # CONFIG_AC3200 is not set |
@@ -684,7 +677,6 @@ CONFIG_NETDEV_1000=y | |||
684 | # CONFIG_SIS190 is not set | 677 | # CONFIG_SIS190 is not set |
685 | # CONFIG_SKGE is not set | 678 | # CONFIG_SKGE is not set |
686 | # CONFIG_SKY2 is not set | 679 | # CONFIG_SKY2 is not set |
687 | # CONFIG_SK98LIN is not set | ||
688 | # CONFIG_VIA_VELOCITY is not set | 680 | # CONFIG_VIA_VELOCITY is not set |
689 | # CONFIG_TIGON3 is not set | 681 | # CONFIG_TIGON3 is not set |
690 | # CONFIG_BNX2 is not set | 682 | # CONFIG_BNX2 is not set |
@@ -703,6 +695,7 @@ CONFIG_NETDEV_10000=y | |||
703 | # CONFIG_MLX4_CORE is not set | 695 | # CONFIG_MLX4_CORE is not set |
704 | # CONFIG_TEHUTI is not set | 696 | # CONFIG_TEHUTI is not set |
705 | # CONFIG_BNX2X is not set | 697 | # CONFIG_BNX2X is not set |
698 | # CONFIG_SFC is not set | ||
706 | # CONFIG_TR is not set | 699 | # CONFIG_TR is not set |
707 | 700 | ||
708 | # | 701 | # |
@@ -710,6 +703,7 @@ CONFIG_NETDEV_10000=y | |||
710 | # | 703 | # |
711 | # CONFIG_WLAN_PRE80211 is not set | 704 | # CONFIG_WLAN_PRE80211 is not set |
712 | # CONFIG_WLAN_80211 is not set | 705 | # CONFIG_WLAN_80211 is not set |
706 | # CONFIG_IWLWIFI_LEDS is not set | ||
713 | 707 | ||
714 | # | 708 | # |
715 | # USB Network Adapters | 709 | # USB Network Adapters |
@@ -813,6 +807,7 @@ CONFIG_VT=y | |||
813 | CONFIG_VT_CONSOLE=y | 807 | CONFIG_VT_CONSOLE=y |
814 | CONFIG_HW_CONSOLE=y | 808 | CONFIG_HW_CONSOLE=y |
815 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 809 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
810 | CONFIG_DEVKMEM=y | ||
816 | # CONFIG_SERIAL_NONSTANDARD is not set | 811 | # CONFIG_SERIAL_NONSTANDARD is not set |
817 | # CONFIG_NOZOMI is not set | 812 | # CONFIG_NOZOMI is not set |
818 | 813 | ||
@@ -853,13 +848,7 @@ CONFIG_DEVPORT=y | |||
853 | CONFIG_I2C=y | 848 | CONFIG_I2C=y |
854 | CONFIG_I2C_BOARDINFO=y | 849 | CONFIG_I2C_BOARDINFO=y |
855 | # CONFIG_I2C_CHARDEV is not set | 850 | # CONFIG_I2C_CHARDEV is not set |
856 | |||
857 | # | ||
858 | # I2C Algorithms | ||
859 | # | ||
860 | CONFIG_I2C_ALGOBIT=y | 851 | CONFIG_I2C_ALGOBIT=y |
861 | # CONFIG_I2C_ALGOPCF is not set | ||
862 | # CONFIG_I2C_ALGOPCA is not set | ||
863 | 852 | ||
864 | # | 853 | # |
865 | # I2C Hardware Bus support | 854 | # I2C Hardware Bus support |
@@ -890,6 +879,7 @@ CONFIG_I2C_ALGOBIT=y | |||
890 | # CONFIG_I2C_VIAPRO is not set | 879 | # CONFIG_I2C_VIAPRO is not set |
891 | # CONFIG_I2C_VOODOO3 is not set | 880 | # CONFIG_I2C_VOODOO3 is not set |
892 | # CONFIG_I2C_PCA_ISA is not set | 881 | # CONFIG_I2C_PCA_ISA is not set |
882 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
893 | 883 | ||
894 | # | 884 | # |
895 | # Miscellaneous I2C Chip support | 885 | # Miscellaneous I2C Chip support |
@@ -899,19 +889,13 @@ CONFIG_I2C_ALGOBIT=y | |||
899 | # CONFIG_SENSORS_PCF8574 is not set | 889 | # CONFIG_SENSORS_PCF8574 is not set |
900 | # CONFIG_PCF8575 is not set | 890 | # CONFIG_PCF8575 is not set |
901 | # CONFIG_SENSORS_PCF8591 is not set | 891 | # CONFIG_SENSORS_PCF8591 is not set |
902 | # CONFIG_TPS65010 is not set | ||
903 | # CONFIG_SENSORS_MAX6875 is not set | 892 | # CONFIG_SENSORS_MAX6875 is not set |
904 | # CONFIG_SENSORS_TSL2550 is not set | 893 | # CONFIG_SENSORS_TSL2550 is not set |
905 | # CONFIG_I2C_DEBUG_CORE is not set | 894 | # CONFIG_I2C_DEBUG_CORE is not set |
906 | # CONFIG_I2C_DEBUG_ALGO is not set | 895 | # CONFIG_I2C_DEBUG_ALGO is not set |
907 | # CONFIG_I2C_DEBUG_BUS is not set | 896 | # CONFIG_I2C_DEBUG_BUS is not set |
908 | # CONFIG_I2C_DEBUG_CHIP is not set | 897 | # CONFIG_I2C_DEBUG_CHIP is not set |
909 | |||
910 | # | ||
911 | # SPI support | ||
912 | # | ||
913 | # CONFIG_SPI is not set | 898 | # CONFIG_SPI is not set |
914 | # CONFIG_SPI_MASTER is not set | ||
915 | # CONFIG_W1 is not set | 899 | # CONFIG_W1 is not set |
916 | # CONFIG_POWER_SUPPLY is not set | 900 | # CONFIG_POWER_SUPPLY is not set |
917 | # CONFIG_HWMON is not set | 901 | # CONFIG_HWMON is not set |
@@ -928,12 +912,22 @@ CONFIG_SSB_POSSIBLE=y | |||
928 | # Multifunction device drivers | 912 | # Multifunction device drivers |
929 | # | 913 | # |
930 | # CONFIG_MFD_SM501 is not set | 914 | # CONFIG_MFD_SM501 is not set |
915 | # CONFIG_HTC_PASIC3 is not set | ||
931 | 916 | ||
932 | # | 917 | # |
933 | # Multimedia devices | 918 | # Multimedia devices |
934 | # | 919 | # |
920 | |||
921 | # | ||
922 | # Multimedia core support | ||
923 | # | ||
935 | # CONFIG_VIDEO_DEV is not set | 924 | # CONFIG_VIDEO_DEV is not set |
936 | # CONFIG_DVB_CORE is not set | 925 | # CONFIG_DVB_CORE is not set |
926 | # CONFIG_VIDEO_MEDIA is not set | ||
927 | |||
928 | # | ||
929 | # Multimedia drivers | ||
930 | # | ||
937 | # CONFIG_DAB is not set | 931 | # CONFIG_DAB is not set |
938 | 932 | ||
939 | # | 933 | # |
@@ -953,8 +947,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
953 | # CONFIG_FB_SYS_FILLRECT is not set | 947 | # CONFIG_FB_SYS_FILLRECT is not set |
954 | # CONFIG_FB_SYS_COPYAREA is not set | 948 | # CONFIG_FB_SYS_COPYAREA is not set |
955 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 949 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
950 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
956 | # CONFIG_FB_SYS_FOPS is not set | 951 | # CONFIG_FB_SYS_FOPS is not set |
957 | CONFIG_FB_DEFERRED_IO=y | ||
958 | # CONFIG_FB_SVGALIB is not set | 952 | # CONFIG_FB_SVGALIB is not set |
959 | CONFIG_FB_MACMODES=y | 953 | CONFIG_FB_MACMODES=y |
960 | CONFIG_FB_BACKLIGHT=y | 954 | CONFIG_FB_BACKLIGHT=y |
@@ -1072,11 +1066,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1072 | # | 1066 | # |
1073 | # USB Host Controller Drivers | 1067 | # USB Host Controller Drivers |
1074 | # | 1068 | # |
1069 | # CONFIG_USB_C67X00_HCD is not set | ||
1075 | CONFIG_USB_EHCI_HCD=m | 1070 | CONFIG_USB_EHCI_HCD=m |
1076 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1071 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1077 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1072 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1078 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1073 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1079 | # CONFIG_USB_ISP116X_HCD is not set | 1074 | # CONFIG_USB_ISP116X_HCD is not set |
1075 | # CONFIG_USB_ISP1760_HCD is not set | ||
1080 | CONFIG_USB_OHCI_HCD=y | 1076 | CONFIG_USB_OHCI_HCD=y |
1081 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1077 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1082 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1078 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1112,6 +1108,7 @@ CONFIG_USB_STORAGE=m | |||
1112 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1108 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1113 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1109 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1114 | # CONFIG_USB_STORAGE_KARMA is not set | 1110 | # CONFIG_USB_STORAGE_KARMA is not set |
1111 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1115 | # CONFIG_USB_LIBUSUAL is not set | 1112 | # CONFIG_USB_LIBUSUAL is not set |
1116 | 1113 | ||
1117 | # | 1114 | # |
@@ -1153,14 +1150,11 @@ CONFIG_USB_MON=y | |||
1153 | # CONFIG_MMC is not set | 1150 | # CONFIG_MMC is not set |
1154 | # CONFIG_MEMSTICK is not set | 1151 | # CONFIG_MEMSTICK is not set |
1155 | # CONFIG_NEW_LEDS is not set | 1152 | # CONFIG_NEW_LEDS is not set |
1153 | # CONFIG_ACCESSIBILITY is not set | ||
1156 | # CONFIG_INFINIBAND is not set | 1154 | # CONFIG_INFINIBAND is not set |
1157 | # CONFIG_EDAC is not set | 1155 | # CONFIG_EDAC is not set |
1158 | # CONFIG_RTC_CLASS is not set | 1156 | # CONFIG_RTC_CLASS is not set |
1159 | # CONFIG_DMADEVICES is not set | 1157 | # CONFIG_DMADEVICES is not set |
1160 | |||
1161 | # | ||
1162 | # Userspace I/O | ||
1163 | # | ||
1164 | # CONFIG_UIO is not set | 1158 | # CONFIG_UIO is not set |
1165 | 1159 | ||
1166 | # | 1160 | # |
@@ -1180,7 +1174,6 @@ CONFIG_FS_MBCACHE=y | |||
1180 | # CONFIG_JFS_FS is not set | 1174 | # CONFIG_JFS_FS is not set |
1181 | # CONFIG_FS_POSIX_ACL is not set | 1175 | # CONFIG_FS_POSIX_ACL is not set |
1182 | # CONFIG_XFS_FS is not set | 1176 | # CONFIG_XFS_FS is not set |
1183 | # CONFIG_GFS2_FS is not set | ||
1184 | # CONFIG_OCFS2_FS is not set | 1177 | # CONFIG_OCFS2_FS is not set |
1185 | CONFIG_DNOTIFY=y | 1178 | CONFIG_DNOTIFY=y |
1186 | CONFIG_INOTIFY=y | 1179 | CONFIG_INOTIFY=y |
@@ -1314,6 +1307,7 @@ CONFIG_NLS_ISO8859_1=m | |||
1314 | # Library routines | 1307 | # Library routines |
1315 | # | 1308 | # |
1316 | CONFIG_BITREVERSE=y | 1309 | CONFIG_BITREVERSE=y |
1310 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1317 | CONFIG_CRC_CCITT=m | 1311 | CONFIG_CRC_CCITT=m |
1318 | # CONFIG_CRC16 is not set | 1312 | # CONFIG_CRC16 is not set |
1319 | # CONFIG_CRC_ITU_T is not set | 1313 | # CONFIG_CRC_ITU_T is not set |
@@ -1334,6 +1328,7 @@ CONFIG_HAVE_LMB=y | |||
1334 | # CONFIG_PRINTK_TIME is not set | 1328 | # CONFIG_PRINTK_TIME is not set |
1335 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1329 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1336 | CONFIG_ENABLE_MUST_CHECK=y | 1330 | CONFIG_ENABLE_MUST_CHECK=y |
1331 | CONFIG_FRAME_WARN=1024 | ||
1337 | CONFIG_MAGIC_SYSRQ=y | 1332 | CONFIG_MAGIC_SYSRQ=y |
1338 | # CONFIG_UNUSED_SYMBOLS is not set | 1333 | # CONFIG_UNUSED_SYMBOLS is not set |
1339 | # CONFIG_DEBUG_FS is not set | 1334 | # CONFIG_DEBUG_FS is not set |
@@ -1344,6 +1339,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1344 | CONFIG_SCHED_DEBUG=y | 1339 | CONFIG_SCHED_DEBUG=y |
1345 | # CONFIG_SCHEDSTATS is not set | 1340 | # CONFIG_SCHEDSTATS is not set |
1346 | # CONFIG_TIMER_STATS is not set | 1341 | # CONFIG_TIMER_STATS is not set |
1342 | # CONFIG_DEBUG_OBJECTS is not set | ||
1347 | # CONFIG_SLUB_DEBUG_ON is not set | 1343 | # CONFIG_SLUB_DEBUG_ON is not set |
1348 | # CONFIG_SLUB_STATS is not set | 1344 | # CONFIG_SLUB_STATS is not set |
1349 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1345 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1357,6 +1353,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y | |||
1357 | CONFIG_DEBUG_BUGVERBOSE=y | 1353 | CONFIG_DEBUG_BUGVERBOSE=y |
1358 | # CONFIG_DEBUG_INFO is not set | 1354 | # CONFIG_DEBUG_INFO is not set |
1359 | # CONFIG_DEBUG_VM is not set | 1355 | # CONFIG_DEBUG_VM is not set |
1356 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1360 | # CONFIG_DEBUG_LIST is not set | 1357 | # CONFIG_DEBUG_LIST is not set |
1361 | # CONFIG_DEBUG_SG is not set | 1358 | # CONFIG_DEBUG_SG is not set |
1362 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1359 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1371,6 +1368,7 @@ CONFIG_DEBUGGER=y | |||
1371 | CONFIG_XMON=y | 1368 | CONFIG_XMON=y |
1372 | CONFIG_XMON_DEFAULT=y | 1369 | CONFIG_XMON_DEFAULT=y |
1373 | CONFIG_XMON_DISASSEMBLY=y | 1370 | CONFIG_XMON_DISASSEMBLY=y |
1371 | CONFIG_IRQSTACKS=y | ||
1374 | # CONFIG_BDI_SWITCH is not set | 1372 | # CONFIG_BDI_SWITCH is not set |
1375 | # CONFIG_BOOTX_TEXT is not set | 1373 | # CONFIG_BOOTX_TEXT is not set |
1376 | # CONFIG_PPC_EARLY_DEBUG is not set | 1374 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1382,50 +1380,80 @@ CONFIG_XMON_DISASSEMBLY=y | |||
1382 | # CONFIG_SECURITY is not set | 1380 | # CONFIG_SECURITY is not set |
1383 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1381 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1384 | CONFIG_CRYPTO=y | 1382 | CONFIG_CRYPTO=y |
1383 | |||
1384 | # | ||
1385 | # Crypto core or helper | ||
1386 | # | ||
1385 | CONFIG_CRYPTO_ALGAPI=m | 1387 | CONFIG_CRYPTO_ALGAPI=m |
1386 | CONFIG_CRYPTO_BLKCIPHER=m | 1388 | CONFIG_CRYPTO_BLKCIPHER=m |
1387 | # CONFIG_CRYPTO_SEQIV is not set | ||
1388 | CONFIG_CRYPTO_MANAGER=m | 1389 | CONFIG_CRYPTO_MANAGER=m |
1390 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1391 | # CONFIG_CRYPTO_NULL is not set | ||
1392 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1393 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1394 | # CONFIG_CRYPTO_TEST is not set | ||
1395 | |||
1396 | # | ||
1397 | # Authenticated Encryption with Associated Data | ||
1398 | # | ||
1399 | # CONFIG_CRYPTO_CCM is not set | ||
1400 | # CONFIG_CRYPTO_GCM is not set | ||
1401 | # CONFIG_CRYPTO_SEQIV is not set | ||
1402 | |||
1403 | # | ||
1404 | # Block modes | ||
1405 | # | ||
1406 | CONFIG_CRYPTO_CBC=m | ||
1407 | # CONFIG_CRYPTO_CTR is not set | ||
1408 | # CONFIG_CRYPTO_CTS is not set | ||
1409 | CONFIG_CRYPTO_ECB=m | ||
1410 | # CONFIG_CRYPTO_LRW is not set | ||
1411 | CONFIG_CRYPTO_PCBC=m | ||
1412 | # CONFIG_CRYPTO_XTS is not set | ||
1413 | |||
1414 | # | ||
1415 | # Hash modes | ||
1416 | # | ||
1389 | # CONFIG_CRYPTO_HMAC is not set | 1417 | # CONFIG_CRYPTO_HMAC is not set |
1390 | # CONFIG_CRYPTO_XCBC is not set | 1418 | # CONFIG_CRYPTO_XCBC is not set |
1391 | # CONFIG_CRYPTO_NULL is not set | 1419 | |
1420 | # | ||
1421 | # Digest | ||
1422 | # | ||
1423 | # CONFIG_CRYPTO_CRC32C is not set | ||
1392 | # CONFIG_CRYPTO_MD4 is not set | 1424 | # CONFIG_CRYPTO_MD4 is not set |
1393 | # CONFIG_CRYPTO_MD5 is not set | 1425 | # CONFIG_CRYPTO_MD5 is not set |
1426 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1394 | CONFIG_CRYPTO_SHA1=m | 1427 | CONFIG_CRYPTO_SHA1=m |
1395 | # CONFIG_CRYPTO_SHA256 is not set | 1428 | # CONFIG_CRYPTO_SHA256 is not set |
1396 | # CONFIG_CRYPTO_SHA512 is not set | 1429 | # CONFIG_CRYPTO_SHA512 is not set |
1397 | # CONFIG_CRYPTO_WP512 is not set | ||
1398 | # CONFIG_CRYPTO_TGR192 is not set | 1430 | # CONFIG_CRYPTO_TGR192 is not set |
1399 | # CONFIG_CRYPTO_GF128MUL is not set | 1431 | # CONFIG_CRYPTO_WP512 is not set |
1400 | CONFIG_CRYPTO_ECB=m | 1432 | |
1401 | CONFIG_CRYPTO_CBC=m | 1433 | # |
1402 | CONFIG_CRYPTO_PCBC=m | 1434 | # Ciphers |
1403 | # CONFIG_CRYPTO_LRW is not set | 1435 | # |
1404 | # CONFIG_CRYPTO_XTS is not set | ||
1405 | # CONFIG_CRYPTO_CTR is not set | ||
1406 | # CONFIG_CRYPTO_GCM is not set | ||
1407 | # CONFIG_CRYPTO_CCM is not set | ||
1408 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1409 | # CONFIG_CRYPTO_DES is not set | ||
1410 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1411 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1412 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1413 | # CONFIG_CRYPTO_SERPENT is not set | ||
1414 | # CONFIG_CRYPTO_AES is not set | 1436 | # CONFIG_CRYPTO_AES is not set |
1437 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1438 | CONFIG_CRYPTO_ARC4=m | ||
1439 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1440 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1415 | # CONFIG_CRYPTO_CAST5 is not set | 1441 | # CONFIG_CRYPTO_CAST5 is not set |
1416 | # CONFIG_CRYPTO_CAST6 is not set | 1442 | # CONFIG_CRYPTO_CAST6 is not set |
1417 | # CONFIG_CRYPTO_TEA is not set | 1443 | # CONFIG_CRYPTO_DES is not set |
1418 | CONFIG_CRYPTO_ARC4=m | 1444 | # CONFIG_CRYPTO_FCRYPT is not set |
1419 | # CONFIG_CRYPTO_KHAZAD is not set | 1445 | # CONFIG_CRYPTO_KHAZAD is not set |
1420 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1421 | # CONFIG_CRYPTO_SEED is not set | ||
1422 | # CONFIG_CRYPTO_SALSA20 is not set | 1446 | # CONFIG_CRYPTO_SALSA20 is not set |
1447 | # CONFIG_CRYPTO_SEED is not set | ||
1448 | # CONFIG_CRYPTO_SERPENT is not set | ||
1449 | # CONFIG_CRYPTO_TEA is not set | ||
1450 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1451 | |||
1452 | # | ||
1453 | # Compression | ||
1454 | # | ||
1423 | # CONFIG_CRYPTO_DEFLATE is not set | 1455 | # CONFIG_CRYPTO_DEFLATE is not set |
1424 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1425 | # CONFIG_CRYPTO_CRC32C is not set | ||
1426 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1427 | # CONFIG_CRYPTO_TEST is not set | ||
1428 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1429 | # CONFIG_CRYPTO_LZO is not set | 1456 | # CONFIG_CRYPTO_LZO is not set |
1430 | # CONFIG_CRYPTO_HW is not set | 1457 | # CONFIG_CRYPTO_HW is not set |
1431 | # CONFIG_PPC_CLOCK is not set | 1458 | # CONFIG_PPC_CLOCK is not set |
1459 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index 2b1504e0a111..ba2a463b9305 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:09 2008 | 4 | # Mon Jun 9 08:52:09 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
@@ -70,18 +72,16 @@ CONFIG_IKCONFIG=y | |||
70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
73 | CONFIG_GROUP_SCHED=y | ||
74 | CONFIG_FAIR_GROUP_SCHED=y | ||
75 | CONFIG_USER_SCHED=y | ||
76 | # CONFIG_CGROUP_SCHED is not set | ||
77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
81 | # CONFIG_BLK_DEV_INITRD is not set | 79 | # CONFIG_BLK_DEV_INITRD is not set |
80 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
82 | CONFIG_SYSCTL=y | 81 | CONFIG_SYSCTL=y |
83 | CONFIG_EMBEDDED=y | 82 | CONFIG_EMBEDDED=y |
84 | CONFIG_SYSCTL_SYSCALL=y | 83 | CONFIG_SYSCTL_SYSCALL=y |
84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
85 | CONFIG_KALLSYMS=y | 85 | CONFIG_KALLSYMS=y |
86 | CONFIG_KALLSYMS_ALL=y | 86 | CONFIG_KALLSYMS_ALL=y |
87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -107,6 +107,7 @@ CONFIG_SLAB=y | |||
107 | CONFIG_HAVE_OPROFILE=y | 107 | CONFIG_HAVE_OPROFILE=y |
108 | CONFIG_HAVE_KPROBES=y | 108 | CONFIG_HAVE_KPROBES=y |
109 | CONFIG_HAVE_KRETPROBES=y | 109 | CONFIG_HAVE_KRETPROBES=y |
110 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
110 | CONFIG_PROC_PAGE_MONITOR=y | 111 | CONFIG_PROC_PAGE_MONITOR=y |
111 | CONFIG_SLABINFO=y | 112 | CONFIG_SLABINFO=y |
112 | CONFIG_RT_MUTEXES=y | 113 | CONFIG_RT_MUTEXES=y |
@@ -194,11 +195,13 @@ CONFIG_FLATMEM=y | |||
194 | CONFIG_FLAT_NODE_MEM_MAP=y | 195 | CONFIG_FLAT_NODE_MEM_MAP=y |
195 | # CONFIG_SPARSEMEM_STATIC is not set | 196 | # CONFIG_SPARSEMEM_STATIC is not set |
196 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 197 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
198 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
197 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
198 | # CONFIG_RESOURCES_64BIT is not set | 200 | # CONFIG_RESOURCES_64BIT is not set |
199 | CONFIG_ZONE_DMA_FLAG=1 | 201 | CONFIG_ZONE_DMA_FLAG=1 |
200 | CONFIG_BOUNCE=y | 202 | CONFIG_BOUNCE=y |
201 | CONFIG_VIRT_TO_BUS=y | 203 | CONFIG_VIRT_TO_BUS=y |
204 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
202 | CONFIG_PROC_DEVICETREE=y | 205 | CONFIG_PROC_DEVICETREE=y |
203 | # CONFIG_CMDLINE_BOOL is not set | 206 | # CONFIG_CMDLINE_BOOL is not set |
204 | # CONFIG_PM is not set | 207 | # CONFIG_PM is not set |
@@ -215,6 +218,7 @@ CONFIG_FSL_SOC=y | |||
215 | # CONFIG_PCI_SYSCALL is not set | 218 | # CONFIG_PCI_SYSCALL is not set |
216 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 219 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
217 | # CONFIG_PCCARD is not set | 220 | # CONFIG_PCCARD is not set |
221 | # CONFIG_HAS_RAPIDIO is not set | ||
218 | 222 | ||
219 | # | 223 | # |
220 | # Advanced setup | 224 | # Advanced setup |
@@ -224,11 +228,11 @@ CONFIG_FSL_SOC=y | |||
224 | # | 228 | # |
225 | # Default settings for advanced configuration options are used | 229 | # Default settings for advanced configuration options are used |
226 | # | 230 | # |
227 | CONFIG_HIGHMEM_START=0xfe000000 | ||
228 | CONFIG_LOWMEM_SIZE=0x30000000 | 231 | CONFIG_LOWMEM_SIZE=0x30000000 |
232 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
229 | CONFIG_KERNEL_START=0xc0000000 | 233 | CONFIG_KERNEL_START=0xc0000000 |
234 | CONFIG_PHYSICAL_START=0x00000000 | ||
230 | CONFIG_TASK_SIZE=0xc0000000 | 235 | CONFIG_TASK_SIZE=0xc0000000 |
231 | CONFIG_BOOT_LOAD=0x00400000 | ||
232 | 236 | ||
233 | # | 237 | # |
234 | # Networking | 238 | # Networking |
@@ -283,6 +287,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
283 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 287 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
284 | CONFIG_INET6_XFRM_MODE_BEET=y | 288 | CONFIG_INET6_XFRM_MODE_BEET=y |
285 | CONFIG_IPV6_SIT=y | 289 | CONFIG_IPV6_SIT=y |
290 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
286 | # CONFIG_IPV6_TUNNEL is not set | 291 | # CONFIG_IPV6_TUNNEL is not set |
287 | # CONFIG_NETWORK_SECMARK is not set | 292 | # CONFIG_NETWORK_SECMARK is not set |
288 | CONFIG_NETFILTER=y | 293 | CONFIG_NETFILTER=y |
@@ -498,6 +503,7 @@ CONFIG_NETDEV_10000=y | |||
498 | # | 503 | # |
499 | # CONFIG_WLAN_PRE80211 is not set | 504 | # CONFIG_WLAN_PRE80211 is not set |
500 | # CONFIG_WLAN_80211 is not set | 505 | # CONFIG_WLAN_80211 is not set |
506 | # CONFIG_IWLWIFI_LEDS is not set | ||
501 | # CONFIG_WAN is not set | 507 | # CONFIG_WAN is not set |
502 | # CONFIG_PPP is not set | 508 | # CONFIG_PPP is not set |
503 | # CONFIG_SLIP is not set | 509 | # CONFIG_SLIP is not set |
@@ -521,6 +527,7 @@ CONFIG_NETDEV_10000=y | |||
521 | # Character devices | 527 | # Character devices |
522 | # | 528 | # |
523 | # CONFIG_VT is not set | 529 | # CONFIG_VT is not set |
530 | CONFIG_DEVKMEM=y | ||
524 | # CONFIG_SERIAL_NONSTANDARD is not set | 531 | # CONFIG_SERIAL_NONSTANDARD is not set |
525 | 532 | ||
526 | # | 533 | # |
@@ -552,12 +559,7 @@ CONFIG_HW_RANDOM=y | |||
552 | # CONFIG_R3964 is not set | 559 | # CONFIG_R3964 is not set |
553 | # CONFIG_RAW_DRIVER is not set | 560 | # CONFIG_RAW_DRIVER is not set |
554 | # CONFIG_I2C is not set | 561 | # CONFIG_I2C is not set |
555 | |||
556 | # | ||
557 | # SPI support | ||
558 | # | ||
559 | # CONFIG_SPI is not set | 562 | # CONFIG_SPI is not set |
560 | # CONFIG_SPI_MASTER is not set | ||
561 | # CONFIG_W1 is not set | 563 | # CONFIG_W1 is not set |
562 | # CONFIG_POWER_SUPPLY is not set | 564 | # CONFIG_POWER_SUPPLY is not set |
563 | # CONFIG_HWMON is not set | 565 | # CONFIG_HWMON is not set |
@@ -574,12 +576,22 @@ CONFIG_SSB_POSSIBLE=y | |||
574 | # Multifunction device drivers | 576 | # Multifunction device drivers |
575 | # | 577 | # |
576 | # CONFIG_MFD_SM501 is not set | 578 | # CONFIG_MFD_SM501 is not set |
579 | # CONFIG_HTC_PASIC3 is not set | ||
577 | 580 | ||
578 | # | 581 | # |
579 | # Multimedia devices | 582 | # Multimedia devices |
580 | # | 583 | # |
584 | |||
585 | # | ||
586 | # Multimedia core support | ||
587 | # | ||
581 | # CONFIG_VIDEO_DEV is not set | 588 | # CONFIG_VIDEO_DEV is not set |
582 | # CONFIG_DVB_CORE is not set | 589 | # CONFIG_DVB_CORE is not set |
590 | # CONFIG_VIDEO_MEDIA is not set | ||
591 | |||
592 | # | ||
593 | # Multimedia drivers | ||
594 | # | ||
583 | CONFIG_DAB=y | 595 | CONFIG_DAB=y |
584 | 596 | ||
585 | # | 597 | # |
@@ -603,12 +615,9 @@ CONFIG_DAB=y | |||
603 | # CONFIG_MMC is not set | 615 | # CONFIG_MMC is not set |
604 | # CONFIG_MEMSTICK is not set | 616 | # CONFIG_MEMSTICK is not set |
605 | # CONFIG_NEW_LEDS is not set | 617 | # CONFIG_NEW_LEDS is not set |
618 | # CONFIG_ACCESSIBILITY is not set | ||
606 | # CONFIG_RTC_CLASS is not set | 619 | # CONFIG_RTC_CLASS is not set |
607 | # CONFIG_DMADEVICES is not set | 620 | # CONFIG_DMADEVICES is not set |
608 | |||
609 | # | ||
610 | # Userspace I/O | ||
611 | # | ||
612 | # CONFIG_UIO is not set | 621 | # CONFIG_UIO is not set |
613 | 622 | ||
614 | # | 623 | # |
@@ -675,7 +684,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
675 | CONFIG_NFS_FS=y | 684 | CONFIG_NFS_FS=y |
676 | CONFIG_NFS_V3=y | 685 | CONFIG_NFS_V3=y |
677 | # CONFIG_NFS_V3_ACL is not set | 686 | # CONFIG_NFS_V3_ACL is not set |
678 | # CONFIG_NFS_DIRECTIO is not set | ||
679 | # CONFIG_NFSD is not set | 687 | # CONFIG_NFSD is not set |
680 | CONFIG_ROOT_NFS=y | 688 | CONFIG_ROOT_NFS=y |
681 | CONFIG_LOCKD=y | 689 | CONFIG_LOCKD=y |
@@ -752,6 +760,7 @@ CONFIG_NLS_UTF8=y | |||
752 | # | 760 | # |
753 | # Library routines | 761 | # Library routines |
754 | # | 762 | # |
763 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
755 | # CONFIG_CRC_CCITT is not set | 764 | # CONFIG_CRC_CCITT is not set |
756 | # CONFIG_CRC16 is not set | 765 | # CONFIG_CRC16 is not set |
757 | # CONFIG_CRC_ITU_T is not set | 766 | # CONFIG_CRC_ITU_T is not set |
@@ -763,6 +772,7 @@ CONFIG_PLIST=y | |||
763 | CONFIG_HAS_IOMEM=y | 772 | CONFIG_HAS_IOMEM=y |
764 | CONFIG_HAS_IOPORT=y | 773 | CONFIG_HAS_IOPORT=y |
765 | CONFIG_HAS_DMA=y | 774 | CONFIG_HAS_DMA=y |
775 | CONFIG_HAVE_LMB=y | ||
766 | 776 | ||
767 | # | 777 | # |
768 | # Kernel hacking | 778 | # Kernel hacking |
@@ -770,6 +780,7 @@ CONFIG_HAS_DMA=y | |||
770 | # CONFIG_PRINTK_TIME is not set | 780 | # CONFIG_PRINTK_TIME is not set |
771 | CONFIG_ENABLE_WARN_DEPRECATED=y | 781 | CONFIG_ENABLE_WARN_DEPRECATED=y |
772 | CONFIG_ENABLE_MUST_CHECK=y | 782 | CONFIG_ENABLE_MUST_CHECK=y |
783 | CONFIG_FRAME_WARN=1024 | ||
773 | CONFIG_MAGIC_SYSRQ=y | 784 | CONFIG_MAGIC_SYSRQ=y |
774 | # CONFIG_UNUSED_SYMBOLS is not set | 785 | # CONFIG_UNUSED_SYMBOLS is not set |
775 | # CONFIG_DEBUG_FS is not set | 786 | # CONFIG_DEBUG_FS is not set |
@@ -780,6 +791,7 @@ CONFIG_DEBUG_KERNEL=y | |||
780 | # CONFIG_SCHED_DEBUG is not set | 791 | # CONFIG_SCHED_DEBUG is not set |
781 | # CONFIG_SCHEDSTATS is not set | 792 | # CONFIG_SCHEDSTATS is not set |
782 | # CONFIG_TIMER_STATS is not set | 793 | # CONFIG_TIMER_STATS is not set |
794 | # CONFIG_DEBUG_OBJECTS is not set | ||
783 | # CONFIG_DEBUG_SLAB is not set | 795 | # CONFIG_DEBUG_SLAB is not set |
784 | # CONFIG_DEBUG_RT_MUTEXES is not set | 796 | # CONFIG_DEBUG_RT_MUTEXES is not set |
785 | # CONFIG_RT_MUTEX_TESTER is not set | 797 | # CONFIG_RT_MUTEX_TESTER is not set |
@@ -791,6 +803,7 @@ CONFIG_DEBUG_KERNEL=y | |||
791 | CONFIG_DEBUG_BUGVERBOSE=y | 803 | CONFIG_DEBUG_BUGVERBOSE=y |
792 | CONFIG_DEBUG_INFO=y | 804 | CONFIG_DEBUG_INFO=y |
793 | # CONFIG_DEBUG_VM is not set | 805 | # CONFIG_DEBUG_VM is not set |
806 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
794 | # CONFIG_DEBUG_LIST is not set | 807 | # CONFIG_DEBUG_LIST is not set |
795 | # CONFIG_DEBUG_SG is not set | 808 | # CONFIG_DEBUG_SG is not set |
796 | # CONFIG_BOOT_PRINTK_DELAY is not set | 809 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -802,6 +815,7 @@ CONFIG_DEBUG_INFO=y | |||
802 | # CONFIG_DEBUG_PAGEALLOC is not set | 815 | # CONFIG_DEBUG_PAGEALLOC is not set |
803 | # CONFIG_DEBUGGER is not set | 816 | # CONFIG_DEBUGGER is not set |
804 | # CONFIG_KGDB_CONSOLE is not set | 817 | # CONFIG_KGDB_CONSOLE is not set |
818 | # CONFIG_IRQSTACKS is not set | ||
805 | CONFIG_BDI_SWITCH=y | 819 | CONFIG_BDI_SWITCH=y |
806 | # CONFIG_PPC_EARLY_DEBUG is not set | 820 | # CONFIG_PPC_EARLY_DEBUG is not set |
807 | 821 | ||
@@ -811,45 +825,75 @@ CONFIG_BDI_SWITCH=y | |||
811 | # CONFIG_KEYS is not set | 825 | # CONFIG_KEYS is not set |
812 | # CONFIG_SECURITY is not set | 826 | # CONFIG_SECURITY is not set |
813 | CONFIG_CRYPTO=y | 827 | CONFIG_CRYPTO=y |
828 | |||
829 | # | ||
830 | # Crypto core or helper | ||
831 | # | ||
814 | CONFIG_CRYPTO_ALGAPI=y | 832 | CONFIG_CRYPTO_ALGAPI=y |
815 | CONFIG_CRYPTO_BLKCIPHER=y | 833 | CONFIG_CRYPTO_BLKCIPHER=y |
816 | # CONFIG_CRYPTO_SEQIV is not set | ||
817 | CONFIG_CRYPTO_MANAGER=y | 834 | CONFIG_CRYPTO_MANAGER=y |
818 | # CONFIG_CRYPTO_HMAC is not set | ||
819 | # CONFIG_CRYPTO_NULL is not set | 835 | # CONFIG_CRYPTO_NULL is not set |
836 | # CONFIG_CRYPTO_CRYPTD is not set | ||
837 | # CONFIG_CRYPTO_AUTHENC is not set | ||
838 | |||
839 | # | ||
840 | # Authenticated Encryption with Associated Data | ||
841 | # | ||
842 | # CONFIG_CRYPTO_CCM is not set | ||
843 | # CONFIG_CRYPTO_GCM is not set | ||
844 | # CONFIG_CRYPTO_SEQIV is not set | ||
845 | |||
846 | # | ||
847 | # Block modes | ||
848 | # | ||
849 | CONFIG_CRYPTO_CBC=y | ||
850 | # CONFIG_CRYPTO_CTR is not set | ||
851 | # CONFIG_CRYPTO_CTS is not set | ||
852 | CONFIG_CRYPTO_ECB=y | ||
853 | CONFIG_CRYPTO_PCBC=y | ||
854 | |||
855 | # | ||
856 | # Hash modes | ||
857 | # | ||
858 | # CONFIG_CRYPTO_HMAC is not set | ||
859 | |||
860 | # | ||
861 | # Digest | ||
862 | # | ||
863 | # CONFIG_CRYPTO_CRC32C is not set | ||
820 | # CONFIG_CRYPTO_MD4 is not set | 864 | # CONFIG_CRYPTO_MD4 is not set |
821 | CONFIG_CRYPTO_MD5=y | 865 | CONFIG_CRYPTO_MD5=y |
866 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
822 | # CONFIG_CRYPTO_SHA1 is not set | 867 | # CONFIG_CRYPTO_SHA1 is not set |
823 | # CONFIG_CRYPTO_SHA256 is not set | 868 | # CONFIG_CRYPTO_SHA256 is not set |
824 | # CONFIG_CRYPTO_SHA512 is not set | 869 | # CONFIG_CRYPTO_SHA512 is not set |
825 | # CONFIG_CRYPTO_WP512 is not set | ||
826 | # CONFIG_CRYPTO_TGR192 is not set | 870 | # CONFIG_CRYPTO_TGR192 is not set |
827 | CONFIG_CRYPTO_ECB=y | 871 | # CONFIG_CRYPTO_WP512 is not set |
828 | CONFIG_CRYPTO_CBC=y | 872 | |
829 | CONFIG_CRYPTO_PCBC=y | 873 | # |
830 | # CONFIG_CRYPTO_CTR is not set | 874 | # Ciphers |
831 | # CONFIG_CRYPTO_GCM is not set | 875 | # |
832 | # CONFIG_CRYPTO_CCM is not set | ||
833 | # CONFIG_CRYPTO_CRYPTD is not set | ||
834 | CONFIG_CRYPTO_DES=y | ||
835 | # CONFIG_CRYPTO_FCRYPT is not set | ||
836 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
837 | # CONFIG_CRYPTO_TWOFISH is not set | ||
838 | # CONFIG_CRYPTO_SERPENT is not set | ||
839 | # CONFIG_CRYPTO_AES is not set | 876 | # CONFIG_CRYPTO_AES is not set |
877 | # CONFIG_CRYPTO_ANUBIS is not set | ||
878 | # CONFIG_CRYPTO_ARC4 is not set | ||
879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
880 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
840 | # CONFIG_CRYPTO_CAST5 is not set | 881 | # CONFIG_CRYPTO_CAST5 is not set |
841 | # CONFIG_CRYPTO_CAST6 is not set | 882 | # CONFIG_CRYPTO_CAST6 is not set |
842 | # CONFIG_CRYPTO_TEA is not set | 883 | CONFIG_CRYPTO_DES=y |
843 | # CONFIG_CRYPTO_ARC4 is not set | 884 | # CONFIG_CRYPTO_FCRYPT is not set |
844 | # CONFIG_CRYPTO_KHAZAD is not set | 885 | # CONFIG_CRYPTO_KHAZAD is not set |
845 | # CONFIG_CRYPTO_ANUBIS is not set | ||
846 | # CONFIG_CRYPTO_SEED is not set | 886 | # CONFIG_CRYPTO_SEED is not set |
887 | # CONFIG_CRYPTO_SERPENT is not set | ||
888 | # CONFIG_CRYPTO_TEA is not set | ||
889 | # CONFIG_CRYPTO_TWOFISH is not set | ||
890 | |||
891 | # | ||
892 | # Compression | ||
893 | # | ||
847 | # CONFIG_CRYPTO_DEFLATE is not set | 894 | # CONFIG_CRYPTO_DEFLATE is not set |
848 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
849 | # CONFIG_CRYPTO_CRC32C is not set | ||
850 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
851 | # CONFIG_CRYPTO_AUTHENC is not set | ||
852 | # CONFIG_CRYPTO_LZO is not set | 895 | # CONFIG_CRYPTO_LZO is not set |
853 | # CONFIG_CRYPTO_HW is not set | 896 | # CONFIG_CRYPTO_HW is not set |
854 | # CONFIG_PPC_CLOCK is not set | 897 | # CONFIG_PPC_CLOCK is not set |
855 | CONFIG_PPC_LIB_RHEAP=y | 898 | CONFIG_PPC_LIB_RHEAP=y |
899 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index 125b4764aadd..ac72b48542dc 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:10 2008 | 4 | # Mon Jun 9 08:52:09 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
31 | CONFIG_STACKTRACE_SUPPORT=y | ||
32 | CONFIG_LOCKDEP_SUPPORT=y | ||
31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
@@ -108,6 +110,7 @@ CONFIG_SLUB=y | |||
108 | CONFIG_HAVE_OPROFILE=y | 110 | CONFIG_HAVE_OPROFILE=y |
109 | CONFIG_HAVE_KPROBES=y | 111 | CONFIG_HAVE_KPROBES=y |
110 | CONFIG_HAVE_KRETPROBES=y | 112 | CONFIG_HAVE_KRETPROBES=y |
113 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
111 | CONFIG_PROC_PAGE_MONITOR=y | 114 | CONFIG_PROC_PAGE_MONITOR=y |
112 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
113 | # CONFIG_TINY_SHMEM is not set | 116 | # CONFIG_TINY_SHMEM is not set |
@@ -212,11 +215,13 @@ CONFIG_FLATMEM=y | |||
212 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
213 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
216 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
217 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
218 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
219 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
220 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
221 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
222 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
@@ -234,6 +239,7 @@ CONFIG_FSL_SOC=y | |||
234 | # CONFIG_PCI_QSPAN is not set | 239 | # CONFIG_PCI_QSPAN is not set |
235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
236 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
242 | # CONFIG_HAS_RAPIDIO is not set | ||
237 | 243 | ||
238 | # | 244 | # |
239 | # Advanced setup | 245 | # Advanced setup |
@@ -243,13 +249,13 @@ CONFIG_FSL_SOC=y | |||
243 | # | 249 | # |
244 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
245 | # | 251 | # |
246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
247 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
248 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
255 | CONFIG_PHYSICAL_START=0x00000000 | ||
249 | CONFIG_TASK_SIZE=0x80000000 | 256 | CONFIG_TASK_SIZE=0x80000000 |
250 | CONFIG_CONSISTENT_START=0xfd000000 | 257 | CONFIG_CONSISTENT_START=0xfd000000 |
251 | CONFIG_CONSISTENT_SIZE=0x00200000 | 258 | CONFIG_CONSISTENT_SIZE=0x00200000 |
252 | CONFIG_BOOT_LOAD=0x00400000 | ||
253 | 259 | ||
254 | # | 260 | # |
255 | # Networking | 261 | # Networking |
@@ -292,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
292 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
293 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
294 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
295 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
296 | # CONFIG_INET6_TUNNEL is not set | ||
297 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
298 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
299 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
@@ -481,6 +485,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
481 | # | 485 | # |
482 | # CONFIG_WLAN_PRE80211 is not set | 486 | # CONFIG_WLAN_PRE80211 is not set |
483 | # CONFIG_WLAN_80211 is not set | 487 | # CONFIG_WLAN_80211 is not set |
488 | # CONFIG_IWLWIFI_LEDS is not set | ||
484 | # CONFIG_WAN is not set | 489 | # CONFIG_WAN is not set |
485 | # CONFIG_PPP is not set | 490 | # CONFIG_PPP is not set |
486 | # CONFIG_SLIP is not set | 491 | # CONFIG_SLIP is not set |
@@ -505,6 +510,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
505 | # Character devices | 510 | # Character devices |
506 | # | 511 | # |
507 | # CONFIG_VT is not set | 512 | # CONFIG_VT is not set |
513 | CONFIG_DEVKMEM=y | ||
508 | # CONFIG_SERIAL_NONSTANDARD is not set | 514 | # CONFIG_SERIAL_NONSTANDARD is not set |
509 | 515 | ||
510 | # | 516 | # |
@@ -537,12 +543,7 @@ CONFIG_GEN_RTC=y | |||
537 | # CONFIG_RAW_DRIVER is not set | 543 | # CONFIG_RAW_DRIVER is not set |
538 | # CONFIG_TCG_TPM is not set | 544 | # CONFIG_TCG_TPM is not set |
539 | # CONFIG_I2C is not set | 545 | # CONFIG_I2C is not set |
540 | |||
541 | # | ||
542 | # SPI support | ||
543 | # | ||
544 | # CONFIG_SPI is not set | 546 | # CONFIG_SPI is not set |
545 | # CONFIG_SPI_MASTER is not set | ||
546 | # CONFIG_W1 is not set | 547 | # CONFIG_W1 is not set |
547 | # CONFIG_POWER_SUPPLY is not set | 548 | # CONFIG_POWER_SUPPLY is not set |
548 | # CONFIG_HWMON is not set | 549 | # CONFIG_HWMON is not set |
@@ -559,12 +560,22 @@ CONFIG_SSB_POSSIBLE=y | |||
559 | # Multifunction device drivers | 560 | # Multifunction device drivers |
560 | # | 561 | # |
561 | # CONFIG_MFD_SM501 is not set | 562 | # CONFIG_MFD_SM501 is not set |
563 | # CONFIG_HTC_PASIC3 is not set | ||
562 | 564 | ||
563 | # | 565 | # |
564 | # Multimedia devices | 566 | # Multimedia devices |
565 | # | 567 | # |
568 | |||
569 | # | ||
570 | # Multimedia core support | ||
571 | # | ||
566 | # CONFIG_VIDEO_DEV is not set | 572 | # CONFIG_VIDEO_DEV is not set |
567 | # CONFIG_DVB_CORE is not set | 573 | # CONFIG_DVB_CORE is not set |
574 | # CONFIG_VIDEO_MEDIA is not set | ||
575 | |||
576 | # | ||
577 | # Multimedia drivers | ||
578 | # | ||
568 | CONFIG_DAB=y | 579 | CONFIG_DAB=y |
569 | 580 | ||
570 | # | 581 | # |
@@ -588,13 +599,10 @@ CONFIG_DAB=y | |||
588 | # CONFIG_MMC is not set | 599 | # CONFIG_MMC is not set |
589 | # CONFIG_MEMSTICK is not set | 600 | # CONFIG_MEMSTICK is not set |
590 | # CONFIG_NEW_LEDS is not set | 601 | # CONFIG_NEW_LEDS is not set |
602 | # CONFIG_ACCESSIBILITY is not set | ||
591 | # CONFIG_EDAC is not set | 603 | # CONFIG_EDAC is not set |
592 | # CONFIG_RTC_CLASS is not set | 604 | # CONFIG_RTC_CLASS is not set |
593 | # CONFIG_DMADEVICES is not set | 605 | # CONFIG_DMADEVICES is not set |
594 | |||
595 | # | ||
596 | # Userspace I/O | ||
597 | # | ||
598 | # CONFIG_UIO is not set | 606 | # CONFIG_UIO is not set |
599 | 607 | ||
600 | # | 608 | # |
@@ -607,7 +615,6 @@ CONFIG_DAB=y | |||
607 | # CONFIG_JFS_FS is not set | 615 | # CONFIG_JFS_FS is not set |
608 | # CONFIG_FS_POSIX_ACL is not set | 616 | # CONFIG_FS_POSIX_ACL is not set |
609 | # CONFIG_XFS_FS is not set | 617 | # CONFIG_XFS_FS is not set |
610 | # CONFIG_GFS2_FS is not set | ||
611 | # CONFIG_OCFS2_FS is not set | 618 | # CONFIG_OCFS2_FS is not set |
612 | # CONFIG_DNOTIFY is not set | 619 | # CONFIG_DNOTIFY is not set |
613 | # CONFIG_INOTIFY is not set | 620 | # CONFIG_INOTIFY is not set |
@@ -665,7 +672,6 @@ CONFIG_NFS_FS=y | |||
665 | CONFIG_NFS_V3=y | 672 | CONFIG_NFS_V3=y |
666 | # CONFIG_NFS_V3_ACL is not set | 673 | # CONFIG_NFS_V3_ACL is not set |
667 | # CONFIG_NFS_V4 is not set | 674 | # CONFIG_NFS_V4 is not set |
668 | # CONFIG_NFS_DIRECTIO is not set | ||
669 | # CONFIG_NFSD is not set | 675 | # CONFIG_NFSD is not set |
670 | CONFIG_ROOT_NFS=y | 676 | CONFIG_ROOT_NFS=y |
671 | CONFIG_LOCKD=y | 677 | CONFIG_LOCKD=y |
@@ -708,6 +714,7 @@ CONFIG_MSDOS_PARTITION=y | |||
708 | # | 714 | # |
709 | # Library routines | 715 | # Library routines |
710 | # | 716 | # |
717 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
711 | # CONFIG_CRC_CCITT is not set | 718 | # CONFIG_CRC_CCITT is not set |
712 | # CONFIG_CRC16 is not set | 719 | # CONFIG_CRC16 is not set |
713 | # CONFIG_CRC_ITU_T is not set | 720 | # CONFIG_CRC_ITU_T is not set |
@@ -718,6 +725,7 @@ CONFIG_ZLIB_INFLATE=y | |||
718 | CONFIG_HAS_IOMEM=y | 725 | CONFIG_HAS_IOMEM=y |
719 | CONFIG_HAS_IOPORT=y | 726 | CONFIG_HAS_IOPORT=y |
720 | CONFIG_HAS_DMA=y | 727 | CONFIG_HAS_DMA=y |
728 | CONFIG_HAVE_LMB=y | ||
721 | 729 | ||
722 | # | 730 | # |
723 | # Kernel hacking | 731 | # Kernel hacking |
@@ -725,6 +733,7 @@ CONFIG_HAS_DMA=y | |||
725 | # CONFIG_PRINTK_TIME is not set | 733 | # CONFIG_PRINTK_TIME is not set |
726 | CONFIG_ENABLE_WARN_DEPRECATED=y | 734 | CONFIG_ENABLE_WARN_DEPRECATED=y |
727 | CONFIG_ENABLE_MUST_CHECK=y | 735 | CONFIG_ENABLE_MUST_CHECK=y |
736 | CONFIG_FRAME_WARN=1024 | ||
728 | CONFIG_MAGIC_SYSRQ=y | 737 | CONFIG_MAGIC_SYSRQ=y |
729 | # CONFIG_UNUSED_SYMBOLS is not set | 738 | # CONFIG_UNUSED_SYMBOLS is not set |
730 | # CONFIG_DEBUG_FS is not set | 739 | # CONFIG_DEBUG_FS is not set |
@@ -735,6 +744,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
735 | CONFIG_SCHED_DEBUG=y | 744 | CONFIG_SCHED_DEBUG=y |
736 | # CONFIG_SCHEDSTATS is not set | 745 | # CONFIG_SCHEDSTATS is not set |
737 | # CONFIG_TIMER_STATS is not set | 746 | # CONFIG_TIMER_STATS is not set |
747 | # CONFIG_DEBUG_OBJECTS is not set | ||
738 | # CONFIG_SLUB_DEBUG_ON is not set | 748 | # CONFIG_SLUB_DEBUG_ON is not set |
739 | # CONFIG_SLUB_STATS is not set | 749 | # CONFIG_SLUB_STATS is not set |
740 | # CONFIG_DEBUG_SPINLOCK is not set | 750 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -745,6 +755,7 @@ CONFIG_SCHED_DEBUG=y | |||
745 | CONFIG_DEBUG_BUGVERBOSE=y | 755 | CONFIG_DEBUG_BUGVERBOSE=y |
746 | CONFIG_DEBUG_INFO=y | 756 | CONFIG_DEBUG_INFO=y |
747 | # CONFIG_DEBUG_VM is not set | 757 | # CONFIG_DEBUG_VM is not set |
758 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
748 | # CONFIG_DEBUG_LIST is not set | 759 | # CONFIG_DEBUG_LIST is not set |
749 | # CONFIG_DEBUG_SG is not set | 760 | # CONFIG_DEBUG_SG is not set |
750 | # CONFIG_BOOT_PRINTK_DELAY is not set | 761 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -755,6 +766,7 @@ CONFIG_DEBUG_INFO=y | |||
755 | # CONFIG_DEBUG_STACK_USAGE is not set | 766 | # CONFIG_DEBUG_STACK_USAGE is not set |
756 | # CONFIG_DEBUG_PAGEALLOC is not set | 767 | # CONFIG_DEBUG_PAGEALLOC is not set |
757 | # CONFIG_DEBUGGER is not set | 768 | # CONFIG_DEBUGGER is not set |
769 | # CONFIG_IRQSTACKS is not set | ||
758 | # CONFIG_BDI_SWITCH is not set | 770 | # CONFIG_BDI_SWITCH is not set |
759 | # CONFIG_PPC_EARLY_DEBUG is not set | 771 | # CONFIG_PPC_EARLY_DEBUG is not set |
760 | 772 | ||
@@ -767,3 +779,4 @@ CONFIG_DEBUG_INFO=y | |||
767 | # CONFIG_CRYPTO is not set | 779 | # CONFIG_CRYPTO is not set |
768 | # CONFIG_PPC_CLOCK is not set | 780 | # CONFIG_PPC_CLOCK is not set |
769 | CONFIG_PPC_LIB_RHEAP=y | 781 | CONFIG_PPC_LIB_RHEAP=y |
782 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 88338a9f5e95..0ccc6e493dcb 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_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-rc6 | 3 | # Linux kernel version: 2.6.26-rc6 |
4 | # Thu Mar 27 13:55:43 2008 | 4 | # Mon Jun 16 21:08:31 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -29,6 +29,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
31 | CONFIG_IRQ_PER_CPU=y | 31 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | ||
33 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | ||
32 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
33 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
34 | CONFIG_ARCH_HAS_ILOG2_U64=y | 37 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -91,6 +94,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
91 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
92 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
93 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 99 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -119,12 +123,14 @@ CONFIG_HAVE_OPROFILE=y | |||
119 | # CONFIG_KPROBES is not set | 123 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
126 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
122 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
123 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
124 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
125 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
126 | CONFIG_BASE_SMALL=0 | 131 | CONFIG_BASE_SMALL=0 |
127 | CONFIG_MODULES=y | 132 | CONFIG_MODULES=y |
133 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
128 | CONFIG_MODULE_UNLOAD=y | 134 | CONFIG_MODULE_UNLOAD=y |
129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 135 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
130 | CONFIG_MODVERSIONS=y | 136 | CONFIG_MODVERSIONS=y |
@@ -165,11 +171,11 @@ CONFIG_PPC_PMAC=y | |||
165 | CONFIG_PPC_PMAC64=y | 171 | CONFIG_PPC_PMAC64=y |
166 | # CONFIG_PPC_MAPLE is not set | 172 | # CONFIG_PPC_MAPLE is not set |
167 | # CONFIG_PPC_PASEMI is not set | 173 | # CONFIG_PPC_PASEMI is not set |
168 | # CONFIG_PPC_CELLEB is not set | ||
169 | # CONFIG_PPC_PS3 is not set | 174 | # CONFIG_PPC_PS3 is not set |
170 | # CONFIG_PPC_CELL is not set | 175 | # CONFIG_PPC_CELL is not set |
171 | # CONFIG_PPC_CELL_NATIVE is not set | 176 | # CONFIG_PPC_CELL_NATIVE is not set |
172 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 177 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
178 | # CONFIG_PPC_CELLEB is not set | ||
173 | # CONFIG_PQ2ADS is not set | 179 | # CONFIG_PQ2ADS is not set |
174 | CONFIG_PPC_NATIVE=y | 180 | CONFIG_PPC_NATIVE=y |
175 | # CONFIG_IPIC is not set | 181 | # CONFIG_IPIC is not set |
@@ -190,6 +196,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
190 | CONFIG_CPU_FREQ_STAT=y | 196 | CONFIG_CPU_FREQ_STAT=y |
191 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 197 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
192 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 198 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
199 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
193 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 200 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
194 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 201 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 202 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
@@ -224,7 +231,6 @@ CONFIG_PREEMPT_NONE=y | |||
224 | CONFIG_BINFMT_ELF=y | 231 | CONFIG_BINFMT_ELF=y |
225 | CONFIG_COMPAT_BINFMT_ELF=y | 232 | CONFIG_COMPAT_BINFMT_ELF=y |
226 | # CONFIG_BINFMT_MISC is not set | 233 | # CONFIG_BINFMT_MISC is not set |
227 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
228 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 234 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
229 | CONFIG_IOMMU_VMERGE=y | 235 | CONFIG_IOMMU_VMERGE=y |
230 | CONFIG_IOMMU_HELPER=y | 236 | CONFIG_IOMMU_HELPER=y |
@@ -248,12 +254,14 @@ CONFIG_FLATMEM=y | |||
248 | CONFIG_FLAT_NODE_MEM_MAP=y | 254 | CONFIG_FLAT_NODE_MEM_MAP=y |
249 | # CONFIG_SPARSEMEM_STATIC is not set | 255 | # CONFIG_SPARSEMEM_STATIC is not set |
250 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 256 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
257 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
251 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 258 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
252 | CONFIG_RESOURCES_64BIT=y | 259 | CONFIG_RESOURCES_64BIT=y |
253 | CONFIG_ZONE_DMA_FLAG=1 | 260 | CONFIG_ZONE_DMA_FLAG=1 |
254 | CONFIG_BOUNCE=y | 261 | CONFIG_BOUNCE=y |
255 | # CONFIG_PPC_HAS_HASH_64K is not set | 262 | # CONFIG_PPC_HAS_HASH_64K is not set |
256 | # CONFIG_PPC_64K_PAGES is not set | 263 | # CONFIG_PPC_64K_PAGES is not set |
264 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
257 | # CONFIG_SCHED_SMT is not set | 265 | # CONFIG_SCHED_SMT is not set |
258 | CONFIG_PROC_DEVICETREE=y | 266 | CONFIG_PROC_DEVICETREE=y |
259 | # CONFIG_CMDLINE_BOOL is not set | 267 | # CONFIG_CMDLINE_BOOL is not set |
@@ -278,7 +286,10 @@ CONFIG_PCI_MSI=y | |||
278 | # CONFIG_PCI_DEBUG is not set | 286 | # CONFIG_PCI_DEBUG is not set |
279 | # CONFIG_PCCARD is not set | 287 | # CONFIG_PCCARD is not set |
280 | # CONFIG_HOTPLUG_PCI is not set | 288 | # CONFIG_HOTPLUG_PCI is not set |
289 | # CONFIG_HAS_RAPIDIO is not set | ||
290 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
281 | CONFIG_KERNEL_START=0xc000000000000000 | 291 | CONFIG_KERNEL_START=0xc000000000000000 |
292 | CONFIG_PHYSICAL_START=0x00000000 | ||
282 | 293 | ||
283 | # | 294 | # |
284 | # Networking | 295 | # Networking |
@@ -325,8 +336,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
325 | # CONFIG_TCP_MD5SIG is not set | 336 | # CONFIG_TCP_MD5SIG is not set |
326 | # CONFIG_IP_VS is not set | 337 | # CONFIG_IP_VS is not set |
327 | # CONFIG_IPV6 is not set | 338 | # CONFIG_IPV6 is not set |
328 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
329 | # CONFIG_INET6_TUNNEL is not set | ||
330 | # CONFIG_NETWORK_SECMARK is not set | 339 | # CONFIG_NETWORK_SECMARK is not set |
331 | CONFIG_NETFILTER=y | 340 | CONFIG_NETFILTER=y |
332 | # CONFIG_NETFILTER_DEBUG is not set | 341 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -342,6 +351,7 @@ CONFIG_NF_CONNTRACK=m | |||
342 | # CONFIG_NF_CT_ACCT is not set | 351 | # CONFIG_NF_CT_ACCT is not set |
343 | CONFIG_NF_CONNTRACK_MARK=y | 352 | CONFIG_NF_CONNTRACK_MARK=y |
344 | CONFIG_NF_CONNTRACK_EVENTS=y | 353 | CONFIG_NF_CONNTRACK_EVENTS=y |
354 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
345 | # CONFIG_NF_CT_PROTO_SCTP is not set | 355 | # CONFIG_NF_CT_PROTO_SCTP is not set |
346 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 356 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
347 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 357 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
@@ -418,6 +428,7 @@ CONFIG_FW_LOADER=y | |||
418 | # CONFIG_CONNECTOR is not set | 428 | # CONFIG_CONNECTOR is not set |
419 | # CONFIG_MTD is not set | 429 | # CONFIG_MTD is not set |
420 | CONFIG_OF_DEVICE=y | 430 | CONFIG_OF_DEVICE=y |
431 | CONFIG_OF_I2C=y | ||
421 | # CONFIG_PARPORT is not set | 432 | # CONFIG_PARPORT is not set |
422 | CONFIG_BLK_DEV=y | 433 | CONFIG_BLK_DEV=y |
423 | # CONFIG_BLK_DEV_FD is not set | 434 | # CONFIG_BLK_DEV_FD is not set |
@@ -465,7 +476,6 @@ CONFIG_IDE_PROC_FS=y | |||
465 | # | 476 | # |
466 | # IDE chipset support/bugfixes | 477 | # IDE chipset support/bugfixes |
467 | # | 478 | # |
468 | CONFIG_IDE_GENERIC=y | ||
469 | # CONFIG_BLK_DEV_PLATFORM is not set | 479 | # CONFIG_BLK_DEV_PLATFORM is not set |
470 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 480 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
471 | 481 | ||
@@ -506,7 +516,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
506 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 516 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
507 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 517 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
508 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
509 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
510 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
511 | 521 | ||
512 | # | 522 | # |
@@ -584,7 +594,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
584 | # CONFIG_SCSI_SRP is not set | 594 | # CONFIG_SCSI_SRP is not set |
585 | CONFIG_ATA=y | 595 | CONFIG_ATA=y |
586 | # CONFIG_ATA_NONSTANDARD is not set | 596 | # CONFIG_ATA_NONSTANDARD is not set |
597 | CONFIG_SATA_PMP=y | ||
587 | # CONFIG_SATA_AHCI is not set | 598 | # CONFIG_SATA_AHCI is not set |
599 | # CONFIG_SATA_SIL24 is not set | ||
600 | CONFIG_ATA_SFF=y | ||
588 | CONFIG_SATA_SVW=y | 601 | CONFIG_SATA_SVW=y |
589 | # CONFIG_ATA_PIIX is not set | 602 | # CONFIG_ATA_PIIX is not set |
590 | # CONFIG_SATA_MV is not set | 603 | # CONFIG_SATA_MV is not set |
@@ -594,7 +607,6 @@ CONFIG_SATA_SVW=y | |||
594 | # CONFIG_SATA_PROMISE is not set | 607 | # CONFIG_SATA_PROMISE is not set |
595 | # CONFIG_SATA_SX4 is not set | 608 | # CONFIG_SATA_SX4 is not set |
596 | # CONFIG_SATA_SIL is not set | 609 | # CONFIG_SATA_SIL is not set |
597 | # CONFIG_SATA_SIL24 is not set | ||
598 | # CONFIG_SATA_SIS is not set | 610 | # CONFIG_SATA_SIS is not set |
599 | # CONFIG_SATA_ULI is not set | 611 | # CONFIG_SATA_ULI is not set |
600 | # CONFIG_SATA_VIA is not set | 612 | # CONFIG_SATA_VIA is not set |
@@ -639,6 +651,7 @@ CONFIG_SATA_SVW=y | |||
639 | # CONFIG_PATA_VIA is not set | 651 | # CONFIG_PATA_VIA is not set |
640 | # CONFIG_PATA_WINBOND is not set | 652 | # CONFIG_PATA_WINBOND is not set |
641 | # CONFIG_PATA_PLATFORM is not set | 653 | # CONFIG_PATA_PLATFORM is not set |
654 | # CONFIG_PATA_SCH is not set | ||
642 | CONFIG_MD=y | 655 | CONFIG_MD=y |
643 | CONFIG_BLK_DEV_MD=y | 656 | CONFIG_BLK_DEV_MD=y |
644 | CONFIG_MD_LINEAR=y | 657 | CONFIG_MD_LINEAR=y |
@@ -740,7 +753,6 @@ CONFIG_E1000=y | |||
740 | # CONFIG_SIS190 is not set | 753 | # CONFIG_SIS190 is not set |
741 | # CONFIG_SKGE is not set | 754 | # CONFIG_SKGE is not set |
742 | # CONFIG_SKY2 is not set | 755 | # CONFIG_SKY2 is not set |
743 | # CONFIG_SK98LIN is not set | ||
744 | # CONFIG_VIA_VELOCITY is not set | 756 | # CONFIG_VIA_VELOCITY is not set |
745 | CONFIG_TIGON3=y | 757 | CONFIG_TIGON3=y |
746 | # CONFIG_BNX2 is not set | 758 | # CONFIG_BNX2 is not set |
@@ -755,10 +767,10 @@ CONFIG_NETDEV_10000=y | |||
755 | # CONFIG_MYRI10GE is not set | 767 | # CONFIG_MYRI10GE is not set |
756 | # CONFIG_NETXEN_NIC is not set | 768 | # CONFIG_NETXEN_NIC is not set |
757 | # CONFIG_NIU is not set | 769 | # CONFIG_NIU is not set |
758 | # CONFIG_PASEMI_MAC is not set | ||
759 | # CONFIG_MLX4_CORE is not set | 770 | # CONFIG_MLX4_CORE is not set |
760 | # CONFIG_TEHUTI is not set | 771 | # CONFIG_TEHUTI is not set |
761 | # CONFIG_BNX2X is not set | 772 | # CONFIG_BNX2X is not set |
773 | # CONFIG_SFC is not set | ||
762 | CONFIG_TR=y | 774 | CONFIG_TR=y |
763 | CONFIG_IBMOL=y | 775 | CONFIG_IBMOL=y |
764 | # CONFIG_3C359 is not set | 776 | # CONFIG_3C359 is not set |
@@ -769,6 +781,7 @@ CONFIG_IBMOL=y | |||
769 | # | 781 | # |
770 | # CONFIG_WLAN_PRE80211 is not set | 782 | # CONFIG_WLAN_PRE80211 is not set |
771 | # CONFIG_WLAN_80211 is not set | 783 | # CONFIG_WLAN_80211 is not set |
784 | # CONFIG_IWLWIFI_LEDS is not set | ||
772 | 785 | ||
773 | # | 786 | # |
774 | # USB Network Adapters | 787 | # USB Network Adapters |
@@ -865,6 +878,7 @@ CONFIG_VT=y | |||
865 | CONFIG_VT_CONSOLE=y | 878 | CONFIG_VT_CONSOLE=y |
866 | CONFIG_HW_CONSOLE=y | 879 | CONFIG_HW_CONSOLE=y |
867 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 880 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
881 | CONFIG_DEVKMEM=y | ||
868 | # CONFIG_SERIAL_NONSTANDARD is not set | 882 | # CONFIG_SERIAL_NONSTANDARD is not set |
869 | # CONFIG_NOZOMI is not set | 883 | # CONFIG_NOZOMI is not set |
870 | 884 | ||
@@ -895,13 +909,7 @@ CONFIG_DEVPORT=y | |||
895 | CONFIG_I2C=y | 909 | CONFIG_I2C=y |
896 | CONFIG_I2C_BOARDINFO=y | 910 | CONFIG_I2C_BOARDINFO=y |
897 | CONFIG_I2C_CHARDEV=y | 911 | CONFIG_I2C_CHARDEV=y |
898 | |||
899 | # | ||
900 | # I2C Algorithms | ||
901 | # | ||
902 | CONFIG_I2C_ALGOBIT=y | 912 | CONFIG_I2C_ALGOBIT=y |
903 | # CONFIG_I2C_ALGOPCF is not set | ||
904 | # CONFIG_I2C_ALGOPCA is not set | ||
905 | 913 | ||
906 | # | 914 | # |
907 | # I2C Hardware Bus support | 915 | # I2C Hardware Bus support |
@@ -930,6 +938,7 @@ CONFIG_I2C_POWERMAC=y | |||
930 | # CONFIG_I2C_VIA is not set | 938 | # CONFIG_I2C_VIA is not set |
931 | # CONFIG_I2C_VIAPRO is not set | 939 | # CONFIG_I2C_VIAPRO is not set |
932 | # CONFIG_I2C_VOODOO3 is not set | 940 | # CONFIG_I2C_VOODOO3 is not set |
941 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
933 | 942 | ||
934 | # | 943 | # |
935 | # Miscellaneous I2C Chip support | 944 | # Miscellaneous I2C Chip support |
@@ -939,19 +948,13 @@ CONFIG_I2C_POWERMAC=y | |||
939 | # CONFIG_SENSORS_PCF8574 is not set | 948 | # CONFIG_SENSORS_PCF8574 is not set |
940 | # CONFIG_PCF8575 is not set | 949 | # CONFIG_PCF8575 is not set |
941 | # CONFIG_SENSORS_PCF8591 is not set | 950 | # CONFIG_SENSORS_PCF8591 is not set |
942 | # CONFIG_TPS65010 is not set | ||
943 | # CONFIG_SENSORS_MAX6875 is not set | 951 | # CONFIG_SENSORS_MAX6875 is not set |
944 | # CONFIG_SENSORS_TSL2550 is not set | 952 | # CONFIG_SENSORS_TSL2550 is not set |
945 | # CONFIG_I2C_DEBUG_CORE is not set | 953 | # CONFIG_I2C_DEBUG_CORE is not set |
946 | # CONFIG_I2C_DEBUG_ALGO is not set | 954 | # CONFIG_I2C_DEBUG_ALGO is not set |
947 | # CONFIG_I2C_DEBUG_BUS is not set | 955 | # CONFIG_I2C_DEBUG_BUS is not set |
948 | # CONFIG_I2C_DEBUG_CHIP is not set | 956 | # CONFIG_I2C_DEBUG_CHIP is not set |
949 | |||
950 | # | ||
951 | # SPI support | ||
952 | # | ||
953 | # CONFIG_SPI is not set | 957 | # CONFIG_SPI is not set |
954 | # CONFIG_SPI_MASTER is not set | ||
955 | # CONFIG_W1 is not set | 958 | # CONFIG_W1 is not set |
956 | # CONFIG_POWER_SUPPLY is not set | 959 | # CONFIG_POWER_SUPPLY is not set |
957 | # CONFIG_HWMON is not set | 960 | # CONFIG_HWMON is not set |
@@ -968,12 +971,22 @@ CONFIG_SSB_POSSIBLE=y | |||
968 | # Multifunction device drivers | 971 | # Multifunction device drivers |
969 | # | 972 | # |
970 | # CONFIG_MFD_SM501 is not set | 973 | # CONFIG_MFD_SM501 is not set |
974 | # CONFIG_HTC_PASIC3 is not set | ||
971 | 975 | ||
972 | # | 976 | # |
973 | # Multimedia devices | 977 | # Multimedia devices |
974 | # | 978 | # |
979 | |||
980 | # | ||
981 | # Multimedia core support | ||
982 | # | ||
975 | # CONFIG_VIDEO_DEV is not set | 983 | # CONFIG_VIDEO_DEV is not set |
976 | # CONFIG_DVB_CORE is not set | 984 | # CONFIG_DVB_CORE is not set |
985 | # CONFIG_VIDEO_MEDIA is not set | ||
986 | |||
987 | # | ||
988 | # Multimedia drivers | ||
989 | # | ||
977 | CONFIG_DAB=y | 990 | CONFIG_DAB=y |
978 | # CONFIG_USB_DABUSB is not set | 991 | # CONFIG_USB_DABUSB is not set |
979 | 992 | ||
@@ -995,8 +1008,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
995 | # CONFIG_FB_SYS_FILLRECT is not set | 1008 | # CONFIG_FB_SYS_FILLRECT is not set |
996 | # CONFIG_FB_SYS_COPYAREA is not set | 1009 | # CONFIG_FB_SYS_COPYAREA is not set |
997 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1010 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1011 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
998 | # CONFIG_FB_SYS_FOPS is not set | 1012 | # CONFIG_FB_SYS_FOPS is not set |
999 | CONFIG_FB_DEFERRED_IO=y | ||
1000 | # CONFIG_FB_SVGALIB is not set | 1013 | # CONFIG_FB_SVGALIB is not set |
1001 | CONFIG_FB_MACMODES=y | 1014 | CONFIG_FB_MACMODES=y |
1002 | CONFIG_FB_BACKLIGHT=y | 1015 | CONFIG_FB_BACKLIGHT=y |
@@ -1112,6 +1125,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1112 | # CONFIG_SND_AU8810 is not set | 1125 | # CONFIG_SND_AU8810 is not set |
1113 | # CONFIG_SND_AU8820 is not set | 1126 | # CONFIG_SND_AU8820 is not set |
1114 | # CONFIG_SND_AU8830 is not set | 1127 | # CONFIG_SND_AU8830 is not set |
1128 | # CONFIG_SND_AW2 is not set | ||
1115 | # CONFIG_SND_AZT3328 is not set | 1129 | # CONFIG_SND_AZT3328 is not set |
1116 | # CONFIG_SND_BT87X is not set | 1130 | # CONFIG_SND_BT87X is not set |
1117 | # CONFIG_SND_CA0106 is not set | 1131 | # CONFIG_SND_CA0106 is not set |
@@ -1198,11 +1212,11 @@ CONFIG_SND_USB_AUDIO=m | |||
1198 | # CONFIG_SND_SOC is not set | 1212 | # CONFIG_SND_SOC is not set |
1199 | 1213 | ||
1200 | # | 1214 | # |
1201 | # SoC Audio support for SuperH | 1215 | # ALSA SoC audio for Freescale SOCs |
1202 | # | 1216 | # |
1203 | 1217 | ||
1204 | # | 1218 | # |
1205 | # ALSA SoC audio for Freescale SOCs | 1219 | # SoC Audio for the Texas Instruments OMAP |
1206 | # | 1220 | # |
1207 | 1221 | ||
1208 | # | 1222 | # |
@@ -1222,6 +1236,7 @@ CONFIG_USB_HID=y | |||
1222 | CONFIG_HID_FF=y | 1236 | CONFIG_HID_FF=y |
1223 | CONFIG_HID_PID=y | 1237 | CONFIG_HID_PID=y |
1224 | CONFIG_LOGITECH_FF=y | 1238 | CONFIG_LOGITECH_FF=y |
1239 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
1225 | # CONFIG_PANTHERLORD_FF is not set | 1240 | # CONFIG_PANTHERLORD_FF is not set |
1226 | CONFIG_THRUSTMASTER_FF=y | 1241 | CONFIG_THRUSTMASTER_FF=y |
1227 | # CONFIG_ZEROPLUS_FF is not set | 1242 | # CONFIG_ZEROPLUS_FF is not set |
@@ -1245,11 +1260,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1245 | # | 1260 | # |
1246 | # USB Host Controller Drivers | 1261 | # USB Host Controller Drivers |
1247 | # | 1262 | # |
1263 | # CONFIG_USB_C67X00_HCD is not set | ||
1248 | CONFIG_USB_EHCI_HCD=y | 1264 | CONFIG_USB_EHCI_HCD=y |
1249 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1265 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1250 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1266 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1251 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1267 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1252 | # CONFIG_USB_ISP116X_HCD is not set | 1268 | # CONFIG_USB_ISP116X_HCD is not set |
1269 | # CONFIG_USB_ISP1760_HCD is not set | ||
1253 | CONFIG_USB_OHCI_HCD=y | 1270 | CONFIG_USB_OHCI_HCD=y |
1254 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1271 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
1255 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1272 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1267,6 +1284,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1267 | # | 1284 | # |
1268 | CONFIG_USB_ACM=m | 1285 | CONFIG_USB_ACM=m |
1269 | CONFIG_USB_PRINTER=y | 1286 | CONFIG_USB_PRINTER=y |
1287 | # CONFIG_USB_WDM is not set | ||
1270 | 1288 | ||
1271 | # | 1289 | # |
1272 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1290 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1288,6 +1306,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1288 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1306 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1289 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1307 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1290 | # CONFIG_USB_STORAGE_KARMA is not set | 1308 | # CONFIG_USB_STORAGE_KARMA is not set |
1309 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1291 | # CONFIG_USB_LIBUSUAL is not set | 1310 | # CONFIG_USB_LIBUSUAL is not set |
1292 | 1311 | ||
1293 | # | 1312 | # |
@@ -1342,9 +1361,11 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m | |||
1342 | CONFIG_USB_SERIAL_MCT_U232=m | 1361 | CONFIG_USB_SERIAL_MCT_U232=m |
1343 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1362 | # CONFIG_USB_SERIAL_MOS7720 is not set |
1344 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1363 | # CONFIG_USB_SERIAL_MOS7840 is not set |
1364 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
1345 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1365 | # CONFIG_USB_SERIAL_NAVMAN is not set |
1346 | CONFIG_USB_SERIAL_PL2303=m | 1366 | CONFIG_USB_SERIAL_PL2303=m |
1347 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1367 | # CONFIG_USB_SERIAL_OTI6858 is not set |
1368 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
1348 | # CONFIG_USB_SERIAL_HP4X is not set | 1369 | # CONFIG_USB_SERIAL_HP4X is not set |
1349 | CONFIG_USB_SERIAL_SAFE=m | 1370 | CONFIG_USB_SERIAL_SAFE=m |
1350 | CONFIG_USB_SERIAL_SAFE_PADDED=y | 1371 | CONFIG_USB_SERIAL_SAFE_PADDED=y |
@@ -1379,18 +1400,16 @@ CONFIG_USB_APPLEDISPLAY=m | |||
1379 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1400 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1380 | # CONFIG_USB_IOWARRIOR is not set | 1401 | # CONFIG_USB_IOWARRIOR is not set |
1381 | # CONFIG_USB_TEST is not set | 1402 | # CONFIG_USB_TEST is not set |
1403 | # CONFIG_USB_ISIGHTFW is not set | ||
1382 | # CONFIG_USB_GADGET is not set | 1404 | # CONFIG_USB_GADGET is not set |
1383 | # CONFIG_MMC is not set | 1405 | # CONFIG_MMC is not set |
1384 | # CONFIG_MEMSTICK is not set | 1406 | # CONFIG_MEMSTICK is not set |
1385 | # CONFIG_NEW_LEDS is not set | 1407 | # CONFIG_NEW_LEDS is not set |
1408 | # CONFIG_ACCESSIBILITY is not set | ||
1386 | # CONFIG_INFINIBAND is not set | 1409 | # CONFIG_INFINIBAND is not set |
1387 | # CONFIG_EDAC is not set | 1410 | # CONFIG_EDAC is not set |
1388 | # CONFIG_RTC_CLASS is not set | 1411 | # CONFIG_RTC_CLASS is not set |
1389 | # CONFIG_DMADEVICES is not set | 1412 | # CONFIG_DMADEVICES is not set |
1390 | |||
1391 | # | ||
1392 | # Userspace I/O | ||
1393 | # | ||
1394 | # CONFIG_UIO is not set | 1413 | # CONFIG_UIO is not set |
1395 | 1414 | ||
1396 | # | 1415 | # |
@@ -1420,9 +1439,9 @@ CONFIG_REISERFS_FS_SECURITY=y | |||
1420 | CONFIG_FS_POSIX_ACL=y | 1439 | CONFIG_FS_POSIX_ACL=y |
1421 | CONFIG_XFS_FS=m | 1440 | CONFIG_XFS_FS=m |
1422 | # CONFIG_XFS_QUOTA is not set | 1441 | # CONFIG_XFS_QUOTA is not set |
1423 | CONFIG_XFS_SECURITY=y | ||
1424 | CONFIG_XFS_POSIX_ACL=y | 1442 | CONFIG_XFS_POSIX_ACL=y |
1425 | # CONFIG_XFS_RT is not set | 1443 | # CONFIG_XFS_RT is not set |
1444 | # CONFIG_XFS_DEBUG is not set | ||
1426 | # CONFIG_GFS2_FS is not set | 1445 | # CONFIG_GFS2_FS is not set |
1427 | # CONFIG_OCFS2_FS is not set | 1446 | # CONFIG_OCFS2_FS is not set |
1428 | CONFIG_DNOTIFY=y | 1447 | CONFIG_DNOTIFY=y |
@@ -1488,13 +1507,11 @@ CONFIG_NFS_FS=y | |||
1488 | CONFIG_NFS_V3=y | 1507 | CONFIG_NFS_V3=y |
1489 | CONFIG_NFS_V3_ACL=y | 1508 | CONFIG_NFS_V3_ACL=y |
1490 | CONFIG_NFS_V4=y | 1509 | CONFIG_NFS_V4=y |
1491 | # CONFIG_NFS_DIRECTIO is not set | ||
1492 | CONFIG_NFSD=y | 1510 | CONFIG_NFSD=y |
1493 | CONFIG_NFSD_V2_ACL=y | 1511 | CONFIG_NFSD_V2_ACL=y |
1494 | CONFIG_NFSD_V3=y | 1512 | CONFIG_NFSD_V3=y |
1495 | CONFIG_NFSD_V3_ACL=y | 1513 | CONFIG_NFSD_V3_ACL=y |
1496 | CONFIG_NFSD_V4=y | 1514 | CONFIG_NFSD_V4=y |
1497 | CONFIG_NFSD_TCP=y | ||
1498 | CONFIG_LOCKD=y | 1515 | CONFIG_LOCKD=y |
1499 | CONFIG_LOCKD_V4=y | 1516 | CONFIG_LOCKD_V4=y |
1500 | CONFIG_EXPORTFS=y | 1517 | CONFIG_EXPORTFS=y |
@@ -1583,9 +1600,10 @@ CONFIG_NLS_UTF8=y | |||
1583 | # Library routines | 1600 | # Library routines |
1584 | # | 1601 | # |
1585 | CONFIG_BITREVERSE=y | 1602 | CONFIG_BITREVERSE=y |
1603 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1586 | CONFIG_CRC_CCITT=m | 1604 | CONFIG_CRC_CCITT=m |
1587 | # CONFIG_CRC16 is not set | 1605 | # CONFIG_CRC16 is not set |
1588 | # CONFIG_CRC_ITU_T is not set | 1606 | CONFIG_CRC_ITU_T=m |
1589 | CONFIG_CRC32=y | 1607 | CONFIG_CRC32=y |
1590 | # CONFIG_CRC7 is not set | 1608 | # CONFIG_CRC7 is not set |
1591 | CONFIG_LIBCRC32C=m | 1609 | CONFIG_LIBCRC32C=m |
@@ -1603,6 +1621,7 @@ CONFIG_HAVE_LMB=y | |||
1603 | # CONFIG_PRINTK_TIME is not set | 1621 | # CONFIG_PRINTK_TIME is not set |
1604 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1622 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1605 | CONFIG_ENABLE_MUST_CHECK=y | 1623 | CONFIG_ENABLE_MUST_CHECK=y |
1624 | CONFIG_FRAME_WARN=2048 | ||
1606 | CONFIG_MAGIC_SYSRQ=y | 1625 | CONFIG_MAGIC_SYSRQ=y |
1607 | # CONFIG_UNUSED_SYMBOLS is not set | 1626 | # CONFIG_UNUSED_SYMBOLS is not set |
1608 | CONFIG_DEBUG_FS=y | 1627 | CONFIG_DEBUG_FS=y |
@@ -1613,18 +1632,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1613 | CONFIG_SCHED_DEBUG=y | 1632 | CONFIG_SCHED_DEBUG=y |
1614 | # CONFIG_SCHEDSTATS is not set | 1633 | # CONFIG_SCHEDSTATS is not set |
1615 | # CONFIG_TIMER_STATS is not set | 1634 | # CONFIG_TIMER_STATS is not set |
1635 | # CONFIG_DEBUG_OBJECTS is not set | ||
1616 | # CONFIG_SLUB_DEBUG_ON is not set | 1636 | # CONFIG_SLUB_DEBUG_ON is not set |
1617 | # CONFIG_SLUB_STATS is not set | 1637 | # CONFIG_SLUB_STATS is not set |
1618 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1638 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1619 | # CONFIG_RT_MUTEX_TESTER is not set | 1639 | # CONFIG_RT_MUTEX_TESTER is not set |
1620 | # CONFIG_DEBUG_SPINLOCK is not set | 1640 | # CONFIG_DEBUG_SPINLOCK is not set |
1621 | CONFIG_DEBUG_MUTEXES=y | 1641 | CONFIG_DEBUG_MUTEXES=y |
1642 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1643 | # CONFIG_PROVE_LOCKING is not set | ||
1644 | # CONFIG_LOCK_STAT is not set | ||
1622 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1645 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1623 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1646 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1624 | # CONFIG_DEBUG_KOBJECT is not set | 1647 | # CONFIG_DEBUG_KOBJECT is not set |
1625 | CONFIG_DEBUG_BUGVERBOSE=y | 1648 | CONFIG_DEBUG_BUGVERBOSE=y |
1626 | # CONFIG_DEBUG_INFO is not set | 1649 | # CONFIG_DEBUG_INFO is not set |
1627 | # CONFIG_DEBUG_VM is not set | 1650 | # CONFIG_DEBUG_VM is not set |
1651 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1628 | # CONFIG_DEBUG_LIST is not set | 1652 | # CONFIG_DEBUG_LIST is not set |
1629 | # CONFIG_DEBUG_SG is not set | 1653 | # CONFIG_DEBUG_SG is not set |
1630 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1654 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1648,53 +1672,83 @@ CONFIG_BOOTX_TEXT=y | |||
1648 | # CONFIG_SECURITY is not set | 1672 | # CONFIG_SECURITY is not set |
1649 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1673 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1650 | CONFIG_CRYPTO=y | 1674 | CONFIG_CRYPTO=y |
1675 | |||
1676 | # | ||
1677 | # Crypto core or helper | ||
1678 | # | ||
1651 | CONFIG_CRYPTO_ALGAPI=y | 1679 | CONFIG_CRYPTO_ALGAPI=y |
1652 | CONFIG_CRYPTO_AEAD=m | 1680 | CONFIG_CRYPTO_AEAD=m |
1653 | CONFIG_CRYPTO_BLKCIPHER=y | 1681 | CONFIG_CRYPTO_BLKCIPHER=y |
1654 | # CONFIG_CRYPTO_SEQIV is not set | ||
1655 | CONFIG_CRYPTO_HASH=y | 1682 | CONFIG_CRYPTO_HASH=y |
1656 | CONFIG_CRYPTO_MANAGER=y | 1683 | CONFIG_CRYPTO_MANAGER=y |
1684 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1685 | CONFIG_CRYPTO_NULL=m | ||
1686 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1687 | CONFIG_CRYPTO_AUTHENC=m | ||
1688 | CONFIG_CRYPTO_TEST=m | ||
1689 | |||
1690 | # | ||
1691 | # Authenticated Encryption with Associated Data | ||
1692 | # | ||
1693 | # CONFIG_CRYPTO_CCM is not set | ||
1694 | # CONFIG_CRYPTO_GCM is not set | ||
1695 | # CONFIG_CRYPTO_SEQIV is not set | ||
1696 | |||
1697 | # | ||
1698 | # Block modes | ||
1699 | # | ||
1700 | CONFIG_CRYPTO_CBC=y | ||
1701 | # CONFIG_CRYPTO_CTR is not set | ||
1702 | # CONFIG_CRYPTO_CTS is not set | ||
1703 | CONFIG_CRYPTO_ECB=m | ||
1704 | # CONFIG_CRYPTO_LRW is not set | ||
1705 | CONFIG_CRYPTO_PCBC=m | ||
1706 | # CONFIG_CRYPTO_XTS is not set | ||
1707 | |||
1708 | # | ||
1709 | # Hash modes | ||
1710 | # | ||
1657 | CONFIG_CRYPTO_HMAC=y | 1711 | CONFIG_CRYPTO_HMAC=y |
1658 | # CONFIG_CRYPTO_XCBC is not set | 1712 | # CONFIG_CRYPTO_XCBC is not set |
1659 | CONFIG_CRYPTO_NULL=m | 1713 | |
1714 | # | ||
1715 | # Digest | ||
1716 | # | ||
1717 | CONFIG_CRYPTO_CRC32C=m | ||
1660 | CONFIG_CRYPTO_MD4=m | 1718 | CONFIG_CRYPTO_MD4=m |
1661 | CONFIG_CRYPTO_MD5=y | 1719 | CONFIG_CRYPTO_MD5=y |
1720 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1662 | CONFIG_CRYPTO_SHA1=m | 1721 | CONFIG_CRYPTO_SHA1=m |
1663 | CONFIG_CRYPTO_SHA256=m | 1722 | CONFIG_CRYPTO_SHA256=m |
1664 | CONFIG_CRYPTO_SHA512=m | 1723 | CONFIG_CRYPTO_SHA512=m |
1665 | CONFIG_CRYPTO_WP512=m | ||
1666 | # CONFIG_CRYPTO_TGR192 is not set | 1724 | # CONFIG_CRYPTO_TGR192 is not set |
1667 | # CONFIG_CRYPTO_GF128MUL is not set | 1725 | CONFIG_CRYPTO_WP512=m |
1668 | CONFIG_CRYPTO_ECB=m | 1726 | |
1669 | CONFIG_CRYPTO_CBC=y | 1727 | # |
1670 | CONFIG_CRYPTO_PCBC=m | 1728 | # Ciphers |
1671 | # CONFIG_CRYPTO_LRW is not set | 1729 | # |
1672 | # CONFIG_CRYPTO_XTS is not set | ||
1673 | # CONFIG_CRYPTO_CTR is not set | ||
1674 | # CONFIG_CRYPTO_GCM is not set | ||
1675 | # CONFIG_CRYPTO_CCM is not set | ||
1676 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1677 | CONFIG_CRYPTO_DES=y | ||
1678 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1679 | CONFIG_CRYPTO_BLOWFISH=m | ||
1680 | CONFIG_CRYPTO_TWOFISH=m | ||
1681 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1682 | CONFIG_CRYPTO_SERPENT=m | ||
1683 | CONFIG_CRYPTO_AES=m | 1730 | CONFIG_CRYPTO_AES=m |
1731 | CONFIG_CRYPTO_ANUBIS=m | ||
1732 | CONFIG_CRYPTO_ARC4=m | ||
1733 | CONFIG_CRYPTO_BLOWFISH=m | ||
1734 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1684 | CONFIG_CRYPTO_CAST5=m | 1735 | CONFIG_CRYPTO_CAST5=m |
1685 | CONFIG_CRYPTO_CAST6=m | 1736 | CONFIG_CRYPTO_CAST6=m |
1686 | CONFIG_CRYPTO_TEA=m | 1737 | CONFIG_CRYPTO_DES=y |
1687 | CONFIG_CRYPTO_ARC4=m | 1738 | # CONFIG_CRYPTO_FCRYPT is not set |
1688 | CONFIG_CRYPTO_KHAZAD=m | 1739 | CONFIG_CRYPTO_KHAZAD=m |
1689 | CONFIG_CRYPTO_ANUBIS=m | ||
1690 | # CONFIG_CRYPTO_SEED is not set | ||
1691 | # CONFIG_CRYPTO_SALSA20 is not set | 1740 | # CONFIG_CRYPTO_SALSA20 is not set |
1741 | # CONFIG_CRYPTO_SEED is not set | ||
1742 | CONFIG_CRYPTO_SERPENT=m | ||
1743 | CONFIG_CRYPTO_TEA=m | ||
1744 | CONFIG_CRYPTO_TWOFISH=m | ||
1745 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1746 | |||
1747 | # | ||
1748 | # Compression | ||
1749 | # | ||
1692 | CONFIG_CRYPTO_DEFLATE=m | 1750 | CONFIG_CRYPTO_DEFLATE=m |
1693 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1694 | CONFIG_CRYPTO_CRC32C=m | ||
1695 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1696 | CONFIG_CRYPTO_TEST=m | ||
1697 | CONFIG_CRYPTO_AUTHENC=m | ||
1698 | # CONFIG_CRYPTO_LZO is not set | 1751 | # CONFIG_CRYPTO_LZO is not set |
1699 | # CONFIG_CRYPTO_HW is not set | 1752 | # CONFIG_CRYPTO_HW is not set |
1700 | # CONFIG_PPC_CLOCK is not set | 1753 | # CONFIG_PPC_CLOCK is not set |
1754 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index b3128fb7ce7e..63f0bdb6340d 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_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-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:55:45 2008 | 4 | # Tue May 20 20:01:36 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -91,6 +94,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
91 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
92 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
93 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 99 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -118,12 +122,14 @@ CONFIG_HAVE_OPROFILE=y | |||
118 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
119 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
120 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
121 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
122 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
123 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
124 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
125 | CONFIG_BASE_SMALL=0 | 130 | CONFIG_BASE_SMALL=0 |
126 | CONFIG_MODULES=y | 131 | CONFIG_MODULES=y |
132 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
127 | CONFIG_MODULE_UNLOAD=y | 133 | CONFIG_MODULE_UNLOAD=y |
128 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 134 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
129 | CONFIG_MODVERSIONS=y | 135 | CONFIG_MODVERSIONS=y |
@@ -172,11 +178,11 @@ CONFIG_VIOPATH=y | |||
172 | # CONFIG_PPC_PMAC is not set | 178 | # CONFIG_PPC_PMAC is not set |
173 | # CONFIG_PPC_MAPLE is not set | 179 | # CONFIG_PPC_MAPLE is not set |
174 | # CONFIG_PPC_PASEMI is not set | 180 | # CONFIG_PPC_PASEMI is not set |
175 | # CONFIG_PPC_CELLEB is not set | ||
176 | # CONFIG_PPC_PS3 is not set | 181 | # CONFIG_PPC_PS3 is not set |
177 | # CONFIG_PPC_CELL is not set | 182 | # CONFIG_PPC_CELL is not set |
178 | # CONFIG_PPC_CELL_NATIVE is not set | 183 | # CONFIG_PPC_CELL_NATIVE is not set |
179 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 184 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
185 | # CONFIG_PPC_CELLEB is not set | ||
180 | # CONFIG_PQ2ADS is not set | 186 | # CONFIG_PQ2ADS is not set |
181 | # CONFIG_IPIC is not set | 187 | # CONFIG_IPIC is not set |
182 | # CONFIG_MPIC is not set | 188 | # CONFIG_MPIC is not set |
@@ -212,7 +218,6 @@ CONFIG_PREEMPT_NONE=y | |||
212 | CONFIG_BINFMT_ELF=y | 218 | CONFIG_BINFMT_ELF=y |
213 | CONFIG_COMPAT_BINFMT_ELF=y | 219 | CONFIG_COMPAT_BINFMT_ELF=y |
214 | # CONFIG_BINFMT_MISC is not set | 220 | # CONFIG_BINFMT_MISC is not set |
215 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
216 | CONFIG_IOMMU_VMERGE=y | 221 | CONFIG_IOMMU_VMERGE=y |
217 | CONFIG_IOMMU_HELPER=y | 222 | CONFIG_IOMMU_HELPER=y |
218 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 223 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -234,12 +239,14 @@ CONFIG_FLATMEM=y | |||
234 | CONFIG_FLAT_NODE_MEM_MAP=y | 239 | CONFIG_FLAT_NODE_MEM_MAP=y |
235 | # CONFIG_SPARSEMEM_STATIC is not set | 240 | # CONFIG_SPARSEMEM_STATIC is not set |
236 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 241 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
242 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
237 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 243 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
238 | CONFIG_RESOURCES_64BIT=y | 244 | CONFIG_RESOURCES_64BIT=y |
239 | CONFIG_ZONE_DMA_FLAG=1 | 245 | CONFIG_ZONE_DMA_FLAG=1 |
240 | CONFIG_BOUNCE=y | 246 | CONFIG_BOUNCE=y |
241 | # CONFIG_PPC_HAS_HASH_64K is not set | 247 | # CONFIG_PPC_HAS_HASH_64K is not set |
242 | # CONFIG_PPC_64K_PAGES is not set | 248 | # CONFIG_PPC_64K_PAGES is not set |
249 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
243 | # CONFIG_SCHED_SMT is not set | 250 | # CONFIG_SCHED_SMT is not set |
244 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
245 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
@@ -263,7 +270,10 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
263 | # CONFIG_PCI_DEBUG is not set | 270 | # CONFIG_PCI_DEBUG is not set |
264 | # CONFIG_PCCARD is not set | 271 | # CONFIG_PCCARD is not set |
265 | # CONFIG_HOTPLUG_PCI is not set | 272 | # CONFIG_HOTPLUG_PCI is not set |
273 | # CONFIG_HAS_RAPIDIO is not set | ||
274 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
266 | CONFIG_KERNEL_START=0xc000000000000000 | 275 | CONFIG_KERNEL_START=0xc000000000000000 |
276 | CONFIG_PHYSICAL_START=0x00000000 | ||
267 | 277 | ||
268 | # | 278 | # |
269 | # Networking | 279 | # Networking |
@@ -310,8 +320,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
310 | # CONFIG_TCP_MD5SIG is not set | 320 | # CONFIG_TCP_MD5SIG is not set |
311 | # CONFIG_IP_VS is not set | 321 | # CONFIG_IP_VS is not set |
312 | # CONFIG_IPV6 is not set | 322 | # CONFIG_IPV6 is not set |
313 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
314 | # CONFIG_INET6_TUNNEL is not set | ||
315 | # CONFIG_NETWORK_SECMARK is not set | 323 | # CONFIG_NETWORK_SECMARK is not set |
316 | CONFIG_NETFILTER=y | 324 | CONFIG_NETFILTER=y |
317 | # CONFIG_NETFILTER_DEBUG is not set | 325 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -327,6 +335,7 @@ CONFIG_NF_CONNTRACK=m | |||
327 | # CONFIG_NF_CT_ACCT is not set | 335 | # CONFIG_NF_CT_ACCT is not set |
328 | CONFIG_NF_CONNTRACK_MARK=y | 336 | CONFIG_NF_CONNTRACK_MARK=y |
329 | CONFIG_NF_CONNTRACK_EVENTS=y | 337 | CONFIG_NF_CONNTRACK_EVENTS=y |
338 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
330 | # CONFIG_NF_CT_PROTO_SCTP is not set | 339 | # CONFIG_NF_CT_PROTO_SCTP is not set |
331 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 340 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
332 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 341 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
@@ -631,7 +640,6 @@ CONFIG_MII=y | |||
631 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 640 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
632 | CONFIG_NET_PCI=y | 641 | CONFIG_NET_PCI=y |
633 | CONFIG_PCNET32=y | 642 | CONFIG_PCNET32=y |
634 | CONFIG_PCNET32_NAPI=y | ||
635 | # CONFIG_AMD8111_ETH is not set | 643 | # CONFIG_AMD8111_ETH is not set |
636 | # CONFIG_ADAPTEC_STARFIRE is not set | 644 | # CONFIG_ADAPTEC_STARFIRE is not set |
637 | # CONFIG_B44 is not set | 645 | # CONFIG_B44 is not set |
@@ -667,7 +675,6 @@ CONFIG_E1000=m | |||
667 | # CONFIG_SIS190 is not set | 675 | # CONFIG_SIS190 is not set |
668 | # CONFIG_SKGE is not set | 676 | # CONFIG_SKGE is not set |
669 | # CONFIG_SKY2 is not set | 677 | # CONFIG_SKY2 is not set |
670 | # CONFIG_SK98LIN is not set | ||
671 | # CONFIG_VIA_VELOCITY is not set | 678 | # CONFIG_VIA_VELOCITY is not set |
672 | # CONFIG_TIGON3 is not set | 679 | # CONFIG_TIGON3 is not set |
673 | # CONFIG_BNX2 is not set | 680 | # CONFIG_BNX2 is not set |
@@ -682,10 +689,10 @@ CONFIG_NETDEV_10000=y | |||
682 | # CONFIG_MYRI10GE is not set | 689 | # CONFIG_MYRI10GE is not set |
683 | # CONFIG_NETXEN_NIC is not set | 690 | # CONFIG_NETXEN_NIC is not set |
684 | # CONFIG_NIU is not set | 691 | # CONFIG_NIU is not set |
685 | # CONFIG_PASEMI_MAC is not set | ||
686 | # CONFIG_MLX4_CORE is not set | 692 | # CONFIG_MLX4_CORE is not set |
687 | # CONFIG_TEHUTI is not set | 693 | # CONFIG_TEHUTI is not set |
688 | # CONFIG_BNX2X is not set | 694 | # CONFIG_BNX2X is not set |
695 | # CONFIG_SFC is not set | ||
689 | CONFIG_TR=y | 696 | CONFIG_TR=y |
690 | CONFIG_IBMOL=y | 697 | CONFIG_IBMOL=y |
691 | # CONFIG_3C359 is not set | 698 | # CONFIG_3C359 is not set |
@@ -696,6 +703,7 @@ CONFIG_IBMOL=y | |||
696 | # | 703 | # |
697 | # CONFIG_WLAN_PRE80211 is not set | 704 | # CONFIG_WLAN_PRE80211 is not set |
698 | # CONFIG_WLAN_80211 is not set | 705 | # CONFIG_WLAN_80211 is not set |
706 | # CONFIG_IWLWIFI_LEDS is not set | ||
699 | # CONFIG_WAN is not set | 707 | # CONFIG_WAN is not set |
700 | CONFIG_ISERIES_VETH=y | 708 | CONFIG_ISERIES_VETH=y |
701 | # CONFIG_FDDI is not set | 709 | # CONFIG_FDDI is not set |
@@ -762,6 +770,7 @@ CONFIG_VT=y | |||
762 | CONFIG_VT_CONSOLE=y | 770 | CONFIG_VT_CONSOLE=y |
763 | CONFIG_HW_CONSOLE=y | 771 | CONFIG_HW_CONSOLE=y |
764 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 772 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
773 | CONFIG_DEVKMEM=y | ||
765 | # CONFIG_SERIAL_NONSTANDARD is not set | 774 | # CONFIG_SERIAL_NONSTANDARD is not set |
766 | # CONFIG_NOZOMI is not set | 775 | # CONFIG_NOZOMI is not set |
767 | 776 | ||
@@ -793,12 +802,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
793 | # CONFIG_TCG_TPM is not set | 802 | # CONFIG_TCG_TPM is not set |
794 | CONFIG_DEVPORT=y | 803 | CONFIG_DEVPORT=y |
795 | # CONFIG_I2C is not set | 804 | # CONFIG_I2C is not set |
796 | |||
797 | # | ||
798 | # SPI support | ||
799 | # | ||
800 | # CONFIG_SPI is not set | 805 | # CONFIG_SPI is not set |
801 | # CONFIG_SPI_MASTER is not set | ||
802 | # CONFIG_W1 is not set | 806 | # CONFIG_W1 is not set |
803 | # CONFIG_POWER_SUPPLY is not set | 807 | # CONFIG_POWER_SUPPLY is not set |
804 | # CONFIG_HWMON is not set | 808 | # CONFIG_HWMON is not set |
@@ -815,12 +819,22 @@ CONFIG_SSB_POSSIBLE=y | |||
815 | # Multifunction device drivers | 819 | # Multifunction device drivers |
816 | # | 820 | # |
817 | # CONFIG_MFD_SM501 is not set | 821 | # CONFIG_MFD_SM501 is not set |
822 | # CONFIG_HTC_PASIC3 is not set | ||
818 | 823 | ||
819 | # | 824 | # |
820 | # Multimedia devices | 825 | # Multimedia devices |
821 | # | 826 | # |
827 | |||
828 | # | ||
829 | # Multimedia core support | ||
830 | # | ||
822 | # CONFIG_VIDEO_DEV is not set | 831 | # CONFIG_VIDEO_DEV is not set |
823 | # CONFIG_DVB_CORE is not set | 832 | # CONFIG_DVB_CORE is not set |
833 | # CONFIG_VIDEO_MEDIA is not set | ||
834 | |||
835 | # | ||
836 | # Multimedia drivers | ||
837 | # | ||
824 | # CONFIG_DAB is not set | 838 | # CONFIG_DAB is not set |
825 | 839 | ||
826 | # | 840 | # |
@@ -854,14 +868,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
854 | # CONFIG_MMC is not set | 868 | # CONFIG_MMC is not set |
855 | # CONFIG_MEMSTICK is not set | 869 | # CONFIG_MEMSTICK is not set |
856 | # CONFIG_NEW_LEDS is not set | 870 | # CONFIG_NEW_LEDS is not set |
871 | # CONFIG_ACCESSIBILITY is not set | ||
857 | # CONFIG_INFINIBAND is not set | 872 | # CONFIG_INFINIBAND is not set |
858 | # CONFIG_EDAC is not set | 873 | # CONFIG_EDAC is not set |
859 | # CONFIG_RTC_CLASS is not set | 874 | # CONFIG_RTC_CLASS is not set |
860 | # CONFIG_DMADEVICES is not set | 875 | # CONFIG_DMADEVICES is not set |
861 | |||
862 | # | ||
863 | # Userspace I/O | ||
864 | # | ||
865 | # CONFIG_UIO is not set | 876 | # CONFIG_UIO is not set |
866 | 877 | ||
867 | # | 878 | # |
@@ -895,9 +906,9 @@ CONFIG_JFS_SECURITY=y | |||
895 | CONFIG_FS_POSIX_ACL=y | 906 | CONFIG_FS_POSIX_ACL=y |
896 | CONFIG_XFS_FS=m | 907 | CONFIG_XFS_FS=m |
897 | # CONFIG_XFS_QUOTA is not set | 908 | # CONFIG_XFS_QUOTA is not set |
898 | CONFIG_XFS_SECURITY=y | ||
899 | CONFIG_XFS_POSIX_ACL=y | 909 | CONFIG_XFS_POSIX_ACL=y |
900 | # CONFIG_XFS_RT is not set | 910 | # CONFIG_XFS_RT is not set |
911 | # CONFIG_XFS_DEBUG is not set | ||
901 | CONFIG_GFS2_FS=m | 912 | CONFIG_GFS2_FS=m |
902 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | 913 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m |
903 | CONFIG_GFS2_FS_LOCKING_DLM=m | 914 | CONFIG_GFS2_FS_LOCKING_DLM=m |
@@ -966,13 +977,11 @@ CONFIG_NFS_FS=y | |||
966 | CONFIG_NFS_V3=y | 977 | CONFIG_NFS_V3=y |
967 | CONFIG_NFS_V3_ACL=y | 978 | CONFIG_NFS_V3_ACL=y |
968 | CONFIG_NFS_V4=y | 979 | CONFIG_NFS_V4=y |
969 | # CONFIG_NFS_DIRECTIO is not set | ||
970 | CONFIG_NFSD=m | 980 | CONFIG_NFSD=m |
971 | CONFIG_NFSD_V2_ACL=y | 981 | CONFIG_NFSD_V2_ACL=y |
972 | CONFIG_NFSD_V3=y | 982 | CONFIG_NFSD_V3=y |
973 | CONFIG_NFSD_V3_ACL=y | 983 | CONFIG_NFSD_V3_ACL=y |
974 | CONFIG_NFSD_V4=y | 984 | CONFIG_NFSD_V4=y |
975 | CONFIG_NFSD_TCP=y | ||
976 | CONFIG_LOCKD=y | 985 | CONFIG_LOCKD=y |
977 | CONFIG_LOCKD_V4=y | 986 | CONFIG_LOCKD_V4=y |
978 | CONFIG_EXPORTFS=m | 987 | CONFIG_EXPORTFS=m |
@@ -1047,9 +1056,10 @@ CONFIG_DLM=m | |||
1047 | # Library routines | 1056 | # Library routines |
1048 | # | 1057 | # |
1049 | CONFIG_BITREVERSE=y | 1058 | CONFIG_BITREVERSE=y |
1059 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1050 | CONFIG_CRC_CCITT=m | 1060 | CONFIG_CRC_CCITT=m |
1051 | # CONFIG_CRC16 is not set | 1061 | # CONFIG_CRC16 is not set |
1052 | # CONFIG_CRC_ITU_T is not set | 1062 | CONFIG_CRC_ITU_T=m |
1053 | CONFIG_CRC32=y | 1063 | CONFIG_CRC32=y |
1054 | # CONFIG_CRC7 is not set | 1064 | # CONFIG_CRC7 is not set |
1055 | CONFIG_LIBCRC32C=m | 1065 | CONFIG_LIBCRC32C=m |
@@ -1071,6 +1081,7 @@ CONFIG_HAVE_LMB=y | |||
1071 | # CONFIG_PRINTK_TIME is not set | 1081 | # CONFIG_PRINTK_TIME is not set |
1072 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1082 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1073 | CONFIG_ENABLE_MUST_CHECK=y | 1083 | CONFIG_ENABLE_MUST_CHECK=y |
1084 | CONFIG_FRAME_WARN=2048 | ||
1074 | CONFIG_MAGIC_SYSRQ=y | 1085 | CONFIG_MAGIC_SYSRQ=y |
1075 | # CONFIG_UNUSED_SYMBOLS is not set | 1086 | # CONFIG_UNUSED_SYMBOLS is not set |
1076 | CONFIG_DEBUG_FS=y | 1087 | CONFIG_DEBUG_FS=y |
@@ -1081,18 +1092,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1081 | CONFIG_SCHED_DEBUG=y | 1092 | CONFIG_SCHED_DEBUG=y |
1082 | # CONFIG_SCHEDSTATS is not set | 1093 | # CONFIG_SCHEDSTATS is not set |
1083 | # CONFIG_TIMER_STATS is not set | 1094 | # CONFIG_TIMER_STATS is not set |
1095 | # CONFIG_DEBUG_OBJECTS is not set | ||
1084 | # CONFIG_SLUB_DEBUG_ON is not set | 1096 | # CONFIG_SLUB_DEBUG_ON is not set |
1085 | # CONFIG_SLUB_STATS is not set | 1097 | # CONFIG_SLUB_STATS is not set |
1086 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1098 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1087 | # CONFIG_RT_MUTEX_TESTER is not set | 1099 | # CONFIG_RT_MUTEX_TESTER is not set |
1088 | # CONFIG_DEBUG_SPINLOCK is not set | 1100 | # CONFIG_DEBUG_SPINLOCK is not set |
1089 | # CONFIG_DEBUG_MUTEXES is not set | 1101 | # CONFIG_DEBUG_MUTEXES is not set |
1102 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1103 | # CONFIG_PROVE_LOCKING is not set | ||
1104 | # CONFIG_LOCK_STAT is not set | ||
1090 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1105 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1091 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1106 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1092 | # CONFIG_DEBUG_KOBJECT is not set | 1107 | # CONFIG_DEBUG_KOBJECT is not set |
1093 | CONFIG_DEBUG_BUGVERBOSE=y | 1108 | CONFIG_DEBUG_BUGVERBOSE=y |
1094 | # CONFIG_DEBUG_INFO is not set | 1109 | # CONFIG_DEBUG_INFO is not set |
1095 | # CONFIG_DEBUG_VM is not set | 1110 | # CONFIG_DEBUG_VM is not set |
1111 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1096 | # CONFIG_DEBUG_LIST is not set | 1112 | # CONFIG_DEBUG_LIST is not set |
1097 | # CONFIG_DEBUG_SG is not set | 1113 | # CONFIG_DEBUG_SG is not set |
1098 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1114 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1116,53 +1132,83 @@ CONFIG_IRQSTACKS=y | |||
1116 | # CONFIG_SECURITY is not set | 1132 | # CONFIG_SECURITY is not set |
1117 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1133 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1118 | CONFIG_CRYPTO=y | 1134 | CONFIG_CRYPTO=y |
1135 | |||
1136 | # | ||
1137 | # Crypto core or helper | ||
1138 | # | ||
1119 | CONFIG_CRYPTO_ALGAPI=y | 1139 | CONFIG_CRYPTO_ALGAPI=y |
1120 | CONFIG_CRYPTO_AEAD=m | 1140 | CONFIG_CRYPTO_AEAD=m |
1121 | CONFIG_CRYPTO_BLKCIPHER=y | 1141 | CONFIG_CRYPTO_BLKCIPHER=y |
1122 | # CONFIG_CRYPTO_SEQIV is not set | ||
1123 | CONFIG_CRYPTO_HASH=y | 1142 | CONFIG_CRYPTO_HASH=y |
1124 | CONFIG_CRYPTO_MANAGER=y | 1143 | CONFIG_CRYPTO_MANAGER=y |
1144 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1145 | CONFIG_CRYPTO_NULL=m | ||
1146 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1147 | CONFIG_CRYPTO_AUTHENC=m | ||
1148 | CONFIG_CRYPTO_TEST=m | ||
1149 | |||
1150 | # | ||
1151 | # Authenticated Encryption with Associated Data | ||
1152 | # | ||
1153 | # CONFIG_CRYPTO_CCM is not set | ||
1154 | # CONFIG_CRYPTO_GCM is not set | ||
1155 | # CONFIG_CRYPTO_SEQIV is not set | ||
1156 | |||
1157 | # | ||
1158 | # Block modes | ||
1159 | # | ||
1160 | CONFIG_CRYPTO_CBC=y | ||
1161 | # CONFIG_CRYPTO_CTR is not set | ||
1162 | # CONFIG_CRYPTO_CTS is not set | ||
1163 | CONFIG_CRYPTO_ECB=m | ||
1164 | # CONFIG_CRYPTO_LRW is not set | ||
1165 | CONFIG_CRYPTO_PCBC=m | ||
1166 | # CONFIG_CRYPTO_XTS is not set | ||
1167 | |||
1168 | # | ||
1169 | # Hash modes | ||
1170 | # | ||
1125 | CONFIG_CRYPTO_HMAC=y | 1171 | CONFIG_CRYPTO_HMAC=y |
1126 | # CONFIG_CRYPTO_XCBC is not set | 1172 | # CONFIG_CRYPTO_XCBC is not set |
1127 | CONFIG_CRYPTO_NULL=m | 1173 | |
1174 | # | ||
1175 | # Digest | ||
1176 | # | ||
1177 | CONFIG_CRYPTO_CRC32C=m | ||
1128 | CONFIG_CRYPTO_MD4=m | 1178 | CONFIG_CRYPTO_MD4=m |
1129 | CONFIG_CRYPTO_MD5=y | 1179 | CONFIG_CRYPTO_MD5=y |
1180 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1130 | CONFIG_CRYPTO_SHA1=m | 1181 | CONFIG_CRYPTO_SHA1=m |
1131 | CONFIG_CRYPTO_SHA256=m | 1182 | CONFIG_CRYPTO_SHA256=m |
1132 | CONFIG_CRYPTO_SHA512=m | 1183 | CONFIG_CRYPTO_SHA512=m |
1133 | CONFIG_CRYPTO_WP512=m | ||
1134 | CONFIG_CRYPTO_TGR192=m | 1184 | CONFIG_CRYPTO_TGR192=m |
1135 | # CONFIG_CRYPTO_GF128MUL is not set | 1185 | CONFIG_CRYPTO_WP512=m |
1136 | CONFIG_CRYPTO_ECB=m | 1186 | |
1137 | CONFIG_CRYPTO_CBC=y | 1187 | # |
1138 | CONFIG_CRYPTO_PCBC=m | 1188 | # Ciphers |
1139 | # CONFIG_CRYPTO_LRW is not set | 1189 | # |
1140 | # CONFIG_CRYPTO_XTS is not set | ||
1141 | # CONFIG_CRYPTO_CTR is not set | ||
1142 | # CONFIG_CRYPTO_GCM is not set | ||
1143 | # CONFIG_CRYPTO_CCM is not set | ||
1144 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1145 | CONFIG_CRYPTO_DES=y | ||
1146 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1147 | CONFIG_CRYPTO_BLOWFISH=m | ||
1148 | CONFIG_CRYPTO_TWOFISH=m | ||
1149 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1150 | CONFIG_CRYPTO_SERPENT=m | ||
1151 | CONFIG_CRYPTO_AES=m | 1190 | CONFIG_CRYPTO_AES=m |
1191 | CONFIG_CRYPTO_ANUBIS=m | ||
1192 | CONFIG_CRYPTO_ARC4=m | ||
1193 | CONFIG_CRYPTO_BLOWFISH=m | ||
1194 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1152 | CONFIG_CRYPTO_CAST5=m | 1195 | CONFIG_CRYPTO_CAST5=m |
1153 | CONFIG_CRYPTO_CAST6=m | 1196 | CONFIG_CRYPTO_CAST6=m |
1154 | CONFIG_CRYPTO_TEA=m | 1197 | CONFIG_CRYPTO_DES=y |
1155 | CONFIG_CRYPTO_ARC4=m | 1198 | # CONFIG_CRYPTO_FCRYPT is not set |
1156 | CONFIG_CRYPTO_KHAZAD=m | 1199 | CONFIG_CRYPTO_KHAZAD=m |
1157 | CONFIG_CRYPTO_ANUBIS=m | ||
1158 | CONFIG_CRYPTO_SEED=m | ||
1159 | # CONFIG_CRYPTO_SALSA20 is not set | 1200 | # CONFIG_CRYPTO_SALSA20 is not set |
1201 | CONFIG_CRYPTO_SEED=m | ||
1202 | CONFIG_CRYPTO_SERPENT=m | ||
1203 | CONFIG_CRYPTO_TEA=m | ||
1204 | CONFIG_CRYPTO_TWOFISH=m | ||
1205 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1206 | |||
1207 | # | ||
1208 | # Compression | ||
1209 | # | ||
1160 | CONFIG_CRYPTO_DEFLATE=m | 1210 | CONFIG_CRYPTO_DEFLATE=m |
1161 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1162 | CONFIG_CRYPTO_CRC32C=m | ||
1163 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1164 | CONFIG_CRYPTO_TEST=m | ||
1165 | CONFIG_CRYPTO_AUTHENC=m | ||
1166 | # CONFIG_CRYPTO_LZO is not set | 1211 | # CONFIG_CRYPTO_LZO is not set |
1167 | # CONFIG_CRYPTO_HW is not set | 1212 | # CONFIG_CRYPTO_HW is not set |
1168 | # CONFIG_PPC_CLOCK is not set | 1213 | # CONFIG_PPC_CLOCK is not set |
1214 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 22a943afc3c0..48434c2c7628 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:10 2008 | 4 | # Mon Jun 9 08:52:10 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -91,6 +93,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
91 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
92 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
93 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -118,12 +121,14 @@ CONFIG_HAVE_OPROFILE=y | |||
118 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
119 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
120 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
124 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
121 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
122 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
123 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
124 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
125 | CONFIG_BASE_SMALL=0 | 129 | CONFIG_BASE_SMALL=0 |
126 | CONFIG_MODULES=y | 130 | CONFIG_MODULES=y |
131 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
127 | CONFIG_MODULE_UNLOAD=y | 132 | CONFIG_MODULE_UNLOAD=y |
128 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 133 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
129 | # CONFIG_MODVERSIONS is not set | 134 | # CONFIG_MODVERSIONS is not set |
@@ -223,11 +228,13 @@ CONFIG_FLATMEM=y | |||
223 | CONFIG_FLAT_NODE_MEM_MAP=y | 228 | CONFIG_FLAT_NODE_MEM_MAP=y |
224 | # CONFIG_SPARSEMEM_STATIC is not set | 229 | # CONFIG_SPARSEMEM_STATIC is not set |
225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
231 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
226 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
227 | # CONFIG_RESOURCES_64BIT is not set | 233 | # CONFIG_RESOURCES_64BIT is not set |
228 | CONFIG_ZONE_DMA_FLAG=1 | 234 | CONFIG_ZONE_DMA_FLAG=1 |
229 | CONFIG_BOUNCE=y | 235 | CONFIG_BOUNCE=y |
230 | CONFIG_VIRT_TO_BUS=y | 236 | CONFIG_VIRT_TO_BUS=y |
237 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
231 | CONFIG_PROC_DEVICETREE=y | 238 | CONFIG_PROC_DEVICETREE=y |
232 | # CONFIG_CMDLINE_BOOL is not set | 239 | # CONFIG_CMDLINE_BOOL is not set |
233 | # CONFIG_PM is not set | 240 | # CONFIG_PM is not set |
@@ -251,6 +258,7 @@ CONFIG_PCI_LEGACY=y | |||
251 | # CONFIG_PCI_DEBUG is not set | 258 | # CONFIG_PCI_DEBUG is not set |
252 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
253 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
261 | # CONFIG_HAS_RAPIDIO is not set | ||
254 | 262 | ||
255 | # | 263 | # |
256 | # Advanced setup | 264 | # Advanced setup |
@@ -260,11 +268,11 @@ CONFIG_PCI_LEGACY=y | |||
260 | # | 268 | # |
261 | # Default settings for advanced configuration options are used | 269 | # Default settings for advanced configuration options are used |
262 | # | 270 | # |
263 | CONFIG_HIGHMEM_START=0xfe000000 | ||
264 | CONFIG_LOWMEM_SIZE=0x30000000 | 271 | CONFIG_LOWMEM_SIZE=0x30000000 |
272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
265 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
274 | CONFIG_PHYSICAL_START=0x00000000 | ||
266 | CONFIG_TASK_SIZE=0xc0000000 | 275 | CONFIG_TASK_SIZE=0xc0000000 |
267 | CONFIG_BOOT_LOAD=0x00800000 | ||
268 | 276 | ||
269 | # | 277 | # |
270 | # Networking | 278 | # Networking |
@@ -313,8 +321,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
313 | # CONFIG_TCP_MD5SIG is not set | 321 | # CONFIG_TCP_MD5SIG is not set |
314 | # CONFIG_IP_VS is not set | 322 | # CONFIG_IP_VS is not set |
315 | # CONFIG_IPV6 is not set | 323 | # CONFIG_IPV6 is not set |
316 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
317 | # CONFIG_INET6_TUNNEL is not set | ||
318 | # CONFIG_NETWORK_SECMARK is not set | 324 | # CONFIG_NETWORK_SECMARK is not set |
319 | CONFIG_NETFILTER=y | 325 | CONFIG_NETFILTER=y |
320 | # CONFIG_NETFILTER_DEBUG is not set | 326 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -329,6 +335,7 @@ CONFIG_NF_CONNTRACK=m | |||
329 | # CONFIG_NF_CT_ACCT is not set | 335 | # CONFIG_NF_CT_ACCT is not set |
330 | # CONFIG_NF_CONNTRACK_MARK is not set | 336 | # CONFIG_NF_CONNTRACK_MARK is not set |
331 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 337 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
338 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
332 | CONFIG_NF_CT_PROTO_GRE=m | 339 | CONFIG_NF_CT_PROTO_GRE=m |
333 | CONFIG_NF_CT_PROTO_SCTP=m | 340 | CONFIG_NF_CT_PROTO_SCTP=m |
334 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 341 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
@@ -407,6 +414,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m | |||
407 | # CONFIG_IP_NF_TARGET_NETMAP is not set | 414 | # CONFIG_IP_NF_TARGET_NETMAP is not set |
408 | # CONFIG_NF_NAT_SNMP_BASIC is not set | 415 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
409 | CONFIG_NF_NAT_PROTO_GRE=m | 416 | CONFIG_NF_NAT_PROTO_GRE=m |
417 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
410 | CONFIG_NF_NAT_FTP=m | 418 | CONFIG_NF_NAT_FTP=m |
411 | CONFIG_NF_NAT_IRC=m | 419 | CONFIG_NF_NAT_IRC=m |
412 | CONFIG_NF_NAT_TFTP=m | 420 | CONFIG_NF_NAT_TFTP=m |
@@ -459,8 +467,6 @@ CONFIG_IEEE80211_DEBUG=y | |||
459 | CONFIG_IEEE80211_CRYPT_WEP=m | 467 | CONFIG_IEEE80211_CRYPT_WEP=m |
460 | CONFIG_IEEE80211_CRYPT_CCMP=m | 468 | CONFIG_IEEE80211_CRYPT_CCMP=m |
461 | CONFIG_IEEE80211_CRYPT_TKIP=m | 469 | CONFIG_IEEE80211_CRYPT_TKIP=m |
462 | CONFIG_IEEE80211_SOFTMAC=m | ||
463 | CONFIG_IEEE80211_SOFTMAC_DEBUG=y | ||
464 | # CONFIG_RFKILL is not set | 470 | # CONFIG_RFKILL is not set |
465 | # CONFIG_NET_9P is not set | 471 | # CONFIG_NET_9P is not set |
466 | 472 | ||
@@ -486,6 +492,7 @@ CONFIG_MTD_PARTITIONS=y | |||
486 | # CONFIG_MTD_REDBOOT_PARTS is not set | 492 | # CONFIG_MTD_REDBOOT_PARTS is not set |
487 | # CONFIG_MTD_CMDLINE_PARTS is not set | 493 | # CONFIG_MTD_CMDLINE_PARTS is not set |
488 | # CONFIG_MTD_OF_PARTS is not set | 494 | # CONFIG_MTD_OF_PARTS is not set |
495 | # CONFIG_MTD_AR7_PARTS is not set | ||
489 | 496 | ||
490 | # | 497 | # |
491 | # User Modules And Translation Layers | 498 | # User Modules And Translation Layers |
@@ -565,6 +572,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
565 | # | 572 | # |
566 | # CONFIG_MTD_UBI is not set | 573 | # CONFIG_MTD_UBI is not set |
567 | CONFIG_OF_DEVICE=y | 574 | CONFIG_OF_DEVICE=y |
575 | CONFIG_OF_I2C=y | ||
568 | # CONFIG_PARPORT is not set | 576 | # CONFIG_PARPORT is not set |
569 | CONFIG_BLK_DEV=y | 577 | CONFIG_BLK_DEV=y |
570 | # CONFIG_BLK_DEV_FD is not set | 578 | # CONFIG_BLK_DEV_FD is not set |
@@ -670,7 +678,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
670 | # CONFIG_SCSI_SRP is not set | 678 | # CONFIG_SCSI_SRP is not set |
671 | CONFIG_ATA=y | 679 | CONFIG_ATA=y |
672 | # CONFIG_ATA_NONSTANDARD is not set | 680 | # CONFIG_ATA_NONSTANDARD is not set |
681 | CONFIG_SATA_PMP=y | ||
673 | # CONFIG_SATA_AHCI is not set | 682 | # CONFIG_SATA_AHCI is not set |
683 | # CONFIG_SATA_SIL24 is not set | ||
684 | # CONFIG_SATA_FSL is not set | ||
685 | CONFIG_ATA_SFF=y | ||
674 | # CONFIG_SATA_SVW is not set | 686 | # CONFIG_SATA_SVW is not set |
675 | # CONFIG_ATA_PIIX is not set | 687 | # CONFIG_ATA_PIIX is not set |
676 | # CONFIG_SATA_MV is not set | 688 | # CONFIG_SATA_MV is not set |
@@ -680,13 +692,11 @@ CONFIG_ATA=y | |||
680 | # CONFIG_SATA_PROMISE is not set | 692 | # CONFIG_SATA_PROMISE is not set |
681 | # CONFIG_SATA_SX4 is not set | 693 | # CONFIG_SATA_SX4 is not set |
682 | # CONFIG_SATA_SIL is not set | 694 | # CONFIG_SATA_SIL is not set |
683 | # CONFIG_SATA_SIL24 is not set | ||
684 | # CONFIG_SATA_SIS is not set | 695 | # CONFIG_SATA_SIS is not set |
685 | # CONFIG_SATA_ULI is not set | 696 | # CONFIG_SATA_ULI is not set |
686 | # CONFIG_SATA_VIA is not set | 697 | # CONFIG_SATA_VIA is not set |
687 | # CONFIG_SATA_VITESSE is not set | 698 | # CONFIG_SATA_VITESSE is not set |
688 | # CONFIG_SATA_INIC162X is not set | 699 | # CONFIG_SATA_INIC162X is not set |
689 | # CONFIG_SATA_FSL is not set | ||
690 | # CONFIG_PATA_ALI is not set | 700 | # CONFIG_PATA_ALI is not set |
691 | # CONFIG_PATA_AMD is not set | 701 | # CONFIG_PATA_AMD is not set |
692 | # CONFIG_PATA_ARTOP is not set | 702 | # CONFIG_PATA_ARTOP is not set |
@@ -726,6 +736,7 @@ CONFIG_PATA_SIL680=y | |||
726 | # CONFIG_PATA_VIA is not set | 736 | # CONFIG_PATA_VIA is not set |
727 | # CONFIG_PATA_WINBOND is not set | 737 | # CONFIG_PATA_WINBOND is not set |
728 | # CONFIG_PATA_PLATFORM is not set | 738 | # CONFIG_PATA_PLATFORM is not set |
739 | # CONFIG_PATA_SCH is not set | ||
729 | # CONFIG_MD is not set | 740 | # CONFIG_MD is not set |
730 | # CONFIG_FUSION is not set | 741 | # CONFIG_FUSION is not set |
731 | 742 | ||
@@ -785,7 +796,6 @@ CONFIG_R8169=y | |||
785 | # CONFIG_SIS190 is not set | 796 | # CONFIG_SIS190 is not set |
786 | # CONFIG_SKGE is not set | 797 | # CONFIG_SKGE is not set |
787 | # CONFIG_SKY2 is not set | 798 | # CONFIG_SKY2 is not set |
788 | # CONFIG_SK98LIN is not set | ||
789 | # CONFIG_VIA_VELOCITY is not set | 799 | # CONFIG_VIA_VELOCITY is not set |
790 | # CONFIG_TIGON3 is not set | 800 | # CONFIG_TIGON3 is not set |
791 | # CONFIG_BNX2 is not set | 801 | # CONFIG_BNX2 is not set |
@@ -805,6 +815,7 @@ CONFIG_NETDEV_10000=y | |||
805 | # CONFIG_MLX4_CORE is not set | 815 | # CONFIG_MLX4_CORE is not set |
806 | # CONFIG_TEHUTI is not set | 816 | # CONFIG_TEHUTI is not set |
807 | # CONFIG_BNX2X is not set | 817 | # CONFIG_BNX2X is not set |
818 | # CONFIG_SFC is not set | ||
808 | # CONFIG_TR is not set | 819 | # CONFIG_TR is not set |
809 | 820 | ||
810 | # | 821 | # |
@@ -812,6 +823,7 @@ CONFIG_NETDEV_10000=y | |||
812 | # | 823 | # |
813 | # CONFIG_WLAN_PRE80211 is not set | 824 | # CONFIG_WLAN_PRE80211 is not set |
814 | # CONFIG_WLAN_80211 is not set | 825 | # CONFIG_WLAN_80211 is not set |
826 | # CONFIG_IWLWIFI_LEDS is not set | ||
815 | 827 | ||
816 | # | 828 | # |
817 | # USB Network Adapters | 829 | # USB Network Adapters |
@@ -886,6 +898,7 @@ CONFIG_VT=y | |||
886 | CONFIG_VT_CONSOLE=y | 898 | CONFIG_VT_CONSOLE=y |
887 | CONFIG_HW_CONSOLE=y | 899 | CONFIG_HW_CONSOLE=y |
888 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 900 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
901 | CONFIG_DEVKMEM=y | ||
889 | # CONFIG_SERIAL_NONSTANDARD is not set | 902 | # CONFIG_SERIAL_NONSTANDARD is not set |
890 | # CONFIG_NOZOMI is not set | 903 | # CONFIG_NOZOMI is not set |
891 | 904 | ||
@@ -913,7 +926,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
913 | # CONFIG_IPMI_HANDLER is not set | 926 | # CONFIG_IPMI_HANDLER is not set |
914 | CONFIG_HW_RANDOM=y | 927 | CONFIG_HW_RANDOM=y |
915 | # CONFIG_NVRAM is not set | 928 | # CONFIG_NVRAM is not set |
916 | # CONFIG_GEN_RTC is not set | ||
917 | # CONFIG_R3964 is not set | 929 | # CONFIG_R3964 is not set |
918 | # CONFIG_APPLICOM is not set | 930 | # CONFIG_APPLICOM is not set |
919 | # CONFIG_RAW_DRIVER is not set | 931 | # CONFIG_RAW_DRIVER is not set |
@@ -924,13 +936,6 @@ CONFIG_I2C_BOARDINFO=y | |||
924 | CONFIG_I2C_CHARDEV=y | 936 | CONFIG_I2C_CHARDEV=y |
925 | 937 | ||
926 | # | 938 | # |
927 | # I2C Algorithms | ||
928 | # | ||
929 | # CONFIG_I2C_ALGOBIT is not set | ||
930 | # CONFIG_I2C_ALGOPCF is not set | ||
931 | # CONFIG_I2C_ALGOPCA is not set | ||
932 | |||
933 | # | ||
934 | # I2C Hardware Bus support | 939 | # I2C Hardware Bus support |
935 | # | 940 | # |
936 | # CONFIG_I2C_ALI1535 is not set | 941 | # CONFIG_I2C_ALI1535 is not set |
@@ -957,6 +962,7 @@ CONFIG_I2C_MPC=y | |||
957 | # CONFIG_I2C_VIA is not set | 962 | # CONFIG_I2C_VIA is not set |
958 | # CONFIG_I2C_VIAPRO is not set | 963 | # CONFIG_I2C_VIAPRO is not set |
959 | # CONFIG_I2C_VOODOO3 is not set | 964 | # CONFIG_I2C_VOODOO3 is not set |
965 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
960 | 966 | ||
961 | # | 967 | # |
962 | # Miscellaneous I2C Chip support | 968 | # Miscellaneous I2C Chip support |
@@ -966,19 +972,13 @@ CONFIG_SENSORS_EEPROM=m | |||
966 | # CONFIG_SENSORS_PCF8574 is not set | 972 | # CONFIG_SENSORS_PCF8574 is not set |
967 | # CONFIG_PCF8575 is not set | 973 | # CONFIG_PCF8575 is not set |
968 | # CONFIG_SENSORS_PCF8591 is not set | 974 | # CONFIG_SENSORS_PCF8591 is not set |
969 | # CONFIG_TPS65010 is not set | ||
970 | # CONFIG_SENSORS_MAX6875 is not set | 975 | # CONFIG_SENSORS_MAX6875 is not set |
971 | # CONFIG_SENSORS_TSL2550 is not set | 976 | # CONFIG_SENSORS_TSL2550 is not set |
972 | # CONFIG_I2C_DEBUG_CORE is not set | 977 | # CONFIG_I2C_DEBUG_CORE is not set |
973 | # CONFIG_I2C_DEBUG_ALGO is not set | 978 | # CONFIG_I2C_DEBUG_ALGO is not set |
974 | # CONFIG_I2C_DEBUG_BUS is not set | 979 | # CONFIG_I2C_DEBUG_BUS is not set |
975 | # CONFIG_I2C_DEBUG_CHIP is not set | 980 | # CONFIG_I2C_DEBUG_CHIP is not set |
976 | |||
977 | # | ||
978 | # SPI support | ||
979 | # | ||
980 | # CONFIG_SPI is not set | 981 | # CONFIG_SPI is not set |
981 | # CONFIG_SPI_MASTER is not set | ||
982 | # CONFIG_W1 is not set | 982 | # CONFIG_W1 is not set |
983 | # CONFIG_POWER_SUPPLY is not set | 983 | # CONFIG_POWER_SUPPLY is not set |
984 | CONFIG_HWMON=y | 984 | CONFIG_HWMON=y |
@@ -1048,12 +1048,22 @@ CONFIG_SSB_POSSIBLE=y | |||
1048 | # Multifunction device drivers | 1048 | # Multifunction device drivers |
1049 | # | 1049 | # |
1050 | # CONFIG_MFD_SM501 is not set | 1050 | # CONFIG_MFD_SM501 is not set |
1051 | # CONFIG_HTC_PASIC3 is not set | ||
1051 | 1052 | ||
1052 | # | 1053 | # |
1053 | # Multimedia devices | 1054 | # Multimedia devices |
1054 | # | 1055 | # |
1056 | |||
1057 | # | ||
1058 | # Multimedia core support | ||
1059 | # | ||
1055 | # CONFIG_VIDEO_DEV is not set | 1060 | # CONFIG_VIDEO_DEV is not set |
1056 | # CONFIG_DVB_CORE is not set | 1061 | # CONFIG_DVB_CORE is not set |
1062 | # CONFIG_VIDEO_MEDIA is not set | ||
1063 | |||
1064 | # | ||
1065 | # Multimedia drivers | ||
1066 | # | ||
1057 | # CONFIG_DAB is not set | 1067 | # CONFIG_DAB is not set |
1058 | 1068 | ||
1059 | # | 1069 | # |
@@ -1115,12 +1125,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1115 | # | 1125 | # |
1116 | # USB Host Controller Drivers | 1126 | # USB Host Controller Drivers |
1117 | # | 1127 | # |
1128 | # CONFIG_USB_C67X00_HCD is not set | ||
1118 | CONFIG_USB_EHCI_HCD=y | 1129 | CONFIG_USB_EHCI_HCD=y |
1119 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1130 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1120 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1131 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1121 | # CONFIG_USB_EHCI_FSL is not set | 1132 | # CONFIG_USB_EHCI_FSL is not set |
1122 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1133 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1123 | # CONFIG_USB_ISP116X_HCD is not set | 1134 | # CONFIG_USB_ISP116X_HCD is not set |
1135 | # CONFIG_USB_ISP1760_HCD is not set | ||
1124 | CONFIG_USB_OHCI_HCD=y | 1136 | CONFIG_USB_OHCI_HCD=y |
1125 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1137 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
1126 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1138 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1138,6 +1150,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1138 | # | 1150 | # |
1139 | # CONFIG_USB_ACM is not set | 1151 | # CONFIG_USB_ACM is not set |
1140 | CONFIG_USB_PRINTER=m | 1152 | CONFIG_USB_PRINTER=m |
1153 | # CONFIG_USB_WDM is not set | ||
1141 | 1154 | ||
1142 | # | 1155 | # |
1143 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1156 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1159,6 +1172,7 @@ CONFIG_USB_STORAGE=m | |||
1159 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1172 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1160 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1173 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1161 | # CONFIG_USB_STORAGE_KARMA is not set | 1174 | # CONFIG_USB_STORAGE_KARMA is not set |
1175 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1162 | # CONFIG_USB_LIBUSUAL is not set | 1176 | # CONFIG_USB_LIBUSUAL is not set |
1163 | 1177 | ||
1164 | # | 1178 | # |
@@ -1202,9 +1216,11 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
1202 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1216 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
1203 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1217 | # CONFIG_USB_SERIAL_MOS7720 is not set |
1204 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1218 | # CONFIG_USB_SERIAL_MOS7840 is not set |
1219 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
1205 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1220 | # CONFIG_USB_SERIAL_NAVMAN is not set |
1206 | # CONFIG_USB_SERIAL_PL2303 is not set | 1221 | # CONFIG_USB_SERIAL_PL2303 is not set |
1207 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1222 | # CONFIG_USB_SERIAL_OTI6858 is not set |
1223 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
1208 | # CONFIG_USB_SERIAL_HP4X is not set | 1224 | # CONFIG_USB_SERIAL_HP4X is not set |
1209 | # CONFIG_USB_SERIAL_SAFE is not set | 1225 | # CONFIG_USB_SERIAL_SAFE is not set |
1210 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1226 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
@@ -1238,10 +1254,12 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
1238 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1254 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1239 | # CONFIG_USB_IOWARRIOR is not set | 1255 | # CONFIG_USB_IOWARRIOR is not set |
1240 | # CONFIG_USB_TEST is not set | 1256 | # CONFIG_USB_TEST is not set |
1257 | # CONFIG_USB_ISIGHTFW is not set | ||
1241 | # CONFIG_USB_GADGET is not set | 1258 | # CONFIG_USB_GADGET is not set |
1242 | # CONFIG_MMC is not set | 1259 | # CONFIG_MMC is not set |
1243 | # CONFIG_MEMSTICK is not set | 1260 | # CONFIG_MEMSTICK is not set |
1244 | # CONFIG_NEW_LEDS is not set | 1261 | # CONFIG_NEW_LEDS is not set |
1262 | # CONFIG_ACCESSIBILITY is not set | ||
1245 | # CONFIG_INFINIBAND is not set | 1263 | # CONFIG_INFINIBAND is not set |
1246 | # CONFIG_EDAC is not set | 1264 | # CONFIG_EDAC is not set |
1247 | CONFIG_RTC_LIB=y | 1265 | CONFIG_RTC_LIB=y |
@@ -1293,11 +1311,8 @@ CONFIG_RTC_DRV_RS5C372=y | |||
1293 | # | 1311 | # |
1294 | # on-CPU RTC drivers | 1312 | # on-CPU RTC drivers |
1295 | # | 1313 | # |
1314 | # CONFIG_RTC_DRV_PPC is not set | ||
1296 | # CONFIG_DMADEVICES is not set | 1315 | # CONFIG_DMADEVICES is not set |
1297 | |||
1298 | # | ||
1299 | # Userspace I/O | ||
1300 | # | ||
1301 | # CONFIG_UIO is not set | 1316 | # CONFIG_UIO is not set |
1302 | 1317 | ||
1303 | # | 1318 | # |
@@ -1318,10 +1333,9 @@ CONFIG_FS_MBCACHE=y | |||
1318 | CONFIG_FS_POSIX_ACL=y | 1333 | CONFIG_FS_POSIX_ACL=y |
1319 | CONFIG_XFS_FS=m | 1334 | CONFIG_XFS_FS=m |
1320 | # CONFIG_XFS_QUOTA is not set | 1335 | # CONFIG_XFS_QUOTA is not set |
1321 | # CONFIG_XFS_SECURITY is not set | ||
1322 | # CONFIG_XFS_POSIX_ACL is not set | 1336 | # CONFIG_XFS_POSIX_ACL is not set |
1323 | # CONFIG_XFS_RT is not set | 1337 | # CONFIG_XFS_RT is not set |
1324 | # CONFIG_GFS2_FS is not set | 1338 | # CONFIG_XFS_DEBUG is not set |
1325 | # CONFIG_OCFS2_FS is not set | 1339 | # CONFIG_OCFS2_FS is not set |
1326 | CONFIG_DNOTIFY=y | 1340 | CONFIG_DNOTIFY=y |
1327 | CONFIG_INOTIFY=y | 1341 | CONFIG_INOTIFY=y |
@@ -1388,12 +1402,10 @@ CONFIG_NFS_FS=y | |||
1388 | CONFIG_NFS_V3=y | 1402 | CONFIG_NFS_V3=y |
1389 | CONFIG_NFS_V3_ACL=y | 1403 | CONFIG_NFS_V3_ACL=y |
1390 | CONFIG_NFS_V4=y | 1404 | CONFIG_NFS_V4=y |
1391 | # CONFIG_NFS_DIRECTIO is not set | ||
1392 | CONFIG_NFSD=m | 1405 | CONFIG_NFSD=m |
1393 | CONFIG_NFSD_V3=y | 1406 | CONFIG_NFSD_V3=y |
1394 | # CONFIG_NFSD_V3_ACL is not set | 1407 | # CONFIG_NFSD_V3_ACL is not set |
1395 | # CONFIG_NFSD_V4 is not set | 1408 | # CONFIG_NFSD_V4 is not set |
1396 | CONFIG_NFSD_TCP=y | ||
1397 | CONFIG_ROOT_NFS=y | 1409 | CONFIG_ROOT_NFS=y |
1398 | CONFIG_LOCKD=y | 1410 | CONFIG_LOCKD=y |
1399 | CONFIG_LOCKD_V4=y | 1411 | CONFIG_LOCKD_V4=y |
@@ -1467,9 +1479,10 @@ CONFIG_NLS_UTF8=m | |||
1467 | # Library routines | 1479 | # Library routines |
1468 | # | 1480 | # |
1469 | CONFIG_BITREVERSE=y | 1481 | CONFIG_BITREVERSE=y |
1482 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1470 | CONFIG_CRC_CCITT=m | 1483 | CONFIG_CRC_CCITT=m |
1471 | # CONFIG_CRC16 is not set | 1484 | # CONFIG_CRC16 is not set |
1472 | # CONFIG_CRC_ITU_T is not set | 1485 | CONFIG_CRC_ITU_T=m |
1473 | CONFIG_CRC32=y | 1486 | CONFIG_CRC32=y |
1474 | # CONFIG_CRC7 is not set | 1487 | # CONFIG_CRC7 is not set |
1475 | CONFIG_LIBCRC32C=m | 1488 | CONFIG_LIBCRC32C=m |
@@ -1481,6 +1494,7 @@ CONFIG_PLIST=y | |||
1481 | CONFIG_HAS_IOMEM=y | 1494 | CONFIG_HAS_IOMEM=y |
1482 | CONFIG_HAS_IOPORT=y | 1495 | CONFIG_HAS_IOPORT=y |
1483 | CONFIG_HAS_DMA=y | 1496 | CONFIG_HAS_DMA=y |
1497 | CONFIG_HAVE_LMB=y | ||
1484 | 1498 | ||
1485 | # | 1499 | # |
1486 | # Kernel hacking | 1500 | # Kernel hacking |
@@ -1488,6 +1502,7 @@ CONFIG_HAS_DMA=y | |||
1488 | # CONFIG_PRINTK_TIME is not set | 1502 | # CONFIG_PRINTK_TIME is not set |
1489 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1503 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1490 | CONFIG_ENABLE_MUST_CHECK=y | 1504 | CONFIG_ENABLE_MUST_CHECK=y |
1505 | CONFIG_FRAME_WARN=1024 | ||
1491 | CONFIG_MAGIC_SYSRQ=y | 1506 | CONFIG_MAGIC_SYSRQ=y |
1492 | # CONFIG_UNUSED_SYMBOLS is not set | 1507 | # CONFIG_UNUSED_SYMBOLS is not set |
1493 | # CONFIG_DEBUG_FS is not set | 1508 | # CONFIG_DEBUG_FS is not set |
@@ -1498,6 +1513,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1498 | CONFIG_SCHED_DEBUG=y | 1513 | CONFIG_SCHED_DEBUG=y |
1499 | # CONFIG_SCHEDSTATS is not set | 1514 | # CONFIG_SCHEDSTATS is not set |
1500 | # CONFIG_TIMER_STATS is not set | 1515 | # CONFIG_TIMER_STATS is not set |
1516 | # CONFIG_DEBUG_OBJECTS is not set | ||
1501 | # CONFIG_SLUB_DEBUG_ON is not set | 1517 | # CONFIG_SLUB_DEBUG_ON is not set |
1502 | # CONFIG_SLUB_STATS is not set | 1518 | # CONFIG_SLUB_STATS is not set |
1503 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1519 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1510,6 +1526,7 @@ CONFIG_SCHED_DEBUG=y | |||
1510 | CONFIG_DEBUG_BUGVERBOSE=y | 1526 | CONFIG_DEBUG_BUGVERBOSE=y |
1511 | # CONFIG_DEBUG_INFO is not set | 1527 | # CONFIG_DEBUG_INFO is not set |
1512 | # CONFIG_DEBUG_VM is not set | 1528 | # CONFIG_DEBUG_VM is not set |
1529 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1513 | # CONFIG_DEBUG_LIST is not set | 1530 | # CONFIG_DEBUG_LIST is not set |
1514 | # CONFIG_DEBUG_SG is not set | 1531 | # CONFIG_DEBUG_SG is not set |
1515 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1532 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1521,6 +1538,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1521 | # CONFIG_DEBUG_STACK_USAGE is not set | 1538 | # CONFIG_DEBUG_STACK_USAGE is not set |
1522 | # CONFIG_DEBUG_PAGEALLOC is not set | 1539 | # CONFIG_DEBUG_PAGEALLOC is not set |
1523 | # CONFIG_DEBUGGER is not set | 1540 | # CONFIG_DEBUGGER is not set |
1541 | # CONFIG_IRQSTACKS is not set | ||
1524 | # CONFIG_BDI_SWITCH is not set | 1542 | # CONFIG_BDI_SWITCH is not set |
1525 | # CONFIG_BOOTX_TEXT is not set | 1543 | # CONFIG_BOOTX_TEXT is not set |
1526 | # CONFIG_PPC_EARLY_DEBUG is not set | 1544 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1532,52 +1550,82 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1532 | # CONFIG_SECURITY is not set | 1550 | # CONFIG_SECURITY is not set |
1533 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1551 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1534 | CONFIG_CRYPTO=y | 1552 | CONFIG_CRYPTO=y |
1553 | |||
1554 | # | ||
1555 | # Crypto core or helper | ||
1556 | # | ||
1535 | CONFIG_CRYPTO_ALGAPI=y | 1557 | CONFIG_CRYPTO_ALGAPI=y |
1536 | CONFIG_CRYPTO_BLKCIPHER=y | 1558 | CONFIG_CRYPTO_BLKCIPHER=y |
1537 | # CONFIG_CRYPTO_SEQIV is not set | ||
1538 | CONFIG_CRYPTO_MANAGER=y | 1559 | CONFIG_CRYPTO_MANAGER=y |
1560 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1561 | # CONFIG_CRYPTO_NULL is not set | ||
1562 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1563 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1564 | # CONFIG_CRYPTO_TEST is not set | ||
1565 | |||
1566 | # | ||
1567 | # Authenticated Encryption with Associated Data | ||
1568 | # | ||
1569 | # CONFIG_CRYPTO_CCM is not set | ||
1570 | # CONFIG_CRYPTO_GCM is not set | ||
1571 | # CONFIG_CRYPTO_SEQIV is not set | ||
1572 | |||
1573 | # | ||
1574 | # Block modes | ||
1575 | # | ||
1576 | CONFIG_CRYPTO_CBC=y | ||
1577 | # CONFIG_CRYPTO_CTR is not set | ||
1578 | # CONFIG_CRYPTO_CTS is not set | ||
1579 | CONFIG_CRYPTO_ECB=m | ||
1580 | # CONFIG_CRYPTO_LRW is not set | ||
1581 | CONFIG_CRYPTO_PCBC=m | ||
1582 | # CONFIG_CRYPTO_XTS is not set | ||
1583 | |||
1584 | # | ||
1585 | # Hash modes | ||
1586 | # | ||
1539 | # CONFIG_CRYPTO_HMAC is not set | 1587 | # CONFIG_CRYPTO_HMAC is not set |
1540 | # CONFIG_CRYPTO_XCBC is not set | 1588 | # CONFIG_CRYPTO_XCBC is not set |
1541 | # CONFIG_CRYPTO_NULL is not set | 1589 | |
1590 | # | ||
1591 | # Digest | ||
1592 | # | ||
1593 | CONFIG_CRYPTO_CRC32C=m | ||
1542 | CONFIG_CRYPTO_MD4=m | 1594 | CONFIG_CRYPTO_MD4=m |
1543 | CONFIG_CRYPTO_MD5=y | 1595 | CONFIG_CRYPTO_MD5=y |
1596 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1544 | CONFIG_CRYPTO_SHA1=m | 1597 | CONFIG_CRYPTO_SHA1=m |
1545 | # CONFIG_CRYPTO_SHA256 is not set | 1598 | # CONFIG_CRYPTO_SHA256 is not set |
1546 | # CONFIG_CRYPTO_SHA512 is not set | 1599 | # CONFIG_CRYPTO_SHA512 is not set |
1547 | # CONFIG_CRYPTO_WP512 is not set | ||
1548 | # CONFIG_CRYPTO_TGR192 is not set | 1600 | # CONFIG_CRYPTO_TGR192 is not set |
1549 | # CONFIG_CRYPTO_GF128MUL is not set | 1601 | # CONFIG_CRYPTO_WP512 is not set |
1550 | CONFIG_CRYPTO_ECB=m | 1602 | |
1551 | CONFIG_CRYPTO_CBC=y | 1603 | # |
1552 | CONFIG_CRYPTO_PCBC=m | 1604 | # Ciphers |
1553 | # CONFIG_CRYPTO_LRW is not set | 1605 | # |
1554 | # CONFIG_CRYPTO_XTS is not set | ||
1555 | # CONFIG_CRYPTO_CTR is not set | ||
1556 | # CONFIG_CRYPTO_GCM is not set | ||
1557 | # CONFIG_CRYPTO_CCM is not set | ||
1558 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1559 | CONFIG_CRYPTO_DES=y | ||
1560 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1561 | CONFIG_CRYPTO_BLOWFISH=m | ||
1562 | CONFIG_CRYPTO_TWOFISH=m | ||
1563 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1564 | CONFIG_CRYPTO_SERPENT=m | ||
1565 | CONFIG_CRYPTO_AES=m | 1606 | CONFIG_CRYPTO_AES=m |
1607 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1608 | CONFIG_CRYPTO_ARC4=m | ||
1609 | CONFIG_CRYPTO_BLOWFISH=m | ||
1610 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1566 | # CONFIG_CRYPTO_CAST5 is not set | 1611 | # CONFIG_CRYPTO_CAST5 is not set |
1567 | # CONFIG_CRYPTO_CAST6 is not set | 1612 | # CONFIG_CRYPTO_CAST6 is not set |
1568 | # CONFIG_CRYPTO_TEA is not set | 1613 | CONFIG_CRYPTO_DES=y |
1569 | CONFIG_CRYPTO_ARC4=m | 1614 | # CONFIG_CRYPTO_FCRYPT is not set |
1570 | # CONFIG_CRYPTO_KHAZAD is not set | 1615 | # CONFIG_CRYPTO_KHAZAD is not set |
1571 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1572 | # CONFIG_CRYPTO_SEED is not set | ||
1573 | # CONFIG_CRYPTO_SALSA20 is not set | 1616 | # CONFIG_CRYPTO_SALSA20 is not set |
1617 | # CONFIG_CRYPTO_SEED is not set | ||
1618 | CONFIG_CRYPTO_SERPENT=m | ||
1619 | # CONFIG_CRYPTO_TEA is not set | ||
1620 | CONFIG_CRYPTO_TWOFISH=m | ||
1621 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1622 | |||
1623 | # | ||
1624 | # Compression | ||
1625 | # | ||
1574 | CONFIG_CRYPTO_DEFLATE=m | 1626 | CONFIG_CRYPTO_DEFLATE=m |
1575 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1576 | CONFIG_CRYPTO_CRC32C=m | ||
1577 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1578 | # CONFIG_CRYPTO_TEST is not set | ||
1579 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1580 | # CONFIG_CRYPTO_LZO is not set | 1627 | # CONFIG_CRYPTO_LZO is not set |
1581 | CONFIG_CRYPTO_HW=y | 1628 | CONFIG_CRYPTO_HW=y |
1582 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1629 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1583 | # CONFIG_PPC_CLOCK is not set | 1630 | # CONFIG_PPC_CLOCK is not set |
1631 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index a3d52e3f2ded..066c583c1f8a 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:11 2008 | 4 | # Mon Jun 9 08:52:11 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
@@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
@@ -209,11 +213,13 @@ CONFIG_FLATMEM=y | |||
209 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
210 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
213 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
214 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
215 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
216 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
217 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
218 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
219 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
@@ -235,6 +241,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
235 | CONFIG_PCI_LEGACY=y | 241 | CONFIG_PCI_LEGACY=y |
236 | # CONFIG_PCCARD is not set | 242 | # CONFIG_PCCARD is not set |
237 | # CONFIG_HOTPLUG_PCI is not set | 243 | # CONFIG_HOTPLUG_PCI is not set |
244 | # CONFIG_HAS_RAPIDIO is not set | ||
238 | 245 | ||
239 | # | 246 | # |
240 | # Advanced setup | 247 | # Advanced setup |
@@ -244,11 +251,11 @@ CONFIG_PCI_LEGACY=y | |||
244 | # | 251 | # |
245 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
246 | # | 253 | # |
247 | CONFIG_HIGHMEM_START=0xfe000000 | ||
248 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
249 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | ||
250 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
251 | CONFIG_BOOT_LOAD=0x00800000 | ||
252 | 259 | ||
253 | # | 260 | # |
254 | # Networking | 261 | # Networking |
@@ -296,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
296 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
297 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
298 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
299 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
300 | # CONFIG_INET6_TUNNEL is not set | ||
301 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
302 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
303 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
@@ -454,7 +459,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
454 | # CONFIG_SCSI_SRP is not set | 459 | # CONFIG_SCSI_SRP is not set |
455 | CONFIG_ATA=y | 460 | CONFIG_ATA=y |
456 | # CONFIG_ATA_NONSTANDARD is not set | 461 | # CONFIG_ATA_NONSTANDARD is not set |
462 | CONFIG_SATA_PMP=y | ||
457 | # CONFIG_SATA_AHCI is not set | 463 | # CONFIG_SATA_AHCI is not set |
464 | # CONFIG_SATA_SIL24 is not set | ||
465 | CONFIG_ATA_SFF=y | ||
458 | # CONFIG_SATA_SVW is not set | 466 | # CONFIG_SATA_SVW is not set |
459 | # CONFIG_ATA_PIIX is not set | 467 | # CONFIG_ATA_PIIX is not set |
460 | CONFIG_SATA_MV=y | 468 | CONFIG_SATA_MV=y |
@@ -464,7 +472,6 @@ CONFIG_SATA_MV=y | |||
464 | # CONFIG_SATA_PROMISE is not set | 472 | # CONFIG_SATA_PROMISE is not set |
465 | # CONFIG_SATA_SX4 is not set | 473 | # CONFIG_SATA_SX4 is not set |
466 | # CONFIG_SATA_SIL is not set | 474 | # CONFIG_SATA_SIL is not set |
467 | # CONFIG_SATA_SIL24 is not set | ||
468 | # CONFIG_SATA_SIS is not set | 475 | # CONFIG_SATA_SIS is not set |
469 | # CONFIG_SATA_ULI is not set | 476 | # CONFIG_SATA_ULI is not set |
470 | # CONFIG_SATA_VIA is not set | 477 | # CONFIG_SATA_VIA is not set |
@@ -509,6 +516,7 @@ CONFIG_SATA_MV=y | |||
509 | # CONFIG_PATA_VIA is not set | 516 | # CONFIG_PATA_VIA is not set |
510 | # CONFIG_PATA_WINBOND is not set | 517 | # CONFIG_PATA_WINBOND is not set |
511 | # CONFIG_PATA_PLATFORM is not set | 518 | # CONFIG_PATA_PLATFORM is not set |
519 | # CONFIG_PATA_SCH is not set | ||
512 | # CONFIG_MD is not set | 520 | # CONFIG_MD is not set |
513 | # CONFIG_FUSION is not set | 521 | # CONFIG_FUSION is not set |
514 | 522 | ||
@@ -596,7 +604,6 @@ CONFIG_NETDEV_1000=y | |||
596 | # CONFIG_SIS190 is not set | 604 | # CONFIG_SIS190 is not set |
597 | # CONFIG_SKGE is not set | 605 | # CONFIG_SKGE is not set |
598 | # CONFIG_SKY2 is not set | 606 | # CONFIG_SKY2 is not set |
599 | # CONFIG_SK98LIN is not set | ||
600 | # CONFIG_VIA_VELOCITY is not set | 607 | # CONFIG_VIA_VELOCITY is not set |
601 | # CONFIG_TIGON3 is not set | 608 | # CONFIG_TIGON3 is not set |
602 | # CONFIG_BNX2 is not set | 609 | # CONFIG_BNX2 is not set |
@@ -616,6 +623,7 @@ CONFIG_NETDEV_10000=y | |||
616 | # CONFIG_MLX4_CORE is not set | 623 | # CONFIG_MLX4_CORE is not set |
617 | # CONFIG_TEHUTI is not set | 624 | # CONFIG_TEHUTI is not set |
618 | # CONFIG_BNX2X is not set | 625 | # CONFIG_BNX2X is not set |
626 | # CONFIG_SFC is not set | ||
619 | # CONFIG_TR is not set | 627 | # CONFIG_TR is not set |
620 | 628 | ||
621 | # | 629 | # |
@@ -623,6 +631,7 @@ CONFIG_NETDEV_10000=y | |||
623 | # | 631 | # |
624 | # CONFIG_WLAN_PRE80211 is not set | 632 | # CONFIG_WLAN_PRE80211 is not set |
625 | # CONFIG_WLAN_80211 is not set | 633 | # CONFIG_WLAN_80211 is not set |
634 | # CONFIG_IWLWIFI_LEDS is not set | ||
626 | # CONFIG_WAN is not set | 635 | # CONFIG_WAN is not set |
627 | # CONFIG_FDDI is not set | 636 | # CONFIG_FDDI is not set |
628 | # CONFIG_HIPPI is not set | 637 | # CONFIG_HIPPI is not set |
@@ -670,6 +679,7 @@ CONFIG_INPUT=y | |||
670 | # Character devices | 679 | # Character devices |
671 | # | 680 | # |
672 | # CONFIG_VT is not set | 681 | # CONFIG_VT is not set |
682 | CONFIG_DEVKMEM=y | ||
673 | # CONFIG_SERIAL_NONSTANDARD is not set | 683 | # CONFIG_SERIAL_NONSTANDARD is not set |
674 | # CONFIG_NOZOMI is not set | 684 | # CONFIG_NOZOMI is not set |
675 | 685 | ||
@@ -705,12 +715,7 @@ CONFIG_GEN_RTC=y | |||
705 | # CONFIG_TCG_TPM is not set | 715 | # CONFIG_TCG_TPM is not set |
706 | CONFIG_DEVPORT=y | 716 | CONFIG_DEVPORT=y |
707 | # CONFIG_I2C is not set | 717 | # CONFIG_I2C is not set |
708 | |||
709 | # | ||
710 | # SPI support | ||
711 | # | ||
712 | # CONFIG_SPI is not set | 718 | # CONFIG_SPI is not set |
713 | # CONFIG_SPI_MASTER is not set | ||
714 | # CONFIG_W1 is not set | 719 | # CONFIG_W1 is not set |
715 | # CONFIG_POWER_SUPPLY is not set | 720 | # CONFIG_POWER_SUPPLY is not set |
716 | CONFIG_HWMON=y | 721 | CONFIG_HWMON=y |
@@ -743,12 +748,22 @@ CONFIG_SSB_POSSIBLE=y | |||
743 | # Multifunction device drivers | 748 | # Multifunction device drivers |
744 | # | 749 | # |
745 | # CONFIG_MFD_SM501 is not set | 750 | # CONFIG_MFD_SM501 is not set |
751 | # CONFIG_HTC_PASIC3 is not set | ||
746 | 752 | ||
747 | # | 753 | # |
748 | # Multimedia devices | 754 | # Multimedia devices |
749 | # | 755 | # |
756 | |||
757 | # | ||
758 | # Multimedia core support | ||
759 | # | ||
750 | # CONFIG_VIDEO_DEV is not set | 760 | # CONFIG_VIDEO_DEV is not set |
751 | # CONFIG_DVB_CORE is not set | 761 | # CONFIG_DVB_CORE is not set |
762 | # CONFIG_VIDEO_MEDIA is not set | ||
763 | |||
764 | # | ||
765 | # Multimedia drivers | ||
766 | # | ||
752 | CONFIG_DAB=y | 767 | CONFIG_DAB=y |
753 | 768 | ||
754 | # | 769 | # |
@@ -779,6 +794,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
779 | CONFIG_USB_ARCH_HAS_OHCI=y | 794 | CONFIG_USB_ARCH_HAS_OHCI=y |
780 | CONFIG_USB_ARCH_HAS_EHCI=y | 795 | CONFIG_USB_ARCH_HAS_EHCI=y |
781 | # CONFIG_USB is not set | 796 | # CONFIG_USB is not set |
797 | # CONFIG_USB_OTG_WHITELIST is not set | ||
798 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
782 | 799 | ||
783 | # | 800 | # |
784 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 801 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -787,14 +804,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
787 | # CONFIG_MMC is not set | 804 | # CONFIG_MMC is not set |
788 | # CONFIG_MEMSTICK is not set | 805 | # CONFIG_MEMSTICK is not set |
789 | # CONFIG_NEW_LEDS is not set | 806 | # CONFIG_NEW_LEDS is not set |
807 | # CONFIG_ACCESSIBILITY is not set | ||
790 | # CONFIG_INFINIBAND is not set | 808 | # CONFIG_INFINIBAND is not set |
791 | # CONFIG_EDAC is not set | 809 | # CONFIG_EDAC is not set |
792 | # CONFIG_RTC_CLASS is not set | 810 | # CONFIG_RTC_CLASS is not set |
793 | # CONFIG_DMADEVICES is not set | 811 | # CONFIG_DMADEVICES is not set |
794 | |||
795 | # | ||
796 | # Userspace I/O | ||
797 | # | ||
798 | # CONFIG_UIO is not set | 812 | # CONFIG_UIO is not set |
799 | 813 | ||
800 | # | 814 | # |
@@ -814,7 +828,6 @@ CONFIG_FS_MBCACHE=y | |||
814 | # CONFIG_JFS_FS is not set | 828 | # CONFIG_JFS_FS is not set |
815 | # CONFIG_FS_POSIX_ACL is not set | 829 | # CONFIG_FS_POSIX_ACL is not set |
816 | # CONFIG_XFS_FS is not set | 830 | # CONFIG_XFS_FS is not set |
817 | # CONFIG_GFS2_FS is not set | ||
818 | # CONFIG_OCFS2_FS is not set | 831 | # CONFIG_OCFS2_FS is not set |
819 | CONFIG_DNOTIFY=y | 832 | CONFIG_DNOTIFY=y |
820 | CONFIG_INOTIFY=y | 833 | CONFIG_INOTIFY=y |
@@ -871,7 +884,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
871 | CONFIG_NFS_FS=y | 884 | CONFIG_NFS_FS=y |
872 | # CONFIG_NFS_V3 is not set | 885 | # CONFIG_NFS_V3 is not set |
873 | # CONFIG_NFS_V4 is not set | 886 | # CONFIG_NFS_V4 is not set |
874 | # CONFIG_NFS_DIRECTIO is not set | ||
875 | # CONFIG_NFSD is not set | 887 | # CONFIG_NFSD is not set |
876 | CONFIG_ROOT_NFS=y | 888 | CONFIG_ROOT_NFS=y |
877 | CONFIG_LOCKD=y | 889 | CONFIG_LOCKD=y |
@@ -914,6 +926,7 @@ CONFIG_MSDOS_PARTITION=y | |||
914 | # Library routines | 926 | # Library routines |
915 | # | 927 | # |
916 | CONFIG_BITREVERSE=y | 928 | CONFIG_BITREVERSE=y |
929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
917 | # CONFIG_CRC_CCITT is not set | 930 | # CONFIG_CRC_CCITT is not set |
918 | # CONFIG_CRC16 is not set | 931 | # CONFIG_CRC16 is not set |
919 | # CONFIG_CRC_ITU_T is not set | 932 | # CONFIG_CRC_ITU_T is not set |
@@ -924,6 +937,7 @@ CONFIG_PLIST=y | |||
924 | CONFIG_HAS_IOMEM=y | 937 | CONFIG_HAS_IOMEM=y |
925 | CONFIG_HAS_IOPORT=y | 938 | CONFIG_HAS_IOPORT=y |
926 | CONFIG_HAS_DMA=y | 939 | CONFIG_HAS_DMA=y |
940 | CONFIG_HAVE_LMB=y | ||
927 | 941 | ||
928 | # | 942 | # |
929 | # Kernel hacking | 943 | # Kernel hacking |
@@ -931,6 +945,7 @@ CONFIG_HAS_DMA=y | |||
931 | # CONFIG_PRINTK_TIME is not set | 945 | # CONFIG_PRINTK_TIME is not set |
932 | CONFIG_ENABLE_WARN_DEPRECATED=y | 946 | CONFIG_ENABLE_WARN_DEPRECATED=y |
933 | CONFIG_ENABLE_MUST_CHECK=y | 947 | CONFIG_ENABLE_MUST_CHECK=y |
948 | CONFIG_FRAME_WARN=1024 | ||
934 | # CONFIG_MAGIC_SYSRQ is not set | 949 | # CONFIG_MAGIC_SYSRQ is not set |
935 | # CONFIG_UNUSED_SYMBOLS is not set | 950 | # CONFIG_UNUSED_SYMBOLS is not set |
936 | # CONFIG_DEBUG_FS is not set | 951 | # CONFIG_DEBUG_FS is not set |
@@ -940,6 +955,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
940 | # CONFIG_SLUB_STATS is not set | 955 | # CONFIG_SLUB_STATS is not set |
941 | # CONFIG_DEBUG_BUGVERBOSE is not set | 956 | # CONFIG_DEBUG_BUGVERBOSE is not set |
942 | # CONFIG_SAMPLES is not set | 957 | # CONFIG_SAMPLES is not set |
958 | # CONFIG_IRQSTACKS is not set | ||
943 | # CONFIG_BOOTX_TEXT is not set | 959 | # CONFIG_BOOTX_TEXT is not set |
944 | # CONFIG_PPC_EARLY_DEBUG is not set | 960 | # CONFIG_PPC_EARLY_DEBUG is not set |
945 | 961 | ||
@@ -950,48 +966,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
950 | # CONFIG_SECURITY is not set | 966 | # CONFIG_SECURITY is not set |
951 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 967 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
952 | CONFIG_CRYPTO=y | 968 | CONFIG_CRYPTO=y |
953 | # CONFIG_CRYPTO_SEQIV is not set | 969 | |
970 | # | ||
971 | # Crypto core or helper | ||
972 | # | ||
954 | # CONFIG_CRYPTO_MANAGER is not set | 973 | # CONFIG_CRYPTO_MANAGER is not set |
974 | # CONFIG_CRYPTO_GF128MUL is not set | ||
975 | # CONFIG_CRYPTO_NULL is not set | ||
976 | # CONFIG_CRYPTO_CRYPTD is not set | ||
977 | # CONFIG_CRYPTO_AUTHENC is not set | ||
978 | |||
979 | # | ||
980 | # Authenticated Encryption with Associated Data | ||
981 | # | ||
982 | # CONFIG_CRYPTO_CCM is not set | ||
983 | # CONFIG_CRYPTO_GCM is not set | ||
984 | # CONFIG_CRYPTO_SEQIV is not set | ||
985 | |||
986 | # | ||
987 | # Block modes | ||
988 | # | ||
989 | # CONFIG_CRYPTO_CBC is not set | ||
990 | # CONFIG_CRYPTO_CTR is not set | ||
991 | # CONFIG_CRYPTO_CTS is not set | ||
992 | # CONFIG_CRYPTO_ECB is not set | ||
993 | # CONFIG_CRYPTO_LRW is not set | ||
994 | # CONFIG_CRYPTO_PCBC is not set | ||
995 | # CONFIG_CRYPTO_XTS is not set | ||
996 | |||
997 | # | ||
998 | # Hash modes | ||
999 | # | ||
955 | # CONFIG_CRYPTO_HMAC is not set | 1000 | # CONFIG_CRYPTO_HMAC is not set |
956 | # CONFIG_CRYPTO_XCBC is not set | 1001 | # CONFIG_CRYPTO_XCBC is not set |
957 | # CONFIG_CRYPTO_NULL is not set | 1002 | |
1003 | # | ||
1004 | # Digest | ||
1005 | # | ||
1006 | # CONFIG_CRYPTO_CRC32C is not set | ||
958 | # CONFIG_CRYPTO_MD4 is not set | 1007 | # CONFIG_CRYPTO_MD4 is not set |
959 | # CONFIG_CRYPTO_MD5 is not set | 1008 | # CONFIG_CRYPTO_MD5 is not set |
1009 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
960 | # CONFIG_CRYPTO_SHA1 is not set | 1010 | # CONFIG_CRYPTO_SHA1 is not set |
961 | # CONFIG_CRYPTO_SHA256 is not set | 1011 | # CONFIG_CRYPTO_SHA256 is not set |
962 | # CONFIG_CRYPTO_SHA512 is not set | 1012 | # CONFIG_CRYPTO_SHA512 is not set |
963 | # CONFIG_CRYPTO_WP512 is not set | ||
964 | # CONFIG_CRYPTO_TGR192 is not set | 1013 | # CONFIG_CRYPTO_TGR192 is not set |
965 | # CONFIG_CRYPTO_GF128MUL is not set | 1014 | # CONFIG_CRYPTO_WP512 is not set |
966 | # CONFIG_CRYPTO_ECB is not set | 1015 | |
967 | # CONFIG_CRYPTO_CBC is not set | 1016 | # |
968 | # CONFIG_CRYPTO_PCBC is not set | 1017 | # Ciphers |
969 | # CONFIG_CRYPTO_LRW is not set | 1018 | # |
970 | # CONFIG_CRYPTO_XTS is not set | ||
971 | # CONFIG_CRYPTO_CTR is not set | ||
972 | # CONFIG_CRYPTO_GCM is not set | ||
973 | # CONFIG_CRYPTO_CCM is not set | ||
974 | # CONFIG_CRYPTO_CRYPTD is not set | ||
975 | # CONFIG_CRYPTO_DES is not set | ||
976 | # CONFIG_CRYPTO_FCRYPT is not set | ||
977 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
978 | # CONFIG_CRYPTO_TWOFISH is not set | ||
979 | # CONFIG_CRYPTO_SERPENT is not set | ||
980 | # CONFIG_CRYPTO_AES is not set | 1019 | # CONFIG_CRYPTO_AES is not set |
1020 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1021 | # CONFIG_CRYPTO_ARC4 is not set | ||
1022 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1023 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
981 | # CONFIG_CRYPTO_CAST5 is not set | 1024 | # CONFIG_CRYPTO_CAST5 is not set |
982 | # CONFIG_CRYPTO_CAST6 is not set | 1025 | # CONFIG_CRYPTO_CAST6 is not set |
983 | # CONFIG_CRYPTO_TEA is not set | 1026 | # CONFIG_CRYPTO_DES is not set |
984 | # CONFIG_CRYPTO_ARC4 is not set | 1027 | # CONFIG_CRYPTO_FCRYPT is not set |
985 | # CONFIG_CRYPTO_KHAZAD is not set | 1028 | # CONFIG_CRYPTO_KHAZAD is not set |
986 | # CONFIG_CRYPTO_ANUBIS is not set | ||
987 | # CONFIG_CRYPTO_SEED is not set | ||
988 | # CONFIG_CRYPTO_SALSA20 is not set | 1029 | # CONFIG_CRYPTO_SALSA20 is not set |
1030 | # CONFIG_CRYPTO_SEED is not set | ||
1031 | # CONFIG_CRYPTO_SERPENT is not set | ||
1032 | # CONFIG_CRYPTO_TEA is not set | ||
1033 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1034 | |||
1035 | # | ||
1036 | # Compression | ||
1037 | # | ||
989 | # CONFIG_CRYPTO_DEFLATE is not set | 1038 | # CONFIG_CRYPTO_DEFLATE is not set |
990 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
991 | # CONFIG_CRYPTO_CRC32C is not set | ||
992 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
993 | # CONFIG_CRYPTO_AUTHENC is not set | ||
994 | # CONFIG_CRYPTO_LZO is not set | 1039 | # CONFIG_CRYPTO_LZO is not set |
995 | CONFIG_CRYPTO_HW=y | 1040 | CONFIG_CRYPTO_HW=y |
996 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1041 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
997 | # CONFIG_PPC_CLOCK is not set | 1042 | # CONFIG_PPC_CLOCK is not set |
1043 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 0264c5757f78..30d7834b7db1 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:13 2008 | 4 | # Mon Jun 9 08:52:12 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
@@ -70,18 +72,16 @@ CONFIG_IKCONFIG=y | |||
70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
73 | CONFIG_GROUP_SCHED=y | ||
74 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
75 | CONFIG_USER_SCHED=y | ||
76 | # CONFIG_CGROUP_SCHED is not set | ||
77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
81 | # CONFIG_BLK_DEV_INITRD is not set | 79 | # CONFIG_BLK_DEV_INITRD is not set |
80 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
82 | CONFIG_SYSCTL=y | 81 | CONFIG_SYSCTL=y |
83 | CONFIG_EMBEDDED=y | 82 | CONFIG_EMBEDDED=y |
84 | CONFIG_SYSCTL_SYSCALL=y | 83 | CONFIG_SYSCTL_SYSCALL=y |
84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
85 | CONFIG_KALLSYMS=y | 85 | CONFIG_KALLSYMS=y |
86 | CONFIG_KALLSYMS_ALL=y | 86 | CONFIG_KALLSYMS_ALL=y |
87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -108,6 +108,7 @@ CONFIG_SLUB=y | |||
108 | CONFIG_HAVE_OPROFILE=y | 108 | CONFIG_HAVE_OPROFILE=y |
109 | CONFIG_HAVE_KPROBES=y | 109 | CONFIG_HAVE_KPROBES=y |
110 | CONFIG_HAVE_KRETPROBES=y | 110 | CONFIG_HAVE_KRETPROBES=y |
111 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
111 | CONFIG_PROC_PAGE_MONITOR=y | 112 | CONFIG_PROC_PAGE_MONITOR=y |
112 | CONFIG_SLABINFO=y | 113 | CONFIG_SLABINFO=y |
113 | CONFIG_RT_MUTEXES=y | 114 | CONFIG_RT_MUTEXES=y |
@@ -196,11 +197,13 @@ CONFIG_FLATMEM=y | |||
196 | CONFIG_FLAT_NODE_MEM_MAP=y | 197 | CONFIG_FLAT_NODE_MEM_MAP=y |
197 | # CONFIG_SPARSEMEM_STATIC is not set | 198 | # CONFIG_SPARSEMEM_STATIC is not set |
198 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
200 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
200 | # CONFIG_RESOURCES_64BIT is not set | 202 | # CONFIG_RESOURCES_64BIT is not set |
201 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
202 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
203 | CONFIG_VIRT_TO_BUS=y | 205 | CONFIG_VIRT_TO_BUS=y |
206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
204 | CONFIG_PROC_DEVICETREE=y | 207 | CONFIG_PROC_DEVICETREE=y |
205 | # CONFIG_CMDLINE_BOOL is not set | 208 | # CONFIG_CMDLINE_BOOL is not set |
206 | # CONFIG_PM is not set | 209 | # CONFIG_PM is not set |
@@ -224,6 +227,7 @@ CONFIG_PCI_LEGACY=y | |||
224 | # CONFIG_PCI_DEBUG is not set | 227 | # CONFIG_PCI_DEBUG is not set |
225 | # CONFIG_PCCARD is not set | 228 | # CONFIG_PCCARD is not set |
226 | # CONFIG_HOTPLUG_PCI is not set | 229 | # CONFIG_HOTPLUG_PCI is not set |
230 | # CONFIG_HAS_RAPIDIO is not set | ||
227 | 231 | ||
228 | # | 232 | # |
229 | # Advanced setup | 233 | # Advanced setup |
@@ -233,11 +237,11 @@ CONFIG_PCI_LEGACY=y | |||
233 | # | 237 | # |
234 | # Default settings for advanced configuration options are used | 238 | # Default settings for advanced configuration options are used |
235 | # | 239 | # |
236 | CONFIG_HIGHMEM_START=0xfe000000 | ||
237 | CONFIG_LOWMEM_SIZE=0x30000000 | 240 | CONFIG_LOWMEM_SIZE=0x30000000 |
241 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
238 | CONFIG_KERNEL_START=0xc0000000 | 242 | CONFIG_KERNEL_START=0xc0000000 |
243 | CONFIG_PHYSICAL_START=0x00000000 | ||
239 | CONFIG_TASK_SIZE=0xc0000000 | 244 | CONFIG_TASK_SIZE=0xc0000000 |
240 | CONFIG_BOOT_LOAD=0x00400000 | ||
241 | 245 | ||
242 | # | 246 | # |
243 | # Networking | 247 | # Networking |
@@ -292,6 +296,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
292 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 296 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
293 | CONFIG_INET6_XFRM_MODE_BEET=y | 297 | CONFIG_INET6_XFRM_MODE_BEET=y |
294 | CONFIG_IPV6_SIT=y | 298 | CONFIG_IPV6_SIT=y |
299 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
295 | # CONFIG_IPV6_TUNNEL is not set | 300 | # CONFIG_IPV6_TUNNEL is not set |
296 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
297 | CONFIG_NETFILTER=y | 302 | CONFIG_NETFILTER=y |
@@ -536,7 +541,6 @@ CONFIG_NETDEV_1000=y | |||
536 | # CONFIG_SIS190 is not set | 541 | # CONFIG_SIS190 is not set |
537 | # CONFIG_SKGE is not set | 542 | # CONFIG_SKGE is not set |
538 | # CONFIG_SKY2 is not set | 543 | # CONFIG_SKY2 is not set |
539 | # CONFIG_SK98LIN is not set | ||
540 | # CONFIG_VIA_VELOCITY is not set | 544 | # CONFIG_VIA_VELOCITY is not set |
541 | # CONFIG_TIGON3 is not set | 545 | # CONFIG_TIGON3 is not set |
542 | # CONFIG_BNX2 is not set | 546 | # CONFIG_BNX2 is not set |
@@ -554,6 +558,7 @@ CONFIG_NETDEV_10000=y | |||
554 | # CONFIG_MLX4_CORE is not set | 558 | # CONFIG_MLX4_CORE is not set |
555 | # CONFIG_TEHUTI is not set | 559 | # CONFIG_TEHUTI is not set |
556 | # CONFIG_BNX2X is not set | 560 | # CONFIG_BNX2X is not set |
561 | # CONFIG_SFC is not set | ||
557 | # CONFIG_TR is not set | 562 | # CONFIG_TR is not set |
558 | 563 | ||
559 | # | 564 | # |
@@ -561,6 +566,7 @@ CONFIG_NETDEV_10000=y | |||
561 | # | 566 | # |
562 | # CONFIG_WLAN_PRE80211 is not set | 567 | # CONFIG_WLAN_PRE80211 is not set |
563 | # CONFIG_WLAN_80211 is not set | 568 | # CONFIG_WLAN_80211 is not set |
569 | # CONFIG_IWLWIFI_LEDS is not set | ||
564 | # CONFIG_WAN is not set | 570 | # CONFIG_WAN is not set |
565 | # CONFIG_FDDI is not set | 571 | # CONFIG_FDDI is not set |
566 | CONFIG_PPP=y | 572 | CONFIG_PPP=y |
@@ -634,6 +640,7 @@ CONFIG_SERIO_LIBPS2=y | |||
634 | # Character devices | 640 | # Character devices |
635 | # | 641 | # |
636 | # CONFIG_VT is not set | 642 | # CONFIG_VT is not set |
643 | CONFIG_DEVKMEM=y | ||
637 | # CONFIG_SERIAL_NONSTANDARD is not set | 644 | # CONFIG_SERIAL_NONSTANDARD is not set |
638 | 645 | ||
639 | # | 646 | # |
@@ -668,12 +675,7 @@ CONFIG_HW_RANDOM=y | |||
668 | # CONFIG_RAW_DRIVER is not set | 675 | # CONFIG_RAW_DRIVER is not set |
669 | CONFIG_DEVPORT=y | 676 | CONFIG_DEVPORT=y |
670 | # CONFIG_I2C is not set | 677 | # CONFIG_I2C is not set |
671 | |||
672 | # | ||
673 | # SPI support | ||
674 | # | ||
675 | # CONFIG_SPI is not set | 678 | # CONFIG_SPI is not set |
676 | # CONFIG_SPI_MASTER is not set | ||
677 | # CONFIG_W1 is not set | 679 | # CONFIG_W1 is not set |
678 | # CONFIG_POWER_SUPPLY is not set | 680 | # CONFIG_POWER_SUPPLY is not set |
679 | # CONFIG_HWMON is not set | 681 | # CONFIG_HWMON is not set |
@@ -690,12 +692,22 @@ CONFIG_SSB_POSSIBLE=y | |||
690 | # Multifunction device drivers | 692 | # Multifunction device drivers |
691 | # | 693 | # |
692 | # CONFIG_MFD_SM501 is not set | 694 | # CONFIG_MFD_SM501 is not set |
695 | # CONFIG_HTC_PASIC3 is not set | ||
693 | 696 | ||
694 | # | 697 | # |
695 | # Multimedia devices | 698 | # Multimedia devices |
696 | # | 699 | # |
700 | |||
701 | # | ||
702 | # Multimedia core support | ||
703 | # | ||
697 | # CONFIG_VIDEO_DEV is not set | 704 | # CONFIG_VIDEO_DEV is not set |
698 | # CONFIG_DVB_CORE is not set | 705 | # CONFIG_DVB_CORE is not set |
706 | # CONFIG_VIDEO_MEDIA is not set | ||
707 | |||
708 | # | ||
709 | # Multimedia drivers | ||
710 | # | ||
699 | CONFIG_DAB=y | 711 | CONFIG_DAB=y |
700 | 712 | ||
701 | # | 713 | # |
@@ -722,13 +734,10 @@ CONFIG_DAB=y | |||
722 | # CONFIG_MMC is not set | 734 | # CONFIG_MMC is not set |
723 | # CONFIG_MEMSTICK is not set | 735 | # CONFIG_MEMSTICK is not set |
724 | # CONFIG_NEW_LEDS is not set | 736 | # CONFIG_NEW_LEDS is not set |
737 | # CONFIG_ACCESSIBILITY is not set | ||
725 | # CONFIG_INFINIBAND is not set | 738 | # CONFIG_INFINIBAND is not set |
726 | # CONFIG_RTC_CLASS is not set | 739 | # CONFIG_RTC_CLASS is not set |
727 | # CONFIG_DMADEVICES is not set | 740 | # CONFIG_DMADEVICES is not set |
728 | |||
729 | # | ||
730 | # Userspace I/O | ||
731 | # | ||
732 | # CONFIG_UIO is not set | 741 | # CONFIG_UIO is not set |
733 | 742 | ||
734 | # | 743 | # |
@@ -798,7 +807,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
798 | CONFIG_NFS_FS=y | 807 | CONFIG_NFS_FS=y |
799 | CONFIG_NFS_V3=y | 808 | CONFIG_NFS_V3=y |
800 | CONFIG_NFS_V3_ACL=y | 809 | CONFIG_NFS_V3_ACL=y |
801 | # CONFIG_NFS_DIRECTIO is not set | ||
802 | # CONFIG_NFSD is not set | 810 | # CONFIG_NFSD is not set |
803 | CONFIG_ROOT_NFS=y | 811 | CONFIG_ROOT_NFS=y |
804 | CONFIG_LOCKD=y | 812 | CONFIG_LOCKD=y |
@@ -877,6 +885,7 @@ CONFIG_NLS_UTF8=y | |||
877 | # Library routines | 885 | # Library routines |
878 | # | 886 | # |
879 | CONFIG_BITREVERSE=y | 887 | CONFIG_BITREVERSE=y |
888 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
880 | CONFIG_CRC_CCITT=y | 889 | CONFIG_CRC_CCITT=y |
881 | # CONFIG_CRC16 is not set | 890 | # CONFIG_CRC16 is not set |
882 | # CONFIG_CRC_ITU_T is not set | 891 | # CONFIG_CRC_ITU_T is not set |
@@ -889,6 +898,7 @@ CONFIG_PLIST=y | |||
889 | CONFIG_HAS_IOMEM=y | 898 | CONFIG_HAS_IOMEM=y |
890 | CONFIG_HAS_IOPORT=y | 899 | CONFIG_HAS_IOPORT=y |
891 | CONFIG_HAS_DMA=y | 900 | CONFIG_HAS_DMA=y |
901 | CONFIG_HAVE_LMB=y | ||
892 | 902 | ||
893 | # | 903 | # |
894 | # Kernel hacking | 904 | # Kernel hacking |
@@ -896,6 +906,7 @@ CONFIG_HAS_DMA=y | |||
896 | # CONFIG_PRINTK_TIME is not set | 906 | # CONFIG_PRINTK_TIME is not set |
897 | CONFIG_ENABLE_WARN_DEPRECATED=y | 907 | CONFIG_ENABLE_WARN_DEPRECATED=y |
898 | CONFIG_ENABLE_MUST_CHECK=y | 908 | CONFIG_ENABLE_MUST_CHECK=y |
909 | CONFIG_FRAME_WARN=1024 | ||
899 | CONFIG_MAGIC_SYSRQ=y | 910 | CONFIG_MAGIC_SYSRQ=y |
900 | # CONFIG_UNUSED_SYMBOLS is not set | 911 | # CONFIG_UNUSED_SYMBOLS is not set |
901 | # CONFIG_DEBUG_FS is not set | 912 | # CONFIG_DEBUG_FS is not set |
@@ -906,6 +917,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
906 | CONFIG_SCHED_DEBUG=y | 917 | CONFIG_SCHED_DEBUG=y |
907 | # CONFIG_SCHEDSTATS is not set | 918 | # CONFIG_SCHEDSTATS is not set |
908 | # CONFIG_TIMER_STATS is not set | 919 | # CONFIG_TIMER_STATS is not set |
920 | # CONFIG_DEBUG_OBJECTS is not set | ||
909 | # CONFIG_SLUB_DEBUG_ON is not set | 921 | # CONFIG_SLUB_DEBUG_ON is not set |
910 | # CONFIG_SLUB_STATS is not set | 922 | # CONFIG_SLUB_STATS is not set |
911 | # CONFIG_DEBUG_RT_MUTEXES is not set | 923 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -918,6 +930,7 @@ CONFIG_SCHED_DEBUG=y | |||
918 | CONFIG_DEBUG_BUGVERBOSE=y | 930 | CONFIG_DEBUG_BUGVERBOSE=y |
919 | CONFIG_DEBUG_INFO=y | 931 | CONFIG_DEBUG_INFO=y |
920 | # CONFIG_DEBUG_VM is not set | 932 | # CONFIG_DEBUG_VM is not set |
933 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
921 | # CONFIG_DEBUG_LIST is not set | 934 | # CONFIG_DEBUG_LIST is not set |
922 | # CONFIG_DEBUG_SG is not set | 935 | # CONFIG_DEBUG_SG is not set |
923 | # CONFIG_BOOT_PRINTK_DELAY is not set | 936 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -929,6 +942,7 @@ CONFIG_DEBUG_INFO=y | |||
929 | # CONFIG_DEBUG_PAGEALLOC is not set | 942 | # CONFIG_DEBUG_PAGEALLOC is not set |
930 | # CONFIG_DEBUGGER is not set | 943 | # CONFIG_DEBUGGER is not set |
931 | # CONFIG_KGDB_CONSOLE is not set | 944 | # CONFIG_KGDB_CONSOLE is not set |
945 | # CONFIG_IRQSTACKS is not set | ||
932 | CONFIG_BDI_SWITCH=y | 946 | CONFIG_BDI_SWITCH=y |
933 | # CONFIG_PPC_EARLY_DEBUG is not set | 947 | # CONFIG_PPC_EARLY_DEBUG is not set |
934 | 948 | ||
@@ -938,45 +952,75 @@ CONFIG_BDI_SWITCH=y | |||
938 | # CONFIG_KEYS is not set | 952 | # CONFIG_KEYS is not set |
939 | # CONFIG_SECURITY is not set | 953 | # CONFIG_SECURITY is not set |
940 | CONFIG_CRYPTO=y | 954 | CONFIG_CRYPTO=y |
955 | |||
956 | # | ||
957 | # Crypto core or helper | ||
958 | # | ||
941 | CONFIG_CRYPTO_ALGAPI=y | 959 | CONFIG_CRYPTO_ALGAPI=y |
942 | CONFIG_CRYPTO_BLKCIPHER=y | 960 | CONFIG_CRYPTO_BLKCIPHER=y |
943 | # CONFIG_CRYPTO_SEQIV is not set | ||
944 | CONFIG_CRYPTO_MANAGER=y | 961 | CONFIG_CRYPTO_MANAGER=y |
945 | # CONFIG_CRYPTO_HMAC is not set | ||
946 | # CONFIG_CRYPTO_NULL is not set | 962 | # CONFIG_CRYPTO_NULL is not set |
963 | # CONFIG_CRYPTO_CRYPTD is not set | ||
964 | # CONFIG_CRYPTO_AUTHENC is not set | ||
965 | |||
966 | # | ||
967 | # Authenticated Encryption with Associated Data | ||
968 | # | ||
969 | # CONFIG_CRYPTO_CCM is not set | ||
970 | # CONFIG_CRYPTO_GCM is not set | ||
971 | # CONFIG_CRYPTO_SEQIV is not set | ||
972 | |||
973 | # | ||
974 | # Block modes | ||
975 | # | ||
976 | CONFIG_CRYPTO_CBC=y | ||
977 | # CONFIG_CRYPTO_CTR is not set | ||
978 | # CONFIG_CRYPTO_CTS is not set | ||
979 | CONFIG_CRYPTO_ECB=y | ||
980 | CONFIG_CRYPTO_PCBC=y | ||
981 | |||
982 | # | ||
983 | # Hash modes | ||
984 | # | ||
985 | # CONFIG_CRYPTO_HMAC is not set | ||
986 | |||
987 | # | ||
988 | # Digest | ||
989 | # | ||
990 | # CONFIG_CRYPTO_CRC32C is not set | ||
947 | # CONFIG_CRYPTO_MD4 is not set | 991 | # CONFIG_CRYPTO_MD4 is not set |
948 | CONFIG_CRYPTO_MD5=y | 992 | CONFIG_CRYPTO_MD5=y |
993 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
949 | # CONFIG_CRYPTO_SHA1 is not set | 994 | # CONFIG_CRYPTO_SHA1 is not set |
950 | # CONFIG_CRYPTO_SHA256 is not set | 995 | # CONFIG_CRYPTO_SHA256 is not set |
951 | # CONFIG_CRYPTO_SHA512 is not set | 996 | # CONFIG_CRYPTO_SHA512 is not set |
952 | # CONFIG_CRYPTO_WP512 is not set | ||
953 | # CONFIG_CRYPTO_TGR192 is not set | 997 | # CONFIG_CRYPTO_TGR192 is not set |
954 | CONFIG_CRYPTO_ECB=y | 998 | # CONFIG_CRYPTO_WP512 is not set |
955 | CONFIG_CRYPTO_CBC=y | 999 | |
956 | CONFIG_CRYPTO_PCBC=y | 1000 | # |
957 | # CONFIG_CRYPTO_CTR is not set | 1001 | # Ciphers |
958 | # CONFIG_CRYPTO_GCM is not set | 1002 | # |
959 | # CONFIG_CRYPTO_CCM is not set | ||
960 | # CONFIG_CRYPTO_CRYPTD is not set | ||
961 | CONFIG_CRYPTO_DES=y | ||
962 | # CONFIG_CRYPTO_FCRYPT is not set | ||
963 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
964 | # CONFIG_CRYPTO_TWOFISH is not set | ||
965 | # CONFIG_CRYPTO_SERPENT is not set | ||
966 | # CONFIG_CRYPTO_AES is not set | 1003 | # CONFIG_CRYPTO_AES is not set |
1004 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1005 | # CONFIG_CRYPTO_ARC4 is not set | ||
1006 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1007 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
967 | # CONFIG_CRYPTO_CAST5 is not set | 1008 | # CONFIG_CRYPTO_CAST5 is not set |
968 | # CONFIG_CRYPTO_CAST6 is not set | 1009 | # CONFIG_CRYPTO_CAST6 is not set |
969 | # CONFIG_CRYPTO_TEA is not set | 1010 | CONFIG_CRYPTO_DES=y |
970 | # CONFIG_CRYPTO_ARC4 is not set | 1011 | # CONFIG_CRYPTO_FCRYPT is not set |
971 | # CONFIG_CRYPTO_KHAZAD is not set | 1012 | # CONFIG_CRYPTO_KHAZAD is not set |
972 | # CONFIG_CRYPTO_ANUBIS is not set | ||
973 | # CONFIG_CRYPTO_SEED is not set | 1013 | # CONFIG_CRYPTO_SEED is not set |
1014 | # CONFIG_CRYPTO_SERPENT is not set | ||
1015 | # CONFIG_CRYPTO_TEA is not set | ||
1016 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1017 | |||
1018 | # | ||
1019 | # Compression | ||
1020 | # | ||
974 | # CONFIG_CRYPTO_DEFLATE is not set | 1021 | # CONFIG_CRYPTO_DEFLATE is not set |
975 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
976 | # CONFIG_CRYPTO_CRC32C is not set | ||
977 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
978 | # CONFIG_CRYPTO_AUTHENC is not set | ||
979 | # CONFIG_CRYPTO_LZO is not set | 1022 | # CONFIG_CRYPTO_LZO is not set |
980 | # CONFIG_CRYPTO_HW is not set | 1023 | # CONFIG_CRYPTO_HW is not set |
981 | # CONFIG_PPC_CLOCK is not set | 1024 | # CONFIG_PPC_CLOCK is not set |
982 | CONFIG_PPC_LIB_RHEAP=y | 1025 | CONFIG_PPC_LIB_RHEAP=y |
1026 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 9e0dd8201691..4293c8be06e1 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc9 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Tue Apr 15 18:07:36 2008 | 4 | # Mon Jun 9 08:52:14 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
@@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
@@ -201,7 +206,6 @@ CONFIG_PREEMPT_NONE=y | |||
201 | # CONFIG_PREEMPT is not set | 206 | # CONFIG_PREEMPT is not set |
202 | CONFIG_BINFMT_ELF=y | 207 | CONFIG_BINFMT_ELF=y |
203 | # CONFIG_BINFMT_MISC is not set | 208 | # CONFIG_BINFMT_MISC is not set |
204 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
205 | CONFIG_MATH_EMULATION=y | 209 | CONFIG_MATH_EMULATION=y |
206 | # CONFIG_IOMMU_HELPER is not set | 210 | # CONFIG_IOMMU_HELPER is not set |
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 211 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
@@ -217,11 +221,13 @@ CONFIG_FLATMEM=y | |||
217 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
218 | # CONFIG_SPARSEMEM_STATIC is not set | 222 | # CONFIG_SPARSEMEM_STATIC is not set |
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
221 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
222 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
223 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
224 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
230 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
225 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
227 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
@@ -240,6 +246,7 @@ CONFIG_FSL_SOC=y | |||
240 | # CONFIG_PCI_SYSCALL is not set | 246 | # CONFIG_PCI_SYSCALL is not set |
241 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
242 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
249 | # CONFIG_HAS_RAPIDIO is not set | ||
243 | 250 | ||
244 | # | 251 | # |
245 | # Advanced setup | 252 | # Advanced setup |
@@ -249,11 +256,11 @@ CONFIG_FSL_SOC=y | |||
249 | # | 256 | # |
250 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
251 | # | 258 | # |
252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
253 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
254 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
262 | CONFIG_PHYSICAL_START=0x00000000 | ||
255 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
256 | CONFIG_BOOT_LOAD=0x00800000 | ||
257 | 264 | ||
258 | # | 265 | # |
259 | # Networking | 266 | # Networking |
@@ -301,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
301 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
302 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
303 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
305 | # CONFIG_INET6_TUNNEL is not set | ||
306 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
307 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
308 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
@@ -361,6 +366,7 @@ CONFIG_MTD_PARTITIONS=y | |||
361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 366 | # CONFIG_MTD_REDBOOT_PARTS is not set |
362 | # CONFIG_MTD_CMDLINE_PARTS is not set | 367 | # CONFIG_MTD_CMDLINE_PARTS is not set |
363 | CONFIG_MTD_OF_PARTS=y | 368 | CONFIG_MTD_OF_PARTS=y |
369 | # CONFIG_MTD_AR7_PARTS is not set | ||
364 | 370 | ||
365 | # | 371 | # |
366 | # User Modules And Translation Layers | 372 | # User Modules And Translation Layers |
@@ -439,6 +445,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
439 | # | 445 | # |
440 | # CONFIG_MTD_UBI is not set | 446 | # CONFIG_MTD_UBI is not set |
441 | CONFIG_OF_DEVICE=y | 447 | CONFIG_OF_DEVICE=y |
448 | CONFIG_OF_I2C=y | ||
442 | # CONFIG_PARPORT is not set | 449 | # CONFIG_PARPORT is not set |
443 | CONFIG_BLK_DEV=y | 450 | CONFIG_BLK_DEV=y |
444 | # CONFIG_BLK_DEV_FD is not set | 451 | # CONFIG_BLK_DEV_FD is not set |
@@ -501,8 +508,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
501 | # CONFIG_SCSI_DEBUG is not set | 508 | # CONFIG_SCSI_DEBUG is not set |
502 | CONFIG_ATA=y | 509 | CONFIG_ATA=y |
503 | # CONFIG_ATA_NONSTANDARD is not set | 510 | # CONFIG_ATA_NONSTANDARD is not set |
504 | # CONFIG_SATA_MV is not set | 511 | CONFIG_SATA_PMP=y |
505 | CONFIG_SATA_FSL=y | 512 | CONFIG_SATA_FSL=y |
513 | CONFIG_ATA_SFF=y | ||
514 | # CONFIG_SATA_MV is not set | ||
506 | # CONFIG_PATA_PLATFORM is not set | 515 | # CONFIG_PATA_PLATFORM is not set |
507 | # CONFIG_MD is not set | 516 | # CONFIG_MD is not set |
508 | # CONFIG_MACINTOSH_DRIVERS is not set | 517 | # CONFIG_MACINTOSH_DRIVERS is not set |
@@ -554,6 +563,7 @@ CONFIG_NETDEV_10000=y | |||
554 | # | 563 | # |
555 | # CONFIG_WLAN_PRE80211 is not set | 564 | # CONFIG_WLAN_PRE80211 is not set |
556 | # CONFIG_WLAN_80211 is not set | 565 | # CONFIG_WLAN_80211 is not set |
566 | # CONFIG_IWLWIFI_LEDS is not set | ||
557 | 567 | ||
558 | # | 568 | # |
559 | # USB Network Adapters | 569 | # USB Network Adapters |
@@ -607,6 +617,7 @@ CONFIG_INPUT=y | |||
607 | # Character devices | 617 | # Character devices |
608 | # | 618 | # |
609 | # CONFIG_VT is not set | 619 | # CONFIG_VT is not set |
620 | CONFIG_DEVKMEM=y | ||
610 | # CONFIG_SERIAL_NONSTANDARD is not set | 621 | # CONFIG_SERIAL_NONSTANDARD is not set |
611 | 622 | ||
612 | # | 623 | # |
@@ -642,13 +653,6 @@ CONFIG_I2C_BOARDINFO=y | |||
642 | CONFIG_I2C_CHARDEV=y | 653 | CONFIG_I2C_CHARDEV=y |
643 | 654 | ||
644 | # | 655 | # |
645 | # I2C Algorithms | ||
646 | # | ||
647 | # CONFIG_I2C_ALGOBIT is not set | ||
648 | # CONFIG_I2C_ALGOPCF is not set | ||
649 | # CONFIG_I2C_ALGOPCA is not set | ||
650 | |||
651 | # | ||
652 | # I2C Hardware Bus support | 656 | # I2C Hardware Bus support |
653 | # | 657 | # |
654 | CONFIG_I2C_MPC=y | 658 | CONFIG_I2C_MPC=y |
@@ -658,6 +662,7 @@ CONFIG_I2C_MPC=y | |||
658 | # CONFIG_I2C_TAOS_EVM is not set | 662 | # CONFIG_I2C_TAOS_EVM is not set |
659 | # CONFIG_I2C_STUB is not set | 663 | # CONFIG_I2C_STUB is not set |
660 | # CONFIG_I2C_TINY_USB is not set | 664 | # CONFIG_I2C_TINY_USB is not set |
665 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
661 | 666 | ||
662 | # | 667 | # |
663 | # Miscellaneous I2C Chip support | 668 | # Miscellaneous I2C Chip support |
@@ -667,19 +672,13 @@ CONFIG_I2C_MPC=y | |||
667 | # CONFIG_SENSORS_PCF8574 is not set | 672 | # CONFIG_SENSORS_PCF8574 is not set |
668 | # CONFIG_PCF8575 is not set | 673 | # CONFIG_PCF8575 is not set |
669 | # CONFIG_SENSORS_PCF8591 is not set | 674 | # CONFIG_SENSORS_PCF8591 is not set |
670 | # CONFIG_TPS65010 is not set | ||
671 | # CONFIG_SENSORS_MAX6875 is not set | 675 | # CONFIG_SENSORS_MAX6875 is not set |
672 | # CONFIG_SENSORS_TSL2550 is not set | 676 | # CONFIG_SENSORS_TSL2550 is not set |
673 | # CONFIG_I2C_DEBUG_CORE is not set | 677 | # CONFIG_I2C_DEBUG_CORE is not set |
674 | # CONFIG_I2C_DEBUG_ALGO is not set | 678 | # CONFIG_I2C_DEBUG_ALGO is not set |
675 | # CONFIG_I2C_DEBUG_BUS is not set | 679 | # CONFIG_I2C_DEBUG_BUS is not set |
676 | # CONFIG_I2C_DEBUG_CHIP is not set | 680 | # CONFIG_I2C_DEBUG_CHIP is not set |
677 | |||
678 | # | ||
679 | # SPI support | ||
680 | # | ||
681 | # CONFIG_SPI is not set | 681 | # CONFIG_SPI is not set |
682 | # CONFIG_SPI_MASTER is not set | ||
683 | # CONFIG_W1 is not set | 682 | # CONFIG_W1 is not set |
684 | # CONFIG_POWER_SUPPLY is not set | 683 | # CONFIG_POWER_SUPPLY is not set |
685 | CONFIG_HWMON=y | 684 | CONFIG_HWMON=y |
@@ -757,12 +756,22 @@ CONFIG_SSB_POSSIBLE=y | |||
757 | # Multifunction device drivers | 756 | # Multifunction device drivers |
758 | # | 757 | # |
759 | # CONFIG_MFD_SM501 is not set | 758 | # CONFIG_MFD_SM501 is not set |
759 | # CONFIG_HTC_PASIC3 is not set | ||
760 | 760 | ||
761 | # | 761 | # |
762 | # Multimedia devices | 762 | # Multimedia devices |
763 | # | 763 | # |
764 | |||
765 | # | ||
766 | # Multimedia core support | ||
767 | # | ||
764 | # CONFIG_VIDEO_DEV is not set | 768 | # CONFIG_VIDEO_DEV is not set |
765 | # CONFIG_DVB_CORE is not set | 769 | # CONFIG_DVB_CORE is not set |
770 | # CONFIG_VIDEO_MEDIA is not set | ||
771 | |||
772 | # | ||
773 | # Multimedia drivers | ||
774 | # | ||
766 | CONFIG_DAB=y | 775 | CONFIG_DAB=y |
767 | # CONFIG_USB_DABUSB is not set | 776 | # CONFIG_USB_DABUSB is not set |
768 | 777 | ||
@@ -810,16 +819,20 @@ CONFIG_USB=y | |||
810 | CONFIG_USB_DEVICE_CLASS=y | 819 | CONFIG_USB_DEVICE_CLASS=y |
811 | # CONFIG_USB_DYNAMIC_MINORS is not set | 820 | # CONFIG_USB_DYNAMIC_MINORS is not set |
812 | # CONFIG_USB_OTG is not set | 821 | # CONFIG_USB_OTG is not set |
822 | # CONFIG_USB_OTG_WHITELIST is not set | ||
823 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
813 | 824 | ||
814 | # | 825 | # |
815 | # USB Host Controller Drivers | 826 | # USB Host Controller Drivers |
816 | # | 827 | # |
828 | # CONFIG_USB_C67X00_HCD is not set | ||
817 | CONFIG_USB_EHCI_HCD=y | 829 | CONFIG_USB_EHCI_HCD=y |
818 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 830 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
819 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 831 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
820 | CONFIG_USB_EHCI_FSL=y | 832 | CONFIG_USB_EHCI_FSL=y |
821 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 833 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
822 | # CONFIG_USB_ISP116X_HCD is not set | 834 | # CONFIG_USB_ISP116X_HCD is not set |
835 | # CONFIG_USB_ISP1760_HCD is not set | ||
823 | # CONFIG_USB_SL811_HCD is not set | 836 | # CONFIG_USB_SL811_HCD is not set |
824 | # CONFIG_USB_R8A66597_HCD is not set | 837 | # CONFIG_USB_R8A66597_HCD is not set |
825 | 838 | ||
@@ -828,6 +841,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
828 | # | 841 | # |
829 | # CONFIG_USB_ACM is not set | 842 | # CONFIG_USB_ACM is not set |
830 | # CONFIG_USB_PRINTER is not set | 843 | # CONFIG_USB_PRINTER is not set |
844 | # CONFIG_USB_WDM is not set | ||
831 | 845 | ||
832 | # | 846 | # |
833 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 847 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -873,17 +887,15 @@ CONFIG_USB_MON=y | |||
873 | # CONFIG_USB_LD is not set | 887 | # CONFIG_USB_LD is not set |
874 | # CONFIG_USB_TRANCEVIBRATOR is not set | 888 | # CONFIG_USB_TRANCEVIBRATOR is not set |
875 | # CONFIG_USB_IOWARRIOR is not set | 889 | # CONFIG_USB_IOWARRIOR is not set |
890 | # CONFIG_USB_ISIGHTFW is not set | ||
876 | # CONFIG_USB_GADGET is not set | 891 | # CONFIG_USB_GADGET is not set |
877 | # CONFIG_MMC is not set | 892 | # CONFIG_MMC is not set |
878 | # CONFIG_MEMSTICK is not set | 893 | # CONFIG_MEMSTICK is not set |
879 | # CONFIG_NEW_LEDS is not set | 894 | # CONFIG_NEW_LEDS is not set |
895 | # CONFIG_ACCESSIBILITY is not set | ||
880 | # CONFIG_EDAC is not set | 896 | # CONFIG_EDAC is not set |
881 | # CONFIG_RTC_CLASS is not set | 897 | # CONFIG_RTC_CLASS is not set |
882 | # CONFIG_DMADEVICES is not set | 898 | # CONFIG_DMADEVICES is not set |
883 | |||
884 | # | ||
885 | # Userspace I/O | ||
886 | # | ||
887 | # CONFIG_UIO is not set | 899 | # CONFIG_UIO is not set |
888 | 900 | ||
889 | # | 901 | # |
@@ -903,7 +915,6 @@ CONFIG_FS_MBCACHE=y | |||
903 | # CONFIG_JFS_FS is not set | 915 | # CONFIG_JFS_FS is not set |
904 | # CONFIG_FS_POSIX_ACL is not set | 916 | # CONFIG_FS_POSIX_ACL is not set |
905 | # CONFIG_XFS_FS is not set | 917 | # CONFIG_XFS_FS is not set |
906 | # CONFIG_GFS2_FS is not set | ||
907 | # CONFIG_OCFS2_FS is not set | 918 | # CONFIG_OCFS2_FS is not set |
908 | CONFIG_DNOTIFY=y | 919 | CONFIG_DNOTIFY=y |
909 | CONFIG_INOTIFY=y | 920 | CONFIG_INOTIFY=y |
@@ -962,7 +973,6 @@ CONFIG_NFS_FS=y | |||
962 | CONFIG_NFS_V3=y | 973 | CONFIG_NFS_V3=y |
963 | # CONFIG_NFS_V3_ACL is not set | 974 | # CONFIG_NFS_V3_ACL is not set |
964 | CONFIG_NFS_V4=y | 975 | CONFIG_NFS_V4=y |
965 | # CONFIG_NFS_DIRECTIO is not set | ||
966 | # CONFIG_NFSD is not set | 976 | # CONFIG_NFSD is not set |
967 | CONFIG_ROOT_NFS=y | 977 | CONFIG_ROOT_NFS=y |
968 | CONFIG_LOCKD=y | 978 | CONFIG_LOCKD=y |
@@ -1009,6 +1019,7 @@ CONFIG_UCC=y | |||
1009 | # Library routines | 1019 | # Library routines |
1010 | # | 1020 | # |
1011 | CONFIG_BITREVERSE=y | 1021 | CONFIG_BITREVERSE=y |
1022 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1012 | # CONFIG_CRC_CCITT is not set | 1023 | # CONFIG_CRC_CCITT is not set |
1013 | # CONFIG_CRC16 is not set | 1024 | # CONFIG_CRC16 is not set |
1014 | # CONFIG_CRC_ITU_T is not set | 1025 | # CONFIG_CRC_ITU_T is not set |
@@ -1027,6 +1038,7 @@ CONFIG_HAVE_LMB=y | |||
1027 | # CONFIG_PRINTK_TIME is not set | 1038 | # CONFIG_PRINTK_TIME is not set |
1028 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1039 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1029 | CONFIG_ENABLE_MUST_CHECK=y | 1040 | CONFIG_ENABLE_MUST_CHECK=y |
1041 | CONFIG_FRAME_WARN=1024 | ||
1030 | # CONFIG_MAGIC_SYSRQ is not set | 1042 | # CONFIG_MAGIC_SYSRQ is not set |
1031 | # CONFIG_UNUSED_SYMBOLS is not set | 1043 | # CONFIG_UNUSED_SYMBOLS is not set |
1032 | # CONFIG_DEBUG_FS is not set | 1044 | # CONFIG_DEBUG_FS is not set |
@@ -1034,6 +1046,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1034 | # CONFIG_DEBUG_KERNEL is not set | 1046 | # CONFIG_DEBUG_KERNEL is not set |
1035 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1047 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1036 | # CONFIG_SAMPLES is not set | 1048 | # CONFIG_SAMPLES is not set |
1049 | # CONFIG_IRQSTACKS is not set | ||
1037 | # CONFIG_PPC_EARLY_DEBUG is not set | 1050 | # CONFIG_PPC_EARLY_DEBUG is not set |
1038 | 1051 | ||
1039 | # | 1052 | # |
@@ -1043,51 +1056,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1043 | # CONFIG_SECURITY is not set | 1056 | # CONFIG_SECURITY is not set |
1044 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1057 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1045 | CONFIG_CRYPTO=y | 1058 | CONFIG_CRYPTO=y |
1059 | |||
1060 | # | ||
1061 | # Crypto core or helper | ||
1062 | # | ||
1046 | CONFIG_CRYPTO_ALGAPI=y | 1063 | CONFIG_CRYPTO_ALGAPI=y |
1047 | CONFIG_CRYPTO_BLKCIPHER=y | 1064 | CONFIG_CRYPTO_BLKCIPHER=y |
1048 | # CONFIG_CRYPTO_SEQIV is not set | ||
1049 | CONFIG_CRYPTO_MANAGER=y | 1065 | CONFIG_CRYPTO_MANAGER=y |
1066 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1067 | # CONFIG_CRYPTO_NULL is not set | ||
1068 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1069 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1070 | # CONFIG_CRYPTO_TEST is not set | ||
1071 | |||
1072 | # | ||
1073 | # Authenticated Encryption with Associated Data | ||
1074 | # | ||
1075 | # CONFIG_CRYPTO_CCM is not set | ||
1076 | # CONFIG_CRYPTO_GCM is not set | ||
1077 | # CONFIG_CRYPTO_SEQIV is not set | ||
1078 | |||
1079 | # | ||
1080 | # Block modes | ||
1081 | # | ||
1082 | CONFIG_CRYPTO_CBC=y | ||
1083 | # CONFIG_CRYPTO_CTR is not set | ||
1084 | # CONFIG_CRYPTO_CTS is not set | ||
1085 | CONFIG_CRYPTO_ECB=m | ||
1086 | # CONFIG_CRYPTO_LRW is not set | ||
1087 | CONFIG_CRYPTO_PCBC=m | ||
1088 | # CONFIG_CRYPTO_XTS is not set | ||
1089 | |||
1090 | # | ||
1091 | # Hash modes | ||
1092 | # | ||
1050 | # CONFIG_CRYPTO_HMAC is not set | 1093 | # CONFIG_CRYPTO_HMAC is not set |
1051 | # CONFIG_CRYPTO_XCBC is not set | 1094 | # CONFIG_CRYPTO_XCBC is not set |
1052 | # CONFIG_CRYPTO_NULL is not set | 1095 | |
1096 | # | ||
1097 | # Digest | ||
1098 | # | ||
1099 | # CONFIG_CRYPTO_CRC32C is not set | ||
1053 | # CONFIG_CRYPTO_MD4 is not set | 1100 | # CONFIG_CRYPTO_MD4 is not set |
1054 | CONFIG_CRYPTO_MD5=y | 1101 | CONFIG_CRYPTO_MD5=y |
1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1055 | # CONFIG_CRYPTO_SHA1 is not set | 1103 | # CONFIG_CRYPTO_SHA1 is not set |
1056 | # CONFIG_CRYPTO_SHA256 is not set | 1104 | # CONFIG_CRYPTO_SHA256 is not set |
1057 | # CONFIG_CRYPTO_SHA512 is not set | 1105 | # CONFIG_CRYPTO_SHA512 is not set |
1058 | # CONFIG_CRYPTO_WP512 is not set | ||
1059 | # CONFIG_CRYPTO_TGR192 is not set | 1106 | # CONFIG_CRYPTO_TGR192 is not set |
1060 | # CONFIG_CRYPTO_GF128MUL is not set | 1107 | # CONFIG_CRYPTO_WP512 is not set |
1061 | CONFIG_CRYPTO_ECB=m | 1108 | |
1062 | CONFIG_CRYPTO_CBC=y | 1109 | # |
1063 | CONFIG_CRYPTO_PCBC=m | 1110 | # Ciphers |
1064 | # CONFIG_CRYPTO_LRW is not set | 1111 | # |
1065 | # CONFIG_CRYPTO_XTS is not set | ||
1066 | # CONFIG_CRYPTO_CTR is not set | ||
1067 | # CONFIG_CRYPTO_GCM is not set | ||
1068 | # CONFIG_CRYPTO_CCM is not set | ||
1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1070 | CONFIG_CRYPTO_DES=y | ||
1071 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1072 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1073 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1074 | # CONFIG_CRYPTO_SERPENT is not set | ||
1075 | # CONFIG_CRYPTO_AES is not set | 1112 | # CONFIG_CRYPTO_AES is not set |
1113 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1114 | # CONFIG_CRYPTO_ARC4 is not set | ||
1115 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1116 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1076 | # CONFIG_CRYPTO_CAST5 is not set | 1117 | # CONFIG_CRYPTO_CAST5 is not set |
1077 | # CONFIG_CRYPTO_CAST6 is not set | 1118 | # CONFIG_CRYPTO_CAST6 is not set |
1078 | # CONFIG_CRYPTO_TEA is not set | 1119 | CONFIG_CRYPTO_DES=y |
1079 | # CONFIG_CRYPTO_ARC4 is not set | 1120 | # CONFIG_CRYPTO_FCRYPT is not set |
1080 | # CONFIG_CRYPTO_KHAZAD is not set | 1121 | # CONFIG_CRYPTO_KHAZAD is not set |
1081 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1082 | # CONFIG_CRYPTO_SEED is not set | ||
1083 | # CONFIG_CRYPTO_SALSA20 is not set | 1122 | # CONFIG_CRYPTO_SALSA20 is not set |
1123 | # CONFIG_CRYPTO_SEED is not set | ||
1124 | # CONFIG_CRYPTO_SERPENT is not set | ||
1125 | # CONFIG_CRYPTO_TEA is not set | ||
1126 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1127 | |||
1128 | # | ||
1129 | # Compression | ||
1130 | # | ||
1084 | # CONFIG_CRYPTO_DEFLATE is not set | 1131 | # CONFIG_CRYPTO_DEFLATE is not set |
1085 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1086 | # CONFIG_CRYPTO_CRC32C is not set | ||
1087 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1088 | # CONFIG_CRYPTO_TEST is not set | ||
1089 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1090 | # CONFIG_CRYPTO_LZO is not set | 1132 | # CONFIG_CRYPTO_LZO is not set |
1091 | CONFIG_CRYPTO_HW=y | 1133 | CONFIG_CRYPTO_HW=y |
1092 | # CONFIG_PPC_CLOCK is not set | 1134 | # CONFIG_PPC_CLOCK is not set |
1093 | CONFIG_PPC_LIB_RHEAP=y | 1135 | CONFIG_PPC_LIB_RHEAP=y |
1136 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 2075722911bb..3efab71a603b 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:37:08 2008 | 4 | # Mon Jun 9 09:03:46 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
@@ -162,6 +167,7 @@ CONFIG_MPC8560_ADS=y | |||
162 | CONFIG_MPC85xx_CDS=y | 167 | CONFIG_MPC85xx_CDS=y |
163 | CONFIG_MPC85xx_MDS=y | 168 | CONFIG_MPC85xx_MDS=y |
164 | CONFIG_MPC85xx_DS=y | 169 | CONFIG_MPC85xx_DS=y |
170 | CONFIG_KSI8560=y | ||
165 | # CONFIG_STX_GP3 is not set | 171 | # CONFIG_STX_GP3 is not set |
166 | CONFIG_TQM8540=y | 172 | CONFIG_TQM8540=y |
167 | CONFIG_TQM8541=y | 173 | CONFIG_TQM8541=y |
@@ -221,11 +227,13 @@ CONFIG_FLATMEM=y | |||
221 | CONFIG_FLAT_NODE_MEM_MAP=y | 227 | CONFIG_FLAT_NODE_MEM_MAP=y |
222 | # CONFIG_SPARSEMEM_STATIC is not set | 228 | # CONFIG_SPARSEMEM_STATIC is not set |
223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
230 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
224 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
225 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
226 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
227 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
228 | CONFIG_VIRT_TO_BUS=y | 235 | CONFIG_VIRT_TO_BUS=y |
236 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
229 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
230 | # CONFIG_CMDLINE_BOOL is not set | 238 | # CONFIG_CMDLINE_BOOL is not set |
231 | # CONFIG_PM is not set | 239 | # CONFIG_PM is not set |
@@ -250,6 +258,7 @@ CONFIG_PCI_LEGACY=y | |||
250 | # CONFIG_PCI_DEBUG is not set | 258 | # CONFIG_PCI_DEBUG is not set |
251 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
252 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
261 | # CONFIG_HAS_RAPIDIO is not set | ||
253 | 262 | ||
254 | # | 263 | # |
255 | # Advanced setup | 264 | # Advanced setup |
@@ -259,11 +268,12 @@ CONFIG_PCI_LEGACY=y | |||
259 | # | 268 | # |
260 | # Default settings for advanced configuration options are used | 269 | # Default settings for advanced configuration options are used |
261 | # | 270 | # |
262 | CONFIG_HIGHMEM_START=0xfe000000 | ||
263 | CONFIG_LOWMEM_SIZE=0x30000000 | 271 | CONFIG_LOWMEM_SIZE=0x30000000 |
272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
264 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
274 | CONFIG_PHYSICAL_START=0x00000000 | ||
275 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
265 | CONFIG_TASK_SIZE=0xc0000000 | 276 | CONFIG_TASK_SIZE=0xc0000000 |
266 | CONFIG_BOOT_LOAD=0x00800000 | ||
267 | 277 | ||
268 | # | 278 | # |
269 | # Networking | 279 | # Networking |
@@ -334,8 +344,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
334 | CONFIG_INET6_XFRM_MODE_BEET=y | 344 | CONFIG_INET6_XFRM_MODE_BEET=y |
335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 345 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
336 | CONFIG_IPV6_SIT=y | 346 | CONFIG_IPV6_SIT=y |
347 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
337 | # CONFIG_IPV6_TUNNEL is not set | 348 | # CONFIG_IPV6_TUNNEL is not set |
338 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 349 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
350 | # CONFIG_IPV6_MROUTE is not set | ||
339 | # CONFIG_NETWORK_SECMARK is not set | 351 | # CONFIG_NETWORK_SECMARK is not set |
340 | # CONFIG_NETFILTER is not set | 352 | # CONFIG_NETFILTER is not set |
341 | # CONFIG_IP_DCCP is not set | 353 | # CONFIG_IP_DCCP is not set |
@@ -397,6 +409,7 @@ CONFIG_FW_LOADER=y | |||
397 | # CONFIG_CONNECTOR is not set | 409 | # CONFIG_CONNECTOR is not set |
398 | # CONFIG_MTD is not set | 410 | # CONFIG_MTD is not set |
399 | CONFIG_OF_DEVICE=y | 411 | CONFIG_OF_DEVICE=y |
412 | CONFIG_OF_I2C=y | ||
400 | # CONFIG_PARPORT is not set | 413 | # CONFIG_PARPORT is not set |
401 | CONFIG_BLK_DEV=y | 414 | CONFIG_BLK_DEV=y |
402 | # CONFIG_BLK_DEV_FD is not set | 415 | # CONFIG_BLK_DEV_FD is not set |
@@ -503,7 +516,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
503 | # CONFIG_SCSI_SRP is not set | 516 | # CONFIG_SCSI_SRP is not set |
504 | CONFIG_ATA=y | 517 | CONFIG_ATA=y |
505 | # CONFIG_ATA_NONSTANDARD is not set | 518 | # CONFIG_ATA_NONSTANDARD is not set |
519 | CONFIG_SATA_PMP=y | ||
506 | CONFIG_SATA_AHCI=y | 520 | CONFIG_SATA_AHCI=y |
521 | # CONFIG_SATA_SIL24 is not set | ||
522 | CONFIG_SATA_FSL=y | ||
523 | CONFIG_ATA_SFF=y | ||
507 | # CONFIG_SATA_SVW is not set | 524 | # CONFIG_SATA_SVW is not set |
508 | # CONFIG_ATA_PIIX is not set | 525 | # CONFIG_ATA_PIIX is not set |
509 | # CONFIG_SATA_MV is not set | 526 | # CONFIG_SATA_MV is not set |
@@ -513,13 +530,11 @@ CONFIG_SATA_AHCI=y | |||
513 | # CONFIG_SATA_PROMISE is not set | 530 | # CONFIG_SATA_PROMISE is not set |
514 | # CONFIG_SATA_SX4 is not set | 531 | # CONFIG_SATA_SX4 is not set |
515 | # CONFIG_SATA_SIL is not set | 532 | # CONFIG_SATA_SIL is not set |
516 | # CONFIG_SATA_SIL24 is not set | ||
517 | # CONFIG_SATA_SIS is not set | 533 | # CONFIG_SATA_SIS is not set |
518 | # CONFIG_SATA_ULI is not set | 534 | # CONFIG_SATA_ULI is not set |
519 | # CONFIG_SATA_VIA is not set | 535 | # CONFIG_SATA_VIA is not set |
520 | # CONFIG_SATA_VITESSE is not set | 536 | # CONFIG_SATA_VITESSE is not set |
521 | # CONFIG_SATA_INIC162X is not set | 537 | # CONFIG_SATA_INIC162X is not set |
522 | # CONFIG_SATA_FSL is not set | ||
523 | CONFIG_PATA_ALI=y | 538 | CONFIG_PATA_ALI=y |
524 | # CONFIG_PATA_AMD is not set | 539 | # CONFIG_PATA_AMD is not set |
525 | # CONFIG_PATA_ARTOP is not set | 540 | # CONFIG_PATA_ARTOP is not set |
@@ -559,6 +574,7 @@ CONFIG_PATA_ALI=y | |||
559 | # CONFIG_PATA_VIA is not set | 574 | # CONFIG_PATA_VIA is not set |
560 | # CONFIG_PATA_WINBOND is not set | 575 | # CONFIG_PATA_WINBOND is not set |
561 | # CONFIG_PATA_PLATFORM is not set | 576 | # CONFIG_PATA_PLATFORM is not set |
577 | # CONFIG_PATA_SCH is not set | ||
562 | # CONFIG_MD is not set | 578 | # CONFIG_MD is not set |
563 | # CONFIG_FUSION is not set | 579 | # CONFIG_FUSION is not set |
564 | 580 | ||
@@ -625,7 +641,6 @@ CONFIG_NETDEV_1000=y | |||
625 | # CONFIG_SIS190 is not set | 641 | # CONFIG_SIS190 is not set |
626 | # CONFIG_SKGE is not set | 642 | # CONFIG_SKGE is not set |
627 | # CONFIG_SKY2 is not set | 643 | # CONFIG_SKY2 is not set |
628 | # CONFIG_SK98LIN is not set | ||
629 | # CONFIG_VIA_VELOCITY is not set | 644 | # CONFIG_VIA_VELOCITY is not set |
630 | # CONFIG_TIGON3 is not set | 645 | # CONFIG_TIGON3 is not set |
631 | # CONFIG_BNX2 is not set | 646 | # CONFIG_BNX2 is not set |
@@ -646,6 +661,7 @@ CONFIG_NETDEV_10000=y | |||
646 | # CONFIG_MLX4_CORE is not set | 661 | # CONFIG_MLX4_CORE is not set |
647 | # CONFIG_TEHUTI is not set | 662 | # CONFIG_TEHUTI is not set |
648 | # CONFIG_BNX2X is not set | 663 | # CONFIG_BNX2X is not set |
664 | # CONFIG_SFC is not set | ||
649 | # CONFIG_TR is not set | 665 | # CONFIG_TR is not set |
650 | 666 | ||
651 | # | 667 | # |
@@ -653,6 +669,7 @@ CONFIG_NETDEV_10000=y | |||
653 | # | 669 | # |
654 | # CONFIG_WLAN_PRE80211 is not set | 670 | # CONFIG_WLAN_PRE80211 is not set |
655 | # CONFIG_WLAN_80211 is not set | 671 | # CONFIG_WLAN_80211 is not set |
672 | # CONFIG_IWLWIFI_LEDS is not set | ||
656 | 673 | ||
657 | # | 674 | # |
658 | # USB Network Adapters | 675 | # USB Network Adapters |
@@ -717,6 +734,7 @@ CONFIG_VT=y | |||
717 | CONFIG_VT_CONSOLE=y | 734 | CONFIG_VT_CONSOLE=y |
718 | CONFIG_HW_CONSOLE=y | 735 | CONFIG_HW_CONSOLE=y |
719 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 736 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
737 | CONFIG_DEVKMEM=y | ||
720 | # CONFIG_SERIAL_NONSTANDARD is not set | 738 | # CONFIG_SERIAL_NONSTANDARD is not set |
721 | # CONFIG_NOZOMI is not set | 739 | # CONFIG_NOZOMI is not set |
722 | 740 | ||
@@ -750,7 +768,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
750 | # CONFIG_IPMI_HANDLER is not set | 768 | # CONFIG_IPMI_HANDLER is not set |
751 | # CONFIG_HW_RANDOM is not set | 769 | # CONFIG_HW_RANDOM is not set |
752 | CONFIG_NVRAM=y | 770 | CONFIG_NVRAM=y |
753 | # CONFIG_GEN_RTC is not set | ||
754 | # CONFIG_R3964 is not set | 771 | # CONFIG_R3964 is not set |
755 | # CONFIG_APPLICOM is not set | 772 | # CONFIG_APPLICOM is not set |
756 | # CONFIG_RAW_DRIVER is not set | 773 | # CONFIG_RAW_DRIVER is not set |
@@ -761,13 +778,6 @@ CONFIG_I2C_BOARDINFO=y | |||
761 | # CONFIG_I2C_CHARDEV is not set | 778 | # CONFIG_I2C_CHARDEV is not set |
762 | 779 | ||
763 | # | 780 | # |
764 | # I2C Algorithms | ||
765 | # | ||
766 | # CONFIG_I2C_ALGOBIT is not set | ||
767 | # CONFIG_I2C_ALGOPCF is not set | ||
768 | # CONFIG_I2C_ALGOPCA is not set | ||
769 | |||
770 | # | ||
771 | # I2C Hardware Bus support | 781 | # I2C Hardware Bus support |
772 | # | 782 | # |
773 | # CONFIG_I2C_ALI1535 is not set | 783 | # CONFIG_I2C_ALI1535 is not set |
@@ -794,6 +804,7 @@ CONFIG_I2C_MPC=y | |||
794 | # CONFIG_I2C_VIA is not set | 804 | # CONFIG_I2C_VIA is not set |
795 | # CONFIG_I2C_VIAPRO is not set | 805 | # CONFIG_I2C_VIAPRO is not set |
796 | # CONFIG_I2C_VOODOO3 is not set | 806 | # CONFIG_I2C_VOODOO3 is not set |
807 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
797 | 808 | ||
798 | # | 809 | # |
799 | # Miscellaneous I2C Chip support | 810 | # Miscellaneous I2C Chip support |
@@ -803,19 +814,13 @@ CONFIG_SENSORS_EEPROM=y | |||
803 | # CONFIG_SENSORS_PCF8574 is not set | 814 | # CONFIG_SENSORS_PCF8574 is not set |
804 | # CONFIG_PCF8575 is not set | 815 | # CONFIG_PCF8575 is not set |
805 | # CONFIG_SENSORS_PCF8591 is not set | 816 | # CONFIG_SENSORS_PCF8591 is not set |
806 | # CONFIG_TPS65010 is not set | ||
807 | # CONFIG_SENSORS_MAX6875 is not set | 817 | # CONFIG_SENSORS_MAX6875 is not set |
808 | # CONFIG_SENSORS_TSL2550 is not set | 818 | # CONFIG_SENSORS_TSL2550 is not set |
809 | # CONFIG_I2C_DEBUG_CORE is not set | 819 | # CONFIG_I2C_DEBUG_CORE is not set |
810 | # CONFIG_I2C_DEBUG_ALGO is not set | 820 | # CONFIG_I2C_DEBUG_ALGO is not set |
811 | # CONFIG_I2C_DEBUG_BUS is not set | 821 | # CONFIG_I2C_DEBUG_BUS is not set |
812 | # CONFIG_I2C_DEBUG_CHIP is not set | 822 | # CONFIG_I2C_DEBUG_CHIP is not set |
813 | |||
814 | # | ||
815 | # SPI support | ||
816 | # | ||
817 | # CONFIG_SPI is not set | 823 | # CONFIG_SPI is not set |
818 | # CONFIG_SPI_MASTER is not set | ||
819 | # CONFIG_W1 is not set | 824 | # CONFIG_W1 is not set |
820 | # CONFIG_POWER_SUPPLY is not set | 825 | # CONFIG_POWER_SUPPLY is not set |
821 | # CONFIG_HWMON is not set | 826 | # CONFIG_HWMON is not set |
@@ -832,13 +837,33 @@ CONFIG_SSB_POSSIBLE=y | |||
832 | # Multifunction device drivers | 837 | # Multifunction device drivers |
833 | # | 838 | # |
834 | # CONFIG_MFD_SM501 is not set | 839 | # CONFIG_MFD_SM501 is not set |
840 | # CONFIG_HTC_PASIC3 is not set | ||
835 | 841 | ||
836 | # | 842 | # |
837 | # Multimedia devices | 843 | # Multimedia devices |
838 | # | 844 | # |
845 | |||
846 | # | ||
847 | # Multimedia core support | ||
848 | # | ||
839 | # CONFIG_VIDEO_DEV is not set | 849 | # CONFIG_VIDEO_DEV is not set |
840 | CONFIG_DVB_CORE=m | 850 | CONFIG_DVB_CORE=m |
841 | # CONFIG_DVB_CORE_ATTACH is not set | 851 | CONFIG_VIDEO_MEDIA=m |
852 | |||
853 | # | ||
854 | # Multimedia drivers | ||
855 | # | ||
856 | # CONFIG_MEDIA_ATTACH is not set | ||
857 | CONFIG_MEDIA_TUNER=m | ||
858 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
859 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
860 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
861 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
862 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
863 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
864 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
865 | CONFIG_MEDIA_TUNER_XC2028=m | ||
866 | CONFIG_MEDIA_TUNER_XC5000=m | ||
842 | CONFIG_DVB_CAPTURE_DRIVERS=y | 867 | CONFIG_DVB_CAPTURE_DRIVERS=y |
843 | 868 | ||
844 | # | 869 | # |
@@ -881,14 +906,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
881 | # | 906 | # |
882 | # DVB-S (satellite) frontends | 907 | # DVB-S (satellite) frontends |
883 | # | 908 | # |
884 | # CONFIG_DVB_STV0299 is not set | ||
885 | # CONFIG_DVB_CX24110 is not set | 909 | # CONFIG_DVB_CX24110 is not set |
886 | # CONFIG_DVB_CX24123 is not set | 910 | # CONFIG_DVB_CX24123 is not set |
887 | # CONFIG_DVB_TDA8083 is not set | ||
888 | # CONFIG_DVB_MT312 is not set | 911 | # CONFIG_DVB_MT312 is not set |
889 | # CONFIG_DVB_VES1X93 is not set | ||
890 | # CONFIG_DVB_S5H1420 is not set | 912 | # CONFIG_DVB_S5H1420 is not set |
913 | # CONFIG_DVB_STV0299 is not set | ||
914 | # CONFIG_DVB_TDA8083 is not set | ||
891 | # CONFIG_DVB_TDA10086 is not set | 915 | # CONFIG_DVB_TDA10086 is not set |
916 | # CONFIG_DVB_VES1X93 is not set | ||
917 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
918 | # CONFIG_DVB_TDA826X is not set | ||
919 | # CONFIG_DVB_TUA6100 is not set | ||
892 | 920 | ||
893 | # | 921 | # |
894 | # DVB-T (terrestrial) frontends | 922 | # DVB-T (terrestrial) frontends |
@@ -906,6 +934,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
906 | # CONFIG_DVB_DIB3000MC is not set | 934 | # CONFIG_DVB_DIB3000MC is not set |
907 | # CONFIG_DVB_DIB7000M is not set | 935 | # CONFIG_DVB_DIB7000M is not set |
908 | # CONFIG_DVB_DIB7000P is not set | 936 | # CONFIG_DVB_DIB7000P is not set |
937 | # CONFIG_DVB_TDA10048 is not set | ||
909 | 938 | ||
910 | # | 939 | # |
911 | # DVB-C (cable) frontends | 940 | # DVB-C (cable) frontends |
@@ -924,27 +953,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
924 | # CONFIG_DVB_BCM3510 is not set | 953 | # CONFIG_DVB_BCM3510 is not set |
925 | # CONFIG_DVB_LGDT330X is not set | 954 | # CONFIG_DVB_LGDT330X is not set |
926 | # CONFIG_DVB_S5H1409 is not set | 955 | # CONFIG_DVB_S5H1409 is not set |
956 | # CONFIG_DVB_AU8522 is not set | ||
957 | # CONFIG_DVB_S5H1411 is not set | ||
927 | 958 | ||
928 | # | 959 | # |
929 | # Tuners/PLL support | 960 | # Digital terrestrial only tuners/PLL |
930 | # | 961 | # |
931 | # CONFIG_DVB_PLL is not set | 962 | # CONFIG_DVB_PLL is not set |
932 | # CONFIG_DVB_TDA826X is not set | ||
933 | # CONFIG_DVB_TDA827X is not set | ||
934 | # CONFIG_DVB_TDA18271 is not set | ||
935 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
936 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
937 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
938 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
939 | # CONFIG_DVB_TUNER_DIB0070 is not set | 963 | # CONFIG_DVB_TUNER_DIB0070 is not set |
940 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
941 | 964 | ||
942 | # | 965 | # |
943 | # Miscellaneous devices | 966 | # SEC control devices for DVB-S |
944 | # | 967 | # |
945 | # CONFIG_DVB_LNBP21 is not set | 968 | # CONFIG_DVB_LNBP21 is not set |
969 | # CONFIG_DVB_ISL6405 is not set | ||
946 | # CONFIG_DVB_ISL6421 is not set | 970 | # CONFIG_DVB_ISL6421 is not set |
947 | # CONFIG_DVB_TUA6100 is not set | ||
948 | CONFIG_DAB=y | 971 | CONFIG_DAB=y |
949 | # CONFIG_USB_DABUSB is not set | 972 | # CONFIG_USB_DABUSB is not set |
950 | 973 | ||
@@ -1011,6 +1034,7 @@ CONFIG_SND_AC97_CODEC=y | |||
1011 | # CONFIG_SND_AU8810 is not set | 1034 | # CONFIG_SND_AU8810 is not set |
1012 | # CONFIG_SND_AU8820 is not set | 1035 | # CONFIG_SND_AU8820 is not set |
1013 | # CONFIG_SND_AU8830 is not set | 1036 | # CONFIG_SND_AU8830 is not set |
1037 | # CONFIG_SND_AW2 is not set | ||
1014 | # CONFIG_SND_AZT3328 is not set | 1038 | # CONFIG_SND_AZT3328 is not set |
1015 | # CONFIG_SND_BT87X is not set | 1039 | # CONFIG_SND_BT87X is not set |
1016 | # CONFIG_SND_CA0106 is not set | 1040 | # CONFIG_SND_CA0106 is not set |
@@ -1085,11 +1109,11 @@ CONFIG_SND_INTEL8X0=y | |||
1085 | # CONFIG_SND_SOC is not set | 1109 | # CONFIG_SND_SOC is not set |
1086 | 1110 | ||
1087 | # | 1111 | # |
1088 | # SoC Audio support for SuperH | 1112 | # ALSA SoC audio for Freescale SOCs |
1089 | # | 1113 | # |
1090 | 1114 | ||
1091 | # | 1115 | # |
1092 | # ALSA SoC audio for Freescale SOCs | 1116 | # SoC Audio for the Texas Instruments OMAP |
1093 | # | 1117 | # |
1094 | 1118 | ||
1095 | # | 1119 | # |
@@ -1124,16 +1148,20 @@ CONFIG_USB_DEVICEFS=y | |||
1124 | CONFIG_USB_DEVICE_CLASS=y | 1148 | CONFIG_USB_DEVICE_CLASS=y |
1125 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1149 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1126 | # CONFIG_USB_OTG is not set | 1150 | # CONFIG_USB_OTG is not set |
1151 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1152 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1127 | 1153 | ||
1128 | # | 1154 | # |
1129 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
1130 | # | 1156 | # |
1157 | # CONFIG_USB_C67X00_HCD is not set | ||
1131 | CONFIG_USB_EHCI_HCD=y | 1158 | CONFIG_USB_EHCI_HCD=y |
1132 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1159 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1133 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1160 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1134 | # CONFIG_USB_EHCI_FSL is not set | 1161 | CONFIG_USB_EHCI_FSL=y |
1135 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1162 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1136 | # CONFIG_USB_ISP116X_HCD is not set | 1163 | # CONFIG_USB_ISP116X_HCD is not set |
1164 | # CONFIG_USB_ISP1760_HCD is not set | ||
1137 | CONFIG_USB_OHCI_HCD=y | 1165 | CONFIG_USB_OHCI_HCD=y |
1138 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1166 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
1139 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1167 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1151,6 +1179,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1151 | # | 1179 | # |
1152 | # CONFIG_USB_ACM is not set | 1180 | # CONFIG_USB_ACM is not set |
1153 | # CONFIG_USB_PRINTER is not set | 1181 | # CONFIG_USB_PRINTER is not set |
1182 | # CONFIG_USB_WDM is not set | ||
1154 | 1183 | ||
1155 | # | 1184 | # |
1156 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1185 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1170,7 +1199,9 @@ CONFIG_USB_STORAGE=y | |||
1170 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1199 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1171 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1200 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1172 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1173 | # CONFIG_USB_STORAGE_KARMA is not set | 1203 | # CONFIG_USB_STORAGE_KARMA is not set |
1204 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1174 | # CONFIG_USB_LIBUSUAL is not set | 1205 | # CONFIG_USB_LIBUSUAL is not set |
1175 | 1206 | ||
1176 | # | 1207 | # |
@@ -1208,12 +1239,21 @@ CONFIG_USB_MON=y | |||
1208 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1239 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1209 | # CONFIG_USB_IOWARRIOR is not set | 1240 | # CONFIG_USB_IOWARRIOR is not set |
1210 | # CONFIG_USB_TEST is not set | 1241 | # CONFIG_USB_TEST is not set |
1242 | # CONFIG_USB_ISIGHTFW is not set | ||
1211 | # CONFIG_USB_GADGET is not set | 1243 | # CONFIG_USB_GADGET is not set |
1212 | # CONFIG_MMC is not set | 1244 | # CONFIG_MMC is not set |
1213 | # CONFIG_MEMSTICK is not set | 1245 | # CONFIG_MEMSTICK is not set |
1214 | # CONFIG_NEW_LEDS is not set | 1246 | # CONFIG_NEW_LEDS is not set |
1247 | # CONFIG_ACCESSIBILITY is not set | ||
1215 | # CONFIG_INFINIBAND is not set | 1248 | # CONFIG_INFINIBAND is not set |
1216 | # CONFIG_EDAC is not set | 1249 | CONFIG_EDAC=y |
1250 | |||
1251 | # | ||
1252 | # Reporting subsystems | ||
1253 | # | ||
1254 | # CONFIG_EDAC_DEBUG is not set | ||
1255 | CONFIG_EDAC_MM_EDAC=y | ||
1256 | CONFIG_EDAC_MPC85XX=y | ||
1217 | CONFIG_RTC_LIB=y | 1257 | CONFIG_RTC_LIB=y |
1218 | CONFIG_RTC_CLASS=y | 1258 | CONFIG_RTC_CLASS=y |
1219 | CONFIG_RTC_HCTOSYS=y | 1259 | CONFIG_RTC_HCTOSYS=y |
@@ -1263,11 +1303,19 @@ CONFIG_RTC_DRV_CMOS=y | |||
1263 | # | 1303 | # |
1264 | # on-CPU RTC drivers | 1304 | # on-CPU RTC drivers |
1265 | # | 1305 | # |
1266 | # CONFIG_DMADEVICES is not set | 1306 | # CONFIG_RTC_DRV_PPC is not set |
1307 | CONFIG_DMADEVICES=y | ||
1267 | 1308 | ||
1268 | # | 1309 | # |
1269 | # Userspace I/O | 1310 | # DMA Devices |
1270 | # | 1311 | # |
1312 | CONFIG_FSL_DMA=y | ||
1313 | CONFIG_DMA_ENGINE=y | ||
1314 | |||
1315 | # | ||
1316 | # DMA Clients | ||
1317 | # | ||
1318 | # CONFIG_NET_DMA is not set | ||
1271 | # CONFIG_UIO is not set | 1319 | # CONFIG_UIO is not set |
1272 | 1320 | ||
1273 | # | 1321 | # |
@@ -1287,7 +1335,6 @@ CONFIG_FS_MBCACHE=y | |||
1287 | # CONFIG_JFS_FS is not set | 1335 | # CONFIG_JFS_FS is not set |
1288 | # CONFIG_FS_POSIX_ACL is not set | 1336 | # CONFIG_FS_POSIX_ACL is not set |
1289 | # CONFIG_XFS_FS is not set | 1337 | # CONFIG_XFS_FS is not set |
1290 | # CONFIG_GFS2_FS is not set | ||
1291 | # CONFIG_OCFS2_FS is not set | 1338 | # CONFIG_OCFS2_FS is not set |
1292 | CONFIG_DNOTIFY=y | 1339 | CONFIG_DNOTIFY=y |
1293 | CONFIG_INOTIFY=y | 1340 | CONFIG_INOTIFY=y |
@@ -1357,10 +1404,9 @@ CONFIG_NFS_FS=y | |||
1357 | CONFIG_NFS_V3=y | 1404 | CONFIG_NFS_V3=y |
1358 | # CONFIG_NFS_V3_ACL is not set | 1405 | # CONFIG_NFS_V3_ACL is not set |
1359 | CONFIG_NFS_V4=y | 1406 | CONFIG_NFS_V4=y |
1360 | # CONFIG_NFS_DIRECTIO is not set | ||
1361 | CONFIG_NFSD=y | 1407 | CONFIG_NFSD=y |
1362 | # CONFIG_NFSD_V3 is not set | 1408 | # CONFIG_NFSD_V3 is not set |
1363 | CONFIG_NFSD_TCP=y | 1409 | # CONFIG_NFSD_V4 is not set |
1364 | CONFIG_ROOT_NFS=y | 1410 | CONFIG_ROOT_NFS=y |
1365 | CONFIG_LOCKD=y | 1411 | CONFIG_LOCKD=y |
1366 | CONFIG_LOCKD_V4=y | 1412 | CONFIG_LOCKD_V4=y |
@@ -1444,9 +1490,10 @@ CONFIG_NLS_UTF8=m | |||
1444 | # Library routines | 1490 | # Library routines |
1445 | # | 1491 | # |
1446 | CONFIG_BITREVERSE=y | 1492 | CONFIG_BITREVERSE=y |
1493 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1447 | # CONFIG_CRC_CCITT is not set | 1494 | # CONFIG_CRC_CCITT is not set |
1448 | # CONFIG_CRC16 is not set | 1495 | # CONFIG_CRC16 is not set |
1449 | # CONFIG_CRC_ITU_T is not set | 1496 | CONFIG_CRC_ITU_T=m |
1450 | CONFIG_CRC32=y | 1497 | CONFIG_CRC32=y |
1451 | # CONFIG_CRC7 is not set | 1498 | # CONFIG_CRC7 is not set |
1452 | CONFIG_LIBCRC32C=m | 1499 | CONFIG_LIBCRC32C=m |
@@ -1455,6 +1502,7 @@ CONFIG_PLIST=y | |||
1455 | CONFIG_HAS_IOMEM=y | 1502 | CONFIG_HAS_IOMEM=y |
1456 | CONFIG_HAS_IOPORT=y | 1503 | CONFIG_HAS_IOPORT=y |
1457 | CONFIG_HAS_DMA=y | 1504 | CONFIG_HAS_DMA=y |
1505 | CONFIG_HAVE_LMB=y | ||
1458 | 1506 | ||
1459 | # | 1507 | # |
1460 | # Kernel hacking | 1508 | # Kernel hacking |
@@ -1462,6 +1510,7 @@ CONFIG_HAS_DMA=y | |||
1462 | # CONFIG_PRINTK_TIME is not set | 1510 | # CONFIG_PRINTK_TIME is not set |
1463 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1511 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1464 | CONFIG_ENABLE_MUST_CHECK=y | 1512 | CONFIG_ENABLE_MUST_CHECK=y |
1513 | CONFIG_FRAME_WARN=1024 | ||
1465 | # CONFIG_MAGIC_SYSRQ is not set | 1514 | # CONFIG_MAGIC_SYSRQ is not set |
1466 | # CONFIG_UNUSED_SYMBOLS is not set | 1515 | # CONFIG_UNUSED_SYMBOLS is not set |
1467 | # CONFIG_DEBUG_FS is not set | 1516 | # CONFIG_DEBUG_FS is not set |
@@ -1472,6 +1521,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1472 | CONFIG_SCHED_DEBUG=y | 1521 | CONFIG_SCHED_DEBUG=y |
1473 | # CONFIG_SCHEDSTATS is not set | 1522 | # CONFIG_SCHEDSTATS is not set |
1474 | # CONFIG_TIMER_STATS is not set | 1523 | # CONFIG_TIMER_STATS is not set |
1524 | # CONFIG_DEBUG_OBJECTS is not set | ||
1475 | # CONFIG_SLUB_DEBUG_ON is not set | 1525 | # CONFIG_SLUB_DEBUG_ON is not set |
1476 | # CONFIG_SLUB_STATS is not set | 1526 | # CONFIG_SLUB_STATS is not set |
1477 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1527 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1485,6 +1535,7 @@ CONFIG_SCHED_DEBUG=y | |||
1485 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1535 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1486 | CONFIG_DEBUG_INFO=y | 1536 | CONFIG_DEBUG_INFO=y |
1487 | # CONFIG_DEBUG_VM is not set | 1537 | # CONFIG_DEBUG_VM is not set |
1538 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1488 | # CONFIG_DEBUG_LIST is not set | 1539 | # CONFIG_DEBUG_LIST is not set |
1489 | # CONFIG_DEBUG_SG is not set | 1540 | # CONFIG_DEBUG_SG is not set |
1490 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1541 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1497,6 +1548,7 @@ CONFIG_DEBUG_INFO=y | |||
1497 | # CONFIG_DEBUG_PAGEALLOC is not set | 1548 | # CONFIG_DEBUG_PAGEALLOC is not set |
1498 | # CONFIG_DEBUGGER is not set | 1549 | # CONFIG_DEBUGGER is not set |
1499 | # CONFIG_KGDB_CONSOLE is not set | 1550 | # CONFIG_KGDB_CONSOLE is not set |
1551 | # CONFIG_IRQSTACKS is not set | ||
1500 | # CONFIG_BDI_SWITCH is not set | 1552 | # CONFIG_BDI_SWITCH is not set |
1501 | # CONFIG_PPC_EARLY_DEBUG is not set | 1553 | # CONFIG_PPC_EARLY_DEBUG is not set |
1502 | 1554 | ||
@@ -1507,53 +1559,83 @@ CONFIG_DEBUG_INFO=y | |||
1507 | # CONFIG_SECURITY is not set | 1559 | # CONFIG_SECURITY is not set |
1508 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1560 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1509 | CONFIG_CRYPTO=y | 1561 | CONFIG_CRYPTO=y |
1562 | |||
1563 | # | ||
1564 | # Crypto core or helper | ||
1565 | # | ||
1510 | CONFIG_CRYPTO_ALGAPI=y | 1566 | CONFIG_CRYPTO_ALGAPI=y |
1511 | CONFIG_CRYPTO_BLKCIPHER=y | 1567 | CONFIG_CRYPTO_BLKCIPHER=y |
1512 | # CONFIG_CRYPTO_SEQIV is not set | ||
1513 | CONFIG_CRYPTO_HASH=y | 1568 | CONFIG_CRYPTO_HASH=y |
1514 | CONFIG_CRYPTO_MANAGER=y | 1569 | CONFIG_CRYPTO_MANAGER=y |
1570 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1571 | # CONFIG_CRYPTO_NULL is not set | ||
1572 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1573 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1574 | # CONFIG_CRYPTO_TEST is not set | ||
1575 | |||
1576 | # | ||
1577 | # Authenticated Encryption with Associated Data | ||
1578 | # | ||
1579 | # CONFIG_CRYPTO_CCM is not set | ||
1580 | # CONFIG_CRYPTO_GCM is not set | ||
1581 | # CONFIG_CRYPTO_SEQIV is not set | ||
1582 | |||
1583 | # | ||
1584 | # Block modes | ||
1585 | # | ||
1586 | CONFIG_CRYPTO_CBC=y | ||
1587 | # CONFIG_CRYPTO_CTR is not set | ||
1588 | # CONFIG_CRYPTO_CTS is not set | ||
1589 | # CONFIG_CRYPTO_ECB is not set | ||
1590 | # CONFIG_CRYPTO_LRW is not set | ||
1591 | CONFIG_CRYPTO_PCBC=m | ||
1592 | # CONFIG_CRYPTO_XTS is not set | ||
1593 | |||
1594 | # | ||
1595 | # Hash modes | ||
1596 | # | ||
1515 | CONFIG_CRYPTO_HMAC=y | 1597 | CONFIG_CRYPTO_HMAC=y |
1516 | # CONFIG_CRYPTO_XCBC is not set | 1598 | # CONFIG_CRYPTO_XCBC is not set |
1517 | # CONFIG_CRYPTO_NULL is not set | 1599 | |
1600 | # | ||
1601 | # Digest | ||
1602 | # | ||
1603 | # CONFIG_CRYPTO_CRC32C is not set | ||
1518 | # CONFIG_CRYPTO_MD4 is not set | 1604 | # CONFIG_CRYPTO_MD4 is not set |
1519 | CONFIG_CRYPTO_MD5=y | 1605 | CONFIG_CRYPTO_MD5=y |
1606 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1520 | CONFIG_CRYPTO_SHA1=m | 1607 | CONFIG_CRYPTO_SHA1=m |
1521 | # CONFIG_CRYPTO_SHA256 is not set | 1608 | # CONFIG_CRYPTO_SHA256 is not set |
1522 | # CONFIG_CRYPTO_SHA512 is not set | 1609 | # CONFIG_CRYPTO_SHA512 is not set |
1523 | # CONFIG_CRYPTO_WP512 is not set | ||
1524 | # CONFIG_CRYPTO_TGR192 is not set | 1610 | # CONFIG_CRYPTO_TGR192 is not set |
1525 | # CONFIG_CRYPTO_GF128MUL is not set | 1611 | # CONFIG_CRYPTO_WP512 is not set |
1526 | # CONFIG_CRYPTO_ECB is not set | 1612 | |
1527 | CONFIG_CRYPTO_CBC=y | 1613 | # |
1528 | CONFIG_CRYPTO_PCBC=m | 1614 | # Ciphers |
1529 | # CONFIG_CRYPTO_LRW is not set | 1615 | # |
1530 | # CONFIG_CRYPTO_XTS is not set | ||
1531 | # CONFIG_CRYPTO_CTR is not set | ||
1532 | # CONFIG_CRYPTO_GCM is not set | ||
1533 | # CONFIG_CRYPTO_CCM is not set | ||
1534 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1535 | CONFIG_CRYPTO_DES=y | ||
1536 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1537 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1538 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1539 | # CONFIG_CRYPTO_SERPENT is not set | ||
1540 | # CONFIG_CRYPTO_AES is not set | 1616 | # CONFIG_CRYPTO_AES is not set |
1617 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1618 | # CONFIG_CRYPTO_ARC4 is not set | ||
1619 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1620 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1541 | # CONFIG_CRYPTO_CAST5 is not set | 1621 | # CONFIG_CRYPTO_CAST5 is not set |
1542 | # CONFIG_CRYPTO_CAST6 is not set | 1622 | # CONFIG_CRYPTO_CAST6 is not set |
1543 | # CONFIG_CRYPTO_TEA is not set | 1623 | CONFIG_CRYPTO_DES=y |
1544 | # CONFIG_CRYPTO_ARC4 is not set | 1624 | # CONFIG_CRYPTO_FCRYPT is not set |
1545 | # CONFIG_CRYPTO_KHAZAD is not set | 1625 | # CONFIG_CRYPTO_KHAZAD is not set |
1546 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1547 | # CONFIG_CRYPTO_SEED is not set | ||
1548 | # CONFIG_CRYPTO_SALSA20 is not set | 1626 | # CONFIG_CRYPTO_SALSA20 is not set |
1627 | # CONFIG_CRYPTO_SEED is not set | ||
1628 | # CONFIG_CRYPTO_SERPENT is not set | ||
1629 | # CONFIG_CRYPTO_TEA is not set | ||
1630 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1631 | |||
1632 | # | ||
1633 | # Compression | ||
1634 | # | ||
1549 | # CONFIG_CRYPTO_DEFLATE is not set | 1635 | # CONFIG_CRYPTO_DEFLATE is not set |
1550 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1551 | # CONFIG_CRYPTO_CRC32C is not set | ||
1552 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1553 | # CONFIG_CRYPTO_TEST is not set | ||
1554 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1555 | # CONFIG_CRYPTO_LZO is not set | 1636 | # CONFIG_CRYPTO_LZO is not set |
1556 | CONFIG_CRYPTO_HW=y | 1637 | CONFIG_CRYPTO_HW=y |
1557 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1638 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1558 | # CONFIG_PPC_CLOCK is not set | 1639 | # CONFIG_PPC_CLOCK is not set |
1559 | CONFIG_PPC_LIB_RHEAP=y | 1640 | CONFIG_PPC_LIB_RHEAP=y |
1641 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig index 7e5b9ce58d89..5612d40d0463 100644 --- a/arch/powerpc/configs/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:33 2008 | 4 | # Mon Jun 9 08:50:24 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -60,9 +62,10 @@ CONFIG_EXPERIMENTAL=y | |||
60 | CONFIG_BROKEN_ON_SMP=y | 62 | CONFIG_BROKEN_ON_SMP=y |
61 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 63 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
62 | CONFIG_LOCALVERSION="" | 64 | CONFIG_LOCALVERSION="" |
63 | # CONFIG_LOCALVERSION_AUTO is not set | 65 | CONFIG_LOCALVERSION_AUTO=y |
64 | # CONFIG_SWAP is not set | 66 | # CONFIG_SWAP is not set |
65 | # CONFIG_SYSVIPC is not set | 67 | CONFIG_SYSVIPC=y |
68 | CONFIG_SYSVIPC_SYSCTL=y | ||
66 | # CONFIG_POSIX_MQUEUE is not set | 69 | # CONFIG_POSIX_MQUEUE is not set |
67 | # CONFIG_BSD_PROCESS_ACCT is not set | 70 | # CONFIG_BSD_PROCESS_ACCT is not set |
68 | # CONFIG_TASKSTATS is not set | 71 | # CONFIG_TASKSTATS is not set |
@@ -86,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
86 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
87 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
88 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
90 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
91 | CONFIG_KALLSYMS_EXTRA_PASS=y | 95 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -110,14 +114,22 @@ CONFIG_SLUB=y | |||
110 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
111 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
112 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
117 | # CONFIG_KPROBES is not set | ||
113 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
120 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
115 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
119 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
120 | # CONFIG_MODULES is not set | 126 | CONFIG_MODULES=y |
127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
128 | CONFIG_MODULE_UNLOAD=y | ||
129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
130 | # CONFIG_MODVERSIONS is not set | ||
131 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
132 | CONFIG_KMOD=y | ||
121 | CONFIG_BLOCK=y | 133 | CONFIG_BLOCK=y |
122 | # CONFIG_LBD is not set | 134 | # CONFIG_LBD is not set |
123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
@@ -151,6 +163,7 @@ CONFIG_PPC_86xx=y | |||
151 | # CONFIG_PPC_CELL_NATIVE is not set | 163 | # CONFIG_PPC_CELL_NATIVE is not set |
152 | # CONFIG_PQ2ADS is not set | 164 | # CONFIG_PQ2ADS is not set |
153 | # CONFIG_MPC8641_HPCN is not set | 165 | # CONFIG_MPC8641_HPCN is not set |
166 | # CONFIG_SBC8641D is not set | ||
154 | CONFIG_MPC8610_HPCD=y | 167 | CONFIG_MPC8610_HPCD=y |
155 | CONFIG_MPC8610=y | 168 | CONFIG_MPC8610=y |
156 | # CONFIG_IPIC is not set | 169 | # CONFIG_IPIC is not set |
@@ -199,11 +212,13 @@ CONFIG_FLATMEM=y | |||
199 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
200 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
201 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
202 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
203 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
204 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
205 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
206 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
221 | CONFIG_FORCE_MAX_ZONEORDER=12 | ||
207 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
208 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
209 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
@@ -223,12 +238,14 @@ CONFIG_PCI_DOMAINS=y | |||
223 | CONFIG_PCI_SYSCALL=y | 238 | CONFIG_PCI_SYSCALL=y |
224 | CONFIG_PCIEPORTBUS=y | 239 | CONFIG_PCIEPORTBUS=y |
225 | CONFIG_PCIEAER=y | 240 | CONFIG_PCIEAER=y |
241 | # CONFIG_PCIEASPM is not set | ||
226 | CONFIG_ARCH_SUPPORTS_MSI=y | 242 | CONFIG_ARCH_SUPPORTS_MSI=y |
227 | # CONFIG_PCI_MSI is not set | 243 | # CONFIG_PCI_MSI is not set |
228 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
229 | CONFIG_PCI_DEBUG=y | 245 | CONFIG_PCI_DEBUG=y |
230 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
231 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
248 | # CONFIG_HAS_RAPIDIO is not set | ||
232 | 249 | ||
233 | # | 250 | # |
234 | # Advanced setup | 251 | # Advanced setup |
@@ -238,11 +255,11 @@ CONFIG_PCI_DEBUG=y | |||
238 | # | 255 | # |
239 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
240 | # | 257 | # |
241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
242 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
243 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
261 | CONFIG_PHYSICAL_START=0x00000000 | ||
244 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
245 | CONFIG_BOOT_LOAD=0x00800000 | ||
246 | 263 | ||
247 | # | 264 | # |
248 | # Networking | 265 | # Networking |
@@ -303,8 +320,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
303 | CONFIG_INET6_XFRM_MODE_BEET=y | 320 | CONFIG_INET6_XFRM_MODE_BEET=y |
304 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 321 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
305 | CONFIG_IPV6_SIT=y | 322 | CONFIG_IPV6_SIT=y |
323 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
306 | # CONFIG_IPV6_TUNNEL is not set | 324 | # CONFIG_IPV6_TUNNEL is not set |
307 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 325 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
326 | # CONFIG_IPV6_MROUTE is not set | ||
308 | # CONFIG_NETWORK_SECMARK is not set | 327 | # CONFIG_NETWORK_SECMARK is not set |
309 | # CONFIG_NETFILTER is not set | 328 | # CONFIG_NETFILTER is not set |
310 | # CONFIG_IP_DCCP is not set | 329 | # CONFIG_IP_DCCP is not set |
@@ -446,6 +465,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
446 | # | 465 | # |
447 | # CONFIG_MTD_UBI is not set | 466 | # CONFIG_MTD_UBI is not set |
448 | CONFIG_OF_DEVICE=y | 467 | CONFIG_OF_DEVICE=y |
468 | CONFIG_OF_I2C=y | ||
449 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
450 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
451 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
@@ -504,6 +524,7 @@ CONFIG_CHR_DEV_SG=y | |||
504 | # CONFIG_SCSI_CONSTANTS is not set | 524 | # CONFIG_SCSI_CONSTANTS is not set |
505 | # CONFIG_SCSI_LOGGING is not set | 525 | # CONFIG_SCSI_LOGGING is not set |
506 | # CONFIG_SCSI_SCAN_ASYNC is not set | 526 | # CONFIG_SCSI_SCAN_ASYNC is not set |
527 | CONFIG_SCSI_WAIT_SCAN=m | ||
507 | 528 | ||
508 | # | 529 | # |
509 | # SCSI Transports | 530 | # SCSI Transports |
@@ -553,7 +574,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
553 | # CONFIG_SCSI_SRP is not set | 574 | # CONFIG_SCSI_SRP is not set |
554 | CONFIG_ATA=y | 575 | CONFIG_ATA=y |
555 | # CONFIG_ATA_NONSTANDARD is not set | 576 | # CONFIG_ATA_NONSTANDARD is not set |
577 | CONFIG_SATA_PMP=y | ||
556 | CONFIG_SATA_AHCI=y | 578 | CONFIG_SATA_AHCI=y |
579 | # CONFIG_SATA_SIL24 is not set | ||
580 | # CONFIG_SATA_FSL is not set | ||
581 | CONFIG_ATA_SFF=y | ||
557 | # CONFIG_SATA_SVW is not set | 582 | # CONFIG_SATA_SVW is not set |
558 | # CONFIG_ATA_PIIX is not set | 583 | # CONFIG_ATA_PIIX is not set |
559 | # CONFIG_SATA_MV is not set | 584 | # CONFIG_SATA_MV is not set |
@@ -563,13 +588,11 @@ CONFIG_SATA_AHCI=y | |||
563 | # CONFIG_SATA_PROMISE is not set | 588 | # CONFIG_SATA_PROMISE is not set |
564 | # CONFIG_SATA_SX4 is not set | 589 | # CONFIG_SATA_SX4 is not set |
565 | # CONFIG_SATA_SIL is not set | 590 | # CONFIG_SATA_SIL is not set |
566 | # CONFIG_SATA_SIL24 is not set | ||
567 | # CONFIG_SATA_SIS is not set | 591 | # CONFIG_SATA_SIS is not set |
568 | # CONFIG_SATA_ULI is not set | 592 | # CONFIG_SATA_ULI is not set |
569 | # CONFIG_SATA_VIA is not set | 593 | # CONFIG_SATA_VIA is not set |
570 | # CONFIG_SATA_VITESSE is not set | 594 | # CONFIG_SATA_VITESSE is not set |
571 | # CONFIG_SATA_INIC162X is not set | 595 | # CONFIG_SATA_INIC162X is not set |
572 | # CONFIG_SATA_FSL is not set | ||
573 | CONFIG_PATA_ALI=y | 596 | CONFIG_PATA_ALI=y |
574 | # CONFIG_PATA_AMD is not set | 597 | # CONFIG_PATA_AMD is not set |
575 | # CONFIG_PATA_ARTOP is not set | 598 | # CONFIG_PATA_ARTOP is not set |
@@ -609,6 +632,7 @@ CONFIG_PATA_ALI=y | |||
609 | # CONFIG_PATA_VIA is not set | 632 | # CONFIG_PATA_VIA is not set |
610 | # CONFIG_PATA_WINBOND is not set | 633 | # CONFIG_PATA_WINBOND is not set |
611 | # CONFIG_PATA_PLATFORM is not set | 634 | # CONFIG_PATA_PLATFORM is not set |
635 | # CONFIG_PATA_SCH is not set | ||
612 | # CONFIG_MD is not set | 636 | # CONFIG_MD is not set |
613 | # CONFIG_FUSION is not set | 637 | # CONFIG_FUSION is not set |
614 | 638 | ||
@@ -628,25 +652,9 @@ CONFIG_DUMMY=y | |||
628 | # CONFIG_TUN is not set | 652 | # CONFIG_TUN is not set |
629 | # CONFIG_VETH is not set | 653 | # CONFIG_VETH is not set |
630 | # CONFIG_ARCNET is not set | 654 | # CONFIG_ARCNET is not set |
631 | CONFIG_PHYLIB=y | 655 | # CONFIG_PHYLIB is not set |
632 | |||
633 | # | ||
634 | # MII PHY device drivers | ||
635 | # | ||
636 | # CONFIG_MARVELL_PHY is not set | ||
637 | # CONFIG_DAVICOM_PHY is not set | ||
638 | # CONFIG_QSEMI_PHY is not set | ||
639 | # CONFIG_LXT_PHY is not set | ||
640 | # CONFIG_CICADA_PHY is not set | ||
641 | # CONFIG_VITESSE_PHY is not set | ||
642 | # CONFIG_SMSC_PHY is not set | ||
643 | # CONFIG_BROADCOM_PHY is not set | ||
644 | # CONFIG_ICPLUS_PHY is not set | ||
645 | # CONFIG_REALTEK_PHY is not set | ||
646 | # CONFIG_FIXED_PHY is not set | ||
647 | # CONFIG_MDIO_BITBANG is not set | ||
648 | CONFIG_NET_ETHERNET=y | 656 | CONFIG_NET_ETHERNET=y |
649 | CONFIG_MII=y | 657 | # CONFIG_MII is not set |
650 | # CONFIG_HAPPYMEAL is not set | 658 | # CONFIG_HAPPYMEAL is not set |
651 | # CONFIG_SUNGEM is not set | 659 | # CONFIG_SUNGEM is not set |
652 | # CONFIG_CASSINI is not set | 660 | # CONFIG_CASSINI is not set |
@@ -663,64 +671,10 @@ CONFIG_ULI526X=y | |||
663 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 671 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
664 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 672 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
665 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 673 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
666 | CONFIG_NET_PCI=y | 674 | # CONFIG_NET_PCI is not set |
667 | # CONFIG_PCNET32 is not set | ||
668 | # CONFIG_AMD8111_ETH is not set | ||
669 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
670 | # CONFIG_B44 is not set | 675 | # CONFIG_B44 is not set |
671 | # CONFIG_FORCEDETH is not set | 676 | # CONFIG_NETDEV_1000 is not set |
672 | # CONFIG_EEPRO100 is not set | 677 | # CONFIG_NETDEV_10000 is not set |
673 | # CONFIG_E100 is not set | ||
674 | # CONFIG_FEALNX is not set | ||
675 | # CONFIG_NATSEMI is not set | ||
676 | # CONFIG_NE2K_PCI is not set | ||
677 | # CONFIG_8139CP is not set | ||
678 | CONFIG_8139TOO=y | ||
679 | CONFIG_8139TOO_PIO=y | ||
680 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
681 | # CONFIG_8139TOO_8129 is not set | ||
682 | # CONFIG_8139_OLD_RX_RESET is not set | ||
683 | # CONFIG_R6040 is not set | ||
684 | # CONFIG_SIS900 is not set | ||
685 | # CONFIG_EPIC100 is not set | ||
686 | # CONFIG_SUNDANCE is not set | ||
687 | # CONFIG_TLAN is not set | ||
688 | # CONFIG_VIA_RHINE is not set | ||
689 | # CONFIG_SC92031 is not set | ||
690 | CONFIG_NETDEV_1000=y | ||
691 | # CONFIG_ACENIC is not set | ||
692 | # CONFIG_DL2K is not set | ||
693 | # CONFIG_E1000 is not set | ||
694 | # CONFIG_E1000E is not set | ||
695 | # CONFIG_E1000E_ENABLED is not set | ||
696 | # CONFIG_IP1000 is not set | ||
697 | # CONFIG_IGB is not set | ||
698 | # CONFIG_NS83820 is not set | ||
699 | # CONFIG_HAMACHI is not set | ||
700 | # CONFIG_YELLOWFIN is not set | ||
701 | # CONFIG_R8169 is not set | ||
702 | # CONFIG_SIS190 is not set | ||
703 | # CONFIG_SKGE is not set | ||
704 | # CONFIG_SKY2 is not set | ||
705 | # CONFIG_SK98LIN is not set | ||
706 | # CONFIG_VIA_VELOCITY is not set | ||
707 | # CONFIG_TIGON3 is not set | ||
708 | # CONFIG_BNX2 is not set | ||
709 | # CONFIG_GIANFAR is not set | ||
710 | # CONFIG_QLA3XXX is not set | ||
711 | # CONFIG_ATL1 is not set | ||
712 | CONFIG_NETDEV_10000=y | ||
713 | # CONFIG_CHELSIO_T1 is not set | ||
714 | # CONFIG_CHELSIO_T3 is not set | ||
715 | # CONFIG_IXGBE is not set | ||
716 | # CONFIG_IXGB is not set | ||
717 | # CONFIG_S2IO is not set | ||
718 | # CONFIG_MYRI10GE is not set | ||
719 | # CONFIG_NETXEN_NIC is not set | ||
720 | # CONFIG_NIU is not set | ||
721 | # CONFIG_MLX4_CORE is not set | ||
722 | # CONFIG_TEHUTI is not set | ||
723 | # CONFIG_BNX2X is not set | ||
724 | # CONFIG_TR is not set | 678 | # CONFIG_TR is not set |
725 | 679 | ||
726 | # | 680 | # |
@@ -728,6 +682,7 @@ CONFIG_NETDEV_10000=y | |||
728 | # | 682 | # |
729 | # CONFIG_WLAN_PRE80211 is not set | 683 | # CONFIG_WLAN_PRE80211 is not set |
730 | # CONFIG_WLAN_80211 is not set | 684 | # CONFIG_WLAN_80211 is not set |
685 | # CONFIG_IWLWIFI_LEDS is not set | ||
731 | # CONFIG_WAN is not set | 686 | # CONFIG_WAN is not set |
732 | # CONFIG_FDDI is not set | 687 | # CONFIG_FDDI is not set |
733 | # CONFIG_HIPPI is not set | 688 | # CONFIG_HIPPI is not set |
@@ -783,6 +738,7 @@ CONFIG_VT=y | |||
783 | CONFIG_VT_CONSOLE=y | 738 | CONFIG_VT_CONSOLE=y |
784 | CONFIG_HW_CONSOLE=y | 739 | CONFIG_HW_CONSOLE=y |
785 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 740 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
741 | CONFIG_DEVKMEM=y | ||
786 | # CONFIG_SERIAL_NONSTANDARD is not set | 742 | # CONFIG_SERIAL_NONSTANDARD is not set |
787 | # CONFIG_NOZOMI is not set | 743 | # CONFIG_NOZOMI is not set |
788 | 744 | ||
@@ -824,13 +780,6 @@ CONFIG_I2C_BOARDINFO=y | |||
824 | # CONFIG_I2C_CHARDEV is not set | 780 | # CONFIG_I2C_CHARDEV is not set |
825 | 781 | ||
826 | # | 782 | # |
827 | # I2C Algorithms | ||
828 | # | ||
829 | # CONFIG_I2C_ALGOBIT is not set | ||
830 | # CONFIG_I2C_ALGOPCF is not set | ||
831 | # CONFIG_I2C_ALGOPCA is not set | ||
832 | |||
833 | # | ||
834 | # I2C Hardware Bus support | 783 | # I2C Hardware Bus support |
835 | # | 784 | # |
836 | # CONFIG_I2C_ALI1535 is not set | 785 | # CONFIG_I2C_ALI1535 is not set |
@@ -852,9 +801,11 @@ CONFIG_I2C_MPC=y | |||
852 | # CONFIG_I2C_SIS630 is not set | 801 | # CONFIG_I2C_SIS630 is not set |
853 | # CONFIG_I2C_SIS96X is not set | 802 | # CONFIG_I2C_SIS96X is not set |
854 | # CONFIG_I2C_TAOS_EVM is not set | 803 | # CONFIG_I2C_TAOS_EVM is not set |
804 | # CONFIG_I2C_STUB is not set | ||
855 | # CONFIG_I2C_VIA is not set | 805 | # CONFIG_I2C_VIA is not set |
856 | # CONFIG_I2C_VIAPRO is not set | 806 | # CONFIG_I2C_VIAPRO is not set |
857 | # CONFIG_I2C_VOODOO3 is not set | 807 | # CONFIG_I2C_VOODOO3 is not set |
808 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
858 | 809 | ||
859 | # | 810 | # |
860 | # Miscellaneous I2C Chip support | 811 | # Miscellaneous I2C Chip support |
@@ -864,19 +815,13 @@ CONFIG_I2C_MPC=y | |||
864 | # CONFIG_SENSORS_PCF8574 is not set | 815 | # CONFIG_SENSORS_PCF8574 is not set |
865 | # CONFIG_PCF8575 is not set | 816 | # CONFIG_PCF8575 is not set |
866 | # CONFIG_SENSORS_PCF8591 is not set | 817 | # CONFIG_SENSORS_PCF8591 is not set |
867 | # CONFIG_TPS65010 is not set | ||
868 | # CONFIG_SENSORS_MAX6875 is not set | 818 | # CONFIG_SENSORS_MAX6875 is not set |
869 | # CONFIG_SENSORS_TSL2550 is not set | 819 | # CONFIG_SENSORS_TSL2550 is not set |
870 | # CONFIG_I2C_DEBUG_CORE is not set | 820 | # CONFIG_I2C_DEBUG_CORE is not set |
871 | # CONFIG_I2C_DEBUG_ALGO is not set | 821 | # CONFIG_I2C_DEBUG_ALGO is not set |
872 | # CONFIG_I2C_DEBUG_BUS is not set | 822 | # CONFIG_I2C_DEBUG_BUS is not set |
873 | # CONFIG_I2C_DEBUG_CHIP is not set | 823 | # CONFIG_I2C_DEBUG_CHIP is not set |
874 | |||
875 | # | ||
876 | # SPI support | ||
877 | # | ||
878 | # CONFIG_SPI is not set | 824 | # CONFIG_SPI is not set |
879 | # CONFIG_SPI_MASTER is not set | ||
880 | # CONFIG_W1 is not set | 825 | # CONFIG_W1 is not set |
881 | # CONFIG_POWER_SUPPLY is not set | 826 | # CONFIG_POWER_SUPPLY is not set |
882 | # CONFIG_HWMON is not set | 827 | # CONFIG_HWMON is not set |
@@ -893,12 +838,22 @@ CONFIG_SSB_POSSIBLE=y | |||
893 | # Multifunction device drivers | 838 | # Multifunction device drivers |
894 | # | 839 | # |
895 | # CONFIG_MFD_SM501 is not set | 840 | # CONFIG_MFD_SM501 is not set |
841 | # CONFIG_HTC_PASIC3 is not set | ||
896 | 842 | ||
897 | # | 843 | # |
898 | # Multimedia devices | 844 | # Multimedia devices |
899 | # | 845 | # |
846 | |||
847 | # | ||
848 | # Multimedia core support | ||
849 | # | ||
900 | # CONFIG_VIDEO_DEV is not set | 850 | # CONFIG_VIDEO_DEV is not set |
901 | # CONFIG_DVB_CORE is not set | 851 | # CONFIG_DVB_CORE is not set |
852 | # CONFIG_VIDEO_MEDIA is not set | ||
853 | |||
854 | # | ||
855 | # Multimedia drivers | ||
856 | # | ||
902 | CONFIG_DAB=y | 857 | CONFIG_DAB=y |
903 | 858 | ||
904 | # | 859 | # |
@@ -908,7 +863,56 @@ CONFIG_DAB=y | |||
908 | # CONFIG_DRM is not set | 863 | # CONFIG_DRM is not set |
909 | # CONFIG_VGASTATE is not set | 864 | # CONFIG_VGASTATE is not set |
910 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 865 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
911 | # CONFIG_FB is not set | 866 | CONFIG_FB=y |
867 | # CONFIG_FIRMWARE_EDID is not set | ||
868 | # CONFIG_FB_DDC is not set | ||
869 | CONFIG_FB_CFB_FILLRECT=y | ||
870 | CONFIG_FB_CFB_COPYAREA=y | ||
871 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
872 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
873 | # CONFIG_FB_SYS_FILLRECT is not set | ||
874 | # CONFIG_FB_SYS_COPYAREA is not set | ||
875 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
876 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
877 | # CONFIG_FB_SYS_FOPS is not set | ||
878 | # CONFIG_FB_SVGALIB is not set | ||
879 | # CONFIG_FB_MACMODES is not set | ||
880 | # CONFIG_FB_BACKLIGHT is not set | ||
881 | # CONFIG_FB_MODE_HELPERS is not set | ||
882 | # CONFIG_FB_TILEBLITTING is not set | ||
883 | |||
884 | # | ||
885 | # Frame buffer hardware drivers | ||
886 | # | ||
887 | # CONFIG_FB_CIRRUS is not set | ||
888 | # CONFIG_FB_PM2 is not set | ||
889 | # CONFIG_FB_CYBER2000 is not set | ||
890 | # CONFIG_FB_OF is not set | ||
891 | # CONFIG_FB_CT65550 is not set | ||
892 | # CONFIG_FB_ASILIANT is not set | ||
893 | # CONFIG_FB_IMSTT is not set | ||
894 | # CONFIG_FB_VGA16 is not set | ||
895 | # CONFIG_FB_S1D13XXX is not set | ||
896 | # CONFIG_FB_NVIDIA is not set | ||
897 | # CONFIG_FB_RIVA is not set | ||
898 | # CONFIG_FB_MATROX is not set | ||
899 | # CONFIG_FB_RADEON is not set | ||
900 | # CONFIG_FB_ATY128 is not set | ||
901 | # CONFIG_FB_ATY is not set | ||
902 | # CONFIG_FB_S3 is not set | ||
903 | # CONFIG_FB_SAVAGE is not set | ||
904 | # CONFIG_FB_SIS is not set | ||
905 | # CONFIG_FB_NEOMAGIC is not set | ||
906 | # CONFIG_FB_KYRO is not set | ||
907 | # CONFIG_FB_3DFX is not set | ||
908 | # CONFIG_FB_VOODOO1 is not set | ||
909 | # CONFIG_FB_VT8623 is not set | ||
910 | # CONFIG_FB_TRIDENT is not set | ||
911 | # CONFIG_FB_ARK is not set | ||
912 | # CONFIG_FB_PM3 is not set | ||
913 | CONFIG_FB_FSL_DIU=y | ||
914 | # CONFIG_FB_IBM_GXT4500 is not set | ||
915 | # CONFIG_FB_VIRTUAL is not set | ||
912 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 916 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
913 | 917 | ||
914 | # | 918 | # |
@@ -922,6 +926,8 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
922 | CONFIG_VGA_CONSOLE=y | 926 | CONFIG_VGA_CONSOLE=y |
923 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 927 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
924 | CONFIG_DUMMY_CONSOLE=y | 928 | CONFIG_DUMMY_CONSOLE=y |
929 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
930 | # CONFIG_LOGO is not set | ||
925 | 931 | ||
926 | # | 932 | # |
927 | # Sound | 933 | # Sound |
@@ -938,7 +944,7 @@ CONFIG_SND_PCM=y | |||
938 | CONFIG_SND_OSSEMUL=y | 944 | CONFIG_SND_OSSEMUL=y |
939 | CONFIG_SND_MIXER_OSS=y | 945 | CONFIG_SND_MIXER_OSS=y |
940 | CONFIG_SND_PCM_OSS=y | 946 | CONFIG_SND_PCM_OSS=y |
941 | # CONFIG_SND_PCM_OSS_PLUGINS is not set | 947 | CONFIG_SND_PCM_OSS_PLUGINS=y |
942 | # CONFIG_SND_DYNAMIC_MINORS is not set | 948 | # CONFIG_SND_DYNAMIC_MINORS is not set |
943 | # CONFIG_SND_SUPPORT_OLD_API is not set | 949 | # CONFIG_SND_SUPPORT_OLD_API is not set |
944 | CONFIG_SND_VERBOSE_PROCFS=y | 950 | CONFIG_SND_VERBOSE_PROCFS=y |
@@ -965,6 +971,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
965 | # CONFIG_SND_AU8810 is not set | 971 | # CONFIG_SND_AU8810 is not set |
966 | # CONFIG_SND_AU8820 is not set | 972 | # CONFIG_SND_AU8820 is not set |
967 | # CONFIG_SND_AU8830 is not set | 973 | # CONFIG_SND_AU8830 is not set |
974 | # CONFIG_SND_AW2 is not set | ||
968 | # CONFIG_SND_AZT3328 is not set | 975 | # CONFIG_SND_AZT3328 is not set |
969 | # CONFIG_SND_BT87X is not set | 976 | # CONFIG_SND_BT87X is not set |
970 | # CONFIG_SND_CA0106 is not set | 977 | # CONFIG_SND_CA0106 is not set |
@@ -1031,14 +1038,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1031 | CONFIG_SND_SOC=y | 1038 | CONFIG_SND_SOC=y |
1032 | 1039 | ||
1033 | # | 1040 | # |
1034 | # SoC Audio support for SuperH | ||
1035 | # | ||
1036 | |||
1037 | # | ||
1038 | # ALSA SoC audio for Freescale SOCs | 1041 | # ALSA SoC audio for Freescale SOCs |
1039 | # | 1042 | # |
1040 | CONFIG_SND_SOC_MPC8610=y | 1043 | CONFIG_SND_SOC_MPC8610=y |
1041 | CONFIG_SND_SOC_MPC8610_HPCD=y | 1044 | CONFIG_SND_SOC_MPC8610_HPCD=y |
1045 | |||
1046 | # | ||
1047 | # SoC Audio for the Texas Instruments OMAP | ||
1048 | # | ||
1042 | CONFIG_SND_SOC_CS4270=y | 1049 | CONFIG_SND_SOC_CS4270=y |
1043 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y | 1050 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y |
1044 | 1051 | ||
@@ -1055,6 +1062,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
1055 | CONFIG_USB_ARCH_HAS_OHCI=y | 1062 | CONFIG_USB_ARCH_HAS_OHCI=y |
1056 | CONFIG_USB_ARCH_HAS_EHCI=y | 1063 | CONFIG_USB_ARCH_HAS_EHCI=y |
1057 | # CONFIG_USB is not set | 1064 | # CONFIG_USB is not set |
1065 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1066 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1058 | 1067 | ||
1059 | # | 1068 | # |
1060 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1069 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1063,14 +1072,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1063 | # CONFIG_MMC is not set | 1072 | # CONFIG_MMC is not set |
1064 | # CONFIG_MEMSTICK is not set | 1073 | # CONFIG_MEMSTICK is not set |
1065 | # CONFIG_NEW_LEDS is not set | 1074 | # CONFIG_NEW_LEDS is not set |
1075 | # CONFIG_ACCESSIBILITY is not set | ||
1066 | # CONFIG_INFINIBAND is not set | 1076 | # CONFIG_INFINIBAND is not set |
1067 | # CONFIG_EDAC is not set | 1077 | # CONFIG_EDAC is not set |
1068 | # CONFIG_RTC_CLASS is not set | 1078 | # CONFIG_RTC_CLASS is not set |
1069 | # CONFIG_DMADEVICES is not set | 1079 | # CONFIG_DMADEVICES is not set |
1070 | |||
1071 | # | ||
1072 | # Userspace I/O | ||
1073 | # | ||
1074 | # CONFIG_UIO is not set | 1080 | # CONFIG_UIO is not set |
1075 | 1081 | ||
1076 | # | 1082 | # |
@@ -1090,7 +1096,6 @@ CONFIG_FS_MBCACHE=y | |||
1090 | # CONFIG_JFS_FS is not set | 1096 | # CONFIG_JFS_FS is not set |
1091 | # CONFIG_FS_POSIX_ACL is not set | 1097 | # CONFIG_FS_POSIX_ACL is not set |
1092 | # CONFIG_XFS_FS is not set | 1098 | # CONFIG_XFS_FS is not set |
1093 | # CONFIG_GFS2_FS is not set | ||
1094 | # CONFIG_OCFS2_FS is not set | 1099 | # CONFIG_OCFS2_FS is not set |
1095 | # CONFIG_DNOTIFY is not set | 1100 | # CONFIG_DNOTIFY is not set |
1096 | # CONFIG_INOTIFY is not set | 1101 | # CONFIG_INOTIFY is not set |
@@ -1134,6 +1139,7 @@ CONFIG_TMPFS=y | |||
1134 | # CONFIG_BEFS_FS is not set | 1139 | # CONFIG_BEFS_FS is not set |
1135 | # CONFIG_BFS_FS is not set | 1140 | # CONFIG_BFS_FS is not set |
1136 | # CONFIG_EFS_FS is not set | 1141 | # CONFIG_EFS_FS is not set |
1142 | # CONFIG_JFFS2_FS is not set | ||
1137 | # CONFIG_CRAMFS is not set | 1143 | # CONFIG_CRAMFS is not set |
1138 | # CONFIG_VXFS_FS is not set | 1144 | # CONFIG_VXFS_FS is not set |
1139 | # CONFIG_MINIX_FS is not set | 1145 | # CONFIG_MINIX_FS is not set |
@@ -1147,10 +1153,9 @@ CONFIG_NFS_FS=y | |||
1147 | CONFIG_NFS_V3=y | 1153 | CONFIG_NFS_V3=y |
1148 | # CONFIG_NFS_V3_ACL is not set | 1154 | # CONFIG_NFS_V3_ACL is not set |
1149 | # CONFIG_NFS_V4 is not set | 1155 | # CONFIG_NFS_V4 is not set |
1150 | # CONFIG_NFS_DIRECTIO is not set | ||
1151 | CONFIG_NFSD=y | 1156 | CONFIG_NFSD=y |
1152 | # CONFIG_NFSD_V3 is not set | 1157 | # CONFIG_NFSD_V3 is not set |
1153 | CONFIG_NFSD_TCP=y | 1158 | # CONFIG_NFSD_V4 is not set |
1154 | CONFIG_ROOT_NFS=y | 1159 | CONFIG_ROOT_NFS=y |
1155 | CONFIG_LOCKD=y | 1160 | CONFIG_LOCKD=y |
1156 | CONFIG_LOCKD_V4=y | 1161 | CONFIG_LOCKD_V4=y |
@@ -1234,6 +1239,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1234 | # Library routines | 1239 | # Library routines |
1235 | # | 1240 | # |
1236 | CONFIG_BITREVERSE=y | 1241 | CONFIG_BITREVERSE=y |
1242 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1237 | # CONFIG_CRC_CCITT is not set | 1243 | # CONFIG_CRC_CCITT is not set |
1238 | # CONFIG_CRC16 is not set | 1244 | # CONFIG_CRC16 is not set |
1239 | # CONFIG_CRC_ITU_T is not set | 1245 | # CONFIG_CRC_ITU_T is not set |
@@ -1244,6 +1250,7 @@ CONFIG_PLIST=y | |||
1244 | CONFIG_HAS_IOMEM=y | 1250 | CONFIG_HAS_IOMEM=y |
1245 | CONFIG_HAS_IOPORT=y | 1251 | CONFIG_HAS_IOPORT=y |
1246 | CONFIG_HAS_DMA=y | 1252 | CONFIG_HAS_DMA=y |
1253 | CONFIG_HAVE_LMB=y | ||
1247 | 1254 | ||
1248 | # | 1255 | # |
1249 | # Kernel hacking | 1256 | # Kernel hacking |
@@ -1251,6 +1258,7 @@ CONFIG_HAS_DMA=y | |||
1251 | # CONFIG_PRINTK_TIME is not set | 1258 | # CONFIG_PRINTK_TIME is not set |
1252 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1259 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1253 | CONFIG_ENABLE_MUST_CHECK=y | 1260 | CONFIG_ENABLE_MUST_CHECK=y |
1261 | CONFIG_FRAME_WARN=1024 | ||
1254 | # CONFIG_MAGIC_SYSRQ is not set | 1262 | # CONFIG_MAGIC_SYSRQ is not set |
1255 | # CONFIG_UNUSED_SYMBOLS is not set | 1263 | # CONFIG_UNUSED_SYMBOLS is not set |
1256 | # CONFIG_DEBUG_FS is not set | 1264 | # CONFIG_DEBUG_FS is not set |
@@ -1261,6 +1269,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1261 | CONFIG_SCHED_DEBUG=y | 1269 | CONFIG_SCHED_DEBUG=y |
1262 | # CONFIG_SCHEDSTATS is not set | 1270 | # CONFIG_SCHEDSTATS is not set |
1263 | # CONFIG_TIMER_STATS is not set | 1271 | # CONFIG_TIMER_STATS is not set |
1272 | # CONFIG_DEBUG_OBJECTS is not set | ||
1264 | # CONFIG_SLUB_DEBUG_ON is not set | 1273 | # CONFIG_SLUB_DEBUG_ON is not set |
1265 | # CONFIG_SLUB_STATS is not set | 1274 | # CONFIG_SLUB_STATS is not set |
1266 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1275 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1274,9 +1283,11 @@ CONFIG_SCHED_DEBUG=y | |||
1274 | CONFIG_DEBUG_BUGVERBOSE=y | 1283 | CONFIG_DEBUG_BUGVERBOSE=y |
1275 | CONFIG_DEBUG_INFO=y | 1284 | CONFIG_DEBUG_INFO=y |
1276 | # CONFIG_DEBUG_VM is not set | 1285 | # CONFIG_DEBUG_VM is not set |
1286 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1277 | # CONFIG_DEBUG_LIST is not set | 1287 | # CONFIG_DEBUG_LIST is not set |
1278 | # CONFIG_DEBUG_SG is not set | 1288 | # CONFIG_DEBUG_SG is not set |
1279 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1289 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1290 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1280 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1291 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1281 | # CONFIG_FAULT_INJECTION is not set | 1292 | # CONFIG_FAULT_INJECTION is not set |
1282 | # CONFIG_SAMPLES is not set | 1293 | # CONFIG_SAMPLES is not set |
@@ -1284,6 +1295,7 @@ CONFIG_DEBUG_INFO=y | |||
1284 | # CONFIG_DEBUG_STACK_USAGE is not set | 1295 | # CONFIG_DEBUG_STACK_USAGE is not set |
1285 | # CONFIG_DEBUG_PAGEALLOC is not set | 1296 | # CONFIG_DEBUG_PAGEALLOC is not set |
1286 | # CONFIG_DEBUGGER is not set | 1297 | # CONFIG_DEBUGGER is not set |
1298 | # CONFIG_IRQSTACKS is not set | ||
1287 | # CONFIG_BDI_SWITCH is not set | 1299 | # CONFIG_BDI_SWITCH is not set |
1288 | # CONFIG_PPC_EARLY_DEBUG is not set | 1300 | # CONFIG_PPC_EARLY_DEBUG is not set |
1289 | 1301 | ||
@@ -1294,48 +1306,80 @@ CONFIG_DEBUG_INFO=y | |||
1294 | # CONFIG_SECURITY is not set | 1306 | # CONFIG_SECURITY is not set |
1295 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1307 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1296 | CONFIG_CRYPTO=y | 1308 | CONFIG_CRYPTO=y |
1297 | # CONFIG_CRYPTO_SEQIV is not set | 1309 | |
1310 | # | ||
1311 | # Crypto core or helper | ||
1312 | # | ||
1298 | # CONFIG_CRYPTO_MANAGER is not set | 1313 | # CONFIG_CRYPTO_MANAGER is not set |
1314 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1315 | # CONFIG_CRYPTO_NULL is not set | ||
1316 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1317 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1318 | # CONFIG_CRYPTO_TEST is not set | ||
1319 | |||
1320 | # | ||
1321 | # Authenticated Encryption with Associated Data | ||
1322 | # | ||
1323 | # CONFIG_CRYPTO_CCM is not set | ||
1324 | # CONFIG_CRYPTO_GCM is not set | ||
1325 | # CONFIG_CRYPTO_SEQIV is not set | ||
1326 | |||
1327 | # | ||
1328 | # Block modes | ||
1329 | # | ||
1330 | # CONFIG_CRYPTO_CBC is not set | ||
1331 | # CONFIG_CRYPTO_CTR is not set | ||
1332 | # CONFIG_CRYPTO_CTS is not set | ||
1333 | # CONFIG_CRYPTO_ECB is not set | ||
1334 | # CONFIG_CRYPTO_LRW is not set | ||
1335 | # CONFIG_CRYPTO_PCBC is not set | ||
1336 | # CONFIG_CRYPTO_XTS is not set | ||
1337 | |||
1338 | # | ||
1339 | # Hash modes | ||
1340 | # | ||
1299 | # CONFIG_CRYPTO_HMAC is not set | 1341 | # CONFIG_CRYPTO_HMAC is not set |
1300 | # CONFIG_CRYPTO_XCBC is not set | 1342 | # CONFIG_CRYPTO_XCBC is not set |
1301 | # CONFIG_CRYPTO_NULL is not set | 1343 | |
1344 | # | ||
1345 | # Digest | ||
1346 | # | ||
1347 | # CONFIG_CRYPTO_CRC32C is not set | ||
1302 | # CONFIG_CRYPTO_MD4 is not set | 1348 | # CONFIG_CRYPTO_MD4 is not set |
1303 | # CONFIG_CRYPTO_MD5 is not set | 1349 | # CONFIG_CRYPTO_MD5 is not set |
1350 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1304 | # CONFIG_CRYPTO_SHA1 is not set | 1351 | # CONFIG_CRYPTO_SHA1 is not set |
1305 | # CONFIG_CRYPTO_SHA256 is not set | 1352 | # CONFIG_CRYPTO_SHA256 is not set |
1306 | # CONFIG_CRYPTO_SHA512 is not set | 1353 | # CONFIG_CRYPTO_SHA512 is not set |
1307 | # CONFIG_CRYPTO_WP512 is not set | ||
1308 | # CONFIG_CRYPTO_TGR192 is not set | 1354 | # CONFIG_CRYPTO_TGR192 is not set |
1309 | # CONFIG_CRYPTO_GF128MUL is not set | 1355 | # CONFIG_CRYPTO_WP512 is not set |
1310 | # CONFIG_CRYPTO_ECB is not set | 1356 | |
1311 | # CONFIG_CRYPTO_CBC is not set | 1357 | # |
1312 | # CONFIG_CRYPTO_PCBC is not set | 1358 | # Ciphers |
1313 | # CONFIG_CRYPTO_LRW is not set | 1359 | # |
1314 | # CONFIG_CRYPTO_XTS is not set | ||
1315 | # CONFIG_CRYPTO_CTR is not set | ||
1316 | # CONFIG_CRYPTO_GCM is not set | ||
1317 | # CONFIG_CRYPTO_CCM is not set | ||
1318 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1319 | # CONFIG_CRYPTO_DES is not set | ||
1320 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1321 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1322 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1323 | # CONFIG_CRYPTO_SERPENT is not set | ||
1324 | # CONFIG_CRYPTO_AES is not set | 1360 | # CONFIG_CRYPTO_AES is not set |
1361 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1362 | # CONFIG_CRYPTO_ARC4 is not set | ||
1363 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1364 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1325 | # CONFIG_CRYPTO_CAST5 is not set | 1365 | # CONFIG_CRYPTO_CAST5 is not set |
1326 | # CONFIG_CRYPTO_CAST6 is not set | 1366 | # CONFIG_CRYPTO_CAST6 is not set |
1327 | # CONFIG_CRYPTO_TEA is not set | 1367 | # CONFIG_CRYPTO_DES is not set |
1328 | # CONFIG_CRYPTO_ARC4 is not set | 1368 | # CONFIG_CRYPTO_FCRYPT is not set |
1329 | # CONFIG_CRYPTO_KHAZAD is not set | 1369 | # CONFIG_CRYPTO_KHAZAD is not set |
1330 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1331 | # CONFIG_CRYPTO_SEED is not set | ||
1332 | # CONFIG_CRYPTO_SALSA20 is not set | 1370 | # CONFIG_CRYPTO_SALSA20 is not set |
1371 | # CONFIG_CRYPTO_SEED is not set | ||
1372 | # CONFIG_CRYPTO_SERPENT is not set | ||
1373 | # CONFIG_CRYPTO_TEA is not set | ||
1374 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1375 | |||
1376 | # | ||
1377 | # Compression | ||
1378 | # | ||
1333 | # CONFIG_CRYPTO_DEFLATE is not set | 1379 | # CONFIG_CRYPTO_DEFLATE is not set |
1334 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1335 | # CONFIG_CRYPTO_CRC32C is not set | ||
1336 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1337 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1338 | # CONFIG_CRYPTO_LZO is not set | 1380 | # CONFIG_CRYPTO_LZO is not set |
1339 | CONFIG_CRYPTO_HW=y | 1381 | CONFIG_CRYPTO_HW=y |
1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1382 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1341 | # CONFIG_PPC_CLOCK is not set | 1383 | # CONFIG_PPC_CLOCK is not set |
1384 | CONFIG_PPC_LIB_RHEAP=y | ||
1385 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index d01dcdb70bd7..4a8171507391 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:37:11 2008 | 4 | # Mon Jun 9 08:52:15 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
@@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
@@ -162,6 +167,7 @@ CONFIG_PPC_86xx=y | |||
162 | # CONFIG_PPC_CELL_NATIVE is not set | 167 | # CONFIG_PPC_CELL_NATIVE is not set |
163 | # CONFIG_PQ2ADS is not set | 168 | # CONFIG_PQ2ADS is not set |
164 | CONFIG_MPC8641_HPCN=y | 169 | CONFIG_MPC8641_HPCN=y |
170 | # CONFIG_SBC8641D is not set | ||
165 | # CONFIG_MPC8610_HPCD is not set | 171 | # CONFIG_MPC8610_HPCD is not set |
166 | CONFIG_MPC8641=y | 172 | CONFIG_MPC8641=y |
167 | # CONFIG_IPIC is not set | 173 | # CONFIG_IPIC is not set |
@@ -211,11 +217,13 @@ CONFIG_FLATMEM=y | |||
211 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
212 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
215 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
216 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
217 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
218 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
219 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
220 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
221 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
@@ -240,6 +248,8 @@ CONFIG_PCI_LEGACY=y | |||
240 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
241 | # CONFIG_PCCARD is not set | 249 | # CONFIG_PCCARD is not set |
242 | # CONFIG_HOTPLUG_PCI is not set | 250 | # CONFIG_HOTPLUG_PCI is not set |
251 | CONFIG_HAS_RAPIDIO=y | ||
252 | # CONFIG_RAPIDIO is not set | ||
243 | 253 | ||
244 | # | 254 | # |
245 | # Advanced setup | 255 | # Advanced setup |
@@ -249,11 +259,11 @@ CONFIG_PCI_LEGACY=y | |||
249 | # | 259 | # |
250 | # Default settings for advanced configuration options are used | 260 | # Default settings for advanced configuration options are used |
251 | # | 261 | # |
252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
253 | CONFIG_LOWMEM_SIZE=0x30000000 | 262 | CONFIG_LOWMEM_SIZE=0x30000000 |
263 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
254 | CONFIG_KERNEL_START=0xc0000000 | 264 | CONFIG_KERNEL_START=0xc0000000 |
265 | CONFIG_PHYSICAL_START=0x00000000 | ||
255 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
256 | CONFIG_BOOT_LOAD=0x00800000 | ||
257 | 267 | ||
258 | # | 268 | # |
259 | # Networking | 269 | # Networking |
@@ -324,8 +334,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
324 | CONFIG_INET6_XFRM_MODE_BEET=y | 334 | CONFIG_INET6_XFRM_MODE_BEET=y |
325 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
326 | CONFIG_IPV6_SIT=y | 336 | CONFIG_IPV6_SIT=y |
337 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
327 | # CONFIG_IPV6_TUNNEL is not set | 338 | # CONFIG_IPV6_TUNNEL is not set |
328 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 339 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
340 | # CONFIG_IPV6_MROUTE is not set | ||
329 | # CONFIG_NETWORK_SECMARK is not set | 341 | # CONFIG_NETWORK_SECMARK is not set |
330 | # CONFIG_NETFILTER is not set | 342 | # CONFIG_NETFILTER is not set |
331 | # CONFIG_IP_DCCP is not set | 343 | # CONFIG_IP_DCCP is not set |
@@ -387,6 +399,7 @@ CONFIG_FW_LOADER=y | |||
387 | # CONFIG_CONNECTOR is not set | 399 | # CONFIG_CONNECTOR is not set |
388 | # CONFIG_MTD is not set | 400 | # CONFIG_MTD is not set |
389 | CONFIG_OF_DEVICE=y | 401 | CONFIG_OF_DEVICE=y |
402 | CONFIG_OF_I2C=y | ||
390 | # CONFIG_PARPORT is not set | 403 | # CONFIG_PARPORT is not set |
391 | CONFIG_BLK_DEV=y | 404 | CONFIG_BLK_DEV=y |
392 | # CONFIG_BLK_DEV_FD is not set | 405 | # CONFIG_BLK_DEV_FD is not set |
@@ -493,7 +506,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
493 | # CONFIG_SCSI_SRP is not set | 506 | # CONFIG_SCSI_SRP is not set |
494 | CONFIG_ATA=y | 507 | CONFIG_ATA=y |
495 | # CONFIG_ATA_NONSTANDARD is not set | 508 | # CONFIG_ATA_NONSTANDARD is not set |
509 | CONFIG_SATA_PMP=y | ||
496 | CONFIG_SATA_AHCI=y | 510 | CONFIG_SATA_AHCI=y |
511 | # CONFIG_SATA_SIL24 is not set | ||
512 | # CONFIG_SATA_FSL is not set | ||
513 | CONFIG_ATA_SFF=y | ||
497 | # CONFIG_SATA_SVW is not set | 514 | # CONFIG_SATA_SVW is not set |
498 | # CONFIG_ATA_PIIX is not set | 515 | # CONFIG_ATA_PIIX is not set |
499 | # CONFIG_SATA_MV is not set | 516 | # CONFIG_SATA_MV is not set |
@@ -503,13 +520,11 @@ CONFIG_SATA_AHCI=y | |||
503 | # CONFIG_SATA_PROMISE is not set | 520 | # CONFIG_SATA_PROMISE is not set |
504 | # CONFIG_SATA_SX4 is not set | 521 | # CONFIG_SATA_SX4 is not set |
505 | # CONFIG_SATA_SIL is not set | 522 | # CONFIG_SATA_SIL is not set |
506 | # CONFIG_SATA_SIL24 is not set | ||
507 | # CONFIG_SATA_SIS is not set | 523 | # CONFIG_SATA_SIS is not set |
508 | # CONFIG_SATA_ULI is not set | 524 | # CONFIG_SATA_ULI is not set |
509 | # CONFIG_SATA_VIA is not set | 525 | # CONFIG_SATA_VIA is not set |
510 | # CONFIG_SATA_VITESSE is not set | 526 | # CONFIG_SATA_VITESSE is not set |
511 | # CONFIG_SATA_INIC162X is not set | 527 | # CONFIG_SATA_INIC162X is not set |
512 | # CONFIG_SATA_FSL is not set | ||
513 | CONFIG_PATA_ALI=y | 528 | CONFIG_PATA_ALI=y |
514 | # CONFIG_PATA_AMD is not set | 529 | # CONFIG_PATA_AMD is not set |
515 | # CONFIG_PATA_ARTOP is not set | 530 | # CONFIG_PATA_ARTOP is not set |
@@ -549,6 +564,7 @@ CONFIG_PATA_ALI=y | |||
549 | # CONFIG_PATA_VIA is not set | 564 | # CONFIG_PATA_VIA is not set |
550 | # CONFIG_PATA_WINBOND is not set | 565 | # CONFIG_PATA_WINBOND is not set |
551 | # CONFIG_PATA_PLATFORM is not set | 566 | # CONFIG_PATA_PLATFORM is not set |
567 | # CONFIG_PATA_SCH is not set | ||
552 | # CONFIG_MD is not set | 568 | # CONFIG_MD is not set |
553 | # CONFIG_FUSION is not set | 569 | # CONFIG_FUSION is not set |
554 | 570 | ||
@@ -614,7 +630,6 @@ CONFIG_NETDEV_1000=y | |||
614 | # CONFIG_SIS190 is not set | 630 | # CONFIG_SIS190 is not set |
615 | # CONFIG_SKGE is not set | 631 | # CONFIG_SKGE is not set |
616 | # CONFIG_SKY2 is not set | 632 | # CONFIG_SKY2 is not set |
617 | # CONFIG_SK98LIN is not set | ||
618 | # CONFIG_VIA_VELOCITY is not set | 633 | # CONFIG_VIA_VELOCITY is not set |
619 | # CONFIG_TIGON3 is not set | 634 | # CONFIG_TIGON3 is not set |
620 | # CONFIG_BNX2 is not set | 635 | # CONFIG_BNX2 is not set |
@@ -634,6 +649,7 @@ CONFIG_NETDEV_10000=y | |||
634 | # CONFIG_MLX4_CORE is not set | 649 | # CONFIG_MLX4_CORE is not set |
635 | # CONFIG_TEHUTI is not set | 650 | # CONFIG_TEHUTI is not set |
636 | # CONFIG_BNX2X is not set | 651 | # CONFIG_BNX2X is not set |
652 | # CONFIG_SFC is not set | ||
637 | # CONFIG_TR is not set | 653 | # CONFIG_TR is not set |
638 | 654 | ||
639 | # | 655 | # |
@@ -641,6 +657,7 @@ CONFIG_NETDEV_10000=y | |||
641 | # | 657 | # |
642 | # CONFIG_WLAN_PRE80211 is not set | 658 | # CONFIG_WLAN_PRE80211 is not set |
643 | # CONFIG_WLAN_80211 is not set | 659 | # CONFIG_WLAN_80211 is not set |
660 | # CONFIG_IWLWIFI_LEDS is not set | ||
644 | 661 | ||
645 | # | 662 | # |
646 | # USB Network Adapters | 663 | # USB Network Adapters |
@@ -705,6 +722,7 @@ CONFIG_VT=y | |||
705 | CONFIG_VT_CONSOLE=y | 722 | CONFIG_VT_CONSOLE=y |
706 | CONFIG_HW_CONSOLE=y | 723 | CONFIG_HW_CONSOLE=y |
707 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 724 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
725 | CONFIG_DEVKMEM=y | ||
708 | # CONFIG_SERIAL_NONSTANDARD is not set | 726 | # CONFIG_SERIAL_NONSTANDARD is not set |
709 | # CONFIG_NOZOMI is not set | 727 | # CONFIG_NOZOMI is not set |
710 | 728 | ||
@@ -736,7 +754,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
736 | # CONFIG_IPMI_HANDLER is not set | 754 | # CONFIG_IPMI_HANDLER is not set |
737 | # CONFIG_HW_RANDOM is not set | 755 | # CONFIG_HW_RANDOM is not set |
738 | CONFIG_NVRAM=y | 756 | CONFIG_NVRAM=y |
739 | # CONFIG_GEN_RTC is not set | ||
740 | # CONFIG_R3964 is not set | 757 | # CONFIG_R3964 is not set |
741 | # CONFIG_APPLICOM is not set | 758 | # CONFIG_APPLICOM is not set |
742 | # CONFIG_RAW_DRIVER is not set | 759 | # CONFIG_RAW_DRIVER is not set |
@@ -747,13 +764,6 @@ CONFIG_I2C_BOARDINFO=y | |||
747 | # CONFIG_I2C_CHARDEV is not set | 764 | # CONFIG_I2C_CHARDEV is not set |
748 | 765 | ||
749 | # | 766 | # |
750 | # I2C Algorithms | ||
751 | # | ||
752 | # CONFIG_I2C_ALGOBIT is not set | ||
753 | # CONFIG_I2C_ALGOPCF is not set | ||
754 | # CONFIG_I2C_ALGOPCA is not set | ||
755 | |||
756 | # | ||
757 | # I2C Hardware Bus support | 767 | # I2C Hardware Bus support |
758 | # | 768 | # |
759 | # CONFIG_I2C_ALI1535 is not set | 769 | # CONFIG_I2C_ALI1535 is not set |
@@ -780,6 +790,7 @@ CONFIG_I2C_MPC=y | |||
780 | # CONFIG_I2C_VIA is not set | 790 | # CONFIG_I2C_VIA is not set |
781 | # CONFIG_I2C_VIAPRO is not set | 791 | # CONFIG_I2C_VIAPRO is not set |
782 | # CONFIG_I2C_VOODOO3 is not set | 792 | # CONFIG_I2C_VOODOO3 is not set |
793 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
783 | 794 | ||
784 | # | 795 | # |
785 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
@@ -789,19 +800,13 @@ CONFIG_SENSORS_EEPROM=y | |||
789 | # CONFIG_SENSORS_PCF8574 is not set | 800 | # CONFIG_SENSORS_PCF8574 is not set |
790 | # CONFIG_PCF8575 is not set | 801 | # CONFIG_PCF8575 is not set |
791 | # CONFIG_SENSORS_PCF8591 is not set | 802 | # CONFIG_SENSORS_PCF8591 is not set |
792 | # CONFIG_TPS65010 is not set | ||
793 | # CONFIG_SENSORS_MAX6875 is not set | 803 | # CONFIG_SENSORS_MAX6875 is not set |
794 | # CONFIG_SENSORS_TSL2550 is not set | 804 | # CONFIG_SENSORS_TSL2550 is not set |
795 | # CONFIG_I2C_DEBUG_CORE is not set | 805 | # CONFIG_I2C_DEBUG_CORE is not set |
796 | # CONFIG_I2C_DEBUG_ALGO is not set | 806 | # CONFIG_I2C_DEBUG_ALGO is not set |
797 | # CONFIG_I2C_DEBUG_BUS is not set | 807 | # CONFIG_I2C_DEBUG_BUS is not set |
798 | # CONFIG_I2C_DEBUG_CHIP is not set | 808 | # CONFIG_I2C_DEBUG_CHIP is not set |
799 | |||
800 | # | ||
801 | # SPI support | ||
802 | # | ||
803 | # CONFIG_SPI is not set | 809 | # CONFIG_SPI is not set |
804 | # CONFIG_SPI_MASTER is not set | ||
805 | # CONFIG_W1 is not set | 810 | # CONFIG_W1 is not set |
806 | # CONFIG_POWER_SUPPLY is not set | 811 | # CONFIG_POWER_SUPPLY is not set |
807 | # CONFIG_HWMON is not set | 812 | # CONFIG_HWMON is not set |
@@ -818,13 +823,33 @@ CONFIG_SSB_POSSIBLE=y | |||
818 | # Multifunction device drivers | 823 | # Multifunction device drivers |
819 | # | 824 | # |
820 | # CONFIG_MFD_SM501 is not set | 825 | # CONFIG_MFD_SM501 is not set |
826 | # CONFIG_HTC_PASIC3 is not set | ||
821 | 827 | ||
822 | # | 828 | # |
823 | # Multimedia devices | 829 | # Multimedia devices |
824 | # | 830 | # |
831 | |||
832 | # | ||
833 | # Multimedia core support | ||
834 | # | ||
825 | # CONFIG_VIDEO_DEV is not set | 835 | # CONFIG_VIDEO_DEV is not set |
826 | CONFIG_DVB_CORE=m | 836 | CONFIG_DVB_CORE=m |
827 | # CONFIG_DVB_CORE_ATTACH is not set | 837 | CONFIG_VIDEO_MEDIA=m |
838 | |||
839 | # | ||
840 | # Multimedia drivers | ||
841 | # | ||
842 | # CONFIG_MEDIA_ATTACH is not set | ||
843 | CONFIG_MEDIA_TUNER=m | ||
844 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
845 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
846 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
847 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
848 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
849 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
850 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
851 | CONFIG_MEDIA_TUNER_XC2028=m | ||
852 | CONFIG_MEDIA_TUNER_XC5000=m | ||
828 | CONFIG_DVB_CAPTURE_DRIVERS=y | 853 | CONFIG_DVB_CAPTURE_DRIVERS=y |
829 | 854 | ||
830 | # | 855 | # |
@@ -867,14 +892,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
867 | # | 892 | # |
868 | # DVB-S (satellite) frontends | 893 | # DVB-S (satellite) frontends |
869 | # | 894 | # |
870 | # CONFIG_DVB_STV0299 is not set | ||
871 | # CONFIG_DVB_CX24110 is not set | 895 | # CONFIG_DVB_CX24110 is not set |
872 | # CONFIG_DVB_CX24123 is not set | 896 | # CONFIG_DVB_CX24123 is not set |
873 | # CONFIG_DVB_TDA8083 is not set | ||
874 | # CONFIG_DVB_MT312 is not set | 897 | # CONFIG_DVB_MT312 is not set |
875 | # CONFIG_DVB_VES1X93 is not set | ||
876 | # CONFIG_DVB_S5H1420 is not set | 898 | # CONFIG_DVB_S5H1420 is not set |
899 | # CONFIG_DVB_STV0299 is not set | ||
900 | # CONFIG_DVB_TDA8083 is not set | ||
877 | # CONFIG_DVB_TDA10086 is not set | 901 | # CONFIG_DVB_TDA10086 is not set |
902 | # CONFIG_DVB_VES1X93 is not set | ||
903 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
904 | # CONFIG_DVB_TDA826X is not set | ||
905 | # CONFIG_DVB_TUA6100 is not set | ||
878 | 906 | ||
879 | # | 907 | # |
880 | # DVB-T (terrestrial) frontends | 908 | # DVB-T (terrestrial) frontends |
@@ -892,6 +920,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
892 | # CONFIG_DVB_DIB3000MC is not set | 920 | # CONFIG_DVB_DIB3000MC is not set |
893 | # CONFIG_DVB_DIB7000M is not set | 921 | # CONFIG_DVB_DIB7000M is not set |
894 | # CONFIG_DVB_DIB7000P is not set | 922 | # CONFIG_DVB_DIB7000P is not set |
923 | # CONFIG_DVB_TDA10048 is not set | ||
895 | 924 | ||
896 | # | 925 | # |
897 | # DVB-C (cable) frontends | 926 | # DVB-C (cable) frontends |
@@ -910,27 +939,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
910 | # CONFIG_DVB_BCM3510 is not set | 939 | # CONFIG_DVB_BCM3510 is not set |
911 | # CONFIG_DVB_LGDT330X is not set | 940 | # CONFIG_DVB_LGDT330X is not set |
912 | # CONFIG_DVB_S5H1409 is not set | 941 | # CONFIG_DVB_S5H1409 is not set |
942 | # CONFIG_DVB_AU8522 is not set | ||
943 | # CONFIG_DVB_S5H1411 is not set | ||
913 | 944 | ||
914 | # | 945 | # |
915 | # Tuners/PLL support | 946 | # Digital terrestrial only tuners/PLL |
916 | # | 947 | # |
917 | # CONFIG_DVB_PLL is not set | 948 | # CONFIG_DVB_PLL is not set |
918 | # CONFIG_DVB_TDA826X is not set | ||
919 | # CONFIG_DVB_TDA827X is not set | ||
920 | # CONFIG_DVB_TDA18271 is not set | ||
921 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
922 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
923 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
924 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
925 | # CONFIG_DVB_TUNER_DIB0070 is not set | 949 | # CONFIG_DVB_TUNER_DIB0070 is not set |
926 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
927 | 950 | ||
928 | # | 951 | # |
929 | # Miscellaneous devices | 952 | # SEC control devices for DVB-S |
930 | # | 953 | # |
931 | # CONFIG_DVB_LNBP21 is not set | 954 | # CONFIG_DVB_LNBP21 is not set |
955 | # CONFIG_DVB_ISL6405 is not set | ||
932 | # CONFIG_DVB_ISL6421 is not set | 956 | # CONFIG_DVB_ISL6421 is not set |
933 | # CONFIG_DVB_TUA6100 is not set | ||
934 | CONFIG_DAB=y | 957 | CONFIG_DAB=y |
935 | # CONFIG_USB_DABUSB is not set | 958 | # CONFIG_USB_DABUSB is not set |
936 | 959 | ||
@@ -997,6 +1020,7 @@ CONFIG_SND_AC97_CODEC=y | |||
997 | # CONFIG_SND_AU8810 is not set | 1020 | # CONFIG_SND_AU8810 is not set |
998 | # CONFIG_SND_AU8820 is not set | 1021 | # CONFIG_SND_AU8820 is not set |
999 | # CONFIG_SND_AU8830 is not set | 1022 | # CONFIG_SND_AU8830 is not set |
1023 | # CONFIG_SND_AW2 is not set | ||
1000 | # CONFIG_SND_AZT3328 is not set | 1024 | # CONFIG_SND_AZT3328 is not set |
1001 | # CONFIG_SND_BT87X is not set | 1025 | # CONFIG_SND_BT87X is not set |
1002 | # CONFIG_SND_CA0106 is not set | 1026 | # CONFIG_SND_CA0106 is not set |
@@ -1071,11 +1095,11 @@ CONFIG_SND_INTEL8X0=y | |||
1071 | # CONFIG_SND_SOC is not set | 1095 | # CONFIG_SND_SOC is not set |
1072 | 1096 | ||
1073 | # | 1097 | # |
1074 | # SoC Audio support for SuperH | 1098 | # ALSA SoC audio for Freescale SOCs |
1075 | # | 1099 | # |
1076 | 1100 | ||
1077 | # | 1101 | # |
1078 | # ALSA SoC audio for Freescale SOCs | 1102 | # SoC Audio for the Texas Instruments OMAP |
1079 | # | 1103 | # |
1080 | 1104 | ||
1081 | # | 1105 | # |
@@ -1110,16 +1134,20 @@ CONFIG_USB_DEVICEFS=y | |||
1110 | CONFIG_USB_DEVICE_CLASS=y | 1134 | CONFIG_USB_DEVICE_CLASS=y |
1111 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1135 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1112 | # CONFIG_USB_OTG is not set | 1136 | # CONFIG_USB_OTG is not set |
1137 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1138 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1113 | 1139 | ||
1114 | # | 1140 | # |
1115 | # USB Host Controller Drivers | 1141 | # USB Host Controller Drivers |
1116 | # | 1142 | # |
1143 | # CONFIG_USB_C67X00_HCD is not set | ||
1117 | CONFIG_USB_EHCI_HCD=y | 1144 | CONFIG_USB_EHCI_HCD=y |
1118 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1145 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1119 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1146 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1120 | # CONFIG_USB_EHCI_FSL is not set | 1147 | # CONFIG_USB_EHCI_FSL is not set |
1121 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1148 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1122 | # CONFIG_USB_ISP116X_HCD is not set | 1149 | # CONFIG_USB_ISP116X_HCD is not set |
1150 | # CONFIG_USB_ISP1760_HCD is not set | ||
1123 | CONFIG_USB_OHCI_HCD=y | 1151 | CONFIG_USB_OHCI_HCD=y |
1124 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1152 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
1125 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1153 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -1137,6 +1165,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1137 | # | 1165 | # |
1138 | # CONFIG_USB_ACM is not set | 1166 | # CONFIG_USB_ACM is not set |
1139 | # CONFIG_USB_PRINTER is not set | 1167 | # CONFIG_USB_PRINTER is not set |
1168 | # CONFIG_USB_WDM is not set | ||
1140 | 1169 | ||
1141 | # | 1170 | # |
1142 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1171 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1156,7 +1185,9 @@ CONFIG_USB_STORAGE=y | |||
1156 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1185 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1157 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1186 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1158 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1187 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1188 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1159 | # CONFIG_USB_STORAGE_KARMA is not set | 1189 | # CONFIG_USB_STORAGE_KARMA is not set |
1190 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1160 | # CONFIG_USB_LIBUSUAL is not set | 1191 | # CONFIG_USB_LIBUSUAL is not set |
1161 | 1192 | ||
1162 | # | 1193 | # |
@@ -1194,10 +1225,12 @@ CONFIG_USB_MON=y | |||
1194 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1225 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1195 | # CONFIG_USB_IOWARRIOR is not set | 1226 | # CONFIG_USB_IOWARRIOR is not set |
1196 | # CONFIG_USB_TEST is not set | 1227 | # CONFIG_USB_TEST is not set |
1228 | # CONFIG_USB_ISIGHTFW is not set | ||
1197 | # CONFIG_USB_GADGET is not set | 1229 | # CONFIG_USB_GADGET is not set |
1198 | # CONFIG_MMC is not set | 1230 | # CONFIG_MMC is not set |
1199 | # CONFIG_MEMSTICK is not set | 1231 | # CONFIG_MEMSTICK is not set |
1200 | # CONFIG_NEW_LEDS is not set | 1232 | # CONFIG_NEW_LEDS is not set |
1233 | # CONFIG_ACCESSIBILITY is not set | ||
1201 | # CONFIG_INFINIBAND is not set | 1234 | # CONFIG_INFINIBAND is not set |
1202 | # CONFIG_EDAC is not set | 1235 | # CONFIG_EDAC is not set |
1203 | CONFIG_RTC_LIB=y | 1236 | CONFIG_RTC_LIB=y |
@@ -1249,11 +1282,8 @@ CONFIG_RTC_DRV_CMOS=y | |||
1249 | # | 1282 | # |
1250 | # on-CPU RTC drivers | 1283 | # on-CPU RTC drivers |
1251 | # | 1284 | # |
1285 | # CONFIG_RTC_DRV_PPC is not set | ||
1252 | # CONFIG_DMADEVICES is not set | 1286 | # CONFIG_DMADEVICES is not set |
1253 | |||
1254 | # | ||
1255 | # Userspace I/O | ||
1256 | # | ||
1257 | # CONFIG_UIO is not set | 1287 | # CONFIG_UIO is not set |
1258 | 1288 | ||
1259 | # | 1289 | # |
@@ -1273,7 +1303,6 @@ CONFIG_FS_MBCACHE=y | |||
1273 | # CONFIG_JFS_FS is not set | 1303 | # CONFIG_JFS_FS is not set |
1274 | # CONFIG_FS_POSIX_ACL is not set | 1304 | # CONFIG_FS_POSIX_ACL is not set |
1275 | # CONFIG_XFS_FS is not set | 1305 | # CONFIG_XFS_FS is not set |
1276 | # CONFIG_GFS2_FS is not set | ||
1277 | # CONFIG_OCFS2_FS is not set | 1306 | # CONFIG_OCFS2_FS is not set |
1278 | CONFIG_DNOTIFY=y | 1307 | CONFIG_DNOTIFY=y |
1279 | CONFIG_INOTIFY=y | 1308 | CONFIG_INOTIFY=y |
@@ -1343,10 +1372,9 @@ CONFIG_NFS_FS=y | |||
1343 | CONFIG_NFS_V3=y | 1372 | CONFIG_NFS_V3=y |
1344 | # CONFIG_NFS_V3_ACL is not set | 1373 | # CONFIG_NFS_V3_ACL is not set |
1345 | CONFIG_NFS_V4=y | 1374 | CONFIG_NFS_V4=y |
1346 | # CONFIG_NFS_DIRECTIO is not set | ||
1347 | CONFIG_NFSD=y | 1375 | CONFIG_NFSD=y |
1348 | # CONFIG_NFSD_V3 is not set | 1376 | # CONFIG_NFSD_V3 is not set |
1349 | CONFIG_NFSD_TCP=y | 1377 | # CONFIG_NFSD_V4 is not set |
1350 | CONFIG_ROOT_NFS=y | 1378 | CONFIG_ROOT_NFS=y |
1351 | CONFIG_LOCKD=y | 1379 | CONFIG_LOCKD=y |
1352 | CONFIG_LOCKD_V4=y | 1380 | CONFIG_LOCKD_V4=y |
@@ -1430,9 +1458,10 @@ CONFIG_NLS_UTF8=m | |||
1430 | # Library routines | 1458 | # Library routines |
1431 | # | 1459 | # |
1432 | CONFIG_BITREVERSE=y | 1460 | CONFIG_BITREVERSE=y |
1461 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1433 | # CONFIG_CRC_CCITT is not set | 1462 | # CONFIG_CRC_CCITT is not set |
1434 | # CONFIG_CRC16 is not set | 1463 | # CONFIG_CRC16 is not set |
1435 | # CONFIG_CRC_ITU_T is not set | 1464 | CONFIG_CRC_ITU_T=m |
1436 | CONFIG_CRC32=y | 1465 | CONFIG_CRC32=y |
1437 | # CONFIG_CRC7 is not set | 1466 | # CONFIG_CRC7 is not set |
1438 | CONFIG_LIBCRC32C=m | 1467 | CONFIG_LIBCRC32C=m |
@@ -1441,6 +1470,7 @@ CONFIG_PLIST=y | |||
1441 | CONFIG_HAS_IOMEM=y | 1470 | CONFIG_HAS_IOMEM=y |
1442 | CONFIG_HAS_IOPORT=y | 1471 | CONFIG_HAS_IOPORT=y |
1443 | CONFIG_HAS_DMA=y | 1472 | CONFIG_HAS_DMA=y |
1473 | CONFIG_HAVE_LMB=y | ||
1444 | 1474 | ||
1445 | # | 1475 | # |
1446 | # Kernel hacking | 1476 | # Kernel hacking |
@@ -1448,6 +1478,7 @@ CONFIG_HAS_DMA=y | |||
1448 | # CONFIG_PRINTK_TIME is not set | 1478 | # CONFIG_PRINTK_TIME is not set |
1449 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1479 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1450 | CONFIG_ENABLE_MUST_CHECK=y | 1480 | CONFIG_ENABLE_MUST_CHECK=y |
1481 | CONFIG_FRAME_WARN=1024 | ||
1451 | # CONFIG_MAGIC_SYSRQ is not set | 1482 | # CONFIG_MAGIC_SYSRQ is not set |
1452 | # CONFIG_UNUSED_SYMBOLS is not set | 1483 | # CONFIG_UNUSED_SYMBOLS is not set |
1453 | # CONFIG_DEBUG_FS is not set | 1484 | # CONFIG_DEBUG_FS is not set |
@@ -1458,6 +1489,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1458 | CONFIG_SCHED_DEBUG=y | 1489 | CONFIG_SCHED_DEBUG=y |
1459 | # CONFIG_SCHEDSTATS is not set | 1490 | # CONFIG_SCHEDSTATS is not set |
1460 | # CONFIG_TIMER_STATS is not set | 1491 | # CONFIG_TIMER_STATS is not set |
1492 | # CONFIG_DEBUG_OBJECTS is not set | ||
1461 | # CONFIG_SLUB_DEBUG_ON is not set | 1493 | # CONFIG_SLUB_DEBUG_ON is not set |
1462 | # CONFIG_SLUB_STATS is not set | 1494 | # CONFIG_SLUB_STATS is not set |
1463 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1495 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1471,6 +1503,7 @@ CONFIG_SCHED_DEBUG=y | |||
1471 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1503 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1472 | CONFIG_DEBUG_INFO=y | 1504 | CONFIG_DEBUG_INFO=y |
1473 | # CONFIG_DEBUG_VM is not set | 1505 | # CONFIG_DEBUG_VM is not set |
1506 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1474 | # CONFIG_DEBUG_LIST is not set | 1507 | # CONFIG_DEBUG_LIST is not set |
1475 | # CONFIG_DEBUG_SG is not set | 1508 | # CONFIG_DEBUG_SG is not set |
1476 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1509 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1482,6 +1515,7 @@ CONFIG_DEBUG_INFO=y | |||
1482 | # CONFIG_DEBUG_STACK_USAGE is not set | 1515 | # CONFIG_DEBUG_STACK_USAGE is not set |
1483 | # CONFIG_DEBUG_PAGEALLOC is not set | 1516 | # CONFIG_DEBUG_PAGEALLOC is not set |
1484 | # CONFIG_DEBUGGER is not set | 1517 | # CONFIG_DEBUGGER is not set |
1518 | # CONFIG_IRQSTACKS is not set | ||
1485 | # CONFIG_BDI_SWITCH is not set | 1519 | # CONFIG_BDI_SWITCH is not set |
1486 | # CONFIG_PPC_EARLY_DEBUG is not set | 1520 | # CONFIG_PPC_EARLY_DEBUG is not set |
1487 | 1521 | ||
@@ -1492,52 +1526,82 @@ CONFIG_DEBUG_INFO=y | |||
1492 | # CONFIG_SECURITY is not set | 1526 | # CONFIG_SECURITY is not set |
1493 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1527 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1494 | CONFIG_CRYPTO=y | 1528 | CONFIG_CRYPTO=y |
1529 | |||
1530 | # | ||
1531 | # Crypto core or helper | ||
1532 | # | ||
1495 | CONFIG_CRYPTO_ALGAPI=y | 1533 | CONFIG_CRYPTO_ALGAPI=y |
1496 | CONFIG_CRYPTO_BLKCIPHER=y | 1534 | CONFIG_CRYPTO_BLKCIPHER=y |
1497 | # CONFIG_CRYPTO_SEQIV is not set | ||
1498 | CONFIG_CRYPTO_HASH=y | 1535 | CONFIG_CRYPTO_HASH=y |
1499 | CONFIG_CRYPTO_MANAGER=y | 1536 | CONFIG_CRYPTO_MANAGER=y |
1537 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1538 | # CONFIG_CRYPTO_NULL is not set | ||
1539 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1540 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1541 | # CONFIG_CRYPTO_TEST is not set | ||
1542 | |||
1543 | # | ||
1544 | # Authenticated Encryption with Associated Data | ||
1545 | # | ||
1546 | # CONFIG_CRYPTO_CCM is not set | ||
1547 | # CONFIG_CRYPTO_GCM is not set | ||
1548 | # CONFIG_CRYPTO_SEQIV is not set | ||
1549 | |||
1550 | # | ||
1551 | # Block modes | ||
1552 | # | ||
1553 | CONFIG_CRYPTO_CBC=y | ||
1554 | # CONFIG_CRYPTO_CTR is not set | ||
1555 | # CONFIG_CRYPTO_CTS is not set | ||
1556 | # CONFIG_CRYPTO_ECB is not set | ||
1557 | # CONFIG_CRYPTO_LRW is not set | ||
1558 | CONFIG_CRYPTO_PCBC=m | ||
1559 | # CONFIG_CRYPTO_XTS is not set | ||
1560 | |||
1561 | # | ||
1562 | # Hash modes | ||
1563 | # | ||
1500 | CONFIG_CRYPTO_HMAC=y | 1564 | CONFIG_CRYPTO_HMAC=y |
1501 | # CONFIG_CRYPTO_XCBC is not set | 1565 | # CONFIG_CRYPTO_XCBC is not set |
1502 | # CONFIG_CRYPTO_NULL is not set | 1566 | |
1567 | # | ||
1568 | # Digest | ||
1569 | # | ||
1570 | # CONFIG_CRYPTO_CRC32C is not set | ||
1503 | # CONFIG_CRYPTO_MD4 is not set | 1571 | # CONFIG_CRYPTO_MD4 is not set |
1504 | CONFIG_CRYPTO_MD5=y | 1572 | CONFIG_CRYPTO_MD5=y |
1573 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1505 | CONFIG_CRYPTO_SHA1=m | 1574 | CONFIG_CRYPTO_SHA1=m |
1506 | # CONFIG_CRYPTO_SHA256 is not set | 1575 | # CONFIG_CRYPTO_SHA256 is not set |
1507 | # CONFIG_CRYPTO_SHA512 is not set | 1576 | # CONFIG_CRYPTO_SHA512 is not set |
1508 | # CONFIG_CRYPTO_WP512 is not set | ||
1509 | # CONFIG_CRYPTO_TGR192 is not set | 1577 | # CONFIG_CRYPTO_TGR192 is not set |
1510 | # CONFIG_CRYPTO_GF128MUL is not set | 1578 | # CONFIG_CRYPTO_WP512 is not set |
1511 | # CONFIG_CRYPTO_ECB is not set | 1579 | |
1512 | CONFIG_CRYPTO_CBC=y | 1580 | # |
1513 | CONFIG_CRYPTO_PCBC=m | 1581 | # Ciphers |
1514 | # CONFIG_CRYPTO_LRW is not set | 1582 | # |
1515 | # CONFIG_CRYPTO_XTS is not set | ||
1516 | # CONFIG_CRYPTO_CTR is not set | ||
1517 | # CONFIG_CRYPTO_GCM is not set | ||
1518 | # CONFIG_CRYPTO_CCM is not set | ||
1519 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1520 | CONFIG_CRYPTO_DES=y | ||
1521 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1522 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1523 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1524 | # CONFIG_CRYPTO_SERPENT is not set | ||
1525 | # CONFIG_CRYPTO_AES is not set | 1583 | # CONFIG_CRYPTO_AES is not set |
1584 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1585 | # CONFIG_CRYPTO_ARC4 is not set | ||
1586 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1587 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1526 | # CONFIG_CRYPTO_CAST5 is not set | 1588 | # CONFIG_CRYPTO_CAST5 is not set |
1527 | # CONFIG_CRYPTO_CAST6 is not set | 1589 | # CONFIG_CRYPTO_CAST6 is not set |
1528 | # CONFIG_CRYPTO_TEA is not set | 1590 | CONFIG_CRYPTO_DES=y |
1529 | # CONFIG_CRYPTO_ARC4 is not set | 1591 | # CONFIG_CRYPTO_FCRYPT is not set |
1530 | # CONFIG_CRYPTO_KHAZAD is not set | 1592 | # CONFIG_CRYPTO_KHAZAD is not set |
1531 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1532 | # CONFIG_CRYPTO_SEED is not set | ||
1533 | # CONFIG_CRYPTO_SALSA20 is not set | 1593 | # CONFIG_CRYPTO_SALSA20 is not set |
1594 | # CONFIG_CRYPTO_SEED is not set | ||
1595 | # CONFIG_CRYPTO_SERPENT is not set | ||
1596 | # CONFIG_CRYPTO_TEA is not set | ||
1597 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1598 | |||
1599 | # | ||
1600 | # Compression | ||
1601 | # | ||
1534 | # CONFIG_CRYPTO_DEFLATE is not set | 1602 | # CONFIG_CRYPTO_DEFLATE is not set |
1535 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1536 | # CONFIG_CRYPTO_CRC32C is not set | ||
1537 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1538 | # CONFIG_CRYPTO_TEST is not set | ||
1539 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1540 | # CONFIG_CRYPTO_LZO is not set | 1603 | # CONFIG_CRYPTO_LZO is not set |
1541 | CONFIG_CRYPTO_HW=y | 1604 | CONFIG_CRYPTO_HW=y |
1542 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1605 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1543 | # CONFIG_PPC_CLOCK is not set | 1606 | # CONFIG_PPC_CLOCK is not set |
1607 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 2d831db9ae5b..46fffbcd3f99 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:35 2008 | 4 | # Mon Jun 9 08:52:16 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
31 | CONFIG_STACKTRACE_SUPPORT=y | ||
32 | CONFIG_LOCKDEP_SUPPORT=y | ||
31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
@@ -106,6 +108,7 @@ CONFIG_SLUB=y | |||
106 | CONFIG_HAVE_OPROFILE=y | 108 | CONFIG_HAVE_OPROFILE=y |
107 | CONFIG_HAVE_KPROBES=y | 109 | CONFIG_HAVE_KPROBES=y |
108 | CONFIG_HAVE_KRETPROBES=y | 110 | CONFIG_HAVE_KRETPROBES=y |
111 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
109 | CONFIG_PROC_PAGE_MONITOR=y | 112 | CONFIG_PROC_PAGE_MONITOR=y |
110 | CONFIG_SLABINFO=y | 113 | CONFIG_SLABINFO=y |
111 | CONFIG_RT_MUTEXES=y | 114 | CONFIG_RT_MUTEXES=y |
@@ -210,11 +213,13 @@ CONFIG_FLATMEM=y | |||
210 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
211 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
214 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
215 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
216 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
217 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
218 | # CONFIG_PROC_DEVICETREE is not set | 223 | # CONFIG_PROC_DEVICETREE is not set |
219 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
220 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
@@ -231,6 +236,7 @@ CONFIG_FSL_SOC=y | |||
231 | # CONFIG_PCI_SYSCALL is not set | 236 | # CONFIG_PCI_SYSCALL is not set |
232 | # CONFIG_PCI_QSPAN is not set | 237 | # CONFIG_PCI_QSPAN is not set |
233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 238 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
239 | # CONFIG_HAS_RAPIDIO is not set | ||
234 | 240 | ||
235 | # | 241 | # |
236 | # Advanced setup | 242 | # Advanced setup |
@@ -240,13 +246,13 @@ CONFIG_FSL_SOC=y | |||
240 | # | 246 | # |
241 | # Default settings for advanced configuration options are used | 247 | # Default settings for advanced configuration options are used |
242 | # | 248 | # |
243 | CONFIG_HIGHMEM_START=0xfe000000 | ||
244 | CONFIG_LOWMEM_SIZE=0x30000000 | 249 | CONFIG_LOWMEM_SIZE=0x30000000 |
250 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
245 | CONFIG_KERNEL_START=0xc0000000 | 251 | CONFIG_KERNEL_START=0xc0000000 |
252 | CONFIG_PHYSICAL_START=0x00000000 | ||
246 | CONFIG_TASK_SIZE=0x80000000 | 253 | CONFIG_TASK_SIZE=0x80000000 |
247 | CONFIG_CONSISTENT_START=0xfd000000 | 254 | CONFIG_CONSISTENT_START=0xfd000000 |
248 | CONFIG_CONSISTENT_SIZE=0x00200000 | 255 | CONFIG_CONSISTENT_SIZE=0x00200000 |
249 | CONFIG_BOOT_LOAD=0x00400000 | ||
250 | 256 | ||
251 | # | 257 | # |
252 | # Networking | 258 | # Networking |
@@ -294,8 +300,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 300 | CONFIG_DEFAULT_TCP_CONG="cubic" |
295 | # CONFIG_TCP_MD5SIG is not set | 301 | # CONFIG_TCP_MD5SIG is not set |
296 | # CONFIG_IPV6 is not set | 302 | # CONFIG_IPV6 is not set |
297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
298 | # CONFIG_INET6_TUNNEL is not set | ||
299 | # CONFIG_NETWORK_SECMARK is not set | 303 | # CONFIG_NETWORK_SECMARK is not set |
300 | # CONFIG_NETFILTER is not set | 304 | # CONFIG_NETFILTER is not set |
301 | # CONFIG_IP_DCCP is not set | 305 | # CONFIG_IP_DCCP is not set |
@@ -419,6 +423,7 @@ CONFIG_NETDEV_10000=y | |||
419 | # | 423 | # |
420 | # CONFIG_WLAN_PRE80211 is not set | 424 | # CONFIG_WLAN_PRE80211 is not set |
421 | # CONFIG_WLAN_80211 is not set | 425 | # CONFIG_WLAN_80211 is not set |
426 | # CONFIG_IWLWIFI_LEDS is not set | ||
422 | # CONFIG_WAN is not set | 427 | # CONFIG_WAN is not set |
423 | # CONFIG_PPP is not set | 428 | # CONFIG_PPP is not set |
424 | # CONFIG_SLIP is not set | 429 | # CONFIG_SLIP is not set |
@@ -485,6 +490,7 @@ CONFIG_SERIO_LIBPS2=y | |||
485 | # Character devices | 490 | # Character devices |
486 | # | 491 | # |
487 | # CONFIG_VT is not set | 492 | # CONFIG_VT is not set |
493 | CONFIG_DEVKMEM=y | ||
488 | # CONFIG_SERIAL_NONSTANDARD is not set | 494 | # CONFIG_SERIAL_NONSTANDARD is not set |
489 | 495 | ||
490 | # | 496 | # |
@@ -517,12 +523,7 @@ CONFIG_GEN_RTC=y | |||
517 | # CONFIG_RAW_DRIVER is not set | 523 | # CONFIG_RAW_DRIVER is not set |
518 | # CONFIG_TCG_TPM is not set | 524 | # CONFIG_TCG_TPM is not set |
519 | # CONFIG_I2C is not set | 525 | # CONFIG_I2C is not set |
520 | |||
521 | # | ||
522 | # SPI support | ||
523 | # | ||
524 | # CONFIG_SPI is not set | 526 | # CONFIG_SPI is not set |
525 | # CONFIG_SPI_MASTER is not set | ||
526 | # CONFIG_W1 is not set | 527 | # CONFIG_W1 is not set |
527 | # CONFIG_POWER_SUPPLY is not set | 528 | # CONFIG_POWER_SUPPLY is not set |
528 | CONFIG_HWMON=y | 529 | CONFIG_HWMON=y |
@@ -551,12 +552,22 @@ CONFIG_SSB_POSSIBLE=y | |||
551 | # Multifunction device drivers | 552 | # Multifunction device drivers |
552 | # | 553 | # |
553 | # CONFIG_MFD_SM501 is not set | 554 | # CONFIG_MFD_SM501 is not set |
555 | # CONFIG_HTC_PASIC3 is not set | ||
554 | 556 | ||
555 | # | 557 | # |
556 | # Multimedia devices | 558 | # Multimedia devices |
557 | # | 559 | # |
560 | |||
561 | # | ||
562 | # Multimedia core support | ||
563 | # | ||
558 | # CONFIG_VIDEO_DEV is not set | 564 | # CONFIG_VIDEO_DEV is not set |
559 | # CONFIG_DVB_CORE is not set | 565 | # CONFIG_DVB_CORE is not set |
566 | # CONFIG_VIDEO_MEDIA is not set | ||
567 | |||
568 | # | ||
569 | # Multimedia drivers | ||
570 | # | ||
560 | CONFIG_DAB=y | 571 | CONFIG_DAB=y |
561 | 572 | ||
562 | # | 573 | # |
@@ -584,6 +595,8 @@ CONFIG_USB_SUPPORT=y | |||
584 | # CONFIG_USB_ARCH_HAS_HCD is not set | 595 | # CONFIG_USB_ARCH_HAS_HCD is not set |
585 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 596 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
586 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 597 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
598 | # CONFIG_USB_OTG_WHITELIST is not set | ||
599 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
587 | 600 | ||
588 | # | 601 | # |
589 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 602 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -592,13 +605,10 @@ CONFIG_USB_SUPPORT=y | |||
592 | # CONFIG_MMC is not set | 605 | # CONFIG_MMC is not set |
593 | # CONFIG_MEMSTICK is not set | 606 | # CONFIG_MEMSTICK is not set |
594 | # CONFIG_NEW_LEDS is not set | 607 | # CONFIG_NEW_LEDS is not set |
608 | # CONFIG_ACCESSIBILITY is not set | ||
595 | # CONFIG_EDAC is not set | 609 | # CONFIG_EDAC is not set |
596 | # CONFIG_RTC_CLASS is not set | 610 | # CONFIG_RTC_CLASS is not set |
597 | # CONFIG_DMADEVICES is not set | 611 | # CONFIG_DMADEVICES is not set |
598 | |||
599 | # | ||
600 | # Userspace I/O | ||
601 | # | ||
602 | # CONFIG_UIO is not set | 612 | # CONFIG_UIO is not set |
603 | 613 | ||
604 | # | 614 | # |
@@ -620,7 +630,6 @@ CONFIG_FS_MBCACHE=y | |||
620 | # CONFIG_JFS_FS is not set | 630 | # CONFIG_JFS_FS is not set |
621 | # CONFIG_FS_POSIX_ACL is not set | 631 | # CONFIG_FS_POSIX_ACL is not set |
622 | # CONFIG_XFS_FS is not set | 632 | # CONFIG_XFS_FS is not set |
623 | # CONFIG_GFS2_FS is not set | ||
624 | # CONFIG_OCFS2_FS is not set | 633 | # CONFIG_OCFS2_FS is not set |
625 | CONFIG_DNOTIFY=y | 634 | CONFIG_DNOTIFY=y |
626 | CONFIG_INOTIFY=y | 635 | CONFIG_INOTIFY=y |
@@ -678,7 +687,6 @@ CONFIG_NFS_FS=y | |||
678 | CONFIG_NFS_V3=y | 687 | CONFIG_NFS_V3=y |
679 | # CONFIG_NFS_V3_ACL is not set | 688 | # CONFIG_NFS_V3_ACL is not set |
680 | # CONFIG_NFS_V4 is not set | 689 | # CONFIG_NFS_V4 is not set |
681 | # CONFIG_NFS_DIRECTIO is not set | ||
682 | # CONFIG_NFSD is not set | 690 | # CONFIG_NFSD is not set |
683 | CONFIG_ROOT_NFS=y | 691 | CONFIG_ROOT_NFS=y |
684 | CONFIG_LOCKD=y | 692 | CONFIG_LOCKD=y |
@@ -722,6 +730,7 @@ CONFIG_MSDOS_PARTITION=y | |||
722 | # Library routines | 730 | # Library routines |
723 | # | 731 | # |
724 | CONFIG_BITREVERSE=y | 732 | CONFIG_BITREVERSE=y |
733 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
725 | CONFIG_CRC_CCITT=y | 734 | CONFIG_CRC_CCITT=y |
726 | # CONFIG_CRC16 is not set | 735 | # CONFIG_CRC16 is not set |
727 | # CONFIG_CRC_ITU_T is not set | 736 | # CONFIG_CRC_ITU_T is not set |
@@ -733,6 +742,7 @@ CONFIG_PLIST=y | |||
733 | CONFIG_HAS_IOMEM=y | 742 | CONFIG_HAS_IOMEM=y |
734 | CONFIG_HAS_IOPORT=y | 743 | CONFIG_HAS_IOPORT=y |
735 | CONFIG_HAS_DMA=y | 744 | CONFIG_HAS_DMA=y |
745 | CONFIG_HAVE_LMB=y | ||
736 | 746 | ||
737 | # | 747 | # |
738 | # Kernel hacking | 748 | # Kernel hacking |
@@ -740,6 +750,7 @@ CONFIG_HAS_DMA=y | |||
740 | # CONFIG_PRINTK_TIME is not set | 750 | # CONFIG_PRINTK_TIME is not set |
741 | CONFIG_ENABLE_WARN_DEPRECATED=y | 751 | CONFIG_ENABLE_WARN_DEPRECATED=y |
742 | CONFIG_ENABLE_MUST_CHECK=y | 752 | CONFIG_ENABLE_MUST_CHECK=y |
753 | CONFIG_FRAME_WARN=1024 | ||
743 | # CONFIG_MAGIC_SYSRQ is not set | 754 | # CONFIG_MAGIC_SYSRQ is not set |
744 | # CONFIG_UNUSED_SYMBOLS is not set | 755 | # CONFIG_UNUSED_SYMBOLS is not set |
745 | # CONFIG_DEBUG_FS is not set | 756 | # CONFIG_DEBUG_FS is not set |
@@ -748,6 +759,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
748 | # CONFIG_SLUB_DEBUG_ON is not set | 759 | # CONFIG_SLUB_DEBUG_ON is not set |
749 | # CONFIG_SLUB_STATS is not set | 760 | # CONFIG_SLUB_STATS is not set |
750 | # CONFIG_SAMPLES is not set | 761 | # CONFIG_SAMPLES is not set |
762 | # CONFIG_IRQSTACKS is not set | ||
751 | # CONFIG_PPC_EARLY_DEBUG is not set | 763 | # CONFIG_PPC_EARLY_DEBUG is not set |
752 | 764 | ||
753 | # | 765 | # |
@@ -757,48 +769,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
757 | # CONFIG_SECURITY is not set | 769 | # CONFIG_SECURITY is not set |
758 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 770 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
759 | CONFIG_CRYPTO=y | 771 | CONFIG_CRYPTO=y |
760 | # CONFIG_CRYPTO_SEQIV is not set | 772 | |
773 | # | ||
774 | # Crypto core or helper | ||
775 | # | ||
761 | # CONFIG_CRYPTO_MANAGER is not set | 776 | # CONFIG_CRYPTO_MANAGER is not set |
777 | # CONFIG_CRYPTO_GF128MUL is not set | ||
778 | # CONFIG_CRYPTO_NULL is not set | ||
779 | # CONFIG_CRYPTO_CRYPTD is not set | ||
780 | # CONFIG_CRYPTO_AUTHENC is not set | ||
781 | |||
782 | # | ||
783 | # Authenticated Encryption with Associated Data | ||
784 | # | ||
785 | # CONFIG_CRYPTO_CCM is not set | ||
786 | # CONFIG_CRYPTO_GCM is not set | ||
787 | # CONFIG_CRYPTO_SEQIV is not set | ||
788 | |||
789 | # | ||
790 | # Block modes | ||
791 | # | ||
792 | # CONFIG_CRYPTO_CBC is not set | ||
793 | # CONFIG_CRYPTO_CTR is not set | ||
794 | # CONFIG_CRYPTO_CTS is not set | ||
795 | # CONFIG_CRYPTO_ECB is not set | ||
796 | # CONFIG_CRYPTO_LRW is not set | ||
797 | # CONFIG_CRYPTO_PCBC is not set | ||
798 | # CONFIG_CRYPTO_XTS is not set | ||
799 | |||
800 | # | ||
801 | # Hash modes | ||
802 | # | ||
762 | # CONFIG_CRYPTO_HMAC is not set | 803 | # CONFIG_CRYPTO_HMAC is not set |
763 | # CONFIG_CRYPTO_XCBC is not set | 804 | # CONFIG_CRYPTO_XCBC is not set |
764 | # CONFIG_CRYPTO_NULL is not set | 805 | |
806 | # | ||
807 | # Digest | ||
808 | # | ||
809 | # CONFIG_CRYPTO_CRC32C is not set | ||
765 | # CONFIG_CRYPTO_MD4 is not set | 810 | # CONFIG_CRYPTO_MD4 is not set |
766 | # CONFIG_CRYPTO_MD5 is not set | 811 | # CONFIG_CRYPTO_MD5 is not set |
812 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
767 | # CONFIG_CRYPTO_SHA1 is not set | 813 | # CONFIG_CRYPTO_SHA1 is not set |
768 | # CONFIG_CRYPTO_SHA256 is not set | 814 | # CONFIG_CRYPTO_SHA256 is not set |
769 | # CONFIG_CRYPTO_SHA512 is not set | 815 | # CONFIG_CRYPTO_SHA512 is not set |
770 | # CONFIG_CRYPTO_WP512 is not set | ||
771 | # CONFIG_CRYPTO_TGR192 is not set | 816 | # CONFIG_CRYPTO_TGR192 is not set |
772 | # CONFIG_CRYPTO_GF128MUL is not set | 817 | # CONFIG_CRYPTO_WP512 is not set |
773 | # CONFIG_CRYPTO_ECB is not set | 818 | |
774 | # CONFIG_CRYPTO_CBC is not set | 819 | # |
775 | # CONFIG_CRYPTO_PCBC is not set | 820 | # Ciphers |
776 | # CONFIG_CRYPTO_LRW is not set | 821 | # |
777 | # CONFIG_CRYPTO_XTS is not set | ||
778 | # CONFIG_CRYPTO_CTR is not set | ||
779 | # CONFIG_CRYPTO_GCM is not set | ||
780 | # CONFIG_CRYPTO_CCM is not set | ||
781 | # CONFIG_CRYPTO_CRYPTD is not set | ||
782 | # CONFIG_CRYPTO_DES is not set | ||
783 | # CONFIG_CRYPTO_FCRYPT is not set | ||
784 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
785 | # CONFIG_CRYPTO_TWOFISH is not set | ||
786 | # CONFIG_CRYPTO_SERPENT is not set | ||
787 | # CONFIG_CRYPTO_AES is not set | 822 | # CONFIG_CRYPTO_AES is not set |
823 | # CONFIG_CRYPTO_ANUBIS is not set | ||
824 | # CONFIG_CRYPTO_ARC4 is not set | ||
825 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
826 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
788 | # CONFIG_CRYPTO_CAST5 is not set | 827 | # CONFIG_CRYPTO_CAST5 is not set |
789 | # CONFIG_CRYPTO_CAST6 is not set | 828 | # CONFIG_CRYPTO_CAST6 is not set |
790 | # CONFIG_CRYPTO_TEA is not set | 829 | # CONFIG_CRYPTO_DES is not set |
791 | # CONFIG_CRYPTO_ARC4 is not set | 830 | # CONFIG_CRYPTO_FCRYPT is not set |
792 | # CONFIG_CRYPTO_KHAZAD is not set | 831 | # CONFIG_CRYPTO_KHAZAD is not set |
793 | # CONFIG_CRYPTO_ANUBIS is not set | ||
794 | # CONFIG_CRYPTO_SEED is not set | ||
795 | # CONFIG_CRYPTO_SALSA20 is not set | 832 | # CONFIG_CRYPTO_SALSA20 is not set |
833 | # CONFIG_CRYPTO_SEED is not set | ||
834 | # CONFIG_CRYPTO_SERPENT is not set | ||
835 | # CONFIG_CRYPTO_TEA is not set | ||
836 | # CONFIG_CRYPTO_TWOFISH is not set | ||
837 | |||
838 | # | ||
839 | # Compression | ||
840 | # | ||
796 | # CONFIG_CRYPTO_DEFLATE is not set | 841 | # CONFIG_CRYPTO_DEFLATE is not set |
797 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
798 | # CONFIG_CRYPTO_CRC32C is not set | ||
799 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
800 | # CONFIG_CRYPTO_AUTHENC is not set | ||
801 | # CONFIG_CRYPTO_LZO is not set | 842 | # CONFIG_CRYPTO_LZO is not set |
802 | CONFIG_CRYPTO_HW=y | 843 | CONFIG_CRYPTO_HW=y |
803 | # CONFIG_PPC_CLOCK is not set | 844 | # CONFIG_PPC_CLOCK is not set |
804 | CONFIG_PPC_LIB_RHEAP=y | 845 | CONFIG_PPC_LIB_RHEAP=y |
846 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 82151b9bba26..9df78973005e 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:35 2008 | 4 | # Mon Jun 9 08:52:17 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
31 | CONFIG_STACKTRACE_SUPPORT=y | ||
32 | CONFIG_LOCKDEP_SUPPORT=y | ||
31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
@@ -108,6 +110,7 @@ CONFIG_SLUB=y | |||
108 | CONFIG_HAVE_OPROFILE=y | 110 | CONFIG_HAVE_OPROFILE=y |
109 | CONFIG_HAVE_KPROBES=y | 111 | CONFIG_HAVE_KPROBES=y |
110 | CONFIG_HAVE_KRETPROBES=y | 112 | CONFIG_HAVE_KRETPROBES=y |
113 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
111 | CONFIG_PROC_PAGE_MONITOR=y | 114 | CONFIG_PROC_PAGE_MONITOR=y |
112 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
113 | # CONFIG_TINY_SHMEM is not set | 116 | # CONFIG_TINY_SHMEM is not set |
@@ -219,11 +222,13 @@ CONFIG_FLATMEM=y | |||
219 | CONFIG_FLAT_NODE_MEM_MAP=y | 222 | CONFIG_FLAT_NODE_MEM_MAP=y |
220 | # CONFIG_SPARSEMEM_STATIC is not set | 223 | # CONFIG_SPARSEMEM_STATIC is not set |
221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
225 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
223 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
224 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
225 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
226 | CONFIG_VIRT_TO_BUS=y | 230 | CONFIG_VIRT_TO_BUS=y |
231 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
227 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
228 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
229 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
@@ -241,6 +246,7 @@ CONFIG_FSL_SOC=y | |||
241 | # CONFIG_PCI_QSPAN is not set | 246 | # CONFIG_PCI_QSPAN is not set |
242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
243 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
249 | # CONFIG_HAS_RAPIDIO is not set | ||
244 | 250 | ||
245 | # | 251 | # |
246 | # Advanced setup | 252 | # Advanced setup |
@@ -250,13 +256,13 @@ CONFIG_FSL_SOC=y | |||
250 | # | 256 | # |
251 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
252 | # | 258 | # |
253 | CONFIG_HIGHMEM_START=0xfe000000 | ||
254 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
255 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
262 | CONFIG_PHYSICAL_START=0x00000000 | ||
256 | CONFIG_TASK_SIZE=0x80000000 | 263 | CONFIG_TASK_SIZE=0x80000000 |
257 | CONFIG_CONSISTENT_START=0xfd000000 | 264 | CONFIG_CONSISTENT_START=0xfd000000 |
258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 265 | CONFIG_CONSISTENT_SIZE=0x00200000 |
259 | CONFIG_BOOT_LOAD=0x00400000 | ||
260 | 266 | ||
261 | # | 267 | # |
262 | # Networking | 268 | # Networking |
@@ -299,8 +305,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 305 | CONFIG_DEFAULT_TCP_CONG="cubic" |
300 | # CONFIG_TCP_MD5SIG is not set | 306 | # CONFIG_TCP_MD5SIG is not set |
301 | # CONFIG_IPV6 is not set | 307 | # CONFIG_IPV6 is not set |
302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
303 | # CONFIG_INET6_TUNNEL is not set | ||
304 | # CONFIG_NETWORK_SECMARK is not set | 308 | # CONFIG_NETWORK_SECMARK is not set |
305 | # CONFIG_NETFILTER is not set | 309 | # CONFIG_NETFILTER is not set |
306 | # CONFIG_IP_DCCP is not set | 310 | # CONFIG_IP_DCCP is not set |
@@ -492,6 +496,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
492 | # | 496 | # |
493 | # CONFIG_WLAN_PRE80211 is not set | 497 | # CONFIG_WLAN_PRE80211 is not set |
494 | # CONFIG_WLAN_80211 is not set | 498 | # CONFIG_WLAN_80211 is not set |
499 | # CONFIG_IWLWIFI_LEDS is not set | ||
495 | # CONFIG_WAN is not set | 500 | # CONFIG_WAN is not set |
496 | # CONFIG_PPP is not set | 501 | # CONFIG_PPP is not set |
497 | # CONFIG_SLIP is not set | 502 | # CONFIG_SLIP is not set |
@@ -516,6 +521,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
516 | # Character devices | 521 | # Character devices |
517 | # | 522 | # |
518 | # CONFIG_VT is not set | 523 | # CONFIG_VT is not set |
524 | CONFIG_DEVKMEM=y | ||
519 | # CONFIG_SERIAL_NONSTANDARD is not set | 525 | # CONFIG_SERIAL_NONSTANDARD is not set |
520 | 526 | ||
521 | # | 527 | # |
@@ -548,12 +554,7 @@ CONFIG_GEN_RTC=y | |||
548 | # CONFIG_RAW_DRIVER is not set | 554 | # CONFIG_RAW_DRIVER is not set |
549 | # CONFIG_TCG_TPM is not set | 555 | # CONFIG_TCG_TPM is not set |
550 | # CONFIG_I2C is not set | 556 | # CONFIG_I2C is not set |
551 | |||
552 | # | ||
553 | # SPI support | ||
554 | # | ||
555 | # CONFIG_SPI is not set | 557 | # CONFIG_SPI is not set |
556 | # CONFIG_SPI_MASTER is not set | ||
557 | # CONFIG_W1 is not set | 558 | # CONFIG_W1 is not set |
558 | # CONFIG_POWER_SUPPLY is not set | 559 | # CONFIG_POWER_SUPPLY is not set |
559 | # CONFIG_HWMON is not set | 560 | # CONFIG_HWMON is not set |
@@ -570,12 +571,22 @@ CONFIG_SSB_POSSIBLE=y | |||
570 | # Multifunction device drivers | 571 | # Multifunction device drivers |
571 | # | 572 | # |
572 | # CONFIG_MFD_SM501 is not set | 573 | # CONFIG_MFD_SM501 is not set |
574 | # CONFIG_HTC_PASIC3 is not set | ||
573 | 575 | ||
574 | # | 576 | # |
575 | # Multimedia devices | 577 | # Multimedia devices |
576 | # | 578 | # |
579 | |||
580 | # | ||
581 | # Multimedia core support | ||
582 | # | ||
577 | # CONFIG_VIDEO_DEV is not set | 583 | # CONFIG_VIDEO_DEV is not set |
578 | # CONFIG_DVB_CORE is not set | 584 | # CONFIG_DVB_CORE is not set |
585 | # CONFIG_VIDEO_MEDIA is not set | ||
586 | |||
587 | # | ||
588 | # Multimedia drivers | ||
589 | # | ||
579 | CONFIG_DAB=y | 590 | CONFIG_DAB=y |
580 | 591 | ||
581 | # | 592 | # |
@@ -599,13 +610,10 @@ CONFIG_DAB=y | |||
599 | # CONFIG_MMC is not set | 610 | # CONFIG_MMC is not set |
600 | # CONFIG_MEMSTICK is not set | 611 | # CONFIG_MEMSTICK is not set |
601 | # CONFIG_NEW_LEDS is not set | 612 | # CONFIG_NEW_LEDS is not set |
613 | # CONFIG_ACCESSIBILITY is not set | ||
602 | # CONFIG_EDAC is not set | 614 | # CONFIG_EDAC is not set |
603 | # CONFIG_RTC_CLASS is not set | 615 | # CONFIG_RTC_CLASS is not set |
604 | # CONFIG_DMADEVICES is not set | 616 | # CONFIG_DMADEVICES is not set |
605 | |||
606 | # | ||
607 | # Userspace I/O | ||
608 | # | ||
609 | # CONFIG_UIO is not set | 617 | # CONFIG_UIO is not set |
610 | 618 | ||
611 | # | 619 | # |
@@ -618,7 +626,6 @@ CONFIG_DAB=y | |||
618 | # CONFIG_JFS_FS is not set | 626 | # CONFIG_JFS_FS is not set |
619 | # CONFIG_FS_POSIX_ACL is not set | 627 | # CONFIG_FS_POSIX_ACL is not set |
620 | # CONFIG_XFS_FS is not set | 628 | # CONFIG_XFS_FS is not set |
621 | # CONFIG_GFS2_FS is not set | ||
622 | # CONFIG_OCFS2_FS is not set | 629 | # CONFIG_OCFS2_FS is not set |
623 | # CONFIG_DNOTIFY is not set | 630 | # CONFIG_DNOTIFY is not set |
624 | # CONFIG_INOTIFY is not set | 631 | # CONFIG_INOTIFY is not set |
@@ -676,7 +683,6 @@ CONFIG_NFS_FS=y | |||
676 | CONFIG_NFS_V3=y | 683 | CONFIG_NFS_V3=y |
677 | # CONFIG_NFS_V3_ACL is not set | 684 | # CONFIG_NFS_V3_ACL is not set |
678 | # CONFIG_NFS_V4 is not set | 685 | # CONFIG_NFS_V4 is not set |
679 | # CONFIG_NFS_DIRECTIO is not set | ||
680 | # CONFIG_NFSD is not set | 686 | # CONFIG_NFSD is not set |
681 | CONFIG_ROOT_NFS=y | 687 | CONFIG_ROOT_NFS=y |
682 | CONFIG_LOCKD=y | 688 | CONFIG_LOCKD=y |
@@ -719,6 +725,7 @@ CONFIG_MSDOS_PARTITION=y | |||
719 | # | 725 | # |
720 | # Library routines | 726 | # Library routines |
721 | # | 727 | # |
728 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
722 | # CONFIG_CRC_CCITT is not set | 729 | # CONFIG_CRC_CCITT is not set |
723 | # CONFIG_CRC16 is not set | 730 | # CONFIG_CRC16 is not set |
724 | # CONFIG_CRC_ITU_T is not set | 731 | # CONFIG_CRC_ITU_T is not set |
@@ -729,6 +736,7 @@ CONFIG_ZLIB_INFLATE=y | |||
729 | CONFIG_HAS_IOMEM=y | 736 | CONFIG_HAS_IOMEM=y |
730 | CONFIG_HAS_IOPORT=y | 737 | CONFIG_HAS_IOPORT=y |
731 | CONFIG_HAS_DMA=y | 738 | CONFIG_HAS_DMA=y |
739 | CONFIG_HAVE_LMB=y | ||
732 | 740 | ||
733 | # | 741 | # |
734 | # Kernel hacking | 742 | # Kernel hacking |
@@ -736,6 +744,7 @@ CONFIG_HAS_DMA=y | |||
736 | # CONFIG_PRINTK_TIME is not set | 744 | # CONFIG_PRINTK_TIME is not set |
737 | CONFIG_ENABLE_WARN_DEPRECATED=y | 745 | CONFIG_ENABLE_WARN_DEPRECATED=y |
738 | CONFIG_ENABLE_MUST_CHECK=y | 746 | CONFIG_ENABLE_MUST_CHECK=y |
747 | CONFIG_FRAME_WARN=1024 | ||
739 | CONFIG_MAGIC_SYSRQ=y | 748 | CONFIG_MAGIC_SYSRQ=y |
740 | # CONFIG_UNUSED_SYMBOLS is not set | 749 | # CONFIG_UNUSED_SYMBOLS is not set |
741 | # CONFIG_DEBUG_FS is not set | 750 | # CONFIG_DEBUG_FS is not set |
@@ -746,6 +755,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
746 | CONFIG_SCHED_DEBUG=y | 755 | CONFIG_SCHED_DEBUG=y |
747 | # CONFIG_SCHEDSTATS is not set | 756 | # CONFIG_SCHEDSTATS is not set |
748 | # CONFIG_TIMER_STATS is not set | 757 | # CONFIG_TIMER_STATS is not set |
758 | # CONFIG_DEBUG_OBJECTS is not set | ||
749 | # CONFIG_SLUB_DEBUG_ON is not set | 759 | # CONFIG_SLUB_DEBUG_ON is not set |
750 | # CONFIG_SLUB_STATS is not set | 760 | # CONFIG_SLUB_STATS is not set |
751 | # CONFIG_DEBUG_SPINLOCK is not set | 761 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -756,6 +766,7 @@ CONFIG_SCHED_DEBUG=y | |||
756 | CONFIG_DEBUG_BUGVERBOSE=y | 766 | CONFIG_DEBUG_BUGVERBOSE=y |
757 | CONFIG_DEBUG_INFO=y | 767 | CONFIG_DEBUG_INFO=y |
758 | # CONFIG_DEBUG_VM is not set | 768 | # CONFIG_DEBUG_VM is not set |
769 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
759 | # CONFIG_DEBUG_LIST is not set | 770 | # CONFIG_DEBUG_LIST is not set |
760 | # CONFIG_DEBUG_SG is not set | 771 | # CONFIG_DEBUG_SG is not set |
761 | # CONFIG_BOOT_PRINTK_DELAY is not set | 772 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -766,6 +777,7 @@ CONFIG_DEBUG_INFO=y | |||
766 | # CONFIG_DEBUG_STACK_USAGE is not set | 777 | # CONFIG_DEBUG_STACK_USAGE is not set |
767 | # CONFIG_DEBUG_PAGEALLOC is not set | 778 | # CONFIG_DEBUG_PAGEALLOC is not set |
768 | # CONFIG_DEBUGGER is not set | 779 | # CONFIG_DEBUGGER is not set |
780 | # CONFIG_IRQSTACKS is not set | ||
769 | # CONFIG_BDI_SWITCH is not set | 781 | # CONFIG_BDI_SWITCH is not set |
770 | # CONFIG_PPC_EARLY_DEBUG is not set | 782 | # CONFIG_PPC_EARLY_DEBUG is not set |
771 | 783 | ||
@@ -778,3 +790,4 @@ CONFIG_DEBUG_INFO=y | |||
778 | # CONFIG_CRYPTO is not set | 790 | # CONFIG_CRYPTO is not set |
779 | # CONFIG_PPC_CLOCK is not set | 791 | # CONFIG_PPC_CLOCK is not set |
780 | CONFIG_PPC_LIB_RHEAP=y | 792 | CONFIG_PPC_LIB_RHEAP=y |
793 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 09f306248f2e..199e5f59d7a6 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_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-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Tue Mar 25 10:25:48 2008 | 4 | # Tue May 27 16:08:06 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -29,6 +29,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
31 | CONFIG_IRQ_PER_CPU=y | 31 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | ||
33 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | ||
32 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
33 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
34 | CONFIG_ARCH_HAS_ILOG2_U64=y | 37 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -87,6 +90,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
87 | CONFIG_SYSCTL=y | 90 | CONFIG_SYSCTL=y |
88 | # CONFIG_EMBEDDED is not set | 91 | # CONFIG_EMBEDDED is not set |
89 | CONFIG_SYSCTL_SYSCALL=y | 92 | CONFIG_SYSCTL_SYSCALL=y |
93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
90 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
91 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -115,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
115 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
116 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
117 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
119 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
122 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
123 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
124 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
@@ -167,11 +173,11 @@ CONFIG_PPC_PASEMI=y | |||
167 | CONFIG_PPC_PASEMI_IOMMU=y | 173 | CONFIG_PPC_PASEMI_IOMMU=y |
168 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set | 174 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set |
169 | CONFIG_PPC_PASEMI_MDIO=y | 175 | CONFIG_PPC_PASEMI_MDIO=y |
170 | # CONFIG_PPC_CELLEB is not set | ||
171 | # CONFIG_PPC_PS3 is not set | 176 | # CONFIG_PPC_PS3 is not set |
172 | # CONFIG_PPC_CELL is not set | 177 | # CONFIG_PPC_CELL is not set |
173 | # CONFIG_PPC_CELL_NATIVE is not set | 178 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 179 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
180 | # CONFIG_PPC_CELLEB is not set | ||
175 | # CONFIG_PQ2ADS is not set | 181 | # CONFIG_PQ2ADS is not set |
176 | CONFIG_PPC_NATIVE=y | 182 | CONFIG_PPC_NATIVE=y |
177 | # CONFIG_IPIC is not set | 183 | # CONFIG_IPIC is not set |
@@ -192,6 +198,7 @@ CONFIG_CPU_FREQ_DEBUG=y | |||
192 | CONFIG_CPU_FREQ_STAT=y | 198 | CONFIG_CPU_FREQ_STAT=y |
193 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 199 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
194 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 200 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
201 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 202 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
196 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 203 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
197 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 204 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
@@ -226,7 +233,6 @@ CONFIG_PREEMPT_NONE=y | |||
226 | CONFIG_BINFMT_ELF=y | 233 | CONFIG_BINFMT_ELF=y |
227 | CONFIG_COMPAT_BINFMT_ELF=y | 234 | CONFIG_COMPAT_BINFMT_ELF=y |
228 | # CONFIG_BINFMT_MISC is not set | 235 | # CONFIG_BINFMT_MISC is not set |
229 | CONFIG_FORCE_MAX_ZONEORDER=9 | ||
230 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 236 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
231 | CONFIG_IOMMU_VMERGE=y | 237 | CONFIG_IOMMU_VMERGE=y |
232 | CONFIG_IOMMU_HELPER=y | 238 | CONFIG_IOMMU_HELPER=y |
@@ -249,12 +255,14 @@ CONFIG_FLATMEM=y | |||
249 | CONFIG_FLAT_NODE_MEM_MAP=y | 255 | CONFIG_FLAT_NODE_MEM_MAP=y |
250 | # CONFIG_SPARSEMEM_STATIC is not set | 256 | # CONFIG_SPARSEMEM_STATIC is not set |
251 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 257 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
258 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
252 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 259 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
253 | CONFIG_RESOURCES_64BIT=y | 260 | CONFIG_RESOURCES_64BIT=y |
254 | CONFIG_ZONE_DMA_FLAG=1 | 261 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_BOUNCE=y | 262 | CONFIG_BOUNCE=y |
256 | CONFIG_PPC_HAS_HASH_64K=y | 263 | CONFIG_PPC_HAS_HASH_64K=y |
257 | CONFIG_PPC_64K_PAGES=y | 264 | CONFIG_PPC_64K_PAGES=y |
265 | CONFIG_FORCE_MAX_ZONEORDER=9 | ||
258 | # CONFIG_PPC_SUBPAGE_PROT is not set | 266 | # CONFIG_PPC_SUBPAGE_PROT is not set |
259 | # CONFIG_SCHED_SMT is not set | 267 | # CONFIG_SCHED_SMT is not set |
260 | CONFIG_PROC_DEVICETREE=y | 268 | CONFIG_PROC_DEVICETREE=y |
@@ -290,9 +298,12 @@ CONFIG_CARDBUS=y | |||
290 | # CONFIG_YENTA is not set | 298 | # CONFIG_YENTA is not set |
291 | # CONFIG_PD6729 is not set | 299 | # CONFIG_PD6729 is not set |
292 | # CONFIG_I82092 is not set | 300 | # CONFIG_I82092 is not set |
293 | # CONFIG_ELECTRA_CF is not set | 301 | CONFIG_ELECTRA_CF=y |
294 | # CONFIG_HOTPLUG_PCI is not set | 302 | # CONFIG_HOTPLUG_PCI is not set |
303 | # CONFIG_HAS_RAPIDIO is not set | ||
304 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
295 | CONFIG_KERNEL_START=0xc000000000000000 | 305 | CONFIG_KERNEL_START=0xc000000000000000 |
306 | CONFIG_PHYSICAL_START=0x00000000 | ||
296 | 307 | ||
297 | # | 308 | # |
298 | # Networking | 309 | # Networking |
@@ -341,8 +352,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
341 | CONFIG_DEFAULT_TCP_CONG="cubic" | 352 | CONFIG_DEFAULT_TCP_CONG="cubic" |
342 | # CONFIG_TCP_MD5SIG is not set | 353 | # CONFIG_TCP_MD5SIG is not set |
343 | # CONFIG_IPV6 is not set | 354 | # CONFIG_IPV6 is not set |
344 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
345 | # CONFIG_INET6_TUNNEL is not set | ||
346 | # CONFIG_NETWORK_SECMARK is not set | 355 | # CONFIG_NETWORK_SECMARK is not set |
347 | # CONFIG_NETFILTER is not set | 356 | # CONFIG_NETFILTER is not set |
348 | # CONFIG_IP_DCCP is not set | 357 | # CONFIG_IP_DCCP is not set |
@@ -473,6 +482,7 @@ CONFIG_MTD_NAND_PASEMI=y | |||
473 | # | 482 | # |
474 | # CONFIG_MTD_UBI is not set | 483 | # CONFIG_MTD_UBI is not set |
475 | CONFIG_OF_DEVICE=y | 484 | CONFIG_OF_DEVICE=y |
485 | CONFIG_OF_I2C=y | ||
476 | # CONFIG_PARPORT is not set | 486 | # CONFIG_PARPORT is not set |
477 | CONFIG_BLK_DEV=y | 487 | CONFIG_BLK_DEV=y |
478 | # CONFIG_BLK_DEV_FD is not set | 488 | # CONFIG_BLK_DEV_FD is not set |
@@ -520,7 +530,6 @@ CONFIG_IDE_PROC_FS=y | |||
520 | # | 530 | # |
521 | # IDE chipset support/bugfixes | 531 | # IDE chipset support/bugfixes |
522 | # | 532 | # |
523 | # CONFIG_IDE_GENERIC is not set | ||
524 | # CONFIG_BLK_DEV_PLATFORM is not set | 533 | # CONFIG_BLK_DEV_PLATFORM is not set |
525 | 534 | ||
526 | # | 535 | # |
@@ -554,7 +563,7 @@ CONFIG_IDE_PROC_FS=y | |||
554 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 563 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
555 | # CONFIG_BLK_DEV_TC86C001 is not set | 564 | # CONFIG_BLK_DEV_TC86C001 is not set |
556 | # CONFIG_BLK_DEV_IDEDMA is not set | 565 | # CONFIG_BLK_DEV_IDEDMA is not set |
557 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 566 | # CONFIG_BLK_DEV_HD_ONLY is not set |
558 | # CONFIG_BLK_DEV_HD is not set | 567 | # CONFIG_BLK_DEV_HD is not set |
559 | 568 | ||
560 | # | 569 | # |
@@ -632,7 +641,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
632 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 641 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
633 | CONFIG_ATA=y | 642 | CONFIG_ATA=y |
634 | # CONFIG_ATA_NONSTANDARD is not set | 643 | # CONFIG_ATA_NONSTANDARD is not set |
644 | CONFIG_SATA_PMP=y | ||
635 | # CONFIG_SATA_AHCI is not set | 645 | # CONFIG_SATA_AHCI is not set |
646 | CONFIG_SATA_SIL24=y | ||
647 | CONFIG_ATA_SFF=y | ||
636 | # CONFIG_SATA_SVW is not set | 648 | # CONFIG_SATA_SVW is not set |
637 | # CONFIG_ATA_PIIX is not set | 649 | # CONFIG_ATA_PIIX is not set |
638 | CONFIG_SATA_MV=y | 650 | CONFIG_SATA_MV=y |
@@ -642,7 +654,6 @@ CONFIG_SATA_MV=y | |||
642 | # CONFIG_SATA_PROMISE is not set | 654 | # CONFIG_SATA_PROMISE is not set |
643 | # CONFIG_SATA_SX4 is not set | 655 | # CONFIG_SATA_SX4 is not set |
644 | # CONFIG_SATA_SIL is not set | 656 | # CONFIG_SATA_SIL is not set |
645 | CONFIG_SATA_SIL24=y | ||
646 | # CONFIG_SATA_SIS is not set | 657 | # CONFIG_SATA_SIS is not set |
647 | # CONFIG_SATA_ULI is not set | 658 | # CONFIG_SATA_ULI is not set |
648 | # CONFIG_SATA_VIA is not set | 659 | # CONFIG_SATA_VIA is not set |
@@ -689,6 +700,7 @@ CONFIG_PATA_PCMCIA=y | |||
689 | # CONFIG_PATA_WINBOND is not set | 700 | # CONFIG_PATA_WINBOND is not set |
690 | CONFIG_PATA_PLATFORM=y | 701 | CONFIG_PATA_PLATFORM=y |
691 | CONFIG_PATA_OF_PLATFORM=y | 702 | CONFIG_PATA_OF_PLATFORM=y |
703 | # CONFIG_PATA_SCH is not set | ||
692 | CONFIG_MD=y | 704 | CONFIG_MD=y |
693 | CONFIG_BLK_DEV_MD=y | 705 | CONFIG_BLK_DEV_MD=y |
694 | CONFIG_MD_LINEAR=y | 706 | CONFIG_MD_LINEAR=y |
@@ -791,7 +803,6 @@ CONFIG_E1000_NAPI=y | |||
791 | # CONFIG_SIS190 is not set | 803 | # CONFIG_SIS190 is not set |
792 | # CONFIG_SKGE is not set | 804 | # CONFIG_SKGE is not set |
793 | # CONFIG_SKY2 is not set | 805 | # CONFIG_SKY2 is not set |
794 | # CONFIG_SK98LIN is not set | ||
795 | # CONFIG_VIA_VELOCITY is not set | 806 | # CONFIG_VIA_VELOCITY is not set |
796 | CONFIG_TIGON3=y | 807 | CONFIG_TIGON3=y |
797 | # CONFIG_BNX2 is not set | 808 | # CONFIG_BNX2 is not set |
@@ -810,6 +821,7 @@ CONFIG_PASEMI_MAC=y | |||
810 | # CONFIG_MLX4_CORE is not set | 821 | # CONFIG_MLX4_CORE is not set |
811 | # CONFIG_TEHUTI is not set | 822 | # CONFIG_TEHUTI is not set |
812 | # CONFIG_BNX2X is not set | 823 | # CONFIG_BNX2X is not set |
824 | # CONFIG_SFC is not set | ||
813 | # CONFIG_TR is not set | 825 | # CONFIG_TR is not set |
814 | 826 | ||
815 | # | 827 | # |
@@ -817,6 +829,7 @@ CONFIG_PASEMI_MAC=y | |||
817 | # | 829 | # |
818 | # CONFIG_WLAN_PRE80211 is not set | 830 | # CONFIG_WLAN_PRE80211 is not set |
819 | # CONFIG_WLAN_80211 is not set | 831 | # CONFIG_WLAN_80211 is not set |
832 | # CONFIG_IWLWIFI_LEDS is not set | ||
820 | 833 | ||
821 | # | 834 | # |
822 | # USB Network Adapters | 835 | # USB Network Adapters |
@@ -890,6 +903,7 @@ CONFIG_VT=y | |||
890 | CONFIG_VT_CONSOLE=y | 903 | CONFIG_VT_CONSOLE=y |
891 | CONFIG_HW_CONSOLE=y | 904 | CONFIG_HW_CONSOLE=y |
892 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 905 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
906 | CONFIG_DEVKMEM=y | ||
893 | # CONFIG_SERIAL_NONSTANDARD is not set | 907 | # CONFIG_SERIAL_NONSTANDARD is not set |
894 | # CONFIG_NOZOMI is not set | 908 | # CONFIG_NOZOMI is not set |
895 | 909 | ||
@@ -917,7 +931,6 @@ CONFIG_LEGACY_PTY_COUNT=4 | |||
917 | # CONFIG_IPMI_HANDLER is not set | 931 | # CONFIG_IPMI_HANDLER is not set |
918 | CONFIG_HW_RANDOM=y | 932 | CONFIG_HW_RANDOM=y |
919 | CONFIG_HW_RANDOM_PASEMI=y | 933 | CONFIG_HW_RANDOM_PASEMI=y |
920 | # CONFIG_GEN_RTC is not set | ||
921 | # CONFIG_R3964 is not set | 934 | # CONFIG_R3964 is not set |
922 | # CONFIG_APPLICOM is not set | 935 | # CONFIG_APPLICOM is not set |
923 | 936 | ||
@@ -936,13 +949,7 @@ CONFIG_DEVPORT=y | |||
936 | CONFIG_I2C=y | 949 | CONFIG_I2C=y |
937 | CONFIG_I2C_BOARDINFO=y | 950 | CONFIG_I2C_BOARDINFO=y |
938 | CONFIG_I2C_CHARDEV=y | 951 | CONFIG_I2C_CHARDEV=y |
939 | |||
940 | # | ||
941 | # I2C Algorithms | ||
942 | # | ||
943 | CONFIG_I2C_ALGOBIT=y | 952 | CONFIG_I2C_ALGOBIT=y |
944 | CONFIG_I2C_ALGOPCF=y | ||
945 | CONFIG_I2C_ALGOPCA=y | ||
946 | 953 | ||
947 | # | 954 | # |
948 | # I2C Hardware Bus support | 955 | # I2C Hardware Bus support |
@@ -971,6 +978,7 @@ CONFIG_I2C_PASEMI=y | |||
971 | # CONFIG_I2C_VIA is not set | 978 | # CONFIG_I2C_VIA is not set |
972 | # CONFIG_I2C_VIAPRO is not set | 979 | # CONFIG_I2C_VIAPRO is not set |
973 | # CONFIG_I2C_VOODOO3 is not set | 980 | # CONFIG_I2C_VOODOO3 is not set |
981 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
974 | 982 | ||
975 | # | 983 | # |
976 | # Miscellaneous I2C Chip support | 984 | # Miscellaneous I2C Chip support |
@@ -980,19 +988,13 @@ CONFIG_SENSORS_EEPROM=y | |||
980 | # CONFIG_SENSORS_PCF8574 is not set | 988 | # CONFIG_SENSORS_PCF8574 is not set |
981 | # CONFIG_PCF8575 is not set | 989 | # CONFIG_PCF8575 is not set |
982 | # CONFIG_SENSORS_PCF8591 is not set | 990 | # CONFIG_SENSORS_PCF8591 is not set |
983 | # CONFIG_TPS65010 is not set | ||
984 | # CONFIG_SENSORS_MAX6875 is not set | 991 | # CONFIG_SENSORS_MAX6875 is not set |
985 | # CONFIG_SENSORS_TSL2550 is not set | 992 | # CONFIG_SENSORS_TSL2550 is not set |
986 | # CONFIG_I2C_DEBUG_CORE is not set | 993 | # CONFIG_I2C_DEBUG_CORE is not set |
987 | # CONFIG_I2C_DEBUG_ALGO is not set | 994 | # CONFIG_I2C_DEBUG_ALGO is not set |
988 | # CONFIG_I2C_DEBUG_BUS is not set | 995 | # CONFIG_I2C_DEBUG_BUS is not set |
989 | # CONFIG_I2C_DEBUG_CHIP is not set | 996 | # CONFIG_I2C_DEBUG_CHIP is not set |
990 | |||
991 | # | ||
992 | # SPI support | ||
993 | # | ||
994 | # CONFIG_SPI is not set | 997 | # CONFIG_SPI is not set |
995 | # CONFIG_SPI_MASTER is not set | ||
996 | # CONFIG_W1 is not set | 998 | # CONFIG_W1 is not set |
997 | # CONFIG_POWER_SUPPLY is not set | 999 | # CONFIG_POWER_SUPPLY is not set |
998 | CONFIG_HWMON=y | 1000 | CONFIG_HWMON=y |
@@ -1062,12 +1064,22 @@ CONFIG_SSB_POSSIBLE=y | |||
1062 | # Multifunction device drivers | 1064 | # Multifunction device drivers |
1063 | # | 1065 | # |
1064 | # CONFIG_MFD_SM501 is not set | 1066 | # CONFIG_MFD_SM501 is not set |
1067 | # CONFIG_HTC_PASIC3 is not set | ||
1065 | 1068 | ||
1066 | # | 1069 | # |
1067 | # Multimedia devices | 1070 | # Multimedia devices |
1068 | # | 1071 | # |
1072 | |||
1073 | # | ||
1074 | # Multimedia core support | ||
1075 | # | ||
1069 | # CONFIG_VIDEO_DEV is not set | 1076 | # CONFIG_VIDEO_DEV is not set |
1070 | # CONFIG_DVB_CORE is not set | 1077 | # CONFIG_DVB_CORE is not set |
1078 | # CONFIG_VIDEO_MEDIA is not set | ||
1079 | |||
1080 | # | ||
1081 | # Multimedia drivers | ||
1082 | # | ||
1071 | CONFIG_DAB=y | 1083 | CONFIG_DAB=y |
1072 | # CONFIG_USB_DABUSB is not set | 1084 | # CONFIG_USB_DABUSB is not set |
1073 | 1085 | ||
@@ -1094,8 +1106,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1094 | # CONFIG_FB_SYS_FILLRECT is not set | 1106 | # CONFIG_FB_SYS_FILLRECT is not set |
1095 | # CONFIG_FB_SYS_COPYAREA is not set | 1107 | # CONFIG_FB_SYS_COPYAREA is not set |
1096 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1108 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1109 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1097 | # CONFIG_FB_SYS_FOPS is not set | 1110 | # CONFIG_FB_SYS_FOPS is not set |
1098 | CONFIG_FB_DEFERRED_IO=y | ||
1099 | # CONFIG_FB_SVGALIB is not set | 1111 | # CONFIG_FB_SVGALIB is not set |
1100 | CONFIG_FB_MACMODES=y | 1112 | CONFIG_FB_MACMODES=y |
1101 | CONFIG_FB_BACKLIGHT=y | 1113 | CONFIG_FB_BACKLIGHT=y |
@@ -1213,6 +1225,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1213 | # CONFIG_SND_AU8810 is not set | 1225 | # CONFIG_SND_AU8810 is not set |
1214 | # CONFIG_SND_AU8820 is not set | 1226 | # CONFIG_SND_AU8820 is not set |
1215 | # CONFIG_SND_AU8830 is not set | 1227 | # CONFIG_SND_AU8830 is not set |
1228 | # CONFIG_SND_AW2 is not set | ||
1216 | # CONFIG_SND_AZT3328 is not set | 1229 | # CONFIG_SND_AZT3328 is not set |
1217 | # CONFIG_SND_BT87X is not set | 1230 | # CONFIG_SND_BT87X is not set |
1218 | # CONFIG_SND_CA0106 is not set | 1231 | # CONFIG_SND_CA0106 is not set |
@@ -1292,11 +1305,11 @@ CONFIG_SND_USB_USX2Y=y | |||
1292 | # CONFIG_SND_SOC is not set | 1305 | # CONFIG_SND_SOC is not set |
1293 | 1306 | ||
1294 | # | 1307 | # |
1295 | # SoC Audio support for SuperH | 1308 | # ALSA SoC audio for Freescale SOCs |
1296 | # | 1309 | # |
1297 | 1310 | ||
1298 | # | 1311 | # |
1299 | # ALSA SoC audio for Freescale SOCs | 1312 | # SoC Audio for the Texas Instruments OMAP |
1300 | # | 1313 | # |
1301 | 1314 | ||
1302 | # | 1315 | # |
@@ -1334,11 +1347,13 @@ CONFIG_USB_DEVICEFS=y | |||
1334 | # | 1347 | # |
1335 | # USB Host Controller Drivers | 1348 | # USB Host Controller Drivers |
1336 | # | 1349 | # |
1350 | # CONFIG_USB_C67X00_HCD is not set | ||
1337 | CONFIG_USB_EHCI_HCD=y | 1351 | CONFIG_USB_EHCI_HCD=y |
1338 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1352 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1339 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1353 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1340 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1354 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1341 | # CONFIG_USB_ISP116X_HCD is not set | 1355 | # CONFIG_USB_ISP116X_HCD is not set |
1356 | # CONFIG_USB_ISP1760_HCD is not set | ||
1342 | CONFIG_USB_OHCI_HCD=y | 1357 | CONFIG_USB_OHCI_HCD=y |
1343 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1358 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1344 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1359 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1354,6 +1369,7 @@ CONFIG_USB_SL811_HCD=y | |||
1354 | # | 1369 | # |
1355 | # CONFIG_USB_ACM is not set | 1370 | # CONFIG_USB_ACM is not set |
1356 | # CONFIG_USB_PRINTER is not set | 1371 | # CONFIG_USB_PRINTER is not set |
1372 | # CONFIG_USB_WDM is not set | ||
1357 | 1373 | ||
1358 | # | 1374 | # |
1359 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1375 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1375,6 +1391,7 @@ CONFIG_USB_STORAGE=y | |||
1375 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1391 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1376 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1392 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1377 | # CONFIG_USB_STORAGE_KARMA is not set | 1393 | # CONFIG_USB_STORAGE_KARMA is not set |
1394 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1378 | CONFIG_USB_LIBUSUAL=y | 1395 | CONFIG_USB_LIBUSUAL=y |
1379 | 1396 | ||
1380 | # | 1397 | # |
@@ -1416,6 +1433,7 @@ CONFIG_USB_LIBUSUAL=y | |||
1416 | # CONFIG_MMC is not set | 1433 | # CONFIG_MMC is not set |
1417 | # CONFIG_MEMSTICK is not set | 1434 | # CONFIG_MEMSTICK is not set |
1418 | # CONFIG_NEW_LEDS is not set | 1435 | # CONFIG_NEW_LEDS is not set |
1436 | # CONFIG_ACCESSIBILITY is not set | ||
1419 | # CONFIG_INFINIBAND is not set | 1437 | # CONFIG_INFINIBAND is not set |
1420 | CONFIG_EDAC=y | 1438 | CONFIG_EDAC=y |
1421 | 1439 | ||
@@ -1475,10 +1493,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
1475 | # on-CPU RTC drivers | 1493 | # on-CPU RTC drivers |
1476 | # | 1494 | # |
1477 | # CONFIG_DMADEVICES is not set | 1495 | # CONFIG_DMADEVICES is not set |
1478 | |||
1479 | # | ||
1480 | # Userspace I/O | ||
1481 | # | ||
1482 | # CONFIG_UIO is not set | 1496 | # CONFIG_UIO is not set |
1483 | 1497 | ||
1484 | # | 1498 | # |
@@ -1576,12 +1590,10 @@ CONFIG_NFS_FS=y | |||
1576 | CONFIG_NFS_V3=y | 1590 | CONFIG_NFS_V3=y |
1577 | # CONFIG_NFS_V3_ACL is not set | 1591 | # CONFIG_NFS_V3_ACL is not set |
1578 | # CONFIG_NFS_V4 is not set | 1592 | # CONFIG_NFS_V4 is not set |
1579 | # CONFIG_NFS_DIRECTIO is not set | ||
1580 | CONFIG_NFSD=y | 1593 | CONFIG_NFSD=y |
1581 | CONFIG_NFSD_V3=y | 1594 | CONFIG_NFSD_V3=y |
1582 | # CONFIG_NFSD_V3_ACL is not set | 1595 | # CONFIG_NFSD_V3_ACL is not set |
1583 | CONFIG_NFSD_V4=y | 1596 | CONFIG_NFSD_V4=y |
1584 | CONFIG_NFSD_TCP=y | ||
1585 | CONFIG_ROOT_NFS=y | 1597 | CONFIG_ROOT_NFS=y |
1586 | CONFIG_LOCKD=y | 1598 | CONFIG_LOCKD=y |
1587 | CONFIG_LOCKD_V4=y | 1599 | CONFIG_LOCKD_V4=y |
@@ -1665,9 +1677,10 @@ CONFIG_NLS_ISO8859_1=y | |||
1665 | # Library routines | 1677 | # Library routines |
1666 | # | 1678 | # |
1667 | CONFIG_BITREVERSE=y | 1679 | CONFIG_BITREVERSE=y |
1680 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1668 | CONFIG_CRC_CCITT=y | 1681 | CONFIG_CRC_CCITT=y |
1669 | # CONFIG_CRC16 is not set | 1682 | # CONFIG_CRC16 is not set |
1670 | # CONFIG_CRC_ITU_T is not set | 1683 | CONFIG_CRC_ITU_T=y |
1671 | CONFIG_CRC32=y | 1684 | CONFIG_CRC32=y |
1672 | # CONFIG_CRC7 is not set | 1685 | # CONFIG_CRC7 is not set |
1673 | CONFIG_LIBCRC32C=m | 1686 | CONFIG_LIBCRC32C=m |
@@ -1677,6 +1690,7 @@ CONFIG_PLIST=y | |||
1677 | CONFIG_HAS_IOMEM=y | 1690 | CONFIG_HAS_IOMEM=y |
1678 | CONFIG_HAS_IOPORT=y | 1691 | CONFIG_HAS_IOPORT=y |
1679 | CONFIG_HAS_DMA=y | 1692 | CONFIG_HAS_DMA=y |
1693 | CONFIG_HAVE_LMB=y | ||
1680 | 1694 | ||
1681 | # | 1695 | # |
1682 | # Kernel hacking | 1696 | # Kernel hacking |
@@ -1684,6 +1698,7 @@ CONFIG_HAS_DMA=y | |||
1684 | # CONFIG_PRINTK_TIME is not set | 1698 | # CONFIG_PRINTK_TIME is not set |
1685 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1699 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1686 | CONFIG_ENABLE_MUST_CHECK=y | 1700 | CONFIG_ENABLE_MUST_CHECK=y |
1701 | CONFIG_FRAME_WARN=2048 | ||
1687 | CONFIG_MAGIC_SYSRQ=y | 1702 | CONFIG_MAGIC_SYSRQ=y |
1688 | # CONFIG_UNUSED_SYMBOLS is not set | 1703 | # CONFIG_UNUSED_SYMBOLS is not set |
1689 | # CONFIG_DEBUG_FS is not set | 1704 | # CONFIG_DEBUG_FS is not set |
@@ -1694,18 +1709,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1694 | # CONFIG_SCHED_DEBUG is not set | 1709 | # CONFIG_SCHED_DEBUG is not set |
1695 | # CONFIG_SCHEDSTATS is not set | 1710 | # CONFIG_SCHEDSTATS is not set |
1696 | # CONFIG_TIMER_STATS is not set | 1711 | # CONFIG_TIMER_STATS is not set |
1712 | # CONFIG_DEBUG_OBJECTS is not set | ||
1697 | # CONFIG_SLUB_DEBUG_ON is not set | 1713 | # CONFIG_SLUB_DEBUG_ON is not set |
1698 | # CONFIG_SLUB_STATS is not set | 1714 | # CONFIG_SLUB_STATS is not set |
1699 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1715 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1700 | # CONFIG_RT_MUTEX_TESTER is not set | 1716 | # CONFIG_RT_MUTEX_TESTER is not set |
1701 | # CONFIG_DEBUG_SPINLOCK is not set | 1717 | # CONFIG_DEBUG_SPINLOCK is not set |
1702 | # CONFIG_DEBUG_MUTEXES is not set | 1718 | # CONFIG_DEBUG_MUTEXES is not set |
1719 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1720 | # CONFIG_PROVE_LOCKING is not set | ||
1721 | # CONFIG_LOCK_STAT is not set | ||
1703 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1722 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1704 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1723 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1705 | # CONFIG_DEBUG_KOBJECT is not set | 1724 | # CONFIG_DEBUG_KOBJECT is not set |
1706 | CONFIG_DEBUG_BUGVERBOSE=y | 1725 | CONFIG_DEBUG_BUGVERBOSE=y |
1707 | # CONFIG_DEBUG_INFO is not set | 1726 | # CONFIG_DEBUG_INFO is not set |
1708 | # CONFIG_DEBUG_VM is not set | 1727 | # CONFIG_DEBUG_VM is not set |
1728 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1709 | # CONFIG_DEBUG_LIST is not set | 1729 | # CONFIG_DEBUG_LIST is not set |
1710 | # CONFIG_DEBUG_SG is not set | 1730 | # CONFIG_DEBUG_SG is not set |
1711 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1731 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1735,53 +1755,83 @@ CONFIG_ASYNC_CORE=y | |||
1735 | CONFIG_ASYNC_MEMCPY=y | 1755 | CONFIG_ASYNC_MEMCPY=y |
1736 | CONFIG_ASYNC_XOR=y | 1756 | CONFIG_ASYNC_XOR=y |
1737 | CONFIG_CRYPTO=y | 1757 | CONFIG_CRYPTO=y |
1758 | |||
1759 | # | ||
1760 | # Crypto core or helper | ||
1761 | # | ||
1738 | CONFIG_CRYPTO_ALGAPI=y | 1762 | CONFIG_CRYPTO_ALGAPI=y |
1739 | CONFIG_CRYPTO_AEAD=y | 1763 | CONFIG_CRYPTO_AEAD=y |
1740 | CONFIG_CRYPTO_BLKCIPHER=y | 1764 | CONFIG_CRYPTO_BLKCIPHER=y |
1741 | # CONFIG_CRYPTO_SEQIV is not set | ||
1742 | CONFIG_CRYPTO_HASH=y | 1765 | CONFIG_CRYPTO_HASH=y |
1743 | CONFIG_CRYPTO_MANAGER=y | 1766 | CONFIG_CRYPTO_MANAGER=y |
1767 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1768 | # CONFIG_CRYPTO_NULL is not set | ||
1769 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1770 | CONFIG_CRYPTO_AUTHENC=y | ||
1771 | # CONFIG_CRYPTO_TEST is not set | ||
1772 | |||
1773 | # | ||
1774 | # Authenticated Encryption with Associated Data | ||
1775 | # | ||
1776 | # CONFIG_CRYPTO_CCM is not set | ||
1777 | # CONFIG_CRYPTO_GCM is not set | ||
1778 | # CONFIG_CRYPTO_SEQIV is not set | ||
1779 | |||
1780 | # | ||
1781 | # Block modes | ||
1782 | # | ||
1783 | CONFIG_CRYPTO_CBC=y | ||
1784 | # CONFIG_CRYPTO_CTR is not set | ||
1785 | # CONFIG_CRYPTO_CTS is not set | ||
1786 | # CONFIG_CRYPTO_ECB is not set | ||
1787 | # CONFIG_CRYPTO_LRW is not set | ||
1788 | # CONFIG_CRYPTO_PCBC is not set | ||
1789 | # CONFIG_CRYPTO_XTS is not set | ||
1790 | |||
1791 | # | ||
1792 | # Hash modes | ||
1793 | # | ||
1744 | CONFIG_CRYPTO_HMAC=y | 1794 | CONFIG_CRYPTO_HMAC=y |
1745 | # CONFIG_CRYPTO_XCBC is not set | 1795 | # CONFIG_CRYPTO_XCBC is not set |
1746 | # CONFIG_CRYPTO_NULL is not set | 1796 | |
1797 | # | ||
1798 | # Digest | ||
1799 | # | ||
1800 | # CONFIG_CRYPTO_CRC32C is not set | ||
1747 | CONFIG_CRYPTO_MD4=y | 1801 | CONFIG_CRYPTO_MD4=y |
1748 | CONFIG_CRYPTO_MD5=y | 1802 | CONFIG_CRYPTO_MD5=y |
1803 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1749 | CONFIG_CRYPTO_SHA1=y | 1804 | CONFIG_CRYPTO_SHA1=y |
1750 | CONFIG_CRYPTO_SHA256=y | 1805 | CONFIG_CRYPTO_SHA256=y |
1751 | CONFIG_CRYPTO_SHA512=y | 1806 | CONFIG_CRYPTO_SHA512=y |
1752 | # CONFIG_CRYPTO_WP512 is not set | ||
1753 | # CONFIG_CRYPTO_TGR192 is not set | 1807 | # CONFIG_CRYPTO_TGR192 is not set |
1754 | # CONFIG_CRYPTO_GF128MUL is not set | 1808 | # CONFIG_CRYPTO_WP512 is not set |
1755 | # CONFIG_CRYPTO_ECB is not set | 1809 | |
1756 | CONFIG_CRYPTO_CBC=y | 1810 | # |
1757 | # CONFIG_CRYPTO_PCBC is not set | 1811 | # Ciphers |
1758 | # CONFIG_CRYPTO_LRW is not set | 1812 | # |
1759 | # CONFIG_CRYPTO_XTS is not set | ||
1760 | # CONFIG_CRYPTO_CTR is not set | ||
1761 | # CONFIG_CRYPTO_GCM is not set | ||
1762 | # CONFIG_CRYPTO_CCM is not set | ||
1763 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1764 | CONFIG_CRYPTO_DES=y | ||
1765 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1766 | CONFIG_CRYPTO_BLOWFISH=y | ||
1767 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1768 | # CONFIG_CRYPTO_SERPENT is not set | ||
1769 | CONFIG_CRYPTO_AES=y | 1813 | CONFIG_CRYPTO_AES=y |
1814 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1815 | # CONFIG_CRYPTO_ARC4 is not set | ||
1816 | CONFIG_CRYPTO_BLOWFISH=y | ||
1817 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1770 | # CONFIG_CRYPTO_CAST5 is not set | 1818 | # CONFIG_CRYPTO_CAST5 is not set |
1771 | # CONFIG_CRYPTO_CAST6 is not set | 1819 | # CONFIG_CRYPTO_CAST6 is not set |
1772 | # CONFIG_CRYPTO_TEA is not set | 1820 | CONFIG_CRYPTO_DES=y |
1773 | # CONFIG_CRYPTO_ARC4 is not set | 1821 | # CONFIG_CRYPTO_FCRYPT is not set |
1774 | # CONFIG_CRYPTO_KHAZAD is not set | 1822 | # CONFIG_CRYPTO_KHAZAD is not set |
1775 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1776 | # CONFIG_CRYPTO_SEED is not set | ||
1777 | # CONFIG_CRYPTO_SALSA20 is not set | 1823 | # CONFIG_CRYPTO_SALSA20 is not set |
1824 | # CONFIG_CRYPTO_SEED is not set | ||
1825 | # CONFIG_CRYPTO_SERPENT is not set | ||
1826 | # CONFIG_CRYPTO_TEA is not set | ||
1827 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1828 | |||
1829 | # | ||
1830 | # Compression | ||
1831 | # | ||
1778 | # CONFIG_CRYPTO_DEFLATE is not set | 1832 | # CONFIG_CRYPTO_DEFLATE is not set |
1779 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1780 | # CONFIG_CRYPTO_CRC32C is not set | ||
1781 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1782 | # CONFIG_CRYPTO_TEST is not set | ||
1783 | CONFIG_CRYPTO_AUTHENC=y | ||
1784 | # CONFIG_CRYPTO_LZO is not set | 1833 | # CONFIG_CRYPTO_LZO is not set |
1785 | CONFIG_CRYPTO_HW=y | 1834 | CONFIG_CRYPTO_HW=y |
1786 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1835 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1787 | # CONFIG_PPC_CLOCK is not set | 1836 | # CONFIG_PPC_CLOCK is not set |
1837 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index fca114252ac7..3688e4bb6fc2 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_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-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:56:21 2008 | 4 | # Tue May 20 20:02:24 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -91,6 +93,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
91 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
92 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
93 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -119,12 +122,14 @@ CONFIG_HAVE_OPROFILE=y | |||
119 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
122 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
123 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
124 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
125 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
126 | CONFIG_BASE_SMALL=0 | 130 | CONFIG_BASE_SMALL=0 |
127 | CONFIG_MODULES=y | 131 | CONFIG_MODULES=y |
132 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
128 | CONFIG_MODULE_UNLOAD=y | 133 | CONFIG_MODULE_UNLOAD=y |
129 | CONFIG_MODULE_FORCE_UNLOAD=y | 134 | CONFIG_MODULE_FORCE_UNLOAD=y |
130 | # CONFIG_MODVERSIONS is not set | 135 | # CONFIG_MODVERSIONS is not set |
@@ -185,6 +190,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
185 | CONFIG_CPU_FREQ_STAT=y | 190 | CONFIG_CPU_FREQ_STAT=y |
186 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 191 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
187 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 192 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
193 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
188 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 194 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
189 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
190 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 196 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
@@ -236,16 +242,17 @@ CONFIG_FLATMEM=y | |||
236 | CONFIG_FLAT_NODE_MEM_MAP=y | 242 | CONFIG_FLAT_NODE_MEM_MAP=y |
237 | # CONFIG_SPARSEMEM_STATIC is not set | 243 | # CONFIG_SPARSEMEM_STATIC is not set |
238 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
245 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
239 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 246 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
240 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
241 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
242 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
243 | CONFIG_VIRT_TO_BUS=y | 250 | CONFIG_VIRT_TO_BUS=y |
251 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
244 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
245 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
246 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 254 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
247 | CONFIG_PM=y | 255 | CONFIG_PM=y |
248 | # CONFIG_PM_LEGACY is not set | ||
249 | CONFIG_PM_DEBUG=y | 256 | CONFIG_PM_DEBUG=y |
250 | # CONFIG_PM_VERBOSE is not set | 257 | # CONFIG_PM_VERBOSE is not set |
251 | CONFIG_CAN_PM_TRACE=y | 258 | CONFIG_CAN_PM_TRACE=y |
@@ -292,6 +299,7 @@ CONFIG_YENTA_TOSHIBA=y | |||
292 | # CONFIG_I82092 is not set | 299 | # CONFIG_I82092 is not set |
293 | CONFIG_PCCARD_NONSTATIC=m | 300 | CONFIG_PCCARD_NONSTATIC=m |
294 | # CONFIG_HOTPLUG_PCI is not set | 301 | # CONFIG_HOTPLUG_PCI is not set |
302 | # CONFIG_HAS_RAPIDIO is not set | ||
295 | 303 | ||
296 | # | 304 | # |
297 | # Advanced setup | 305 | # Advanced setup |
@@ -301,11 +309,11 @@ CONFIG_PCCARD_NONSTATIC=m | |||
301 | # | 309 | # |
302 | # Default settings for advanced configuration options are used | 310 | # Default settings for advanced configuration options are used |
303 | # | 311 | # |
304 | CONFIG_HIGHMEM_START=0xfe000000 | ||
305 | CONFIG_LOWMEM_SIZE=0x30000000 | 312 | CONFIG_LOWMEM_SIZE=0x30000000 |
313 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
306 | CONFIG_KERNEL_START=0xc0000000 | 314 | CONFIG_KERNEL_START=0xc0000000 |
315 | CONFIG_PHYSICAL_START=0x00000000 | ||
307 | CONFIG_TASK_SIZE=0xc0000000 | 316 | CONFIG_TASK_SIZE=0xc0000000 |
308 | CONFIG_BOOT_LOAD=0x00800000 | ||
309 | 317 | ||
310 | # | 318 | # |
311 | # Networking | 319 | # Networking |
@@ -352,8 +360,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
352 | # CONFIG_TCP_MD5SIG is not set | 360 | # CONFIG_TCP_MD5SIG is not set |
353 | # CONFIG_IP_VS is not set | 361 | # CONFIG_IP_VS is not set |
354 | # CONFIG_IPV6 is not set | 362 | # CONFIG_IPV6 is not set |
355 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
356 | # CONFIG_INET6_TUNNEL is not set | ||
357 | # CONFIG_NETWORK_SECMARK is not set | 363 | # CONFIG_NETWORK_SECMARK is not set |
358 | CONFIG_NETFILTER=y | 364 | CONFIG_NETFILTER=y |
359 | # CONFIG_NETFILTER_DEBUG is not set | 365 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -369,6 +375,7 @@ CONFIG_NF_CONNTRACK=m | |||
369 | # CONFIG_NF_CT_ACCT is not set | 375 | # CONFIG_NF_CT_ACCT is not set |
370 | # CONFIG_NF_CONNTRACK_MARK is not set | 376 | # CONFIG_NF_CONNTRACK_MARK is not set |
371 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 377 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
378 | CONFIG_NF_CT_PROTO_DCCP=m | ||
372 | # CONFIG_NF_CT_PROTO_SCTP is not set | 379 | # CONFIG_NF_CT_PROTO_SCTP is not set |
373 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 380 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
374 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 381 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
@@ -445,6 +452,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m | |||
445 | CONFIG_IP_NF_TARGET_REDIRECT=m | 452 | CONFIG_IP_NF_TARGET_REDIRECT=m |
446 | CONFIG_IP_NF_TARGET_NETMAP=m | 453 | CONFIG_IP_NF_TARGET_NETMAP=m |
447 | # CONFIG_NF_NAT_SNMP_BASIC is not set | 454 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
455 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
448 | CONFIG_NF_NAT_FTP=m | 456 | CONFIG_NF_NAT_FTP=m |
449 | CONFIG_NF_NAT_IRC=m | 457 | CONFIG_NF_NAT_IRC=m |
450 | CONFIG_NF_NAT_TFTP=m | 458 | CONFIG_NF_NAT_TFTP=m |
@@ -586,7 +594,6 @@ CONFIG_MAC80211=m | |||
586 | # Rate control algorithm selection | 594 | # Rate control algorithm selection |
587 | # | 595 | # |
588 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 596 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
589 | # CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set | ||
590 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | 597 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set |
591 | 598 | ||
592 | # | 599 | # |
@@ -598,7 +605,7 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y | |||
598 | # | 605 | # |
599 | CONFIG_MAC80211_RC_DEFAULT="pid" | 606 | CONFIG_MAC80211_RC_DEFAULT="pid" |
600 | CONFIG_MAC80211_RC_PID=y | 607 | CONFIG_MAC80211_RC_PID=y |
601 | # CONFIG_MAC80211_RC_SIMPLE is not set | 608 | # CONFIG_MAC80211_MESH is not set |
602 | CONFIG_MAC80211_LEDS=y | 609 | CONFIG_MAC80211_LEDS=y |
603 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 610 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set |
604 | # CONFIG_MAC80211_DEBUG is not set | 611 | # CONFIG_MAC80211_DEBUG is not set |
@@ -607,7 +614,6 @@ CONFIG_IEEE80211=m | |||
607 | CONFIG_IEEE80211_CRYPT_WEP=m | 614 | CONFIG_IEEE80211_CRYPT_WEP=m |
608 | CONFIG_IEEE80211_CRYPT_CCMP=m | 615 | CONFIG_IEEE80211_CRYPT_CCMP=m |
609 | CONFIG_IEEE80211_CRYPT_TKIP=m | 616 | CONFIG_IEEE80211_CRYPT_TKIP=m |
610 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
611 | # CONFIG_RFKILL is not set | 617 | # CONFIG_RFKILL is not set |
612 | # CONFIG_NET_9P is not set | 618 | # CONFIG_NET_9P is not set |
613 | 619 | ||
@@ -629,6 +635,7 @@ CONFIG_CONNECTOR=y | |||
629 | CONFIG_PROC_EVENTS=y | 635 | CONFIG_PROC_EVENTS=y |
630 | # CONFIG_MTD is not set | 636 | # CONFIG_MTD is not set |
631 | CONFIG_OF_DEVICE=y | 637 | CONFIG_OF_DEVICE=y |
638 | CONFIG_OF_I2C=y | ||
632 | # CONFIG_PARPORT is not set | 639 | # CONFIG_PARPORT is not set |
633 | CONFIG_BLK_DEV=y | 640 | CONFIG_BLK_DEV=y |
634 | # CONFIG_BLK_DEV_FD is not set | 641 | # CONFIG_BLK_DEV_FD is not set |
@@ -720,7 +727,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
720 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 727 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
721 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 728 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
722 | CONFIG_BLK_DEV_IDEDMA=y | 729 | CONFIG_BLK_DEV_IDEDMA=y |
723 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 730 | # CONFIG_BLK_DEV_HD_ONLY is not set |
724 | # CONFIG_BLK_DEV_HD is not set | 731 | # CONFIG_BLK_DEV_HD is not set |
725 | 732 | ||
726 | # | 733 | # |
@@ -906,7 +913,6 @@ CONFIG_SUNGEM=y | |||
906 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 913 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
907 | CONFIG_NET_PCI=y | 914 | CONFIG_NET_PCI=y |
908 | CONFIG_PCNET32=y | 915 | CONFIG_PCNET32=y |
909 | # CONFIG_PCNET32_NAPI is not set | ||
910 | # CONFIG_AMD8111_ETH is not set | 916 | # CONFIG_AMD8111_ETH is not set |
911 | # CONFIG_ADAPTEC_STARFIRE is not set | 917 | # CONFIG_ADAPTEC_STARFIRE is not set |
912 | # CONFIG_B44 is not set | 918 | # CONFIG_B44 is not set |
@@ -940,7 +946,6 @@ CONFIG_NETDEV_1000=y | |||
940 | # CONFIG_SIS190 is not set | 946 | # CONFIG_SIS190 is not set |
941 | # CONFIG_SKGE is not set | 947 | # CONFIG_SKGE is not set |
942 | # CONFIG_SKY2 is not set | 948 | # CONFIG_SKY2 is not set |
943 | # CONFIG_SK98LIN is not set | ||
944 | # CONFIG_VIA_VELOCITY is not set | 949 | # CONFIG_VIA_VELOCITY is not set |
945 | # CONFIG_TIGON3 is not set | 950 | # CONFIG_TIGON3 is not set |
946 | # CONFIG_BNX2 is not set | 951 | # CONFIG_BNX2 is not set |
@@ -959,6 +964,7 @@ CONFIG_NETDEV_10000=y | |||
959 | # CONFIG_MLX4_CORE is not set | 964 | # CONFIG_MLX4_CORE is not set |
960 | # CONFIG_TEHUTI is not set | 965 | # CONFIG_TEHUTI is not set |
961 | # CONFIG_BNX2X is not set | 966 | # CONFIG_BNX2X is not set |
967 | # CONFIG_SFC is not set | ||
962 | # CONFIG_TR is not set | 968 | # CONFIG_TR is not set |
963 | 969 | ||
964 | # | 970 | # |
@@ -992,6 +998,8 @@ CONFIG_P54_COMMON=m | |||
992 | # CONFIG_P54_USB is not set | 998 | # CONFIG_P54_USB is not set |
993 | # CONFIG_P54_PCI is not set | 999 | # CONFIG_P54_PCI is not set |
994 | # CONFIG_ATH5K is not set | 1000 | # CONFIG_ATH5K is not set |
1001 | # CONFIG_IWLCORE is not set | ||
1002 | # CONFIG_IWLWIFI_LEDS is not set | ||
995 | # CONFIG_IWL4965 is not set | 1003 | # CONFIG_IWL4965 is not set |
996 | # CONFIG_IWL3945 is not set | 1004 | # CONFIG_IWL3945 is not set |
997 | # CONFIG_HOSTAP is not set | 1005 | # CONFIG_HOSTAP is not set |
@@ -1110,6 +1118,7 @@ CONFIG_VT=y | |||
1110 | CONFIG_VT_CONSOLE=y | 1118 | CONFIG_VT_CONSOLE=y |
1111 | CONFIG_HW_CONSOLE=y | 1119 | CONFIG_HW_CONSOLE=y |
1112 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1120 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
1121 | CONFIG_DEVKMEM=y | ||
1113 | # CONFIG_SERIAL_NONSTANDARD is not set | 1122 | # CONFIG_SERIAL_NONSTANDARD is not set |
1114 | # CONFIG_NOZOMI is not set | 1123 | # CONFIG_NOZOMI is not set |
1115 | 1124 | ||
@@ -1156,13 +1165,7 @@ CONFIG_DEVPORT=y | |||
1156 | CONFIG_I2C=y | 1165 | CONFIG_I2C=y |
1157 | CONFIG_I2C_BOARDINFO=y | 1166 | CONFIG_I2C_BOARDINFO=y |
1158 | CONFIG_I2C_CHARDEV=m | 1167 | CONFIG_I2C_CHARDEV=m |
1159 | |||
1160 | # | ||
1161 | # I2C Algorithms | ||
1162 | # | ||
1163 | CONFIG_I2C_ALGOBIT=y | 1168 | CONFIG_I2C_ALGOBIT=y |
1164 | # CONFIG_I2C_ALGOPCF is not set | ||
1165 | # CONFIG_I2C_ALGOPCA is not set | ||
1166 | 1169 | ||
1167 | # | 1170 | # |
1168 | # I2C Hardware Bus support | 1171 | # I2C Hardware Bus support |
@@ -1192,6 +1195,7 @@ CONFIG_I2C_POWERMAC=y | |||
1192 | # CONFIG_I2C_VIA is not set | 1195 | # CONFIG_I2C_VIA is not set |
1193 | # CONFIG_I2C_VIAPRO is not set | 1196 | # CONFIG_I2C_VIAPRO is not set |
1194 | # CONFIG_I2C_VOODOO3 is not set | 1197 | # CONFIG_I2C_VOODOO3 is not set |
1198 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1195 | 1199 | ||
1196 | # | 1200 | # |
1197 | # Miscellaneous I2C Chip support | 1201 | # Miscellaneous I2C Chip support |
@@ -1201,19 +1205,13 @@ CONFIG_I2C_POWERMAC=y | |||
1201 | # CONFIG_SENSORS_PCF8574 is not set | 1205 | # CONFIG_SENSORS_PCF8574 is not set |
1202 | # CONFIG_PCF8575 is not set | 1206 | # CONFIG_PCF8575 is not set |
1203 | # CONFIG_SENSORS_PCF8591 is not set | 1207 | # CONFIG_SENSORS_PCF8591 is not set |
1204 | # CONFIG_TPS65010 is not set | ||
1205 | # CONFIG_SENSORS_MAX6875 is not set | 1208 | # CONFIG_SENSORS_MAX6875 is not set |
1206 | # CONFIG_SENSORS_TSL2550 is not set | 1209 | # CONFIG_SENSORS_TSL2550 is not set |
1207 | # CONFIG_I2C_DEBUG_CORE is not set | 1210 | # CONFIG_I2C_DEBUG_CORE is not set |
1208 | # CONFIG_I2C_DEBUG_ALGO is not set | 1211 | # CONFIG_I2C_DEBUG_ALGO is not set |
1209 | # CONFIG_I2C_DEBUG_BUS is not set | 1212 | # CONFIG_I2C_DEBUG_BUS is not set |
1210 | # CONFIG_I2C_DEBUG_CHIP is not set | 1213 | # CONFIG_I2C_DEBUG_CHIP is not set |
1211 | |||
1212 | # | ||
1213 | # SPI support | ||
1214 | # | ||
1215 | # CONFIG_SPI is not set | 1214 | # CONFIG_SPI is not set |
1216 | # CONFIG_SPI_MASTER is not set | ||
1217 | # CONFIG_W1 is not set | 1215 | # CONFIG_W1 is not set |
1218 | CONFIG_POWER_SUPPLY=y | 1216 | CONFIG_POWER_SUPPLY=y |
1219 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1217 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
@@ -1230,6 +1228,7 @@ CONFIG_BATTERY_PMU=y | |||
1230 | # | 1228 | # |
1231 | CONFIG_SSB_POSSIBLE=y | 1229 | CONFIG_SSB_POSSIBLE=y |
1232 | CONFIG_SSB=m | 1230 | CONFIG_SSB=m |
1231 | CONFIG_SSB_SPROM=y | ||
1233 | CONFIG_SSB_PCIHOST_POSSIBLE=y | 1232 | CONFIG_SSB_PCIHOST_POSSIBLE=y |
1234 | CONFIG_SSB_PCIHOST=y | 1233 | CONFIG_SSB_PCIHOST=y |
1235 | CONFIG_SSB_B43_PCI_BRIDGE=y | 1234 | CONFIG_SSB_B43_PCI_BRIDGE=y |
@@ -1243,12 +1242,22 @@ CONFIG_SSB_DRIVER_PCICORE=y | |||
1243 | # Multifunction device drivers | 1242 | # Multifunction device drivers |
1244 | # | 1243 | # |
1245 | # CONFIG_MFD_SM501 is not set | 1244 | # CONFIG_MFD_SM501 is not set |
1245 | # CONFIG_HTC_PASIC3 is not set | ||
1246 | 1246 | ||
1247 | # | 1247 | # |
1248 | # Multimedia devices | 1248 | # Multimedia devices |
1249 | # | 1249 | # |
1250 | |||
1251 | # | ||
1252 | # Multimedia core support | ||
1253 | # | ||
1250 | # CONFIG_VIDEO_DEV is not set | 1254 | # CONFIG_VIDEO_DEV is not set |
1251 | # CONFIG_DVB_CORE is not set | 1255 | # CONFIG_DVB_CORE is not set |
1256 | # CONFIG_VIDEO_MEDIA is not set | ||
1257 | |||
1258 | # | ||
1259 | # Multimedia drivers | ||
1260 | # | ||
1252 | # CONFIG_DAB is not set | 1261 | # CONFIG_DAB is not set |
1253 | 1262 | ||
1254 | # | 1263 | # |
@@ -1276,8 +1285,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1276 | # CONFIG_FB_SYS_FILLRECT is not set | 1285 | # CONFIG_FB_SYS_FILLRECT is not set |
1277 | # CONFIG_FB_SYS_COPYAREA is not set | 1286 | # CONFIG_FB_SYS_COPYAREA is not set |
1278 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1287 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1288 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1279 | # CONFIG_FB_SYS_FOPS is not set | 1289 | # CONFIG_FB_SYS_FOPS is not set |
1280 | CONFIG_FB_DEFERRED_IO=y | ||
1281 | # CONFIG_FB_SVGALIB is not set | 1290 | # CONFIG_FB_SVGALIB is not set |
1282 | CONFIG_FB_MACMODES=y | 1291 | CONFIG_FB_MACMODES=y |
1283 | CONFIG_FB_BACKLIGHT=y | 1292 | CONFIG_FB_BACKLIGHT=y |
@@ -1413,6 +1422,7 @@ CONFIG_SND_DUMMY=m | |||
1413 | # CONFIG_SND_AU8810 is not set | 1422 | # CONFIG_SND_AU8810 is not set |
1414 | # CONFIG_SND_AU8820 is not set | 1423 | # CONFIG_SND_AU8820 is not set |
1415 | # CONFIG_SND_AU8830 is not set | 1424 | # CONFIG_SND_AU8830 is not set |
1425 | # CONFIG_SND_AW2 is not set | ||
1416 | # CONFIG_SND_AZT3328 is not set | 1426 | # CONFIG_SND_AZT3328 is not set |
1417 | # CONFIG_SND_BT87X is not set | 1427 | # CONFIG_SND_BT87X is not set |
1418 | # CONFIG_SND_CA0106 is not set | 1428 | # CONFIG_SND_CA0106 is not set |
@@ -1505,11 +1515,11 @@ CONFIG_SND_USB_AUDIO=m | |||
1505 | # CONFIG_SND_SOC is not set | 1515 | # CONFIG_SND_SOC is not set |
1506 | 1516 | ||
1507 | # | 1517 | # |
1508 | # SoC Audio support for SuperH | 1518 | # ALSA SoC audio for Freescale SOCs |
1509 | # | 1519 | # |
1510 | 1520 | ||
1511 | # | 1521 | # |
1512 | # ALSA SoC audio for Freescale SOCs | 1522 | # SoC Audio for the Texas Instruments OMAP |
1513 | # | 1523 | # |
1514 | 1524 | ||
1515 | # | 1525 | # |
@@ -1543,17 +1553,18 @@ CONFIG_USB_DEVICEFS=y | |||
1543 | CONFIG_USB_DEVICE_CLASS=y | 1553 | CONFIG_USB_DEVICE_CLASS=y |
1544 | CONFIG_USB_DYNAMIC_MINORS=y | 1554 | CONFIG_USB_DYNAMIC_MINORS=y |
1545 | # CONFIG_USB_SUSPEND is not set | 1555 | # CONFIG_USB_SUSPEND is not set |
1546 | # CONFIG_USB_PERSIST is not set | ||
1547 | # CONFIG_USB_OTG is not set | 1556 | # CONFIG_USB_OTG is not set |
1548 | 1557 | ||
1549 | # | 1558 | # |
1550 | # USB Host Controller Drivers | 1559 | # USB Host Controller Drivers |
1551 | # | 1560 | # |
1561 | # CONFIG_USB_C67X00_HCD is not set | ||
1552 | CONFIG_USB_EHCI_HCD=m | 1562 | CONFIG_USB_EHCI_HCD=m |
1553 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1563 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
1554 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1564 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1555 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1565 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1556 | # CONFIG_USB_ISP116X_HCD is not set | 1566 | # CONFIG_USB_ISP116X_HCD is not set |
1567 | # CONFIG_USB_ISP1760_HCD is not set | ||
1557 | CONFIG_USB_OHCI_HCD=y | 1568 | CONFIG_USB_OHCI_HCD=y |
1558 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1569 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1559 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1570 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1587,7 +1598,9 @@ CONFIG_USB_STORAGE=m | |||
1587 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1598 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1588 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1599 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1589 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1600 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1601 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
1590 | # CONFIG_USB_STORAGE_KARMA is not set | 1602 | # CONFIG_USB_STORAGE_KARMA is not set |
1603 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1591 | # CONFIG_USB_LIBUSUAL is not set | 1604 | # CONFIG_USB_LIBUSUAL is not set |
1592 | 1605 | ||
1593 | # | 1606 | # |
@@ -1642,9 +1655,11 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
1642 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1655 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
1643 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1656 | # CONFIG_USB_SERIAL_MOS7720 is not set |
1644 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1657 | # CONFIG_USB_SERIAL_MOS7840 is not set |
1658 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
1645 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1659 | # CONFIG_USB_SERIAL_NAVMAN is not set |
1646 | # CONFIG_USB_SERIAL_PL2303 is not set | 1660 | # CONFIG_USB_SERIAL_PL2303 is not set |
1647 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1661 | # CONFIG_USB_SERIAL_OTI6858 is not set |
1662 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
1648 | # CONFIG_USB_SERIAL_HP4X is not set | 1663 | # CONFIG_USB_SERIAL_HP4X is not set |
1649 | # CONFIG_USB_SERIAL_SAFE is not set | 1664 | # CONFIG_USB_SERIAL_SAFE is not set |
1650 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1665 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
@@ -1695,14 +1710,12 @@ CONFIG_LEDS_TRIGGERS=y | |||
1695 | # CONFIG_LEDS_TRIGGER_TIMER is not set | 1710 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
1696 | CONFIG_LEDS_TRIGGER_IDE_DISK=y | 1711 | CONFIG_LEDS_TRIGGER_IDE_DISK=y |
1697 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 1712 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
1713 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
1714 | # CONFIG_ACCESSIBILITY is not set | ||
1698 | # CONFIG_INFINIBAND is not set | 1715 | # CONFIG_INFINIBAND is not set |
1699 | # CONFIG_EDAC is not set | 1716 | # CONFIG_EDAC is not set |
1700 | # CONFIG_RTC_CLASS is not set | 1717 | # CONFIG_RTC_CLASS is not set |
1701 | # CONFIG_DMADEVICES is not set | 1718 | # CONFIG_DMADEVICES is not set |
1702 | |||
1703 | # | ||
1704 | # Userspace I/O | ||
1705 | # | ||
1706 | # CONFIG_UIO is not set | 1719 | # CONFIG_UIO is not set |
1707 | 1720 | ||
1708 | # | 1721 | # |
@@ -1786,13 +1799,11 @@ CONFIG_NFS_FS=y | |||
1786 | CONFIG_NFS_V3=y | 1799 | CONFIG_NFS_V3=y |
1787 | CONFIG_NFS_V3_ACL=y | 1800 | CONFIG_NFS_V3_ACL=y |
1788 | CONFIG_NFS_V4=y | 1801 | CONFIG_NFS_V4=y |
1789 | # CONFIG_NFS_DIRECTIO is not set | ||
1790 | CONFIG_NFSD=m | 1802 | CONFIG_NFSD=m |
1791 | CONFIG_NFSD_V2_ACL=y | 1803 | CONFIG_NFSD_V2_ACL=y |
1792 | CONFIG_NFSD_V3=y | 1804 | CONFIG_NFSD_V3=y |
1793 | CONFIG_NFSD_V3_ACL=y | 1805 | CONFIG_NFSD_V3_ACL=y |
1794 | CONFIG_NFSD_V4=y | 1806 | CONFIG_NFSD_V4=y |
1795 | CONFIG_NFSD_TCP=y | ||
1796 | CONFIG_LOCKD=y | 1807 | CONFIG_LOCKD=y |
1797 | CONFIG_LOCKD_V4=y | 1808 | CONFIG_LOCKD_V4=y |
1798 | CONFIG_EXPORTFS=m | 1809 | CONFIG_EXPORTFS=m |
@@ -1877,9 +1888,10 @@ CONFIG_NLS_UTF8=m | |||
1877 | # Library routines | 1888 | # Library routines |
1878 | # | 1889 | # |
1879 | CONFIG_BITREVERSE=y | 1890 | CONFIG_BITREVERSE=y |
1891 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1880 | CONFIG_CRC_CCITT=y | 1892 | CONFIG_CRC_CCITT=y |
1881 | CONFIG_CRC16=y | 1893 | CONFIG_CRC16=y |
1882 | # CONFIG_CRC_ITU_T is not set | 1894 | CONFIG_CRC_ITU_T=m |
1883 | CONFIG_CRC32=y | 1895 | CONFIG_CRC32=y |
1884 | # CONFIG_CRC7 is not set | 1896 | # CONFIG_CRC7 is not set |
1885 | CONFIG_LIBCRC32C=m | 1897 | CONFIG_LIBCRC32C=m |
@@ -1901,6 +1913,7 @@ CONFIG_HAVE_LMB=y | |||
1901 | # CONFIG_PRINTK_TIME is not set | 1913 | # CONFIG_PRINTK_TIME is not set |
1902 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1914 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1903 | CONFIG_ENABLE_MUST_CHECK=y | 1915 | CONFIG_ENABLE_MUST_CHECK=y |
1916 | CONFIG_FRAME_WARN=1024 | ||
1904 | CONFIG_MAGIC_SYSRQ=y | 1917 | CONFIG_MAGIC_SYSRQ=y |
1905 | # CONFIG_UNUSED_SYMBOLS is not set | 1918 | # CONFIG_UNUSED_SYMBOLS is not set |
1906 | # CONFIG_DEBUG_FS is not set | 1919 | # CONFIG_DEBUG_FS is not set |
@@ -1911,6 +1924,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1911 | CONFIG_SCHED_DEBUG=y | 1924 | CONFIG_SCHED_DEBUG=y |
1912 | # CONFIG_SCHEDSTATS is not set | 1925 | # CONFIG_SCHEDSTATS is not set |
1913 | # CONFIG_TIMER_STATS is not set | 1926 | # CONFIG_TIMER_STATS is not set |
1927 | # CONFIG_DEBUG_OBJECTS is not set | ||
1914 | # CONFIG_SLUB_DEBUG_ON is not set | 1928 | # CONFIG_SLUB_DEBUG_ON is not set |
1915 | # CONFIG_SLUB_STATS is not set | 1929 | # CONFIG_SLUB_STATS is not set |
1916 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1930 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1923,6 +1937,7 @@ CONFIG_SCHED_DEBUG=y | |||
1923 | CONFIG_DEBUG_BUGVERBOSE=y | 1937 | CONFIG_DEBUG_BUGVERBOSE=y |
1924 | # CONFIG_DEBUG_INFO is not set | 1938 | # CONFIG_DEBUG_INFO is not set |
1925 | # CONFIG_DEBUG_VM is not set | 1939 | # CONFIG_DEBUG_VM is not set |
1940 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1926 | # CONFIG_DEBUG_LIST is not set | 1941 | # CONFIG_DEBUG_LIST is not set |
1927 | # CONFIG_DEBUG_SG is not set | 1942 | # CONFIG_DEBUG_SG is not set |
1928 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1943 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1936,6 +1951,7 @@ CONFIG_DEBUGGER=y | |||
1936 | CONFIG_XMON=y | 1951 | CONFIG_XMON=y |
1937 | CONFIG_XMON_DEFAULT=y | 1952 | CONFIG_XMON_DEFAULT=y |
1938 | CONFIG_XMON_DISASSEMBLY=y | 1953 | CONFIG_XMON_DISASSEMBLY=y |
1954 | CONFIG_IRQSTACKS=y | ||
1939 | # CONFIG_BDI_SWITCH is not set | 1955 | # CONFIG_BDI_SWITCH is not set |
1940 | CONFIG_BOOTX_TEXT=y | 1956 | CONFIG_BOOTX_TEXT=y |
1941 | # CONFIG_PPC_EARLY_DEBUG is not set | 1957 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1947,54 +1963,84 @@ CONFIG_BOOTX_TEXT=y | |||
1947 | # CONFIG_SECURITY is not set | 1963 | # CONFIG_SECURITY is not set |
1948 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1964 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1949 | CONFIG_CRYPTO=y | 1965 | CONFIG_CRYPTO=y |
1966 | |||
1967 | # | ||
1968 | # Crypto core or helper | ||
1969 | # | ||
1950 | CONFIG_CRYPTO_ALGAPI=y | 1970 | CONFIG_CRYPTO_ALGAPI=y |
1951 | CONFIG_CRYPTO_AEAD=y | 1971 | CONFIG_CRYPTO_AEAD=y |
1952 | CONFIG_CRYPTO_BLKCIPHER=y | 1972 | CONFIG_CRYPTO_BLKCIPHER=y |
1953 | # CONFIG_CRYPTO_SEQIV is not set | ||
1954 | CONFIG_CRYPTO_HASH=y | 1973 | CONFIG_CRYPTO_HASH=y |
1955 | CONFIG_CRYPTO_MANAGER=y | 1974 | CONFIG_CRYPTO_MANAGER=y |
1975 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1976 | CONFIG_CRYPTO_NULL=m | ||
1977 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1978 | CONFIG_CRYPTO_AUTHENC=y | ||
1979 | # CONFIG_CRYPTO_TEST is not set | ||
1980 | |||
1981 | # | ||
1982 | # Authenticated Encryption with Associated Data | ||
1983 | # | ||
1984 | # CONFIG_CRYPTO_CCM is not set | ||
1985 | # CONFIG_CRYPTO_GCM is not set | ||
1986 | # CONFIG_CRYPTO_SEQIV is not set | ||
1987 | |||
1988 | # | ||
1989 | # Block modes | ||
1990 | # | ||
1991 | CONFIG_CRYPTO_CBC=y | ||
1992 | # CONFIG_CRYPTO_CTR is not set | ||
1993 | # CONFIG_CRYPTO_CTS is not set | ||
1994 | CONFIG_CRYPTO_ECB=m | ||
1995 | # CONFIG_CRYPTO_LRW is not set | ||
1996 | CONFIG_CRYPTO_PCBC=m | ||
1997 | # CONFIG_CRYPTO_XTS is not set | ||
1998 | |||
1999 | # | ||
2000 | # Hash modes | ||
2001 | # | ||
1956 | CONFIG_CRYPTO_HMAC=y | 2002 | CONFIG_CRYPTO_HMAC=y |
1957 | # CONFIG_CRYPTO_XCBC is not set | 2003 | # CONFIG_CRYPTO_XCBC is not set |
1958 | CONFIG_CRYPTO_NULL=m | 2004 | |
2005 | # | ||
2006 | # Digest | ||
2007 | # | ||
2008 | CONFIG_CRYPTO_CRC32C=m | ||
1959 | CONFIG_CRYPTO_MD4=m | 2009 | CONFIG_CRYPTO_MD4=m |
1960 | CONFIG_CRYPTO_MD5=y | 2010 | CONFIG_CRYPTO_MD5=y |
2011 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1961 | CONFIG_CRYPTO_SHA1=y | 2012 | CONFIG_CRYPTO_SHA1=y |
1962 | CONFIG_CRYPTO_SHA256=m | 2013 | CONFIG_CRYPTO_SHA256=m |
1963 | CONFIG_CRYPTO_SHA512=m | 2014 | CONFIG_CRYPTO_SHA512=m |
1964 | CONFIG_CRYPTO_WP512=m | ||
1965 | CONFIG_CRYPTO_TGR192=m | 2015 | CONFIG_CRYPTO_TGR192=m |
1966 | # CONFIG_CRYPTO_GF128MUL is not set | 2016 | CONFIG_CRYPTO_WP512=m |
1967 | CONFIG_CRYPTO_ECB=m | 2017 | |
1968 | CONFIG_CRYPTO_CBC=y | 2018 | # |
1969 | CONFIG_CRYPTO_PCBC=m | 2019 | # Ciphers |
1970 | # CONFIG_CRYPTO_LRW is not set | 2020 | # |
1971 | # CONFIG_CRYPTO_XTS is not set | ||
1972 | # CONFIG_CRYPTO_CTR is not set | ||
1973 | # CONFIG_CRYPTO_GCM is not set | ||
1974 | # CONFIG_CRYPTO_CCM is not set | ||
1975 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1976 | CONFIG_CRYPTO_DES=y | ||
1977 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1978 | CONFIG_CRYPTO_BLOWFISH=m | ||
1979 | CONFIG_CRYPTO_TWOFISH=m | ||
1980 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1981 | CONFIG_CRYPTO_SERPENT=m | ||
1982 | CONFIG_CRYPTO_AES=m | 2021 | CONFIG_CRYPTO_AES=m |
2022 | CONFIG_CRYPTO_ANUBIS=m | ||
2023 | CONFIG_CRYPTO_ARC4=m | ||
2024 | CONFIG_CRYPTO_BLOWFISH=m | ||
2025 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1983 | CONFIG_CRYPTO_CAST5=m | 2026 | CONFIG_CRYPTO_CAST5=m |
1984 | CONFIG_CRYPTO_CAST6=m | 2027 | CONFIG_CRYPTO_CAST6=m |
1985 | CONFIG_CRYPTO_TEA=m | 2028 | CONFIG_CRYPTO_DES=y |
1986 | CONFIG_CRYPTO_ARC4=m | 2029 | # CONFIG_CRYPTO_FCRYPT is not set |
1987 | CONFIG_CRYPTO_KHAZAD=m | 2030 | CONFIG_CRYPTO_KHAZAD=m |
1988 | CONFIG_CRYPTO_ANUBIS=m | ||
1989 | # CONFIG_CRYPTO_SEED is not set | ||
1990 | # CONFIG_CRYPTO_SALSA20 is not set | 2031 | # CONFIG_CRYPTO_SALSA20 is not set |
2032 | # CONFIG_CRYPTO_SEED is not set | ||
2033 | CONFIG_CRYPTO_SERPENT=m | ||
2034 | CONFIG_CRYPTO_TEA=m | ||
2035 | CONFIG_CRYPTO_TWOFISH=m | ||
2036 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
2037 | |||
2038 | # | ||
2039 | # Compression | ||
2040 | # | ||
1991 | CONFIG_CRYPTO_DEFLATE=m | 2041 | CONFIG_CRYPTO_DEFLATE=m |
1992 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1993 | CONFIG_CRYPTO_CRC32C=m | ||
1994 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1995 | # CONFIG_CRYPTO_TEST is not set | ||
1996 | CONFIG_CRYPTO_AUTHENC=y | ||
1997 | # CONFIG_CRYPTO_LZO is not set | 2042 | # CONFIG_CRYPTO_LZO is not set |
1998 | CONFIG_CRYPTO_HW=y | 2043 | CONFIG_CRYPTO_HW=y |
1999 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 2044 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
2000 | # CONFIG_PPC_CLOCK is not set | 2045 | # CONFIG_PPC_CLOCK is not set |
2046 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 970282b1a004..ce250bc98584 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_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-rc6 | 3 | # Linux kernel version: 2.6.26-rc6 |
4 | # Thu Mar 27 13:56:24 2008 | 4 | # Mon Jun 16 21:11:19 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -82,6 +85,7 @@ CONFIG_LOG_BUF_SHIFT=17 | |||
82 | CONFIG_CGROUPS=y | 85 | CONFIG_CGROUPS=y |
83 | # CONFIG_CGROUP_DEBUG is not set | 86 | # CONFIG_CGROUP_DEBUG is not set |
84 | # CONFIG_CGROUP_NS is not set | 87 | # CONFIG_CGROUP_NS is not set |
88 | # CONFIG_CGROUP_DEVICE is not set | ||
85 | CONFIG_CPUSETS=y | 89 | CONFIG_CPUSETS=y |
86 | # CONFIG_GROUP_SCHED is not set | 90 | # CONFIG_GROUP_SCHED is not set |
87 | # CONFIG_CGROUP_CPUACCT is not set | 91 | # CONFIG_CGROUP_CPUACCT is not set |
@@ -101,6 +105,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
101 | CONFIG_SYSCTL=y | 105 | CONFIG_SYSCTL=y |
102 | # CONFIG_EMBEDDED is not set | 106 | # CONFIG_EMBEDDED is not set |
103 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
104 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
105 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
106 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -108,6 +113,7 @@ CONFIG_HOTPLUG=y | |||
108 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
109 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
110 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
116 | CONFIG_PCSPKR_PLATFORM=y | ||
111 | # CONFIG_COMPAT_BRK is not set | 117 | # CONFIG_COMPAT_BRK is not set |
112 | CONFIG_BASE_FULL=y | 118 | CONFIG_BASE_FULL=y |
113 | CONFIG_FUTEX=y | 119 | CONFIG_FUTEX=y |
@@ -129,12 +135,14 @@ CONFIG_HAVE_OPROFILE=y | |||
129 | # CONFIG_KPROBES is not set | 135 | # CONFIG_KPROBES is not set |
130 | CONFIG_HAVE_KPROBES=y | 136 | CONFIG_HAVE_KPROBES=y |
131 | CONFIG_HAVE_KRETPROBES=y | 137 | CONFIG_HAVE_KRETPROBES=y |
138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
132 | CONFIG_PROC_PAGE_MONITOR=y | 139 | CONFIG_PROC_PAGE_MONITOR=y |
133 | CONFIG_SLABINFO=y | 140 | CONFIG_SLABINFO=y |
134 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
135 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
136 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
137 | CONFIG_MODULES=y | 144 | CONFIG_MODULES=y |
145 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
138 | CONFIG_MODULE_UNLOAD=y | 146 | CONFIG_MODULE_UNLOAD=y |
139 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 147 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
140 | CONFIG_MODVERSIONS=y | 148 | CONFIG_MODVERSIONS=y |
@@ -194,11 +202,11 @@ CONFIG_PPC_PASEMI=y | |||
194 | CONFIG_PPC_PASEMI_IOMMU=y | 202 | CONFIG_PPC_PASEMI_IOMMU=y |
195 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set | 203 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set |
196 | CONFIG_PPC_PASEMI_MDIO=y | 204 | CONFIG_PPC_PASEMI_MDIO=y |
197 | CONFIG_PPC_CELLEB=y | ||
198 | # CONFIG_PPC_PS3 is not set | 205 | # CONFIG_PPC_PS3 is not set |
199 | CONFIG_PPC_CELL=y | 206 | CONFIG_PPC_CELL=y |
200 | CONFIG_PPC_CELL_NATIVE=y | 207 | CONFIG_PPC_CELL_NATIVE=y |
201 | CONFIG_PPC_IBM_CELL_BLADE=y | 208 | CONFIG_PPC_IBM_CELL_BLADE=y |
209 | CONFIG_PPC_CELLEB=y | ||
202 | 210 | ||
203 | # | 211 | # |
204 | # Cell Broadband Engine options | 212 | # Cell Broadband Engine options |
@@ -241,6 +249,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
241 | CONFIG_CPU_FREQ_STAT=y | 249 | CONFIG_CPU_FREQ_STAT=y |
242 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 250 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
243 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 251 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
252 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
244 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 253 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
245 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 254 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
246 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 255 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
@@ -277,7 +286,6 @@ CONFIG_PREEMPT_NONE=y | |||
277 | CONFIG_BINFMT_ELF=y | 286 | CONFIG_BINFMT_ELF=y |
278 | CONFIG_COMPAT_BINFMT_ELF=y | 287 | CONFIG_COMPAT_BINFMT_ELF=y |
279 | CONFIG_BINFMT_MISC=m | 288 | CONFIG_BINFMT_MISC=m |
280 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
281 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 289 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
282 | CONFIG_IOMMU_VMERGE=y | 290 | CONFIG_IOMMU_VMERGE=y |
283 | CONFIG_IOMMU_HELPER=y | 291 | CONFIG_IOMMU_HELPER=y |
@@ -307,6 +315,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | |||
307 | CONFIG_SPARSEMEM_VMEMMAP=y | 315 | CONFIG_SPARSEMEM_VMEMMAP=y |
308 | CONFIG_MEMORY_HOTPLUG=y | 316 | CONFIG_MEMORY_HOTPLUG=y |
309 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | 317 | CONFIG_MEMORY_HOTPLUG_SPARSE=y |
318 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
310 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 319 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
311 | CONFIG_RESOURCES_64BIT=y | 320 | CONFIG_RESOURCES_64BIT=y |
312 | CONFIG_ZONE_DMA_FLAG=1 | 321 | CONFIG_ZONE_DMA_FLAG=1 |
@@ -314,6 +323,7 @@ CONFIG_BOUNCE=y | |||
314 | CONFIG_ARCH_MEMORY_PROBE=y | 323 | CONFIG_ARCH_MEMORY_PROBE=y |
315 | CONFIG_PPC_HAS_HASH_64K=y | 324 | CONFIG_PPC_HAS_HASH_64K=y |
316 | # CONFIG_PPC_64K_PAGES is not set | 325 | # CONFIG_PPC_64K_PAGES is not set |
326 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
317 | # CONFIG_SCHED_SMT is not set | 327 | # CONFIG_SCHED_SMT is not set |
318 | CONFIG_PROC_DEVICETREE=y | 328 | CONFIG_PROC_DEVICETREE=y |
319 | # CONFIG_CMDLINE_BOOL is not set | 329 | # CONFIG_CMDLINE_BOOL is not set |
@@ -356,7 +366,10 @@ CONFIG_HOTPLUG_PCI=m | |||
356 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 366 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
357 | CONFIG_HOTPLUG_PCI_RPA=m | 367 | CONFIG_HOTPLUG_PCI_RPA=m |
358 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | 368 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m |
369 | # CONFIG_HAS_RAPIDIO is not set | ||
370 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
359 | CONFIG_KERNEL_START=0xc000000000000000 | 371 | CONFIG_KERNEL_START=0xc000000000000000 |
372 | CONFIG_PHYSICAL_START=0x00000000 | ||
360 | 373 | ||
361 | # | 374 | # |
362 | # Networking | 375 | # Networking |
@@ -406,8 +419,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
406 | # CONFIG_TCP_MD5SIG is not set | 419 | # CONFIG_TCP_MD5SIG is not set |
407 | # CONFIG_IP_VS is not set | 420 | # CONFIG_IP_VS is not set |
408 | # CONFIG_IPV6 is not set | 421 | # CONFIG_IPV6 is not set |
409 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
410 | # CONFIG_INET6_TUNNEL is not set | ||
411 | # CONFIG_NETWORK_SECMARK is not set | 422 | # CONFIG_NETWORK_SECMARK is not set |
412 | CONFIG_NETFILTER=y | 423 | CONFIG_NETFILTER=y |
413 | # CONFIG_NETFILTER_DEBUG is not set | 424 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -423,6 +434,7 @@ CONFIG_NF_CONNTRACK=m | |||
423 | CONFIG_NF_CT_ACCT=y | 434 | CONFIG_NF_CT_ACCT=y |
424 | CONFIG_NF_CONNTRACK_MARK=y | 435 | CONFIG_NF_CONNTRACK_MARK=y |
425 | CONFIG_NF_CONNTRACK_EVENTS=y | 436 | CONFIG_NF_CONNTRACK_EVENTS=y |
437 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
426 | CONFIG_NF_CT_PROTO_GRE=m | 438 | CONFIG_NF_CT_PROTO_GRE=m |
427 | CONFIG_NF_CT_PROTO_SCTP=m | 439 | CONFIG_NF_CT_PROTO_SCTP=m |
428 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 440 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
@@ -501,6 +513,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m | |||
501 | CONFIG_IP_NF_TARGET_NETMAP=m | 513 | CONFIG_IP_NF_TARGET_NETMAP=m |
502 | CONFIG_NF_NAT_SNMP_BASIC=m | 514 | CONFIG_NF_NAT_SNMP_BASIC=m |
503 | CONFIG_NF_NAT_PROTO_GRE=m | 515 | CONFIG_NF_NAT_PROTO_GRE=m |
516 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
504 | CONFIG_NF_NAT_FTP=m | 517 | CONFIG_NF_NAT_FTP=m |
505 | CONFIG_NF_NAT_IRC=m | 518 | CONFIG_NF_NAT_IRC=m |
506 | CONFIG_NF_NAT_TFTP=m | 519 | CONFIG_NF_NAT_TFTP=m |
@@ -571,6 +584,7 @@ CONFIG_FW_LOADER=y | |||
571 | # CONFIG_CONNECTOR is not set | 584 | # CONFIG_CONNECTOR is not set |
572 | # CONFIG_MTD is not set | 585 | # CONFIG_MTD is not set |
573 | CONFIG_OF_DEVICE=y | 586 | CONFIG_OF_DEVICE=y |
587 | CONFIG_OF_I2C=y | ||
574 | # CONFIG_PARPORT is not set | 588 | # CONFIG_PARPORT is not set |
575 | CONFIG_BLK_DEV=y | 589 | CONFIG_BLK_DEV=y |
576 | CONFIG_BLK_DEV_FD=y | 590 | CONFIG_BLK_DEV_FD=y |
@@ -618,7 +632,6 @@ CONFIG_IDE_PROC_FS=y | |||
618 | # | 632 | # |
619 | # IDE chipset support/bugfixes | 633 | # IDE chipset support/bugfixes |
620 | # | 634 | # |
621 | CONFIG_IDE_GENERIC=y | ||
622 | # CONFIG_BLK_DEV_PLATFORM is not set | 635 | # CONFIG_BLK_DEV_PLATFORM is not set |
623 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 636 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
624 | 637 | ||
@@ -661,7 +674,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
661 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 674 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
662 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 675 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
663 | CONFIG_BLK_DEV_IDEDMA=y | 676 | CONFIG_BLK_DEV_IDEDMA=y |
664 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 677 | # CONFIG_BLK_DEV_HD_ONLY is not set |
665 | # CONFIG_BLK_DEV_HD is not set | 678 | # CONFIG_BLK_DEV_HD is not set |
666 | 679 | ||
667 | # | 680 | # |
@@ -747,17 +760,19 @@ CONFIG_SCSI_DEBUG=m | |||
747 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 760 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
748 | CONFIG_ATA=y | 761 | CONFIG_ATA=y |
749 | CONFIG_ATA_NONSTANDARD=y | 762 | CONFIG_ATA_NONSTANDARD=y |
763 | CONFIG_SATA_PMP=y | ||
750 | # CONFIG_SATA_AHCI is not set | 764 | # CONFIG_SATA_AHCI is not set |
765 | CONFIG_SATA_SIL24=y | ||
766 | CONFIG_ATA_SFF=y | ||
751 | CONFIG_SATA_SVW=y | 767 | CONFIG_SATA_SVW=y |
752 | # CONFIG_ATA_PIIX is not set | 768 | # CONFIG_ATA_PIIX is not set |
753 | CONFIG_SATA_MV=y | 769 | # CONFIG_SATA_MV is not set |
754 | # CONFIG_SATA_NV is not set | 770 | # CONFIG_SATA_NV is not set |
755 | # CONFIG_PDC_ADMA is not set | 771 | # CONFIG_PDC_ADMA is not set |
756 | # CONFIG_SATA_QSTOR is not set | 772 | # CONFIG_SATA_QSTOR is not set |
757 | # CONFIG_SATA_PROMISE is not set | 773 | # CONFIG_SATA_PROMISE is not set |
758 | # CONFIG_SATA_SX4 is not set | 774 | # CONFIG_SATA_SX4 is not set |
759 | # CONFIG_SATA_SIL is not set | 775 | # CONFIG_SATA_SIL is not set |
760 | CONFIG_SATA_SIL24=y | ||
761 | # CONFIG_SATA_SIS is not set | 776 | # CONFIG_SATA_SIS is not set |
762 | # CONFIG_SATA_ULI is not set | 777 | # CONFIG_SATA_ULI is not set |
763 | # CONFIG_SATA_VIA is not set | 778 | # CONFIG_SATA_VIA is not set |
@@ -791,7 +806,7 @@ CONFIG_SATA_SIL24=y | |||
791 | # CONFIG_PATA_NS87415 is not set | 806 | # CONFIG_PATA_NS87415 is not set |
792 | # CONFIG_PATA_OPTI is not set | 807 | # CONFIG_PATA_OPTI is not set |
793 | # CONFIG_PATA_OPTIDMA is not set | 808 | # CONFIG_PATA_OPTIDMA is not set |
794 | CONFIG_PATA_PCMCIA=y | 809 | # CONFIG_PATA_PCMCIA is not set |
795 | # CONFIG_PATA_PDC_OLD is not set | 810 | # CONFIG_PATA_PDC_OLD is not set |
796 | # CONFIG_PATA_RADISYS is not set | 811 | # CONFIG_PATA_RADISYS is not set |
797 | # CONFIG_PATA_RZ1000 is not set | 812 | # CONFIG_PATA_RZ1000 is not set |
@@ -801,10 +816,10 @@ CONFIG_PATA_PCMCIA=y | |||
801 | # CONFIG_PATA_SIL680 is not set | 816 | # CONFIG_PATA_SIL680 is not set |
802 | # CONFIG_PATA_SIS is not set | 817 | # CONFIG_PATA_SIS is not set |
803 | # CONFIG_PATA_VIA is not set | 818 | # CONFIG_PATA_VIA is not set |
804 | CONFIG_PATA_WINBOND=y | 819 | # CONFIG_PATA_WINBOND is not set |
805 | CONFIG_PATA_PLATFORM=y | 820 | # CONFIG_PATA_PLATFORM is not set |
806 | # CONFIG_PATA_OF_PLATFORM is not set | 821 | # CONFIG_PATA_SCC is not set |
807 | CONFIG_PATA_SCC=y | 822 | # CONFIG_PATA_SCH is not set |
808 | CONFIG_MD=y | 823 | CONFIG_MD=y |
809 | CONFIG_BLK_DEV_MD=y | 824 | CONFIG_BLK_DEV_MD=y |
810 | CONFIG_MD_LINEAR=y | 825 | CONFIG_MD_LINEAR=y |
@@ -866,6 +881,7 @@ CONFIG_WINDFARM=y | |||
866 | CONFIG_WINDFARM_PM81=y | 881 | CONFIG_WINDFARM_PM81=y |
867 | CONFIG_WINDFARM_PM91=y | 882 | CONFIG_WINDFARM_PM91=y |
868 | CONFIG_WINDFARM_PM112=y | 883 | CONFIG_WINDFARM_PM112=y |
884 | CONFIG_WINDFARM_PM121=y | ||
869 | # CONFIG_PMAC_RACKMETER is not set | 885 | # CONFIG_PMAC_RACKMETER is not set |
870 | CONFIG_NETDEVICES=y | 886 | CONFIG_NETDEVICES=y |
871 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 887 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
@@ -911,7 +927,6 @@ CONFIG_IBM_NEW_EMAC_TAH=y | |||
911 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 927 | CONFIG_IBM_NEW_EMAC_EMAC4=y |
912 | CONFIG_NET_PCI=y | 928 | CONFIG_NET_PCI=y |
913 | CONFIG_PCNET32=y | 929 | CONFIG_PCNET32=y |
914 | # CONFIG_PCNET32_NAPI is not set | ||
915 | # CONFIG_AMD8111_ETH is not set | 930 | # CONFIG_AMD8111_ETH is not set |
916 | # CONFIG_ADAPTEC_STARFIRE is not set | 931 | # CONFIG_ADAPTEC_STARFIRE is not set |
917 | # CONFIG_B44 is not set | 932 | # CONFIG_B44 is not set |
@@ -947,7 +962,6 @@ CONFIG_E1000=y | |||
947 | # CONFIG_SIS190 is not set | 962 | # CONFIG_SIS190 is not set |
948 | # CONFIG_SKGE is not set | 963 | # CONFIG_SKGE is not set |
949 | # CONFIG_SKY2 is not set | 964 | # CONFIG_SKY2 is not set |
950 | # CONFIG_SK98LIN is not set | ||
951 | # CONFIG_VIA_VELOCITY is not set | 965 | # CONFIG_VIA_VELOCITY is not set |
952 | CONFIG_TIGON3=y | 966 | CONFIG_TIGON3=y |
953 | # CONFIG_BNX2 is not set | 967 | # CONFIG_BNX2 is not set |
@@ -969,6 +983,7 @@ CONFIG_PASEMI_MAC=y | |||
969 | # CONFIG_MLX4_CORE is not set | 983 | # CONFIG_MLX4_CORE is not set |
970 | # CONFIG_TEHUTI is not set | 984 | # CONFIG_TEHUTI is not set |
971 | # CONFIG_BNX2X is not set | 985 | # CONFIG_BNX2X is not set |
986 | # CONFIG_SFC is not set | ||
972 | CONFIG_TR=y | 987 | CONFIG_TR=y |
973 | CONFIG_IBMOL=y | 988 | CONFIG_IBMOL=y |
974 | # CONFIG_3C359 is not set | 989 | # CONFIG_3C359 is not set |
@@ -979,6 +994,7 @@ CONFIG_IBMOL=y | |||
979 | # | 994 | # |
980 | # CONFIG_WLAN_PRE80211 is not set | 995 | # CONFIG_WLAN_PRE80211 is not set |
981 | # CONFIG_WLAN_80211 is not set | 996 | # CONFIG_WLAN_80211 is not set |
997 | # CONFIG_IWLWIFI_LEDS is not set | ||
982 | 998 | ||
983 | # | 999 | # |
984 | # USB Network Adapters | 1000 | # USB Network Adapters |
@@ -1083,6 +1099,7 @@ CONFIG_VT=y | |||
1083 | CONFIG_VT_CONSOLE=y | 1099 | CONFIG_VT_CONSOLE=y |
1084 | CONFIG_HW_CONSOLE=y | 1100 | CONFIG_HW_CONSOLE=y |
1085 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1101 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
1102 | CONFIG_DEVKMEM=y | ||
1086 | # CONFIG_SERIAL_NONSTANDARD is not set | 1103 | # CONFIG_SERIAL_NONSTANDARD is not set |
1087 | # CONFIG_NOZOMI is not set | 1104 | # CONFIG_NOZOMI is not set |
1088 | 1105 | ||
@@ -1121,8 +1138,6 @@ CONFIG_HVC_BEAT=y | |||
1121 | CONFIG_HVCS=m | 1138 | CONFIG_HVCS=m |
1122 | # CONFIG_IPMI_HANDLER is not set | 1139 | # CONFIG_IPMI_HANDLER is not set |
1123 | # CONFIG_HW_RANDOM is not set | 1140 | # CONFIG_HW_RANDOM is not set |
1124 | CONFIG_GEN_RTC=y | ||
1125 | # CONFIG_GEN_RTC_X is not set | ||
1126 | # CONFIG_R3964 is not set | 1141 | # CONFIG_R3964 is not set |
1127 | # CONFIG_APPLICOM is not set | 1142 | # CONFIG_APPLICOM is not set |
1128 | 1143 | ||
@@ -1141,13 +1156,7 @@ CONFIG_DEVPORT=y | |||
1141 | CONFIG_I2C=y | 1156 | CONFIG_I2C=y |
1142 | CONFIG_I2C_BOARDINFO=y | 1157 | CONFIG_I2C_BOARDINFO=y |
1143 | CONFIG_I2C_CHARDEV=y | 1158 | CONFIG_I2C_CHARDEV=y |
1144 | |||
1145 | # | ||
1146 | # I2C Algorithms | ||
1147 | # | ||
1148 | CONFIG_I2C_ALGOBIT=y | 1159 | CONFIG_I2C_ALGOBIT=y |
1149 | # CONFIG_I2C_ALGOPCF is not set | ||
1150 | # CONFIG_I2C_ALGOPCA is not set | ||
1151 | 1160 | ||
1152 | # | 1161 | # |
1153 | # I2C Hardware Bus support | 1162 | # I2C Hardware Bus support |
@@ -1177,6 +1186,7 @@ CONFIG_I2C_PASEMI=y | |||
1177 | # CONFIG_I2C_VIA is not set | 1186 | # CONFIG_I2C_VIA is not set |
1178 | # CONFIG_I2C_VIAPRO is not set | 1187 | # CONFIG_I2C_VIAPRO is not set |
1179 | # CONFIG_I2C_VOODOO3 is not set | 1188 | # CONFIG_I2C_VOODOO3 is not set |
1189 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1180 | 1190 | ||
1181 | # | 1191 | # |
1182 | # Miscellaneous I2C Chip support | 1192 | # Miscellaneous I2C Chip support |
@@ -1186,19 +1196,13 @@ CONFIG_I2C_PASEMI=y | |||
1186 | # CONFIG_SENSORS_PCF8574 is not set | 1196 | # CONFIG_SENSORS_PCF8574 is not set |
1187 | # CONFIG_PCF8575 is not set | 1197 | # CONFIG_PCF8575 is not set |
1188 | # CONFIG_SENSORS_PCF8591 is not set | 1198 | # CONFIG_SENSORS_PCF8591 is not set |
1189 | # CONFIG_TPS65010 is not set | ||
1190 | # CONFIG_SENSORS_MAX6875 is not set | 1199 | # CONFIG_SENSORS_MAX6875 is not set |
1191 | # CONFIG_SENSORS_TSL2550 is not set | 1200 | # CONFIG_SENSORS_TSL2550 is not set |
1192 | # CONFIG_I2C_DEBUG_CORE is not set | 1201 | # CONFIG_I2C_DEBUG_CORE is not set |
1193 | # CONFIG_I2C_DEBUG_ALGO is not set | 1202 | # CONFIG_I2C_DEBUG_ALGO is not set |
1194 | # CONFIG_I2C_DEBUG_BUS is not set | 1203 | # CONFIG_I2C_DEBUG_BUS is not set |
1195 | # CONFIG_I2C_DEBUG_CHIP is not set | 1204 | # CONFIG_I2C_DEBUG_CHIP is not set |
1196 | |||
1197 | # | ||
1198 | # SPI support | ||
1199 | # | ||
1200 | # CONFIG_SPI is not set | 1205 | # CONFIG_SPI is not set |
1201 | # CONFIG_SPI_MASTER is not set | ||
1202 | # CONFIG_W1 is not set | 1206 | # CONFIG_W1 is not set |
1203 | # CONFIG_POWER_SUPPLY is not set | 1207 | # CONFIG_POWER_SUPPLY is not set |
1204 | # CONFIG_HWMON is not set | 1208 | # CONFIG_HWMON is not set |
@@ -1215,12 +1219,22 @@ CONFIG_SSB_POSSIBLE=y | |||
1215 | # Multifunction device drivers | 1219 | # Multifunction device drivers |
1216 | # | 1220 | # |
1217 | # CONFIG_MFD_SM501 is not set | 1221 | # CONFIG_MFD_SM501 is not set |
1222 | # CONFIG_HTC_PASIC3 is not set | ||
1218 | 1223 | ||
1219 | # | 1224 | # |
1220 | # Multimedia devices | 1225 | # Multimedia devices |
1221 | # | 1226 | # |
1227 | |||
1228 | # | ||
1229 | # Multimedia core support | ||
1230 | # | ||
1222 | # CONFIG_VIDEO_DEV is not set | 1231 | # CONFIG_VIDEO_DEV is not set |
1223 | # CONFIG_DVB_CORE is not set | 1232 | # CONFIG_DVB_CORE is not set |
1233 | # CONFIG_VIDEO_MEDIA is not set | ||
1234 | |||
1235 | # | ||
1236 | # Multimedia drivers | ||
1237 | # | ||
1224 | # CONFIG_DAB is not set | 1238 | # CONFIG_DAB is not set |
1225 | 1239 | ||
1226 | # | 1240 | # |
@@ -1240,8 +1254,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1240 | # CONFIG_FB_SYS_FILLRECT is not set | 1254 | # CONFIG_FB_SYS_FILLRECT is not set |
1241 | # CONFIG_FB_SYS_COPYAREA is not set | 1255 | # CONFIG_FB_SYS_COPYAREA is not set |
1242 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1256 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1257 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1243 | # CONFIG_FB_SYS_FOPS is not set | 1258 | # CONFIG_FB_SYS_FOPS is not set |
1244 | CONFIG_FB_DEFERRED_IO=y | ||
1245 | # CONFIG_FB_SVGALIB is not set | 1259 | # CONFIG_FB_SVGALIB is not set |
1246 | CONFIG_FB_MACMODES=y | 1260 | CONFIG_FB_MACMODES=y |
1247 | CONFIG_FB_BACKLIGHT=y | 1261 | CONFIG_FB_BACKLIGHT=y |
@@ -1363,6 +1377,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1363 | # CONFIG_SND_AU8810 is not set | 1377 | # CONFIG_SND_AU8810 is not set |
1364 | # CONFIG_SND_AU8820 is not set | 1378 | # CONFIG_SND_AU8820 is not set |
1365 | # CONFIG_SND_AU8830 is not set | 1379 | # CONFIG_SND_AU8830 is not set |
1380 | # CONFIG_SND_AW2 is not set | ||
1366 | # CONFIG_SND_AZT3328 is not set | 1381 | # CONFIG_SND_AZT3328 is not set |
1367 | # CONFIG_SND_BT87X is not set | 1382 | # CONFIG_SND_BT87X is not set |
1368 | # CONFIG_SND_CA0106 is not set | 1383 | # CONFIG_SND_CA0106 is not set |
@@ -1455,11 +1470,11 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m | |||
1455 | # CONFIG_SND_SOC is not set | 1470 | # CONFIG_SND_SOC is not set |
1456 | 1471 | ||
1457 | # | 1472 | # |
1458 | # SoC Audio support for SuperH | 1473 | # ALSA SoC audio for Freescale SOCs |
1459 | # | 1474 | # |
1460 | 1475 | ||
1461 | # | 1476 | # |
1462 | # ALSA SoC audio for Freescale SOCs | 1477 | # SoC Audio for the Texas Instruments OMAP |
1463 | # | 1478 | # |
1464 | 1479 | ||
1465 | # | 1480 | # |
@@ -1497,12 +1512,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1497 | # | 1512 | # |
1498 | # USB Host Controller Drivers | 1513 | # USB Host Controller Drivers |
1499 | # | 1514 | # |
1515 | # CONFIG_USB_C67X00_HCD is not set | ||
1500 | CONFIG_USB_EHCI_HCD=y | 1516 | CONFIG_USB_EHCI_HCD=y |
1501 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1517 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1502 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1518 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
1503 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | 1519 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y |
1504 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1520 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1505 | # CONFIG_USB_ISP116X_HCD is not set | 1521 | # CONFIG_USB_ISP116X_HCD is not set |
1522 | # CONFIG_USB_ISP1760_HCD is not set | ||
1506 | CONFIG_USB_OHCI_HCD=y | 1523 | CONFIG_USB_OHCI_HCD=y |
1507 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1524 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1508 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1525 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1517,6 +1534,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1517 | # | 1534 | # |
1518 | # CONFIG_USB_ACM is not set | 1535 | # CONFIG_USB_ACM is not set |
1519 | # CONFIG_USB_PRINTER is not set | 1536 | # CONFIG_USB_PRINTER is not set |
1537 | # CONFIG_USB_WDM is not set | ||
1520 | 1538 | ||
1521 | # | 1539 | # |
1522 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1540 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1538,6 +1556,7 @@ CONFIG_USB_STORAGE=m | |||
1538 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1556 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1539 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1557 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1540 | # CONFIG_USB_STORAGE_KARMA is not set | 1558 | # CONFIG_USB_STORAGE_KARMA is not set |
1559 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1541 | # CONFIG_USB_LIBUSUAL is not set | 1560 | # CONFIG_USB_LIBUSUAL is not set |
1542 | 1561 | ||
1543 | # | 1562 | # |
@@ -1575,10 +1594,12 @@ CONFIG_USB_APPLEDISPLAY=m | |||
1575 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1594 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1576 | # CONFIG_USB_IOWARRIOR is not set | 1595 | # CONFIG_USB_IOWARRIOR is not set |
1577 | # CONFIG_USB_TEST is not set | 1596 | # CONFIG_USB_TEST is not set |
1597 | # CONFIG_USB_ISIGHTFW is not set | ||
1578 | # CONFIG_USB_GADGET is not set | 1598 | # CONFIG_USB_GADGET is not set |
1579 | # CONFIG_MMC is not set | 1599 | # CONFIG_MMC is not set |
1580 | # CONFIG_MEMSTICK is not set | 1600 | # CONFIG_MEMSTICK is not set |
1581 | # CONFIG_NEW_LEDS is not set | 1601 | # CONFIG_NEW_LEDS is not set |
1602 | # CONFIG_ACCESSIBILITY is not set | ||
1582 | CONFIG_INFINIBAND=m | 1603 | CONFIG_INFINIBAND=m |
1583 | # CONFIG_INFINIBAND_USER_MAD is not set | 1604 | # CONFIG_INFINIBAND_USER_MAD is not set |
1584 | # CONFIG_INFINIBAND_USER_ACCESS is not set | 1605 | # CONFIG_INFINIBAND_USER_ACCESS is not set |
@@ -1607,10 +1628,6 @@ CONFIG_EDAC_PASEMI=y | |||
1607 | # CONFIG_EDAC_CELL is not set | 1628 | # CONFIG_EDAC_CELL is not set |
1608 | CONFIG_RTC_LIB=y | 1629 | CONFIG_RTC_LIB=y |
1609 | CONFIG_RTC_CLASS=y | 1630 | CONFIG_RTC_CLASS=y |
1610 | |||
1611 | # | ||
1612 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
1613 | # | ||
1614 | CONFIG_RTC_HCTOSYS=y | 1631 | CONFIG_RTC_HCTOSYS=y |
1615 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1632 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
1616 | # CONFIG_RTC_DEBUG is not set | 1633 | # CONFIG_RTC_DEBUG is not set |
@@ -1638,6 +1655,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1638 | # CONFIG_RTC_DRV_PCF8583 is not set | 1655 | # CONFIG_RTC_DRV_PCF8583 is not set |
1639 | # CONFIG_RTC_DRV_M41T80 is not set | 1656 | # CONFIG_RTC_DRV_M41T80 is not set |
1640 | # CONFIG_RTC_DRV_S35390A is not set | 1657 | # CONFIG_RTC_DRV_S35390A is not set |
1658 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1641 | 1659 | ||
1642 | # | 1660 | # |
1643 | # SPI RTC drivers | 1661 | # SPI RTC drivers |
@@ -1658,11 +1676,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
1658 | # | 1676 | # |
1659 | # on-CPU RTC drivers | 1677 | # on-CPU RTC drivers |
1660 | # | 1678 | # |
1679 | CONFIG_RTC_DRV_PPC=y | ||
1661 | # CONFIG_DMADEVICES is not set | 1680 | # CONFIG_DMADEVICES is not set |
1662 | |||
1663 | # | ||
1664 | # Userspace I/O | ||
1665 | # | ||
1666 | # CONFIG_UIO is not set | 1681 | # CONFIG_UIO is not set |
1667 | 1682 | ||
1668 | # | 1683 | # |
@@ -1696,9 +1711,9 @@ CONFIG_JFS_SECURITY=y | |||
1696 | CONFIG_FS_POSIX_ACL=y | 1711 | CONFIG_FS_POSIX_ACL=y |
1697 | CONFIG_XFS_FS=m | 1712 | CONFIG_XFS_FS=m |
1698 | # CONFIG_XFS_QUOTA is not set | 1713 | # CONFIG_XFS_QUOTA is not set |
1699 | CONFIG_XFS_SECURITY=y | ||
1700 | CONFIG_XFS_POSIX_ACL=y | 1714 | CONFIG_XFS_POSIX_ACL=y |
1701 | # CONFIG_XFS_RT is not set | 1715 | # CONFIG_XFS_RT is not set |
1716 | # CONFIG_XFS_DEBUG is not set | ||
1702 | # CONFIG_GFS2_FS is not set | 1717 | # CONFIG_GFS2_FS is not set |
1703 | # CONFIG_OCFS2_FS is not set | 1718 | # CONFIG_OCFS2_FS is not set |
1704 | CONFIG_DNOTIFY=y | 1719 | CONFIG_DNOTIFY=y |
@@ -1764,13 +1779,11 @@ CONFIG_NFS_FS=y | |||
1764 | CONFIG_NFS_V3=y | 1779 | CONFIG_NFS_V3=y |
1765 | CONFIG_NFS_V3_ACL=y | 1780 | CONFIG_NFS_V3_ACL=y |
1766 | CONFIG_NFS_V4=y | 1781 | CONFIG_NFS_V4=y |
1767 | # CONFIG_NFS_DIRECTIO is not set | ||
1768 | CONFIG_NFSD=m | 1782 | CONFIG_NFSD=m |
1769 | CONFIG_NFSD_V2_ACL=y | 1783 | CONFIG_NFSD_V2_ACL=y |
1770 | CONFIG_NFSD_V3=y | 1784 | CONFIG_NFSD_V3=y |
1771 | CONFIG_NFSD_V3_ACL=y | 1785 | CONFIG_NFSD_V3_ACL=y |
1772 | CONFIG_NFSD_V4=y | 1786 | CONFIG_NFSD_V4=y |
1773 | CONFIG_NFSD_TCP=y | ||
1774 | CONFIG_ROOT_NFS=y | 1787 | CONFIG_ROOT_NFS=y |
1775 | CONFIG_LOCKD=y | 1788 | CONFIG_LOCKD=y |
1776 | CONFIG_LOCKD_V4=y | 1789 | CONFIG_LOCKD_V4=y |
@@ -1862,9 +1875,10 @@ CONFIG_NLS_UTF8=m | |||
1862 | # Library routines | 1875 | # Library routines |
1863 | # | 1876 | # |
1864 | CONFIG_BITREVERSE=y | 1877 | CONFIG_BITREVERSE=y |
1878 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1865 | CONFIG_CRC_CCITT=m | 1879 | CONFIG_CRC_CCITT=m |
1866 | # CONFIG_CRC16 is not set | 1880 | # CONFIG_CRC16 is not set |
1867 | # CONFIG_CRC_ITU_T is not set | 1881 | CONFIG_CRC_ITU_T=m |
1868 | CONFIG_CRC32=y | 1882 | CONFIG_CRC32=y |
1869 | # CONFIG_CRC7 is not set | 1883 | # CONFIG_CRC7 is not set |
1870 | CONFIG_LIBCRC32C=m | 1884 | CONFIG_LIBCRC32C=m |
@@ -1888,6 +1902,7 @@ CONFIG_HAVE_LMB=y | |||
1888 | # CONFIG_PRINTK_TIME is not set | 1902 | # CONFIG_PRINTK_TIME is not set |
1889 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1903 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1890 | CONFIG_ENABLE_MUST_CHECK=y | 1904 | CONFIG_ENABLE_MUST_CHECK=y |
1905 | CONFIG_FRAME_WARN=2048 | ||
1891 | CONFIG_MAGIC_SYSRQ=y | 1906 | CONFIG_MAGIC_SYSRQ=y |
1892 | # CONFIG_UNUSED_SYMBOLS is not set | 1907 | # CONFIG_UNUSED_SYMBOLS is not set |
1893 | CONFIG_DEBUG_FS=y | 1908 | CONFIG_DEBUG_FS=y |
@@ -1898,18 +1913,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1898 | CONFIG_SCHED_DEBUG=y | 1913 | CONFIG_SCHED_DEBUG=y |
1899 | # CONFIG_SCHEDSTATS is not set | 1914 | # CONFIG_SCHEDSTATS is not set |
1900 | # CONFIG_TIMER_STATS is not set | 1915 | # CONFIG_TIMER_STATS is not set |
1916 | # CONFIG_DEBUG_OBJECTS is not set | ||
1901 | # CONFIG_SLUB_DEBUG_ON is not set | 1917 | # CONFIG_SLUB_DEBUG_ON is not set |
1902 | # CONFIG_SLUB_STATS is not set | 1918 | # CONFIG_SLUB_STATS is not set |
1903 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1919 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1904 | # CONFIG_RT_MUTEX_TESTER is not set | 1920 | # CONFIG_RT_MUTEX_TESTER is not set |
1905 | # CONFIG_DEBUG_SPINLOCK is not set | 1921 | # CONFIG_DEBUG_SPINLOCK is not set |
1906 | CONFIG_DEBUG_MUTEXES=y | 1922 | CONFIG_DEBUG_MUTEXES=y |
1923 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1924 | # CONFIG_PROVE_LOCKING is not set | ||
1925 | # CONFIG_LOCK_STAT is not set | ||
1907 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1926 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1908 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1927 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1909 | # CONFIG_DEBUG_KOBJECT is not set | 1928 | # CONFIG_DEBUG_KOBJECT is not set |
1910 | CONFIG_DEBUG_BUGVERBOSE=y | 1929 | CONFIG_DEBUG_BUGVERBOSE=y |
1911 | # CONFIG_DEBUG_INFO is not set | 1930 | # CONFIG_DEBUG_INFO is not set |
1912 | # CONFIG_DEBUG_VM is not set | 1931 | # CONFIG_DEBUG_VM is not set |
1932 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1913 | # CONFIG_DEBUG_LIST is not set | 1933 | # CONFIG_DEBUG_LIST is not set |
1914 | # CONFIG_DEBUG_SG is not set | 1934 | # CONFIG_DEBUG_SG is not set |
1915 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1935 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1941,53 +1961,83 @@ CONFIG_ASYNC_CORE=y | |||
1941 | CONFIG_ASYNC_MEMCPY=y | 1961 | CONFIG_ASYNC_MEMCPY=y |
1942 | CONFIG_ASYNC_XOR=y | 1962 | CONFIG_ASYNC_XOR=y |
1943 | CONFIG_CRYPTO=y | 1963 | CONFIG_CRYPTO=y |
1964 | |||
1965 | # | ||
1966 | # Crypto core or helper | ||
1967 | # | ||
1944 | CONFIG_CRYPTO_ALGAPI=y | 1968 | CONFIG_CRYPTO_ALGAPI=y |
1945 | CONFIG_CRYPTO_AEAD=m | 1969 | CONFIG_CRYPTO_AEAD=m |
1946 | CONFIG_CRYPTO_BLKCIPHER=y | 1970 | CONFIG_CRYPTO_BLKCIPHER=y |
1947 | CONFIG_CRYPTO_SEQIV=m | ||
1948 | CONFIG_CRYPTO_HASH=y | 1971 | CONFIG_CRYPTO_HASH=y |
1949 | CONFIG_CRYPTO_MANAGER=y | 1972 | CONFIG_CRYPTO_MANAGER=y |
1973 | CONFIG_CRYPTO_GF128MUL=m | ||
1974 | CONFIG_CRYPTO_NULL=m | ||
1975 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1976 | CONFIG_CRYPTO_AUTHENC=m | ||
1977 | CONFIG_CRYPTO_TEST=m | ||
1978 | |||
1979 | # | ||
1980 | # Authenticated Encryption with Associated Data | ||
1981 | # | ||
1982 | CONFIG_CRYPTO_CCM=m | ||
1983 | CONFIG_CRYPTO_GCM=m | ||
1984 | CONFIG_CRYPTO_SEQIV=m | ||
1985 | |||
1986 | # | ||
1987 | # Block modes | ||
1988 | # | ||
1989 | CONFIG_CRYPTO_CBC=y | ||
1990 | CONFIG_CRYPTO_CTR=m | ||
1991 | # CONFIG_CRYPTO_CTS is not set | ||
1992 | CONFIG_CRYPTO_ECB=m | ||
1993 | # CONFIG_CRYPTO_LRW is not set | ||
1994 | CONFIG_CRYPTO_PCBC=m | ||
1995 | # CONFIG_CRYPTO_XTS is not set | ||
1996 | |||
1997 | # | ||
1998 | # Hash modes | ||
1999 | # | ||
1950 | CONFIG_CRYPTO_HMAC=y | 2000 | CONFIG_CRYPTO_HMAC=y |
1951 | # CONFIG_CRYPTO_XCBC is not set | 2001 | # CONFIG_CRYPTO_XCBC is not set |
1952 | CONFIG_CRYPTO_NULL=m | 2002 | |
2003 | # | ||
2004 | # Digest | ||
2005 | # | ||
2006 | CONFIG_CRYPTO_CRC32C=m | ||
1953 | CONFIG_CRYPTO_MD4=m | 2007 | CONFIG_CRYPTO_MD4=m |
1954 | CONFIG_CRYPTO_MD5=y | 2008 | CONFIG_CRYPTO_MD5=y |
2009 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1955 | CONFIG_CRYPTO_SHA1=m | 2010 | CONFIG_CRYPTO_SHA1=m |
1956 | CONFIG_CRYPTO_SHA256=m | 2011 | CONFIG_CRYPTO_SHA256=m |
1957 | CONFIG_CRYPTO_SHA512=m | 2012 | CONFIG_CRYPTO_SHA512=m |
1958 | CONFIG_CRYPTO_WP512=m | ||
1959 | CONFIG_CRYPTO_TGR192=m | 2013 | CONFIG_CRYPTO_TGR192=m |
1960 | CONFIG_CRYPTO_GF128MUL=m | 2014 | CONFIG_CRYPTO_WP512=m |
1961 | CONFIG_CRYPTO_ECB=m | 2015 | |
1962 | CONFIG_CRYPTO_CBC=y | 2016 | # |
1963 | CONFIG_CRYPTO_PCBC=m | 2017 | # Ciphers |
1964 | # CONFIG_CRYPTO_LRW is not set | 2018 | # |
1965 | # CONFIG_CRYPTO_XTS is not set | ||
1966 | CONFIG_CRYPTO_CTR=m | ||
1967 | CONFIG_CRYPTO_GCM=m | ||
1968 | CONFIG_CRYPTO_CCM=m | ||
1969 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1970 | CONFIG_CRYPTO_DES=y | ||
1971 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1972 | CONFIG_CRYPTO_BLOWFISH=m | ||
1973 | CONFIG_CRYPTO_TWOFISH=m | ||
1974 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1975 | CONFIG_CRYPTO_SERPENT=m | ||
1976 | CONFIG_CRYPTO_AES=m | 2019 | CONFIG_CRYPTO_AES=m |
2020 | CONFIG_CRYPTO_ANUBIS=m | ||
2021 | CONFIG_CRYPTO_ARC4=m | ||
2022 | CONFIG_CRYPTO_BLOWFISH=m | ||
2023 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1977 | CONFIG_CRYPTO_CAST5=m | 2024 | CONFIG_CRYPTO_CAST5=m |
1978 | CONFIG_CRYPTO_CAST6=m | 2025 | CONFIG_CRYPTO_CAST6=m |
1979 | CONFIG_CRYPTO_TEA=m | 2026 | CONFIG_CRYPTO_DES=y |
1980 | CONFIG_CRYPTO_ARC4=m | 2027 | # CONFIG_CRYPTO_FCRYPT is not set |
1981 | CONFIG_CRYPTO_KHAZAD=m | 2028 | CONFIG_CRYPTO_KHAZAD=m |
1982 | CONFIG_CRYPTO_ANUBIS=m | ||
1983 | # CONFIG_CRYPTO_SEED is not set | ||
1984 | CONFIG_CRYPTO_SALSA20=m | 2029 | CONFIG_CRYPTO_SALSA20=m |
2030 | # CONFIG_CRYPTO_SEED is not set | ||
2031 | CONFIG_CRYPTO_SERPENT=m | ||
2032 | CONFIG_CRYPTO_TEA=m | ||
2033 | CONFIG_CRYPTO_TWOFISH=m | ||
2034 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
2035 | |||
2036 | # | ||
2037 | # Compression | ||
2038 | # | ||
1985 | CONFIG_CRYPTO_DEFLATE=m | 2039 | CONFIG_CRYPTO_DEFLATE=m |
1986 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1987 | CONFIG_CRYPTO_CRC32C=m | ||
1988 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1989 | CONFIG_CRYPTO_TEST=m | ||
1990 | CONFIG_CRYPTO_AUTHENC=m | ||
1991 | CONFIG_CRYPTO_LZO=m | 2040 | CONFIG_CRYPTO_LZO=m |
1992 | # CONFIG_CRYPTO_HW is not set | 2041 | # CONFIG_CRYPTO_HW is not set |
1993 | # CONFIG_PPC_CLOCK is not set | 2042 | # CONFIG_PPC_CLOCK is not set |
2043 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 1383eb696a20..bc3bf62ddc2f 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 24 08:48:36 2008 | 4 | # Mon Jun 9 08:52:18 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
@@ -70,19 +72,17 @@ CONFIG_IKCONFIG=y | |||
70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
73 | CONFIG_GROUP_SCHED=y | ||
74 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
75 | CONFIG_USER_SCHED=y | ||
76 | # CONFIG_CGROUP_SCHED is not set | ||
77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
81 | CONFIG_BLK_DEV_INITRD=y | 79 | CONFIG_BLK_DEV_INITRD=y |
82 | CONFIG_INITRAMFS_SOURCE="" | 80 | CONFIG_INITRAMFS_SOURCE="" |
81 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
83 | CONFIG_SYSCTL=y | 82 | CONFIG_SYSCTL=y |
84 | CONFIG_EMBEDDED=y | 83 | CONFIG_EMBEDDED=y |
85 | CONFIG_SYSCTL_SYSCALL=y | 84 | CONFIG_SYSCTL_SYSCALL=y |
85 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
86 | CONFIG_KALLSYMS=y | 86 | CONFIG_KALLSYMS=y |
87 | CONFIG_KALLSYMS_ALL=y | 87 | CONFIG_KALLSYMS_ALL=y |
88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -109,6 +109,7 @@ CONFIG_SLUB=y | |||
109 | CONFIG_HAVE_OPROFILE=y | 109 | CONFIG_HAVE_OPROFILE=y |
110 | CONFIG_HAVE_KPROBES=y | 110 | CONFIG_HAVE_KPROBES=y |
111 | CONFIG_HAVE_KRETPROBES=y | 111 | CONFIG_HAVE_KRETPROBES=y |
112 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
112 | CONFIG_PROC_PAGE_MONITOR=y | 113 | CONFIG_PROC_PAGE_MONITOR=y |
113 | CONFIG_SLABINFO=y | 114 | CONFIG_SLABINFO=y |
114 | CONFIG_RT_MUTEXES=y | 115 | CONFIG_RT_MUTEXES=y |
@@ -196,11 +197,13 @@ CONFIG_FLATMEM=y | |||
196 | CONFIG_FLAT_NODE_MEM_MAP=y | 197 | CONFIG_FLAT_NODE_MEM_MAP=y |
197 | # CONFIG_SPARSEMEM_STATIC is not set | 198 | # CONFIG_SPARSEMEM_STATIC is not set |
198 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
200 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
200 | # CONFIG_RESOURCES_64BIT is not set | 202 | # CONFIG_RESOURCES_64BIT is not set |
201 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
202 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
203 | CONFIG_VIRT_TO_BUS=y | 205 | CONFIG_VIRT_TO_BUS=y |
206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
204 | CONFIG_PROC_DEVICETREE=y | 207 | CONFIG_PROC_DEVICETREE=y |
205 | # CONFIG_CMDLINE_BOOL is not set | 208 | # CONFIG_CMDLINE_BOOL is not set |
206 | # CONFIG_PM is not set | 209 | # CONFIG_PM is not set |
@@ -225,6 +228,7 @@ CONFIG_PCI_LEGACY=y | |||
225 | # CONFIG_PCI_DEBUG is not set | 228 | # CONFIG_PCI_DEBUG is not set |
226 | # CONFIG_PCCARD is not set | 229 | # CONFIG_PCCARD is not set |
227 | # CONFIG_HOTPLUG_PCI is not set | 230 | # CONFIG_HOTPLUG_PCI is not set |
231 | # CONFIG_HAS_RAPIDIO is not set | ||
228 | 232 | ||
229 | # | 233 | # |
230 | # Advanced setup | 234 | # Advanced setup |
@@ -234,11 +238,11 @@ CONFIG_PCI_LEGACY=y | |||
234 | # | 238 | # |
235 | # Default settings for advanced configuration options are used | 239 | # Default settings for advanced configuration options are used |
236 | # | 240 | # |
237 | CONFIG_HIGHMEM_START=0xfe000000 | ||
238 | CONFIG_LOWMEM_SIZE=0x30000000 | 241 | CONFIG_LOWMEM_SIZE=0x30000000 |
242 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
239 | CONFIG_KERNEL_START=0xc0000000 | 243 | CONFIG_KERNEL_START=0xc0000000 |
244 | CONFIG_PHYSICAL_START=0x00000000 | ||
240 | CONFIG_TASK_SIZE=0xc0000000 | 245 | CONFIG_TASK_SIZE=0xc0000000 |
241 | CONFIG_BOOT_LOAD=0x00400000 | ||
242 | 246 | ||
243 | # | 247 | # |
244 | # Networking | 248 | # Networking |
@@ -293,6 +297,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
293 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 297 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
294 | CONFIG_INET6_XFRM_MODE_BEET=y | 298 | CONFIG_INET6_XFRM_MODE_BEET=y |
295 | CONFIG_IPV6_SIT=y | 299 | CONFIG_IPV6_SIT=y |
300 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
296 | # CONFIG_IPV6_TUNNEL is not set | 301 | # CONFIG_IPV6_TUNNEL is not set |
297 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
298 | CONFIG_NETFILTER=y | 303 | CONFIG_NETFILTER=y |
@@ -513,7 +518,7 @@ CONFIG_IDE_PROC_FS=y | |||
513 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 518 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
514 | # CONFIG_BLK_DEV_TC86C001 is not set | 519 | # CONFIG_BLK_DEV_TC86C001 is not set |
515 | # CONFIG_BLK_DEV_IDEDMA is not set | 520 | # CONFIG_BLK_DEV_IDEDMA is not set |
516 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 521 | # CONFIG_BLK_DEV_HD_ONLY is not set |
517 | # CONFIG_BLK_DEV_HD is not set | 522 | # CONFIG_BLK_DEV_HD is not set |
518 | 523 | ||
519 | # | 524 | # |
@@ -593,7 +598,6 @@ CONFIG_NETDEV_1000=y | |||
593 | # CONFIG_SIS190 is not set | 598 | # CONFIG_SIS190 is not set |
594 | # CONFIG_SKGE is not set | 599 | # CONFIG_SKGE is not set |
595 | # CONFIG_SKY2 is not set | 600 | # CONFIG_SKY2 is not set |
596 | # CONFIG_SK98LIN is not set | ||
597 | # CONFIG_VIA_VELOCITY is not set | 601 | # CONFIG_VIA_VELOCITY is not set |
598 | # CONFIG_TIGON3 is not set | 602 | # CONFIG_TIGON3 is not set |
599 | # CONFIG_BNX2 is not set | 603 | # CONFIG_BNX2 is not set |
@@ -611,6 +615,7 @@ CONFIG_NETDEV_10000=y | |||
611 | # CONFIG_MLX4_CORE is not set | 615 | # CONFIG_MLX4_CORE is not set |
612 | # CONFIG_TEHUTI is not set | 616 | # CONFIG_TEHUTI is not set |
613 | # CONFIG_BNX2X is not set | 617 | # CONFIG_BNX2X is not set |
618 | # CONFIG_SFC is not set | ||
614 | # CONFIG_TR is not set | 619 | # CONFIG_TR is not set |
615 | 620 | ||
616 | # | 621 | # |
@@ -618,6 +623,7 @@ CONFIG_NETDEV_10000=y | |||
618 | # | 623 | # |
619 | # CONFIG_WLAN_PRE80211 is not set | 624 | # CONFIG_WLAN_PRE80211 is not set |
620 | # CONFIG_WLAN_80211 is not set | 625 | # CONFIG_WLAN_80211 is not set |
626 | # CONFIG_IWLWIFI_LEDS is not set | ||
621 | # CONFIG_WAN is not set | 627 | # CONFIG_WAN is not set |
622 | # CONFIG_FDDI is not set | 628 | # CONFIG_FDDI is not set |
623 | CONFIG_PPP=y | 629 | CONFIG_PPP=y |
@@ -692,6 +698,7 @@ CONFIG_SERIO_LIBPS2=y | |||
692 | # Character devices | 698 | # Character devices |
693 | # | 699 | # |
694 | # CONFIG_VT is not set | 700 | # CONFIG_VT is not set |
701 | CONFIG_DEVKMEM=y | ||
695 | # CONFIG_SERIAL_NONSTANDARD is not set | 702 | # CONFIG_SERIAL_NONSTANDARD is not set |
696 | 703 | ||
697 | # | 704 | # |
@@ -726,12 +733,7 @@ CONFIG_HW_RANDOM=y | |||
726 | # CONFIG_RAW_DRIVER is not set | 733 | # CONFIG_RAW_DRIVER is not set |
727 | CONFIG_DEVPORT=y | 734 | CONFIG_DEVPORT=y |
728 | # CONFIG_I2C is not set | 735 | # CONFIG_I2C is not set |
729 | |||
730 | # | ||
731 | # SPI support | ||
732 | # | ||
733 | # CONFIG_SPI is not set | 736 | # CONFIG_SPI is not set |
734 | # CONFIG_SPI_MASTER is not set | ||
735 | # CONFIG_W1 is not set | 737 | # CONFIG_W1 is not set |
736 | # CONFIG_POWER_SUPPLY is not set | 738 | # CONFIG_POWER_SUPPLY is not set |
737 | # CONFIG_HWMON is not set | 739 | # CONFIG_HWMON is not set |
@@ -748,12 +750,22 @@ CONFIG_SSB_POSSIBLE=y | |||
748 | # Multifunction device drivers | 750 | # Multifunction device drivers |
749 | # | 751 | # |
750 | # CONFIG_MFD_SM501 is not set | 752 | # CONFIG_MFD_SM501 is not set |
753 | # CONFIG_HTC_PASIC3 is not set | ||
751 | 754 | ||
752 | # | 755 | # |
753 | # Multimedia devices | 756 | # Multimedia devices |
754 | # | 757 | # |
758 | |||
759 | # | ||
760 | # Multimedia core support | ||
761 | # | ||
755 | # CONFIG_VIDEO_DEV is not set | 762 | # CONFIG_VIDEO_DEV is not set |
756 | # CONFIG_DVB_CORE is not set | 763 | # CONFIG_DVB_CORE is not set |
764 | # CONFIG_VIDEO_MEDIA is not set | ||
765 | |||
766 | # | ||
767 | # Multimedia drivers | ||
768 | # | ||
757 | CONFIG_DAB=y | 769 | CONFIG_DAB=y |
758 | 770 | ||
759 | # | 771 | # |
@@ -781,11 +793,14 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
781 | CONFIG_USB_ARCH_HAS_OHCI=y | 793 | CONFIG_USB_ARCH_HAS_OHCI=y |
782 | CONFIG_USB_ARCH_HAS_EHCI=y | 794 | CONFIG_USB_ARCH_HAS_EHCI=y |
783 | # CONFIG_USB is not set | 795 | # CONFIG_USB is not set |
796 | # CONFIG_USB_OTG_WHITELIST is not set | ||
797 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
784 | 798 | ||
785 | # | 799 | # |
786 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
787 | # | 801 | # |
788 | CONFIG_USB_GADGET=y | 802 | CONFIG_USB_GADGET=y |
803 | # CONFIG_USB_GADGET_DEBUG is not set | ||
789 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 804 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
790 | CONFIG_USB_GADGET_SELECTED=y | 805 | CONFIG_USB_GADGET_SELECTED=y |
791 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 806 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
@@ -795,6 +810,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
795 | # CONFIG_USB_GADGET_PXA2XX is not set | 810 | # CONFIG_USB_GADGET_PXA2XX is not set |
796 | CONFIG_USB_GADGET_M66592=y | 811 | CONFIG_USB_GADGET_M66592=y |
797 | CONFIG_USB_M66592=y | 812 | CONFIG_USB_M66592=y |
813 | # CONFIG_USB_GADGET_PXA27X is not set | ||
798 | # CONFIG_USB_GADGET_GOKU is not set | 814 | # CONFIG_USB_GADGET_GOKU is not set |
799 | # CONFIG_USB_GADGET_LH7A40X is not set | 815 | # CONFIG_USB_GADGET_LH7A40X is not set |
800 | # CONFIG_USB_GADGET_OMAP is not set | 816 | # CONFIG_USB_GADGET_OMAP is not set |
@@ -804,6 +820,7 @@ CONFIG_USB_M66592=y | |||
804 | CONFIG_USB_GADGET_DUALSPEED=y | 820 | CONFIG_USB_GADGET_DUALSPEED=y |
805 | # CONFIG_USB_ZERO is not set | 821 | # CONFIG_USB_ZERO is not set |
806 | CONFIG_USB_ETH=y | 822 | CONFIG_USB_ETH=y |
823 | CONFIG_USB_ETH_RNDIS=y | ||
807 | # CONFIG_USB_GADGETFS is not set | 824 | # CONFIG_USB_GADGETFS is not set |
808 | # CONFIG_USB_FILE_STORAGE is not set | 825 | # CONFIG_USB_FILE_STORAGE is not set |
809 | # CONFIG_USB_G_SERIAL is not set | 826 | # CONFIG_USB_G_SERIAL is not set |
@@ -812,13 +829,10 @@ CONFIG_USB_ETH=y | |||
812 | # CONFIG_MMC is not set | 829 | # CONFIG_MMC is not set |
813 | # CONFIG_MEMSTICK is not set | 830 | # CONFIG_MEMSTICK is not set |
814 | # CONFIG_NEW_LEDS is not set | 831 | # CONFIG_NEW_LEDS is not set |
832 | # CONFIG_ACCESSIBILITY is not set | ||
815 | # CONFIG_INFINIBAND is not set | 833 | # CONFIG_INFINIBAND is not set |
816 | # CONFIG_RTC_CLASS is not set | 834 | # CONFIG_RTC_CLASS is not set |
817 | # CONFIG_DMADEVICES is not set | 835 | # CONFIG_DMADEVICES is not set |
818 | |||
819 | # | ||
820 | # Userspace I/O | ||
821 | # | ||
822 | # CONFIG_UIO is not set | 836 | # CONFIG_UIO is not set |
823 | 837 | ||
824 | # | 838 | # |
@@ -888,7 +902,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
888 | CONFIG_NFS_FS=y | 902 | CONFIG_NFS_FS=y |
889 | CONFIG_NFS_V3=y | 903 | CONFIG_NFS_V3=y |
890 | CONFIG_NFS_V3_ACL=y | 904 | CONFIG_NFS_V3_ACL=y |
891 | # CONFIG_NFS_DIRECTIO is not set | ||
892 | # CONFIG_NFSD is not set | 905 | # CONFIG_NFSD is not set |
893 | CONFIG_ROOT_NFS=y | 906 | CONFIG_ROOT_NFS=y |
894 | CONFIG_LOCKD=y | 907 | CONFIG_LOCKD=y |
@@ -967,6 +980,7 @@ CONFIG_NLS_UTF8=y | |||
967 | # Library routines | 980 | # Library routines |
968 | # | 981 | # |
969 | CONFIG_BITREVERSE=y | 982 | CONFIG_BITREVERSE=y |
983 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
970 | CONFIG_CRC_CCITT=y | 984 | CONFIG_CRC_CCITT=y |
971 | # CONFIG_CRC16 is not set | 985 | # CONFIG_CRC16 is not set |
972 | # CONFIG_CRC_ITU_T is not set | 986 | # CONFIG_CRC_ITU_T is not set |
@@ -979,6 +993,7 @@ CONFIG_PLIST=y | |||
979 | CONFIG_HAS_IOMEM=y | 993 | CONFIG_HAS_IOMEM=y |
980 | CONFIG_HAS_IOPORT=y | 994 | CONFIG_HAS_IOPORT=y |
981 | CONFIG_HAS_DMA=y | 995 | CONFIG_HAS_DMA=y |
996 | CONFIG_HAVE_LMB=y | ||
982 | 997 | ||
983 | # | 998 | # |
984 | # Kernel hacking | 999 | # Kernel hacking |
@@ -986,6 +1001,7 @@ CONFIG_HAS_DMA=y | |||
986 | # CONFIG_PRINTK_TIME is not set | 1001 | # CONFIG_PRINTK_TIME is not set |
987 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1002 | CONFIG_ENABLE_WARN_DEPRECATED=y |
988 | CONFIG_ENABLE_MUST_CHECK=y | 1003 | CONFIG_ENABLE_MUST_CHECK=y |
1004 | CONFIG_FRAME_WARN=1024 | ||
989 | CONFIG_MAGIC_SYSRQ=y | 1005 | CONFIG_MAGIC_SYSRQ=y |
990 | # CONFIG_UNUSED_SYMBOLS is not set | 1006 | # CONFIG_UNUSED_SYMBOLS is not set |
991 | # CONFIG_DEBUG_FS is not set | 1007 | # CONFIG_DEBUG_FS is not set |
@@ -996,6 +1012,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
996 | # CONFIG_SCHED_DEBUG is not set | 1012 | # CONFIG_SCHED_DEBUG is not set |
997 | # CONFIG_SCHEDSTATS is not set | 1013 | # CONFIG_SCHEDSTATS is not set |
998 | # CONFIG_TIMER_STATS is not set | 1014 | # CONFIG_TIMER_STATS is not set |
1015 | # CONFIG_DEBUG_OBJECTS is not set | ||
999 | # CONFIG_SLUB_DEBUG_ON is not set | 1016 | # CONFIG_SLUB_DEBUG_ON is not set |
1000 | # CONFIG_SLUB_STATS is not set | 1017 | # CONFIG_SLUB_STATS is not set |
1001 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1018 | # CONFIG_DEBUG_RT_MUTEXES is not set |
@@ -1008,6 +1025,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1008 | CONFIG_DEBUG_BUGVERBOSE=y | 1025 | CONFIG_DEBUG_BUGVERBOSE=y |
1009 | CONFIG_DEBUG_INFO=y | 1026 | CONFIG_DEBUG_INFO=y |
1010 | # CONFIG_DEBUG_VM is not set | 1027 | # CONFIG_DEBUG_VM is not set |
1028 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1011 | # CONFIG_DEBUG_LIST is not set | 1029 | # CONFIG_DEBUG_LIST is not set |
1012 | # CONFIG_DEBUG_SG is not set | 1030 | # CONFIG_DEBUG_SG is not set |
1013 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1031 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1019,6 +1037,7 @@ CONFIG_DEBUG_INFO=y | |||
1019 | # CONFIG_DEBUG_PAGEALLOC is not set | 1037 | # CONFIG_DEBUG_PAGEALLOC is not set |
1020 | # CONFIG_DEBUGGER is not set | 1038 | # CONFIG_DEBUGGER is not set |
1021 | # CONFIG_KGDB_CONSOLE is not set | 1039 | # CONFIG_KGDB_CONSOLE is not set |
1040 | # CONFIG_IRQSTACKS is not set | ||
1022 | CONFIG_BDI_SWITCH=y | 1041 | CONFIG_BDI_SWITCH=y |
1023 | # CONFIG_PPC_EARLY_DEBUG is not set | 1042 | # CONFIG_PPC_EARLY_DEBUG is not set |
1024 | 1043 | ||
@@ -1028,46 +1047,76 @@ CONFIG_BDI_SWITCH=y | |||
1028 | # CONFIG_KEYS is not set | 1047 | # CONFIG_KEYS is not set |
1029 | # CONFIG_SECURITY is not set | 1048 | # CONFIG_SECURITY is not set |
1030 | CONFIG_CRYPTO=y | 1049 | CONFIG_CRYPTO=y |
1050 | |||
1051 | # | ||
1052 | # Crypto core or helper | ||
1053 | # | ||
1031 | CONFIG_CRYPTO_ALGAPI=y | 1054 | CONFIG_CRYPTO_ALGAPI=y |
1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1055 | CONFIG_CRYPTO_BLKCIPHER=y |
1033 | # CONFIG_CRYPTO_SEQIV is not set | ||
1034 | CONFIG_CRYPTO_MANAGER=y | 1056 | CONFIG_CRYPTO_MANAGER=y |
1035 | # CONFIG_CRYPTO_HMAC is not set | ||
1036 | # CONFIG_CRYPTO_NULL is not set | 1057 | # CONFIG_CRYPTO_NULL is not set |
1058 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1059 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1060 | |||
1061 | # | ||
1062 | # Authenticated Encryption with Associated Data | ||
1063 | # | ||
1064 | # CONFIG_CRYPTO_CCM is not set | ||
1065 | # CONFIG_CRYPTO_GCM is not set | ||
1066 | # CONFIG_CRYPTO_SEQIV is not set | ||
1067 | |||
1068 | # | ||
1069 | # Block modes | ||
1070 | # | ||
1071 | CONFIG_CRYPTO_CBC=y | ||
1072 | # CONFIG_CRYPTO_CTR is not set | ||
1073 | # CONFIG_CRYPTO_CTS is not set | ||
1074 | CONFIG_CRYPTO_ECB=y | ||
1075 | CONFIG_CRYPTO_PCBC=y | ||
1076 | |||
1077 | # | ||
1078 | # Hash modes | ||
1079 | # | ||
1080 | # CONFIG_CRYPTO_HMAC is not set | ||
1081 | |||
1082 | # | ||
1083 | # Digest | ||
1084 | # | ||
1085 | # CONFIG_CRYPTO_CRC32C is not set | ||
1037 | # CONFIG_CRYPTO_MD4 is not set | 1086 | # CONFIG_CRYPTO_MD4 is not set |
1038 | CONFIG_CRYPTO_MD5=y | 1087 | CONFIG_CRYPTO_MD5=y |
1088 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1039 | # CONFIG_CRYPTO_SHA1 is not set | 1089 | # CONFIG_CRYPTO_SHA1 is not set |
1040 | # CONFIG_CRYPTO_SHA256 is not set | 1090 | # CONFIG_CRYPTO_SHA256 is not set |
1041 | # CONFIG_CRYPTO_SHA512 is not set | 1091 | # CONFIG_CRYPTO_SHA512 is not set |
1042 | # CONFIG_CRYPTO_WP512 is not set | ||
1043 | # CONFIG_CRYPTO_TGR192 is not set | 1092 | # CONFIG_CRYPTO_TGR192 is not set |
1044 | CONFIG_CRYPTO_ECB=y | 1093 | # CONFIG_CRYPTO_WP512 is not set |
1045 | CONFIG_CRYPTO_CBC=y | 1094 | |
1046 | CONFIG_CRYPTO_PCBC=y | 1095 | # |
1047 | # CONFIG_CRYPTO_CTR is not set | 1096 | # Ciphers |
1048 | # CONFIG_CRYPTO_GCM is not set | 1097 | # |
1049 | # CONFIG_CRYPTO_CCM is not set | ||
1050 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1051 | CONFIG_CRYPTO_DES=y | ||
1052 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1053 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1054 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1055 | # CONFIG_CRYPTO_SERPENT is not set | ||
1056 | # CONFIG_CRYPTO_AES is not set | 1098 | # CONFIG_CRYPTO_AES is not set |
1099 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1100 | # CONFIG_CRYPTO_ARC4 is not set | ||
1101 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1102 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1057 | # CONFIG_CRYPTO_CAST5 is not set | 1103 | # CONFIG_CRYPTO_CAST5 is not set |
1058 | # CONFIG_CRYPTO_CAST6 is not set | 1104 | # CONFIG_CRYPTO_CAST6 is not set |
1059 | # CONFIG_CRYPTO_TEA is not set | 1105 | CONFIG_CRYPTO_DES=y |
1060 | # CONFIG_CRYPTO_ARC4 is not set | 1106 | # CONFIG_CRYPTO_FCRYPT is not set |
1061 | # CONFIG_CRYPTO_KHAZAD is not set | 1107 | # CONFIG_CRYPTO_KHAZAD is not set |
1062 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1063 | # CONFIG_CRYPTO_SEED is not set | 1108 | # CONFIG_CRYPTO_SEED is not set |
1109 | # CONFIG_CRYPTO_SERPENT is not set | ||
1110 | # CONFIG_CRYPTO_TEA is not set | ||
1111 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1112 | |||
1113 | # | ||
1114 | # Compression | ||
1115 | # | ||
1064 | # CONFIG_CRYPTO_DEFLATE is not set | 1116 | # CONFIG_CRYPTO_DEFLATE is not set |
1065 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1066 | # CONFIG_CRYPTO_CRC32C is not set | ||
1067 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1068 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1069 | # CONFIG_CRYPTO_LZO is not set | 1117 | # CONFIG_CRYPTO_LZO is not set |
1070 | CONFIG_CRYPTO_HW=y | 1118 | CONFIG_CRYPTO_HW=y |
1071 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1119 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1072 | # CONFIG_PPC_CLOCK is not set | 1120 | # CONFIG_PPC_CLOCK is not set |
1073 | CONFIG_PPC_LIB_RHEAP=y | 1121 | CONFIG_PPC_LIB_RHEAP=y |
1122 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index f9121685f11a..c6b83577c055 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:37:15 2008 | 4 | # Mon Jun 9 08:52:18 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -33,6 +33,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
33 | CONFIG_GENERIC_HARDIRQS=y | 33 | CONFIG_GENERIC_HARDIRQS=y |
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | ||
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
38 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
@@ -92,6 +94,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
92 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
93 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
94 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
95 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
97 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
@@ -117,6 +120,7 @@ CONFIG_SLUB=y | |||
117 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
@@ -215,11 +219,13 @@ CONFIG_FLATMEM=y | |||
215 | CONFIG_FLAT_NODE_MEM_MAP=y | 219 | CONFIG_FLAT_NODE_MEM_MAP=y |
216 | # CONFIG_SPARSEMEM_STATIC is not set | 220 | # CONFIG_SPARSEMEM_STATIC is not set |
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
222 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
219 | # CONFIG_RESOURCES_64BIT is not set | 224 | # CONFIG_RESOURCES_64BIT is not set |
220 | CONFIG_ZONE_DMA_FLAG=1 | 225 | CONFIG_ZONE_DMA_FLAG=1 |
221 | CONFIG_BOUNCE=y | 226 | CONFIG_BOUNCE=y |
222 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
228 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
223 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
224 | # CONFIG_CMDLINE_BOOL is not set | 230 | # CONFIG_CMDLINE_BOOL is not set |
225 | # CONFIG_PM is not set | 231 | # CONFIG_PM is not set |
@@ -241,6 +247,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
241 | CONFIG_PCI_LEGACY=y | 247 | CONFIG_PCI_LEGACY=y |
242 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
243 | # CONFIG_HOTPLUG_PCI is not set | 249 | # CONFIG_HOTPLUG_PCI is not set |
250 | # CONFIG_HAS_RAPIDIO is not set | ||
244 | 251 | ||
245 | # | 252 | # |
246 | # Advanced setup | 253 | # Advanced setup |
@@ -250,13 +257,13 @@ CONFIG_PCI_LEGACY=y | |||
250 | # | 257 | # |
251 | # Default settings for advanced configuration options are used | 258 | # Default settings for advanced configuration options are used |
252 | # | 259 | # |
253 | CONFIG_HIGHMEM_START=0xfe000000 | ||
254 | CONFIG_LOWMEM_SIZE=0x30000000 | 260 | CONFIG_LOWMEM_SIZE=0x30000000 |
261 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
255 | CONFIG_KERNEL_START=0xc0000000 | 262 | CONFIG_KERNEL_START=0xc0000000 |
263 | CONFIG_PHYSICAL_START=0x00000000 | ||
256 | CONFIG_TASK_SIZE=0xc0000000 | 264 | CONFIG_TASK_SIZE=0xc0000000 |
257 | CONFIG_CONSISTENT_START=0xff100000 | 265 | CONFIG_CONSISTENT_START=0xff100000 |
258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 266 | CONFIG_CONSISTENT_SIZE=0x00200000 |
259 | CONFIG_BOOT_LOAD=0x00800000 | ||
260 | 267 | ||
261 | # | 268 | # |
262 | # Networking | 269 | # Networking |
@@ -304,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
304 | CONFIG_DEFAULT_TCP_CONG="cubic" | 311 | CONFIG_DEFAULT_TCP_CONG="cubic" |
305 | # CONFIG_TCP_MD5SIG is not set | 312 | # CONFIG_TCP_MD5SIG is not set |
306 | # CONFIG_IPV6 is not set | 313 | # CONFIG_IPV6 is not set |
307 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
308 | # CONFIG_INET6_TUNNEL is not set | ||
309 | # CONFIG_NETWORK_SECMARK is not set | 314 | # CONFIG_NETWORK_SECMARK is not set |
310 | # CONFIG_NETFILTER is not set | 315 | # CONFIG_NETFILTER is not set |
311 | # CONFIG_IP_DCCP is not set | 316 | # CONFIG_IP_DCCP is not set |
@@ -364,6 +369,7 @@ CONFIG_MTD_PARTITIONS=y | |||
364 | # CONFIG_MTD_REDBOOT_PARTS is not set | 369 | # CONFIG_MTD_REDBOOT_PARTS is not set |
365 | # CONFIG_MTD_CMDLINE_PARTS is not set | 370 | # CONFIG_MTD_CMDLINE_PARTS is not set |
366 | # CONFIG_MTD_OF_PARTS is not set | 371 | # CONFIG_MTD_OF_PARTS is not set |
372 | # CONFIG_MTD_AR7_PARTS is not set | ||
367 | 373 | ||
368 | # | 374 | # |
369 | # User Modules And Translation Layers | 375 | # User Modules And Translation Layers |
@@ -435,6 +441,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
435 | # | 441 | # |
436 | # CONFIG_MTD_UBI is not set | 442 | # CONFIG_MTD_UBI is not set |
437 | CONFIG_OF_DEVICE=y | 443 | CONFIG_OF_DEVICE=y |
444 | CONFIG_OF_I2C=y | ||
438 | # CONFIG_PARPORT is not set | 445 | # CONFIG_PARPORT is not set |
439 | CONFIG_BLK_DEV=y | 446 | CONFIG_BLK_DEV=y |
440 | # CONFIG_BLK_DEV_FD is not set | 447 | # CONFIG_BLK_DEV_FD is not set |
@@ -519,7 +526,7 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y | |||
519 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 526 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
520 | # CONFIG_BLK_DEV_TC86C001 is not set | 527 | # CONFIG_BLK_DEV_TC86C001 is not set |
521 | CONFIG_BLK_DEV_IDEDMA=y | 528 | CONFIG_BLK_DEV_IDEDMA=y |
522 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 529 | # CONFIG_BLK_DEV_HD_ONLY is not set |
523 | # CONFIG_BLK_DEV_HD is not set | 530 | # CONFIG_BLK_DEV_HD is not set |
524 | 531 | ||
525 | # | 532 | # |
@@ -598,7 +605,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
598 | # CONFIG_SCSI_SRP is not set | 605 | # CONFIG_SCSI_SRP is not set |
599 | CONFIG_ATA=y | 606 | CONFIG_ATA=y |
600 | # CONFIG_ATA_NONSTANDARD is not set | 607 | # CONFIG_ATA_NONSTANDARD is not set |
608 | CONFIG_SATA_PMP=y | ||
601 | # CONFIG_SATA_AHCI is not set | 609 | # CONFIG_SATA_AHCI is not set |
610 | # CONFIG_SATA_SIL24 is not set | ||
611 | CONFIG_ATA_SFF=y | ||
602 | # CONFIG_SATA_SVW is not set | 612 | # CONFIG_SATA_SVW is not set |
603 | # CONFIG_ATA_PIIX is not set | 613 | # CONFIG_ATA_PIIX is not set |
604 | CONFIG_SATA_MV=y | 614 | CONFIG_SATA_MV=y |
@@ -608,7 +618,6 @@ CONFIG_SATA_MV=y | |||
608 | # CONFIG_SATA_PROMISE is not set | 618 | # CONFIG_SATA_PROMISE is not set |
609 | # CONFIG_SATA_SX4 is not set | 619 | # CONFIG_SATA_SX4 is not set |
610 | # CONFIG_SATA_SIL is not set | 620 | # CONFIG_SATA_SIL is not set |
611 | # CONFIG_SATA_SIL24 is not set | ||
612 | # CONFIG_SATA_SIS is not set | 621 | # CONFIG_SATA_SIS is not set |
613 | # CONFIG_SATA_ULI is not set | 622 | # CONFIG_SATA_ULI is not set |
614 | # CONFIG_SATA_VIA is not set | 623 | # CONFIG_SATA_VIA is not set |
@@ -653,6 +662,7 @@ CONFIG_SATA_MV=y | |||
653 | # CONFIG_PATA_VIA is not set | 662 | # CONFIG_PATA_VIA is not set |
654 | # CONFIG_PATA_WINBOND is not set | 663 | # CONFIG_PATA_WINBOND is not set |
655 | # CONFIG_PATA_PLATFORM is not set | 664 | # CONFIG_PATA_PLATFORM is not set |
665 | # CONFIG_PATA_SCH is not set | ||
656 | # CONFIG_MD is not set | 666 | # CONFIG_MD is not set |
657 | # CONFIG_FUSION is not set | 667 | # CONFIG_FUSION is not set |
658 | 668 | ||
@@ -744,7 +754,6 @@ CONFIG_E1000=y | |||
744 | # CONFIG_SIS190 is not set | 754 | # CONFIG_SIS190 is not set |
745 | # CONFIG_SKGE is not set | 755 | # CONFIG_SKGE is not set |
746 | # CONFIG_SKY2 is not set | 756 | # CONFIG_SKY2 is not set |
747 | # CONFIG_SK98LIN is not set | ||
748 | # CONFIG_VIA_VELOCITY is not set | 757 | # CONFIG_VIA_VELOCITY is not set |
749 | # CONFIG_TIGON3 is not set | 758 | # CONFIG_TIGON3 is not set |
750 | # CONFIG_BNX2 is not set | 759 | # CONFIG_BNX2 is not set |
@@ -763,6 +772,7 @@ CONFIG_NETDEV_10000=y | |||
763 | # CONFIG_MLX4_CORE is not set | 772 | # CONFIG_MLX4_CORE is not set |
764 | # CONFIG_TEHUTI is not set | 773 | # CONFIG_TEHUTI is not set |
765 | # CONFIG_BNX2X is not set | 774 | # CONFIG_BNX2X is not set |
775 | # CONFIG_SFC is not set | ||
766 | # CONFIG_TR is not set | 776 | # CONFIG_TR is not set |
767 | 777 | ||
768 | # | 778 | # |
@@ -770,6 +780,7 @@ CONFIG_NETDEV_10000=y | |||
770 | # | 780 | # |
771 | # CONFIG_WLAN_PRE80211 is not set | 781 | # CONFIG_WLAN_PRE80211 is not set |
772 | # CONFIG_WLAN_80211 is not set | 782 | # CONFIG_WLAN_80211 is not set |
783 | # CONFIG_IWLWIFI_LEDS is not set | ||
773 | 784 | ||
774 | # | 785 | # |
775 | # USB Network Adapters | 786 | # USB Network Adapters |
@@ -832,6 +843,7 @@ CONFIG_VT=y | |||
832 | CONFIG_VT_CONSOLE=y | 843 | CONFIG_VT_CONSOLE=y |
833 | CONFIG_HW_CONSOLE=y | 844 | CONFIG_HW_CONSOLE=y |
834 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 845 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
846 | CONFIG_DEVKMEM=y | ||
835 | # CONFIG_SERIAL_NONSTANDARD is not set | 847 | # CONFIG_SERIAL_NONSTANDARD is not set |
836 | # CONFIG_NOZOMI is not set | 848 | # CONFIG_NOZOMI is not set |
837 | 849 | ||
@@ -855,7 +867,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
855 | # CONFIG_IPMI_HANDLER is not set | 867 | # CONFIG_IPMI_HANDLER is not set |
856 | # CONFIG_HW_RANDOM is not set | 868 | # CONFIG_HW_RANDOM is not set |
857 | # CONFIG_NVRAM is not set | 869 | # CONFIG_NVRAM is not set |
858 | # CONFIG_GEN_RTC is not set | ||
859 | # CONFIG_R3964 is not set | 870 | # CONFIG_R3964 is not set |
860 | # CONFIG_APPLICOM is not set | 871 | # CONFIG_APPLICOM is not set |
861 | # CONFIG_RAW_DRIVER is not set | 872 | # CONFIG_RAW_DRIVER is not set |
@@ -866,13 +877,6 @@ CONFIG_I2C_BOARDINFO=y | |||
866 | CONFIG_I2C_CHARDEV=y | 877 | CONFIG_I2C_CHARDEV=y |
867 | 878 | ||
868 | # | 879 | # |
869 | # I2C Algorithms | ||
870 | # | ||
871 | # CONFIG_I2C_ALGOBIT is not set | ||
872 | # CONFIG_I2C_ALGOPCF is not set | ||
873 | # CONFIG_I2C_ALGOPCA is not set | ||
874 | |||
875 | # | ||
876 | # I2C Hardware Bus support | 880 | # I2C Hardware Bus support |
877 | # | 881 | # |
878 | # CONFIG_I2C_ALI1535 is not set | 882 | # CONFIG_I2C_ALI1535 is not set |
@@ -898,6 +902,7 @@ CONFIG_I2C_CHARDEV=y | |||
898 | # CONFIG_I2C_VIA is not set | 902 | # CONFIG_I2C_VIA is not set |
899 | # CONFIG_I2C_VIAPRO is not set | 903 | # CONFIG_I2C_VIAPRO is not set |
900 | # CONFIG_I2C_VOODOO3 is not set | 904 | # CONFIG_I2C_VOODOO3 is not set |
905 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
901 | CONFIG_I2C_MV64XXX=y | 906 | CONFIG_I2C_MV64XXX=y |
902 | 907 | ||
903 | # | 908 | # |
@@ -908,19 +913,13 @@ CONFIG_I2C_MV64XXX=y | |||
908 | # CONFIG_SENSORS_PCF8574 is not set | 913 | # CONFIG_SENSORS_PCF8574 is not set |
909 | # CONFIG_PCF8575 is not set | 914 | # CONFIG_PCF8575 is not set |
910 | # CONFIG_SENSORS_PCF8591 is not set | 915 | # CONFIG_SENSORS_PCF8591 is not set |
911 | # CONFIG_TPS65010 is not set | ||
912 | # CONFIG_SENSORS_MAX6875 is not set | 916 | # CONFIG_SENSORS_MAX6875 is not set |
913 | # CONFIG_SENSORS_TSL2550 is not set | 917 | # CONFIG_SENSORS_TSL2550 is not set |
914 | # CONFIG_I2C_DEBUG_CORE is not set | 918 | # CONFIG_I2C_DEBUG_CORE is not set |
915 | # CONFIG_I2C_DEBUG_ALGO is not set | 919 | # CONFIG_I2C_DEBUG_ALGO is not set |
916 | # CONFIG_I2C_DEBUG_BUS is not set | 920 | # CONFIG_I2C_DEBUG_BUS is not set |
917 | # CONFIG_I2C_DEBUG_CHIP is not set | 921 | # CONFIG_I2C_DEBUG_CHIP is not set |
918 | |||
919 | # | ||
920 | # SPI support | ||
921 | # | ||
922 | # CONFIG_SPI is not set | 922 | # CONFIG_SPI is not set |
923 | # CONFIG_SPI_MASTER is not set | ||
924 | # CONFIG_W1 is not set | 923 | # CONFIG_W1 is not set |
925 | # CONFIG_POWER_SUPPLY is not set | 924 | # CONFIG_POWER_SUPPLY is not set |
926 | CONFIG_HWMON=y | 925 | CONFIG_HWMON=y |
@@ -990,12 +989,22 @@ CONFIG_SSB_POSSIBLE=y | |||
990 | # Multifunction device drivers | 989 | # Multifunction device drivers |
991 | # | 990 | # |
992 | # CONFIG_MFD_SM501 is not set | 991 | # CONFIG_MFD_SM501 is not set |
992 | # CONFIG_HTC_PASIC3 is not set | ||
993 | 993 | ||
994 | # | 994 | # |
995 | # Multimedia devices | 995 | # Multimedia devices |
996 | # | 996 | # |
997 | |||
998 | # | ||
999 | # Multimedia core support | ||
1000 | # | ||
997 | # CONFIG_VIDEO_DEV is not set | 1001 | # CONFIG_VIDEO_DEV is not set |
998 | # CONFIG_DVB_CORE is not set | 1002 | # CONFIG_DVB_CORE is not set |
1003 | # CONFIG_VIDEO_MEDIA is not set | ||
1004 | |||
1005 | # | ||
1006 | # Multimedia drivers | ||
1007 | # | ||
999 | # CONFIG_DAB is not set | 1008 | # CONFIG_DAB is not set |
1000 | 1009 | ||
1001 | # | 1010 | # |
@@ -1055,11 +1064,13 @@ CONFIG_USB_DEVICEFS=y | |||
1055 | # | 1064 | # |
1056 | # USB Host Controller Drivers | 1065 | # USB Host Controller Drivers |
1057 | # | 1066 | # |
1067 | # CONFIG_USB_C67X00_HCD is not set | ||
1058 | CONFIG_USB_EHCI_HCD=y | 1068 | CONFIG_USB_EHCI_HCD=y |
1059 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1069 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1060 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1070 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1061 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1071 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
1062 | # CONFIG_USB_ISP116X_HCD is not set | 1072 | # CONFIG_USB_ISP116X_HCD is not set |
1073 | # CONFIG_USB_ISP1760_HCD is not set | ||
1063 | CONFIG_USB_OHCI_HCD=y | 1074 | CONFIG_USB_OHCI_HCD=y |
1064 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1075 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1065 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1076 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1074,6 +1085,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1074 | # | 1085 | # |
1075 | # CONFIG_USB_ACM is not set | 1086 | # CONFIG_USB_ACM is not set |
1076 | # CONFIG_USB_PRINTER is not set | 1087 | # CONFIG_USB_PRINTER is not set |
1088 | # CONFIG_USB_WDM is not set | ||
1077 | 1089 | ||
1078 | # | 1090 | # |
1079 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1091 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1120,10 +1132,12 @@ CONFIG_USB_MON=y | |||
1120 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1132 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1121 | # CONFIG_USB_IOWARRIOR is not set | 1133 | # CONFIG_USB_IOWARRIOR is not set |
1122 | # CONFIG_USB_TEST is not set | 1134 | # CONFIG_USB_TEST is not set |
1135 | # CONFIG_USB_ISIGHTFW is not set | ||
1123 | # CONFIG_USB_GADGET is not set | 1136 | # CONFIG_USB_GADGET is not set |
1124 | # CONFIG_MMC is not set | 1137 | # CONFIG_MMC is not set |
1125 | # CONFIG_MEMSTICK is not set | 1138 | # CONFIG_MEMSTICK is not set |
1126 | # CONFIG_NEW_LEDS is not set | 1139 | # CONFIG_NEW_LEDS is not set |
1140 | # CONFIG_ACCESSIBILITY is not set | ||
1127 | # CONFIG_INFINIBAND is not set | 1141 | # CONFIG_INFINIBAND is not set |
1128 | # CONFIG_EDAC is not set | 1142 | # CONFIG_EDAC is not set |
1129 | CONFIG_RTC_LIB=y | 1143 | CONFIG_RTC_LIB=y |
@@ -1175,11 +1189,8 @@ CONFIG_RTC_DRV_MAX6900=y | |||
1175 | # | 1189 | # |
1176 | # on-CPU RTC drivers | 1190 | # on-CPU RTC drivers |
1177 | # | 1191 | # |
1192 | # CONFIG_RTC_DRV_PPC is not set | ||
1178 | # CONFIG_DMADEVICES is not set | 1193 | # CONFIG_DMADEVICES is not set |
1179 | |||
1180 | # | ||
1181 | # Userspace I/O | ||
1182 | # | ||
1183 | # CONFIG_UIO is not set | 1194 | # CONFIG_UIO is not set |
1184 | 1195 | ||
1185 | # | 1196 | # |
@@ -1199,7 +1210,6 @@ CONFIG_FS_MBCACHE=y | |||
1199 | # CONFIG_JFS_FS is not set | 1210 | # CONFIG_JFS_FS is not set |
1200 | # CONFIG_FS_POSIX_ACL is not set | 1211 | # CONFIG_FS_POSIX_ACL is not set |
1201 | # CONFIG_XFS_FS is not set | 1212 | # CONFIG_XFS_FS is not set |
1202 | # CONFIG_GFS2_FS is not set | ||
1203 | # CONFIG_OCFS2_FS is not set | 1213 | # CONFIG_OCFS2_FS is not set |
1204 | CONFIG_DNOTIFY=y | 1214 | CONFIG_DNOTIFY=y |
1205 | CONFIG_INOTIFY=y | 1215 | CONFIG_INOTIFY=y |
@@ -1257,7 +1267,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
1257 | CONFIG_NFS_FS=y | 1267 | CONFIG_NFS_FS=y |
1258 | # CONFIG_NFS_V3 is not set | 1268 | # CONFIG_NFS_V3 is not set |
1259 | # CONFIG_NFS_V4 is not set | 1269 | # CONFIG_NFS_V4 is not set |
1260 | # CONFIG_NFS_DIRECTIO is not set | ||
1261 | # CONFIG_NFSD is not set | 1270 | # CONFIG_NFSD is not set |
1262 | CONFIG_ROOT_NFS=y | 1271 | CONFIG_ROOT_NFS=y |
1263 | CONFIG_LOCKD=y | 1272 | CONFIG_LOCKD=y |
@@ -1300,6 +1309,7 @@ CONFIG_MSDOS_PARTITION=y | |||
1300 | # Library routines | 1309 | # Library routines |
1301 | # | 1310 | # |
1302 | CONFIG_BITREVERSE=y | 1311 | CONFIG_BITREVERSE=y |
1312 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1303 | # CONFIG_CRC_CCITT is not set | 1313 | # CONFIG_CRC_CCITT is not set |
1304 | # CONFIG_CRC16 is not set | 1314 | # CONFIG_CRC16 is not set |
1305 | # CONFIG_CRC_ITU_T is not set | 1315 | # CONFIG_CRC_ITU_T is not set |
@@ -1310,6 +1320,7 @@ CONFIG_PLIST=y | |||
1310 | CONFIG_HAS_IOMEM=y | 1320 | CONFIG_HAS_IOMEM=y |
1311 | CONFIG_HAS_IOPORT=y | 1321 | CONFIG_HAS_IOPORT=y |
1312 | CONFIG_HAS_DMA=y | 1322 | CONFIG_HAS_DMA=y |
1323 | CONFIG_HAVE_LMB=y | ||
1313 | 1324 | ||
1314 | # | 1325 | # |
1315 | # Kernel hacking | 1326 | # Kernel hacking |
@@ -1317,6 +1328,7 @@ CONFIG_HAS_DMA=y | |||
1317 | # CONFIG_PRINTK_TIME is not set | 1328 | # CONFIG_PRINTK_TIME is not set |
1318 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1329 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1319 | CONFIG_ENABLE_MUST_CHECK=y | 1330 | CONFIG_ENABLE_MUST_CHECK=y |
1331 | CONFIG_FRAME_WARN=1024 | ||
1320 | # CONFIG_MAGIC_SYSRQ is not set | 1332 | # CONFIG_MAGIC_SYSRQ is not set |
1321 | # CONFIG_UNUSED_SYMBOLS is not set | 1333 | # CONFIG_UNUSED_SYMBOLS is not set |
1322 | # CONFIG_DEBUG_FS is not set | 1334 | # CONFIG_DEBUG_FS is not set |
@@ -1326,6 +1338,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1326 | # CONFIG_SLUB_STATS is not set | 1338 | # CONFIG_SLUB_STATS is not set |
1327 | CONFIG_DEBUG_BUGVERBOSE=y | 1339 | CONFIG_DEBUG_BUGVERBOSE=y |
1328 | # CONFIG_SAMPLES is not set | 1340 | # CONFIG_SAMPLES is not set |
1341 | # CONFIG_IRQSTACKS is not set | ||
1329 | # CONFIG_BOOTX_TEXT is not set | 1342 | # CONFIG_BOOTX_TEXT is not set |
1330 | # CONFIG_PPC_EARLY_DEBUG is not set | 1343 | # CONFIG_PPC_EARLY_DEBUG is not set |
1331 | 1344 | ||
@@ -1336,48 +1349,78 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1336 | # CONFIG_SECURITY is not set | 1349 | # CONFIG_SECURITY is not set |
1337 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1350 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1338 | CONFIG_CRYPTO=y | 1351 | CONFIG_CRYPTO=y |
1339 | # CONFIG_CRYPTO_SEQIV is not set | 1352 | |
1353 | # | ||
1354 | # Crypto core or helper | ||
1355 | # | ||
1340 | # CONFIG_CRYPTO_MANAGER is not set | 1356 | # CONFIG_CRYPTO_MANAGER is not set |
1357 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1358 | # CONFIG_CRYPTO_NULL is not set | ||
1359 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1360 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1361 | |||
1362 | # | ||
1363 | # Authenticated Encryption with Associated Data | ||
1364 | # | ||
1365 | # CONFIG_CRYPTO_CCM is not set | ||
1366 | # CONFIG_CRYPTO_GCM is not set | ||
1367 | # CONFIG_CRYPTO_SEQIV is not set | ||
1368 | |||
1369 | # | ||
1370 | # Block modes | ||
1371 | # | ||
1372 | # CONFIG_CRYPTO_CBC is not set | ||
1373 | # CONFIG_CRYPTO_CTR is not set | ||
1374 | # CONFIG_CRYPTO_CTS is not set | ||
1375 | # CONFIG_CRYPTO_ECB is not set | ||
1376 | # CONFIG_CRYPTO_LRW is not set | ||
1377 | # CONFIG_CRYPTO_PCBC is not set | ||
1378 | # CONFIG_CRYPTO_XTS is not set | ||
1379 | |||
1380 | # | ||
1381 | # Hash modes | ||
1382 | # | ||
1341 | # CONFIG_CRYPTO_HMAC is not set | 1383 | # CONFIG_CRYPTO_HMAC is not set |
1342 | # CONFIG_CRYPTO_XCBC is not set | 1384 | # CONFIG_CRYPTO_XCBC is not set |
1343 | # CONFIG_CRYPTO_NULL is not set | 1385 | |
1386 | # | ||
1387 | # Digest | ||
1388 | # | ||
1389 | # CONFIG_CRYPTO_CRC32C is not set | ||
1344 | # CONFIG_CRYPTO_MD4 is not set | 1390 | # CONFIG_CRYPTO_MD4 is not set |
1345 | # CONFIG_CRYPTO_MD5 is not set | 1391 | # CONFIG_CRYPTO_MD5 is not set |
1392 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1346 | # CONFIG_CRYPTO_SHA1 is not set | 1393 | # CONFIG_CRYPTO_SHA1 is not set |
1347 | # CONFIG_CRYPTO_SHA256 is not set | 1394 | # CONFIG_CRYPTO_SHA256 is not set |
1348 | # CONFIG_CRYPTO_SHA512 is not set | 1395 | # CONFIG_CRYPTO_SHA512 is not set |
1349 | # CONFIG_CRYPTO_WP512 is not set | ||
1350 | # CONFIG_CRYPTO_TGR192 is not set | 1396 | # CONFIG_CRYPTO_TGR192 is not set |
1351 | # CONFIG_CRYPTO_GF128MUL is not set | 1397 | # CONFIG_CRYPTO_WP512 is not set |
1352 | # CONFIG_CRYPTO_ECB is not set | 1398 | |
1353 | # CONFIG_CRYPTO_CBC is not set | 1399 | # |
1354 | # CONFIG_CRYPTO_PCBC is not set | 1400 | # Ciphers |
1355 | # CONFIG_CRYPTO_LRW is not set | 1401 | # |
1356 | # CONFIG_CRYPTO_XTS is not set | ||
1357 | # CONFIG_CRYPTO_CTR is not set | ||
1358 | # CONFIG_CRYPTO_GCM is not set | ||
1359 | # CONFIG_CRYPTO_CCM is not set | ||
1360 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1361 | # CONFIG_CRYPTO_DES is not set | ||
1362 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1363 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1364 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1365 | # CONFIG_CRYPTO_SERPENT is not set | ||
1366 | # CONFIG_CRYPTO_AES is not set | 1402 | # CONFIG_CRYPTO_AES is not set |
1403 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1404 | # CONFIG_CRYPTO_ARC4 is not set | ||
1405 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1406 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1367 | # CONFIG_CRYPTO_CAST5 is not set | 1407 | # CONFIG_CRYPTO_CAST5 is not set |
1368 | # CONFIG_CRYPTO_CAST6 is not set | 1408 | # CONFIG_CRYPTO_CAST6 is not set |
1369 | # CONFIG_CRYPTO_TEA is not set | 1409 | # CONFIG_CRYPTO_DES is not set |
1370 | # CONFIG_CRYPTO_ARC4 is not set | 1410 | # CONFIG_CRYPTO_FCRYPT is not set |
1371 | # CONFIG_CRYPTO_KHAZAD is not set | 1411 | # CONFIG_CRYPTO_KHAZAD is not set |
1372 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1373 | # CONFIG_CRYPTO_SEED is not set | ||
1374 | # CONFIG_CRYPTO_SALSA20 is not set | 1412 | # CONFIG_CRYPTO_SALSA20 is not set |
1413 | # CONFIG_CRYPTO_SEED is not set | ||
1414 | # CONFIG_CRYPTO_SERPENT is not set | ||
1415 | # CONFIG_CRYPTO_TEA is not set | ||
1416 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1417 | |||
1418 | # | ||
1419 | # Compression | ||
1420 | # | ||
1375 | # CONFIG_CRYPTO_DEFLATE is not set | 1421 | # CONFIG_CRYPTO_DEFLATE is not set |
1376 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1377 | # CONFIG_CRYPTO_CRC32C is not set | ||
1378 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1379 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1380 | # CONFIG_CRYPTO_LZO is not set | 1422 | # CONFIG_CRYPTO_LZO is not set |
1381 | CONFIG_CRYPTO_HW=y | 1423 | CONFIG_CRYPTO_HW=y |
1382 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1424 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1383 | # CONFIG_PPC_CLOCK is not set | 1425 | # CONFIG_PPC_CLOCK is not set |
1426 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 3e2593c60b12..adaa05fb0478 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_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-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Thu Mar 27 13:56:28 2008 | 4 | # Tue May 20 20:03:28 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -81,6 +84,7 @@ CONFIG_LOG_BUF_SHIFT=17 | |||
81 | CONFIG_CGROUPS=y | 84 | CONFIG_CGROUPS=y |
82 | # CONFIG_CGROUP_DEBUG is not set | 85 | # CONFIG_CGROUP_DEBUG is not set |
83 | CONFIG_CGROUP_NS=y | 86 | CONFIG_CGROUP_NS=y |
87 | CONFIG_CGROUP_DEVICE=y | ||
84 | CONFIG_CPUSETS=y | 88 | CONFIG_CPUSETS=y |
85 | # CONFIG_GROUP_SCHED is not set | 89 | # CONFIG_GROUP_SCHED is not set |
86 | CONFIG_CGROUP_CPUACCT=y | 90 | CONFIG_CGROUP_CPUACCT=y |
@@ -100,6 +104,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
100 | CONFIG_SYSCTL=y | 104 | CONFIG_SYSCTL=y |
101 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
102 | CONFIG_SYSCTL_SYSCALL=y | 106 | CONFIG_SYSCTL_SYSCALL=y |
107 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
103 | CONFIG_KALLSYMS=y | 108 | CONFIG_KALLSYMS=y |
104 | CONFIG_KALLSYMS_ALL=y | 109 | CONFIG_KALLSYMS_ALL=y |
105 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -107,6 +112,7 @@ CONFIG_HOTPLUG=y | |||
107 | CONFIG_PRINTK=y | 112 | CONFIG_PRINTK=y |
108 | CONFIG_BUG=y | 113 | CONFIG_BUG=y |
109 | CONFIG_ELF_CORE=y | 114 | CONFIG_ELF_CORE=y |
115 | CONFIG_PCSPKR_PLATFORM=y | ||
110 | # CONFIG_COMPAT_BRK is not set | 116 | # CONFIG_COMPAT_BRK is not set |
111 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
112 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
@@ -129,12 +135,14 @@ CONFIG_KPROBES=y | |||
129 | CONFIG_KRETPROBES=y | 135 | CONFIG_KRETPROBES=y |
130 | CONFIG_HAVE_KPROBES=y | 136 | CONFIG_HAVE_KPROBES=y |
131 | CONFIG_HAVE_KRETPROBES=y | 137 | CONFIG_HAVE_KRETPROBES=y |
138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
132 | CONFIG_PROC_PAGE_MONITOR=y | 139 | CONFIG_PROC_PAGE_MONITOR=y |
133 | CONFIG_SLABINFO=y | 140 | CONFIG_SLABINFO=y |
134 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
135 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
136 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
137 | CONFIG_MODULES=y | 144 | CONFIG_MODULES=y |
145 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
138 | CONFIG_MODULE_UNLOAD=y | 146 | CONFIG_MODULE_UNLOAD=y |
139 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 147 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
140 | CONFIG_MODVERSIONS=y | 148 | CONFIG_MODVERSIONS=y |
@@ -178,11 +186,11 @@ CONFIG_LPARCFG=y | |||
178 | # CONFIG_PPC_PMAC is not set | 186 | # CONFIG_PPC_PMAC is not set |
179 | # CONFIG_PPC_MAPLE is not set | 187 | # CONFIG_PPC_MAPLE is not set |
180 | # CONFIG_PPC_PASEMI is not set | 188 | # CONFIG_PPC_PASEMI is not set |
181 | # CONFIG_PPC_CELLEB is not set | ||
182 | # CONFIG_PPC_PS3 is not set | 189 | # CONFIG_PPC_PS3 is not set |
183 | # CONFIG_PPC_CELL is not set | 190 | # CONFIG_PPC_CELL is not set |
184 | # CONFIG_PPC_CELL_NATIVE is not set | 191 | # CONFIG_PPC_CELL_NATIVE is not set |
185 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 192 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
193 | # CONFIG_PPC_CELLEB is not set | ||
186 | # CONFIG_PQ2ADS is not set | 194 | # CONFIG_PQ2ADS is not set |
187 | CONFIG_PPC_NATIVE=y | 195 | CONFIG_PPC_NATIVE=y |
188 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 196 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
@@ -225,7 +233,6 @@ CONFIG_PREEMPT_NONE=y | |||
225 | CONFIG_BINFMT_ELF=y | 233 | CONFIG_BINFMT_ELF=y |
226 | CONFIG_COMPAT_BINFMT_ELF=y | 234 | CONFIG_COMPAT_BINFMT_ELF=y |
227 | CONFIG_BINFMT_MISC=m | 235 | CONFIG_BINFMT_MISC=m |
228 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
229 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 236 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
230 | CONFIG_IOMMU_VMERGE=y | 237 | CONFIG_IOMMU_VMERGE=y |
231 | CONFIG_IOMMU_HELPER=y | 238 | CONFIG_IOMMU_HELPER=y |
@@ -255,6 +262,7 @@ CONFIG_SPARSEMEM_EXTREME=y | |||
255 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 262 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
256 | CONFIG_SPARSEMEM_VMEMMAP=y | 263 | CONFIG_SPARSEMEM_VMEMMAP=y |
257 | # CONFIG_MEMORY_HOTPLUG is not set | 264 | # CONFIG_MEMORY_HOTPLUG is not set |
265 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
258 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 266 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
259 | CONFIG_MIGRATION=y | 267 | CONFIG_MIGRATION=y |
260 | CONFIG_RESOURCES_64BIT=y | 268 | CONFIG_RESOURCES_64BIT=y |
@@ -263,6 +271,7 @@ CONFIG_BOUNCE=y | |||
263 | CONFIG_NODES_SPAN_OTHER_NODES=y | 271 | CONFIG_NODES_SPAN_OTHER_NODES=y |
264 | # CONFIG_PPC_HAS_HASH_64K is not set | 272 | # CONFIG_PPC_HAS_HASH_64K is not set |
265 | # CONFIG_PPC_64K_PAGES is not set | 273 | # CONFIG_PPC_64K_PAGES is not set |
274 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
266 | CONFIG_SCHED_SMT=y | 275 | CONFIG_SCHED_SMT=y |
267 | CONFIG_PROC_DEVICETREE=y | 276 | CONFIG_PROC_DEVICETREE=y |
268 | # CONFIG_CMDLINE_BOOL is not set | 277 | # CONFIG_CMDLINE_BOOL is not set |
@@ -291,7 +300,10 @@ CONFIG_HOTPLUG_PCI=m | |||
291 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 300 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
292 | CONFIG_HOTPLUG_PCI_RPA=m | 301 | CONFIG_HOTPLUG_PCI_RPA=m |
293 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | 302 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m |
303 | # CONFIG_HAS_RAPIDIO is not set | ||
304 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
294 | CONFIG_KERNEL_START=0xc000000000000000 | 305 | CONFIG_KERNEL_START=0xc000000000000000 |
306 | CONFIG_PHYSICAL_START=0x00000000 | ||
295 | 307 | ||
296 | # | 308 | # |
297 | # Networking | 309 | # Networking |
@@ -338,8 +350,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
338 | # CONFIG_TCP_MD5SIG is not set | 350 | # CONFIG_TCP_MD5SIG is not set |
339 | # CONFIG_IP_VS is not set | 351 | # CONFIG_IP_VS is not set |
340 | # CONFIG_IPV6 is not set | 352 | # CONFIG_IPV6 is not set |
341 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
342 | # CONFIG_INET6_TUNNEL is not set | ||
343 | # CONFIG_NETWORK_SECMARK is not set | 353 | # CONFIG_NETWORK_SECMARK is not set |
344 | CONFIG_NETFILTER=y | 354 | CONFIG_NETFILTER=y |
345 | # CONFIG_NETFILTER_DEBUG is not set | 355 | # CONFIG_NETFILTER_DEBUG is not set |
@@ -355,6 +365,7 @@ CONFIG_NF_CONNTRACK=m | |||
355 | CONFIG_NF_CT_ACCT=y | 365 | CONFIG_NF_CT_ACCT=y |
356 | CONFIG_NF_CONNTRACK_MARK=y | 366 | CONFIG_NF_CONNTRACK_MARK=y |
357 | CONFIG_NF_CONNTRACK_EVENTS=y | 367 | CONFIG_NF_CONNTRACK_EVENTS=y |
368 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
358 | # CONFIG_NF_CT_PROTO_SCTP is not set | 369 | # CONFIG_NF_CT_PROTO_SCTP is not set |
359 | CONFIG_NF_CT_PROTO_UDPLITE=m | 370 | CONFIG_NF_CT_PROTO_UDPLITE=m |
360 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 371 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
@@ -426,6 +437,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m | |||
426 | CONFIG_IP_NF_TARGET_REDIRECT=m | 437 | CONFIG_IP_NF_TARGET_REDIRECT=m |
427 | CONFIG_IP_NF_TARGET_NETMAP=m | 438 | CONFIG_IP_NF_TARGET_NETMAP=m |
428 | CONFIG_NF_NAT_SNMP_BASIC=m | 439 | CONFIG_NF_NAT_SNMP_BASIC=m |
440 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
429 | CONFIG_NF_NAT_FTP=m | 441 | CONFIG_NF_NAT_FTP=m |
430 | CONFIG_NF_NAT_IRC=m | 442 | CONFIG_NF_NAT_IRC=m |
431 | CONFIG_NF_NAT_TFTP=m | 443 | CONFIG_NF_NAT_TFTP=m |
@@ -492,6 +504,7 @@ CONFIG_FW_LOADER=y | |||
492 | # CONFIG_CONNECTOR is not set | 504 | # CONFIG_CONNECTOR is not set |
493 | # CONFIG_MTD is not set | 505 | # CONFIG_MTD is not set |
494 | CONFIG_OF_DEVICE=y | 506 | CONFIG_OF_DEVICE=y |
507 | CONFIG_OF_I2C=y | ||
495 | CONFIG_PARPORT=m | 508 | CONFIG_PARPORT=m |
496 | CONFIG_PARPORT_PC=m | 509 | CONFIG_PARPORT_PC=m |
497 | # CONFIG_PARPORT_SERIAL is not set | 510 | # CONFIG_PARPORT_SERIAL is not set |
@@ -545,7 +558,6 @@ CONFIG_IDE_PROC_FS=y | |||
545 | # | 558 | # |
546 | # IDE chipset support/bugfixes | 559 | # IDE chipset support/bugfixes |
547 | # | 560 | # |
548 | CONFIG_IDE_GENERIC=y | ||
549 | # CONFIG_BLK_DEV_PLATFORM is not set | 561 | # CONFIG_BLK_DEV_PLATFORM is not set |
550 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 562 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
551 | 563 | ||
@@ -584,7 +596,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
584 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 596 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
585 | # CONFIG_BLK_DEV_TC86C001 is not set | 597 | # CONFIG_BLK_DEV_TC86C001 is not set |
586 | CONFIG_BLK_DEV_IDEDMA=y | 598 | CONFIG_BLK_DEV_IDEDMA=y |
587 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 599 | # CONFIG_BLK_DEV_HD_ONLY is not set |
588 | # CONFIG_BLK_DEV_HD is not set | 600 | # CONFIG_BLK_DEV_HD is not set |
589 | 601 | ||
590 | # | 602 | # |
@@ -671,61 +683,10 @@ CONFIG_SCSI_LPFC=m | |||
671 | # CONFIG_SCSI_SRP is not set | 683 | # CONFIG_SCSI_SRP is not set |
672 | CONFIG_ATA=y | 684 | CONFIG_ATA=y |
673 | # CONFIG_ATA_NONSTANDARD is not set | 685 | # CONFIG_ATA_NONSTANDARD is not set |
686 | CONFIG_SATA_PMP=y | ||
674 | # CONFIG_SATA_AHCI is not set | 687 | # CONFIG_SATA_AHCI is not set |
675 | # CONFIG_SATA_SVW is not set | ||
676 | # CONFIG_ATA_PIIX is not set | ||
677 | # CONFIG_SATA_MV is not set | ||
678 | # CONFIG_SATA_NV is not set | ||
679 | # CONFIG_PDC_ADMA is not set | ||
680 | # CONFIG_SATA_QSTOR is not set | ||
681 | # CONFIG_SATA_PROMISE is not set | ||
682 | # CONFIG_SATA_SX4 is not set | ||
683 | # CONFIG_SATA_SIL is not set | ||
684 | # CONFIG_SATA_SIL24 is not set | 688 | # CONFIG_SATA_SIL24 is not set |
685 | # CONFIG_SATA_SIS is not set | 689 | # CONFIG_ATA_SFF is not set |
686 | # CONFIG_SATA_ULI is not set | ||
687 | # CONFIG_SATA_VIA is not set | ||
688 | # CONFIG_SATA_VITESSE is not set | ||
689 | # CONFIG_SATA_INIC162X is not set | ||
690 | # CONFIG_PATA_ALI is not set | ||
691 | # CONFIG_PATA_AMD is not set | ||
692 | # CONFIG_PATA_ARTOP is not set | ||
693 | # CONFIG_PATA_ATIIXP is not set | ||
694 | # CONFIG_PATA_CMD640_PCI is not set | ||
695 | # CONFIG_PATA_CMD64X is not set | ||
696 | # CONFIG_PATA_CS5520 is not set | ||
697 | # CONFIG_PATA_CS5530 is not set | ||
698 | # CONFIG_PATA_CYPRESS is not set | ||
699 | # CONFIG_PATA_EFAR is not set | ||
700 | # CONFIG_ATA_GENERIC is not set | ||
701 | # CONFIG_PATA_HPT366 is not set | ||
702 | # CONFIG_PATA_HPT37X is not set | ||
703 | # CONFIG_PATA_HPT3X2N is not set | ||
704 | # CONFIG_PATA_HPT3X3 is not set | ||
705 | # CONFIG_PATA_IT821X is not set | ||
706 | # CONFIG_PATA_IT8213 is not set | ||
707 | # CONFIG_PATA_JMICRON is not set | ||
708 | # CONFIG_PATA_TRIFLEX is not set | ||
709 | # CONFIG_PATA_MARVELL is not set | ||
710 | # CONFIG_PATA_MPIIX is not set | ||
711 | # CONFIG_PATA_OLDPIIX is not set | ||
712 | # CONFIG_PATA_NETCELL is not set | ||
713 | # CONFIG_PATA_NINJA32 is not set | ||
714 | # CONFIG_PATA_NS87410 is not set | ||
715 | # CONFIG_PATA_NS87415 is not set | ||
716 | # CONFIG_PATA_OPTI is not set | ||
717 | # CONFIG_PATA_OPTIDMA is not set | ||
718 | # CONFIG_PATA_PDC_OLD is not set | ||
719 | # CONFIG_PATA_RADISYS is not set | ||
720 | # CONFIG_PATA_RZ1000 is not set | ||
721 | # CONFIG_PATA_SC1200 is not set | ||
722 | # CONFIG_PATA_SERVERWORKS is not set | ||
723 | # CONFIG_PATA_PDC2027X is not set | ||
724 | # CONFIG_PATA_SIL680 is not set | ||
725 | # CONFIG_PATA_SIS is not set | ||
726 | # CONFIG_PATA_VIA is not set | ||
727 | CONFIG_PATA_WINBOND=y | ||
728 | # CONFIG_PATA_PLATFORM is not set | ||
729 | CONFIG_MD=y | 690 | CONFIG_MD=y |
730 | CONFIG_BLK_DEV_MD=y | 691 | CONFIG_BLK_DEV_MD=y |
731 | CONFIG_MD_LINEAR=y | 692 | CONFIG_MD_LINEAR=y |
@@ -783,7 +744,6 @@ CONFIG_IBMVETH=y | |||
783 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 744 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
784 | CONFIG_NET_PCI=y | 745 | CONFIG_NET_PCI=y |
785 | CONFIG_PCNET32=y | 746 | CONFIG_PCNET32=y |
786 | # CONFIG_PCNET32_NAPI is not set | ||
787 | # CONFIG_AMD8111_ETH is not set | 747 | # CONFIG_AMD8111_ETH is not set |
788 | # CONFIG_ADAPTEC_STARFIRE is not set | 748 | # CONFIG_ADAPTEC_STARFIRE is not set |
789 | # CONFIG_B44 is not set | 749 | # CONFIG_B44 is not set |
@@ -820,7 +780,6 @@ CONFIG_E1000=y | |||
820 | # CONFIG_SIS190 is not set | 780 | # CONFIG_SIS190 is not set |
821 | # CONFIG_SKGE is not set | 781 | # CONFIG_SKGE is not set |
822 | # CONFIG_SKY2 is not set | 782 | # CONFIG_SKY2 is not set |
823 | # CONFIG_SK98LIN is not set | ||
824 | # CONFIG_VIA_VELOCITY is not set | 783 | # CONFIG_VIA_VELOCITY is not set |
825 | CONFIG_TIGON3=y | 784 | CONFIG_TIGON3=y |
826 | # CONFIG_BNX2 is not set | 785 | # CONFIG_BNX2 is not set |
@@ -829,7 +788,6 @@ CONFIG_TIGON3=y | |||
829 | CONFIG_NETDEV_10000=y | 788 | CONFIG_NETDEV_10000=y |
830 | # CONFIG_CHELSIO_T1 is not set | 789 | # CONFIG_CHELSIO_T1 is not set |
831 | # CONFIG_CHELSIO_T3 is not set | 790 | # CONFIG_CHELSIO_T3 is not set |
832 | CONFIG_EHEA=m | ||
833 | # CONFIG_IXGBE is not set | 791 | # CONFIG_IXGBE is not set |
834 | CONFIG_IXGB=m | 792 | CONFIG_IXGB=m |
835 | # CONFIG_IXGB_NAPI is not set | 793 | # CONFIG_IXGB_NAPI is not set |
@@ -838,10 +796,10 @@ CONFIG_S2IO=m | |||
838 | # CONFIG_MYRI10GE is not set | 796 | # CONFIG_MYRI10GE is not set |
839 | # CONFIG_NETXEN_NIC is not set | 797 | # CONFIG_NETXEN_NIC is not set |
840 | # CONFIG_NIU is not set | 798 | # CONFIG_NIU is not set |
841 | # CONFIG_PASEMI_MAC is not set | ||
842 | # CONFIG_MLX4_CORE is not set | 799 | # CONFIG_MLX4_CORE is not set |
843 | # CONFIG_TEHUTI is not set | 800 | # CONFIG_TEHUTI is not set |
844 | # CONFIG_BNX2X is not set | 801 | # CONFIG_BNX2X is not set |
802 | # CONFIG_SFC is not set | ||
845 | CONFIG_TR=y | 803 | CONFIG_TR=y |
846 | CONFIG_IBMOL=y | 804 | CONFIG_IBMOL=y |
847 | # CONFIG_3C359 is not set | 805 | # CONFIG_3C359 is not set |
@@ -852,6 +810,7 @@ CONFIG_IBMOL=y | |||
852 | # | 810 | # |
853 | # CONFIG_WLAN_PRE80211 is not set | 811 | # CONFIG_WLAN_PRE80211 is not set |
854 | # CONFIG_WLAN_80211 is not set | 812 | # CONFIG_WLAN_80211 is not set |
813 | # CONFIG_IWLWIFI_LEDS is not set | ||
855 | 814 | ||
856 | # | 815 | # |
857 | # USB Network Adapters | 816 | # USB Network Adapters |
@@ -956,6 +915,7 @@ CONFIG_VT=y | |||
956 | CONFIG_VT_CONSOLE=y | 915 | CONFIG_VT_CONSOLE=y |
957 | CONFIG_HW_CONSOLE=y | 916 | CONFIG_HW_CONSOLE=y |
958 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 917 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
918 | CONFIG_DEVKMEM=y | ||
959 | # CONFIG_SERIAL_NONSTANDARD is not set | 919 | # CONFIG_SERIAL_NONSTANDARD is not set |
960 | # CONFIG_NOZOMI is not set | 920 | # CONFIG_NOZOMI is not set |
961 | 921 | ||
@@ -1000,13 +960,7 @@ CONFIG_DEVPORT=y | |||
1000 | CONFIG_I2C=y | 960 | CONFIG_I2C=y |
1001 | CONFIG_I2C_BOARDINFO=y | 961 | CONFIG_I2C_BOARDINFO=y |
1002 | # CONFIG_I2C_CHARDEV is not set | 962 | # CONFIG_I2C_CHARDEV is not set |
1003 | |||
1004 | # | ||
1005 | # I2C Algorithms | ||
1006 | # | ||
1007 | CONFIG_I2C_ALGOBIT=y | 963 | CONFIG_I2C_ALGOBIT=y |
1008 | # CONFIG_I2C_ALGOPCF is not set | ||
1009 | # CONFIG_I2C_ALGOPCA is not set | ||
1010 | 964 | ||
1011 | # | 965 | # |
1012 | # I2C Hardware Bus support | 966 | # I2C Hardware Bus support |
@@ -1035,6 +989,7 @@ CONFIG_I2C_ALGOBIT=y | |||
1035 | # CONFIG_I2C_VIA is not set | 989 | # CONFIG_I2C_VIA is not set |
1036 | # CONFIG_I2C_VIAPRO is not set | 990 | # CONFIG_I2C_VIAPRO is not set |
1037 | # CONFIG_I2C_VOODOO3 is not set | 991 | # CONFIG_I2C_VOODOO3 is not set |
992 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1038 | 993 | ||
1039 | # | 994 | # |
1040 | # Miscellaneous I2C Chip support | 995 | # Miscellaneous I2C Chip support |
@@ -1044,19 +999,13 @@ CONFIG_I2C_ALGOBIT=y | |||
1044 | # CONFIG_SENSORS_PCF8574 is not set | 999 | # CONFIG_SENSORS_PCF8574 is not set |
1045 | # CONFIG_PCF8575 is not set | 1000 | # CONFIG_PCF8575 is not set |
1046 | # CONFIG_SENSORS_PCF8591 is not set | 1001 | # CONFIG_SENSORS_PCF8591 is not set |
1047 | # CONFIG_TPS65010 is not set | ||
1048 | # CONFIG_SENSORS_MAX6875 is not set | 1002 | # CONFIG_SENSORS_MAX6875 is not set |
1049 | # CONFIG_SENSORS_TSL2550 is not set | 1003 | # CONFIG_SENSORS_TSL2550 is not set |
1050 | # CONFIG_I2C_DEBUG_CORE is not set | 1004 | # CONFIG_I2C_DEBUG_CORE is not set |
1051 | # CONFIG_I2C_DEBUG_ALGO is not set | 1005 | # CONFIG_I2C_DEBUG_ALGO is not set |
1052 | # CONFIG_I2C_DEBUG_BUS is not set | 1006 | # CONFIG_I2C_DEBUG_BUS is not set |
1053 | # CONFIG_I2C_DEBUG_CHIP is not set | 1007 | # CONFIG_I2C_DEBUG_CHIP is not set |
1054 | |||
1055 | # | ||
1056 | # SPI support | ||
1057 | # | ||
1058 | # CONFIG_SPI is not set | 1008 | # CONFIG_SPI is not set |
1059 | # CONFIG_SPI_MASTER is not set | ||
1060 | # CONFIG_W1 is not set | 1009 | # CONFIG_W1 is not set |
1061 | # CONFIG_POWER_SUPPLY is not set | 1010 | # CONFIG_POWER_SUPPLY is not set |
1062 | # CONFIG_HWMON is not set | 1011 | # CONFIG_HWMON is not set |
@@ -1073,12 +1022,22 @@ CONFIG_SSB_POSSIBLE=y | |||
1073 | # Multifunction device drivers | 1022 | # Multifunction device drivers |
1074 | # | 1023 | # |
1075 | # CONFIG_MFD_SM501 is not set | 1024 | # CONFIG_MFD_SM501 is not set |
1025 | # CONFIG_HTC_PASIC3 is not set | ||
1076 | 1026 | ||
1077 | # | 1027 | # |
1078 | # Multimedia devices | 1028 | # Multimedia devices |
1079 | # | 1029 | # |
1030 | |||
1031 | # | ||
1032 | # Multimedia core support | ||
1033 | # | ||
1080 | # CONFIG_VIDEO_DEV is not set | 1034 | # CONFIG_VIDEO_DEV is not set |
1081 | # CONFIG_DVB_CORE is not set | 1035 | # CONFIG_DVB_CORE is not set |
1036 | # CONFIG_VIDEO_MEDIA is not set | ||
1037 | |||
1038 | # | ||
1039 | # Multimedia drivers | ||
1040 | # | ||
1082 | # CONFIG_DAB is not set | 1041 | # CONFIG_DAB is not set |
1083 | 1042 | ||
1084 | # | 1043 | # |
@@ -1098,8 +1057,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1098 | # CONFIG_FB_SYS_FILLRECT is not set | 1057 | # CONFIG_FB_SYS_FILLRECT is not set |
1099 | # CONFIG_FB_SYS_COPYAREA is not set | 1058 | # CONFIG_FB_SYS_COPYAREA is not set |
1100 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1059 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1060 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1101 | # CONFIG_FB_SYS_FOPS is not set | 1061 | # CONFIG_FB_SYS_FOPS is not set |
1102 | CONFIG_FB_DEFERRED_IO=y | ||
1103 | # CONFIG_FB_SVGALIB is not set | 1062 | # CONFIG_FB_SVGALIB is not set |
1104 | CONFIG_FB_MACMODES=y | 1063 | CONFIG_FB_MACMODES=y |
1105 | CONFIG_FB_BACKLIGHT=y | 1064 | CONFIG_FB_BACKLIGHT=y |
@@ -1209,11 +1168,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1209 | # | 1168 | # |
1210 | # USB Host Controller Drivers | 1169 | # USB Host Controller Drivers |
1211 | # | 1170 | # |
1171 | # CONFIG_USB_C67X00_HCD is not set | ||
1212 | CONFIG_USB_EHCI_HCD=y | 1172 | CONFIG_USB_EHCI_HCD=y |
1213 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1173 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1214 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1174 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1215 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1175 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
1216 | # CONFIG_USB_ISP116X_HCD is not set | 1176 | # CONFIG_USB_ISP116X_HCD is not set |
1177 | # CONFIG_USB_ISP1760_HCD is not set | ||
1217 | CONFIG_USB_OHCI_HCD=y | 1178 | CONFIG_USB_OHCI_HCD=y |
1218 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1179 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
1219 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1180 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1247,7 +1208,9 @@ CONFIG_USB_STORAGE=y | |||
1247 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1208 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1248 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1209 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1249 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1210 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1211 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
1250 | # CONFIG_USB_STORAGE_KARMA is not set | 1212 | # CONFIG_USB_STORAGE_KARMA is not set |
1213 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1251 | # CONFIG_USB_LIBUSUAL is not set | 1214 | # CONFIG_USB_LIBUSUAL is not set |
1252 | 1215 | ||
1253 | # | 1216 | # |
@@ -1290,6 +1253,7 @@ CONFIG_USB_MON=y | |||
1290 | # CONFIG_MMC is not set | 1253 | # CONFIG_MMC is not set |
1291 | # CONFIG_MEMSTICK is not set | 1254 | # CONFIG_MEMSTICK is not set |
1292 | # CONFIG_NEW_LEDS is not set | 1255 | # CONFIG_NEW_LEDS is not set |
1256 | # CONFIG_ACCESSIBILITY is not set | ||
1293 | CONFIG_INFINIBAND=m | 1257 | CONFIG_INFINIBAND=m |
1294 | CONFIG_INFINIBAND_USER_MAD=m | 1258 | CONFIG_INFINIBAND_USER_MAD=m |
1295 | CONFIG_INFINIBAND_USER_ACCESS=m | 1259 | CONFIG_INFINIBAND_USER_ACCESS=m |
@@ -1312,10 +1276,6 @@ CONFIG_INFINIBAND_SRP=m | |||
1312 | # CONFIG_RTC_CLASS is not set | 1276 | # CONFIG_RTC_CLASS is not set |
1313 | # CONFIG_DMADEVICES is not set | 1277 | # CONFIG_DMADEVICES is not set |
1314 | # CONFIG_AUXDISPLAY is not set | 1278 | # CONFIG_AUXDISPLAY is not set |
1315 | |||
1316 | # | ||
1317 | # Userspace I/O | ||
1318 | # | ||
1319 | # CONFIG_UIO is not set | 1279 | # CONFIG_UIO is not set |
1320 | 1280 | ||
1321 | # | 1281 | # |
@@ -1349,11 +1309,12 @@ CONFIG_JFS_SECURITY=y | |||
1349 | CONFIG_FS_POSIX_ACL=y | 1309 | CONFIG_FS_POSIX_ACL=y |
1350 | CONFIG_XFS_FS=m | 1310 | CONFIG_XFS_FS=m |
1351 | # CONFIG_XFS_QUOTA is not set | 1311 | # CONFIG_XFS_QUOTA is not set |
1352 | CONFIG_XFS_SECURITY=y | ||
1353 | CONFIG_XFS_POSIX_ACL=y | 1312 | CONFIG_XFS_POSIX_ACL=y |
1354 | # CONFIG_XFS_RT is not set | 1313 | # CONFIG_XFS_RT is not set |
1314 | # CONFIG_XFS_DEBUG is not set | ||
1355 | # CONFIG_GFS2_FS is not set | 1315 | # CONFIG_GFS2_FS is not set |
1356 | CONFIG_OCFS2_FS=m | 1316 | CONFIG_OCFS2_FS=m |
1317 | CONFIG_OCFS2_FS_O2CB=m | ||
1357 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1318 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
1358 | # CONFIG_OCFS2_DEBUG_FS is not set | 1319 | # CONFIG_OCFS2_DEBUG_FS is not set |
1359 | CONFIG_DNOTIFY=y | 1320 | CONFIG_DNOTIFY=y |
@@ -1419,13 +1380,11 @@ CONFIG_NFS_FS=y | |||
1419 | CONFIG_NFS_V3=y | 1380 | CONFIG_NFS_V3=y |
1420 | CONFIG_NFS_V3_ACL=y | 1381 | CONFIG_NFS_V3_ACL=y |
1421 | CONFIG_NFS_V4=y | 1382 | CONFIG_NFS_V4=y |
1422 | # CONFIG_NFS_DIRECTIO is not set | ||
1423 | CONFIG_NFSD=y | 1383 | CONFIG_NFSD=y |
1424 | CONFIG_NFSD_V2_ACL=y | 1384 | CONFIG_NFSD_V2_ACL=y |
1425 | CONFIG_NFSD_V3=y | 1385 | CONFIG_NFSD_V3=y |
1426 | CONFIG_NFSD_V3_ACL=y | 1386 | CONFIG_NFSD_V3_ACL=y |
1427 | CONFIG_NFSD_V4=y | 1387 | CONFIG_NFSD_V4=y |
1428 | CONFIG_NFSD_TCP=y | ||
1429 | CONFIG_LOCKD=y | 1388 | CONFIG_LOCKD=y |
1430 | CONFIG_LOCKD_V4=y | 1389 | CONFIG_LOCKD_V4=y |
1431 | CONFIG_EXPORTFS=y | 1390 | CONFIG_EXPORTFS=y |
@@ -1500,9 +1459,10 @@ CONFIG_NLS_ISO8859_1=y | |||
1500 | # Library routines | 1459 | # Library routines |
1501 | # | 1460 | # |
1502 | CONFIG_BITREVERSE=y | 1461 | CONFIG_BITREVERSE=y |
1462 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1503 | CONFIG_CRC_CCITT=m | 1463 | CONFIG_CRC_CCITT=m |
1504 | # CONFIG_CRC16 is not set | 1464 | # CONFIG_CRC16 is not set |
1505 | # CONFIG_CRC_ITU_T is not set | 1465 | CONFIG_CRC_ITU_T=m |
1506 | CONFIG_CRC32=y | 1466 | CONFIG_CRC32=y |
1507 | # CONFIG_CRC7 is not set | 1467 | # CONFIG_CRC7 is not set |
1508 | CONFIG_LIBCRC32C=m | 1468 | CONFIG_LIBCRC32C=m |
@@ -1526,6 +1486,7 @@ CONFIG_HAVE_LMB=y | |||
1526 | # CONFIG_PRINTK_TIME is not set | 1486 | # CONFIG_PRINTK_TIME is not set |
1527 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1487 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1528 | CONFIG_ENABLE_MUST_CHECK=y | 1488 | CONFIG_ENABLE_MUST_CHECK=y |
1489 | CONFIG_FRAME_WARN=2048 | ||
1529 | CONFIG_MAGIC_SYSRQ=y | 1490 | CONFIG_MAGIC_SYSRQ=y |
1530 | # CONFIG_UNUSED_SYMBOLS is not set | 1491 | # CONFIG_UNUSED_SYMBOLS is not set |
1531 | CONFIG_DEBUG_FS=y | 1492 | CONFIG_DEBUG_FS=y |
@@ -1536,18 +1497,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1536 | CONFIG_SCHED_DEBUG=y | 1497 | CONFIG_SCHED_DEBUG=y |
1537 | # CONFIG_SCHEDSTATS is not set | 1498 | # CONFIG_SCHEDSTATS is not set |
1538 | # CONFIG_TIMER_STATS is not set | 1499 | # CONFIG_TIMER_STATS is not set |
1500 | # CONFIG_DEBUG_OBJECTS is not set | ||
1539 | # CONFIG_SLUB_DEBUG_ON is not set | 1501 | # CONFIG_SLUB_DEBUG_ON is not set |
1540 | # CONFIG_SLUB_STATS is not set | 1502 | # CONFIG_SLUB_STATS is not set |
1541 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1503 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1542 | # CONFIG_RT_MUTEX_TESTER is not set | 1504 | # CONFIG_RT_MUTEX_TESTER is not set |
1543 | # CONFIG_DEBUG_SPINLOCK is not set | 1505 | # CONFIG_DEBUG_SPINLOCK is not set |
1544 | # CONFIG_DEBUG_MUTEXES is not set | 1506 | # CONFIG_DEBUG_MUTEXES is not set |
1507 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1508 | # CONFIG_PROVE_LOCKING is not set | ||
1509 | # CONFIG_LOCK_STAT is not set | ||
1545 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1510 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1546 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1511 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1547 | # CONFIG_DEBUG_KOBJECT is not set | 1512 | # CONFIG_DEBUG_KOBJECT is not set |
1548 | CONFIG_DEBUG_BUGVERBOSE=y | 1513 | CONFIG_DEBUG_BUGVERBOSE=y |
1549 | # CONFIG_DEBUG_INFO is not set | 1514 | # CONFIG_DEBUG_INFO is not set |
1550 | # CONFIG_DEBUG_VM is not set | 1515 | # CONFIG_DEBUG_VM is not set |
1516 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1551 | # CONFIG_DEBUG_LIST is not set | 1517 | # CONFIG_DEBUG_LIST is not set |
1552 | # CONFIG_DEBUG_SG is not set | 1518 | # CONFIG_DEBUG_SG is not set |
1553 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1519 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1577,53 +1543,83 @@ CONFIG_VIRQ_DEBUG=y | |||
1577 | # CONFIG_SECURITY is not set | 1543 | # CONFIG_SECURITY is not set |
1578 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1544 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1579 | CONFIG_CRYPTO=y | 1545 | CONFIG_CRYPTO=y |
1546 | |||
1547 | # | ||
1548 | # Crypto core or helper | ||
1549 | # | ||
1580 | CONFIG_CRYPTO_ALGAPI=y | 1550 | CONFIG_CRYPTO_ALGAPI=y |
1581 | CONFIG_CRYPTO_AEAD=m | 1551 | CONFIG_CRYPTO_AEAD=m |
1582 | CONFIG_CRYPTO_BLKCIPHER=y | 1552 | CONFIG_CRYPTO_BLKCIPHER=y |
1583 | CONFIG_CRYPTO_SEQIV=m | ||
1584 | CONFIG_CRYPTO_HASH=y | 1553 | CONFIG_CRYPTO_HASH=y |
1585 | CONFIG_CRYPTO_MANAGER=y | 1554 | CONFIG_CRYPTO_MANAGER=y |
1555 | CONFIG_CRYPTO_GF128MUL=m | ||
1556 | CONFIG_CRYPTO_NULL=m | ||
1557 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1558 | CONFIG_CRYPTO_AUTHENC=m | ||
1559 | CONFIG_CRYPTO_TEST=m | ||
1560 | |||
1561 | # | ||
1562 | # Authenticated Encryption with Associated Data | ||
1563 | # | ||
1564 | CONFIG_CRYPTO_CCM=m | ||
1565 | CONFIG_CRYPTO_GCM=m | ||
1566 | CONFIG_CRYPTO_SEQIV=m | ||
1567 | |||
1568 | # | ||
1569 | # Block modes | ||
1570 | # | ||
1571 | CONFIG_CRYPTO_CBC=y | ||
1572 | CONFIG_CRYPTO_CTR=m | ||
1573 | # CONFIG_CRYPTO_CTS is not set | ||
1574 | CONFIG_CRYPTO_ECB=m | ||
1575 | # CONFIG_CRYPTO_LRW is not set | ||
1576 | CONFIG_CRYPTO_PCBC=m | ||
1577 | # CONFIG_CRYPTO_XTS is not set | ||
1578 | |||
1579 | # | ||
1580 | # Hash modes | ||
1581 | # | ||
1586 | CONFIG_CRYPTO_HMAC=y | 1582 | CONFIG_CRYPTO_HMAC=y |
1587 | # CONFIG_CRYPTO_XCBC is not set | 1583 | # CONFIG_CRYPTO_XCBC is not set |
1588 | CONFIG_CRYPTO_NULL=m | 1584 | |
1585 | # | ||
1586 | # Digest | ||
1587 | # | ||
1588 | CONFIG_CRYPTO_CRC32C=m | ||
1589 | CONFIG_CRYPTO_MD4=m | 1589 | CONFIG_CRYPTO_MD4=m |
1590 | CONFIG_CRYPTO_MD5=y | 1590 | CONFIG_CRYPTO_MD5=y |
1591 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1591 | CONFIG_CRYPTO_SHA1=m | 1592 | CONFIG_CRYPTO_SHA1=m |
1592 | CONFIG_CRYPTO_SHA256=m | 1593 | CONFIG_CRYPTO_SHA256=m |
1593 | CONFIG_CRYPTO_SHA512=m | 1594 | CONFIG_CRYPTO_SHA512=m |
1594 | CONFIG_CRYPTO_WP512=m | ||
1595 | CONFIG_CRYPTO_TGR192=m | 1595 | CONFIG_CRYPTO_TGR192=m |
1596 | CONFIG_CRYPTO_GF128MUL=m | 1596 | CONFIG_CRYPTO_WP512=m |
1597 | CONFIG_CRYPTO_ECB=m | 1597 | |
1598 | CONFIG_CRYPTO_CBC=y | 1598 | # |
1599 | CONFIG_CRYPTO_PCBC=m | 1599 | # Ciphers |
1600 | # CONFIG_CRYPTO_LRW is not set | 1600 | # |
1601 | # CONFIG_CRYPTO_XTS is not set | ||
1602 | CONFIG_CRYPTO_CTR=m | ||
1603 | CONFIG_CRYPTO_GCM=m | ||
1604 | CONFIG_CRYPTO_CCM=m | ||
1605 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1606 | CONFIG_CRYPTO_DES=y | ||
1607 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1608 | CONFIG_CRYPTO_BLOWFISH=m | ||
1609 | CONFIG_CRYPTO_TWOFISH=m | ||
1610 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1611 | CONFIG_CRYPTO_SERPENT=m | ||
1612 | CONFIG_CRYPTO_AES=m | 1601 | CONFIG_CRYPTO_AES=m |
1602 | CONFIG_CRYPTO_ANUBIS=m | ||
1603 | CONFIG_CRYPTO_ARC4=m | ||
1604 | CONFIG_CRYPTO_BLOWFISH=m | ||
1605 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1613 | CONFIG_CRYPTO_CAST5=m | 1606 | CONFIG_CRYPTO_CAST5=m |
1614 | CONFIG_CRYPTO_CAST6=m | 1607 | CONFIG_CRYPTO_CAST6=m |
1615 | CONFIG_CRYPTO_TEA=m | 1608 | CONFIG_CRYPTO_DES=y |
1616 | CONFIG_CRYPTO_ARC4=m | 1609 | # CONFIG_CRYPTO_FCRYPT is not set |
1617 | CONFIG_CRYPTO_KHAZAD=m | 1610 | CONFIG_CRYPTO_KHAZAD=m |
1618 | CONFIG_CRYPTO_ANUBIS=m | ||
1619 | # CONFIG_CRYPTO_SEED is not set | ||
1620 | CONFIG_CRYPTO_SALSA20=m | 1611 | CONFIG_CRYPTO_SALSA20=m |
1612 | # CONFIG_CRYPTO_SEED is not set | ||
1613 | CONFIG_CRYPTO_SERPENT=m | ||
1614 | CONFIG_CRYPTO_TEA=m | ||
1615 | CONFIG_CRYPTO_TWOFISH=m | ||
1616 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1617 | |||
1618 | # | ||
1619 | # Compression | ||
1620 | # | ||
1621 | CONFIG_CRYPTO_DEFLATE=m | 1621 | CONFIG_CRYPTO_DEFLATE=m |
1622 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1623 | CONFIG_CRYPTO_CRC32C=m | ||
1624 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1625 | CONFIG_CRYPTO_TEST=m | ||
1626 | CONFIG_CRYPTO_AUTHENC=m | ||
1627 | CONFIG_CRYPTO_LZO=m | 1622 | CONFIG_CRYPTO_LZO=m |
1628 | # CONFIG_CRYPTO_HW is not set | 1623 | # CONFIG_CRYPTO_HW is not set |
1629 | # CONFIG_PPC_CLOCK is not set | 1624 | # CONFIG_PPC_CLOCK is not set |
1625 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/sbc8641d_defconfig index 3180125aa6c4..8227510b41a9 100644 --- a/arch/powerpc/configs/sbc8641d_defconfig +++ b/arch/powerpc/configs/sbc8641d_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Thu Apr 10 18:03:25 2008 | 4 | # Mon Jun 9 08:52:19 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | ||
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_GENERIC_LOCKBREAK=y | 38 | CONFIG_GENERIC_LOCKBREAK=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
94 | # CONFIG_KALLSYMS_ALL is not set | 97 | # CONFIG_KALLSYMS_ALL is not set |
95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -116,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
116 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
117 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
118 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
119 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
120 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
121 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
122 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
123 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
124 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
125 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
127 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
@@ -197,7 +202,6 @@ CONFIG_PREEMPT=y | |||
197 | # CONFIG_PREEMPT_RCU is not set | 202 | # CONFIG_PREEMPT_RCU is not set |
198 | CONFIG_BINFMT_ELF=y | 203 | CONFIG_BINFMT_ELF=y |
199 | CONFIG_BINFMT_MISC=m | 204 | CONFIG_BINFMT_MISC=m |
200 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
201 | # CONFIG_IOMMU_HELPER is not set | 205 | # CONFIG_IOMMU_HELPER is not set |
202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
203 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 207 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
@@ -213,11 +217,13 @@ CONFIG_FLATMEM=y | |||
213 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
214 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
217 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
218 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
219 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
220 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
221 | # CONFIG_PROC_DEVICETREE is not set | 227 | # CONFIG_PROC_DEVICETREE is not set |
222 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
223 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
@@ -237,12 +243,14 @@ CONFIG_PCI_DOMAINS=y | |||
237 | CONFIG_PCI_SYSCALL=y | 243 | CONFIG_PCI_SYSCALL=y |
238 | CONFIG_PCIEPORTBUS=y | 244 | CONFIG_PCIEPORTBUS=y |
239 | CONFIG_PCIEAER=y | 245 | CONFIG_PCIEAER=y |
246 | # CONFIG_PCIEASPM is not set | ||
240 | CONFIG_ARCH_SUPPORTS_MSI=y | 247 | CONFIG_ARCH_SUPPORTS_MSI=y |
241 | # CONFIG_PCI_MSI is not set | 248 | # CONFIG_PCI_MSI is not set |
242 | CONFIG_PCI_LEGACY=y | 249 | CONFIG_PCI_LEGACY=y |
243 | # CONFIG_PCI_DEBUG is not set | 250 | # CONFIG_PCI_DEBUG is not set |
244 | # CONFIG_PCCARD is not set | 251 | # CONFIG_PCCARD is not set |
245 | # CONFIG_HOTPLUG_PCI is not set | 252 | # CONFIG_HOTPLUG_PCI is not set |
253 | # CONFIG_HAS_RAPIDIO is not set | ||
246 | 254 | ||
247 | # | 255 | # |
248 | # Advanced setup | 256 | # Advanced setup |
@@ -252,11 +260,11 @@ CONFIG_PCI_LEGACY=y | |||
252 | # | 260 | # |
253 | # Default settings for advanced configuration options are used | 261 | # Default settings for advanced configuration options are used |
254 | # | 262 | # |
255 | CONFIG_HIGHMEM_START=0xfe000000 | ||
256 | CONFIG_LOWMEM_SIZE=0x30000000 | 263 | CONFIG_LOWMEM_SIZE=0x30000000 |
264 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
257 | CONFIG_KERNEL_START=0xc0000000 | 265 | CONFIG_KERNEL_START=0xc0000000 |
266 | CONFIG_PHYSICAL_START=0x00000000 | ||
258 | CONFIG_TASK_SIZE=0xc0000000 | 267 | CONFIG_TASK_SIZE=0xc0000000 |
259 | CONFIG_BOOT_LOAD=0x00800000 | ||
260 | 268 | ||
261 | # | 269 | # |
262 | # Networking | 270 | # Networking |
@@ -328,8 +336,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
328 | CONFIG_INET6_XFRM_MODE_BEET=m | 336 | CONFIG_INET6_XFRM_MODE_BEET=m |
329 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 337 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
330 | CONFIG_IPV6_SIT=m | 338 | CONFIG_IPV6_SIT=m |
339 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
331 | CONFIG_IPV6_TUNNEL=m | 340 | CONFIG_IPV6_TUNNEL=m |
332 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 341 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
342 | # CONFIG_IPV6_MROUTE is not set | ||
333 | # CONFIG_NETLABEL is not set | 343 | # CONFIG_NETLABEL is not set |
334 | # CONFIG_NETWORK_SECMARK is not set | 344 | # CONFIG_NETWORK_SECMARK is not set |
335 | CONFIG_NETFILTER=y | 345 | CONFIG_NETFILTER=y |
@@ -534,6 +544,7 @@ CONFIG_MTD_PARTITIONS=y | |||
534 | # CONFIG_MTD_REDBOOT_PARTS is not set | 544 | # CONFIG_MTD_REDBOOT_PARTS is not set |
535 | # CONFIG_MTD_CMDLINE_PARTS is not set | 545 | # CONFIG_MTD_CMDLINE_PARTS is not set |
536 | # CONFIG_MTD_OF_PARTS is not set | 546 | # CONFIG_MTD_OF_PARTS is not set |
547 | # CONFIG_MTD_AR7_PARTS is not set | ||
537 | 548 | ||
538 | # | 549 | # |
539 | # User Modules And Translation Layers | 550 | # User Modules And Translation Layers |
@@ -610,6 +621,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
610 | # | 621 | # |
611 | # CONFIG_MTD_UBI is not set | 622 | # CONFIG_MTD_UBI is not set |
612 | CONFIG_OF_DEVICE=y | 623 | CONFIG_OF_DEVICE=y |
624 | CONFIG_OF_I2C=y | ||
613 | # CONFIG_PARPORT is not set | 625 | # CONFIG_PARPORT is not set |
614 | CONFIG_BLK_DEV=y | 626 | CONFIG_BLK_DEV=y |
615 | # CONFIG_BLK_DEV_FD is not set | 627 | # CONFIG_BLK_DEV_FD is not set |
@@ -727,7 +739,6 @@ CONFIG_NETDEV_1000=y | |||
727 | # CONFIG_SIS190 is not set | 739 | # CONFIG_SIS190 is not set |
728 | # CONFIG_SKGE is not set | 740 | # CONFIG_SKGE is not set |
729 | # CONFIG_SKY2 is not set | 741 | # CONFIG_SKY2 is not set |
730 | # CONFIG_SK98LIN is not set | ||
731 | # CONFIG_VIA_VELOCITY is not set | 742 | # CONFIG_VIA_VELOCITY is not set |
732 | # CONFIG_TIGON3 is not set | 743 | # CONFIG_TIGON3 is not set |
733 | # CONFIG_BNX2 is not set | 744 | # CONFIG_BNX2 is not set |
@@ -743,6 +754,7 @@ CONFIG_GIANFAR=y | |||
743 | # | 754 | # |
744 | # CONFIG_WLAN_PRE80211 is not set | 755 | # CONFIG_WLAN_PRE80211 is not set |
745 | # CONFIG_WLAN_80211 is not set | 756 | # CONFIG_WLAN_80211 is not set |
757 | # CONFIG_IWLWIFI_LEDS is not set | ||
746 | # CONFIG_WAN is not set | 758 | # CONFIG_WAN is not set |
747 | CONFIG_ATM_DRIVERS=y | 759 | CONFIG_ATM_DRIVERS=y |
748 | # CONFIG_ATM_DUMMY is not set | 760 | # CONFIG_ATM_DUMMY is not set |
@@ -825,6 +837,7 @@ CONFIG_VT=y | |||
825 | CONFIG_VT_CONSOLE=y | 837 | CONFIG_VT_CONSOLE=y |
826 | CONFIG_HW_CONSOLE=y | 838 | CONFIG_HW_CONSOLE=y |
827 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 839 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
840 | CONFIG_DEVKMEM=y | ||
828 | # CONFIG_SERIAL_NONSTANDARD is not set | 841 | # CONFIG_SERIAL_NONSTANDARD is not set |
829 | # CONFIG_NOZOMI is not set | 842 | # CONFIG_NOZOMI is not set |
830 | 843 | ||
@@ -863,13 +876,6 @@ CONFIG_I2C_BOARDINFO=y | |||
863 | CONFIG_I2C_CHARDEV=y | 876 | CONFIG_I2C_CHARDEV=y |
864 | 877 | ||
865 | # | 878 | # |
866 | # I2C Algorithms | ||
867 | # | ||
868 | # CONFIG_I2C_ALGOBIT is not set | ||
869 | # CONFIG_I2C_ALGOPCF is not set | ||
870 | # CONFIG_I2C_ALGOPCA is not set | ||
871 | |||
872 | # | ||
873 | # I2C Hardware Bus support | 879 | # I2C Hardware Bus support |
874 | # | 880 | # |
875 | # CONFIG_I2C_ALI1535 is not set | 881 | # CONFIG_I2C_ALI1535 is not set |
@@ -895,6 +901,7 @@ CONFIG_I2C_MPC=y | |||
895 | # CONFIG_I2C_VIA is not set | 901 | # CONFIG_I2C_VIA is not set |
896 | # CONFIG_I2C_VIAPRO is not set | 902 | # CONFIG_I2C_VIAPRO is not set |
897 | # CONFIG_I2C_VOODOO3 is not set | 903 | # CONFIG_I2C_VOODOO3 is not set |
904 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
898 | 905 | ||
899 | # | 906 | # |
900 | # Miscellaneous I2C Chip support | 907 | # Miscellaneous I2C Chip support |
@@ -904,19 +911,13 @@ CONFIG_I2C_MPC=y | |||
904 | # CONFIG_SENSORS_PCF8574 is not set | 911 | # CONFIG_SENSORS_PCF8574 is not set |
905 | # CONFIG_PCF8575 is not set | 912 | # CONFIG_PCF8575 is not set |
906 | # CONFIG_SENSORS_PCF8591 is not set | 913 | # CONFIG_SENSORS_PCF8591 is not set |
907 | # CONFIG_TPS65010 is not set | ||
908 | # CONFIG_SENSORS_MAX6875 is not set | 914 | # CONFIG_SENSORS_MAX6875 is not set |
909 | # CONFIG_SENSORS_TSL2550 is not set | 915 | # CONFIG_SENSORS_TSL2550 is not set |
910 | # CONFIG_I2C_DEBUG_CORE is not set | 916 | # CONFIG_I2C_DEBUG_CORE is not set |
911 | # CONFIG_I2C_DEBUG_ALGO is not set | 917 | # CONFIG_I2C_DEBUG_ALGO is not set |
912 | # CONFIG_I2C_DEBUG_BUS is not set | 918 | # CONFIG_I2C_DEBUG_BUS is not set |
913 | # CONFIG_I2C_DEBUG_CHIP is not set | 919 | # CONFIG_I2C_DEBUG_CHIP is not set |
914 | |||
915 | # | ||
916 | # SPI support | ||
917 | # | ||
918 | # CONFIG_SPI is not set | 920 | # CONFIG_SPI is not set |
919 | # CONFIG_SPI_MASTER is not set | ||
920 | # CONFIG_W1 is not set | 921 | # CONFIG_W1 is not set |
921 | # CONFIG_POWER_SUPPLY is not set | 922 | # CONFIG_POWER_SUPPLY is not set |
922 | CONFIG_HWMON=y | 923 | CONFIG_HWMON=y |
@@ -998,12 +999,22 @@ CONFIG_SSB_POSSIBLE=y | |||
998 | # Multifunction device drivers | 999 | # Multifunction device drivers |
999 | # | 1000 | # |
1000 | # CONFIG_MFD_SM501 is not set | 1001 | # CONFIG_MFD_SM501 is not set |
1002 | # CONFIG_HTC_PASIC3 is not set | ||
1001 | 1003 | ||
1002 | # | 1004 | # |
1003 | # Multimedia devices | 1005 | # Multimedia devices |
1004 | # | 1006 | # |
1007 | |||
1008 | # | ||
1009 | # Multimedia core support | ||
1010 | # | ||
1005 | # CONFIG_VIDEO_DEV is not set | 1011 | # CONFIG_VIDEO_DEV is not set |
1006 | # CONFIG_DVB_CORE is not set | 1012 | # CONFIG_DVB_CORE is not set |
1013 | # CONFIG_VIDEO_MEDIA is not set | ||
1014 | |||
1015 | # | ||
1016 | # Multimedia drivers | ||
1017 | # | ||
1007 | CONFIG_DAB=y | 1018 | CONFIG_DAB=y |
1008 | 1019 | ||
1009 | # | 1020 | # |
@@ -1041,6 +1052,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
1041 | CONFIG_USB_ARCH_HAS_OHCI=y | 1052 | CONFIG_USB_ARCH_HAS_OHCI=y |
1042 | CONFIG_USB_ARCH_HAS_EHCI=y | 1053 | CONFIG_USB_ARCH_HAS_EHCI=y |
1043 | # CONFIG_USB is not set | 1054 | # CONFIG_USB is not set |
1055 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1056 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1044 | 1057 | ||
1045 | # | 1058 | # |
1046 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1059 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1049,14 +1062,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1049 | # CONFIG_MMC is not set | 1062 | # CONFIG_MMC is not set |
1050 | # CONFIG_MEMSTICK is not set | 1063 | # CONFIG_MEMSTICK is not set |
1051 | # CONFIG_NEW_LEDS is not set | 1064 | # CONFIG_NEW_LEDS is not set |
1065 | # CONFIG_ACCESSIBILITY is not set | ||
1052 | # CONFIG_INFINIBAND is not set | 1066 | # CONFIG_INFINIBAND is not set |
1053 | # CONFIG_EDAC is not set | 1067 | # CONFIG_EDAC is not set |
1054 | # CONFIG_RTC_CLASS is not set | 1068 | # CONFIG_RTC_CLASS is not set |
1055 | # CONFIG_DMADEVICES is not set | 1069 | # CONFIG_DMADEVICES is not set |
1056 | |||
1057 | # | ||
1058 | # Userspace I/O | ||
1059 | # | ||
1060 | # CONFIG_UIO is not set | 1070 | # CONFIG_UIO is not set |
1061 | 1071 | ||
1062 | # | 1072 | # |
@@ -1084,8 +1094,8 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
1084 | # CONFIG_JFS_FS is not set | 1094 | # CONFIG_JFS_FS is not set |
1085 | CONFIG_FS_POSIX_ACL=y | 1095 | CONFIG_FS_POSIX_ACL=y |
1086 | # CONFIG_XFS_FS is not set | 1096 | # CONFIG_XFS_FS is not set |
1087 | # CONFIG_GFS2_FS is not set | ||
1088 | CONFIG_OCFS2_FS=m | 1097 | CONFIG_OCFS2_FS=m |
1098 | CONFIG_OCFS2_FS_O2CB=m | ||
1089 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1099 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
1090 | # CONFIG_OCFS2_DEBUG_FS is not set | 1100 | # CONFIG_OCFS2_DEBUG_FS is not set |
1091 | CONFIG_DNOTIFY=y | 1101 | CONFIG_DNOTIFY=y |
@@ -1145,7 +1155,6 @@ CONFIG_NFS_FS=y | |||
1145 | CONFIG_NFS_V3=y | 1155 | CONFIG_NFS_V3=y |
1146 | # CONFIG_NFS_V3_ACL is not set | 1156 | # CONFIG_NFS_V3_ACL is not set |
1147 | CONFIG_NFS_V4=y | 1157 | CONFIG_NFS_V4=y |
1148 | CONFIG_NFS_DIRECTIO=y | ||
1149 | # CONFIG_NFSD is not set | 1158 | # CONFIG_NFSD is not set |
1150 | CONFIG_ROOT_NFS=y | 1159 | CONFIG_ROOT_NFS=y |
1151 | CONFIG_LOCKD=y | 1160 | CONFIG_LOCKD=y |
@@ -1221,6 +1230,7 @@ CONFIG_NLS_UTF8=m | |||
1221 | # Library routines | 1230 | # Library routines |
1222 | # | 1231 | # |
1223 | CONFIG_BITREVERSE=y | 1232 | CONFIG_BITREVERSE=y |
1233 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1224 | CONFIG_CRC_CCITT=m | 1234 | CONFIG_CRC_CCITT=m |
1225 | # CONFIG_CRC16 is not set | 1235 | # CONFIG_CRC16 is not set |
1226 | # CONFIG_CRC_ITU_T is not set | 1236 | # CONFIG_CRC_ITU_T is not set |
@@ -1241,6 +1251,7 @@ CONFIG_HAVE_LMB=y | |||
1241 | # CONFIG_PRINTK_TIME is not set | 1251 | # CONFIG_PRINTK_TIME is not set |
1242 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1252 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1243 | CONFIG_ENABLE_MUST_CHECK=y | 1253 | CONFIG_ENABLE_MUST_CHECK=y |
1254 | CONFIG_FRAME_WARN=1024 | ||
1244 | CONFIG_MAGIC_SYSRQ=y | 1255 | CONFIG_MAGIC_SYSRQ=y |
1245 | # CONFIG_UNUSED_SYMBOLS is not set | 1256 | # CONFIG_UNUSED_SYMBOLS is not set |
1246 | CONFIG_DEBUG_FS=y | 1257 | CONFIG_DEBUG_FS=y |
@@ -1251,6 +1262,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1251 | CONFIG_SCHED_DEBUG=y | 1262 | CONFIG_SCHED_DEBUG=y |
1252 | # CONFIG_SCHEDSTATS is not set | 1263 | # CONFIG_SCHEDSTATS is not set |
1253 | # CONFIG_TIMER_STATS is not set | 1264 | # CONFIG_TIMER_STATS is not set |
1265 | # CONFIG_DEBUG_OBJECTS is not set | ||
1254 | # CONFIG_DEBUG_SLAB is not set | 1266 | # CONFIG_DEBUG_SLAB is not set |
1255 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1267 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1256 | # CONFIG_RT_MUTEX_TESTER is not set | 1268 | # CONFIG_RT_MUTEX_TESTER is not set |
@@ -1262,6 +1274,7 @@ CONFIG_SCHED_DEBUG=y | |||
1262 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1274 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1263 | CONFIG_DEBUG_INFO=y | 1275 | CONFIG_DEBUG_INFO=y |
1264 | # CONFIG_DEBUG_VM is not set | 1276 | # CONFIG_DEBUG_VM is not set |
1277 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1265 | # CONFIG_DEBUG_LIST is not set | 1278 | # CONFIG_DEBUG_LIST is not set |
1266 | # CONFIG_DEBUG_SG is not set | 1279 | # CONFIG_DEBUG_SG is not set |
1267 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1280 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1274,6 +1287,7 @@ CONFIG_DEBUG_INFO=y | |||
1274 | # CONFIG_DEBUG_PAGEALLOC is not set | 1287 | # CONFIG_DEBUG_PAGEALLOC is not set |
1275 | CONFIG_DEBUGGER=y | 1288 | CONFIG_DEBUGGER=y |
1276 | # CONFIG_XMON is not set | 1289 | # CONFIG_XMON is not set |
1290 | # CONFIG_IRQSTACKS is not set | ||
1277 | # CONFIG_VIRQ_DEBUG is not set | 1291 | # CONFIG_VIRQ_DEBUG is not set |
1278 | # CONFIG_BDI_SWITCH is not set | 1292 | # CONFIG_BDI_SWITCH is not set |
1279 | # CONFIG_PPC_EARLY_DEBUG is not set | 1293 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1289,54 +1303,84 @@ CONFIG_SECURITY_CAPABILITIES=y | |||
1289 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1303 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1290 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | 1304 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
1291 | CONFIG_CRYPTO=y | 1305 | CONFIG_CRYPTO=y |
1306 | |||
1307 | # | ||
1308 | # Crypto core or helper | ||
1309 | # | ||
1292 | CONFIG_CRYPTO_ALGAPI=y | 1310 | CONFIG_CRYPTO_ALGAPI=y |
1293 | CONFIG_CRYPTO_AEAD=m | 1311 | CONFIG_CRYPTO_AEAD=m |
1294 | CONFIG_CRYPTO_BLKCIPHER=y | 1312 | CONFIG_CRYPTO_BLKCIPHER=y |
1295 | # CONFIG_CRYPTO_SEQIV is not set | ||
1296 | CONFIG_CRYPTO_HASH=y | 1313 | CONFIG_CRYPTO_HASH=y |
1297 | CONFIG_CRYPTO_MANAGER=y | 1314 | CONFIG_CRYPTO_MANAGER=y |
1315 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1316 | CONFIG_CRYPTO_NULL=m | ||
1317 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1318 | CONFIG_CRYPTO_AUTHENC=m | ||
1319 | CONFIG_CRYPTO_TEST=m | ||
1320 | |||
1321 | # | ||
1322 | # Authenticated Encryption with Associated Data | ||
1323 | # | ||
1324 | # CONFIG_CRYPTO_CCM is not set | ||
1325 | # CONFIG_CRYPTO_GCM is not set | ||
1326 | # CONFIG_CRYPTO_SEQIV is not set | ||
1327 | |||
1328 | # | ||
1329 | # Block modes | ||
1330 | # | ||
1331 | CONFIG_CRYPTO_CBC=y | ||
1332 | # CONFIG_CRYPTO_CTR is not set | ||
1333 | # CONFIG_CRYPTO_CTS is not set | ||
1334 | CONFIG_CRYPTO_ECB=m | ||
1335 | # CONFIG_CRYPTO_LRW is not set | ||
1336 | CONFIG_CRYPTO_PCBC=m | ||
1337 | # CONFIG_CRYPTO_XTS is not set | ||
1338 | |||
1339 | # | ||
1340 | # Hash modes | ||
1341 | # | ||
1298 | CONFIG_CRYPTO_HMAC=y | 1342 | CONFIG_CRYPTO_HMAC=y |
1299 | # CONFIG_CRYPTO_XCBC is not set | 1343 | # CONFIG_CRYPTO_XCBC is not set |
1300 | CONFIG_CRYPTO_NULL=m | 1344 | |
1345 | # | ||
1346 | # Digest | ||
1347 | # | ||
1348 | CONFIG_CRYPTO_CRC32C=m | ||
1301 | CONFIG_CRYPTO_MD4=m | 1349 | CONFIG_CRYPTO_MD4=m |
1302 | CONFIG_CRYPTO_MD5=y | 1350 | CONFIG_CRYPTO_MD5=y |
1351 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1303 | CONFIG_CRYPTO_SHA1=m | 1352 | CONFIG_CRYPTO_SHA1=m |
1304 | CONFIG_CRYPTO_SHA256=m | 1353 | CONFIG_CRYPTO_SHA256=m |
1305 | CONFIG_CRYPTO_SHA512=m | 1354 | CONFIG_CRYPTO_SHA512=m |
1306 | CONFIG_CRYPTO_WP512=m | ||
1307 | # CONFIG_CRYPTO_TGR192 is not set | 1355 | # CONFIG_CRYPTO_TGR192 is not set |
1308 | # CONFIG_CRYPTO_GF128MUL is not set | 1356 | CONFIG_CRYPTO_WP512=m |
1309 | CONFIG_CRYPTO_ECB=m | 1357 | |
1310 | CONFIG_CRYPTO_CBC=y | 1358 | # |
1311 | CONFIG_CRYPTO_PCBC=m | 1359 | # Ciphers |
1312 | # CONFIG_CRYPTO_LRW is not set | 1360 | # |
1313 | # CONFIG_CRYPTO_XTS is not set | ||
1314 | # CONFIG_CRYPTO_CTR is not set | ||
1315 | # CONFIG_CRYPTO_GCM is not set | ||
1316 | # CONFIG_CRYPTO_CCM is not set | ||
1317 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1318 | CONFIG_CRYPTO_DES=y | ||
1319 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1320 | CONFIG_CRYPTO_BLOWFISH=m | ||
1321 | CONFIG_CRYPTO_TWOFISH=m | ||
1322 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1323 | CONFIG_CRYPTO_SERPENT=m | ||
1324 | CONFIG_CRYPTO_AES=m | 1361 | CONFIG_CRYPTO_AES=m |
1362 | CONFIG_CRYPTO_ANUBIS=m | ||
1363 | CONFIG_CRYPTO_ARC4=m | ||
1364 | CONFIG_CRYPTO_BLOWFISH=m | ||
1365 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1325 | CONFIG_CRYPTO_CAST5=m | 1366 | CONFIG_CRYPTO_CAST5=m |
1326 | CONFIG_CRYPTO_CAST6=m | 1367 | CONFIG_CRYPTO_CAST6=m |
1327 | CONFIG_CRYPTO_TEA=m | 1368 | CONFIG_CRYPTO_DES=y |
1328 | CONFIG_CRYPTO_ARC4=m | 1369 | # CONFIG_CRYPTO_FCRYPT is not set |
1329 | CONFIG_CRYPTO_KHAZAD=m | 1370 | CONFIG_CRYPTO_KHAZAD=m |
1330 | CONFIG_CRYPTO_ANUBIS=m | ||
1331 | # CONFIG_CRYPTO_SEED is not set | ||
1332 | # CONFIG_CRYPTO_SALSA20 is not set | 1371 | # CONFIG_CRYPTO_SALSA20 is not set |
1372 | # CONFIG_CRYPTO_SEED is not set | ||
1373 | CONFIG_CRYPTO_SERPENT=m | ||
1374 | CONFIG_CRYPTO_TEA=m | ||
1375 | CONFIG_CRYPTO_TWOFISH=m | ||
1376 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1377 | |||
1378 | # | ||
1379 | # Compression | ||
1380 | # | ||
1333 | CONFIG_CRYPTO_DEFLATE=m | 1381 | CONFIG_CRYPTO_DEFLATE=m |
1334 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1335 | CONFIG_CRYPTO_CRC32C=m | ||
1336 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1337 | CONFIG_CRYPTO_TEST=m | ||
1338 | CONFIG_CRYPTO_AUTHENC=m | ||
1339 | # CONFIG_CRYPTO_LZO is not set | 1382 | # CONFIG_CRYPTO_LZO is not set |
1340 | CONFIG_CRYPTO_HW=y | 1383 | CONFIG_CRYPTO_HW=y |
1341 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1384 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1342 | # CONFIG_PPC_CLOCK is not set | 1385 | # CONFIG_PPC_CLOCK is not set |
1386 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index fdbfd39a3aca..88f6aa8273be 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
4 | # Mon Mar 31 11:37:19 2008 | 4 | # Mon Jun 9 08:52:20 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
@@ -85,6 +87,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
85 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
86 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
87 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
90 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
88 | # CONFIG_KALLSYMS is not set | 91 | # CONFIG_KALLSYMS is not set |
89 | CONFIG_HOTPLUG=y | 92 | CONFIG_HOTPLUG=y |
90 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
@@ -109,12 +112,14 @@ CONFIG_SLUB=y | |||
109 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
110 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
111 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
115 | # CONFIG_TINY_SHMEM is not set | 119 | # CONFIG_TINY_SHMEM is not set |
116 | CONFIG_BASE_SMALL=0 | 120 | CONFIG_BASE_SMALL=0 |
117 | CONFIG_MODULES=y | 121 | CONFIG_MODULES=y |
122 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
118 | CONFIG_MODULE_UNLOAD=y | 123 | CONFIG_MODULE_UNLOAD=y |
119 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
120 | # CONFIG_MODVERSIONS is not set | 125 | # CONFIG_MODVERSIONS is not set |
@@ -214,11 +219,13 @@ CONFIG_FLATMEM=y | |||
214 | CONFIG_FLAT_NODE_MEM_MAP=y | 219 | CONFIG_FLAT_NODE_MEM_MAP=y |
215 | # CONFIG_SPARSEMEM_STATIC is not set | 220 | # CONFIG_SPARSEMEM_STATIC is not set |
216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
222 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
218 | # CONFIG_RESOURCES_64BIT is not set | 224 | # CONFIG_RESOURCES_64BIT is not set |
219 | CONFIG_ZONE_DMA_FLAG=1 | 225 | CONFIG_ZONE_DMA_FLAG=1 |
220 | CONFIG_BOUNCE=y | 226 | CONFIG_BOUNCE=y |
221 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
228 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
222 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
223 | CONFIG_CMDLINE_BOOL=y | 230 | CONFIG_CMDLINE_BOOL=y |
224 | CONFIG_CMDLINE="console=ttyS0,115200" | 231 | CONFIG_CMDLINE="console=ttyS0,115200" |
@@ -242,6 +249,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
242 | CONFIG_PCI_LEGACY=y | 249 | CONFIG_PCI_LEGACY=y |
243 | # CONFIG_PCCARD is not set | 250 | # CONFIG_PCCARD is not set |
244 | # CONFIG_HOTPLUG_PCI is not set | 251 | # CONFIG_HOTPLUG_PCI is not set |
252 | # CONFIG_HAS_RAPIDIO is not set | ||
245 | 253 | ||
246 | # | 254 | # |
247 | # Advanced setup | 255 | # Advanced setup |
@@ -251,11 +259,11 @@ CONFIG_PCI_LEGACY=y | |||
251 | # | 259 | # |
252 | # Default settings for advanced configuration options are used | 260 | # Default settings for advanced configuration options are used |
253 | # | 261 | # |
254 | CONFIG_HIGHMEM_START=0xfe000000 | ||
255 | CONFIG_LOWMEM_SIZE=0x30000000 | 262 | CONFIG_LOWMEM_SIZE=0x30000000 |
263 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
256 | CONFIG_KERNEL_START=0xc0000000 | 264 | CONFIG_KERNEL_START=0xc0000000 |
265 | CONFIG_PHYSICAL_START=0x00000000 | ||
257 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
258 | CONFIG_BOOT_LOAD=0x00800000 | ||
259 | 267 | ||
260 | # | 268 | # |
261 | # Networking | 269 | # Networking |
@@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
302 | # CONFIG_INET6_TUNNEL is not set | ||
303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
@@ -358,6 +364,7 @@ CONFIG_MTD_PARTITIONS=y | |||
358 | # CONFIG_MTD_REDBOOT_PARTS is not set | 364 | # CONFIG_MTD_REDBOOT_PARTS is not set |
359 | # CONFIG_MTD_CMDLINE_PARTS is not set | 365 | # CONFIG_MTD_CMDLINE_PARTS is not set |
360 | # CONFIG_MTD_OF_PARTS is not set | 366 | # CONFIG_MTD_OF_PARTS is not set |
367 | # CONFIG_MTD_AR7_PARTS is not set | ||
361 | 368 | ||
362 | # | 369 | # |
363 | # User Modules And Translation Layers | 370 | # User Modules And Translation Layers |
@@ -433,6 +440,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
433 | # | 440 | # |
434 | # CONFIG_MTD_UBI is not set | 441 | # CONFIG_MTD_UBI is not set |
435 | CONFIG_OF_DEVICE=y | 442 | CONFIG_OF_DEVICE=y |
443 | CONFIG_OF_I2C=y | ||
436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
438 | # CONFIG_BLK_DEV_FD is not set | 446 | # CONFIG_BLK_DEV_FD is not set |
@@ -513,7 +521,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
513 | CONFIG_BLK_DEV_VIA82CXXX=y | 521 | CONFIG_BLK_DEV_VIA82CXXX=y |
514 | # CONFIG_BLK_DEV_TC86C001 is not set | 522 | # CONFIG_BLK_DEV_TC86C001 is not set |
515 | CONFIG_BLK_DEV_IDEDMA=y | 523 | CONFIG_BLK_DEV_IDEDMA=y |
516 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 524 | # CONFIG_BLK_DEV_HD_ONLY is not set |
517 | # CONFIG_BLK_DEV_HD is not set | 525 | # CONFIG_BLK_DEV_HD is not set |
518 | 526 | ||
519 | # | 527 | # |
@@ -638,7 +646,6 @@ CONFIG_R8169=y | |||
638 | # CONFIG_SIS190 is not set | 646 | # CONFIG_SIS190 is not set |
639 | # CONFIG_SKGE is not set | 647 | # CONFIG_SKGE is not set |
640 | # CONFIG_SKY2 is not set | 648 | # CONFIG_SKY2 is not set |
641 | # CONFIG_SK98LIN is not set | ||
642 | # CONFIG_VIA_VELOCITY is not set | 649 | # CONFIG_VIA_VELOCITY is not set |
643 | # CONFIG_TIGON3 is not set | 650 | # CONFIG_TIGON3 is not set |
644 | # CONFIG_BNX2 is not set | 651 | # CONFIG_BNX2 is not set |
@@ -654,6 +661,7 @@ CONFIG_R8169=y | |||
654 | # | 661 | # |
655 | # CONFIG_WLAN_PRE80211 is not set | 662 | # CONFIG_WLAN_PRE80211 is not set |
656 | # CONFIG_WLAN_80211 is not set | 663 | # CONFIG_WLAN_80211 is not set |
664 | # CONFIG_IWLWIFI_LEDS is not set | ||
657 | 665 | ||
658 | # | 666 | # |
659 | # USB Network Adapters | 667 | # USB Network Adapters |
@@ -690,6 +698,7 @@ CONFIG_R8169=y | |||
690 | # Character devices | 698 | # Character devices |
691 | # | 699 | # |
692 | # CONFIG_VT is not set | 700 | # CONFIG_VT is not set |
701 | CONFIG_DEVKMEM=y | ||
693 | # CONFIG_SERIAL_NONSTANDARD is not set | 702 | # CONFIG_SERIAL_NONSTANDARD is not set |
694 | # CONFIG_NOZOMI is not set | 703 | # CONFIG_NOZOMI is not set |
695 | 704 | ||
@@ -717,7 +726,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
717 | # CONFIG_IPMI_HANDLER is not set | 726 | # CONFIG_IPMI_HANDLER is not set |
718 | CONFIG_HW_RANDOM=m | 727 | CONFIG_HW_RANDOM=m |
719 | CONFIG_NVRAM=y | 728 | CONFIG_NVRAM=y |
720 | # CONFIG_GEN_RTC is not set | ||
721 | # CONFIG_R3964 is not set | 729 | # CONFIG_R3964 is not set |
722 | # CONFIG_APPLICOM is not set | 730 | # CONFIG_APPLICOM is not set |
723 | # CONFIG_RAW_DRIVER is not set | 731 | # CONFIG_RAW_DRIVER is not set |
@@ -728,13 +736,6 @@ CONFIG_I2C_BOARDINFO=y | |||
728 | CONFIG_I2C_CHARDEV=y | 736 | CONFIG_I2C_CHARDEV=y |
729 | 737 | ||
730 | # | 738 | # |
731 | # I2C Algorithms | ||
732 | # | ||
733 | # CONFIG_I2C_ALGOBIT is not set | ||
734 | # CONFIG_I2C_ALGOPCF is not set | ||
735 | # CONFIG_I2C_ALGOPCA is not set | ||
736 | |||
737 | # | ||
738 | # I2C Hardware Bus support | 739 | # I2C Hardware Bus support |
739 | # | 740 | # |
740 | # CONFIG_I2C_ALI1535 is not set | 741 | # CONFIG_I2C_ALI1535 is not set |
@@ -761,6 +762,7 @@ CONFIG_I2C_MPC=y | |||
761 | # CONFIG_I2C_VIA is not set | 762 | # CONFIG_I2C_VIA is not set |
762 | # CONFIG_I2C_VIAPRO is not set | 763 | # CONFIG_I2C_VIAPRO is not set |
763 | # CONFIG_I2C_VOODOO3 is not set | 764 | # CONFIG_I2C_VOODOO3 is not set |
765 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
764 | 766 | ||
765 | # | 767 | # |
766 | # Miscellaneous I2C Chip support | 768 | # Miscellaneous I2C Chip support |
@@ -770,19 +772,13 @@ CONFIG_I2C_MPC=y | |||
770 | # CONFIG_SENSORS_PCF8574 is not set | 772 | # CONFIG_SENSORS_PCF8574 is not set |
771 | # CONFIG_PCF8575 is not set | 773 | # CONFIG_PCF8575 is not set |
772 | # CONFIG_SENSORS_PCF8591 is not set | 774 | # CONFIG_SENSORS_PCF8591 is not set |
773 | # CONFIG_TPS65010 is not set | ||
774 | # CONFIG_SENSORS_MAX6875 is not set | 775 | # CONFIG_SENSORS_MAX6875 is not set |
775 | # CONFIG_SENSORS_TSL2550 is not set | 776 | # CONFIG_SENSORS_TSL2550 is not set |
776 | # CONFIG_I2C_DEBUG_CORE is not set | 777 | # CONFIG_I2C_DEBUG_CORE is not set |
777 | # CONFIG_I2C_DEBUG_ALGO is not set | 778 | # CONFIG_I2C_DEBUG_ALGO is not set |
778 | # CONFIG_I2C_DEBUG_BUS is not set | 779 | # CONFIG_I2C_DEBUG_BUS is not set |
779 | # CONFIG_I2C_DEBUG_CHIP is not set | 780 | # CONFIG_I2C_DEBUG_CHIP is not set |
780 | |||
781 | # | ||
782 | # SPI support | ||
783 | # | ||
784 | # CONFIG_SPI is not set | 781 | # CONFIG_SPI is not set |
785 | # CONFIG_SPI_MASTER is not set | ||
786 | # CONFIG_W1 is not set | 782 | # CONFIG_W1 is not set |
787 | # CONFIG_POWER_SUPPLY is not set | 783 | # CONFIG_POWER_SUPPLY is not set |
788 | # CONFIG_HWMON is not set | 784 | # CONFIG_HWMON is not set |
@@ -799,12 +795,22 @@ CONFIG_SSB_POSSIBLE=y | |||
799 | # Multifunction device drivers | 795 | # Multifunction device drivers |
800 | # | 796 | # |
801 | # CONFIG_MFD_SM501 is not set | 797 | # CONFIG_MFD_SM501 is not set |
798 | # CONFIG_HTC_PASIC3 is not set | ||
802 | 799 | ||
803 | # | 800 | # |
804 | # Multimedia devices | 801 | # Multimedia devices |
805 | # | 802 | # |
803 | |||
804 | # | ||
805 | # Multimedia core support | ||
806 | # | ||
806 | # CONFIG_VIDEO_DEV is not set | 807 | # CONFIG_VIDEO_DEV is not set |
807 | # CONFIG_DVB_CORE is not set | 808 | # CONFIG_DVB_CORE is not set |
809 | # CONFIG_VIDEO_MEDIA is not set | ||
810 | |||
811 | # | ||
812 | # Multimedia drivers | ||
813 | # | ||
808 | # CONFIG_DAB is not set | 814 | # CONFIG_DAB is not set |
809 | 815 | ||
810 | # | 816 | # |
@@ -841,16 +847,20 @@ CONFIG_USB_DEVICEFS=y | |||
841 | CONFIG_USB_DEVICE_CLASS=y | 847 | CONFIG_USB_DEVICE_CLASS=y |
842 | # CONFIG_USB_DYNAMIC_MINORS is not set | 848 | # CONFIG_USB_DYNAMIC_MINORS is not set |
843 | # CONFIG_USB_OTG is not set | 849 | # CONFIG_USB_OTG is not set |
850 | # CONFIG_USB_OTG_WHITELIST is not set | ||
851 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
844 | 852 | ||
845 | # | 853 | # |
846 | # USB Host Controller Drivers | 854 | # USB Host Controller Drivers |
847 | # | 855 | # |
856 | # CONFIG_USB_C67X00_HCD is not set | ||
848 | CONFIG_USB_EHCI_HCD=y | 857 | CONFIG_USB_EHCI_HCD=y |
849 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 858 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
850 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 859 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
851 | # CONFIG_USB_EHCI_FSL is not set | 860 | # CONFIG_USB_EHCI_FSL is not set |
852 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 861 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
853 | # CONFIG_USB_ISP116X_HCD is not set | 862 | # CONFIG_USB_ISP116X_HCD is not set |
863 | # CONFIG_USB_ISP1760_HCD is not set | ||
854 | CONFIG_USB_OHCI_HCD=y | 864 | CONFIG_USB_OHCI_HCD=y |
855 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 865 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
856 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 866 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -865,6 +875,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
865 | # | 875 | # |
866 | # CONFIG_USB_ACM is not set | 876 | # CONFIG_USB_ACM is not set |
867 | # CONFIG_USB_PRINTER is not set | 877 | # CONFIG_USB_PRINTER is not set |
878 | # CONFIG_USB_WDM is not set | ||
868 | 879 | ||
869 | # | 880 | # |
870 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 881 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -885,6 +896,7 @@ CONFIG_USB_STORAGE=y | |||
885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 896 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
886 | # CONFIG_USB_STORAGE_ALAUDA is not set | 897 | # CONFIG_USB_STORAGE_ALAUDA is not set |
887 | # CONFIG_USB_STORAGE_KARMA is not set | 898 | # CONFIG_USB_STORAGE_KARMA is not set |
899 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
888 | # CONFIG_USB_LIBUSUAL is not set | 900 | # CONFIG_USB_LIBUSUAL is not set |
889 | 901 | ||
890 | # | 902 | # |
@@ -922,10 +934,12 @@ CONFIG_USB_STORAGE=y | |||
922 | # CONFIG_USB_TRANCEVIBRATOR is not set | 934 | # CONFIG_USB_TRANCEVIBRATOR is not set |
923 | # CONFIG_USB_IOWARRIOR is not set | 935 | # CONFIG_USB_IOWARRIOR is not set |
924 | # CONFIG_USB_TEST is not set | 936 | # CONFIG_USB_TEST is not set |
937 | # CONFIG_USB_ISIGHTFW is not set | ||
925 | # CONFIG_USB_GADGET is not set | 938 | # CONFIG_USB_GADGET is not set |
926 | # CONFIG_MMC is not set | 939 | # CONFIG_MMC is not set |
927 | # CONFIG_MEMSTICK is not set | 940 | # CONFIG_MEMSTICK is not set |
928 | # CONFIG_NEW_LEDS is not set | 941 | # CONFIG_NEW_LEDS is not set |
942 | # CONFIG_ACCESSIBILITY is not set | ||
929 | # CONFIG_INFINIBAND is not set | 943 | # CONFIG_INFINIBAND is not set |
930 | # CONFIG_EDAC is not set | 944 | # CONFIG_EDAC is not set |
931 | CONFIG_RTC_LIB=y | 945 | CONFIG_RTC_LIB=y |
@@ -977,11 +991,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
977 | # | 991 | # |
978 | # on-CPU RTC drivers | 992 | # on-CPU RTC drivers |
979 | # | 993 | # |
994 | # CONFIG_RTC_DRV_PPC is not set | ||
980 | # CONFIG_DMADEVICES is not set | 995 | # CONFIG_DMADEVICES is not set |
981 | |||
982 | # | ||
983 | # Userspace I/O | ||
984 | # | ||
985 | # CONFIG_UIO is not set | 996 | # CONFIG_UIO is not set |
986 | 997 | ||
987 | # | 998 | # |
@@ -1002,10 +1013,9 @@ CONFIG_FS_MBCACHE=y | |||
1002 | # CONFIG_FS_POSIX_ACL is not set | 1013 | # CONFIG_FS_POSIX_ACL is not set |
1003 | CONFIG_XFS_FS=m | 1014 | CONFIG_XFS_FS=m |
1004 | # CONFIG_XFS_QUOTA is not set | 1015 | # CONFIG_XFS_QUOTA is not set |
1005 | # CONFIG_XFS_SECURITY is not set | ||
1006 | # CONFIG_XFS_POSIX_ACL is not set | 1016 | # CONFIG_XFS_POSIX_ACL is not set |
1007 | # CONFIG_XFS_RT is not set | 1017 | # CONFIG_XFS_RT is not set |
1008 | # CONFIG_GFS2_FS is not set | 1018 | # CONFIG_XFS_DEBUG is not set |
1009 | # CONFIG_OCFS2_FS is not set | 1019 | # CONFIG_OCFS2_FS is not set |
1010 | CONFIG_DNOTIFY=y | 1020 | CONFIG_DNOTIFY=y |
1011 | CONFIG_INOTIFY=y | 1021 | CONFIG_INOTIFY=y |
@@ -1138,6 +1148,7 @@ CONFIG_NLS_UTF8=y | |||
1138 | # Library routines | 1148 | # Library routines |
1139 | # | 1149 | # |
1140 | CONFIG_BITREVERSE=y | 1150 | CONFIG_BITREVERSE=y |
1151 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1141 | # CONFIG_CRC_CCITT is not set | 1152 | # CONFIG_CRC_CCITT is not set |
1142 | # CONFIG_CRC16 is not set | 1153 | # CONFIG_CRC16 is not set |
1143 | # CONFIG_CRC_ITU_T is not set | 1154 | # CONFIG_CRC_ITU_T is not set |
@@ -1150,6 +1161,7 @@ CONFIG_PLIST=y | |||
1150 | CONFIG_HAS_IOMEM=y | 1161 | CONFIG_HAS_IOMEM=y |
1151 | CONFIG_HAS_IOPORT=y | 1162 | CONFIG_HAS_IOPORT=y |
1152 | CONFIG_HAS_DMA=y | 1163 | CONFIG_HAS_DMA=y |
1164 | CONFIG_HAVE_LMB=y | ||
1153 | 1165 | ||
1154 | # | 1166 | # |
1155 | # Kernel hacking | 1167 | # Kernel hacking |
@@ -1157,6 +1169,7 @@ CONFIG_HAS_DMA=y | |||
1157 | # CONFIG_PRINTK_TIME is not set | 1169 | # CONFIG_PRINTK_TIME is not set |
1158 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 1170 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
1159 | # CONFIG_ENABLE_MUST_CHECK is not set | 1171 | # CONFIG_ENABLE_MUST_CHECK is not set |
1172 | CONFIG_FRAME_WARN=1024 | ||
1160 | # CONFIG_MAGIC_SYSRQ is not set | 1173 | # CONFIG_MAGIC_SYSRQ is not set |
1161 | # CONFIG_UNUSED_SYMBOLS is not set | 1174 | # CONFIG_UNUSED_SYMBOLS is not set |
1162 | # CONFIG_DEBUG_FS is not set | 1175 | # CONFIG_DEBUG_FS is not set |
@@ -1166,6 +1179,7 @@ CONFIG_HAS_DMA=y | |||
1166 | # CONFIG_SLUB_STATS is not set | 1179 | # CONFIG_SLUB_STATS is not set |
1167 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1180 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1168 | # CONFIG_SAMPLES is not set | 1181 | # CONFIG_SAMPLES is not set |
1182 | # CONFIG_IRQSTACKS is not set | ||
1169 | # CONFIG_BOOTX_TEXT is not set | 1183 | # CONFIG_BOOTX_TEXT is not set |
1170 | # CONFIG_PPC_EARLY_DEBUG is not set | 1184 | # CONFIG_PPC_EARLY_DEBUG is not set |
1171 | 1185 | ||
@@ -1181,3 +1195,4 @@ CONFIG_ASYNC_MEMCPY=y | |||
1181 | CONFIG_ASYNC_XOR=y | 1195 | CONFIG_ASYNC_XOR=y |
1182 | # CONFIG_CRYPTO is not set | 1196 | # CONFIG_CRYPTO is not set |
1183 | # CONFIG_PPC_CLOCK is not set | 1197 | # CONFIG_PPC_CLOCK is not set |
1198 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index c2b9dc4fce5d..22b5d2c459a3 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S | |||
@@ -368,7 +368,12 @@ interrupt_base: | |||
368 | 368 | ||
369 | rlwimi r11,r13,0,26,31 /* Insert static perms */ | 369 | rlwimi r11,r13,0,26,31 /* Insert static perms */ |
370 | 370 | ||
371 | rlwinm r11,r11,0,20,15 /* Clear U0-U3 */ | 371 | /* |
372 | * Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added | ||
373 | * on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see | ||
374 | * include/asm-powerpc/pgtable-ppc32.h for details). | ||
375 | */ | ||
376 | rlwinm r11,r11,0,20,10 | ||
372 | 377 | ||
373 | /* find the TLB index that caused the fault. It has to be here. */ | 378 | /* find the TLB index that caused the fault. It has to be here. */ |
374 | tlbsx r10, 0, r10 | 379 | tlbsx r10, 0, r10 |
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 2f73f705d564..bcc249d90c4d 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -1073,7 +1073,7 @@ static const struct file_operations virq_debug_fops = { | |||
1073 | static int __init irq_debugfs_init(void) | 1073 | static int __init irq_debugfs_init(void) |
1074 | { | 1074 | { |
1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, | 1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, |
1076 | NULL, &virq_debug_fops)) | 1076 | NULL, &virq_debug_fops) == NULL) |
1077 | return -ENOMEM; | 1077 | return -ENOMEM; |
1078 | 1078 | ||
1079 | return 0; | 1079 | return 0; |
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 61dd17449ddc..cf37f5ca4b71 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
@@ -136,6 +136,11 @@ static int __init add_legacy_soc_port(struct device_node *np, | |||
136 | if (of_get_property(np, "clock-frequency", NULL) == NULL) | 136 | if (of_get_property(np, "clock-frequency", NULL) == NULL) |
137 | return -1; | 137 | return -1; |
138 | 138 | ||
139 | /* if reg-shift or offset, don't try to use it */ | ||
140 | if ((of_get_property(np, "reg-shift", NULL) != NULL) || | ||
141 | (of_get_property(np, "reg-offset", NULL) != NULL)) | ||
142 | return -1; | ||
143 | |||
139 | /* if rtas uses this device, don't try to use it as well */ | 144 | /* if rtas uses this device, don't try to use it as well */ |
140 | if (of_get_property(np, "used-by-rtas", NULL) != NULL) | 145 | if (of_get_property(np, "used-by-rtas", NULL) != NULL) |
141 | return -1; | 146 | return -1; |
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index 52750745edfd..30eedfc5a566 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -189,7 +189,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, | |||
189 | 189 | ||
190 | dev->cfg_size = pci_cfg_space_size(dev); | 190 | dev->cfg_size = pci_cfg_space_size(dev); |
191 | 191 | ||
192 | sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus), | 192 | dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus), |
193 | dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); | 193 | dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); |
194 | dev->class = get_int_prop(node, "class-code", 0); | 194 | dev->class = get_int_prop(node, "class-code", 0); |
195 | dev->revision = get_int_prop(node, "revision-id", 0); | 195 | dev->revision = get_int_prop(node, "revision-id", 0); |
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index cf6b5a7d8b3f..d3ac631cbd26 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/screen_info.h> | 8 | #include <linux/screen_info.h> |
9 | #include <linux/vt_kern.h> | 9 | #include <linux/vt_kern.h> |
10 | #include <linux/nvram.h> | 10 | #include <linux/nvram.h> |
11 | #include <linux/console.h> | ||
12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
@@ -160,7 +159,6 @@ EXPORT_SYMBOL(screen_info); | |||
160 | EXPORT_SYMBOL(timer_interrupt); | 159 | EXPORT_SYMBOL(timer_interrupt); |
161 | EXPORT_SYMBOL(irq_desc); | 160 | EXPORT_SYMBOL(irq_desc); |
162 | EXPORT_SYMBOL(tb_ticks_per_jiffy); | 161 | EXPORT_SYMBOL(tb_ticks_per_jiffy); |
163 | EXPORT_SYMBOL(console_drivers); | ||
164 | EXPORT_SYMBOL(cacheable_memcpy); | 162 | EXPORT_SYMBOL(cacheable_memcpy); |
165 | #endif | 163 | #endif |
166 | 164 | ||
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh index 8e24fc1821e8..2c7e8e87f770 100644 --- a/arch/powerpc/kernel/prom_init_check.sh +++ b/arch/powerpc/kernel/prom_init_check.sh | |||
@@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush | |||
20 | _end enter_prom memcpy memset reloc_offset __secondary_hold | 20 | _end enter_prom memcpy memset reloc_offset __secondary_hold |
21 | __secondary_hold_acknowledge __secondary_hold_spinloop __start | 21 | __secondary_hold_acknowledge __secondary_hold_spinloop __start |
22 | strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 | 22 | strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 |
23 | reloc_got2" | 23 | reloc_got2 kernstart_addr" |
24 | 24 | ||
25 | NM="$1" | 25 | NM="$1" |
26 | OBJ="$2" | 26 | OBJ="$2" |
@@ -48,6 +48,20 @@ do | |||
48 | fi | 48 | fi |
49 | done | 49 | done |
50 | 50 | ||
51 | # ignore register save/restore funcitons | ||
52 | if [ "${UNDEF:0:9}" = "_restgpr_" ]; then | ||
53 | OK=1 | ||
54 | fi | ||
55 | if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then | ||
56 | OK=1 | ||
57 | fi | ||
58 | if [ "${UNDEF:0:9}" = "_savegpr_" ]; then | ||
59 | OK=1 | ||
60 | fi | ||
61 | if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then | ||
62 | OK=1 | ||
63 | fi | ||
64 | |||
51 | if [ $OK -eq 0 ]; then | 65 | if [ $OK -eq 0 ]; then |
52 | ERROR=1 | 66 | ERROR=1 |
53 | echo "Error: External symbol '$UNDEF' referenced" \ | 67 | echo "Error: External symbol '$UNDEF' referenced" \ |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index faeb8f207ea4..da7c058e3731 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
@@ -87,6 +87,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
87 | #ifdef CONFIG_ALTIVEC | 87 | #ifdef CONFIG_ALTIVEC |
88 | elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)(((unsigned long)sc->vmx_reserve + 15) & ~0xful); | 88 | elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)(((unsigned long)sc->vmx_reserve + 15) & ~0xful); |
89 | #endif | 89 | #endif |
90 | unsigned long msr = regs->msr; | ||
90 | long err = 0; | 91 | long err = 0; |
91 | 92 | ||
92 | flush_fp_to_thread(current); | 93 | flush_fp_to_thread(current); |
@@ -102,7 +103,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
102 | /* set MSR_VEC in the MSR value in the frame to indicate that sc->v_reg) | 103 | /* set MSR_VEC in the MSR value in the frame to indicate that sc->v_reg) |
103 | * contains valid data. | 104 | * contains valid data. |
104 | */ | 105 | */ |
105 | regs->msr |= MSR_VEC; | 106 | msr |= MSR_VEC; |
106 | } | 107 | } |
107 | /* We always copy to/from vrsave, it's 0 if we don't have or don't | 108 | /* We always copy to/from vrsave, it's 0 if we don't have or don't |
108 | * use altivec. | 109 | * use altivec. |
@@ -114,6 +115,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
114 | err |= __put_user(&sc->gp_regs, &sc->regs); | 115 | err |= __put_user(&sc->gp_regs, &sc->regs); |
115 | WARN_ON(!FULL_REGS(regs)); | 116 | WARN_ON(!FULL_REGS(regs)); |
116 | err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE); | 117 | err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE); |
118 | err |= __put_user(msr, &sc->gp_regs[PT_MSR]); | ||
117 | err |= __copy_to_user(&sc->fp_regs, ¤t->thread.fpr, FP_REGS_SIZE); | 119 | err |= __copy_to_user(&sc->fp_regs, ¤t->thread.fpr, FP_REGS_SIZE); |
118 | err |= __put_user(signr, &sc->signal); | 120 | err |= __put_user(signr, &sc->signal); |
119 | err |= __put_user(handler, &sc->handler); | 121 | err |= __put_user(handler, &sc->handler); |
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index c21a626af676..ce245a850db2 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
@@ -142,7 +142,7 @@ static void dump_one_vdso_page(struct page *pg, struct page *upg) | |||
142 | printk("kpg: %p (c:%d,f:%08lx)", __va(page_to_pfn(pg) << PAGE_SHIFT), | 142 | printk("kpg: %p (c:%d,f:%08lx)", __va(page_to_pfn(pg) << PAGE_SHIFT), |
143 | page_count(pg), | 143 | page_count(pg), |
144 | pg->flags); | 144 | pg->flags); |
145 | if (upg/* && pg != upg*/) { | 145 | if (upg && !IS_ERR(upg) /* && pg != upg*/) { |
146 | printk(" upg: %p (c:%d,f:%08lx)", __va(page_to_pfn(upg) | 146 | printk(" upg: %p (c:%d,f:%08lx)", __va(page_to_pfn(upg) |
147 | << PAGE_SHIFT), | 147 | << PAGE_SHIFT), |
148 | page_count(upg), | 148 | page_count(upg), |
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c index f5d7a5eab96e..75dff7cfa814 100644 --- a/arch/powerpc/kvm/44x_tlb.c +++ b/arch/powerpc/kvm/44x_tlb.c | |||
@@ -116,8 +116,6 @@ static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu, | |||
116 | struct tlbe *stlbe = &vcpu->arch.shadow_tlb[index]; | 116 | struct tlbe *stlbe = &vcpu->arch.shadow_tlb[index]; |
117 | struct page *page = vcpu->arch.shadow_pages[index]; | 117 | struct page *page = vcpu->arch.shadow_pages[index]; |
118 | 118 | ||
119 | kunmap(vcpu->arch.shadow_pages[index]); | ||
120 | |||
121 | if (get_tlb_v(stlbe)) { | 119 | if (get_tlb_v(stlbe)) { |
122 | if (kvmppc_44x_tlbe_is_writable(stlbe)) | 120 | if (kvmppc_44x_tlbe_is_writable(stlbe)) |
123 | kvm_release_page_dirty(page); | 121 | kvm_release_page_dirty(page); |
@@ -144,18 +142,19 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid, | |||
144 | stlbe = &vcpu->arch.shadow_tlb[victim]; | 142 | stlbe = &vcpu->arch.shadow_tlb[victim]; |
145 | 143 | ||
146 | /* Get reference to new page. */ | 144 | /* Get reference to new page. */ |
147 | down_write(¤t->mm->mmap_sem); | 145 | down_read(¤t->mm->mmap_sem); |
148 | new_page = gfn_to_page(vcpu->kvm, gfn); | 146 | new_page = gfn_to_page(vcpu->kvm, gfn); |
149 | if (is_error_page(new_page)) { | 147 | if (is_error_page(new_page)) { |
150 | printk(KERN_ERR "Couldn't get guest page!\n"); | 148 | printk(KERN_ERR "Couldn't get guest page for gfn %lx!\n", gfn); |
151 | kvm_release_page_clean(new_page); | 149 | kvm_release_page_clean(new_page); |
150 | up_read(¤t->mm->mmap_sem); | ||
152 | return; | 151 | return; |
153 | } | 152 | } |
154 | hpaddr = page_to_phys(new_page); | 153 | hpaddr = page_to_phys(new_page); |
155 | 154 | ||
156 | /* Drop reference to old page. */ | 155 | /* Drop reference to old page. */ |
157 | kvmppc_44x_shadow_release(vcpu, victim); | 156 | kvmppc_44x_shadow_release(vcpu, victim); |
158 | up_write(¤t->mm->mmap_sem); | 157 | up_read(¤t->mm->mmap_sem); |
159 | 158 | ||
160 | vcpu->arch.shadow_pages[victim] = new_page; | 159 | vcpu->arch.shadow_pages[victim] = new_page; |
161 | 160 | ||
diff --git a/arch/powerpc/kvm/booke_guest.c b/arch/powerpc/kvm/booke_guest.c index 712d89a28c46..9c8ad850c6e3 100644 --- a/arch/powerpc/kvm/booke_guest.c +++ b/arch/powerpc/kvm/booke_guest.c | |||
@@ -227,39 +227,6 @@ void kvmppc_check_and_deliver_interrupts(struct kvm_vcpu *vcpu) | |||
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | static int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu) | ||
231 | { | ||
232 | enum emulation_result er; | ||
233 | int r; | ||
234 | |||
235 | er = kvmppc_emulate_instruction(run, vcpu); | ||
236 | switch (er) { | ||
237 | case EMULATE_DONE: | ||
238 | /* Future optimization: only reload non-volatiles if they were | ||
239 | * actually modified. */ | ||
240 | r = RESUME_GUEST_NV; | ||
241 | break; | ||
242 | case EMULATE_DO_MMIO: | ||
243 | run->exit_reason = KVM_EXIT_MMIO; | ||
244 | /* We must reload nonvolatiles because "update" load/store | ||
245 | * instructions modify register state. */ | ||
246 | /* Future optimization: only reload non-volatiles if they were | ||
247 | * actually modified. */ | ||
248 | r = RESUME_HOST_NV; | ||
249 | break; | ||
250 | case EMULATE_FAIL: | ||
251 | /* XXX Deliver Program interrupt to guest. */ | ||
252 | printk(KERN_EMERG "%s: emulation failed (%08x)\n", __func__, | ||
253 | vcpu->arch.last_inst); | ||
254 | r = RESUME_HOST; | ||
255 | break; | ||
256 | default: | ||
257 | BUG(); | ||
258 | } | ||
259 | |||
260 | return r; | ||
261 | } | ||
262 | |||
263 | /** | 230 | /** |
264 | * kvmppc_handle_exit | 231 | * kvmppc_handle_exit |
265 | * | 232 | * |
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index a03fe0c80698..000097461283 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c | |||
@@ -246,6 +246,11 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) | |||
246 | case 31: | 246 | case 31: |
247 | switch (get_xop(inst)) { | 247 | switch (get_xop(inst)) { |
248 | 248 | ||
249 | case 23: /* lwzx */ | ||
250 | rt = get_rt(inst); | ||
251 | emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1); | ||
252 | break; | ||
253 | |||
249 | case 83: /* mfmsr */ | 254 | case 83: /* mfmsr */ |
250 | rt = get_rt(inst); | 255 | rt = get_rt(inst); |
251 | vcpu->arch.gpr[rt] = vcpu->arch.msr; | 256 | vcpu->arch.gpr[rt] = vcpu->arch.msr; |
@@ -267,6 +272,13 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) | |||
267 | kvmppc_set_msr(vcpu, vcpu->arch.gpr[rs]); | 272 | kvmppc_set_msr(vcpu, vcpu->arch.gpr[rs]); |
268 | break; | 273 | break; |
269 | 274 | ||
275 | case 151: /* stwx */ | ||
276 | rs = get_rs(inst); | ||
277 | emulated = kvmppc_handle_store(run, vcpu, | ||
278 | vcpu->arch.gpr[rs], | ||
279 | 4, 1); | ||
280 | break; | ||
281 | |||
270 | case 163: /* wrteei */ | 282 | case 163: /* wrteei */ |
271 | vcpu->arch.msr = (vcpu->arch.msr & ~MSR_EE) | 283 | vcpu->arch.msr = (vcpu->arch.msr & ~MSR_EE) |
272 | | (inst & MSR_EE); | 284 | | (inst & MSR_EE); |
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index c71d37dc6a88..e522b06cc42f 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
@@ -9,7 +9,7 @@ endif | |||
9 | ifeq ($(CONFIG_PPC_MERGE),y) | 9 | ifeq ($(CONFIG_PPC_MERGE),y) |
10 | obj-y := string.o alloc.o \ | 10 | obj-y := string.o alloc.o \ |
11 | checksum_$(CONFIG_WORD_SIZE).o | 11 | checksum_$(CONFIG_WORD_SIZE).o |
12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o | 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o |
13 | obj-$(CONFIG_HAS_IOMEM) += devres.o | 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o |
14 | endif | 14 | endif |
15 | 15 | ||
diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S new file mode 100644 index 000000000000..70a9cd8a3008 --- /dev/null +++ b/arch/powerpc/lib/crtsavres.S | |||
@@ -0,0 +1,229 @@ | |||
1 | /* | ||
2 | * Special support for eabi and SVR4 | ||
3 | * | ||
4 | * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. | ||
5 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
6 | * Written By Michael Meissner | ||
7 | * | ||
8 | * Based on gcc/config/rs6000/crtsavres.asm from gcc | ||
9 | * | ||
10 | * This file is free software; you can redistribute it and/or modify it | ||
11 | * under the terms of the GNU General Public License as published by the | ||
12 | * Free Software Foundation; either version 2, or (at your option) any | ||
13 | * later version. | ||
14 | * | ||
15 | * In addition to the permissions in the GNU General Public License, the | ||
16 | * Free Software Foundation gives you unlimited permission to link the | ||
17 | * compiled version of this file with other programs, and to distribute | ||
18 | * those programs without any restriction coming from the use of this | ||
19 | * file. (The General Public License restrictions do apply in other | ||
20 | * respects; for example, they cover modification of the file, and | ||
21 | * distribution when not linked into another program.) | ||
22 | * | ||
23 | * This file is distributed in the hope that it will be useful, but | ||
24 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
26 | * General Public License for more details. | ||
27 | * | ||
28 | * You should have received a copy of the GNU General Public License | ||
29 | * along with this program; see the file COPYING. If not, write to | ||
30 | * the Free Software Foundation, 51 Franklin Street, Fifth Floor, | ||
31 | * Boston, MA 02110-1301, USA. | ||
32 | * | ||
33 | * As a special exception, if you link this library with files | ||
34 | * compiled with GCC to produce an executable, this does not cause | ||
35 | * the resulting executable to be covered by the GNU General Public License. | ||
36 | * This exception does not however invalidate any other reasons why | ||
37 | * the executable file might be covered by the GNU General Public License. | ||
38 | */ | ||
39 | |||
40 | #include <asm/ppc_asm.h> | ||
41 | |||
42 | .file "crtsavres.S" | ||
43 | .section ".text" | ||
44 | |||
45 | #ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE | ||
46 | |||
47 | /* Routines for saving integer registers, called by the compiler. */ | ||
48 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
49 | /* function, just beyond the end of the integer save area. */ | ||
50 | |||
51 | _GLOBAL(_savegpr_14) | ||
52 | _GLOBAL(_save32gpr_14) | ||
53 | stw 14,-72(11) /* save gp registers */ | ||
54 | _GLOBAL(_savegpr_15) | ||
55 | _GLOBAL(_save32gpr_15) | ||
56 | stw 15,-68(11) | ||
57 | _GLOBAL(_savegpr_16) | ||
58 | _GLOBAL(_save32gpr_16) | ||
59 | stw 16,-64(11) | ||
60 | _GLOBAL(_savegpr_17) | ||
61 | _GLOBAL(_save32gpr_17) | ||
62 | stw 17,-60(11) | ||
63 | _GLOBAL(_savegpr_18) | ||
64 | _GLOBAL(_save32gpr_18) | ||
65 | stw 18,-56(11) | ||
66 | _GLOBAL(_savegpr_19) | ||
67 | _GLOBAL(_save32gpr_19) | ||
68 | stw 19,-52(11) | ||
69 | _GLOBAL(_savegpr_20) | ||
70 | _GLOBAL(_save32gpr_20) | ||
71 | stw 20,-48(11) | ||
72 | _GLOBAL(_savegpr_21) | ||
73 | _GLOBAL(_save32gpr_21) | ||
74 | stw 21,-44(11) | ||
75 | _GLOBAL(_savegpr_22) | ||
76 | _GLOBAL(_save32gpr_22) | ||
77 | stw 22,-40(11) | ||
78 | _GLOBAL(_savegpr_23) | ||
79 | _GLOBAL(_save32gpr_23) | ||
80 | stw 23,-36(11) | ||
81 | _GLOBAL(_savegpr_24) | ||
82 | _GLOBAL(_save32gpr_24) | ||
83 | stw 24,-32(11) | ||
84 | _GLOBAL(_savegpr_25) | ||
85 | _GLOBAL(_save32gpr_25) | ||
86 | stw 25,-28(11) | ||
87 | _GLOBAL(_savegpr_26) | ||
88 | _GLOBAL(_save32gpr_26) | ||
89 | stw 26,-24(11) | ||
90 | _GLOBAL(_savegpr_27) | ||
91 | _GLOBAL(_save32gpr_27) | ||
92 | stw 27,-20(11) | ||
93 | _GLOBAL(_savegpr_28) | ||
94 | _GLOBAL(_save32gpr_28) | ||
95 | stw 28,-16(11) | ||
96 | _GLOBAL(_savegpr_29) | ||
97 | _GLOBAL(_save32gpr_29) | ||
98 | stw 29,-12(11) | ||
99 | _GLOBAL(_savegpr_30) | ||
100 | _GLOBAL(_save32gpr_30) | ||
101 | stw 30,-8(11) | ||
102 | _GLOBAL(_savegpr_31) | ||
103 | _GLOBAL(_save32gpr_31) | ||
104 | stw 31,-4(11) | ||
105 | blr | ||
106 | |||
107 | /* Routines for restoring integer registers, called by the compiler. */ | ||
108 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
109 | /* function, just beyond the end of the integer restore area. */ | ||
110 | |||
111 | _GLOBAL(_restgpr_14) | ||
112 | _GLOBAL(_rest32gpr_14) | ||
113 | lwz 14,-72(11) /* restore gp registers */ | ||
114 | _GLOBAL(_restgpr_15) | ||
115 | _GLOBAL(_rest32gpr_15) | ||
116 | lwz 15,-68(11) | ||
117 | _GLOBAL(_restgpr_16) | ||
118 | _GLOBAL(_rest32gpr_16) | ||
119 | lwz 16,-64(11) | ||
120 | _GLOBAL(_restgpr_17) | ||
121 | _GLOBAL(_rest32gpr_17) | ||
122 | lwz 17,-60(11) | ||
123 | _GLOBAL(_restgpr_18) | ||
124 | _GLOBAL(_rest32gpr_18) | ||
125 | lwz 18,-56(11) | ||
126 | _GLOBAL(_restgpr_19) | ||
127 | _GLOBAL(_rest32gpr_19) | ||
128 | lwz 19,-52(11) | ||
129 | _GLOBAL(_restgpr_20) | ||
130 | _GLOBAL(_rest32gpr_20) | ||
131 | lwz 20,-48(11) | ||
132 | _GLOBAL(_restgpr_21) | ||
133 | _GLOBAL(_rest32gpr_21) | ||
134 | lwz 21,-44(11) | ||
135 | _GLOBAL(_restgpr_22) | ||
136 | _GLOBAL(_rest32gpr_22) | ||
137 | lwz 22,-40(11) | ||
138 | _GLOBAL(_restgpr_23) | ||
139 | _GLOBAL(_rest32gpr_23) | ||
140 | lwz 23,-36(11) | ||
141 | _GLOBAL(_restgpr_24) | ||
142 | _GLOBAL(_rest32gpr_24) | ||
143 | lwz 24,-32(11) | ||
144 | _GLOBAL(_restgpr_25) | ||
145 | _GLOBAL(_rest32gpr_25) | ||
146 | lwz 25,-28(11) | ||
147 | _GLOBAL(_restgpr_26) | ||
148 | _GLOBAL(_rest32gpr_26) | ||
149 | lwz 26,-24(11) | ||
150 | _GLOBAL(_restgpr_27) | ||
151 | _GLOBAL(_rest32gpr_27) | ||
152 | lwz 27,-20(11) | ||
153 | _GLOBAL(_restgpr_28) | ||
154 | _GLOBAL(_rest32gpr_28) | ||
155 | lwz 28,-16(11) | ||
156 | _GLOBAL(_restgpr_29) | ||
157 | _GLOBAL(_rest32gpr_29) | ||
158 | lwz 29,-12(11) | ||
159 | _GLOBAL(_restgpr_30) | ||
160 | _GLOBAL(_rest32gpr_30) | ||
161 | lwz 30,-8(11) | ||
162 | _GLOBAL(_restgpr_31) | ||
163 | _GLOBAL(_rest32gpr_31) | ||
164 | lwz 31,-4(11) | ||
165 | blr | ||
166 | |||
167 | /* Routines for restoring integer registers, called by the compiler. */ | ||
168 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
169 | /* function, just beyond the end of the integer restore area. */ | ||
170 | |||
171 | _GLOBAL(_restgpr_14_x) | ||
172 | _GLOBAL(_rest32gpr_14_x) | ||
173 | lwz 14,-72(11) /* restore gp registers */ | ||
174 | _GLOBAL(_restgpr_15_x) | ||
175 | _GLOBAL(_rest32gpr_15_x) | ||
176 | lwz 15,-68(11) | ||
177 | _GLOBAL(_restgpr_16_x) | ||
178 | _GLOBAL(_rest32gpr_16_x) | ||
179 | lwz 16,-64(11) | ||
180 | _GLOBAL(_restgpr_17_x) | ||
181 | _GLOBAL(_rest32gpr_17_x) | ||
182 | lwz 17,-60(11) | ||
183 | _GLOBAL(_restgpr_18_x) | ||
184 | _GLOBAL(_rest32gpr_18_x) | ||
185 | lwz 18,-56(11) | ||
186 | _GLOBAL(_restgpr_19_x) | ||
187 | _GLOBAL(_rest32gpr_19_x) | ||
188 | lwz 19,-52(11) | ||
189 | _GLOBAL(_restgpr_20_x) | ||
190 | _GLOBAL(_rest32gpr_20_x) | ||
191 | lwz 20,-48(11) | ||
192 | _GLOBAL(_restgpr_21_x) | ||
193 | _GLOBAL(_rest32gpr_21_x) | ||
194 | lwz 21,-44(11) | ||
195 | _GLOBAL(_restgpr_22_x) | ||
196 | _GLOBAL(_rest32gpr_22_x) | ||
197 | lwz 22,-40(11) | ||
198 | _GLOBAL(_restgpr_23_x) | ||
199 | _GLOBAL(_rest32gpr_23_x) | ||
200 | lwz 23,-36(11) | ||
201 | _GLOBAL(_restgpr_24_x) | ||
202 | _GLOBAL(_rest32gpr_24_x) | ||
203 | lwz 24,-32(11) | ||
204 | _GLOBAL(_restgpr_25_x) | ||
205 | _GLOBAL(_rest32gpr_25_x) | ||
206 | lwz 25,-28(11) | ||
207 | _GLOBAL(_restgpr_26_x) | ||
208 | _GLOBAL(_rest32gpr_26_x) | ||
209 | lwz 26,-24(11) | ||
210 | _GLOBAL(_restgpr_27_x) | ||
211 | _GLOBAL(_rest32gpr_27_x) | ||
212 | lwz 27,-20(11) | ||
213 | _GLOBAL(_restgpr_28_x) | ||
214 | _GLOBAL(_rest32gpr_28_x) | ||
215 | lwz 28,-16(11) | ||
216 | _GLOBAL(_restgpr_29_x) | ||
217 | _GLOBAL(_rest32gpr_29_x) | ||
218 | lwz 29,-12(11) | ||
219 | _GLOBAL(_restgpr_30_x) | ||
220 | _GLOBAL(_rest32gpr_30_x) | ||
221 | lwz 30,-8(11) | ||
222 | _GLOBAL(_restgpr_31_x) | ||
223 | _GLOBAL(_rest32gpr_31_x) | ||
224 | lwz 0,4(11) | ||
225 | lwz 31,-4(11) | ||
226 | mtlr 0 | ||
227 | mr 1,11 | ||
228 | blr | ||
229 | #endif | ||
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S index ddeaf9e38ad5..b9ba7d930801 100644 --- a/arch/powerpc/mm/hash_low_32.S +++ b/arch/powerpc/mm/hash_low_32.S | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: hashtable.S,v 1.6 1999/10/08 01:56:15 paulus Exp $ | ||
3 | * | ||
4 | * PowerPC version | 2 | * PowerPC version |
5 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) | 3 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) |
6 | * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP | 4 | * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP |
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S index 21d248486479..70f4c833fa32 100644 --- a/arch/powerpc/mm/hash_low_64.S +++ b/arch/powerpc/mm/hash_low_64.S | |||
@@ -568,6 +568,10 @@ htab_inval_old_hpte: | |||
568 | ld r7,STK_PARM(r9)(r1) /* ssize */ | 568 | ld r7,STK_PARM(r9)(r1) /* ssize */ |
569 | ld r8,STK_PARM(r8)(r1) /* local */ | 569 | ld r8,STK_PARM(r8)(r1) /* local */ |
570 | bl .flush_hash_page | 570 | bl .flush_hash_page |
571 | /* Clear out _PAGE_HPTE_SUB bits in the new linux PTE */ | ||
572 | lis r0,_PAGE_HPTE_SUB@h | ||
573 | ori r0,r0,_PAGE_HPTE_SUB@l | ||
574 | andc r30,r30,r0 | ||
571 | b htab_insert_pte | 575 | b htab_insert_pte |
572 | 576 | ||
573 | htab_bail_ok: | 577 | htab_bail_ok: |
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index f67e118116fa..51f82d83bf14 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -151,6 +151,7 @@ out: | |||
151 | return ret; | 151 | return ret; |
152 | } | 152 | } |
153 | #endif /* CONFIG_MEMORY_HOTREMOVE */ | 153 | #endif /* CONFIG_MEMORY_HOTREMOVE */ |
154 | #endif /* CONFIG_MEMORY_HOTPLUG */ | ||
154 | 155 | ||
155 | /* | 156 | /* |
156 | * walk_memory_resource() needs to make sure there is no holes in a given | 157 | * walk_memory_resource() needs to make sure there is no holes in a given |
@@ -184,8 +185,6 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg, | |||
184 | } | 185 | } |
185 | EXPORT_SYMBOL_GPL(walk_memory_resource); | 186 | EXPORT_SYMBOL_GPL(walk_memory_resource); |
186 | 187 | ||
187 | #endif /* CONFIG_MEMORY_HOTPLUG */ | ||
188 | |||
189 | void show_mem(void) | 188 | void show_mem(void) |
190 | { | 189 | { |
191 | unsigned long total = 0, reserved = 0; | 190 | unsigned long total = 0, reserved = 0; |
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 80d1babb230d..e0ff59f21135 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
@@ -402,7 +402,7 @@ void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags) | |||
402 | return; | 402 | return; |
403 | } | 403 | } |
404 | 404 | ||
405 | map_page(address, phys, flags); | 405 | map_page(address, phys, pgprot_val(flags)); |
406 | fixmaps++; | 406 | fixmaps++; |
407 | } | 407 | } |
408 | 408 | ||
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c index 41c7fd91e99e..fe92e65103ed 100644 --- a/arch/powerpc/platforms/52xx/lite5200_pm.c +++ b/arch/powerpc/platforms/52xx/lite5200_pm.c | |||
@@ -14,6 +14,7 @@ static struct mpc52xx_sdma __iomem *bes; | |||
14 | static struct mpc52xx_xlb __iomem *xlb; | 14 | static struct mpc52xx_xlb __iomem *xlb; |
15 | static struct mpc52xx_gpio __iomem *gps; | 15 | static struct mpc52xx_gpio __iomem *gps; |
16 | static struct mpc52xx_gpio_wkup __iomem *gpw; | 16 | static struct mpc52xx_gpio_wkup __iomem *gpw; |
17 | static void __iomem *pci; | ||
17 | static void __iomem *sram; | 18 | static void __iomem *sram; |
18 | static const int sram_size = 0x4000; /* 16 kBytes */ | 19 | static const int sram_size = 0x4000; /* 16 kBytes */ |
19 | static void __iomem *mbar; | 20 | static void __iomem *mbar; |
@@ -50,6 +51,8 @@ static int lite5200_pm_prepare(void) | |||
50 | { .type = "builtin", .compatible = "mpc5200", }, /* efika */ | 51 | { .type = "builtin", .compatible = "mpc5200", }, /* efika */ |
51 | {} | 52 | {} |
52 | }; | 53 | }; |
54 | u64 regaddr64 = 0; | ||
55 | const u32 *regaddr_p; | ||
53 | 56 | ||
54 | /* deep sleep? let mpc52xx code handle that */ | 57 | /* deep sleep? let mpc52xx code handle that */ |
55 | if (lite5200_pm_target_state == PM_SUSPEND_STANDBY) | 58 | if (lite5200_pm_target_state == PM_SUSPEND_STANDBY) |
@@ -60,8 +63,12 @@ static int lite5200_pm_prepare(void) | |||
60 | 63 | ||
61 | /* map registers */ | 64 | /* map registers */ |
62 | np = of_find_matching_node(NULL, immr_ids); | 65 | np = of_find_matching_node(NULL, immr_ids); |
63 | mbar = of_iomap(np, 0); | 66 | regaddr_p = of_get_address(np, 0, NULL, NULL); |
67 | if (regaddr_p) | ||
68 | regaddr64 = of_translate_address(np, regaddr_p); | ||
64 | of_node_put(np); | 69 | of_node_put(np); |
70 | |||
71 | mbar = ioremap((u32) regaddr64, 0xC000); | ||
65 | if (!mbar) { | 72 | if (!mbar) { |
66 | printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__); | 73 | printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__); |
67 | return -ENOSYS; | 74 | return -ENOSYS; |
@@ -71,6 +78,7 @@ static int lite5200_pm_prepare(void) | |||
71 | pic = mbar + 0x500; | 78 | pic = mbar + 0x500; |
72 | gps = mbar + 0xb00; | 79 | gps = mbar + 0xb00; |
73 | gpw = mbar + 0xc00; | 80 | gpw = mbar + 0xc00; |
81 | pci = mbar + 0xd00; | ||
74 | bes = mbar + 0x1200; | 82 | bes = mbar + 0x1200; |
75 | xlb = mbar + 0x1f00; | 83 | xlb = mbar + 0x1f00; |
76 | sram = mbar + 0x8000; | 84 | sram = mbar + 0x8000; |
@@ -85,6 +93,7 @@ static struct mpc52xx_sdma sbes; | |||
85 | static struct mpc52xx_xlb sxlb; | 93 | static struct mpc52xx_xlb sxlb; |
86 | static struct mpc52xx_gpio sgps; | 94 | static struct mpc52xx_gpio sgps; |
87 | static struct mpc52xx_gpio_wkup sgpw; | 95 | static struct mpc52xx_gpio_wkup sgpw; |
96 | static char spci[0x200]; | ||
88 | 97 | ||
89 | static void lite5200_save_regs(void) | 98 | static void lite5200_save_regs(void) |
90 | { | 99 | { |
@@ -94,6 +103,7 @@ static void lite5200_save_regs(void) | |||
94 | _memcpy_fromio(&sxlb, xlb, sizeof(*xlb)); | 103 | _memcpy_fromio(&sxlb, xlb, sizeof(*xlb)); |
95 | _memcpy_fromio(&sgps, gps, sizeof(*gps)); | 104 | _memcpy_fromio(&sgps, gps, sizeof(*gps)); |
96 | _memcpy_fromio(&sgpw, gpw, sizeof(*gpw)); | 105 | _memcpy_fromio(&sgpw, gpw, sizeof(*gpw)); |
106 | _memcpy_fromio(spci, pci, 0x200); | ||
97 | 107 | ||
98 | _memcpy_fromio(saved_sram, sram, sram_size); | 108 | _memcpy_fromio(saved_sram, sram, sram_size); |
99 | } | 109 | } |
@@ -103,6 +113,8 @@ static void lite5200_restore_regs(void) | |||
103 | int i; | 113 | int i; |
104 | _memcpy_toio(sram, saved_sram, sram_size); | 114 | _memcpy_toio(sram, saved_sram, sram_size); |
105 | 115 | ||
116 | /* PCI Configuration */ | ||
117 | _memcpy_toio(pci, spci, 0x200); | ||
106 | 118 | ||
107 | /* | 119 | /* |
108 | * GPIOs. Interrupt Master Enable has higher address then other | 120 | * GPIOs. Interrupt Master Enable has higher address then other |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c index 48da5dfe4856..8a455ebce98d 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c | |||
@@ -100,7 +100,7 @@ static int mpc52xx_wkup_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) | |||
100 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 100 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
101 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, | 101 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, |
102 | struct mpc52xx_gpiochip, mmchip); | 102 | struct mpc52xx_gpiochip, mmchip); |
103 | struct mpc52xx_gpio_wkup *regs = mm_gc->regs; | 103 | struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs; |
104 | unsigned long flags; | 104 | unsigned long flags; |
105 | 105 | ||
106 | spin_lock_irqsave(&gpio_lock, flags); | 106 | spin_lock_irqsave(&gpio_lock, flags); |
@@ -122,7 +122,7 @@ static int | |||
122 | mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) | 122 | mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) |
123 | { | 123 | { |
124 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 124 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
125 | struct mpc52xx_gpio_wkup *regs = mm_gc->regs; | 125 | struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs; |
126 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, | 126 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, |
127 | struct mpc52xx_gpiochip, mmchip); | 127 | struct mpc52xx_gpiochip, mmchip); |
128 | unsigned long flags; | 128 | unsigned long flags; |
@@ -150,7 +150,7 @@ static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev, | |||
150 | const struct of_device_id *match) | 150 | const struct of_device_id *match) |
151 | { | 151 | { |
152 | struct mpc52xx_gpiochip *chip; | 152 | struct mpc52xx_gpiochip *chip; |
153 | struct mpc52xx_gpio_wkup *regs; | 153 | struct mpc52xx_gpio_wkup __iomem *regs; |
154 | struct of_gpio_chip *ofchip; | 154 | struct of_gpio_chip *ofchip; |
155 | int ret; | 155 | int ret; |
156 | 156 | ||
@@ -260,7 +260,7 @@ static int mpc52xx_simple_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) | |||
260 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 260 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
261 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, | 261 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, |
262 | struct mpc52xx_gpiochip, mmchip); | 262 | struct mpc52xx_gpiochip, mmchip); |
263 | struct mpc52xx_gpio *regs = mm_gc->regs; | 263 | struct mpc52xx_gpio __iomem *regs = mm_gc->regs; |
264 | unsigned long flags; | 264 | unsigned long flags; |
265 | 265 | ||
266 | spin_lock_irqsave(&gpio_lock, flags); | 266 | spin_lock_irqsave(&gpio_lock, flags); |
@@ -284,7 +284,7 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) | |||
284 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 284 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
285 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, | 285 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, |
286 | struct mpc52xx_gpiochip, mmchip); | 286 | struct mpc52xx_gpiochip, mmchip); |
287 | struct mpc52xx_gpio *regs = mm_gc->regs; | 287 | struct mpc52xx_gpio __iomem *regs = mm_gc->regs; |
288 | unsigned long flags; | 288 | unsigned long flags; |
289 | 289 | ||
290 | spin_lock_irqsave(&gpio_lock, flags); | 290 | spin_lock_irqsave(&gpio_lock, flags); |
@@ -312,7 +312,7 @@ static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev, | |||
312 | { | 312 | { |
313 | struct mpc52xx_gpiochip *chip; | 313 | struct mpc52xx_gpiochip *chip; |
314 | struct of_gpio_chip *ofchip; | 314 | struct of_gpio_chip *ofchip; |
315 | struct mpc52xx_gpio *regs; | 315 | struct mpc52xx_gpio __iomem *regs; |
316 | int ret; | 316 | int ret; |
317 | 317 | ||
318 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | 318 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
@@ -387,7 +387,7 @@ mpc52xx_gpt_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) | |||
387 | static int mpc52xx_gpt_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) | 387 | static int mpc52xx_gpt_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) |
388 | { | 388 | { |
389 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 389 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
390 | struct mpc52xx_gpt *regs = mm_gc->regs; | 390 | struct mpc52xx_gpt __iomem *regs = mm_gc->regs; |
391 | 391 | ||
392 | out_be32(®s->mode, 0x04); | 392 | out_be32(®s->mode, 0x04); |
393 | 393 | ||
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 7ff29d53dc2d..ecbe580c3f32 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -34,6 +34,7 @@ config MPC85xx_MDS | |||
34 | bool "Freescale MPC85xx MDS" | 34 | bool "Freescale MPC85xx MDS" |
35 | select DEFAULT_UIMAGE | 35 | select DEFAULT_UIMAGE |
36 | select QUICC_ENGINE | 36 | select QUICC_ENGINE |
37 | select PHYLIB | ||
37 | help | 38 | help |
38 | This option enables support for the MPC85xx MDS board | 39 | This option enables support for the MPC85xx MDS board |
39 | 40 | ||
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c index 31da84c458d2..0e04f8fb152a 100644 --- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c +++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c | |||
@@ -217,7 +217,7 @@ static u##size scc_pciex_in##name(unsigned long port) \ | |||
217 | static void scc_pciex_ins##name(unsigned long p, void *b, unsigned long c) \ | 217 | static void scc_pciex_ins##name(unsigned long p, void *b, unsigned long c) \ |
218 | { \ | 218 | { \ |
219 | struct iowa_bus *bus = iowa_pio_find_bus(p); \ | 219 | struct iowa_bus *bus = iowa_pio_find_bus(p); \ |
220 | u##size *dst = b; \ | 220 | __le##size *dst = b; \ |
221 | for (; c != 0; c--, dst++) \ | 221 | for (; c != 0; c--, dst++) \ |
222 | *dst = cpu_to_le##size(__scc_pciex_in##name(bus->phb, p)); \ | 222 | *dst = cpu_to_le##size(__scc_pciex_in##name(bus->phb, p)); \ |
223 | scc_pciex_io_flush(bus); \ | 223 | scc_pciex_io_flush(bus); \ |
@@ -231,10 +231,11 @@ static void scc_pciex_outs##name(unsigned long p, const void *b, \ | |||
231 | unsigned long c) \ | 231 | unsigned long c) \ |
232 | { \ | 232 | { \ |
233 | struct iowa_bus *bus = iowa_pio_find_bus(p); \ | 233 | struct iowa_bus *bus = iowa_pio_find_bus(p); \ |
234 | const u##size *src = b; \ | 234 | const __le##size *src = b; \ |
235 | for (; c != 0; c--, src++) \ | 235 | for (; c != 0; c--, src++) \ |
236 | __scc_pciex_out##name(bus->phb, le##size##_to_cpu(*src), p); \ | 236 | __scc_pciex_out##name(bus->phb, le##size##_to_cpu(*src), p); \ |
237 | } | 237 | } |
238 | #define __le8 u8 | ||
238 | #define cpu_to_le8(x) (x) | 239 | #define cpu_to_le8(x) (x) |
239 | #define le8_to_cpu(x) (x) | 240 | #define le8_to_cpu(x) (x) |
240 | PCIEX_PIO_FUNC(8, b) | 241 | PCIEX_PIO_FUNC(8, b) |
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c index 70c660121ec4..78f905bc6a42 100644 --- a/arch/powerpc/platforms/cell/spu_base.c +++ b/arch/powerpc/platforms/cell/spu_base.c | |||
@@ -219,15 +219,25 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea) | |||
219 | extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX | 219 | extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX |
220 | static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) | 220 | static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) |
221 | { | 221 | { |
222 | int ret; | ||
223 | |||
222 | pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea); | 224 | pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea); |
223 | 225 | ||
224 | /* Handle kernel space hash faults immediately. | 226 | /* |
225 | User hash faults need to be deferred to process context. */ | 227 | * Handle kernel space hash faults immediately. User hash |
226 | if ((dsisr & MFC_DSISR_PTE_NOT_FOUND) | 228 | * faults need to be deferred to process context. |
227 | && REGION_ID(ea) != USER_REGION_ID | 229 | */ |
228 | && hash_page(ea, _PAGE_PRESENT, 0x300) == 0) { | 230 | if ((dsisr & MFC_DSISR_PTE_NOT_FOUND) && |
229 | spu_restart_dma(spu); | 231 | (REGION_ID(ea) != USER_REGION_ID)) { |
230 | return 0; | 232 | |
233 | spin_unlock(&spu->register_lock); | ||
234 | ret = hash_page(ea, _PAGE_PRESENT, 0x300); | ||
235 | spin_lock(&spu->register_lock); | ||
236 | |||
237 | if (!ret) { | ||
238 | spu_restart_dma(spu); | ||
239 | return 0; | ||
240 | } | ||
231 | } | 241 | } |
232 | 242 | ||
233 | spu->class_1_dar = ea; | 243 | spu->class_1_dar = ea; |
@@ -324,17 +334,13 @@ spu_irq_class_0(int irq, void *data) | |||
324 | stat = spu_int_stat_get(spu, 0) & mask; | 334 | stat = spu_int_stat_get(spu, 0) & mask; |
325 | 335 | ||
326 | spu->class_0_pending |= stat; | 336 | spu->class_0_pending |= stat; |
327 | spu->class_0_dsisr = spu_mfc_dsisr_get(spu); | ||
328 | spu->class_0_dar = spu_mfc_dar_get(spu); | 337 | spu->class_0_dar = spu_mfc_dar_get(spu); |
329 | spin_unlock(&spu->register_lock); | ||
330 | |||
331 | spu->stop_callback(spu, 0); | 338 | spu->stop_callback(spu, 0); |
332 | |||
333 | spu->class_0_pending = 0; | 339 | spu->class_0_pending = 0; |
334 | spu->class_0_dsisr = 0; | ||
335 | spu->class_0_dar = 0; | 340 | spu->class_0_dar = 0; |
336 | 341 | ||
337 | spu_int_stat_clear(spu, 0, stat); | 342 | spu_int_stat_clear(spu, 0, stat); |
343 | spin_unlock(&spu->register_lock); | ||
338 | 344 | ||
339 | return IRQ_HANDLED; | 345 | return IRQ_HANDLED; |
340 | } | 346 | } |
@@ -357,13 +363,12 @@ spu_irq_class_1(int irq, void *data) | |||
357 | spu_mfc_dsisr_set(spu, 0ul); | 363 | spu_mfc_dsisr_set(spu, 0ul); |
358 | spu_int_stat_clear(spu, 1, stat); | 364 | spu_int_stat_clear(spu, 1, stat); |
359 | 365 | ||
360 | if (stat & CLASS1_SEGMENT_FAULT_INTR) | ||
361 | __spu_trap_data_seg(spu, dar); | ||
362 | |||
363 | spin_unlock(&spu->register_lock); | ||
364 | pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat, | 366 | pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat, |
365 | dar, dsisr); | 367 | dar, dsisr); |
366 | 368 | ||
369 | if (stat & CLASS1_SEGMENT_FAULT_INTR) | ||
370 | __spu_trap_data_seg(spu, dar); | ||
371 | |||
367 | if (stat & CLASS1_STORAGE_FAULT_INTR) | 372 | if (stat & CLASS1_STORAGE_FAULT_INTR) |
368 | __spu_trap_data_map(spu, dar, dsisr); | 373 | __spu_trap_data_map(spu, dar, dsisr); |
369 | 374 | ||
@@ -376,6 +381,8 @@ spu_irq_class_1(int irq, void *data) | |||
376 | spu->class_1_dsisr = 0; | 381 | spu->class_1_dsisr = 0; |
377 | spu->class_1_dar = 0; | 382 | spu->class_1_dar = 0; |
378 | 383 | ||
384 | spin_unlock(&spu->register_lock); | ||
385 | |||
379 | return stat ? IRQ_HANDLED : IRQ_NONE; | 386 | return stat ? IRQ_HANDLED : IRQ_NONE; |
380 | } | 387 | } |
381 | 388 | ||
@@ -394,14 +401,12 @@ spu_irq_class_2(int irq, void *data) | |||
394 | mask = spu_int_mask_get(spu, 2); | 401 | mask = spu_int_mask_get(spu, 2); |
395 | /* ignore interrupts we're not waiting for */ | 402 | /* ignore interrupts we're not waiting for */ |
396 | stat &= mask; | 403 | stat &= mask; |
397 | |||
398 | /* mailbox interrupts are level triggered. mask them now before | 404 | /* mailbox interrupts are level triggered. mask them now before |
399 | * acknowledging */ | 405 | * acknowledging */ |
400 | if (stat & mailbox_intrs) | 406 | if (stat & mailbox_intrs) |
401 | spu_int_mask_and(spu, 2, ~(stat & mailbox_intrs)); | 407 | spu_int_mask_and(spu, 2, ~(stat & mailbox_intrs)); |
402 | /* acknowledge all interrupts before the callbacks */ | 408 | /* acknowledge all interrupts before the callbacks */ |
403 | spu_int_stat_clear(spu, 2, stat); | 409 | spu_int_stat_clear(spu, 2, stat); |
404 | spin_unlock(&spu->register_lock); | ||
405 | 410 | ||
406 | pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask); | 411 | pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask); |
407 | 412 | ||
@@ -421,6 +426,9 @@ spu_irq_class_2(int irq, void *data) | |||
421 | spu->wbox_callback(spu); | 426 | spu->wbox_callback(spu); |
422 | 427 | ||
423 | spu->stats.class2_intr++; | 428 | spu->stats.class2_intr++; |
429 | |||
430 | spin_unlock(&spu->register_lock); | ||
431 | |||
424 | return stat ? IRQ_HANDLED : IRQ_NONE; | 432 | return stat ? IRQ_HANDLED : IRQ_NONE; |
425 | } | 433 | } |
426 | 434 | ||
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index b7493b865812..f7edba6cb795 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c | |||
@@ -27,7 +27,6 @@ void spufs_stop_callback(struct spu *spu, int irq) | |||
27 | switch(irq) { | 27 | switch(irq) { |
28 | case 0 : | 28 | case 0 : |
29 | ctx->csa.class_0_pending = spu->class_0_pending; | 29 | ctx->csa.class_0_pending = spu->class_0_pending; |
30 | ctx->csa.class_0_dsisr = spu->class_0_dsisr; | ||
31 | ctx->csa.class_0_dar = spu->class_0_dar; | 30 | ctx->csa.class_0_dar = spu->class_0_dar; |
32 | break; | 31 | break; |
33 | case 1 : | 32 | case 1 : |
@@ -51,18 +50,22 @@ int spu_stopped(struct spu_context *ctx, u32 *stat) | |||
51 | u64 dsisr; | 50 | u64 dsisr; |
52 | u32 stopped; | 51 | u32 stopped; |
53 | 52 | ||
54 | *stat = ctx->ops->status_read(ctx); | ||
55 | |||
56 | if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags)) | ||
57 | return 1; | ||
58 | |||
59 | stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP | | 53 | stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP | |
60 | SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP; | 54 | SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP; |
61 | if (!(*stat & SPU_STATUS_RUNNING) && (*stat & stopped)) | 55 | |
56 | top: | ||
57 | *stat = ctx->ops->status_read(ctx); | ||
58 | if (*stat & stopped) { | ||
59 | /* | ||
60 | * If the spu hasn't finished stopping, we need to | ||
61 | * re-read the register to get the stopped value. | ||
62 | */ | ||
63 | if (*stat & SPU_STATUS_RUNNING) | ||
64 | goto top; | ||
62 | return 1; | 65 | return 1; |
66 | } | ||
63 | 67 | ||
64 | dsisr = ctx->csa.class_0_dsisr; | 68 | if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags)) |
65 | if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)) | ||
66 | return 1; | 69 | return 1; |
67 | 70 | ||
68 | dsisr = ctx->csa.class_1_dsisr; | 71 | dsisr = ctx->csa.class_1_dsisr; |
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 745dd51ec37f..e929e70a84e3 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/arch/powerpc/platforms/cell/spufs/sched.c | |||
@@ -230,19 +230,23 @@ static void spu_bind_context(struct spu *spu, struct spu_context *ctx) | |||
230 | ctx->stats.slb_flt_base = spu->stats.slb_flt; | 230 | ctx->stats.slb_flt_base = spu->stats.slb_flt; |
231 | ctx->stats.class2_intr_base = spu->stats.class2_intr; | 231 | ctx->stats.class2_intr_base = spu->stats.class2_intr; |
232 | 232 | ||
233 | spu_associate_mm(spu, ctx->owner); | ||
234 | |||
235 | spin_lock_irq(&spu->register_lock); | ||
233 | spu->ctx = ctx; | 236 | spu->ctx = ctx; |
234 | spu->flags = 0; | 237 | spu->flags = 0; |
235 | ctx->spu = spu; | 238 | ctx->spu = spu; |
236 | ctx->ops = &spu_hw_ops; | 239 | ctx->ops = &spu_hw_ops; |
237 | spu->pid = current->pid; | 240 | spu->pid = current->pid; |
238 | spu->tgid = current->tgid; | 241 | spu->tgid = current->tgid; |
239 | spu_associate_mm(spu, ctx->owner); | ||
240 | spu->ibox_callback = spufs_ibox_callback; | 242 | spu->ibox_callback = spufs_ibox_callback; |
241 | spu->wbox_callback = spufs_wbox_callback; | 243 | spu->wbox_callback = spufs_wbox_callback; |
242 | spu->stop_callback = spufs_stop_callback; | 244 | spu->stop_callback = spufs_stop_callback; |
243 | spu->mfc_callback = spufs_mfc_callback; | 245 | spu->mfc_callback = spufs_mfc_callback; |
244 | mb(); | 246 | spin_unlock_irq(&spu->register_lock); |
247 | |||
245 | spu_unmap_mappings(ctx); | 248 | spu_unmap_mappings(ctx); |
249 | |||
246 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0); | 250 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0); |
247 | spu_restore(&ctx->csa, spu); | 251 | spu_restore(&ctx->csa, spu); |
248 | spu->timestamp = jiffies; | 252 | spu->timestamp = jiffies; |
@@ -403,6 +407,8 @@ static int has_affinity(struct spu_context *ctx) | |||
403 | */ | 407 | */ |
404 | static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | 408 | static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) |
405 | { | 409 | { |
410 | u32 status; | ||
411 | |||
406 | spu_context_trace(spu_unbind_context__enter, ctx, spu); | 412 | spu_context_trace(spu_unbind_context__enter, ctx, spu); |
407 | 413 | ||
408 | spuctx_switch_state(ctx, SPU_UTIL_SYSTEM); | 414 | spuctx_switch_state(ctx, SPU_UTIL_SYSTEM); |
@@ -423,18 +429,22 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | |||
423 | spu_unmap_mappings(ctx); | 429 | spu_unmap_mappings(ctx); |
424 | spu_save(&ctx->csa, spu); | 430 | spu_save(&ctx->csa, spu); |
425 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0); | 431 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0); |
432 | |||
433 | spin_lock_irq(&spu->register_lock); | ||
426 | spu->timestamp = jiffies; | 434 | spu->timestamp = jiffies; |
427 | ctx->state = SPU_STATE_SAVED; | 435 | ctx->state = SPU_STATE_SAVED; |
428 | spu->ibox_callback = NULL; | 436 | spu->ibox_callback = NULL; |
429 | spu->wbox_callback = NULL; | 437 | spu->wbox_callback = NULL; |
430 | spu->stop_callback = NULL; | 438 | spu->stop_callback = NULL; |
431 | spu->mfc_callback = NULL; | 439 | spu->mfc_callback = NULL; |
432 | spu_associate_mm(spu, NULL); | ||
433 | spu->pid = 0; | 440 | spu->pid = 0; |
434 | spu->tgid = 0; | 441 | spu->tgid = 0; |
435 | ctx->ops = &spu_backing_ops; | 442 | ctx->ops = &spu_backing_ops; |
436 | spu->flags = 0; | 443 | spu->flags = 0; |
437 | spu->ctx = NULL; | 444 | spu->ctx = NULL; |
445 | spin_unlock_irq(&spu->register_lock); | ||
446 | |||
447 | spu_associate_mm(spu, NULL); | ||
438 | 448 | ||
439 | ctx->stats.slb_flt += | 449 | ctx->stats.slb_flt += |
440 | (spu->stats.slb_flt - ctx->stats.slb_flt_base); | 450 | (spu->stats.slb_flt - ctx->stats.slb_flt_base); |
@@ -444,6 +454,9 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | |||
444 | /* This maps the underlying spu state to idle */ | 454 | /* This maps the underlying spu state to idle */ |
445 | spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); | 455 | spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); |
446 | ctx->spu = NULL; | 456 | ctx->spu = NULL; |
457 | |||
458 | if (spu_stopped(ctx, &status)) | ||
459 | wake_up_all(&ctx->stop_wq); | ||
447 | } | 460 | } |
448 | 461 | ||
449 | /** | 462 | /** |
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c index 5b3fb2b321ab..3a58ffabccd9 100644 --- a/arch/powerpc/platforms/ps3/mm.c +++ b/arch/powerpc/platforms/ps3/mm.c | |||
@@ -317,6 +317,9 @@ static int __init ps3_mm_add_memory(void) | |||
317 | return result; | 317 | return result; |
318 | } | 318 | } |
319 | 319 | ||
320 | lmb_add(start_addr, map.r1.size); | ||
321 | lmb_analyze(); | ||
322 | |||
320 | result = online_pages(start_pfn, nr_pages); | 323 | result = online_pages(start_pfn, nr_pages); |
321 | 324 | ||
322 | if (result) | 325 | if (result) |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 68ea5eee39a8..8c1ca477c52c 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
@@ -42,17 +42,20 @@ static inline const char * pcid_name (struct pci_dev *pdev) | |||
42 | } | 42 | } |
43 | 43 | ||
44 | #ifdef DEBUG | 44 | #ifdef DEBUG |
45 | static void print_device_node_tree (struct pci_dn *pdn, int dent) | 45 | static void print_device_node_tree(struct pci_dn *pdn, int dent) |
46 | { | 46 | { |
47 | int i; | 47 | int i; |
48 | if (!pdn) return; | 48 | struct device_node *pc; |
49 | for (i=0;i<dent; i++) | 49 | |
50 | if (!pdn) | ||
51 | return; | ||
52 | for (i = 0; i < dent; i++) | ||
50 | printk(" "); | 53 | printk(" "); |
51 | printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n", | 54 | printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n", |
52 | pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr, | 55 | pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr, |
53 | pdn->eeh_pe_config_addr, pdn->node->full_name); | 56 | pdn->eeh_pe_config_addr, pdn->node->full_name); |
54 | dent += 3; | 57 | dent += 3; |
55 | struct device_node *pc = pdn->node->child; | 58 | pc = pdn->node->child; |
56 | while (pc) { | 59 | while (pc) { |
57 | print_device_node_tree(PCI_DN(pc), dent); | 60 | print_device_node_tree(PCI_DN(pc), dent); |
58 | pc = pc->sibling; | 61 | pc = pc->sibling; |
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c index f68903e15bd5..42f7e384e6c4 100644 --- a/arch/powerpc/platforms/pseries/nvram.c +++ b/arch/powerpc/platforms/pseries/nvram.c | |||
@@ -131,8 +131,10 @@ int __init pSeries_nvram_init(void) | |||
131 | return -ENODEV; | 131 | return -ENODEV; |
132 | 132 | ||
133 | nbytes_p = of_get_property(nvram, "#bytes", &proplen); | 133 | nbytes_p = of_get_property(nvram, "#bytes", &proplen); |
134 | if (nbytes_p == NULL || proplen != sizeof(unsigned int)) | 134 | if (nbytes_p == NULL || proplen != sizeof(unsigned int)) { |
135 | of_node_put(nvram); | ||
135 | return -EIO; | 136 | return -EIO; |
137 | } | ||
136 | 138 | ||
137 | nvram_size = *nbytes_p; | 139 | nvram_size = *nbytes_p; |
138 | 140 | ||
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 3a7054e2bb75..019657c110b6 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
@@ -432,7 +432,7 @@ static struct i2c_driver_device i2c_devices[] __initdata = { | |||
432 | {"dallas,ds1339", "ds1339"}, | 432 | {"dallas,ds1339", "ds1339"}, |
433 | {"dallas,ds1340", "ds1340"}, | 433 | {"dallas,ds1340", "ds1340"}, |
434 | {"stm,m41t00", "m41t00"}, | 434 | {"stm,m41t00", "m41t00"}, |
435 | {"dallas,ds1374", "rtc-ds1374"}, | 435 | {"dallas,ds1374", "ds1374"}, |
436 | }; | 436 | }; |
437 | 437 | ||
438 | static int __init of_find_i2c_driver(struct device_node *node, | 438 | static int __init of_find_i2c_driver(struct device_node *node, |
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 8619f2a3f1f6..7680001676a6 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -1331,6 +1331,9 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) | |||
1331 | unsigned long flags; | 1331 | unsigned long flags; |
1332 | u32 reg; | 1332 | u32 reg; |
1333 | 1333 | ||
1334 | if (!mpic) | ||
1335 | return; | ||
1336 | |||
1334 | spin_lock_irqsave(&mpic_lock, flags); | 1337 | spin_lock_irqsave(&mpic_lock, flags); |
1335 | if (is_ipi) { | 1338 | if (is_ipi) { |
1336 | reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) & | 1339 | reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) & |
@@ -1346,23 +1349,6 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) | |||
1346 | spin_unlock_irqrestore(&mpic_lock, flags); | 1349 | spin_unlock_irqrestore(&mpic_lock, flags); |
1347 | } | 1350 | } |
1348 | 1351 | ||
1349 | unsigned int mpic_irq_get_priority(unsigned int irq) | ||
1350 | { | ||
1351 | unsigned int is_ipi; | ||
1352 | struct mpic *mpic = mpic_find(irq, &is_ipi); | ||
1353 | unsigned int src = mpic_irq_to_hw(irq); | ||
1354 | unsigned long flags; | ||
1355 | u32 reg; | ||
1356 | |||
1357 | spin_lock_irqsave(&mpic_lock, flags); | ||
1358 | if (is_ipi) | ||
1359 | reg = mpic_ipi_read(src = mpic->ipi_vecs[0]); | ||
1360 | else | ||
1361 | reg = mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI)); | ||
1362 | spin_unlock_irqrestore(&mpic_lock, flags); | ||
1363 | return (reg & MPIC_VECPRI_PRIORITY_MASK) >> MPIC_VECPRI_PRIORITY_SHIFT; | ||
1364 | } | ||
1365 | |||
1366 | void mpic_setup_this_cpu(void) | 1352 | void mpic_setup_this_cpu(void) |
1367 | { | 1353 | { |
1368 | #ifdef CONFIG_SMP | 1354 | #ifdef CONFIG_SMP |
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 1702de9395ee..bfcf70ee8959 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
@@ -2844,7 +2844,6 @@ static void dump_spu_fields(struct spu *spu) | |||
2844 | DUMP_FIELD(spu, "0x%lx", flags); | 2844 | DUMP_FIELD(spu, "0x%lx", flags); |
2845 | DUMP_FIELD(spu, "%d", class_0_pending); | 2845 | DUMP_FIELD(spu, "%d", class_0_pending); |
2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); | 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); |
2847 | DUMP_FIELD(spu, "0x%lx", class_0_dsisr); | ||
2848 | DUMP_FIELD(spu, "0x%lx", class_1_dar); | 2847 | DUMP_FIELD(spu, "0x%lx", class_1_dar); |
2849 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); | 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); |
2850 | DUMP_FIELD(spu, "0x%lx", irqs[0]); | 2849 | DUMP_FIELD(spu, "0x%lx", irqs[0]); |
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 602c268fc8a2..5d529bcbeee9 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
@@ -60,8 +60,10 @@ long long __ashrdi3(long long, int); | |||
60 | long long __ashldi3(long long, int); | 60 | long long __ashldi3(long long, int); |
61 | long long __lshrdi3(long long, int); | 61 | long long __lshrdi3(long long, int); |
62 | 62 | ||
63 | EXPORT_SYMBOL(empty_zero_page); | ||
63 | EXPORT_SYMBOL(clear_pages); | 64 | EXPORT_SYMBOL(clear_pages); |
64 | EXPORT_SYMBOL(clear_user_page); | 65 | EXPORT_SYMBOL(clear_user_page); |
66 | EXPORT_SYMBOL(copy_page); | ||
65 | EXPORT_SYMBOL(transfer_to_handler); | 67 | EXPORT_SYMBOL(transfer_to_handler); |
66 | EXPORT_SYMBOL(do_IRQ); | 68 | EXPORT_SYMBOL(do_IRQ); |
67 | EXPORT_SYMBOL(machine_check_exception); | 69 | EXPORT_SYMBOL(machine_check_exception); |
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 1d035082e78e..107e492cb47e 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -304,10 +304,14 @@ config ARCH_SPARSEMEM_ENABLE | |||
304 | def_bool y | 304 | def_bool y |
305 | select SPARSEMEM_VMEMMAP_ENABLE | 305 | select SPARSEMEM_VMEMMAP_ENABLE |
306 | select SPARSEMEM_VMEMMAP | 306 | select SPARSEMEM_VMEMMAP |
307 | select SPARSEMEM_STATIC if !64BIT | ||
307 | 308 | ||
308 | config ARCH_SPARSEMEM_DEFAULT | 309 | config ARCH_SPARSEMEM_DEFAULT |
309 | def_bool y | 310 | def_bool y |
310 | 311 | ||
312 | config ARCH_SELECT_MEMORY_MODEL | ||
313 | def_bool y | ||
314 | |||
311 | source "mm/Kconfig" | 315 | source "mm/Kconfig" |
312 | 316 | ||
313 | comment "I/O subsystem configuration" | 317 | comment "I/O subsystem configuration" |
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index 655d52543e2d..ad40729bec3d 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c | |||
@@ -130,6 +130,7 @@ static void appldata_work_fn(struct work_struct *work) | |||
130 | 130 | ||
131 | P_DEBUG(" -= Work Queue =-\n"); | 131 | P_DEBUG(" -= Work Queue =-\n"); |
132 | i = 0; | 132 | i = 0; |
133 | get_online_cpus(); | ||
133 | spin_lock(&appldata_ops_lock); | 134 | spin_lock(&appldata_ops_lock); |
134 | list_for_each(lh, &appldata_ops_list) { | 135 | list_for_each(lh, &appldata_ops_list) { |
135 | ops = list_entry(lh, struct appldata_ops, list); | 136 | ops = list_entry(lh, struct appldata_ops, list); |
@@ -140,6 +141,7 @@ static void appldata_work_fn(struct work_struct *work) | |||
140 | } | 141 | } |
141 | } | 142 | } |
142 | spin_unlock(&appldata_ops_lock); | 143 | spin_unlock(&appldata_ops_lock); |
144 | put_online_cpus(); | ||
143 | } | 145 | } |
144 | 146 | ||
145 | /* | 147 | /* |
@@ -266,12 +268,14 @@ appldata_timer_handler(ctl_table *ctl, int write, struct file *filp, | |||
266 | len = *lenp; | 268 | len = *lenp; |
267 | if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len)) | 269 | if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len)) |
268 | return -EFAULT; | 270 | return -EFAULT; |
271 | get_online_cpus(); | ||
269 | spin_lock(&appldata_timer_lock); | 272 | spin_lock(&appldata_timer_lock); |
270 | if (buf[0] == '1') | 273 | if (buf[0] == '1') |
271 | __appldata_vtimer_setup(APPLDATA_ADD_TIMER); | 274 | __appldata_vtimer_setup(APPLDATA_ADD_TIMER); |
272 | else if (buf[0] == '0') | 275 | else if (buf[0] == '0') |
273 | __appldata_vtimer_setup(APPLDATA_DEL_TIMER); | 276 | __appldata_vtimer_setup(APPLDATA_DEL_TIMER); |
274 | spin_unlock(&appldata_timer_lock); | 277 | spin_unlock(&appldata_timer_lock); |
278 | put_online_cpus(); | ||
275 | out: | 279 | out: |
276 | *lenp = len; | 280 | *lenp = len; |
277 | *ppos += len; | 281 | *ppos += len; |
@@ -314,10 +318,12 @@ appldata_interval_handler(ctl_table *ctl, int write, struct file *filp, | |||
314 | return -EINVAL; | 318 | return -EINVAL; |
315 | } | 319 | } |
316 | 320 | ||
321 | get_online_cpus(); | ||
317 | spin_lock(&appldata_timer_lock); | 322 | spin_lock(&appldata_timer_lock); |
318 | appldata_interval = interval; | 323 | appldata_interval = interval; |
319 | __appldata_vtimer_setup(APPLDATA_MOD_TIMER); | 324 | __appldata_vtimer_setup(APPLDATA_MOD_TIMER); |
320 | spin_unlock(&appldata_timer_lock); | 325 | spin_unlock(&appldata_timer_lock); |
326 | put_online_cpus(); | ||
321 | 327 | ||
322 | P_INFO("Monitoring CPU interval set to %u milliseconds.\n", | 328 | P_INFO("Monitoring CPU interval set to %u milliseconds.\n", |
323 | interval); | 329 | interval); |
@@ -556,8 +562,10 @@ static int __init appldata_init(void) | |||
556 | return -ENOMEM; | 562 | return -ENOMEM; |
557 | } | 563 | } |
558 | 564 | ||
565 | get_online_cpus(); | ||
559 | for_each_online_cpu(i) | 566 | for_each_online_cpu(i) |
560 | appldata_online_cpu(i); | 567 | appldata_online_cpu(i); |
568 | put_online_cpus(); | ||
561 | 569 | ||
562 | /* Register cpu hotplug notifier */ | 570 | /* Register cpu hotplug notifier */ |
563 | register_hotcpu_notifier(&appldata_nb); | 571 | register_hotcpu_notifier(&appldata_nb); |
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index aa341d0ea1e6..c5cdb975d590 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.25 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Wed Apr 30 11:07:45 2008 | 4 | # Fri May 30 09:49:33 2008 |
5 | # | 5 | # |
6 | CONFIG_SCHED_MC=y | 6 | CONFIG_SCHED_MC=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
@@ -103,6 +103,7 @@ CONFIG_RT_MUTEXES=y | |||
103 | # CONFIG_TINY_SHMEM is not set | 103 | # CONFIG_TINY_SHMEM is not set |
104 | CONFIG_BASE_SMALL=0 | 104 | CONFIG_BASE_SMALL=0 |
105 | CONFIG_MODULES=y | 105 | CONFIG_MODULES=y |
106 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
106 | CONFIG_MODULE_UNLOAD=y | 107 | CONFIG_MODULE_UNLOAD=y |
107 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 108 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
108 | CONFIG_MODVERSIONS=y | 109 | CONFIG_MODVERSIONS=y |
@@ -173,6 +174,7 @@ CONFIG_PREEMPT=y | |||
173 | # CONFIG_PREEMPT_RCU is not set | 174 | # CONFIG_PREEMPT_RCU is not set |
174 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 175 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
175 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 176 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
177 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
176 | CONFIG_SELECT_MEMORY_MODEL=y | 178 | CONFIG_SELECT_MEMORY_MODEL=y |
177 | # CONFIG_FLATMEM_MANUAL is not set | 179 | # CONFIG_FLATMEM_MANUAL is not set |
178 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 180 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -210,6 +212,7 @@ CONFIG_FORCE_MAX_ZONEORDER=9 | |||
210 | CONFIG_PFAULT=y | 212 | CONFIG_PFAULT=y |
211 | # CONFIG_SHARED_KERNEL is not set | 213 | # CONFIG_SHARED_KERNEL is not set |
212 | # CONFIG_CMM is not set | 214 | # CONFIG_CMM is not set |
215 | # CONFIG_PAGE_STATES is not set | ||
213 | CONFIG_VIRT_TIMER=y | 216 | CONFIG_VIRT_TIMER=y |
214 | CONFIG_VIRT_CPU_ACCOUNTING=y | 217 | CONFIG_VIRT_CPU_ACCOUNTING=y |
215 | # CONFIG_APPLDATA_BASE is not set | 218 | # CONFIG_APPLDATA_BASE is not set |
@@ -620,6 +623,7 @@ CONFIG_S390_VMUR=m | |||
620 | # | 623 | # |
621 | # CONFIG_MEMSTICK is not set | 624 | # CONFIG_MEMSTICK is not set |
622 | # CONFIG_NEW_LEDS is not set | 625 | # CONFIG_NEW_LEDS is not set |
626 | CONFIG_ACCESSIBILITY=y | ||
623 | 627 | ||
624 | # | 628 | # |
625 | # File systems | 629 | # File systems |
@@ -754,11 +758,12 @@ CONFIG_FRAME_WARN=2048 | |||
754 | CONFIG_MAGIC_SYSRQ=y | 758 | CONFIG_MAGIC_SYSRQ=y |
755 | # CONFIG_UNUSED_SYMBOLS is not set | 759 | # CONFIG_UNUSED_SYMBOLS is not set |
756 | CONFIG_DEBUG_FS=y | 760 | CONFIG_DEBUG_FS=y |
757 | CONFIG_HEADERS_CHECK=y | 761 | # CONFIG_HEADERS_CHECK is not set |
758 | CONFIG_DEBUG_KERNEL=y | 762 | CONFIG_DEBUG_KERNEL=y |
759 | # CONFIG_SCHED_DEBUG is not set | 763 | # CONFIG_SCHED_DEBUG is not set |
760 | # CONFIG_SCHEDSTATS is not set | 764 | # CONFIG_SCHEDSTATS is not set |
761 | # CONFIG_TIMER_STATS is not set | 765 | # CONFIG_TIMER_STATS is not set |
766 | # CONFIG_DEBUG_OBJECTS is not set | ||
762 | # CONFIG_DEBUG_SLAB is not set | 767 | # CONFIG_DEBUG_SLAB is not set |
763 | CONFIG_DEBUG_PREEMPT=y | 768 | CONFIG_DEBUG_PREEMPT=y |
764 | # CONFIG_DEBUG_RT_MUTEXES is not set | 769 | # CONFIG_DEBUG_RT_MUTEXES is not set |
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c index c14a336f6300..d2f270c995d9 100644 --- a/arch/s390/kernel/dis.c +++ b/arch/s390/kernel/dis.c | |||
@@ -208,7 +208,7 @@ static const unsigned char formats[][7] = { | |||
208 | [INSTR_RRF_F0FF] = { 0xff, F_16,F_24,F_28,0,0,0 }, /* e.g. madbr */ | 208 | [INSTR_RRF_F0FF] = { 0xff, F_16,F_24,F_28,0,0,0 }, /* e.g. madbr */ |
209 | [INSTR_RRF_FUFF] = { 0xff, F_24,F_16,F_28,U4_20,0,0 },/* e.g. didbr */ | 209 | [INSTR_RRF_FUFF] = { 0xff, F_24,F_16,F_28,U4_20,0,0 },/* e.g. didbr */ |
210 | [INSTR_RRF_RURR] = { 0xff, R_24,R_28,R_16,U4_20,0,0 },/* e.g. .insn */ | 210 | [INSTR_RRF_RURR] = { 0xff, R_24,R_28,R_16,U4_20,0,0 },/* e.g. .insn */ |
211 | [INSTR_RRF_R0RR] = { 0xff, R_24,R_28,R_16,0,0,0 }, /* e.g. idte */ | 211 | [INSTR_RRF_R0RR] = { 0xff, R_24,R_16,R_28,0,0,0 }, /* e.g. idte */ |
212 | [INSTR_RRF_U0FF] = { 0xff, F_24,U4_16,F_28,0,0,0 }, /* e.g. fixr */ | 212 | [INSTR_RRF_U0FF] = { 0xff, F_24,U4_16,F_28,0,0,0 }, /* e.g. fixr */ |
213 | [INSTR_RRF_U0RF] = { 0xff, R_24,U4_16,F_28,0,0,0 }, /* e.g. cfebr */ | 213 | [INSTR_RRF_U0RF] = { 0xff, R_24,U4_16,F_28,0,0,0 }, /* e.g. cfebr */ |
214 | [INSTR_RRF_M0RR] = { 0xff, R_24,R_28,M_16,0,0,0 }, /* e.g. sske */ | 214 | [INSTR_RRF_M0RR] = { 0xff, R_24,R_28,M_16,0,0,0 }, /* e.g. sske */ |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 1f4228948dc4..5d4fa4b1c74c 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -711,7 +711,7 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
711 | memset(sf, 0, sizeof(struct stack_frame)); | 711 | memset(sf, 0, sizeof(struct stack_frame)); |
712 | sf->gprs[9] = (unsigned long) sf; | 712 | sf->gprs[9] = (unsigned long) sf; |
713 | cpu_lowcore->save_area[15] = (unsigned long) sf; | 713 | cpu_lowcore->save_area[15] = (unsigned long) sf; |
714 | __ctl_store(cpu_lowcore->cregs_save_area[0], 0, 15); | 714 | __ctl_store(cpu_lowcore->cregs_save_area, 0, 15); |
715 | asm volatile( | 715 | asm volatile( |
716 | " stam 0,15,0(%0)" | 716 | " stam 0,15,0(%0)" |
717 | : : "a" (&cpu_lowcore->access_regs_save_area) : "memory"); | 717 | : : "a" (&cpu_lowcore->access_regs_save_area) : "memory"); |
@@ -1089,7 +1089,7 @@ out: | |||
1089 | 1089 | ||
1090 | #ifdef CONFIG_HOTPLUG_CPU | 1090 | #ifdef CONFIG_HOTPLUG_CPU |
1091 | 1091 | ||
1092 | int smp_rescan_cpus(void) | 1092 | int __ref smp_rescan_cpus(void) |
1093 | { | 1093 | { |
1094 | cpumask_t newcpus; | 1094 | cpumask_t newcpus; |
1095 | int cpu; | 1095 | int cpu; |
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index f639a152869f..a0775e1f08df 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c | |||
@@ -20,7 +20,7 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu) | |||
20 | VCPU_EVENT(vcpu, 5, "%s", "diag time slice end"); | 20 | VCPU_EVENT(vcpu, 5, "%s", "diag time slice end"); |
21 | vcpu->stat.diagnose_44++; | 21 | vcpu->stat.diagnose_44++; |
22 | vcpu_put(vcpu); | 22 | vcpu_put(vcpu); |
23 | schedule(); | 23 | yield(); |
24 | vcpu_load(vcpu); | 24 | vcpu_load(vcpu); |
25 | return 0; | 25 | return 0; |
26 | } | 26 | } |
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index fcd1ed8015c1..84a7fed4cd4e 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
@@ -339,6 +339,11 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) | |||
339 | if (kvm_cpu_has_interrupt(vcpu)) | 339 | if (kvm_cpu_has_interrupt(vcpu)) |
340 | return 0; | 340 | return 0; |
341 | 341 | ||
342 | __set_cpu_idle(vcpu); | ||
343 | spin_lock_bh(&vcpu->arch.local_int.lock); | ||
344 | vcpu->arch.local_int.timer_due = 0; | ||
345 | spin_unlock_bh(&vcpu->arch.local_int.lock); | ||
346 | |||
342 | if (psw_interrupts_disabled(vcpu)) { | 347 | if (psw_interrupts_disabled(vcpu)) { |
343 | VCPU_EVENT(vcpu, 3, "%s", "disabled wait"); | 348 | VCPU_EVENT(vcpu, 3, "%s", "disabled wait"); |
344 | __unset_cpu_idle(vcpu); | 349 | __unset_cpu_idle(vcpu); |
@@ -366,8 +371,6 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) | |||
366 | no_timer: | 371 | no_timer: |
367 | spin_lock_bh(&vcpu->arch.local_int.float_int->lock); | 372 | spin_lock_bh(&vcpu->arch.local_int.float_int->lock); |
368 | spin_lock_bh(&vcpu->arch.local_int.lock); | 373 | spin_lock_bh(&vcpu->arch.local_int.lock); |
369 | __set_cpu_idle(vcpu); | ||
370 | vcpu->arch.local_int.timer_due = 0; | ||
371 | add_wait_queue(&vcpu->arch.local_int.wq, &wait); | 374 | add_wait_queue(&vcpu->arch.local_int.wq, &wait); |
372 | while (list_empty(&vcpu->arch.local_int.list) && | 375 | while (list_empty(&vcpu->arch.local_int.list) && |
373 | list_empty(&vcpu->arch.local_int.float_int->list) && | 376 | list_empty(&vcpu->arch.local_int.float_int->list) && |
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 0ac36a649eba..6558b09ff579 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c | |||
@@ -423,6 +423,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, | |||
423 | return -EINVAL; /* not implemented yet */ | 423 | return -EINVAL; /* not implemented yet */ |
424 | } | 424 | } |
425 | 425 | ||
426 | extern void s390_handle_mcck(void); | ||
427 | |||
426 | static void __vcpu_run(struct kvm_vcpu *vcpu) | 428 | static void __vcpu_run(struct kvm_vcpu *vcpu) |
427 | { | 429 | { |
428 | memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16); | 430 | memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16); |
@@ -430,13 +432,21 @@ static void __vcpu_run(struct kvm_vcpu *vcpu) | |||
430 | if (need_resched()) | 432 | if (need_resched()) |
431 | schedule(); | 433 | schedule(); |
432 | 434 | ||
435 | if (test_thread_flag(TIF_MCCK_PENDING)) | ||
436 | s390_handle_mcck(); | ||
437 | |||
438 | kvm_s390_deliver_pending_interrupts(vcpu); | ||
439 | |||
433 | vcpu->arch.sie_block->icptcode = 0; | 440 | vcpu->arch.sie_block->icptcode = 0; |
434 | local_irq_disable(); | 441 | local_irq_disable(); |
435 | kvm_guest_enter(); | 442 | kvm_guest_enter(); |
436 | local_irq_enable(); | 443 | local_irq_enable(); |
437 | VCPU_EVENT(vcpu, 6, "entering sie flags %x", | 444 | VCPU_EVENT(vcpu, 6, "entering sie flags %x", |
438 | atomic_read(&vcpu->arch.sie_block->cpuflags)); | 445 | atomic_read(&vcpu->arch.sie_block->cpuflags)); |
439 | sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs); | 446 | if (sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs)) { |
447 | VCPU_EVENT(vcpu, 3, "%s", "fault in sie instruction"); | ||
448 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); | ||
449 | } | ||
440 | VCPU_EVENT(vcpu, 6, "exit sie icptcode %d", | 450 | VCPU_EVENT(vcpu, 6, "exit sie icptcode %d", |
441 | vcpu->arch.sie_block->icptcode); | 451 | vcpu->arch.sie_block->icptcode); |
442 | local_irq_disable(); | 452 | local_irq_disable(); |
@@ -475,7 +485,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
475 | might_sleep(); | 485 | might_sleep(); |
476 | 486 | ||
477 | do { | 487 | do { |
478 | kvm_s390_deliver_pending_interrupts(vcpu); | ||
479 | __vcpu_run(vcpu); | 488 | __vcpu_run(vcpu); |
480 | rc = kvm_handle_sie_intercept(vcpu); | 489 | rc = kvm_handle_sie_intercept(vcpu); |
481 | } while (!signal_pending(current) && !rc); | 490 | } while (!signal_pending(current) && !rc); |
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 29f3a63806b9..05598649b326 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
@@ -44,37 +44,34 @@ char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); | |||
44 | 44 | ||
45 | void show_mem(void) | 45 | void show_mem(void) |
46 | { | 46 | { |
47 | int i, total = 0, reserved = 0; | 47 | unsigned long i, total = 0, reserved = 0; |
48 | int shared = 0, cached = 0; | 48 | unsigned long shared = 0, cached = 0; |
49 | unsigned long flags; | ||
49 | struct page *page; | 50 | struct page *page; |
51 | pg_data_t *pgdat; | ||
50 | 52 | ||
51 | printk("Mem-info:\n"); | 53 | printk("Mem-info:\n"); |
52 | show_free_areas(); | 54 | show_free_areas(); |
53 | i = max_mapnr; | 55 | for_each_online_pgdat(pgdat) { |
54 | while (i-- > 0) { | 56 | pgdat_resize_lock(pgdat, &flags); |
55 | if (!pfn_valid(i)) | 57 | for (i = 0; i < pgdat->node_spanned_pages; i++) { |
56 | continue; | 58 | if (!pfn_valid(pgdat->node_start_pfn + i)) |
57 | page = pfn_to_page(i); | 59 | continue; |
58 | total++; | 60 | page = pfn_to_page(pgdat->node_start_pfn + i); |
59 | if (PageReserved(page)) | 61 | total++; |
60 | reserved++; | 62 | if (PageReserved(page)) |
61 | else if (PageSwapCache(page)) | 63 | reserved++; |
62 | cached++; | 64 | else if (PageSwapCache(page)) |
63 | else if (page_count(page)) | 65 | cached++; |
64 | shared += page_count(page) - 1; | 66 | else if (page_count(page)) |
67 | shared += page_count(page) - 1; | ||
68 | } | ||
69 | pgdat_resize_unlock(pgdat, &flags); | ||
65 | } | 70 | } |
66 | printk("%d pages of RAM\n", total); | 71 | printk("%ld pages of RAM\n", total); |
67 | printk("%d reserved pages\n", reserved); | 72 | printk("%ld reserved pages\n", reserved); |
68 | printk("%d pages shared\n", shared); | 73 | printk("%ld pages shared\n", shared); |
69 | printk("%d pages swap cached\n", cached); | 74 | printk("%ld pages swap cached\n", cached); |
70 | |||
71 | printk("%lu pages dirty\n", global_page_state(NR_FILE_DIRTY)); | ||
72 | printk("%lu pages writeback\n", global_page_state(NR_WRITEBACK)); | ||
73 | printk("%lu pages mapped\n", global_page_state(NR_FILE_MAPPED)); | ||
74 | printk("%lu pages slab\n", | ||
75 | global_page_state(NR_SLAB_RECLAIMABLE) + | ||
76 | global_page_state(NR_SLAB_UNRECLAIMABLE)); | ||
77 | printk("%lu pages pagetables\n", global_page_state(NR_PAGETABLE)); | ||
78 | } | 75 | } |
79 | 76 | ||
80 | /* | 77 | /* |
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 5c1aea97cd12..3d98ba82ea67 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c | |||
@@ -254,36 +254,46 @@ void disable_noexec(struct mm_struct *mm, struct task_struct *tsk) | |||
254 | int s390_enable_sie(void) | 254 | int s390_enable_sie(void) |
255 | { | 255 | { |
256 | struct task_struct *tsk = current; | 256 | struct task_struct *tsk = current; |
257 | struct mm_struct *mm; | 257 | struct mm_struct *mm, *old_mm; |
258 | int rc; | ||
259 | 258 | ||
260 | task_lock(tsk); | 259 | /* Do we have pgstes? if yes, we are done */ |
261 | |||
262 | rc = 0; | ||
263 | if (tsk->mm->context.pgstes) | 260 | if (tsk->mm->context.pgstes) |
264 | goto unlock; | 261 | return 0; |
265 | 262 | ||
266 | rc = -EINVAL; | 263 | /* lets check if we are allowed to replace the mm */ |
264 | task_lock(tsk); | ||
267 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || | 265 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || |
268 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) | 266 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) { |
269 | goto unlock; | 267 | task_unlock(tsk); |
268 | return -EINVAL; | ||
269 | } | ||
270 | task_unlock(tsk); | ||
270 | 271 | ||
271 | tsk->mm->context.pgstes = 1; /* dirty little tricks .. */ | 272 | /* we copy the mm with pgstes enabled */ |
273 | tsk->mm->context.pgstes = 1; | ||
272 | mm = dup_mm(tsk); | 274 | mm = dup_mm(tsk); |
273 | tsk->mm->context.pgstes = 0; | 275 | tsk->mm->context.pgstes = 0; |
274 | |||
275 | rc = -ENOMEM; | ||
276 | if (!mm) | 276 | if (!mm) |
277 | goto unlock; | 277 | return -ENOMEM; |
278 | mmput(tsk->mm); | 278 | |
279 | /* Now lets check again if somebody attached ptrace etc */ | ||
280 | task_lock(tsk); | ||
281 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || | ||
282 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) { | ||
283 | mmput(mm); | ||
284 | task_unlock(tsk); | ||
285 | return -EINVAL; | ||
286 | } | ||
287 | |||
288 | /* ok, we are alone. No ptrace, no threads, etc. */ | ||
289 | old_mm = tsk->mm; | ||
279 | tsk->mm = tsk->active_mm = mm; | 290 | tsk->mm = tsk->active_mm = mm; |
280 | preempt_disable(); | 291 | preempt_disable(); |
281 | update_mm(mm, tsk); | 292 | update_mm(mm, tsk); |
282 | cpu_set(smp_processor_id(), mm->cpu_vm_mask); | 293 | cpu_set(smp_processor_id(), mm->cpu_vm_mask); |
283 | preempt_enable(); | 294 | preempt_enable(); |
284 | rc = 0; | ||
285 | unlock: | ||
286 | task_unlock(tsk); | 295 | task_unlock(tsk); |
287 | return rc; | 296 | mmput(old_mm); |
297 | return 0; | ||
288 | } | 298 | } |
289 | EXPORT_SYMBOL_GPL(s390_enable_sie); | 299 | EXPORT_SYMBOL_GPL(s390_enable_sie); |
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index ea2804808f39..e4868bfc672f 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c | |||
@@ -27,12 +27,19 @@ struct memory_segment { | |||
27 | 27 | ||
28 | static LIST_HEAD(mem_segs); | 28 | static LIST_HEAD(mem_segs); |
29 | 29 | ||
30 | static pud_t *vmem_pud_alloc(void) | 30 | static void __ref *vmem_alloc_pages(unsigned int order) |
31 | { | ||
32 | if (slab_is_available()) | ||
33 | return (void *)__get_free_pages(GFP_KERNEL, order); | ||
34 | return alloc_bootmem_pages((1 << order) * PAGE_SIZE); | ||
35 | } | ||
36 | |||
37 | static inline pud_t *vmem_pud_alloc(void) | ||
31 | { | 38 | { |
32 | pud_t *pud = NULL; | 39 | pud_t *pud = NULL; |
33 | 40 | ||
34 | #ifdef CONFIG_64BIT | 41 | #ifdef CONFIG_64BIT |
35 | pud = vmemmap_alloc_block(PAGE_SIZE * 4, 0); | 42 | pud = vmem_alloc_pages(2); |
36 | if (!pud) | 43 | if (!pud) |
37 | return NULL; | 44 | return NULL; |
38 | clear_table((unsigned long *) pud, _REGION3_ENTRY_EMPTY, PAGE_SIZE * 4); | 45 | clear_table((unsigned long *) pud, _REGION3_ENTRY_EMPTY, PAGE_SIZE * 4); |
@@ -40,12 +47,12 @@ static pud_t *vmem_pud_alloc(void) | |||
40 | return pud; | 47 | return pud; |
41 | } | 48 | } |
42 | 49 | ||
43 | static pmd_t *vmem_pmd_alloc(void) | 50 | static inline pmd_t *vmem_pmd_alloc(void) |
44 | { | 51 | { |
45 | pmd_t *pmd = NULL; | 52 | pmd_t *pmd = NULL; |
46 | 53 | ||
47 | #ifdef CONFIG_64BIT | 54 | #ifdef CONFIG_64BIT |
48 | pmd = vmemmap_alloc_block(PAGE_SIZE * 4, 0); | 55 | pmd = vmem_alloc_pages(2); |
49 | if (!pmd) | 56 | if (!pmd) |
50 | return NULL; | 57 | return NULL; |
51 | clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE * 4); | 58 | clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE * 4); |
@@ -207,13 +214,14 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node) | |||
207 | if (pte_none(*pt_dir)) { | 214 | if (pte_none(*pt_dir)) { |
208 | unsigned long new_page; | 215 | unsigned long new_page; |
209 | 216 | ||
210 | new_page =__pa(vmemmap_alloc_block(PAGE_SIZE, 0)); | 217 | new_page =__pa(vmem_alloc_pages(0)); |
211 | if (!new_page) | 218 | if (!new_page) |
212 | goto out; | 219 | goto out; |
213 | pte = pfn_pte(new_page >> PAGE_SHIFT, PAGE_KERNEL); | 220 | pte = pfn_pte(new_page >> PAGE_SHIFT, PAGE_KERNEL); |
214 | *pt_dir = pte; | 221 | *pt_dir = pte; |
215 | } | 222 | } |
216 | } | 223 | } |
224 | memset(start, 0, nr * sizeof(struct page)); | ||
217 | ret = 0; | 225 | ret = 0; |
218 | out: | 226 | out: |
219 | flush_tlb_kernel_range(start_addr, end_addr); | 227 | flush_tlb_kernel_range(start_addr, end_addr); |
@@ -228,7 +236,7 @@ static int insert_memory_segment(struct memory_segment *seg) | |||
228 | { | 236 | { |
229 | struct memory_segment *tmp; | 237 | struct memory_segment *tmp; |
230 | 238 | ||
231 | if (seg->start + seg->size >= VMEM_MAX_PHYS || | 239 | if (seg->start + seg->size > VMEM_MAX_PHYS || |
232 | seg->start + seg->size < seg->start) | 240 | seg->start + seg->size < seg->start) |
233 | return -ERANGE; | 241 | return -ERANGE; |
234 | 242 | ||
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8a68160079a9..9a854c8e5274 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -281,7 +281,6 @@ config CPU_SUBTYPE_SH7723 | |||
281 | select CPU_SH4A | 281 | select CPU_SH4A |
282 | select CPU_SHX2 | 282 | select CPU_SHX2 |
283 | select ARCH_SPARSEMEM_ENABLE | 283 | select ARCH_SPARSEMEM_ENABLE |
284 | select SYS_SUPPORTS_NUMA | ||
285 | help | 284 | help |
286 | Select SH7723 if you have an SH-MobileR2 CPU. | 285 | Select SH7723 if you have an SH-MobileR2 CPU. |
287 | 286 | ||
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug index 0d2ef1e9a6fd..0f4549860226 100644 --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug | |||
@@ -81,7 +81,7 @@ config DEBUG_STACK_USAGE | |||
81 | 81 | ||
82 | config 4KSTACKS | 82 | config 4KSTACKS |
83 | bool "Use 4Kb for kernel stacks instead of 8Kb" | 83 | bool "Use 4Kb for kernel stacks instead of 8Kb" |
84 | depends on DEBUG_KERNEL | 84 | depends on DEBUG_KERNEL && (MMU || BROKEN) |
85 | help | 85 | help |
86 | If you say Y here the kernel will use a 4Kb stacksize for the | 86 | If you say Y here the kernel will use a 4Kb stacksize for the |
87 | kernel stack attached to each process/thread. This facilitates | 87 | kernel stack attached to each process/thread. This facilitates |
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 8050b03d51fc..fb7b1b15e392 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile | |||
@@ -41,6 +41,8 @@ cflags-$(CONFIG_CPU_SH5) := $(call cc-option,-m5-32media-nofpu,) | |||
41 | cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb | 41 | cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb |
42 | cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml | 42 | cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml |
43 | 43 | ||
44 | cflags-y += $(call cc-option,-mno-fdpic) | ||
45 | |||
44 | # | 46 | # |
45 | # -Wa,-isa= tuning implies -Wa,-dsp for the versions of binutils that | 47 | # -Wa,-isa= tuning implies -Wa,-dsp for the versions of binutils that |
46 | # support it, while -Wa,-dsp by itself limits the range of usable opcodes | 48 | # support it, while -Wa,-dsp by itself limits the range of usable opcodes |
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c index 452d0d6459a4..2308e8753bcd 100644 --- a/arch/sh/boards/renesas/rts7751r2d/setup.c +++ b/arch/sh/boards/renesas/rts7751r2d/setup.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
13 | #include <linux/ata_platform.h> | 13 | #include <linux/ata_platform.h> |
14 | #include <linux/serial_8250.h> | ||
15 | #include <linux/sm501.h> | 14 | #include <linux/sm501.h> |
16 | #include <linux/sm501-regs.h> | 15 | #include <linux/sm501-regs.h> |
17 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
@@ -109,27 +108,6 @@ static struct platform_device heartbeat_device = { | |||
109 | .resource = heartbeat_resources, | 108 | .resource = heartbeat_resources, |
110 | }; | 109 | }; |
111 | 110 | ||
112 | static struct plat_serial8250_port uart_platform_data[] = { | ||
113 | { | ||
114 | .membase = (void __iomem *)0xb3e30000, | ||
115 | .mapbase = 0xb3e30000, | ||
116 | .iotype = UPIO_MEM, | ||
117 | .irq = IRQ_VOYAGER, | ||
118 | .flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ, | ||
119 | .regshift = 2, | ||
120 | .uartclk = (9600 * 16), | ||
121 | }, | ||
122 | { 0 }, | ||
123 | }; | ||
124 | |||
125 | static struct platform_device uart_device = { | ||
126 | .name = "serial8250", | ||
127 | .id = PLAT8250_DEV_PLATFORM, | ||
128 | .dev = { | ||
129 | .platform_data = uart_platform_data, | ||
130 | }, | ||
131 | }; | ||
132 | |||
133 | static struct resource sm501_resources[] = { | 111 | static struct resource sm501_resources[] = { |
134 | [0] = { | 112 | [0] = { |
135 | .start = 0x10000000, | 113 | .start = 0x10000000, |
@@ -185,11 +163,7 @@ static struct sm501_platdata_fb sm501_fb_pdata = { | |||
185 | }; | 163 | }; |
186 | 164 | ||
187 | static struct sm501_initdata sm501_initdata = { | 165 | static struct sm501_initdata sm501_initdata = { |
188 | .gpio_high = { | 166 | .devices = SM501_USE_USB_HOST | SM501_USE_UART0, |
189 | .set = 0x00001fe0, | ||
190 | .mask = 0x0, | ||
191 | }, | ||
192 | .devices = SM501_USE_USB_HOST, | ||
193 | }; | 167 | }; |
194 | 168 | ||
195 | static struct sm501_platdata sm501_platform_data = { | 169 | static struct sm501_platdata sm501_platform_data = { |
@@ -208,7 +182,6 @@ static struct platform_device sm501_device = { | |||
208 | }; | 182 | }; |
209 | 183 | ||
210 | static struct platform_device *rts7751r2d_devices[] __initdata = { | 184 | static struct platform_device *rts7751r2d_devices[] __initdata = { |
211 | &uart_device, | ||
212 | &sm501_device, | 185 | &sm501_device, |
213 | &heartbeat_device, | 186 | &heartbeat_device, |
214 | &spi_sh_sci_device, | 187 | &spi_sh_sci_device, |
@@ -272,16 +245,6 @@ static void __init rts7751r2d_setup(char **cmdline_p) | |||
272 | 245 | ||
273 | sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL; | 246 | sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL; |
274 | writel(readl(sm501_reg) | 0x00f107c0, sm501_reg); | 247 | writel(readl(sm501_reg) | 0x00f107c0, sm501_reg); |
275 | |||
276 | /* | ||
277 | * Power Mode Gate - Enable UART0 | ||
278 | */ | ||
279 | |||
280 | sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_0_GATE; | ||
281 | writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg); | ||
282 | |||
283 | sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_1_GATE; | ||
284 | writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg); | ||
285 | } | 248 | } |
286 | 249 | ||
287 | /* | 250 | /* |
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index ee5900817f8f..287408b2ace6 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_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 | 3 | # Linux kernel version: 2.6.26-rc3 |
4 | # Wed Feb 6 21:52:20 2008 | 4 | # Thu May 22 14:30:07 2008 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -20,6 +20,7 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
22 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 22 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
23 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
24 | 25 | ||
25 | # | 26 | # |
@@ -36,18 +37,16 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
36 | # CONFIG_POSIX_MQUEUE is not set | 37 | # CONFIG_POSIX_MQUEUE is not set |
37 | # CONFIG_BSD_PROCESS_ACCT is not set | 38 | # CONFIG_BSD_PROCESS_ACCT is not set |
38 | # CONFIG_TASKSTATS is not set | 39 | # CONFIG_TASKSTATS is not set |
39 | # CONFIG_USER_NS is not set | ||
40 | # CONFIG_PID_NS is not set | ||
41 | # CONFIG_AUDIT is not set | 40 | # CONFIG_AUDIT is not set |
42 | CONFIG_IKCONFIG=y | 41 | CONFIG_IKCONFIG=y |
43 | CONFIG_IKCONFIG_PROC=y | 42 | CONFIG_IKCONFIG_PROC=y |
44 | CONFIG_LOG_BUF_SHIFT=14 | 43 | CONFIG_LOG_BUF_SHIFT=14 |
45 | # CONFIG_CGROUPS is not set | 44 | # CONFIG_CGROUPS is not set |
46 | CONFIG_FAIR_GROUP_SCHED=y | 45 | # CONFIG_GROUP_SCHED is not set |
47 | CONFIG_FAIR_USER_SCHED=y | ||
48 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
49 | CONFIG_SYSFS_DEPRECATED=y | 46 | CONFIG_SYSFS_DEPRECATED=y |
47 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
50 | # CONFIG_RELAY is not set | 48 | # CONFIG_RELAY is not set |
49 | # CONFIG_NAMESPACES is not set | ||
51 | CONFIG_BLK_DEV_INITRD=y | 50 | CONFIG_BLK_DEV_INITRD=y |
52 | CONFIG_INITRAMFS_SOURCE="" | 51 | CONFIG_INITRAMFS_SOURCE="" |
53 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 52 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -61,11 +60,13 @@ CONFIG_HOTPLUG=y | |||
61 | CONFIG_PRINTK=y | 60 | CONFIG_PRINTK=y |
62 | CONFIG_BUG=y | 61 | CONFIG_BUG=y |
63 | CONFIG_ELF_CORE=y | 62 | CONFIG_ELF_CORE=y |
63 | CONFIG_COMPAT_BRK=y | ||
64 | CONFIG_BASE_FULL=y | 64 | CONFIG_BASE_FULL=y |
65 | CONFIG_FUTEX=y | 65 | CONFIG_FUTEX=y |
66 | CONFIG_ANON_INODES=y | 66 | CONFIG_ANON_INODES=y |
67 | CONFIG_EPOLL=y | 67 | CONFIG_EPOLL=y |
68 | CONFIG_SIGNALFD=y | 68 | CONFIG_SIGNALFD=y |
69 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | 70 | CONFIG_EVENTFD=y |
70 | CONFIG_SHMEM=y | 71 | CONFIG_SHMEM=y |
71 | CONFIG_VM_EVENT_COUNTERS=y | 72 | CONFIG_VM_EVENT_COUNTERS=y |
@@ -77,11 +78,15 @@ CONFIG_PROFILING=y | |||
77 | CONFIG_OPROFILE=y | 78 | CONFIG_OPROFILE=y |
78 | CONFIG_HAVE_OPROFILE=y | 79 | CONFIG_HAVE_OPROFILE=y |
79 | # CONFIG_HAVE_KPROBES is not set | 80 | # CONFIG_HAVE_KPROBES is not set |
81 | # CONFIG_HAVE_KRETPROBES is not set | ||
82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
83 | CONFIG_PROC_PAGE_MONITOR=y | ||
80 | CONFIG_SLABINFO=y | 84 | CONFIG_SLABINFO=y |
81 | CONFIG_RT_MUTEXES=y | 85 | CONFIG_RT_MUTEXES=y |
82 | # CONFIG_TINY_SHMEM is not set | 86 | # CONFIG_TINY_SHMEM is not set |
83 | CONFIG_BASE_SMALL=0 | 87 | CONFIG_BASE_SMALL=0 |
84 | CONFIG_MODULES=y | 88 | CONFIG_MODULES=y |
89 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
85 | # CONFIG_MODULE_UNLOAD is not set | 90 | # CONFIG_MODULE_UNLOAD is not set |
86 | # CONFIG_MODVERSIONS is not set | 91 | # CONFIG_MODVERSIONS is not set |
87 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 92 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
@@ -105,7 +110,6 @@ CONFIG_DEFAULT_AS=y | |||
105 | # CONFIG_DEFAULT_NOOP is not set | 110 | # CONFIG_DEFAULT_NOOP is not set |
106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 111 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
107 | CONFIG_CLASSIC_RCU=y | 112 | CONFIG_CLASSIC_RCU=y |
108 | # CONFIG_PREEMPT_RCU is not set | ||
109 | 113 | ||
110 | # | 114 | # |
111 | # System type | 115 | # System type |
@@ -118,6 +122,7 @@ CONFIG_CPU_SHX2=y | |||
118 | # CONFIG_CPU_SUBTYPE_SH7203 is not set | 122 | # CONFIG_CPU_SUBTYPE_SH7203 is not set |
119 | # CONFIG_CPU_SUBTYPE_SH7206 is not set | 123 | # CONFIG_CPU_SUBTYPE_SH7206 is not set |
120 | # CONFIG_CPU_SUBTYPE_SH7263 is not set | 124 | # CONFIG_CPU_SUBTYPE_SH7263 is not set |
125 | # CONFIG_CPU_SUBTYPE_MXG is not set | ||
121 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | 126 | # CONFIG_CPU_SUBTYPE_SH7705 is not set |
122 | # CONFIG_CPU_SUBTYPE_SH7706 is not set | 127 | # CONFIG_CPU_SUBTYPE_SH7706 is not set |
123 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | 128 | # CONFIG_CPU_SUBTYPE_SH7707 is not set |
@@ -135,6 +140,7 @@ CONFIG_CPU_SHX2=y | |||
135 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | 140 | # CONFIG_CPU_SUBTYPE_SH7751R is not set |
136 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 141 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
137 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 142 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
143 | # CONFIG_CPU_SUBTYPE_SH7723 is not set | ||
138 | # CONFIG_CPU_SUBTYPE_SH7763 is not set | 144 | # CONFIG_CPU_SUBTYPE_SH7763 is not set |
139 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | 145 | # CONFIG_CPU_SUBTYPE_SH7770 is not set |
140 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | 146 | # CONFIG_CPU_SUBTYPE_SH7780 is not set |
@@ -142,6 +148,7 @@ CONFIG_CPU_SHX2=y | |||
142 | # CONFIG_CPU_SUBTYPE_SHX3 is not set | 148 | # CONFIG_CPU_SUBTYPE_SHX3 is not set |
143 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | 149 | # CONFIG_CPU_SUBTYPE_SH7343 is not set |
144 | CONFIG_CPU_SUBTYPE_SH7722=y | 150 | CONFIG_CPU_SUBTYPE_SH7722=y |
151 | # CONFIG_CPU_SUBTYPE_SH7366 is not set | ||
145 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set | 152 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set |
146 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set | 153 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set |
147 | 154 | ||
@@ -255,7 +262,6 @@ CONFIG_HZ=250 | |||
255 | CONFIG_PREEMPT_NONE=y | 262 | CONFIG_PREEMPT_NONE=y |
256 | # CONFIG_PREEMPT_VOLUNTARY is not set | 263 | # CONFIG_PREEMPT_VOLUNTARY is not set |
257 | # CONFIG_PREEMPT is not set | 264 | # CONFIG_PREEMPT is not set |
258 | CONFIG_RCU_TRACE=y | ||
259 | CONFIG_GUSA=y | 265 | CONFIG_GUSA=y |
260 | 266 | ||
261 | # | 267 | # |
@@ -323,8 +329,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
323 | CONFIG_DEFAULT_TCP_CONG="cubic" | 329 | CONFIG_DEFAULT_TCP_CONG="cubic" |
324 | # CONFIG_TCP_MD5SIG is not set | 330 | # CONFIG_TCP_MD5SIG is not set |
325 | # CONFIG_IPV6 is not set | 331 | # CONFIG_IPV6 is not set |
326 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
327 | # CONFIG_INET6_TUNNEL is not set | ||
328 | # CONFIG_NETWORK_SECMARK is not set | 332 | # CONFIG_NETWORK_SECMARK is not set |
329 | # CONFIG_NETFILTER is not set | 333 | # CONFIG_NETFILTER is not set |
330 | # CONFIG_IP_DCCP is not set | 334 | # CONFIG_IP_DCCP is not set |
@@ -376,7 +380,90 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
376 | CONFIG_FW_LOADER=m | 380 | CONFIG_FW_LOADER=m |
377 | # CONFIG_SYS_HYPERVISOR is not set | 381 | # CONFIG_SYS_HYPERVISOR is not set |
378 | # CONFIG_CONNECTOR is not set | 382 | # CONFIG_CONNECTOR is not set |
379 | # CONFIG_MTD is not set | 383 | CONFIG_MTD=y |
384 | # CONFIG_MTD_DEBUG is not set | ||
385 | CONFIG_MTD_CONCAT=y | ||
386 | CONFIG_MTD_PARTITIONS=y | ||
387 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
388 | CONFIG_MTD_CMDLINE_PARTS=y | ||
389 | # CONFIG_MTD_AR7_PARTS is not set | ||
390 | |||
391 | # | ||
392 | # User Modules And Translation Layers | ||
393 | # | ||
394 | CONFIG_MTD_CHAR=y | ||
395 | CONFIG_MTD_BLKDEVS=y | ||
396 | CONFIG_MTD_BLOCK=y | ||
397 | # CONFIG_FTL is not set | ||
398 | # CONFIG_NFTL is not set | ||
399 | # CONFIG_INFTL is not set | ||
400 | # CONFIG_RFD_FTL is not set | ||
401 | # CONFIG_SSFDC is not set | ||
402 | # CONFIG_MTD_OOPS is not set | ||
403 | |||
404 | # | ||
405 | # RAM/ROM/Flash chip drivers | ||
406 | # | ||
407 | CONFIG_MTD_CFI=y | ||
408 | # CONFIG_MTD_JEDECPROBE is not set | ||
409 | CONFIG_MTD_GEN_PROBE=y | ||
410 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
411 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
412 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
413 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
414 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
415 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
416 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
417 | CONFIG_MTD_CFI_I1=y | ||
418 | CONFIG_MTD_CFI_I2=y | ||
419 | # CONFIG_MTD_CFI_I4 is not set | ||
420 | # CONFIG_MTD_CFI_I8 is not set | ||
421 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
422 | CONFIG_MTD_CFI_AMDSTD=y | ||
423 | # CONFIG_MTD_CFI_STAA is not set | ||
424 | CONFIG_MTD_CFI_UTIL=y | ||
425 | # CONFIG_MTD_RAM is not set | ||
426 | # CONFIG_MTD_ROM is not set | ||
427 | # CONFIG_MTD_ABSENT is not set | ||
428 | |||
429 | # | ||
430 | # Mapping drivers for chip access | ||
431 | # | ||
432 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
433 | CONFIG_MTD_PHYSMAP=y | ||
434 | CONFIG_MTD_PHYSMAP_START=0xffffffff | ||
435 | CONFIG_MTD_PHYSMAP_LEN=0 | ||
436 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
437 | # CONFIG_MTD_PLATRAM is not set | ||
438 | |||
439 | # | ||
440 | # Self-contained MTD device drivers | ||
441 | # | ||
442 | # CONFIG_MTD_SLRAM is not set | ||
443 | # CONFIG_MTD_PHRAM is not set | ||
444 | # CONFIG_MTD_MTDRAM is not set | ||
445 | # CONFIG_MTD_BLOCK2MTD is not set | ||
446 | |||
447 | # | ||
448 | # Disk-On-Chip Device Drivers | ||
449 | # | ||
450 | # CONFIG_MTD_DOC2000 is not set | ||
451 | # CONFIG_MTD_DOC2001 is not set | ||
452 | # CONFIG_MTD_DOC2001PLUS is not set | ||
453 | CONFIG_MTD_NAND=y | ||
454 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
455 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
456 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
457 | CONFIG_MTD_NAND_IDS=y | ||
458 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
459 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
460 | CONFIG_MTD_NAND_PLATFORM=y | ||
461 | # CONFIG_MTD_ONENAND is not set | ||
462 | |||
463 | # | ||
464 | # UBI - Unsorted block images | ||
465 | # | ||
466 | # CONFIG_MTD_UBI is not set | ||
380 | # CONFIG_PARPORT is not set | 467 | # CONFIG_PARPORT is not set |
381 | CONFIG_BLK_DEV=y | 468 | CONFIG_BLK_DEV=y |
382 | # CONFIG_BLK_DEV_COW_COMMON is not set | 469 | # CONFIG_BLK_DEV_COW_COMMON is not set |
@@ -385,11 +472,13 @@ CONFIG_BLK_DEV=y | |||
385 | CONFIG_BLK_DEV_RAM=y | 472 | CONFIG_BLK_DEV_RAM=y |
386 | CONFIG_BLK_DEV_RAM_COUNT=16 | 473 | CONFIG_BLK_DEV_RAM_COUNT=16 |
387 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 474 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
388 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 475 | # CONFIG_BLK_DEV_XIP is not set |
389 | # CONFIG_CDROM_PKTCDVD is not set | 476 | # CONFIG_CDROM_PKTCDVD is not set |
390 | # CONFIG_ATA_OVER_ETH is not set | 477 | # CONFIG_ATA_OVER_ETH is not set |
391 | CONFIG_MISC_DEVICES=y | 478 | CONFIG_MISC_DEVICES=y |
392 | # CONFIG_EEPROM_93CX6 is not set | 479 | # CONFIG_EEPROM_93CX6 is not set |
480 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
481 | CONFIG_HAVE_IDE=y | ||
393 | # CONFIG_IDE is not set | 482 | # CONFIG_IDE is not set |
394 | 483 | ||
395 | # | 484 | # |
@@ -461,6 +550,7 @@ CONFIG_SMC91X=y | |||
461 | # | 550 | # |
462 | # CONFIG_WLAN_PRE80211 is not set | 551 | # CONFIG_WLAN_PRE80211 is not set |
463 | # CONFIG_WLAN_80211 is not set | 552 | # CONFIG_WLAN_80211 is not set |
553 | # CONFIG_IWLWIFI_LEDS is not set | ||
464 | # CONFIG_WAN is not set | 554 | # CONFIG_WAN is not set |
465 | # CONFIG_PPP is not set | 555 | # CONFIG_PPP is not set |
466 | # CONFIG_SLIP is not set | 556 | # CONFIG_SLIP is not set |
@@ -482,13 +572,20 @@ CONFIG_INPUT=y | |||
482 | # | 572 | # |
483 | # CONFIG_INPUT_MOUSEDEV is not set | 573 | # CONFIG_INPUT_MOUSEDEV is not set |
484 | # CONFIG_INPUT_JOYDEV is not set | 574 | # CONFIG_INPUT_JOYDEV is not set |
485 | # CONFIG_INPUT_EVDEV is not set | 575 | CONFIG_INPUT_EVDEV=y |
486 | # CONFIG_INPUT_EVBUG is not set | 576 | # CONFIG_INPUT_EVBUG is not set |
487 | 577 | ||
488 | # | 578 | # |
489 | # Input Device Drivers | 579 | # Input Device Drivers |
490 | # | 580 | # |
491 | # CONFIG_INPUT_KEYBOARD is not set | 581 | CONFIG_INPUT_KEYBOARD=y |
582 | # CONFIG_KEYBOARD_ATKBD is not set | ||
583 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
584 | # CONFIG_KEYBOARD_LKKBD is not set | ||
585 | # CONFIG_KEYBOARD_XTKBD is not set | ||
586 | # CONFIG_KEYBOARD_NEWTON is not set | ||
587 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
588 | CONFIG_KEYBOARD_SH_KEYSC=y | ||
492 | # CONFIG_INPUT_MOUSE is not set | 589 | # CONFIG_INPUT_MOUSE is not set |
493 | # CONFIG_INPUT_JOYSTICK is not set | 590 | # CONFIG_INPUT_JOYSTICK is not set |
494 | # CONFIG_INPUT_TABLET is not set | 591 | # CONFIG_INPUT_TABLET is not set |
@@ -508,6 +605,7 @@ CONFIG_VT=y | |||
508 | CONFIG_VT_CONSOLE=y | 605 | CONFIG_VT_CONSOLE=y |
509 | CONFIG_HW_CONSOLE=y | 606 | CONFIG_HW_CONSOLE=y |
510 | CONFIG_VT_HW_CONSOLE_BINDING=y | 607 | CONFIG_VT_HW_CONSOLE_BINDING=y |
608 | CONFIG_DEVKMEM=y | ||
511 | # CONFIG_SERIAL_NONSTANDARD is not set | 609 | # CONFIG_SERIAL_NONSTANDARD is not set |
512 | 610 | ||
513 | # | 611 | # |
@@ -531,16 +629,40 @@ CONFIG_HW_RANDOM=y | |||
531 | # CONFIG_R3964 is not set | 629 | # CONFIG_R3964 is not set |
532 | # CONFIG_RAW_DRIVER is not set | 630 | # CONFIG_RAW_DRIVER is not set |
533 | # CONFIG_TCG_TPM is not set | 631 | # CONFIG_TCG_TPM is not set |
534 | # CONFIG_I2C is not set | 632 | CONFIG_I2C=y |
535 | 633 | CONFIG_I2C_BOARDINFO=y | |
536 | # | 634 | # CONFIG_I2C_CHARDEV is not set |
537 | # SPI support | 635 | |
538 | # | 636 | # |
637 | # I2C Hardware Bus support | ||
638 | # | ||
639 | # CONFIG_I2C_OCORES is not set | ||
640 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
641 | # CONFIG_I2C_SIMTEC is not set | ||
642 | # CONFIG_I2C_TAOS_EVM is not set | ||
643 | # CONFIG_I2C_STUB is not set | ||
644 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
645 | CONFIG_I2C_SH_MOBILE=y | ||
646 | |||
647 | # | ||
648 | # Miscellaneous I2C Chip support | ||
649 | # | ||
650 | # CONFIG_DS1682 is not set | ||
651 | # CONFIG_SENSORS_EEPROM is not set | ||
652 | # CONFIG_SENSORS_PCF8574 is not set | ||
653 | # CONFIG_PCF8575 is not set | ||
654 | # CONFIG_SENSORS_PCF8591 is not set | ||
655 | # CONFIG_SENSORS_MAX6875 is not set | ||
656 | # CONFIG_SENSORS_TSL2550 is not set | ||
657 | # CONFIG_I2C_DEBUG_CORE is not set | ||
658 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
659 | # CONFIG_I2C_DEBUG_BUS is not set | ||
660 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
539 | # CONFIG_SPI is not set | 661 | # CONFIG_SPI is not set |
540 | # CONFIG_SPI_MASTER is not set | ||
541 | # CONFIG_W1 is not set | 662 | # CONFIG_W1 is not set |
542 | # CONFIG_POWER_SUPPLY is not set | 663 | # CONFIG_POWER_SUPPLY is not set |
543 | # CONFIG_HWMON is not set | 664 | # CONFIG_HWMON is not set |
665 | # CONFIG_THERMAL is not set | ||
544 | # CONFIG_WATCHDOG is not set | 666 | # CONFIG_WATCHDOG is not set |
545 | 667 | ||
546 | # | 668 | # |
@@ -553,12 +675,22 @@ CONFIG_SSB_POSSIBLE=y | |||
553 | # Multifunction device drivers | 675 | # Multifunction device drivers |
554 | # | 676 | # |
555 | # CONFIG_MFD_SM501 is not set | 677 | # CONFIG_MFD_SM501 is not set |
678 | # CONFIG_HTC_PASIC3 is not set | ||
556 | 679 | ||
557 | # | 680 | # |
558 | # Multimedia devices | 681 | # Multimedia devices |
559 | # | 682 | # |
683 | |||
684 | # | ||
685 | # Multimedia core support | ||
686 | # | ||
560 | # CONFIG_VIDEO_DEV is not set | 687 | # CONFIG_VIDEO_DEV is not set |
561 | # CONFIG_DVB_CORE is not set | 688 | # CONFIG_DVB_CORE is not set |
689 | # CONFIG_VIDEO_MEDIA is not set | ||
690 | |||
691 | # | ||
692 | # Multimedia drivers | ||
693 | # | ||
562 | # CONFIG_DAB is not set | 694 | # CONFIG_DAB is not set |
563 | 695 | ||
564 | # | 696 | # |
@@ -592,6 +724,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
592 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 724 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
593 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 725 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
594 | # CONFIG_USB is not set | 726 | # CONFIG_USB is not set |
727 | # CONFIG_USB_OTG_WHITELIST is not set | ||
728 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
595 | 729 | ||
596 | # | 730 | # |
597 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 731 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -608,6 +742,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
608 | CONFIG_USB_GADGET_M66592=y | 742 | CONFIG_USB_GADGET_M66592=y |
609 | CONFIG_USB_M66592=y | 743 | CONFIG_USB_M66592=y |
610 | CONFIG_SUPERH_BUILT_IN_M66592=y | 744 | CONFIG_SUPERH_BUILT_IN_M66592=y |
745 | # CONFIG_USB_GADGET_PXA27X is not set | ||
611 | # CONFIG_USB_GADGET_GOKU is not set | 746 | # CONFIG_USB_GADGET_GOKU is not set |
612 | # CONFIG_USB_GADGET_LH7A40X is not set | 747 | # CONFIG_USB_GADGET_LH7A40X is not set |
613 | # CONFIG_USB_GADGET_OMAP is not set | 748 | # CONFIG_USB_GADGET_OMAP is not set |
@@ -623,7 +758,9 @@ CONFIG_USB_G_SERIAL=y | |||
623 | # CONFIG_USB_MIDI_GADGET is not set | 758 | # CONFIG_USB_MIDI_GADGET is not set |
624 | # CONFIG_USB_G_PRINTER is not set | 759 | # CONFIG_USB_G_PRINTER is not set |
625 | # CONFIG_MMC is not set | 760 | # CONFIG_MMC is not set |
761 | # CONFIG_MEMSTICK is not set | ||
626 | # CONFIG_NEW_LEDS is not set | 762 | # CONFIG_NEW_LEDS is not set |
763 | # CONFIG_ACCESSIBILITY is not set | ||
627 | CONFIG_RTC_LIB=y | 764 | CONFIG_RTC_LIB=y |
628 | CONFIG_RTC_CLASS=y | 765 | CONFIG_RTC_CLASS=y |
629 | CONFIG_RTC_HCTOSYS=y | 766 | CONFIG_RTC_HCTOSYS=y |
@@ -640,15 +777,31 @@ CONFIG_RTC_INTF_DEV=y | |||
640 | # CONFIG_RTC_DRV_TEST is not set | 777 | # CONFIG_RTC_DRV_TEST is not set |
641 | 778 | ||
642 | # | 779 | # |
780 | # I2C RTC drivers | ||
781 | # | ||
782 | # CONFIG_RTC_DRV_DS1307 is not set | ||
783 | # CONFIG_RTC_DRV_DS1374 is not set | ||
784 | # CONFIG_RTC_DRV_DS1672 is not set | ||
785 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
786 | CONFIG_RTC_DRV_RS5C372=y | ||
787 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
788 | # CONFIG_RTC_DRV_X1205 is not set | ||
789 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
790 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
791 | # CONFIG_RTC_DRV_M41T80 is not set | ||
792 | # CONFIG_RTC_DRV_S35390A is not set | ||
793 | |||
794 | # | ||
643 | # SPI RTC drivers | 795 | # SPI RTC drivers |
644 | # | 796 | # |
645 | 797 | ||
646 | # | 798 | # |
647 | # Platform RTC drivers | 799 | # Platform RTC drivers |
648 | # | 800 | # |
801 | # CONFIG_RTC_DRV_DS1511 is not set | ||
649 | # CONFIG_RTC_DRV_DS1553 is not set | 802 | # CONFIG_RTC_DRV_DS1553 is not set |
650 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
651 | # CONFIG_RTC_DRV_DS1742 is not set | 803 | # CONFIG_RTC_DRV_DS1742 is not set |
804 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
652 | # CONFIG_RTC_DRV_M48T86 is not set | 805 | # CONFIG_RTC_DRV_M48T86 is not set |
653 | # CONFIG_RTC_DRV_M48T59 is not set | 806 | # CONFIG_RTC_DRV_M48T59 is not set |
654 | # CONFIG_RTC_DRV_V3020 is not set | 807 | # CONFIG_RTC_DRV_V3020 is not set |
@@ -657,10 +810,6 @@ CONFIG_RTC_INTF_DEV=y | |||
657 | # on-CPU RTC drivers | 810 | # on-CPU RTC drivers |
658 | # | 811 | # |
659 | CONFIG_RTC_DRV_SH=y | 812 | CONFIG_RTC_DRV_SH=y |
660 | |||
661 | # | ||
662 | # Userspace I/O | ||
663 | # | ||
664 | # CONFIG_UIO is not set | 813 | # CONFIG_UIO is not set |
665 | 814 | ||
666 | # | 815 | # |
@@ -673,13 +822,10 @@ CONFIG_RTC_DRV_SH=y | |||
673 | # CONFIG_JFS_FS is not set | 822 | # CONFIG_JFS_FS is not set |
674 | # CONFIG_FS_POSIX_ACL is not set | 823 | # CONFIG_FS_POSIX_ACL is not set |
675 | # CONFIG_XFS_FS is not set | 824 | # CONFIG_XFS_FS is not set |
676 | # CONFIG_GFS2_FS is not set | ||
677 | # CONFIG_OCFS2_FS is not set | 825 | # CONFIG_OCFS2_FS is not set |
678 | # CONFIG_MINIX_FS is not set | 826 | # CONFIG_DNOTIFY is not set |
679 | # CONFIG_ROMFS_FS is not set | ||
680 | # CONFIG_INOTIFY is not set | 827 | # CONFIG_INOTIFY is not set |
681 | # CONFIG_QUOTA is not set | 828 | # CONFIG_QUOTA is not set |
682 | # CONFIG_DNOTIFY is not set | ||
683 | # CONFIG_AUTOFS_FS is not set | 829 | # CONFIG_AUTOFS_FS is not set |
684 | # CONFIG_AUTOFS4_FS is not set | 830 | # CONFIG_AUTOFS4_FS is not set |
685 | # CONFIG_FUSE_FS is not set | 831 | # CONFIG_FUSE_FS is not set |
@@ -720,10 +866,13 @@ CONFIG_TMPFS=y | |||
720 | # CONFIG_BEFS_FS is not set | 866 | # CONFIG_BEFS_FS is not set |
721 | # CONFIG_BFS_FS is not set | 867 | # CONFIG_BFS_FS is not set |
722 | # CONFIG_EFS_FS is not set | 868 | # CONFIG_EFS_FS is not set |
869 | # CONFIG_JFFS2_FS is not set | ||
723 | # CONFIG_CRAMFS is not set | 870 | # CONFIG_CRAMFS is not set |
724 | # CONFIG_VXFS_FS is not set | 871 | # CONFIG_VXFS_FS is not set |
872 | # CONFIG_MINIX_FS is not set | ||
725 | # CONFIG_HPFS_FS is not set | 873 | # CONFIG_HPFS_FS is not set |
726 | # CONFIG_QNX4FS_FS is not set | 874 | # CONFIG_QNX4FS_FS is not set |
875 | # CONFIG_ROMFS_FS is not set | ||
727 | # CONFIG_SYSV_FS is not set | 876 | # CONFIG_SYSV_FS is not set |
728 | # CONFIG_UFS_FS is not set | 877 | # CONFIG_UFS_FS is not set |
729 | # CONFIG_NETWORK_FILESYSTEMS is not set | 878 | # CONFIG_NETWORK_FILESYSTEMS is not set |
@@ -743,6 +892,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y | |||
743 | # CONFIG_PRINTK_TIME is not set | 892 | # CONFIG_PRINTK_TIME is not set |
744 | CONFIG_ENABLE_WARN_DEPRECATED=y | 893 | CONFIG_ENABLE_WARN_DEPRECATED=y |
745 | CONFIG_ENABLE_MUST_CHECK=y | 894 | CONFIG_ENABLE_MUST_CHECK=y |
895 | CONFIG_FRAME_WARN=1024 | ||
746 | # CONFIG_MAGIC_SYSRQ is not set | 896 | # CONFIG_MAGIC_SYSRQ is not set |
747 | # CONFIG_UNUSED_SYMBOLS is not set | 897 | # CONFIG_UNUSED_SYMBOLS is not set |
748 | CONFIG_DEBUG_FS=y | 898 | CONFIG_DEBUG_FS=y |
@@ -763,48 +913,77 @@ CONFIG_EARLY_PRINTK=y | |||
763 | # CONFIG_SECURITY is not set | 913 | # CONFIG_SECURITY is not set |
764 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 914 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
765 | CONFIG_CRYPTO=y | 915 | CONFIG_CRYPTO=y |
766 | # CONFIG_CRYPTO_SEQIV is not set | 916 | |
917 | # | ||
918 | # Crypto core or helper | ||
919 | # | ||
767 | # CONFIG_CRYPTO_MANAGER is not set | 920 | # CONFIG_CRYPTO_MANAGER is not set |
921 | # CONFIG_CRYPTO_GF128MUL is not set | ||
922 | # CONFIG_CRYPTO_NULL is not set | ||
923 | # CONFIG_CRYPTO_CRYPTD is not set | ||
924 | # CONFIG_CRYPTO_AUTHENC is not set | ||
925 | # CONFIG_CRYPTO_TEST is not set | ||
926 | |||
927 | # | ||
928 | # Authenticated Encryption with Associated Data | ||
929 | # | ||
930 | # CONFIG_CRYPTO_CCM is not set | ||
931 | # CONFIG_CRYPTO_GCM is not set | ||
932 | # CONFIG_CRYPTO_SEQIV is not set | ||
933 | |||
934 | # | ||
935 | # Block modes | ||
936 | # | ||
937 | # CONFIG_CRYPTO_CBC is not set | ||
938 | # CONFIG_CRYPTO_CTR is not set | ||
939 | # CONFIG_CRYPTO_CTS is not set | ||
940 | # CONFIG_CRYPTO_ECB is not set | ||
941 | # CONFIG_CRYPTO_LRW is not set | ||
942 | # CONFIG_CRYPTO_PCBC is not set | ||
943 | # CONFIG_CRYPTO_XTS is not set | ||
944 | |||
945 | # | ||
946 | # Hash modes | ||
947 | # | ||
768 | # CONFIG_CRYPTO_HMAC is not set | 948 | # CONFIG_CRYPTO_HMAC is not set |
769 | # CONFIG_CRYPTO_XCBC is not set | 949 | # CONFIG_CRYPTO_XCBC is not set |
770 | # CONFIG_CRYPTO_NULL is not set | 950 | |
951 | # | ||
952 | # Digest | ||
953 | # | ||
954 | # CONFIG_CRYPTO_CRC32C is not set | ||
771 | # CONFIG_CRYPTO_MD4 is not set | 955 | # CONFIG_CRYPTO_MD4 is not set |
772 | # CONFIG_CRYPTO_MD5 is not set | 956 | # CONFIG_CRYPTO_MD5 is not set |
957 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
773 | # CONFIG_CRYPTO_SHA1 is not set | 958 | # CONFIG_CRYPTO_SHA1 is not set |
774 | # CONFIG_CRYPTO_SHA256 is not set | 959 | # CONFIG_CRYPTO_SHA256 is not set |
775 | # CONFIG_CRYPTO_SHA512 is not set | 960 | # CONFIG_CRYPTO_SHA512 is not set |
776 | # CONFIG_CRYPTO_WP512 is not set | ||
777 | # CONFIG_CRYPTO_TGR192 is not set | 961 | # CONFIG_CRYPTO_TGR192 is not set |
778 | # CONFIG_CRYPTO_GF128MUL is not set | 962 | # CONFIG_CRYPTO_WP512 is not set |
779 | # CONFIG_CRYPTO_ECB is not set | 963 | |
780 | # CONFIG_CRYPTO_CBC is not set | 964 | # |
781 | # CONFIG_CRYPTO_PCBC is not set | 965 | # Ciphers |
782 | # CONFIG_CRYPTO_LRW is not set | 966 | # |
783 | # CONFIG_CRYPTO_XTS is not set | ||
784 | # CONFIG_CRYPTO_CTR is not set | ||
785 | # CONFIG_CRYPTO_GCM is not set | ||
786 | # CONFIG_CRYPTO_CCM is not set | ||
787 | # CONFIG_CRYPTO_CRYPTD is not set | ||
788 | # CONFIG_CRYPTO_DES is not set | ||
789 | # CONFIG_CRYPTO_FCRYPT is not set | ||
790 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
791 | # CONFIG_CRYPTO_TWOFISH is not set | ||
792 | # CONFIG_CRYPTO_SERPENT is not set | ||
793 | # CONFIG_CRYPTO_AES is not set | 967 | # CONFIG_CRYPTO_AES is not set |
968 | # CONFIG_CRYPTO_ANUBIS is not set | ||
969 | # CONFIG_CRYPTO_ARC4 is not set | ||
970 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
971 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
794 | # CONFIG_CRYPTO_CAST5 is not set | 972 | # CONFIG_CRYPTO_CAST5 is not set |
795 | # CONFIG_CRYPTO_CAST6 is not set | 973 | # CONFIG_CRYPTO_CAST6 is not set |
796 | # CONFIG_CRYPTO_TEA is not set | 974 | # CONFIG_CRYPTO_DES is not set |
797 | # CONFIG_CRYPTO_ARC4 is not set | 975 | # CONFIG_CRYPTO_FCRYPT is not set |
798 | # CONFIG_CRYPTO_KHAZAD is not set | 976 | # CONFIG_CRYPTO_KHAZAD is not set |
799 | # CONFIG_CRYPTO_ANUBIS is not set | ||
800 | # CONFIG_CRYPTO_SEED is not set | ||
801 | # CONFIG_CRYPTO_SALSA20 is not set | 977 | # CONFIG_CRYPTO_SALSA20 is not set |
978 | # CONFIG_CRYPTO_SEED is not set | ||
979 | # CONFIG_CRYPTO_SERPENT is not set | ||
980 | # CONFIG_CRYPTO_TEA is not set | ||
981 | # CONFIG_CRYPTO_TWOFISH is not set | ||
982 | |||
983 | # | ||
984 | # Compression | ||
985 | # | ||
802 | # CONFIG_CRYPTO_DEFLATE is not set | 986 | # CONFIG_CRYPTO_DEFLATE is not set |
803 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
804 | # CONFIG_CRYPTO_CRC32C is not set | ||
805 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
806 | # CONFIG_CRYPTO_TEST is not set | ||
807 | # CONFIG_CRYPTO_AUTHENC is not set | ||
808 | # CONFIG_CRYPTO_LZO is not set | 987 | # CONFIG_CRYPTO_LZO is not set |
809 | CONFIG_CRYPTO_HW=y | 988 | CONFIG_CRYPTO_HW=y |
810 | 989 | ||
@@ -812,6 +991,7 @@ CONFIG_CRYPTO_HW=y | |||
812 | # Library routines | 991 | # Library routines |
813 | # | 992 | # |
814 | CONFIG_BITREVERSE=y | 993 | CONFIG_BITREVERSE=y |
994 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
815 | # CONFIG_CRC_CCITT is not set | 995 | # CONFIG_CRC_CCITT is not set |
816 | # CONFIG_CRC16 is not set | 996 | # CONFIG_CRC16 is not set |
817 | # CONFIG_CRC_ITU_T is not set | 997 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig new file mode 100644 index 000000000000..a0ebd439cbd2 --- /dev/null +++ b/arch/sh/configs/rsk7203_defconfig | |||
@@ -0,0 +1,841 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.26-rc4 | ||
4 | # Tue Jun 3 13:02:42 2008 | ||
5 | # | ||
6 | CONFIG_SUPERH=y | ||
7 | CONFIG_SUPERH32=y | ||
8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
9 | CONFIG_GENERIC_BUG=y | ||
10 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
12 | CONFIG_GENERIC_HARDIRQS=y | ||
13 | CONFIG_GENERIC_IRQ_PROBE=y | ||
14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
15 | # CONFIG_GENERIC_TIME is not set | ||
16 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
17 | CONFIG_STACKTRACE_SUPPORT=y | ||
18 | CONFIG_LOCKDEP_SUPPORT=y | ||
19 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
21 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
22 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
24 | |||
25 | # | ||
26 | # General setup | ||
27 | # | ||
28 | CONFIG_EXPERIMENTAL=y | ||
29 | CONFIG_BROKEN_ON_SMP=y | ||
30 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
31 | CONFIG_LOCALVERSION="" | ||
32 | # CONFIG_LOCALVERSION_AUTO is not set | ||
33 | CONFIG_SYSVIPC=y | ||
34 | CONFIG_SYSVIPC_SYSCTL=y | ||
35 | CONFIG_POSIX_MQUEUE=y | ||
36 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
37 | # CONFIG_TASKSTATS is not set | ||
38 | # CONFIG_AUDIT is not set | ||
39 | # CONFIG_IKCONFIG is not set | ||
40 | CONFIG_LOG_BUF_SHIFT=14 | ||
41 | # CONFIG_CGROUPS is not set | ||
42 | CONFIG_GROUP_SCHED=y | ||
43 | CONFIG_FAIR_GROUP_SCHED=y | ||
44 | # CONFIG_RT_GROUP_SCHED is not set | ||
45 | CONFIG_USER_SCHED=y | ||
46 | # CONFIG_CGROUP_SCHED is not set | ||
47 | CONFIG_SYSFS_DEPRECATED=y | ||
48 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
49 | # CONFIG_RELAY is not set | ||
50 | # CONFIG_NAMESPACES is not set | ||
51 | CONFIG_BLK_DEV_INITRD=y | ||
52 | CONFIG_INITRAMFS_SOURCE="" | ||
53 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
54 | CONFIG_SYSCTL=y | ||
55 | CONFIG_EMBEDDED=y | ||
56 | CONFIG_UID16=y | ||
57 | CONFIG_SYSCTL_SYSCALL=y | ||
58 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
59 | CONFIG_KALLSYMS=y | ||
60 | CONFIG_KALLSYMS_ALL=y | ||
61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
62 | CONFIG_HOTPLUG=y | ||
63 | CONFIG_PRINTK=y | ||
64 | CONFIG_BUG=y | ||
65 | CONFIG_ELF_CORE=y | ||
66 | CONFIG_COMPAT_BRK=y | ||
67 | CONFIG_BASE_FULL=y | ||
68 | CONFIG_FUTEX=y | ||
69 | CONFIG_ANON_INODES=y | ||
70 | CONFIG_EPOLL=y | ||
71 | CONFIG_SIGNALFD=y | ||
72 | CONFIG_TIMERFD=y | ||
73 | CONFIG_EVENTFD=y | ||
74 | CONFIG_VM_EVENT_COUNTERS=y | ||
75 | CONFIG_SLAB=y | ||
76 | # CONFIG_SLUB is not set | ||
77 | # CONFIG_SLOB is not set | ||
78 | CONFIG_PROFILING=y | ||
79 | # CONFIG_MARKERS is not set | ||
80 | CONFIG_OPROFILE=y | ||
81 | CONFIG_HAVE_OPROFILE=y | ||
82 | # CONFIG_HAVE_KPROBES is not set | ||
83 | # CONFIG_HAVE_KRETPROBES is not set | ||
84 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
85 | CONFIG_SLABINFO=y | ||
86 | CONFIG_RT_MUTEXES=y | ||
87 | CONFIG_TINY_SHMEM=y | ||
88 | CONFIG_BASE_SMALL=0 | ||
89 | # CONFIG_MODULES is not set | ||
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | # CONFIG_BLK_DEV_BSG is not set | ||
95 | |||
96 | # | ||
97 | # IO Schedulers | ||
98 | # | ||
99 | CONFIG_IOSCHED_NOOP=y | ||
100 | # CONFIG_IOSCHED_AS is not set | ||
101 | # CONFIG_IOSCHED_DEADLINE is not set | ||
102 | # CONFIG_IOSCHED_CFQ is not set | ||
103 | # CONFIG_DEFAULT_AS is not set | ||
104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
105 | # CONFIG_DEFAULT_CFQ is not set | ||
106 | CONFIG_DEFAULT_NOOP=y | ||
107 | CONFIG_DEFAULT_IOSCHED="noop" | ||
108 | CONFIG_CLASSIC_RCU=y | ||
109 | |||
110 | # | ||
111 | # System type | ||
112 | # | ||
113 | CONFIG_CPU_SH2=y | ||
114 | CONFIG_CPU_SH2A=y | ||
115 | # CONFIG_CPU_SUBTYPE_SH7619 is not set | ||
116 | CONFIG_CPU_SUBTYPE_SH7203=y | ||
117 | # CONFIG_CPU_SUBTYPE_SH7206 is not set | ||
118 | # CONFIG_CPU_SUBTYPE_SH7263 is not set | ||
119 | # CONFIG_CPU_SUBTYPE_MXG is not set | ||
120 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | ||
121 | # CONFIG_CPU_SUBTYPE_SH7706 is not set | ||
122 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | ||
123 | # CONFIG_CPU_SUBTYPE_SH7708 is not set | ||
124 | # CONFIG_CPU_SUBTYPE_SH7709 is not set | ||
125 | # CONFIG_CPU_SUBTYPE_SH7710 is not set | ||
126 | # CONFIG_CPU_SUBTYPE_SH7712 is not set | ||
127 | # CONFIG_CPU_SUBTYPE_SH7720 is not set | ||
128 | # CONFIG_CPU_SUBTYPE_SH7721 is not set | ||
129 | # CONFIG_CPU_SUBTYPE_SH7750 is not set | ||
130 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | ||
131 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | ||
132 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | ||
133 | # CONFIG_CPU_SUBTYPE_SH7751 is not set | ||
134 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | ||
135 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | ||
136 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | ||
137 | # CONFIG_CPU_SUBTYPE_SH7723 is not set | ||
138 | # CONFIG_CPU_SUBTYPE_SH7763 is not set | ||
139 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | ||
140 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | ||
141 | # CONFIG_CPU_SUBTYPE_SH7785 is not set | ||
142 | # CONFIG_CPU_SUBTYPE_SHX3 is not set | ||
143 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | ||
144 | # CONFIG_CPU_SUBTYPE_SH7722 is not set | ||
145 | # CONFIG_CPU_SUBTYPE_SH7366 is not set | ||
146 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set | ||
147 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set | ||
148 | |||
149 | # | ||
150 | # Memory management options | ||
151 | # | ||
152 | CONFIG_QUICKLIST=y | ||
153 | CONFIG_PAGE_OFFSET=0x00000000 | ||
154 | CONFIG_MEMORY_START=0x0c000000 | ||
155 | CONFIG_MEMORY_SIZE=0x01000000 | ||
156 | CONFIG_29BIT=y | ||
157 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
158 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
159 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | ||
160 | CONFIG_MAX_ACTIVE_REGIONS=1 | ||
161 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
162 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
163 | CONFIG_PAGE_SIZE_4KB=y | ||
164 | # CONFIG_PAGE_SIZE_8KB is not set | ||
165 | # CONFIG_PAGE_SIZE_64KB is not set | ||
166 | CONFIG_SELECT_MEMORY_MODEL=y | ||
167 | CONFIG_FLATMEM_MANUAL=y | ||
168 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
169 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
170 | CONFIG_FLATMEM=y | ||
171 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
172 | CONFIG_SPARSEMEM_STATIC=y | ||
173 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
174 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
175 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
176 | # CONFIG_RESOURCES_64BIT is not set | ||
177 | CONFIG_ZONE_DMA_FLAG=0 | ||
178 | CONFIG_NR_QUICK=2 | ||
179 | |||
180 | # | ||
181 | # Cache configuration | ||
182 | # | ||
183 | # CONFIG_SH_DIRECT_MAPPED is not set | ||
184 | CONFIG_CACHE_WRITEBACK=y | ||
185 | # CONFIG_CACHE_WRITETHROUGH is not set | ||
186 | # CONFIG_CACHE_OFF is not set | ||
187 | |||
188 | # | ||
189 | # Processor features | ||
190 | # | ||
191 | # CONFIG_CPU_LITTLE_ENDIAN is not set | ||
192 | CONFIG_CPU_BIG_ENDIAN=y | ||
193 | CONFIG_SH_FPU=y | ||
194 | CONFIG_CPU_HAS_FPU=y | ||
195 | |||
196 | # | ||
197 | # Board support | ||
198 | # | ||
199 | |||
200 | # | ||
201 | # Timer and clock configuration | ||
202 | # | ||
203 | CONFIG_SH_CMT=y | ||
204 | # CONFIG_SH_MTU2 is not set | ||
205 | CONFIG_SH_TIMER_IRQ=142 | ||
206 | CONFIG_SH_PCLK_FREQ=16670800 | ||
207 | CONFIG_SH_CLK_MD=0 | ||
208 | # CONFIG_TICK_ONESHOT is not set | ||
209 | |||
210 | # | ||
211 | # CPU Frequency scaling | ||
212 | # | ||
213 | CONFIG_CPU_FREQ=y | ||
214 | CONFIG_CPU_FREQ_TABLE=y | ||
215 | # CONFIG_CPU_FREQ_DEBUG is not set | ||
216 | CONFIG_CPU_FREQ_STAT=y | ||
217 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | ||
218 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | ||
219 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
220 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | ||
221 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
222 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
223 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | ||
224 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | ||
225 | # CONFIG_CPU_FREQ_GOV_USERSPACE is not set | ||
226 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set | ||
227 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | ||
228 | CONFIG_SH_CPU_FREQ=y | ||
229 | |||
230 | # | ||
231 | # DMA support | ||
232 | # | ||
233 | |||
234 | # | ||
235 | # Companion Chips | ||
236 | # | ||
237 | |||
238 | # | ||
239 | # Additional SuperH Device Drivers | ||
240 | # | ||
241 | CONFIG_HEARTBEAT=y | ||
242 | # CONFIG_PUSH_SWITCH is not set | ||
243 | |||
244 | # | ||
245 | # Kernel features | ||
246 | # | ||
247 | # CONFIG_HZ_100 is not set | ||
248 | # CONFIG_HZ_250 is not set | ||
249 | # CONFIG_HZ_300 is not set | ||
250 | CONFIG_HZ_1000=y | ||
251 | CONFIG_HZ=1000 | ||
252 | # CONFIG_SCHED_HRTICK is not set | ||
253 | # CONFIG_KEXEC is not set | ||
254 | # CONFIG_CRASH_DUMP is not set | ||
255 | CONFIG_PREEMPT_NONE=y | ||
256 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
257 | # CONFIG_PREEMPT is not set | ||
258 | CONFIG_GUSA=y | ||
259 | |||
260 | # | ||
261 | # Boot options | ||
262 | # | ||
263 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | ||
264 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | ||
265 | CONFIG_CMDLINE_BOOL=y | ||
266 | CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel" | ||
267 | |||
268 | # | ||
269 | # Bus options | ||
270 | # | ||
271 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
272 | # CONFIG_PCCARD is not set | ||
273 | |||
274 | # | ||
275 | # Executable file formats | ||
276 | # | ||
277 | CONFIG_BINFMT_FLAT=y | ||
278 | CONFIG_BINFMT_ZFLAT=y | ||
279 | CONFIG_BINFMT_SHARED_FLAT=y | ||
280 | # CONFIG_BINFMT_MISC is not set | ||
281 | |||
282 | # | ||
283 | # Networking | ||
284 | # | ||
285 | CONFIG_NET=y | ||
286 | |||
287 | # | ||
288 | # Networking options | ||
289 | # | ||
290 | # CONFIG_PACKET is not set | ||
291 | # CONFIG_UNIX is not set | ||
292 | # CONFIG_NET_KEY is not set | ||
293 | CONFIG_INET=y | ||
294 | # CONFIG_IP_MULTICAST is not set | ||
295 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
296 | CONFIG_IP_FIB_HASH=y | ||
297 | CONFIG_IP_PNP=y | ||
298 | CONFIG_IP_PNP_DHCP=y | ||
299 | # CONFIG_IP_PNP_BOOTP is not set | ||
300 | # CONFIG_IP_PNP_RARP is not set | ||
301 | # CONFIG_NET_IPIP is not set | ||
302 | # CONFIG_NET_IPGRE 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 | ||
309 | # CONFIG_INET_TUNNEL is not set | ||
310 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
311 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
312 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
313 | # CONFIG_INET_LRO is not set | ||
314 | # CONFIG_INET_DIAG is not set | ||
315 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
316 | CONFIG_TCP_CONG_CUBIC=y | ||
317 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
318 | # CONFIG_TCP_MD5SIG is not set | ||
319 | # CONFIG_IPV6 is not set | ||
320 | # CONFIG_NETWORK_SECMARK is not set | ||
321 | # CONFIG_NETFILTER is not set | ||
322 | # CONFIG_IP_DCCP is not set | ||
323 | # CONFIG_IP_SCTP is not set | ||
324 | # CONFIG_TIPC is not set | ||
325 | # CONFIG_ATM is not set | ||
326 | # CONFIG_BRIDGE is not set | ||
327 | # CONFIG_VLAN_8021Q is not set | ||
328 | # CONFIG_DECNET is not set | ||
329 | # CONFIG_LLC2 is not set | ||
330 | # CONFIG_IPX is not set | ||
331 | # CONFIG_ATALK is not set | ||
332 | # CONFIG_X25 is not set | ||
333 | # CONFIG_LAPB is not set | ||
334 | # CONFIG_ECONET is not set | ||
335 | # CONFIG_WAN_ROUTER is not set | ||
336 | # CONFIG_NET_SCHED is not set | ||
337 | |||
338 | # | ||
339 | # Network testing | ||
340 | # | ||
341 | # CONFIG_NET_PKTGEN is not set | ||
342 | # CONFIG_HAMRADIO is not set | ||
343 | # CONFIG_CAN is not set | ||
344 | # CONFIG_IRDA is not set | ||
345 | # CONFIG_BT is not set | ||
346 | # CONFIG_AF_RXRPC is not set | ||
347 | |||
348 | # | ||
349 | # Wireless | ||
350 | # | ||
351 | # CONFIG_CFG80211 is not set | ||
352 | # CONFIG_WIRELESS_EXT is not set | ||
353 | # CONFIG_MAC80211 is not set | ||
354 | # CONFIG_IEEE80211 is not set | ||
355 | # CONFIG_RFKILL is not set | ||
356 | # CONFIG_NET_9P is not set | ||
357 | |||
358 | # | ||
359 | # Device Drivers | ||
360 | # | ||
361 | |||
362 | # | ||
363 | # Generic Driver Options | ||
364 | # | ||
365 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
366 | # CONFIG_STANDALONE is not set | ||
367 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
368 | # CONFIG_FW_LOADER is not set | ||
369 | # CONFIG_DEBUG_DRIVER is not set | ||
370 | # CONFIG_DEBUG_DEVRES is not set | ||
371 | # CONFIG_SYS_HYPERVISOR is not set | ||
372 | # CONFIG_CONNECTOR is not set | ||
373 | CONFIG_MTD=y | ||
374 | # CONFIG_MTD_DEBUG is not set | ||
375 | CONFIG_MTD_CONCAT=y | ||
376 | CONFIG_MTD_PARTITIONS=y | ||
377 | CONFIG_MTD_REDBOOT_PARTS=y | ||
378 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
379 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
380 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | ||
381 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
382 | # CONFIG_MTD_AR7_PARTS is not set | ||
383 | |||
384 | # | ||
385 | # User Modules And Translation Layers | ||
386 | # | ||
387 | CONFIG_MTD_CHAR=y | ||
388 | CONFIG_MTD_BLKDEVS=y | ||
389 | CONFIG_MTD_BLOCK=y | ||
390 | # CONFIG_FTL is not set | ||
391 | # CONFIG_NFTL is not set | ||
392 | # CONFIG_INFTL is not set | ||
393 | # CONFIG_RFD_FTL is not set | ||
394 | # CONFIG_SSFDC is not set | ||
395 | # CONFIG_MTD_OOPS is not set | ||
396 | |||
397 | # | ||
398 | # RAM/ROM/Flash chip drivers | ||
399 | # | ||
400 | CONFIG_MTD_CFI=y | ||
401 | # CONFIG_MTD_JEDECPROBE is not set | ||
402 | CONFIG_MTD_GEN_PROBE=y | ||
403 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
404 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
405 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
406 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
407 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
408 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
409 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
410 | CONFIG_MTD_CFI_I1=y | ||
411 | CONFIG_MTD_CFI_I2=y | ||
412 | # CONFIG_MTD_CFI_I4 is not set | ||
413 | # CONFIG_MTD_CFI_I8 is not set | ||
414 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
415 | CONFIG_MTD_CFI_AMDSTD=y | ||
416 | # CONFIG_MTD_CFI_STAA is not set | ||
417 | CONFIG_MTD_CFI_UTIL=y | ||
418 | # CONFIG_MTD_RAM is not set | ||
419 | # CONFIG_MTD_ROM is not set | ||
420 | # CONFIG_MTD_ABSENT is not set | ||
421 | |||
422 | # | ||
423 | # Mapping drivers for chip access | ||
424 | # | ||
425 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
426 | CONFIG_MTD_PHYSMAP=y | ||
427 | CONFIG_MTD_PHYSMAP_START=0x20000000 | ||
428 | CONFIG_MTD_PHYSMAP_LEN=0x01000000 | ||
429 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | ||
430 | # CONFIG_MTD_UCLINUX is not set | ||
431 | # CONFIG_MTD_PLATRAM is not set | ||
432 | |||
433 | # | ||
434 | # Self-contained MTD device drivers | ||
435 | # | ||
436 | # CONFIG_MTD_SLRAM is not set | ||
437 | # CONFIG_MTD_PHRAM is not set | ||
438 | # CONFIG_MTD_MTDRAM is not set | ||
439 | # CONFIG_MTD_BLOCK2MTD is not set | ||
440 | |||
441 | # | ||
442 | # Disk-On-Chip Device Drivers | ||
443 | # | ||
444 | # CONFIG_MTD_DOC2000 is not set | ||
445 | # CONFIG_MTD_DOC2001 is not set | ||
446 | # CONFIG_MTD_DOC2001PLUS is not set | ||
447 | # CONFIG_MTD_NAND is not set | ||
448 | # CONFIG_MTD_ONENAND is not set | ||
449 | |||
450 | # | ||
451 | # UBI - Unsorted block images | ||
452 | # | ||
453 | # CONFIG_MTD_UBI is not set | ||
454 | # CONFIG_PARPORT is not set | ||
455 | CONFIG_BLK_DEV=y | ||
456 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
457 | # CONFIG_BLK_DEV_LOOP is not set | ||
458 | # CONFIG_BLK_DEV_NBD is not set | ||
459 | # CONFIG_BLK_DEV_RAM is not set | ||
460 | # CONFIG_CDROM_PKTCDVD is not set | ||
461 | # CONFIG_ATA_OVER_ETH is not set | ||
462 | CONFIG_MISC_DEVICES=y | ||
463 | # CONFIG_EEPROM_93CX6 is not set | ||
464 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
465 | CONFIG_HAVE_IDE=y | ||
466 | # CONFIG_IDE is not set | ||
467 | |||
468 | # | ||
469 | # SCSI device support | ||
470 | # | ||
471 | # CONFIG_RAID_ATTRS is not set | ||
472 | # CONFIG_SCSI is not set | ||
473 | # CONFIG_SCSI_DMA is not set | ||
474 | # CONFIG_SCSI_NETLINK is not set | ||
475 | # CONFIG_ATA is not set | ||
476 | # CONFIG_MD is not set | ||
477 | CONFIG_NETDEVICES=y | ||
478 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
479 | # CONFIG_DUMMY is not set | ||
480 | # CONFIG_BONDING is not set | ||
481 | # CONFIG_MACVLAN is not set | ||
482 | # CONFIG_EQUALIZER is not set | ||
483 | # CONFIG_TUN is not set | ||
484 | # CONFIG_VETH is not set | ||
485 | # CONFIG_PHYLIB is not set | ||
486 | CONFIG_NET_ETHERNET=y | ||
487 | CONFIG_MII=y | ||
488 | # CONFIG_AX88796 is not set | ||
489 | # CONFIG_STNIC is not set | ||
490 | CONFIG_SMC91X=y | ||
491 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
492 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
493 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
494 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
495 | # CONFIG_B44 is not set | ||
496 | CONFIG_NETDEV_1000=y | ||
497 | # CONFIG_E1000E_ENABLED is not set | ||
498 | CONFIG_NETDEV_10000=y | ||
499 | |||
500 | # | ||
501 | # Wireless LAN | ||
502 | # | ||
503 | # CONFIG_WLAN_PRE80211 is not set | ||
504 | # CONFIG_WLAN_80211 is not set | ||
505 | # CONFIG_IWLWIFI_LEDS is not set | ||
506 | # CONFIG_WAN is not set | ||
507 | # CONFIG_PPP is not set | ||
508 | # CONFIG_SLIP is not set | ||
509 | # CONFIG_NETCONSOLE is not set | ||
510 | # CONFIG_NETPOLL is not set | ||
511 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
512 | # CONFIG_ISDN is not set | ||
513 | # CONFIG_PHONE is not set | ||
514 | |||
515 | # | ||
516 | # Input device support | ||
517 | # | ||
518 | CONFIG_INPUT=y | ||
519 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
520 | # CONFIG_INPUT_POLLDEV is not set | ||
521 | |||
522 | # | ||
523 | # Userland interfaces | ||
524 | # | ||
525 | # CONFIG_INPUT_MOUSEDEV is not set | ||
526 | # CONFIG_INPUT_JOYDEV is not set | ||
527 | # CONFIG_INPUT_EVDEV is not set | ||
528 | # CONFIG_INPUT_EVBUG is not set | ||
529 | |||
530 | # | ||
531 | # Input Device Drivers | ||
532 | # | ||
533 | # CONFIG_INPUT_KEYBOARD is not set | ||
534 | # CONFIG_INPUT_MOUSE is not set | ||
535 | # CONFIG_INPUT_JOYSTICK is not set | ||
536 | # CONFIG_INPUT_TABLET is not set | ||
537 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
538 | # CONFIG_INPUT_MISC is not set | ||
539 | |||
540 | # | ||
541 | # Hardware I/O ports | ||
542 | # | ||
543 | # CONFIG_SERIO is not set | ||
544 | # CONFIG_GAMEPORT is not set | ||
545 | |||
546 | # | ||
547 | # Character devices | ||
548 | # | ||
549 | # CONFIG_VT is not set | ||
550 | CONFIG_DEVKMEM=y | ||
551 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
552 | |||
553 | # | ||
554 | # Serial drivers | ||
555 | # | ||
556 | # CONFIG_SERIAL_8250 is not set | ||
557 | |||
558 | # | ||
559 | # Non-8250 serial port support | ||
560 | # | ||
561 | CONFIG_SERIAL_SH_SCI=y | ||
562 | CONFIG_SERIAL_SH_SCI_NR_UARTS=4 | ||
563 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
564 | CONFIG_SERIAL_CORE=y | ||
565 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
566 | # CONFIG_UNIX98_PTYS is not set | ||
567 | # CONFIG_LEGACY_PTYS is not set | ||
568 | # CONFIG_IPMI_HANDLER is not set | ||
569 | # CONFIG_HW_RANDOM is not set | ||
570 | # CONFIG_R3964 is not set | ||
571 | # CONFIG_RAW_DRIVER is not set | ||
572 | # CONFIG_TCG_TPM is not set | ||
573 | # CONFIG_I2C is not set | ||
574 | # CONFIG_SPI is not set | ||
575 | # CONFIG_W1 is not set | ||
576 | # CONFIG_POWER_SUPPLY is not set | ||
577 | # CONFIG_HWMON is not set | ||
578 | CONFIG_THERMAL=y | ||
579 | # CONFIG_WATCHDOG is not set | ||
580 | |||
581 | # | ||
582 | # Sonics Silicon Backplane | ||
583 | # | ||
584 | CONFIG_SSB_POSSIBLE=y | ||
585 | # CONFIG_SSB is not set | ||
586 | |||
587 | # | ||
588 | # Multifunction device drivers | ||
589 | # | ||
590 | # CONFIG_MFD_SM501 is not set | ||
591 | # CONFIG_HTC_PASIC3 is not set | ||
592 | |||
593 | # | ||
594 | # Multimedia devices | ||
595 | # | ||
596 | |||
597 | # | ||
598 | # Multimedia core support | ||
599 | # | ||
600 | # CONFIG_VIDEO_DEV is not set | ||
601 | # CONFIG_DVB_CORE is not set | ||
602 | # CONFIG_VIDEO_MEDIA is not set | ||
603 | |||
604 | # | ||
605 | # Multimedia drivers | ||
606 | # | ||
607 | CONFIG_DAB=y | ||
608 | |||
609 | # | ||
610 | # Graphics support | ||
611 | # | ||
612 | # CONFIG_VGASTATE is not set | ||
613 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
614 | # CONFIG_FB is not set | ||
615 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
616 | |||
617 | # | ||
618 | # Display device support | ||
619 | # | ||
620 | # CONFIG_DISPLAY_SUPPORT is not set | ||
621 | |||
622 | # | ||
623 | # Sound | ||
624 | # | ||
625 | # CONFIG_SOUND is not set | ||
626 | CONFIG_HID_SUPPORT=y | ||
627 | CONFIG_HID=y | ||
628 | # CONFIG_HID_DEBUG is not set | ||
629 | # CONFIG_HIDRAW is not set | ||
630 | CONFIG_USB_SUPPORT=y | ||
631 | CONFIG_USB_ARCH_HAS_HCD=y | ||
632 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
633 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
634 | # CONFIG_USB is not set | ||
635 | # CONFIG_USB_OTG_WHITELIST is not set | ||
636 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
637 | |||
638 | # | ||
639 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
640 | # | ||
641 | # CONFIG_USB_GADGET is not set | ||
642 | # CONFIG_MMC is not set | ||
643 | # CONFIG_MEMSTICK is not set | ||
644 | # CONFIG_NEW_LEDS is not set | ||
645 | # CONFIG_ACCESSIBILITY is not set | ||
646 | CONFIG_RTC_LIB=y | ||
647 | CONFIG_RTC_CLASS=y | ||
648 | CONFIG_RTC_HCTOSYS=y | ||
649 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
650 | # CONFIG_RTC_DEBUG is not set | ||
651 | |||
652 | # | ||
653 | # RTC interfaces | ||
654 | # | ||
655 | CONFIG_RTC_INTF_SYSFS=y | ||
656 | CONFIG_RTC_INTF_PROC=y | ||
657 | CONFIG_RTC_INTF_DEV=y | ||
658 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
659 | # CONFIG_RTC_DRV_TEST is not set | ||
660 | |||
661 | # | ||
662 | # SPI RTC drivers | ||
663 | # | ||
664 | |||
665 | # | ||
666 | # Platform RTC drivers | ||
667 | # | ||
668 | # CONFIG_RTC_DRV_DS1511 is not set | ||
669 | # CONFIG_RTC_DRV_DS1553 is not set | ||
670 | # CONFIG_RTC_DRV_DS1742 is not set | ||
671 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
672 | # CONFIG_RTC_DRV_M48T86 is not set | ||
673 | # CONFIG_RTC_DRV_M48T59 is not set | ||
674 | # CONFIG_RTC_DRV_V3020 is not set | ||
675 | |||
676 | # | ||
677 | # on-CPU RTC drivers | ||
678 | # | ||
679 | CONFIG_RTC_DRV_SH=y | ||
680 | # CONFIG_UIO is not set | ||
681 | |||
682 | # | ||
683 | # File systems | ||
684 | # | ||
685 | # CONFIG_EXT2_FS is not set | ||
686 | # CONFIG_EXT3_FS is not set | ||
687 | # CONFIG_EXT4DEV_FS is not set | ||
688 | # CONFIG_REISERFS_FS is not set | ||
689 | # CONFIG_JFS_FS is not set | ||
690 | # CONFIG_FS_POSIX_ACL is not set | ||
691 | # CONFIG_XFS_FS is not set | ||
692 | # CONFIG_OCFS2_FS is not set | ||
693 | # CONFIG_DNOTIFY is not set | ||
694 | # CONFIG_INOTIFY is not set | ||
695 | # CONFIG_QUOTA is not set | ||
696 | # CONFIG_AUTOFS_FS is not set | ||
697 | # CONFIG_AUTOFS4_FS is not set | ||
698 | # CONFIG_FUSE_FS is not set | ||
699 | |||
700 | # | ||
701 | # CD-ROM/DVD Filesystems | ||
702 | # | ||
703 | # CONFIG_ISO9660_FS is not set | ||
704 | # CONFIG_UDF_FS is not set | ||
705 | |||
706 | # | ||
707 | # DOS/FAT/NT Filesystems | ||
708 | # | ||
709 | # CONFIG_MSDOS_FS is not set | ||
710 | # CONFIG_VFAT_FS is not set | ||
711 | # CONFIG_NTFS_FS is not set | ||
712 | |||
713 | # | ||
714 | # Pseudo filesystems | ||
715 | # | ||
716 | CONFIG_PROC_FS=y | ||
717 | CONFIG_PROC_SYSCTL=y | ||
718 | CONFIG_SYSFS=y | ||
719 | # CONFIG_TMPFS is not set | ||
720 | # CONFIG_HUGETLB_PAGE is not set | ||
721 | # CONFIG_CONFIGFS_FS is not set | ||
722 | |||
723 | # | ||
724 | # Miscellaneous filesystems | ||
725 | # | ||
726 | # CONFIG_ADFS_FS is not set | ||
727 | # CONFIG_AFFS_FS is not set | ||
728 | # CONFIG_HFS_FS is not set | ||
729 | # CONFIG_HFSPLUS_FS is not set | ||
730 | # CONFIG_BEFS_FS is not set | ||
731 | # CONFIG_BFS_FS is not set | ||
732 | # CONFIG_EFS_FS is not set | ||
733 | # CONFIG_JFFS2_FS is not set | ||
734 | # CONFIG_CRAMFS is not set | ||
735 | # CONFIG_VXFS_FS is not set | ||
736 | # CONFIG_MINIX_FS is not set | ||
737 | # CONFIG_HPFS_FS is not set | ||
738 | # CONFIG_QNX4FS_FS is not set | ||
739 | CONFIG_ROMFS_FS=y | ||
740 | # CONFIG_SYSV_FS is not set | ||
741 | # CONFIG_UFS_FS is not set | ||
742 | CONFIG_NETWORK_FILESYSTEMS=y | ||
743 | CONFIG_NFS_FS=y | ||
744 | # CONFIG_NFS_V3 is not set | ||
745 | # CONFIG_NFS_V4 is not set | ||
746 | # CONFIG_NFSD is not set | ||
747 | CONFIG_ROOT_NFS=y | ||
748 | CONFIG_LOCKD=y | ||
749 | CONFIG_NFS_COMMON=y | ||
750 | CONFIG_SUNRPC=y | ||
751 | # CONFIG_SUNRPC_BIND34 is not set | ||
752 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
753 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
754 | # CONFIG_SMB_FS is not set | ||
755 | # CONFIG_CIFS is not set | ||
756 | # CONFIG_NCP_FS is not set | ||
757 | # CONFIG_CODA_FS is not set | ||
758 | # CONFIG_AFS_FS is not set | ||
759 | |||
760 | # | ||
761 | # Partition Types | ||
762 | # | ||
763 | # CONFIG_PARTITION_ADVANCED is not set | ||
764 | CONFIG_MSDOS_PARTITION=y | ||
765 | # CONFIG_NLS is not set | ||
766 | # CONFIG_DLM is not set | ||
767 | |||
768 | # | ||
769 | # Kernel hacking | ||
770 | # | ||
771 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
772 | # CONFIG_PRINTK_TIME is not set | ||
773 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
774 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
775 | CONFIG_FRAME_WARN=1024 | ||
776 | CONFIG_MAGIC_SYSRQ=y | ||
777 | # CONFIG_UNUSED_SYMBOLS is not set | ||
778 | # CONFIG_DEBUG_FS is not set | ||
779 | # CONFIG_HEADERS_CHECK is not set | ||
780 | CONFIG_DEBUG_KERNEL=y | ||
781 | CONFIG_DEBUG_SHIRQ=y | ||
782 | CONFIG_DETECT_SOFTLOCKUP=y | ||
783 | CONFIG_SCHED_DEBUG=y | ||
784 | # CONFIG_SCHEDSTATS is not set | ||
785 | # CONFIG_TIMER_STATS is not set | ||
786 | # CONFIG_DEBUG_OBJECTS is not set | ||
787 | # CONFIG_DEBUG_SLAB is not set | ||
788 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
789 | # CONFIG_RT_MUTEX_TESTER is not set | ||
790 | # CONFIG_DEBUG_SPINLOCK is not set | ||
791 | CONFIG_DEBUG_MUTEXES=y | ||
792 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
793 | # CONFIG_PROVE_LOCKING is not set | ||
794 | # CONFIG_LOCK_STAT is not set | ||
795 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | ||
796 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
797 | # CONFIG_DEBUG_KOBJECT is not set | ||
798 | CONFIG_DEBUG_BUGVERBOSE=y | ||
799 | CONFIG_DEBUG_INFO=y | ||
800 | # CONFIG_DEBUG_VM is not set | ||
801 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
802 | # CONFIG_DEBUG_LIST is not set | ||
803 | # CONFIG_DEBUG_SG is not set | ||
804 | CONFIG_FRAME_POINTER=y | ||
805 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
806 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
807 | # CONFIG_FAULT_INJECTION is not set | ||
808 | # CONFIG_SAMPLES is not set | ||
809 | # CONFIG_SH_STANDARD_BIOS is not set | ||
810 | CONFIG_EARLY_SCIF_CONSOLE=y | ||
811 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xfffe8000 | ||
812 | CONFIG_EARLY_PRINTK=y | ||
813 | CONFIG_DEBUG_BOOTMEM=y | ||
814 | CONFIG_DEBUG_STACKOVERFLOW=y | ||
815 | CONFIG_DEBUG_STACK_USAGE=y | ||
816 | # CONFIG_IRQSTACKS is not set | ||
817 | |||
818 | # | ||
819 | # Security options | ||
820 | # | ||
821 | # CONFIG_KEYS is not set | ||
822 | # CONFIG_SECURITY is not set | ||
823 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
824 | # CONFIG_CRYPTO is not set | ||
825 | |||
826 | # | ||
827 | # Library routines | ||
828 | # | ||
829 | CONFIG_BITREVERSE=y | ||
830 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
831 | # CONFIG_CRC_CCITT is not set | ||
832 | # CONFIG_CRC16 is not set | ||
833 | # CONFIG_CRC_ITU_T is not set | ||
834 | CONFIG_CRC32=y | ||
835 | # CONFIG_CRC7 is not set | ||
836 | # CONFIG_LIBCRC32C is not set | ||
837 | CONFIG_ZLIB_INFLATE=y | ||
838 | CONFIG_PLIST=y | ||
839 | CONFIG_HAS_IOMEM=y | ||
840 | CONFIG_HAS_IOPORT=y | ||
841 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig index 0d0cda908270..6b34baa26eae 100644 --- a/arch/sh/configs/se7206_defconfig +++ b/arch/sh/configs/se7206_defconfig | |||
@@ -1,9 +1,10 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.23-rc4 | 3 | # Linux kernel version: 2.6.26-rc4 |
4 | # Thu Sep 13 16:40:16 2007 | 4 | # Tue Jun 3 20:27:08 2008 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | ||
7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
8 | CONFIG_GENERIC_BUG=y | 9 | CONFIG_GENERIC_BUG=y |
9 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 10 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
@@ -18,6 +19,7 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 20 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
20 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 21 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
22 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
21 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
22 | 24 | ||
23 | # | 25 | # |
@@ -25,47 +27,82 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | |||
25 | # | 27 | # |
26 | CONFIG_EXPERIMENTAL=y | 28 | CONFIG_EXPERIMENTAL=y |
27 | CONFIG_BROKEN_ON_SMP=y | 29 | CONFIG_BROKEN_ON_SMP=y |
30 | CONFIG_LOCK_KERNEL=y | ||
28 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 31 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
29 | CONFIG_LOCALVERSION="" | 32 | CONFIG_LOCALVERSION="" |
30 | # CONFIG_LOCALVERSION_AUTO is not set | 33 | CONFIG_LOCALVERSION_AUTO=y |
31 | # CONFIG_SYSVIPC is not set | 34 | CONFIG_SYSVIPC=y |
32 | # CONFIG_POSIX_MQUEUE is not set | 35 | CONFIG_SYSVIPC_SYSCTL=y |
33 | # CONFIG_BSD_PROCESS_ACCT is not set | 36 | CONFIG_POSIX_MQUEUE=y |
37 | CONFIG_BSD_PROCESS_ACCT=y | ||
38 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
34 | # CONFIG_TASKSTATS is not set | 39 | # CONFIG_TASKSTATS is not set |
35 | # CONFIG_USER_NS is not set | 40 | CONFIG_AUDIT=y |
36 | # CONFIG_AUDIT is not set | 41 | CONFIG_AUDITSYSCALL=y |
37 | # CONFIG_IKCONFIG is not set | 42 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | 43 | CONFIG_LOG_BUF_SHIFT=14 |
39 | CONFIG_SYSFS_DEPRECATED=y | 44 | CONFIG_CGROUPS=y |
40 | # CONFIG_RELAY is not set | 45 | CONFIG_CGROUP_DEBUG=y |
41 | # CONFIG_BLK_DEV_INITRD is not set | 46 | CONFIG_CGROUP_NS=y |
47 | CONFIG_CGROUP_DEVICE=y | ||
48 | # CONFIG_GROUP_SCHED is not set | ||
49 | CONFIG_CGROUP_CPUACCT=y | ||
50 | CONFIG_RESOURCE_COUNTERS=y | ||
51 | CONFIG_MM_OWNER=y | ||
52 | CONFIG_CGROUP_MEM_RES_CTLR=y | ||
53 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
54 | CONFIG_RELAY=y | ||
55 | CONFIG_NAMESPACES=y | ||
56 | CONFIG_UTS_NS=y | ||
57 | CONFIG_IPC_NS=y | ||
58 | CONFIG_USER_NS=y | ||
59 | CONFIG_PID_NS=y | ||
60 | CONFIG_BLK_DEV_INITRD=y | ||
61 | CONFIG_INITRAMFS_SOURCE="" | ||
42 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 62 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
43 | CONFIG_SYSCTL=y | 63 | CONFIG_SYSCTL=y |
44 | CONFIG_EMBEDDED=y | 64 | CONFIG_EMBEDDED=y |
45 | # CONFIG_UID16 is not set | 65 | # CONFIG_UID16 is not set |
46 | # CONFIG_SYSCTL_SYSCALL is not set | 66 | # CONFIG_SYSCTL_SYSCALL is not set |
47 | # CONFIG_KALLSYMS is not set | 67 | CONFIG_KALLSYMS=y |
48 | # CONFIG_HOTPLUG is not set | 68 | CONFIG_KALLSYMS_ALL=y |
69 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
70 | CONFIG_HOTPLUG=y | ||
49 | CONFIG_PRINTK=y | 71 | CONFIG_PRINTK=y |
50 | CONFIG_BUG=y | 72 | CONFIG_BUG=y |
51 | # CONFIG_ELF_CORE is not set | 73 | # CONFIG_ELF_CORE is not set |
52 | # CONFIG_BASE_FULL is not set | 74 | # CONFIG_COMPAT_BRK is not set |
53 | # CONFIG_FUTEX is not set | 75 | CONFIG_BASE_FULL=y |
76 | CONFIG_FUTEX=y | ||
54 | CONFIG_ANON_INODES=y | 77 | CONFIG_ANON_INODES=y |
55 | # CONFIG_EPOLL is not set | 78 | CONFIG_EPOLL=y |
56 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
57 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
58 | CONFIG_EVENTFD=y | 81 | CONFIG_EVENTFD=y |
59 | # CONFIG_VM_EVENT_COUNTERS is not set | 82 | CONFIG_VM_EVENT_COUNTERS=y |
60 | CONFIG_SLUB_DEBUG=y | ||
61 | # CONFIG_SLAB is not set | 83 | # CONFIG_SLAB is not set |
62 | CONFIG_SLUB=y | 84 | # CONFIG_SLUB is not set |
63 | # CONFIG_SLOB is not set | 85 | CONFIG_SLOB=y |
86 | CONFIG_PROFILING=y | ||
87 | # CONFIG_MARKERS is not set | ||
88 | CONFIG_OPROFILE=y | ||
89 | CONFIG_HAVE_OPROFILE=y | ||
90 | # CONFIG_HAVE_KPROBES is not set | ||
91 | # CONFIG_HAVE_KRETPROBES is not set | ||
92 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
93 | CONFIG_RT_MUTEXES=y | ||
64 | CONFIG_TINY_SHMEM=y | 94 | CONFIG_TINY_SHMEM=y |
65 | CONFIG_BASE_SMALL=1 | 95 | CONFIG_BASE_SMALL=0 |
66 | # CONFIG_MODULES is not set | 96 | CONFIG_MODULES=y |
97 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
98 | CONFIG_MODULE_UNLOAD=y | ||
99 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
100 | # CONFIG_MODVERSIONS is not set | ||
101 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
102 | # CONFIG_KMOD is not set | ||
67 | CONFIG_BLOCK=y | 103 | CONFIG_BLOCK=y |
68 | # CONFIG_LBD is not set | 104 | # CONFIG_LBD is not set |
105 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
69 | # CONFIG_LSF is not set | 106 | # CONFIG_LSF is not set |
70 | # CONFIG_BLK_DEV_BSG is not set | 107 | # CONFIG_BLK_DEV_BSG is not set |
71 | 108 | ||
@@ -81,6 +118,7 @@ CONFIG_IOSCHED_NOOP=y | |||
81 | # CONFIG_DEFAULT_CFQ is not set | 118 | # CONFIG_DEFAULT_CFQ is not set |
82 | CONFIG_DEFAULT_NOOP=y | 119 | CONFIG_DEFAULT_NOOP=y |
83 | CONFIG_DEFAULT_IOSCHED="noop" | 120 | CONFIG_DEFAULT_IOSCHED="noop" |
121 | # CONFIG_CLASSIC_RCU is not set | ||
84 | 122 | ||
85 | # | 123 | # |
86 | # System type | 124 | # System type |
@@ -88,7 +126,10 @@ CONFIG_DEFAULT_IOSCHED="noop" | |||
88 | CONFIG_CPU_SH2=y | 126 | CONFIG_CPU_SH2=y |
89 | CONFIG_CPU_SH2A=y | 127 | CONFIG_CPU_SH2A=y |
90 | # CONFIG_CPU_SUBTYPE_SH7619 is not set | 128 | # CONFIG_CPU_SUBTYPE_SH7619 is not set |
129 | # CONFIG_CPU_SUBTYPE_SH7203 is not set | ||
91 | CONFIG_CPU_SUBTYPE_SH7206=y | 130 | CONFIG_CPU_SUBTYPE_SH7206=y |
131 | # CONFIG_CPU_SUBTYPE_SH7263 is not set | ||
132 | # CONFIG_CPU_SUBTYPE_MXG is not set | ||
92 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | 133 | # CONFIG_CPU_SUBTYPE_SH7705 is not set |
93 | # CONFIG_CPU_SUBTYPE_SH7706 is not set | 134 | # CONFIG_CPU_SUBTYPE_SH7706 is not set |
94 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | 135 | # CONFIG_CPU_SUBTYPE_SH7707 is not set |
@@ -97,6 +138,7 @@ CONFIG_CPU_SUBTYPE_SH7206=y | |||
97 | # CONFIG_CPU_SUBTYPE_SH7710 is not set | 138 | # CONFIG_CPU_SUBTYPE_SH7710 is not set |
98 | # CONFIG_CPU_SUBTYPE_SH7712 is not set | 139 | # CONFIG_CPU_SUBTYPE_SH7712 is not set |
99 | # CONFIG_CPU_SUBTYPE_SH7720 is not set | 140 | # CONFIG_CPU_SUBTYPE_SH7720 is not set |
141 | # CONFIG_CPU_SUBTYPE_SH7721 is not set | ||
100 | # CONFIG_CPU_SUBTYPE_SH7750 is not set | 142 | # CONFIG_CPU_SUBTYPE_SH7750 is not set |
101 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | 143 | # CONFIG_CPU_SUBTYPE_SH7091 is not set |
102 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | 144 | # CONFIG_CPU_SUBTYPE_SH7750R is not set |
@@ -105,14 +147,17 @@ CONFIG_CPU_SUBTYPE_SH7206=y | |||
105 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | 147 | # CONFIG_CPU_SUBTYPE_SH7751R is not set |
106 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 148 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
107 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 149 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
108 | # CONFIG_CPU_SUBTYPE_ST40STB1 is not set | 150 | # CONFIG_CPU_SUBTYPE_SH7723 is not set |
109 | # CONFIG_CPU_SUBTYPE_ST40GX1 is not set | 151 | # CONFIG_CPU_SUBTYPE_SH7763 is not set |
110 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | 152 | # CONFIG_CPU_SUBTYPE_SH7770 is not set |
111 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | 153 | # CONFIG_CPU_SUBTYPE_SH7780 is not set |
112 | # CONFIG_CPU_SUBTYPE_SH7785 is not set | 154 | # CONFIG_CPU_SUBTYPE_SH7785 is not set |
113 | # CONFIG_CPU_SUBTYPE_SHX3 is not set | 155 | # CONFIG_CPU_SUBTYPE_SHX3 is not set |
114 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | 156 | # CONFIG_CPU_SUBTYPE_SH7343 is not set |
115 | # CONFIG_CPU_SUBTYPE_SH7722 is not set | 157 | # CONFIG_CPU_SUBTYPE_SH7722 is not set |
158 | # CONFIG_CPU_SUBTYPE_SH7366 is not set | ||
159 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set | ||
160 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set | ||
116 | 161 | ||
117 | # | 162 | # |
118 | # Memory management options | 163 | # Memory management options |
@@ -121,23 +166,25 @@ CONFIG_QUICKLIST=y | |||
121 | CONFIG_PAGE_OFFSET=0x00000000 | 166 | CONFIG_PAGE_OFFSET=0x00000000 |
122 | CONFIG_MEMORY_START=0x0c000000 | 167 | CONFIG_MEMORY_START=0x0c000000 |
123 | CONFIG_MEMORY_SIZE=0x04000000 | 168 | CONFIG_MEMORY_SIZE=0x04000000 |
169 | CONFIG_29BIT=y | ||
124 | CONFIG_ARCH_FLATMEM_ENABLE=y | 170 | CONFIG_ARCH_FLATMEM_ENABLE=y |
125 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 171 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
126 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 172 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
127 | CONFIG_MAX_ACTIVE_REGIONS=1 | 173 | CONFIG_MAX_ACTIVE_REGIONS=1 |
128 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 174 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
129 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 175 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
130 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
131 | CONFIG_PAGE_SIZE_4KB=y | 176 | CONFIG_PAGE_SIZE_4KB=y |
132 | # CONFIG_PAGE_SIZE_8KB is not set | 177 | # CONFIG_PAGE_SIZE_8KB is not set |
133 | # CONFIG_PAGE_SIZE_64KB is not set | 178 | # CONFIG_PAGE_SIZE_64KB is not set |
134 | CONFIG_SELECT_MEMORY_MODEL=y | 179 | CONFIG_SELECT_MEMORY_MODEL=y |
135 | # CONFIG_FLATMEM_MANUAL is not set | 180 | CONFIG_FLATMEM_MANUAL=y |
136 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 181 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
137 | CONFIG_SPARSEMEM_MANUAL=y | 182 | # CONFIG_SPARSEMEM_MANUAL is not set |
138 | CONFIG_SPARSEMEM=y | 183 | CONFIG_FLATMEM=y |
139 | CONFIG_HAVE_MEMORY_PRESENT=y | 184 | CONFIG_FLAT_NODE_MEM_MAP=y |
140 | CONFIG_SPARSEMEM_STATIC=y | 185 | CONFIG_SPARSEMEM_STATIC=y |
186 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
187 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
141 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 188 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
142 | # CONFIG_RESOURCES_64BIT is not set | 189 | # CONFIG_RESOURCES_64BIT is not set |
143 | CONFIG_ZONE_DMA_FLAG=0 | 190 | CONFIG_ZONE_DMA_FLAG=0 |
@@ -183,13 +230,16 @@ CONFIG_CPU_FREQ_TABLE=y | |||
183 | CONFIG_CPU_FREQ_STAT=y | 230 | CONFIG_CPU_FREQ_STAT=y |
184 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 231 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
185 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 232 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
233 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
186 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 234 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
235 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
236 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
187 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 237 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
188 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 238 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
189 | # CONFIG_CPU_FREQ_GOV_USERSPACE is not set | 239 | # CONFIG_CPU_FREQ_GOV_USERSPACE is not set |
190 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set | 240 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set |
191 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | 241 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
192 | # CONFIG_SH_CPU_FREQ is not set | 242 | CONFIG_SH_CPU_FREQ=y |
193 | 243 | ||
194 | # | 244 | # |
195 | # DMA support | 245 | # DMA support |
@@ -213,11 +263,15 @@ CONFIG_HEARTBEAT=y | |||
213 | # CONFIG_HZ_300 is not set | 263 | # CONFIG_HZ_300 is not set |
214 | CONFIG_HZ_1000=y | 264 | CONFIG_HZ_1000=y |
215 | CONFIG_HZ=1000 | 265 | CONFIG_HZ=1000 |
216 | # CONFIG_KEXEC is not set | 266 | # CONFIG_SCHED_HRTICK is not set |
267 | CONFIG_KEXEC=y | ||
217 | # CONFIG_CRASH_DUMP is not set | 268 | # CONFIG_CRASH_DUMP is not set |
218 | CONFIG_PREEMPT_NONE=y | 269 | # CONFIG_PREEMPT_NONE is not set |
219 | # CONFIG_PREEMPT_VOLUNTARY is not set | 270 | # CONFIG_PREEMPT_VOLUNTARY is not set |
220 | # CONFIG_PREEMPT is not set | 271 | CONFIG_PREEMPT=y |
272 | CONFIG_PREEMPT_RCU=y | ||
273 | CONFIG_RCU_TRACE=y | ||
274 | CONFIG_GUSA=y | ||
221 | 275 | ||
222 | # | 276 | # |
223 | # Boot options | 277 | # Boot options |
@@ -225,25 +279,25 @@ CONFIG_PREEMPT_NONE=y | |||
225 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | 279 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 |
226 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 280 | CONFIG_BOOT_LINK_OFFSET=0x00800000 |
227 | CONFIG_CMDLINE_BOOL=y | 281 | CONFIG_CMDLINE_BOOL=y |
228 | CONFIG_CMDLINE="console=ttySC3,115200 earlyprintk=serial ignore_loglevel" | 282 | CONFIG_CMDLINE="console=ttySC3,115200 ignore_loglevel earlyprintk=serial" |
229 | 283 | ||
230 | # | 284 | # |
231 | # Bus options | 285 | # Bus options |
232 | # | 286 | # |
233 | # CONFIG_CF_ENABLER is not set | 287 | CONFIG_CF_ENABLER=y |
288 | # CONFIG_CF_AREA5 is not set | ||
289 | CONFIG_CF_AREA6=y | ||
290 | CONFIG_CF_BASE_ADDR=0xb8000000 | ||
234 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 291 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
235 | 292 | # CONFIG_PCCARD is not set | |
236 | # | ||
237 | # PCCARD (PCMCIA/CardBus) support | ||
238 | # | ||
239 | 293 | ||
240 | # | 294 | # |
241 | # Executable file formats | 295 | # Executable file formats |
242 | # | 296 | # |
243 | CONFIG_BINFMT_FLAT=y | 297 | CONFIG_BINFMT_FLAT=y |
244 | CONFIG_BINFMT_ZFLAT=y | 298 | CONFIG_BINFMT_ZFLAT=y |
245 | # CONFIG_BINFMT_SHARED_FLAT is not set | 299 | CONFIG_BINFMT_SHARED_FLAT=y |
246 | # CONFIG_BINFMT_MISC is not set | 300 | CONFIG_BINFMT_MISC=y |
247 | 301 | ||
248 | # | 302 | # |
249 | # Networking | 303 | # Networking |
@@ -253,14 +307,24 @@ CONFIG_NET=y | |||
253 | # | 307 | # |
254 | # Networking options | 308 | # Networking options |
255 | # | 309 | # |
256 | # CONFIG_PACKET is not set | 310 | CONFIG_PACKET=y |
257 | # CONFIG_UNIX is not set | 311 | # CONFIG_PACKET_MMAP is not set |
258 | # CONFIG_NET_KEY is not set | 312 | CONFIG_UNIX=y |
313 | CONFIG_XFRM=y | ||
314 | # CONFIG_XFRM_USER is not set | ||
315 | # CONFIG_XFRM_SUB_POLICY is not set | ||
316 | # CONFIG_XFRM_MIGRATE is not set | ||
317 | # CONFIG_XFRM_STATISTICS is not set | ||
318 | CONFIG_NET_KEY=y | ||
319 | # CONFIG_NET_KEY_MIGRATE is not set | ||
259 | CONFIG_INET=y | 320 | CONFIG_INET=y |
260 | # CONFIG_IP_MULTICAST is not set | 321 | # CONFIG_IP_MULTICAST is not set |
261 | # CONFIG_IP_ADVANCED_ROUTER is not set | 322 | # CONFIG_IP_ADVANCED_ROUTER is not set |
262 | CONFIG_IP_FIB_HASH=y | 323 | CONFIG_IP_FIB_HASH=y |
263 | # CONFIG_IP_PNP is not set | 324 | CONFIG_IP_PNP=y |
325 | CONFIG_IP_PNP_DHCP=y | ||
326 | # CONFIG_IP_PNP_BOOTP is not set | ||
327 | # CONFIG_IP_PNP_RARP is not set | ||
264 | # CONFIG_NET_IPIP is not set | 328 | # CONFIG_NET_IPIP is not set |
265 | # CONFIG_NET_IPGRE is not set | 329 | # CONFIG_NET_IPGRE is not set |
266 | # CONFIG_ARPD is not set | 330 | # CONFIG_ARPD is not set |
@@ -273,14 +337,13 @@ CONFIG_IP_FIB_HASH=y | |||
273 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 337 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
274 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 338 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
275 | # CONFIG_INET_XFRM_MODE_BEET is not set | 339 | # CONFIG_INET_XFRM_MODE_BEET is not set |
340 | # CONFIG_INET_LRO is not set | ||
276 | # CONFIG_INET_DIAG is not set | 341 | # CONFIG_INET_DIAG is not set |
277 | # CONFIG_TCP_CONG_ADVANCED is not set | 342 | # CONFIG_TCP_CONG_ADVANCED is not set |
278 | CONFIG_TCP_CONG_CUBIC=y | 343 | CONFIG_TCP_CONG_CUBIC=y |
279 | CONFIG_DEFAULT_TCP_CONG="cubic" | 344 | CONFIG_DEFAULT_TCP_CONG="cubic" |
280 | # CONFIG_TCP_MD5SIG is not set | 345 | # CONFIG_TCP_MD5SIG is not set |
281 | # CONFIG_IPV6 is not set | 346 | # CONFIG_IPV6 is not set |
282 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
283 | # CONFIG_INET6_TUNNEL is not set | ||
284 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
285 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
286 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
@@ -297,10 +360,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
297 | # CONFIG_LAPB is not set | 360 | # CONFIG_LAPB is not set |
298 | # CONFIG_ECONET is not set | 361 | # CONFIG_ECONET is not set |
299 | # CONFIG_WAN_ROUTER is not set | 362 | # CONFIG_WAN_ROUTER is not set |
300 | |||
301 | # | ||
302 | # QoS and/or fair queueing | ||
303 | # | ||
304 | # CONFIG_NET_SCHED is not set | 363 | # CONFIG_NET_SCHED is not set |
305 | 364 | ||
306 | # | 365 | # |
@@ -308,6 +367,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
308 | # | 367 | # |
309 | # CONFIG_NET_PKTGEN is not set | 368 | # CONFIG_NET_PKTGEN is not set |
310 | # CONFIG_HAMRADIO is not set | 369 | # CONFIG_HAMRADIO is not set |
370 | # CONFIG_CAN is not set | ||
311 | # CONFIG_IRDA is not set | 371 | # CONFIG_IRDA is not set |
312 | # CONFIG_BT is not set | 372 | # CONFIG_BT is not set |
313 | # CONFIG_AF_RXRPC is not set | 373 | # CONFIG_AF_RXRPC is not set |
@@ -329,8 +389,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
329 | # | 389 | # |
330 | # Generic Driver Options | 390 | # Generic Driver Options |
331 | # | 391 | # |
392 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
332 | # CONFIG_STANDALONE is not set | 393 | # CONFIG_STANDALONE is not set |
333 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 394 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
395 | # CONFIG_FW_LOADER is not set | ||
334 | # CONFIG_DEBUG_DRIVER is not set | 396 | # CONFIG_DEBUG_DRIVER is not set |
335 | # CONFIG_DEBUG_DEVRES is not set | 397 | # CONFIG_DEBUG_DEVRES is not set |
336 | # CONFIG_SYS_HYPERVISOR is not set | 398 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -339,11 +401,9 @@ CONFIG_MTD=y | |||
339 | # CONFIG_MTD_DEBUG is not set | 401 | # CONFIG_MTD_DEBUG is not set |
340 | CONFIG_MTD_CONCAT=y | 402 | CONFIG_MTD_CONCAT=y |
341 | CONFIG_MTD_PARTITIONS=y | 403 | CONFIG_MTD_PARTITIONS=y |
342 | CONFIG_MTD_REDBOOT_PARTS=y | 404 | # CONFIG_MTD_REDBOOT_PARTS is not set |
343 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
344 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
345 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | ||
346 | # CONFIG_MTD_CMDLINE_PARTS is not set | 405 | # CONFIG_MTD_CMDLINE_PARTS is not set |
406 | # CONFIG_MTD_AR7_PARTS is not set | ||
347 | 407 | ||
348 | # | 408 | # |
349 | # User Modules And Translation Layers | 409 | # User Modules And Translation Layers |
@@ -356,6 +416,7 @@ CONFIG_MTD_BLOCK=y | |||
356 | # CONFIG_INFTL is not set | 416 | # CONFIG_INFTL is not set |
357 | # CONFIG_RFD_FTL is not set | 417 | # CONFIG_RFD_FTL is not set |
358 | # CONFIG_SSFDC is not set | 418 | # CONFIG_SSFDC is not set |
419 | # CONFIG_MTD_OOPS is not set | ||
359 | 420 | ||
360 | # | 421 | # |
361 | # RAM/ROM/Flash chip drivers | 422 | # RAM/ROM/Flash chip drivers |
@@ -390,7 +451,6 @@ CONFIG_MTD_PHYSMAP=y | |||
390 | CONFIG_MTD_PHYSMAP_START=0x20000000 | 451 | CONFIG_MTD_PHYSMAP_START=0x20000000 |
391 | CONFIG_MTD_PHYSMAP_LEN=0x01000000 | 452 | CONFIG_MTD_PHYSMAP_LEN=0x01000000 |
392 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | 453 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 |
393 | # CONFIG_MTD_SOLUTIONENGINE is not set | ||
394 | # CONFIG_MTD_UCLINUX is not set | 454 | # CONFIG_MTD_UCLINUX is not set |
395 | # CONFIG_MTD_PLATRAM is not set | 455 | # CONFIG_MTD_PLATRAM is not set |
396 | 456 | ||
@@ -418,13 +478,19 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | |||
418 | # CONFIG_PARPORT is not set | 478 | # CONFIG_PARPORT is not set |
419 | CONFIG_BLK_DEV=y | 479 | CONFIG_BLK_DEV=y |
420 | # CONFIG_BLK_DEV_COW_COMMON is not set | 480 | # CONFIG_BLK_DEV_COW_COMMON is not set |
421 | # CONFIG_BLK_DEV_LOOP is not set | 481 | CONFIG_BLK_DEV_LOOP=y |
482 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
422 | # CONFIG_BLK_DEV_NBD is not set | 483 | # CONFIG_BLK_DEV_NBD is not set |
423 | # CONFIG_BLK_DEV_RAM is not set | 484 | CONFIG_BLK_DEV_RAM=y |
485 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
486 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
487 | # CONFIG_BLK_DEV_XIP is not set | ||
424 | # CONFIG_CDROM_PKTCDVD is not set | 488 | # CONFIG_CDROM_PKTCDVD is not set |
425 | # CONFIG_ATA_OVER_ETH is not set | 489 | # CONFIG_ATA_OVER_ETH is not set |
426 | CONFIG_MISC_DEVICES=y | 490 | CONFIG_MISC_DEVICES=y |
427 | # CONFIG_EEPROM_93CX6 is not set | 491 | CONFIG_EEPROM_93CX6=y |
492 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
493 | CONFIG_HAVE_IDE=y | ||
428 | # CONFIG_IDE is not set | 494 | # CONFIG_IDE is not set |
429 | 495 | ||
430 | # | 496 | # |
@@ -443,23 +509,30 @@ CONFIG_NETDEVICES=y | |||
443 | # CONFIG_MACVLAN is not set | 509 | # CONFIG_MACVLAN is not set |
444 | # CONFIG_EQUALIZER is not set | 510 | # CONFIG_EQUALIZER is not set |
445 | # CONFIG_TUN is not set | 511 | # CONFIG_TUN is not set |
512 | # CONFIG_VETH is not set | ||
446 | # CONFIG_PHYLIB is not set | 513 | # CONFIG_PHYLIB is not set |
447 | CONFIG_NET_ETHERNET=y | 514 | CONFIG_NET_ETHERNET=y |
448 | CONFIG_MII=y | 515 | CONFIG_MII=y |
516 | # CONFIG_AX88796 is not set | ||
449 | # CONFIG_STNIC is not set | 517 | # CONFIG_STNIC is not set |
450 | CONFIG_SMC91X=y | 518 | CONFIG_SMC91X=y |
451 | CONFIG_NETDEV_1000=y | 519 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
452 | CONFIG_NETDEV_10000=y | 520 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
521 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
522 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
523 | # CONFIG_B44 is not set | ||
524 | # CONFIG_NETDEV_1000 is not set | ||
525 | # CONFIG_NETDEV_10000 is not set | ||
453 | 526 | ||
454 | # | 527 | # |
455 | # Wireless LAN | 528 | # Wireless LAN |
456 | # | 529 | # |
457 | # CONFIG_WLAN_PRE80211 is not set | 530 | # CONFIG_WLAN_PRE80211 is not set |
458 | # CONFIG_WLAN_80211 is not set | 531 | # CONFIG_WLAN_80211 is not set |
532 | # CONFIG_IWLWIFI_LEDS is not set | ||
459 | # CONFIG_WAN is not set | 533 | # CONFIG_WAN is not set |
460 | # CONFIG_PPP is not set | 534 | # CONFIG_PPP is not set |
461 | # CONFIG_SLIP is not set | 535 | # CONFIG_SLIP is not set |
462 | # CONFIG_SHAPER is not set | ||
463 | # CONFIG_NETCONSOLE is not set | 536 | # CONFIG_NETCONSOLE is not set |
464 | # CONFIG_NETPOLL is not set | 537 | # CONFIG_NETPOLL is not set |
465 | # CONFIG_NET_POLL_CONTROLLER is not set | 538 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -469,28 +542,7 @@ CONFIG_NETDEV_10000=y | |||
469 | # | 542 | # |
470 | # Input device support | 543 | # Input device support |
471 | # | 544 | # |
472 | CONFIG_INPUT=y | 545 | # CONFIG_INPUT is not set |
473 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
474 | # CONFIG_INPUT_POLLDEV is not set | ||
475 | |||
476 | # | ||
477 | # Userland interfaces | ||
478 | # | ||
479 | # CONFIG_INPUT_MOUSEDEV is not set | ||
480 | # CONFIG_INPUT_JOYDEV is not set | ||
481 | # CONFIG_INPUT_TSDEV is not set | ||
482 | # CONFIG_INPUT_EVDEV is not set | ||
483 | # CONFIG_INPUT_EVBUG is not set | ||
484 | |||
485 | # | ||
486 | # Input Device Drivers | ||
487 | # | ||
488 | # CONFIG_INPUT_KEYBOARD is not set | ||
489 | # CONFIG_INPUT_MOUSE is not set | ||
490 | # CONFIG_INPUT_JOYSTICK is not set | ||
491 | # CONFIG_INPUT_TABLET is not set | ||
492 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
493 | # CONFIG_INPUT_MISC is not set | ||
494 | 546 | ||
495 | # | 547 | # |
496 | # Hardware I/O ports | 548 | # Hardware I/O ports |
@@ -502,6 +554,7 @@ CONFIG_INPUT=y | |||
502 | # Character devices | 554 | # Character devices |
503 | # | 555 | # |
504 | # CONFIG_VT is not set | 556 | # CONFIG_VT is not set |
557 | # CONFIG_DEVKMEM is not set | ||
505 | # CONFIG_SERIAL_NONSTANDARD is not set | 558 | # CONFIG_SERIAL_NONSTANDARD is not set |
506 | 559 | ||
507 | # | 560 | # |
@@ -520,106 +573,119 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
520 | # CONFIG_UNIX98_PTYS is not set | 573 | # CONFIG_UNIX98_PTYS is not set |
521 | # CONFIG_LEGACY_PTYS is not set | 574 | # CONFIG_LEGACY_PTYS is not set |
522 | # CONFIG_IPMI_HANDLER is not set | 575 | # CONFIG_IPMI_HANDLER is not set |
523 | # CONFIG_WATCHDOG is not set | ||
524 | # CONFIG_HW_RANDOM is not set | 576 | # CONFIG_HW_RANDOM is not set |
525 | # CONFIG_R3964 is not set | 577 | # CONFIG_R3964 is not set |
526 | # CONFIG_RAW_DRIVER is not set | 578 | # CONFIG_RAW_DRIVER is not set |
527 | # CONFIG_TCG_TPM is not set | 579 | # CONFIG_TCG_TPM is not set |
528 | # CONFIG_I2C is not set | 580 | # CONFIG_I2C is not set |
529 | |||
530 | # | ||
531 | # SPI support | ||
532 | # | ||
533 | # CONFIG_SPI is not set | 581 | # CONFIG_SPI is not set |
534 | # CONFIG_SPI_MASTER is not set | ||
535 | # CONFIG_W1 is not set | 582 | # CONFIG_W1 is not set |
536 | # CONFIG_POWER_SUPPLY is not set | 583 | # CONFIG_POWER_SUPPLY is not set |
537 | # CONFIG_HWMON is not set | 584 | # CONFIG_HWMON is not set |
585 | # CONFIG_THERMAL is not set | ||
586 | # CONFIG_WATCHDOG is not set | ||
587 | |||
588 | # | ||
589 | # Sonics Silicon Backplane | ||
590 | # | ||
591 | CONFIG_SSB_POSSIBLE=y | ||
592 | # CONFIG_SSB is not set | ||
538 | 593 | ||
539 | # | 594 | # |
540 | # Multifunction device drivers | 595 | # Multifunction device drivers |
541 | # | 596 | # |
542 | # CONFIG_MFD_SM501 is not set | 597 | # CONFIG_MFD_SM501 is not set |
598 | # CONFIG_HTC_PASIC3 is not set | ||
543 | 599 | ||
544 | # | 600 | # |
545 | # Multimedia devices | 601 | # Multimedia devices |
546 | # | 602 | # |
603 | |||
604 | # | ||
605 | # Multimedia core support | ||
606 | # | ||
547 | # CONFIG_VIDEO_DEV is not set | 607 | # CONFIG_VIDEO_DEV is not set |
548 | # CONFIG_DVB_CORE is not set | 608 | # CONFIG_DVB_CORE is not set |
549 | CONFIG_DAB=y | 609 | # CONFIG_VIDEO_MEDIA is not set |
610 | |||
611 | # | ||
612 | # Multimedia drivers | ||
613 | # | ||
614 | # CONFIG_DAB is not set | ||
550 | 615 | ||
551 | # | 616 | # |
552 | # Graphics support | 617 | # Graphics support |
553 | # | 618 | # |
619 | # CONFIG_VGASTATE is not set | ||
620 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
621 | # CONFIG_FB is not set | ||
554 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 622 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
555 | 623 | ||
556 | # | 624 | # |
557 | # Display device support | 625 | # Display device support |
558 | # | 626 | # |
559 | # CONFIG_DISPLAY_SUPPORT is not set | 627 | # CONFIG_DISPLAY_SUPPORT is not set |
560 | # CONFIG_VGASTATE is not set | ||
561 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
562 | # CONFIG_FB is not set | ||
563 | 628 | ||
564 | # | 629 | # |
565 | # Sound | 630 | # Sound |
566 | # | 631 | # |
567 | # CONFIG_SOUND is not set | 632 | # CONFIG_SOUND is not set |
568 | CONFIG_HID_SUPPORT=y | 633 | # CONFIG_USB_SUPPORT is not set |
569 | CONFIG_HID=y | ||
570 | # CONFIG_HID_DEBUG is not set | ||
571 | CONFIG_USB_SUPPORT=y | ||
572 | CONFIG_USB_ARCH_HAS_HCD=y | ||
573 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
574 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
575 | # CONFIG_USB is not set | ||
576 | |||
577 | # | ||
578 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
579 | # | ||
580 | |||
581 | # | ||
582 | # USB Gadget Support | ||
583 | # | ||
584 | # CONFIG_USB_GADGET is not set | ||
585 | # CONFIG_MMC is not set | 634 | # CONFIG_MMC is not set |
635 | # CONFIG_MEMSTICK is not set | ||
586 | # CONFIG_NEW_LEDS is not set | 636 | # CONFIG_NEW_LEDS is not set |
587 | # CONFIG_RTC_CLASS is not set | 637 | # CONFIG_ACCESSIBILITY is not set |
638 | CONFIG_RTC_LIB=y | ||
639 | CONFIG_RTC_CLASS=y | ||
640 | CONFIG_RTC_HCTOSYS=y | ||
641 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
642 | # CONFIG_RTC_DEBUG is not set | ||
588 | 643 | ||
589 | # | 644 | # |
590 | # DMA Engine support | 645 | # RTC interfaces |
591 | # | 646 | # |
592 | # CONFIG_DMA_ENGINE is not set | 647 | CONFIG_RTC_INTF_SYSFS=y |
648 | CONFIG_RTC_INTF_PROC=y | ||
649 | CONFIG_RTC_INTF_DEV=y | ||
650 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
651 | # CONFIG_RTC_DRV_TEST is not set | ||
593 | 652 | ||
594 | # | 653 | # |
595 | # DMA Clients | 654 | # SPI RTC drivers |
596 | # | 655 | # |
597 | 656 | ||
598 | # | 657 | # |
599 | # DMA Devices | 658 | # Platform RTC drivers |
600 | # | 659 | # |
660 | # CONFIG_RTC_DRV_DS1511 is not set | ||
661 | # CONFIG_RTC_DRV_DS1553 is not set | ||
662 | # CONFIG_RTC_DRV_DS1742 is not set | ||
663 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
664 | # CONFIG_RTC_DRV_M48T86 is not set | ||
665 | # CONFIG_RTC_DRV_M48T59 is not set | ||
666 | # CONFIG_RTC_DRV_V3020 is not set | ||
601 | 667 | ||
602 | # | 668 | # |
603 | # Userspace I/O | 669 | # on-CPU RTC drivers |
604 | # | 670 | # |
671 | CONFIG_RTC_DRV_SH=y | ||
605 | # CONFIG_UIO is not set | 672 | # CONFIG_UIO is not set |
606 | 673 | ||
607 | # | 674 | # |
608 | # File systems | 675 | # File systems |
609 | # | 676 | # |
610 | # CONFIG_EXT2_FS is not set | 677 | CONFIG_EXT2_FS=y |
678 | # CONFIG_EXT2_FS_XATTR is not set | ||
611 | # CONFIG_EXT3_FS is not set | 679 | # CONFIG_EXT3_FS is not set |
612 | # CONFIG_EXT4DEV_FS is not set | 680 | # CONFIG_EXT4DEV_FS is not set |
613 | # CONFIG_REISERFS_FS is not set | 681 | # CONFIG_REISERFS_FS is not set |
614 | # CONFIG_JFS_FS is not set | 682 | # CONFIG_JFS_FS is not set |
615 | # CONFIG_FS_POSIX_ACL is not set | 683 | # CONFIG_FS_POSIX_ACL is not set |
616 | # CONFIG_XFS_FS is not set | 684 | # CONFIG_XFS_FS is not set |
617 | # CONFIG_GFS2_FS is not set | 685 | # CONFIG_OCFS2_FS is not set |
618 | # CONFIG_MINIX_FS is not set | 686 | # CONFIG_DNOTIFY is not set |
619 | CONFIG_ROMFS_FS=y | ||
620 | # CONFIG_INOTIFY is not set | 687 | # CONFIG_INOTIFY is not set |
621 | # CONFIG_QUOTA is not set | 688 | # CONFIG_QUOTA is not set |
622 | # CONFIG_DNOTIFY is not set | ||
623 | # CONFIG_AUTOFS_FS is not set | 689 | # CONFIG_AUTOFS_FS is not set |
624 | # CONFIG_AUTOFS4_FS is not set | 690 | # CONFIG_AUTOFS4_FS is not set |
625 | # CONFIG_FUSE_FS is not set | 691 | # CONFIG_FUSE_FS is not set |
@@ -642,10 +708,11 @@ CONFIG_ROMFS_FS=y | |||
642 | # | 708 | # |
643 | CONFIG_PROC_FS=y | 709 | CONFIG_PROC_FS=y |
644 | CONFIG_PROC_SYSCTL=y | 710 | CONFIG_PROC_SYSCTL=y |
645 | # CONFIG_SYSFS is not set | 711 | CONFIG_SYSFS=y |
646 | # CONFIG_TMPFS is not set | 712 | CONFIG_TMPFS=y |
713 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
647 | # CONFIG_HUGETLB_PAGE is not set | 714 | # CONFIG_HUGETLB_PAGE is not set |
648 | CONFIG_RAMFS=y | 715 | CONFIG_CONFIGFS_FS=y |
649 | 716 | ||
650 | # | 717 | # |
651 | # Miscellaneous filesystems | 718 | # Miscellaneous filesystems |
@@ -658,18 +725,28 @@ CONFIG_RAMFS=y | |||
658 | # CONFIG_BFS_FS is not set | 725 | # CONFIG_BFS_FS is not set |
659 | # CONFIG_EFS_FS is not set | 726 | # CONFIG_EFS_FS is not set |
660 | # CONFIG_JFFS2_FS is not set | 727 | # CONFIG_JFFS2_FS is not set |
661 | # CONFIG_CRAMFS is not set | 728 | CONFIG_CRAMFS=y |
662 | # CONFIG_VXFS_FS is not set | 729 | # CONFIG_VXFS_FS is not set |
730 | # CONFIG_MINIX_FS is not set | ||
663 | # CONFIG_HPFS_FS is not set | 731 | # CONFIG_HPFS_FS is not set |
664 | # CONFIG_QNX4FS_FS is not set | 732 | # CONFIG_QNX4FS_FS is not set |
733 | CONFIG_ROMFS_FS=y | ||
665 | # CONFIG_SYSV_FS is not set | 734 | # CONFIG_SYSV_FS is not set |
666 | # CONFIG_UFS_FS is not set | 735 | # CONFIG_UFS_FS is not set |
667 | 736 | CONFIG_NETWORK_FILESYSTEMS=y | |
668 | # | 737 | CONFIG_NFS_FS=y |
669 | # Network File Systems | 738 | CONFIG_NFS_V3=y |
670 | # | 739 | # CONFIG_NFS_V3_ACL is not set |
671 | # CONFIG_NFS_FS is not set | 740 | # CONFIG_NFS_V4 is not set |
672 | # CONFIG_NFSD is not set | 741 | # CONFIG_NFSD is not set |
742 | CONFIG_ROOT_NFS=y | ||
743 | CONFIG_LOCKD=y | ||
744 | CONFIG_LOCKD_V4=y | ||
745 | CONFIG_NFS_COMMON=y | ||
746 | CONFIG_SUNRPC=y | ||
747 | # CONFIG_SUNRPC_BIND34 is not set | ||
748 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
749 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
673 | # CONFIG_SMB_FS is not set | 750 | # CONFIG_SMB_FS is not set |
674 | # CONFIG_CIFS is not set | 751 | # CONFIG_CIFS is not set |
675 | # CONFIG_NCP_FS is not set | 752 | # CONFIG_NCP_FS is not set |
@@ -681,30 +758,20 @@ CONFIG_RAMFS=y | |||
681 | # | 758 | # |
682 | # CONFIG_PARTITION_ADVANCED is not set | 759 | # CONFIG_PARTITION_ADVANCED is not set |
683 | CONFIG_MSDOS_PARTITION=y | 760 | CONFIG_MSDOS_PARTITION=y |
684 | |||
685 | # | ||
686 | # Native Language Support | ||
687 | # | ||
688 | # CONFIG_NLS is not set | 761 | # CONFIG_NLS is not set |
689 | 762 | # CONFIG_DLM is not set | |
690 | # | ||
691 | # Distributed Lock Manager | ||
692 | # | ||
693 | |||
694 | # | ||
695 | # Profiling support | ||
696 | # | ||
697 | CONFIG_PROFILING=y | ||
698 | # CONFIG_OPROFILE is not set | ||
699 | 763 | ||
700 | # | 764 | # |
701 | # Kernel hacking | 765 | # Kernel hacking |
702 | # | 766 | # |
703 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 767 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
704 | # CONFIG_PRINTK_TIME is not set | 768 | # CONFIG_PRINTK_TIME is not set |
769 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
705 | # CONFIG_ENABLE_MUST_CHECK is not set | 770 | # CONFIG_ENABLE_MUST_CHECK is not set |
771 | CONFIG_FRAME_WARN=1024 | ||
706 | # CONFIG_MAGIC_SYSRQ is not set | 772 | # CONFIG_MAGIC_SYSRQ is not set |
707 | # CONFIG_UNUSED_SYMBOLS is not set | 773 | # CONFIG_UNUSED_SYMBOLS is not set |
774 | CONFIG_DEBUG_FS=y | ||
708 | # CONFIG_HEADERS_CHECK is not set | 775 | # CONFIG_HEADERS_CHECK is not set |
709 | CONFIG_DEBUG_KERNEL=y | 776 | CONFIG_DEBUG_KERNEL=y |
710 | # CONFIG_DEBUG_SHIRQ is not set | 777 | # CONFIG_DEBUG_SHIRQ is not set |
@@ -712,7 +779,10 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
712 | CONFIG_SCHED_DEBUG=y | 779 | CONFIG_SCHED_DEBUG=y |
713 | # CONFIG_SCHEDSTATS is not set | 780 | # CONFIG_SCHEDSTATS is not set |
714 | # CONFIG_TIMER_STATS is not set | 781 | # CONFIG_TIMER_STATS is not set |
715 | CONFIG_SLUB_DEBUG_ON=y | 782 | # CONFIG_DEBUG_OBJECTS is not set |
783 | CONFIG_DEBUG_PREEMPT=y | ||
784 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
785 | # CONFIG_RT_MUTEX_TESTER is not set | ||
716 | # CONFIG_DEBUG_SPINLOCK is not set | 786 | # CONFIG_DEBUG_SPINLOCK is not set |
717 | # CONFIG_DEBUG_MUTEXES is not set | 787 | # CONFIG_DEBUG_MUTEXES is not set |
718 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 788 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
@@ -722,38 +792,123 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y | |||
722 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 792 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
723 | # CONFIG_DEBUG_KOBJECT is not set | 793 | # CONFIG_DEBUG_KOBJECT is not set |
724 | CONFIG_DEBUG_BUGVERBOSE=y | 794 | CONFIG_DEBUG_BUGVERBOSE=y |
725 | CONFIG_DEBUG_INFO=y | 795 | # CONFIG_DEBUG_INFO is not set |
726 | # CONFIG_DEBUG_VM is not set | 796 | CONFIG_DEBUG_VM=y |
727 | # CONFIG_DEBUG_LIST is not set | 797 | # CONFIG_DEBUG_WRITECOUNT is not set |
798 | CONFIG_DEBUG_LIST=y | ||
799 | # CONFIG_DEBUG_SG is not set | ||
728 | CONFIG_FRAME_POINTER=y | 800 | CONFIG_FRAME_POINTER=y |
729 | CONFIG_FORCED_INLINING=y | 801 | # CONFIG_BOOT_PRINTK_DELAY is not set |
802 | # CONFIG_RCU_TORTURE_TEST is not set | ||
803 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
730 | # CONFIG_FAULT_INJECTION is not set | 804 | # CONFIG_FAULT_INJECTION is not set |
805 | # CONFIG_SAMPLES is not set | ||
731 | # CONFIG_SH_STANDARD_BIOS is not set | 806 | # CONFIG_SH_STANDARD_BIOS is not set |
732 | CONFIG_EARLY_SCIF_CONSOLE=y | 807 | # CONFIG_EARLY_SCIF_CONSOLE is not set |
733 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xfffe9800 | ||
734 | CONFIG_EARLY_PRINTK=y | ||
735 | # CONFIG_DEBUG_BOOTMEM is not set | 808 | # CONFIG_DEBUG_BOOTMEM is not set |
736 | CONFIG_DEBUG_STACKOVERFLOW=y | 809 | CONFIG_DEBUG_STACKOVERFLOW=y |
737 | CONFIG_DEBUG_STACK_USAGE=y | 810 | CONFIG_DEBUG_STACK_USAGE=y |
738 | # CONFIG_4KSTACKS is not set | 811 | # CONFIG_IRQSTACKS is not set |
739 | 812 | ||
740 | # | 813 | # |
741 | # Security options | 814 | # Security options |
742 | # | 815 | # |
743 | # CONFIG_KEYS is not set | 816 | # CONFIG_KEYS is not set |
744 | # CONFIG_CRYPTO is not set | 817 | # CONFIG_SECURITY is not set |
818 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
819 | CONFIG_CRYPTO=y | ||
820 | |||
821 | # | ||
822 | # Crypto core or helper | ||
823 | # | ||
824 | CONFIG_CRYPTO_ALGAPI=y | ||
825 | # CONFIG_CRYPTO_MANAGER is not set | ||
826 | # CONFIG_CRYPTO_GF128MUL is not set | ||
827 | # CONFIG_CRYPTO_NULL is not set | ||
828 | # CONFIG_CRYPTO_CRYPTD is not set | ||
829 | # CONFIG_CRYPTO_AUTHENC is not set | ||
830 | # CONFIG_CRYPTO_TEST is not set | ||
831 | |||
832 | # | ||
833 | # Authenticated Encryption with Associated Data | ||
834 | # | ||
835 | # CONFIG_CRYPTO_CCM is not set | ||
836 | # CONFIG_CRYPTO_GCM is not set | ||
837 | # CONFIG_CRYPTO_SEQIV is not set | ||
838 | |||
839 | # | ||
840 | # Block modes | ||
841 | # | ||
842 | # CONFIG_CRYPTO_CBC is not set | ||
843 | # CONFIG_CRYPTO_CTR is not set | ||
844 | # CONFIG_CRYPTO_CTS is not set | ||
845 | # CONFIG_CRYPTO_ECB is not set | ||
846 | # CONFIG_CRYPTO_LRW is not set | ||
847 | # CONFIG_CRYPTO_PCBC is not set | ||
848 | # CONFIG_CRYPTO_XTS is not set | ||
849 | |||
850 | # | ||
851 | # Hash modes | ||
852 | # | ||
853 | # CONFIG_CRYPTO_HMAC is not set | ||
854 | # CONFIG_CRYPTO_XCBC is not set | ||
855 | |||
856 | # | ||
857 | # Digest | ||
858 | # | ||
859 | # CONFIG_CRYPTO_CRC32C is not set | ||
860 | # CONFIG_CRYPTO_MD4 is not set | ||
861 | # CONFIG_CRYPTO_MD5 is not set | ||
862 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
863 | # CONFIG_CRYPTO_SHA1 is not set | ||
864 | # CONFIG_CRYPTO_SHA256 is not set | ||
865 | # CONFIG_CRYPTO_SHA512 is not set | ||
866 | # CONFIG_CRYPTO_TGR192 is not set | ||
867 | # CONFIG_CRYPTO_WP512 is not set | ||
868 | |||
869 | # | ||
870 | # Ciphers | ||
871 | # | ||
872 | # CONFIG_CRYPTO_AES is not set | ||
873 | # CONFIG_CRYPTO_ANUBIS is not set | ||
874 | # CONFIG_CRYPTO_ARC4 is not set | ||
875 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
876 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
877 | # CONFIG_CRYPTO_CAST5 is not set | ||
878 | # CONFIG_CRYPTO_CAST6 is not set | ||
879 | # CONFIG_CRYPTO_DES is not set | ||
880 | # CONFIG_CRYPTO_FCRYPT is not set | ||
881 | # CONFIG_CRYPTO_KHAZAD is not set | ||
882 | # CONFIG_CRYPTO_SALSA20 is not set | ||
883 | # CONFIG_CRYPTO_SEED is not set | ||
884 | # CONFIG_CRYPTO_SERPENT is not set | ||
885 | # CONFIG_CRYPTO_TEA is not set | ||
886 | # CONFIG_CRYPTO_TWOFISH is not set | ||
887 | |||
888 | # | ||
889 | # Compression | ||
890 | # | ||
891 | CONFIG_CRYPTO_DEFLATE=y | ||
892 | CONFIG_CRYPTO_LZO=y | ||
893 | # CONFIG_CRYPTO_HW is not set | ||
745 | 894 | ||
746 | # | 895 | # |
747 | # Library routines | 896 | # Library routines |
748 | # | 897 | # |
749 | CONFIG_BITREVERSE=y | 898 | CONFIG_BITREVERSE=y |
750 | # CONFIG_CRC_CCITT is not set | 899 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
751 | # CONFIG_CRC16 is not set | 900 | CONFIG_CRC_CCITT=y |
752 | # CONFIG_CRC_ITU_T is not set | 901 | CONFIG_CRC16=y |
902 | CONFIG_CRC_ITU_T=y | ||
753 | CONFIG_CRC32=y | 903 | CONFIG_CRC32=y |
754 | # CONFIG_CRC7 is not set | 904 | CONFIG_CRC7=y |
755 | # CONFIG_LIBCRC32C is not set | 905 | CONFIG_LIBCRC32C=y |
906 | CONFIG_AUDIT_GENERIC=y | ||
756 | CONFIG_ZLIB_INFLATE=y | 907 | CONFIG_ZLIB_INFLATE=y |
908 | CONFIG_ZLIB_DEFLATE=y | ||
909 | CONFIG_LZO_COMPRESS=y | ||
910 | CONFIG_LZO_DECOMPRESS=y | ||
911 | CONFIG_PLIST=y | ||
757 | CONFIG_HAS_IOMEM=y | 912 | CONFIG_HAS_IOMEM=y |
758 | CONFIG_HAS_IOPORT=y | 913 | CONFIG_HAS_IOPORT=y |
759 | CONFIG_HAS_DMA=y | 914 | CONFIG_HAS_DMA=y |
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c index ab77b0e0fa0e..938817e34e2b 100644 --- a/arch/sh/drivers/heartbeat.c +++ b/arch/sh/drivers/heartbeat.c | |||
@@ -154,4 +154,4 @@ module_exit(heartbeat_exit); | |||
154 | 154 | ||
155 | MODULE_VERSION(DRV_VERSION); | 155 | MODULE_VERSION(DRV_VERSION); |
156 | MODULE_AUTHOR("Paul Mundt"); | 156 | MODULE_AUTHOR("Paul Mundt"); |
157 | MODULE_LICENSE("GPLv2"); | 157 | MODULE_LICENSE("GPL v2"); |
diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c index de45c6a3e33b..79baa47af977 100644 --- a/arch/sh/kernel/cpu/irq/intc-sh5.c +++ b/arch/sh/kernel/cpu/irq/intc-sh5.c | |||
@@ -242,6 +242,7 @@ void __init plat_irq_setup(void) | |||
242 | reg += 8; | 242 | reg += 8; |
243 | } | 243 | } |
244 | } | 244 | } |
245 | } | ||
245 | #endif | 246 | #endif |
246 | 247 | ||
247 | /* | 248 | /* |
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c index ebceb0dadff5..be4926969181 100644 --- a/arch/sh/kernel/cpu/sh4/probe.c +++ b/arch/sh/kernel/cpu/sh4/probe.c | |||
@@ -132,6 +132,7 @@ int __init detect_cpu_and_cache_system(void) | |||
132 | 132 | ||
133 | switch (prr) { | 133 | switch (prr) { |
134 | case 0x50: | 134 | case 0x50: |
135 | case 0x51: | ||
135 | boot_cpu_data.type = CPU_SH7723; | 136 | boot_cpu_data.type = CPU_SH7723; |
136 | boot_cpu_data.flags |= CPU_HAS_FPU | CPU_HAS_L2_CACHE; | 137 | boot_cpu_data.flags |= CPU_HAS_FPU | CPU_HAS_L2_CACHE; |
137 | break; | 138 | break; |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index 069314037049..62ebccf18b3c 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | static struct resource usbf_resources[] = { | 17 | static struct resource usbf_resources[] = { |
18 | [0] = { | 18 | [0] = { |
19 | .name = "USBF", | 19 | .name = "m66592_udc", |
20 | .start = 0x04480000, | 20 | .start = 0x04480000, |
21 | .end = 0x044800FF, | 21 | .end = 0x044800FF, |
22 | .flags = IORESOURCE_MEM, | 22 | .flags = IORESOURCE_MEM, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index 16925cf28db8..a0470f2f5479 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
@@ -16,6 +16,21 @@ | |||
16 | 16 | ||
17 | static struct plat_sci_port sci_platform_data[] = { | 17 | static struct plat_sci_port sci_platform_data[] = { |
18 | { | 18 | { |
19 | .mapbase = 0xffe00000, | ||
20 | .flags = UPF_BOOT_AUTOCONF, | ||
21 | .type = PORT_SCIF, | ||
22 | .irqs = { 80, 80, 80, 80 }, | ||
23 | },{ | ||
24 | .mapbase = 0xffe10000, | ||
25 | .flags = UPF_BOOT_AUTOCONF, | ||
26 | .type = PORT_SCIF, | ||
27 | .irqs = { 81, 81, 81, 81 }, | ||
28 | },{ | ||
29 | .mapbase = 0xffe20000, | ||
30 | .flags = UPF_BOOT_AUTOCONF, | ||
31 | .type = PORT_SCIF, | ||
32 | .irqs = { 82, 82, 82, 82 }, | ||
33 | },{ | ||
19 | .mapbase = 0xa4e30000, | 34 | .mapbase = 0xa4e30000, |
20 | .flags = UPF_BOOT_AUTOCONF, | 35 | .flags = UPF_BOOT_AUTOCONF, |
21 | .type = PORT_SCI, | 36 | .type = PORT_SCI, |
@@ -73,9 +88,35 @@ static struct platform_device rtc_device = { | |||
73 | .resource = rtc_resources, | 88 | .resource = rtc_resources, |
74 | }; | 89 | }; |
75 | 90 | ||
91 | static struct resource sh7723_usb_host_resources[] = { | ||
92 | [0] = { | ||
93 | .name = "r8a66597_hcd", | ||
94 | .start = 0xa4d80000, | ||
95 | .end = 0xa4d800ff, | ||
96 | .flags = IORESOURCE_MEM, | ||
97 | }, | ||
98 | [1] = { | ||
99 | .start = 65, | ||
100 | .end = 65, | ||
101 | .flags = IORESOURCE_IRQ, | ||
102 | }, | ||
103 | }; | ||
104 | |||
105 | static struct platform_device sh7723_usb_host_device = { | ||
106 | .name = "r8a66597_hcd", | ||
107 | .id = 0, | ||
108 | .dev = { | ||
109 | .dma_mask = NULL, /* not use dma */ | ||
110 | .coherent_dma_mask = 0xffffffff, | ||
111 | }, | ||
112 | .num_resources = ARRAY_SIZE(sh7723_usb_host_resources), | ||
113 | .resource = sh7723_usb_host_resources, | ||
114 | }; | ||
115 | |||
76 | static struct platform_device *sh7723_devices[] __initdata = { | 116 | static struct platform_device *sh7723_devices[] __initdata = { |
77 | &sci_device, | 117 | &sci_device, |
78 | &rtc_device, | 118 | &rtc_device, |
119 | &sh7723_usb_host_device, | ||
79 | }; | 120 | }; |
80 | 121 | ||
81 | static int __init sh7723_devices_setup(void) | 122 | static int __init sh7723_devices_setup(void) |
@@ -153,7 +194,7 @@ static struct intc_vect vectors[] __initdata = { | |||
153 | INTC_VECT(VIO_VOUI,0x8E0), | 194 | INTC_VECT(VIO_VOUI,0x8E0), |
154 | 195 | ||
155 | INTC_VECT(SCIFA_SCIFA0,0x900), | 196 | INTC_VECT(SCIFA_SCIFA0,0x900), |
156 | INTC_VECT(VPU_VPUI,0x920), | 197 | INTC_VECT(VPU_VPUI,0x980), |
157 | INTC_VECT(TPU_TPUI,0x9A0), | 198 | INTC_VECT(TPU_TPUI,0x9A0), |
158 | INTC_VECT(ADC_ADI,0x9E0), | 199 | INTC_VECT(ADC_ADI,0x9E0), |
159 | INTC_VECT(USB_USI0,0xA20), | 200 | INTC_VECT(USB_USI0,0xA20), |
@@ -292,9 +333,3 @@ void __init plat_irq_setup(void) | |||
292 | { | 333 | { |
293 | register_intc_controller(&intc_desc); | 334 | register_intc_controller(&intc_desc); |
294 | } | 335 | } |
295 | |||
296 | void __init plat_mem_setup(void) | ||
297 | { | ||
298 | /* Register the URAM space as Node 1 */ | ||
299 | setup_bootmem_node(1, 0x055f0000, 0x05610000); | ||
300 | } | ||
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c index ae2b22219f02..f189a559462b 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c | |||
@@ -291,8 +291,9 @@ static struct intc_sense_reg irq_sense_registers[] __initdata = { | |||
291 | }; | 291 | }; |
292 | 292 | ||
293 | static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors, | 293 | static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors, |
294 | NULL, NULL, irq_mask_registers, irq_prio_registers, | 294 | NULL, irq_mask_registers, irq_prio_registers, |
295 | irq_sense_registers); | 295 | irq_sense_registers); |
296 | |||
296 | 297 | ||
297 | /* External interrupt pins in IRL mode */ | 298 | /* External interrupt pins in IRL mode */ |
298 | static struct intc_vect irl_vectors[] __initdata = { | 299 | static struct intc_vect irl_vectors[] __initdata = { |
@@ -324,10 +325,10 @@ static struct intc_mask_reg irl7654_mask_registers[] __initdata = { | |||
324 | }; | 325 | }; |
325 | 326 | ||
326 | static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7763-irl7654", irl_vectors, | 327 | static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7763-irl7654", irl_vectors, |
327 | NULL, NULL, irl7654_mask_registers, NULL, NULL); | 328 | NULL, irl7654_mask_registers, NULL, NULL); |
328 | 329 | ||
329 | static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7763-irl3210", irl_vectors, | 330 | static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7763-irl3210", irl_vectors, |
330 | NULL, NULL, irl3210_mask_registers, NULL, NULL); | 331 | NULL, irl3210_mask_registers, NULL, NULL); |
331 | 332 | ||
332 | #define INTC_ICR0 0xffd00000 | 333 | #define INTC_ICR0 0xffd00000 |
333 | #define INTC_INTMSK0 0xffd00044 | 334 | #define INTC_INTMSK0 0xffd00044 |
diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c index b3d0a03b4c76..5482e65375a9 100644 --- a/arch/sh/kernel/module.c +++ b/arch/sh/kernel/module.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/fs.h> | 30 | #include <linux/fs.h> |
31 | #include <linux/string.h> | 31 | #include <linux/string.h> |
32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
33 | #include <asm/unaligned.h> | ||
33 | 34 | ||
34 | void *module_alloc(unsigned long size) | 35 | void *module_alloc(unsigned long size) |
35 | { | 36 | { |
@@ -56,34 +57,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, | |||
56 | return 0; | 57 | return 0; |
57 | } | 58 | } |
58 | 59 | ||
59 | #ifdef CONFIG_SUPERH32 | ||
60 | #define COPY_UNALIGNED_WORD(sw, tw, align) \ | ||
61 | { \ | ||
62 | void *__s = &(sw), *__t = &(tw); \ | ||
63 | unsigned short *__s2 = __s, *__t2 = __t; \ | ||
64 | unsigned char *__s1 = __s, *__t1 = __t; \ | ||
65 | switch ((align)) \ | ||
66 | { \ | ||
67 | case 0: \ | ||
68 | *(unsigned long *) __t = *(unsigned long *) __s; \ | ||
69 | break; \ | ||
70 | case 2: \ | ||
71 | *__t2++ = *__s2++; \ | ||
72 | *__t2 = *__s2; \ | ||
73 | break; \ | ||
74 | default: \ | ||
75 | *__t1++ = *__s1++; \ | ||
76 | *__t1++ = *__s1++; \ | ||
77 | *__t1++ = *__s1++; \ | ||
78 | *__t1 = *__s1; \ | ||
79 | break; \ | ||
80 | } \ | ||
81 | } | ||
82 | #else | ||
83 | /* One thing SHmedia doesn't screw up! */ | ||
84 | #define COPY_UNALIGNED_WORD(sw, tw, align) { (tw) = (sw); } | ||
85 | #endif | ||
86 | |||
87 | int apply_relocate_add(Elf32_Shdr *sechdrs, | 60 | int apply_relocate_add(Elf32_Shdr *sechdrs, |
88 | const char *strtab, | 61 | const char *strtab, |
89 | unsigned int symindex, | 62 | unsigned int symindex, |
@@ -96,7 +69,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
96 | Elf32_Addr relocation; | 69 | Elf32_Addr relocation; |
97 | uint32_t *location; | 70 | uint32_t *location; |
98 | uint32_t value; | 71 | uint32_t value; |
99 | int align; | ||
100 | 72 | ||
101 | pr_debug("Applying relocate section %u to %u\n", relsec, | 73 | pr_debug("Applying relocate section %u to %u\n", relsec, |
102 | sechdrs[relsec].sh_info); | 74 | sechdrs[relsec].sh_info); |
@@ -109,7 +81,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
109 | sym = (Elf32_Sym *)sechdrs[symindex].sh_addr | 81 | sym = (Elf32_Sym *)sechdrs[symindex].sh_addr |
110 | + ELF32_R_SYM(rel[i].r_info); | 82 | + ELF32_R_SYM(rel[i].r_info); |
111 | relocation = sym->st_value + rel[i].r_addend; | 83 | relocation = sym->st_value + rel[i].r_addend; |
112 | align = (int)location & 3; | ||
113 | 84 | ||
114 | #ifdef CONFIG_SUPERH64 | 85 | #ifdef CONFIG_SUPERH64 |
115 | /* For text addresses, bit2 of the st_other field indicates | 86 | /* For text addresses, bit2 of the st_other field indicates |
@@ -122,15 +93,15 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
122 | 93 | ||
123 | switch (ELF32_R_TYPE(rel[i].r_info)) { | 94 | switch (ELF32_R_TYPE(rel[i].r_info)) { |
124 | case R_SH_DIR32: | 95 | case R_SH_DIR32: |
125 | COPY_UNALIGNED_WORD (*location, value, align); | 96 | value = get_unaligned(location); |
126 | value += relocation; | 97 | value += relocation; |
127 | COPY_UNALIGNED_WORD (value, *location, align); | 98 | put_unaligned(value, location); |
128 | break; | 99 | break; |
129 | case R_SH_REL32: | 100 | case R_SH_REL32: |
130 | relocation = (relocation - (Elf32_Addr) location); | 101 | relocation = (relocation - (Elf32_Addr) location); |
131 | COPY_UNALIGNED_WORD (*location, value, align); | 102 | value = get_unaligned(location); |
132 | value += relocation; | 103 | value += relocation; |
133 | COPY_UNALIGNED_WORD (value, *location, align); | 104 | put_unaligned(value, location); |
134 | break; | 105 | break; |
135 | case R_SH_IMM_LOW16: | 106 | case R_SH_IMM_LOW16: |
136 | *location = (*location & ~0x3fffc00) | | 107 | *location = (*location & ~0x3fffc00) | |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index d211fdb24584..789724e61e83 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: config.in,v 1.113 2002/01/24 22:14:44 davem Exp $ | ||
2 | # For a description of the syntax of this configuration file, | 1 | # For a description of the syntax of this configuration file, |
3 | # see Documentation/kbuild/kconfig-language.txt. | 2 | # see Documentation/kbuild/kconfig-language.txt. |
4 | # | 3 | # |
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile index b365084316ac..22d331e1e941 100644 --- a/arch/sparc/boot/Makefile +++ b/arch/sparc/boot/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.10 2000/02/23 08:17:46 jj Exp $ | ||
2 | # Makefile for the Sparc boot stuff. | 1 | # Makefile for the Sparc boot stuff. |
3 | # | 2 | # |
4 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/boot/btfixupprep.c b/arch/sparc/boot/btfixupprep.c index dc7b0546e3bb..52a4208fe4f0 100644 --- a/arch/sparc/boot/btfixupprep.c +++ b/arch/sparc/boot/btfixupprep.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: btfixupprep.c,v 1.6 2001/08/22 15:27:47 davem Exp $ | 1 | /* |
2 | Simple utility to prepare vmlinux image for sparc. | 2 | Simple utility to prepare vmlinux image for sparc. |
3 | Resolves all BTFIXUP uses and settings and creates | 3 | Resolves all BTFIXUP uses and settings and creates |
4 | a special .s object to link to the image. | 4 | a special .s object to link to the image. |
diff --git a/arch/sparc/boot/piggyback.c b/arch/sparc/boot/piggyback.c index 6962cc68ed5b..c9f500c1a8b2 100644 --- a/arch/sparc/boot/piggyback.c +++ b/arch/sparc/boot/piggyback.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: piggyback.c,v 1.4 2000/12/05 00:48:57 anton Exp $ | 1 | /* |
2 | Simple utility to make a single-image install kernel with initial ramdisk | 2 | Simple utility to make a single-image install kernel with initial ramdisk |
3 | for Sparc tftpbooting without need to set up nfs. | 3 | for Sparc tftpbooting without need to set up nfs. |
4 | 4 | ||
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index 96344ff2bbe1..92c6fc07e59c 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ebus.c,v 1.20 2002/01/05 01:13:43 davem Exp $ | 1 | /* |
2 | * ebus.c: PCI to EBus bridge device. | 2 | * ebus.c: PCI to EBus bridge device. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc/kernel/etrap.S b/arch/sparc/kernel/etrap.S index a8b35bed12a2..f37d961d67a6 100644 --- a/arch/sparc/kernel/etrap.S +++ b/arch/sparc/kernel/etrap.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: etrap.S,v 1.31 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
2 | * etrap.S: Sparc trap window preparation for entry into the | 2 | * etrap.S: Sparc trap window preparation for entry into the |
3 | * Linux kernel. | 3 | * Linux kernel. |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S index 8bec05fa5795..3bfd6085a91d 100644 --- a/arch/sparc/kernel/head.S +++ b/arch/sparc/kernel/head.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: head.S,v 1.105 2001/08/12 09:08:56 davem Exp $ | 1 | /* |
2 | * head.S: The initial boot code for the Sparc port of Linux. | 2 | * head.S: The initial boot code for the Sparc port of Linux. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/idprom.c b/arch/sparc/kernel/idprom.c index 3a5bad525394..7220562cdb34 100644 --- a/arch/sparc/kernel/idprom.c +++ b/arch/sparc/kernel/idprom.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: idprom.c,v 1.24 1999/08/31 06:54:20 davem Exp $ | 1 | /* |
2 | * idprom.c: Routines to load the idprom into kernel addresses and | 2 | * idprom.c: Routines to load the idprom into kernel addresses and |
3 | * interpret the data contained within. | 3 | * interpret the data contained within. |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index ad0ede24ca1d..7b17522f59bf 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ioport.c,v 1.45 2001/10/30 04:54:21 davem Exp $ | 1 | /* |
2 | * ioport.c: Simple io mapping allocator. | 2 | * ioport.c: Simple io mapping allocator. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c index 01a6756ba371..087390b092b0 100644 --- a/arch/sparc/kernel/irq.c +++ b/arch/sparc/kernel/irq.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: irq.c,v 1.114 2001/12/11 04:55:51 davem Exp $ | 1 | /* |
2 | * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the | 2 | * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the |
3 | * Sparc the IRQs are basically 'cast in stone' | 3 | * Sparc the IRQs are basically 'cast in stone' |
4 | * and you are supposed to probe the prom's device | 4 | * and you are supposed to probe the prom's device |
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c index 59e9344e7a0d..adaaed4ea2fb 100644 --- a/arch/sparc/kernel/led.c +++ b/arch/sparc/kernel/led.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
3 | #include <linux/init.h> | 3 | #include <linux/init.h> |
4 | #include <linux/proc_fs.h> | 4 | #include <linux/proc_fs.h> |
5 | #include <linux/seq_file.h> | ||
5 | #include <linux/string.h> | 6 | #include <linux/string.h> |
6 | #include <linux/jiffies.h> | 7 | #include <linux/jiffies.h> |
7 | #include <linux/timer.h> | 8 | #include <linux/timer.h> |
@@ -45,21 +46,22 @@ static void led_blink(unsigned long timeout) | |||
45 | add_timer(&led_blink_timer); | 46 | add_timer(&led_blink_timer); |
46 | } | 47 | } |
47 | 48 | ||
48 | static int led_read_proc(char *buf, char **start, off_t offset, int count, | 49 | static int led_proc_show(struct seq_file *m, void *v) |
49 | int *eof, void *data) | ||
50 | { | 50 | { |
51 | int len = 0; | ||
52 | |||
53 | if (get_auxio() & AUXIO_LED) | 51 | if (get_auxio() & AUXIO_LED) |
54 | len = sprintf(buf, "on\n"); | 52 | seq_puts(m, "on\n"); |
55 | else | 53 | else |
56 | len = sprintf(buf, "off\n"); | 54 | seq_puts(m, "off\n"); |
55 | return 0; | ||
56 | } | ||
57 | 57 | ||
58 | return len; | 58 | static int led_proc_open(struct inode *inode, struct file *file) |
59 | { | ||
60 | return single_open(file, led_proc_show, NULL); | ||
59 | } | 61 | } |
60 | 62 | ||
61 | static int led_write_proc(struct file *file, const char __user *buffer, | 63 | static ssize_t led_proc_write(struct file *file, const char __user *buffer, |
62 | unsigned long count, void *data) | 64 | size_t count, loff_t *ppos) |
63 | { | 65 | { |
64 | char *buf = NULL; | 66 | char *buf = NULL; |
65 | 67 | ||
@@ -103,6 +105,15 @@ static int led_write_proc(struct file *file, const char __user *buffer, | |||
103 | return count; | 105 | return count; |
104 | } | 106 | } |
105 | 107 | ||
108 | static const struct file_operations led_proc_fops = { | ||
109 | .owner = THIS_MODULE, | ||
110 | .open = led_proc_open, | ||
111 | .read = seq_read, | ||
112 | .llseek = seq_lseek, | ||
113 | .release = single_release, | ||
114 | .write = led_proc_write, | ||
115 | }; | ||
116 | |||
106 | static struct proc_dir_entry *led; | 117 | static struct proc_dir_entry *led; |
107 | 118 | ||
108 | #define LED_VERSION "0.1" | 119 | #define LED_VERSION "0.1" |
@@ -112,12 +123,9 @@ static int __init led_init(void) | |||
112 | init_timer(&led_blink_timer); | 123 | init_timer(&led_blink_timer); |
113 | led_blink_timer.function = led_blink; | 124 | led_blink_timer.function = led_blink; |
114 | 125 | ||
115 | led = create_proc_entry("led", 0, NULL); | 126 | led = proc_create("led", 0, NULL, &led_proc_fops); |
116 | if (!led) | 127 | if (!led) |
117 | return -ENOMEM; | 128 | return -ENOMEM; |
118 | |||
119 | led->read_proc = led_read_proc; /* reader function */ | ||
120 | led->write_proc = led_write_proc; /* writer function */ | ||
121 | led->owner = THIS_MODULE; | 129 | led->owner = THIS_MODULE; |
122 | 130 | ||
123 | printk(KERN_INFO | 131 | printk(KERN_INFO |
diff --git a/arch/sparc/kernel/muldiv.c b/arch/sparc/kernel/muldiv.c index 37b9a4942232..e352239e72c8 100644 --- a/arch/sparc/kernel/muldiv.c +++ b/arch/sparc/kernel/muldiv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: muldiv.c,v 1.5 1997/12/15 20:07:20 ecd Exp $ | 1 | /* |
2 | * muldiv.c: Hardware multiply/division illegal instruction trap | 2 | * muldiv.c: Hardware multiply/division illegal instruction trap |
3 | * for sun4c/sun4 (which do not have those instructions) | 3 | * for sun4c/sun4 (which do not have those instructions) |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S index ab818cdc4cc0..ce30082ab266 100644 --- a/arch/sparc/kernel/rtrap.S +++ b/arch/sparc/kernel/rtrap.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rtrap.S,v 1.58 2002/01/31 03:30:05 davem Exp $ | 1 | /* |
2 | * rtrap.S: Return from Sparc trap low-level code. | 2 | * rtrap.S: Return from Sparc trap low-level code. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 8a55c4f0df84..a0ea0bc6f471 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: setup.c,v 1.126 2001/11/13 00:49:27 davem Exp $ | 1 | /* |
2 | * linux/arch/sparc/kernel/setup.c | 2 | * linux/arch/sparc/kernel/setup.c |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index aa8ee06cf488..b23cea5ca5d1 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sparc_ksyms.c,v 1.107 2001/07/17 16:17:33 anton Exp $ | 1 | /* |
2 | * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. | 2 | * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index e0efab2a6bef..8ac5661cafff 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sun4d_irq.c,v 1.29 2001/12/11 04:55:51 davem Exp $ | 1 | /* |
2 | * arch/sparc/kernel/sun4d_irq.c: | 2 | * arch/sparc/kernel/sun4d_irq.c: |
3 | * SS1000/SC2000 interrupt handling. | 3 | * SS1000/SC2000 interrupt handling. |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S index 2dcdaa1fd8cd..356c56aebc62 100644 --- a/arch/sparc/kernel/trampoline.S +++ b/arch/sparc/kernel/trampoline.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: trampoline.S,v 1.14 2002/01/11 08:45:38 davem Exp $ | 1 | /* |
2 | * trampoline.S: SMP cpu boot-up trampoline code. | 2 | * trampoline.S: SMP cpu boot-up trampoline code. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c index d404e7994527..978e9d85949e 100644 --- a/arch/sparc/kernel/traps.c +++ b/arch/sparc/kernel/traps.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: traps.c,v 1.64 2000/09/03 15:00:49 anton Exp $ | 1 | /* |
2 | * arch/sparc/kernel/traps.c | 2 | * arch/sparc/kernel/traps.c |
3 | * | 3 | * |
4 | * Copyright 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/unaligned.c b/arch/sparc/kernel/unaligned.c index 33857be16661..c2a28c5ad650 100644 --- a/arch/sparc/kernel/unaligned.c +++ b/arch/sparc/kernel/unaligned.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: unaligned.c,v 1.23 2001/12/21 00:54:31 davem Exp $ | 1 | /* |
2 | * unaligned.c: Unaligned load/store trap handling with special | 2 | * unaligned.c: Unaligned load/store trap handling with special |
3 | * cases for the kernel to do them more quickly. | 3 | * cases for the kernel to do them more quickly. |
4 | * | 4 | * |
diff --git a/arch/sparc/kernel/wof.S b/arch/sparc/kernel/wof.S index 083b1215d515..4bce38dfe3c5 100644 --- a/arch/sparc/kernel/wof.S +++ b/arch/sparc/kernel/wof.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: wof.S,v 1.40 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
2 | * wof.S: Sparc window overflow handler. | 2 | * wof.S: Sparc window overflow handler. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/wuf.S b/arch/sparc/kernel/wuf.S index d1a266bf103a..82e5145b0f77 100644 --- a/arch/sparc/kernel/wuf.S +++ b/arch/sparc/kernel/wuf.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: wuf.S,v 1.39 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
2 | * wuf.S: Window underflow trap handler for the Sparc. | 2 | * wuf.S: Window underflow trap handler for the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller | 4 | * Copyright (C) 1995 David S. Miller |
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 76effdbea075..6e303e10c3b9 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.35 2000/12/15 00:41:18 davem Exp $ | ||
2 | # Makefile for Sparc library files.. | 1 | # Makefile for Sparc library files.. |
3 | # | 2 | # |
4 | 3 | ||
diff --git a/arch/sparc/lib/ashldi3.S b/arch/sparc/lib/ashldi3.S index 52418a0cb3dd..17912e608716 100644 --- a/arch/sparc/lib/ashldi3.S +++ b/arch/sparc/lib/ashldi3.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ashldi3.S,v 1.2 1999/11/19 04:11:46 davem Exp $ | 1 | /* |
2 | * ashldi3.S: GCC emits these for certain drivers playing | 2 | * ashldi3.S: GCC emits these for certain drivers playing |
3 | * with long longs. | 3 | * with long longs. |
4 | * | 4 | * |
diff --git a/arch/sparc/lib/ashrdi3.S b/arch/sparc/lib/ashrdi3.S index 2848237598a4..85398fd6dcc9 100644 --- a/arch/sparc/lib/ashrdi3.S +++ b/arch/sparc/lib/ashrdi3.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ashrdi3.S,v 1.4 1999/11/19 04:11:49 davem Exp $ | 1 | /* |
2 | * ashrdi3.S: The filesystem code creates all kinds of references to | 2 | * ashrdi3.S: The filesystem code creates all kinds of references to |
3 | * this little routine on the sparc with gcc. | 3 | * this little routine on the sparc with gcc. |
4 | * | 4 | * |
diff --git a/arch/sparc/lib/blockops.S b/arch/sparc/lib/blockops.S index a7c7ffaa4a94..804be87f9a42 100644 --- a/arch/sparc/lib/blockops.S +++ b/arch/sparc/lib/blockops.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: blockops.S,v 1.8 1998/01/30 10:58:44 jj Exp $ | 1 | /* |
2 | * blockops.S: Common block zero optimized routines. | 2 | * blockops.S: Common block zero optimized routines. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/locks.S b/arch/sparc/lib/locks.S index b1df55cb2215..64f53f2b673d 100644 --- a/arch/sparc/lib/locks.S +++ b/arch/sparc/lib/locks.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: locks.S,v 1.16 2000/02/26 11:02:47 anton Exp $ | 1 | /* |
2 | * locks.S: SMP low-level lock primitives on Sparc. | 2 | * locks.S: SMP low-level lock primitives on Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/lshrdi3.S b/arch/sparc/lib/lshrdi3.S index 35abf5b2bd15..47a1354c1602 100644 --- a/arch/sparc/lib/lshrdi3.S +++ b/arch/sparc/lib/lshrdi3.S | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: lshrdi3.S,v 1.1 1999/03/21 06:37:45 davem Exp $ */ | ||
2 | 1 | ||
3 | .globl __lshrdi3 | 2 | .globl __lshrdi3 |
4 | __lshrdi3: | 3 | __lshrdi3: |
diff --git a/arch/sparc/lib/memscan.S b/arch/sparc/lib/memscan.S index 28e78ff090ac..4ff1657dfc24 100644 --- a/arch/sparc/lib/memscan.S +++ b/arch/sparc/lib/memscan.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: memscan.S,v 1.4 1996/09/08 02:01:20 davem Exp $ | 1 | /* |
2 | * memscan.S: Optimized memscan for the Sparc. | 2 | * memscan.S: Optimized memscan for the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/mul.S b/arch/sparc/lib/mul.S index da693560d878..c45470d0b0ce 100644 --- a/arch/sparc/lib/mul.S +++ b/arch/sparc/lib/mul.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mul.S,v 1.4 1996/09/30 02:22:32 davem Exp $ | 1 | /* |
2 | * mul.S: This routine was taken from glibc-1.09 and is covered | 2 | * mul.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/rem.S b/arch/sparc/lib/rem.S index bf015a90d07e..42fb86252815 100644 --- a/arch/sparc/lib/rem.S +++ b/arch/sparc/lib/rem.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rem.S,v 1.7 1996/09/30 02:22:34 davem Exp $ | 1 | /* |
2 | * rem.S: This routine was taken from glibc-1.09 and is covered | 2 | * rem.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/rwsem.S b/arch/sparc/lib/rwsem.S index f406b1f22791..9675268e7fde 100644 --- a/arch/sparc/lib/rwsem.S +++ b/arch/sparc/lib/rwsem.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rwsem.S,v 1.5 2000/05/09 17:40:13 davem Exp $ | 1 | /* |
2 | * Assembly part of rw semaphores. | 2 | * Assembly part of rw semaphores. |
3 | * | 3 | * |
4 | * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) | 4 | * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) |
diff --git a/arch/sparc/lib/sdiv.S b/arch/sparc/lib/sdiv.S index af9451629d0b..f0a0d4e4db78 100644 --- a/arch/sparc/lib/sdiv.S +++ b/arch/sparc/lib/sdiv.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sdiv.S,v 1.6 1996/10/02 17:37:00 davem Exp $ | 1 | /* |
2 | * sdiv.S: This routine was taken from glibc-1.09 and is covered | 2 | * sdiv.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/strncmp.S b/arch/sparc/lib/strncmp.S index 615626805d4b..494ec664537a 100644 --- a/arch/sparc/lib/strncmp.S +++ b/arch/sparc/lib/strncmp.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: strncmp.S,v 1.2 1996/09/09 02:47:20 davem Exp $ | 1 | /* |
2 | * strncmp.S: Hand optimized Sparc assembly of GCC output from GNU libc | 2 | * strncmp.S: Hand optimized Sparc assembly of GCC output from GNU libc |
3 | * generic strncmp routine. | 3 | * generic strncmp routine. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/udiv.S b/arch/sparc/lib/udiv.S index 169e01da6715..2101405bdfcb 100644 --- a/arch/sparc/lib/udiv.S +++ b/arch/sparc/lib/udiv.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: udiv.S,v 1.4 1996/09/30 02:22:38 davem Exp $ | 1 | /* |
2 | * udiv.S: This routine was taken from glibc-1.09 and is covered | 2 | * udiv.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/umul.S b/arch/sparc/lib/umul.S index f0e5b20a2536..1f36ae682529 100644 --- a/arch/sparc/lib/umul.S +++ b/arch/sparc/lib/umul.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: umul.S,v 1.4 1996/09/30 02:22:39 davem Exp $ | 1 | /* |
2 | * umul.S: This routine was taken from glibc-1.09 and is covered | 2 | * umul.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/urem.S b/arch/sparc/lib/urem.S index 6b92bdc8b04c..77123eb83c44 100644 --- a/arch/sparc/lib/urem.S +++ b/arch/sparc/lib/urem.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: urem.S,v 1.4 1996/09/30 02:22:42 davem Exp $ | 1 | /* |
2 | * urem.S: This routine was taken from glibc-1.09 and is covered | 2 | * urem.S: This routine was taken from glibc-1.09 and is covered |
3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
4 | */ | 4 | */ |
diff --git a/arch/sparc/math-emu/ashldi3.S b/arch/sparc/math-emu/ashldi3.S index eab1d097296a..7230ff5c7aa1 100644 --- a/arch/sparc/math-emu/ashldi3.S +++ b/arch/sparc/math-emu/ashldi3.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ashldi3.S,v 1.1 1998/04/06 16:09:28 jj Exp $ | 1 | /* |
2 | * ashldi3.S: Math-emu code creates all kinds of references to | 2 | * ashldi3.S: Math-emu code creates all kinds of references to |
3 | * this little routine on the sparc with gcc. | 3 | * this little routine on the sparc with gcc. |
4 | * | 4 | * |
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile index 16eeba4b991a..109c8b22cb38 100644 --- a/arch/sparc/mm/Makefile +++ b/arch/sparc/mm/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.38 2000/12/15 00:41:22 davem Exp $ | ||
2 | # Makefile for the linux Sparc-specific parts of the memory manager. | 1 | # Makefile for the linux Sparc-specific parts of the memory manager. |
3 | # | 2 | # |
4 | 3 | ||
diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c index abd50795a7b6..0a3cd8f6cfe4 100644 --- a/arch/sparc/mm/fault.c +++ b/arch/sparc/mm/fault.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fault.c,v 1.122 2001/11/17 07:19:26 davem Exp $ | 1 | /* |
2 | * fault.c: Page fault handlers for the Sparc. | 2 | * fault.c: Page fault handlers for the Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/generic.c b/arch/sparc/mm/generic.c index 1ef7fa03fefe..a289261da9fd 100644 --- a/arch/sparc/mm/generic.c +++ b/arch/sparc/mm/generic.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: generic.c,v 1.14 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * generic.c: Generic Sparc mm routines that are not dependent upon | 2 | * generic.c: Generic Sparc mm routines that are not dependent upon |
3 | * MMU type but are Sparc specific. | 3 | * MMU type but are Sparc specific. |
4 | * | 4 | * |
diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S index d29cc24c5bba..44aad32eeb4e 100644 --- a/arch/sparc/mm/hypersparc.S +++ b/arch/sparc/mm/hypersparc.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: hypersparc.S,v 1.18 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * hypersparc.S: High speed Hypersparc mmu/cache operations. | 2 | * hypersparc.S: High speed Hypersparc mmu/cache operations. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index b89837accc88..7794ecb896e3 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: init.c,v 1.103 2001/11/19 19:03:08 davem Exp $ | 1 | /* |
2 | * linux/arch/sparc/mm/init.c | 2 | * linux/arch/sparc/mm/init.c |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index b86dfce8eee4..f167835db3df 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: io-unit.c,v 1.24 2001/12/17 07:05:09 davem Exp $ | 1 | /* |
2 | * io-unit.c: IO-UNIT specific routines for memory management. | 2 | * io-unit.c: IO-UNIT specific routines for memory management. |
3 | * | 3 | * |
4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc/mm/loadmmu.c b/arch/sparc/mm/loadmmu.c index 2d9cd65160a4..652be05acbea 100644 --- a/arch/sparc/mm/loadmmu.c +++ b/arch/sparc/mm/loadmmu.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: loadmmu.c,v 1.56 2000/02/08 20:24:21 davem Exp $ | 1 | /* |
2 | * loadmmu.c: This code loads up all the mm function pointers once the | 2 | * loadmmu.c: This code loads up all the mm function pointers once the |
3 | * machine type has been determined. It also sets the static | 3 | * machine type has been determined. It also sets the static |
4 | * mmu values such as PAGE_NONE, etc. | 4 | * mmu values such as PAGE_NONE, etc. |
diff --git a/arch/sparc/mm/nosrmmu.c b/arch/sparc/mm/nosrmmu.c index 9e215659697e..3701f70fc30a 100644 --- a/arch/sparc/mm/nosrmmu.c +++ b/arch/sparc/mm/nosrmmu.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: nosrmmu.c,v 1.5 1999/11/19 04:11:54 davem Exp $ | 1 | /* |
2 | * nosrmmu.c: This file is a bunch of dummies for sun4 compiles, | 2 | * nosrmmu.c: This file is a bunch of dummies for sun4 compiles, |
3 | * so that it does not need srmmu and avoid ifdefs. | 3 | * so that it does not need srmmu and avoid ifdefs. |
4 | * | 4 | * |
diff --git a/arch/sparc/mm/nosun4c.c b/arch/sparc/mm/nosun4c.c index ea2e2105341d..196263f895b7 100644 --- a/arch/sparc/mm/nosun4c.c +++ b/arch/sparc/mm/nosun4c.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: nosun4c.c,v 1.3 2000/02/14 04:52:36 jj Exp $ | 1 | /* |
2 | * nosun4c.c: This file is a bunch of dummies for SMP compiles, | 2 | * nosun4c.c: This file is a bunch of dummies for SMP compiles, |
3 | * so that it does not need sun4c and avoid ifdefs. | 3 | * so that it does not need sun4c and avoid ifdefs. |
4 | * | 4 | * |
diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S index 9f4cd396a0fa..c801c3953a00 100644 --- a/arch/sparc/mm/swift.S +++ b/arch/sparc/mm/swift.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: swift.S,v 1.9 2002/01/08 11:11:59 davem Exp $ | 1 | /* |
2 | * swift.S: MicroSparc-II mmu/cache operations. | 2 | * swift.S: MicroSparc-II mmu/cache operations. |
3 | * | 3 | * |
4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S index 4988e6a310bb..db0d6de33a87 100644 --- a/arch/sparc/mm/tsunami.S +++ b/arch/sparc/mm/tsunami.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: tsunami.S,v 1.7 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * tsunami.S: High speed MicroSparc-I mmu/cache operations. | 2 | * tsunami.S: High speed MicroSparc-I mmu/cache operations. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index 754c622548a5..6dfcc13d3100 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: viking.S,v 1.19 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * viking.S: High speed Viking cache/mmu operations | 2 | * viking.S: High speed Viking cache/mmu operations |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc/prom/Makefile b/arch/sparc/prom/Makefile index 2b217ee40703..7f5eacfcfbcf 100644 --- a/arch/sparc/prom/Makefile +++ b/arch/sparc/prom/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.8 2000/12/15 00:41:22 davem Exp $ | ||
2 | # Makefile for the Sun Boot PROM interface library under | 1 | # Makefile for the Sun Boot PROM interface library under |
3 | # Linux. | 2 | # Linux. |
4 | # | 3 | # |
diff --git a/arch/sparc/prom/bootstr.c b/arch/sparc/prom/bootstr.c index cfdeac2788d1..5a35c768ff7c 100644 --- a/arch/sparc/prom/bootstr.c +++ b/arch/sparc/prom/bootstr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bootstr.c,v 1.20 2000/02/08 20:24:23 davem Exp $ | 1 | /* |
2 | * bootstr.c: Boot string/argument acquisition from the PROM. | 2 | * bootstr.c: Boot string/argument acquisition from the PROM. |
3 | * | 3 | * |
4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c index 2a007a784415..790057a34616 100644 --- a/arch/sparc/prom/console.c +++ b/arch/sparc/prom/console.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: console.c,v 1.25 2001/10/30 04:54:22 davem Exp $ | 1 | /* |
2 | * console.c: Routines that deal with sending and receiving IO | 2 | * console.c: Routines that deal with sending and receiving IO |
3 | * to/from the current console device using the PROM. | 3 | * to/from the current console device using the PROM. |
4 | * | 4 | * |
diff --git a/arch/sparc/prom/devmap.c b/arch/sparc/prom/devmap.c index eb12073578ad..1e517915b0df 100644 --- a/arch/sparc/prom/devmap.c +++ b/arch/sparc/prom/devmap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: devmap.c,v 1.7 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * promdevmap.c: Map device/IO areas to virtual addresses. | 2 | * promdevmap.c: Map device/IO areas to virtual addresses. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/devops.c b/arch/sparc/prom/devops.c index 61919b54f6cc..9f1a95c91ad1 100644 --- a/arch/sparc/prom/devops.c +++ b/arch/sparc/prom/devops.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: devops.c,v 1.13 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * devops.c: Device operations using the PROM. | 2 | * devops.c: Device operations using the PROM. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c index 2fa3a474e3a2..729f87066945 100644 --- a/arch/sparc/prom/init.c +++ b/arch/sparc/prom/init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: init.c,v 1.14 2000/01/29 01:09:12 anton Exp $ | 1 | /* |
2 | * init.c: Initialize internal variables used by the PROM | 2 | * init.c: Initialize internal variables used by the PROM |
3 | * library functions. | 3 | * library functions. |
4 | * | 4 | * |
diff --git a/arch/sparc/prom/misc.c b/arch/sparc/prom/misc.c index d9fb3af41c1f..49b5057b9601 100644 --- a/arch/sparc/prom/misc.c +++ b/arch/sparc/prom/misc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: misc.c,v 1.18 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * misc.c: Miscellaneous prom functions that don't belong | 2 | * misc.c: Miscellaneous prom functions that don't belong |
3 | * anywhere else. | 3 | * anywhere else. |
4 | * | 4 | * |
diff --git a/arch/sparc/prom/mp.c b/arch/sparc/prom/mp.c index 92fe3739fdb8..4c4dc79f65af 100644 --- a/arch/sparc/prom/mp.c +++ b/arch/sparc/prom/mp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: mp.c,v 1.12 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * mp.c: OpenBoot Prom Multiprocessor support routines. Don't call | 2 | * mp.c: OpenBoot Prom Multiprocessor support routines. Don't call |
3 | * these on a UP or else you will halt and catch fire. ;) | 3 | * these on a UP or else you will halt and catch fire. ;) |
4 | * | 4 | * |
diff --git a/arch/sparc/prom/palloc.c b/arch/sparc/prom/palloc.c index 84ce8bc54473..20be339cc2ce 100644 --- a/arch/sparc/prom/palloc.c +++ b/arch/sparc/prom/palloc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: palloc.c,v 1.4 1996/04/25 06:09:48 davem Exp $ | 1 | /* |
2 | * palloc.c: Memory allocation from the Sun PROM. | 2 | * palloc.c: Memory allocation from the Sun PROM. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/ranges.c b/arch/sparc/prom/ranges.c index a2920323c900..f9b7def35f6e 100644 --- a/arch/sparc/prom/ranges.c +++ b/arch/sparc/prom/ranges.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ranges.c,v 1.15 2001/12/19 00:29:51 davem Exp $ | 1 | /* |
2 | * ranges.c: Handle ranges in newer proms for obio/sbus. | 2 | * ranges.c: Handle ranges in newer proms for obio/sbus. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/segment.c b/arch/sparc/prom/segment.c index 09d6460165ab..04fd03a7f926 100644 --- a/arch/sparc/prom/segment.c +++ b/arch/sparc/prom/segment.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: segment.c,v 1.7 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * segment.c: Prom routine to map segments in other contexts before | 2 | * segment.c: Prom routine to map segments in other contexts before |
3 | * a standalone is completely mapped. This is for sun4 and | 3 | * a standalone is completely mapped. This is for sun4 and |
4 | * sun4c architectures only. | 4 | * sun4c architectures only. |
diff --git a/arch/sparc/prom/tree.c b/arch/sparc/prom/tree.c index 5ec246573a98..f228fe057b24 100644 --- a/arch/sparc/prom/tree.c +++ b/arch/sparc/prom/tree.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: tree.c,v 1.26 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
2 | * tree.c: Basic device tree traversal/scanning for the Linux | 2 | * tree.c: Basic device tree traversal/scanning for the Linux |
3 | * prom library. | 3 | * prom library. |
4 | * | 4 | * |
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index 9cb75c852b45..4b8f2b084c21 100644 --- a/arch/sparc64/Makefile +++ b/arch/sparc64/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.52 2002/02/09 19:49:31 davem Exp $ | ||
2 | # sparc64/Makefile | 1 | # sparc64/Makefile |
3 | # | 2 | # |
4 | # Makefile for the architecture dependent flags and dependencies on the | 3 | # Makefile for the architecture dependent flags and dependencies on the |
diff --git a/arch/sparc64/boot/Makefile b/arch/sparc64/boot/Makefile index 6968a6da57da..0458b5244f09 100644 --- a/arch/sparc64/boot/Makefile +++ b/arch/sparc64/boot/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.4 1997/12/15 20:08:56 ecd Exp $ | ||
2 | # Makefile for the Sparc64 boot stuff. | 1 | # Makefile for the Sparc64 boot stuff. |
3 | # | 2 | # |
4 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/boot/piggyback.c b/arch/sparc64/boot/piggyback.c index 36f907408c60..de364bfed0bb 100644 --- a/arch/sparc64/boot/piggyback.c +++ b/arch/sparc64/boot/piggyback.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: piggyback.c,v 1.2 2000/09/19 14:34:39 anton Exp $ | 1 | /* |
2 | Simple utility to make a single-image install kernel with initial ramdisk | 2 | Simple utility to make a single-image install kernel with initial ramdisk |
3 | for Sparc64 tftpbooting without need to set up nfs. | 3 | for Sparc64 tftpbooting without need to set up nfs. |
4 | 4 | ||
diff --git a/arch/sparc64/kernel/dtlb_prot.S b/arch/sparc64/kernel/dtlb_prot.S index e0a920162604..b2c2c5be281c 100644 --- a/arch/sparc64/kernel/dtlb_prot.S +++ b/arch/sparc64/kernel/dtlb_prot.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: dtlb_prot.S,v 1.22 2001/04/11 23:40:32 davem Exp $ | 1 | /* |
2 | * dtlb_prot.S: DTLB protection trap strategy. | 2 | * dtlb_prot.S: DTLB protection trap strategy. |
3 | * This is included directly into the trap table. | 3 | * This is included directly into the trap table. |
4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index bc2632274840..c49d0388b793 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: ebus.c,v 1.64 2001/11/08 04:41:33 davem Exp $ | 1 | /* |
2 | * ebus.c: PCI to EBus bridge device. | 2 | * ebus.c: PCI to EBus bridge device. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S index f25e1da3fd03..29ce489bc188 100644 --- a/arch/sparc64/kernel/etrap.S +++ b/arch/sparc64/kernel/etrap.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: etrap.S,v 1.46 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
2 | * etrap.S: Preparing for entry into the kernel on Sparc V9. | 2 | * etrap.S: Preparing for entry into the kernel on Sparc V9. |
3 | * | 3 | * |
4 | * Copyright (C) 1996, 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996, 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/idprom.c b/arch/sparc64/kernel/idprom.c index 3b6789e09a72..5b45a808c621 100644 --- a/arch/sparc64/kernel/idprom.c +++ b/arch/sparc64/kernel/idprom.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: idprom.c,v 1.3 1999/08/31 06:54:53 davem Exp $ | 1 | /* |
2 | * idprom.c: Routines to load the idprom into kernel addresses and | 2 | * idprom.c: Routines to load the idprom into kernel addresses and |
3 | * interpret the data contained within. | 3 | * interpret the data contained within. |
4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 4129c0449856..2084f81a76e1 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* arch/sparc64/kernel/process.c | 1 | /* arch/sparc64/kernel/process.c |
2 | * | 2 | * |
3 | * Copyright (C) 1995, 1996 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1995, 1996, 2008 David S. Miller (davem@davemloft.net) |
4 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) |
5 | * Copyright (C) 1997, 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 5 | * Copyright (C) 1997, 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
6 | */ | 6 | */ |
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
31 | #include <linux/cpu.h> | 31 | #include <linux/cpu.h> |
32 | #include <linux/elfcore.h> | 32 | #include <linux/elfcore.h> |
33 | #include <linux/sysrq.h> | ||
33 | 34 | ||
34 | #include <asm/oplib.h> | 35 | #include <asm/oplib.h> |
35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
@@ -49,6 +50,8 @@ | |||
49 | #include <asm/sstate.h> | 50 | #include <asm/sstate.h> |
50 | #include <asm/reboot.h> | 51 | #include <asm/reboot.h> |
51 | #include <asm/syscalls.h> | 52 | #include <asm/syscalls.h> |
53 | #include <asm/irq_regs.h> | ||
54 | #include <asm/smp.h> | ||
52 | 55 | ||
53 | /* #define VERBOSE_SHOWREGS */ | 56 | /* #define VERBOSE_SHOWREGS */ |
54 | 57 | ||
@@ -298,6 +301,118 @@ void show_regs(struct pt_regs *regs) | |||
298 | #endif | 301 | #endif |
299 | } | 302 | } |
300 | 303 | ||
304 | #ifdef CONFIG_MAGIC_SYSRQ | ||
305 | struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; | ||
306 | static DEFINE_SPINLOCK(global_reg_snapshot_lock); | ||
307 | |||
308 | static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs, | ||
309 | int this_cpu) | ||
310 | { | ||
311 | flushw_all(); | ||
312 | |||
313 | global_reg_snapshot[this_cpu].tstate = regs->tstate; | ||
314 | global_reg_snapshot[this_cpu].tpc = regs->tpc; | ||
315 | global_reg_snapshot[this_cpu].tnpc = regs->tnpc; | ||
316 | global_reg_snapshot[this_cpu].o7 = regs->u_regs[UREG_I7]; | ||
317 | |||
318 | if (regs->tstate & TSTATE_PRIV) { | ||
319 | struct reg_window *rw; | ||
320 | |||
321 | rw = (struct reg_window *) | ||
322 | (regs->u_regs[UREG_FP] + STACK_BIAS); | ||
323 | global_reg_snapshot[this_cpu].i7 = rw->ins[6]; | ||
324 | } else | ||
325 | global_reg_snapshot[this_cpu].i7 = 0; | ||
326 | |||
327 | global_reg_snapshot[this_cpu].thread = tp; | ||
328 | } | ||
329 | |||
330 | /* In order to avoid hangs we do not try to synchronize with the | ||
331 | * global register dump client cpus. The last store they make is to | ||
332 | * the thread pointer, so do a short poll waiting for that to become | ||
333 | * non-NULL. | ||
334 | */ | ||
335 | static void __global_reg_poll(struct global_reg_snapshot *gp) | ||
336 | { | ||
337 | int limit = 0; | ||
338 | |||
339 | while (!gp->thread && ++limit < 100) { | ||
340 | barrier(); | ||
341 | udelay(1); | ||
342 | } | ||
343 | } | ||
344 | |||
345 | static void sysrq_handle_globreg(int key, struct tty_struct *tty) | ||
346 | { | ||
347 | struct thread_info *tp = current_thread_info(); | ||
348 | struct pt_regs *regs = get_irq_regs(); | ||
349 | #ifdef CONFIG_KALLSYMS | ||
350 | char buffer[KSYM_SYMBOL_LEN]; | ||
351 | #endif | ||
352 | unsigned long flags; | ||
353 | int this_cpu, cpu; | ||
354 | |||
355 | if (!regs) | ||
356 | regs = tp->kregs; | ||
357 | |||
358 | spin_lock_irqsave(&global_reg_snapshot_lock, flags); | ||
359 | |||
360 | memset(global_reg_snapshot, 0, sizeof(global_reg_snapshot)); | ||
361 | |||
362 | this_cpu = raw_smp_processor_id(); | ||
363 | |||
364 | __global_reg_self(tp, regs, this_cpu); | ||
365 | |||
366 | smp_fetch_global_regs(); | ||
367 | |||
368 | for_each_online_cpu(cpu) { | ||
369 | struct global_reg_snapshot *gp = &global_reg_snapshot[cpu]; | ||
370 | struct thread_info *tp; | ||
371 | |||
372 | __global_reg_poll(gp); | ||
373 | |||
374 | tp = gp->thread; | ||
375 | printk("%c CPU[%3d]: TSTATE[%016lx] TPC[%016lx] TNPC[%016lx] TASK[%s:%d]\n", | ||
376 | (cpu == this_cpu ? '*' : ' '), cpu, | ||
377 | gp->tstate, gp->tpc, gp->tnpc, | ||
378 | ((tp && tp->task) ? tp->task->comm : "NULL"), | ||
379 | ((tp && tp->task) ? tp->task->pid : -1)); | ||
380 | #ifdef CONFIG_KALLSYMS | ||
381 | if (gp->tstate & TSTATE_PRIV) { | ||
382 | sprint_symbol(buffer, gp->tpc); | ||
383 | printk(" TPC[%s] ", buffer); | ||
384 | sprint_symbol(buffer, gp->o7); | ||
385 | printk("O7[%s] ", buffer); | ||
386 | sprint_symbol(buffer, gp->i7); | ||
387 | printk("I7[%s]\n", buffer); | ||
388 | } else | ||
389 | #endif | ||
390 | { | ||
391 | printk(" TPC[%lx] O7[%lx] I7[%lx]\n", | ||
392 | gp->tpc, gp->o7, gp->i7); | ||
393 | } | ||
394 | } | ||
395 | |||
396 | memset(global_reg_snapshot, 0, sizeof(global_reg_snapshot)); | ||
397 | |||
398 | spin_unlock_irqrestore(&global_reg_snapshot_lock, flags); | ||
399 | } | ||
400 | |||
401 | static struct sysrq_key_op sparc_globalreg_op = { | ||
402 | .handler = sysrq_handle_globreg, | ||
403 | .help_msg = "Globalregs", | ||
404 | .action_msg = "Show Global CPU Regs", | ||
405 | }; | ||
406 | |||
407 | static int __init sparc_globreg_init(void) | ||
408 | { | ||
409 | return register_sysrq_key('y', &sparc_globalreg_op); | ||
410 | } | ||
411 | |||
412 | core_initcall(sparc_globreg_init); | ||
413 | |||
414 | #endif | ||
415 | |||
301 | unsigned long thread_saved_pc(struct task_struct *tsk) | 416 | unsigned long thread_saved_pc(struct task_struct *tsk) |
302 | { | 417 | { |
303 | struct thread_info *ti = task_thread_info(tsk); | 418 | struct thread_info *ti = task_thread_info(tsk); |
@@ -542,20 +657,39 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
542 | struct task_struct *p, struct pt_regs *regs) | 657 | struct task_struct *p, struct pt_regs *regs) |
543 | { | 658 | { |
544 | struct thread_info *t = task_thread_info(p); | 659 | struct thread_info *t = task_thread_info(p); |
660 | struct sparc_stackf *parent_sf; | ||
661 | unsigned long child_stack_sz; | ||
545 | char *child_trap_frame; | 662 | char *child_trap_frame; |
663 | int kernel_thread; | ||
546 | 664 | ||
547 | /* Calculate offset to stack_frame & pt_regs */ | 665 | kernel_thread = (regs->tstate & TSTATE_PRIV) ? 1 : 0; |
548 | child_trap_frame = task_stack_page(p) + (THREAD_SIZE - (TRACEREG_SZ+STACKFRAME_SZ)); | 666 | parent_sf = ((struct sparc_stackf *) regs) - 1; |
549 | memcpy(child_trap_frame, (((struct sparc_stackf *)regs)-1), (TRACEREG_SZ+STACKFRAME_SZ)); | ||
550 | 667 | ||
551 | t->flags = (t->flags & ~((0xffUL << TI_FLAG_CWP_SHIFT) | (0xffUL << TI_FLAG_CURRENT_DS_SHIFT))) | | 668 | /* Calculate offset to stack_frame & pt_regs */ |
669 | child_stack_sz = ((STACKFRAME_SZ + TRACEREG_SZ) + | ||
670 | (kernel_thread ? STACKFRAME_SZ : 0)); | ||
671 | child_trap_frame = (task_stack_page(p) + | ||
672 | (THREAD_SIZE - child_stack_sz)); | ||
673 | memcpy(child_trap_frame, parent_sf, child_stack_sz); | ||
674 | |||
675 | t->flags = (t->flags & ~((0xffUL << TI_FLAG_CWP_SHIFT) | | ||
676 | (0xffUL << TI_FLAG_CURRENT_DS_SHIFT))) | | ||
552 | (((regs->tstate + 1) & TSTATE_CWP) << TI_FLAG_CWP_SHIFT); | 677 | (((regs->tstate + 1) & TSTATE_CWP) << TI_FLAG_CWP_SHIFT); |
553 | t->new_child = 1; | 678 | t->new_child = 1; |
554 | t->ksp = ((unsigned long) child_trap_frame) - STACK_BIAS; | 679 | t->ksp = ((unsigned long) child_trap_frame) - STACK_BIAS; |
555 | t->kregs = (struct pt_regs *)(child_trap_frame+sizeof(struct sparc_stackf)); | 680 | t->kregs = (struct pt_regs *) (child_trap_frame + |
681 | sizeof(struct sparc_stackf)); | ||
556 | t->fpsaved[0] = 0; | 682 | t->fpsaved[0] = 0; |
557 | 683 | ||
558 | if (regs->tstate & TSTATE_PRIV) { | 684 | if (kernel_thread) { |
685 | struct sparc_stackf *child_sf = (struct sparc_stackf *) | ||
686 | (child_trap_frame + (STACKFRAME_SZ + TRACEREG_SZ)); | ||
687 | |||
688 | /* Zero terminate the stack backtrace. */ | ||
689 | child_sf->fp = NULL; | ||
690 | t->kregs->u_regs[UREG_FP] = | ||
691 | ((unsigned long) child_sf) - STACK_BIAS; | ||
692 | |||
559 | /* Special case, if we are spawning a kernel thread from | 693 | /* Special case, if we are spawning a kernel thread from |
560 | * a userspace task (via KMOD, NFS, or similar) we must | 694 | * a userspace task (via KMOD, NFS, or similar) we must |
561 | * disable performance counters in the child because the | 695 | * disable performance counters in the child because the |
@@ -566,12 +700,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
566 | t->pcr_reg = 0; | 700 | t->pcr_reg = 0; |
567 | t->flags &= ~_TIF_PERFCTR; | 701 | t->flags &= ~_TIF_PERFCTR; |
568 | } | 702 | } |
569 | t->kregs->u_regs[UREG_FP] = t->ksp; | ||
570 | t->flags |= ((long)ASI_P << TI_FLAG_CURRENT_DS_SHIFT); | 703 | t->flags |= ((long)ASI_P << TI_FLAG_CURRENT_DS_SHIFT); |
571 | flush_register_windows(); | ||
572 | memcpy((void *)(t->ksp + STACK_BIAS), | ||
573 | (void *)(regs->u_regs[UREG_FP] + STACK_BIAS), | ||
574 | sizeof(struct sparc_stackf)); | ||
575 | t->kregs->u_regs[UREG_G6] = (unsigned long) t; | 704 | t->kregs->u_regs[UREG_G6] = (unsigned long) t; |
576 | t->kregs->u_regs[UREG_G4] = (unsigned long) t->task; | 705 | t->kregs->u_regs[UREG_G4] = (unsigned long) t->task; |
577 | } else { | 706 | } else { |
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index 16689b2930db..c6fc695fe1fe 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: rtrap.S,v 1.61 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * rtrap.S: Preparing for return from trap on Sparc V9. | 2 | * rtrap.S: Preparing for return from trap on Sparc V9. |
3 | * | 3 | * |
4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
@@ -363,6 +363,7 @@ kern_rtt: rdpr %canrestore, %g1 | |||
363 | brz,pn %g1, kern_rtt_fill | 363 | brz,pn %g1, kern_rtt_fill |
364 | nop | 364 | nop |
365 | kern_rtt_restore: | 365 | kern_rtt_restore: |
366 | stw %g0, [%sp + PTREGS_OFF + PT_V9_MAGIC] | ||
366 | restore | 367 | restore |
367 | retry | 368 | retry |
368 | 369 | ||
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index fa2827c4a3ad..e33a8a660e9e 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sbus.c,v 1.19 2002/01/23 11:27:32 davem Exp $ | 1 | /* |
2 | * sbus.c: UltraSparc SBUS controller support. | 2 | * sbus.c: UltraSparc SBUS controller support. |
3 | * | 3 | * |
4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index da5e6ee0c661..c8b03a4f68bf 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: setup.c,v 1.72 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
2 | * linux/arch/sparc64/kernel/setup.c | 2 | * linux/arch/sparc64/kernel/setup.c |
3 | * | 3 | * |
4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 6e4dc67d16af..9667e96fd513 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: signal.c,v 1.60 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * arch/sparc64/kernel/signal.c | 2 | * arch/sparc64/kernel/signal.c |
3 | * | 3 | * |
4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 0d6403a630ac..fa63c68a1819 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
@@ -900,6 +900,9 @@ extern unsigned long xcall_flush_tlb_mm; | |||
900 | extern unsigned long xcall_flush_tlb_pending; | 900 | extern unsigned long xcall_flush_tlb_pending; |
901 | extern unsigned long xcall_flush_tlb_kernel_range; | 901 | extern unsigned long xcall_flush_tlb_kernel_range; |
902 | extern unsigned long xcall_report_regs; | 902 | extern unsigned long xcall_report_regs; |
903 | #ifdef CONFIG_MAGIC_SYSRQ | ||
904 | extern unsigned long xcall_fetch_glob_regs; | ||
905 | #endif | ||
903 | extern unsigned long xcall_receive_signal; | 906 | extern unsigned long xcall_receive_signal; |
904 | extern unsigned long xcall_new_mmu_context_version; | 907 | extern unsigned long xcall_new_mmu_context_version; |
905 | #ifdef CONFIG_KGDB | 908 | #ifdef CONFIG_KGDB |
@@ -1080,6 +1083,13 @@ void smp_report_regs(void) | |||
1080 | smp_cross_call(&xcall_report_regs, 0, 0, 0); | 1083 | smp_cross_call(&xcall_report_regs, 0, 0, 0); |
1081 | } | 1084 | } |
1082 | 1085 | ||
1086 | #ifdef CONFIG_MAGIC_SYSRQ | ||
1087 | void smp_fetch_global_regs(void) | ||
1088 | { | ||
1089 | smp_cross_call(&xcall_fetch_glob_regs, 0, 0, 0); | ||
1090 | } | ||
1091 | #endif | ||
1092 | |||
1083 | /* We know that the window frames of the user have been flushed | 1093 | /* We know that the window frames of the user have been flushed |
1084 | * to the stack before we get here because all callers of us | 1094 | * to the stack before we get here because all callers of us |
1085 | * are flush_tlb_*() routines, and these run after flush_cache_*() | 1095 | * are flush_tlb_*() routines, and these run after flush_cache_*() |
diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c index 01b52f561af4..c73ce3f4197e 100644 --- a/arch/sparc64/kernel/stacktrace.c +++ b/arch/sparc64/kernel/stacktrace.c | |||
@@ -19,7 +19,7 @@ void save_stack_trace(struct stack_trace *trace) | |||
19 | fp = ksp + STACK_BIAS; | 19 | fp = ksp + STACK_BIAS; |
20 | thread_base = (unsigned long) tp; | 20 | thread_base = (unsigned long) tp; |
21 | do { | 21 | do { |
22 | struct reg_window *rw; | 22 | struct sparc_stackf *sf; |
23 | struct pt_regs *regs; | 23 | struct pt_regs *regs; |
24 | unsigned long pc; | 24 | unsigned long pc; |
25 | 25 | ||
@@ -28,15 +28,17 @@ void save_stack_trace(struct stack_trace *trace) | |||
28 | fp >= (thread_base + THREAD_SIZE)) | 28 | fp >= (thread_base + THREAD_SIZE)) |
29 | break; | 29 | break; |
30 | 30 | ||
31 | rw = (struct reg_window *) fp; | 31 | sf = (struct sparc_stackf *) fp; |
32 | regs = (struct pt_regs *) (rw + 1); | 32 | regs = (struct pt_regs *) (sf + 1); |
33 | 33 | ||
34 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { | 34 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { |
35 | if (!(regs->tstate & TSTATE_PRIV)) | ||
36 | break; | ||
35 | pc = regs->tpc; | 37 | pc = regs->tpc; |
36 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; | 38 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; |
37 | } else { | 39 | } else { |
38 | pc = rw->ins[7]; | 40 | pc = sf->callers_pc; |
39 | fp = rw->ins[6] + STACK_BIAS; | 41 | fp = (unsigned long)sf->fp + STACK_BIAS; |
40 | } | 42 | } |
41 | 43 | ||
42 | if (trace->skip > 0) | 44 | if (trace->skip > 0) |
diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c index b930fee7708a..7461581b3bb9 100644 --- a/arch/sparc64/kernel/starfire.c +++ b/arch/sparc64/kernel/starfire.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: starfire.c,v 1.10 2001/04/14 21:13:45 davem Exp $ | 1 | /* |
2 | * starfire.c: Starfire/E10000 support. | 2 | * starfire.c: Starfire/E10000 support. |
3 | * | 3 | * |
4 | * Copyright (C) 1998 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1998 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S index 010a737908ee..ade18ba0c686 100644 --- a/arch/sparc64/kernel/sys32.S +++ b/arch/sparc64/kernel/sys32.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sys32.S,v 1.12 2000/03/24 04:17:37 davem Exp $ | 1 | /* |
2 | * sys32.S: I-cache tricks for 32-bit compatibility layer simple | 2 | * sys32.S: I-cache tricks for 32-bit compatibility layer simple |
3 | * conversions. | 3 | * conversions. |
4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index 56ff55211341..704a3afcfd06 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: trampoline.S,v 1.26 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
2 | * trampoline.S: Jump start slave processors on sparc64. | 2 | * trampoline.S: Jump start slave processors on sparc64. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index d9b8d46707d1..369749262653 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
@@ -2116,7 +2116,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
2116 | printk("\n"); | 2116 | printk("\n"); |
2117 | #endif | 2117 | #endif |
2118 | do { | 2118 | do { |
2119 | struct reg_window *rw; | 2119 | struct sparc_stackf *sf; |
2120 | struct pt_regs *regs; | 2120 | struct pt_regs *regs; |
2121 | unsigned long pc; | 2121 | unsigned long pc; |
2122 | 2122 | ||
@@ -2124,15 +2124,17 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
2124 | if (fp < (thread_base + sizeof(struct thread_info)) || | 2124 | if (fp < (thread_base + sizeof(struct thread_info)) || |
2125 | fp >= (thread_base + THREAD_SIZE)) | 2125 | fp >= (thread_base + THREAD_SIZE)) |
2126 | break; | 2126 | break; |
2127 | rw = (struct reg_window *)fp; | 2127 | sf = (struct sparc_stackf *) fp; |
2128 | regs = (struct pt_regs *) (rw + 1); | 2128 | regs = (struct pt_regs *) (sf + 1); |
2129 | 2129 | ||
2130 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { | 2130 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { |
2131 | if (!(regs->tstate & TSTATE_PRIV)) | ||
2132 | break; | ||
2131 | pc = regs->tpc; | 2133 | pc = regs->tpc; |
2132 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; | 2134 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; |
2133 | } else { | 2135 | } else { |
2134 | pc = rw->ins[7]; | 2136 | pc = sf->callers_pc; |
2135 | fp = rw->ins[6] + STACK_BIAS; | 2137 | fp = (unsigned long)sf->fp + STACK_BIAS; |
2136 | } | 2138 | } |
2137 | 2139 | ||
2138 | printk(" [%016lx] ", pc); | 2140 | printk(" [%016lx] ", pc); |
diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c index 1a511e9f0d3e..afa7fc4f5193 100644 --- a/arch/sparc64/kernel/unaligned.c +++ b/arch/sparc64/kernel/unaligned.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: unaligned.c,v 1.24 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * unaligned.c: Unaligned load/store trap handling with special | 2 | * unaligned.c: Unaligned load/store trap handling with special |
3 | * cases for the kernel to do them more quickly. | 3 | * cases for the kernel to do them more quickly. |
4 | * | 4 | * |
diff --git a/arch/sparc64/lib/PeeCeeI.c b/arch/sparc64/lib/PeeCeeI.c index 3c6cfbb20360..8b313f11bc8d 100644 --- a/arch/sparc64/lib/PeeCeeI.c +++ b/arch/sparc64/lib/PeeCeeI.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: PeeCeeI.c,v 1.4 1999/09/06 01:17:35 davem Exp $ | 1 | /* |
2 | * PeeCeeI.c: The emerging standard... | 2 | * PeeCeeI.c: The emerging standard... |
3 | * | 3 | * |
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/lib/VISsave.S b/arch/sparc64/lib/VISsave.S index a0ded5c5aa5c..b320ae9e2e2e 100644 --- a/arch/sparc64/lib/VISsave.S +++ b/arch/sparc64/lib/VISsave.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: VISsave.S,v 1.6 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
2 | * VISsave.S: Code for saving FPU register state for | 2 | * VISsave.S: Code for saving FPU register state for |
3 | * VIS routines. One should not call this directly, | 3 | * VIS routines. One should not call this directly, |
4 | * but use macros provided in <asm/visasm.h>. | 4 | * but use macros provided in <asm/visasm.h>. |
diff --git a/arch/sparc64/lib/memcmp.S b/arch/sparc64/lib/memcmp.S index c90ad96c51b9..d3fdaa898566 100644 --- a/arch/sparc64/lib/memcmp.S +++ b/arch/sparc64/lib/memcmp.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: memcmp.S,v 1.3 2000/03/23 07:51:08 davem Exp $ | 1 | /* |
2 | * Sparc64 optimized memcmp code. | 2 | * Sparc64 optimized memcmp code. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/lib/memscan.S b/arch/sparc64/lib/memscan.S index 5e72d4911417..5686dfa5dc15 100644 --- a/arch/sparc64/lib/memscan.S +++ b/arch/sparc64/lib/memscan.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: memscan.S,v 1.3 2000/01/31 04:59:10 davem Exp $ | 1 | /* |
2 | * memscan.S: Optimized memscan for Sparc64. | 2 | * memscan.S: Optimized memscan for Sparc64. |
3 | * | 3 | * |
4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/lib/strncmp.S b/arch/sparc64/lib/strncmp.S index 6f14f53dbabe..980e83751556 100644 --- a/arch/sparc64/lib/strncmp.S +++ b/arch/sparc64/lib/strncmp.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: strncmp.S,v 1.2 1997/03/11 17:51:44 jj Exp $ | 1 | /* |
2 | * Sparc64 optimized strncmp code. | 2 | * Sparc64 optimized strncmp code. |
3 | * | 3 | * |
4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/lib/strncpy_from_user.S b/arch/sparc64/lib/strncpy_from_user.S index b2f499f79427..511c8f136f95 100644 --- a/arch/sparc64/lib/strncpy_from_user.S +++ b/arch/sparc64/lib/strncpy_from_user.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: strncpy_from_user.S,v 1.6 1999/05/25 16:53:05 jj Exp $ | 1 | /* |
2 | * strncpy_from_user.S: Sparc64 strncpy from userspace. | 2 | * strncpy_from_user.S: Sparc64 strncpy from userspace. |
3 | * | 3 | * |
4 | * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/math-emu/math.c b/arch/sparc64/math-emu/math.c index 6ee496c2864a..add053e0f3b3 100644 --- a/arch/sparc64/math-emu/math.c +++ b/arch/sparc64/math-emu/math.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: math.c,v 1.11 1999/12/20 05:02:25 davem Exp $ | 1 | /* |
2 | * arch/sparc64/math-emu/math.c | 2 | * arch/sparc64/math-emu/math.c |
3 | * | 3 | * |
4 | * Copyright (C) 1997,1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997,1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/math-emu/sfp-util.h b/arch/sparc64/math-emu/sfp-util.h index 31e474738cf6..425d3cf01af4 100644 --- a/arch/sparc64/math-emu/sfp-util.h +++ b/arch/sparc64/math-emu/sfp-util.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: sfp-util.h,v 1.5 2001/06/10 06:48:46 davem Exp $ | 1 | /* |
2 | * arch/sparc64/math-emu/sfp-util.h | 2 | * arch/sparc64/math-emu/sfp-util.h |
3 | * | 3 | * |
4 | * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/mm/Makefile b/arch/sparc64/mm/Makefile index e415bf942bcd..68d04c0370f4 100644 --- a/arch/sparc64/mm/Makefile +++ b/arch/sparc64/mm/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.8 2000/12/14 22:57:25 davem Exp $ | ||
2 | # Makefile for the linux Sparc64-specific parts of the memory manager. | 1 | # Makefile for the linux Sparc64-specific parts of the memory manager. |
3 | # | 2 | # |
4 | 3 | ||
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 2650d0d33ac2..236f4d228d2b 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fault.c,v 1.59 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. | 2 | * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/mm/generic.c b/arch/sparc64/mm/generic.c index af9d81db0b38..f362c2037013 100644 --- a/arch/sparc64/mm/generic.c +++ b/arch/sparc64/mm/generic.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: generic.c,v 1.18 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
2 | * generic.c: Generic Sparc mm routines that are not dependent upon | 2 | * generic.c: Generic Sparc mm routines that are not dependent upon |
3 | * MMU type but are Sparc specific. | 3 | * MMU type but are Sparc specific. |
4 | * | 4 | * |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 3c7b9471eafb..84898c44dd4d 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: init.c,v 1.209 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * arch/sparc64/mm/init.c | 2 | * arch/sparc64/mm/init.c |
3 | * | 3 | * |
4 | * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index 796e005dad8b..9bb2d90a9df6 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S | |||
@@ -1,7 +1,7 @@ | |||
1 | /* $Id: ultra.S,v 1.72 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
2 | * ultra.S: Don't expand these all over the place... | 2 | * ultra.S: Don't expand these all over the place... |
3 | * | 3 | * |
4 | * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1997, 2000, 2008 David S. Miller (davem@davemloft.net) |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
@@ -15,6 +15,7 @@ | |||
15 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
16 | #include <asm/cacheflush.h> | 16 | #include <asm/cacheflush.h> |
17 | #include <asm/hypervisor.h> | 17 | #include <asm/hypervisor.h> |
18 | #include <asm/cpudata.h> | ||
18 | 19 | ||
19 | /* Basically, most of the Spitfire vs. Cheetah madness | 20 | /* Basically, most of the Spitfire vs. Cheetah madness |
20 | * has to do with the fact that Cheetah does not support | 21 | * has to do with the fact that Cheetah does not support |
@@ -514,6 +515,32 @@ xcall_report_regs: | |||
514 | b rtrap_xcall | 515 | b rtrap_xcall |
515 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 | 516 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 |
516 | 517 | ||
518 | #ifdef CONFIG_MAGIC_SYSRQ | ||
519 | .globl xcall_fetch_glob_regs | ||
520 | xcall_fetch_glob_regs: | ||
521 | sethi %hi(global_reg_snapshot), %g1 | ||
522 | or %g1, %lo(global_reg_snapshot), %g1 | ||
523 | __GET_CPUID(%g2) | ||
524 | sllx %g2, 6, %g3 | ||
525 | add %g1, %g3, %g1 | ||
526 | rdpr %tstate, %g7 | ||
527 | stx %g7, [%g1 + GR_SNAP_TSTATE] | ||
528 | rdpr %tpc, %g7 | ||
529 | stx %g7, [%g1 + GR_SNAP_TPC] | ||
530 | rdpr %tnpc, %g7 | ||
531 | stx %g7, [%g1 + GR_SNAP_TNPC] | ||
532 | stx %o7, [%g1 + GR_SNAP_O7] | ||
533 | stx %i7, [%g1 + GR_SNAP_I7] | ||
534 | sethi %hi(trap_block), %g7 | ||
535 | or %g7, %lo(trap_block), %g7 | ||
536 | sllx %g2, TRAP_BLOCK_SZ_SHIFT, %g2 | ||
537 | add %g7, %g2, %g7 | ||
538 | ldx [%g7 + TRAP_PER_CPU_THREAD], %g3 | ||
539 | membar #StoreStore | ||
540 | stx %g3, [%g1 + GR_SNAP_THREAD] | ||
541 | retry | ||
542 | #endif /* CONFIG_MAGIC_SYSRQ */ | ||
543 | |||
517 | #ifdef DCACHE_ALIASING_POSSIBLE | 544 | #ifdef DCACHE_ALIASING_POSSIBLE |
518 | .align 32 | 545 | .align 32 |
519 | .globl xcall_flush_dcache_page_cheetah | 546 | .globl xcall_flush_dcache_page_cheetah |
diff --git a/arch/sparc64/prom/Makefile b/arch/sparc64/prom/Makefile index 3d33ed27bc27..8c94483ca54d 100644 --- a/arch/sparc64/prom/Makefile +++ b/arch/sparc64/prom/Makefile | |||
@@ -1,4 +1,3 @@ | |||
1 | # $Id: Makefile,v 1.7 2000/12/14 22:57:25 davem Exp $ | ||
2 | # Makefile for the Sun Boot PROM interface library under | 1 | # Makefile for the Sun Boot PROM interface library under |
3 | # Linux. | 2 | # Linux. |
4 | # | 3 | # |
diff --git a/arch/sparc64/prom/bootstr.c b/arch/sparc64/prom/bootstr.c index a7278614e99d..ab9ccc63b388 100644 --- a/arch/sparc64/prom/bootstr.c +++ b/arch/sparc64/prom/bootstr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bootstr.c,v 1.6 1999/08/31 06:55:01 davem Exp $ | 1 | /* |
2 | * bootstr.c: Boot string/argument acquisition from the PROM. | 2 | * bootstr.c: Boot string/argument acquisition from the PROM. |
3 | * | 3 | * |
4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/prom/devops.c b/arch/sparc64/prom/devops.c index 4641839eb39a..9dbd803e46e1 100644 --- a/arch/sparc64/prom/devops.c +++ b/arch/sparc64/prom/devops.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: devops.c,v 1.3 1997/10/29 07:43:28 ecd Exp $ | 1 | /* |
2 | * devops.c: Device operations using the PROM. | 2 | * devops.c: Device operations using the PROM. |
3 | * | 3 | * |
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/prom/init.c b/arch/sparc64/prom/init.c index 87e7c7ea0ee6..7b00f89490a4 100644 --- a/arch/sparc64/prom/init.c +++ b/arch/sparc64/prom/init.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: init.c,v 1.10 1999/09/21 14:35:59 davem Exp $ | 1 | /* |
2 | * init.c: Initialize internal variables used by the PROM | 2 | * init.c: Initialize internal variables used by the PROM |
3 | * library functions. | 3 | * library functions. |
4 | * | 4 | * |
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 47a877a15abd..9b0c0760901e 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: misc.c,v 1.20 2001/09/21 03:17:07 kanoj Exp $ | 1 | /* |
2 | * misc.c: Miscellaneous prom functions that don't belong | 2 | * misc.c: Miscellaneous prom functions that don't belong |
3 | * anywhere else. | 3 | * anywhere else. |
4 | * | 4 | * |
diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc64/prom/p1275.c index 7fcccc0e19cf..4b7c937bba61 100644 --- a/arch/sparc64/prom/p1275.c +++ b/arch/sparc64/prom/p1275.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: p1275.c,v 1.22 2001/10/18 09:40:00 davem Exp $ | 1 | /* |
2 | * p1275.c: Sun IEEE 1275 PROM low level interface routines | 2 | * p1275.c: Sun IEEE 1275 PROM low level interface routines |
3 | * | 3 | * |
4 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/prom/tree.c b/arch/sparc64/prom/tree.c index a99ccd7fb1b0..281aea44790b 100644 --- a/arch/sparc64/prom/tree.c +++ b/arch/sparc64/prom/tree.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: tree.c,v 1.10 1998/01/10 22:39:00 ecd Exp $ | 1 | /* |
2 | * tree.c: Basic device tree traversal/scanning for the Linux | 2 | * tree.c: Basic device tree traversal/scanning for the Linux |
3 | * prom library. | 3 | * prom library. |
4 | * | 4 | * |
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index dba8e05f0287..6976812cfb18 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -259,6 +259,8 @@ if BROKEN | |||
259 | source "drivers/mtd/Kconfig" | 259 | source "drivers/mtd/Kconfig" |
260 | endif | 260 | endif |
261 | 261 | ||
262 | source "drivers/leds/Kconfig" | ||
263 | |||
262 | #This is just to shut up some Kconfig warnings, so no prompt. | 264 | #This is just to shut up some Kconfig warnings, so no prompt. |
263 | config INPUT | 265 | config INPUT |
264 | bool | 266 | bool |
diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c index e9809356c530..5f903587d69e 100644 --- a/arch/um/drivers/pcap_user.c +++ b/arch/um/drivers/pcap_user.c | |||
@@ -50,7 +50,7 @@ static int pcap_open(void *data) | |||
50 | return -EIO; | 50 | return -EIO; |
51 | } | 51 | } |
52 | 52 | ||
53 | pri->compiled = kmalloc(sizeof(struct bpf_program), | 53 | pri->compiled = uml_kmalloc(sizeof(struct bpf_program), |
54 | UM_GFP_KERNEL); | 54 | UM_GFP_KERNEL); |
55 | if (pri->compiled == NULL) { | 55 | if (pri->compiled == NULL) { |
56 | printk(UM_KERN_ERR "pcap_open : kmalloc failed\n"); | 56 | printk(UM_KERN_ERR "pcap_open : kmalloc failed\n"); |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 44ad1607be2d..b58fb8941d8d 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #include "irq_user.h" | 49 | #include "irq_user.h" |
50 | #include "irq_kern.h" | 50 | #include "irq_kern.h" |
51 | #include "ubd_user.h" | 51 | #include "ubd_user.h" |
52 | #include "kern_util.h" | ||
53 | #include "os.h" | 52 | #include "os.h" |
54 | #include "mem.h" | 53 | #include "mem.h" |
55 | #include "mem_kern.h" | 54 | #include "mem_kern.h" |
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index e2716ac8889a..db5be46e3e18 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
@@ -299,6 +299,6 @@ extern int os_arch_prctl(int pid, int code, unsigned long *addr); | |||
299 | extern int get_pty(void); | 299 | extern int get_pty(void); |
300 | 300 | ||
301 | /* sys-$ARCH/task_size.c */ | 301 | /* sys-$ARCH/task_size.c */ |
302 | extern unsigned long os_get_task_size(void); | 302 | extern unsigned long os_get_top_address(void); |
303 | 303 | ||
304 | #endif | 304 | #endif |
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c index 66e2a305a8d6..ccc02a616c22 100644 --- a/arch/um/kernel/ksyms.c +++ b/arch/um/kernel/ksyms.c | |||
@@ -60,6 +60,11 @@ EXPORT_SYMBOL(os_rcv_fd); | |||
60 | EXPORT_SYMBOL(run_helper); | 60 | EXPORT_SYMBOL(run_helper); |
61 | EXPORT_SYMBOL(start_thread); | 61 | EXPORT_SYMBOL(start_thread); |
62 | 62 | ||
63 | EXPORT_SYMBOL(add_sigio_fd); | ||
64 | EXPORT_SYMBOL(ignore_sigio_fd); | ||
65 | EXPORT_SYMBOL(deactivate_fd); | ||
66 | EXPORT_SYMBOL(sigio_broken); | ||
67 | |||
63 | #ifdef CONFIG_SMP | 68 | #ifdef CONFIG_SMP |
64 | 69 | ||
65 | /* required for SMP */ | 70 | /* required for SMP */ |
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 9db85b2ce698..8d84250324b3 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
@@ -274,7 +274,7 @@ int __init linux_main(int argc, char **argv) | |||
274 | if (have_root == 0) | 274 | if (have_root == 0) |
275 | add_arg(DEFAULT_COMMAND_LINE); | 275 | add_arg(DEFAULT_COMMAND_LINE); |
276 | 276 | ||
277 | host_task_size = os_get_task_size(); | 277 | host_task_size = os_get_top_address(); |
278 | /* | 278 | /* |
279 | * TASK_SIZE needs to be PGDIR_SIZE aligned or else exit_mmap craps | 279 | * TASK_SIZE needs to be PGDIR_SIZE aligned or else exit_mmap craps |
280 | * out | 280 | * out |
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index 74ca7aabf4e1..30860b89ec58 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <unistd.h> | 7 | #include <unistd.h> |
8 | #include <errno.h> | 8 | #include <errno.h> |
9 | #include <sched.h> | 9 | #include <sched.h> |
10 | #include <linux/limits.h> | ||
10 | #include <sys/socket.h> | 11 | #include <sys/socket.h> |
11 | #include <sys/wait.h> | 12 | #include <sys/wait.h> |
12 | #include "kern_constants.h" | 13 | #include "kern_constants.h" |
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 6be028ca1817..172ad8f72e12 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c | |||
@@ -55,7 +55,7 @@ static int ptrace_dump_regs(int pid) | |||
55 | * Signals that are OK to receive in the stub - we'll just continue it. | 55 | * Signals that are OK to receive in the stub - we'll just continue it. |
56 | * SIGWINCH will happen when UML is inside a detached screen. | 56 | * SIGWINCH will happen when UML is inside a detached screen. |
57 | */ | 57 | */ |
58 | #define STUB_SIG_MASK (1 << SIGVTALRM) | 58 | #define STUB_SIG_MASK ((1 << SIGVTALRM) | (1 << SIGWINCH)) |
59 | 59 | ||
60 | /* Signals that the stub will finish with - anything else is an error */ | 60 | /* Signals that the stub will finish with - anything else is an error */ |
61 | #define STUB_DONE_MASK (1 << SIGTRAP) | 61 | #define STUB_DONE_MASK (1 << SIGTRAP) |
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index b4b36e0f2e89..183db26d01bf 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c | |||
@@ -121,8 +121,10 @@ static int stop_ptraced_child(int pid, int exitcode, int mustexit) | |||
121 | { | 121 | { |
122 | int status, n, ret = 0; | 122 | int status, n, ret = 0; |
123 | 123 | ||
124 | if (ptrace(PTRACE_CONT, pid, 0, 0) < 0) | 124 | if (ptrace(PTRACE_CONT, pid, 0, 0) < 0) { |
125 | fatal_perror("stop_ptraced_child : ptrace failed"); | 125 | perror("stop_ptraced_child : ptrace failed"); |
126 | return -1; | ||
127 | } | ||
126 | CATCH_EINTR(n = waitpid(pid, &status, 0)); | 128 | CATCH_EINTR(n = waitpid(pid, &status, 0)); |
127 | if (!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) { | 129 | if (!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) { |
128 | int exit_with = WEXITSTATUS(status); | 130 | int exit_with = WEXITSTATUS(status); |
@@ -212,7 +214,7 @@ static void __init check_sysemu(void) | |||
212 | if (n < 0) | 214 | if (n < 0) |
213 | fatal_perror("check_sysemu : wait failed"); | 215 | fatal_perror("check_sysemu : wait failed"); |
214 | if (!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGTRAP)) | 216 | if (!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGTRAP)) |
215 | fatal("check_sysemu : expected SIGTRAP, got status = %d", | 217 | fatal("check_sysemu : expected SIGTRAP, got status = %d\n", |
216 | status); | 218 | status); |
217 | 219 | ||
218 | if (ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) | 220 | if (ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) |
@@ -254,9 +256,11 @@ static void __init check_sysemu(void) | |||
254 | 256 | ||
255 | if (WIFSTOPPED(status) && | 257 | if (WIFSTOPPED(status) && |
256 | (WSTOPSIG(status) == (SIGTRAP|0x80))) { | 258 | (WSTOPSIG(status) == (SIGTRAP|0x80))) { |
257 | if (!count) | 259 | if (!count) { |
258 | fatal("check_ptrace : SYSEMU_SINGLESTEP " | 260 | non_fatal("check_ptrace : SYSEMU_SINGLESTEP " |
259 | "doesn't singlestep"); | 261 | "doesn't singlestep"); |
262 | goto fail; | ||
263 | } | ||
260 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, | 264 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, |
261 | os_getpid()); | 265 | os_getpid()); |
262 | if (n < 0) | 266 | if (n < 0) |
@@ -266,9 +270,12 @@ static void __init check_sysemu(void) | |||
266 | } | 270 | } |
267 | else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) | 271 | else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) |
268 | count++; | 272 | count++; |
269 | else | 273 | else { |
270 | fatal("check_ptrace : expected SIGTRAP or " | 274 | non_fatal("check_ptrace : expected SIGTRAP or " |
271 | "(SIGTRAP | 0x80), got status = %d", status); | 275 | "(SIGTRAP | 0x80), got status = %d\n", |
276 | status); | ||
277 | goto fail; | ||
278 | } | ||
272 | } | 279 | } |
273 | if (stop_ptraced_child(pid, 0, 0) < 0) | 280 | if (stop_ptraced_child(pid, 0, 0) < 0) |
274 | goto fail_stopped; | 281 | goto fail_stopped; |
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c index c6183e7aec3d..229f7a53d8da 100644 --- a/arch/um/os-Linux/sys-i386/registers.c +++ b/arch/um/os-Linux/sys-i386/registers.c | |||
@@ -5,7 +5,8 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <errno.h> | 7 | #include <errno.h> |
8 | #include <asm/user.h> | 8 | #include <sys/ptrace.h> |
9 | #include <sys/user.h> | ||
9 | #include "kern_constants.h" | 10 | #include "kern_constants.h" |
10 | #include "longjmp.h" | 11 | #include "longjmp.h" |
11 | #include "user.h" | 12 | #include "user.h" |
@@ -75,7 +76,7 @@ int put_fp_registers(int pid, unsigned long *regs) | |||
75 | 76 | ||
76 | void arch_init_registers(int pid) | 77 | void arch_init_registers(int pid) |
77 | { | 78 | { |
78 | struct user_fxsr_struct fpx_regs; | 79 | struct user_fpxregs_struct fpx_regs; |
79 | int err; | 80 | int err; |
80 | 81 | ||
81 | err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs); | 82 | err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs); |
diff --git a/arch/um/os-Linux/sys-i386/task_size.c b/arch/um/os-Linux/sys-i386/task_size.c index ccb49b0aff59..be04c1e183bf 100644 --- a/arch/um/os-Linux/sys-i386/task_size.c +++ b/arch/um/os-Linux/sys-i386/task_size.c | |||
@@ -63,7 +63,7 @@ static int page_ok(unsigned long page) | |||
63 | return ok; | 63 | return ok; |
64 | } | 64 | } |
65 | 65 | ||
66 | unsigned long os_get_task_size(void) | 66 | unsigned long os_get_top_address(void) |
67 | { | 67 | { |
68 | struct sigaction sa, old; | 68 | struct sigaction sa, old; |
69 | unsigned long bottom = 0; | 69 | unsigned long bottom = 0; |
@@ -76,9 +76,9 @@ unsigned long os_get_task_size(void) | |||
76 | * hosts, but shouldn't hurt otherwise. | 76 | * hosts, but shouldn't hurt otherwise. |
77 | */ | 77 | */ |
78 | unsigned long top = 0xffffd000 >> UM_KERN_PAGE_SHIFT; | 78 | unsigned long top = 0xffffd000 >> UM_KERN_PAGE_SHIFT; |
79 | unsigned long test; | 79 | unsigned long test, original; |
80 | 80 | ||
81 | printf("Locating the top of the address space ... "); | 81 | printf("Locating the bottom of the address space ... "); |
82 | fflush(stdout); | 82 | fflush(stdout); |
83 | 83 | ||
84 | /* | 84 | /* |
@@ -89,16 +89,31 @@ unsigned long os_get_task_size(void) | |||
89 | sigemptyset(&sa.sa_mask); | 89 | sigemptyset(&sa.sa_mask); |
90 | sa.sa_flags = SA_NODEFER; | 90 | sa.sa_flags = SA_NODEFER; |
91 | if (sigaction(SIGSEGV, &sa, &old)) { | 91 | if (sigaction(SIGSEGV, &sa, &old)) { |
92 | perror("os_get_task_size"); | 92 | perror("os_get_top_address"); |
93 | exit(1); | 93 | exit(1); |
94 | } | 94 | } |
95 | 95 | ||
96 | if (!page_ok(bottom)) { | 96 | /* Manually scan the address space, bottom-up, until we find |
97 | fprintf(stderr, "Address 0x%x no good?\n", | 97 | * the first valid page (or run out of them). |
98 | bottom << UM_KERN_PAGE_SHIFT); | 98 | */ |
99 | for (bottom = 0; bottom < top; bottom++) { | ||
100 | if (page_ok(bottom)) | ||
101 | break; | ||
102 | } | ||
103 | |||
104 | /* If we've got this far, we ran out of pages. */ | ||
105 | if (bottom == top) { | ||
106 | fprintf(stderr, "Unable to determine bottom of address " | ||
107 | "space.\n"); | ||
99 | exit(1); | 108 | exit(1); |
100 | } | 109 | } |
101 | 110 | ||
111 | printf("0x%x\n", bottom << UM_KERN_PAGE_SHIFT); | ||
112 | printf("Locating the top of the address space ... "); | ||
113 | fflush(stdout); | ||
114 | |||
115 | original = bottom; | ||
116 | |||
102 | /* This could happen with a 4G/4G split */ | 117 | /* This could happen with a 4G/4G split */ |
103 | if (page_ok(top)) | 118 | if (page_ok(top)) |
104 | goto out; | 119 | goto out; |
@@ -114,7 +129,7 @@ unsigned long os_get_task_size(void) | |||
114 | out: | 129 | out: |
115 | /* Restore the old SIGSEGV handling */ | 130 | /* Restore the old SIGSEGV handling */ |
116 | if (sigaction(SIGSEGV, &old, NULL)) { | 131 | if (sigaction(SIGSEGV, &old, NULL)) { |
117 | perror("os_get_task_size"); | 132 | perror("os_get_top_address"); |
118 | exit(1); | 133 | exit(1); |
119 | } | 134 | } |
120 | top <<= UM_KERN_PAGE_SHIFT; | 135 | top <<= UM_KERN_PAGE_SHIFT; |
diff --git a/arch/um/os-Linux/sys-x86_64/task_size.c b/arch/um/os-Linux/sys-x86_64/task_size.c index fad6f57f8ee3..26a0dd1f349c 100644 --- a/arch/um/os-Linux/sys-x86_64/task_size.c +++ b/arch/um/os-Linux/sys-x86_64/task_size.c | |||
@@ -1,4 +1,4 @@ | |||
1 | unsigned long os_get_task_size(unsigned long shift) | 1 | unsigned long os_get_top_address(unsigned long shift) |
2 | { | 2 | { |
3 | /* The old value of CONFIG_TOP_ADDR */ | 3 | /* The old value of CONFIG_TOP_ADDR */ |
4 | return 0x7fc0000000; | 4 | return 0x7fc0000000; |
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index bee98f466d66..dec5678fc17f 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c | |||
@@ -106,6 +106,10 @@ static void deliver_alarm(void) | |||
106 | unsigned long long this_tick = os_nsecs(); | 106 | unsigned long long this_tick = os_nsecs(); |
107 | int one_tick = UM_NSEC_PER_SEC / UM_HZ; | 107 | int one_tick = UM_NSEC_PER_SEC / UM_HZ; |
108 | 108 | ||
109 | /* Protection against the host's time going backwards */ | ||
110 | if ((last_tick != 0) && (this_tick < last_tick)) | ||
111 | this_tick = last_tick; | ||
112 | |||
109 | if (last_tick == 0) | 113 | if (last_tick == 0) |
110 | last_tick = this_tick - one_tick; | 114 | last_tick = this_tick - one_tick; |
111 | 115 | ||
@@ -148,6 +152,9 @@ static int after_sleep_interval(struct timespec *ts) | |||
148 | start_usecs = usec; | 152 | start_usecs = usec; |
149 | 153 | ||
150 | start_usecs -= skew / UM_NSEC_PER_USEC; | 154 | start_usecs -= skew / UM_NSEC_PER_USEC; |
155 | if (start_usecs < 0) | ||
156 | start_usecs = 0; | ||
157 | |||
151 | tv = ((struct timeval) { .tv_sec = start_usecs / UM_USEC_PER_SEC, | 158 | tv = ((struct timeval) { .tv_sec = start_usecs / UM_USEC_PER_SEC, |
152 | .tv_usec = start_usecs % UM_USEC_PER_SEC }); | 159 | .tv_usec = start_usecs % UM_USEC_PER_SEC }); |
153 | interval = ((struct itimerval) { { 0, usec }, tv }); | 160 | interval = ((struct itimerval) { { 0, usec }, tv }); |
diff --git a/arch/um/sys-x86_64/ksyms.c b/arch/um/sys-x86_64/ksyms.c index 4d7d1a812d8f..1db2fce00948 100644 --- a/arch/um/sys-x86_64/ksyms.c +++ b/arch/um/sys-x86_64/ksyms.c | |||
@@ -1,5 +1,11 @@ | |||
1 | #include "linux/module.h" | 1 | #include <linux/module.h> |
2 | #include "asm/string.h" | 2 | #include <asm/string.h> |
3 | #include <asm/checksum.h> | ||
3 | 4 | ||
4 | /*XXX: we need them because they would be exported by x86_64 */ | 5 | /*XXX: we need them because they would be exported by x86_64 */ |
6 | #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 | ||
7 | EXPORT_SYMBOL(memcpy); | ||
8 | #else | ||
5 | EXPORT_SYMBOL(__memcpy); | 9 | EXPORT_SYMBOL(__memcpy); |
10 | #endif | ||
11 | EXPORT_SYMBOL(csum_partial); | ||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fe361ae7ef2f..5d2858119930 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -26,17 +26,10 @@ config X86 | |||
26 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 26 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
27 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 27 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
28 | 28 | ||
29 | config DEFCONFIG_LIST | 29 | config ARCH_DEFCONFIG |
30 | string | 30 | string |
31 | depends on X86_32 | 31 | default "arch/x86/configs/i386_defconfig" if X86_32 |
32 | option defconfig_list | 32 | default "arch/x86/configs/x86_64_defconfig" if X86_64 |
33 | default "arch/x86/configs/i386_defconfig" | ||
34 | |||
35 | config DEFCONFIG_LIST | ||
36 | string | ||
37 | depends on X86_64 | ||
38 | option defconfig_list | ||
39 | default "arch/x86/configs/x86_64_defconfig" | ||
40 | 33 | ||
41 | 34 | ||
42 | config GENERIC_LOCKBREAK | 35 | config GENERIC_LOCKBREAK |
@@ -258,7 +251,7 @@ config X86_ELAN | |||
258 | 251 | ||
259 | config X86_VOYAGER | 252 | config X86_VOYAGER |
260 | bool "Voyager (NCR)" | 253 | bool "Voyager (NCR)" |
261 | depends on X86_32 && (SMP || BROKEN) | 254 | depends on X86_32 && (SMP || BROKEN) && !PCI |
262 | help | 255 | help |
263 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | 256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary |
264 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | 257 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. |
@@ -270,7 +263,7 @@ config X86_VOYAGER | |||
270 | 263 | ||
271 | config X86_NUMAQ | 264 | config X86_NUMAQ |
272 | bool "NUMAQ (IBM/Sequent)" | 265 | bool "NUMAQ (IBM/Sequent)" |
273 | depends on SMP && X86_32 | 266 | depends on SMP && X86_32 && PCI |
274 | select NUMA | 267 | select NUMA |
275 | help | 268 | help |
276 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA | 269 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA |
@@ -300,7 +293,7 @@ config X86_BIGSMP | |||
300 | 293 | ||
301 | config X86_VISWS | 294 | config X86_VISWS |
302 | bool "SGI 320/540 (Visual Workstation)" | 295 | bool "SGI 320/540 (Visual Workstation)" |
303 | depends on X86_32 | 296 | depends on X86_32 && !PCI |
304 | help | 297 | help |
305 | The SGI Visual Workstation series is an IA32-based workstation | 298 | The SGI Visual Workstation series is an IA32-based workstation |
306 | based on SGI systems chips with some legacy PC hardware attached. | 299 | based on SGI systems chips with some legacy PC hardware attached. |
@@ -344,7 +337,7 @@ config X86_RDC321X | |||
344 | config X86_VSMP | 337 | config X86_VSMP |
345 | bool "Support for ScaleMP vSMP" | 338 | bool "Support for ScaleMP vSMP" |
346 | select PARAVIRT | 339 | select PARAVIRT |
347 | depends on X86_64 | 340 | depends on X86_64 && !PCI |
348 | help | 341 | help |
349 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | 342 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is |
350 | supposed to run on these EM64T-based machines. Only choose this option | 343 | supposed to run on these EM64T-based machines. Only choose this option |
@@ -390,6 +383,7 @@ config VMI | |||
390 | config KVM_CLOCK | 383 | config KVM_CLOCK |
391 | bool "KVM paravirtualized clock" | 384 | bool "KVM paravirtualized clock" |
392 | select PARAVIRT | 385 | select PARAVIRT |
386 | select PARAVIRT_CLOCK | ||
393 | depends on !(X86_VISWS || X86_VOYAGER) | 387 | depends on !(X86_VISWS || X86_VOYAGER) |
394 | help | 388 | help |
395 | Turning on this option will allow you to run a paravirtualized clock | 389 | Turning on this option will allow you to run a paravirtualized clock |
@@ -417,37 +411,25 @@ config PARAVIRT | |||
417 | over full virtualization. However, when run without a hypervisor | 411 | over full virtualization. However, when run without a hypervisor |
418 | the kernel is theoretically slower and slightly larger. | 412 | the kernel is theoretically slower and slightly larger. |
419 | 413 | ||
414 | config PARAVIRT_CLOCK | ||
415 | bool | ||
416 | default n | ||
417 | |||
420 | endif | 418 | endif |
421 | 419 | ||
422 | config MEMTEST_BOOTPARAM | 420 | config MEMTEST |
423 | bool "Memtest boot parameter" | 421 | bool "Memtest" |
424 | depends on X86_64 | 422 | depends on X86_64 |
425 | default y | 423 | default y |
426 | help | 424 | help |
427 | This option adds a kernel parameter 'memtest', which allows memtest | 425 | This option adds a kernel parameter 'memtest', which allows memtest |
428 | to be disabled at boot. If this option is selected, memtest | 426 | to be set. |
429 | functionality can be disabled with memtest=0 on the kernel | 427 | memtest=0, mean disabled; -- default |
430 | command line. The purpose of this option is to allow a single | 428 | memtest=1, mean do 1 test pattern; |
431 | kernel image to be distributed with memtest built in, but not | 429 | ... |
432 | necessarily enabled. | 430 | memtest=4, mean do 4 test patterns. |
433 | |||
434 | If you are unsure how to answer this question, answer Y. | 431 | If you are unsure how to answer this question, answer Y. |
435 | 432 | ||
436 | config MEMTEST_BOOTPARAM_VALUE | ||
437 | int "Memtest boot parameter default value (0-4)" | ||
438 | depends on MEMTEST_BOOTPARAM | ||
439 | range 0 4 | ||
440 | default 0 | ||
441 | help | ||
442 | This option sets the default value for the kernel parameter | ||
443 | 'memtest', which allows memtest to be disabled at boot. If this | ||
444 | option is set to 0 (zero), the memtest kernel parameter will | ||
445 | default to 0, disabling memtest at bootup. If this option is | ||
446 | set to 4, the memtest kernel parameter will default to 4, | ||
447 | enabling memtest at bootup, and use that as pattern number. | ||
448 | |||
449 | If you are unsure how to answer this question, answer 0. | ||
450 | |||
451 | config ACPI_SRAT | 433 | config ACPI_SRAT |
452 | def_bool y | 434 | def_bool y |
453 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) | 435 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) |
@@ -565,18 +547,18 @@ config IOMMU_HELPER | |||
565 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) | 547 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) |
566 | 548 | ||
567 | config NR_CPUS | 549 | config NR_CPUS |
568 | int "Maximum number of CPUs (2-255)" | 550 | int "Maximum number of CPUs (2-4096)" |
569 | range 2 255 | 551 | range 2 4096 |
570 | depends on SMP | 552 | depends on SMP |
571 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 553 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
572 | default "8" | 554 | default "8" |
573 | help | 555 | help |
574 | This allows you to specify the maximum number of CPUs which this | 556 | This allows you to specify the maximum number of CPUs which this |
575 | kernel will support. The maximum supported value is 255 and the | 557 | kernel will support. The maximum supported value is 4096 and the |
576 | minimum value which makes sense is 2. | 558 | minimum value which makes sense is 2. |
577 | 559 | ||
578 | This is purely to save memory - each supported CPU adds | 560 | This is purely to save memory - each supported CPU adds |
579 | approximately eight kilobytes to the kernel image. | 561 | approximately one kilobyte to the kernel image. |
580 | 562 | ||
581 | config SCHED_SMT | 563 | config SCHED_SMT |
582 | bool "SMT (Hyperthreading) scheduler support" | 564 | bool "SMT (Hyperthreading) scheduler support" |
@@ -968,8 +950,8 @@ config NUMA_EMU | |||
968 | number of nodes. This is only useful for debugging. | 950 | number of nodes. This is only useful for debugging. |
969 | 951 | ||
970 | config NODES_SHIFT | 952 | config NODES_SHIFT |
971 | int "Max num nodes shift(1-15)" | 953 | int "Max num nodes shift(1-9)" |
972 | range 1 15 if X86_64 | 954 | range 1 9 if X86_64 |
973 | default "6" if X86_64 | 955 | default "6" if X86_64 |
974 | default "4" if X86_NUMAQ | 956 | default "4" if X86_NUMAQ |
975 | default "3" | 957 | default "3" |
@@ -1477,8 +1459,7 @@ endmenu | |||
1477 | menu "Bus options (PCI etc.)" | 1459 | menu "Bus options (PCI etc.)" |
1478 | 1460 | ||
1479 | config PCI | 1461 | config PCI |
1480 | bool "PCI support" if !X86_VISWS && !X86_VSMP | 1462 | bool "PCI support" |
1481 | depends on !X86_VOYAGER | ||
1482 | default y | 1463 | default y |
1483 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | 1464 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |
1484 | help | 1465 | help |
@@ -1515,13 +1496,13 @@ config PCI_GOMMCONFIG | |||
1515 | config PCI_GODIRECT | 1496 | config PCI_GODIRECT |
1516 | bool "Direct" | 1497 | bool "Direct" |
1517 | 1498 | ||
1518 | config PCI_GOANY | ||
1519 | bool "Any" | ||
1520 | |||
1521 | config PCI_GOOLPC | 1499 | config PCI_GOOLPC |
1522 | bool "OLPC" | 1500 | bool "OLPC" |
1523 | depends on OLPC | 1501 | depends on OLPC |
1524 | 1502 | ||
1503 | config PCI_GOANY | ||
1504 | bool "Any" | ||
1505 | |||
1525 | endchoice | 1506 | endchoice |
1526 | 1507 | ||
1527 | config PCI_BIOS | 1508 | config PCI_BIOS |
@@ -1538,9 +1519,8 @@ config PCI_MMCONFIG | |||
1538 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1519 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
1539 | 1520 | ||
1540 | config PCI_OLPC | 1521 | config PCI_OLPC |
1541 | bool | 1522 | def_bool y |
1542 | depends on PCI && PCI_GOOLPC | 1523 | depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY) |
1543 | default y | ||
1544 | 1524 | ||
1545 | config PCI_DOMAINS | 1525 | config PCI_DOMAINS |
1546 | def_bool y | 1526 | def_bool y |
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 2ad6301849a1..3d22bb8175b4 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
@@ -399,6 +399,10 @@ config X86_TSC | |||
399 | def_bool y | 399 | def_bool y |
400 | depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64 | 400 | depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64 |
401 | 401 | ||
402 | config X86_CMPXCHG64 | ||
403 | def_bool y | ||
404 | depends on X86_PAE || X86_64 | ||
405 | |||
402 | # this should be set for all -march=.. options where the compiler | 406 | # this should be set for all -march=.. options where the compiler |
403 | # generates cmov. | 407 | # generates cmov. |
404 | config X86_CMOV | 408 | config X86_CMOV |
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index ac1e31ba4795..18363374d51a 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
@@ -6,15 +6,19 @@ config TRACE_IRQFLAGS_SUPPORT | |||
6 | source "lib/Kconfig.debug" | 6 | source "lib/Kconfig.debug" |
7 | 7 | ||
8 | config NONPROMISC_DEVMEM | 8 | config NONPROMISC_DEVMEM |
9 | bool "Disable promiscuous /dev/mem" | 9 | bool "Filter access to /dev/mem" |
10 | help | 10 | help |
11 | The /dev/mem file by default only allows userspace access to PCI | 11 | If this option is left off, you allow userspace access to all |
12 | space and the BIOS code and data regions. This is sufficient for | 12 | of memory, including kernel and userspace memory. Accidental |
13 | dosemu and X and all common users of /dev/mem. With this config | 13 | access to this is obviously disastrous, but specific access can |
14 | option, you allow userspace access to all of memory, including | 14 | be used by people debugging the kernel. |
15 | kernel and userspace memory. Accidental access to this is | 15 | |
16 | obviously disasterous, but specific access can be used by people | 16 | If this option is switched on, the /dev/mem file only allows |
17 | debugging the kernel. | 17 | userspace access to PCI space and the BIOS code and data regions. |
18 | This is sufficient for dosemu and X and all common users of | ||
19 | /dev/mem. | ||
20 | |||
21 | If in doubt, say Y. | ||
18 | 22 | ||
19 | config EARLY_PRINTK | 23 | config EARLY_PRINTK |
20 | bool "Early printk" if EMBEDDED | 24 | bool "Early printk" if EMBEDDED |
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 3cff3c894cf3..5df0d1e330b1 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
@@ -210,12 +210,12 @@ all: bzImage | |||
210 | 210 | ||
211 | # KBUILD_IMAGE specify target image being built | 211 | # KBUILD_IMAGE specify target image being built |
212 | KBUILD_IMAGE := $(boot)/bzImage | 212 | KBUILD_IMAGE := $(boot)/bzImage |
213 | zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage | 213 | zImage zlilo zdisk: KBUILD_IMAGE := $(boot)/zImage |
214 | 214 | ||
215 | zImage bzImage: vmlinux | 215 | zImage bzImage: vmlinux |
216 | $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) | 216 | $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) |
217 | $(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot | 217 | $(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot |
218 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/bzImage | 218 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/$@ |
219 | 219 | ||
220 | compressed: zImage | 220 | compressed: zImage |
221 | 221 | ||
diff --git a/arch/x86/boot/a20.c b/arch/x86/boot/a20.c index 90943f83e84d..e01aafd03bde 100644 --- a/arch/x86/boot/a20.c +++ b/arch/x86/boot/a20.c | |||
@@ -115,8 +115,6 @@ static void enable_a20_fast(void) | |||
115 | 115 | ||
116 | int enable_a20(void) | 116 | int enable_a20(void) |
117 | { | 117 | { |
118 | int loops = A20_ENABLE_LOOPS; | ||
119 | |||
120 | #if defined(CONFIG_X86_ELAN) | 118 | #if defined(CONFIG_X86_ELAN) |
121 | /* Elan croaks if we try to touch the KBC */ | 119 | /* Elan croaks if we try to touch the KBC */ |
122 | enable_a20_fast(); | 120 | enable_a20_fast(); |
@@ -128,6 +126,7 @@ int enable_a20(void) | |||
128 | enable_a20_kbc(); | 126 | enable_a20_kbc(); |
129 | return 0; | 127 | return 0; |
130 | #else | 128 | #else |
129 | int loops = A20_ENABLE_LOOPS; | ||
131 | while (loops--) { | 130 | while (loops--) { |
132 | /* First, check to see if A20 is already enabled | 131 | /* First, check to see if A20 is already enabled |
133 | (legacy free, etc.) */ | 132 | (legacy free, etc.) */ |
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index d8819efac81d..1d5dff4123e1 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <asm/page.h> | 30 | #include <asm/page.h> |
31 | #include <asm/boot.h> | 31 | #include <asm/boot.h> |
32 | #include <asm/msr.h> | 32 | #include <asm/msr.h> |
33 | #include <asm/processor-flags.h> | ||
33 | #include <asm/asm-offsets.h> | 34 | #include <asm/asm-offsets.h> |
34 | 35 | ||
35 | .section ".text.head" | 36 | .section ".text.head" |
@@ -109,7 +110,7 @@ startup_32: | |||
109 | 110 | ||
110 | /* Enable PAE mode */ | 111 | /* Enable PAE mode */ |
111 | xorl %eax, %eax | 112 | xorl %eax, %eax |
112 | orl $(1 << 5), %eax | 113 | orl $(X86_CR4_PAE), %eax |
113 | movl %eax, %cr4 | 114 | movl %eax, %cr4 |
114 | 115 | ||
115 | /* | 116 | /* |
@@ -170,7 +171,7 @@ startup_32: | |||
170 | pushl %eax | 171 | pushl %eax |
171 | 172 | ||
172 | /* Enter paged protected Mode, activating Long Mode */ | 173 | /* Enter paged protected Mode, activating Long Mode */ |
173 | movl $0x80000001, %eax /* Enable Paging and Protected mode */ | 174 | movl $(X86_CR0_PG | X86_CR0_PE), %eax /* Enable Paging and Protected mode */ |
174 | movl %eax, %cr0 | 175 | movl %eax, %cr0 |
175 | 176 | ||
176 | /* Jump from 32bit compatibility mode into 64bit mode. */ | 177 | /* Jump from 32bit compatibility mode into 64bit mode. */ |
diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c index c1d00c0274c4..50e47cdbdddd 100644 --- a/arch/x86/boot/printf.c +++ b/arch/x86/boot/printf.c | |||
@@ -56,7 +56,7 @@ static char *number(char *str, long num, int base, int size, int precision, | |||
56 | if (type & LEFT) | 56 | if (type & LEFT) |
57 | type &= ~ZEROPAD; | 57 | type &= ~ZEROPAD; |
58 | if (base < 2 || base > 36) | 58 | if (base < 2 || base > 36) |
59 | return 0; | 59 | return NULL; |
60 | c = (type & ZEROPAD) ? '0' : ' '; | 60 | c = (type & ZEROPAD) ? '0' : ' '; |
61 | sign = 0; | 61 | sign = 0; |
62 | if (type & SIGN) { | 62 | if (type & SIGN) { |
diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c index 40ecb8d7688c..b939cb476dec 100644 --- a/arch/x86/boot/video-vga.c +++ b/arch/x86/boot/video-vga.c | |||
@@ -259,8 +259,7 @@ static int vga_probe(void) | |||
259 | return mode_count[adapter]; | 259 | return mode_count[adapter]; |
260 | } | 260 | } |
261 | 261 | ||
262 | __videocard video_vga = | 262 | __videocard video_vga = { |
263 | { | ||
264 | .card_name = "VGA", | 263 | .card_name = "VGA", |
265 | .probe = vga_probe, | 264 | .probe = vga_probe, |
266 | .set_mode = vga_set_mode, | 265 | .set_mode = vga_set_mode, |
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index ad7ddaaff588..9bc34e2033ec 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
@@ -1,54 +1,103 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.22-git14 | 3 | # Linux kernel version: 2.6.26-rc1 |
4 | # Fri Jul 20 09:53:15 2007 | 4 | # Sun May 4 19:59:02 2008 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | ||
6 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
8 | # CONFIG_X86_64 is not set | ||
9 | CONFIG_X86=y | ||
10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig" | ||
11 | # CONFIG_GENERIC_LOCKBREAK is not set | ||
7 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
13 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
8 | CONFIG_CLOCKSOURCE_WATCHDOG=y | 14 | CONFIG_CLOCKSOURCE_WATCHDOG=y |
9 | CONFIG_GENERIC_CLOCKEVENTS=y | 15 | CONFIG_GENERIC_CLOCKEVENTS=y |
10 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | 16 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y |
11 | CONFIG_LOCKDEP_SUPPORT=y | 17 | CONFIG_LOCKDEP_SUPPORT=y |
12 | CONFIG_STACKTRACE_SUPPORT=y | 18 | CONFIG_STACKTRACE_SUPPORT=y |
13 | CONFIG_SEMAPHORE_SLEEPERS=y | 19 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
14 | CONFIG_X86=y | 20 | CONFIG_FAST_CMPXCHG_LOCAL=y |
15 | CONFIG_MMU=y | 21 | CONFIG_MMU=y |
16 | CONFIG_ZONE_DMA=y | 22 | CONFIG_ZONE_DMA=y |
17 | CONFIG_QUICKLIST=y | ||
18 | CONFIG_GENERIC_ISA_DMA=y | 23 | CONFIG_GENERIC_ISA_DMA=y |
19 | CONFIG_GENERIC_IOMAP=y | 24 | CONFIG_GENERIC_IOMAP=y |
20 | CONFIG_GENERIC_BUG=y | 25 | CONFIG_GENERIC_BUG=y |
21 | CONFIG_GENERIC_HWEIGHT=y | 26 | CONFIG_GENERIC_HWEIGHT=y |
27 | # CONFIG_GENERIC_GPIO is not set | ||
22 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
23 | CONFIG_DMI=y | 29 | # CONFIG_RWSEM_GENERIC_SPINLOCK is not set |
24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 30 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
31 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
32 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y | ||
34 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
35 | # CONFIG_GENERIC_TIME_VSYSCALL is not set | ||
36 | CONFIG_ARCH_HAS_CPU_RELAX=y | ||
37 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | ||
38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
39 | # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set | ||
40 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
41 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
42 | # CONFIG_ZONE_DMA32 is not set | ||
43 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
44 | # CONFIG_AUDIT_ARCH is not set | ||
45 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | ||
47 | CONFIG_GENERIC_HARDIRQS=y | ||
48 | CONFIG_GENERIC_IRQ_PROBE=y | ||
49 | CONFIG_GENERIC_PENDING_IRQ=y | ||
50 | CONFIG_X86_SMP=y | ||
51 | CONFIG_X86_32_SMP=y | ||
52 | CONFIG_X86_HT=y | ||
53 | CONFIG_X86_BIOS_REBOOT=y | ||
54 | CONFIG_X86_TRAMPOLINE=y | ||
55 | CONFIG_KTIME_SCALAR=y | ||
25 | 56 | ||
26 | # | 57 | # |
27 | # Code maturity level options | 58 | # General setup |
28 | # | 59 | # |
29 | CONFIG_EXPERIMENTAL=y | 60 | CONFIG_EXPERIMENTAL=y |
30 | CONFIG_LOCK_KERNEL=y | 61 | CONFIG_LOCK_KERNEL=y |
31 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 62 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
32 | |||
33 | # | ||
34 | # General setup | ||
35 | # | ||
36 | CONFIG_LOCALVERSION="" | 63 | CONFIG_LOCALVERSION="" |
37 | CONFIG_LOCALVERSION_AUTO=y | 64 | # CONFIG_LOCALVERSION_AUTO is not set |
38 | CONFIG_SWAP=y | 65 | CONFIG_SWAP=y |
39 | CONFIG_SYSVIPC=y | 66 | CONFIG_SYSVIPC=y |
40 | CONFIG_SYSVIPC_SYSCTL=y | 67 | CONFIG_SYSVIPC_SYSCTL=y |
41 | CONFIG_POSIX_MQUEUE=y | 68 | CONFIG_POSIX_MQUEUE=y |
42 | # CONFIG_BSD_PROCESS_ACCT is not set | 69 | CONFIG_BSD_PROCESS_ACCT=y |
43 | # CONFIG_TASKSTATS is not set | 70 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
44 | # CONFIG_USER_NS is not set | 71 | CONFIG_TASKSTATS=y |
45 | # CONFIG_AUDIT is not set | 72 | CONFIG_TASK_DELAY_ACCT=y |
46 | CONFIG_IKCONFIG=y | 73 | CONFIG_TASK_XACCT=y |
47 | CONFIG_IKCONFIG_PROC=y | 74 | CONFIG_TASK_IO_ACCOUNTING=y |
48 | CONFIG_LOG_BUF_SHIFT=18 | 75 | CONFIG_AUDIT=y |
49 | # CONFIG_CPUSETS is not set | 76 | CONFIG_AUDITSYSCALL=y |
50 | CONFIG_SYSFS_DEPRECATED=y | 77 | CONFIG_AUDIT_TREE=y |
78 | # CONFIG_IKCONFIG is not set | ||
79 | CONFIG_LOG_BUF_SHIFT=17 | ||
80 | CONFIG_CGROUPS=y | ||
81 | # CONFIG_CGROUP_DEBUG is not set | ||
82 | CONFIG_CGROUP_NS=y | ||
83 | # CONFIG_CGROUP_DEVICE is not set | ||
84 | CONFIG_CPUSETS=y | ||
85 | CONFIG_GROUP_SCHED=y | ||
86 | CONFIG_FAIR_GROUP_SCHED=y | ||
87 | # CONFIG_RT_GROUP_SCHED is not set | ||
88 | # CONFIG_USER_SCHED is not set | ||
89 | CONFIG_CGROUP_SCHED=y | ||
90 | CONFIG_CGROUP_CPUACCT=y | ||
91 | CONFIG_RESOURCE_COUNTERS=y | ||
92 | # CONFIG_CGROUP_MEM_RES_CTLR is not set | ||
93 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
94 | CONFIG_PROC_PID_CPUSET=y | ||
51 | CONFIG_RELAY=y | 95 | CONFIG_RELAY=y |
96 | CONFIG_NAMESPACES=y | ||
97 | CONFIG_UTS_NS=y | ||
98 | CONFIG_IPC_NS=y | ||
99 | CONFIG_USER_NS=y | ||
100 | CONFIG_PID_NS=y | ||
52 | CONFIG_BLK_DEV_INITRD=y | 101 | CONFIG_BLK_DEV_INITRD=y |
53 | CONFIG_INITRAMFS_SOURCE="" | 102 | CONFIG_INITRAMFS_SOURCE="" |
54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 103 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -56,13 +105,15 @@ CONFIG_SYSCTL=y | |||
56 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
57 | CONFIG_UID16=y | 106 | CONFIG_UID16=y |
58 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
59 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
60 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | CONFIG_KALLSYMS_EXTRA_PASS=y |
62 | CONFIG_HOTPLUG=y | 112 | CONFIG_HOTPLUG=y |
63 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
64 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
65 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
116 | # CONFIG_COMPAT_BRK is not set | ||
66 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
67 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
68 | CONFIG_ANON_INODES=y | 119 | CONFIG_ANON_INODES=y |
@@ -76,6 +127,17 @@ CONFIG_SLUB_DEBUG=y | |||
76 | # CONFIG_SLAB is not set | 127 | # CONFIG_SLAB is not set |
77 | CONFIG_SLUB=y | 128 | CONFIG_SLUB=y |
78 | # CONFIG_SLOB is not set | 129 | # CONFIG_SLOB is not set |
130 | CONFIG_PROFILING=y | ||
131 | CONFIG_MARKERS=y | ||
132 | # CONFIG_OPROFILE is not set | ||
133 | CONFIG_HAVE_OPROFILE=y | ||
134 | CONFIG_KPROBES=y | ||
135 | CONFIG_KRETPROBES=y | ||
136 | CONFIG_HAVE_KPROBES=y | ||
137 | CONFIG_HAVE_KRETPROBES=y | ||
138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
139 | CONFIG_PROC_PAGE_MONITOR=y | ||
140 | CONFIG_SLABINFO=y | ||
79 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
80 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
81 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
@@ -87,10 +149,10 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
87 | # CONFIG_KMOD is not set | 149 | # CONFIG_KMOD is not set |
88 | CONFIG_STOP_MACHINE=y | 150 | CONFIG_STOP_MACHINE=y |
89 | CONFIG_BLOCK=y | 151 | CONFIG_BLOCK=y |
90 | CONFIG_LBD=y | 152 | # CONFIG_LBD is not set |
91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 153 | CONFIG_BLK_DEV_IO_TRACE=y |
92 | # CONFIG_LSF is not set | 154 | # CONFIG_LSF is not set |
93 | # CONFIG_BLK_DEV_BSG is not set | 155 | CONFIG_BLK_DEV_BSG=y |
94 | 156 | ||
95 | # | 157 | # |
96 | # IO Schedulers | 158 | # IO Schedulers |
@@ -103,7 +165,8 @@ CONFIG_IOSCHED_CFQ=y | |||
103 | # CONFIG_DEFAULT_DEADLINE is not set | 165 | # CONFIG_DEFAULT_DEADLINE is not set |
104 | CONFIG_DEFAULT_CFQ=y | 166 | CONFIG_DEFAULT_CFQ=y |
105 | # CONFIG_DEFAULT_NOOP is not set | 167 | # CONFIG_DEFAULT_NOOP is not set |
106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 168 | CONFIG_DEFAULT_IOSCHED="cfq" |
169 | CONFIG_CLASSIC_RCU=y | ||
107 | 170 | ||
108 | # | 171 | # |
109 | # Processor type and features | 172 | # Processor type and features |
@@ -111,18 +174,21 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
111 | CONFIG_TICK_ONESHOT=y | 174 | CONFIG_TICK_ONESHOT=y |
112 | CONFIG_NO_HZ=y | 175 | CONFIG_NO_HZ=y |
113 | CONFIG_HIGH_RES_TIMERS=y | 176 | CONFIG_HIGH_RES_TIMERS=y |
177 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
114 | CONFIG_SMP=y | 178 | CONFIG_SMP=y |
115 | # CONFIG_X86_PC is not set | 179 | CONFIG_X86_PC=y |
116 | # CONFIG_X86_ELAN is not set | 180 | # CONFIG_X86_ELAN is not set |
117 | # CONFIG_X86_VOYAGER is not set | 181 | # CONFIG_X86_VOYAGER is not set |
118 | # CONFIG_X86_NUMAQ is not set | 182 | # CONFIG_X86_NUMAQ is not set |
119 | # CONFIG_X86_SUMMIT is not set | 183 | # CONFIG_X86_SUMMIT is not set |
120 | # CONFIG_X86_BIGSMP is not set | 184 | # CONFIG_X86_BIGSMP is not set |
121 | # CONFIG_X86_VISWS is not set | 185 | # CONFIG_X86_VISWS is not set |
122 | CONFIG_X86_GENERICARCH=y | 186 | # CONFIG_X86_GENERICARCH is not set |
123 | # CONFIG_X86_ES7000 is not set | 187 | # CONFIG_X86_ES7000 is not set |
124 | # CONFIG_PARAVIRT is not set | 188 | # CONFIG_X86_RDC321X is not set |
125 | CONFIG_X86_CYCLONE_TIMER=y | 189 | # CONFIG_X86_VSMP is not set |
190 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
191 | # CONFIG_PARAVIRT_GUEST is not set | ||
126 | # CONFIG_M386 is not set | 192 | # CONFIG_M386 is not set |
127 | # CONFIG_M486 is not set | 193 | # CONFIG_M486 is not set |
128 | # CONFIG_M586 is not set | 194 | # CONFIG_M586 is not set |
@@ -130,9 +196,8 @@ CONFIG_X86_CYCLONE_TIMER=y | |||
130 | # CONFIG_M586MMX is not set | 196 | # CONFIG_M586MMX is not set |
131 | # CONFIG_M686 is not set | 197 | # CONFIG_M686 is not set |
132 | # CONFIG_MPENTIUMII is not set | 198 | # CONFIG_MPENTIUMII is not set |
133 | CONFIG_MPENTIUMIII=y | 199 | # CONFIG_MPENTIUMIII is not set |
134 | # CONFIG_MPENTIUMM is not set | 200 | # CONFIG_MPENTIUMM is not set |
135 | # CONFIG_MCORE2 is not set | ||
136 | # CONFIG_MPENTIUM4 is not set | 201 | # CONFIG_MPENTIUM4 is not set |
137 | # CONFIG_MK6 is not set | 202 | # CONFIG_MK6 is not set |
138 | # CONFIG_MK7 is not set | 203 | # CONFIG_MK7 is not set |
@@ -147,14 +212,14 @@ CONFIG_MPENTIUMIII=y | |||
147 | # CONFIG_MCYRIXIII is not set | 212 | # CONFIG_MCYRIXIII is not set |
148 | # CONFIG_MVIAC3_2 is not set | 213 | # CONFIG_MVIAC3_2 is not set |
149 | # CONFIG_MVIAC7 is not set | 214 | # CONFIG_MVIAC7 is not set |
150 | CONFIG_X86_GENERIC=y | 215 | # CONFIG_MPSC is not set |
216 | CONFIG_MCORE2=y | ||
217 | # CONFIG_GENERIC_CPU is not set | ||
218 | # CONFIG_X86_GENERIC is not set | ||
219 | CONFIG_X86_CPU=y | ||
151 | CONFIG_X86_CMPXCHG=y | 220 | CONFIG_X86_CMPXCHG=y |
152 | CONFIG_X86_L1_CACHE_SHIFT=7 | 221 | CONFIG_X86_L1_CACHE_SHIFT=6 |
153 | CONFIG_X86_XADD=y | 222 | CONFIG_X86_XADD=y |
154 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
155 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
156 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
157 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
158 | CONFIG_X86_WP_WORKS_OK=y | 223 | CONFIG_X86_WP_WORKS_OK=y |
159 | CONFIG_X86_INVLPG=y | 224 | CONFIG_X86_INVLPG=y |
160 | CONFIG_X86_BSWAP=y | 225 | CONFIG_X86_BSWAP=y |
@@ -162,106 +227,120 @@ CONFIG_X86_POPAD_OK=y | |||
162 | CONFIG_X86_GOOD_APIC=y | 227 | CONFIG_X86_GOOD_APIC=y |
163 | CONFIG_X86_INTEL_USERCOPY=y | 228 | CONFIG_X86_INTEL_USERCOPY=y |
164 | CONFIG_X86_USE_PPRO_CHECKSUM=y | 229 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
230 | CONFIG_X86_P6_NOP=y | ||
165 | CONFIG_X86_TSC=y | 231 | CONFIG_X86_TSC=y |
166 | CONFIG_X86_CMOV=y | 232 | CONFIG_X86_MINIMUM_CPU_FAMILY=6 |
167 | CONFIG_X86_MINIMUM_CPU_FAMILY=4 | 233 | CONFIG_X86_DEBUGCTLMSR=y |
168 | CONFIG_HPET_TIMER=y | 234 | CONFIG_HPET_TIMER=y |
169 | CONFIG_HPET_EMULATE_RTC=y | 235 | CONFIG_HPET_EMULATE_RTC=y |
170 | CONFIG_NR_CPUS=32 | 236 | CONFIG_DMI=y |
171 | CONFIG_SCHED_SMT=y | 237 | # CONFIG_IOMMU_HELPER is not set |
238 | CONFIG_NR_CPUS=4 | ||
239 | # CONFIG_SCHED_SMT is not set | ||
172 | CONFIG_SCHED_MC=y | 240 | CONFIG_SCHED_MC=y |
173 | # CONFIG_PREEMPT_NONE is not set | 241 | # CONFIG_PREEMPT_NONE is not set |
174 | CONFIG_PREEMPT_VOLUNTARY=y | 242 | CONFIG_PREEMPT_VOLUNTARY=y |
175 | # CONFIG_PREEMPT is not set | 243 | # CONFIG_PREEMPT is not set |
176 | CONFIG_PREEMPT_BKL=y | ||
177 | CONFIG_X86_LOCAL_APIC=y | 244 | CONFIG_X86_LOCAL_APIC=y |
178 | CONFIG_X86_IO_APIC=y | 245 | CONFIG_X86_IO_APIC=y |
179 | CONFIG_X86_MCE=y | 246 | # CONFIG_X86_MCE is not set |
180 | CONFIG_X86_MCE_NONFATAL=y | ||
181 | CONFIG_X86_MCE_P4THERMAL=y | ||
182 | CONFIG_VM86=y | 247 | CONFIG_VM86=y |
183 | # CONFIG_TOSHIBA is not set | 248 | # CONFIG_TOSHIBA is not set |
184 | # CONFIG_I8K is not set | 249 | # CONFIG_I8K is not set |
185 | # CONFIG_X86_REBOOTFIXUPS is not set | 250 | # CONFIG_X86_REBOOTFIXUPS is not set |
186 | CONFIG_MICROCODE=y | 251 | # CONFIG_MICROCODE is not set |
187 | CONFIG_MICROCODE_OLD_INTERFACE=y | ||
188 | CONFIG_X86_MSR=y | 252 | CONFIG_X86_MSR=y |
189 | CONFIG_X86_CPUID=y | 253 | CONFIG_X86_CPUID=y |
190 | |||
191 | # | ||
192 | # Firmware Drivers | ||
193 | # | ||
194 | # CONFIG_EDD is not set | ||
195 | # CONFIG_DELL_RBU is not set | ||
196 | # CONFIG_DCDBAS is not set | ||
197 | CONFIG_DMIID=y | ||
198 | # CONFIG_NOHIGHMEM is not set | 254 | # CONFIG_NOHIGHMEM is not set |
199 | CONFIG_HIGHMEM4G=y | 255 | CONFIG_HIGHMEM4G=y |
200 | # CONFIG_HIGHMEM64G is not set | 256 | # CONFIG_HIGHMEM64G is not set |
201 | CONFIG_PAGE_OFFSET=0xC0000000 | 257 | CONFIG_PAGE_OFFSET=0xC0000000 |
202 | CONFIG_HIGHMEM=y | 258 | CONFIG_HIGHMEM=y |
203 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 259 | CONFIG_NEED_NODE_MEMMAP_SIZE=y |
260 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
261 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
262 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
204 | CONFIG_SELECT_MEMORY_MODEL=y | 263 | CONFIG_SELECT_MEMORY_MODEL=y |
205 | CONFIG_FLATMEM_MANUAL=y | 264 | # CONFIG_FLATMEM_MANUAL is not set |
206 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 265 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
207 | # CONFIG_SPARSEMEM_MANUAL is not set | 266 | CONFIG_SPARSEMEM_MANUAL=y |
208 | CONFIG_FLATMEM=y | 267 | CONFIG_SPARSEMEM=y |
209 | CONFIG_FLAT_NODE_MEM_MAP=y | 268 | CONFIG_HAVE_MEMORY_PRESENT=y |
210 | # CONFIG_SPARSEMEM_STATIC is not set | 269 | CONFIG_SPARSEMEM_STATIC=y |
270 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
271 | |||
272 | # | ||
273 | # Memory hotplug is currently incompatible with Software Suspend | ||
274 | # | ||
275 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 276 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
212 | CONFIG_RESOURCES_64BIT=y | 277 | CONFIG_RESOURCES_64BIT=y |
213 | CONFIG_ZONE_DMA_FLAG=1 | 278 | CONFIG_ZONE_DMA_FLAG=1 |
214 | CONFIG_BOUNCE=y | 279 | CONFIG_BOUNCE=y |
215 | CONFIG_NR_QUICK=1 | ||
216 | CONFIG_VIRT_TO_BUS=y | 280 | CONFIG_VIRT_TO_BUS=y |
217 | # CONFIG_HIGHPTE is not set | 281 | # CONFIG_HIGHPTE is not set |
218 | # CONFIG_MATH_EMULATION is not set | 282 | # CONFIG_MATH_EMULATION is not set |
219 | CONFIG_MTRR=y | 283 | CONFIG_MTRR=y |
220 | # CONFIG_EFI is not set | 284 | # CONFIG_X86_PAT is not set |
285 | CONFIG_EFI=y | ||
221 | # CONFIG_IRQBALANCE is not set | 286 | # CONFIG_IRQBALANCE is not set |
222 | CONFIG_SECCOMP=y | 287 | CONFIG_SECCOMP=y |
223 | # CONFIG_HZ_100 is not set | 288 | # CONFIG_HZ_100 is not set |
224 | CONFIG_HZ_250=y | 289 | # CONFIG_HZ_250 is not set |
225 | # CONFIG_HZ_300 is not set | 290 | # CONFIG_HZ_300 is not set |
226 | # CONFIG_HZ_1000 is not set | 291 | CONFIG_HZ_1000=y |
227 | CONFIG_HZ=250 | 292 | CONFIG_HZ=1000 |
228 | # CONFIG_KEXEC is not set | 293 | CONFIG_SCHED_HRTICK=y |
229 | # CONFIG_CRASH_DUMP is not set | 294 | CONFIG_KEXEC=y |
230 | CONFIG_PHYSICAL_START=0x100000 | 295 | CONFIG_CRASH_DUMP=y |
231 | # CONFIG_RELOCATABLE is not set | 296 | CONFIG_PHYSICAL_START=0x1000000 |
232 | CONFIG_PHYSICAL_ALIGN=0x100000 | 297 | CONFIG_RELOCATABLE=y |
233 | # CONFIG_HOTPLUG_CPU is not set | 298 | CONFIG_PHYSICAL_ALIGN=0x200000 |
234 | CONFIG_COMPAT_VDSO=y | 299 | CONFIG_HOTPLUG_CPU=y |
300 | # CONFIG_COMPAT_VDSO is not set | ||
235 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 301 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
236 | 302 | ||
237 | # | 303 | # |
238 | # Power management options (ACPI, APM) | 304 | # Power management options |
239 | # | 305 | # |
240 | CONFIG_PM=y | 306 | CONFIG_PM=y |
241 | CONFIG_PM_LEGACY=y | 307 | CONFIG_PM_DEBUG=y |
242 | # CONFIG_PM_DEBUG is not set | 308 | # CONFIG_PM_VERBOSE is not set |
243 | 309 | CONFIG_CAN_PM_TRACE=y | |
244 | # | 310 | CONFIG_PM_TRACE=y |
245 | # ACPI (Advanced Configuration and Power Interface) Support | 311 | CONFIG_PM_TRACE_RTC=y |
246 | # | 312 | CONFIG_PM_SLEEP_SMP=y |
313 | CONFIG_PM_SLEEP=y | ||
314 | CONFIG_SUSPEND=y | ||
315 | CONFIG_SUSPEND_FREEZER=y | ||
316 | CONFIG_HIBERNATION=y | ||
317 | CONFIG_PM_STD_PARTITION="" | ||
247 | CONFIG_ACPI=y | 318 | CONFIG_ACPI=y |
319 | CONFIG_ACPI_SLEEP=y | ||
248 | CONFIG_ACPI_PROCFS=y | 320 | CONFIG_ACPI_PROCFS=y |
321 | CONFIG_ACPI_PROCFS_POWER=y | ||
322 | CONFIG_ACPI_SYSFS_POWER=y | ||
323 | CONFIG_ACPI_PROC_EVENT=y | ||
249 | CONFIG_ACPI_AC=y | 324 | CONFIG_ACPI_AC=y |
250 | CONFIG_ACPI_BATTERY=y | 325 | CONFIG_ACPI_BATTERY=y |
251 | CONFIG_ACPI_BUTTON=y | 326 | CONFIG_ACPI_BUTTON=y |
252 | CONFIG_ACPI_FAN=y | 327 | CONFIG_ACPI_FAN=y |
253 | # CONFIG_ACPI_DOCK is not set | 328 | CONFIG_ACPI_DOCK=y |
329 | # CONFIG_ACPI_BAY is not set | ||
254 | CONFIG_ACPI_PROCESSOR=y | 330 | CONFIG_ACPI_PROCESSOR=y |
331 | CONFIG_ACPI_HOTPLUG_CPU=y | ||
255 | CONFIG_ACPI_THERMAL=y | 332 | CONFIG_ACPI_THERMAL=y |
333 | # CONFIG_ACPI_WMI is not set | ||
256 | # CONFIG_ACPI_ASUS is not set | 334 | # CONFIG_ACPI_ASUS is not set |
257 | # CONFIG_ACPI_TOSHIBA is not set | 335 | # CONFIG_ACPI_TOSHIBA is not set |
258 | CONFIG_ACPI_BLACKLIST_YEAR=2001 | 336 | # CONFIG_ACPI_CUSTOM_DSDT is not set |
259 | CONFIG_ACPI_DEBUG=y | 337 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
338 | # CONFIG_ACPI_DEBUG is not set | ||
260 | CONFIG_ACPI_EC=y | 339 | CONFIG_ACPI_EC=y |
261 | CONFIG_ACPI_POWER=y | 340 | CONFIG_ACPI_POWER=y |
262 | CONFIG_ACPI_SYSTEM=y | 341 | CONFIG_ACPI_SYSTEM=y |
263 | CONFIG_X86_PM_TIMER=y | 342 | CONFIG_X86_PM_TIMER=y |
264 | # CONFIG_ACPI_CONTAINER is not set | 343 | CONFIG_ACPI_CONTAINER=y |
265 | # CONFIG_ACPI_SBS is not set | 344 | # CONFIG_ACPI_SBS is not set |
266 | # CONFIG_APM is not set | 345 | # CONFIG_APM is not set |
267 | 346 | ||
@@ -271,15 +350,17 @@ CONFIG_X86_PM_TIMER=y | |||
271 | CONFIG_CPU_FREQ=y | 350 | CONFIG_CPU_FREQ=y |
272 | CONFIG_CPU_FREQ_TABLE=y | 351 | CONFIG_CPU_FREQ_TABLE=y |
273 | CONFIG_CPU_FREQ_DEBUG=y | 352 | CONFIG_CPU_FREQ_DEBUG=y |
274 | CONFIG_CPU_FREQ_STAT=y | 353 | # CONFIG_CPU_FREQ_STAT is not set |
275 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 354 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
276 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 355 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set |
277 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 356 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y |
357 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
358 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
278 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 359 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
279 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 360 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
280 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 361 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
281 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 362 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
282 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 363 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
283 | 364 | ||
284 | # | 365 | # |
285 | # CPUFreq processor drivers | 366 | # CPUFreq processor drivers |
@@ -287,8 +368,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | |||
287 | CONFIG_X86_ACPI_CPUFREQ=y | 368 | CONFIG_X86_ACPI_CPUFREQ=y |
288 | # CONFIG_X86_POWERNOW_K6 is not set | 369 | # CONFIG_X86_POWERNOW_K6 is not set |
289 | # CONFIG_X86_POWERNOW_K7 is not set | 370 | # CONFIG_X86_POWERNOW_K7 is not set |
290 | CONFIG_X86_POWERNOW_K8=y | 371 | # CONFIG_X86_POWERNOW_K8 is not set |
291 | CONFIG_X86_POWERNOW_K8_ACPI=y | ||
292 | # CONFIG_X86_GX_SUSPMOD is not set | 372 | # CONFIG_X86_GX_SUSPMOD is not set |
293 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | 373 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set |
294 | # CONFIG_X86_SPEEDSTEP_ICH is not set | 374 | # CONFIG_X86_SPEEDSTEP_ICH is not set |
@@ -302,43 +382,72 @@ CONFIG_X86_POWERNOW_K8_ACPI=y | |||
302 | # | 382 | # |
303 | # shared options | 383 | # shared options |
304 | # | 384 | # |
305 | CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | 385 | # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set |
306 | # CONFIG_X86_SPEEDSTEP_LIB is not set | 386 | # CONFIG_X86_SPEEDSTEP_LIB is not set |
387 | CONFIG_CPU_IDLE=y | ||
388 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
389 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
307 | 390 | ||
308 | # | 391 | # |
309 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 392 | # Bus options (PCI etc.) |
310 | # | 393 | # |
311 | CONFIG_PCI=y | 394 | CONFIG_PCI=y |
312 | # CONFIG_PCI_GOBIOS is not set | 395 | # CONFIG_PCI_GOBIOS is not set |
313 | # CONFIG_PCI_GOMMCONFIG is not set | 396 | # CONFIG_PCI_GOMMCONFIG is not set |
314 | # CONFIG_PCI_GODIRECT is not set | 397 | # CONFIG_PCI_GODIRECT is not set |
315 | CONFIG_PCI_GOANY=y | 398 | CONFIG_PCI_GOANY=y |
399 | # CONFIG_PCI_GOOLPC is not set | ||
316 | CONFIG_PCI_BIOS=y | 400 | CONFIG_PCI_BIOS=y |
317 | CONFIG_PCI_DIRECT=y | 401 | CONFIG_PCI_DIRECT=y |
318 | CONFIG_PCI_MMCONFIG=y | 402 | CONFIG_PCI_MMCONFIG=y |
319 | # CONFIG_PCIEPORTBUS is not set | 403 | CONFIG_PCI_DOMAINS=y |
404 | CONFIG_PCIEPORTBUS=y | ||
405 | # CONFIG_HOTPLUG_PCI_PCIE is not set | ||
406 | CONFIG_PCIEAER=y | ||
407 | # CONFIG_PCIEASPM is not set | ||
320 | CONFIG_ARCH_SUPPORTS_MSI=y | 408 | CONFIG_ARCH_SUPPORTS_MSI=y |
321 | CONFIG_PCI_MSI=y | 409 | CONFIG_PCI_MSI=y |
410 | # CONFIG_PCI_LEGACY is not set | ||
322 | # CONFIG_PCI_DEBUG is not set | 411 | # CONFIG_PCI_DEBUG is not set |
323 | # CONFIG_HT_IRQ is not set | 412 | CONFIG_HT_IRQ=y |
324 | CONFIG_ISA_DMA_API=y | 413 | CONFIG_ISA_DMA_API=y |
325 | # CONFIG_ISA is not set | 414 | # CONFIG_ISA is not set |
326 | # CONFIG_MCA is not set | 415 | # CONFIG_MCA is not set |
327 | # CONFIG_SCx200 is not set | 416 | # CONFIG_SCx200 is not set |
417 | # CONFIG_OLPC is not set | ||
328 | CONFIG_K8_NB=y | 418 | CONFIG_K8_NB=y |
329 | 419 | CONFIG_PCCARD=y | |
330 | # | 420 | # CONFIG_PCMCIA_DEBUG is not set |
331 | # PCCARD (PCMCIA/CardBus) support | 421 | CONFIG_PCMCIA=y |
332 | # | 422 | CONFIG_PCMCIA_LOAD_CIS=y |
333 | # CONFIG_PCCARD is not set | 423 | CONFIG_PCMCIA_IOCTL=y |
334 | # CONFIG_HOTPLUG_PCI is not set | 424 | CONFIG_CARDBUS=y |
335 | 425 | ||
336 | # | 426 | # |
337 | # Executable file formats | 427 | # PC-card bridges |
428 | # | ||
429 | CONFIG_YENTA=y | ||
430 | CONFIG_YENTA_O2=y | ||
431 | CONFIG_YENTA_RICOH=y | ||
432 | CONFIG_YENTA_TI=y | ||
433 | CONFIG_YENTA_ENE_TUNE=y | ||
434 | CONFIG_YENTA_TOSHIBA=y | ||
435 | # CONFIG_PD6729 is not set | ||
436 | # CONFIG_I82092 is not set | ||
437 | CONFIG_PCCARD_NONSTATIC=y | ||
438 | CONFIG_HOTPLUG_PCI=y | ||
439 | # CONFIG_HOTPLUG_PCI_FAKE is not set | ||
440 | # CONFIG_HOTPLUG_PCI_IBM is not set | ||
441 | # CONFIG_HOTPLUG_PCI_ACPI is not set | ||
442 | # CONFIG_HOTPLUG_PCI_CPCI is not set | ||
443 | # CONFIG_HOTPLUG_PCI_SHPC is not set | ||
444 | |||
445 | # | ||
446 | # Executable file formats / Emulations | ||
338 | # | 447 | # |
339 | CONFIG_BINFMT_ELF=y | 448 | CONFIG_BINFMT_ELF=y |
340 | # CONFIG_BINFMT_AOUT is not set | 449 | # CONFIG_BINFMT_AOUT is not set |
341 | # CONFIG_BINFMT_MISC is not set | 450 | CONFIG_BINFMT_MISC=y |
342 | 451 | ||
343 | # | 452 | # |
344 | # Networking | 453 | # Networking |
@@ -349,59 +458,142 @@ CONFIG_NET=y | |||
349 | # Networking options | 458 | # Networking options |
350 | # | 459 | # |
351 | CONFIG_PACKET=y | 460 | CONFIG_PACKET=y |
352 | # CONFIG_PACKET_MMAP is not set | 461 | CONFIG_PACKET_MMAP=y |
353 | CONFIG_UNIX=y | 462 | CONFIG_UNIX=y |
354 | CONFIG_XFRM=y | 463 | CONFIG_XFRM=y |
355 | # CONFIG_XFRM_USER is not set | 464 | CONFIG_XFRM_USER=y |
356 | # CONFIG_XFRM_SUB_POLICY is not set | 465 | # CONFIG_XFRM_SUB_POLICY is not set |
357 | # CONFIG_XFRM_MIGRATE is not set | 466 | # CONFIG_XFRM_MIGRATE is not set |
467 | # CONFIG_XFRM_STATISTICS is not set | ||
358 | # CONFIG_NET_KEY is not set | 468 | # CONFIG_NET_KEY is not set |
359 | CONFIG_INET=y | 469 | CONFIG_INET=y |
360 | CONFIG_IP_MULTICAST=y | 470 | CONFIG_IP_MULTICAST=y |
361 | # CONFIG_IP_ADVANCED_ROUTER is not set | 471 | CONFIG_IP_ADVANCED_ROUTER=y |
472 | CONFIG_ASK_IP_FIB_HASH=y | ||
473 | # CONFIG_IP_FIB_TRIE is not set | ||
362 | CONFIG_IP_FIB_HASH=y | 474 | CONFIG_IP_FIB_HASH=y |
363 | CONFIG_IP_PNP=y | 475 | CONFIG_IP_MULTIPLE_TABLES=y |
364 | CONFIG_IP_PNP_DHCP=y | 476 | CONFIG_IP_ROUTE_MULTIPATH=y |
365 | # CONFIG_IP_PNP_BOOTP is not set | 477 | CONFIG_IP_ROUTE_VERBOSE=y |
366 | # CONFIG_IP_PNP_RARP is not set | 478 | # CONFIG_IP_PNP is not set |
367 | # CONFIG_NET_IPIP is not set | 479 | # CONFIG_NET_IPIP is not set |
368 | # CONFIG_NET_IPGRE is not set | 480 | # CONFIG_NET_IPGRE is not set |
369 | # CONFIG_IP_MROUTE is not set | 481 | CONFIG_IP_MROUTE=y |
482 | CONFIG_IP_PIMSM_V1=y | ||
483 | CONFIG_IP_PIMSM_V2=y | ||
370 | # CONFIG_ARPD is not set | 484 | # CONFIG_ARPD is not set |
371 | # CONFIG_SYN_COOKIES is not set | 485 | CONFIG_SYN_COOKIES=y |
372 | # CONFIG_INET_AH is not set | 486 | # CONFIG_INET_AH is not set |
373 | # CONFIG_INET_ESP is not set | 487 | # CONFIG_INET_ESP is not set |
374 | # CONFIG_INET_IPCOMP is not set | 488 | # CONFIG_INET_IPCOMP is not set |
375 | # CONFIG_INET_XFRM_TUNNEL is not set | 489 | # CONFIG_INET_XFRM_TUNNEL is not set |
376 | CONFIG_INET_TUNNEL=y | 490 | CONFIG_INET_TUNNEL=y |
377 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 491 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
378 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 492 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
379 | # CONFIG_INET_XFRM_MODE_BEET is not set | 493 | # CONFIG_INET_XFRM_MODE_BEET is not set |
380 | CONFIG_INET_DIAG=y | 494 | CONFIG_INET_LRO=y |
381 | CONFIG_INET_TCP_DIAG=y | 495 | # CONFIG_INET_DIAG is not set |
382 | # CONFIG_TCP_CONG_ADVANCED is not set | 496 | CONFIG_TCP_CONG_ADVANCED=y |
497 | # CONFIG_TCP_CONG_BIC is not set | ||
383 | CONFIG_TCP_CONG_CUBIC=y | 498 | CONFIG_TCP_CONG_CUBIC=y |
499 | # CONFIG_TCP_CONG_WESTWOOD is not set | ||
500 | # CONFIG_TCP_CONG_HTCP is not set | ||
501 | # CONFIG_TCP_CONG_HSTCP is not set | ||
502 | # CONFIG_TCP_CONG_HYBLA is not set | ||
503 | # CONFIG_TCP_CONG_VEGAS is not set | ||
504 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
505 | # CONFIG_TCP_CONG_LP is not set | ||
506 | # CONFIG_TCP_CONG_VENO is not set | ||
507 | # CONFIG_TCP_CONG_YEAH is not set | ||
508 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
509 | # CONFIG_DEFAULT_BIC is not set | ||
510 | CONFIG_DEFAULT_CUBIC=y | ||
511 | # CONFIG_DEFAULT_HTCP is not set | ||
512 | # CONFIG_DEFAULT_VEGAS is not set | ||
513 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
514 | # CONFIG_DEFAULT_RENO is not set | ||
384 | CONFIG_DEFAULT_TCP_CONG="cubic" | 515 | CONFIG_DEFAULT_TCP_CONG="cubic" |
385 | # CONFIG_TCP_MD5SIG is not set | 516 | CONFIG_TCP_MD5SIG=y |
517 | # CONFIG_IP_VS is not set | ||
386 | CONFIG_IPV6=y | 518 | CONFIG_IPV6=y |
387 | # CONFIG_IPV6_PRIVACY is not set | 519 | # CONFIG_IPV6_PRIVACY is not set |
388 | # CONFIG_IPV6_ROUTER_PREF is not set | 520 | # CONFIG_IPV6_ROUTER_PREF is not set |
389 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | 521 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set |
390 | # CONFIG_INET6_AH is not set | 522 | CONFIG_INET6_AH=y |
391 | # CONFIG_INET6_ESP is not set | 523 | CONFIG_INET6_ESP=y |
392 | # CONFIG_INET6_IPCOMP is not set | 524 | # CONFIG_INET6_IPCOMP is not set |
393 | # CONFIG_IPV6_MIP6 is not set | 525 | # CONFIG_IPV6_MIP6 is not set |
394 | # CONFIG_INET6_XFRM_TUNNEL is not set | 526 | # CONFIG_INET6_XFRM_TUNNEL is not set |
395 | # CONFIG_INET6_TUNNEL is not set | 527 | # CONFIG_INET6_TUNNEL is not set |
396 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | 528 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
397 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 529 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
398 | # CONFIG_INET6_XFRM_MODE_BEET is not set | 530 | CONFIG_INET6_XFRM_MODE_BEET=y |
399 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 531 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
400 | CONFIG_IPV6_SIT=y | 532 | CONFIG_IPV6_SIT=y |
533 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
401 | # CONFIG_IPV6_TUNNEL is not set | 534 | # CONFIG_IPV6_TUNNEL is not set |
402 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 535 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
403 | # CONFIG_NETWORK_SECMARK is not set | 536 | # CONFIG_IPV6_MROUTE is not set |
404 | # CONFIG_NETFILTER is not set | 537 | CONFIG_NETLABEL=y |
538 | CONFIG_NETWORK_SECMARK=y | ||
539 | CONFIG_NETFILTER=y | ||
540 | # CONFIG_NETFILTER_DEBUG is not set | ||
541 | # CONFIG_NETFILTER_ADVANCED is not set | ||
542 | |||
543 | # | ||
544 | # Core Netfilter Configuration | ||
545 | # | ||
546 | CONFIG_NETFILTER_NETLINK=y | ||
547 | CONFIG_NETFILTER_NETLINK_LOG=y | ||
548 | CONFIG_NF_CONNTRACK=y | ||
549 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
550 | CONFIG_NF_CONNTRACK_FTP=y | ||
551 | CONFIG_NF_CONNTRACK_IRC=y | ||
552 | CONFIG_NF_CONNTRACK_SIP=y | ||
553 | CONFIG_NF_CT_NETLINK=y | ||
554 | CONFIG_NETFILTER_XTABLES=y | ||
555 | CONFIG_NETFILTER_XT_TARGET_MARK=y | ||
556 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y | ||
557 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y | ||
558 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
559 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y | ||
560 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y | ||
561 | CONFIG_NETFILTER_XT_MATCH_MARK=y | ||
562 | CONFIG_NETFILTER_XT_MATCH_POLICY=y | ||
563 | CONFIG_NETFILTER_XT_MATCH_STATE=y | ||
564 | |||
565 | # | ||
566 | # IP: Netfilter Configuration | ||
567 | # | ||
568 | CONFIG_NF_CONNTRACK_IPV4=y | ||
569 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
570 | CONFIG_IP_NF_IPTABLES=y | ||
571 | CONFIG_IP_NF_FILTER=y | ||
572 | CONFIG_IP_NF_TARGET_REJECT=y | ||
573 | CONFIG_IP_NF_TARGET_LOG=y | ||
574 | CONFIG_IP_NF_TARGET_ULOG=y | ||
575 | CONFIG_NF_NAT=y | ||
576 | CONFIG_NF_NAT_NEEDED=y | ||
577 | CONFIG_IP_NF_TARGET_MASQUERADE=y | ||
578 | CONFIG_NF_NAT_FTP=y | ||
579 | CONFIG_NF_NAT_IRC=y | ||
580 | # CONFIG_NF_NAT_TFTP is not set | ||
581 | # CONFIG_NF_NAT_AMANDA is not set | ||
582 | # CONFIG_NF_NAT_PPTP is not set | ||
583 | # CONFIG_NF_NAT_H323 is not set | ||
584 | CONFIG_NF_NAT_SIP=y | ||
585 | CONFIG_IP_NF_MANGLE=y | ||
586 | |||
587 | # | ||
588 | # IPv6: Netfilter Configuration | ||
589 | # | ||
590 | CONFIG_NF_CONNTRACK_IPV6=y | ||
591 | CONFIG_IP6_NF_IPTABLES=y | ||
592 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y | ||
593 | CONFIG_IP6_NF_FILTER=y | ||
594 | CONFIG_IP6_NF_TARGET_LOG=y | ||
595 | CONFIG_IP6_NF_TARGET_REJECT=y | ||
596 | CONFIG_IP6_NF_MANGLE=y | ||
405 | # CONFIG_IP_DCCP is not set | 597 | # CONFIG_IP_DCCP is not set |
406 | # CONFIG_IP_SCTP is not set | 598 | # CONFIG_IP_SCTP is not set |
407 | # CONFIG_TIPC is not set | 599 | # CONFIG_TIPC is not set |
@@ -409,6 +601,7 @@ CONFIG_IPV6_SIT=y | |||
409 | # CONFIG_BRIDGE is not set | 601 | # CONFIG_BRIDGE is not set |
410 | # CONFIG_VLAN_8021Q is not set | 602 | # CONFIG_VLAN_8021Q is not set |
411 | # CONFIG_DECNET is not set | 603 | # CONFIG_DECNET is not set |
604 | CONFIG_LLC=y | ||
412 | # CONFIG_LLC2 is not set | 605 | # CONFIG_LLC2 is not set |
413 | # CONFIG_IPX is not set | 606 | # CONFIG_IPX is not set |
414 | # CONFIG_ATALK is not set | 607 | # CONFIG_ATALK is not set |
@@ -416,28 +609,99 @@ CONFIG_IPV6_SIT=y | |||
416 | # CONFIG_LAPB is not set | 609 | # CONFIG_LAPB is not set |
417 | # CONFIG_ECONET is not set | 610 | # CONFIG_ECONET is not set |
418 | # CONFIG_WAN_ROUTER is not set | 611 | # CONFIG_WAN_ROUTER is not set |
419 | 612 | CONFIG_NET_SCHED=y | |
420 | # | 613 | |
421 | # QoS and/or fair queueing | 614 | # |
422 | # | 615 | # Queueing/Scheduling |
423 | # CONFIG_NET_SCHED is not set | 616 | # |
617 | # CONFIG_NET_SCH_CBQ is not set | ||
618 | # CONFIG_NET_SCH_HTB is not set | ||
619 | # CONFIG_NET_SCH_HFSC is not set | ||
620 | # CONFIG_NET_SCH_PRIO is not set | ||
621 | # CONFIG_NET_SCH_RR is not set | ||
622 | # CONFIG_NET_SCH_RED is not set | ||
623 | # CONFIG_NET_SCH_SFQ is not set | ||
624 | # CONFIG_NET_SCH_TEQL is not set | ||
625 | # CONFIG_NET_SCH_TBF is not set | ||
626 | # CONFIG_NET_SCH_GRED is not set | ||
627 | # CONFIG_NET_SCH_DSMARK is not set | ||
628 | # CONFIG_NET_SCH_NETEM is not set | ||
629 | # CONFIG_NET_SCH_INGRESS is not set | ||
630 | |||
631 | # | ||
632 | # Classification | ||
633 | # | ||
634 | CONFIG_NET_CLS=y | ||
635 | # CONFIG_NET_CLS_BASIC is not set | ||
636 | # CONFIG_NET_CLS_TCINDEX is not set | ||
637 | # CONFIG_NET_CLS_ROUTE4 is not set | ||
638 | # CONFIG_NET_CLS_FW is not set | ||
639 | # CONFIG_NET_CLS_U32 is not set | ||
640 | # CONFIG_NET_CLS_RSVP is not set | ||
641 | # CONFIG_NET_CLS_RSVP6 is not set | ||
642 | # CONFIG_NET_CLS_FLOW is not set | ||
643 | CONFIG_NET_EMATCH=y | ||
644 | CONFIG_NET_EMATCH_STACK=32 | ||
645 | # CONFIG_NET_EMATCH_CMP is not set | ||
646 | # CONFIG_NET_EMATCH_NBYTE is not set | ||
647 | # CONFIG_NET_EMATCH_U32 is not set | ||
648 | # CONFIG_NET_EMATCH_META is not set | ||
649 | # CONFIG_NET_EMATCH_TEXT is not set | ||
650 | CONFIG_NET_CLS_ACT=y | ||
651 | # CONFIG_NET_ACT_POLICE is not set | ||
652 | # CONFIG_NET_ACT_GACT is not set | ||
653 | # CONFIG_NET_ACT_MIRRED is not set | ||
654 | # CONFIG_NET_ACT_IPT is not set | ||
655 | # CONFIG_NET_ACT_NAT is not set | ||
656 | # CONFIG_NET_ACT_PEDIT is not set | ||
657 | # CONFIG_NET_ACT_SIMP is not set | ||
658 | CONFIG_NET_SCH_FIFO=y | ||
424 | 659 | ||
425 | # | 660 | # |
426 | # Network testing | 661 | # Network testing |
427 | # | 662 | # |
428 | # CONFIG_NET_PKTGEN is not set | 663 | # CONFIG_NET_PKTGEN is not set |
429 | # CONFIG_NET_TCPPROBE is not set | 664 | # CONFIG_NET_TCPPROBE is not set |
430 | # CONFIG_HAMRADIO is not set | 665 | CONFIG_HAMRADIO=y |
666 | |||
667 | # | ||
668 | # Packet Radio protocols | ||
669 | # | ||
670 | # CONFIG_AX25 is not set | ||
671 | # CONFIG_CAN is not set | ||
431 | # CONFIG_IRDA is not set | 672 | # CONFIG_IRDA is not set |
432 | # CONFIG_BT is not set | 673 | # CONFIG_BT is not set |
433 | # CONFIG_AF_RXRPC is not set | 674 | # CONFIG_AF_RXRPC is not set |
675 | CONFIG_FIB_RULES=y | ||
434 | 676 | ||
435 | # | 677 | # |
436 | # Wireless | 678 | # Wireless |
437 | # | 679 | # |
438 | # CONFIG_CFG80211 is not set | 680 | CONFIG_CFG80211=y |
439 | # CONFIG_WIRELESS_EXT is not set | 681 | CONFIG_NL80211=y |
440 | # CONFIG_MAC80211 is not set | 682 | CONFIG_WIRELESS_EXT=y |
683 | CONFIG_MAC80211=y | ||
684 | |||
685 | # | ||
686 | # Rate control algorithm selection | ||
687 | # | ||
688 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
689 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
690 | |||
691 | # | ||
692 | # Selecting 'y' for an algorithm will | ||
693 | # | ||
694 | |||
695 | # | ||
696 | # build the algorithm into mac80211. | ||
697 | # | ||
698 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
699 | CONFIG_MAC80211_RC_PID=y | ||
700 | # CONFIG_MAC80211_MESH is not set | ||
701 | CONFIG_MAC80211_LEDS=y | ||
702 | # CONFIG_MAC80211_DEBUGFS is not set | ||
703 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
704 | # CONFIG_MAC80211_DEBUG is not set | ||
441 | # CONFIG_IEEE80211 is not set | 705 | # CONFIG_IEEE80211 is not set |
442 | # CONFIG_RFKILL is not set | 706 | # CONFIG_RFKILL is not set |
443 | # CONFIG_NET_9P is not set | 707 | # CONFIG_NET_9P is not set |
@@ -449,13 +713,15 @@ CONFIG_IPV6_SIT=y | |||
449 | # | 713 | # |
450 | # Generic Driver Options | 714 | # Generic Driver Options |
451 | # | 715 | # |
716 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
452 | CONFIG_STANDALONE=y | 717 | CONFIG_STANDALONE=y |
453 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 718 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
454 | CONFIG_FW_LOADER=y | 719 | CONFIG_FW_LOADER=y |
455 | # CONFIG_DEBUG_DRIVER is not set | 720 | # CONFIG_DEBUG_DRIVER is not set |
456 | # CONFIG_DEBUG_DEVRES is not set | 721 | CONFIG_DEBUG_DEVRES=y |
457 | # CONFIG_SYS_HYPERVISOR is not set | 722 | # CONFIG_SYS_HYPERVISOR is not set |
458 | # CONFIG_CONNECTOR is not set | 723 | CONFIG_CONNECTOR=y |
724 | CONFIG_PROC_EVENTS=y | ||
459 | # CONFIG_MTD is not set | 725 | # CONFIG_MTD is not set |
460 | # CONFIG_PARPORT is not set | 726 | # CONFIG_PARPORT is not set |
461 | CONFIG_PNP=y | 727 | CONFIG_PNP=y |
@@ -466,7 +732,7 @@ CONFIG_PNP=y | |||
466 | # | 732 | # |
467 | CONFIG_PNPACPI=y | 733 | CONFIG_PNPACPI=y |
468 | CONFIG_BLK_DEV=y | 734 | CONFIG_BLK_DEV=y |
469 | CONFIG_BLK_DEV_FD=y | 735 | # CONFIG_BLK_DEV_FD is not set |
470 | # CONFIG_BLK_CPQ_DA is not set | 736 | # CONFIG_BLK_CPQ_DA is not set |
471 | # CONFIG_BLK_CPQ_CISS_DA is not set | 737 | # CONFIG_BLK_CPQ_CISS_DA is not set |
472 | # CONFIG_BLK_DEV_DAC960 is not set | 738 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -479,8 +745,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
479 | # CONFIG_BLK_DEV_UB is not set | 745 | # CONFIG_BLK_DEV_UB is not set |
480 | CONFIG_BLK_DEV_RAM=y | 746 | CONFIG_BLK_DEV_RAM=y |
481 | CONFIG_BLK_DEV_RAM_COUNT=16 | 747 | CONFIG_BLK_DEV_RAM_COUNT=16 |
482 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 748 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
483 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 749 | # CONFIG_BLK_DEV_XIP is not set |
484 | # CONFIG_CDROM_PKTCDVD is not set | 750 | # CONFIG_CDROM_PKTCDVD is not set |
485 | # CONFIG_ATA_OVER_ETH is not set | 751 | # CONFIG_ATA_OVER_ETH is not set |
486 | CONFIG_MISC_DEVICES=y | 752 | CONFIG_MISC_DEVICES=y |
@@ -489,73 +755,17 @@ CONFIG_MISC_DEVICES=y | |||
489 | # CONFIG_EEPROM_93CX6 is not set | 755 | # CONFIG_EEPROM_93CX6 is not set |
490 | # CONFIG_SGI_IOC4 is not set | 756 | # CONFIG_SGI_IOC4 is not set |
491 | # CONFIG_TIFM_CORE is not set | 757 | # CONFIG_TIFM_CORE is not set |
758 | # CONFIG_ACER_WMI is not set | ||
759 | # CONFIG_ASUS_LAPTOP is not set | ||
760 | # CONFIG_FUJITSU_LAPTOP is not set | ||
761 | # CONFIG_TC1100_WMI is not set | ||
762 | # CONFIG_MSI_LAPTOP is not set | ||
492 | # CONFIG_SONY_LAPTOP is not set | 763 | # CONFIG_SONY_LAPTOP is not set |
493 | # CONFIG_THINKPAD_ACPI is not set | 764 | # CONFIG_THINKPAD_ACPI is not set |
494 | CONFIG_IDE=y | 765 | # CONFIG_INTEL_MENLOW is not set |
495 | CONFIG_BLK_DEV_IDE=y | 766 | # CONFIG_ENCLOSURE_SERVICES is not set |
496 | 767 | CONFIG_HAVE_IDE=y | |
497 | # | 768 | # CONFIG_IDE is not set |
498 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
499 | # | ||
500 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
501 | # CONFIG_BLK_DEV_HD_IDE is not set | ||
502 | CONFIG_BLK_DEV_IDEDISK=y | ||
503 | CONFIG_IDEDISK_MULTI_MODE=y | ||
504 | CONFIG_BLK_DEV_IDECD=y | ||
505 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
506 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
507 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
508 | CONFIG_BLK_DEV_IDEACPI=y | ||
509 | # CONFIG_IDE_TASK_IOCTL is not set | ||
510 | CONFIG_IDE_PROC_FS=y | ||
511 | |||
512 | # | ||
513 | # IDE chipset support/bugfixes | ||
514 | # | ||
515 | CONFIG_IDE_GENERIC=y | ||
516 | # CONFIG_BLK_DEV_CMD640 is not set | ||
517 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
518 | CONFIG_BLK_DEV_IDEPCI=y | ||
519 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
520 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
521 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
522 | # CONFIG_BLK_DEV_GENERIC is not set | ||
523 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
524 | # CONFIG_BLK_DEV_RZ1000 is not set | ||
525 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
526 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
527 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
528 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
529 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
530 | CONFIG_BLK_DEV_AMD74XX=y | ||
531 | # CONFIG_BLK_DEV_ATIIXP is not set | ||
532 | # CONFIG_BLK_DEV_CMD64X is not set | ||
533 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
534 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
535 | # CONFIG_BLK_DEV_CS5520 is not set | ||
536 | # CONFIG_BLK_DEV_CS5530 is not set | ||
537 | # CONFIG_BLK_DEV_CS5535 is not set | ||
538 | # CONFIG_BLK_DEV_HPT34X is not set | ||
539 | # CONFIG_BLK_DEV_HPT366 is not set | ||
540 | # CONFIG_BLK_DEV_JMICRON is not set | ||
541 | # CONFIG_BLK_DEV_SC1200 is not set | ||
542 | CONFIG_BLK_DEV_PIIX=y | ||
543 | # CONFIG_BLK_DEV_IT8213 is not set | ||
544 | # CONFIG_BLK_DEV_IT821X is not set | ||
545 | # CONFIG_BLK_DEV_NS87415 is not set | ||
546 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
547 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
548 | # CONFIG_BLK_DEV_SVWKS is not set | ||
549 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
550 | # CONFIG_BLK_DEV_SIS5513 is not set | ||
551 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
552 | # CONFIG_BLK_DEV_TRM290 is not set | ||
553 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
554 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
555 | # CONFIG_IDE_ARM is not set | ||
556 | CONFIG_BLK_DEV_IDEDMA=y | ||
557 | # CONFIG_IDEDMA_IVB is not set | ||
558 | # CONFIG_BLK_DEV_HD is not set | ||
559 | 769 | ||
560 | # | 770 | # |
561 | # SCSI device support | 771 | # SCSI device support |
@@ -564,8 +774,8 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
564 | CONFIG_SCSI=y | 774 | CONFIG_SCSI=y |
565 | CONFIG_SCSI_DMA=y | 775 | CONFIG_SCSI_DMA=y |
566 | # CONFIG_SCSI_TGT is not set | 776 | # CONFIG_SCSI_TGT is not set |
567 | CONFIG_SCSI_NETLINK=y | 777 | # CONFIG_SCSI_NETLINK is not set |
568 | # CONFIG_SCSI_PROC_FS is not set | 778 | CONFIG_SCSI_PROC_FS=y |
569 | 779 | ||
570 | # | 780 | # |
571 | # SCSI support type (disk, tape, CD-ROM) | 781 | # SCSI support type (disk, tape, CD-ROM) |
@@ -574,7 +784,7 @@ CONFIG_BLK_DEV_SD=y | |||
574 | # CONFIG_CHR_DEV_ST is not set | 784 | # CONFIG_CHR_DEV_ST is not set |
575 | # CONFIG_CHR_DEV_OSST is not set | 785 | # CONFIG_CHR_DEV_OSST is not set |
576 | CONFIG_BLK_DEV_SR=y | 786 | CONFIG_BLK_DEV_SR=y |
577 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 787 | CONFIG_BLK_DEV_SR_VENDOR=y |
578 | CONFIG_CHR_DEV_SG=y | 788 | CONFIG_CHR_DEV_SG=y |
579 | # CONFIG_CHR_DEV_SCH is not set | 789 | # CONFIG_CHR_DEV_SCH is not set |
580 | 790 | ||
@@ -582,7 +792,7 @@ CONFIG_CHR_DEV_SG=y | |||
582 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 792 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
583 | # | 793 | # |
584 | # CONFIG_SCSI_MULTI_LUN is not set | 794 | # CONFIG_SCSI_MULTI_LUN is not set |
585 | # CONFIG_SCSI_CONSTANTS is not set | 795 | CONFIG_SCSI_CONSTANTS=y |
586 | # CONFIG_SCSI_LOGGING is not set | 796 | # CONFIG_SCSI_LOGGING is not set |
587 | # CONFIG_SCSI_SCAN_ASYNC is not set | 797 | # CONFIG_SCSI_SCAN_ASYNC is not set |
588 | CONFIG_SCSI_WAIT_SCAN=m | 798 | CONFIG_SCSI_WAIT_SCAN=m |
@@ -591,81 +801,37 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
591 | # SCSI Transports | 801 | # SCSI Transports |
592 | # | 802 | # |
593 | CONFIG_SCSI_SPI_ATTRS=y | 803 | CONFIG_SCSI_SPI_ATTRS=y |
594 | CONFIG_SCSI_FC_ATTRS=y | 804 | # CONFIG_SCSI_FC_ATTRS is not set |
595 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 805 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
596 | # CONFIG_SCSI_SAS_ATTRS is not set | 806 | # CONFIG_SCSI_SAS_ATTRS is not set |
597 | # CONFIG_SCSI_SAS_LIBSAS is not set | 807 | # CONFIG_SCSI_SAS_LIBSAS is not set |
598 | 808 | # CONFIG_SCSI_SRP_ATTRS is not set | |
599 | # | 809 | # CONFIG_SCSI_LOWLEVEL is not set |
600 | # SCSI low-level drivers | 810 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
601 | # | ||
602 | # CONFIG_ISCSI_TCP is not set | ||
603 | CONFIG_BLK_DEV_3W_XXXX_RAID=y | ||
604 | # CONFIG_SCSI_3W_9XXX is not set | ||
605 | # CONFIG_SCSI_ACARD is not set | ||
606 | # CONFIG_SCSI_AACRAID is not set | ||
607 | CONFIG_SCSI_AIC7XXX=y | ||
608 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 | ||
609 | CONFIG_AIC7XXX_RESET_DELAY_MS=5000 | ||
610 | CONFIG_AIC7XXX_DEBUG_ENABLE=y | ||
611 | CONFIG_AIC7XXX_DEBUG_MASK=0 | ||
612 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | ||
613 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
614 | CONFIG_SCSI_AIC79XX=y | ||
615 | CONFIG_AIC79XX_CMDS_PER_DEVICE=32 | ||
616 | CONFIG_AIC79XX_RESET_DELAY_MS=4000 | ||
617 | # CONFIG_AIC79XX_DEBUG_ENABLE is not set | ||
618 | CONFIG_AIC79XX_DEBUG_MASK=0 | ||
619 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set | ||
620 | # CONFIG_SCSI_AIC94XX is not set | ||
621 | # CONFIG_SCSI_DPT_I2O is not set | ||
622 | # CONFIG_SCSI_ADVANSYS is not set | ||
623 | # CONFIG_SCSI_ARCMSR is not set | ||
624 | # CONFIG_MEGARAID_NEWGEN is not set | ||
625 | # CONFIG_MEGARAID_LEGACY is not set | ||
626 | # CONFIG_MEGARAID_SAS is not set | ||
627 | # CONFIG_SCSI_HPTIOP is not set | ||
628 | # CONFIG_SCSI_BUSLOGIC is not set | ||
629 | # CONFIG_SCSI_DMX3191D is not set | ||
630 | # CONFIG_SCSI_EATA is not set | ||
631 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
632 | # CONFIG_SCSI_GDTH is not set | ||
633 | # CONFIG_SCSI_IPS is not set | ||
634 | # CONFIG_SCSI_INITIO is not set | ||
635 | # CONFIG_SCSI_INIA100 is not set | ||
636 | # CONFIG_SCSI_STEX is not set | ||
637 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
638 | # CONFIG_SCSI_IPR is not set | ||
639 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
640 | # CONFIG_SCSI_QLA_FC is not set | ||
641 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
642 | # CONFIG_SCSI_LPFC is not set | ||
643 | # CONFIG_SCSI_DC395x is not set | ||
644 | # CONFIG_SCSI_DC390T is not set | ||
645 | # CONFIG_SCSI_NSP32 is not set | ||
646 | # CONFIG_SCSI_DEBUG is not set | ||
647 | # CONFIG_SCSI_SRP is not set | ||
648 | CONFIG_ATA=y | 811 | CONFIG_ATA=y |
649 | # CONFIG_ATA_NONSTANDARD is not set | 812 | # CONFIG_ATA_NONSTANDARD is not set |
650 | CONFIG_ATA_ACPI=y | 813 | CONFIG_ATA_ACPI=y |
814 | CONFIG_SATA_PMP=y | ||
651 | CONFIG_SATA_AHCI=y | 815 | CONFIG_SATA_AHCI=y |
652 | CONFIG_SATA_SVW=y | 816 | # CONFIG_SATA_SIL24 is not set |
817 | CONFIG_ATA_SFF=y | ||
818 | # CONFIG_SATA_SVW is not set | ||
653 | CONFIG_ATA_PIIX=y | 819 | CONFIG_ATA_PIIX=y |
654 | # CONFIG_SATA_MV is not set | 820 | # CONFIG_SATA_MV is not set |
655 | CONFIG_SATA_NV=y | 821 | # CONFIG_SATA_NV is not set |
656 | # CONFIG_PDC_ADMA is not set | 822 | # CONFIG_PDC_ADMA is not set |
657 | # CONFIG_SATA_QSTOR is not set | 823 | # CONFIG_SATA_QSTOR is not set |
658 | # CONFIG_SATA_PROMISE is not set | 824 | # CONFIG_SATA_PROMISE is not set |
659 | # CONFIG_SATA_SX4 is not set | 825 | # CONFIG_SATA_SX4 is not set |
660 | CONFIG_SATA_SIL=y | 826 | # CONFIG_SATA_SIL is not set |
661 | # CONFIG_SATA_SIL24 is not set | ||
662 | # CONFIG_SATA_SIS is not set | 827 | # CONFIG_SATA_SIS is not set |
663 | # CONFIG_SATA_ULI is not set | 828 | # CONFIG_SATA_ULI is not set |
664 | CONFIG_SATA_VIA=y | 829 | # CONFIG_SATA_VIA is not set |
665 | # CONFIG_SATA_VITESSE is not set | 830 | # CONFIG_SATA_VITESSE is not set |
666 | # CONFIG_SATA_INIC162X is not set | 831 | # CONFIG_SATA_INIC162X is not set |
832 | # CONFIG_PATA_ACPI is not set | ||
667 | # CONFIG_PATA_ALI is not set | 833 | # CONFIG_PATA_ALI is not set |
668 | # CONFIG_PATA_AMD is not set | 834 | CONFIG_PATA_AMD=y |
669 | # CONFIG_PATA_ARTOP is not set | 835 | # CONFIG_PATA_ARTOP is not set |
670 | # CONFIG_PATA_ATIIXP is not set | 836 | # CONFIG_PATA_ATIIXP is not set |
671 | # CONFIG_PATA_CMD640_PCI is not set | 837 | # CONFIG_PATA_CMD640_PCI is not set |
@@ -673,6 +839,7 @@ CONFIG_SATA_VIA=y | |||
673 | # CONFIG_PATA_CS5520 is not set | 839 | # CONFIG_PATA_CS5520 is not set |
674 | # CONFIG_PATA_CS5530 is not set | 840 | # CONFIG_PATA_CS5530 is not set |
675 | # CONFIG_PATA_CS5535 is not set | 841 | # CONFIG_PATA_CS5535 is not set |
842 | # CONFIG_PATA_CS5536 is not set | ||
676 | # CONFIG_PATA_CYPRESS is not set | 843 | # CONFIG_PATA_CYPRESS is not set |
677 | # CONFIG_PATA_EFAR is not set | 844 | # CONFIG_PATA_EFAR is not set |
678 | # CONFIG_ATA_GENERIC is not set | 845 | # CONFIG_ATA_GENERIC is not set |
@@ -686,11 +853,14 @@ CONFIG_SATA_VIA=y | |||
686 | # CONFIG_PATA_TRIFLEX is not set | 853 | # CONFIG_PATA_TRIFLEX is not set |
687 | # CONFIG_PATA_MARVELL is not set | 854 | # CONFIG_PATA_MARVELL is not set |
688 | # CONFIG_PATA_MPIIX is not set | 855 | # CONFIG_PATA_MPIIX is not set |
689 | # CONFIG_PATA_OLDPIIX is not set | 856 | CONFIG_PATA_OLDPIIX=y |
690 | # CONFIG_PATA_NETCELL is not set | 857 | # CONFIG_PATA_NETCELL is not set |
858 | # CONFIG_PATA_NINJA32 is not set | ||
691 | # CONFIG_PATA_NS87410 is not set | 859 | # CONFIG_PATA_NS87410 is not set |
860 | # CONFIG_PATA_NS87415 is not set | ||
692 | # CONFIG_PATA_OPTI is not set | 861 | # CONFIG_PATA_OPTI is not set |
693 | # CONFIG_PATA_OPTIDMA is not set | 862 | # CONFIG_PATA_OPTIDMA is not set |
863 | # CONFIG_PATA_PCMCIA is not set | ||
694 | # CONFIG_PATA_PDC_OLD is not set | 864 | # CONFIG_PATA_PDC_OLD is not set |
695 | # CONFIG_PATA_RADISYS is not set | 865 | # CONFIG_PATA_RADISYS is not set |
696 | # CONFIG_PATA_RZ1000 is not set | 866 | # CONFIG_PATA_RZ1000 is not set |
@@ -702,65 +872,42 @@ CONFIG_SATA_VIA=y | |||
702 | # CONFIG_PATA_VIA is not set | 872 | # CONFIG_PATA_VIA is not set |
703 | # CONFIG_PATA_WINBOND is not set | 873 | # CONFIG_PATA_WINBOND is not set |
704 | CONFIG_MD=y | 874 | CONFIG_MD=y |
705 | # CONFIG_BLK_DEV_MD is not set | 875 | CONFIG_BLK_DEV_MD=y |
876 | # CONFIG_MD_LINEAR is not set | ||
877 | # CONFIG_MD_RAID0 is not set | ||
878 | # CONFIG_MD_RAID1 is not set | ||
879 | # CONFIG_MD_RAID10 is not set | ||
880 | # CONFIG_MD_RAID456 is not set | ||
881 | # CONFIG_MD_MULTIPATH is not set | ||
882 | # CONFIG_MD_FAULTY is not set | ||
706 | CONFIG_BLK_DEV_DM=y | 883 | CONFIG_BLK_DEV_DM=y |
707 | # CONFIG_DM_DEBUG is not set | 884 | # CONFIG_DM_DEBUG is not set |
708 | # CONFIG_DM_CRYPT is not set | 885 | # CONFIG_DM_CRYPT is not set |
709 | # CONFIG_DM_SNAPSHOT is not set | 886 | # CONFIG_DM_SNAPSHOT is not set |
710 | # CONFIG_DM_MIRROR is not set | 887 | CONFIG_DM_MIRROR=y |
711 | # CONFIG_DM_ZERO is not set | 888 | CONFIG_DM_ZERO=y |
712 | # CONFIG_DM_MULTIPATH is not set | 889 | # CONFIG_DM_MULTIPATH is not set |
713 | # CONFIG_DM_DELAY is not set | 890 | # CONFIG_DM_DELAY is not set |
714 | 891 | # CONFIG_DM_UEVENT is not set | |
715 | # | 892 | # CONFIG_FUSION is not set |
716 | # Fusion MPT device support | ||
717 | # | ||
718 | CONFIG_FUSION=y | ||
719 | CONFIG_FUSION_SPI=y | ||
720 | # CONFIG_FUSION_FC is not set | ||
721 | # CONFIG_FUSION_SAS is not set | ||
722 | CONFIG_FUSION_MAX_SGE=128 | ||
723 | # CONFIG_FUSION_CTL is not set | ||
724 | 893 | ||
725 | # | 894 | # |
726 | # IEEE 1394 (FireWire) support | 895 | # IEEE 1394 (FireWire) support |
727 | # | 896 | # |
728 | # CONFIG_FIREWIRE is not set | 897 | # CONFIG_FIREWIRE is not set |
729 | CONFIG_IEEE1394=y | 898 | # CONFIG_IEEE1394 is not set |
730 | |||
731 | # | ||
732 | # Subsystem Options | ||
733 | # | ||
734 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
735 | |||
736 | # | ||
737 | # Controllers | ||
738 | # | ||
739 | |||
740 | # | ||
741 | # Texas Instruments PCILynx requires I2C | ||
742 | # | ||
743 | CONFIG_IEEE1394_OHCI1394=y | ||
744 | |||
745 | # | ||
746 | # Protocols | ||
747 | # | ||
748 | # CONFIG_IEEE1394_VIDEO1394 is not set | ||
749 | # CONFIG_IEEE1394_SBP2 is not set | ||
750 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | ||
751 | # CONFIG_IEEE1394_ETH1394 is not set | ||
752 | # CONFIG_IEEE1394_DV1394 is not set | ||
753 | CONFIG_IEEE1394_RAWIO=y | ||
754 | # CONFIG_I2O is not set | 899 | # CONFIG_I2O is not set |
755 | CONFIG_MACINTOSH_DRIVERS=y | 900 | CONFIG_MACINTOSH_DRIVERS=y |
756 | # CONFIG_MAC_EMUMOUSEBTN is not set | 901 | CONFIG_MAC_EMUMOUSEBTN=y |
757 | CONFIG_NETDEVICES=y | 902 | CONFIG_NETDEVICES=y |
758 | CONFIG_NETDEVICES_MULTIQUEUE=y | 903 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
904 | # CONFIG_IFB is not set | ||
759 | # CONFIG_DUMMY is not set | 905 | # CONFIG_DUMMY is not set |
760 | # CONFIG_BONDING is not set | 906 | # CONFIG_BONDING is not set |
761 | # CONFIG_MACVLAN is not set | 907 | # CONFIG_MACVLAN is not set |
762 | # CONFIG_EQUALIZER is not set | 908 | # CONFIG_EQUALIZER is not set |
763 | # CONFIG_TUN is not set | 909 | # CONFIG_TUN is not set |
910 | # CONFIG_VETH is not set | ||
764 | # CONFIG_NET_SB1000 is not set | 911 | # CONFIG_NET_SB1000 is not set |
765 | # CONFIG_ARCNET is not set | 912 | # CONFIG_ARCNET is not set |
766 | # CONFIG_PHYLIB is not set | 913 | # CONFIG_PHYLIB is not set |
@@ -770,38 +917,40 @@ CONFIG_MII=y | |||
770 | # CONFIG_SUNGEM is not set | 917 | # CONFIG_SUNGEM is not set |
771 | # CONFIG_CASSINI is not set | 918 | # CONFIG_CASSINI is not set |
772 | CONFIG_NET_VENDOR_3COM=y | 919 | CONFIG_NET_VENDOR_3COM=y |
773 | CONFIG_VORTEX=y | 920 | # CONFIG_VORTEX is not set |
774 | # CONFIG_TYPHOON is not set | 921 | # CONFIG_TYPHOON is not set |
775 | CONFIG_NET_TULIP=y | 922 | CONFIG_NET_TULIP=y |
776 | # CONFIG_DE2104X is not set | 923 | # CONFIG_DE2104X is not set |
777 | CONFIG_TULIP=y | 924 | # CONFIG_TULIP is not set |
778 | # CONFIG_TULIP_MWI is not set | ||
779 | # CONFIG_TULIP_MMIO is not set | ||
780 | # CONFIG_TULIP_NAPI is not set | ||
781 | # CONFIG_DE4X5 is not set | 925 | # CONFIG_DE4X5 is not set |
782 | # CONFIG_WINBOND_840 is not set | 926 | # CONFIG_WINBOND_840 is not set |
783 | # CONFIG_DM9102 is not set | 927 | # CONFIG_DM9102 is not set |
784 | # CONFIG_ULI526X is not set | 928 | # CONFIG_ULI526X is not set |
929 | # CONFIG_PCMCIA_XIRCOM is not set | ||
785 | # CONFIG_HP100 is not set | 930 | # CONFIG_HP100 is not set |
931 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
932 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
933 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
934 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
786 | CONFIG_NET_PCI=y | 935 | CONFIG_NET_PCI=y |
787 | # CONFIG_PCNET32 is not set | 936 | # CONFIG_PCNET32 is not set |
788 | # CONFIG_AMD8111_ETH is not set | 937 | # CONFIG_AMD8111_ETH is not set |
789 | # CONFIG_ADAPTEC_STARFIRE is not set | 938 | # CONFIG_ADAPTEC_STARFIRE is not set |
790 | CONFIG_B44=y | 939 | # CONFIG_B44 is not set |
791 | CONFIG_FORCEDETH=y | 940 | CONFIG_FORCEDETH=y |
792 | # CONFIG_FORCEDETH_NAPI is not set | 941 | # CONFIG_FORCEDETH_NAPI is not set |
793 | # CONFIG_DGRS is not set | ||
794 | # CONFIG_EEPRO100 is not set | 942 | # CONFIG_EEPRO100 is not set |
795 | CONFIG_E100=y | 943 | CONFIG_E100=y |
796 | # CONFIG_FEALNX is not set | 944 | # CONFIG_FEALNX is not set |
797 | # CONFIG_NATSEMI is not set | 945 | # CONFIG_NATSEMI is not set |
798 | # CONFIG_NE2K_PCI is not set | 946 | # CONFIG_NE2K_PCI is not set |
799 | CONFIG_8139CP=y | 947 | # CONFIG_8139CP is not set |
800 | CONFIG_8139TOO=y | 948 | CONFIG_8139TOO=y |
801 | # CONFIG_8139TOO_PIO is not set | 949 | CONFIG_8139TOO_PIO=y |
802 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 950 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
803 | # CONFIG_8139TOO_8129 is not set | 951 | # CONFIG_8139TOO_8129 is not set |
804 | # CONFIG_8139_OLD_RX_RESET is not set | 952 | # CONFIG_8139_OLD_RX_RESET is not set |
953 | # CONFIG_R6040 is not set | ||
805 | # CONFIG_SIS900 is not set | 954 | # CONFIG_SIS900 is not set |
806 | # CONFIG_EPIC100 is not set | 955 | # CONFIG_EPIC100 is not set |
807 | # CONFIG_SUNDANCE is not set | 956 | # CONFIG_SUNDANCE is not set |
@@ -814,34 +963,75 @@ CONFIG_NETDEV_1000=y | |||
814 | CONFIG_E1000=y | 963 | CONFIG_E1000=y |
815 | # CONFIG_E1000_NAPI is not set | 964 | # CONFIG_E1000_NAPI is not set |
816 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 965 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
966 | # CONFIG_E1000E is not set | ||
967 | # CONFIG_E1000E_ENABLED is not set | ||
968 | # CONFIG_IP1000 is not set | ||
969 | # CONFIG_IGB is not set | ||
817 | # CONFIG_NS83820 is not set | 970 | # CONFIG_NS83820 is not set |
818 | # CONFIG_HAMACHI is not set | 971 | # CONFIG_HAMACHI is not set |
819 | # CONFIG_YELLOWFIN is not set | 972 | # CONFIG_YELLOWFIN is not set |
820 | CONFIG_R8169=y | 973 | # CONFIG_R8169 is not set |
821 | # CONFIG_R8169_NAPI is not set | ||
822 | # CONFIG_SIS190 is not set | 974 | # CONFIG_SIS190 is not set |
823 | # CONFIG_SKGE is not set | 975 | # CONFIG_SKGE is not set |
824 | CONFIG_SKY2=y | 976 | CONFIG_SKY2=y |
977 | # CONFIG_SKY2_DEBUG is not set | ||
825 | # CONFIG_VIA_VELOCITY is not set | 978 | # CONFIG_VIA_VELOCITY is not set |
826 | CONFIG_TIGON3=y | 979 | CONFIG_TIGON3=y |
827 | CONFIG_BNX2=y | 980 | # CONFIG_BNX2 is not set |
828 | # CONFIG_QLA3XXX is not set | 981 | # CONFIG_QLA3XXX is not set |
829 | # CONFIG_ATL1 is not set | 982 | # CONFIG_ATL1 is not set |
830 | CONFIG_NETDEV_10000=y | 983 | CONFIG_NETDEV_10000=y |
831 | # CONFIG_CHELSIO_T1 is not set | 984 | # CONFIG_CHELSIO_T1 is not set |
832 | # CONFIG_CHELSIO_T3 is not set | 985 | # CONFIG_CHELSIO_T3 is not set |
986 | # CONFIG_IXGBE is not set | ||
833 | # CONFIG_IXGB is not set | 987 | # CONFIG_IXGB is not set |
834 | # CONFIG_S2IO is not set | 988 | # CONFIG_S2IO is not set |
835 | # CONFIG_MYRI10GE is not set | 989 | # CONFIG_MYRI10GE is not set |
836 | # CONFIG_NETXEN_NIC is not set | 990 | # CONFIG_NETXEN_NIC is not set |
991 | # CONFIG_NIU is not set | ||
837 | # CONFIG_MLX4_CORE is not set | 992 | # CONFIG_MLX4_CORE is not set |
838 | # CONFIG_TR is not set | 993 | # CONFIG_TEHUTI is not set |
994 | # CONFIG_BNX2X is not set | ||
995 | # CONFIG_SFC is not set | ||
996 | CONFIG_TR=y | ||
997 | # CONFIG_IBMOL is not set | ||
998 | # CONFIG_IBMLS is not set | ||
999 | # CONFIG_3C359 is not set | ||
1000 | # CONFIG_TMS380TR is not set | ||
839 | 1001 | ||
840 | # | 1002 | # |
841 | # Wireless LAN | 1003 | # Wireless LAN |
842 | # | 1004 | # |
843 | # CONFIG_WLAN_PRE80211 is not set | 1005 | # CONFIG_WLAN_PRE80211 is not set |
844 | # CONFIG_WLAN_80211 is not set | 1006 | CONFIG_WLAN_80211=y |
1007 | # CONFIG_PCMCIA_RAYCS is not set | ||
1008 | # CONFIG_IPW2100 is not set | ||
1009 | # CONFIG_IPW2200 is not set | ||
1010 | # CONFIG_LIBERTAS is not set | ||
1011 | # CONFIG_AIRO is not set | ||
1012 | # CONFIG_HERMES is not set | ||
1013 | # CONFIG_ATMEL is not set | ||
1014 | # CONFIG_AIRO_CS is not set | ||
1015 | # CONFIG_PCMCIA_WL3501 is not set | ||
1016 | # CONFIG_PRISM54 is not set | ||
1017 | # CONFIG_USB_ZD1201 is not set | ||
1018 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
1019 | # CONFIG_RTL8180 is not set | ||
1020 | # CONFIG_RTL8187 is not set | ||
1021 | # CONFIG_ADM8211 is not set | ||
1022 | # CONFIG_P54_COMMON is not set | ||
1023 | CONFIG_ATH5K=y | ||
1024 | # CONFIG_ATH5K_DEBUG is not set | ||
1025 | # CONFIG_IWLWIFI is not set | ||
1026 | # CONFIG_IWLCORE is not set | ||
1027 | # CONFIG_IWLWIFI_LEDS is not set | ||
1028 | # CONFIG_IWL4965 is not set | ||
1029 | # CONFIG_IWL3945 is not set | ||
1030 | # CONFIG_HOSTAP is not set | ||
1031 | # CONFIG_B43 is not set | ||
1032 | # CONFIG_B43LEGACY is not set | ||
1033 | # CONFIG_ZD1211RW is not set | ||
1034 | # CONFIG_RT2X00 is not set | ||
845 | 1035 | ||
846 | # | 1036 | # |
847 | # USB Network Adapters | 1037 | # USB Network Adapters |
@@ -850,16 +1040,27 @@ CONFIG_NETDEV_10000=y | |||
850 | # CONFIG_USB_KAWETH is not set | 1040 | # CONFIG_USB_KAWETH is not set |
851 | # CONFIG_USB_PEGASUS is not set | 1041 | # CONFIG_USB_PEGASUS is not set |
852 | # CONFIG_USB_RTL8150 is not set | 1042 | # CONFIG_USB_RTL8150 is not set |
853 | # CONFIG_USB_USBNET_MII is not set | ||
854 | # CONFIG_USB_USBNET is not set | 1043 | # CONFIG_USB_USBNET is not set |
1044 | CONFIG_NET_PCMCIA=y | ||
1045 | # CONFIG_PCMCIA_3C589 is not set | ||
1046 | # CONFIG_PCMCIA_3C574 is not set | ||
1047 | # CONFIG_PCMCIA_FMVJ18X is not set | ||
1048 | # CONFIG_PCMCIA_PCNET is not set | ||
1049 | # CONFIG_PCMCIA_NMCLAN is not set | ||
1050 | # CONFIG_PCMCIA_SMC91C92 is not set | ||
1051 | # CONFIG_PCMCIA_XIRC2PS is not set | ||
1052 | # CONFIG_PCMCIA_AXNET is not set | ||
1053 | # CONFIG_PCMCIA_IBMTR is not set | ||
855 | # CONFIG_WAN is not set | 1054 | # CONFIG_WAN is not set |
856 | # CONFIG_FDDI is not set | 1055 | CONFIG_FDDI=y |
1056 | # CONFIG_DEFXX is not set | ||
1057 | # CONFIG_SKFP is not set | ||
857 | # CONFIG_HIPPI is not set | 1058 | # CONFIG_HIPPI is not set |
858 | # CONFIG_PPP is not set | 1059 | # CONFIG_PPP is not set |
859 | # CONFIG_SLIP is not set | 1060 | # CONFIG_SLIP is not set |
860 | # CONFIG_NET_FC is not set | 1061 | # CONFIG_NET_FC is not set |
861 | # CONFIG_SHAPER is not set | ||
862 | CONFIG_NETCONSOLE=y | 1062 | CONFIG_NETCONSOLE=y |
1063 | # CONFIG_NETCONSOLE_DYNAMIC is not set | ||
863 | CONFIG_NETPOLL=y | 1064 | CONFIG_NETPOLL=y |
864 | # CONFIG_NETPOLL_TRAP is not set | 1065 | # CONFIG_NETPOLL_TRAP is not set |
865 | CONFIG_NET_POLL_CONTROLLER=y | 1066 | CONFIG_NET_POLL_CONTROLLER=y |
@@ -870,18 +1071,17 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
870 | # Input device support | 1071 | # Input device support |
871 | # | 1072 | # |
872 | CONFIG_INPUT=y | 1073 | CONFIG_INPUT=y |
873 | # CONFIG_INPUT_FF_MEMLESS is not set | 1074 | CONFIG_INPUT_FF_MEMLESS=y |
874 | # CONFIG_INPUT_POLLDEV is not set | 1075 | CONFIG_INPUT_POLLDEV=y |
875 | 1076 | ||
876 | # | 1077 | # |
877 | # Userland interfaces | 1078 | # Userland interfaces |
878 | # | 1079 | # |
879 | CONFIG_INPUT_MOUSEDEV=y | 1080 | CONFIG_INPUT_MOUSEDEV=y |
880 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | 1081 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
881 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1082 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
882 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1083 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
883 | # CONFIG_INPUT_JOYDEV is not set | 1084 | # CONFIG_INPUT_JOYDEV is not set |
884 | # CONFIG_INPUT_TSDEV is not set | ||
885 | CONFIG_INPUT_EVDEV=y | 1085 | CONFIG_INPUT_EVDEV=y |
886 | # CONFIG_INPUT_EVBUG is not set | 1086 | # CONFIG_INPUT_EVBUG is not set |
887 | 1087 | ||
@@ -906,17 +1106,63 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
906 | # CONFIG_MOUSE_SERIAL is not set | 1106 | # CONFIG_MOUSE_SERIAL is not set |
907 | # CONFIG_MOUSE_APPLETOUCH is not set | 1107 | # CONFIG_MOUSE_APPLETOUCH is not set |
908 | # CONFIG_MOUSE_VSXXXAA is not set | 1108 | # CONFIG_MOUSE_VSXXXAA is not set |
909 | # CONFIG_INPUT_JOYSTICK is not set | 1109 | CONFIG_INPUT_JOYSTICK=y |
910 | # CONFIG_INPUT_TABLET is not set | 1110 | # CONFIG_JOYSTICK_ANALOG is not set |
911 | # CONFIG_INPUT_TOUCHSCREEN is not set | 1111 | # CONFIG_JOYSTICK_A3D is not set |
912 | # CONFIG_INPUT_MISC is not set | 1112 | # CONFIG_JOYSTICK_ADI is not set |
1113 | # CONFIG_JOYSTICK_COBRA is not set | ||
1114 | # CONFIG_JOYSTICK_GF2K is not set | ||
1115 | # CONFIG_JOYSTICK_GRIP is not set | ||
1116 | # CONFIG_JOYSTICK_GRIP_MP is not set | ||
1117 | # CONFIG_JOYSTICK_GUILLEMOT is not set | ||
1118 | # CONFIG_JOYSTICK_INTERACT is not set | ||
1119 | # CONFIG_JOYSTICK_SIDEWINDER is not set | ||
1120 | # CONFIG_JOYSTICK_TMDC is not set | ||
1121 | # CONFIG_JOYSTICK_IFORCE is not set | ||
1122 | # CONFIG_JOYSTICK_WARRIOR is not set | ||
1123 | # CONFIG_JOYSTICK_MAGELLAN is not set | ||
1124 | # CONFIG_JOYSTICK_SPACEORB is not set | ||
1125 | # CONFIG_JOYSTICK_SPACEBALL is not set | ||
1126 | # CONFIG_JOYSTICK_STINGER is not set | ||
1127 | # CONFIG_JOYSTICK_TWIDJOY is not set | ||
1128 | # CONFIG_JOYSTICK_ZHENHUA is not set | ||
1129 | # CONFIG_JOYSTICK_JOYDUMP is not set | ||
1130 | # CONFIG_JOYSTICK_XPAD is not set | ||
1131 | CONFIG_INPUT_TABLET=y | ||
1132 | # CONFIG_TABLET_USB_ACECAD is not set | ||
1133 | # CONFIG_TABLET_USB_AIPTEK is not set | ||
1134 | # CONFIG_TABLET_USB_GTCO is not set | ||
1135 | # CONFIG_TABLET_USB_KBTAB is not set | ||
1136 | # CONFIG_TABLET_USB_WACOM is not set | ||
1137 | CONFIG_INPUT_TOUCHSCREEN=y | ||
1138 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
1139 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
1140 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
1141 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
1142 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
1143 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
1144 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
1145 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
1146 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
1147 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
1148 | CONFIG_INPUT_MISC=y | ||
1149 | # CONFIG_INPUT_PCSPKR is not set | ||
1150 | # CONFIG_INPUT_APANEL is not set | ||
1151 | # CONFIG_INPUT_WISTRON_BTNS is not set | ||
1152 | # CONFIG_INPUT_ATLAS_BTNS is not set | ||
1153 | # CONFIG_INPUT_ATI_REMOTE is not set | ||
1154 | # CONFIG_INPUT_ATI_REMOTE2 is not set | ||
1155 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | ||
1156 | # CONFIG_INPUT_POWERMATE is not set | ||
1157 | # CONFIG_INPUT_YEALINK is not set | ||
1158 | # CONFIG_INPUT_UINPUT is not set | ||
913 | 1159 | ||
914 | # | 1160 | # |
915 | # Hardware I/O ports | 1161 | # Hardware I/O ports |
916 | # | 1162 | # |
917 | CONFIG_SERIO=y | 1163 | CONFIG_SERIO=y |
918 | CONFIG_SERIO_I8042=y | 1164 | CONFIG_SERIO_I8042=y |
919 | # CONFIG_SERIO_SERPORT is not set | 1165 | CONFIG_SERIO_SERPORT=y |
920 | # CONFIG_SERIO_CT82C710 is not set | 1166 | # CONFIG_SERIO_CT82C710 is not set |
921 | # CONFIG_SERIO_PCIPS2 is not set | 1167 | # CONFIG_SERIO_PCIPS2 is not set |
922 | CONFIG_SERIO_LIBPS2=y | 1168 | CONFIG_SERIO_LIBPS2=y |
@@ -929,8 +1175,26 @@ CONFIG_SERIO_LIBPS2=y | |||
929 | CONFIG_VT=y | 1175 | CONFIG_VT=y |
930 | CONFIG_VT_CONSOLE=y | 1176 | CONFIG_VT_CONSOLE=y |
931 | CONFIG_HW_CONSOLE=y | 1177 | CONFIG_HW_CONSOLE=y |
932 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1178 | CONFIG_VT_HW_CONSOLE_BINDING=y |
933 | # CONFIG_SERIAL_NONSTANDARD is not set | 1179 | CONFIG_DEVKMEM=y |
1180 | CONFIG_SERIAL_NONSTANDARD=y | ||
1181 | # CONFIG_COMPUTONE is not set | ||
1182 | # CONFIG_ROCKETPORT is not set | ||
1183 | # CONFIG_CYCLADES is not set | ||
1184 | # CONFIG_DIGIEPCA is not set | ||
1185 | # CONFIG_MOXA_INTELLIO is not set | ||
1186 | # CONFIG_MOXA_SMARTIO is not set | ||
1187 | # CONFIG_ISI is not set | ||
1188 | # CONFIG_SYNCLINK is not set | ||
1189 | # CONFIG_SYNCLINKMP is not set | ||
1190 | # CONFIG_SYNCLINK_GT is not set | ||
1191 | # CONFIG_N_HDLC is not set | ||
1192 | # CONFIG_RISCOM8 is not set | ||
1193 | # CONFIG_SPECIALIX is not set | ||
1194 | # CONFIG_SX is not set | ||
1195 | # CONFIG_RIO is not set | ||
1196 | # CONFIG_STALDRV is not set | ||
1197 | # CONFIG_NOZOMI is not set | ||
934 | 1198 | ||
935 | # | 1199 | # |
936 | # Serial drivers | 1200 | # Serial drivers |
@@ -940,9 +1204,14 @@ CONFIG_SERIAL_8250_CONSOLE=y | |||
940 | CONFIG_FIX_EARLYCON_MEM=y | 1204 | CONFIG_FIX_EARLYCON_MEM=y |
941 | CONFIG_SERIAL_8250_PCI=y | 1205 | CONFIG_SERIAL_8250_PCI=y |
942 | CONFIG_SERIAL_8250_PNP=y | 1206 | CONFIG_SERIAL_8250_PNP=y |
943 | CONFIG_SERIAL_8250_NR_UARTS=4 | 1207 | # CONFIG_SERIAL_8250_CS is not set |
1208 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
944 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 1209 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
945 | # CONFIG_SERIAL_8250_EXTENDED is not set | 1210 | CONFIG_SERIAL_8250_EXTENDED=y |
1211 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
1212 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
1213 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
1214 | CONFIG_SERIAL_8250_RSA=y | ||
946 | 1215 | ||
947 | # | 1216 | # |
948 | # Non-8250 serial port support | 1217 | # Non-8250 serial port support |
@@ -951,89 +1220,275 @@ CONFIG_SERIAL_CORE=y | |||
951 | CONFIG_SERIAL_CORE_CONSOLE=y | 1220 | CONFIG_SERIAL_CORE_CONSOLE=y |
952 | # CONFIG_SERIAL_JSM is not set | 1221 | # CONFIG_SERIAL_JSM is not set |
953 | CONFIG_UNIX98_PTYS=y | 1222 | CONFIG_UNIX98_PTYS=y |
954 | CONFIG_LEGACY_PTYS=y | 1223 | # CONFIG_LEGACY_PTYS is not set |
955 | CONFIG_LEGACY_PTY_COUNT=256 | ||
956 | # CONFIG_IPMI_HANDLER is not set | 1224 | # CONFIG_IPMI_HANDLER is not set |
957 | # CONFIG_WATCHDOG is not set | ||
958 | CONFIG_HW_RANDOM=y | 1225 | CONFIG_HW_RANDOM=y |
959 | CONFIG_HW_RANDOM_INTEL=y | 1226 | # CONFIG_HW_RANDOM_INTEL is not set |
960 | CONFIG_HW_RANDOM_AMD=y | 1227 | # CONFIG_HW_RANDOM_AMD is not set |
961 | CONFIG_HW_RANDOM_GEODE=y | 1228 | CONFIG_HW_RANDOM_GEODE=y |
962 | CONFIG_HW_RANDOM_VIA=y | 1229 | CONFIG_HW_RANDOM_VIA=y |
963 | # CONFIG_NVRAM is not set | 1230 | CONFIG_NVRAM=y |
964 | CONFIG_RTC=y | ||
965 | # CONFIG_R3964 is not set | 1231 | # CONFIG_R3964 is not set |
966 | # CONFIG_APPLICOM is not set | 1232 | # CONFIG_APPLICOM is not set |
967 | # CONFIG_SONYPI is not set | 1233 | # CONFIG_SONYPI is not set |
968 | CONFIG_AGP=y | 1234 | |
969 | # CONFIG_AGP_ALI is not set | 1235 | # |
970 | # CONFIG_AGP_ATI is not set | 1236 | # PCMCIA character devices |
971 | # CONFIG_AGP_AMD is not set | 1237 | # |
972 | CONFIG_AGP_AMD64=y | 1238 | # CONFIG_SYNCLINK_CS is not set |
973 | CONFIG_AGP_INTEL=y | 1239 | # CONFIG_CARDMAN_4000 is not set |
974 | # CONFIG_AGP_NVIDIA is not set | 1240 | # CONFIG_CARDMAN_4040 is not set |
975 | # CONFIG_AGP_SIS is not set | 1241 | # CONFIG_IPWIRELESS is not set |
976 | # CONFIG_AGP_SWORKS is not set | ||
977 | # CONFIG_AGP_VIA is not set | ||
978 | # CONFIG_AGP_EFFICEON is not set | ||
979 | # CONFIG_DRM is not set | ||
980 | # CONFIG_MWAVE is not set | 1242 | # CONFIG_MWAVE is not set |
981 | # CONFIG_PC8736x_GPIO is not set | 1243 | # CONFIG_PC8736x_GPIO is not set |
982 | # CONFIG_NSC_GPIO is not set | 1244 | # CONFIG_NSC_GPIO is not set |
983 | # CONFIG_CS5535_GPIO is not set | 1245 | # CONFIG_CS5535_GPIO is not set |
984 | CONFIG_RAW_DRIVER=y | 1246 | # CONFIG_RAW_DRIVER is not set |
985 | CONFIG_MAX_RAW_DEVS=256 | ||
986 | CONFIG_HPET=y | 1247 | CONFIG_HPET=y |
987 | # CONFIG_HPET_RTC_IRQ is not set | 1248 | # CONFIG_HPET_RTC_IRQ is not set |
988 | CONFIG_HPET_MMAP=y | 1249 | # CONFIG_HPET_MMAP is not set |
989 | # CONFIG_HANGCHECK_TIMER is not set | 1250 | # CONFIG_HANGCHECK_TIMER is not set |
990 | # CONFIG_TCG_TPM is not set | 1251 | # CONFIG_TCG_TPM is not set |
991 | # CONFIG_TELCLOCK is not set | 1252 | # CONFIG_TELCLOCK is not set |
992 | CONFIG_DEVPORT=y | 1253 | CONFIG_DEVPORT=y |
993 | # CONFIG_I2C is not set | 1254 | CONFIG_I2C=y |
994 | 1255 | CONFIG_I2C_BOARDINFO=y | |
995 | # | 1256 | # CONFIG_I2C_CHARDEV is not set |
996 | # SPI support | 1257 | |
997 | # | 1258 | # |
1259 | # I2C Hardware Bus support | ||
1260 | # | ||
1261 | # CONFIG_I2C_ALI1535 is not set | ||
1262 | # CONFIG_I2C_ALI1563 is not set | ||
1263 | # CONFIG_I2C_ALI15X3 is not set | ||
1264 | # CONFIG_I2C_AMD756 is not set | ||
1265 | # CONFIG_I2C_AMD8111 is not set | ||
1266 | CONFIG_I2C_I801=y | ||
1267 | # CONFIG_I2C_I810 is not set | ||
1268 | # CONFIG_I2C_PIIX4 is not set | ||
1269 | # CONFIG_I2C_NFORCE2 is not set | ||
1270 | # CONFIG_I2C_OCORES is not set | ||
1271 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1272 | # CONFIG_I2C_PROSAVAGE is not set | ||
1273 | # CONFIG_I2C_SAVAGE4 is not set | ||
1274 | # CONFIG_I2C_SIMTEC is not set | ||
1275 | # CONFIG_SCx200_ACB is not set | ||
1276 | # CONFIG_I2C_SIS5595 is not set | ||
1277 | # CONFIG_I2C_SIS630 is not set | ||
1278 | # CONFIG_I2C_SIS96X is not set | ||
1279 | # CONFIG_I2C_TAOS_EVM is not set | ||
1280 | # CONFIG_I2C_STUB is not set | ||
1281 | # CONFIG_I2C_TINY_USB is not set | ||
1282 | # CONFIG_I2C_VIA is not set | ||
1283 | # CONFIG_I2C_VIAPRO is not set | ||
1284 | # CONFIG_I2C_VOODOO3 is not set | ||
1285 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1286 | |||
1287 | # | ||
1288 | # Miscellaneous I2C Chip support | ||
1289 | # | ||
1290 | # CONFIG_DS1682 is not set | ||
1291 | # CONFIG_SENSORS_EEPROM is not set | ||
1292 | # CONFIG_SENSORS_PCF8574 is not set | ||
1293 | # CONFIG_PCF8575 is not set | ||
1294 | # CONFIG_SENSORS_PCF8591 is not set | ||
1295 | # CONFIG_SENSORS_MAX6875 is not set | ||
1296 | # CONFIG_SENSORS_TSL2550 is not set | ||
1297 | # CONFIG_I2C_DEBUG_CORE is not set | ||
1298 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
1299 | # CONFIG_I2C_DEBUG_BUS is not set | ||
1300 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
998 | # CONFIG_SPI is not set | 1301 | # CONFIG_SPI is not set |
999 | # CONFIG_SPI_MASTER is not set | ||
1000 | # CONFIG_W1 is not set | 1302 | # CONFIG_W1 is not set |
1001 | # CONFIG_POWER_SUPPLY is not set | 1303 | CONFIG_POWER_SUPPLY=y |
1304 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
1305 | # CONFIG_PDA_POWER is not set | ||
1306 | # CONFIG_BATTERY_DS2760 is not set | ||
1002 | # CONFIG_HWMON is not set | 1307 | # CONFIG_HWMON is not set |
1308 | CONFIG_THERMAL=y | ||
1309 | CONFIG_WATCHDOG=y | ||
1310 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
1311 | |||
1312 | # | ||
1313 | # Watchdog Device Drivers | ||
1314 | # | ||
1315 | # CONFIG_SOFT_WATCHDOG is not set | ||
1316 | # CONFIG_ACQUIRE_WDT is not set | ||
1317 | # CONFIG_ADVANTECH_WDT is not set | ||
1318 | # CONFIG_ALIM1535_WDT is not set | ||
1319 | # CONFIG_ALIM7101_WDT is not set | ||
1320 | # CONFIG_SC520_WDT is not set | ||
1321 | # CONFIG_EUROTECH_WDT is not set | ||
1322 | # CONFIG_IB700_WDT is not set | ||
1323 | # CONFIG_IBMASR is not set | ||
1324 | # CONFIG_WAFER_WDT is not set | ||
1325 | # CONFIG_I6300ESB_WDT is not set | ||
1326 | # CONFIG_ITCO_WDT is not set | ||
1327 | # CONFIG_IT8712F_WDT is not set | ||
1328 | # CONFIG_HP_WATCHDOG is not set | ||
1329 | # CONFIG_SC1200_WDT is not set | ||
1330 | # CONFIG_PC87413_WDT is not set | ||
1331 | # CONFIG_60XX_WDT is not set | ||
1332 | # CONFIG_SBC8360_WDT is not set | ||
1333 | # CONFIG_SBC7240_WDT is not set | ||
1334 | # CONFIG_CPU5_WDT is not set | ||
1335 | # CONFIG_SMSC37B787_WDT is not set | ||
1336 | # CONFIG_W83627HF_WDT is not set | ||
1337 | # CONFIG_W83697HF_WDT is not set | ||
1338 | # CONFIG_W83877F_WDT is not set | ||
1339 | # CONFIG_W83977F_WDT is not set | ||
1340 | # CONFIG_MACHZ_WDT is not set | ||
1341 | # CONFIG_SBC_EPX_C3_WATCHDOG is not set | ||
1342 | |||
1343 | # | ||
1344 | # PCI-based Watchdog Cards | ||
1345 | # | ||
1346 | # CONFIG_PCIPCWATCHDOG is not set | ||
1347 | # CONFIG_WDTPCI is not set | ||
1348 | |||
1349 | # | ||
1350 | # USB-based Watchdog Cards | ||
1351 | # | ||
1352 | # CONFIG_USBPCWATCHDOG is not set | ||
1353 | |||
1354 | # | ||
1355 | # Sonics Silicon Backplane | ||
1356 | # | ||
1357 | CONFIG_SSB_POSSIBLE=y | ||
1358 | # CONFIG_SSB is not set | ||
1003 | 1359 | ||
1004 | # | 1360 | # |
1005 | # Multifunction device drivers | 1361 | # Multifunction device drivers |
1006 | # | 1362 | # |
1007 | # CONFIG_MFD_SM501 is not set | 1363 | # CONFIG_MFD_SM501 is not set |
1364 | # CONFIG_HTC_PASIC3 is not set | ||
1008 | 1365 | ||
1009 | # | 1366 | # |
1010 | # Multimedia devices | 1367 | # Multimedia devices |
1011 | # | 1368 | # |
1369 | |||
1370 | # | ||
1371 | # Multimedia core support | ||
1372 | # | ||
1012 | # CONFIG_VIDEO_DEV is not set | 1373 | # CONFIG_VIDEO_DEV is not set |
1013 | # CONFIG_DVB_CORE is not set | 1374 | # CONFIG_DVB_CORE is not set |
1375 | |||
1376 | # | ||
1377 | # Multimedia drivers | ||
1378 | # | ||
1014 | CONFIG_DAB=y | 1379 | CONFIG_DAB=y |
1015 | # CONFIG_USB_DABUSB is not set | 1380 | # CONFIG_USB_DABUSB is not set |
1016 | 1381 | ||
1017 | # | 1382 | # |
1018 | # Graphics support | 1383 | # Graphics support |
1019 | # | 1384 | # |
1020 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1385 | CONFIG_AGP=y |
1386 | # CONFIG_AGP_ALI is not set | ||
1387 | # CONFIG_AGP_ATI is not set | ||
1388 | # CONFIG_AGP_AMD is not set | ||
1389 | CONFIG_AGP_AMD64=y | ||
1390 | CONFIG_AGP_INTEL=y | ||
1391 | # CONFIG_AGP_NVIDIA is not set | ||
1392 | # CONFIG_AGP_SIS is not set | ||
1393 | # CONFIG_AGP_SWORKS is not set | ||
1394 | # CONFIG_AGP_VIA is not set | ||
1395 | # CONFIG_AGP_EFFICEON is not set | ||
1396 | CONFIG_DRM=y | ||
1397 | # CONFIG_DRM_TDFX is not set | ||
1398 | # CONFIG_DRM_R128 is not set | ||
1399 | # CONFIG_DRM_RADEON is not set | ||
1400 | # CONFIG_DRM_I810 is not set | ||
1401 | # CONFIG_DRM_I830 is not set | ||
1402 | CONFIG_DRM_I915=y | ||
1403 | # CONFIG_DRM_MGA is not set | ||
1404 | # CONFIG_DRM_SIS is not set | ||
1405 | # CONFIG_DRM_VIA is not set | ||
1406 | # CONFIG_DRM_SAVAGE is not set | ||
1407 | # CONFIG_VGASTATE is not set | ||
1408 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
1409 | CONFIG_FB=y | ||
1410 | # CONFIG_FIRMWARE_EDID is not set | ||
1411 | # CONFIG_FB_DDC is not set | ||
1412 | CONFIG_FB_CFB_FILLRECT=y | ||
1413 | CONFIG_FB_CFB_COPYAREA=y | ||
1414 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
1415 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
1416 | # CONFIG_FB_SYS_FILLRECT is not set | ||
1417 | # CONFIG_FB_SYS_COPYAREA is not set | ||
1418 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
1419 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1420 | # CONFIG_FB_SYS_FOPS is not set | ||
1421 | CONFIG_FB_DEFERRED_IO=y | ||
1422 | # CONFIG_FB_SVGALIB is not set | ||
1423 | # CONFIG_FB_MACMODES is not set | ||
1424 | # CONFIG_FB_BACKLIGHT is not set | ||
1425 | CONFIG_FB_MODE_HELPERS=y | ||
1426 | CONFIG_FB_TILEBLITTING=y | ||
1427 | |||
1428 | # | ||
1429 | # Frame buffer hardware drivers | ||
1430 | # | ||
1431 | # CONFIG_FB_CIRRUS is not set | ||
1432 | # CONFIG_FB_PM2 is not set | ||
1433 | # CONFIG_FB_CYBER2000 is not set | ||
1434 | # CONFIG_FB_ARC is not set | ||
1435 | # CONFIG_FB_ASILIANT is not set | ||
1436 | # CONFIG_FB_IMSTT is not set | ||
1437 | # CONFIG_FB_VGA16 is not set | ||
1438 | # CONFIG_FB_UVESA is not set | ||
1439 | # CONFIG_FB_VESA is not set | ||
1440 | CONFIG_FB_EFI=y | ||
1441 | # CONFIG_FB_IMAC is not set | ||
1442 | # CONFIG_FB_N411 is not set | ||
1443 | # CONFIG_FB_HGA is not set | ||
1444 | # CONFIG_FB_S1D13XXX is not set | ||
1445 | # CONFIG_FB_NVIDIA is not set | ||
1446 | # CONFIG_FB_RIVA is not set | ||
1447 | # CONFIG_FB_I810 is not set | ||
1448 | # CONFIG_FB_LE80578 is not set | ||
1449 | # CONFIG_FB_INTEL is not set | ||
1450 | # CONFIG_FB_MATROX is not set | ||
1451 | # CONFIG_FB_RADEON is not set | ||
1452 | # CONFIG_FB_ATY128 is not set | ||
1453 | # CONFIG_FB_ATY is not set | ||
1454 | # CONFIG_FB_S3 is not set | ||
1455 | # CONFIG_FB_SAVAGE is not set | ||
1456 | # CONFIG_FB_SIS is not set | ||
1457 | # CONFIG_FB_NEOMAGIC is not set | ||
1458 | # CONFIG_FB_KYRO is not set | ||
1459 | # CONFIG_FB_3DFX is not set | ||
1460 | # CONFIG_FB_VOODOO1 is not set | ||
1461 | # CONFIG_FB_VT8623 is not set | ||
1462 | # CONFIG_FB_CYBLA is not set | ||
1463 | # CONFIG_FB_TRIDENT is not set | ||
1464 | # CONFIG_FB_ARK is not set | ||
1465 | # CONFIG_FB_PM3 is not set | ||
1466 | # CONFIG_FB_GEODE is not set | ||
1467 | # CONFIG_FB_VIRTUAL is not set | ||
1468 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
1469 | # CONFIG_LCD_CLASS_DEVICE is not set | ||
1470 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
1471 | # CONFIG_BACKLIGHT_CORGI is not set | ||
1472 | # CONFIG_BACKLIGHT_PROGEAR is not set | ||
1021 | 1473 | ||
1022 | # | 1474 | # |
1023 | # Display device support | 1475 | # Display device support |
1024 | # | 1476 | # |
1025 | # CONFIG_DISPLAY_SUPPORT is not set | 1477 | # CONFIG_DISPLAY_SUPPORT is not set |
1026 | # CONFIG_VGASTATE is not set | ||
1027 | # CONFIG_FB is not set | ||
1028 | 1478 | ||
1029 | # | 1479 | # |
1030 | # Console display driver support | 1480 | # Console display driver support |
1031 | # | 1481 | # |
1032 | CONFIG_VGA_CONSOLE=y | 1482 | CONFIG_VGA_CONSOLE=y |
1033 | CONFIG_VGACON_SOFT_SCROLLBACK=y | 1483 | CONFIG_VGACON_SOFT_SCROLLBACK=y |
1034 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=128 | 1484 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
1035 | CONFIG_VIDEO_SELECT=y | 1485 | CONFIG_VIDEO_SELECT=y |
1036 | CONFIG_DUMMY_CONSOLE=y | 1486 | CONFIG_DUMMY_CONSOLE=y |
1487 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
1488 | CONFIG_LOGO=y | ||
1489 | # CONFIG_LOGO_LINUX_MONO is not set | ||
1490 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
1491 | CONFIG_LOGO_LINUX_CLUT224=y | ||
1037 | 1492 | ||
1038 | # | 1493 | # |
1039 | # Sound | 1494 | # Sound |
@@ -1043,33 +1498,167 @@ CONFIG_SOUND=y | |||
1043 | # | 1498 | # |
1044 | # Advanced Linux Sound Architecture | 1499 | # Advanced Linux Sound Architecture |
1045 | # | 1500 | # |
1046 | # CONFIG_SND is not set | 1501 | CONFIG_SND=y |
1502 | CONFIG_SND_TIMER=y | ||
1503 | CONFIG_SND_PCM=y | ||
1504 | CONFIG_SND_HWDEP=y | ||
1505 | CONFIG_SND_SEQUENCER=y | ||
1506 | CONFIG_SND_SEQ_DUMMY=y | ||
1507 | CONFIG_SND_OSSEMUL=y | ||
1508 | CONFIG_SND_MIXER_OSS=y | ||
1509 | CONFIG_SND_PCM_OSS=y | ||
1510 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
1511 | CONFIG_SND_SEQUENCER_OSS=y | ||
1512 | CONFIG_SND_DYNAMIC_MINORS=y | ||
1513 | CONFIG_SND_SUPPORT_OLD_API=y | ||
1514 | CONFIG_SND_VERBOSE_PROCFS=y | ||
1515 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
1516 | # CONFIG_SND_DEBUG is not set | ||
1517 | CONFIG_SND_VMASTER=y | ||
1518 | |||
1519 | # | ||
1520 | # Generic devices | ||
1521 | # | ||
1522 | # CONFIG_SND_PCSP is not set | ||
1523 | # CONFIG_SND_DUMMY is not set | ||
1524 | # CONFIG_SND_VIRMIDI is not set | ||
1525 | # CONFIG_SND_MTPAV is not set | ||
1526 | # CONFIG_SND_SERIAL_U16550 is not set | ||
1527 | # CONFIG_SND_MPU401 is not set | ||
1528 | |||
1529 | # | ||
1530 | # PCI devices | ||
1531 | # | ||
1532 | # CONFIG_SND_AD1889 is not set | ||
1533 | # CONFIG_SND_ALS300 is not set | ||
1534 | # CONFIG_SND_ALS4000 is not set | ||
1535 | # CONFIG_SND_ALI5451 is not set | ||
1536 | # CONFIG_SND_ATIIXP is not set | ||
1537 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
1538 | # CONFIG_SND_AU8810 is not set | ||
1539 | # CONFIG_SND_AU8820 is not set | ||
1540 | # CONFIG_SND_AU8830 is not set | ||
1541 | # CONFIG_SND_AW2 is not set | ||
1542 | # CONFIG_SND_AZT3328 is not set | ||
1543 | # CONFIG_SND_BT87X is not set | ||
1544 | # CONFIG_SND_CA0106 is not set | ||
1545 | # CONFIG_SND_CMIPCI is not set | ||
1546 | # CONFIG_SND_OXYGEN is not set | ||
1547 | # CONFIG_SND_CS4281 is not set | ||
1548 | # CONFIG_SND_CS46XX is not set | ||
1549 | # CONFIG_SND_CS5530 is not set | ||
1550 | # CONFIG_SND_CS5535AUDIO is not set | ||
1551 | # CONFIG_SND_DARLA20 is not set | ||
1552 | # CONFIG_SND_GINA20 is not set | ||
1553 | # CONFIG_SND_LAYLA20 is not set | ||
1554 | # CONFIG_SND_DARLA24 is not set | ||
1555 | # CONFIG_SND_GINA24 is not set | ||
1556 | # CONFIG_SND_LAYLA24 is not set | ||
1557 | # CONFIG_SND_MONA is not set | ||
1558 | # CONFIG_SND_MIA is not set | ||
1559 | # CONFIG_SND_ECHO3G is not set | ||
1560 | # CONFIG_SND_INDIGO is not set | ||
1561 | # CONFIG_SND_INDIGOIO is not set | ||
1562 | # CONFIG_SND_INDIGODJ is not set | ||
1563 | # CONFIG_SND_EMU10K1 is not set | ||
1564 | # CONFIG_SND_EMU10K1X is not set | ||
1565 | # CONFIG_SND_ENS1370 is not set | ||
1566 | # CONFIG_SND_ENS1371 is not set | ||
1567 | # CONFIG_SND_ES1938 is not set | ||
1568 | # CONFIG_SND_ES1968 is not set | ||
1569 | # CONFIG_SND_FM801 is not set | ||
1570 | CONFIG_SND_HDA_INTEL=y | ||
1571 | CONFIG_SND_HDA_HWDEP=y | ||
1572 | CONFIG_SND_HDA_CODEC_REALTEK=y | ||
1573 | CONFIG_SND_HDA_CODEC_ANALOG=y | ||
1574 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | ||
1575 | CONFIG_SND_HDA_CODEC_VIA=y | ||
1576 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | ||
1577 | CONFIG_SND_HDA_CODEC_CONEXANT=y | ||
1578 | CONFIG_SND_HDA_CODEC_CMEDIA=y | ||
1579 | CONFIG_SND_HDA_CODEC_SI3054=y | ||
1580 | CONFIG_SND_HDA_GENERIC=y | ||
1581 | # CONFIG_SND_HDA_POWER_SAVE is not set | ||
1582 | # CONFIG_SND_HDSP is not set | ||
1583 | # CONFIG_SND_HDSPM is not set | ||
1584 | # CONFIG_SND_HIFIER is not set | ||
1585 | # CONFIG_SND_ICE1712 is not set | ||
1586 | # CONFIG_SND_ICE1724 is not set | ||
1587 | # CONFIG_SND_INTEL8X0 is not set | ||
1588 | # CONFIG_SND_INTEL8X0M is not set | ||
1589 | # CONFIG_SND_KORG1212 is not set | ||
1590 | # CONFIG_SND_MAESTRO3 is not set | ||
1591 | # CONFIG_SND_MIXART is not set | ||
1592 | # CONFIG_SND_NM256 is not set | ||
1593 | # CONFIG_SND_PCXHR is not set | ||
1594 | # CONFIG_SND_RIPTIDE is not set | ||
1595 | # CONFIG_SND_RME32 is not set | ||
1596 | # CONFIG_SND_RME96 is not set | ||
1597 | # CONFIG_SND_RME9652 is not set | ||
1598 | # CONFIG_SND_SIS7019 is not set | ||
1599 | # CONFIG_SND_SONICVIBES is not set | ||
1600 | # CONFIG_SND_TRIDENT is not set | ||
1601 | # CONFIG_SND_VIA82XX is not set | ||
1602 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
1603 | # CONFIG_SND_VIRTUOSO is not set | ||
1604 | # CONFIG_SND_VX222 is not set | ||
1605 | # CONFIG_SND_YMFPCI is not set | ||
1606 | |||
1607 | # | ||
1608 | # USB devices | ||
1609 | # | ||
1610 | # CONFIG_SND_USB_AUDIO is not set | ||
1611 | # CONFIG_SND_USB_USX2Y is not set | ||
1612 | # CONFIG_SND_USB_CAIAQ is not set | ||
1613 | |||
1614 | # | ||
1615 | # PCMCIA devices | ||
1616 | # | ||
1617 | # CONFIG_SND_VXPOCKET is not set | ||
1618 | # CONFIG_SND_PDAUDIOCF is not set | ||
1619 | |||
1620 | # | ||
1621 | # System on Chip audio support | ||
1622 | # | ||
1623 | # CONFIG_SND_SOC is not set | ||
1624 | |||
1625 | # | ||
1626 | # ALSA SoC audio for Freescale SOCs | ||
1627 | # | ||
1628 | |||
1629 | # | ||
1630 | # SoC Audio for the Texas Instruments OMAP | ||
1631 | # | ||
1047 | 1632 | ||
1048 | # | 1633 | # |
1049 | # Open Sound System | 1634 | # Open Sound System |
1050 | # | 1635 | # |
1051 | CONFIG_SOUND_PRIME=y | 1636 | # CONFIG_SOUND_PRIME is not set |
1052 | # CONFIG_SOUND_TRIDENT is not set | ||
1053 | # CONFIG_SOUND_MSNDCLAS is not set | ||
1054 | # CONFIG_SOUND_MSNDPIN is not set | ||
1055 | # CONFIG_SOUND_OSS is not set | ||
1056 | CONFIG_HID_SUPPORT=y | 1637 | CONFIG_HID_SUPPORT=y |
1057 | CONFIG_HID=y | 1638 | CONFIG_HID=y |
1058 | # CONFIG_HID_DEBUG is not set | 1639 | CONFIG_HID_DEBUG=y |
1640 | CONFIG_HIDRAW=y | ||
1059 | 1641 | ||
1060 | # | 1642 | # |
1061 | # USB Input Devices | 1643 | # USB Input Devices |
1062 | # | 1644 | # |
1063 | CONFIG_USB_HID=y | 1645 | CONFIG_USB_HID=y |
1064 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1646 | CONFIG_USB_HIDINPUT_POWERBOOK=y |
1065 | # CONFIG_HID_FF is not set | 1647 | CONFIG_HID_FF=y |
1066 | # CONFIG_USB_HIDDEV is not set | 1648 | CONFIG_HID_PID=y |
1649 | CONFIG_LOGITECH_FF=y | ||
1650 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
1651 | CONFIG_PANTHERLORD_FF=y | ||
1652 | CONFIG_THRUSTMASTER_FF=y | ||
1653 | CONFIG_ZEROPLUS_FF=y | ||
1654 | CONFIG_USB_HIDDEV=y | ||
1067 | CONFIG_USB_SUPPORT=y | 1655 | CONFIG_USB_SUPPORT=y |
1068 | CONFIG_USB_ARCH_HAS_HCD=y | 1656 | CONFIG_USB_ARCH_HAS_HCD=y |
1069 | CONFIG_USB_ARCH_HAS_OHCI=y | 1657 | CONFIG_USB_ARCH_HAS_OHCI=y |
1070 | CONFIG_USB_ARCH_HAS_EHCI=y | 1658 | CONFIG_USB_ARCH_HAS_EHCI=y |
1071 | CONFIG_USB=y | 1659 | CONFIG_USB=y |
1072 | # CONFIG_USB_DEBUG is not set | 1660 | CONFIG_USB_DEBUG=y |
1661 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
1073 | 1662 | ||
1074 | # | 1663 | # |
1075 | # Miscellaneous USB options | 1664 | # Miscellaneous USB options |
@@ -1077,18 +1666,18 @@ CONFIG_USB=y | |||
1077 | CONFIG_USB_DEVICEFS=y | 1666 | CONFIG_USB_DEVICEFS=y |
1078 | # CONFIG_USB_DEVICE_CLASS is not set | 1667 | # CONFIG_USB_DEVICE_CLASS is not set |
1079 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1668 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1080 | # CONFIG_USB_SUSPEND is not set | 1669 | CONFIG_USB_SUSPEND=y |
1081 | # CONFIG_USB_PERSIST is not set | ||
1082 | # CONFIG_USB_OTG is not set | 1670 | # CONFIG_USB_OTG is not set |
1083 | 1671 | ||
1084 | # | 1672 | # |
1085 | # USB Host Controller Drivers | 1673 | # USB Host Controller Drivers |
1086 | # | 1674 | # |
1675 | # CONFIG_USB_C67X00_HCD is not set | ||
1087 | CONFIG_USB_EHCI_HCD=y | 1676 | CONFIG_USB_EHCI_HCD=y |
1088 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
1089 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1677 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1090 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1678 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1091 | # CONFIG_USB_ISP116X_HCD is not set | 1679 | # CONFIG_USB_ISP116X_HCD is not set |
1680 | # CONFIG_USB_ISP1760_HCD is not set | ||
1092 | CONFIG_USB_OHCI_HCD=y | 1681 | CONFIG_USB_OHCI_HCD=y |
1093 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1682 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
1094 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1683 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -1121,8 +1710,10 @@ CONFIG_USB_STORAGE=y | |||
1121 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1710 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1122 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1711 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1123 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1712 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1713 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1124 | # CONFIG_USB_STORAGE_KARMA is not set | 1714 | # CONFIG_USB_STORAGE_KARMA is not set |
1125 | # CONFIG_USB_LIBUSUAL is not set | 1715 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1716 | CONFIG_USB_LIBUSUAL=y | ||
1126 | 1717 | ||
1127 | # | 1718 | # |
1128 | # USB Imaging devices | 1719 | # USB Imaging devices |
@@ -1134,10 +1725,6 @@ CONFIG_USB_MON=y | |||
1134 | # | 1725 | # |
1135 | # USB port drivers | 1726 | # USB port drivers |
1136 | # | 1727 | # |
1137 | |||
1138 | # | ||
1139 | # USB Serial Converter support | ||
1140 | # | ||
1141 | # CONFIG_USB_SERIAL is not set | 1728 | # CONFIG_USB_SERIAL is not set |
1142 | 1729 | ||
1143 | # | 1730 | # |
@@ -1163,90 +1750,125 @@ CONFIG_USB_MON=y | |||
1163 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1750 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1164 | # CONFIG_USB_IOWARRIOR is not set | 1751 | # CONFIG_USB_IOWARRIOR is not set |
1165 | # CONFIG_USB_TEST is not set | 1752 | # CONFIG_USB_TEST is not set |
1753 | # CONFIG_USB_GADGET is not set | ||
1754 | # CONFIG_MMC is not set | ||
1755 | # CONFIG_MEMSTICK is not set | ||
1756 | CONFIG_NEW_LEDS=y | ||
1757 | CONFIG_LEDS_CLASS=y | ||
1166 | 1758 | ||
1167 | # | 1759 | # |
1168 | # USB DSL modem support | 1760 | # LED drivers |
1169 | # | 1761 | # |
1762 | # CONFIG_LEDS_CLEVO_MAIL is not set | ||
1170 | 1763 | ||
1171 | # | 1764 | # |
1172 | # USB Gadget Support | 1765 | # LED Triggers |
1173 | # | 1766 | # |
1174 | # CONFIG_USB_GADGET is not set | 1767 | CONFIG_LEDS_TRIGGERS=y |
1175 | # CONFIG_MMC is not set | 1768 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
1769 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
1770 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
1771 | # CONFIG_ACCESSIBILITY is not set | ||
1772 | # CONFIG_INFINIBAND is not set | ||
1773 | CONFIG_EDAC=y | ||
1176 | 1774 | ||
1177 | # | 1775 | # |
1178 | # LED devices | 1776 | # Reporting subsystems |
1179 | # | 1777 | # |
1180 | # CONFIG_NEW_LEDS is not set | 1778 | # CONFIG_EDAC_DEBUG is not set |
1779 | # CONFIG_EDAC_MM_EDAC is not set | ||
1780 | CONFIG_RTC_LIB=y | ||
1781 | CONFIG_RTC_CLASS=y | ||
1782 | # CONFIG_RTC_HCTOSYS is not set | ||
1783 | # CONFIG_RTC_DEBUG is not set | ||
1181 | 1784 | ||
1182 | # | 1785 | # |
1183 | # LED drivers | 1786 | # RTC interfaces |
1184 | # | 1787 | # |
1788 | CONFIG_RTC_INTF_SYSFS=y | ||
1789 | CONFIG_RTC_INTF_PROC=y | ||
1790 | CONFIG_RTC_INTF_DEV=y | ||
1791 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
1792 | # CONFIG_RTC_DRV_TEST is not set | ||
1185 | 1793 | ||
1186 | # | 1794 | # |
1187 | # LED Triggers | 1795 | # I2C RTC drivers |
1188 | # | 1796 | # |
1189 | # CONFIG_INFINIBAND is not set | 1797 | # CONFIG_RTC_DRV_DS1307 is not set |
1190 | # CONFIG_EDAC is not set | 1798 | # CONFIG_RTC_DRV_DS1374 is not set |
1799 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1800 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1801 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1802 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1803 | # CONFIG_RTC_DRV_X1205 is not set | ||
1804 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1805 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1806 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1807 | # CONFIG_RTC_DRV_S35390A is not set | ||
1191 | 1808 | ||
1192 | # | 1809 | # |
1193 | # Real Time Clock | 1810 | # SPI RTC drivers |
1194 | # | 1811 | # |
1195 | # CONFIG_RTC_CLASS is not set | ||
1196 | 1812 | ||
1197 | # | 1813 | # |
1198 | # DMA Engine support | 1814 | # Platform RTC drivers |
1199 | # | 1815 | # |
1200 | # CONFIG_DMA_ENGINE is not set | 1816 | CONFIG_RTC_DRV_CMOS=y |
1817 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1818 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1819 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1820 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1821 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1822 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1823 | # CONFIG_RTC_DRV_V3020 is not set | ||
1201 | 1824 | ||
1202 | # | 1825 | # |
1203 | # DMA Clients | 1826 | # on-CPU RTC drivers |
1204 | # | 1827 | # |
1828 | CONFIG_DMADEVICES=y | ||
1205 | 1829 | ||
1206 | # | 1830 | # |
1207 | # DMA Devices | 1831 | # DMA Devices |
1208 | # | 1832 | # |
1209 | CONFIG_VIRTUALIZATION=y | 1833 | # CONFIG_INTEL_IOATDMA is not set |
1210 | # CONFIG_KVM is not set | 1834 | # CONFIG_UIO is not set |
1211 | 1835 | ||
1212 | # | 1836 | # |
1213 | # Userspace I/O | 1837 | # Firmware Drivers |
1214 | # | 1838 | # |
1215 | # CONFIG_UIO is not set | 1839 | # CONFIG_EDD is not set |
1840 | CONFIG_EFI_VARS=y | ||
1841 | # CONFIG_DELL_RBU is not set | ||
1842 | # CONFIG_DCDBAS is not set | ||
1843 | CONFIG_DMIID=y | ||
1844 | # CONFIG_ISCSI_IBFT_FIND is not set | ||
1216 | 1845 | ||
1217 | # | 1846 | # |
1218 | # File systems | 1847 | # File systems |
1219 | # | 1848 | # |
1220 | CONFIG_EXT2_FS=y | 1849 | # CONFIG_EXT2_FS is not set |
1221 | CONFIG_EXT2_FS_XATTR=y | ||
1222 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
1223 | # CONFIG_EXT2_FS_SECURITY is not set | ||
1224 | # CONFIG_EXT2_FS_XIP is not set | ||
1225 | CONFIG_EXT3_FS=y | 1850 | CONFIG_EXT3_FS=y |
1226 | CONFIG_EXT3_FS_XATTR=y | 1851 | CONFIG_EXT3_FS_XATTR=y |
1227 | CONFIG_EXT3_FS_POSIX_ACL=y | 1852 | CONFIG_EXT3_FS_POSIX_ACL=y |
1228 | # CONFIG_EXT3_FS_SECURITY is not set | 1853 | CONFIG_EXT3_FS_SECURITY=y |
1229 | # CONFIG_EXT4DEV_FS is not set | 1854 | # CONFIG_EXT4DEV_FS is not set |
1230 | CONFIG_JBD=y | 1855 | CONFIG_JBD=y |
1231 | # CONFIG_JBD_DEBUG is not set | 1856 | # CONFIG_JBD_DEBUG is not set |
1232 | CONFIG_FS_MBCACHE=y | 1857 | CONFIG_FS_MBCACHE=y |
1233 | CONFIG_REISERFS_FS=y | 1858 | # CONFIG_REISERFS_FS is not set |
1234 | # CONFIG_REISERFS_CHECK is not set | ||
1235 | # CONFIG_REISERFS_PROC_INFO is not set | ||
1236 | CONFIG_REISERFS_FS_XATTR=y | ||
1237 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
1238 | # CONFIG_REISERFS_FS_SECURITY is not set | ||
1239 | # CONFIG_JFS_FS is not set | 1859 | # CONFIG_JFS_FS is not set |
1240 | CONFIG_FS_POSIX_ACL=y | 1860 | CONFIG_FS_POSIX_ACL=y |
1241 | # CONFIG_XFS_FS is not set | 1861 | # CONFIG_XFS_FS is not set |
1242 | # CONFIG_GFS2_FS is not set | ||
1243 | # CONFIG_OCFS2_FS is not set | 1862 | # CONFIG_OCFS2_FS is not set |
1244 | # CONFIG_MINIX_FS is not set | 1863 | CONFIG_DNOTIFY=y |
1245 | # CONFIG_ROMFS_FS is not set | ||
1246 | CONFIG_INOTIFY=y | 1864 | CONFIG_INOTIFY=y |
1247 | CONFIG_INOTIFY_USER=y | 1865 | CONFIG_INOTIFY_USER=y |
1248 | # CONFIG_QUOTA is not set | 1866 | CONFIG_QUOTA=y |
1249 | CONFIG_DNOTIFY=y | 1867 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
1868 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
1869 | # CONFIG_QFMT_V1 is not set | ||
1870 | CONFIG_QFMT_V2=y | ||
1871 | CONFIG_QUOTACTL=y | ||
1250 | # CONFIG_AUTOFS_FS is not set | 1872 | # CONFIG_AUTOFS_FS is not set |
1251 | CONFIG_AUTOFS4_FS=y | 1873 | CONFIG_AUTOFS4_FS=y |
1252 | # CONFIG_FUSE_FS is not set | 1874 | # CONFIG_FUSE_FS is not set |
@@ -1256,8 +1878,8 @@ CONFIG_GENERIC_ACL=y | |||
1256 | # CD-ROM/DVD Filesystems | 1878 | # CD-ROM/DVD Filesystems |
1257 | # | 1879 | # |
1258 | CONFIG_ISO9660_FS=y | 1880 | CONFIG_ISO9660_FS=y |
1259 | # CONFIG_JOLIET is not set | 1881 | CONFIG_JOLIET=y |
1260 | # CONFIG_ZISOFS is not set | 1882 | CONFIG_ZISOFS=y |
1261 | # CONFIG_UDF_FS is not set | 1883 | # CONFIG_UDF_FS is not set |
1262 | 1884 | ||
1263 | # | 1885 | # |
@@ -1275,13 +1897,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1275 | # | 1897 | # |
1276 | CONFIG_PROC_FS=y | 1898 | CONFIG_PROC_FS=y |
1277 | CONFIG_PROC_KCORE=y | 1899 | CONFIG_PROC_KCORE=y |
1900 | CONFIG_PROC_VMCORE=y | ||
1278 | CONFIG_PROC_SYSCTL=y | 1901 | CONFIG_PROC_SYSCTL=y |
1279 | CONFIG_SYSFS=y | 1902 | CONFIG_SYSFS=y |
1280 | CONFIG_TMPFS=y | 1903 | CONFIG_TMPFS=y |
1281 | CONFIG_TMPFS_POSIX_ACL=y | 1904 | CONFIG_TMPFS_POSIX_ACL=y |
1282 | CONFIG_HUGETLBFS=y | 1905 | CONFIG_HUGETLBFS=y |
1283 | CONFIG_HUGETLB_PAGE=y | 1906 | CONFIG_HUGETLB_PAGE=y |
1284 | CONFIG_RAMFS=y | ||
1285 | # CONFIG_CONFIGFS_FS is not set | 1907 | # CONFIG_CONFIGFS_FS is not set |
1286 | 1908 | ||
1287 | # | 1909 | # |
@@ -1289,6 +1911,7 @@ CONFIG_RAMFS=y | |||
1289 | # | 1911 | # |
1290 | # CONFIG_ADFS_FS is not set | 1912 | # CONFIG_ADFS_FS is not set |
1291 | # CONFIG_AFFS_FS is not set | 1913 | # CONFIG_AFFS_FS is not set |
1914 | # CONFIG_ECRYPT_FS is not set | ||
1292 | # CONFIG_HFS_FS is not set | 1915 | # CONFIG_HFS_FS is not set |
1293 | # CONFIG_HFSPLUS_FS is not set | 1916 | # CONFIG_HFSPLUS_FS is not set |
1294 | # CONFIG_BEFS_FS is not set | 1917 | # CONFIG_BEFS_FS is not set |
@@ -1296,33 +1919,15 @@ CONFIG_RAMFS=y | |||
1296 | # CONFIG_EFS_FS is not set | 1919 | # CONFIG_EFS_FS is not set |
1297 | # CONFIG_CRAMFS is not set | 1920 | # CONFIG_CRAMFS is not set |
1298 | # CONFIG_VXFS_FS is not set | 1921 | # CONFIG_VXFS_FS is not set |
1922 | # CONFIG_MINIX_FS is not set | ||
1299 | # CONFIG_HPFS_FS is not set | 1923 | # CONFIG_HPFS_FS is not set |
1300 | # CONFIG_QNX4FS_FS is not set | 1924 | # CONFIG_QNX4FS_FS is not set |
1925 | # CONFIG_ROMFS_FS is not set | ||
1301 | # CONFIG_SYSV_FS is not set | 1926 | # CONFIG_SYSV_FS is not set |
1302 | # CONFIG_UFS_FS is not set | 1927 | # CONFIG_UFS_FS is not set |
1303 | 1928 | CONFIG_NETWORK_FILESYSTEMS=y | |
1304 | # | 1929 | # CONFIG_NFS_FS is not set |
1305 | # Network File Systems | 1930 | # CONFIG_NFSD is not set |
1306 | # | ||
1307 | CONFIG_NFS_FS=y | ||
1308 | CONFIG_NFS_V3=y | ||
1309 | # CONFIG_NFS_V3_ACL is not set | ||
1310 | # CONFIG_NFS_V4 is not set | ||
1311 | # CONFIG_NFS_DIRECTIO is not set | ||
1312 | CONFIG_NFSD=y | ||
1313 | CONFIG_NFSD_V3=y | ||
1314 | # CONFIG_NFSD_V3_ACL is not set | ||
1315 | # CONFIG_NFSD_V4 is not set | ||
1316 | CONFIG_NFSD_TCP=y | ||
1317 | CONFIG_ROOT_NFS=y | ||
1318 | CONFIG_LOCKD=y | ||
1319 | CONFIG_LOCKD_V4=y | ||
1320 | CONFIG_EXPORTFS=y | ||
1321 | CONFIG_NFS_COMMON=y | ||
1322 | CONFIG_SUNRPC=y | ||
1323 | # CONFIG_SUNRPC_BIND34 is not set | ||
1324 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1325 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1326 | # CONFIG_SMB_FS is not set | 1931 | # CONFIG_SMB_FS is not set |
1327 | # CONFIG_CIFS is not set | 1932 | # CONFIG_CIFS is not set |
1328 | # CONFIG_NCP_FS is not set | 1933 | # CONFIG_NCP_FS is not set |
@@ -1332,14 +1937,26 @@ CONFIG_SUNRPC=y | |||
1332 | # | 1937 | # |
1333 | # Partition Types | 1938 | # Partition Types |
1334 | # | 1939 | # |
1335 | # CONFIG_PARTITION_ADVANCED is not set | 1940 | CONFIG_PARTITION_ADVANCED=y |
1941 | # CONFIG_ACORN_PARTITION is not set | ||
1942 | CONFIG_OSF_PARTITION=y | ||
1943 | CONFIG_AMIGA_PARTITION=y | ||
1944 | # CONFIG_ATARI_PARTITION is not set | ||
1945 | CONFIG_MAC_PARTITION=y | ||
1336 | CONFIG_MSDOS_PARTITION=y | 1946 | CONFIG_MSDOS_PARTITION=y |
1337 | 1947 | CONFIG_BSD_DISKLABEL=y | |
1338 | # | 1948 | CONFIG_MINIX_SUBPARTITION=y |
1339 | # Native Language Support | 1949 | CONFIG_SOLARIS_X86_PARTITION=y |
1340 | # | 1950 | CONFIG_UNIXWARE_DISKLABEL=y |
1951 | # CONFIG_LDM_PARTITION is not set | ||
1952 | CONFIG_SGI_PARTITION=y | ||
1953 | # CONFIG_ULTRIX_PARTITION is not set | ||
1954 | CONFIG_SUN_PARTITION=y | ||
1955 | CONFIG_KARMA_PARTITION=y | ||
1956 | CONFIG_EFI_PARTITION=y | ||
1957 | # CONFIG_SYSV68_PARTITION is not set | ||
1341 | CONFIG_NLS=y | 1958 | CONFIG_NLS=y |
1342 | CONFIG_NLS_DEFAULT="iso8859-1" | 1959 | CONFIG_NLS_DEFAULT="utf8" |
1343 | CONFIG_NLS_CODEPAGE_437=y | 1960 | CONFIG_NLS_CODEPAGE_437=y |
1344 | # CONFIG_NLS_CODEPAGE_737 is not set | 1961 | # CONFIG_NLS_CODEPAGE_737 is not set |
1345 | # CONFIG_NLS_CODEPAGE_775 is not set | 1962 | # CONFIG_NLS_CODEPAGE_775 is not set |
@@ -1374,37 +1991,33 @@ CONFIG_NLS_ISO8859_1=y | |||
1374 | # CONFIG_NLS_ISO8859_9 is not set | 1991 | # CONFIG_NLS_ISO8859_9 is not set |
1375 | # CONFIG_NLS_ISO8859_13 is not set | 1992 | # CONFIG_NLS_ISO8859_13 is not set |
1376 | # CONFIG_NLS_ISO8859_14 is not set | 1993 | # CONFIG_NLS_ISO8859_14 is not set |
1377 | CONFIG_NLS_ISO8859_15=y | 1994 | # CONFIG_NLS_ISO8859_15 is not set |
1378 | # CONFIG_NLS_KOI8_R is not set | 1995 | # CONFIG_NLS_KOI8_R is not set |
1379 | # CONFIG_NLS_KOI8_U is not set | 1996 | # CONFIG_NLS_KOI8_U is not set |
1380 | CONFIG_NLS_UTF8=y | 1997 | CONFIG_NLS_UTF8=y |
1381 | |||
1382 | # | ||
1383 | # Distributed Lock Manager | ||
1384 | # | ||
1385 | # CONFIG_DLM is not set | 1998 | # CONFIG_DLM is not set |
1386 | CONFIG_INSTRUMENTATION=y | ||
1387 | CONFIG_PROFILING=y | ||
1388 | CONFIG_OPROFILE=y | ||
1389 | CONFIG_KPROBES=y | ||
1390 | 1999 | ||
1391 | # | 2000 | # |
1392 | # Kernel hacking | 2001 | # Kernel hacking |
1393 | # | 2002 | # |
1394 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2003 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
1395 | # CONFIG_PRINTK_TIME is not set | 2004 | # CONFIG_PRINTK_TIME is not set |
2005 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
1396 | # CONFIG_ENABLE_MUST_CHECK is not set | 2006 | # CONFIG_ENABLE_MUST_CHECK is not set |
2007 | CONFIG_FRAME_WARN=2048 | ||
1397 | CONFIG_MAGIC_SYSRQ=y | 2008 | CONFIG_MAGIC_SYSRQ=y |
1398 | CONFIG_UNUSED_SYMBOLS=y | 2009 | # CONFIG_UNUSED_SYMBOLS is not set |
1399 | # CONFIG_DEBUG_FS is not set | 2010 | CONFIG_DEBUG_FS=y |
1400 | # CONFIG_HEADERS_CHECK is not set | 2011 | # CONFIG_HEADERS_CHECK is not set |
1401 | CONFIG_DEBUG_KERNEL=y | 2012 | CONFIG_DEBUG_KERNEL=y |
1402 | # CONFIG_DEBUG_SHIRQ is not set | 2013 | # CONFIG_DEBUG_SHIRQ is not set |
1403 | CONFIG_DETECT_SOFTLOCKUP=y | 2014 | # CONFIG_DETECT_SOFTLOCKUP is not set |
1404 | # CONFIG_SCHED_DEBUG is not set | 2015 | # CONFIG_SCHED_DEBUG is not set |
1405 | # CONFIG_SCHEDSTATS is not set | 2016 | CONFIG_SCHEDSTATS=y |
1406 | CONFIG_TIMER_STATS=y | 2017 | CONFIG_TIMER_STATS=y |
2018 | # CONFIG_DEBUG_OBJECTS is not set | ||
1407 | # CONFIG_SLUB_DEBUG_ON is not set | 2019 | # CONFIG_SLUB_DEBUG_ON is not set |
2020 | # CONFIG_SLUB_STATS is not set | ||
1408 | # CONFIG_DEBUG_RT_MUTEXES is not set | 2021 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1409 | # CONFIG_RT_MUTEX_TESTER is not set | 2022 | # CONFIG_RT_MUTEX_TESTER is not set |
1410 | # CONFIG_DEBUG_SPINLOCK is not set | 2023 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1419,48 +2032,174 @@ CONFIG_TIMER_STATS=y | |||
1419 | CONFIG_DEBUG_BUGVERBOSE=y | 2032 | CONFIG_DEBUG_BUGVERBOSE=y |
1420 | # CONFIG_DEBUG_INFO is not set | 2033 | # CONFIG_DEBUG_INFO is not set |
1421 | # CONFIG_DEBUG_VM is not set | 2034 | # CONFIG_DEBUG_VM is not set |
2035 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1422 | # CONFIG_DEBUG_LIST is not set | 2036 | # CONFIG_DEBUG_LIST is not set |
1423 | # CONFIG_FRAME_POINTER is not set | 2037 | # CONFIG_DEBUG_SG is not set |
1424 | CONFIG_OPTIMIZE_INLINING=y | 2038 | CONFIG_FRAME_POINTER=y |
2039 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1425 | # CONFIG_RCU_TORTURE_TEST is not set | 2040 | # CONFIG_RCU_TORTURE_TEST is not set |
2041 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
2042 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1426 | # CONFIG_LKDTM is not set | 2043 | # CONFIG_LKDTM is not set |
1427 | # CONFIG_FAULT_INJECTION is not set | 2044 | # CONFIG_FAULT_INJECTION is not set |
2045 | # CONFIG_LATENCYTOP is not set | ||
2046 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | ||
2047 | # CONFIG_SAMPLES is not set | ||
2048 | # CONFIG_KGDB is not set | ||
2049 | CONFIG_HAVE_ARCH_KGDB=y | ||
2050 | # CONFIG_NONPROMISC_DEVMEM is not set | ||
1428 | CONFIG_EARLY_PRINTK=y | 2051 | CONFIG_EARLY_PRINTK=y |
1429 | CONFIG_DEBUG_STACKOVERFLOW=y | 2052 | CONFIG_DEBUG_STACKOVERFLOW=y |
1430 | # CONFIG_DEBUG_STACK_USAGE is not set | 2053 | CONFIG_DEBUG_STACK_USAGE=y |
1431 | # CONFIG_DEBUG_RODATA is not set | 2054 | # CONFIG_DEBUG_PAGEALLOC is not set |
2055 | # CONFIG_X86_PTDUMP is not set | ||
2056 | CONFIG_DEBUG_RODATA=y | ||
2057 | # CONFIG_DEBUG_RODATA_TEST is not set | ||
2058 | CONFIG_DEBUG_NX_TEST=m | ||
1432 | # CONFIG_4KSTACKS is not set | 2059 | # CONFIG_4KSTACKS is not set |
1433 | CONFIG_X86_FIND_SMP_CONFIG=y | 2060 | CONFIG_X86_FIND_SMP_CONFIG=y |
1434 | CONFIG_X86_MPPARSE=y | 2061 | CONFIG_X86_MPPARSE=y |
1435 | CONFIG_DOUBLEFAULT=y | 2062 | CONFIG_DOUBLEFAULT=y |
2063 | CONFIG_IO_DELAY_TYPE_0X80=0 | ||
2064 | CONFIG_IO_DELAY_TYPE_0XED=1 | ||
2065 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | ||
2066 | CONFIG_IO_DELAY_TYPE_NONE=3 | ||
2067 | CONFIG_IO_DELAY_0X80=y | ||
2068 | # CONFIG_IO_DELAY_0XED is not set | ||
2069 | # CONFIG_IO_DELAY_UDELAY is not set | ||
2070 | # CONFIG_IO_DELAY_NONE is not set | ||
2071 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | ||
2072 | CONFIG_DEBUG_BOOT_PARAMS=y | ||
2073 | # CONFIG_CPA_DEBUG is not set | ||
1436 | 2074 | ||
1437 | # | 2075 | # |
1438 | # Security options | 2076 | # Security options |
1439 | # | 2077 | # |
1440 | # CONFIG_KEYS is not set | 2078 | CONFIG_KEYS=y |
1441 | # CONFIG_SECURITY is not set | 2079 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1442 | # CONFIG_CRYPTO is not set | 2080 | CONFIG_SECURITY=y |
2081 | CONFIG_SECURITY_NETWORK=y | ||
2082 | # CONFIG_SECURITY_NETWORK_XFRM is not set | ||
2083 | CONFIG_SECURITY_CAPABILITIES=y | ||
2084 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
2085 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
2086 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | ||
2087 | CONFIG_SECURITY_SELINUX=y | ||
2088 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | ||
2089 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | ||
2090 | CONFIG_SECURITY_SELINUX_DISABLE=y | ||
2091 | CONFIG_SECURITY_SELINUX_DEVELOP=y | ||
2092 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | ||
2093 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | ||
2094 | # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set | ||
2095 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set | ||
2096 | # CONFIG_SECURITY_SMACK is not set | ||
2097 | CONFIG_CRYPTO=y | ||
2098 | |||
2099 | # | ||
2100 | # Crypto core or helper | ||
2101 | # | ||
2102 | CONFIG_CRYPTO_ALGAPI=y | ||
2103 | CONFIG_CRYPTO_AEAD=y | ||
2104 | CONFIG_CRYPTO_BLKCIPHER=y | ||
2105 | CONFIG_CRYPTO_HASH=y | ||
2106 | CONFIG_CRYPTO_MANAGER=y | ||
2107 | # CONFIG_CRYPTO_GF128MUL is not set | ||
2108 | # CONFIG_CRYPTO_NULL is not set | ||
2109 | # CONFIG_CRYPTO_CRYPTD is not set | ||
2110 | CONFIG_CRYPTO_AUTHENC=y | ||
2111 | # CONFIG_CRYPTO_TEST is not set | ||
2112 | |||
2113 | # | ||
2114 | # Authenticated Encryption with Associated Data | ||
2115 | # | ||
2116 | # CONFIG_CRYPTO_CCM is not set | ||
2117 | # CONFIG_CRYPTO_GCM is not set | ||
2118 | # CONFIG_CRYPTO_SEQIV is not set | ||
2119 | |||
2120 | # | ||
2121 | # Block modes | ||
2122 | # | ||
2123 | CONFIG_CRYPTO_CBC=y | ||
2124 | # CONFIG_CRYPTO_CTR is not set | ||
2125 | # CONFIG_CRYPTO_CTS is not set | ||
2126 | CONFIG_CRYPTO_ECB=y | ||
2127 | # CONFIG_CRYPTO_LRW is not set | ||
2128 | # CONFIG_CRYPTO_PCBC is not set | ||
2129 | # CONFIG_CRYPTO_XTS is not set | ||
2130 | |||
2131 | # | ||
2132 | # Hash modes | ||
2133 | # | ||
2134 | CONFIG_CRYPTO_HMAC=y | ||
2135 | # CONFIG_CRYPTO_XCBC is not set | ||
2136 | |||
2137 | # | ||
2138 | # Digest | ||
2139 | # | ||
2140 | # CONFIG_CRYPTO_CRC32C is not set | ||
2141 | # CONFIG_CRYPTO_MD4 is not set | ||
2142 | CONFIG_CRYPTO_MD5=y | ||
2143 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
2144 | CONFIG_CRYPTO_SHA1=y | ||
2145 | # CONFIG_CRYPTO_SHA256 is not set | ||
2146 | # CONFIG_CRYPTO_SHA512 is not set | ||
2147 | # CONFIG_CRYPTO_TGR192 is not set | ||
2148 | # CONFIG_CRYPTO_WP512 is not set | ||
2149 | |||
2150 | # | ||
2151 | # Ciphers | ||
2152 | # | ||
2153 | CONFIG_CRYPTO_AES=y | ||
2154 | # CONFIG_CRYPTO_AES_586 is not set | ||
2155 | # CONFIG_CRYPTO_ANUBIS is not set | ||
2156 | CONFIG_CRYPTO_ARC4=y | ||
2157 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
2158 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
2159 | # CONFIG_CRYPTO_CAST5 is not set | ||
2160 | # CONFIG_CRYPTO_CAST6 is not set | ||
2161 | CONFIG_CRYPTO_DES=y | ||
2162 | # CONFIG_CRYPTO_FCRYPT is not set | ||
2163 | # CONFIG_CRYPTO_KHAZAD is not set | ||
2164 | # CONFIG_CRYPTO_SALSA20 is not set | ||
2165 | # CONFIG_CRYPTO_SALSA20_586 is not set | ||
2166 | # CONFIG_CRYPTO_SEED is not set | ||
2167 | # CONFIG_CRYPTO_SERPENT is not set | ||
2168 | # CONFIG_CRYPTO_TEA is not set | ||
2169 | # CONFIG_CRYPTO_TWOFISH is not set | ||
2170 | # CONFIG_CRYPTO_TWOFISH_586 is not set | ||
2171 | |||
2172 | # | ||
2173 | # Compression | ||
2174 | # | ||
2175 | # CONFIG_CRYPTO_DEFLATE is not set | ||
2176 | # CONFIG_CRYPTO_LZO is not set | ||
2177 | CONFIG_CRYPTO_HW=y | ||
2178 | # CONFIG_CRYPTO_DEV_PADLOCK is not set | ||
2179 | # CONFIG_CRYPTO_DEV_GEODE is not set | ||
2180 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
2181 | CONFIG_HAVE_KVM=y | ||
2182 | CONFIG_VIRTUALIZATION=y | ||
2183 | # CONFIG_KVM is not set | ||
2184 | # CONFIG_LGUEST is not set | ||
2185 | # CONFIG_VIRTIO_PCI is not set | ||
2186 | # CONFIG_VIRTIO_BALLOON is not set | ||
1443 | 2187 | ||
1444 | # | 2188 | # |
1445 | # Library routines | 2189 | # Library routines |
1446 | # | 2190 | # |
1447 | CONFIG_BITREVERSE=y | 2191 | CONFIG_BITREVERSE=y |
2192 | CONFIG_GENERIC_FIND_FIRST_BIT=y | ||
2193 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
1448 | # CONFIG_CRC_CCITT is not set | 2194 | # CONFIG_CRC_CCITT is not set |
1449 | # CONFIG_CRC16 is not set | 2195 | # CONFIG_CRC16 is not set |
1450 | # CONFIG_CRC_ITU_T is not set | 2196 | # CONFIG_CRC_ITU_T is not set |
1451 | CONFIG_CRC32=y | 2197 | CONFIG_CRC32=y |
1452 | # CONFIG_CRC7 is not set | 2198 | # CONFIG_CRC7 is not set |
1453 | # CONFIG_LIBCRC32C is not set | 2199 | # CONFIG_LIBCRC32C is not set |
2200 | CONFIG_AUDIT_GENERIC=y | ||
1454 | CONFIG_ZLIB_INFLATE=y | 2201 | CONFIG_ZLIB_INFLATE=y |
1455 | CONFIG_PLIST=y | 2202 | CONFIG_PLIST=y |
1456 | CONFIG_HAS_IOMEM=y | 2203 | CONFIG_HAS_IOMEM=y |
1457 | CONFIG_HAS_IOPORT=y | 2204 | CONFIG_HAS_IOPORT=y |
1458 | CONFIG_HAS_DMA=y | 2205 | CONFIG_HAS_DMA=y |
1459 | CONFIG_GENERIC_HARDIRQS=y | ||
1460 | CONFIG_GENERIC_IRQ_PROBE=y | ||
1461 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1462 | CONFIG_X86_SMP=y | ||
1463 | CONFIG_X86_HT=y | ||
1464 | CONFIG_X86_BIOS_REBOOT=y | ||
1465 | CONFIG_X86_TRAMPOLINE=y | ||
1466 | CONFIG_KTIME_SCALAR=y | ||
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 2d6f5b2809d2..ae5124e064d4 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -1,64 +1,103 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.22-git14 | 3 | # Linux kernel version: 2.6.26-rc1 |
4 | # Fri Jul 20 09:53:15 2007 | 4 | # Sun May 4 19:59:57 2008 |
5 | # | 5 | # |
6 | CONFIG_X86_64=y | ||
7 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | # CONFIG_X86_32 is not set | ||
8 | CONFIG_X86_64=y | ||
8 | CONFIG_X86=y | 9 | CONFIG_X86=y |
10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/x86_64_defconfig" | ||
11 | # CONFIG_GENERIC_LOCKBREAK is not set | ||
9 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
10 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
11 | CONFIG_GENERIC_CMOS_UPDATE=y | 13 | CONFIG_GENERIC_CMOS_UPDATE=y |
12 | CONFIG_ZONE_DMA32=y | 14 | CONFIG_CLOCKSOURCE_WATCHDOG=y |
15 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
16 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | ||
13 | CONFIG_LOCKDEP_SUPPORT=y | 17 | CONFIG_LOCKDEP_SUPPORT=y |
14 | CONFIG_STACKTRACE_SUPPORT=y | 18 | CONFIG_STACKTRACE_SUPPORT=y |
15 | CONFIG_SEMAPHORE_SLEEPERS=y | 19 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
20 | CONFIG_FAST_CMPXCHG_LOCAL=y | ||
16 | CONFIG_MMU=y | 21 | CONFIG_MMU=y |
17 | CONFIG_ZONE_DMA=y | 22 | CONFIG_ZONE_DMA=y |
18 | CONFIG_QUICKLIST=y | ||
19 | CONFIG_NR_QUICK=2 | ||
20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
21 | CONFIG_GENERIC_HWEIGHT=y | ||
22 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
23 | CONFIG_X86_CMPXCHG=y | ||
24 | CONFIG_EARLY_PRINTK=y | ||
25 | CONFIG_GENERIC_ISA_DMA=y | 23 | CONFIG_GENERIC_ISA_DMA=y |
26 | CONFIG_GENERIC_IOMAP=y | 24 | CONFIG_GENERIC_IOMAP=y |
27 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
28 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
29 | CONFIG_DMI=y | ||
30 | CONFIG_AUDIT_ARCH=y | ||
31 | CONFIG_GENERIC_BUG=y | 25 | CONFIG_GENERIC_BUG=y |
26 | CONFIG_GENERIC_HWEIGHT=y | ||
27 | # CONFIG_GENERIC_GPIO is not set | ||
28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
29 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
30 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | ||
32 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 31 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
33 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 32 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
34 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y |
34 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
35 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
36 | CONFIG_ARCH_HAS_CPU_RELAX=y | ||
37 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | ||
38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
39 | CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y | ||
40 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
41 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
42 | CONFIG_ZONE_DMA32=y | ||
43 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
44 | CONFIG_AUDIT_ARCH=y | ||
45 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | ||
47 | CONFIG_GENERIC_HARDIRQS=y | ||
48 | CONFIG_GENERIC_IRQ_PROBE=y | ||
49 | CONFIG_GENERIC_PENDING_IRQ=y | ||
50 | CONFIG_X86_SMP=y | ||
51 | CONFIG_X86_64_SMP=y | ||
52 | CONFIG_X86_HT=y | ||
53 | CONFIG_X86_BIOS_REBOOT=y | ||
54 | CONFIG_X86_TRAMPOLINE=y | ||
55 | # CONFIG_KTIME_SCALAR is not set | ||
35 | 56 | ||
36 | # | 57 | # |
37 | # Code maturity level options | 58 | # General setup |
38 | # | 59 | # |
39 | CONFIG_EXPERIMENTAL=y | 60 | CONFIG_EXPERIMENTAL=y |
40 | CONFIG_LOCK_KERNEL=y | 61 | CONFIG_LOCK_KERNEL=y |
41 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 62 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
42 | |||
43 | # | ||
44 | # General setup | ||
45 | # | ||
46 | CONFIG_LOCALVERSION="" | 63 | CONFIG_LOCALVERSION="" |
47 | CONFIG_LOCALVERSION_AUTO=y | 64 | # CONFIG_LOCALVERSION_AUTO is not set |
48 | CONFIG_SWAP=y | 65 | CONFIG_SWAP=y |
49 | CONFIG_SYSVIPC=y | 66 | CONFIG_SYSVIPC=y |
50 | CONFIG_SYSVIPC_SYSCTL=y | 67 | CONFIG_SYSVIPC_SYSCTL=y |
51 | CONFIG_POSIX_MQUEUE=y | 68 | CONFIG_POSIX_MQUEUE=y |
52 | # CONFIG_BSD_PROCESS_ACCT is not set | 69 | CONFIG_BSD_PROCESS_ACCT=y |
53 | # CONFIG_TASKSTATS is not set | 70 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
54 | # CONFIG_USER_NS is not set | 71 | CONFIG_TASKSTATS=y |
55 | # CONFIG_AUDIT is not set | 72 | CONFIG_TASK_DELAY_ACCT=y |
56 | CONFIG_IKCONFIG=y | 73 | CONFIG_TASK_XACCT=y |
57 | CONFIG_IKCONFIG_PROC=y | 74 | CONFIG_TASK_IO_ACCOUNTING=y |
58 | CONFIG_LOG_BUF_SHIFT=18 | 75 | CONFIG_AUDIT=y |
59 | # CONFIG_CPUSETS is not set | 76 | CONFIG_AUDITSYSCALL=y |
60 | CONFIG_SYSFS_DEPRECATED=y | 77 | CONFIG_AUDIT_TREE=y |
78 | # CONFIG_IKCONFIG is not set | ||
79 | CONFIG_LOG_BUF_SHIFT=17 | ||
80 | CONFIG_CGROUPS=y | ||
81 | # CONFIG_CGROUP_DEBUG is not set | ||
82 | CONFIG_CGROUP_NS=y | ||
83 | # CONFIG_CGROUP_DEVICE is not set | ||
84 | CONFIG_CPUSETS=y | ||
85 | CONFIG_GROUP_SCHED=y | ||
86 | CONFIG_FAIR_GROUP_SCHED=y | ||
87 | # CONFIG_RT_GROUP_SCHED is not set | ||
88 | # CONFIG_USER_SCHED is not set | ||
89 | CONFIG_CGROUP_SCHED=y | ||
90 | CONFIG_CGROUP_CPUACCT=y | ||
91 | CONFIG_RESOURCE_COUNTERS=y | ||
92 | # CONFIG_CGROUP_MEM_RES_CTLR is not set | ||
93 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
94 | CONFIG_PROC_PID_CPUSET=y | ||
61 | CONFIG_RELAY=y | 95 | CONFIG_RELAY=y |
96 | CONFIG_NAMESPACES=y | ||
97 | CONFIG_UTS_NS=y | ||
98 | CONFIG_IPC_NS=y | ||
99 | CONFIG_USER_NS=y | ||
100 | CONFIG_PID_NS=y | ||
62 | CONFIG_BLK_DEV_INITRD=y | 101 | CONFIG_BLK_DEV_INITRD=y |
63 | CONFIG_INITRAMFS_SOURCE="" | 102 | CONFIG_INITRAMFS_SOURCE="" |
64 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 103 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -66,13 +105,15 @@ CONFIG_SYSCTL=y | |||
66 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
67 | CONFIG_UID16=y | 106 | CONFIG_UID16=y |
68 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
69 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
70 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
71 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | CONFIG_KALLSYMS_EXTRA_PASS=y |
72 | CONFIG_HOTPLUG=y | 112 | CONFIG_HOTPLUG=y |
73 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
74 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
75 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
116 | # CONFIG_COMPAT_BRK is not set | ||
76 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
77 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
78 | CONFIG_ANON_INODES=y | 119 | CONFIG_ANON_INODES=y |
@@ -82,9 +123,21 @@ CONFIG_TIMERFD=y | |||
82 | CONFIG_EVENTFD=y | 123 | CONFIG_EVENTFD=y |
83 | CONFIG_SHMEM=y | 124 | CONFIG_SHMEM=y |
84 | CONFIG_VM_EVENT_COUNTERS=y | 125 | CONFIG_VM_EVENT_COUNTERS=y |
85 | CONFIG_SLAB=y | 126 | CONFIG_SLUB_DEBUG=y |
86 | # CONFIG_SLUB is not set | 127 | # CONFIG_SLAB is not set |
128 | CONFIG_SLUB=y | ||
87 | # CONFIG_SLOB is not set | 129 | # CONFIG_SLOB is not set |
130 | CONFIG_PROFILING=y | ||
131 | CONFIG_MARKERS=y | ||
132 | # CONFIG_OPROFILE is not set | ||
133 | CONFIG_HAVE_OPROFILE=y | ||
134 | CONFIG_KPROBES=y | ||
135 | CONFIG_KRETPROBES=y | ||
136 | CONFIG_HAVE_KPROBES=y | ||
137 | CONFIG_HAVE_KRETPROBES=y | ||
138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
139 | CONFIG_PROC_PAGE_MONITOR=y | ||
140 | CONFIG_SLABINFO=y | ||
88 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
89 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
90 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
@@ -96,14 +149,15 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
96 | # CONFIG_KMOD is not set | 149 | # CONFIG_KMOD is not set |
97 | CONFIG_STOP_MACHINE=y | 150 | CONFIG_STOP_MACHINE=y |
98 | CONFIG_BLOCK=y | 151 | CONFIG_BLOCK=y |
99 | # CONFIG_BLK_DEV_IO_TRACE is not set | 152 | CONFIG_BLK_DEV_IO_TRACE=y |
100 | # CONFIG_BLK_DEV_BSG is not set | 153 | CONFIG_BLK_DEV_BSG=y |
154 | CONFIG_BLOCK_COMPAT=y | ||
101 | 155 | ||
102 | # | 156 | # |
103 | # IO Schedulers | 157 | # IO Schedulers |
104 | # | 158 | # |
105 | CONFIG_IOSCHED_NOOP=y | 159 | CONFIG_IOSCHED_NOOP=y |
106 | # CONFIG_IOSCHED_AS is not set | 160 | CONFIG_IOSCHED_AS=y |
107 | CONFIG_IOSCHED_DEADLINE=y | 161 | CONFIG_IOSCHED_DEADLINE=y |
108 | CONFIG_IOSCHED_CFQ=y | 162 | CONFIG_IOSCHED_CFQ=y |
109 | # CONFIG_DEFAULT_AS is not set | 163 | # CONFIG_DEFAULT_AS is not set |
@@ -111,107 +165,177 @@ CONFIG_IOSCHED_CFQ=y | |||
111 | CONFIG_DEFAULT_CFQ=y | 165 | CONFIG_DEFAULT_CFQ=y |
112 | # CONFIG_DEFAULT_NOOP is not set | 166 | # CONFIG_DEFAULT_NOOP is not set |
113 | CONFIG_DEFAULT_IOSCHED="cfq" | 167 | CONFIG_DEFAULT_IOSCHED="cfq" |
168 | CONFIG_CLASSIC_RCU=y | ||
114 | 169 | ||
115 | # | 170 | # |
116 | # Processor type and features | 171 | # Processor type and features |
117 | # | 172 | # |
173 | CONFIG_TICK_ONESHOT=y | ||
174 | CONFIG_NO_HZ=y | ||
175 | CONFIG_HIGH_RES_TIMERS=y | ||
176 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
177 | CONFIG_SMP=y | ||
118 | CONFIG_X86_PC=y | 178 | CONFIG_X86_PC=y |
179 | # CONFIG_X86_ELAN is not set | ||
180 | # CONFIG_X86_VOYAGER is not set | ||
181 | # CONFIG_X86_NUMAQ is not set | ||
182 | # CONFIG_X86_SUMMIT is not set | ||
183 | # CONFIG_X86_BIGSMP is not set | ||
184 | # CONFIG_X86_VISWS is not set | ||
185 | # CONFIG_X86_GENERICARCH is not set | ||
186 | # CONFIG_X86_ES7000 is not set | ||
187 | # CONFIG_X86_RDC321X is not set | ||
119 | # CONFIG_X86_VSMP is not set | 188 | # CONFIG_X86_VSMP is not set |
189 | # CONFIG_PARAVIRT_GUEST is not set | ||
190 | CONFIG_MEMTEST_BOOTPARAM=y | ||
191 | CONFIG_MEMTEST_BOOTPARAM_VALUE=0 | ||
192 | # CONFIG_M386 is not set | ||
193 | # CONFIG_M486 is not set | ||
194 | # CONFIG_M586 is not set | ||
195 | # CONFIG_M586TSC is not set | ||
196 | # CONFIG_M586MMX is not set | ||
197 | # CONFIG_M686 is not set | ||
198 | # CONFIG_MPENTIUMII is not set | ||
199 | # CONFIG_MPENTIUMIII is not set | ||
200 | # CONFIG_MPENTIUMM is not set | ||
201 | # CONFIG_MPENTIUM4 is not set | ||
202 | # CONFIG_MK6 is not set | ||
203 | # CONFIG_MK7 is not set | ||
120 | # CONFIG_MK8 is not set | 204 | # CONFIG_MK8 is not set |
205 | # CONFIG_MCRUSOE is not set | ||
206 | # CONFIG_MEFFICEON is not set | ||
207 | # CONFIG_MWINCHIPC6 is not set | ||
208 | # CONFIG_MWINCHIP2 is not set | ||
209 | # CONFIG_MWINCHIP3D is not set | ||
210 | # CONFIG_MGEODEGX1 is not set | ||
211 | # CONFIG_MGEODE_LX is not set | ||
212 | # CONFIG_MCYRIXIII is not set | ||
213 | # CONFIG_MVIAC3_2 is not set | ||
214 | # CONFIG_MVIAC7 is not set | ||
121 | # CONFIG_MPSC is not set | 215 | # CONFIG_MPSC is not set |
122 | # CONFIG_MCORE2 is not set | 216 | CONFIG_MCORE2=y |
123 | CONFIG_GENERIC_CPU=y | 217 | # CONFIG_GENERIC_CPU is not set |
124 | CONFIG_X86_L1_CACHE_BYTES=128 | 218 | CONFIG_X86_CPU=y |
125 | CONFIG_X86_L1_CACHE_SHIFT=7 | 219 | CONFIG_X86_L1_CACHE_BYTES=64 |
126 | CONFIG_X86_INTERNODE_CACHE_BYTES=128 | 220 | CONFIG_X86_INTERNODE_CACHE_BYTES=64 |
127 | CONFIG_X86_TSC=y | 221 | CONFIG_X86_CMPXCHG=y |
222 | CONFIG_X86_L1_CACHE_SHIFT=6 | ||
128 | CONFIG_X86_GOOD_APIC=y | 223 | CONFIG_X86_GOOD_APIC=y |
129 | # CONFIG_MICROCODE is not set | 224 | CONFIG_X86_INTEL_USERCOPY=y |
130 | CONFIG_X86_MSR=y | 225 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
131 | CONFIG_X86_CPUID=y | 226 | CONFIG_X86_P6_NOP=y |
132 | CONFIG_X86_HT=y | 227 | CONFIG_X86_TSC=y |
133 | CONFIG_X86_IO_APIC=y | 228 | CONFIG_X86_CMOV=y |
134 | CONFIG_X86_LOCAL_APIC=y | 229 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 |
135 | CONFIG_MTRR=y | 230 | CONFIG_X86_DEBUGCTLMSR=y |
136 | CONFIG_SMP=y | 231 | CONFIG_HPET_TIMER=y |
137 | CONFIG_SCHED_SMT=y | 232 | CONFIG_HPET_EMULATE_RTC=y |
233 | CONFIG_DMI=y | ||
234 | CONFIG_GART_IOMMU=y | ||
235 | CONFIG_CALGARY_IOMMU=y | ||
236 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y | ||
237 | CONFIG_SWIOTLB=y | ||
238 | CONFIG_IOMMU_HELPER=y | ||
239 | CONFIG_NR_CPUS=4 | ||
240 | # CONFIG_SCHED_SMT is not set | ||
138 | CONFIG_SCHED_MC=y | 241 | CONFIG_SCHED_MC=y |
139 | # CONFIG_PREEMPT_NONE is not set | 242 | # CONFIG_PREEMPT_NONE is not set |
140 | CONFIG_PREEMPT_VOLUNTARY=y | 243 | CONFIG_PREEMPT_VOLUNTARY=y |
141 | # CONFIG_PREEMPT is not set | 244 | # CONFIG_PREEMPT is not set |
142 | CONFIG_PREEMPT_BKL=y | 245 | CONFIG_X86_LOCAL_APIC=y |
246 | CONFIG_X86_IO_APIC=y | ||
247 | # CONFIG_X86_MCE is not set | ||
248 | # CONFIG_I8K is not set | ||
249 | # CONFIG_MICROCODE is not set | ||
250 | CONFIG_X86_MSR=y | ||
251 | CONFIG_X86_CPUID=y | ||
143 | CONFIG_NUMA=y | 252 | CONFIG_NUMA=y |
144 | CONFIG_K8_NUMA=y | 253 | CONFIG_K8_NUMA=y |
145 | CONFIG_NODES_SHIFT=6 | ||
146 | CONFIG_X86_64_ACPI_NUMA=y | 254 | CONFIG_X86_64_ACPI_NUMA=y |
147 | CONFIG_NUMA_EMU=y | 255 | CONFIG_NODES_SPAN_OTHER_NODES=y |
256 | # CONFIG_NUMA_EMU is not set | ||
257 | CONFIG_NODES_SHIFT=6 | ||
258 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | ||
259 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
260 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
261 | CONFIG_SELECT_MEMORY_MODEL=y | ||
262 | # CONFIG_FLATMEM_MANUAL is not set | ||
263 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
264 | CONFIG_SPARSEMEM_MANUAL=y | ||
265 | CONFIG_SPARSEMEM=y | ||
148 | CONFIG_NEED_MULTIPLE_NODES=y | 266 | CONFIG_NEED_MULTIPLE_NODES=y |
267 | CONFIG_HAVE_MEMORY_PRESENT=y | ||
149 | # CONFIG_SPARSEMEM_STATIC is not set | 268 | # CONFIG_SPARSEMEM_STATIC is not set |
269 | CONFIG_SPARSEMEM_EXTREME=y | ||
270 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | ||
271 | CONFIG_SPARSEMEM_VMEMMAP=y | ||
272 | |||
273 | # | ||
274 | # Memory hotplug is currently incompatible with Software Suspend | ||
275 | # | ||
276 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 277 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
151 | CONFIG_MIGRATION=y | 278 | CONFIG_MIGRATION=y |
152 | CONFIG_RESOURCES_64BIT=y | 279 | CONFIG_RESOURCES_64BIT=y |
153 | CONFIG_ZONE_DMA_FLAG=1 | 280 | CONFIG_ZONE_DMA_FLAG=1 |
154 | CONFIG_BOUNCE=y | 281 | CONFIG_BOUNCE=y |
155 | CONFIG_VIRT_TO_BUS=y | 282 | CONFIG_VIRT_TO_BUS=y |
156 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 283 | CONFIG_MTRR=y |
157 | CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y | 284 | # CONFIG_X86_PAT is not set |
158 | CONFIG_NR_CPUS=32 | 285 | CONFIG_EFI=y |
159 | CONFIG_PHYSICAL_ALIGN=0x200000 | ||
160 | CONFIG_HOTPLUG_CPU=y | ||
161 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
162 | CONFIG_HPET_TIMER=y | ||
163 | CONFIG_HPET_EMULATE_RTC=y | ||
164 | CONFIG_GART_IOMMU=y | ||
165 | # CONFIG_CALGARY_IOMMU is not set | ||
166 | CONFIG_SWIOTLB=y | ||
167 | CONFIG_X86_MCE=y | ||
168 | CONFIG_X86_MCE_INTEL=y | ||
169 | CONFIG_X86_MCE_AMD=y | ||
170 | # CONFIG_KEXEC is not set | ||
171 | # CONFIG_CRASH_DUMP is not set | ||
172 | # CONFIG_RELOCATABLE is not set | ||
173 | CONFIG_PHYSICAL_START=0x200000 | ||
174 | CONFIG_SECCOMP=y | 286 | CONFIG_SECCOMP=y |
175 | # CONFIG_CC_STACKPROTECTOR is not set | ||
176 | # CONFIG_HZ_100 is not set | 287 | # CONFIG_HZ_100 is not set |
177 | CONFIG_HZ_250=y | 288 | # CONFIG_HZ_250 is not set |
178 | # CONFIG_HZ_300 is not set | 289 | # CONFIG_HZ_300 is not set |
179 | # CONFIG_HZ_1000 is not set | 290 | CONFIG_HZ_1000=y |
180 | CONFIG_HZ=250 | 291 | CONFIG_HZ=1000 |
181 | CONFIG_K8_NB=y | 292 | CONFIG_SCHED_HRTICK=y |
182 | CONFIG_GENERIC_HARDIRQS=y | 293 | CONFIG_KEXEC=y |
183 | CONFIG_GENERIC_IRQ_PROBE=y | 294 | CONFIG_CRASH_DUMP=y |
184 | CONFIG_ISA_DMA_API=y | 295 | CONFIG_PHYSICAL_START=0x1000000 |
185 | CONFIG_GENERIC_PENDING_IRQ=y | 296 | CONFIG_RELOCATABLE=y |
297 | CONFIG_PHYSICAL_ALIGN=0x200000 | ||
298 | CONFIG_HOTPLUG_CPU=y | ||
299 | # CONFIG_COMPAT_VDSO is not set | ||
300 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
301 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
186 | 302 | ||
187 | # | 303 | # |
188 | # Power management options | 304 | # Power management options |
189 | # | 305 | # |
306 | CONFIG_ARCH_HIBERNATION_HEADER=y | ||
190 | CONFIG_PM=y | 307 | CONFIG_PM=y |
191 | # CONFIG_PM_LEGACY is not set | 308 | CONFIG_PM_DEBUG=y |
192 | # CONFIG_PM_DEBUG is not set | 309 | # CONFIG_PM_VERBOSE is not set |
310 | CONFIG_CAN_PM_TRACE=y | ||
311 | CONFIG_PM_TRACE=y | ||
312 | CONFIG_PM_TRACE_RTC=y | ||
313 | CONFIG_PM_SLEEP_SMP=y | ||
314 | CONFIG_PM_SLEEP=y | ||
315 | CONFIG_SUSPEND=y | ||
316 | CONFIG_SUSPEND_FREEZER=y | ||
193 | CONFIG_HIBERNATION=y | 317 | CONFIG_HIBERNATION=y |
194 | CONFIG_PM_STD_PARTITION="" | 318 | CONFIG_PM_STD_PARTITION="" |
195 | |||
196 | # | ||
197 | # ACPI (Advanced Configuration and Power Interface) Support | ||
198 | # | ||
199 | CONFIG_ACPI=y | 319 | CONFIG_ACPI=y |
200 | CONFIG_ACPI_SLEEP=y | 320 | CONFIG_ACPI_SLEEP=y |
201 | CONFIG_ACPI_SLEEP_PROC_FS=y | ||
202 | CONFIG_ACPI_SLEEP_PROC_SLEEP=y | ||
203 | CONFIG_ACPI_PROCFS=y | 321 | CONFIG_ACPI_PROCFS=y |
322 | CONFIG_ACPI_PROCFS_POWER=y | ||
323 | CONFIG_ACPI_SYSFS_POWER=y | ||
324 | CONFIG_ACPI_PROC_EVENT=y | ||
204 | CONFIG_ACPI_AC=y | 325 | CONFIG_ACPI_AC=y |
205 | CONFIG_ACPI_BATTERY=y | 326 | CONFIG_ACPI_BATTERY=y |
206 | CONFIG_ACPI_BUTTON=y | 327 | CONFIG_ACPI_BUTTON=y |
207 | CONFIG_ACPI_FAN=y | 328 | CONFIG_ACPI_FAN=y |
208 | # CONFIG_ACPI_DOCK is not set | 329 | CONFIG_ACPI_DOCK=y |
330 | # CONFIG_ACPI_BAY is not set | ||
209 | CONFIG_ACPI_PROCESSOR=y | 331 | CONFIG_ACPI_PROCESSOR=y |
210 | CONFIG_ACPI_HOTPLUG_CPU=y | 332 | CONFIG_ACPI_HOTPLUG_CPU=y |
211 | CONFIG_ACPI_THERMAL=y | 333 | CONFIG_ACPI_THERMAL=y |
212 | CONFIG_ACPI_NUMA=y | 334 | CONFIG_ACPI_NUMA=y |
335 | # CONFIG_ACPI_WMI is not set | ||
213 | # CONFIG_ACPI_ASUS is not set | 336 | # CONFIG_ACPI_ASUS is not set |
214 | # CONFIG_ACPI_TOSHIBA is not set | 337 | # CONFIG_ACPI_TOSHIBA is not set |
338 | # CONFIG_ACPI_CUSTOM_DSDT is not set | ||
215 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 339 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
216 | # CONFIG_ACPI_DEBUG is not set | 340 | # CONFIG_ACPI_DEBUG is not set |
217 | CONFIG_ACPI_EC=y | 341 | CONFIG_ACPI_EC=y |
@@ -227,29 +351,34 @@ CONFIG_ACPI_CONTAINER=y | |||
227 | CONFIG_CPU_FREQ=y | 351 | CONFIG_CPU_FREQ=y |
228 | CONFIG_CPU_FREQ_TABLE=y | 352 | CONFIG_CPU_FREQ_TABLE=y |
229 | CONFIG_CPU_FREQ_DEBUG=y | 353 | CONFIG_CPU_FREQ_DEBUG=y |
230 | CONFIG_CPU_FREQ_STAT=y | 354 | # CONFIG_CPU_FREQ_STAT is not set |
231 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 355 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
232 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 356 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set |
233 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 357 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y |
358 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
359 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
234 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 360 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
235 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 361 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
236 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 362 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
237 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 363 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
238 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 364 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
239 | 365 | ||
240 | # | 366 | # |
241 | # CPUFreq processor drivers | 367 | # CPUFreq processor drivers |
242 | # | 368 | # |
243 | CONFIG_X86_POWERNOW_K8=y | ||
244 | CONFIG_X86_POWERNOW_K8_ACPI=y | ||
245 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | ||
246 | CONFIG_X86_ACPI_CPUFREQ=y | 369 | CONFIG_X86_ACPI_CPUFREQ=y |
370 | # CONFIG_X86_POWERNOW_K8 is not set | ||
371 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | ||
372 | # CONFIG_X86_P4_CLOCKMOD is not set | ||
247 | 373 | ||
248 | # | 374 | # |
249 | # shared options | 375 | # shared options |
250 | # | 376 | # |
251 | CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | 377 | # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set |
252 | # CONFIG_X86_SPEEDSTEP_LIB is not set | 378 | # CONFIG_X86_SPEEDSTEP_LIB is not set |
379 | CONFIG_CPU_IDLE=y | ||
380 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
381 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
253 | 382 | ||
254 | # | 383 | # |
255 | # Bus options (PCI etc.) | 384 | # Bus options (PCI etc.) |
@@ -257,27 +386,56 @@ CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | |||
257 | CONFIG_PCI=y | 386 | CONFIG_PCI=y |
258 | CONFIG_PCI_DIRECT=y | 387 | CONFIG_PCI_DIRECT=y |
259 | CONFIG_PCI_MMCONFIG=y | 388 | CONFIG_PCI_MMCONFIG=y |
389 | CONFIG_PCI_DOMAINS=y | ||
390 | CONFIG_DMAR=y | ||
391 | CONFIG_DMAR_GFX_WA=y | ||
392 | CONFIG_DMAR_FLOPPY_WA=y | ||
260 | CONFIG_PCIEPORTBUS=y | 393 | CONFIG_PCIEPORTBUS=y |
394 | # CONFIG_HOTPLUG_PCI_PCIE is not set | ||
261 | CONFIG_PCIEAER=y | 395 | CONFIG_PCIEAER=y |
396 | # CONFIG_PCIEASPM is not set | ||
262 | CONFIG_ARCH_SUPPORTS_MSI=y | 397 | CONFIG_ARCH_SUPPORTS_MSI=y |
263 | CONFIG_PCI_MSI=y | 398 | CONFIG_PCI_MSI=y |
399 | # CONFIG_PCI_LEGACY is not set | ||
264 | # CONFIG_PCI_DEBUG is not set | 400 | # CONFIG_PCI_DEBUG is not set |
265 | # CONFIG_HT_IRQ is not set | 401 | CONFIG_HT_IRQ=y |
266 | 402 | CONFIG_ISA_DMA_API=y | |
267 | # | 403 | CONFIG_K8_NB=y |
268 | # PCCARD (PCMCIA/CardBus) support | 404 | CONFIG_PCCARD=y |
269 | # | 405 | # CONFIG_PCMCIA_DEBUG is not set |
270 | # CONFIG_PCCARD is not set | 406 | CONFIG_PCMCIA=y |
271 | # CONFIG_HOTPLUG_PCI is not set | 407 | CONFIG_PCMCIA_LOAD_CIS=y |
408 | CONFIG_PCMCIA_IOCTL=y | ||
409 | CONFIG_CARDBUS=y | ||
410 | |||
411 | # | ||
412 | # PC-card bridges | ||
413 | # | ||
414 | CONFIG_YENTA=y | ||
415 | CONFIG_YENTA_O2=y | ||
416 | CONFIG_YENTA_RICOH=y | ||
417 | CONFIG_YENTA_TI=y | ||
418 | CONFIG_YENTA_ENE_TUNE=y | ||
419 | CONFIG_YENTA_TOSHIBA=y | ||
420 | # CONFIG_PD6729 is not set | ||
421 | # CONFIG_I82092 is not set | ||
422 | CONFIG_PCCARD_NONSTATIC=y | ||
423 | CONFIG_HOTPLUG_PCI=y | ||
424 | # CONFIG_HOTPLUG_PCI_FAKE is not set | ||
425 | # CONFIG_HOTPLUG_PCI_ACPI is not set | ||
426 | # CONFIG_HOTPLUG_PCI_CPCI is not set | ||
427 | # CONFIG_HOTPLUG_PCI_SHPC is not set | ||
272 | 428 | ||
273 | # | 429 | # |
274 | # Executable file formats / Emulations | 430 | # Executable file formats / Emulations |
275 | # | 431 | # |
276 | CONFIG_BINFMT_ELF=y | 432 | CONFIG_BINFMT_ELF=y |
277 | # CONFIG_BINFMT_MISC is not set | 433 | CONFIG_COMPAT_BINFMT_ELF=y |
434 | CONFIG_BINFMT_MISC=y | ||
278 | CONFIG_IA32_EMULATION=y | 435 | CONFIG_IA32_EMULATION=y |
279 | CONFIG_IA32_AOUT=y | 436 | # CONFIG_IA32_AOUT is not set |
280 | CONFIG_COMPAT=y | 437 | CONFIG_COMPAT=y |
438 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y | ||
281 | CONFIG_SYSVIPC_COMPAT=y | 439 | CONFIG_SYSVIPC_COMPAT=y |
282 | 440 | ||
283 | # | 441 | # |
@@ -289,22 +447,31 @@ CONFIG_NET=y | |||
289 | # Networking options | 447 | # Networking options |
290 | # | 448 | # |
291 | CONFIG_PACKET=y | 449 | CONFIG_PACKET=y |
292 | # CONFIG_PACKET_MMAP is not set | 450 | CONFIG_PACKET_MMAP=y |
293 | CONFIG_UNIX=y | 451 | CONFIG_UNIX=y |
452 | CONFIG_XFRM=y | ||
453 | CONFIG_XFRM_USER=y | ||
454 | # CONFIG_XFRM_SUB_POLICY is not set | ||
455 | # CONFIG_XFRM_MIGRATE is not set | ||
456 | # CONFIG_XFRM_STATISTICS is not set | ||
294 | # CONFIG_NET_KEY is not set | 457 | # CONFIG_NET_KEY is not set |
295 | CONFIG_INET=y | 458 | CONFIG_INET=y |
296 | CONFIG_IP_MULTICAST=y | 459 | CONFIG_IP_MULTICAST=y |
297 | # CONFIG_IP_ADVANCED_ROUTER is not set | 460 | CONFIG_IP_ADVANCED_ROUTER=y |
461 | CONFIG_ASK_IP_FIB_HASH=y | ||
462 | # CONFIG_IP_FIB_TRIE is not set | ||
298 | CONFIG_IP_FIB_HASH=y | 463 | CONFIG_IP_FIB_HASH=y |
299 | CONFIG_IP_PNP=y | 464 | CONFIG_IP_MULTIPLE_TABLES=y |
300 | CONFIG_IP_PNP_DHCP=y | 465 | CONFIG_IP_ROUTE_MULTIPATH=y |
301 | # CONFIG_IP_PNP_BOOTP is not set | 466 | CONFIG_IP_ROUTE_VERBOSE=y |
302 | # CONFIG_IP_PNP_RARP is not set | 467 | # CONFIG_IP_PNP is not set |
303 | # CONFIG_NET_IPIP is not set | 468 | # CONFIG_NET_IPIP is not set |
304 | # CONFIG_NET_IPGRE is not set | 469 | # CONFIG_NET_IPGRE is not set |
305 | # CONFIG_IP_MROUTE is not set | 470 | CONFIG_IP_MROUTE=y |
471 | CONFIG_IP_PIMSM_V1=y | ||
472 | CONFIG_IP_PIMSM_V2=y | ||
306 | # CONFIG_ARPD is not set | 473 | # CONFIG_ARPD is not set |
307 | # CONFIG_SYN_COOKIES is not set | 474 | CONFIG_SYN_COOKIES=y |
308 | # CONFIG_INET_AH is not set | 475 | # CONFIG_INET_AH is not set |
309 | # CONFIG_INET_ESP is not set | 476 | # CONFIG_INET_ESP is not set |
310 | # CONFIG_INET_IPCOMP is not set | 477 | # CONFIG_INET_IPCOMP is not set |
@@ -313,31 +480,109 @@ CONFIG_INET_TUNNEL=y | |||
313 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 480 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
314 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 481 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
315 | # CONFIG_INET_XFRM_MODE_BEET is not set | 482 | # CONFIG_INET_XFRM_MODE_BEET is not set |
316 | CONFIG_INET_DIAG=y | 483 | CONFIG_INET_LRO=y |
317 | CONFIG_INET_TCP_DIAG=y | 484 | # CONFIG_INET_DIAG is not set |
318 | # CONFIG_TCP_CONG_ADVANCED is not set | 485 | CONFIG_TCP_CONG_ADVANCED=y |
486 | # CONFIG_TCP_CONG_BIC is not set | ||
319 | CONFIG_TCP_CONG_CUBIC=y | 487 | CONFIG_TCP_CONG_CUBIC=y |
488 | # CONFIG_TCP_CONG_WESTWOOD is not set | ||
489 | # CONFIG_TCP_CONG_HTCP is not set | ||
490 | # CONFIG_TCP_CONG_HSTCP is not set | ||
491 | # CONFIG_TCP_CONG_HYBLA is not set | ||
492 | # CONFIG_TCP_CONG_VEGAS is not set | ||
493 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
494 | # CONFIG_TCP_CONG_LP is not set | ||
495 | # CONFIG_TCP_CONG_VENO is not set | ||
496 | # CONFIG_TCP_CONG_YEAH is not set | ||
497 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
498 | # CONFIG_DEFAULT_BIC is not set | ||
499 | CONFIG_DEFAULT_CUBIC=y | ||
500 | # CONFIG_DEFAULT_HTCP is not set | ||
501 | # CONFIG_DEFAULT_VEGAS is not set | ||
502 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
503 | # CONFIG_DEFAULT_RENO is not set | ||
320 | CONFIG_DEFAULT_TCP_CONG="cubic" | 504 | CONFIG_DEFAULT_TCP_CONG="cubic" |
321 | # CONFIG_TCP_MD5SIG is not set | 505 | CONFIG_TCP_MD5SIG=y |
506 | # CONFIG_IP_VS is not set | ||
322 | CONFIG_IPV6=y | 507 | CONFIG_IPV6=y |
323 | # CONFIG_IPV6_PRIVACY is not set | 508 | # CONFIG_IPV6_PRIVACY is not set |
324 | # CONFIG_IPV6_ROUTER_PREF is not set | 509 | # CONFIG_IPV6_ROUTER_PREF is not set |
325 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | 510 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set |
326 | # CONFIG_INET6_AH is not set | 511 | CONFIG_INET6_AH=y |
327 | # CONFIG_INET6_ESP is not set | 512 | CONFIG_INET6_ESP=y |
328 | # CONFIG_INET6_IPCOMP is not set | 513 | # CONFIG_INET6_IPCOMP is not set |
329 | # CONFIG_IPV6_MIP6 is not set | 514 | # CONFIG_IPV6_MIP6 is not set |
330 | # CONFIG_INET6_XFRM_TUNNEL is not set | 515 | # CONFIG_INET6_XFRM_TUNNEL is not set |
331 | # CONFIG_INET6_TUNNEL is not set | 516 | # CONFIG_INET6_TUNNEL is not set |
332 | # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set | 517 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
333 | # CONFIG_INET6_XFRM_MODE_TUNNEL is not set | 518 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
334 | # CONFIG_INET6_XFRM_MODE_BEET is not set | 519 | CONFIG_INET6_XFRM_MODE_BEET=y |
335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 520 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
336 | CONFIG_IPV6_SIT=y | 521 | CONFIG_IPV6_SIT=y |
522 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
337 | # CONFIG_IPV6_TUNNEL is not set | 523 | # CONFIG_IPV6_TUNNEL is not set |
338 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 524 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
339 | # CONFIG_NETWORK_SECMARK is not set | 525 | # CONFIG_IPV6_MROUTE is not set |
340 | # CONFIG_NETFILTER is not set | 526 | CONFIG_NETLABEL=y |
527 | CONFIG_NETWORK_SECMARK=y | ||
528 | CONFIG_NETFILTER=y | ||
529 | # CONFIG_NETFILTER_DEBUG is not set | ||
530 | # CONFIG_NETFILTER_ADVANCED is not set | ||
531 | |||
532 | # | ||
533 | # Core Netfilter Configuration | ||
534 | # | ||
535 | CONFIG_NETFILTER_NETLINK=y | ||
536 | CONFIG_NETFILTER_NETLINK_LOG=y | ||
537 | CONFIG_NF_CONNTRACK=y | ||
538 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
539 | CONFIG_NF_CONNTRACK_FTP=y | ||
540 | CONFIG_NF_CONNTRACK_IRC=y | ||
541 | CONFIG_NF_CONNTRACK_SIP=y | ||
542 | CONFIG_NF_CT_NETLINK=y | ||
543 | CONFIG_NETFILTER_XTABLES=y | ||
544 | CONFIG_NETFILTER_XT_TARGET_MARK=y | ||
545 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y | ||
546 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y | ||
547 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
548 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y | ||
549 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y | ||
550 | CONFIG_NETFILTER_XT_MATCH_MARK=y | ||
551 | CONFIG_NETFILTER_XT_MATCH_POLICY=y | ||
552 | CONFIG_NETFILTER_XT_MATCH_STATE=y | ||
553 | |||
554 | # | ||
555 | # IP: Netfilter Configuration | ||
556 | # | ||
557 | CONFIG_NF_CONNTRACK_IPV4=y | ||
558 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
559 | CONFIG_IP_NF_IPTABLES=y | ||
560 | CONFIG_IP_NF_FILTER=y | ||
561 | CONFIG_IP_NF_TARGET_REJECT=y | ||
562 | CONFIG_IP_NF_TARGET_LOG=y | ||
563 | CONFIG_IP_NF_TARGET_ULOG=y | ||
564 | CONFIG_NF_NAT=y | ||
565 | CONFIG_NF_NAT_NEEDED=y | ||
566 | CONFIG_IP_NF_TARGET_MASQUERADE=y | ||
567 | CONFIG_NF_NAT_FTP=y | ||
568 | CONFIG_NF_NAT_IRC=y | ||
569 | # CONFIG_NF_NAT_TFTP is not set | ||
570 | # CONFIG_NF_NAT_AMANDA is not set | ||
571 | # CONFIG_NF_NAT_PPTP is not set | ||
572 | # CONFIG_NF_NAT_H323 is not set | ||
573 | CONFIG_NF_NAT_SIP=y | ||
574 | CONFIG_IP_NF_MANGLE=y | ||
575 | |||
576 | # | ||
577 | # IPv6: Netfilter Configuration | ||
578 | # | ||
579 | CONFIG_NF_CONNTRACK_IPV6=y | ||
580 | CONFIG_IP6_NF_IPTABLES=y | ||
581 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y | ||
582 | CONFIG_IP6_NF_FILTER=y | ||
583 | CONFIG_IP6_NF_TARGET_LOG=y | ||
584 | CONFIG_IP6_NF_TARGET_REJECT=y | ||
585 | CONFIG_IP6_NF_MANGLE=y | ||
341 | # CONFIG_IP_DCCP is not set | 586 | # CONFIG_IP_DCCP is not set |
342 | # CONFIG_IP_SCTP is not set | 587 | # CONFIG_IP_SCTP is not set |
343 | # CONFIG_TIPC is not set | 588 | # CONFIG_TIPC is not set |
@@ -345,6 +590,7 @@ CONFIG_IPV6_SIT=y | |||
345 | # CONFIG_BRIDGE is not set | 590 | # CONFIG_BRIDGE is not set |
346 | # CONFIG_VLAN_8021Q is not set | 591 | # CONFIG_VLAN_8021Q is not set |
347 | # CONFIG_DECNET is not set | 592 | # CONFIG_DECNET is not set |
593 | CONFIG_LLC=y | ||
348 | # CONFIG_LLC2 is not set | 594 | # CONFIG_LLC2 is not set |
349 | # CONFIG_IPX is not set | 595 | # CONFIG_IPX is not set |
350 | # CONFIG_ATALK is not set | 596 | # CONFIG_ATALK is not set |
@@ -352,28 +598,99 @@ CONFIG_IPV6_SIT=y | |||
352 | # CONFIG_LAPB is not set | 598 | # CONFIG_LAPB is not set |
353 | # CONFIG_ECONET is not set | 599 | # CONFIG_ECONET is not set |
354 | # CONFIG_WAN_ROUTER is not set | 600 | # CONFIG_WAN_ROUTER is not set |
355 | 601 | CONFIG_NET_SCHED=y | |
356 | # | 602 | |
357 | # QoS and/or fair queueing | 603 | # |
358 | # | 604 | # Queueing/Scheduling |
359 | # CONFIG_NET_SCHED is not set | 605 | # |
606 | # CONFIG_NET_SCH_CBQ is not set | ||
607 | # CONFIG_NET_SCH_HTB is not set | ||
608 | # CONFIG_NET_SCH_HFSC is not set | ||
609 | # CONFIG_NET_SCH_PRIO is not set | ||
610 | # CONFIG_NET_SCH_RR is not set | ||
611 | # CONFIG_NET_SCH_RED is not set | ||
612 | # CONFIG_NET_SCH_SFQ is not set | ||
613 | # CONFIG_NET_SCH_TEQL is not set | ||
614 | # CONFIG_NET_SCH_TBF is not set | ||
615 | # CONFIG_NET_SCH_GRED is not set | ||
616 | # CONFIG_NET_SCH_DSMARK is not set | ||
617 | # CONFIG_NET_SCH_NETEM is not set | ||
618 | # CONFIG_NET_SCH_INGRESS is not set | ||
619 | |||
620 | # | ||
621 | # Classification | ||
622 | # | ||
623 | CONFIG_NET_CLS=y | ||
624 | # CONFIG_NET_CLS_BASIC is not set | ||
625 | # CONFIG_NET_CLS_TCINDEX is not set | ||
626 | # CONFIG_NET_CLS_ROUTE4 is not set | ||
627 | # CONFIG_NET_CLS_FW is not set | ||
628 | # CONFIG_NET_CLS_U32 is not set | ||
629 | # CONFIG_NET_CLS_RSVP is not set | ||
630 | # CONFIG_NET_CLS_RSVP6 is not set | ||
631 | # CONFIG_NET_CLS_FLOW is not set | ||
632 | CONFIG_NET_EMATCH=y | ||
633 | CONFIG_NET_EMATCH_STACK=32 | ||
634 | # CONFIG_NET_EMATCH_CMP is not set | ||
635 | # CONFIG_NET_EMATCH_NBYTE is not set | ||
636 | # CONFIG_NET_EMATCH_U32 is not set | ||
637 | # CONFIG_NET_EMATCH_META is not set | ||
638 | # CONFIG_NET_EMATCH_TEXT is not set | ||
639 | CONFIG_NET_CLS_ACT=y | ||
640 | # CONFIG_NET_ACT_POLICE is not set | ||
641 | # CONFIG_NET_ACT_GACT is not set | ||
642 | # CONFIG_NET_ACT_MIRRED is not set | ||
643 | # CONFIG_NET_ACT_IPT is not set | ||
644 | # CONFIG_NET_ACT_NAT is not set | ||
645 | # CONFIG_NET_ACT_PEDIT is not set | ||
646 | # CONFIG_NET_ACT_SIMP is not set | ||
647 | CONFIG_NET_SCH_FIFO=y | ||
360 | 648 | ||
361 | # | 649 | # |
362 | # Network testing | 650 | # Network testing |
363 | # | 651 | # |
364 | # CONFIG_NET_PKTGEN is not set | 652 | # CONFIG_NET_PKTGEN is not set |
365 | # CONFIG_NET_TCPPROBE is not set | 653 | # CONFIG_NET_TCPPROBE is not set |
366 | # CONFIG_HAMRADIO is not set | 654 | CONFIG_HAMRADIO=y |
655 | |||
656 | # | ||
657 | # Packet Radio protocols | ||
658 | # | ||
659 | # CONFIG_AX25 is not set | ||
660 | # CONFIG_CAN is not set | ||
367 | # CONFIG_IRDA is not set | 661 | # CONFIG_IRDA is not set |
368 | # CONFIG_BT is not set | 662 | # CONFIG_BT is not set |
369 | # CONFIG_AF_RXRPC is not set | 663 | # CONFIG_AF_RXRPC is not set |
664 | CONFIG_FIB_RULES=y | ||
370 | 665 | ||
371 | # | 666 | # |
372 | # Wireless | 667 | # Wireless |
373 | # | 668 | # |
374 | # CONFIG_CFG80211 is not set | 669 | CONFIG_CFG80211=y |
375 | # CONFIG_WIRELESS_EXT is not set | 670 | CONFIG_NL80211=y |
376 | # CONFIG_MAC80211 is not set | 671 | CONFIG_WIRELESS_EXT=y |
672 | CONFIG_MAC80211=y | ||
673 | |||
674 | # | ||
675 | # Rate control algorithm selection | ||
676 | # | ||
677 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
678 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
679 | |||
680 | # | ||
681 | # Selecting 'y' for an algorithm will | ||
682 | # | ||
683 | |||
684 | # | ||
685 | # build the algorithm into mac80211. | ||
686 | # | ||
687 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
688 | CONFIG_MAC80211_RC_PID=y | ||
689 | # CONFIG_MAC80211_MESH is not set | ||
690 | CONFIG_MAC80211_LEDS=y | ||
691 | # CONFIG_MAC80211_DEBUGFS is not set | ||
692 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
693 | # CONFIG_MAC80211_DEBUG is not set | ||
377 | # CONFIG_IEEE80211 is not set | 694 | # CONFIG_IEEE80211 is not set |
378 | # CONFIG_RFKILL is not set | 695 | # CONFIG_RFKILL is not set |
379 | # CONFIG_NET_9P is not set | 696 | # CONFIG_NET_9P is not set |
@@ -385,13 +702,15 @@ CONFIG_IPV6_SIT=y | |||
385 | # | 702 | # |
386 | # Generic Driver Options | 703 | # Generic Driver Options |
387 | # | 704 | # |
705 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
388 | CONFIG_STANDALONE=y | 706 | CONFIG_STANDALONE=y |
389 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 707 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
390 | CONFIG_FW_LOADER=y | 708 | CONFIG_FW_LOADER=y |
391 | # CONFIG_DEBUG_DRIVER is not set | 709 | # CONFIG_DEBUG_DRIVER is not set |
392 | # CONFIG_DEBUG_DEVRES is not set | 710 | CONFIG_DEBUG_DEVRES=y |
393 | # CONFIG_SYS_HYPERVISOR is not set | 711 | # CONFIG_SYS_HYPERVISOR is not set |
394 | # CONFIG_CONNECTOR is not set | 712 | CONFIG_CONNECTOR=y |
713 | CONFIG_PROC_EVENTS=y | ||
395 | # CONFIG_MTD is not set | 714 | # CONFIG_MTD is not set |
396 | # CONFIG_PARPORT is not set | 715 | # CONFIG_PARPORT is not set |
397 | CONFIG_PNP=y | 716 | CONFIG_PNP=y |
@@ -402,7 +721,7 @@ CONFIG_PNP=y | |||
402 | # | 721 | # |
403 | CONFIG_PNPACPI=y | 722 | CONFIG_PNPACPI=y |
404 | CONFIG_BLK_DEV=y | 723 | CONFIG_BLK_DEV=y |
405 | CONFIG_BLK_DEV_FD=y | 724 | # CONFIG_BLK_DEV_FD is not set |
406 | # CONFIG_BLK_CPQ_DA is not set | 725 | # CONFIG_BLK_CPQ_DA is not set |
407 | # CONFIG_BLK_CPQ_CISS_DA is not set | 726 | # CONFIG_BLK_CPQ_CISS_DA is not set |
408 | # CONFIG_BLK_DEV_DAC960 is not set | 727 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -415,8 +734,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
415 | # CONFIG_BLK_DEV_UB is not set | 734 | # CONFIG_BLK_DEV_UB is not set |
416 | CONFIG_BLK_DEV_RAM=y | 735 | CONFIG_BLK_DEV_RAM=y |
417 | CONFIG_BLK_DEV_RAM_COUNT=16 | 736 | CONFIG_BLK_DEV_RAM_COUNT=16 |
418 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 737 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
419 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 738 | # CONFIG_BLK_DEV_XIP is not set |
420 | # CONFIG_CDROM_PKTCDVD is not set | 739 | # CONFIG_CDROM_PKTCDVD is not set |
421 | # CONFIG_ATA_OVER_ETH is not set | 740 | # CONFIG_ATA_OVER_ETH is not set |
422 | CONFIG_MISC_DEVICES=y | 741 | CONFIG_MISC_DEVICES=y |
@@ -425,72 +744,16 @@ CONFIG_MISC_DEVICES=y | |||
425 | # CONFIG_EEPROM_93CX6 is not set | 744 | # CONFIG_EEPROM_93CX6 is not set |
426 | # CONFIG_SGI_IOC4 is not set | 745 | # CONFIG_SGI_IOC4 is not set |
427 | # CONFIG_TIFM_CORE is not set | 746 | # CONFIG_TIFM_CORE is not set |
747 | # CONFIG_ACER_WMI is not set | ||
748 | # CONFIG_ASUS_LAPTOP is not set | ||
749 | # CONFIG_FUJITSU_LAPTOP is not set | ||
750 | # CONFIG_MSI_LAPTOP is not set | ||
428 | # CONFIG_SONY_LAPTOP is not set | 751 | # CONFIG_SONY_LAPTOP is not set |
429 | # CONFIG_THINKPAD_ACPI is not set | 752 | # CONFIG_THINKPAD_ACPI is not set |
430 | CONFIG_IDE=y | 753 | # CONFIG_INTEL_MENLOW is not set |
431 | CONFIG_BLK_DEV_IDE=y | 754 | # CONFIG_ENCLOSURE_SERVICES is not set |
432 | 755 | CONFIG_HAVE_IDE=y | |
433 | # | 756 | # CONFIG_IDE is not set |
434 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
435 | # | ||
436 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
437 | # CONFIG_BLK_DEV_HD_IDE is not set | ||
438 | CONFIG_BLK_DEV_IDEDISK=y | ||
439 | CONFIG_IDEDISK_MULTI_MODE=y | ||
440 | CONFIG_BLK_DEV_IDECD=y | ||
441 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
442 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
443 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
444 | CONFIG_BLK_DEV_IDEACPI=y | ||
445 | # CONFIG_IDE_TASK_IOCTL is not set | ||
446 | CONFIG_IDE_PROC_FS=y | ||
447 | |||
448 | # | ||
449 | # IDE chipset support/bugfixes | ||
450 | # | ||
451 | CONFIG_IDE_GENERIC=y | ||
452 | # CONFIG_BLK_DEV_CMD640 is not set | ||
453 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
454 | CONFIG_BLK_DEV_IDEPCI=y | ||
455 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
456 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
457 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
458 | # CONFIG_BLK_DEV_GENERIC is not set | ||
459 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
460 | # CONFIG_BLK_DEV_RZ1000 is not set | ||
461 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
462 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
463 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
464 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
465 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
466 | CONFIG_BLK_DEV_AMD74XX=y | ||
467 | CONFIG_BLK_DEV_ATIIXP=y | ||
468 | # CONFIG_BLK_DEV_CMD64X is not set | ||
469 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
470 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
471 | # CONFIG_BLK_DEV_CS5520 is not set | ||
472 | # CONFIG_BLK_DEV_CS5530 is not set | ||
473 | # CONFIG_BLK_DEV_HPT34X is not set | ||
474 | # CONFIG_BLK_DEV_HPT366 is not set | ||
475 | # CONFIG_BLK_DEV_JMICRON is not set | ||
476 | # CONFIG_BLK_DEV_SC1200 is not set | ||
477 | CONFIG_BLK_DEV_PIIX=y | ||
478 | # CONFIG_BLK_DEV_IT8213 is not set | ||
479 | # CONFIG_BLK_DEV_IT821X is not set | ||
480 | # CONFIG_BLK_DEV_NS87415 is not set | ||
481 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
482 | CONFIG_BLK_DEV_PDC202XX_NEW=y | ||
483 | # CONFIG_BLK_DEV_SVWKS is not set | ||
484 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
485 | # CONFIG_BLK_DEV_SIS5513 is not set | ||
486 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
487 | # CONFIG_BLK_DEV_TRM290 is not set | ||
488 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
489 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
490 | # CONFIG_IDE_ARM is not set | ||
491 | CONFIG_BLK_DEV_IDEDMA=y | ||
492 | # CONFIG_IDEDMA_IVB is not set | ||
493 | # CONFIG_BLK_DEV_HD is not set | ||
494 | 757 | ||
495 | # | 758 | # |
496 | # SCSI device support | 759 | # SCSI device support |
@@ -499,8 +762,8 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
499 | CONFIG_SCSI=y | 762 | CONFIG_SCSI=y |
500 | CONFIG_SCSI_DMA=y | 763 | CONFIG_SCSI_DMA=y |
501 | # CONFIG_SCSI_TGT is not set | 764 | # CONFIG_SCSI_TGT is not set |
502 | CONFIG_SCSI_NETLINK=y | 765 | # CONFIG_SCSI_NETLINK is not set |
503 | # CONFIG_SCSI_PROC_FS is not set | 766 | CONFIG_SCSI_PROC_FS=y |
504 | 767 | ||
505 | # | 768 | # |
506 | # SCSI support type (disk, tape, CD-ROM) | 769 | # SCSI support type (disk, tape, CD-ROM) |
@@ -509,7 +772,7 @@ CONFIG_BLK_DEV_SD=y | |||
509 | # CONFIG_CHR_DEV_ST is not set | 772 | # CONFIG_CHR_DEV_ST is not set |
510 | # CONFIG_CHR_DEV_OSST is not set | 773 | # CONFIG_CHR_DEV_OSST is not set |
511 | CONFIG_BLK_DEV_SR=y | 774 | CONFIG_BLK_DEV_SR=y |
512 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 775 | CONFIG_BLK_DEV_SR_VENDOR=y |
513 | CONFIG_CHR_DEV_SG=y | 776 | CONFIG_CHR_DEV_SG=y |
514 | # CONFIG_CHR_DEV_SCH is not set | 777 | # CONFIG_CHR_DEV_SCH is not set |
515 | 778 | ||
@@ -526,73 +789,37 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
526 | # SCSI Transports | 789 | # SCSI Transports |
527 | # | 790 | # |
528 | CONFIG_SCSI_SPI_ATTRS=y | 791 | CONFIG_SCSI_SPI_ATTRS=y |
529 | CONFIG_SCSI_FC_ATTRS=y | 792 | # CONFIG_SCSI_FC_ATTRS is not set |
530 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 793 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
531 | CONFIG_SCSI_SAS_ATTRS=y | 794 | # CONFIG_SCSI_SAS_ATTRS is not set |
532 | # CONFIG_SCSI_SAS_LIBSAS is not set | 795 | # CONFIG_SCSI_SAS_LIBSAS is not set |
533 | 796 | # CONFIG_SCSI_SRP_ATTRS is not set | |
534 | # | 797 | # CONFIG_SCSI_LOWLEVEL is not set |
535 | # SCSI low-level drivers | 798 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
536 | # | ||
537 | # CONFIG_ISCSI_TCP is not set | ||
538 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
539 | # CONFIG_SCSI_3W_9XXX is not set | ||
540 | # CONFIG_SCSI_ACARD is not set | ||
541 | # CONFIG_SCSI_AACRAID is not set | ||
542 | # CONFIG_SCSI_AIC7XXX is not set | ||
543 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
544 | CONFIG_SCSI_AIC79XX=y | ||
545 | CONFIG_AIC79XX_CMDS_PER_DEVICE=32 | ||
546 | CONFIG_AIC79XX_RESET_DELAY_MS=4000 | ||
547 | # CONFIG_AIC79XX_DEBUG_ENABLE is not set | ||
548 | CONFIG_AIC79XX_DEBUG_MASK=0 | ||
549 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set | ||
550 | # CONFIG_SCSI_AIC94XX is not set | ||
551 | # CONFIG_SCSI_ARCMSR is not set | ||
552 | # CONFIG_MEGARAID_NEWGEN is not set | ||
553 | # CONFIG_MEGARAID_LEGACY is not set | ||
554 | # CONFIG_MEGARAID_SAS is not set | ||
555 | # CONFIG_SCSI_HPTIOP is not set | ||
556 | # CONFIG_SCSI_BUSLOGIC is not set | ||
557 | # CONFIG_SCSI_DMX3191D is not set | ||
558 | # CONFIG_SCSI_EATA is not set | ||
559 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
560 | # CONFIG_SCSI_GDTH is not set | ||
561 | # CONFIG_SCSI_IPS is not set | ||
562 | # CONFIG_SCSI_INITIO is not set | ||
563 | # CONFIG_SCSI_INIA100 is not set | ||
564 | # CONFIG_SCSI_STEX is not set | ||
565 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
566 | # CONFIG_SCSI_IPR is not set | ||
567 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
568 | # CONFIG_SCSI_QLA_FC is not set | ||
569 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
570 | # CONFIG_SCSI_LPFC is not set | ||
571 | # CONFIG_SCSI_DC395x is not set | ||
572 | # CONFIG_SCSI_DC390T is not set | ||
573 | # CONFIG_SCSI_DEBUG is not set | ||
574 | # CONFIG_SCSI_SRP is not set | ||
575 | CONFIG_ATA=y | 799 | CONFIG_ATA=y |
576 | # CONFIG_ATA_NONSTANDARD is not set | 800 | # CONFIG_ATA_NONSTANDARD is not set |
577 | CONFIG_ATA_ACPI=y | 801 | CONFIG_ATA_ACPI=y |
802 | CONFIG_SATA_PMP=y | ||
578 | CONFIG_SATA_AHCI=y | 803 | CONFIG_SATA_AHCI=y |
579 | CONFIG_SATA_SVW=y | 804 | # CONFIG_SATA_SIL24 is not set |
805 | CONFIG_ATA_SFF=y | ||
806 | # CONFIG_SATA_SVW is not set | ||
580 | CONFIG_ATA_PIIX=y | 807 | CONFIG_ATA_PIIX=y |
581 | # CONFIG_SATA_MV is not set | 808 | # CONFIG_SATA_MV is not set |
582 | CONFIG_SATA_NV=y | 809 | # CONFIG_SATA_NV is not set |
583 | # CONFIG_PDC_ADMA is not set | 810 | # CONFIG_PDC_ADMA is not set |
584 | # CONFIG_SATA_QSTOR is not set | 811 | # CONFIG_SATA_QSTOR is not set |
585 | # CONFIG_SATA_PROMISE is not set | 812 | # CONFIG_SATA_PROMISE is not set |
586 | # CONFIG_SATA_SX4 is not set | 813 | # CONFIG_SATA_SX4 is not set |
587 | CONFIG_SATA_SIL=y | 814 | # CONFIG_SATA_SIL is not set |
588 | # CONFIG_SATA_SIL24 is not set | ||
589 | # CONFIG_SATA_SIS is not set | 815 | # CONFIG_SATA_SIS is not set |
590 | # CONFIG_SATA_ULI is not set | 816 | # CONFIG_SATA_ULI is not set |
591 | CONFIG_SATA_VIA=y | 817 | # CONFIG_SATA_VIA is not set |
592 | # CONFIG_SATA_VITESSE is not set | 818 | # CONFIG_SATA_VITESSE is not set |
593 | # CONFIG_SATA_INIC162X is not set | 819 | # CONFIG_SATA_INIC162X is not set |
820 | # CONFIG_PATA_ACPI is not set | ||
594 | # CONFIG_PATA_ALI is not set | 821 | # CONFIG_PATA_ALI is not set |
595 | # CONFIG_PATA_AMD is not set | 822 | CONFIG_PATA_AMD=y |
596 | # CONFIG_PATA_ARTOP is not set | 823 | # CONFIG_PATA_ARTOP is not set |
597 | # CONFIG_PATA_ATIIXP is not set | 824 | # CONFIG_PATA_ATIIXP is not set |
598 | # CONFIG_PATA_CMD640_PCI is not set | 825 | # CONFIG_PATA_CMD640_PCI is not set |
@@ -612,11 +839,14 @@ CONFIG_SATA_VIA=y | |||
612 | # CONFIG_PATA_TRIFLEX is not set | 839 | # CONFIG_PATA_TRIFLEX is not set |
613 | # CONFIG_PATA_MARVELL is not set | 840 | # CONFIG_PATA_MARVELL is not set |
614 | # CONFIG_PATA_MPIIX is not set | 841 | # CONFIG_PATA_MPIIX is not set |
615 | # CONFIG_PATA_OLDPIIX is not set | 842 | CONFIG_PATA_OLDPIIX=y |
616 | # CONFIG_PATA_NETCELL is not set | 843 | # CONFIG_PATA_NETCELL is not set |
844 | # CONFIG_PATA_NINJA32 is not set | ||
617 | # CONFIG_PATA_NS87410 is not set | 845 | # CONFIG_PATA_NS87410 is not set |
846 | # CONFIG_PATA_NS87415 is not set | ||
618 | # CONFIG_PATA_OPTI is not set | 847 | # CONFIG_PATA_OPTI is not set |
619 | # CONFIG_PATA_OPTIDMA is not set | 848 | # CONFIG_PATA_OPTIDMA is not set |
849 | # CONFIG_PATA_PCMCIA is not set | ||
620 | # CONFIG_PATA_PDC_OLD is not set | 850 | # CONFIG_PATA_PDC_OLD is not set |
621 | # CONFIG_PATA_RADISYS is not set | 851 | # CONFIG_PATA_RADISYS is not set |
622 | # CONFIG_PATA_RZ1000 is not set | 852 | # CONFIG_PATA_RZ1000 is not set |
@@ -628,65 +858,42 @@ CONFIG_SATA_VIA=y | |||
628 | # CONFIG_PATA_VIA is not set | 858 | # CONFIG_PATA_VIA is not set |
629 | # CONFIG_PATA_WINBOND is not set | 859 | # CONFIG_PATA_WINBOND is not set |
630 | CONFIG_MD=y | 860 | CONFIG_MD=y |
631 | # CONFIG_BLK_DEV_MD is not set | 861 | CONFIG_BLK_DEV_MD=y |
862 | # CONFIG_MD_LINEAR is not set | ||
863 | # CONFIG_MD_RAID0 is not set | ||
864 | # CONFIG_MD_RAID1 is not set | ||
865 | # CONFIG_MD_RAID10 is not set | ||
866 | # CONFIG_MD_RAID456 is not set | ||
867 | # CONFIG_MD_MULTIPATH is not set | ||
868 | # CONFIG_MD_FAULTY is not set | ||
632 | CONFIG_BLK_DEV_DM=y | 869 | CONFIG_BLK_DEV_DM=y |
633 | # CONFIG_DM_DEBUG is not set | 870 | # CONFIG_DM_DEBUG is not set |
634 | # CONFIG_DM_CRYPT is not set | 871 | # CONFIG_DM_CRYPT is not set |
635 | # CONFIG_DM_SNAPSHOT is not set | 872 | # CONFIG_DM_SNAPSHOT is not set |
636 | # CONFIG_DM_MIRROR is not set | 873 | CONFIG_DM_MIRROR=y |
637 | # CONFIG_DM_ZERO is not set | 874 | CONFIG_DM_ZERO=y |
638 | # CONFIG_DM_MULTIPATH is not set | 875 | # CONFIG_DM_MULTIPATH is not set |
639 | # CONFIG_DM_DELAY is not set | 876 | # CONFIG_DM_DELAY is not set |
640 | 877 | # CONFIG_DM_UEVENT is not set | |
641 | # | 878 | # CONFIG_FUSION is not set |
642 | # Fusion MPT device support | ||
643 | # | ||
644 | CONFIG_FUSION=y | ||
645 | CONFIG_FUSION_SPI=y | ||
646 | # CONFIG_FUSION_FC is not set | ||
647 | # CONFIG_FUSION_SAS is not set | ||
648 | CONFIG_FUSION_MAX_SGE=128 | ||
649 | # CONFIG_FUSION_CTL is not set | ||
650 | 879 | ||
651 | # | 880 | # |
652 | # IEEE 1394 (FireWire) support | 881 | # IEEE 1394 (FireWire) support |
653 | # | 882 | # |
654 | # CONFIG_FIREWIRE is not set | 883 | # CONFIG_FIREWIRE is not set |
655 | CONFIG_IEEE1394=y | 884 | # CONFIG_IEEE1394 is not set |
656 | |||
657 | # | ||
658 | # Subsystem Options | ||
659 | # | ||
660 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
661 | |||
662 | # | ||
663 | # Controllers | ||
664 | # | ||
665 | |||
666 | # | ||
667 | # Texas Instruments PCILynx requires I2C | ||
668 | # | ||
669 | CONFIG_IEEE1394_OHCI1394=y | ||
670 | |||
671 | # | ||
672 | # Protocols | ||
673 | # | ||
674 | # CONFIG_IEEE1394_VIDEO1394 is not set | ||
675 | # CONFIG_IEEE1394_SBP2 is not set | ||
676 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | ||
677 | # CONFIG_IEEE1394_ETH1394 is not set | ||
678 | # CONFIG_IEEE1394_DV1394 is not set | ||
679 | CONFIG_IEEE1394_RAWIO=y | ||
680 | # CONFIG_I2O is not set | 885 | # CONFIG_I2O is not set |
681 | CONFIG_MACINTOSH_DRIVERS=y | 886 | CONFIG_MACINTOSH_DRIVERS=y |
682 | # CONFIG_MAC_EMUMOUSEBTN is not set | 887 | CONFIG_MAC_EMUMOUSEBTN=y |
683 | CONFIG_NETDEVICES=y | 888 | CONFIG_NETDEVICES=y |
684 | CONFIG_NETDEVICES_MULTIQUEUE=y | 889 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
890 | # CONFIG_IFB is not set | ||
685 | # CONFIG_DUMMY is not set | 891 | # CONFIG_DUMMY is not set |
686 | # CONFIG_BONDING is not set | 892 | # CONFIG_BONDING is not set |
687 | # CONFIG_MACVLAN is not set | 893 | # CONFIG_MACVLAN is not set |
688 | # CONFIG_EQUALIZER is not set | 894 | # CONFIG_EQUALIZER is not set |
689 | CONFIG_TUN=y | 895 | # CONFIG_TUN is not set |
896 | # CONFIG_VETH is not set | ||
690 | # CONFIG_NET_SB1000 is not set | 897 | # CONFIG_NET_SB1000 is not set |
691 | # CONFIG_ARCNET is not set | 898 | # CONFIG_ARCNET is not set |
692 | # CONFIG_PHYLIB is not set | 899 | # CONFIG_PHYLIB is not set |
@@ -696,39 +903,40 @@ CONFIG_MII=y | |||
696 | # CONFIG_SUNGEM is not set | 903 | # CONFIG_SUNGEM is not set |
697 | # CONFIG_CASSINI is not set | 904 | # CONFIG_CASSINI is not set |
698 | CONFIG_NET_VENDOR_3COM=y | 905 | CONFIG_NET_VENDOR_3COM=y |
699 | CONFIG_VORTEX=y | 906 | # CONFIG_VORTEX is not set |
700 | # CONFIG_TYPHOON is not set | 907 | # CONFIG_TYPHOON is not set |
701 | CONFIG_NET_TULIP=y | 908 | CONFIG_NET_TULIP=y |
702 | # CONFIG_DE2104X is not set | 909 | # CONFIG_DE2104X is not set |
703 | CONFIG_TULIP=y | 910 | # CONFIG_TULIP is not set |
704 | # CONFIG_TULIP_MWI is not set | ||
705 | # CONFIG_TULIP_MMIO is not set | ||
706 | # CONFIG_TULIP_NAPI is not set | ||
707 | # CONFIG_DE4X5 is not set | 911 | # CONFIG_DE4X5 is not set |
708 | # CONFIG_WINBOND_840 is not set | 912 | # CONFIG_WINBOND_840 is not set |
709 | # CONFIG_DM9102 is not set | 913 | # CONFIG_DM9102 is not set |
710 | # CONFIG_ULI526X is not set | 914 | # CONFIG_ULI526X is not set |
915 | # CONFIG_PCMCIA_XIRCOM is not set | ||
711 | # CONFIG_HP100 is not set | 916 | # CONFIG_HP100 is not set |
917 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
918 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
919 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
920 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
712 | CONFIG_NET_PCI=y | 921 | CONFIG_NET_PCI=y |
713 | # CONFIG_PCNET32 is not set | 922 | # CONFIG_PCNET32 is not set |
714 | CONFIG_AMD8111_ETH=y | 923 | # CONFIG_AMD8111_ETH is not set |
715 | # CONFIG_AMD8111E_NAPI is not set | ||
716 | # CONFIG_ADAPTEC_STARFIRE is not set | 924 | # CONFIG_ADAPTEC_STARFIRE is not set |
717 | CONFIG_B44=y | 925 | # CONFIG_B44 is not set |
718 | CONFIG_FORCEDETH=y | 926 | CONFIG_FORCEDETH=y |
719 | # CONFIG_FORCEDETH_NAPI is not set | 927 | # CONFIG_FORCEDETH_NAPI is not set |
720 | # CONFIG_DGRS is not set | ||
721 | # CONFIG_EEPRO100 is not set | 928 | # CONFIG_EEPRO100 is not set |
722 | CONFIG_E100=y | 929 | CONFIG_E100=y |
723 | # CONFIG_FEALNX is not set | 930 | # CONFIG_FEALNX is not set |
724 | # CONFIG_NATSEMI is not set | 931 | # CONFIG_NATSEMI is not set |
725 | # CONFIG_NE2K_PCI is not set | 932 | # CONFIG_NE2K_PCI is not set |
726 | CONFIG_8139CP=y | 933 | # CONFIG_8139CP is not set |
727 | CONFIG_8139TOO=y | 934 | CONFIG_8139TOO=y |
728 | # CONFIG_8139TOO_PIO is not set | 935 | CONFIG_8139TOO_PIO=y |
729 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 936 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
730 | # CONFIG_8139TOO_8129 is not set | 937 | # CONFIG_8139TOO_8129 is not set |
731 | # CONFIG_8139_OLD_RX_RESET is not set | 938 | # CONFIG_8139_OLD_RX_RESET is not set |
939 | # CONFIG_R6040 is not set | ||
732 | # CONFIG_SIS900 is not set | 940 | # CONFIG_SIS900 is not set |
733 | # CONFIG_EPIC100 is not set | 941 | # CONFIG_EPIC100 is not set |
734 | # CONFIG_SUNDANCE is not set | 942 | # CONFIG_SUNDANCE is not set |
@@ -740,34 +948,74 @@ CONFIG_NETDEV_1000=y | |||
740 | CONFIG_E1000=y | 948 | CONFIG_E1000=y |
741 | # CONFIG_E1000_NAPI is not set | 949 | # CONFIG_E1000_NAPI is not set |
742 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 950 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
951 | # CONFIG_E1000E is not set | ||
952 | # CONFIG_E1000E_ENABLED is not set | ||
953 | # CONFIG_IP1000 is not set | ||
954 | # CONFIG_IGB is not set | ||
743 | # CONFIG_NS83820 is not set | 955 | # CONFIG_NS83820 is not set |
744 | # CONFIG_HAMACHI is not set | 956 | # CONFIG_HAMACHI is not set |
745 | # CONFIG_YELLOWFIN is not set | 957 | # CONFIG_YELLOWFIN is not set |
746 | # CONFIG_R8169 is not set | 958 | # CONFIG_R8169 is not set |
747 | # CONFIG_SIS190 is not set | 959 | # CONFIG_SIS190 is not set |
748 | # CONFIG_SKGE is not set | 960 | # CONFIG_SKGE is not set |
749 | # CONFIG_SKY2 is not set | 961 | CONFIG_SKY2=y |
962 | # CONFIG_SKY2_DEBUG is not set | ||
750 | # CONFIG_VIA_VELOCITY is not set | 963 | # CONFIG_VIA_VELOCITY is not set |
751 | CONFIG_TIGON3=y | 964 | CONFIG_TIGON3=y |
752 | CONFIG_BNX2=y | 965 | # CONFIG_BNX2 is not set |
753 | # CONFIG_QLA3XXX is not set | 966 | # CONFIG_QLA3XXX is not set |
754 | # CONFIG_ATL1 is not set | 967 | # CONFIG_ATL1 is not set |
755 | CONFIG_NETDEV_10000=y | 968 | CONFIG_NETDEV_10000=y |
756 | # CONFIG_CHELSIO_T1 is not set | 969 | # CONFIG_CHELSIO_T1 is not set |
757 | # CONFIG_CHELSIO_T3 is not set | 970 | # CONFIG_CHELSIO_T3 is not set |
971 | # CONFIG_IXGBE is not set | ||
758 | # CONFIG_IXGB is not set | 972 | # CONFIG_IXGB is not set |
759 | CONFIG_S2IO=m | 973 | # CONFIG_S2IO is not set |
760 | # CONFIG_S2IO_NAPI is not set | ||
761 | # CONFIG_MYRI10GE is not set | 974 | # CONFIG_MYRI10GE is not set |
762 | # CONFIG_NETXEN_NIC is not set | 975 | # CONFIG_NETXEN_NIC is not set |
976 | # CONFIG_NIU is not set | ||
763 | # CONFIG_MLX4_CORE is not set | 977 | # CONFIG_MLX4_CORE is not set |
764 | # CONFIG_TR is not set | 978 | # CONFIG_TEHUTI is not set |
979 | # CONFIG_BNX2X is not set | ||
980 | # CONFIG_SFC is not set | ||
981 | CONFIG_TR=y | ||
982 | # CONFIG_IBMOL is not set | ||
983 | # CONFIG_3C359 is not set | ||
984 | # CONFIG_TMS380TR is not set | ||
765 | 985 | ||
766 | # | 986 | # |
767 | # Wireless LAN | 987 | # Wireless LAN |
768 | # | 988 | # |
769 | # CONFIG_WLAN_PRE80211 is not set | 989 | # CONFIG_WLAN_PRE80211 is not set |
770 | # CONFIG_WLAN_80211 is not set | 990 | CONFIG_WLAN_80211=y |
991 | # CONFIG_PCMCIA_RAYCS is not set | ||
992 | # CONFIG_IPW2100 is not set | ||
993 | # CONFIG_IPW2200 is not set | ||
994 | # CONFIG_LIBERTAS is not set | ||
995 | # CONFIG_AIRO is not set | ||
996 | # CONFIG_HERMES is not set | ||
997 | # CONFIG_ATMEL is not set | ||
998 | # CONFIG_AIRO_CS is not set | ||
999 | # CONFIG_PCMCIA_WL3501 is not set | ||
1000 | # CONFIG_PRISM54 is not set | ||
1001 | # CONFIG_USB_ZD1201 is not set | ||
1002 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
1003 | # CONFIG_RTL8180 is not set | ||
1004 | # CONFIG_RTL8187 is not set | ||
1005 | # CONFIG_ADM8211 is not set | ||
1006 | # CONFIG_P54_COMMON is not set | ||
1007 | CONFIG_ATH5K=y | ||
1008 | # CONFIG_ATH5K_DEBUG is not set | ||
1009 | # CONFIG_IWLWIFI is not set | ||
1010 | # CONFIG_IWLCORE is not set | ||
1011 | # CONFIG_IWLWIFI_LEDS is not set | ||
1012 | # CONFIG_IWL4965 is not set | ||
1013 | # CONFIG_IWL3945 is not set | ||
1014 | # CONFIG_HOSTAP is not set | ||
1015 | # CONFIG_B43 is not set | ||
1016 | # CONFIG_B43LEGACY is not set | ||
1017 | # CONFIG_ZD1211RW is not set | ||
1018 | # CONFIG_RT2X00 is not set | ||
771 | 1019 | ||
772 | # | 1020 | # |
773 | # USB Network Adapters | 1021 | # USB Network Adapters |
@@ -776,16 +1024,26 @@ CONFIG_S2IO=m | |||
776 | # CONFIG_USB_KAWETH is not set | 1024 | # CONFIG_USB_KAWETH is not set |
777 | # CONFIG_USB_PEGASUS is not set | 1025 | # CONFIG_USB_PEGASUS is not set |
778 | # CONFIG_USB_RTL8150 is not set | 1026 | # CONFIG_USB_RTL8150 is not set |
779 | # CONFIG_USB_USBNET_MII is not set | ||
780 | # CONFIG_USB_USBNET is not set | 1027 | # CONFIG_USB_USBNET is not set |
1028 | CONFIG_NET_PCMCIA=y | ||
1029 | # CONFIG_PCMCIA_3C589 is not set | ||
1030 | # CONFIG_PCMCIA_3C574 is not set | ||
1031 | # CONFIG_PCMCIA_FMVJ18X is not set | ||
1032 | # CONFIG_PCMCIA_PCNET is not set | ||
1033 | # CONFIG_PCMCIA_NMCLAN is not set | ||
1034 | # CONFIG_PCMCIA_SMC91C92 is not set | ||
1035 | # CONFIG_PCMCIA_XIRC2PS is not set | ||
1036 | # CONFIG_PCMCIA_AXNET is not set | ||
781 | # CONFIG_WAN is not set | 1037 | # CONFIG_WAN is not set |
782 | # CONFIG_FDDI is not set | 1038 | CONFIG_FDDI=y |
1039 | # CONFIG_DEFXX is not set | ||
1040 | # CONFIG_SKFP is not set | ||
783 | # CONFIG_HIPPI is not set | 1041 | # CONFIG_HIPPI is not set |
784 | # CONFIG_PPP is not set | 1042 | # CONFIG_PPP is not set |
785 | # CONFIG_SLIP is not set | 1043 | # CONFIG_SLIP is not set |
786 | # CONFIG_NET_FC is not set | 1044 | # CONFIG_NET_FC is not set |
787 | # CONFIG_SHAPER is not set | ||
788 | CONFIG_NETCONSOLE=y | 1045 | CONFIG_NETCONSOLE=y |
1046 | # CONFIG_NETCONSOLE_DYNAMIC is not set | ||
789 | CONFIG_NETPOLL=y | 1047 | CONFIG_NETPOLL=y |
790 | # CONFIG_NETPOLL_TRAP is not set | 1048 | # CONFIG_NETPOLL_TRAP is not set |
791 | CONFIG_NET_POLL_CONTROLLER=y | 1049 | CONFIG_NET_POLL_CONTROLLER=y |
@@ -796,18 +1054,17 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
796 | # Input device support | 1054 | # Input device support |
797 | # | 1055 | # |
798 | CONFIG_INPUT=y | 1056 | CONFIG_INPUT=y |
799 | # CONFIG_INPUT_FF_MEMLESS is not set | 1057 | CONFIG_INPUT_FF_MEMLESS=y |
800 | # CONFIG_INPUT_POLLDEV is not set | 1058 | CONFIG_INPUT_POLLDEV=y |
801 | 1059 | ||
802 | # | 1060 | # |
803 | # Userland interfaces | 1061 | # Userland interfaces |
804 | # | 1062 | # |
805 | CONFIG_INPUT_MOUSEDEV=y | 1063 | CONFIG_INPUT_MOUSEDEV=y |
806 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | 1064 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
807 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1065 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
808 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1066 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
809 | # CONFIG_INPUT_JOYDEV is not set | 1067 | # CONFIG_INPUT_JOYDEV is not set |
810 | # CONFIG_INPUT_TSDEV is not set | ||
811 | CONFIG_INPUT_EVDEV=y | 1068 | CONFIG_INPUT_EVDEV=y |
812 | # CONFIG_INPUT_EVBUG is not set | 1069 | # CONFIG_INPUT_EVBUG is not set |
813 | 1070 | ||
@@ -832,17 +1089,62 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
832 | # CONFIG_MOUSE_SERIAL is not set | 1089 | # CONFIG_MOUSE_SERIAL is not set |
833 | # CONFIG_MOUSE_APPLETOUCH is not set | 1090 | # CONFIG_MOUSE_APPLETOUCH is not set |
834 | # CONFIG_MOUSE_VSXXXAA is not set | 1091 | # CONFIG_MOUSE_VSXXXAA is not set |
835 | # CONFIG_INPUT_JOYSTICK is not set | 1092 | CONFIG_INPUT_JOYSTICK=y |
836 | # CONFIG_INPUT_TABLET is not set | 1093 | # CONFIG_JOYSTICK_ANALOG is not set |
837 | # CONFIG_INPUT_TOUCHSCREEN is not set | 1094 | # CONFIG_JOYSTICK_A3D is not set |
838 | # CONFIG_INPUT_MISC is not set | 1095 | # CONFIG_JOYSTICK_ADI is not set |
1096 | # CONFIG_JOYSTICK_COBRA is not set | ||
1097 | # CONFIG_JOYSTICK_GF2K is not set | ||
1098 | # CONFIG_JOYSTICK_GRIP is not set | ||
1099 | # CONFIG_JOYSTICK_GRIP_MP is not set | ||
1100 | # CONFIG_JOYSTICK_GUILLEMOT is not set | ||
1101 | # CONFIG_JOYSTICK_INTERACT is not set | ||
1102 | # CONFIG_JOYSTICK_SIDEWINDER is not set | ||
1103 | # CONFIG_JOYSTICK_TMDC is not set | ||
1104 | # CONFIG_JOYSTICK_IFORCE is not set | ||
1105 | # CONFIG_JOYSTICK_WARRIOR is not set | ||
1106 | # CONFIG_JOYSTICK_MAGELLAN is not set | ||
1107 | # CONFIG_JOYSTICK_SPACEORB is not set | ||
1108 | # CONFIG_JOYSTICK_SPACEBALL is not set | ||
1109 | # CONFIG_JOYSTICK_STINGER is not set | ||
1110 | # CONFIG_JOYSTICK_TWIDJOY is not set | ||
1111 | # CONFIG_JOYSTICK_ZHENHUA is not set | ||
1112 | # CONFIG_JOYSTICK_JOYDUMP is not set | ||
1113 | # CONFIG_JOYSTICK_XPAD is not set | ||
1114 | CONFIG_INPUT_TABLET=y | ||
1115 | # CONFIG_TABLET_USB_ACECAD is not set | ||
1116 | # CONFIG_TABLET_USB_AIPTEK is not set | ||
1117 | # CONFIG_TABLET_USB_GTCO is not set | ||
1118 | # CONFIG_TABLET_USB_KBTAB is not set | ||
1119 | # CONFIG_TABLET_USB_WACOM is not set | ||
1120 | CONFIG_INPUT_TOUCHSCREEN=y | ||
1121 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
1122 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
1123 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
1124 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
1125 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
1126 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
1127 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
1128 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
1129 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
1130 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
1131 | CONFIG_INPUT_MISC=y | ||
1132 | # CONFIG_INPUT_PCSPKR is not set | ||
1133 | # CONFIG_INPUT_APANEL is not set | ||
1134 | # CONFIG_INPUT_ATLAS_BTNS is not set | ||
1135 | # CONFIG_INPUT_ATI_REMOTE is not set | ||
1136 | # CONFIG_INPUT_ATI_REMOTE2 is not set | ||
1137 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | ||
1138 | # CONFIG_INPUT_POWERMATE is not set | ||
1139 | # CONFIG_INPUT_YEALINK is not set | ||
1140 | # CONFIG_INPUT_UINPUT is not set | ||
839 | 1141 | ||
840 | # | 1142 | # |
841 | # Hardware I/O ports | 1143 | # Hardware I/O ports |
842 | # | 1144 | # |
843 | CONFIG_SERIO=y | 1145 | CONFIG_SERIO=y |
844 | CONFIG_SERIO_I8042=y | 1146 | CONFIG_SERIO_I8042=y |
845 | # CONFIG_SERIO_SERPORT is not set | 1147 | CONFIG_SERIO_SERPORT=y |
846 | # CONFIG_SERIO_CT82C710 is not set | 1148 | # CONFIG_SERIO_CT82C710 is not set |
847 | # CONFIG_SERIO_PCIPS2 is not set | 1149 | # CONFIG_SERIO_PCIPS2 is not set |
848 | CONFIG_SERIO_LIBPS2=y | 1150 | CONFIG_SERIO_LIBPS2=y |
@@ -855,8 +1157,26 @@ CONFIG_SERIO_LIBPS2=y | |||
855 | CONFIG_VT=y | 1157 | CONFIG_VT=y |
856 | CONFIG_VT_CONSOLE=y | 1158 | CONFIG_VT_CONSOLE=y |
857 | CONFIG_HW_CONSOLE=y | 1159 | CONFIG_HW_CONSOLE=y |
858 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1160 | CONFIG_VT_HW_CONSOLE_BINDING=y |
859 | # CONFIG_SERIAL_NONSTANDARD is not set | 1161 | CONFIG_DEVKMEM=y |
1162 | CONFIG_SERIAL_NONSTANDARD=y | ||
1163 | # CONFIG_COMPUTONE is not set | ||
1164 | # CONFIG_ROCKETPORT is not set | ||
1165 | # CONFIG_CYCLADES is not set | ||
1166 | # CONFIG_DIGIEPCA is not set | ||
1167 | # CONFIG_MOXA_INTELLIO is not set | ||
1168 | # CONFIG_MOXA_SMARTIO is not set | ||
1169 | # CONFIG_ISI is not set | ||
1170 | # CONFIG_SYNCLINK is not set | ||
1171 | # CONFIG_SYNCLINKMP is not set | ||
1172 | # CONFIG_SYNCLINK_GT is not set | ||
1173 | # CONFIG_N_HDLC is not set | ||
1174 | # CONFIG_RISCOM8 is not set | ||
1175 | # CONFIG_SPECIALIX is not set | ||
1176 | # CONFIG_SX is not set | ||
1177 | # CONFIG_RIO is not set | ||
1178 | # CONFIG_STALDRV is not set | ||
1179 | # CONFIG_NOZOMI is not set | ||
860 | 1180 | ||
861 | # | 1181 | # |
862 | # Serial drivers | 1182 | # Serial drivers |
@@ -866,9 +1186,14 @@ CONFIG_SERIAL_8250_CONSOLE=y | |||
866 | CONFIG_FIX_EARLYCON_MEM=y | 1186 | CONFIG_FIX_EARLYCON_MEM=y |
867 | CONFIG_SERIAL_8250_PCI=y | 1187 | CONFIG_SERIAL_8250_PCI=y |
868 | CONFIG_SERIAL_8250_PNP=y | 1188 | CONFIG_SERIAL_8250_PNP=y |
869 | CONFIG_SERIAL_8250_NR_UARTS=4 | 1189 | # CONFIG_SERIAL_8250_CS is not set |
1190 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
870 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 1191 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
871 | # CONFIG_SERIAL_8250_EXTENDED is not set | 1192 | CONFIG_SERIAL_8250_EXTENDED=y |
1193 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
1194 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
1195 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
1196 | CONFIG_SERIAL_8250_RSA=y | ||
872 | 1197 | ||
873 | # | 1198 | # |
874 | # Non-8250 serial port support | 1199 | # Non-8250 serial port support |
@@ -877,78 +1202,260 @@ CONFIG_SERIAL_CORE=y | |||
877 | CONFIG_SERIAL_CORE_CONSOLE=y | 1202 | CONFIG_SERIAL_CORE_CONSOLE=y |
878 | # CONFIG_SERIAL_JSM is not set | 1203 | # CONFIG_SERIAL_JSM is not set |
879 | CONFIG_UNIX98_PTYS=y | 1204 | CONFIG_UNIX98_PTYS=y |
880 | CONFIG_LEGACY_PTYS=y | 1205 | # CONFIG_LEGACY_PTYS is not set |
881 | CONFIG_LEGACY_PTY_COUNT=256 | ||
882 | # CONFIG_IPMI_HANDLER is not set | 1206 | # CONFIG_IPMI_HANDLER is not set |
883 | # CONFIG_WATCHDOG is not set | ||
884 | CONFIG_HW_RANDOM=y | 1207 | CONFIG_HW_RANDOM=y |
885 | CONFIG_HW_RANDOM_INTEL=y | 1208 | # CONFIG_HW_RANDOM_INTEL is not set |
886 | CONFIG_HW_RANDOM_AMD=y | 1209 | # CONFIG_HW_RANDOM_AMD is not set |
887 | # CONFIG_NVRAM is not set | 1210 | CONFIG_NVRAM=y |
888 | CONFIG_RTC=y | ||
889 | # CONFIG_R3964 is not set | 1211 | # CONFIG_R3964 is not set |
890 | # CONFIG_APPLICOM is not set | 1212 | # CONFIG_APPLICOM is not set |
891 | CONFIG_AGP=y | 1213 | |
892 | CONFIG_AGP_AMD64=y | 1214 | # |
893 | CONFIG_AGP_INTEL=y | 1215 | # PCMCIA character devices |
894 | # CONFIG_AGP_SIS is not set | 1216 | # |
895 | # CONFIG_AGP_VIA is not set | 1217 | # CONFIG_SYNCLINK_CS is not set |
896 | # CONFIG_DRM is not set | 1218 | # CONFIG_CARDMAN_4000 is not set |
1219 | # CONFIG_CARDMAN_4040 is not set | ||
1220 | # CONFIG_IPWIRELESS is not set | ||
897 | # CONFIG_MWAVE is not set | 1221 | # CONFIG_MWAVE is not set |
898 | # CONFIG_PC8736x_GPIO is not set | 1222 | # CONFIG_PC8736x_GPIO is not set |
899 | CONFIG_RAW_DRIVER=y | 1223 | # CONFIG_RAW_DRIVER is not set |
900 | CONFIG_MAX_RAW_DEVS=256 | ||
901 | CONFIG_HPET=y | 1224 | CONFIG_HPET=y |
902 | # CONFIG_HPET_RTC_IRQ is not set | 1225 | # CONFIG_HPET_RTC_IRQ is not set |
903 | CONFIG_HPET_MMAP=y | 1226 | # CONFIG_HPET_MMAP is not set |
904 | # CONFIG_HANGCHECK_TIMER is not set | 1227 | # CONFIG_HANGCHECK_TIMER is not set |
905 | # CONFIG_TCG_TPM is not set | 1228 | # CONFIG_TCG_TPM is not set |
906 | # CONFIG_TELCLOCK is not set | 1229 | # CONFIG_TELCLOCK is not set |
907 | CONFIG_DEVPORT=y | 1230 | CONFIG_DEVPORT=y |
908 | # CONFIG_I2C is not set | 1231 | CONFIG_I2C=y |
909 | 1232 | CONFIG_I2C_BOARDINFO=y | |
910 | # | 1233 | # CONFIG_I2C_CHARDEV is not set |
911 | # SPI support | 1234 | |
912 | # | 1235 | # |
1236 | # I2C Hardware Bus support | ||
1237 | # | ||
1238 | # CONFIG_I2C_ALI1535 is not set | ||
1239 | # CONFIG_I2C_ALI1563 is not set | ||
1240 | # CONFIG_I2C_ALI15X3 is not set | ||
1241 | # CONFIG_I2C_AMD756 is not set | ||
1242 | # CONFIG_I2C_AMD8111 is not set | ||
1243 | CONFIG_I2C_I801=y | ||
1244 | # CONFIG_I2C_I810 is not set | ||
1245 | # CONFIG_I2C_PIIX4 is not set | ||
1246 | # CONFIG_I2C_NFORCE2 is not set | ||
1247 | # CONFIG_I2C_OCORES is not set | ||
1248 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1249 | # CONFIG_I2C_PROSAVAGE is not set | ||
1250 | # CONFIG_I2C_SAVAGE4 is not set | ||
1251 | # CONFIG_I2C_SIMTEC is not set | ||
1252 | # CONFIG_I2C_SIS5595 is not set | ||
1253 | # CONFIG_I2C_SIS630 is not set | ||
1254 | # CONFIG_I2C_SIS96X is not set | ||
1255 | # CONFIG_I2C_TAOS_EVM is not set | ||
1256 | # CONFIG_I2C_STUB is not set | ||
1257 | # CONFIG_I2C_TINY_USB is not set | ||
1258 | # CONFIG_I2C_VIA is not set | ||
1259 | # CONFIG_I2C_VIAPRO is not set | ||
1260 | # CONFIG_I2C_VOODOO3 is not set | ||
1261 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
1262 | |||
1263 | # | ||
1264 | # Miscellaneous I2C Chip support | ||
1265 | # | ||
1266 | # CONFIG_DS1682 is not set | ||
1267 | # CONFIG_SENSORS_EEPROM is not set | ||
1268 | # CONFIG_SENSORS_PCF8574 is not set | ||
1269 | # CONFIG_PCF8575 is not set | ||
1270 | # CONFIG_SENSORS_PCF8591 is not set | ||
1271 | # CONFIG_SENSORS_MAX6875 is not set | ||
1272 | # CONFIG_SENSORS_TSL2550 is not set | ||
1273 | # CONFIG_I2C_DEBUG_CORE is not set | ||
1274 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
1275 | # CONFIG_I2C_DEBUG_BUS is not set | ||
1276 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
913 | # CONFIG_SPI is not set | 1277 | # CONFIG_SPI is not set |
914 | # CONFIG_SPI_MASTER is not set | ||
915 | # CONFIG_W1 is not set | 1278 | # CONFIG_W1 is not set |
916 | # CONFIG_POWER_SUPPLY is not set | 1279 | CONFIG_POWER_SUPPLY=y |
1280 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
1281 | # CONFIG_PDA_POWER is not set | ||
1282 | # CONFIG_BATTERY_DS2760 is not set | ||
917 | # CONFIG_HWMON is not set | 1283 | # CONFIG_HWMON is not set |
1284 | CONFIG_THERMAL=y | ||
1285 | CONFIG_WATCHDOG=y | ||
1286 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
1287 | |||
1288 | # | ||
1289 | # Watchdog Device Drivers | ||
1290 | # | ||
1291 | # CONFIG_SOFT_WATCHDOG is not set | ||
1292 | # CONFIG_ACQUIRE_WDT is not set | ||
1293 | # CONFIG_ADVANTECH_WDT is not set | ||
1294 | # CONFIG_ALIM1535_WDT is not set | ||
1295 | # CONFIG_ALIM7101_WDT is not set | ||
1296 | # CONFIG_SC520_WDT is not set | ||
1297 | # CONFIG_EUROTECH_WDT is not set | ||
1298 | # CONFIG_IB700_WDT is not set | ||
1299 | # CONFIG_IBMASR is not set | ||
1300 | # CONFIG_WAFER_WDT is not set | ||
1301 | # CONFIG_I6300ESB_WDT is not set | ||
1302 | # CONFIG_ITCO_WDT is not set | ||
1303 | # CONFIG_IT8712F_WDT is not set | ||
1304 | # CONFIG_HP_WATCHDOG is not set | ||
1305 | # CONFIG_SC1200_WDT is not set | ||
1306 | # CONFIG_PC87413_WDT is not set | ||
1307 | # CONFIG_60XX_WDT is not set | ||
1308 | # CONFIG_SBC8360_WDT is not set | ||
1309 | # CONFIG_CPU5_WDT is not set | ||
1310 | # CONFIG_SMSC37B787_WDT is not set | ||
1311 | # CONFIG_W83627HF_WDT is not set | ||
1312 | # CONFIG_W83697HF_WDT is not set | ||
1313 | # CONFIG_W83877F_WDT is not set | ||
1314 | # CONFIG_W83977F_WDT is not set | ||
1315 | # CONFIG_MACHZ_WDT is not set | ||
1316 | # CONFIG_SBC_EPX_C3_WATCHDOG is not set | ||
1317 | |||
1318 | # | ||
1319 | # PCI-based Watchdog Cards | ||
1320 | # | ||
1321 | # CONFIG_PCIPCWATCHDOG is not set | ||
1322 | # CONFIG_WDTPCI is not set | ||
1323 | |||
1324 | # | ||
1325 | # USB-based Watchdog Cards | ||
1326 | # | ||
1327 | # CONFIG_USBPCWATCHDOG is not set | ||
1328 | |||
1329 | # | ||
1330 | # Sonics Silicon Backplane | ||
1331 | # | ||
1332 | CONFIG_SSB_POSSIBLE=y | ||
1333 | # CONFIG_SSB is not set | ||
918 | 1334 | ||
919 | # | 1335 | # |
920 | # Multifunction device drivers | 1336 | # Multifunction device drivers |
921 | # | 1337 | # |
922 | # CONFIG_MFD_SM501 is not set | 1338 | # CONFIG_MFD_SM501 is not set |
1339 | # CONFIG_HTC_PASIC3 is not set | ||
923 | 1340 | ||
924 | # | 1341 | # |
925 | # Multimedia devices | 1342 | # Multimedia devices |
926 | # | 1343 | # |
1344 | |||
1345 | # | ||
1346 | # Multimedia core support | ||
1347 | # | ||
927 | # CONFIG_VIDEO_DEV is not set | 1348 | # CONFIG_VIDEO_DEV is not set |
928 | # CONFIG_DVB_CORE is not set | 1349 | # CONFIG_DVB_CORE is not set |
1350 | |||
1351 | # | ||
1352 | # Multimedia drivers | ||
1353 | # | ||
929 | CONFIG_DAB=y | 1354 | CONFIG_DAB=y |
930 | # CONFIG_USB_DABUSB is not set | 1355 | # CONFIG_USB_DABUSB is not set |
931 | 1356 | ||
932 | # | 1357 | # |
933 | # Graphics support | 1358 | # Graphics support |
934 | # | 1359 | # |
935 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1360 | CONFIG_AGP=y |
1361 | CONFIG_AGP_AMD64=y | ||
1362 | CONFIG_AGP_INTEL=y | ||
1363 | # CONFIG_AGP_SIS is not set | ||
1364 | # CONFIG_AGP_VIA is not set | ||
1365 | CONFIG_DRM=y | ||
1366 | # CONFIG_DRM_TDFX is not set | ||
1367 | # CONFIG_DRM_R128 is not set | ||
1368 | # CONFIG_DRM_RADEON is not set | ||
1369 | # CONFIG_DRM_I810 is not set | ||
1370 | # CONFIG_DRM_I830 is not set | ||
1371 | CONFIG_DRM_I915=y | ||
1372 | # CONFIG_DRM_MGA is not set | ||
1373 | # CONFIG_DRM_SIS is not set | ||
1374 | # CONFIG_DRM_VIA is not set | ||
1375 | # CONFIG_DRM_SAVAGE is not set | ||
1376 | # CONFIG_VGASTATE is not set | ||
1377 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
1378 | CONFIG_FB=y | ||
1379 | # CONFIG_FIRMWARE_EDID is not set | ||
1380 | # CONFIG_FB_DDC is not set | ||
1381 | CONFIG_FB_CFB_FILLRECT=y | ||
1382 | CONFIG_FB_CFB_COPYAREA=y | ||
1383 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
1384 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
1385 | # CONFIG_FB_SYS_FILLRECT is not set | ||
1386 | # CONFIG_FB_SYS_COPYAREA is not set | ||
1387 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
1388 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1389 | # CONFIG_FB_SYS_FOPS is not set | ||
1390 | CONFIG_FB_DEFERRED_IO=y | ||
1391 | # CONFIG_FB_SVGALIB is not set | ||
1392 | # CONFIG_FB_MACMODES is not set | ||
1393 | # CONFIG_FB_BACKLIGHT is not set | ||
1394 | CONFIG_FB_MODE_HELPERS=y | ||
1395 | CONFIG_FB_TILEBLITTING=y | ||
1396 | |||
1397 | # | ||
1398 | # Frame buffer hardware drivers | ||
1399 | # | ||
1400 | # CONFIG_FB_CIRRUS is not set | ||
1401 | # CONFIG_FB_PM2 is not set | ||
1402 | # CONFIG_FB_CYBER2000 is not set | ||
1403 | # CONFIG_FB_ARC is not set | ||
1404 | # CONFIG_FB_ASILIANT is not set | ||
1405 | # CONFIG_FB_IMSTT is not set | ||
1406 | # CONFIG_FB_VGA16 is not set | ||
1407 | # CONFIG_FB_UVESA is not set | ||
1408 | # CONFIG_FB_VESA is not set | ||
1409 | CONFIG_FB_EFI=y | ||
1410 | # CONFIG_FB_IMAC is not set | ||
1411 | # CONFIG_FB_N411 is not set | ||
1412 | # CONFIG_FB_HGA is not set | ||
1413 | # CONFIG_FB_S1D13XXX is not set | ||
1414 | # CONFIG_FB_NVIDIA is not set | ||
1415 | # CONFIG_FB_RIVA is not set | ||
1416 | # CONFIG_FB_LE80578 is not set | ||
1417 | # CONFIG_FB_INTEL is not set | ||
1418 | # CONFIG_FB_MATROX is not set | ||
1419 | # CONFIG_FB_RADEON is not set | ||
1420 | # CONFIG_FB_ATY128 is not set | ||
1421 | # CONFIG_FB_ATY is not set | ||
1422 | # CONFIG_FB_S3 is not set | ||
1423 | # CONFIG_FB_SAVAGE is not set | ||
1424 | # CONFIG_FB_SIS is not set | ||
1425 | # CONFIG_FB_NEOMAGIC is not set | ||
1426 | # CONFIG_FB_KYRO is not set | ||
1427 | # CONFIG_FB_3DFX is not set | ||
1428 | # CONFIG_FB_VOODOO1 is not set | ||
1429 | # CONFIG_FB_VT8623 is not set | ||
1430 | # CONFIG_FB_TRIDENT is not set | ||
1431 | # CONFIG_FB_ARK is not set | ||
1432 | # CONFIG_FB_PM3 is not set | ||
1433 | # CONFIG_FB_GEODE is not set | ||
1434 | # CONFIG_FB_VIRTUAL is not set | ||
1435 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
1436 | # CONFIG_LCD_CLASS_DEVICE is not set | ||
1437 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
1438 | # CONFIG_BACKLIGHT_CORGI is not set | ||
1439 | # CONFIG_BACKLIGHT_PROGEAR is not set | ||
936 | 1440 | ||
937 | # | 1441 | # |
938 | # Display device support | 1442 | # Display device support |
939 | # | 1443 | # |
940 | # CONFIG_DISPLAY_SUPPORT is not set | 1444 | # CONFIG_DISPLAY_SUPPORT is not set |
941 | # CONFIG_VGASTATE is not set | ||
942 | # CONFIG_FB is not set | ||
943 | 1445 | ||
944 | # | 1446 | # |
945 | # Console display driver support | 1447 | # Console display driver support |
946 | # | 1448 | # |
947 | CONFIG_VGA_CONSOLE=y | 1449 | CONFIG_VGA_CONSOLE=y |
948 | CONFIG_VGACON_SOFT_SCROLLBACK=y | 1450 | CONFIG_VGACON_SOFT_SCROLLBACK=y |
949 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 | 1451 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
950 | CONFIG_VIDEO_SELECT=y | 1452 | CONFIG_VIDEO_SELECT=y |
951 | CONFIG_DUMMY_CONSOLE=y | 1453 | CONFIG_DUMMY_CONSOLE=y |
1454 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
1455 | CONFIG_LOGO=y | ||
1456 | # CONFIG_LOGO_LINUX_MONO is not set | ||
1457 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
1458 | CONFIG_LOGO_LINUX_CLUT224=y | ||
952 | 1459 | ||
953 | # | 1460 | # |
954 | # Sound | 1461 | # Sound |
@@ -958,33 +1465,165 @@ CONFIG_SOUND=y | |||
958 | # | 1465 | # |
959 | # Advanced Linux Sound Architecture | 1466 | # Advanced Linux Sound Architecture |
960 | # | 1467 | # |
961 | # CONFIG_SND is not set | 1468 | CONFIG_SND=y |
1469 | CONFIG_SND_TIMER=y | ||
1470 | CONFIG_SND_PCM=y | ||
1471 | CONFIG_SND_HWDEP=y | ||
1472 | CONFIG_SND_SEQUENCER=y | ||
1473 | CONFIG_SND_SEQ_DUMMY=y | ||
1474 | CONFIG_SND_OSSEMUL=y | ||
1475 | CONFIG_SND_MIXER_OSS=y | ||
1476 | CONFIG_SND_PCM_OSS=y | ||
1477 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
1478 | CONFIG_SND_SEQUENCER_OSS=y | ||
1479 | CONFIG_SND_DYNAMIC_MINORS=y | ||
1480 | CONFIG_SND_SUPPORT_OLD_API=y | ||
1481 | CONFIG_SND_VERBOSE_PROCFS=y | ||
1482 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
1483 | # CONFIG_SND_DEBUG is not set | ||
1484 | CONFIG_SND_VMASTER=y | ||
1485 | |||
1486 | # | ||
1487 | # Generic devices | ||
1488 | # | ||
1489 | # CONFIG_SND_PCSP is not set | ||
1490 | # CONFIG_SND_DUMMY is not set | ||
1491 | # CONFIG_SND_VIRMIDI is not set | ||
1492 | # CONFIG_SND_MTPAV is not set | ||
1493 | # CONFIG_SND_SERIAL_U16550 is not set | ||
1494 | # CONFIG_SND_MPU401 is not set | ||
1495 | |||
1496 | # | ||
1497 | # PCI devices | ||
1498 | # | ||
1499 | # CONFIG_SND_AD1889 is not set | ||
1500 | # CONFIG_SND_ALS300 is not set | ||
1501 | # CONFIG_SND_ALS4000 is not set | ||
1502 | # CONFIG_SND_ALI5451 is not set | ||
1503 | # CONFIG_SND_ATIIXP is not set | ||
1504 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
1505 | # CONFIG_SND_AU8810 is not set | ||
1506 | # CONFIG_SND_AU8820 is not set | ||
1507 | # CONFIG_SND_AU8830 is not set | ||
1508 | # CONFIG_SND_AW2 is not set | ||
1509 | # CONFIG_SND_AZT3328 is not set | ||
1510 | # CONFIG_SND_BT87X is not set | ||
1511 | # CONFIG_SND_CA0106 is not set | ||
1512 | # CONFIG_SND_CMIPCI is not set | ||
1513 | # CONFIG_SND_OXYGEN is not set | ||
1514 | # CONFIG_SND_CS4281 is not set | ||
1515 | # CONFIG_SND_CS46XX is not set | ||
1516 | # CONFIG_SND_CS5530 is not set | ||
1517 | # CONFIG_SND_DARLA20 is not set | ||
1518 | # CONFIG_SND_GINA20 is not set | ||
1519 | # CONFIG_SND_LAYLA20 is not set | ||
1520 | # CONFIG_SND_DARLA24 is not set | ||
1521 | # CONFIG_SND_GINA24 is not set | ||
1522 | # CONFIG_SND_LAYLA24 is not set | ||
1523 | # CONFIG_SND_MONA is not set | ||
1524 | # CONFIG_SND_MIA is not set | ||
1525 | # CONFIG_SND_ECHO3G is not set | ||
1526 | # CONFIG_SND_INDIGO is not set | ||
1527 | # CONFIG_SND_INDIGOIO is not set | ||
1528 | # CONFIG_SND_INDIGODJ is not set | ||
1529 | # CONFIG_SND_EMU10K1 is not set | ||
1530 | # CONFIG_SND_EMU10K1X is not set | ||
1531 | # CONFIG_SND_ENS1370 is not set | ||
1532 | # CONFIG_SND_ENS1371 is not set | ||
1533 | # CONFIG_SND_ES1938 is not set | ||
1534 | # CONFIG_SND_ES1968 is not set | ||
1535 | # CONFIG_SND_FM801 is not set | ||
1536 | CONFIG_SND_HDA_INTEL=y | ||
1537 | CONFIG_SND_HDA_HWDEP=y | ||
1538 | CONFIG_SND_HDA_CODEC_REALTEK=y | ||
1539 | CONFIG_SND_HDA_CODEC_ANALOG=y | ||
1540 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | ||
1541 | CONFIG_SND_HDA_CODEC_VIA=y | ||
1542 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | ||
1543 | CONFIG_SND_HDA_CODEC_CONEXANT=y | ||
1544 | CONFIG_SND_HDA_CODEC_CMEDIA=y | ||
1545 | CONFIG_SND_HDA_CODEC_SI3054=y | ||
1546 | CONFIG_SND_HDA_GENERIC=y | ||
1547 | # CONFIG_SND_HDA_POWER_SAVE is not set | ||
1548 | # CONFIG_SND_HDSP is not set | ||
1549 | # CONFIG_SND_HDSPM is not set | ||
1550 | # CONFIG_SND_HIFIER is not set | ||
1551 | # CONFIG_SND_ICE1712 is not set | ||
1552 | # CONFIG_SND_ICE1724 is not set | ||
1553 | # CONFIG_SND_INTEL8X0 is not set | ||
1554 | # CONFIG_SND_INTEL8X0M is not set | ||
1555 | # CONFIG_SND_KORG1212 is not set | ||
1556 | # CONFIG_SND_MAESTRO3 is not set | ||
1557 | # CONFIG_SND_MIXART is not set | ||
1558 | # CONFIG_SND_NM256 is not set | ||
1559 | # CONFIG_SND_PCXHR is not set | ||
1560 | # CONFIG_SND_RIPTIDE is not set | ||
1561 | # CONFIG_SND_RME32 is not set | ||
1562 | # CONFIG_SND_RME96 is not set | ||
1563 | # CONFIG_SND_RME9652 is not set | ||
1564 | # CONFIG_SND_SONICVIBES is not set | ||
1565 | # CONFIG_SND_TRIDENT is not set | ||
1566 | # CONFIG_SND_VIA82XX is not set | ||
1567 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
1568 | # CONFIG_SND_VIRTUOSO is not set | ||
1569 | # CONFIG_SND_VX222 is not set | ||
1570 | # CONFIG_SND_YMFPCI is not set | ||
1571 | |||
1572 | # | ||
1573 | # USB devices | ||
1574 | # | ||
1575 | # CONFIG_SND_USB_AUDIO is not set | ||
1576 | # CONFIG_SND_USB_USX2Y is not set | ||
1577 | # CONFIG_SND_USB_CAIAQ is not set | ||
1578 | |||
1579 | # | ||
1580 | # PCMCIA devices | ||
1581 | # | ||
1582 | # CONFIG_SND_VXPOCKET is not set | ||
1583 | # CONFIG_SND_PDAUDIOCF is not set | ||
1584 | |||
1585 | # | ||
1586 | # System on Chip audio support | ||
1587 | # | ||
1588 | # CONFIG_SND_SOC is not set | ||
1589 | |||
1590 | # | ||
1591 | # ALSA SoC audio for Freescale SOCs | ||
1592 | # | ||
1593 | |||
1594 | # | ||
1595 | # SoC Audio for the Texas Instruments OMAP | ||
1596 | # | ||
962 | 1597 | ||
963 | # | 1598 | # |
964 | # Open Sound System | 1599 | # Open Sound System |
965 | # | 1600 | # |
966 | CONFIG_SOUND_PRIME=y | 1601 | # CONFIG_SOUND_PRIME is not set |
967 | # CONFIG_SOUND_TRIDENT is not set | ||
968 | # CONFIG_SOUND_MSNDCLAS is not set | ||
969 | # CONFIG_SOUND_MSNDPIN is not set | ||
970 | # CONFIG_SOUND_OSS is not set | ||
971 | CONFIG_HID_SUPPORT=y | 1602 | CONFIG_HID_SUPPORT=y |
972 | CONFIG_HID=y | 1603 | CONFIG_HID=y |
973 | # CONFIG_HID_DEBUG is not set | 1604 | CONFIG_HID_DEBUG=y |
1605 | CONFIG_HIDRAW=y | ||
974 | 1606 | ||
975 | # | 1607 | # |
976 | # USB Input Devices | 1608 | # USB Input Devices |
977 | # | 1609 | # |
978 | CONFIG_USB_HID=y | 1610 | CONFIG_USB_HID=y |
979 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1611 | CONFIG_USB_HIDINPUT_POWERBOOK=y |
980 | # CONFIG_HID_FF is not set | 1612 | CONFIG_HID_FF=y |
981 | # CONFIG_USB_HIDDEV is not set | 1613 | CONFIG_HID_PID=y |
1614 | CONFIG_LOGITECH_FF=y | ||
1615 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
1616 | CONFIG_PANTHERLORD_FF=y | ||
1617 | CONFIG_THRUSTMASTER_FF=y | ||
1618 | CONFIG_ZEROPLUS_FF=y | ||
1619 | CONFIG_USB_HIDDEV=y | ||
982 | CONFIG_USB_SUPPORT=y | 1620 | CONFIG_USB_SUPPORT=y |
983 | CONFIG_USB_ARCH_HAS_HCD=y | 1621 | CONFIG_USB_ARCH_HAS_HCD=y |
984 | CONFIG_USB_ARCH_HAS_OHCI=y | 1622 | CONFIG_USB_ARCH_HAS_OHCI=y |
985 | CONFIG_USB_ARCH_HAS_EHCI=y | 1623 | CONFIG_USB_ARCH_HAS_EHCI=y |
986 | CONFIG_USB=y | 1624 | CONFIG_USB=y |
987 | # CONFIG_USB_DEBUG is not set | 1625 | CONFIG_USB_DEBUG=y |
1626 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
988 | 1627 | ||
989 | # | 1628 | # |
990 | # Miscellaneous USB options | 1629 | # Miscellaneous USB options |
@@ -992,18 +1631,18 @@ CONFIG_USB=y | |||
992 | CONFIG_USB_DEVICEFS=y | 1631 | CONFIG_USB_DEVICEFS=y |
993 | # CONFIG_USB_DEVICE_CLASS is not set | 1632 | # CONFIG_USB_DEVICE_CLASS is not set |
994 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1633 | # CONFIG_USB_DYNAMIC_MINORS is not set |
995 | # CONFIG_USB_SUSPEND is not set | 1634 | CONFIG_USB_SUSPEND=y |
996 | # CONFIG_USB_PERSIST is not set | ||
997 | # CONFIG_USB_OTG is not set | 1635 | # CONFIG_USB_OTG is not set |
998 | 1636 | ||
999 | # | 1637 | # |
1000 | # USB Host Controller Drivers | 1638 | # USB Host Controller Drivers |
1001 | # | 1639 | # |
1640 | # CONFIG_USB_C67X00_HCD is not set | ||
1002 | CONFIG_USB_EHCI_HCD=y | 1641 | CONFIG_USB_EHCI_HCD=y |
1003 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
1004 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1642 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1005 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1643 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1006 | # CONFIG_USB_ISP116X_HCD is not set | 1644 | # CONFIG_USB_ISP116X_HCD is not set |
1645 | # CONFIG_USB_ISP1760_HCD is not set | ||
1007 | CONFIG_USB_OHCI_HCD=y | 1646 | CONFIG_USB_OHCI_HCD=y |
1008 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1647 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
1009 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1648 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
@@ -1036,8 +1675,10 @@ CONFIG_USB_STORAGE=y | |||
1036 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1675 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1037 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1676 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1038 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1677 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1678 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1039 | # CONFIG_USB_STORAGE_KARMA is not set | 1679 | # CONFIG_USB_STORAGE_KARMA is not set |
1040 | # CONFIG_USB_LIBUSUAL is not set | 1680 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1681 | CONFIG_USB_LIBUSUAL=y | ||
1041 | 1682 | ||
1042 | # | 1683 | # |
1043 | # USB Imaging devices | 1684 | # USB Imaging devices |
@@ -1049,10 +1690,6 @@ CONFIG_USB_MON=y | |||
1049 | # | 1690 | # |
1050 | # USB port drivers | 1691 | # USB port drivers |
1051 | # | 1692 | # |
1052 | |||
1053 | # | ||
1054 | # USB Serial Converter support | ||
1055 | # | ||
1056 | # CONFIG_USB_SERIAL is not set | 1693 | # CONFIG_USB_SERIAL is not set |
1057 | 1694 | ||
1058 | # | 1695 | # |
@@ -1078,98 +1715,126 @@ CONFIG_USB_MON=y | |||
1078 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1715 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1079 | # CONFIG_USB_IOWARRIOR is not set | 1716 | # CONFIG_USB_IOWARRIOR is not set |
1080 | # CONFIG_USB_TEST is not set | 1717 | # CONFIG_USB_TEST is not set |
1718 | # CONFIG_USB_GADGET is not set | ||
1719 | # CONFIG_MMC is not set | ||
1720 | # CONFIG_MEMSTICK is not set | ||
1721 | CONFIG_NEW_LEDS=y | ||
1722 | CONFIG_LEDS_CLASS=y | ||
1081 | 1723 | ||
1082 | # | 1724 | # |
1083 | # USB DSL modem support | 1725 | # LED drivers |
1084 | # | 1726 | # |
1727 | # CONFIG_LEDS_CLEVO_MAIL is not set | ||
1085 | 1728 | ||
1086 | # | 1729 | # |
1087 | # USB Gadget Support | 1730 | # LED Triggers |
1088 | # | 1731 | # |
1089 | # CONFIG_USB_GADGET is not set | 1732 | CONFIG_LEDS_TRIGGERS=y |
1090 | # CONFIG_MMC is not set | 1733 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
1734 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
1735 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
1736 | # CONFIG_ACCESSIBILITY is not set | ||
1737 | # CONFIG_INFINIBAND is not set | ||
1738 | CONFIG_EDAC=y | ||
1091 | 1739 | ||
1092 | # | 1740 | # |
1093 | # LED devices | 1741 | # Reporting subsystems |
1094 | # | 1742 | # |
1095 | # CONFIG_NEW_LEDS is not set | 1743 | # CONFIG_EDAC_DEBUG is not set |
1744 | # CONFIG_EDAC_MM_EDAC is not set | ||
1745 | CONFIG_RTC_LIB=y | ||
1746 | CONFIG_RTC_CLASS=y | ||
1747 | # CONFIG_RTC_HCTOSYS is not set | ||
1748 | # CONFIG_RTC_DEBUG is not set | ||
1096 | 1749 | ||
1097 | # | 1750 | # |
1098 | # LED drivers | 1751 | # RTC interfaces |
1099 | # | 1752 | # |
1753 | CONFIG_RTC_INTF_SYSFS=y | ||
1754 | CONFIG_RTC_INTF_PROC=y | ||
1755 | CONFIG_RTC_INTF_DEV=y | ||
1756 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
1757 | # CONFIG_RTC_DRV_TEST is not set | ||
1100 | 1758 | ||
1101 | # | 1759 | # |
1102 | # LED Triggers | 1760 | # I2C RTC drivers |
1103 | # | 1761 | # |
1104 | # CONFIG_INFINIBAND is not set | 1762 | # CONFIG_RTC_DRV_DS1307 is not set |
1105 | # CONFIG_EDAC is not set | 1763 | # CONFIG_RTC_DRV_DS1374 is not set |
1764 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1765 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1766 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1767 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1768 | # CONFIG_RTC_DRV_X1205 is not set | ||
1769 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1770 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1771 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1772 | # CONFIG_RTC_DRV_S35390A is not set | ||
1106 | 1773 | ||
1107 | # | 1774 | # |
1108 | # Real Time Clock | 1775 | # SPI RTC drivers |
1109 | # | 1776 | # |
1110 | # CONFIG_RTC_CLASS is not set | ||
1111 | 1777 | ||
1112 | # | 1778 | # |
1113 | # DMA Engine support | 1779 | # Platform RTC drivers |
1114 | # | 1780 | # |
1115 | # CONFIG_DMA_ENGINE is not set | 1781 | CONFIG_RTC_DRV_CMOS=y |
1782 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1783 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1784 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1785 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1786 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1787 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1788 | # CONFIG_RTC_DRV_V3020 is not set | ||
1116 | 1789 | ||
1117 | # | 1790 | # |
1118 | # DMA Clients | 1791 | # on-CPU RTC drivers |
1119 | # | 1792 | # |
1793 | CONFIG_DMADEVICES=y | ||
1120 | 1794 | ||
1121 | # | 1795 | # |
1122 | # DMA Devices | 1796 | # DMA Devices |
1123 | # | 1797 | # |
1124 | CONFIG_VIRTUALIZATION=y | 1798 | # CONFIG_INTEL_IOATDMA is not set |
1125 | # CONFIG_KVM is not set | ||
1126 | |||
1127 | # | ||
1128 | # Userspace I/O | ||
1129 | # | ||
1130 | # CONFIG_UIO is not set | 1799 | # CONFIG_UIO is not set |
1131 | 1800 | ||
1132 | # | 1801 | # |
1133 | # Firmware Drivers | 1802 | # Firmware Drivers |
1134 | # | 1803 | # |
1135 | # CONFIG_EDD is not set | 1804 | # CONFIG_EDD is not set |
1805 | CONFIG_EFI_VARS=y | ||
1136 | # CONFIG_DELL_RBU is not set | 1806 | # CONFIG_DELL_RBU is not set |
1137 | # CONFIG_DCDBAS is not set | 1807 | # CONFIG_DCDBAS is not set |
1138 | CONFIG_DMIID=y | 1808 | CONFIG_DMIID=y |
1809 | # CONFIG_ISCSI_IBFT_FIND is not set | ||
1139 | 1810 | ||
1140 | # | 1811 | # |
1141 | # File systems | 1812 | # File systems |
1142 | # | 1813 | # |
1143 | CONFIG_EXT2_FS=y | 1814 | # CONFIG_EXT2_FS is not set |
1144 | CONFIG_EXT2_FS_XATTR=y | ||
1145 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
1146 | # CONFIG_EXT2_FS_SECURITY is not set | ||
1147 | # CONFIG_EXT2_FS_XIP is not set | ||
1148 | CONFIG_EXT3_FS=y | 1815 | CONFIG_EXT3_FS=y |
1149 | CONFIG_EXT3_FS_XATTR=y | 1816 | CONFIG_EXT3_FS_XATTR=y |
1150 | CONFIG_EXT3_FS_POSIX_ACL=y | 1817 | CONFIG_EXT3_FS_POSIX_ACL=y |
1151 | # CONFIG_EXT3_FS_SECURITY is not set | 1818 | CONFIG_EXT3_FS_SECURITY=y |
1152 | # CONFIG_EXT4DEV_FS is not set | 1819 | # CONFIG_EXT4DEV_FS is not set |
1153 | CONFIG_JBD=y | 1820 | CONFIG_JBD=y |
1154 | # CONFIG_JBD_DEBUG is not set | 1821 | # CONFIG_JBD_DEBUG is not set |
1155 | CONFIG_FS_MBCACHE=y | 1822 | CONFIG_FS_MBCACHE=y |
1156 | CONFIG_REISERFS_FS=y | 1823 | # CONFIG_REISERFS_FS is not set |
1157 | # CONFIG_REISERFS_CHECK is not set | ||
1158 | # CONFIG_REISERFS_PROC_INFO is not set | ||
1159 | CONFIG_REISERFS_FS_XATTR=y | ||
1160 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
1161 | # CONFIG_REISERFS_FS_SECURITY is not set | ||
1162 | # CONFIG_JFS_FS is not set | 1824 | # CONFIG_JFS_FS is not set |
1163 | CONFIG_FS_POSIX_ACL=y | 1825 | CONFIG_FS_POSIX_ACL=y |
1164 | # CONFIG_XFS_FS is not set | 1826 | # CONFIG_XFS_FS is not set |
1165 | # CONFIG_GFS2_FS is not set | 1827 | # CONFIG_GFS2_FS is not set |
1166 | # CONFIG_OCFS2_FS is not set | 1828 | # CONFIG_OCFS2_FS is not set |
1167 | # CONFIG_MINIX_FS is not set | 1829 | CONFIG_DNOTIFY=y |
1168 | # CONFIG_ROMFS_FS is not set | ||
1169 | CONFIG_INOTIFY=y | 1830 | CONFIG_INOTIFY=y |
1170 | CONFIG_INOTIFY_USER=y | 1831 | CONFIG_INOTIFY_USER=y |
1171 | # CONFIG_QUOTA is not set | 1832 | CONFIG_QUOTA=y |
1172 | CONFIG_DNOTIFY=y | 1833 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
1834 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
1835 | # CONFIG_QFMT_V1 is not set | ||
1836 | CONFIG_QFMT_V2=y | ||
1837 | CONFIG_QUOTACTL=y | ||
1173 | # CONFIG_AUTOFS_FS is not set | 1838 | # CONFIG_AUTOFS_FS is not set |
1174 | CONFIG_AUTOFS4_FS=y | 1839 | CONFIG_AUTOFS4_FS=y |
1175 | # CONFIG_FUSE_FS is not set | 1840 | # CONFIG_FUSE_FS is not set |
@@ -1180,7 +1845,7 @@ CONFIG_GENERIC_ACL=y | |||
1180 | # | 1845 | # |
1181 | CONFIG_ISO9660_FS=y | 1846 | CONFIG_ISO9660_FS=y |
1182 | CONFIG_JOLIET=y | 1847 | CONFIG_JOLIET=y |
1183 | # CONFIG_ZISOFS is not set | 1848 | CONFIG_ZISOFS=y |
1184 | # CONFIG_UDF_FS is not set | 1849 | # CONFIG_UDF_FS is not set |
1185 | 1850 | ||
1186 | # | 1851 | # |
@@ -1198,13 +1863,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1198 | # | 1863 | # |
1199 | CONFIG_PROC_FS=y | 1864 | CONFIG_PROC_FS=y |
1200 | CONFIG_PROC_KCORE=y | 1865 | CONFIG_PROC_KCORE=y |
1866 | CONFIG_PROC_VMCORE=y | ||
1201 | CONFIG_PROC_SYSCTL=y | 1867 | CONFIG_PROC_SYSCTL=y |
1202 | CONFIG_SYSFS=y | 1868 | CONFIG_SYSFS=y |
1203 | CONFIG_TMPFS=y | 1869 | CONFIG_TMPFS=y |
1204 | CONFIG_TMPFS_POSIX_ACL=y | 1870 | CONFIG_TMPFS_POSIX_ACL=y |
1205 | CONFIG_HUGETLBFS=y | 1871 | CONFIG_HUGETLBFS=y |
1206 | CONFIG_HUGETLB_PAGE=y | 1872 | CONFIG_HUGETLB_PAGE=y |
1207 | CONFIG_RAMFS=y | ||
1208 | # CONFIG_CONFIGFS_FS is not set | 1873 | # CONFIG_CONFIGFS_FS is not set |
1209 | 1874 | ||
1210 | # | 1875 | # |
@@ -1212,6 +1877,7 @@ CONFIG_RAMFS=y | |||
1212 | # | 1877 | # |
1213 | # CONFIG_ADFS_FS is not set | 1878 | # CONFIG_ADFS_FS is not set |
1214 | # CONFIG_AFFS_FS is not set | 1879 | # CONFIG_AFFS_FS is not set |
1880 | # CONFIG_ECRYPT_FS is not set | ||
1215 | # CONFIG_HFS_FS is not set | 1881 | # CONFIG_HFS_FS is not set |
1216 | # CONFIG_HFSPLUS_FS is not set | 1882 | # CONFIG_HFSPLUS_FS is not set |
1217 | # CONFIG_BEFS_FS is not set | 1883 | # CONFIG_BEFS_FS is not set |
@@ -1219,33 +1885,15 @@ CONFIG_RAMFS=y | |||
1219 | # CONFIG_EFS_FS is not set | 1885 | # CONFIG_EFS_FS is not set |
1220 | # CONFIG_CRAMFS is not set | 1886 | # CONFIG_CRAMFS is not set |
1221 | # CONFIG_VXFS_FS is not set | 1887 | # CONFIG_VXFS_FS is not set |
1888 | # CONFIG_MINIX_FS is not set | ||
1222 | # CONFIG_HPFS_FS is not set | 1889 | # CONFIG_HPFS_FS is not set |
1223 | # CONFIG_QNX4FS_FS is not set | 1890 | # CONFIG_QNX4FS_FS is not set |
1891 | # CONFIG_ROMFS_FS is not set | ||
1224 | # CONFIG_SYSV_FS is not set | 1892 | # CONFIG_SYSV_FS is not set |
1225 | # CONFIG_UFS_FS is not set | 1893 | # CONFIG_UFS_FS is not set |
1226 | 1894 | CONFIG_NETWORK_FILESYSTEMS=y | |
1227 | # | 1895 | # CONFIG_NFS_FS is not set |
1228 | # Network File Systems | 1896 | # CONFIG_NFSD is not set |
1229 | # | ||
1230 | CONFIG_NFS_FS=y | ||
1231 | CONFIG_NFS_V3=y | ||
1232 | # CONFIG_NFS_V3_ACL is not set | ||
1233 | # CONFIG_NFS_V4 is not set | ||
1234 | # CONFIG_NFS_DIRECTIO is not set | ||
1235 | CONFIG_NFSD=y | ||
1236 | CONFIG_NFSD_V3=y | ||
1237 | # CONFIG_NFSD_V3_ACL is not set | ||
1238 | # CONFIG_NFSD_V4 is not set | ||
1239 | CONFIG_NFSD_TCP=y | ||
1240 | CONFIG_ROOT_NFS=y | ||
1241 | CONFIG_LOCKD=y | ||
1242 | CONFIG_LOCKD_V4=y | ||
1243 | CONFIG_EXPORTFS=y | ||
1244 | CONFIG_NFS_COMMON=y | ||
1245 | CONFIG_SUNRPC=y | ||
1246 | # CONFIG_SUNRPC_BIND34 is not set | ||
1247 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1248 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1249 | # CONFIG_SMB_FS is not set | 1897 | # CONFIG_SMB_FS is not set |
1250 | # CONFIG_CIFS is not set | 1898 | # CONFIG_CIFS is not set |
1251 | # CONFIG_NCP_FS is not set | 1899 | # CONFIG_NCP_FS is not set |
@@ -1255,14 +1903,26 @@ CONFIG_SUNRPC=y | |||
1255 | # | 1903 | # |
1256 | # Partition Types | 1904 | # Partition Types |
1257 | # | 1905 | # |
1258 | # CONFIG_PARTITION_ADVANCED is not set | 1906 | CONFIG_PARTITION_ADVANCED=y |
1907 | # CONFIG_ACORN_PARTITION is not set | ||
1908 | CONFIG_OSF_PARTITION=y | ||
1909 | CONFIG_AMIGA_PARTITION=y | ||
1910 | # CONFIG_ATARI_PARTITION is not set | ||
1911 | CONFIG_MAC_PARTITION=y | ||
1259 | CONFIG_MSDOS_PARTITION=y | 1912 | CONFIG_MSDOS_PARTITION=y |
1260 | 1913 | CONFIG_BSD_DISKLABEL=y | |
1261 | # | 1914 | CONFIG_MINIX_SUBPARTITION=y |
1262 | # Native Language Support | 1915 | CONFIG_SOLARIS_X86_PARTITION=y |
1263 | # | 1916 | CONFIG_UNIXWARE_DISKLABEL=y |
1917 | # CONFIG_LDM_PARTITION is not set | ||
1918 | CONFIG_SGI_PARTITION=y | ||
1919 | # CONFIG_ULTRIX_PARTITION is not set | ||
1920 | CONFIG_SUN_PARTITION=y | ||
1921 | CONFIG_KARMA_PARTITION=y | ||
1922 | CONFIG_EFI_PARTITION=y | ||
1923 | # CONFIG_SYSV68_PARTITION is not set | ||
1264 | CONFIG_NLS=y | 1924 | CONFIG_NLS=y |
1265 | CONFIG_NLS_DEFAULT="iso8859-1" | 1925 | CONFIG_NLS_DEFAULT="utf8" |
1266 | CONFIG_NLS_CODEPAGE_437=y | 1926 | CONFIG_NLS_CODEPAGE_437=y |
1267 | # CONFIG_NLS_CODEPAGE_737 is not set | 1927 | # CONFIG_NLS_CODEPAGE_737 is not set |
1268 | # CONFIG_NLS_CODEPAGE_775 is not set | 1928 | # CONFIG_NLS_CODEPAGE_775 is not set |
@@ -1297,40 +1957,33 @@ CONFIG_NLS_ISO8859_1=y | |||
1297 | # CONFIG_NLS_ISO8859_9 is not set | 1957 | # CONFIG_NLS_ISO8859_9 is not set |
1298 | # CONFIG_NLS_ISO8859_13 is not set | 1958 | # CONFIG_NLS_ISO8859_13 is not set |
1299 | # CONFIG_NLS_ISO8859_14 is not set | 1959 | # CONFIG_NLS_ISO8859_14 is not set |
1300 | CONFIG_NLS_ISO8859_15=y | 1960 | # CONFIG_NLS_ISO8859_15 is not set |
1301 | # CONFIG_NLS_KOI8_R is not set | 1961 | # CONFIG_NLS_KOI8_R is not set |
1302 | # CONFIG_NLS_KOI8_U is not set | 1962 | # CONFIG_NLS_KOI8_U is not set |
1303 | CONFIG_NLS_UTF8=y | 1963 | CONFIG_NLS_UTF8=y |
1304 | |||
1305 | # | ||
1306 | # Distributed Lock Manager | ||
1307 | # | ||
1308 | # CONFIG_DLM is not set | 1964 | # CONFIG_DLM is not set |
1309 | 1965 | ||
1310 | # | 1966 | # |
1311 | # Instrumentation Support | ||
1312 | # | ||
1313 | CONFIG_PROFILING=y | ||
1314 | CONFIG_OPROFILE=y | ||
1315 | CONFIG_KPROBES=y | ||
1316 | |||
1317 | # | ||
1318 | # Kernel hacking | 1967 | # Kernel hacking |
1319 | # | 1968 | # |
1320 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1969 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
1321 | # CONFIG_PRINTK_TIME is not set | 1970 | # CONFIG_PRINTK_TIME is not set |
1971 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
1322 | # CONFIG_ENABLE_MUST_CHECK is not set | 1972 | # CONFIG_ENABLE_MUST_CHECK is not set |
1973 | CONFIG_FRAME_WARN=2048 | ||
1323 | CONFIG_MAGIC_SYSRQ=y | 1974 | CONFIG_MAGIC_SYSRQ=y |
1324 | CONFIG_UNUSED_SYMBOLS=y | 1975 | # CONFIG_UNUSED_SYMBOLS is not set |
1325 | CONFIG_DEBUG_FS=y | 1976 | CONFIG_DEBUG_FS=y |
1326 | # CONFIG_HEADERS_CHECK is not set | 1977 | # CONFIG_HEADERS_CHECK is not set |
1327 | CONFIG_DEBUG_KERNEL=y | 1978 | CONFIG_DEBUG_KERNEL=y |
1328 | # CONFIG_DEBUG_SHIRQ is not set | 1979 | # CONFIG_DEBUG_SHIRQ is not set |
1329 | CONFIG_DETECT_SOFTLOCKUP=y | 1980 | # CONFIG_DETECT_SOFTLOCKUP is not set |
1330 | # CONFIG_SCHED_DEBUG is not set | 1981 | # CONFIG_SCHED_DEBUG is not set |
1331 | # CONFIG_SCHEDSTATS is not set | 1982 | CONFIG_SCHEDSTATS=y |
1332 | CONFIG_TIMER_STATS=y | 1983 | CONFIG_TIMER_STATS=y |
1333 | # CONFIG_DEBUG_SLAB is not set | 1984 | # CONFIG_DEBUG_OBJECTS is not set |
1985 | # CONFIG_SLUB_DEBUG_ON is not set | ||
1986 | # CONFIG_SLUB_STATS is not set | ||
1334 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1987 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1335 | # CONFIG_RT_MUTEX_TESTER is not set | 1988 | # CONFIG_RT_MUTEX_TESTER is not set |
1336 | # CONFIG_DEBUG_SPINLOCK is not set | 1989 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1344,28 +1997,162 @@ CONFIG_TIMER_STATS=y | |||
1344 | CONFIG_DEBUG_BUGVERBOSE=y | 1997 | CONFIG_DEBUG_BUGVERBOSE=y |
1345 | # CONFIG_DEBUG_INFO is not set | 1998 | # CONFIG_DEBUG_INFO is not set |
1346 | # CONFIG_DEBUG_VM is not set | 1999 | # CONFIG_DEBUG_VM is not set |
2000 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1347 | # CONFIG_DEBUG_LIST is not set | 2001 | # CONFIG_DEBUG_LIST is not set |
1348 | # CONFIG_FRAME_POINTER is not set | 2002 | # CONFIG_DEBUG_SG is not set |
1349 | CONFIG_OPTIMIZE_INLINING=y | 2003 | CONFIG_FRAME_POINTER=y |
2004 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1350 | # CONFIG_RCU_TORTURE_TEST is not set | 2005 | # CONFIG_RCU_TORTURE_TEST is not set |
2006 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
2007 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1351 | # CONFIG_LKDTM is not set | 2008 | # CONFIG_LKDTM is not set |
1352 | # CONFIG_FAULT_INJECTION is not set | 2009 | # CONFIG_FAULT_INJECTION is not set |
1353 | # CONFIG_DEBUG_RODATA is not set | 2010 | # CONFIG_LATENCYTOP is not set |
1354 | # CONFIG_IOMMU_DEBUG is not set | 2011 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
2012 | # CONFIG_SAMPLES is not set | ||
2013 | # CONFIG_KGDB is not set | ||
2014 | CONFIG_HAVE_ARCH_KGDB=y | ||
2015 | # CONFIG_NONPROMISC_DEVMEM is not set | ||
2016 | CONFIG_EARLY_PRINTK=y | ||
1355 | CONFIG_DEBUG_STACKOVERFLOW=y | 2017 | CONFIG_DEBUG_STACKOVERFLOW=y |
1356 | # CONFIG_DEBUG_STACK_USAGE is not set | 2018 | CONFIG_DEBUG_STACK_USAGE=y |
2019 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
2020 | # CONFIG_DEBUG_PER_CPU_MAPS is not set | ||
2021 | # CONFIG_X86_PTDUMP is not set | ||
2022 | CONFIG_DEBUG_RODATA=y | ||
2023 | # CONFIG_DIRECT_GBPAGES is not set | ||
2024 | # CONFIG_DEBUG_RODATA_TEST is not set | ||
2025 | CONFIG_DEBUG_NX_TEST=m | ||
2026 | CONFIG_X86_MPPARSE=y | ||
2027 | # CONFIG_IOMMU_DEBUG is not set | ||
2028 | CONFIG_IO_DELAY_TYPE_0X80=0 | ||
2029 | CONFIG_IO_DELAY_TYPE_0XED=1 | ||
2030 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | ||
2031 | CONFIG_IO_DELAY_TYPE_NONE=3 | ||
2032 | CONFIG_IO_DELAY_0X80=y | ||
2033 | # CONFIG_IO_DELAY_0XED is not set | ||
2034 | # CONFIG_IO_DELAY_UDELAY is not set | ||
2035 | # CONFIG_IO_DELAY_NONE is not set | ||
2036 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | ||
2037 | CONFIG_DEBUG_BOOT_PARAMS=y | ||
2038 | # CONFIG_CPA_DEBUG is not set | ||
1357 | 2039 | ||
1358 | # | 2040 | # |
1359 | # Security options | 2041 | # Security options |
1360 | # | 2042 | # |
1361 | # CONFIG_KEYS is not set | 2043 | CONFIG_KEYS=y |
1362 | # CONFIG_SECURITY is not set | 2044 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1363 | # CONFIG_CRYPTO is not set | 2045 | CONFIG_SECURITY=y |
2046 | CONFIG_SECURITY_NETWORK=y | ||
2047 | # CONFIG_SECURITY_NETWORK_XFRM is not set | ||
2048 | CONFIG_SECURITY_CAPABILITIES=y | ||
2049 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
2050 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
2051 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | ||
2052 | CONFIG_SECURITY_SELINUX=y | ||
2053 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | ||
2054 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | ||
2055 | CONFIG_SECURITY_SELINUX_DISABLE=y | ||
2056 | CONFIG_SECURITY_SELINUX_DEVELOP=y | ||
2057 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | ||
2058 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | ||
2059 | # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set | ||
2060 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set | ||
2061 | # CONFIG_SECURITY_SMACK is not set | ||
2062 | CONFIG_CRYPTO=y | ||
2063 | |||
2064 | # | ||
2065 | # Crypto core or helper | ||
2066 | # | ||
2067 | CONFIG_CRYPTO_ALGAPI=y | ||
2068 | CONFIG_CRYPTO_AEAD=y | ||
2069 | CONFIG_CRYPTO_BLKCIPHER=y | ||
2070 | CONFIG_CRYPTO_HASH=y | ||
2071 | CONFIG_CRYPTO_MANAGER=y | ||
2072 | # CONFIG_CRYPTO_GF128MUL is not set | ||
2073 | # CONFIG_CRYPTO_NULL is not set | ||
2074 | # CONFIG_CRYPTO_CRYPTD is not set | ||
2075 | CONFIG_CRYPTO_AUTHENC=y | ||
2076 | # CONFIG_CRYPTO_TEST is not set | ||
2077 | |||
2078 | # | ||
2079 | # Authenticated Encryption with Associated Data | ||
2080 | # | ||
2081 | # CONFIG_CRYPTO_CCM is not set | ||
2082 | # CONFIG_CRYPTO_GCM is not set | ||
2083 | # CONFIG_CRYPTO_SEQIV is not set | ||
2084 | |||
2085 | # | ||
2086 | # Block modes | ||
2087 | # | ||
2088 | CONFIG_CRYPTO_CBC=y | ||
2089 | # CONFIG_CRYPTO_CTR is not set | ||
2090 | # CONFIG_CRYPTO_CTS is not set | ||
2091 | CONFIG_CRYPTO_ECB=y | ||
2092 | # CONFIG_CRYPTO_LRW is not set | ||
2093 | # CONFIG_CRYPTO_PCBC is not set | ||
2094 | # CONFIG_CRYPTO_XTS is not set | ||
2095 | |||
2096 | # | ||
2097 | # Hash modes | ||
2098 | # | ||
2099 | CONFIG_CRYPTO_HMAC=y | ||
2100 | # CONFIG_CRYPTO_XCBC is not set | ||
2101 | |||
2102 | # | ||
2103 | # Digest | ||
2104 | # | ||
2105 | # CONFIG_CRYPTO_CRC32C is not set | ||
2106 | # CONFIG_CRYPTO_MD4 is not set | ||
2107 | CONFIG_CRYPTO_MD5=y | ||
2108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
2109 | CONFIG_CRYPTO_SHA1=y | ||
2110 | # CONFIG_CRYPTO_SHA256 is not set | ||
2111 | # CONFIG_CRYPTO_SHA512 is not set | ||
2112 | # CONFIG_CRYPTO_TGR192 is not set | ||
2113 | # CONFIG_CRYPTO_WP512 is not set | ||
2114 | |||
2115 | # | ||
2116 | # Ciphers | ||
2117 | # | ||
2118 | CONFIG_CRYPTO_AES=y | ||
2119 | # CONFIG_CRYPTO_AES_X86_64 is not set | ||
2120 | # CONFIG_CRYPTO_ANUBIS is not set | ||
2121 | CONFIG_CRYPTO_ARC4=y | ||
2122 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
2123 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
2124 | # CONFIG_CRYPTO_CAST5 is not set | ||
2125 | # CONFIG_CRYPTO_CAST6 is not set | ||
2126 | CONFIG_CRYPTO_DES=y | ||
2127 | # CONFIG_CRYPTO_FCRYPT is not set | ||
2128 | # CONFIG_CRYPTO_KHAZAD is not set | ||
2129 | # CONFIG_CRYPTO_SALSA20 is not set | ||
2130 | # CONFIG_CRYPTO_SALSA20_X86_64 is not set | ||
2131 | # CONFIG_CRYPTO_SEED is not set | ||
2132 | # CONFIG_CRYPTO_SERPENT is not set | ||
2133 | # CONFIG_CRYPTO_TEA is not set | ||
2134 | # CONFIG_CRYPTO_TWOFISH is not set | ||
2135 | # CONFIG_CRYPTO_TWOFISH_X86_64 is not set | ||
2136 | |||
2137 | # | ||
2138 | # Compression | ||
2139 | # | ||
2140 | # CONFIG_CRYPTO_DEFLATE is not set | ||
2141 | # CONFIG_CRYPTO_LZO is not set | ||
2142 | CONFIG_CRYPTO_HW=y | ||
2143 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
2144 | CONFIG_HAVE_KVM=y | ||
2145 | CONFIG_VIRTUALIZATION=y | ||
2146 | # CONFIG_KVM is not set | ||
2147 | # CONFIG_VIRTIO_PCI is not set | ||
2148 | # CONFIG_VIRTIO_BALLOON is not set | ||
1364 | 2149 | ||
1365 | # | 2150 | # |
1366 | # Library routines | 2151 | # Library routines |
1367 | # | 2152 | # |
1368 | CONFIG_BITREVERSE=y | 2153 | CONFIG_BITREVERSE=y |
2154 | CONFIG_GENERIC_FIND_FIRST_BIT=y | ||
2155 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
1369 | # CONFIG_CRC_CCITT is not set | 2156 | # CONFIG_CRC_CCITT is not set |
1370 | # CONFIG_CRC16 is not set | 2157 | # CONFIG_CRC16 is not set |
1371 | # CONFIG_CRC_ITU_T is not set | 2158 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index b5e329da166c..3aefbce2de48 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
@@ -370,13 +370,11 @@ quiet_ni_syscall: | |||
370 | PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn, %rdi | 370 | PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn, %rdi |
371 | PTREGSCALL stub32_sigreturn, sys32_sigreturn, %rdi | 371 | PTREGSCALL stub32_sigreturn, sys32_sigreturn, %rdi |
372 | PTREGSCALL stub32_sigaltstack, sys32_sigaltstack, %rdx | 372 | PTREGSCALL stub32_sigaltstack, sys32_sigaltstack, %rdx |
373 | PTREGSCALL stub32_sigsuspend, sys32_sigsuspend, %rcx | ||
374 | PTREGSCALL stub32_execve, sys32_execve, %rcx | 373 | PTREGSCALL stub32_execve, sys32_execve, %rcx |
375 | PTREGSCALL stub32_fork, sys_fork, %rdi | 374 | PTREGSCALL stub32_fork, sys_fork, %rdi |
376 | PTREGSCALL stub32_clone, sys32_clone, %rdx | 375 | PTREGSCALL stub32_clone, sys32_clone, %rdx |
377 | PTREGSCALL stub32_vfork, sys_vfork, %rdi | 376 | PTREGSCALL stub32_vfork, sys_vfork, %rdi |
378 | PTREGSCALL stub32_iopl, sys_iopl, %rsi | 377 | PTREGSCALL stub32_iopl, sys_iopl, %rsi |
379 | PTREGSCALL stub32_rt_sigsuspend, sys_rt_sigsuspend, %rdx | ||
380 | 378 | ||
381 | ENTRY(ia32_ptregs_common) | 379 | ENTRY(ia32_ptregs_common) |
382 | popq %r11 | 380 | popq %r11 |
@@ -476,7 +474,7 @@ ia32_sys_call_table: | |||
476 | .quad sys_ssetmask | 474 | .quad sys_ssetmask |
477 | .quad sys_setreuid16 /* 70 */ | 475 | .quad sys_setreuid16 /* 70 */ |
478 | .quad sys_setregid16 | 476 | .quad sys_setregid16 |
479 | .quad stub32_sigsuspend | 477 | .quad sys32_sigsuspend |
480 | .quad compat_sys_sigpending | 478 | .quad compat_sys_sigpending |
481 | .quad sys_sethostname | 479 | .quad sys_sethostname |
482 | .quad compat_sys_setrlimit /* 75 */ | 480 | .quad compat_sys_setrlimit /* 75 */ |
@@ -583,7 +581,7 @@ ia32_sys_call_table: | |||
583 | .quad sys32_rt_sigpending | 581 | .quad sys32_rt_sigpending |
584 | .quad compat_sys_rt_sigtimedwait | 582 | .quad compat_sys_rt_sigtimedwait |
585 | .quad sys32_rt_sigqueueinfo | 583 | .quad sys32_rt_sigqueueinfo |
586 | .quad stub32_rt_sigsuspend | 584 | .quad sys_rt_sigsuspend |
587 | .quad sys32_pread /* 180 */ | 585 | .quad sys32_pread /* 180 */ |
588 | .quad sys32_pwrite | 586 | .quad sys32_pwrite |
589 | .quad sys_chown16 | 587 | .quad sys_chown16 |
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 5e618c3b4720..8a42b797cd6b 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
@@ -18,14 +18,13 @@ CFLAGS_tsc_64.o := $(nostackp) | |||
18 | obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o | 18 | obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o |
19 | obj-y += traps_$(BITS).o irq_$(BITS).o | 19 | obj-y += traps_$(BITS).o irq_$(BITS).o |
20 | obj-y += time_$(BITS).o ioport.o ldt.o | 20 | obj-y += time_$(BITS).o ioport.o ldt.o |
21 | obj-y += setup_$(BITS).o i8259_$(BITS).o setup.o | 21 | obj-y += setup_$(BITS).o i8259.o irqinit_$(BITS).o setup.o |
22 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o | 22 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o |
23 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o | 23 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o |
24 | obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o | 24 | obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o |
25 | obj-y += bootflag.o e820_$(BITS).o | 25 | obj-y += bootflag.o e820_$(BITS).o |
26 | obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o | 26 | obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o |
27 | obj-y += alternative.o i8253.o pci-nommu.o | 27 | obj-y += alternative.o i8253.o pci-nommu.o |
28 | obj-$(CONFIG_X86_64) += bugs_64.o | ||
29 | obj-y += tsc_$(BITS).o io_delay.o rtc.o | 28 | obj-y += tsc_$(BITS).o io_delay.o rtc.o |
30 | 29 | ||
31 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o | 30 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o |
@@ -82,6 +81,7 @@ obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o | |||
82 | obj-$(CONFIG_KVM_GUEST) += kvm.o | 81 | obj-$(CONFIG_KVM_GUEST) += kvm.o |
83 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o | 82 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o |
84 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o | 83 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o |
84 | obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o | ||
85 | 85 | ||
86 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o | 86 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o |
87 | 87 | ||
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index c49ebcc6c41e..33c5216fd3e1 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -242,12 +242,19 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) | |||
242 | 242 | ||
243 | static void __cpuinit acpi_register_lapic(int id, u8 enabled) | 243 | static void __cpuinit acpi_register_lapic(int id, u8 enabled) |
244 | { | 244 | { |
245 | unsigned int ver = 0; | ||
246 | |||
245 | if (!enabled) { | 247 | if (!enabled) { |
246 | ++disabled_cpus; | 248 | ++disabled_cpus; |
247 | return; | 249 | return; |
248 | } | 250 | } |
249 | 251 | ||
250 | generic_processor_info(id, 0); | 252 | #ifdef CONFIG_X86_32 |
253 | if (boot_cpu_physical_apicid != -1U) | ||
254 | ver = apic_version[boot_cpu_physical_apicid]; | ||
255 | #endif | ||
256 | |||
257 | generic_processor_info(id, ver); | ||
251 | } | 258 | } |
252 | 259 | ||
253 | static int __init | 260 | static int __init |
@@ -767,8 +774,13 @@ static void __init acpi_register_lapic_address(unsigned long address) | |||
767 | mp_lapic_addr = address; | 774 | mp_lapic_addr = address; |
768 | 775 | ||
769 | set_fixmap_nocache(FIX_APIC_BASE, address); | 776 | set_fixmap_nocache(FIX_APIC_BASE, address); |
770 | if (boot_cpu_physical_apicid == -1U) | 777 | if (boot_cpu_physical_apicid == -1U) { |
771 | boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id()); | 778 | boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id()); |
779 | #ifdef CONFIG_X86_32 | ||
780 | apic_version[boot_cpu_physical_apicid] = | ||
781 | GET_APIC_VERSION(apic_read(APIC_LVR)); | ||
782 | #endif | ||
783 | } | ||
772 | } | 784 | } |
773 | 785 | ||
774 | static int __init early_acpi_parse_madt_lapic_addr_ovr(void) | 786 | static int __init early_acpi_parse_madt_lapic_addr_ovr(void) |
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S index f9b77fb37e5b..3355973b12ac 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.S +++ b/arch/x86/kernel/acpi/realmode/wakeup.S | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <asm/msr-index.h> | 5 | #include <asm/msr-index.h> |
6 | #include <asm/page.h> | 6 | #include <asm/page.h> |
7 | #include <asm/pgtable.h> | 7 | #include <asm/pgtable.h> |
8 | #include <asm/processor-flags.h> | ||
8 | 9 | ||
9 | .code16 | 10 | .code16 |
10 | .section ".header", "a" | 11 | .section ".header", "a" |
@@ -24,6 +25,11 @@ pmode_gdt: .quad 0 | |||
24 | realmode_flags: .long 0 | 25 | realmode_flags: .long 0 |
25 | real_magic: .long 0 | 26 | real_magic: .long 0 |
26 | trampoline_segment: .word 0 | 27 | trampoline_segment: .word 0 |
28 | _pad1: .byte 0 | ||
29 | wakeup_jmp: .byte 0xea /* ljmpw */ | ||
30 | wakeup_jmp_off: .word 3f | ||
31 | wakeup_jmp_seg: .word 0 | ||
32 | wakeup_gdt: .quad 0, 0, 0 | ||
27 | signature: .long 0x51ee1111 | 33 | signature: .long 0x51ee1111 |
28 | 34 | ||
29 | .text | 35 | .text |
@@ -34,11 +40,34 @@ _start: | |||
34 | cli | 40 | cli |
35 | cld | 41 | cld |
36 | 42 | ||
43 | /* Apparently some dimwit BIOS programmers don't know how to | ||
44 | program a PM to RM transition, and we might end up here with | ||
45 | junk in the data segment descriptor registers. The only way | ||
46 | to repair that is to go into PM and fix it ourselves... */ | ||
47 | movw $16, %cx | ||
48 | lgdtl %cs:wakeup_gdt | ||
49 | movl %cr0, %eax | ||
50 | orb $X86_CR0_PE, %al | ||
51 | movl %eax, %cr0 | ||
52 | jmp 1f | ||
53 | 1: ljmpw $8, $2f | ||
54 | 2: | ||
55 | movw %cx, %ds | ||
56 | movw %cx, %es | ||
57 | movw %cx, %ss | ||
58 | movw %cx, %fs | ||
59 | movw %cx, %gs | ||
60 | |||
61 | andb $~X86_CR0_PE, %al | ||
62 | movl %eax, %cr0 | ||
63 | jmp wakeup_jmp | ||
64 | 3: | ||
37 | /* Set up segments */ | 65 | /* Set up segments */ |
38 | movw %cs, %ax | 66 | movw %cs, %ax |
39 | movw %ax, %ds | 67 | movw %ax, %ds |
40 | movw %ax, %es | 68 | movw %ax, %es |
41 | movw %ax, %ss | 69 | movw %ax, %ss |
70 | lidtl wakeup_idt | ||
42 | 71 | ||
43 | movl $wakeup_stack_end, %esp | 72 | movl $wakeup_stack_end, %esp |
44 | 73 | ||
@@ -98,7 +127,14 @@ bogus_real_magic: | |||
98 | jmp 1b | 127 | jmp 1b |
99 | 128 | ||
100 | .data | 129 | .data |
101 | .balign 4 | 130 | .balign 8 |
131 | |||
132 | /* This is the standard real-mode IDT */ | ||
133 | wakeup_idt: | ||
134 | .word 0xffff /* limit */ | ||
135 | .long 0 /* address */ | ||
136 | .word 0 | ||
137 | |||
102 | .globl HEAP, heap_end | 138 | .globl HEAP, heap_end |
103 | HEAP: | 139 | HEAP: |
104 | .long wakeup_heap | 140 | .long wakeup_heap |
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.h b/arch/x86/kernel/acpi/realmode/wakeup.h index ef8166fe8020..69d38d0b2b64 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.h +++ b/arch/x86/kernel/acpi/realmode/wakeup.h | |||
@@ -24,6 +24,11 @@ struct wakeup_header { | |||
24 | u32 realmode_flags; | 24 | u32 realmode_flags; |
25 | u32 real_magic; | 25 | u32 real_magic; |
26 | u16 trampoline_segment; /* segment with trampoline code, 64-bit only */ | 26 | u16 trampoline_segment; /* segment with trampoline code, 64-bit only */ |
27 | u8 _pad1; | ||
28 | u8 wakeup_jmp; | ||
29 | u16 wakeup_jmp_off; | ||
30 | u16 wakeup_jmp_seg; | ||
31 | u64 wakeup_gdt[3]; | ||
27 | u32 signature; /* To check we have correct structure */ | 32 | u32 signature; /* To check we have correct structure */ |
28 | } __attribute__((__packed__)); | 33 | } __attribute__((__packed__)); |
29 | 34 | ||
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index afc25ee9964b..36af01f029ed 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c | |||
@@ -50,6 +50,20 @@ int acpi_save_state_mem(void) | |||
50 | 50 | ||
51 | header->video_mode = saved_video_mode; | 51 | header->video_mode = saved_video_mode; |
52 | 52 | ||
53 | header->wakeup_jmp_seg = acpi_wakeup_address >> 4; | ||
54 | /* GDT[0]: GDT self-pointer */ | ||
55 | header->wakeup_gdt[0] = | ||
56 | (u64)(sizeof(header->wakeup_gdt) - 1) + | ||
57 | ((u64)(acpi_wakeup_address + | ||
58 | ((char *)&header->wakeup_gdt - (char *)acpi_realmode)) | ||
59 | << 16); | ||
60 | /* GDT[1]: real-mode-like code segment */ | ||
61 | header->wakeup_gdt[1] = (0x009bULL << 40) + | ||
62 | ((u64)acpi_wakeup_address << 16) + 0xffff; | ||
63 | /* GDT[2]: real-mode-like data segment */ | ||
64 | header->wakeup_gdt[2] = (0x0093ULL << 40) + | ||
65 | ((u64)acpi_wakeup_address << 16) + 0xffff; | ||
66 | |||
53 | #ifndef CONFIG_64BIT | 67 | #ifndef CONFIG_64BIT |
54 | store_gdt((struct desc_ptr *)&header->pmode_gdt); | 68 | store_gdt((struct desc_ptr *)&header->pmode_gdt); |
55 | 69 | ||
@@ -111,7 +125,7 @@ void __init acpi_reserve_bootmem(void) | |||
111 | return; | 125 | return; |
112 | } | 126 | } |
113 | 127 | ||
114 | acpi_wakeup_address = acpi_realmode; | 128 | acpi_wakeup_address = virt_to_phys((void *)acpi_realmode); |
115 | } | 129 | } |
116 | 130 | ||
117 | 131 | ||
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c index 479926d9e004..e819362c7068 100644 --- a/arch/x86/kernel/aperture_64.c +++ b/arch/x86/kernel/aperture_64.c | |||
@@ -35,6 +35,18 @@ int fallback_aper_force __initdata; | |||
35 | 35 | ||
36 | int fix_aperture __initdata = 1; | 36 | int fix_aperture __initdata = 1; |
37 | 37 | ||
38 | struct bus_dev_range { | ||
39 | int bus; | ||
40 | int dev_base; | ||
41 | int dev_limit; | ||
42 | }; | ||
43 | |||
44 | static struct bus_dev_range bus_dev_ranges[] __initdata = { | ||
45 | { 0x00, 0x18, 0x20}, | ||
46 | { 0xff, 0x00, 0x20}, | ||
47 | { 0xfe, 0x00, 0x20} | ||
48 | }; | ||
49 | |||
38 | static struct resource gart_resource = { | 50 | static struct resource gart_resource = { |
39 | .name = "GART", | 51 | .name = "GART", |
40 | .flags = IORESOURCE_MEM, | 52 | .flags = IORESOURCE_MEM, |
@@ -55,8 +67,9 @@ static u32 __init allocate_aperture(void) | |||
55 | u32 aper_size; | 67 | u32 aper_size; |
56 | void *p; | 68 | void *p; |
57 | 69 | ||
58 | if (fallback_aper_order > 7) | 70 | /* aper_size should <= 1G */ |
59 | fallback_aper_order = 7; | 71 | if (fallback_aper_order > 5) |
72 | fallback_aper_order = 5; | ||
60 | aper_size = (32 * 1024 * 1024) << fallback_aper_order; | 73 | aper_size = (32 * 1024 * 1024) << fallback_aper_order; |
61 | 74 | ||
62 | /* | 75 | /* |
@@ -65,7 +78,20 @@ static u32 __init allocate_aperture(void) | |||
65 | * memory. Unfortunately we cannot move it up because that would | 78 | * memory. Unfortunately we cannot move it up because that would |
66 | * make the IOMMU useless. | 79 | * make the IOMMU useless. |
67 | */ | 80 | */ |
68 | p = __alloc_bootmem_nopanic(aper_size, aper_size, 0); | 81 | /* |
82 | * using 512M as goal, in case kexec will load kernel_big | ||
83 | * that will do the on position decompress, and could overlap with | ||
84 | * that positon with gart that is used. | ||
85 | * sequende: | ||
86 | * kernel_small | ||
87 | * ==> kexec (with kdump trigger path or previous doesn't shutdown gart) | ||
88 | * ==> kernel_small(gart area become e820_reserved) | ||
89 | * ==> kexec (with kdump trigger path or previous doesn't shutdown gart) | ||
90 | * ==> kerne_big (uncompressed size will be big than 64M or 128M) | ||
91 | * so don't use 512M below as gart iommu, leave the space for kernel | ||
92 | * code for safe | ||
93 | */ | ||
94 | p = __alloc_bootmem_nopanic(aper_size, aper_size, 512ULL<<20); | ||
69 | if (!p || __pa(p)+aper_size > 0xffffffff) { | 95 | if (!p || __pa(p)+aper_size > 0xffffffff) { |
70 | printk(KERN_ERR | 96 | printk(KERN_ERR |
71 | "Cannot allocate aperture memory hole (%p,%uK)\n", | 97 | "Cannot allocate aperture memory hole (%p,%uK)\n", |
@@ -83,69 +109,53 @@ static u32 __init allocate_aperture(void) | |||
83 | return (u32)__pa(p); | 109 | return (u32)__pa(p); |
84 | } | 110 | } |
85 | 111 | ||
86 | static int __init aperture_valid(u64 aper_base, u32 aper_size) | ||
87 | { | ||
88 | if (!aper_base) | ||
89 | return 0; | ||
90 | |||
91 | if (aper_base + aper_size > 0x100000000UL) { | ||
92 | printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n"); | ||
93 | return 0; | ||
94 | } | ||
95 | if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) { | ||
96 | printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n"); | ||
97 | return 0; | ||
98 | } | ||
99 | if (aper_size < 64*1024*1024) { | ||
100 | printk(KERN_ERR "Aperture too small (%d MB)\n", aper_size>>20); | ||
101 | return 0; | ||
102 | } | ||
103 | |||
104 | return 1; | ||
105 | } | ||
106 | 112 | ||
107 | /* Find a PCI capability */ | 113 | /* Find a PCI capability */ |
108 | static __u32 __init find_cap(int num, int slot, int func, int cap) | 114 | static u32 __init find_cap(int bus, int slot, int func, int cap) |
109 | { | 115 | { |
110 | int bytes; | 116 | int bytes; |
111 | u8 pos; | 117 | u8 pos; |
112 | 118 | ||
113 | if (!(read_pci_config_16(num, slot, func, PCI_STATUS) & | 119 | if (!(read_pci_config_16(bus, slot, func, PCI_STATUS) & |
114 | PCI_STATUS_CAP_LIST)) | 120 | PCI_STATUS_CAP_LIST)) |
115 | return 0; | 121 | return 0; |
116 | 122 | ||
117 | pos = read_pci_config_byte(num, slot, func, PCI_CAPABILITY_LIST); | 123 | pos = read_pci_config_byte(bus, slot, func, PCI_CAPABILITY_LIST); |
118 | for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) { | 124 | for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) { |
119 | u8 id; | 125 | u8 id; |
120 | 126 | ||
121 | pos &= ~3; | 127 | pos &= ~3; |
122 | id = read_pci_config_byte(num, slot, func, pos+PCI_CAP_LIST_ID); | 128 | id = read_pci_config_byte(bus, slot, func, pos+PCI_CAP_LIST_ID); |
123 | if (id == 0xff) | 129 | if (id == 0xff) |
124 | break; | 130 | break; |
125 | if (id == cap) | 131 | if (id == cap) |
126 | return pos; | 132 | return pos; |
127 | pos = read_pci_config_byte(num, slot, func, | 133 | pos = read_pci_config_byte(bus, slot, func, |
128 | pos+PCI_CAP_LIST_NEXT); | 134 | pos+PCI_CAP_LIST_NEXT); |
129 | } | 135 | } |
130 | return 0; | 136 | return 0; |
131 | } | 137 | } |
132 | 138 | ||
133 | /* Read a standard AGPv3 bridge header */ | 139 | /* Read a standard AGPv3 bridge header */ |
134 | static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | 140 | static u32 __init read_agp(int bus, int slot, int func, int cap, u32 *order) |
135 | { | 141 | { |
136 | u32 apsize; | 142 | u32 apsize; |
137 | u32 apsizereg; | 143 | u32 apsizereg; |
138 | int nbits; | 144 | int nbits; |
139 | u32 aper_low, aper_hi; | 145 | u32 aper_low, aper_hi; |
140 | u64 aper; | 146 | u64 aper; |
147 | u32 old_order; | ||
141 | 148 | ||
142 | printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", num, slot, func); | 149 | printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", bus, slot, func); |
143 | apsizereg = read_pci_config_16(num, slot, func, cap + 0x14); | 150 | apsizereg = read_pci_config_16(bus, slot, func, cap + 0x14); |
144 | if (apsizereg == 0xffffffff) { | 151 | if (apsizereg == 0xffffffff) { |
145 | printk(KERN_ERR "APSIZE in AGP bridge unreadable\n"); | 152 | printk(KERN_ERR "APSIZE in AGP bridge unreadable\n"); |
146 | return 0; | 153 | return 0; |
147 | } | 154 | } |
148 | 155 | ||
156 | /* old_order could be the value from NB gart setting */ | ||
157 | old_order = *order; | ||
158 | |||
149 | apsize = apsizereg & 0xfff; | 159 | apsize = apsizereg & 0xfff; |
150 | /* Some BIOS use weird encodings not in the AGPv3 table. */ | 160 | /* Some BIOS use weird encodings not in the AGPv3 table. */ |
151 | if (apsize & 0xff) | 161 | if (apsize & 0xff) |
@@ -155,14 +165,26 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | |||
155 | if ((int)*order < 0) /* < 32MB */ | 165 | if ((int)*order < 0) /* < 32MB */ |
156 | *order = 0; | 166 | *order = 0; |
157 | 167 | ||
158 | aper_low = read_pci_config(num, slot, func, 0x10); | 168 | aper_low = read_pci_config(bus, slot, func, 0x10); |
159 | aper_hi = read_pci_config(num, slot, func, 0x14); | 169 | aper_hi = read_pci_config(bus, slot, func, 0x14); |
160 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); | 170 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); |
161 | 171 | ||
172 | /* | ||
173 | * On some sick chips, APSIZE is 0. It means it wants 4G | ||
174 | * so let double check that order, and lets trust AMD NB settings: | ||
175 | */ | ||
176 | printk(KERN_INFO "Aperture from AGP @ %Lx old size %u MB\n", | ||
177 | aper, 32 << old_order); | ||
178 | if (aper + (32ULL<<(20 + *order)) > 0x100000000ULL) { | ||
179 | printk(KERN_INFO "Aperture size %u MB (APSIZE %x) is not right, using settings from NB\n", | ||
180 | 32 << *order, apsizereg); | ||
181 | *order = old_order; | ||
182 | } | ||
183 | |||
162 | printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", | 184 | printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", |
163 | aper, 32 << *order, apsizereg); | 185 | aper, 32 << *order, apsizereg); |
164 | 186 | ||
165 | if (!aperture_valid(aper, (32*1024*1024) << *order)) | 187 | if (!aperture_valid(aper, (32*1024*1024) << *order, 32<<20)) |
166 | return 0; | 188 | return 0; |
167 | return (u32)aper; | 189 | return (u32)aper; |
168 | } | 190 | } |
@@ -180,17 +202,17 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | |||
180 | * the AGP bridges should be always an own bus on the HT hierarchy, | 202 | * the AGP bridges should be always an own bus on the HT hierarchy, |
181 | * but do it here for future safety. | 203 | * but do it here for future safety. |
182 | */ | 204 | */ |
183 | static __u32 __init search_agp_bridge(u32 *order, int *valid_agp) | 205 | static u32 __init search_agp_bridge(u32 *order, int *valid_agp) |
184 | { | 206 | { |
185 | int num, slot, func; | 207 | int bus, slot, func; |
186 | 208 | ||
187 | /* Poor man's PCI discovery */ | 209 | /* Poor man's PCI discovery */ |
188 | for (num = 0; num < 256; num++) { | 210 | for (bus = 0; bus < 256; bus++) { |
189 | for (slot = 0; slot < 32; slot++) { | 211 | for (slot = 0; slot < 32; slot++) { |
190 | for (func = 0; func < 8; func++) { | 212 | for (func = 0; func < 8; func++) { |
191 | u32 class, cap; | 213 | u32 class, cap; |
192 | u8 type; | 214 | u8 type; |
193 | class = read_pci_config(num, slot, func, | 215 | class = read_pci_config(bus, slot, func, |
194 | PCI_CLASS_REVISION); | 216 | PCI_CLASS_REVISION); |
195 | if (class == 0xffffffff) | 217 | if (class == 0xffffffff) |
196 | break; | 218 | break; |
@@ -199,17 +221,17 @@ static __u32 __init search_agp_bridge(u32 *order, int *valid_agp) | |||
199 | case PCI_CLASS_BRIDGE_HOST: | 221 | case PCI_CLASS_BRIDGE_HOST: |
200 | case PCI_CLASS_BRIDGE_OTHER: /* needed? */ | 222 | case PCI_CLASS_BRIDGE_OTHER: /* needed? */ |
201 | /* AGP bridge? */ | 223 | /* AGP bridge? */ |
202 | cap = find_cap(num, slot, func, | 224 | cap = find_cap(bus, slot, func, |
203 | PCI_CAP_ID_AGP); | 225 | PCI_CAP_ID_AGP); |
204 | if (!cap) | 226 | if (!cap) |
205 | break; | 227 | break; |
206 | *valid_agp = 1; | 228 | *valid_agp = 1; |
207 | return read_agp(num, slot, func, cap, | 229 | return read_agp(bus, slot, func, cap, |
208 | order); | 230 | order); |
209 | } | 231 | } |
210 | 232 | ||
211 | /* No multi-function device? */ | 233 | /* No multi-function device? */ |
212 | type = read_pci_config_byte(num, slot, func, | 234 | type = read_pci_config_byte(bus, slot, func, |
213 | PCI_HEADER_TYPE); | 235 | PCI_HEADER_TYPE); |
214 | if (!(type & 0x80)) | 236 | if (!(type & 0x80)) |
215 | break; | 237 | break; |
@@ -249,36 +271,50 @@ void __init early_gart_iommu_check(void) | |||
249 | * or BIOS forget to put that in reserved. | 271 | * or BIOS forget to put that in reserved. |
250 | * try to update e820 to make that region as reserved. | 272 | * try to update e820 to make that region as reserved. |
251 | */ | 273 | */ |
252 | int fix, num; | 274 | int i, fix, slot; |
253 | u32 ctl; | 275 | u32 ctl; |
254 | u32 aper_size = 0, aper_order = 0, last_aper_order = 0; | 276 | u32 aper_size = 0, aper_order = 0, last_aper_order = 0; |
255 | u64 aper_base = 0, last_aper_base = 0; | 277 | u64 aper_base = 0, last_aper_base = 0; |
256 | int aper_enabled = 0, last_aper_enabled = 0; | 278 | int aper_enabled = 0, last_aper_enabled = 0, last_valid = 0; |
257 | 279 | ||
258 | if (!early_pci_allowed()) | 280 | if (!early_pci_allowed()) |
259 | return; | 281 | return; |
260 | 282 | ||
283 | /* This is mostly duplicate of iommu_hole_init */ | ||
261 | fix = 0; | 284 | fix = 0; |
262 | for (num = 24; num < 32; num++) { | 285 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
263 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 286 | int bus; |
264 | continue; | 287 | int dev_base, dev_limit; |
265 | 288 | ||
266 | ctl = read_pci_config(0, num, 3, 0x90); | 289 | bus = bus_dev_ranges[i].bus; |
267 | aper_enabled = ctl & 1; | 290 | dev_base = bus_dev_ranges[i].dev_base; |
268 | aper_order = (ctl >> 1) & 7; | 291 | dev_limit = bus_dev_ranges[i].dev_limit; |
269 | aper_size = (32 * 1024 * 1024) << aper_order; | 292 | |
270 | aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff; | 293 | for (slot = dev_base; slot < dev_limit; slot++) { |
271 | aper_base <<= 25; | 294 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
272 | 295 | continue; | |
273 | if ((last_aper_order && aper_order != last_aper_order) || | 296 | |
274 | (last_aper_base && aper_base != last_aper_base) || | 297 | ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL); |
275 | (last_aper_enabled && aper_enabled != last_aper_enabled)) { | 298 | aper_enabled = ctl & AMD64_GARTEN; |
276 | fix = 1; | 299 | aper_order = (ctl >> 1) & 7; |
277 | break; | 300 | aper_size = (32 * 1024 * 1024) << aper_order; |
301 | aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff; | ||
302 | aper_base <<= 25; | ||
303 | |||
304 | if (last_valid) { | ||
305 | if ((aper_order != last_aper_order) || | ||
306 | (aper_base != last_aper_base) || | ||
307 | (aper_enabled != last_aper_enabled)) { | ||
308 | fix = 1; | ||
309 | break; | ||
310 | } | ||
311 | } | ||
312 | |||
313 | last_aper_order = aper_order; | ||
314 | last_aper_base = aper_base; | ||
315 | last_aper_enabled = aper_enabled; | ||
316 | last_valid = 1; | ||
278 | } | 317 | } |
279 | last_aper_order = aper_order; | ||
280 | last_aper_base = aper_base; | ||
281 | last_aper_enabled = aper_enabled; | ||
282 | } | 318 | } |
283 | 319 | ||
284 | if (!fix && !aper_enabled) | 320 | if (!fix && !aper_enabled) |
@@ -290,32 +326,46 @@ void __init early_gart_iommu_check(void) | |||
290 | if (gart_fix_e820 && !fix && aper_enabled) { | 326 | if (gart_fix_e820 && !fix && aper_enabled) { |
291 | if (e820_any_mapped(aper_base, aper_base + aper_size, | 327 | if (e820_any_mapped(aper_base, aper_base + aper_size, |
292 | E820_RAM)) { | 328 | E820_RAM)) { |
293 | /* reserved it, so we can resuse it in second kernel */ | 329 | /* reserve it, so we can reuse it in second kernel */ |
294 | printk(KERN_INFO "update e820 for GART\n"); | 330 | printk(KERN_INFO "update e820 for GART\n"); |
295 | add_memory_region(aper_base, aper_size, E820_RESERVED); | 331 | add_memory_region(aper_base, aper_size, E820_RESERVED); |
296 | update_e820(); | 332 | update_e820(); |
297 | } | 333 | } |
298 | return; | ||
299 | } | 334 | } |
300 | 335 | ||
336 | if (!fix) | ||
337 | return; | ||
338 | |||
301 | /* different nodes have different setting, disable them all at first*/ | 339 | /* different nodes have different setting, disable them all at first*/ |
302 | for (num = 24; num < 32; num++) { | 340 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
303 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 341 | int bus; |
304 | continue; | 342 | int dev_base, dev_limit; |
343 | |||
344 | bus = bus_dev_ranges[i].bus; | ||
345 | dev_base = bus_dev_ranges[i].dev_base; | ||
346 | dev_limit = bus_dev_ranges[i].dev_limit; | ||
347 | |||
348 | for (slot = dev_base; slot < dev_limit; slot++) { | ||
349 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) | ||
350 | continue; | ||
305 | 351 | ||
306 | ctl = read_pci_config(0, num, 3, 0x90); | 352 | ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL); |
307 | ctl &= ~1; | 353 | ctl &= ~AMD64_GARTEN; |
308 | write_pci_config(0, num, 3, 0x90, ctl); | 354 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, ctl); |
355 | } | ||
309 | } | 356 | } |
310 | 357 | ||
311 | } | 358 | } |
312 | 359 | ||
360 | static int __initdata printed_gart_size_msg; | ||
361 | |||
313 | void __init gart_iommu_hole_init(void) | 362 | void __init gart_iommu_hole_init(void) |
314 | { | 363 | { |
364 | u32 agp_aper_base = 0, agp_aper_order = 0; | ||
315 | u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0; | 365 | u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0; |
316 | u64 aper_base, last_aper_base = 0; | 366 | u64 aper_base, last_aper_base = 0; |
317 | int fix, num, valid_agp = 0; | 367 | int fix, slot, valid_agp = 0; |
318 | int node; | 368 | int i, node; |
319 | 369 | ||
320 | if (gart_iommu_aperture_disabled || !fix_aperture || | 370 | if (gart_iommu_aperture_disabled || !fix_aperture || |
321 | !early_pci_allowed()) | 371 | !early_pci_allowed()) |
@@ -323,38 +373,63 @@ void __init gart_iommu_hole_init(void) | |||
323 | 373 | ||
324 | printk(KERN_INFO "Checking aperture...\n"); | 374 | printk(KERN_INFO "Checking aperture...\n"); |
325 | 375 | ||
376 | if (!fallback_aper_force) | ||
377 | agp_aper_base = search_agp_bridge(&agp_aper_order, &valid_agp); | ||
378 | |||
326 | fix = 0; | 379 | fix = 0; |
327 | node = 0; | 380 | node = 0; |
328 | for (num = 24; num < 32; num++) { | 381 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
329 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 382 | int bus; |
330 | continue; | 383 | int dev_base, dev_limit; |
331 | 384 | ||
332 | iommu_detected = 1; | 385 | bus = bus_dev_ranges[i].bus; |
333 | gart_iommu_aperture = 1; | 386 | dev_base = bus_dev_ranges[i].dev_base; |
334 | 387 | dev_limit = bus_dev_ranges[i].dev_limit; | |
335 | aper_order = (read_pci_config(0, num, 3, 0x90) >> 1) & 7; | 388 | |
336 | aper_size = (32 * 1024 * 1024) << aper_order; | 389 | for (slot = dev_base; slot < dev_limit; slot++) { |
337 | aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff; | 390 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
338 | aper_base <<= 25; | 391 | continue; |
339 | 392 | ||
340 | printk(KERN_INFO "Node %d: aperture @ %Lx size %u MB\n", | 393 | iommu_detected = 1; |
341 | node, aper_base, aper_size >> 20); | 394 | gart_iommu_aperture = 1; |
342 | node++; | 395 | |
343 | 396 | aper_order = (read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL) >> 1) & 7; | |
344 | if (!aperture_valid(aper_base, aper_size)) { | 397 | aper_size = (32 * 1024 * 1024) << aper_order; |
345 | fix = 1; | 398 | aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff; |
346 | break; | 399 | aper_base <<= 25; |
347 | } | 400 | |
401 | printk(KERN_INFO "Node %d: aperture @ %Lx size %u MB\n", | ||
402 | node, aper_base, aper_size >> 20); | ||
403 | node++; | ||
404 | |||
405 | if (!aperture_valid(aper_base, aper_size, 64<<20)) { | ||
406 | if (valid_agp && agp_aper_base && | ||
407 | agp_aper_base == aper_base && | ||
408 | agp_aper_order == aper_order) { | ||
409 | /* the same between two setting from NB and agp */ | ||
410 | if (!no_iommu && end_pfn > MAX_DMA32_PFN && !printed_gart_size_msg) { | ||
411 | printk(KERN_ERR "you are using iommu with agp, but GART size is less than 64M\n"); | ||
412 | printk(KERN_ERR "please increase GART size in your BIOS setup\n"); | ||
413 | printk(KERN_ERR "if BIOS doesn't have that option, contact your HW vendor!\n"); | ||
414 | printed_gart_size_msg = 1; | ||
415 | } | ||
416 | } else { | ||
417 | fix = 1; | ||
418 | goto out; | ||
419 | } | ||
420 | } | ||
348 | 421 | ||
349 | if ((last_aper_order && aper_order != last_aper_order) || | 422 | if ((last_aper_order && aper_order != last_aper_order) || |
350 | (last_aper_base && aper_base != last_aper_base)) { | 423 | (last_aper_base && aper_base != last_aper_base)) { |
351 | fix = 1; | 424 | fix = 1; |
352 | break; | 425 | goto out; |
426 | } | ||
427 | last_aper_order = aper_order; | ||
428 | last_aper_base = aper_base; | ||
353 | } | 429 | } |
354 | last_aper_order = aper_order; | ||
355 | last_aper_base = aper_base; | ||
356 | } | 430 | } |
357 | 431 | ||
432 | out: | ||
358 | if (!fix && !fallback_aper_force) { | 433 | if (!fix && !fallback_aper_force) { |
359 | if (last_aper_base) { | 434 | if (last_aper_base) { |
360 | unsigned long n = (32 * 1024 * 1024) << last_aper_order; | 435 | unsigned long n = (32 * 1024 * 1024) << last_aper_order; |
@@ -364,8 +439,10 @@ void __init gart_iommu_hole_init(void) | |||
364 | return; | 439 | return; |
365 | } | 440 | } |
366 | 441 | ||
367 | if (!fallback_aper_force) | 442 | if (!fallback_aper_force) { |
368 | aper_alloc = search_agp_bridge(&aper_order, &valid_agp); | 443 | aper_alloc = agp_aper_base; |
444 | aper_order = agp_aper_order; | ||
445 | } | ||
369 | 446 | ||
370 | if (aper_alloc) { | 447 | if (aper_alloc) { |
371 | /* Got the aperture from the AGP bridge */ | 448 | /* Got the aperture from the AGP bridge */ |
@@ -401,16 +478,24 @@ void __init gart_iommu_hole_init(void) | |||
401 | } | 478 | } |
402 | 479 | ||
403 | /* Fix up the north bridges */ | 480 | /* Fix up the north bridges */ |
404 | for (num = 24; num < 32; num++) { | 481 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
405 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 482 | int bus; |
406 | continue; | 483 | int dev_base, dev_limit; |
407 | 484 | ||
408 | /* | 485 | bus = bus_dev_ranges[i].bus; |
409 | * Don't enable translation yet. That is done later. | 486 | dev_base = bus_dev_ranges[i].dev_base; |
410 | * Assume this BIOS didn't initialise the GART so | 487 | dev_limit = bus_dev_ranges[i].dev_limit; |
411 | * just overwrite all previous bits | 488 | for (slot = dev_base; slot < dev_limit; slot++) { |
412 | */ | 489 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
413 | write_pci_config(0, num, 3, 0x90, aper_order<<1); | 490 | continue; |
414 | write_pci_config(0, num, 3, 0x94, aper_alloc>>25); | 491 | |
492 | /* Don't enable translation yet. That is done later. | ||
493 | Assume this BIOS didn't initialise the GART so | ||
494 | just overwrite all previous bits */ | ||
495 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, aper_order << 1); | ||
496 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE, aper_alloc >> 25); | ||
497 | } | ||
415 | } | 498 | } |
499 | |||
500 | set_up_gart_resume(aper_order, aper_alloc); | ||
416 | } | 501 | } |
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 4b99b1bdeb6c..45d8da405ad9 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -64,9 +64,8 @@ static int enable_local_apic __initdata; | |||
64 | 64 | ||
65 | /* Local APIC timer verification ok */ | 65 | /* Local APIC timer verification ok */ |
66 | static int local_apic_timer_verify_ok; | 66 | static int local_apic_timer_verify_ok; |
67 | /* Disable local APIC timer from the kernel commandline or via dmi quirk | 67 | /* Disable local APIC timer from the kernel commandline or via dmi quirk */ |
68 | or using CPU MSR check */ | 68 | static int local_apic_timer_disabled; |
69 | int local_apic_timer_disabled; | ||
70 | /* Local APIC timer works in C2 */ | 69 | /* Local APIC timer works in C2 */ |
71 | int local_apic_timer_c2_ok; | 70 | int local_apic_timer_c2_ok; |
72 | EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok); | 71 | EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok); |
@@ -1154,9 +1153,6 @@ static int __init detect_init_APIC(void) | |||
1154 | if (l & MSR_IA32_APICBASE_ENABLE) | 1153 | if (l & MSR_IA32_APICBASE_ENABLE) |
1155 | mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; | 1154 | mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; |
1156 | 1155 | ||
1157 | if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED) | ||
1158 | nmi_watchdog = NMI_LOCAL_APIC; | ||
1159 | |||
1160 | printk(KERN_INFO "Found and enabled local APIC!\n"); | 1156 | printk(KERN_INFO "Found and enabled local APIC!\n"); |
1161 | 1157 | ||
1162 | apic_pm_activate(); | 1158 | apic_pm_activate(); |
@@ -1269,6 +1265,10 @@ int __init APIC_init_uniprocessor(void) | |||
1269 | 1265 | ||
1270 | setup_local_APIC(); | 1266 | setup_local_APIC(); |
1271 | 1267 | ||
1268 | #ifdef CONFIG_X86_IO_APIC | ||
1269 | if (!smp_found_config || skip_ioapic_setup || !nr_ioapics) | ||
1270 | #endif | ||
1271 | localise_nmi_watchdog(); | ||
1272 | end_local_APIC_setup(); | 1272 | end_local_APIC_setup(); |
1273 | #ifdef CONFIG_X86_IO_APIC | 1273 | #ifdef CONFIG_X86_IO_APIC |
1274 | if (smp_found_config) | 1274 | if (smp_found_config) |
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 5910020c3f24..3ef7752aa8e5 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <mach_ipi.h> | 43 | #include <mach_ipi.h> |
44 | #include <mach_apic.h> | 44 | #include <mach_apic.h> |
45 | 45 | ||
46 | int disable_apic_timer __cpuinitdata; | 46 | static int disable_apic_timer __cpuinitdata; |
47 | static int apic_calibrate_pmtmr __initdata; | 47 | static int apic_calibrate_pmtmr __initdata; |
48 | int disable_apic; | 48 | int disable_apic; |
49 | 49 | ||
@@ -422,32 +422,8 @@ void __init setup_boot_APIC_clock(void) | |||
422 | setup_APIC_timer(); | 422 | setup_APIC_timer(); |
423 | } | 423 | } |
424 | 424 | ||
425 | /* | ||
426 | * AMD C1E enabled CPUs have a real nasty problem: Some BIOSes set the | ||
427 | * C1E flag only in the secondary CPU, so when we detect the wreckage | ||
428 | * we already have enabled the boot CPU local apic timer. Check, if | ||
429 | * disable_apic_timer is set and the DUMMY flag is cleared. If yes, | ||
430 | * set the DUMMY flag again and force the broadcast mode in the | ||
431 | * clockevents layer. | ||
432 | */ | ||
433 | static void __cpuinit check_boot_apic_timer_broadcast(void) | ||
434 | { | ||
435 | if (!disable_apic_timer || | ||
436 | (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY)) | ||
437 | return; | ||
438 | |||
439 | printk(KERN_INFO "AMD C1E detected late. Force timer broadcast.\n"); | ||
440 | lapic_clockevent.features |= CLOCK_EVT_FEAT_DUMMY; | ||
441 | |||
442 | local_irq_enable(); | ||
443 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, | ||
444 | &boot_cpu_physical_apicid); | ||
445 | local_irq_disable(); | ||
446 | } | ||
447 | |||
448 | void __cpuinit setup_secondary_APIC_clock(void) | 425 | void __cpuinit setup_secondary_APIC_clock(void) |
449 | { | 426 | { |
450 | check_boot_apic_timer_broadcast(); | ||
451 | setup_APIC_timer(); | 427 | setup_APIC_timer(); |
452 | } | 428 | } |
453 | 429 | ||
@@ -534,7 +510,7 @@ int setup_profiling_timer(unsigned int multiplier) | |||
534 | */ | 510 | */ |
535 | void clear_local_APIC(void) | 511 | void clear_local_APIC(void) |
536 | { | 512 | { |
537 | int maxlvt = lapic_get_maxlvt(); | 513 | int maxlvt; |
538 | u32 v; | 514 | u32 v; |
539 | 515 | ||
540 | /* APIC hasn't been mapped yet */ | 516 | /* APIC hasn't been mapped yet */ |
@@ -875,7 +851,7 @@ static int __init detect_init_APIC(void) | |||
875 | 851 | ||
876 | void __init early_init_lapic_mapping(void) | 852 | void __init early_init_lapic_mapping(void) |
877 | { | 853 | { |
878 | unsigned long apic_phys; | 854 | unsigned long phys_addr; |
879 | 855 | ||
880 | /* | 856 | /* |
881 | * If no local APIC can be found then go out | 857 | * If no local APIC can be found then go out |
@@ -884,11 +860,11 @@ void __init early_init_lapic_mapping(void) | |||
884 | if (!smp_found_config) | 860 | if (!smp_found_config) |
885 | return; | 861 | return; |
886 | 862 | ||
887 | apic_phys = mp_lapic_addr; | 863 | phys_addr = mp_lapic_addr; |
888 | 864 | ||
889 | set_fixmap_nocache(FIX_APIC_BASE, apic_phys); | 865 | set_fixmap_nocache(FIX_APIC_BASE, phys_addr); |
890 | apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", | 866 | apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", |
891 | APIC_BASE, apic_phys); | 867 | APIC_BASE, phys_addr); |
892 | 868 | ||
893 | /* | 869 | /* |
894 | * Fetch the APIC ID of the BSP in case we have a | 870 | * Fetch the APIC ID of the BSP in case we have a |
@@ -954,6 +930,8 @@ int __init APIC_init_uniprocessor(void) | |||
954 | if (!skip_ioapic_setup && nr_ioapics) | 930 | if (!skip_ioapic_setup && nr_ioapics) |
955 | enable_IO_APIC(); | 931 | enable_IO_APIC(); |
956 | 932 | ||
933 | if (!smp_found_config || skip_ioapic_setup || !nr_ioapics) | ||
934 | localise_nmi_watchdog(); | ||
957 | end_local_APIC_setup(); | 935 | end_local_APIC_setup(); |
958 | 936 | ||
959 | if (smp_found_config && !skip_ioapic_setup && nr_ioapics) | 937 | if (smp_found_config && !skip_ioapic_setup && nr_ioapics) |
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index bf9290e29013..00e6d1370954 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -228,6 +228,7 @@ | |||
228 | #include <linux/suspend.h> | 228 | #include <linux/suspend.h> |
229 | #include <linux/kthread.h> | 229 | #include <linux/kthread.h> |
230 | #include <linux/jiffies.h> | 230 | #include <linux/jiffies.h> |
231 | #include <linux/smp_lock.h> | ||
231 | 232 | ||
232 | #include <asm/system.h> | 233 | #include <asm/system.h> |
233 | #include <asm/uaccess.h> | 234 | #include <asm/uaccess.h> |
@@ -1149,7 +1150,7 @@ static void queue_event(apm_event_t event, struct apm_user *sender) | |||
1149 | as->event_tail = 0; | 1150 | as->event_tail = 0; |
1150 | } | 1151 | } |
1151 | as->events[as->event_head] = event; | 1152 | as->events[as->event_head] = event; |
1152 | if ((!as->suser) || (!as->writer)) | 1153 | if (!as->suser || !as->writer) |
1153 | continue; | 1154 | continue; |
1154 | switch (event) { | 1155 | switch (event) { |
1155 | case APM_SYS_SUSPEND: | 1156 | case APM_SYS_SUSPEND: |
@@ -1396,7 +1397,7 @@ static void apm_mainloop(void) | |||
1396 | 1397 | ||
1397 | static int check_apm_user(struct apm_user *as, const char *func) | 1398 | static int check_apm_user(struct apm_user *as, const char *func) |
1398 | { | 1399 | { |
1399 | if ((as == NULL) || (as->magic != APM_BIOS_MAGIC)) { | 1400 | if (as == NULL || as->magic != APM_BIOS_MAGIC) { |
1400 | printk(KERN_ERR "apm: %s passed bad filp\n", func); | 1401 | printk(KERN_ERR "apm: %s passed bad filp\n", func); |
1401 | return 1; | 1402 | return 1; |
1402 | } | 1403 | } |
@@ -1459,18 +1460,19 @@ static unsigned int do_poll(struct file *fp, poll_table *wait) | |||
1459 | return 0; | 1460 | return 0; |
1460 | } | 1461 | } |
1461 | 1462 | ||
1462 | static int do_ioctl(struct inode *inode, struct file *filp, | 1463 | static long do_ioctl(struct file *filp, u_int cmd, u_long arg) |
1463 | u_int cmd, u_long arg) | ||
1464 | { | 1464 | { |
1465 | struct apm_user *as; | 1465 | struct apm_user *as; |
1466 | int ret; | ||
1466 | 1467 | ||
1467 | as = filp->private_data; | 1468 | as = filp->private_data; |
1468 | if (check_apm_user(as, "ioctl")) | 1469 | if (check_apm_user(as, "ioctl")) |
1469 | return -EIO; | 1470 | return -EIO; |
1470 | if ((!as->suser) || (!as->writer)) | 1471 | if (!as->suser || !as->writer) |
1471 | return -EPERM; | 1472 | return -EPERM; |
1472 | switch (cmd) { | 1473 | switch (cmd) { |
1473 | case APM_IOC_STANDBY: | 1474 | case APM_IOC_STANDBY: |
1475 | lock_kernel(); | ||
1474 | if (as->standbys_read > 0) { | 1476 | if (as->standbys_read > 0) { |
1475 | as->standbys_read--; | 1477 | as->standbys_read--; |
1476 | as->standbys_pending--; | 1478 | as->standbys_pending--; |
@@ -1479,8 +1481,10 @@ static int do_ioctl(struct inode *inode, struct file *filp, | |||
1479 | queue_event(APM_USER_STANDBY, as); | 1481 | queue_event(APM_USER_STANDBY, as); |
1480 | if (standbys_pending <= 0) | 1482 | if (standbys_pending <= 0) |
1481 | standby(); | 1483 | standby(); |
1484 | unlock_kernel(); | ||
1482 | break; | 1485 | break; |
1483 | case APM_IOC_SUSPEND: | 1486 | case APM_IOC_SUSPEND: |
1487 | lock_kernel(); | ||
1484 | if (as->suspends_read > 0) { | 1488 | if (as->suspends_read > 0) { |
1485 | as->suspends_read--; | 1489 | as->suspends_read--; |
1486 | as->suspends_pending--; | 1490 | as->suspends_pending--; |
@@ -1488,16 +1492,17 @@ static int do_ioctl(struct inode *inode, struct file *filp, | |||
1488 | } else | 1492 | } else |
1489 | queue_event(APM_USER_SUSPEND, as); | 1493 | queue_event(APM_USER_SUSPEND, as); |
1490 | if (suspends_pending <= 0) { | 1494 | if (suspends_pending <= 0) { |
1491 | return suspend(1); | 1495 | ret = suspend(1); |
1492 | } else { | 1496 | } else { |
1493 | as->suspend_wait = 1; | 1497 | as->suspend_wait = 1; |
1494 | wait_event_interruptible(apm_suspend_waitqueue, | 1498 | wait_event_interruptible(apm_suspend_waitqueue, |
1495 | as->suspend_wait == 0); | 1499 | as->suspend_wait == 0); |
1496 | return as->suspend_result; | 1500 | ret = as->suspend_result; |
1497 | } | 1501 | } |
1498 | break; | 1502 | unlock_kernel(); |
1503 | return ret; | ||
1499 | default: | 1504 | default: |
1500 | return -EINVAL; | 1505 | return -ENOTTY; |
1501 | } | 1506 | } |
1502 | return 0; | 1507 | return 0; |
1503 | } | 1508 | } |
@@ -1860,7 +1865,7 @@ static const struct file_operations apm_bios_fops = { | |||
1860 | .owner = THIS_MODULE, | 1865 | .owner = THIS_MODULE, |
1861 | .read = do_read, | 1866 | .read = do_read, |
1862 | .poll = do_poll, | 1867 | .poll = do_poll, |
1863 | .ioctl = do_ioctl, | 1868 | .unlocked_ioctl = do_ioctl, |
1864 | .open = do_open, | 1869 | .open = do_open, |
1865 | .release = do_release, | 1870 | .release = do_release, |
1866 | }; | 1871 | }; |
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index a0c6f8190887..65b1be5fe9ce 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile | |||
@@ -6,11 +6,15 @@ obj-y := intel_cacheinfo.o addon_cpuid_features.o | |||
6 | obj-y += proc.o feature_names.o | 6 | obj-y += proc.o feature_names.o |
7 | 7 | ||
8 | obj-$(CONFIG_X86_32) += common.o bugs.o | 8 | obj-$(CONFIG_X86_32) += common.o bugs.o |
9 | obj-$(CONFIG_X86_64) += bugs_64.o | ||
9 | obj-$(CONFIG_X86_32) += amd.o | 10 | obj-$(CONFIG_X86_32) += amd.o |
11 | obj-$(CONFIG_X86_64) += amd_64.o | ||
10 | obj-$(CONFIG_X86_32) += cyrix.o | 12 | obj-$(CONFIG_X86_32) += cyrix.o |
11 | obj-$(CONFIG_X86_32) += centaur.o | 13 | obj-$(CONFIG_X86_32) += centaur.o |
14 | obj-$(CONFIG_X86_64) += centaur_64.o | ||
12 | obj-$(CONFIG_X86_32) += transmeta.o | 15 | obj-$(CONFIG_X86_32) += transmeta.o |
13 | obj-$(CONFIG_X86_32) += intel.o | 16 | obj-$(CONFIG_X86_32) += intel.o |
17 | obj-$(CONFIG_X86_64) += intel_64.o | ||
14 | obj-$(CONFIG_X86_32) += umc.o | 18 | obj-$(CONFIG_X86_32) += umc.o |
15 | 19 | ||
16 | obj-$(CONFIG_X86_MCE) += mcheck/ | 20 | obj-$(CONFIG_X86_MCE) += mcheck/ |
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index c2e1ce33c7cb..84a8220a6072 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c | |||
@@ -1,9 +1,7 @@ | |||
1 | |||
2 | /* | 1 | /* |
3 | * Routines to indentify additional cpu features that are scattered in | 2 | * Routines to indentify additional cpu features that are scattered in |
4 | * cpuid space. | 3 | * cpuid space. |
5 | */ | 4 | */ |
6 | |||
7 | #include <linux/cpu.h> | 5 | #include <linux/cpu.h> |
8 | 6 | ||
9 | #include <asm/pat.h> | 7 | #include <asm/pat.h> |
@@ -53,19 +51,20 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) | |||
53 | #ifdef CONFIG_X86_PAT | 51 | #ifdef CONFIG_X86_PAT |
54 | void __cpuinit validate_pat_support(struct cpuinfo_x86 *c) | 52 | void __cpuinit validate_pat_support(struct cpuinfo_x86 *c) |
55 | { | 53 | { |
54 | if (!cpu_has_pat) | ||
55 | pat_disable("PAT not supported by CPU."); | ||
56 | |||
56 | switch (c->x86_vendor) { | 57 | switch (c->x86_vendor) { |
57 | case X86_VENDOR_AMD: | ||
58 | if (c->x86 >= 0xf && c->x86 <= 0x11) | ||
59 | return; | ||
60 | break; | ||
61 | case X86_VENDOR_INTEL: | 58 | case X86_VENDOR_INTEL: |
62 | if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15)) | 59 | if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15)) |
63 | return; | 60 | return; |
64 | break; | 61 | break; |
62 | case X86_VENDOR_AMD: | ||
63 | case X86_VENDOR_CENTAUR: | ||
64 | case X86_VENDOR_TRANSMETA: | ||
65 | return; | ||
65 | } | 66 | } |
66 | 67 | ||
67 | pat_disable(cpu_has_pat ? | 68 | pat_disable("PAT disabled. Not yet verified on this CPU type."); |
68 | "PAT disabled. Not yet verified on this CPU type." : | ||
69 | "PAT not supported by CPU."); | ||
70 | } | 69 | } |
71 | #endif | 70 | #endif |
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 245866828294..81a07ca65d44 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -24,43 +24,6 @@ | |||
24 | extern void vide(void); | 24 | extern void vide(void); |
25 | __asm__(".align 4\nvide: ret"); | 25 | __asm__(".align 4\nvide: ret"); |
26 | 26 | ||
27 | #ifdef CONFIG_X86_LOCAL_APIC | ||
28 | #define ENABLE_C1E_MASK 0x18000000 | ||
29 | #define CPUID_PROCESSOR_SIGNATURE 1 | ||
30 | #define CPUID_XFAM 0x0ff00000 | ||
31 | #define CPUID_XFAM_K8 0x00000000 | ||
32 | #define CPUID_XFAM_10H 0x00100000 | ||
33 | #define CPUID_XFAM_11H 0x00200000 | ||
34 | #define CPUID_XMOD 0x000f0000 | ||
35 | #define CPUID_XMOD_REV_F 0x00040000 | ||
36 | |||
37 | /* AMD systems with C1E don't have a working lAPIC timer. Check for that. */ | ||
38 | static __cpuinit int amd_apic_timer_broken(void) | ||
39 | { | ||
40 | u32 lo, hi; | ||
41 | u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE); | ||
42 | switch (eax & CPUID_XFAM) { | ||
43 | case CPUID_XFAM_K8: | ||
44 | if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F) | ||
45 | break; | ||
46 | case CPUID_XFAM_10H: | ||
47 | case CPUID_XFAM_11H: | ||
48 | rdmsr(MSR_K8_ENABLE_C1E, lo, hi); | ||
49 | if (lo & ENABLE_C1E_MASK) { | ||
50 | if (smp_processor_id() != boot_cpu_physical_apicid) | ||
51 | printk(KERN_INFO "AMD C1E detected late. " | ||
52 | " Force timer broadcast.\n"); | ||
53 | return 1; | ||
54 | } | ||
55 | break; | ||
56 | default: | ||
57 | /* err on the side of caution */ | ||
58 | return 1; | ||
59 | } | ||
60 | return 0; | ||
61 | } | ||
62 | #endif | ||
63 | |||
64 | int force_mwait __cpuinitdata; | 27 | int force_mwait __cpuinitdata; |
65 | 28 | ||
66 | static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) | 29 | static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) |
@@ -297,11 +260,6 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
297 | num_cache_leaves = 3; | 260 | num_cache_leaves = 3; |
298 | } | 261 | } |
299 | 262 | ||
300 | #ifdef CONFIG_X86_LOCAL_APIC | ||
301 | if (amd_apic_timer_broken()) | ||
302 | local_apic_timer_disabled = 1; | ||
303 | #endif | ||
304 | |||
305 | /* K6s reports MCEs but don't actually have all the MSRs */ | 263 | /* K6s reports MCEs but don't actually have all the MSRs */ |
306 | if (c->x86 < 6) | 264 | if (c->x86 < 6) |
307 | clear_cpu_cap(c, X86_FEATURE_MCE); | 265 | clear_cpu_cap(c, X86_FEATURE_MCE); |
diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c new file mode 100644 index 000000000000..30b7557c9641 --- /dev/null +++ b/arch/x86/kernel/cpu/amd_64.c | |||
@@ -0,0 +1,211 @@ | |||
1 | #include <linux/init.h> | ||
2 | #include <linux/mm.h> | ||
3 | |||
4 | #include <asm/numa_64.h> | ||
5 | #include <asm/mmconfig.h> | ||
6 | #include <asm/cacheflush.h> | ||
7 | |||
8 | #include <mach_apic.h> | ||
9 | |||
10 | #include "cpu.h" | ||
11 | |||
12 | int force_mwait __cpuinitdata; | ||
13 | |||
14 | #ifdef CONFIG_NUMA | ||
15 | static int __cpuinit nearby_node(int apicid) | ||
16 | { | ||
17 | int i, node; | ||
18 | |||
19 | for (i = apicid - 1; i >= 0; i--) { | ||
20 | node = apicid_to_node[i]; | ||
21 | if (node != NUMA_NO_NODE && node_online(node)) | ||
22 | return node; | ||
23 | } | ||
24 | for (i = apicid + 1; i < MAX_LOCAL_APIC; i++) { | ||
25 | node = apicid_to_node[i]; | ||
26 | if (node != NUMA_NO_NODE && node_online(node)) | ||
27 | return node; | ||
28 | } | ||
29 | return first_node(node_online_map); /* Shouldn't happen */ | ||
30 | } | ||
31 | #endif | ||
32 | |||
33 | /* | ||
34 | * On a AMD dual core setup the lower bits of the APIC id distingush the cores. | ||
35 | * Assumes number of cores is a power of two. | ||
36 | */ | ||
37 | static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) | ||
38 | { | ||
39 | #ifdef CONFIG_SMP | ||
40 | unsigned bits; | ||
41 | #ifdef CONFIG_NUMA | ||
42 | int cpu = smp_processor_id(); | ||
43 | int node = 0; | ||
44 | unsigned apicid = hard_smp_processor_id(); | ||
45 | #endif | ||
46 | bits = c->x86_coreid_bits; | ||
47 | |||
48 | /* Low order bits define the core id (index of core in socket) */ | ||
49 | c->cpu_core_id = c->initial_apicid & ((1 << bits)-1); | ||
50 | /* Convert the initial APIC ID into the socket ID */ | ||
51 | c->phys_proc_id = c->initial_apicid >> bits; | ||
52 | |||
53 | #ifdef CONFIG_NUMA | ||
54 | node = c->phys_proc_id; | ||
55 | if (apicid_to_node[apicid] != NUMA_NO_NODE) | ||
56 | node = apicid_to_node[apicid]; | ||
57 | if (!node_online(node)) { | ||
58 | /* Two possibilities here: | ||
59 | - The CPU is missing memory and no node was created. | ||
60 | In that case try picking one from a nearby CPU | ||
61 | - The APIC IDs differ from the HyperTransport node IDs | ||
62 | which the K8 northbridge parsing fills in. | ||
63 | Assume they are all increased by a constant offset, | ||
64 | but in the same order as the HT nodeids. | ||
65 | If that doesn't result in a usable node fall back to the | ||
66 | path for the previous case. */ | ||
67 | |||
68 | int ht_nodeid = c->initial_apicid; | ||
69 | |||
70 | if (ht_nodeid >= 0 && | ||
71 | apicid_to_node[ht_nodeid] != NUMA_NO_NODE) | ||
72 | node = apicid_to_node[ht_nodeid]; | ||
73 | /* Pick a nearby node */ | ||
74 | if (!node_online(node)) | ||
75 | node = nearby_node(apicid); | ||
76 | } | ||
77 | numa_set_node(cpu, node); | ||
78 | |||
79 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
80 | #endif | ||
81 | #endif | ||
82 | } | ||
83 | |||
84 | static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c) | ||
85 | { | ||
86 | #ifdef CONFIG_SMP | ||
87 | unsigned bits, ecx; | ||
88 | |||
89 | /* Multi core CPU? */ | ||
90 | if (c->extended_cpuid_level < 0x80000008) | ||
91 | return; | ||
92 | |||
93 | ecx = cpuid_ecx(0x80000008); | ||
94 | |||
95 | c->x86_max_cores = (ecx & 0xff) + 1; | ||
96 | |||
97 | /* CPU telling us the core id bits shift? */ | ||
98 | bits = (ecx >> 12) & 0xF; | ||
99 | |||
100 | /* Otherwise recompute */ | ||
101 | if (bits == 0) { | ||
102 | while ((1 << bits) < c->x86_max_cores) | ||
103 | bits++; | ||
104 | } | ||
105 | |||
106 | c->x86_coreid_bits = bits; | ||
107 | |||
108 | #endif | ||
109 | } | ||
110 | |||
111 | static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) | ||
112 | { | ||
113 | early_init_amd_mc(c); | ||
114 | |||
115 | /* c->x86_power is 8000_0007 edx. Bit 8 is constant TSC */ | ||
116 | if (c->x86_power & (1<<8)) | ||
117 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
118 | } | ||
119 | |||
120 | static void __cpuinit init_amd(struct cpuinfo_x86 *c) | ||
121 | { | ||
122 | unsigned level; | ||
123 | |||
124 | #ifdef CONFIG_SMP | ||
125 | unsigned long value; | ||
126 | |||
127 | /* | ||
128 | * Disable TLB flush filter by setting HWCR.FFDIS on K8 | ||
129 | * bit 6 of msr C001_0015 | ||
130 | * | ||
131 | * Errata 63 for SH-B3 steppings | ||
132 | * Errata 122 for all steppings (F+ have it disabled by default) | ||
133 | */ | ||
134 | if (c->x86 == 15) { | ||
135 | rdmsrl(MSR_K8_HWCR, value); | ||
136 | value |= 1 << 6; | ||
137 | wrmsrl(MSR_K8_HWCR, value); | ||
138 | } | ||
139 | #endif | ||
140 | |||
141 | /* Bit 31 in normal CPUID used for nonstandard 3DNow ID; | ||
142 | 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */ | ||
143 | clear_cpu_cap(c, 0*32+31); | ||
144 | |||
145 | /* On C+ stepping K8 rep microcode works well for copy/memset */ | ||
146 | level = cpuid_eax(1); | ||
147 | if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || | ||
148 | level >= 0x0f58)) | ||
149 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
150 | if (c->x86 == 0x10 || c->x86 == 0x11) | ||
151 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
152 | |||
153 | /* Enable workaround for FXSAVE leak */ | ||
154 | if (c->x86 >= 6) | ||
155 | set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK); | ||
156 | |||
157 | level = get_model_name(c); | ||
158 | if (!level) { | ||
159 | switch (c->x86) { | ||
160 | case 15: | ||
161 | /* Should distinguish Models here, but this is only | ||
162 | a fallback anyways. */ | ||
163 | strcpy(c->x86_model_id, "Hammer"); | ||
164 | break; | ||
165 | } | ||
166 | } | ||
167 | display_cacheinfo(c); | ||
168 | |||
169 | /* Multi core CPU? */ | ||
170 | if (c->extended_cpuid_level >= 0x80000008) | ||
171 | amd_detect_cmp(c); | ||
172 | |||
173 | if (c->extended_cpuid_level >= 0x80000006 && | ||
174 | (cpuid_edx(0x80000006) & 0xf000)) | ||
175 | num_cache_leaves = 4; | ||
176 | else | ||
177 | num_cache_leaves = 3; | ||
178 | |||
179 | if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11) | ||
180 | set_cpu_cap(c, X86_FEATURE_K8); | ||
181 | |||
182 | /* MFENCE stops RDTSC speculation */ | ||
183 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); | ||
184 | |||
185 | if (c->x86 == 0x10) | ||
186 | fam10h_check_enable_mmcfg(); | ||
187 | |||
188 | if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) { | ||
189 | unsigned long long tseg; | ||
190 | |||
191 | /* | ||
192 | * Split up direct mapping around the TSEG SMM area. | ||
193 | * Don't do it for gbpages because there seems very little | ||
194 | * benefit in doing so. | ||
195 | */ | ||
196 | if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &tseg) && | ||
197 | (tseg >> PMD_SHIFT) < | ||
198 | (max_pfn_mapped >> (PMD_SHIFT-PAGE_SHIFT))) | ||
199 | set_memory_4k((unsigned long)__va(tseg), 1); | ||
200 | } | ||
201 | } | ||
202 | |||
203 | static struct cpu_dev amd_cpu_dev __cpuinitdata = { | ||
204 | .c_vendor = "AMD", | ||
205 | .c_ident = { "AuthenticAMD" }, | ||
206 | .c_early_init = early_init_amd, | ||
207 | .c_init = init_amd, | ||
208 | }; | ||
209 | |||
210 | cpu_vendor_dev_register(X86_VENDOR_AMD, &amd_cpu_dev); | ||
211 | |||
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 170d2f5523b2..1b1c56bb338f 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c | |||
@@ -59,8 +59,12 @@ static void __init check_fpu(void) | |||
59 | return; | 59 | return; |
60 | } | 60 | } |
61 | 61 | ||
62 | /* trap_init() enabled FXSR and company _before_ testing for FP problems here. */ | 62 | /* |
63 | /* Test for the divl bug.. */ | 63 | * trap_init() enabled FXSR and company _before_ testing for FP |
64 | * problems here. | ||
65 | * | ||
66 | * Test for the divl bug.. | ||
67 | */ | ||
64 | __asm__("fninit\n\t" | 68 | __asm__("fninit\n\t" |
65 | "fldl %1\n\t" | 69 | "fldl %1\n\t" |
66 | "fdivl %2\n\t" | 70 | "fdivl %2\n\t" |
@@ -108,10 +112,15 @@ static void __init check_popad(void) | |||
108 | "movl $12345678,%%eax; movl $0,%%edi; pusha; popa; movl (%%edx,%%edi),%%ecx " | 112 | "movl $12345678,%%eax; movl $0,%%edi; pusha; popa; movl (%%edx,%%edi),%%ecx " |
109 | : "=&a" (res) | 113 | : "=&a" (res) |
110 | : "d" (inp) | 114 | : "d" (inp) |
111 | : "ecx", "edi" ); | 115 | : "ecx", "edi"); |
112 | /* If this fails, it means that any user program may lock the CPU hard. Too bad. */ | 116 | /* |
113 | if (res != 12345678) printk( "Buggy.\n" ); | 117 | * If this fails, it means that any user program may lock the |
114 | else printk( "OK.\n" ); | 118 | * CPU hard. Too bad. |
119 | */ | ||
120 | if (res != 12345678) | ||
121 | printk("Buggy.\n"); | ||
122 | else | ||
123 | printk("OK.\n"); | ||
115 | #endif | 124 | #endif |
116 | } | 125 | } |
117 | 126 | ||
@@ -137,7 +146,8 @@ static void __init check_config(void) | |||
137 | * i486+ only features! (WP works in supervisor mode and the | 146 | * i486+ only features! (WP works in supervisor mode and the |
138 | * new "invlpg" and "bswap" instructions) | 147 | * new "invlpg" and "bswap" instructions) |
139 | */ | 148 | */ |
140 | #if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_BSWAP) | 149 | #if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || \ |
150 | defined(CONFIG_X86_BSWAP) | ||
141 | if (boot_cpu_data.x86 == 3) | 151 | if (boot_cpu_data.x86 == 3) |
142 | panic("Kernel requires i486+ for 'invlpg' and other features"); | 152 | panic("Kernel requires i486+ for 'invlpg' and other features"); |
143 | #endif | 153 | #endif |
@@ -170,6 +180,7 @@ void __init check_bugs(void) | |||
170 | check_fpu(); | 180 | check_fpu(); |
171 | check_hlt(); | 181 | check_hlt(); |
172 | check_popad(); | 182 | check_popad(); |
173 | init_utsname()->machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86); | 183 | init_utsname()->machine[1] = |
184 | '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86); | ||
174 | alternative_instructions(); | 185 | alternative_instructions(); |
175 | } | 186 | } |
diff --git a/arch/x86/kernel/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c index 9a3ed0649d4e..9a3ed0649d4e 100644 --- a/arch/x86/kernel/bugs_64.c +++ b/arch/x86/kernel/cpu/bugs_64.c | |||
diff --git a/arch/x86/kernel/cpu/centaur_64.c b/arch/x86/kernel/cpu/centaur_64.c new file mode 100644 index 000000000000..13526fd5cce1 --- /dev/null +++ b/arch/x86/kernel/cpu/centaur_64.c | |||
@@ -0,0 +1,43 @@ | |||
1 | #include <linux/init.h> | ||
2 | #include <linux/smp.h> | ||
3 | |||
4 | #include <asm/cpufeature.h> | ||
5 | #include <asm/processor.h> | ||
6 | |||
7 | #include "cpu.h" | ||
8 | |||
9 | static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c) | ||
10 | { | ||
11 | if (c->x86 == 0x6 && c->x86_model >= 0xf) | ||
12 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
13 | } | ||
14 | |||
15 | static void __cpuinit init_centaur(struct cpuinfo_x86 *c) | ||
16 | { | ||
17 | /* Cache sizes */ | ||
18 | unsigned n; | ||
19 | |||
20 | n = c->extended_cpuid_level; | ||
21 | if (n >= 0x80000008) { | ||
22 | unsigned eax = cpuid_eax(0x80000008); | ||
23 | c->x86_virt_bits = (eax >> 8) & 0xff; | ||
24 | c->x86_phys_bits = eax & 0xff; | ||
25 | } | ||
26 | |||
27 | if (c->x86 == 0x6 && c->x86_model >= 0xf) { | ||
28 | c->x86_cache_alignment = c->x86_clflush_size * 2; | ||
29 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
30 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
31 | } | ||
32 | set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); | ||
33 | } | ||
34 | |||
35 | static struct cpu_dev centaur_cpu_dev __cpuinitdata = { | ||
36 | .c_vendor = "Centaur", | ||
37 | .c_ident = { "CentaurHauls" }, | ||
38 | .c_early_init = early_init_centaur, | ||
39 | .c_init = init_centaur, | ||
40 | }; | ||
41 | |||
42 | cpu_vendor_dev_register(X86_VENDOR_CENTAUR, ¢aur_cpu_dev); | ||
43 | |||
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 783691b2a738..4d894e8565fe 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h | |||
@@ -1,3 +1,6 @@ | |||
1 | #ifndef ARCH_X86_CPU_H | ||
2 | |||
3 | #define ARCH_X86_CPU_H | ||
1 | 4 | ||
2 | struct cpu_model_info { | 5 | struct cpu_model_info { |
3 | int vendor; | 6 | int vendor; |
@@ -36,3 +39,5 @@ extern struct cpu_vendor_dev __x86cpuvendor_start[], __x86cpuvendor_end[]; | |||
36 | 39 | ||
37 | extern int get_model_name(struct cpuinfo_x86 *c); | 40 | extern int get_model_name(struct cpuinfo_x86 *c); |
38 | extern void display_cacheinfo(struct cpuinfo_x86 *c); | 41 | extern void display_cacheinfo(struct cpuinfo_x86 *c); |
42 | |||
43 | #endif | ||
diff --git a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c index f03e9153618e..965ea52767ac 100644 --- a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c +++ b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | |||
@@ -26,9 +26,10 @@ | |||
26 | #define NFORCE2_SAFE_DISTANCE 50 | 26 | #define NFORCE2_SAFE_DISTANCE 50 |
27 | 27 | ||
28 | /* Delay in ms between FSB changes */ | 28 | /* Delay in ms between FSB changes */ |
29 | //#define NFORCE2_DELAY 10 | 29 | /* #define NFORCE2_DELAY 10 */ |
30 | 30 | ||
31 | /* nforce2_chipset: | 31 | /* |
32 | * nforce2_chipset: | ||
32 | * FSB is changed using the chipset | 33 | * FSB is changed using the chipset |
33 | */ | 34 | */ |
34 | static struct pci_dev *nforce2_chipset_dev; | 35 | static struct pci_dev *nforce2_chipset_dev; |
@@ -36,13 +37,13 @@ static struct pci_dev *nforce2_chipset_dev; | |||
36 | /* fid: | 37 | /* fid: |
37 | * multiplier * 10 | 38 | * multiplier * 10 |
38 | */ | 39 | */ |
39 | static int fid = 0; | 40 | static int fid; |
40 | 41 | ||
41 | /* min_fsb, max_fsb: | 42 | /* min_fsb, max_fsb: |
42 | * minimum and maximum FSB (= FSB at boot time) | 43 | * minimum and maximum FSB (= FSB at boot time) |
43 | */ | 44 | */ |
44 | static int min_fsb = 0; | 45 | static int min_fsb; |
45 | static int max_fsb = 0; | 46 | static int max_fsb; |
46 | 47 | ||
47 | MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); | 48 | MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); |
48 | MODULE_DESCRIPTION("nForce2 FSB changing cpufreq driver"); | 49 | MODULE_DESCRIPTION("nForce2 FSB changing cpufreq driver"); |
@@ -53,7 +54,7 @@ module_param(min_fsb, int, 0444); | |||
53 | 54 | ||
54 | MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)"); | 55 | MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)"); |
55 | MODULE_PARM_DESC(min_fsb, | 56 | MODULE_PARM_DESC(min_fsb, |
56 | "Minimum FSB to use, if not defined: current FSB - 50"); | 57 | "Minimum FSB to use, if not defined: current FSB - 50"); |
57 | 58 | ||
58 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "cpufreq-nforce2", msg) | 59 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "cpufreq-nforce2", msg) |
59 | 60 | ||
@@ -139,7 +140,7 @@ static unsigned int nforce2_fsb_read(int bootfsb) | |||
139 | 140 | ||
140 | /* Get chipset boot FSB from subdevice 5 (FSB at boot-time) */ | 141 | /* Get chipset boot FSB from subdevice 5 (FSB at boot-time) */ |
141 | nforce2_sub5 = pci_get_subsys(PCI_VENDOR_ID_NVIDIA, | 142 | nforce2_sub5 = pci_get_subsys(PCI_VENDOR_ID_NVIDIA, |
142 | 0x01EF,PCI_ANY_ID,PCI_ANY_ID,NULL); | 143 | 0x01EF, PCI_ANY_ID, PCI_ANY_ID, NULL); |
143 | if (!nforce2_sub5) | 144 | if (!nforce2_sub5) |
144 | return 0; | 145 | return 0; |
145 | 146 | ||
@@ -147,13 +148,13 @@ static unsigned int nforce2_fsb_read(int bootfsb) | |||
147 | fsb /= 1000000; | 148 | fsb /= 1000000; |
148 | 149 | ||
149 | /* Check if PLL register is already set */ | 150 | /* Check if PLL register is already set */ |
150 | pci_read_config_byte(nforce2_chipset_dev,NFORCE2_PLLENABLE, (u8 *)&temp); | 151 | pci_read_config_byte(nforce2_chipset_dev, NFORCE2_PLLENABLE, (u8 *)&temp); |
151 | 152 | ||
152 | if(bootfsb || !temp) | 153 | if (bootfsb || !temp) |
153 | return fsb; | 154 | return fsb; |
154 | 155 | ||
155 | /* Use PLL register FSB value */ | 156 | /* Use PLL register FSB value */ |
156 | pci_read_config_dword(nforce2_chipset_dev,NFORCE2_PLLREG, &temp); | 157 | pci_read_config_dword(nforce2_chipset_dev, NFORCE2_PLLREG, &temp); |
157 | fsb = nforce2_calc_fsb(temp); | 158 | fsb = nforce2_calc_fsb(temp); |
158 | 159 | ||
159 | return fsb; | 160 | return fsb; |
@@ -184,7 +185,7 @@ static int nforce2_set_fsb(unsigned int fsb) | |||
184 | } | 185 | } |
185 | 186 | ||
186 | /* First write? Then set actual value */ | 187 | /* First write? Then set actual value */ |
187 | pci_read_config_byte(nforce2_chipset_dev,NFORCE2_PLLENABLE, (u8 *)&temp); | 188 | pci_read_config_byte(nforce2_chipset_dev, NFORCE2_PLLENABLE, (u8 *)&temp); |
188 | if (!temp) { | 189 | if (!temp) { |
189 | pll = nforce2_calc_pll(tfsb); | 190 | pll = nforce2_calc_pll(tfsb); |
190 | 191 | ||
@@ -210,7 +211,8 @@ static int nforce2_set_fsb(unsigned int fsb) | |||
210 | tfsb--; | 211 | tfsb--; |
211 | 212 | ||
212 | /* Calculate the PLL reg. value */ | 213 | /* Calculate the PLL reg. value */ |
213 | if ((pll = nforce2_calc_pll(tfsb)) == -1) | 214 | pll = nforce2_calc_pll(tfsb); |
215 | if (pll == -1) | ||
214 | return -EINVAL; | 216 | return -EINVAL; |
215 | 217 | ||
216 | nforce2_write_pll(pll); | 218 | nforce2_write_pll(pll); |
@@ -249,7 +251,7 @@ static unsigned int nforce2_get(unsigned int cpu) | |||
249 | static int nforce2_target(struct cpufreq_policy *policy, | 251 | static int nforce2_target(struct cpufreq_policy *policy, |
250 | unsigned int target_freq, unsigned int relation) | 252 | unsigned int target_freq, unsigned int relation) |
251 | { | 253 | { |
252 | // unsigned long flags; | 254 | /* unsigned long flags; */ |
253 | struct cpufreq_freqs freqs; | 255 | struct cpufreq_freqs freqs; |
254 | unsigned int target_fsb; | 256 | unsigned int target_fsb; |
255 | 257 | ||
@@ -271,17 +273,17 @@ static int nforce2_target(struct cpufreq_policy *policy, | |||
271 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); | 273 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); |
272 | 274 | ||
273 | /* Disable IRQs */ | 275 | /* Disable IRQs */ |
274 | //local_irq_save(flags); | 276 | /* local_irq_save(flags); */ |
275 | 277 | ||
276 | if (nforce2_set_fsb(target_fsb) < 0) | 278 | if (nforce2_set_fsb(target_fsb) < 0) |
277 | printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n", | 279 | printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n", |
278 | target_fsb); | 280 | target_fsb); |
279 | else | 281 | else |
280 | dprintk("Changed FSB successfully to %d\n", | 282 | dprintk("Changed FSB successfully to %d\n", |
281 | target_fsb); | 283 | target_fsb); |
282 | 284 | ||
283 | /* Enable IRQs */ | 285 | /* Enable IRQs */ |
284 | //local_irq_restore(flags); | 286 | /* local_irq_restore(flags); */ |
285 | 287 | ||
286 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); | 288 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); |
287 | 289 | ||
@@ -302,8 +304,8 @@ static int nforce2_verify(struct cpufreq_policy *policy) | |||
302 | policy->max = (fsb_pol_max + 1) * fid * 100; | 304 | policy->max = (fsb_pol_max + 1) * fid * 100; |
303 | 305 | ||
304 | cpufreq_verify_within_limits(policy, | 306 | cpufreq_verify_within_limits(policy, |
305 | policy->cpuinfo.min_freq, | 307 | policy->cpuinfo.min_freq, |
306 | policy->cpuinfo.max_freq); | 308 | policy->cpuinfo.max_freq); |
307 | return 0; | 309 | return 0; |
308 | } | 310 | } |
309 | 311 | ||
@@ -347,7 +349,7 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) | |||
347 | /* Set maximum FSB to FSB at boot time */ | 349 | /* Set maximum FSB to FSB at boot time */ |
348 | max_fsb = nforce2_fsb_read(1); | 350 | max_fsb = nforce2_fsb_read(1); |
349 | 351 | ||
350 | if(!max_fsb) | 352 | if (!max_fsb) |
351 | return -EIO; | 353 | return -EIO; |
352 | 354 | ||
353 | if (!min_fsb) | 355 | if (!min_fsb) |
diff --git a/arch/x86/kernel/cpu/cpufreq/longrun.c b/arch/x86/kernel/cpu/cpufreq/longrun.c index af4a867a097c..777a7ff075de 100644 --- a/arch/x86/kernel/cpu/cpufreq/longrun.c +++ b/arch/x86/kernel/cpu/cpufreq/longrun.c | |||
@@ -245,7 +245,7 @@ static unsigned int __init longrun_determine_freqs(unsigned int *low_freq, | |||
245 | if ((ecx > 95) || (ecx == 0) || (eax < ebx)) | 245 | if ((ecx > 95) || (ecx == 0) || (eax < ebx)) |
246 | return -EIO; | 246 | return -EIO; |
247 | 247 | ||
248 | edx = (eax - ebx) / (100 - ecx); | 248 | edx = ((eax - ebx) * 100) / (100 - ecx); |
249 | *low_freq = edx * 1000; /* back to kHz */ | 249 | *low_freq = edx * 1000; /* back to kHz */ |
250 | 250 | ||
251 | dprintk("low frequency is %u kHz\n", *low_freq); | 251 | dprintk("low frequency is %u kHz\n", *low_freq); |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index 46d4034d9f37..206791eb46e3 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | |||
@@ -1127,12 +1127,23 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
1127 | * an UP version, and is deprecated by AMD. | 1127 | * an UP version, and is deprecated by AMD. |
1128 | */ | 1128 | */ |
1129 | if (num_online_cpus() != 1) { | 1129 | if (num_online_cpus() != 1) { |
1130 | printk(KERN_ERR PFX "MP systems not supported by PSB BIOS structure\n"); | 1130 | #ifndef CONFIG_ACPI_PROCESSOR |
1131 | printk(KERN_ERR PFX "ACPI Processor support is required " | ||
1132 | "for SMP systems but is absent. Please load the " | ||
1133 | "ACPI Processor module before starting this " | ||
1134 | "driver.\n"); | ||
1135 | #else | ||
1136 | printk(KERN_ERR PFX "Your BIOS does not provide ACPI " | ||
1137 | "_PSS objects in a way that Linux understands. " | ||
1138 | "Please report this to the Linux ACPI maintainers" | ||
1139 | " and complain to your BIOS vendor.\n"); | ||
1140 | #endif | ||
1131 | kfree(data); | 1141 | kfree(data); |
1132 | return -ENODEV; | 1142 | return -ENODEV; |
1133 | } | 1143 | } |
1134 | if (pol->cpu != 0) { | 1144 | if (pol->cpu != 0) { |
1135 | printk(KERN_ERR PFX "No _PSS objects for CPU other than CPU0\n"); | 1145 | printk(KERN_ERR PFX "No ACPI _PSS objects for CPU other than " |
1146 | "CPU0. Complain to your BIOS vendor.\n"); | ||
1136 | kfree(data); | 1147 | kfree(data); |
1137 | return -ENODEV; | 1148 | return -ENODEV; |
1138 | } | 1149 | } |
diff --git a/arch/x86/kernel/cpu/intel_64.c b/arch/x86/kernel/cpu/intel_64.c new file mode 100644 index 000000000000..fcb1cc9d75ca --- /dev/null +++ b/arch/x86/kernel/cpu/intel_64.c | |||
@@ -0,0 +1,103 @@ | |||
1 | #include <linux/init.h> | ||
2 | #include <linux/smp.h> | ||
3 | #include <asm/processor.h> | ||
4 | #include <asm/ptrace.h> | ||
5 | #include <asm/topology.h> | ||
6 | #include <asm/numa_64.h> | ||
7 | |||
8 | #include "cpu.h" | ||
9 | |||
10 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | ||
11 | { | ||
12 | if ((c->x86 == 0xf && c->x86_model >= 0x03) || | ||
13 | (c->x86 == 0x6 && c->x86_model >= 0x0e)) | ||
14 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
15 | } | ||
16 | |||
17 | /* | ||
18 | * find out the number of processor cores on the die | ||
19 | */ | ||
20 | static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c) | ||
21 | { | ||
22 | unsigned int eax, t; | ||
23 | |||
24 | if (c->cpuid_level < 4) | ||
25 | return 1; | ||
26 | |||
27 | cpuid_count(4, 0, &eax, &t, &t, &t); | ||
28 | |||
29 | if (eax & 0x1f) | ||
30 | return ((eax >> 26) + 1); | ||
31 | else | ||
32 | return 1; | ||
33 | } | ||
34 | |||
35 | static void __cpuinit srat_detect_node(void) | ||
36 | { | ||
37 | #ifdef CONFIG_NUMA | ||
38 | unsigned node; | ||
39 | int cpu = smp_processor_id(); | ||
40 | int apicid = hard_smp_processor_id(); | ||
41 | |||
42 | /* Don't do the funky fallback heuristics the AMD version employs | ||
43 | for now. */ | ||
44 | node = apicid_to_node[apicid]; | ||
45 | if (node == NUMA_NO_NODE || !node_online(node)) | ||
46 | node = first_node(node_online_map); | ||
47 | numa_set_node(cpu, node); | ||
48 | |||
49 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
50 | #endif | ||
51 | } | ||
52 | |||
53 | static void __cpuinit init_intel(struct cpuinfo_x86 *c) | ||
54 | { | ||
55 | /* Cache sizes */ | ||
56 | unsigned n; | ||
57 | |||
58 | init_intel_cacheinfo(c); | ||
59 | if (c->cpuid_level > 9) { | ||
60 | unsigned eax = cpuid_eax(10); | ||
61 | /* Check for version and the number of counters */ | ||
62 | if ((eax & 0xff) && (((eax>>8) & 0xff) > 1)) | ||
63 | set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON); | ||
64 | } | ||
65 | |||
66 | if (cpu_has_ds) { | ||
67 | unsigned int l1, l2; | ||
68 | rdmsr(MSR_IA32_MISC_ENABLE, l1, l2); | ||
69 | if (!(l1 & (1<<11))) | ||
70 | set_cpu_cap(c, X86_FEATURE_BTS); | ||
71 | if (!(l1 & (1<<12))) | ||
72 | set_cpu_cap(c, X86_FEATURE_PEBS); | ||
73 | } | ||
74 | |||
75 | |||
76 | if (cpu_has_bts) | ||
77 | ds_init_intel(c); | ||
78 | |||
79 | n = c->extended_cpuid_level; | ||
80 | if (n >= 0x80000008) { | ||
81 | unsigned eax = cpuid_eax(0x80000008); | ||
82 | c->x86_virt_bits = (eax >> 8) & 0xff; | ||
83 | c->x86_phys_bits = eax & 0xff; | ||
84 | } | ||
85 | |||
86 | if (c->x86 == 15) | ||
87 | c->x86_cache_alignment = c->x86_clflush_size * 2; | ||
88 | if (c->x86 == 6) | ||
89 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
90 | set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); | ||
91 | c->x86_max_cores = intel_num_cpu_cores(c); | ||
92 | |||
93 | srat_detect_node(); | ||
94 | } | ||
95 | |||
96 | static struct cpu_dev intel_cpu_dev __cpuinitdata = { | ||
97 | .c_vendor = "Intel", | ||
98 | .c_ident = { "GenuineIntel" }, | ||
99 | .c_early_init = early_init_intel, | ||
100 | .c_init = init_intel, | ||
101 | }; | ||
102 | cpu_vendor_dev_register(X86_VENDOR_INTEL, &intel_cpu_dev); | ||
103 | |||
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 26d615dcb149..2c8afafa18e8 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
@@ -62,6 +62,7 @@ static struct _cache_table cache_table[] __cpuinitdata = | |||
62 | { 0x4b, LVL_3, 8192 }, /* 16-way set assoc, 64 byte line size */ | 62 | { 0x4b, LVL_3, 8192 }, /* 16-way set assoc, 64 byte line size */ |
63 | { 0x4c, LVL_3, 12288 }, /* 12-way set assoc, 64 byte line size */ | 63 | { 0x4c, LVL_3, 12288 }, /* 12-way set assoc, 64 byte line size */ |
64 | { 0x4d, LVL_3, 16384 }, /* 16-way set assoc, 64 byte line size */ | 64 | { 0x4d, LVL_3, 16384 }, /* 16-way set assoc, 64 byte line size */ |
65 | { 0x4e, LVL_2, 6144 }, /* 24-way set assoc, 64 byte line size */ | ||
65 | { 0x60, LVL_1_DATA, 16 }, /* 8-way set assoc, sectored cache, 64 byte line size */ | 66 | { 0x60, LVL_1_DATA, 16 }, /* 8-way set assoc, sectored cache, 64 byte line size */ |
66 | { 0x66, LVL_1_DATA, 8 }, /* 4-way set assoc, sectored cache, 64 byte line size */ | 67 | { 0x66, LVL_1_DATA, 8 }, /* 4-way set assoc, sectored cache, 64 byte line size */ |
67 | { 0x67, LVL_1_DATA, 16 }, /* 4-way set assoc, sectored cache, 64 byte line size */ | 68 | { 0x67, LVL_1_DATA, 16 }, /* 4-way set assoc, sectored cache, 64 byte line size */ |
diff --git a/arch/x86/kernel/cpu/mcheck/k7.c b/arch/x86/kernel/cpu/mcheck/k7.c index e633c9c2b764..f390c9f66351 100644 --- a/arch/x86/kernel/cpu/mcheck/k7.c +++ b/arch/x86/kernel/cpu/mcheck/k7.c | |||
@@ -9,23 +9,23 @@ | |||
9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
10 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
11 | 11 | ||
12 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
13 | #include <asm/system.h> | 13 | #include <asm/system.h> |
14 | #include <asm/msr.h> | 14 | #include <asm/msr.h> |
15 | 15 | ||
16 | #include "mce.h" | 16 | #include "mce.h" |
17 | 17 | ||
18 | /* Machine Check Handler For AMD Athlon/Duron */ | 18 | /* Machine Check Handler For AMD Athlon/Duron */ |
19 | static void k7_machine_check(struct pt_regs * regs, long error_code) | 19 | static void k7_machine_check(struct pt_regs *regs, long error_code) |
20 | { | 20 | { |
21 | int recover=1; | 21 | int recover = 1; |
22 | u32 alow, ahigh, high, low; | 22 | u32 alow, ahigh, high, low; |
23 | u32 mcgstl, mcgsth; | 23 | u32 mcgstl, mcgsth; |
24 | int i; | 24 | int i; |
25 | 25 | ||
26 | rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth); | 26 | rdmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
27 | if (mcgstl & (1<<0)) /* Recoverable ? */ | 27 | if (mcgstl & (1<<0)) /* Recoverable ? */ |
28 | recover=0; | 28 | recover = 0; |
29 | 29 | ||
30 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", | 30 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", |
31 | smp_processor_id(), mcgsth, mcgstl); | 31 | smp_processor_id(), mcgsth, mcgstl); |
@@ -60,12 +60,12 @@ static void k7_machine_check(struct pt_regs * regs, long error_code) | |||
60 | } | 60 | } |
61 | 61 | ||
62 | if (recover&2) | 62 | if (recover&2) |
63 | panic ("CPU context corrupt"); | 63 | panic("CPU context corrupt"); |
64 | if (recover&1) | 64 | if (recover&1) |
65 | panic ("Unable to continue"); | 65 | panic("Unable to continue"); |
66 | printk (KERN_EMERG "Attempting to continue.\n"); | 66 | printk(KERN_EMERG "Attempting to continue.\n"); |
67 | mcgstl &= ~(1<<2); | 67 | mcgstl &= ~(1<<2); |
68 | wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth); | 68 | wrmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
@@ -81,25 +81,25 @@ void amd_mcheck_init(struct cpuinfo_x86 *c) | |||
81 | machine_check_vector = k7_machine_check; | 81 | machine_check_vector = k7_machine_check; |
82 | wmb(); | 82 | wmb(); |
83 | 83 | ||
84 | printk (KERN_INFO "Intel machine check architecture supported.\n"); | 84 | printk(KERN_INFO "Intel machine check architecture supported.\n"); |
85 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 85 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
86 | if (l & (1<<8)) /* Control register present ? */ | 86 | if (l & (1<<8)) /* Control register present ? */ |
87 | wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 87 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
88 | nr_mce_banks = l & 0xff; | 88 | nr_mce_banks = l & 0xff; |
89 | 89 | ||
90 | /* Clear status for MC index 0 separately, we don't touch CTL, | 90 | /* Clear status for MC index 0 separately, we don't touch CTL, |
91 | * as some K7 Athlons cause spurious MCEs when its enabled. */ | 91 | * as some K7 Athlons cause spurious MCEs when its enabled. */ |
92 | if (boot_cpu_data.x86 == 6) { | 92 | if (boot_cpu_data.x86 == 6) { |
93 | wrmsr (MSR_IA32_MC0_STATUS, 0x0, 0x0); | 93 | wrmsr(MSR_IA32_MC0_STATUS, 0x0, 0x0); |
94 | i = 1; | 94 | i = 1; |
95 | } else | 95 | } else |
96 | i = 0; | 96 | i = 0; |
97 | for (; i<nr_mce_banks; i++) { | 97 | for (; i < nr_mce_banks; i++) { |
98 | wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); | 98 | wrmsr(MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); |
99 | wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); | 99 | wrmsr(MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); |
100 | } | 100 | } |
101 | 101 | ||
102 | set_in_cr4 (X86_CR4_MCE); | 102 | set_in_cr4(X86_CR4_MCE); |
103 | printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", | 103 | printk(KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", |
104 | smp_processor_id()); | 104 | smp_processor_id()); |
105 | } | 105 | } |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index e07e8c068ae0..501ca1cea27d 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/idle.h> | 31 | #include <asm/idle.h> |
32 | 32 | ||
33 | #define MISC_MCELOG_MINOR 227 | 33 | #define MISC_MCELOG_MINOR 227 |
34 | #define NR_BANKS 6 | 34 | #define NR_SYSFS_BANKS 6 |
35 | 35 | ||
36 | atomic_t mce_entry; | 36 | atomic_t mce_entry; |
37 | 37 | ||
@@ -46,7 +46,7 @@ static int mce_dont_init; | |||
46 | */ | 46 | */ |
47 | static int tolerant = 1; | 47 | static int tolerant = 1; |
48 | static int banks; | 48 | static int banks; |
49 | static unsigned long bank[NR_BANKS] = { [0 ... NR_BANKS-1] = ~0UL }; | 49 | static unsigned long bank[NR_SYSFS_BANKS] = { [0 ... NR_SYSFS_BANKS-1] = ~0UL }; |
50 | static unsigned long notify_user; | 50 | static unsigned long notify_user; |
51 | static int rip_msr; | 51 | static int rip_msr; |
52 | static int mce_bootlog = -1; | 52 | static int mce_bootlog = -1; |
@@ -209,7 +209,7 @@ void do_machine_check(struct pt_regs * regs, long error_code) | |||
209 | barrier(); | 209 | barrier(); |
210 | 210 | ||
211 | for (i = 0; i < banks; i++) { | 211 | for (i = 0; i < banks; i++) { |
212 | if (!bank[i]) | 212 | if (i < NR_SYSFS_BANKS && !bank[i]) |
213 | continue; | 213 | continue; |
214 | 214 | ||
215 | m.misc = 0; | 215 | m.misc = 0; |
@@ -444,9 +444,10 @@ static void mce_init(void *dummy) | |||
444 | 444 | ||
445 | rdmsrl(MSR_IA32_MCG_CAP, cap); | 445 | rdmsrl(MSR_IA32_MCG_CAP, cap); |
446 | banks = cap & 0xff; | 446 | banks = cap & 0xff; |
447 | if (banks > NR_BANKS) { | 447 | if (banks > MCE_EXTENDED_BANK) { |
448 | printk(KERN_INFO "MCE: warning: using only %d banks\n", banks); | 448 | banks = MCE_EXTENDED_BANK; |
449 | banks = NR_BANKS; | 449 | printk(KERN_INFO "MCE: warning: using only %d banks\n", |
450 | MCE_EXTENDED_BANK); | ||
450 | } | 451 | } |
451 | /* Use accurate RIP reporting if available. */ | 452 | /* Use accurate RIP reporting if available. */ |
452 | if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9) | 453 | if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9) |
@@ -462,7 +463,11 @@ static void mce_init(void *dummy) | |||
462 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 463 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
463 | 464 | ||
464 | for (i = 0; i < banks; i++) { | 465 | for (i = 0; i < banks; i++) { |
465 | wrmsrl(MSR_IA32_MC0_CTL+4*i, bank[i]); | 466 | if (i < NR_SYSFS_BANKS) |
467 | wrmsrl(MSR_IA32_MC0_CTL+4*i, bank[i]); | ||
468 | else | ||
469 | wrmsrl(MSR_IA32_MC0_CTL+4*i, ~0UL); | ||
470 | |||
466 | wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0); | 471 | wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0); |
467 | } | 472 | } |
468 | } | 473 | } |
@@ -766,7 +771,10 @@ DEFINE_PER_CPU(struct sys_device, device_mce); | |||
766 | } \ | 771 | } \ |
767 | static SYSDEV_ATTR(name, 0644, show_ ## name, set_ ## name); | 772 | static SYSDEV_ATTR(name, 0644, show_ ## name, set_ ## name); |
768 | 773 | ||
769 | /* TBD should generate these dynamically based on number of available banks */ | 774 | /* |
775 | * TBD should generate these dynamically based on number of available banks. | ||
776 | * Have only 6 contol banks in /sysfs until then. | ||
777 | */ | ||
770 | ACCESSOR(bank0ctl,bank[0],mce_restart()) | 778 | ACCESSOR(bank0ctl,bank[0],mce_restart()) |
771 | ACCESSOR(bank1ctl,bank[1],mce_restart()) | 779 | ACCESSOR(bank1ctl,bank[1],mce_restart()) |
772 | ACCESSOR(bank2ctl,bank[2],mce_restart()) | 780 | ACCESSOR(bank2ctl,bank[2],mce_restart()) |
diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c index cb03345554a5..eef001ad3bde 100644 --- a/arch/x86/kernel/cpu/mcheck/p4.c +++ b/arch/x86/kernel/cpu/mcheck/p4.c | |||
@@ -8,7 +8,7 @@ | |||
8 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
9 | #include <linux/smp.h> | 9 | #include <linux/smp.h> |
10 | 10 | ||
11 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
12 | #include <asm/system.h> | 12 | #include <asm/system.h> |
13 | #include <asm/msr.h> | 13 | #include <asm/msr.h> |
14 | #include <asm/apic.h> | 14 | #include <asm/apic.h> |
@@ -32,12 +32,12 @@ struct intel_mce_extended_msrs { | |||
32 | /* u32 *reserved[]; */ | 32 | /* u32 *reserved[]; */ |
33 | }; | 33 | }; |
34 | 34 | ||
35 | static int mce_num_extended_msrs = 0; | 35 | static int mce_num_extended_msrs; |
36 | 36 | ||
37 | 37 | ||
38 | #ifdef CONFIG_X86_MCE_P4THERMAL | 38 | #ifdef CONFIG_X86_MCE_P4THERMAL |
39 | static void unexpected_thermal_interrupt(struct pt_regs *regs) | 39 | static void unexpected_thermal_interrupt(struct pt_regs *regs) |
40 | { | 40 | { |
41 | printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n", | 41 | printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n", |
42 | smp_processor_id()); | 42 | smp_processor_id()); |
43 | add_taint(TAINT_MACHINE_CHECK); | 43 | add_taint(TAINT_MACHINE_CHECK); |
@@ -83,7 +83,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
83 | * be some SMM goo which handles it, so we can't even put a handler | 83 | * be some SMM goo which handles it, so we can't even put a handler |
84 | * since it might be delivered via SMI already -zwanem. | 84 | * since it might be delivered via SMI already -zwanem. |
85 | */ | 85 | */ |
86 | rdmsr (MSR_IA32_MISC_ENABLE, l, h); | 86 | rdmsr(MSR_IA32_MISC_ENABLE, l, h); |
87 | h = apic_read(APIC_LVTTHMR); | 87 | h = apic_read(APIC_LVTTHMR); |
88 | if ((l & (1<<3)) && (h & APIC_DM_SMI)) { | 88 | if ((l & (1<<3)) && (h & APIC_DM_SMI)) { |
89 | printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", | 89 | printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", |
@@ -91,7 +91,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
91 | return; /* -EBUSY */ | 91 | return; /* -EBUSY */ |
92 | } | 92 | } |
93 | 93 | ||
94 | /* check whether a vector already exists, temporarily masked? */ | 94 | /* check whether a vector already exists, temporarily masked? */ |
95 | if (h & APIC_VECTOR_MASK) { | 95 | if (h & APIC_VECTOR_MASK) { |
96 | printk(KERN_DEBUG "CPU%d: Thermal LVT vector (%#x) already " | 96 | printk(KERN_DEBUG "CPU%d: Thermal LVT vector (%#x) already " |
97 | "installed\n", | 97 | "installed\n", |
@@ -104,18 +104,18 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
104 | h |= (APIC_DM_FIXED | APIC_LVT_MASKED); /* we'll mask till we're ready */ | 104 | h |= (APIC_DM_FIXED | APIC_LVT_MASKED); /* we'll mask till we're ready */ |
105 | apic_write_around(APIC_LVTTHMR, h); | 105 | apic_write_around(APIC_LVTTHMR, h); |
106 | 106 | ||
107 | rdmsr (MSR_IA32_THERM_INTERRUPT, l, h); | 107 | rdmsr(MSR_IA32_THERM_INTERRUPT, l, h); |
108 | wrmsr (MSR_IA32_THERM_INTERRUPT, l | 0x03 , h); | 108 | wrmsr(MSR_IA32_THERM_INTERRUPT, l | 0x03 , h); |
109 | 109 | ||
110 | /* ok we're good to go... */ | 110 | /* ok we're good to go... */ |
111 | vendor_thermal_interrupt = intel_thermal_interrupt; | 111 | vendor_thermal_interrupt = intel_thermal_interrupt; |
112 | |||
113 | rdmsr (MSR_IA32_MISC_ENABLE, l, h); | ||
114 | wrmsr (MSR_IA32_MISC_ENABLE, l | (1<<3), h); | ||
115 | 112 | ||
116 | l = apic_read (APIC_LVTTHMR); | 113 | rdmsr(MSR_IA32_MISC_ENABLE, l, h); |
117 | apic_write_around (APIC_LVTTHMR, l & ~APIC_LVT_MASKED); | 114 | wrmsr(MSR_IA32_MISC_ENABLE, l | (1<<3), h); |
118 | printk (KERN_INFO "CPU%d: Thermal monitoring enabled\n", cpu); | 115 | |
116 | l = apic_read(APIC_LVTTHMR); | ||
117 | apic_write_around(APIC_LVTTHMR, l & ~APIC_LVT_MASKED); | ||
118 | printk(KERN_INFO "CPU%d: Thermal monitoring enabled\n", cpu); | ||
119 | 119 | ||
120 | /* enable thermal throttle processing */ | 120 | /* enable thermal throttle processing */ |
121 | atomic_set(&therm_throt_en, 1); | 121 | atomic_set(&therm_throt_en, 1); |
@@ -129,28 +129,28 @@ static inline void intel_get_extended_msrs(struct intel_mce_extended_msrs *r) | |||
129 | { | 129 | { |
130 | u32 h; | 130 | u32 h; |
131 | 131 | ||
132 | rdmsr (MSR_IA32_MCG_EAX, r->eax, h); | 132 | rdmsr(MSR_IA32_MCG_EAX, r->eax, h); |
133 | rdmsr (MSR_IA32_MCG_EBX, r->ebx, h); | 133 | rdmsr(MSR_IA32_MCG_EBX, r->ebx, h); |
134 | rdmsr (MSR_IA32_MCG_ECX, r->ecx, h); | 134 | rdmsr(MSR_IA32_MCG_ECX, r->ecx, h); |
135 | rdmsr (MSR_IA32_MCG_EDX, r->edx, h); | 135 | rdmsr(MSR_IA32_MCG_EDX, r->edx, h); |
136 | rdmsr (MSR_IA32_MCG_ESI, r->esi, h); | 136 | rdmsr(MSR_IA32_MCG_ESI, r->esi, h); |
137 | rdmsr (MSR_IA32_MCG_EDI, r->edi, h); | 137 | rdmsr(MSR_IA32_MCG_EDI, r->edi, h); |
138 | rdmsr (MSR_IA32_MCG_EBP, r->ebp, h); | 138 | rdmsr(MSR_IA32_MCG_EBP, r->ebp, h); |
139 | rdmsr (MSR_IA32_MCG_ESP, r->esp, h); | 139 | rdmsr(MSR_IA32_MCG_ESP, r->esp, h); |
140 | rdmsr (MSR_IA32_MCG_EFLAGS, r->eflags, h); | 140 | rdmsr(MSR_IA32_MCG_EFLAGS, r->eflags, h); |
141 | rdmsr (MSR_IA32_MCG_EIP, r->eip, h); | 141 | rdmsr(MSR_IA32_MCG_EIP, r->eip, h); |
142 | } | 142 | } |
143 | 143 | ||
144 | static void intel_machine_check(struct pt_regs * regs, long error_code) | 144 | static void intel_machine_check(struct pt_regs *regs, long error_code) |
145 | { | 145 | { |
146 | int recover=1; | 146 | int recover = 1; |
147 | u32 alow, ahigh, high, low; | 147 | u32 alow, ahigh, high, low; |
148 | u32 mcgstl, mcgsth; | 148 | u32 mcgstl, mcgsth; |
149 | int i; | 149 | int i; |
150 | 150 | ||
151 | rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth); | 151 | rdmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
152 | if (mcgstl & (1<<0)) /* Recoverable ? */ | 152 | if (mcgstl & (1<<0)) /* Recoverable ? */ |
153 | recover=0; | 153 | recover = 0; |
154 | 154 | ||
155 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", | 155 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", |
156 | smp_processor_id(), mcgsth, mcgstl); | 156 | smp_processor_id(), mcgsth, mcgstl); |
@@ -191,20 +191,20 @@ static void intel_machine_check(struct pt_regs * regs, long error_code) | |||
191 | } | 191 | } |
192 | 192 | ||
193 | if (recover & 2) | 193 | if (recover & 2) |
194 | panic ("CPU context corrupt"); | 194 | panic("CPU context corrupt"); |
195 | if (recover & 1) | 195 | if (recover & 1) |
196 | panic ("Unable to continue"); | 196 | panic("Unable to continue"); |
197 | 197 | ||
198 | printk(KERN_EMERG "Attempting to continue.\n"); | 198 | printk(KERN_EMERG "Attempting to continue.\n"); |
199 | /* | 199 | /* |
200 | * Do not clear the MSR_IA32_MCi_STATUS if the error is not | 200 | * Do not clear the MSR_IA32_MCi_STATUS if the error is not |
201 | * recoverable/continuable.This will allow BIOS to look at the MSRs | 201 | * recoverable/continuable.This will allow BIOS to look at the MSRs |
202 | * for errors if the OS could not log the error. | 202 | * for errors if the OS could not log the error. |
203 | */ | 203 | */ |
204 | for (i=0; i<nr_mce_banks; i++) { | 204 | for (i = 0; i < nr_mce_banks; i++) { |
205 | u32 msr; | 205 | u32 msr; |
206 | msr = MSR_IA32_MC0_STATUS+i*4; | 206 | msr = MSR_IA32_MC0_STATUS+i*4; |
207 | rdmsr (msr, low, high); | 207 | rdmsr(msr, low, high); |
208 | if (high&(1<<31)) { | 208 | if (high&(1<<31)) { |
209 | /* Clear it */ | 209 | /* Clear it */ |
210 | wrmsr(msr, 0UL, 0UL); | 210 | wrmsr(msr, 0UL, 0UL); |
@@ -214,7 +214,7 @@ static void intel_machine_check(struct pt_regs * regs, long error_code) | |||
214 | } | 214 | } |
215 | } | 215 | } |
216 | mcgstl &= ~(1<<2); | 216 | mcgstl &= ~(1<<2); |
217 | wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth); | 217 | wrmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
218 | } | 218 | } |
219 | 219 | ||
220 | 220 | ||
@@ -222,30 +222,30 @@ void intel_p4_mcheck_init(struct cpuinfo_x86 *c) | |||
222 | { | 222 | { |
223 | u32 l, h; | 223 | u32 l, h; |
224 | int i; | 224 | int i; |
225 | 225 | ||
226 | machine_check_vector = intel_machine_check; | 226 | machine_check_vector = intel_machine_check; |
227 | wmb(); | 227 | wmb(); |
228 | 228 | ||
229 | printk (KERN_INFO "Intel machine check architecture supported.\n"); | 229 | printk(KERN_INFO "Intel machine check architecture supported.\n"); |
230 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 230 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
231 | if (l & (1<<8)) /* Control register present ? */ | 231 | if (l & (1<<8)) /* Control register present ? */ |
232 | wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 232 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
233 | nr_mce_banks = l & 0xff; | 233 | nr_mce_banks = l & 0xff; |
234 | 234 | ||
235 | for (i=0; i<nr_mce_banks; i++) { | 235 | for (i = 0; i < nr_mce_banks; i++) { |
236 | wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); | 236 | wrmsr(MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); |
237 | wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); | 237 | wrmsr(MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); |
238 | } | 238 | } |
239 | 239 | ||
240 | set_in_cr4 (X86_CR4_MCE); | 240 | set_in_cr4(X86_CR4_MCE); |
241 | printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", | 241 | printk(KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", |
242 | smp_processor_id()); | 242 | smp_processor_id()); |
243 | 243 | ||
244 | /* Check for P4/Xeon extended MCE MSRs */ | 244 | /* Check for P4/Xeon extended MCE MSRs */ |
245 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 245 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
246 | if (l & (1<<9)) {/* MCG_EXT_P */ | 246 | if (l & (1<<9)) {/* MCG_EXT_P */ |
247 | mce_num_extended_msrs = (l >> 16) & 0xff; | 247 | mce_num_extended_msrs = (l >> 16) & 0xff; |
248 | printk (KERN_INFO "CPU%d: Intel P4/Xeon Extended MCE MSRs (%d)" | 248 | printk(KERN_INFO "CPU%d: Intel P4/Xeon Extended MCE MSRs (%d)" |
249 | " available\n", | 249 | " available\n", |
250 | smp_processor_id(), mce_num_extended_msrs); | 250 | smp_processor_id(), mce_num_extended_msrs); |
251 | 251 | ||
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 9f51e1ea9e82..84fd9f2a28ff 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c | |||
@@ -98,17 +98,6 @@ static void __init nvidia_bugs(int num, int slot, int func) | |||
98 | 98 | ||
99 | } | 99 | } |
100 | 100 | ||
101 | static void __init ati_bugs(int num, int slot, int func) | ||
102 | { | ||
103 | #ifdef CONFIG_X86_IO_APIC | ||
104 | if (timer_over_8254 == 1) { | ||
105 | timer_over_8254 = 0; | ||
106 | printk(KERN_INFO | ||
107 | "ATI board detected. Disabling timer routing over 8254.\n"); | ||
108 | } | ||
109 | #endif | ||
110 | } | ||
111 | |||
112 | #define QFLAG_APPLY_ONCE 0x1 | 101 | #define QFLAG_APPLY_ONCE 0x1 |
113 | #define QFLAG_APPLIED 0x2 | 102 | #define QFLAG_APPLIED 0x2 |
114 | #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) | 103 | #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) |
@@ -126,8 +115,6 @@ static struct chipset early_qrk[] __initdata = { | |||
126 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs }, | 115 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs }, |
127 | { PCI_VENDOR_ID_VIA, PCI_ANY_ID, | 116 | { PCI_VENDOR_ID_VIA, PCI_ANY_ID, |
128 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, via_bugs }, | 117 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, via_bugs }, |
129 | { PCI_VENDOR_ID_ATI, PCI_ANY_ID, | ||
130 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, ati_bugs }, | ||
131 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, | 118 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, |
132 | PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config }, | 119 | PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config }, |
133 | {} | 120 | {} |
diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c index 5d23d85624d4..4b63c8e1f13b 100644 --- a/arch/x86/kernel/efi_32.c +++ b/arch/x86/kernel/efi_32.c | |||
@@ -49,13 +49,13 @@ void efi_call_phys_prelog(void) | |||
49 | local_irq_save(efi_rt_eflags); | 49 | local_irq_save(efi_rt_eflags); |
50 | 50 | ||
51 | /* | 51 | /* |
52 | * If I don't have PSE, I should just duplicate two entries in page | 52 | * If I don't have PAE, I should just duplicate two entries in page |
53 | * directory. If I have PSE, I just need to duplicate one entry in | 53 | * directory. If I have PAE, I just need to duplicate one entry in |
54 | * page directory. | 54 | * page directory. |
55 | */ | 55 | */ |
56 | cr4 = read_cr4(); | 56 | cr4 = read_cr4(); |
57 | 57 | ||
58 | if (cr4 & X86_CR4_PSE) { | 58 | if (cr4 & X86_CR4_PAE) { |
59 | efi_bak_pg_dir_pointer[0].pgd = | 59 | efi_bak_pg_dir_pointer[0].pgd = |
60 | swapper_pg_dir[pgd_index(0)].pgd; | 60 | swapper_pg_dir[pgd_index(0)].pgd; |
61 | swapper_pg_dir[0].pgd = | 61 | swapper_pg_dir[0].pgd = |
@@ -93,7 +93,7 @@ void efi_call_phys_epilog(void) | |||
93 | 93 | ||
94 | cr4 = read_cr4(); | 94 | cr4 = read_cr4(); |
95 | 95 | ||
96 | if (cr4 & X86_CR4_PSE) { | 96 | if (cr4 & X86_CR4_PAE) { |
97 | swapper_pg_dir[pgd_index(0)].pgd = | 97 | swapper_pg_dir[pgd_index(0)].pgd = |
98 | efi_bak_pg_dir_pointer[0].pgd; | 98 | efi_bak_pg_dir_pointer[0].pgd; |
99 | } else { | 99 | } else { |
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 2a609dc3271c..c778e4fa55a2 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -248,6 +248,7 @@ ENTRY(resume_userspace) | |||
248 | DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt | 248 | DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt |
249 | # setting need_resched or sigpending | 249 | # setting need_resched or sigpending |
250 | # between sampling and the iret | 250 | # between sampling and the iret |
251 | TRACE_IRQS_OFF | ||
251 | movl TI_flags(%ebp), %ecx | 252 | movl TI_flags(%ebp), %ecx |
252 | andl $_TIF_WORK_MASK, %ecx # is there any work to be done on | 253 | andl $_TIF_WORK_MASK, %ecx # is there any work to be done on |
253 | # int/exception return? | 254 | # int/exception return? |
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 556a8df522a7..5cf0aa993f4f 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -420,7 +420,6 @@ END(\label) | |||
420 | PTREGSCALL stub_clone, sys_clone, %r8 | 420 | PTREGSCALL stub_clone, sys_clone, %r8 |
421 | PTREGSCALL stub_fork, sys_fork, %rdi | 421 | PTREGSCALL stub_fork, sys_fork, %rdi |
422 | PTREGSCALL stub_vfork, sys_vfork, %rdi | 422 | PTREGSCALL stub_vfork, sys_vfork, %rdi |
423 | PTREGSCALL stub_rt_sigsuspend, sys_rt_sigsuspend, %rdx | ||
424 | PTREGSCALL stub_sigaltstack, sys_sigaltstack, %rdx | 423 | PTREGSCALL stub_sigaltstack, sys_sigaltstack, %rdx |
425 | PTREGSCALL stub_iopl, sys_iopl, %rsi | 424 | PTREGSCALL stub_iopl, sys_iopl, %rsi |
426 | 425 | ||
@@ -1120,10 +1119,6 @@ ENTRY(coprocessor_segment_overrun) | |||
1120 | zeroentry do_coprocessor_segment_overrun | 1119 | zeroentry do_coprocessor_segment_overrun |
1121 | END(coprocessor_segment_overrun) | 1120 | END(coprocessor_segment_overrun) |
1122 | 1121 | ||
1123 | ENTRY(reserved) | ||
1124 | zeroentry do_reserved | ||
1125 | END(reserved) | ||
1126 | |||
1127 | /* runs on exception stack */ | 1122 | /* runs on exception stack */ |
1128 | ENTRY(double_fault) | 1123 | ENTRY(double_fault) |
1129 | XCPT_FRAME | 1124 | XCPT_FRAME |
diff --git a/arch/x86/kernel/geode_32.c b/arch/x86/kernel/geode_32.c index e8edd63ab000..9b08e852fd1a 100644 --- a/arch/x86/kernel/geode_32.c +++ b/arch/x86/kernel/geode_32.c | |||
@@ -166,6 +166,8 @@ int geode_has_vsa2(void) | |||
166 | static int has_vsa2 = -1; | 166 | static int has_vsa2 = -1; |
167 | 167 | ||
168 | if (has_vsa2 == -1) { | 168 | if (has_vsa2 == -1) { |
169 | u16 val; | ||
170 | |||
169 | /* | 171 | /* |
170 | * The VSA has virtual registers that we can query for a | 172 | * The VSA has virtual registers that we can query for a |
171 | * signature. | 173 | * signature. |
@@ -173,7 +175,8 @@ int geode_has_vsa2(void) | |||
173 | outw(VSA_VR_UNLOCK, VSA_VRC_INDEX); | 175 | outw(VSA_VR_UNLOCK, VSA_VRC_INDEX); |
174 | outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX); | 176 | outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX); |
175 | 177 | ||
176 | has_vsa2 = (inw(VSA_VRC_DATA) == VSA_SIG); | 178 | val = inw(VSA_VRC_DATA); |
179 | has_vsa2 = (val == AMD_VSA_SIG || val == GSW_VSA_SIG); | ||
177 | } | 180 | } |
178 | 181 | ||
179 | return has_vsa2; | 182 | return has_vsa2; |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index b2cc73768a9d..f7357cc0162c 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -189,7 +189,7 @@ default_entry: | |||
189 | * this stage. | 189 | * this stage. |
190 | */ | 190 | */ |
191 | 191 | ||
192 | #define KPMDS ((0x100000000-__PAGE_OFFSET) >> 30) /* Number of kernel PMDs */ | 192 | #define KPMDS (((-__PAGE_OFFSET) >> 30) & 3) /* Number of kernel PMDs */ |
193 | 193 | ||
194 | xorl %ebx,%ebx /* %ebx is kept at zero */ | 194 | xorl %ebx,%ebx /* %ebx is kept at zero */ |
195 | 195 | ||
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 10a1955bb1d1..263b9d14753e 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
19 | #include <asm/msr.h> | 19 | #include <asm/msr.h> |
20 | #include <asm/cache.h> | 20 | #include <asm/cache.h> |
21 | #include <asm/processor-flags.h> | ||
21 | 22 | ||
22 | #ifdef CONFIG_PARAVIRT | 23 | #ifdef CONFIG_PARAVIRT |
23 | #include <asm/asm-offsets.h> | 24 | #include <asm/asm-offsets.h> |
@@ -128,7 +129,7 @@ ident_complete: | |||
128 | /* Fixup phys_base */ | 129 | /* Fixup phys_base */ |
129 | addq %rbp, phys_base(%rip) | 130 | addq %rbp, phys_base(%rip) |
130 | 131 | ||
131 | #ifdef CONFIG_SMP | 132 | #ifdef CONFIG_X86_TRAMPOLINE |
132 | addq %rbp, trampoline_level4_pgt + 0(%rip) | 133 | addq %rbp, trampoline_level4_pgt + 0(%rip) |
133 | addq %rbp, trampoline_level4_pgt + (511*8)(%rip) | 134 | addq %rbp, trampoline_level4_pgt + (511*8)(%rip) |
134 | #endif | 135 | #endif |
@@ -154,9 +155,7 @@ ENTRY(secondary_startup_64) | |||
154 | */ | 155 | */ |
155 | 156 | ||
156 | /* Enable PAE mode and PGE */ | 157 | /* Enable PAE mode and PGE */ |
157 | xorq %rax, %rax | 158 | movl $(X86_CR4_PAE | X86_CR4_PGE), %eax |
158 | btsq $5, %rax | ||
159 | btsq $7, %rax | ||
160 | movq %rax, %cr4 | 159 | movq %rax, %cr4 |
161 | 160 | ||
162 | /* Setup early boot stage 4 level pagetables. */ | 161 | /* Setup early boot stage 4 level pagetables. */ |
@@ -184,14 +183,10 @@ ENTRY(secondary_startup_64) | |||
184 | 1: wrmsr /* Make changes effective */ | 183 | 1: wrmsr /* Make changes effective */ |
185 | 184 | ||
186 | /* Setup cr0 */ | 185 | /* Setup cr0 */ |
187 | #define CR0_PM 1 /* protected mode */ | 186 | #define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \ |
188 | #define CR0_MP (1<<1) | 187 | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \ |
189 | #define CR0_ET (1<<4) | 188 | X86_CR0_PG) |
190 | #define CR0_NE (1<<5) | 189 | movl $CR0_STATE, %eax |
191 | #define CR0_WP (1<<16) | ||
192 | #define CR0_AM (1<<18) | ||
193 | #define CR0_PAGING (1<<31) | ||
194 | movl $CR0_PM|CR0_MP|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PAGING,%eax | ||
195 | /* Make changes effective */ | 190 | /* Make changes effective */ |
196 | movq %rax, %cr0 | 191 | movq %rax, %cr0 |
197 | 192 | ||
@@ -327,11 +322,11 @@ early_idt_ripmsg: | |||
327 | ENTRY(name) | 322 | ENTRY(name) |
328 | 323 | ||
329 | /* Automate the creation of 1 to 1 mapping pmd entries */ | 324 | /* Automate the creation of 1 to 1 mapping pmd entries */ |
330 | #define PMDS(START, PERM, COUNT) \ | 325 | #define PMDS(START, PERM, COUNT) \ |
331 | i = 0 ; \ | 326 | i = 0 ; \ |
332 | .rept (COUNT) ; \ | 327 | .rept (COUNT) ; \ |
333 | .quad (START) + (i << 21) + (PERM) ; \ | 328 | .quad (START) + (i << PMD_SHIFT) + (PERM) ; \ |
334 | i = i + 1 ; \ | 329 | i = i + 1 ; \ |
335 | .endr | 330 | .endr |
336 | 331 | ||
337 | /* | 332 | /* |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 9b5cfcdfc426..ea230ec69057 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | /* FSEC = 10^-15 | 18 | /* FSEC = 10^-15 |
19 | NSEC = 10^-9 */ | 19 | NSEC = 10^-9 */ |
20 | #define FSEC_PER_NSEC 1000000 | 20 | #define FSEC_PER_NSEC 1000000L |
21 | 21 | ||
22 | /* | 22 | /* |
23 | * HPET address is set in acpi/boot.c, when an ACPI entry exists | 23 | * HPET address is set in acpi/boot.c, when an ACPI entry exists |
@@ -206,20 +206,19 @@ static void hpet_enable_legacy_int(void) | |||
206 | 206 | ||
207 | static void hpet_legacy_clockevent_register(void) | 207 | static void hpet_legacy_clockevent_register(void) |
208 | { | 208 | { |
209 | uint64_t hpet_freq; | ||
210 | |||
211 | /* Start HPET legacy interrupts */ | 209 | /* Start HPET legacy interrupts */ |
212 | hpet_enable_legacy_int(); | 210 | hpet_enable_legacy_int(); |
213 | 211 | ||
214 | /* | 212 | /* |
215 | * The period is a femto seconds value. We need to calculate the | 213 | * The mult factor is defined as (include/linux/clockchips.h) |
216 | * scaled math multiplication factor for nanosecond to hpet tick | 214 | * mult/2^shift = cyc/ns (in contrast to ns/cyc in clocksource.h) |
217 | * conversion. | 215 | * hpet_period is in units of femtoseconds (per cycle), so |
216 | * mult/2^shift = cyc/ns = 10^6/hpet_period | ||
217 | * mult = (10^6 * 2^shift)/hpet_period | ||
218 | * mult = (FSEC_PER_NSEC << hpet_clockevent.shift)/hpet_period | ||
218 | */ | 219 | */ |
219 | hpet_freq = 1000000000000000ULL; | 220 | hpet_clockevent.mult = div_sc((unsigned long) FSEC_PER_NSEC, |
220 | do_div(hpet_freq, hpet_period); | 221 | hpet_period, hpet_clockevent.shift); |
221 | hpet_clockevent.mult = div_sc((unsigned long) hpet_freq, | ||
222 | NSEC_PER_SEC, hpet_clockevent.shift); | ||
223 | /* Calculate the min / max delta */ | 222 | /* Calculate the min / max delta */ |
224 | hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF, | 223 | hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF, |
225 | &hpet_clockevent); | 224 | &hpet_clockevent); |
@@ -324,7 +323,7 @@ static struct clocksource clocksource_hpet = { | |||
324 | 323 | ||
325 | static int hpet_clocksource_register(void) | 324 | static int hpet_clocksource_register(void) |
326 | { | 325 | { |
327 | u64 tmp, start, now; | 326 | u64 start, now; |
328 | cycle_t t1; | 327 | cycle_t t1; |
329 | 328 | ||
330 | /* Start the counter */ | 329 | /* Start the counter */ |
@@ -351,21 +350,15 @@ static int hpet_clocksource_register(void) | |||
351 | return -ENODEV; | 350 | return -ENODEV; |
352 | } | 351 | } |
353 | 352 | ||
354 | /* Initialize and register HPET clocksource | 353 | /* |
355 | * | 354 | * The definition of mult is (include/linux/clocksource.h) |
356 | * hpet period is in femto seconds per cycle | 355 | * mult/2^shift = ns/cyc and hpet_period is in units of fsec/cyc |
357 | * so we need to convert this to ns/cyc units | 356 | * so we first need to convert hpet_period to ns/cyc units: |
358 | * approximated by mult/2^shift | 357 | * mult/2^shift = ns/cyc = hpet_period/10^6 |
359 | * | 358 | * mult = (hpet_period * 2^shift)/10^6 |
360 | * fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift | 359 | * mult = (hpet_period << shift)/FSEC_PER_NSEC |
361 | * fsec/cyc * 1ns/1000000fsec * 2^shift = mult | ||
362 | * fsec/cyc * 2^shift * 1nsec/1000000fsec = mult | ||
363 | * (fsec/cyc << shift)/1000000 = mult | ||
364 | * (hpet_period << shift)/FSEC_PER_NSEC = mult | ||
365 | */ | 360 | */ |
366 | tmp = (u64)hpet_period << HPET_SHIFT; | 361 | clocksource_hpet.mult = div_sc(hpet_period, FSEC_PER_NSEC, HPET_SHIFT); |
367 | do_div(tmp, FSEC_PER_NSEC); | ||
368 | clocksource_hpet.mult = (u32)tmp; | ||
369 | 362 | ||
370 | clocksource_register(&clocksource_hpet); | 363 | clocksource_register(&clocksource_hpet); |
371 | 364 | ||
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index e03cc952f233..95e80e5033c3 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c | |||
@@ -56,6 +56,11 @@ void __cpuinit mxcsr_feature_mask_init(void) | |||
56 | 56 | ||
57 | void __init init_thread_xstate(void) | 57 | void __init init_thread_xstate(void) |
58 | { | 58 | { |
59 | if (!HAVE_HWFP) { | ||
60 | xstate_size = sizeof(struct i387_soft_struct); | ||
61 | return; | ||
62 | } | ||
63 | |||
59 | if (cpu_has_fxsr) | 64 | if (cpu_has_fxsr) |
60 | xstate_size = sizeof(struct i387_fxsave_struct); | 65 | xstate_size = sizeof(struct i387_fxsave_struct); |
61 | #ifdef CONFIG_X86_32 | 66 | #ifdef CONFIG_X86_32 |
@@ -94,7 +99,7 @@ void __cpuinit fpu_init(void) | |||
94 | int init_fpu(struct task_struct *tsk) | 99 | int init_fpu(struct task_struct *tsk) |
95 | { | 100 | { |
96 | if (tsk_used_math(tsk)) { | 101 | if (tsk_used_math(tsk)) { |
97 | if (tsk == current) | 102 | if (HAVE_HWFP && tsk == current) |
98 | unlazy_fpu(tsk); | 103 | unlazy_fpu(tsk); |
99 | return 0; | 104 | return 0; |
100 | } | 105 | } |
@@ -109,6 +114,15 @@ int init_fpu(struct task_struct *tsk) | |||
109 | return -ENOMEM; | 114 | return -ENOMEM; |
110 | } | 115 | } |
111 | 116 | ||
117 | #ifdef CONFIG_X86_32 | ||
118 | if (!HAVE_HWFP) { | ||
119 | memset(tsk->thread.xstate, 0, xstate_size); | ||
120 | finit(); | ||
121 | set_stopped_child_used_math(tsk); | ||
122 | return 0; | ||
123 | } | ||
124 | #endif | ||
125 | |||
112 | if (cpu_has_fxsr) { | 126 | if (cpu_has_fxsr) { |
113 | struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave; | 127 | struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave; |
114 | 128 | ||
@@ -148,7 +162,7 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset, | |||
148 | int ret; | 162 | int ret; |
149 | 163 | ||
150 | if (!cpu_has_fxsr) | 164 | if (!cpu_has_fxsr) |
151 | return -ENODEV; | 165 | return -EIO; |
152 | 166 | ||
153 | ret = init_fpu(target); | 167 | ret = init_fpu(target); |
154 | if (ret) | 168 | if (ret) |
@@ -165,7 +179,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset, | |||
165 | int ret; | 179 | int ret; |
166 | 180 | ||
167 | if (!cpu_has_fxsr) | 181 | if (!cpu_has_fxsr) |
168 | return -ENODEV; | 182 | return -EIO; |
169 | 183 | ||
170 | ret = init_fpu(target); | 184 | ret = init_fpu(target); |
171 | if (ret) | 185 | if (ret) |
@@ -330,13 +344,13 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset, | |||
330 | struct user_i387_ia32_struct env; | 344 | struct user_i387_ia32_struct env; |
331 | int ret; | 345 | int ret; |
332 | 346 | ||
333 | if (!HAVE_HWFP) | ||
334 | return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf); | ||
335 | |||
336 | ret = init_fpu(target); | 347 | ret = init_fpu(target); |
337 | if (ret) | 348 | if (ret) |
338 | return ret; | 349 | return ret; |
339 | 350 | ||
351 | if (!HAVE_HWFP) | ||
352 | return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf); | ||
353 | |||
340 | if (!cpu_has_fxsr) { | 354 | if (!cpu_has_fxsr) { |
341 | return user_regset_copyout(&pos, &count, &kbuf, &ubuf, | 355 | return user_regset_copyout(&pos, &count, &kbuf, &ubuf, |
342 | &target->thread.xstate->fsave, 0, | 356 | &target->thread.xstate->fsave, 0, |
@@ -360,15 +374,15 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset, | |||
360 | struct user_i387_ia32_struct env; | 374 | struct user_i387_ia32_struct env; |
361 | int ret; | 375 | int ret; |
362 | 376 | ||
363 | if (!HAVE_HWFP) | ||
364 | return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf); | ||
365 | |||
366 | ret = init_fpu(target); | 377 | ret = init_fpu(target); |
367 | if (ret) | 378 | if (ret) |
368 | return ret; | 379 | return ret; |
369 | 380 | ||
370 | set_stopped_child_used_math(target); | 381 | set_stopped_child_used_math(target); |
371 | 382 | ||
383 | if (!HAVE_HWFP) | ||
384 | return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf); | ||
385 | |||
372 | if (!cpu_has_fxsr) { | 386 | if (!cpu_has_fxsr) { |
373 | return user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 387 | return user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
374 | &target->thread.xstate->fsave, 0, -1); | 388 | &target->thread.xstate->fsave, 0, -1); |
@@ -474,18 +488,18 @@ static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf) | |||
474 | int restore_i387_ia32(struct _fpstate_ia32 __user *buf) | 488 | int restore_i387_ia32(struct _fpstate_ia32 __user *buf) |
475 | { | 489 | { |
476 | int err; | 490 | int err; |
491 | struct task_struct *tsk = current; | ||
477 | 492 | ||
478 | if (HAVE_HWFP) { | 493 | if (HAVE_HWFP) |
479 | struct task_struct *tsk = current; | ||
480 | |||
481 | clear_fpu(tsk); | 494 | clear_fpu(tsk); |
482 | 495 | ||
483 | if (!used_math()) { | 496 | if (!used_math()) { |
484 | err = init_fpu(tsk); | 497 | err = init_fpu(tsk); |
485 | if (err) | 498 | if (err) |
486 | return err; | 499 | return err; |
487 | } | 500 | } |
488 | 501 | ||
502 | if (HAVE_HWFP) { | ||
489 | if (cpu_has_fxsr) | 503 | if (cpu_has_fxsr) |
490 | err = restore_i387_fxsave(buf); | 504 | err = restore_i387_fxsave(buf); |
491 | else | 505 | else |
diff --git a/arch/x86/kernel/i8259_32.c b/arch/x86/kernel/i8259.c index fe631967d625..7a0fda8f01b5 100644 --- a/arch/x86/kernel/i8259_32.c +++ b/arch/x86/kernel/i8259.c | |||
@@ -1,8 +1,10 @@ | |||
1 | #include <linux/linkage.h> | ||
1 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
2 | #include <linux/signal.h> | 3 | #include <linux/signal.h> |
3 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
4 | #include <linux/ioport.h> | 5 | #include <linux/ioport.h> |
5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
7 | #include <linux/timex.h> | ||
6 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
7 | #include <linux/random.h> | 9 | #include <linux/random.h> |
8 | #include <linux/init.h> | 10 | #include <linux/init.h> |
@@ -10,10 +12,12 @@ | |||
10 | #include <linux/sysdev.h> | 12 | #include <linux/sysdev.h> |
11 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
12 | 14 | ||
15 | #include <asm/acpi.h> | ||
13 | #include <asm/atomic.h> | 16 | #include <asm/atomic.h> |
14 | #include <asm/system.h> | 17 | #include <asm/system.h> |
15 | #include <asm/io.h> | 18 | #include <asm/io.h> |
16 | #include <asm/timer.h> | 19 | #include <asm/timer.h> |
20 | #include <asm/hw_irq.h> | ||
17 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
18 | #include <asm/delay.h> | 22 | #include <asm/delay.h> |
19 | #include <asm/desc.h> | 23 | #include <asm/desc.h> |
@@ -32,7 +36,7 @@ static int i8259A_auto_eoi; | |||
32 | DEFINE_SPINLOCK(i8259A_lock); | 36 | DEFINE_SPINLOCK(i8259A_lock); |
33 | static void mask_and_ack_8259A(unsigned int); | 37 | static void mask_and_ack_8259A(unsigned int); |
34 | 38 | ||
35 | static struct irq_chip i8259A_chip = { | 39 | struct irq_chip i8259A_chip = { |
36 | .name = "XT-PIC", | 40 | .name = "XT-PIC", |
37 | .mask = disable_8259A_irq, | 41 | .mask = disable_8259A_irq, |
38 | .disable = disable_8259A_irq, | 42 | .disable = disable_8259A_irq, |
@@ -125,14 +129,14 @@ static inline int i8259A_irq_real(unsigned int irq) | |||
125 | int irqmask = 1<<irq; | 129 | int irqmask = 1<<irq; |
126 | 130 | ||
127 | if (irq < 8) { | 131 | if (irq < 8) { |
128 | outb(0x0B,PIC_MASTER_CMD); /* ISR register */ | 132 | outb(0x0B, PIC_MASTER_CMD); /* ISR register */ |
129 | value = inb(PIC_MASTER_CMD) & irqmask; | 133 | value = inb(PIC_MASTER_CMD) & irqmask; |
130 | outb(0x0A,PIC_MASTER_CMD); /* back to the IRR register */ | 134 | outb(0x0A, PIC_MASTER_CMD); /* back to the IRR register */ |
131 | return value; | 135 | return value; |
132 | } | 136 | } |
133 | outb(0x0B,PIC_SLAVE_CMD); /* ISR register */ | 137 | outb(0x0B, PIC_SLAVE_CMD); /* ISR register */ |
134 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); | 138 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); |
135 | outb(0x0A,PIC_SLAVE_CMD); /* back to the IRR register */ | 139 | outb(0x0A, PIC_SLAVE_CMD); /* back to the IRR register */ |
136 | return value; | 140 | return value; |
137 | } | 141 | } |
138 | 142 | ||
@@ -171,12 +175,14 @@ handle_real_irq: | |||
171 | if (irq & 8) { | 175 | if (irq & 8) { |
172 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ | 176 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ |
173 | outb(cached_slave_mask, PIC_SLAVE_IMR); | 177 | outb(cached_slave_mask, PIC_SLAVE_IMR); |
174 | outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ | 178 | /* 'Specific EOI' to slave */ |
175 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ | 179 | outb(0x60+(irq&7), PIC_SLAVE_CMD); |
180 | /* 'Specific EOI' to master-IRQ2 */ | ||
181 | outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); | ||
176 | } else { | 182 | } else { |
177 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ | 183 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ |
178 | outb(cached_master_mask, PIC_MASTER_IMR); | 184 | outb(cached_master_mask, PIC_MASTER_IMR); |
179 | outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */ | 185 | outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */ |
180 | } | 186 | } |
181 | spin_unlock_irqrestore(&i8259A_lock, flags); | 187 | spin_unlock_irqrestore(&i8259A_lock, flags); |
182 | return; | 188 | return; |
@@ -199,7 +205,8 @@ spurious_8259A_irq: | |||
199 | * lets ACK and report it. [once per IRQ] | 205 | * lets ACK and report it. [once per IRQ] |
200 | */ | 206 | */ |
201 | if (!(spurious_irq_mask & irqmask)) { | 207 | if (!(spurious_irq_mask & irqmask)) { |
202 | printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq); | 208 | printk(KERN_DEBUG |
209 | "spurious 8259A interrupt: IRQ%d.\n", irq); | ||
203 | spurious_irq_mask |= irqmask; | 210 | spurious_irq_mask |= irqmask; |
204 | } | 211 | } |
205 | atomic_inc(&irq_err_count); | 212 | atomic_inc(&irq_err_count); |
@@ -290,17 +297,34 @@ void init_8259A(int auto_eoi) | |||
290 | * outb_pic - this has to work on a wide range of PC hardware. | 297 | * outb_pic - this has to work on a wide range of PC hardware. |
291 | */ | 298 | */ |
292 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ | 299 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ |
300 | #ifndef CONFIG_X86_64 | ||
293 | outb_pic(0x20 + 0, PIC_MASTER_IMR); /* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */ | 301 | outb_pic(0x20 + 0, PIC_MASTER_IMR); /* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */ |
294 | outb_pic(1U << PIC_CASCADE_IR, PIC_MASTER_IMR); /* 8259A-1 (the master) has a slave on IR2 */ | 302 | outb_pic(1U << PIC_CASCADE_IR, PIC_MASTER_IMR); /* 8259A-1 (the master) has a slave on IR2 */ |
303 | #else /* CONFIG_X86_64 */ | ||
304 | /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */ | ||
305 | outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR); | ||
306 | /* 8259A-1 (the master) has a slave on IR2 */ | ||
307 | outb_pic(0x04, PIC_MASTER_IMR); | ||
308 | #endif /* CONFIG_X86_64 */ | ||
295 | if (auto_eoi) /* master does Auto EOI */ | 309 | if (auto_eoi) /* master does Auto EOI */ |
296 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); | 310 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); |
297 | else /* master expects normal EOI */ | 311 | else /* master expects normal EOI */ |
298 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); | 312 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); |
299 | 313 | ||
300 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ | 314 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ |
315 | #ifndef CONFIG_X86_64 | ||
301 | outb_pic(0x20 + 8, PIC_SLAVE_IMR); /* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */ | 316 | outb_pic(0x20 + 8, PIC_SLAVE_IMR); /* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */ |
302 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); /* 8259A-2 is a slave on master's IR2 */ | 317 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); /* 8259A-2 is a slave on master's IR2 */ |
303 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */ | 318 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */ |
319 | #else /* CONFIG_X86_64 */ | ||
320 | /* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */ | ||
321 | outb_pic(IRQ8_VECTOR, PIC_SLAVE_IMR); | ||
322 | /* 8259A-2 is a slave on master's IR2 */ | ||
323 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); | ||
324 | /* (slave's support for AEOI in flat mode is to be investigated) */ | ||
325 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); | ||
326 | |||
327 | #endif /* CONFIG_X86_64 */ | ||
304 | if (auto_eoi) | 328 | if (auto_eoi) |
305 | /* | 329 | /* |
306 | * In AEOI mode we just have to mask the interrupt | 330 | * In AEOI mode we just have to mask the interrupt |
@@ -317,93 +341,3 @@ void init_8259A(int auto_eoi) | |||
317 | 341 | ||
318 | spin_unlock_irqrestore(&i8259A_lock, flags); | 342 | spin_unlock_irqrestore(&i8259A_lock, flags); |
319 | } | 343 | } |
320 | |||
321 | /* | ||
322 | * Note that on a 486, we don't want to do a SIGFPE on an irq13 | ||
323 | * as the irq is unreliable, and exception 16 works correctly | ||
324 | * (ie as explained in the intel literature). On a 386, you | ||
325 | * can't use exception 16 due to bad IBM design, so we have to | ||
326 | * rely on the less exact irq13. | ||
327 | * | ||
328 | * Careful.. Not only is IRQ13 unreliable, but it is also | ||
329 | * leads to races. IBM designers who came up with it should | ||
330 | * be shot. | ||
331 | */ | ||
332 | |||
333 | |||
334 | static irqreturn_t math_error_irq(int cpl, void *dev_id) | ||
335 | { | ||
336 | extern void math_error(void __user *); | ||
337 | outb(0,0xF0); | ||
338 | if (ignore_fpu_irq || !boot_cpu_data.hard_math) | ||
339 | return IRQ_NONE; | ||
340 | math_error((void __user *)get_irq_regs()->ip); | ||
341 | return IRQ_HANDLED; | ||
342 | } | ||
343 | |||
344 | /* | ||
345 | * New motherboards sometimes make IRQ 13 be a PCI interrupt, | ||
346 | * so allow interrupt sharing. | ||
347 | */ | ||
348 | static struct irqaction fpu_irq = { | ||
349 | .handler = math_error_irq, | ||
350 | .mask = CPU_MASK_NONE, | ||
351 | .name = "fpu", | ||
352 | }; | ||
353 | |||
354 | void __init init_ISA_irqs (void) | ||
355 | { | ||
356 | int i; | ||
357 | |||
358 | #ifdef CONFIG_X86_LOCAL_APIC | ||
359 | init_bsp_APIC(); | ||
360 | #endif | ||
361 | init_8259A(0); | ||
362 | |||
363 | /* | ||
364 | * 16 old-style INTA-cycle interrupts: | ||
365 | */ | ||
366 | for (i = 0; i < 16; i++) { | ||
367 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
368 | handle_level_irq, "XT"); | ||
369 | } | ||
370 | } | ||
371 | |||
372 | /* Overridden in paravirt.c */ | ||
373 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
374 | |||
375 | void __init native_init_IRQ(void) | ||
376 | { | ||
377 | int i; | ||
378 | |||
379 | /* all the set up before the call gates are initialised */ | ||
380 | pre_intr_init_hook(); | ||
381 | |||
382 | /* | ||
383 | * Cover the whole vector space, no vector can escape | ||
384 | * us. (some of these will be overridden and become | ||
385 | * 'special' SMP interrupts) | ||
386 | */ | ||
387 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
388 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
389 | if (i >= NR_IRQS) | ||
390 | break; | ||
391 | /* SYSCALL_VECTOR was reserved in trap_init. */ | ||
392 | if (!test_bit(vector, used_vectors)) | ||
393 | set_intr_gate(vector, interrupt[i]); | ||
394 | } | ||
395 | |||
396 | /* setup after call gates are initialised (usually add in | ||
397 | * the architecture specific gates) | ||
398 | */ | ||
399 | intr_init_hook(); | ||
400 | |||
401 | /* | ||
402 | * External FPU? Set up irq13 if so, for | ||
403 | * original braindamaged IBM FERR coupling. | ||
404 | */ | ||
405 | if (boot_cpu_data.hard_math && !cpu_has_fpu) | ||
406 | setup_irq(FPU_IRQ, &fpu_irq); | ||
407 | |||
408 | irq_ctx_init(smp_processor_id()); | ||
409 | } | ||
diff --git a/arch/x86/kernel/i8259_64.c b/arch/x86/kernel/i8259_64.c deleted file mode 100644 index fa57a1568508..000000000000 --- a/arch/x86/kernel/i8259_64.c +++ /dev/null | |||
@@ -1,512 +0,0 @@ | |||
1 | #include <linux/linkage.h> | ||
2 | #include <linux/errno.h> | ||
3 | #include <linux/signal.h> | ||
4 | #include <linux/sched.h> | ||
5 | #include <linux/ioport.h> | ||
6 | #include <linux/interrupt.h> | ||
7 | #include <linux/timex.h> | ||
8 | #include <linux/slab.h> | ||
9 | #include <linux/random.h> | ||
10 | #include <linux/init.h> | ||
11 | #include <linux/kernel_stat.h> | ||
12 | #include <linux/sysdev.h> | ||
13 | #include <linux/bitops.h> | ||
14 | |||
15 | #include <asm/acpi.h> | ||
16 | #include <asm/atomic.h> | ||
17 | #include <asm/system.h> | ||
18 | #include <asm/io.h> | ||
19 | #include <asm/hw_irq.h> | ||
20 | #include <asm/pgtable.h> | ||
21 | #include <asm/delay.h> | ||
22 | #include <asm/desc.h> | ||
23 | #include <asm/apic.h> | ||
24 | #include <asm/i8259.h> | ||
25 | |||
26 | /* | ||
27 | * Common place to define all x86 IRQ vectors | ||
28 | * | ||
29 | * This builds up the IRQ handler stubs using some ugly macros in irq.h | ||
30 | * | ||
31 | * These macros create the low-level assembly IRQ routines that save | ||
32 | * register context and call do_IRQ(). do_IRQ() then does all the | ||
33 | * operations that are needed to keep the AT (or SMP IOAPIC) | ||
34 | * interrupt-controller happy. | ||
35 | */ | ||
36 | |||
37 | #define BI(x,y) \ | ||
38 | BUILD_IRQ(x##y) | ||
39 | |||
40 | #define BUILD_16_IRQS(x) \ | ||
41 | BI(x,0) BI(x,1) BI(x,2) BI(x,3) \ | ||
42 | BI(x,4) BI(x,5) BI(x,6) BI(x,7) \ | ||
43 | BI(x,8) BI(x,9) BI(x,a) BI(x,b) \ | ||
44 | BI(x,c) BI(x,d) BI(x,e) BI(x,f) | ||
45 | |||
46 | /* | ||
47 | * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts: | ||
48 | * (these are usually mapped to vectors 0x30-0x3f) | ||
49 | */ | ||
50 | |||
51 | /* | ||
52 | * The IO-APIC gives us many more interrupt sources. Most of these | ||
53 | * are unused but an SMP system is supposed to have enough memory ... | ||
54 | * sometimes (mostly wrt. hw bugs) we get corrupted vectors all | ||
55 | * across the spectrum, so we really want to be prepared to get all | ||
56 | * of these. Plus, more powerful systems might have more than 64 | ||
57 | * IO-APIC registers. | ||
58 | * | ||
59 | * (these are usually mapped into the 0x30-0xff vector range) | ||
60 | */ | ||
61 | BUILD_16_IRQS(0x2) BUILD_16_IRQS(0x3) | ||
62 | BUILD_16_IRQS(0x4) BUILD_16_IRQS(0x5) BUILD_16_IRQS(0x6) BUILD_16_IRQS(0x7) | ||
63 | BUILD_16_IRQS(0x8) BUILD_16_IRQS(0x9) BUILD_16_IRQS(0xa) BUILD_16_IRQS(0xb) | ||
64 | BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd) BUILD_16_IRQS(0xe) BUILD_16_IRQS(0xf) | ||
65 | |||
66 | #undef BUILD_16_IRQS | ||
67 | #undef BI | ||
68 | |||
69 | |||
70 | #define IRQ(x,y) \ | ||
71 | IRQ##x##y##_interrupt | ||
72 | |||
73 | #define IRQLIST_16(x) \ | ||
74 | IRQ(x,0), IRQ(x,1), IRQ(x,2), IRQ(x,3), \ | ||
75 | IRQ(x,4), IRQ(x,5), IRQ(x,6), IRQ(x,7), \ | ||
76 | IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \ | ||
77 | IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f) | ||
78 | |||
79 | /* for the irq vectors */ | ||
80 | static void (*__initdata interrupt[NR_VECTORS - FIRST_EXTERNAL_VECTOR])(void) = { | ||
81 | IRQLIST_16(0x2), IRQLIST_16(0x3), | ||
82 | IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7), | ||
83 | IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb), | ||
84 | IRQLIST_16(0xc), IRQLIST_16(0xd), IRQLIST_16(0xe), IRQLIST_16(0xf) | ||
85 | }; | ||
86 | |||
87 | #undef IRQ | ||
88 | #undef IRQLIST_16 | ||
89 | |||
90 | /* | ||
91 | * This is the 'legacy' 8259A Programmable Interrupt Controller, | ||
92 | * present in the majority of PC/AT boxes. | ||
93 | * plus some generic x86 specific things if generic specifics makes | ||
94 | * any sense at all. | ||
95 | * this file should become arch/i386/kernel/irq.c when the old irq.c | ||
96 | * moves to arch independent land | ||
97 | */ | ||
98 | |||
99 | static int i8259A_auto_eoi; | ||
100 | DEFINE_SPINLOCK(i8259A_lock); | ||
101 | static void mask_and_ack_8259A(unsigned int); | ||
102 | |||
103 | static struct irq_chip i8259A_chip = { | ||
104 | .name = "XT-PIC", | ||
105 | .mask = disable_8259A_irq, | ||
106 | .disable = disable_8259A_irq, | ||
107 | .unmask = enable_8259A_irq, | ||
108 | .mask_ack = mask_and_ack_8259A, | ||
109 | }; | ||
110 | |||
111 | /* | ||
112 | * 8259A PIC functions to handle ISA devices: | ||
113 | */ | ||
114 | |||
115 | /* | ||
116 | * This contains the irq mask for both 8259A irq controllers, | ||
117 | */ | ||
118 | unsigned int cached_irq_mask = 0xffff; | ||
119 | |||
120 | /* | ||
121 | * Not all IRQs can be routed through the IO-APIC, eg. on certain (older) | ||
122 | * boards the timer interrupt is not really connected to any IO-APIC pin, | ||
123 | * it's fed to the master 8259A's IR0 line only. | ||
124 | * | ||
125 | * Any '1' bit in this mask means the IRQ is routed through the IO-APIC. | ||
126 | * this 'mixed mode' IRQ handling costs nothing because it's only used | ||
127 | * at IRQ setup time. | ||
128 | */ | ||
129 | unsigned long io_apic_irqs; | ||
130 | |||
131 | void disable_8259A_irq(unsigned int irq) | ||
132 | { | ||
133 | unsigned int mask = 1 << irq; | ||
134 | unsigned long flags; | ||
135 | |||
136 | spin_lock_irqsave(&i8259A_lock, flags); | ||
137 | cached_irq_mask |= mask; | ||
138 | if (irq & 8) | ||
139 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
140 | else | ||
141 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
142 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
143 | } | ||
144 | |||
145 | void enable_8259A_irq(unsigned int irq) | ||
146 | { | ||
147 | unsigned int mask = ~(1 << irq); | ||
148 | unsigned long flags; | ||
149 | |||
150 | spin_lock_irqsave(&i8259A_lock, flags); | ||
151 | cached_irq_mask &= mask; | ||
152 | if (irq & 8) | ||
153 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
154 | else | ||
155 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
156 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
157 | } | ||
158 | |||
159 | int i8259A_irq_pending(unsigned int irq) | ||
160 | { | ||
161 | unsigned int mask = 1<<irq; | ||
162 | unsigned long flags; | ||
163 | int ret; | ||
164 | |||
165 | spin_lock_irqsave(&i8259A_lock, flags); | ||
166 | if (irq < 8) | ||
167 | ret = inb(PIC_MASTER_CMD) & mask; | ||
168 | else | ||
169 | ret = inb(PIC_SLAVE_CMD) & (mask >> 8); | ||
170 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
171 | |||
172 | return ret; | ||
173 | } | ||
174 | |||
175 | void make_8259A_irq(unsigned int irq) | ||
176 | { | ||
177 | disable_irq_nosync(irq); | ||
178 | io_apic_irqs &= ~(1<<irq); | ||
179 | set_irq_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq, | ||
180 | "XT"); | ||
181 | enable_irq(irq); | ||
182 | } | ||
183 | |||
184 | /* | ||
185 | * This function assumes to be called rarely. Switching between | ||
186 | * 8259A registers is slow. | ||
187 | * This has to be protected by the irq controller spinlock | ||
188 | * before being called. | ||
189 | */ | ||
190 | static inline int i8259A_irq_real(unsigned int irq) | ||
191 | { | ||
192 | int value; | ||
193 | int irqmask = 1<<irq; | ||
194 | |||
195 | if (irq < 8) { | ||
196 | outb(0x0B,PIC_MASTER_CMD); /* ISR register */ | ||
197 | value = inb(PIC_MASTER_CMD) & irqmask; | ||
198 | outb(0x0A,PIC_MASTER_CMD); /* back to the IRR register */ | ||
199 | return value; | ||
200 | } | ||
201 | outb(0x0B,PIC_SLAVE_CMD); /* ISR register */ | ||
202 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); | ||
203 | outb(0x0A,PIC_SLAVE_CMD); /* back to the IRR register */ | ||
204 | return value; | ||
205 | } | ||
206 | |||
207 | /* | ||
208 | * Careful! The 8259A is a fragile beast, it pretty | ||
209 | * much _has_ to be done exactly like this (mask it | ||
210 | * first, _then_ send the EOI, and the order of EOI | ||
211 | * to the two 8259s is important! | ||
212 | */ | ||
213 | static void mask_and_ack_8259A(unsigned int irq) | ||
214 | { | ||
215 | unsigned int irqmask = 1 << irq; | ||
216 | unsigned long flags; | ||
217 | |||
218 | spin_lock_irqsave(&i8259A_lock, flags); | ||
219 | /* | ||
220 | * Lightweight spurious IRQ detection. We do not want | ||
221 | * to overdo spurious IRQ handling - it's usually a sign | ||
222 | * of hardware problems, so we only do the checks we can | ||
223 | * do without slowing down good hardware unnecessarily. | ||
224 | * | ||
225 | * Note that IRQ7 and IRQ15 (the two spurious IRQs | ||
226 | * usually resulting from the 8259A-1|2 PICs) occur | ||
227 | * even if the IRQ is masked in the 8259A. Thus we | ||
228 | * can check spurious 8259A IRQs without doing the | ||
229 | * quite slow i8259A_irq_real() call for every IRQ. | ||
230 | * This does not cover 100% of spurious interrupts, | ||
231 | * but should be enough to warn the user that there | ||
232 | * is something bad going on ... | ||
233 | */ | ||
234 | if (cached_irq_mask & irqmask) | ||
235 | goto spurious_8259A_irq; | ||
236 | cached_irq_mask |= irqmask; | ||
237 | |||
238 | handle_real_irq: | ||
239 | if (irq & 8) { | ||
240 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ | ||
241 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
242 | /* 'Specific EOI' to slave */ | ||
243 | outb(0x60+(irq&7),PIC_SLAVE_CMD); | ||
244 | /* 'Specific EOI' to master-IRQ2 */ | ||
245 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); | ||
246 | } else { | ||
247 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ | ||
248 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
249 | /* 'Specific EOI' to master */ | ||
250 | outb(0x60+irq,PIC_MASTER_CMD); | ||
251 | } | ||
252 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
253 | return; | ||
254 | |||
255 | spurious_8259A_irq: | ||
256 | /* | ||
257 | * this is the slow path - should happen rarely. | ||
258 | */ | ||
259 | if (i8259A_irq_real(irq)) | ||
260 | /* | ||
261 | * oops, the IRQ _is_ in service according to the | ||
262 | * 8259A - not spurious, go handle it. | ||
263 | */ | ||
264 | goto handle_real_irq; | ||
265 | |||
266 | { | ||
267 | static int spurious_irq_mask; | ||
268 | /* | ||
269 | * At this point we can be sure the IRQ is spurious, | ||
270 | * lets ACK and report it. [once per IRQ] | ||
271 | */ | ||
272 | if (!(spurious_irq_mask & irqmask)) { | ||
273 | printk(KERN_DEBUG | ||
274 | "spurious 8259A interrupt: IRQ%d.\n", irq); | ||
275 | spurious_irq_mask |= irqmask; | ||
276 | } | ||
277 | atomic_inc(&irq_err_count); | ||
278 | /* | ||
279 | * Theoretically we do not have to handle this IRQ, | ||
280 | * but in Linux this does not cause problems and is | ||
281 | * simpler for us. | ||
282 | */ | ||
283 | goto handle_real_irq; | ||
284 | } | ||
285 | } | ||
286 | |||
287 | static char irq_trigger[2]; | ||
288 | /** | ||
289 | * ELCR registers (0x4d0, 0x4d1) control edge/level of IRQ | ||
290 | */ | ||
291 | static void restore_ELCR(char *trigger) | ||
292 | { | ||
293 | outb(trigger[0], 0x4d0); | ||
294 | outb(trigger[1], 0x4d1); | ||
295 | } | ||
296 | |||
297 | static void save_ELCR(char *trigger) | ||
298 | { | ||
299 | /* IRQ 0,1,2,8,13 are marked as reserved */ | ||
300 | trigger[0] = inb(0x4d0) & 0xF8; | ||
301 | trigger[1] = inb(0x4d1) & 0xDE; | ||
302 | } | ||
303 | |||
304 | static int i8259A_resume(struct sys_device *dev) | ||
305 | { | ||
306 | init_8259A(i8259A_auto_eoi); | ||
307 | restore_ELCR(irq_trigger); | ||
308 | return 0; | ||
309 | } | ||
310 | |||
311 | static int i8259A_suspend(struct sys_device *dev, pm_message_t state) | ||
312 | { | ||
313 | save_ELCR(irq_trigger); | ||
314 | return 0; | ||
315 | } | ||
316 | |||
317 | static int i8259A_shutdown(struct sys_device *dev) | ||
318 | { | ||
319 | /* Put the i8259A into a quiescent state that | ||
320 | * the kernel initialization code can get it | ||
321 | * out of. | ||
322 | */ | ||
323 | outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */ | ||
324 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-1 */ | ||
325 | return 0; | ||
326 | } | ||
327 | |||
328 | static struct sysdev_class i8259_sysdev_class = { | ||
329 | .name = "i8259", | ||
330 | .suspend = i8259A_suspend, | ||
331 | .resume = i8259A_resume, | ||
332 | .shutdown = i8259A_shutdown, | ||
333 | }; | ||
334 | |||
335 | static struct sys_device device_i8259A = { | ||
336 | .id = 0, | ||
337 | .cls = &i8259_sysdev_class, | ||
338 | }; | ||
339 | |||
340 | static int __init i8259A_init_sysfs(void) | ||
341 | { | ||
342 | int error = sysdev_class_register(&i8259_sysdev_class); | ||
343 | if (!error) | ||
344 | error = sysdev_register(&device_i8259A); | ||
345 | return error; | ||
346 | } | ||
347 | |||
348 | device_initcall(i8259A_init_sysfs); | ||
349 | |||
350 | void init_8259A(int auto_eoi) | ||
351 | { | ||
352 | unsigned long flags; | ||
353 | |||
354 | i8259A_auto_eoi = auto_eoi; | ||
355 | |||
356 | spin_lock_irqsave(&i8259A_lock, flags); | ||
357 | |||
358 | outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */ | ||
359 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */ | ||
360 | |||
361 | /* | ||
362 | * outb_pic - this has to work on a wide range of PC hardware. | ||
363 | */ | ||
364 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ | ||
365 | /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */ | ||
366 | outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR); | ||
367 | /* 8259A-1 (the master) has a slave on IR2 */ | ||
368 | outb_pic(0x04, PIC_MASTER_IMR); | ||
369 | if (auto_eoi) /* master does Auto EOI */ | ||
370 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); | ||
371 | else /* master expects normal EOI */ | ||
372 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); | ||
373 | |||
374 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ | ||
375 | /* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */ | ||
376 | outb_pic(IRQ8_VECTOR, PIC_SLAVE_IMR); | ||
377 | /* 8259A-2 is a slave on master's IR2 */ | ||
378 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); | ||
379 | /* (slave's support for AEOI in flat mode is to be investigated) */ | ||
380 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); | ||
381 | |||
382 | if (auto_eoi) | ||
383 | /* | ||
384 | * In AEOI mode we just have to mask the interrupt | ||
385 | * when acking. | ||
386 | */ | ||
387 | i8259A_chip.mask_ack = disable_8259A_irq; | ||
388 | else | ||
389 | i8259A_chip.mask_ack = mask_and_ack_8259A; | ||
390 | |||
391 | udelay(100); /* wait for 8259A to initialize */ | ||
392 | |||
393 | outb(cached_master_mask, PIC_MASTER_IMR); /* restore master IRQ mask */ | ||
394 | outb(cached_slave_mask, PIC_SLAVE_IMR); /* restore slave IRQ mask */ | ||
395 | |||
396 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
397 | } | ||
398 | |||
399 | |||
400 | |||
401 | |||
402 | /* | ||
403 | * IRQ2 is cascade interrupt to second interrupt controller | ||
404 | */ | ||
405 | |||
406 | static struct irqaction irq2 = { | ||
407 | .handler = no_action, | ||
408 | .mask = CPU_MASK_NONE, | ||
409 | .name = "cascade", | ||
410 | }; | ||
411 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | ||
412 | [0 ... IRQ0_VECTOR - 1] = -1, | ||
413 | [IRQ0_VECTOR] = 0, | ||
414 | [IRQ1_VECTOR] = 1, | ||
415 | [IRQ2_VECTOR] = 2, | ||
416 | [IRQ3_VECTOR] = 3, | ||
417 | [IRQ4_VECTOR] = 4, | ||
418 | [IRQ5_VECTOR] = 5, | ||
419 | [IRQ6_VECTOR] = 6, | ||
420 | [IRQ7_VECTOR] = 7, | ||
421 | [IRQ8_VECTOR] = 8, | ||
422 | [IRQ9_VECTOR] = 9, | ||
423 | [IRQ10_VECTOR] = 10, | ||
424 | [IRQ11_VECTOR] = 11, | ||
425 | [IRQ12_VECTOR] = 12, | ||
426 | [IRQ13_VECTOR] = 13, | ||
427 | [IRQ14_VECTOR] = 14, | ||
428 | [IRQ15_VECTOR] = 15, | ||
429 | [IRQ15_VECTOR + 1 ... NR_VECTORS - 1] = -1 | ||
430 | }; | ||
431 | |||
432 | void __init init_ISA_irqs (void) | ||
433 | { | ||
434 | int i; | ||
435 | |||
436 | init_bsp_APIC(); | ||
437 | init_8259A(0); | ||
438 | |||
439 | for (i = 0; i < NR_IRQS; i++) { | ||
440 | irq_desc[i].status = IRQ_DISABLED; | ||
441 | irq_desc[i].action = NULL; | ||
442 | irq_desc[i].depth = 1; | ||
443 | |||
444 | if (i < 16) { | ||
445 | /* | ||
446 | * 16 old-style INTA-cycle interrupts: | ||
447 | */ | ||
448 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
449 | handle_level_irq, "XT"); | ||
450 | } else { | ||
451 | /* | ||
452 | * 'high' PCI IRQs filled in on demand | ||
453 | */ | ||
454 | irq_desc[i].chip = &no_irq_chip; | ||
455 | } | ||
456 | } | ||
457 | } | ||
458 | |||
459 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
460 | |||
461 | void __init native_init_IRQ(void) | ||
462 | { | ||
463 | int i; | ||
464 | |||
465 | init_ISA_irqs(); | ||
466 | /* | ||
467 | * Cover the whole vector space, no vector can escape | ||
468 | * us. (some of these will be overridden and become | ||
469 | * 'special' SMP interrupts) | ||
470 | */ | ||
471 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
472 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
473 | if (vector != IA32_SYSCALL_VECTOR) | ||
474 | set_intr_gate(vector, interrupt[i]); | ||
475 | } | ||
476 | |||
477 | #ifdef CONFIG_SMP | ||
478 | /* | ||
479 | * The reschedule interrupt is a CPU-to-CPU reschedule-helper | ||
480 | * IPI, driven by wakeup. | ||
481 | */ | ||
482 | set_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt); | ||
483 | |||
484 | /* IPIs for invalidation */ | ||
485 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0); | ||
486 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1); | ||
487 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2); | ||
488 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3); | ||
489 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4); | ||
490 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5); | ||
491 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6); | ||
492 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7); | ||
493 | |||
494 | /* IPI for generic function call */ | ||
495 | set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt); | ||
496 | |||
497 | /* Low priority IPI to cleanup after moving an irq */ | ||
498 | set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt); | ||
499 | #endif | ||
500 | set_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | ||
501 | set_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); | ||
502 | |||
503 | /* self generated IPI for local APIC timer */ | ||
504 | set_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); | ||
505 | |||
506 | /* IPI vectors for APIC spurious and error interrupts */ | ||
507 | set_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); | ||
508 | set_intr_gate(ERROR_APIC_VECTOR, error_interrupt); | ||
509 | |||
510 | if (!acpi_ioapic) | ||
511 | setup_irq(2, &irq2); | ||
512 | } | ||
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index a40d54fc1fdd..d4f9df2b022a 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -58,7 +58,7 @@ static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | |||
58 | static DEFINE_SPINLOCK(ioapic_lock); | 58 | static DEFINE_SPINLOCK(ioapic_lock); |
59 | static DEFINE_SPINLOCK(vector_lock); | 59 | static DEFINE_SPINLOCK(vector_lock); |
60 | 60 | ||
61 | int timer_over_8254 __initdata = 1; | 61 | int timer_through_8259 __initdata; |
62 | 62 | ||
63 | /* | 63 | /* |
64 | * Is the SiS APIC rmw bug present ? | 64 | * Is the SiS APIC rmw bug present ? |
@@ -239,7 +239,7 @@ static void __init replace_pin_at_irq(unsigned int irq, | |||
239 | } | 239 | } |
240 | } | 240 | } |
241 | 241 | ||
242 | static void __modify_IO_APIC_irq (unsigned int irq, unsigned long enable, unsigned long disable) | 242 | static void __modify_IO_APIC_irq(unsigned int irq, unsigned long enable, unsigned long disable) |
243 | { | 243 | { |
244 | struct irq_pin_list *entry = irq_2_pin + irq; | 244 | struct irq_pin_list *entry = irq_2_pin + irq; |
245 | unsigned int pin, reg; | 245 | unsigned int pin, reg; |
@@ -259,30 +259,32 @@ static void __modify_IO_APIC_irq (unsigned int irq, unsigned long enable, unsign | |||
259 | } | 259 | } |
260 | 260 | ||
261 | /* mask = 1 */ | 261 | /* mask = 1 */ |
262 | static void __mask_IO_APIC_irq (unsigned int irq) | 262 | static void __mask_IO_APIC_irq(unsigned int irq) |
263 | { | 263 | { |
264 | __modify_IO_APIC_irq(irq, 0x00010000, 0); | 264 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_MASKED, 0); |
265 | } | 265 | } |
266 | 266 | ||
267 | /* mask = 0 */ | 267 | /* mask = 0 */ |
268 | static void __unmask_IO_APIC_irq (unsigned int irq) | 268 | static void __unmask_IO_APIC_irq(unsigned int irq) |
269 | { | 269 | { |
270 | __modify_IO_APIC_irq(irq, 0, 0x00010000); | 270 | __modify_IO_APIC_irq(irq, 0, IO_APIC_REDIR_MASKED); |
271 | } | 271 | } |
272 | 272 | ||
273 | /* mask = 1, trigger = 0 */ | 273 | /* mask = 1, trigger = 0 */ |
274 | static void __mask_and_edge_IO_APIC_irq (unsigned int irq) | 274 | static void __mask_and_edge_IO_APIC_irq(unsigned int irq) |
275 | { | 275 | { |
276 | __modify_IO_APIC_irq(irq, 0x00010000, 0x00008000); | 276 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_MASKED, |
277 | IO_APIC_REDIR_LEVEL_TRIGGER); | ||
277 | } | 278 | } |
278 | 279 | ||
279 | /* mask = 0, trigger = 1 */ | 280 | /* mask = 0, trigger = 1 */ |
280 | static void __unmask_and_level_IO_APIC_irq (unsigned int irq) | 281 | static void __unmask_and_level_IO_APIC_irq(unsigned int irq) |
281 | { | 282 | { |
282 | __modify_IO_APIC_irq(irq, 0x00008000, 0x00010000); | 283 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_LEVEL_TRIGGER, |
284 | IO_APIC_REDIR_MASKED); | ||
283 | } | 285 | } |
284 | 286 | ||
285 | static void mask_IO_APIC_irq (unsigned int irq) | 287 | static void mask_IO_APIC_irq(unsigned int irq) |
286 | { | 288 | { |
287 | unsigned long flags; | 289 | unsigned long flags; |
288 | 290 | ||
@@ -291,7 +293,7 @@ static void mask_IO_APIC_irq (unsigned int irq) | |||
291 | spin_unlock_irqrestore(&ioapic_lock, flags); | 293 | spin_unlock_irqrestore(&ioapic_lock, flags); |
292 | } | 294 | } |
293 | 295 | ||
294 | static void unmask_IO_APIC_irq (unsigned int irq) | 296 | static void unmask_IO_APIC_irq(unsigned int irq) |
295 | { | 297 | { |
296 | unsigned long flags; | 298 | unsigned long flags; |
297 | 299 | ||
@@ -303,7 +305,7 @@ static void unmask_IO_APIC_irq (unsigned int irq) | |||
303 | static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) | 305 | static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) |
304 | { | 306 | { |
305 | struct IO_APIC_route_entry entry; | 307 | struct IO_APIC_route_entry entry; |
306 | 308 | ||
307 | /* Check delivery_mode to be sure we're not clearing an SMI pin */ | 309 | /* Check delivery_mode to be sure we're not clearing an SMI pin */ |
308 | entry = ioapic_read_entry(apic, pin); | 310 | entry = ioapic_read_entry(apic, pin); |
309 | if (entry.delivery_mode == dest_SMI) | 311 | if (entry.delivery_mode == dest_SMI) |
@@ -315,7 +317,7 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) | |||
315 | ioapic_mask_entry(apic, pin); | 317 | ioapic_mask_entry(apic, pin); |
316 | } | 318 | } |
317 | 319 | ||
318 | static void clear_IO_APIC (void) | 320 | static void clear_IO_APIC(void) |
319 | { | 321 | { |
320 | int apic, pin; | 322 | int apic, pin; |
321 | 323 | ||
@@ -332,7 +334,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) | |||
332 | struct irq_pin_list *entry = irq_2_pin + irq; | 334 | struct irq_pin_list *entry = irq_2_pin + irq; |
333 | unsigned int apicid_value; | 335 | unsigned int apicid_value; |
334 | cpumask_t tmp; | 336 | cpumask_t tmp; |
335 | 337 | ||
336 | cpus_and(tmp, cpumask, cpu_online_map); | 338 | cpus_and(tmp, cpumask, cpu_online_map); |
337 | if (cpus_empty(tmp)) | 339 | if (cpus_empty(tmp)) |
338 | tmp = TARGET_CPUS; | 340 | tmp = TARGET_CPUS; |
@@ -361,7 +363,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) | |||
361 | # include <linux/kernel_stat.h> /* kstat */ | 363 | # include <linux/kernel_stat.h> /* kstat */ |
362 | # include <linux/slab.h> /* kmalloc() */ | 364 | # include <linux/slab.h> /* kmalloc() */ |
363 | # include <linux/timer.h> | 365 | # include <linux/timer.h> |
364 | 366 | ||
365 | #define IRQBALANCE_CHECK_ARCH -999 | 367 | #define IRQBALANCE_CHECK_ARCH -999 |
366 | #define MAX_BALANCED_IRQ_INTERVAL (5*HZ) | 368 | #define MAX_BALANCED_IRQ_INTERVAL (5*HZ) |
367 | #define MIN_BALANCED_IRQ_INTERVAL (HZ/2) | 369 | #define MIN_BALANCED_IRQ_INTERVAL (HZ/2) |
@@ -373,14 +375,14 @@ static int physical_balance __read_mostly; | |||
373 | static long balanced_irq_interval __read_mostly = MAX_BALANCED_IRQ_INTERVAL; | 375 | static long balanced_irq_interval __read_mostly = MAX_BALANCED_IRQ_INTERVAL; |
374 | 376 | ||
375 | static struct irq_cpu_info { | 377 | static struct irq_cpu_info { |
376 | unsigned long * last_irq; | 378 | unsigned long *last_irq; |
377 | unsigned long * irq_delta; | 379 | unsigned long *irq_delta; |
378 | unsigned long irq; | 380 | unsigned long irq; |
379 | } irq_cpu_data[NR_CPUS]; | 381 | } irq_cpu_data[NR_CPUS]; |
380 | 382 | ||
381 | #define CPU_IRQ(cpu) (irq_cpu_data[cpu].irq) | 383 | #define CPU_IRQ(cpu) (irq_cpu_data[cpu].irq) |
382 | #define LAST_CPU_IRQ(cpu,irq) (irq_cpu_data[cpu].last_irq[irq]) | 384 | #define LAST_CPU_IRQ(cpu, irq) (irq_cpu_data[cpu].last_irq[irq]) |
383 | #define IRQ_DELTA(cpu,irq) (irq_cpu_data[cpu].irq_delta[irq]) | 385 | #define IRQ_DELTA(cpu, irq) (irq_cpu_data[cpu].irq_delta[irq]) |
384 | 386 | ||
385 | #define IDLE_ENOUGH(cpu,now) \ | 387 | #define IDLE_ENOUGH(cpu,now) \ |
386 | (idle_cpu(cpu) && ((now) - per_cpu(irq_stat, (cpu)).idle_timestamp > 1)) | 388 | (idle_cpu(cpu) && ((now) - per_cpu(irq_stat, (cpu)).idle_timestamp > 1)) |
@@ -419,8 +421,8 @@ inside: | |||
419 | if (cpu == -1) | 421 | if (cpu == -1) |
420 | cpu = NR_CPUS-1; | 422 | cpu = NR_CPUS-1; |
421 | } | 423 | } |
422 | } while (!cpu_online(cpu) || !IRQ_ALLOWED(cpu,allowed_mask) || | 424 | } while (!cpu_online(cpu) || !IRQ_ALLOWED(cpu, allowed_mask) || |
423 | (search_idle && !IDLE_ENOUGH(cpu,now))); | 425 | (search_idle && !IDLE_ENOUGH(cpu, now))); |
424 | 426 | ||
425 | return cpu; | 427 | return cpu; |
426 | } | 428 | } |
@@ -430,15 +432,14 @@ static inline void balance_irq(int cpu, int irq) | |||
430 | unsigned long now = jiffies; | 432 | unsigned long now = jiffies; |
431 | cpumask_t allowed_mask; | 433 | cpumask_t allowed_mask; |
432 | unsigned int new_cpu; | 434 | unsigned int new_cpu; |
433 | 435 | ||
434 | if (irqbalance_disabled) | 436 | if (irqbalance_disabled) |
435 | return; | 437 | return; |
436 | 438 | ||
437 | cpus_and(allowed_mask, cpu_online_map, balance_irq_affinity[irq]); | 439 | cpus_and(allowed_mask, cpu_online_map, balance_irq_affinity[irq]); |
438 | new_cpu = move(cpu, allowed_mask, now, 1); | 440 | new_cpu = move(cpu, allowed_mask, now, 1); |
439 | if (cpu != new_cpu) { | 441 | if (cpu != new_cpu) |
440 | set_pending_irq(irq, cpumask_of_cpu(new_cpu)); | 442 | set_pending_irq(irq, cpumask_of_cpu(new_cpu)); |
441 | } | ||
442 | } | 443 | } |
443 | 444 | ||
444 | static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) | 445 | static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) |
@@ -450,14 +451,14 @@ static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) | |||
450 | if (!irq_desc[j].action) | 451 | if (!irq_desc[j].action) |
451 | continue; | 452 | continue; |
452 | /* Is it a significant load ? */ | 453 | /* Is it a significant load ? */ |
453 | if (IRQ_DELTA(CPU_TO_PACKAGEINDEX(i),j) < | 454 | if (IRQ_DELTA(CPU_TO_PACKAGEINDEX(i), j) < |
454 | useful_load_threshold) | 455 | useful_load_threshold) |
455 | continue; | 456 | continue; |
456 | balance_irq(i, j); | 457 | balance_irq(i, j); |
457 | } | 458 | } |
458 | } | 459 | } |
459 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, | 460 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, |
460 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); | 461 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); |
461 | return; | 462 | return; |
462 | } | 463 | } |
463 | 464 | ||
@@ -486,22 +487,22 @@ static void do_irq_balance(void) | |||
486 | /* Is this an active IRQ or balancing disabled ? */ | 487 | /* Is this an active IRQ or balancing disabled ? */ |
487 | if (!irq_desc[j].action || irq_balancing_disabled(j)) | 488 | if (!irq_desc[j].action || irq_balancing_disabled(j)) |
488 | continue; | 489 | continue; |
489 | if ( package_index == i ) | 490 | if (package_index == i) |
490 | IRQ_DELTA(package_index,j) = 0; | 491 | IRQ_DELTA(package_index, j) = 0; |
491 | /* Determine the total count per processor per IRQ */ | 492 | /* Determine the total count per processor per IRQ */ |
492 | value_now = (unsigned long) kstat_cpu(i).irqs[j]; | 493 | value_now = (unsigned long) kstat_cpu(i).irqs[j]; |
493 | 494 | ||
494 | /* Determine the activity per processor per IRQ */ | 495 | /* Determine the activity per processor per IRQ */ |
495 | delta = value_now - LAST_CPU_IRQ(i,j); | 496 | delta = value_now - LAST_CPU_IRQ(i, j); |
496 | 497 | ||
497 | /* Update last_cpu_irq[][] for the next time */ | 498 | /* Update last_cpu_irq[][] for the next time */ |
498 | LAST_CPU_IRQ(i,j) = value_now; | 499 | LAST_CPU_IRQ(i, j) = value_now; |
499 | 500 | ||
500 | /* Ignore IRQs whose rate is less than the clock */ | 501 | /* Ignore IRQs whose rate is less than the clock */ |
501 | if (delta < useful_load_threshold) | 502 | if (delta < useful_load_threshold) |
502 | continue; | 503 | continue; |
503 | /* update the load for the processor or package total */ | 504 | /* update the load for the processor or package total */ |
504 | IRQ_DELTA(package_index,j) += delta; | 505 | IRQ_DELTA(package_index, j) += delta; |
505 | 506 | ||
506 | /* Keep track of the higher numbered sibling as well */ | 507 | /* Keep track of the higher numbered sibling as well */ |
507 | if (i != package_index) | 508 | if (i != package_index) |
@@ -527,7 +528,8 @@ static void do_irq_balance(void) | |||
527 | max_cpu_irq = ULONG_MAX; | 528 | max_cpu_irq = ULONG_MAX; |
528 | 529 | ||
529 | tryanothercpu: | 530 | tryanothercpu: |
530 | /* Look for heaviest loaded processor. | 531 | /* |
532 | * Look for heaviest loaded processor. | ||
531 | * We may come back to get the next heaviest loaded processor. | 533 | * We may come back to get the next heaviest loaded processor. |
532 | * Skip processors with trivial loads. | 534 | * Skip processors with trivial loads. |
533 | */ | 535 | */ |
@@ -536,7 +538,7 @@ tryanothercpu: | |||
536 | for_each_online_cpu(i) { | 538 | for_each_online_cpu(i) { |
537 | if (i != CPU_TO_PACKAGEINDEX(i)) | 539 | if (i != CPU_TO_PACKAGEINDEX(i)) |
538 | continue; | 540 | continue; |
539 | if (max_cpu_irq <= CPU_IRQ(i)) | 541 | if (max_cpu_irq <= CPU_IRQ(i)) |
540 | continue; | 542 | continue; |
541 | if (tmp_cpu_irq < CPU_IRQ(i)) { | 543 | if (tmp_cpu_irq < CPU_IRQ(i)) { |
542 | tmp_cpu_irq = CPU_IRQ(i); | 544 | tmp_cpu_irq = CPU_IRQ(i); |
@@ -545,8 +547,9 @@ tryanothercpu: | |||
545 | } | 547 | } |
546 | 548 | ||
547 | if (tmp_loaded == -1) { | 549 | if (tmp_loaded == -1) { |
548 | /* In the case of small number of heavy interrupt sources, | 550 | /* |
549 | * loading some of the cpus too much. We use Ingo's original | 551 | * In the case of small number of heavy interrupt sources, |
552 | * loading some of the cpus too much. We use Ingo's original | ||
550 | * approach to rotate them around. | 553 | * approach to rotate them around. |
551 | */ | 554 | */ |
552 | if (!first_attempt && imbalance >= useful_load_threshold) { | 555 | if (!first_attempt && imbalance >= useful_load_threshold) { |
@@ -555,13 +558,14 @@ tryanothercpu: | |||
555 | } | 558 | } |
556 | goto not_worth_the_effort; | 559 | goto not_worth_the_effort; |
557 | } | 560 | } |
558 | 561 | ||
559 | first_attempt = 0; /* heaviest search */ | 562 | first_attempt = 0; /* heaviest search */ |
560 | max_cpu_irq = tmp_cpu_irq; /* load */ | 563 | max_cpu_irq = tmp_cpu_irq; /* load */ |
561 | max_loaded = tmp_loaded; /* processor */ | 564 | max_loaded = tmp_loaded; /* processor */ |
562 | imbalance = (max_cpu_irq - min_cpu_irq) / 2; | 565 | imbalance = (max_cpu_irq - min_cpu_irq) / 2; |
563 | 566 | ||
564 | /* if imbalance is less than approx 10% of max load, then | 567 | /* |
568 | * if imbalance is less than approx 10% of max load, then | ||
565 | * observe diminishing returns action. - quit | 569 | * observe diminishing returns action. - quit |
566 | */ | 570 | */ |
567 | if (imbalance < (max_cpu_irq >> 3)) | 571 | if (imbalance < (max_cpu_irq >> 3)) |
@@ -577,26 +581,25 @@ tryanotherirq: | |||
577 | /* Is this an active IRQ? */ | 581 | /* Is this an active IRQ? */ |
578 | if (!irq_desc[j].action) | 582 | if (!irq_desc[j].action) |
579 | continue; | 583 | continue; |
580 | if (imbalance <= IRQ_DELTA(max_loaded,j)) | 584 | if (imbalance <= IRQ_DELTA(max_loaded, j)) |
581 | continue; | 585 | continue; |
582 | /* Try to find the IRQ that is closest to the imbalance | 586 | /* Try to find the IRQ that is closest to the imbalance |
583 | * without going over. | 587 | * without going over. |
584 | */ | 588 | */ |
585 | if (move_this_load < IRQ_DELTA(max_loaded,j)) { | 589 | if (move_this_load < IRQ_DELTA(max_loaded, j)) { |
586 | move_this_load = IRQ_DELTA(max_loaded,j); | 590 | move_this_load = IRQ_DELTA(max_loaded, j); |
587 | selected_irq = j; | 591 | selected_irq = j; |
588 | } | 592 | } |
589 | } | 593 | } |
590 | if (selected_irq == -1) { | 594 | if (selected_irq == -1) |
591 | goto tryanothercpu; | 595 | goto tryanothercpu; |
592 | } | ||
593 | 596 | ||
594 | imbalance = move_this_load; | 597 | imbalance = move_this_load; |
595 | 598 | ||
596 | /* For physical_balance case, we accumulated both load | 599 | /* For physical_balance case, we accumulated both load |
597 | * values in the one of the siblings cpu_irq[], | 600 | * values in the one of the siblings cpu_irq[], |
598 | * to use the same code for physical and logical processors | 601 | * to use the same code for physical and logical processors |
599 | * as much as possible. | 602 | * as much as possible. |
600 | * | 603 | * |
601 | * NOTE: the cpu_irq[] array holds the sum of the load for | 604 | * NOTE: the cpu_irq[] array holds the sum of the load for |
602 | * sibling A and sibling B in the slot for the lowest numbered | 605 | * sibling A and sibling B in the slot for the lowest numbered |
@@ -625,11 +628,11 @@ tryanotherirq: | |||
625 | /* mark for change destination */ | 628 | /* mark for change destination */ |
626 | set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); | 629 | set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); |
627 | 630 | ||
628 | /* Since we made a change, come back sooner to | 631 | /* Since we made a change, come back sooner to |
629 | * check for more variation. | 632 | * check for more variation. |
630 | */ | 633 | */ |
631 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, | 634 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, |
632 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); | 635 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); |
633 | return; | 636 | return; |
634 | } | 637 | } |
635 | goto tryanotherirq; | 638 | goto tryanotherirq; |
@@ -640,7 +643,7 @@ not_worth_the_effort: | |||
640 | * upward | 643 | * upward |
641 | */ | 644 | */ |
642 | balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, | 645 | balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, |
643 | balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); | 646 | balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); |
644 | return; | 647 | return; |
645 | } | 648 | } |
646 | 649 | ||
@@ -679,13 +682,13 @@ static int __init balanced_irq_init(void) | |||
679 | cpumask_t tmp; | 682 | cpumask_t tmp; |
680 | 683 | ||
681 | cpus_shift_right(tmp, cpu_online_map, 2); | 684 | cpus_shift_right(tmp, cpu_online_map, 2); |
682 | c = &boot_cpu_data; | 685 | c = &boot_cpu_data; |
683 | /* When not overwritten by the command line ask subarchitecture. */ | 686 | /* When not overwritten by the command line ask subarchitecture. */ |
684 | if (irqbalance_disabled == IRQBALANCE_CHECK_ARCH) | 687 | if (irqbalance_disabled == IRQBALANCE_CHECK_ARCH) |
685 | irqbalance_disabled = NO_BALANCE_IRQ; | 688 | irqbalance_disabled = NO_BALANCE_IRQ; |
686 | if (irqbalance_disabled) | 689 | if (irqbalance_disabled) |
687 | return 0; | 690 | return 0; |
688 | 691 | ||
689 | /* disable irqbalance completely if there is only one processor online */ | 692 | /* disable irqbalance completely if there is only one processor online */ |
690 | if (num_online_cpus() < 2) { | 693 | if (num_online_cpus() < 2) { |
691 | irqbalance_disabled = 1; | 694 | irqbalance_disabled = 1; |
@@ -699,16 +702,14 @@ static int __init balanced_irq_init(void) | |||
699 | physical_balance = 1; | 702 | physical_balance = 1; |
700 | 703 | ||
701 | for_each_online_cpu(i) { | 704 | for_each_online_cpu(i) { |
702 | irq_cpu_data[i].irq_delta = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); | 705 | irq_cpu_data[i].irq_delta = kzalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); |
703 | irq_cpu_data[i].last_irq = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); | 706 | irq_cpu_data[i].last_irq = kzalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); |
704 | if (irq_cpu_data[i].irq_delta == NULL || irq_cpu_data[i].last_irq == NULL) { | 707 | if (irq_cpu_data[i].irq_delta == NULL || irq_cpu_data[i].last_irq == NULL) { |
705 | printk(KERN_ERR "balanced_irq_init: out of memory"); | 708 | printk(KERN_ERR "balanced_irq_init: out of memory"); |
706 | goto failed; | 709 | goto failed; |
707 | } | 710 | } |
708 | memset(irq_cpu_data[i].irq_delta,0,sizeof(unsigned long) * NR_IRQS); | ||
709 | memset(irq_cpu_data[i].last_irq,0,sizeof(unsigned long) * NR_IRQS); | ||
710 | } | 711 | } |
711 | 712 | ||
712 | printk(KERN_INFO "Starting balanced_irq\n"); | 713 | printk(KERN_INFO "Starting balanced_irq\n"); |
713 | if (!IS_ERR(kthread_run(balanced_irq, NULL, "kirqd"))) | 714 | if (!IS_ERR(kthread_run(balanced_irq, NULL, "kirqd"))) |
714 | return 0; | 715 | return 0; |
@@ -843,7 +844,7 @@ static int __init find_isa_irq_apic(int irq, int type) | |||
843 | } | 844 | } |
844 | if (i < mp_irq_entries) { | 845 | if (i < mp_irq_entries) { |
845 | int apic; | 846 | int apic; |
846 | for(apic = 0; apic < nr_ioapics; apic++) { | 847 | for (apic = 0; apic < nr_ioapics; apic++) { |
847 | if (mp_ioapics[apic].mpc_apicid == mp_irqs[i].mpc_dstapic) | 848 | if (mp_ioapics[apic].mpc_apicid == mp_irqs[i].mpc_dstapic) |
848 | return apic; | 849 | return apic; |
849 | } | 850 | } |
@@ -880,7 +881,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) | |||
880 | !mp_irqs[i].mpc_irqtype && | 881 | !mp_irqs[i].mpc_irqtype && |
881 | (bus == lbus) && | 882 | (bus == lbus) && |
882 | (slot == ((mp_irqs[i].mpc_srcbusirq >> 2) & 0x1f))) { | 883 | (slot == ((mp_irqs[i].mpc_srcbusirq >> 2) & 0x1f))) { |
883 | int irq = pin_2_irq(i,apic,mp_irqs[i].mpc_dstirq); | 884 | int irq = pin_2_irq(i, apic, mp_irqs[i].mpc_dstirq); |
884 | 885 | ||
885 | if (!(apic || IO_APIC_IRQ(irq))) | 886 | if (!(apic || IO_APIC_IRQ(irq))) |
886 | continue; | 887 | continue; |
@@ -900,7 +901,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) | |||
900 | EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); | 901 | EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); |
901 | 902 | ||
902 | /* | 903 | /* |
903 | * This function currently is only a helper for the i386 smp boot process where | 904 | * This function currently is only a helper for the i386 smp boot process where |
904 | * we need to reprogram the ioredtbls to cater for the cpus which have come online | 905 | * we need to reprogram the ioredtbls to cater for the cpus which have come online |
905 | * so mask in all cases should simply be TARGET_CPUS | 906 | * so mask in all cases should simply be TARGET_CPUS |
906 | */ | 907 | */ |
@@ -975,37 +976,36 @@ static int MPBIOS_polarity(int idx) | |||
975 | /* | 976 | /* |
976 | * Determine IRQ line polarity (high active or low active): | 977 | * Determine IRQ line polarity (high active or low active): |
977 | */ | 978 | */ |
978 | switch (mp_irqs[idx].mpc_irqflag & 3) | 979 | switch (mp_irqs[idx].mpc_irqflag & 3) { |
980 | case 0: /* conforms, ie. bus-type dependent polarity */ | ||
979 | { | 981 | { |
980 | case 0: /* conforms, ie. bus-type dependent polarity */ | 982 | polarity = test_bit(bus, mp_bus_not_pci)? |
981 | { | 983 | default_ISA_polarity(idx): |
982 | polarity = test_bit(bus, mp_bus_not_pci)? | 984 | default_PCI_polarity(idx); |
983 | default_ISA_polarity(idx): | 985 | break; |
984 | default_PCI_polarity(idx); | 986 | } |
985 | break; | 987 | case 1: /* high active */ |
986 | } | 988 | { |
987 | case 1: /* high active */ | 989 | polarity = 0; |
988 | { | 990 | break; |
989 | polarity = 0; | 991 | } |
990 | break; | 992 | case 2: /* reserved */ |
991 | } | 993 | { |
992 | case 2: /* reserved */ | 994 | printk(KERN_WARNING "broken BIOS!!\n"); |
993 | { | 995 | polarity = 1; |
994 | printk(KERN_WARNING "broken BIOS!!\n"); | 996 | break; |
995 | polarity = 1; | 997 | } |
996 | break; | 998 | case 3: /* low active */ |
997 | } | 999 | { |
998 | case 3: /* low active */ | 1000 | polarity = 1; |
999 | { | 1001 | break; |
1000 | polarity = 1; | 1002 | } |
1001 | break; | 1003 | default: /* invalid */ |
1002 | } | 1004 | { |
1003 | default: /* invalid */ | 1005 | printk(KERN_WARNING "broken BIOS!!\n"); |
1004 | { | 1006 | polarity = 1; |
1005 | printk(KERN_WARNING "broken BIOS!!\n"); | 1007 | break; |
1006 | polarity = 1; | 1008 | } |
1007 | break; | ||
1008 | } | ||
1009 | } | 1009 | } |
1010 | return polarity; | 1010 | return polarity; |
1011 | } | 1011 | } |
@@ -1018,69 +1018,67 @@ static int MPBIOS_trigger(int idx) | |||
1018 | /* | 1018 | /* |
1019 | * Determine IRQ trigger mode (edge or level sensitive): | 1019 | * Determine IRQ trigger mode (edge or level sensitive): |
1020 | */ | 1020 | */ |
1021 | switch ((mp_irqs[idx].mpc_irqflag>>2) & 3) | 1021 | switch ((mp_irqs[idx].mpc_irqflag>>2) & 3) { |
1022 | case 0: /* conforms, ie. bus-type dependent */ | ||
1022 | { | 1023 | { |
1023 | case 0: /* conforms, ie. bus-type dependent */ | 1024 | trigger = test_bit(bus, mp_bus_not_pci)? |
1024 | { | 1025 | default_ISA_trigger(idx): |
1025 | trigger = test_bit(bus, mp_bus_not_pci)? | 1026 | default_PCI_trigger(idx); |
1026 | default_ISA_trigger(idx): | ||
1027 | default_PCI_trigger(idx); | ||
1028 | #if defined(CONFIG_EISA) || defined(CONFIG_MCA) | 1027 | #if defined(CONFIG_EISA) || defined(CONFIG_MCA) |
1029 | switch (mp_bus_id_to_type[bus]) | 1028 | switch (mp_bus_id_to_type[bus]) { |
1030 | { | 1029 | case MP_BUS_ISA: /* ISA pin */ |
1031 | case MP_BUS_ISA: /* ISA pin */ | 1030 | { |
1032 | { | 1031 | /* set before the switch */ |
1033 | /* set before the switch */ | ||
1034 | break; | ||
1035 | } | ||
1036 | case MP_BUS_EISA: /* EISA pin */ | ||
1037 | { | ||
1038 | trigger = default_EISA_trigger(idx); | ||
1039 | break; | ||
1040 | } | ||
1041 | case MP_BUS_PCI: /* PCI pin */ | ||
1042 | { | ||
1043 | /* set before the switch */ | ||
1044 | break; | ||
1045 | } | ||
1046 | case MP_BUS_MCA: /* MCA pin */ | ||
1047 | { | ||
1048 | trigger = default_MCA_trigger(idx); | ||
1049 | break; | ||
1050 | } | ||
1051 | default: | ||
1052 | { | ||
1053 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
1054 | trigger = 1; | ||
1055 | break; | ||
1056 | } | ||
1057 | } | ||
1058 | #endif | ||
1059 | break; | 1032 | break; |
1060 | } | 1033 | } |
1061 | case 1: /* edge */ | 1034 | case MP_BUS_EISA: /* EISA pin */ |
1062 | { | 1035 | { |
1063 | trigger = 0; | 1036 | trigger = default_EISA_trigger(idx); |
1064 | break; | 1037 | break; |
1065 | } | 1038 | } |
1066 | case 2: /* reserved */ | 1039 | case MP_BUS_PCI: /* PCI pin */ |
1067 | { | 1040 | { |
1068 | printk(KERN_WARNING "broken BIOS!!\n"); | 1041 | /* set before the switch */ |
1069 | trigger = 1; | ||
1070 | break; | 1042 | break; |
1071 | } | 1043 | } |
1072 | case 3: /* level */ | 1044 | case MP_BUS_MCA: /* MCA pin */ |
1073 | { | 1045 | { |
1074 | trigger = 1; | 1046 | trigger = default_MCA_trigger(idx); |
1075 | break; | 1047 | break; |
1076 | } | 1048 | } |
1077 | default: /* invalid */ | 1049 | default: |
1078 | { | 1050 | { |
1079 | printk(KERN_WARNING "broken BIOS!!\n"); | 1051 | printk(KERN_WARNING "broken BIOS!!\n"); |
1080 | trigger = 0; | 1052 | trigger = 1; |
1081 | break; | 1053 | break; |
1082 | } | 1054 | } |
1083 | } | 1055 | } |
1056 | #endif | ||
1057 | break; | ||
1058 | } | ||
1059 | case 1: /* edge */ | ||
1060 | { | ||
1061 | trigger = 0; | ||
1062 | break; | ||
1063 | } | ||
1064 | case 2: /* reserved */ | ||
1065 | { | ||
1066 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
1067 | trigger = 1; | ||
1068 | break; | ||
1069 | } | ||
1070 | case 3: /* level */ | ||
1071 | { | ||
1072 | trigger = 1; | ||
1073 | break; | ||
1074 | } | ||
1075 | default: /* invalid */ | ||
1076 | { | ||
1077 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
1078 | trigger = 0; | ||
1079 | break; | ||
1080 | } | ||
1081 | } | ||
1084 | return trigger; | 1082 | return trigger; |
1085 | } | 1083 | } |
1086 | 1084 | ||
@@ -1148,8 +1146,8 @@ static inline int IO_APIC_irq_trigger(int irq) | |||
1148 | 1146 | ||
1149 | for (apic = 0; apic < nr_ioapics; apic++) { | 1147 | for (apic = 0; apic < nr_ioapics; apic++) { |
1150 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { | 1148 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { |
1151 | idx = find_irq_entry(apic,pin,mp_INT); | 1149 | idx = find_irq_entry(apic, pin, mp_INT); |
1152 | if ((idx != -1) && (irq == pin_2_irq(idx,apic,pin))) | 1150 | if ((idx != -1) && (irq == pin_2_irq(idx, apic, pin))) |
1153 | return irq_trigger(idx); | 1151 | return irq_trigger(idx); |
1154 | } | 1152 | } |
1155 | } | 1153 | } |
@@ -1164,7 +1162,7 @@ static u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 } | |||
1164 | 1162 | ||
1165 | static int __assign_irq_vector(int irq) | 1163 | static int __assign_irq_vector(int irq) |
1166 | { | 1164 | { |
1167 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset = 0; | 1165 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset; |
1168 | int vector, offset; | 1166 | int vector, offset; |
1169 | 1167 | ||
1170 | BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); | 1168 | BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); |
@@ -1237,15 +1235,15 @@ static void __init setup_IO_APIC_irqs(void) | |||
1237 | /* | 1235 | /* |
1238 | * add it to the IO-APIC irq-routing table: | 1236 | * add it to the IO-APIC irq-routing table: |
1239 | */ | 1237 | */ |
1240 | memset(&entry,0,sizeof(entry)); | 1238 | memset(&entry, 0, sizeof(entry)); |
1241 | 1239 | ||
1242 | entry.delivery_mode = INT_DELIVERY_MODE; | 1240 | entry.delivery_mode = INT_DELIVERY_MODE; |
1243 | entry.dest_mode = INT_DEST_MODE; | 1241 | entry.dest_mode = INT_DEST_MODE; |
1244 | entry.mask = 0; /* enable IRQ */ | 1242 | entry.mask = 0; /* enable IRQ */ |
1245 | entry.dest.logical.logical_dest = | 1243 | entry.dest.logical.logical_dest = |
1246 | cpu_mask_to_apicid(TARGET_CPUS); | 1244 | cpu_mask_to_apicid(TARGET_CPUS); |
1247 | 1245 | ||
1248 | idx = find_irq_entry(apic,pin,mp_INT); | 1246 | idx = find_irq_entry(apic, pin, mp_INT); |
1249 | if (idx == -1) { | 1247 | if (idx == -1) { |
1250 | if (first_notcon) { | 1248 | if (first_notcon) { |
1251 | apic_printk(APIC_VERBOSE, KERN_DEBUG | 1249 | apic_printk(APIC_VERBOSE, KERN_DEBUG |
@@ -1289,7 +1287,7 @@ static void __init setup_IO_APIC_irqs(void) | |||
1289 | vector = assign_irq_vector(irq); | 1287 | vector = assign_irq_vector(irq); |
1290 | entry.vector = vector; | 1288 | entry.vector = vector; |
1291 | ioapic_register_intr(irq, vector, IOAPIC_AUTO); | 1289 | ioapic_register_intr(irq, vector, IOAPIC_AUTO); |
1292 | 1290 | ||
1293 | if (!apic && (irq < 16)) | 1291 | if (!apic && (irq < 16)) |
1294 | disable_8259A_irq(irq); | 1292 | disable_8259A_irq(irq); |
1295 | } | 1293 | } |
@@ -1302,25 +1300,21 @@ static void __init setup_IO_APIC_irqs(void) | |||
1302 | } | 1300 | } |
1303 | 1301 | ||
1304 | /* | 1302 | /* |
1305 | * Set up the 8259A-master output pin: | 1303 | * Set up the timer pin, possibly with the 8259A-master behind. |
1306 | */ | 1304 | */ |
1307 | static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, int vector) | 1305 | static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, |
1306 | int vector) | ||
1308 | { | 1307 | { |
1309 | struct IO_APIC_route_entry entry; | 1308 | struct IO_APIC_route_entry entry; |
1310 | 1309 | ||
1311 | memset(&entry,0,sizeof(entry)); | 1310 | memset(&entry, 0, sizeof(entry)); |
1312 | |||
1313 | disable_8259A_irq(0); | ||
1314 | |||
1315 | /* mask LVT0 */ | ||
1316 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | ||
1317 | 1311 | ||
1318 | /* | 1312 | /* |
1319 | * We use logical delivery to get the timer IRQ | 1313 | * We use logical delivery to get the timer IRQ |
1320 | * to the first CPU. | 1314 | * to the first CPU. |
1321 | */ | 1315 | */ |
1322 | entry.dest_mode = INT_DEST_MODE; | 1316 | entry.dest_mode = INT_DEST_MODE; |
1323 | entry.mask = 0; /* unmask IRQ now */ | 1317 | entry.mask = 1; /* mask IRQ now */ |
1324 | entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS); | 1318 | entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS); |
1325 | entry.delivery_mode = INT_DELIVERY_MODE; | 1319 | entry.delivery_mode = INT_DELIVERY_MODE; |
1326 | entry.polarity = 0; | 1320 | entry.polarity = 0; |
@@ -1329,17 +1323,14 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
1329 | 1323 | ||
1330 | /* | 1324 | /* |
1331 | * The timer IRQ doesn't have to know that behind the | 1325 | * The timer IRQ doesn't have to know that behind the |
1332 | * scene we have a 8259A-master in AEOI mode ... | 1326 | * scene we may have a 8259A-master in AEOI mode ... |
1333 | */ | 1327 | */ |
1334 | irq_desc[0].chip = &ioapic_chip; | 1328 | ioapic_register_intr(0, vector, IOAPIC_EDGE); |
1335 | set_irq_handler(0, handle_edge_irq); | ||
1336 | 1329 | ||
1337 | /* | 1330 | /* |
1338 | * Add it to the IO-APIC irq-routing table: | 1331 | * Add it to the IO-APIC irq-routing table: |
1339 | */ | 1332 | */ |
1340 | ioapic_write_entry(apic, pin, entry); | 1333 | ioapic_write_entry(apic, pin, entry); |
1341 | |||
1342 | enable_8259A_irq(0); | ||
1343 | } | 1334 | } |
1344 | 1335 | ||
1345 | void __init print_IO_APIC(void) | 1336 | void __init print_IO_APIC(void) |
@@ -1354,7 +1345,7 @@ void __init print_IO_APIC(void) | |||
1354 | if (apic_verbosity == APIC_QUIET) | 1345 | if (apic_verbosity == APIC_QUIET) |
1355 | return; | 1346 | return; |
1356 | 1347 | ||
1357 | printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries); | 1348 | printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries); |
1358 | for (i = 0; i < nr_ioapics; i++) | 1349 | for (i = 0; i < nr_ioapics; i++) |
1359 | printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n", | 1350 | printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n", |
1360 | mp_ioapics[i].mpc_apicid, nr_ioapic_registers[i]); | 1351 | mp_ioapics[i].mpc_apicid, nr_ioapic_registers[i]); |
@@ -1459,7 +1450,7 @@ void __init print_IO_APIC(void) | |||
1459 | 1450 | ||
1460 | #if 0 | 1451 | #if 0 |
1461 | 1452 | ||
1462 | static void print_APIC_bitfield (int base) | 1453 | static void print_APIC_bitfield(int base) |
1463 | { | 1454 | { |
1464 | unsigned int v; | 1455 | unsigned int v; |
1465 | int i, j; | 1456 | int i, j; |
@@ -1480,7 +1471,7 @@ static void print_APIC_bitfield (int base) | |||
1480 | } | 1471 | } |
1481 | } | 1472 | } |
1482 | 1473 | ||
1483 | void /*__init*/ print_local_APIC(void * dummy) | 1474 | void /*__init*/ print_local_APIC(void *dummy) |
1484 | { | 1475 | { |
1485 | unsigned int v, ver, maxlvt; | 1476 | unsigned int v, ver, maxlvt; |
1486 | 1477 | ||
@@ -1489,6 +1480,7 @@ void /*__init*/ print_local_APIC(void * dummy) | |||
1489 | 1480 | ||
1490 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", | 1481 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", |
1491 | smp_processor_id(), hard_smp_processor_id()); | 1482 | smp_processor_id(), hard_smp_processor_id()); |
1483 | v = apic_read(APIC_ID); | ||
1492 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, | 1484 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, |
1493 | GET_APIC_ID(read_apic_id())); | 1485 | GET_APIC_ID(read_apic_id())); |
1494 | v = apic_read(APIC_LVR); | 1486 | v = apic_read(APIC_LVR); |
@@ -1563,7 +1555,7 @@ void /*__init*/ print_local_APIC(void * dummy) | |||
1563 | printk("\n"); | 1555 | printk("\n"); |
1564 | } | 1556 | } |
1565 | 1557 | ||
1566 | void print_all_local_APICs (void) | 1558 | void print_all_local_APICs(void) |
1567 | { | 1559 | { |
1568 | on_each_cpu(print_local_APIC, NULL, 1, 1); | 1560 | on_each_cpu(print_local_APIC, NULL, 1, 1); |
1569 | } | 1561 | } |
@@ -1586,11 +1578,11 @@ void /*__init*/ print_PIC(void) | |||
1586 | v = inb(0xa0) << 8 | inb(0x20); | 1578 | v = inb(0xa0) << 8 | inb(0x20); |
1587 | printk(KERN_DEBUG "... PIC IRR: %04x\n", v); | 1579 | printk(KERN_DEBUG "... PIC IRR: %04x\n", v); |
1588 | 1580 | ||
1589 | outb(0x0b,0xa0); | 1581 | outb(0x0b, 0xa0); |
1590 | outb(0x0b,0x20); | 1582 | outb(0x0b, 0x20); |
1591 | v = inb(0xa0) << 8 | inb(0x20); | 1583 | v = inb(0xa0) << 8 | inb(0x20); |
1592 | outb(0x0a,0xa0); | 1584 | outb(0x0a, 0xa0); |
1593 | outb(0x0a,0x20); | 1585 | outb(0x0a, 0x20); |
1594 | 1586 | ||
1595 | spin_unlock_irqrestore(&i8259A_lock, flags); | 1587 | spin_unlock_irqrestore(&i8259A_lock, flags); |
1596 | 1588 | ||
@@ -1626,7 +1618,7 @@ static void __init enable_IO_APIC(void) | |||
1626 | spin_unlock_irqrestore(&ioapic_lock, flags); | 1618 | spin_unlock_irqrestore(&ioapic_lock, flags); |
1627 | nr_ioapic_registers[apic] = reg_01.bits.entries+1; | 1619 | nr_ioapic_registers[apic] = reg_01.bits.entries+1; |
1628 | } | 1620 | } |
1629 | for(apic = 0; apic < nr_ioapics; apic++) { | 1621 | for (apic = 0; apic < nr_ioapics; apic++) { |
1630 | int pin; | 1622 | int pin; |
1631 | /* See if any of the pins is in ExtINT mode */ | 1623 | /* See if any of the pins is in ExtINT mode */ |
1632 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { | 1624 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { |
@@ -1748,7 +1740,7 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
1748 | spin_lock_irqsave(&ioapic_lock, flags); | 1740 | spin_lock_irqsave(&ioapic_lock, flags); |
1749 | reg_00.raw = io_apic_read(apic, 0); | 1741 | reg_00.raw = io_apic_read(apic, 0); |
1750 | spin_unlock_irqrestore(&ioapic_lock, flags); | 1742 | spin_unlock_irqrestore(&ioapic_lock, flags); |
1751 | 1743 | ||
1752 | old_id = mp_ioapics[apic].mpc_apicid; | 1744 | old_id = mp_ioapics[apic].mpc_apicid; |
1753 | 1745 | ||
1754 | if (mp_ioapics[apic].mpc_apicid >= get_physical_broadcast()) { | 1746 | if (mp_ioapics[apic].mpc_apicid >= get_physical_broadcast()) { |
@@ -1800,7 +1792,7 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
1800 | /* | 1792 | /* |
1801 | * Read the right value from the MPC table and | 1793 | * Read the right value from the MPC table and |
1802 | * write it into the ID register. | 1794 | * write it into the ID register. |
1803 | */ | 1795 | */ |
1804 | apic_printk(APIC_VERBOSE, KERN_INFO | 1796 | apic_printk(APIC_VERBOSE, KERN_INFO |
1805 | "...changing IO-APIC physical APIC ID to %d ...", | 1797 | "...changing IO-APIC physical APIC ID to %d ...", |
1806 | mp_ioapics[apic].mpc_apicid); | 1798 | mp_ioapics[apic].mpc_apicid); |
@@ -2020,7 +2012,7 @@ static void ack_apic(unsigned int irq) | |||
2020 | ack_APIC_irq(); | 2012 | ack_APIC_irq(); |
2021 | } | 2013 | } |
2022 | 2014 | ||
2023 | static void mask_lapic_irq (unsigned int irq) | 2015 | static void mask_lapic_irq(unsigned int irq) |
2024 | { | 2016 | { |
2025 | unsigned long v; | 2017 | unsigned long v; |
2026 | 2018 | ||
@@ -2028,7 +2020,7 @@ static void mask_lapic_irq (unsigned int irq) | |||
2028 | apic_write_around(APIC_LVT0, v | APIC_LVT_MASKED); | 2020 | apic_write_around(APIC_LVT0, v | APIC_LVT_MASKED); |
2029 | } | 2021 | } |
2030 | 2022 | ||
2031 | static void unmask_lapic_irq (unsigned int irq) | 2023 | static void unmask_lapic_irq(unsigned int irq) |
2032 | { | 2024 | { |
2033 | unsigned long v; | 2025 | unsigned long v; |
2034 | 2026 | ||
@@ -2037,7 +2029,7 @@ static void unmask_lapic_irq (unsigned int irq) | |||
2037 | } | 2029 | } |
2038 | 2030 | ||
2039 | static struct irq_chip lapic_chip __read_mostly = { | 2031 | static struct irq_chip lapic_chip __read_mostly = { |
2040 | .name = "local-APIC-edge", | 2032 | .name = "local-APIC", |
2041 | .mask = mask_lapic_irq, | 2033 | .mask = mask_lapic_irq, |
2042 | .unmask = unmask_lapic_irq, | 2034 | .unmask = unmask_lapic_irq, |
2043 | .eoi = ack_apic, | 2035 | .eoi = ack_apic, |
@@ -2046,14 +2038,14 @@ static struct irq_chip lapic_chip __read_mostly = { | |||
2046 | static void __init setup_nmi(void) | 2038 | static void __init setup_nmi(void) |
2047 | { | 2039 | { |
2048 | /* | 2040 | /* |
2049 | * Dirty trick to enable the NMI watchdog ... | 2041 | * Dirty trick to enable the NMI watchdog ... |
2050 | * We put the 8259A master into AEOI mode and | 2042 | * We put the 8259A master into AEOI mode and |
2051 | * unmask on all local APICs LVT0 as NMI. | 2043 | * unmask on all local APICs LVT0 as NMI. |
2052 | * | 2044 | * |
2053 | * The idea to use the 8259A in AEOI mode ('8259A Virtual Wire') | 2045 | * The idea to use the 8259A in AEOI mode ('8259A Virtual Wire') |
2054 | * is from Maciej W. Rozycki - so we do not have to EOI from | 2046 | * is from Maciej W. Rozycki - so we do not have to EOI from |
2055 | * the NMI handler or the timer interrupt. | 2047 | * the NMI handler or the timer interrupt. |
2056 | */ | 2048 | */ |
2057 | apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ..."); | 2049 | apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ..."); |
2058 | 2050 | ||
2059 | enable_NMI_through_LVT0(); | 2051 | enable_NMI_through_LVT0(); |
@@ -2129,6 +2121,7 @@ static inline void __init unlock_ExtINT_logic(void) | |||
2129 | static inline void __init check_timer(void) | 2121 | static inline void __init check_timer(void) |
2130 | { | 2122 | { |
2131 | int apic1, pin1, apic2, pin2; | 2123 | int apic1, pin1, apic2, pin2; |
2124 | int no_pin1 = 0; | ||
2132 | int vector; | 2125 | int vector; |
2133 | unsigned int ver; | 2126 | unsigned int ver; |
2134 | unsigned long flags; | 2127 | unsigned long flags; |
@@ -2146,21 +2139,17 @@ static inline void __init check_timer(void) | |||
2146 | set_intr_gate(vector, interrupt[0]); | 2139 | set_intr_gate(vector, interrupt[0]); |
2147 | 2140 | ||
2148 | /* | 2141 | /* |
2149 | * Subtle, code in do_timer_interrupt() expects an AEOI | 2142 | * As IRQ0 is to be enabled in the 8259A, the virtual |
2150 | * mode for the 8259A whenever interrupts are routed | 2143 | * wire has to be disabled in the local APIC. Also |
2151 | * through I/O APICs. Also IRQ0 has to be enabled in | 2144 | * timer interrupts need to be acknowledged manually in |
2152 | * the 8259A which implies the virtual wire has to be | 2145 | * the 8259A for the i82489DX when using the NMI |
2153 | * disabled in the local APIC. Finally timer interrupts | 2146 | * watchdog as that APIC treats NMIs as level-triggered. |
2154 | * need to be acknowledged manually in the 8259A for | 2147 | * The AEOI mode will finish them in the 8259A |
2155 | * timer_interrupt() and for the i82489DX when using | 2148 | * automatically. |
2156 | * the NMI watchdog. | ||
2157 | */ | 2149 | */ |
2158 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 2150 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
2159 | init_8259A(1); | 2151 | init_8259A(1); |
2160 | timer_ack = !cpu_has_tsc; | 2152 | timer_ack = (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); |
2161 | timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); | ||
2162 | if (timer_over_8254 > 0) | ||
2163 | enable_8259A_irq(0); | ||
2164 | 2153 | ||
2165 | pin1 = find_isa_irq_pin(0, mp_INT); | 2154 | pin1 = find_isa_irq_pin(0, mp_INT); |
2166 | apic1 = find_isa_irq_apic(0, mp_INT); | 2155 | apic1 = find_isa_irq_apic(0, mp_INT); |
@@ -2170,14 +2159,33 @@ static inline void __init check_timer(void) | |||
2170 | printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", | 2159 | printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", |
2171 | vector, apic1, pin1, apic2, pin2); | 2160 | vector, apic1, pin1, apic2, pin2); |
2172 | 2161 | ||
2162 | /* | ||
2163 | * Some BIOS writers are clueless and report the ExtINTA | ||
2164 | * I/O APIC input from the cascaded 8259A as the timer | ||
2165 | * interrupt input. So just in case, if only one pin | ||
2166 | * was found above, try it both directly and through the | ||
2167 | * 8259A. | ||
2168 | */ | ||
2169 | if (pin1 == -1) { | ||
2170 | pin1 = pin2; | ||
2171 | apic1 = apic2; | ||
2172 | no_pin1 = 1; | ||
2173 | } else if (pin2 == -1) { | ||
2174 | pin2 = pin1; | ||
2175 | apic2 = apic1; | ||
2176 | } | ||
2177 | |||
2173 | if (pin1 != -1) { | 2178 | if (pin1 != -1) { |
2174 | /* | 2179 | /* |
2175 | * Ok, does IRQ0 through the IOAPIC work? | 2180 | * Ok, does IRQ0 through the IOAPIC work? |
2176 | */ | 2181 | */ |
2182 | if (no_pin1) { | ||
2183 | add_pin_to_irq(0, apic1, pin1); | ||
2184 | setup_timer_IRQ0_pin(apic1, pin1, vector); | ||
2185 | } | ||
2177 | unmask_IO_APIC_irq(0); | 2186 | unmask_IO_APIC_irq(0); |
2178 | if (timer_irq_works()) { | 2187 | if (timer_irq_works()) { |
2179 | if (nmi_watchdog == NMI_IO_APIC) { | 2188 | if (nmi_watchdog == NMI_IO_APIC) { |
2180 | disable_8259A_irq(0); | ||
2181 | setup_nmi(); | 2189 | setup_nmi(); |
2182 | enable_8259A_irq(0); | 2190 | enable_8259A_irq(0); |
2183 | } | 2191 | } |
@@ -2186,43 +2194,46 @@ static inline void __init check_timer(void) | |||
2186 | goto out; | 2194 | goto out; |
2187 | } | 2195 | } |
2188 | clear_IO_APIC_pin(apic1, pin1); | 2196 | clear_IO_APIC_pin(apic1, pin1); |
2189 | printk(KERN_ERR "..MP-BIOS bug: 8254 timer not connected to " | 2197 | if (!no_pin1) |
2190 | "IO-APIC\n"); | 2198 | printk(KERN_ERR "..MP-BIOS bug: " |
2191 | } | 2199 | "8254 timer not connected to IO-APIC\n"); |
2192 | 2200 | ||
2193 | printk(KERN_INFO "...trying to set up timer (IRQ0) through the 8259A ... "); | 2201 | printk(KERN_INFO "...trying to set up timer (IRQ0) " |
2194 | if (pin2 != -1) { | 2202 | "through the 8259A ... "); |
2195 | printk("\n..... (found pin %d) ...", pin2); | 2203 | printk("\n..... (found pin %d) ...", pin2); |
2196 | /* | 2204 | /* |
2197 | * legacy devices should be connected to IO APIC #0 | 2205 | * legacy devices should be connected to IO APIC #0 |
2198 | */ | 2206 | */ |
2199 | setup_ExtINT_IRQ0_pin(apic2, pin2, vector); | 2207 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); |
2208 | setup_timer_IRQ0_pin(apic2, pin2, vector); | ||
2209 | unmask_IO_APIC_irq(0); | ||
2210 | enable_8259A_irq(0); | ||
2200 | if (timer_irq_works()) { | 2211 | if (timer_irq_works()) { |
2201 | printk("works.\n"); | 2212 | printk("works.\n"); |
2202 | if (pin1 != -1) | 2213 | timer_through_8259 = 1; |
2203 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); | ||
2204 | else | ||
2205 | add_pin_to_irq(0, apic2, pin2); | ||
2206 | if (nmi_watchdog == NMI_IO_APIC) { | 2214 | if (nmi_watchdog == NMI_IO_APIC) { |
2215 | disable_8259A_irq(0); | ||
2207 | setup_nmi(); | 2216 | setup_nmi(); |
2217 | enable_8259A_irq(0); | ||
2208 | } | 2218 | } |
2209 | goto out; | 2219 | goto out; |
2210 | } | 2220 | } |
2211 | /* | 2221 | /* |
2212 | * Cleanup, just in case ... | 2222 | * Cleanup, just in case ... |
2213 | */ | 2223 | */ |
2224 | disable_8259A_irq(0); | ||
2214 | clear_IO_APIC_pin(apic2, pin2); | 2225 | clear_IO_APIC_pin(apic2, pin2); |
2226 | printk(" failed.\n"); | ||
2215 | } | 2227 | } |
2216 | printk(" failed.\n"); | ||
2217 | 2228 | ||
2218 | if (nmi_watchdog == NMI_IO_APIC) { | 2229 | if (nmi_watchdog == NMI_IO_APIC) { |
2219 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); | 2230 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); |
2220 | nmi_watchdog = 0; | 2231 | nmi_watchdog = NMI_NONE; |
2221 | } | 2232 | } |
2233 | timer_ack = 0; | ||
2222 | 2234 | ||
2223 | printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); | 2235 | printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); |
2224 | 2236 | ||
2225 | disable_8259A_irq(0); | ||
2226 | set_irq_chip_and_handler_name(0, &lapic_chip, handle_fasteoi_irq, | 2237 | set_irq_chip_and_handler_name(0, &lapic_chip, handle_fasteoi_irq, |
2227 | "fasteoi"); | 2238 | "fasteoi"); |
2228 | apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */ | 2239 | apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */ |
@@ -2232,12 +2243,12 @@ static inline void __init check_timer(void) | |||
2232 | printk(" works.\n"); | 2243 | printk(" works.\n"); |
2233 | goto out; | 2244 | goto out; |
2234 | } | 2245 | } |
2246 | disable_8259A_irq(0); | ||
2235 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector); | 2247 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector); |
2236 | printk(" failed.\n"); | 2248 | printk(" failed.\n"); |
2237 | 2249 | ||
2238 | printk(KERN_INFO "...trying to set up timer as ExtINT IRQ..."); | 2250 | printk(KERN_INFO "...trying to set up timer as ExtINT IRQ..."); |
2239 | 2251 | ||
2240 | timer_ack = 0; | ||
2241 | init_8259A(0); | 2252 | init_8259A(0); |
2242 | make_8259A_irq(0); | 2253 | make_8259A_irq(0); |
2243 | apic_write_around(APIC_LVT0, APIC_DM_EXTINT); | 2254 | apic_write_around(APIC_LVT0, APIC_DM_EXTINT); |
@@ -2294,28 +2305,14 @@ void __init setup_IO_APIC(void) | |||
2294 | print_IO_APIC(); | 2305 | print_IO_APIC(); |
2295 | } | 2306 | } |
2296 | 2307 | ||
2297 | static int __init setup_disable_8254_timer(char *s) | ||
2298 | { | ||
2299 | timer_over_8254 = -1; | ||
2300 | return 1; | ||
2301 | } | ||
2302 | static int __init setup_enable_8254_timer(char *s) | ||
2303 | { | ||
2304 | timer_over_8254 = 2; | ||
2305 | return 1; | ||
2306 | } | ||
2307 | |||
2308 | __setup("disable_8254_timer", setup_disable_8254_timer); | ||
2309 | __setup("enable_8254_timer", setup_enable_8254_timer); | ||
2310 | |||
2311 | /* | 2308 | /* |
2312 | * Called after all the initialization is done. If we didnt find any | 2309 | * Called after all the initialization is done. If we didnt find any |
2313 | * APIC bugs then we can allow the modify fast path | 2310 | * APIC bugs then we can allow the modify fast path |
2314 | */ | 2311 | */ |
2315 | 2312 | ||
2316 | static int __init io_apic_bug_finalize(void) | 2313 | static int __init io_apic_bug_finalize(void) |
2317 | { | 2314 | { |
2318 | if(sis_apic_bug == -1) | 2315 | if (sis_apic_bug == -1) |
2319 | sis_apic_bug = 0; | 2316 | sis_apic_bug = 0; |
2320 | return 0; | 2317 | return 0; |
2321 | } | 2318 | } |
@@ -2326,17 +2323,17 @@ struct sysfs_ioapic_data { | |||
2326 | struct sys_device dev; | 2323 | struct sys_device dev; |
2327 | struct IO_APIC_route_entry entry[0]; | 2324 | struct IO_APIC_route_entry entry[0]; |
2328 | }; | 2325 | }; |
2329 | static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS]; | 2326 | static struct sysfs_ioapic_data *mp_ioapic_data[MAX_IO_APICS]; |
2330 | 2327 | ||
2331 | static int ioapic_suspend(struct sys_device *dev, pm_message_t state) | 2328 | static int ioapic_suspend(struct sys_device *dev, pm_message_t state) |
2332 | { | 2329 | { |
2333 | struct IO_APIC_route_entry *entry; | 2330 | struct IO_APIC_route_entry *entry; |
2334 | struct sysfs_ioapic_data *data; | 2331 | struct sysfs_ioapic_data *data; |
2335 | int i; | 2332 | int i; |
2336 | 2333 | ||
2337 | data = container_of(dev, struct sysfs_ioapic_data, dev); | 2334 | data = container_of(dev, struct sysfs_ioapic_data, dev); |
2338 | entry = data->entry; | 2335 | entry = data->entry; |
2339 | for (i = 0; i < nr_ioapic_registers[dev->id]; i ++) | 2336 | for (i = 0; i < nr_ioapic_registers[dev->id]; i++) |
2340 | entry[i] = ioapic_read_entry(dev->id, i); | 2337 | entry[i] = ioapic_read_entry(dev->id, i); |
2341 | 2338 | ||
2342 | return 0; | 2339 | return 0; |
@@ -2349,7 +2346,7 @@ static int ioapic_resume(struct sys_device *dev) | |||
2349 | unsigned long flags; | 2346 | unsigned long flags; |
2350 | union IO_APIC_reg_00 reg_00; | 2347 | union IO_APIC_reg_00 reg_00; |
2351 | int i; | 2348 | int i; |
2352 | 2349 | ||
2353 | data = container_of(dev, struct sysfs_ioapic_data, dev); | 2350 | data = container_of(dev, struct sysfs_ioapic_data, dev); |
2354 | entry = data->entry; | 2351 | entry = data->entry; |
2355 | 2352 | ||
@@ -2360,7 +2357,7 @@ static int ioapic_resume(struct sys_device *dev) | |||
2360 | io_apic_write(dev->id, 0, reg_00.raw); | 2357 | io_apic_write(dev->id, 0, reg_00.raw); |
2361 | } | 2358 | } |
2362 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2359 | spin_unlock_irqrestore(&ioapic_lock, flags); |
2363 | for (i = 0; i < nr_ioapic_registers[dev->id]; i ++) | 2360 | for (i = 0; i < nr_ioapic_registers[dev->id]; i++) |
2364 | ioapic_write_entry(dev->id, i, entry[i]); | 2361 | ioapic_write_entry(dev->id, i, entry[i]); |
2365 | 2362 | ||
2366 | return 0; | 2363 | return 0; |
@@ -2374,24 +2371,23 @@ static struct sysdev_class ioapic_sysdev_class = { | |||
2374 | 2371 | ||
2375 | static int __init ioapic_init_sysfs(void) | 2372 | static int __init ioapic_init_sysfs(void) |
2376 | { | 2373 | { |
2377 | struct sys_device * dev; | 2374 | struct sys_device *dev; |
2378 | int i, size, error = 0; | 2375 | int i, size, error = 0; |
2379 | 2376 | ||
2380 | error = sysdev_class_register(&ioapic_sysdev_class); | 2377 | error = sysdev_class_register(&ioapic_sysdev_class); |
2381 | if (error) | 2378 | if (error) |
2382 | return error; | 2379 | return error; |
2383 | 2380 | ||
2384 | for (i = 0; i < nr_ioapics; i++ ) { | 2381 | for (i = 0; i < nr_ioapics; i++) { |
2385 | size = sizeof(struct sys_device) + nr_ioapic_registers[i] | 2382 | size = sizeof(struct sys_device) + nr_ioapic_registers[i] |
2386 | * sizeof(struct IO_APIC_route_entry); | 2383 | * sizeof(struct IO_APIC_route_entry); |
2387 | mp_ioapic_data[i] = kmalloc(size, GFP_KERNEL); | 2384 | mp_ioapic_data[i] = kzalloc(size, GFP_KERNEL); |
2388 | if (!mp_ioapic_data[i]) { | 2385 | if (!mp_ioapic_data[i]) { |
2389 | printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i); | 2386 | printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i); |
2390 | continue; | 2387 | continue; |
2391 | } | 2388 | } |
2392 | memset(mp_ioapic_data[i], 0, size); | ||
2393 | dev = &mp_ioapic_data[i]->dev; | 2389 | dev = &mp_ioapic_data[i]->dev; |
2394 | dev->id = i; | 2390 | dev->id = i; |
2395 | dev->cls = &ioapic_sysdev_class; | 2391 | dev->cls = &ioapic_sysdev_class; |
2396 | error = sysdev_register(dev); | 2392 | error = sysdev_register(dev); |
2397 | if (error) { | 2393 | if (error) { |
@@ -2466,7 +2462,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
2466 | msg->address_lo = | 2462 | msg->address_lo = |
2467 | MSI_ADDR_BASE_LO | | 2463 | MSI_ADDR_BASE_LO | |
2468 | ((INT_DEST_MODE == 0) ? | 2464 | ((INT_DEST_MODE == 0) ? |
2469 | MSI_ADDR_DEST_MODE_PHYSICAL: | 2465 | MSI_ADDR_DEST_MODE_PHYSICAL: |
2470 | MSI_ADDR_DEST_MODE_LOGICAL) | | 2466 | MSI_ADDR_DEST_MODE_LOGICAL) | |
2471 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 2467 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? |
2472 | MSI_ADDR_REDIRECTION_CPU: | 2468 | MSI_ADDR_REDIRECTION_CPU: |
@@ -2477,7 +2473,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
2477 | MSI_DATA_TRIGGER_EDGE | | 2473 | MSI_DATA_TRIGGER_EDGE | |
2478 | MSI_DATA_LEVEL_ASSERT | | 2474 | MSI_DATA_LEVEL_ASSERT | |
2479 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 2475 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? |
2480 | MSI_DATA_DELIVERY_FIXED: | 2476 | MSI_DATA_DELIVERY_FIXED: |
2481 | MSI_DATA_DELIVERY_LOWPRI) | | 2477 | MSI_DATA_DELIVERY_LOWPRI) | |
2482 | MSI_DATA_VECTOR(vector); | 2478 | MSI_DATA_VECTOR(vector); |
2483 | } | 2479 | } |
@@ -2648,12 +2644,12 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) | |||
2648 | #endif /* CONFIG_HT_IRQ */ | 2644 | #endif /* CONFIG_HT_IRQ */ |
2649 | 2645 | ||
2650 | /* -------------------------------------------------------------------------- | 2646 | /* -------------------------------------------------------------------------- |
2651 | ACPI-based IOAPIC Configuration | 2647 | ACPI-based IOAPIC Configuration |
2652 | -------------------------------------------------------------------------- */ | 2648 | -------------------------------------------------------------------------- */ |
2653 | 2649 | ||
2654 | #ifdef CONFIG_ACPI | 2650 | #ifdef CONFIG_ACPI |
2655 | 2651 | ||
2656 | int __init io_apic_get_unique_id (int ioapic, int apic_id) | 2652 | int __init io_apic_get_unique_id(int ioapic, int apic_id) |
2657 | { | 2653 | { |
2658 | union IO_APIC_reg_00 reg_00; | 2654 | union IO_APIC_reg_00 reg_00; |
2659 | static physid_mask_t apic_id_map = PHYSID_MASK_NONE; | 2655 | static physid_mask_t apic_id_map = PHYSID_MASK_NONE; |
@@ -2662,10 +2658,10 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
2662 | int i = 0; | 2658 | int i = 0; |
2663 | 2659 | ||
2664 | /* | 2660 | /* |
2665 | * The P4 platform supports up to 256 APIC IDs on two separate APIC | 2661 | * The P4 platform supports up to 256 APIC IDs on two separate APIC |
2666 | * buses (one for LAPICs, one for IOAPICs), where predecessors only | 2662 | * buses (one for LAPICs, one for IOAPICs), where predecessors only |
2667 | * supports up to 16 on one shared APIC bus. | 2663 | * supports up to 16 on one shared APIC bus. |
2668 | * | 2664 | * |
2669 | * TBD: Expand LAPIC/IOAPIC support on P4-class systems to take full | 2665 | * TBD: Expand LAPIC/IOAPIC support on P4-class systems to take full |
2670 | * advantage of new APIC bus architecture. | 2666 | * advantage of new APIC bus architecture. |
2671 | */ | 2667 | */ |
@@ -2684,7 +2680,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
2684 | } | 2680 | } |
2685 | 2681 | ||
2686 | /* | 2682 | /* |
2687 | * Every APIC in a system must have a unique ID or we get lots of nice | 2683 | * Every APIC in a system must have a unique ID or we get lots of nice |
2688 | * 'stuck on smp_invalidate_needed IPI wait' messages. | 2684 | * 'stuck on smp_invalidate_needed IPI wait' messages. |
2689 | */ | 2685 | */ |
2690 | if (check_apicid_used(apic_id_map, apic_id)) { | 2686 | if (check_apicid_used(apic_id_map, apic_id)) { |
@@ -2701,7 +2697,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
2701 | "trying %d\n", ioapic, apic_id, i); | 2697 | "trying %d\n", ioapic, apic_id, i); |
2702 | 2698 | ||
2703 | apic_id = i; | 2699 | apic_id = i; |
2704 | } | 2700 | } |
2705 | 2701 | ||
2706 | tmp = apicid_to_cpu_present(apic_id); | 2702 | tmp = apicid_to_cpu_present(apic_id); |
2707 | physids_or(apic_id_map, apic_id_map, tmp); | 2703 | physids_or(apic_id_map, apic_id_map, tmp); |
@@ -2728,7 +2724,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
2728 | } | 2724 | } |
2729 | 2725 | ||
2730 | 2726 | ||
2731 | int __init io_apic_get_version (int ioapic) | 2727 | int __init io_apic_get_version(int ioapic) |
2732 | { | 2728 | { |
2733 | union IO_APIC_reg_01 reg_01; | 2729 | union IO_APIC_reg_01 reg_01; |
2734 | unsigned long flags; | 2730 | unsigned long flags; |
@@ -2741,7 +2737,7 @@ int __init io_apic_get_version (int ioapic) | |||
2741 | } | 2737 | } |
2742 | 2738 | ||
2743 | 2739 | ||
2744 | int __init io_apic_get_redir_entries (int ioapic) | 2740 | int __init io_apic_get_redir_entries(int ioapic) |
2745 | { | 2741 | { |
2746 | union IO_APIC_reg_01 reg_01; | 2742 | union IO_APIC_reg_01 reg_01; |
2747 | unsigned long flags; | 2743 | unsigned long flags; |
@@ -2754,7 +2750,7 @@ int __init io_apic_get_redir_entries (int ioapic) | |||
2754 | } | 2750 | } |
2755 | 2751 | ||
2756 | 2752 | ||
2757 | int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low) | 2753 | int io_apic_set_pci_routing(int ioapic, int pin, int irq, int edge_level, int active_high_low) |
2758 | { | 2754 | { |
2759 | struct IO_APIC_route_entry entry; | 2755 | struct IO_APIC_route_entry entry; |
2760 | 2756 | ||
@@ -2770,7 +2766,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a | |||
2770 | * corresponding device driver registers for this IRQ. | 2766 | * corresponding device driver registers for this IRQ. |
2771 | */ | 2767 | */ |
2772 | 2768 | ||
2773 | memset(&entry,0,sizeof(entry)); | 2769 | memset(&entry, 0, sizeof(entry)); |
2774 | 2770 | ||
2775 | entry.delivery_mode = INT_DELIVERY_MODE; | 2771 | entry.delivery_mode = INT_DELIVERY_MODE; |
2776 | entry.dest_mode = INT_DEST_MODE; | 2772 | entry.dest_mode = INT_DEST_MODE; |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index ef1a8dfcc529..e5ef60303562 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -61,7 +61,7 @@ struct irq_cfg { | |||
61 | }; | 61 | }; |
62 | 62 | ||
63 | /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ | 63 | /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ |
64 | struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = { | 64 | static struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = { |
65 | [0] = { .domain = CPU_MASK_ALL, .vector = IRQ0_VECTOR, }, | 65 | [0] = { .domain = CPU_MASK_ALL, .vector = IRQ0_VECTOR, }, |
66 | [1] = { .domain = CPU_MASK_ALL, .vector = IRQ1_VECTOR, }, | 66 | [1] = { .domain = CPU_MASK_ALL, .vector = IRQ1_VECTOR, }, |
67 | [2] = { .domain = CPU_MASK_ALL, .vector = IRQ2_VECTOR, }, | 67 | [2] = { .domain = CPU_MASK_ALL, .vector = IRQ2_VECTOR, }, |
@@ -90,7 +90,7 @@ static int no_timer_check; | |||
90 | 90 | ||
91 | static int disable_timer_pin_1 __initdata; | 91 | static int disable_timer_pin_1 __initdata; |
92 | 92 | ||
93 | int timer_over_8254 __initdata = 1; | 93 | int timer_through_8259 __initdata; |
94 | 94 | ||
95 | /* Where if anywhere is the i8259 connect in external int mode */ | 95 | /* Where if anywhere is the i8259 connect in external int mode */ |
96 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | 96 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; |
@@ -183,7 +183,7 @@ static bool io_apic_level_ack_pending(unsigned int irq) | |||
183 | break; | 183 | break; |
184 | reg = io_apic_read(entry->apic, 0x10 + pin*2); | 184 | reg = io_apic_read(entry->apic, 0x10 + pin*2); |
185 | /* Is the remote IRR bit set? */ | 185 | /* Is the remote IRR bit set? */ |
186 | if ((reg >> 14) & 1) { | 186 | if (reg & IO_APIC_REDIR_REMOTE_IRR) { |
187 | spin_unlock_irqrestore(&ioapic_lock, flags); | 187 | spin_unlock_irqrestore(&ioapic_lock, flags); |
188 | return true; | 188 | return true; |
189 | } | 189 | } |
@@ -298,7 +298,7 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector) | |||
298 | break; | 298 | break; |
299 | io_apic_write(apic, 0x11 + pin*2, dest); | 299 | io_apic_write(apic, 0x11 + pin*2, dest); |
300 | reg = io_apic_read(apic, 0x10 + pin*2); | 300 | reg = io_apic_read(apic, 0x10 + pin*2); |
301 | reg &= ~0x000000ff; | 301 | reg &= ~IO_APIC_REDIR_VECTOR_MASK; |
302 | reg |= vector; | 302 | reg |= vector; |
303 | io_apic_modify(apic, reg); | 303 | io_apic_modify(apic, reg); |
304 | if (!entry->next) | 304 | if (!entry->next) |
@@ -360,16 +360,37 @@ static void add_pin_to_irq(unsigned int irq, int apic, int pin) | |||
360 | entry->pin = pin; | 360 | entry->pin = pin; |
361 | } | 361 | } |
362 | 362 | ||
363 | /* | ||
364 | * Reroute an IRQ to a different pin. | ||
365 | */ | ||
366 | static void __init replace_pin_at_irq(unsigned int irq, | ||
367 | int oldapic, int oldpin, | ||
368 | int newapic, int newpin) | ||
369 | { | ||
370 | struct irq_pin_list *entry = irq_2_pin + irq; | ||
371 | |||
372 | while (1) { | ||
373 | if (entry->apic == oldapic && entry->pin == oldpin) { | ||
374 | entry->apic = newapic; | ||
375 | entry->pin = newpin; | ||
376 | } | ||
377 | if (!entry->next) | ||
378 | break; | ||
379 | entry = irq_2_pin + entry->next; | ||
380 | } | ||
381 | } | ||
382 | |||
363 | 383 | ||
364 | #define DO_ACTION(name,R,ACTION, FINAL) \ | 384 | #define DO_ACTION(name,R,ACTION, FINAL) \ |
365 | \ | 385 | \ |
366 | static void name##_IO_APIC_irq (unsigned int irq) \ | 386 | static void name##_IO_APIC_irq (unsigned int irq) \ |
367 | __DO_ACTION(R, ACTION, FINAL) | 387 | __DO_ACTION(R, ACTION, FINAL) |
368 | 388 | ||
369 | DO_ACTION( __mask, 0, |= 0x00010000, io_apic_sync(entry->apic) ) | 389 | /* mask = 1 */ |
370 | /* mask = 1 */ | 390 | DO_ACTION(__mask, 0, |= IO_APIC_REDIR_MASKED, io_apic_sync(entry->apic)) |
371 | DO_ACTION( __unmask, 0, &= 0xfffeffff, ) | 391 | |
372 | /* mask = 0 */ | 392 | /* mask = 0 */ |
393 | DO_ACTION(__unmask, 0, &= ~IO_APIC_REDIR_MASKED, ) | ||
373 | 394 | ||
374 | static void mask_IO_APIC_irq (unsigned int irq) | 395 | static void mask_IO_APIC_irq (unsigned int irq) |
375 | { | 396 | { |
@@ -430,20 +451,6 @@ static int __init disable_timer_pin_setup(char *arg) | |||
430 | } | 451 | } |
431 | __setup("disable_timer_pin_1", disable_timer_pin_setup); | 452 | __setup("disable_timer_pin_1", disable_timer_pin_setup); |
432 | 453 | ||
433 | static int __init setup_disable_8254_timer(char *s) | ||
434 | { | ||
435 | timer_over_8254 = -1; | ||
436 | return 1; | ||
437 | } | ||
438 | static int __init setup_enable_8254_timer(char *s) | ||
439 | { | ||
440 | timer_over_8254 = 2; | ||
441 | return 1; | ||
442 | } | ||
443 | |||
444 | __setup("disable_8254_timer", setup_disable_8254_timer); | ||
445 | __setup("enable_8254_timer", setup_enable_8254_timer); | ||
446 | |||
447 | 454 | ||
448 | /* | 455 | /* |
449 | * Find the IRQ entry number of a certain pin. | 456 | * Find the IRQ entry number of a certain pin. |
@@ -911,26 +918,21 @@ static void __init setup_IO_APIC_irqs(void) | |||
911 | } | 918 | } |
912 | 919 | ||
913 | /* | 920 | /* |
914 | * Set up the 8259A-master output pin as broadcast to all | 921 | * Set up the timer pin, possibly with the 8259A-master behind. |
915 | * CPUs. | ||
916 | */ | 922 | */ |
917 | static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, int vector) | 923 | static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, |
924 | int vector) | ||
918 | { | 925 | { |
919 | struct IO_APIC_route_entry entry; | 926 | struct IO_APIC_route_entry entry; |
920 | 927 | ||
921 | memset(&entry, 0, sizeof(entry)); | 928 | memset(&entry, 0, sizeof(entry)); |
922 | 929 | ||
923 | disable_8259A_irq(0); | ||
924 | |||
925 | /* mask LVT0 */ | ||
926 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | ||
927 | |||
928 | /* | 930 | /* |
929 | * We use logical delivery to get the timer IRQ | 931 | * We use logical delivery to get the timer IRQ |
930 | * to the first CPU. | 932 | * to the first CPU. |
931 | */ | 933 | */ |
932 | entry.dest_mode = INT_DEST_MODE; | 934 | entry.dest_mode = INT_DEST_MODE; |
933 | entry.mask = 0; /* unmask IRQ now */ | 935 | entry.mask = 1; /* mask IRQ now */ |
934 | entry.dest = cpu_mask_to_apicid(TARGET_CPUS); | 936 | entry.dest = cpu_mask_to_apicid(TARGET_CPUS); |
935 | entry.delivery_mode = INT_DELIVERY_MODE; | 937 | entry.delivery_mode = INT_DELIVERY_MODE; |
936 | entry.polarity = 0; | 938 | entry.polarity = 0; |
@@ -939,7 +941,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
939 | 941 | ||
940 | /* | 942 | /* |
941 | * The timer IRQ doesn't have to know that behind the | 943 | * The timer IRQ doesn't have to know that behind the |
942 | * scene we have a 8259A-master in AEOI mode ... | 944 | * scene we may have a 8259A-master in AEOI mode ... |
943 | */ | 945 | */ |
944 | set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge"); | 946 | set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge"); |
945 | 947 | ||
@@ -947,8 +949,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
947 | * Add it to the IO-APIC irq-routing table: | 949 | * Add it to the IO-APIC irq-routing table: |
948 | */ | 950 | */ |
949 | ioapic_write_entry(apic, pin, entry); | 951 | ioapic_write_entry(apic, pin, entry); |
950 | |||
951 | enable_8259A_irq(0); | ||
952 | } | 952 | } |
953 | 953 | ||
954 | void __apicdebuginit print_IO_APIC(void) | 954 | void __apicdebuginit print_IO_APIC(void) |
@@ -1077,6 +1077,7 @@ void __apicdebuginit print_local_APIC(void * dummy) | |||
1077 | 1077 | ||
1078 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", | 1078 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", |
1079 | smp_processor_id(), hard_smp_processor_id()); | 1079 | smp_processor_id(), hard_smp_processor_id()); |
1080 | v = apic_read(APIC_ID); | ||
1080 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(read_apic_id())); | 1081 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(read_apic_id())); |
1081 | v = apic_read(APIC_LVR); | 1082 | v = apic_read(APIC_LVR); |
1082 | printk(KERN_INFO "... APIC VERSION: %08x\n", v); | 1083 | printk(KERN_INFO "... APIC VERSION: %08x\n", v); |
@@ -1659,6 +1660,7 @@ static inline void __init check_timer(void) | |||
1659 | struct irq_cfg *cfg = irq_cfg + 0; | 1660 | struct irq_cfg *cfg = irq_cfg + 0; |
1660 | int apic1, pin1, apic2, pin2; | 1661 | int apic1, pin1, apic2, pin2; |
1661 | unsigned long flags; | 1662 | unsigned long flags; |
1663 | int no_pin1 = 0; | ||
1662 | 1664 | ||
1663 | local_irq_save(flags); | 1665 | local_irq_save(flags); |
1664 | 1666 | ||
@@ -1669,16 +1671,11 @@ static inline void __init check_timer(void) | |||
1669 | assign_irq_vector(0, TARGET_CPUS); | 1671 | assign_irq_vector(0, TARGET_CPUS); |
1670 | 1672 | ||
1671 | /* | 1673 | /* |
1672 | * Subtle, code in do_timer_interrupt() expects an AEOI | 1674 | * As IRQ0 is to be enabled in the 8259A, the virtual |
1673 | * mode for the 8259A whenever interrupts are routed | 1675 | * wire has to be disabled in the local APIC. |
1674 | * through I/O APICs. Also IRQ0 has to be enabled in | ||
1675 | * the 8259A which implies the virtual wire has to be | ||
1676 | * disabled in the local APIC. | ||
1677 | */ | 1676 | */ |
1678 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 1677 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
1679 | init_8259A(1); | 1678 | init_8259A(1); |
1680 | if (timer_over_8254 > 0) | ||
1681 | enable_8259A_irq(0); | ||
1682 | 1679 | ||
1683 | pin1 = find_isa_irq_pin(0, mp_INT); | 1680 | pin1 = find_isa_irq_pin(0, mp_INT); |
1684 | apic1 = find_isa_irq_apic(0, mp_INT); | 1681 | apic1 = find_isa_irq_apic(0, mp_INT); |
@@ -1688,15 +1685,39 @@ static inline void __init check_timer(void) | |||
1688 | apic_printk(APIC_VERBOSE,KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", | 1685 | apic_printk(APIC_VERBOSE,KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", |
1689 | cfg->vector, apic1, pin1, apic2, pin2); | 1686 | cfg->vector, apic1, pin1, apic2, pin2); |
1690 | 1687 | ||
1688 | /* | ||
1689 | * Some BIOS writers are clueless and report the ExtINTA | ||
1690 | * I/O APIC input from the cascaded 8259A as the timer | ||
1691 | * interrupt input. So just in case, if only one pin | ||
1692 | * was found above, try it both directly and through the | ||
1693 | * 8259A. | ||
1694 | */ | ||
1695 | if (pin1 == -1) { | ||
1696 | pin1 = pin2; | ||
1697 | apic1 = apic2; | ||
1698 | no_pin1 = 1; | ||
1699 | } else if (pin2 == -1) { | ||
1700 | pin2 = pin1; | ||
1701 | apic2 = apic1; | ||
1702 | } | ||
1703 | |||
1704 | replace_pin_at_irq(0, 0, 0, apic1, pin1); | ||
1705 | apic1 = 0; | ||
1706 | pin1 = 0; | ||
1707 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); | ||
1708 | |||
1691 | if (pin1 != -1) { | 1709 | if (pin1 != -1) { |
1692 | /* | 1710 | /* |
1693 | * Ok, does IRQ0 through the IOAPIC work? | 1711 | * Ok, does IRQ0 through the IOAPIC work? |
1694 | */ | 1712 | */ |
1713 | if (no_pin1) { | ||
1714 | add_pin_to_irq(0, apic1, pin1); | ||
1715 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); | ||
1716 | } | ||
1695 | unmask_IO_APIC_irq(0); | 1717 | unmask_IO_APIC_irq(0); |
1696 | if (!no_timer_check && timer_irq_works()) { | 1718 | if (!no_timer_check && timer_irq_works()) { |
1697 | nmi_watchdog_default(); | 1719 | nmi_watchdog_default(); |
1698 | if (nmi_watchdog == NMI_IO_APIC) { | 1720 | if (nmi_watchdog == NMI_IO_APIC) { |
1699 | disable_8259A_irq(0); | ||
1700 | setup_nmi(); | 1721 | setup_nmi(); |
1701 | enable_8259A_irq(0); | 1722 | enable_8259A_irq(0); |
1702 | } | 1723 | } |
@@ -1705,42 +1726,48 @@ static inline void __init check_timer(void) | |||
1705 | goto out; | 1726 | goto out; |
1706 | } | 1727 | } |
1707 | clear_IO_APIC_pin(apic1, pin1); | 1728 | clear_IO_APIC_pin(apic1, pin1); |
1708 | apic_printk(APIC_QUIET,KERN_ERR "..MP-BIOS bug: 8254 timer not " | 1729 | if (!no_pin1) |
1709 | "connected to IO-APIC\n"); | 1730 | apic_printk(APIC_QUIET,KERN_ERR "..MP-BIOS bug: " |
1710 | } | 1731 | "8254 timer not connected to IO-APIC\n"); |
1711 | 1732 | ||
1712 | apic_printk(APIC_VERBOSE,KERN_INFO "...trying to set up timer (IRQ0) " | 1733 | apic_printk(APIC_VERBOSE,KERN_INFO |
1713 | "through the 8259A ... "); | 1734 | "...trying to set up timer (IRQ0) " |
1714 | if (pin2 != -1) { | 1735 | "through the 8259A ... "); |
1715 | apic_printk(APIC_VERBOSE,"\n..... (found apic %d pin %d) ...", | 1736 | apic_printk(APIC_VERBOSE,"\n..... (found apic %d pin %d) ...", |
1716 | apic2, pin2); | 1737 | apic2, pin2); |
1717 | /* | 1738 | /* |
1718 | * legacy devices should be connected to IO APIC #0 | 1739 | * legacy devices should be connected to IO APIC #0 |
1719 | */ | 1740 | */ |
1720 | setup_ExtINT_IRQ0_pin(apic2, pin2, cfg->vector); | 1741 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); |
1742 | setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); | ||
1743 | unmask_IO_APIC_irq(0); | ||
1744 | enable_8259A_irq(0); | ||
1721 | if (timer_irq_works()) { | 1745 | if (timer_irq_works()) { |
1722 | apic_printk(APIC_VERBOSE," works.\n"); | 1746 | apic_printk(APIC_VERBOSE," works.\n"); |
1747 | timer_through_8259 = 1; | ||
1723 | nmi_watchdog_default(); | 1748 | nmi_watchdog_default(); |
1724 | if (nmi_watchdog == NMI_IO_APIC) { | 1749 | if (nmi_watchdog == NMI_IO_APIC) { |
1750 | disable_8259A_irq(0); | ||
1725 | setup_nmi(); | 1751 | setup_nmi(); |
1752 | enable_8259A_irq(0); | ||
1726 | } | 1753 | } |
1727 | goto out; | 1754 | goto out; |
1728 | } | 1755 | } |
1729 | /* | 1756 | /* |
1730 | * Cleanup, just in case ... | 1757 | * Cleanup, just in case ... |
1731 | */ | 1758 | */ |
1759 | disable_8259A_irq(0); | ||
1732 | clear_IO_APIC_pin(apic2, pin2); | 1760 | clear_IO_APIC_pin(apic2, pin2); |
1761 | apic_printk(APIC_VERBOSE," failed.\n"); | ||
1733 | } | 1762 | } |
1734 | apic_printk(APIC_VERBOSE," failed.\n"); | ||
1735 | 1763 | ||
1736 | if (nmi_watchdog == NMI_IO_APIC) { | 1764 | if (nmi_watchdog == NMI_IO_APIC) { |
1737 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); | 1765 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); |
1738 | nmi_watchdog = 0; | 1766 | nmi_watchdog = NMI_NONE; |
1739 | } | 1767 | } |
1740 | 1768 | ||
1741 | apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); | 1769 | apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); |
1742 | 1770 | ||
1743 | disable_8259A_irq(0); | ||
1744 | irq_desc[0].chip = &lapic_irq_type; | 1771 | irq_desc[0].chip = &lapic_irq_type; |
1745 | apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */ | 1772 | apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */ |
1746 | enable_8259A_irq(0); | 1773 | enable_8259A_irq(0); |
@@ -1749,6 +1776,7 @@ static inline void __init check_timer(void) | |||
1749 | apic_printk(APIC_VERBOSE," works.\n"); | 1776 | apic_printk(APIC_VERBOSE," works.\n"); |
1750 | goto out; | 1777 | goto out; |
1751 | } | 1778 | } |
1779 | disable_8259A_irq(0); | ||
1752 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); | 1780 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); |
1753 | apic_printk(APIC_VERBOSE," failed.\n"); | 1781 | apic_printk(APIC_VERBOSE," failed.\n"); |
1754 | 1782 | ||
diff --git a/arch/x86/kernel/ipi.c b/arch/x86/kernel/ipi.c index c0df7b89ca23..9d98cda39ad9 100644 --- a/arch/x86/kernel/ipi.c +++ b/arch/x86/kernel/ipi.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/kernel_stat.h> | 8 | #include <linux/kernel_stat.h> |
9 | #include <linux/mc146818rtc.h> | 9 | #include <linux/mc146818rtc.h> |
10 | #include <linux/cache.h> | 10 | #include <linux/cache.h> |
11 | #include <linux/interrupt.h> | ||
12 | #include <linux/cpu.h> | 11 | #include <linux/cpu.h> |
13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
14 | 13 | ||
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 147352df28b9..468acd04aa2e 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c | |||
@@ -313,16 +313,20 @@ skip: | |||
313 | per_cpu(irq_stat,j).irq_tlb_count); | 313 | per_cpu(irq_stat,j).irq_tlb_count); |
314 | seq_printf(p, " TLB shootdowns\n"); | 314 | seq_printf(p, " TLB shootdowns\n"); |
315 | #endif | 315 | #endif |
316 | #ifdef CONFIG_X86_MCE | ||
316 | seq_printf(p, "TRM: "); | 317 | seq_printf(p, "TRM: "); |
317 | for_each_online_cpu(j) | 318 | for_each_online_cpu(j) |
318 | seq_printf(p, "%10u ", | 319 | seq_printf(p, "%10u ", |
319 | per_cpu(irq_stat,j).irq_thermal_count); | 320 | per_cpu(irq_stat,j).irq_thermal_count); |
320 | seq_printf(p, " Thermal event interrupts\n"); | 321 | seq_printf(p, " Thermal event interrupts\n"); |
322 | #endif | ||
323 | #ifdef CONFIG_X86_LOCAL_APIC | ||
321 | seq_printf(p, "SPU: "); | 324 | seq_printf(p, "SPU: "); |
322 | for_each_online_cpu(j) | 325 | for_each_online_cpu(j) |
323 | seq_printf(p, "%10u ", | 326 | seq_printf(p, "%10u ", |
324 | per_cpu(irq_stat,j).irq_spurious_count); | 327 | per_cpu(irq_stat,j).irq_spurious_count); |
325 | seq_printf(p, " Spurious interrupts\n"); | 328 | seq_printf(p, " Spurious interrupts\n"); |
329 | #endif | ||
326 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); | 330 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); |
327 | #if defined(CONFIG_X86_IO_APIC) | 331 | #if defined(CONFIG_X86_IO_APIC) |
328 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); | 332 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); |
@@ -331,6 +335,40 @@ skip: | |||
331 | return 0; | 335 | return 0; |
332 | } | 336 | } |
333 | 337 | ||
338 | /* | ||
339 | * /proc/stat helpers | ||
340 | */ | ||
341 | u64 arch_irq_stat_cpu(unsigned int cpu) | ||
342 | { | ||
343 | u64 sum = nmi_count(cpu); | ||
344 | |||
345 | #ifdef CONFIG_X86_LOCAL_APIC | ||
346 | sum += per_cpu(irq_stat, cpu).apic_timer_irqs; | ||
347 | #endif | ||
348 | #ifdef CONFIG_SMP | ||
349 | sum += per_cpu(irq_stat, cpu).irq_resched_count; | ||
350 | sum += per_cpu(irq_stat, cpu).irq_call_count; | ||
351 | sum += per_cpu(irq_stat, cpu).irq_tlb_count; | ||
352 | #endif | ||
353 | #ifdef CONFIG_X86_MCE | ||
354 | sum += per_cpu(irq_stat, cpu).irq_thermal_count; | ||
355 | #endif | ||
356 | #ifdef CONFIG_X86_LOCAL_APIC | ||
357 | sum += per_cpu(irq_stat, cpu).irq_spurious_count; | ||
358 | #endif | ||
359 | return sum; | ||
360 | } | ||
361 | |||
362 | u64 arch_irq_stat(void) | ||
363 | { | ||
364 | u64 sum = atomic_read(&irq_err_count); | ||
365 | |||
366 | #ifdef CONFIG_X86_IO_APIC | ||
367 | sum += atomic_read(&irq_mis_count); | ||
368 | #endif | ||
369 | return sum; | ||
370 | } | ||
371 | |||
334 | #ifdef CONFIG_HOTPLUG_CPU | 372 | #ifdef CONFIG_HOTPLUG_CPU |
335 | #include <mach_apic.h> | 373 | #include <mach_apic.h> |
336 | 374 | ||
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index 3aac15466a91..1f78b238d8d2 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c | |||
@@ -135,6 +135,7 @@ skip: | |||
135 | seq_printf(p, "%10u ", cpu_pda(j)->irq_tlb_count); | 135 | seq_printf(p, "%10u ", cpu_pda(j)->irq_tlb_count); |
136 | seq_printf(p, " TLB shootdowns\n"); | 136 | seq_printf(p, " TLB shootdowns\n"); |
137 | #endif | 137 | #endif |
138 | #ifdef CONFIG_X86_MCE | ||
138 | seq_printf(p, "TRM: "); | 139 | seq_printf(p, "TRM: "); |
139 | for_each_online_cpu(j) | 140 | for_each_online_cpu(j) |
140 | seq_printf(p, "%10u ", cpu_pda(j)->irq_thermal_count); | 141 | seq_printf(p, "%10u ", cpu_pda(j)->irq_thermal_count); |
@@ -143,6 +144,7 @@ skip: | |||
143 | for_each_online_cpu(j) | 144 | for_each_online_cpu(j) |
144 | seq_printf(p, "%10u ", cpu_pda(j)->irq_threshold_count); | 145 | seq_printf(p, "%10u ", cpu_pda(j)->irq_threshold_count); |
145 | seq_printf(p, " Threshold APIC interrupts\n"); | 146 | seq_printf(p, " Threshold APIC interrupts\n"); |
147 | #endif | ||
146 | seq_printf(p, "SPU: "); | 148 | seq_printf(p, "SPU: "); |
147 | for_each_online_cpu(j) | 149 | for_each_online_cpu(j) |
148 | seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count); | 150 | seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count); |
@@ -153,6 +155,32 @@ skip: | |||
153 | } | 155 | } |
154 | 156 | ||
155 | /* | 157 | /* |
158 | * /proc/stat helpers | ||
159 | */ | ||
160 | u64 arch_irq_stat_cpu(unsigned int cpu) | ||
161 | { | ||
162 | u64 sum = cpu_pda(cpu)->__nmi_count; | ||
163 | |||
164 | sum += cpu_pda(cpu)->apic_timer_irqs; | ||
165 | #ifdef CONFIG_SMP | ||
166 | sum += cpu_pda(cpu)->irq_resched_count; | ||
167 | sum += cpu_pda(cpu)->irq_call_count; | ||
168 | sum += cpu_pda(cpu)->irq_tlb_count; | ||
169 | #endif | ||
170 | #ifdef CONFIG_X86_MCE | ||
171 | sum += cpu_pda(cpu)->irq_thermal_count; | ||
172 | sum += cpu_pda(cpu)->irq_threshold_count; | ||
173 | #endif | ||
174 | sum += cpu_pda(cpu)->irq_spurious_count; | ||
175 | return sum; | ||
176 | } | ||
177 | |||
178 | u64 arch_irq_stat(void) | ||
179 | { | ||
180 | return atomic_read(&irq_err_count); | ||
181 | } | ||
182 | |||
183 | /* | ||
156 | * do_IRQ handles all normal device IRQ's (the special | 184 | * do_IRQ handles all normal device IRQ's (the special |
157 | * SMP cross-CPU interrupts have their own specific | 185 | * SMP cross-CPU interrupts have their own specific |
158 | * handlers). | 186 | * handlers). |
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c new file mode 100644 index 000000000000..d66914287ee1 --- /dev/null +++ b/arch/x86/kernel/irqinit_32.c | |||
@@ -0,0 +1,114 @@ | |||
1 | #include <linux/errno.h> | ||
2 | #include <linux/signal.h> | ||
3 | #include <linux/sched.h> | ||
4 | #include <linux/ioport.h> | ||
5 | #include <linux/interrupt.h> | ||
6 | #include <linux/slab.h> | ||
7 | #include <linux/random.h> | ||
8 | #include <linux/init.h> | ||
9 | #include <linux/kernel_stat.h> | ||
10 | #include <linux/sysdev.h> | ||
11 | #include <linux/bitops.h> | ||
12 | |||
13 | #include <asm/atomic.h> | ||
14 | #include <asm/system.h> | ||
15 | #include <asm/io.h> | ||
16 | #include <asm/timer.h> | ||
17 | #include <asm/pgtable.h> | ||
18 | #include <asm/delay.h> | ||
19 | #include <asm/desc.h> | ||
20 | #include <asm/apic.h> | ||
21 | #include <asm/arch_hooks.h> | ||
22 | #include <asm/i8259.h> | ||
23 | |||
24 | |||
25 | |||
26 | /* | ||
27 | * Note that on a 486, we don't want to do a SIGFPE on an irq13 | ||
28 | * as the irq is unreliable, and exception 16 works correctly | ||
29 | * (ie as explained in the intel literature). On a 386, you | ||
30 | * can't use exception 16 due to bad IBM design, so we have to | ||
31 | * rely on the less exact irq13. | ||
32 | * | ||
33 | * Careful.. Not only is IRQ13 unreliable, but it is also | ||
34 | * leads to races. IBM designers who came up with it should | ||
35 | * be shot. | ||
36 | */ | ||
37 | |||
38 | |||
39 | static irqreturn_t math_error_irq(int cpl, void *dev_id) | ||
40 | { | ||
41 | extern void math_error(void __user *); | ||
42 | outb(0,0xF0); | ||
43 | if (ignore_fpu_irq || !boot_cpu_data.hard_math) | ||
44 | return IRQ_NONE; | ||
45 | math_error((void __user *)get_irq_regs()->ip); | ||
46 | return IRQ_HANDLED; | ||
47 | } | ||
48 | |||
49 | /* | ||
50 | * New motherboards sometimes make IRQ 13 be a PCI interrupt, | ||
51 | * so allow interrupt sharing. | ||
52 | */ | ||
53 | static struct irqaction fpu_irq = { | ||
54 | .handler = math_error_irq, | ||
55 | .mask = CPU_MASK_NONE, | ||
56 | .name = "fpu", | ||
57 | }; | ||
58 | |||
59 | void __init init_ISA_irqs (void) | ||
60 | { | ||
61 | int i; | ||
62 | |||
63 | #ifdef CONFIG_X86_LOCAL_APIC | ||
64 | init_bsp_APIC(); | ||
65 | #endif | ||
66 | init_8259A(0); | ||
67 | |||
68 | /* | ||
69 | * 16 old-style INTA-cycle interrupts: | ||
70 | */ | ||
71 | for (i = 0; i < 16; i++) { | ||
72 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
73 | handle_level_irq, "XT"); | ||
74 | } | ||
75 | } | ||
76 | |||
77 | /* Overridden in paravirt.c */ | ||
78 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
79 | |||
80 | void __init native_init_IRQ(void) | ||
81 | { | ||
82 | int i; | ||
83 | |||
84 | /* all the set up before the call gates are initialised */ | ||
85 | pre_intr_init_hook(); | ||
86 | |||
87 | /* | ||
88 | * Cover the whole vector space, no vector can escape | ||
89 | * us. (some of these will be overridden and become | ||
90 | * 'special' SMP interrupts) | ||
91 | */ | ||
92 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
93 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
94 | if (i >= NR_IRQS) | ||
95 | break; | ||
96 | /* SYSCALL_VECTOR was reserved in trap_init. */ | ||
97 | if (!test_bit(vector, used_vectors)) | ||
98 | set_intr_gate(vector, interrupt[i]); | ||
99 | } | ||
100 | |||
101 | /* setup after call gates are initialised (usually add in | ||
102 | * the architecture specific gates) | ||
103 | */ | ||
104 | intr_init_hook(); | ||
105 | |||
106 | /* | ||
107 | * External FPU? Set up irq13 if so, for | ||
108 | * original braindamaged IBM FERR coupling. | ||
109 | */ | ||
110 | if (boot_cpu_data.hard_math && !cpu_has_fpu) | ||
111 | setup_irq(FPU_IRQ, &fpu_irq); | ||
112 | |||
113 | irq_ctx_init(smp_processor_id()); | ||
114 | } | ||
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c new file mode 100644 index 000000000000..64bc0f14285f --- /dev/null +++ b/arch/x86/kernel/irqinit_64.c | |||
@@ -0,0 +1,203 @@ | |||
1 | #include <linux/linkage.h> | ||
2 | #include <linux/errno.h> | ||
3 | #include <linux/signal.h> | ||
4 | #include <linux/sched.h> | ||
5 | #include <linux/ioport.h> | ||
6 | #include <linux/interrupt.h> | ||
7 | #include <linux/timex.h> | ||
8 | #include <linux/slab.h> | ||
9 | #include <linux/random.h> | ||
10 | #include <linux/init.h> | ||
11 | #include <linux/kernel_stat.h> | ||
12 | #include <linux/sysdev.h> | ||
13 | #include <linux/bitops.h> | ||
14 | |||
15 | #include <asm/acpi.h> | ||
16 | #include <asm/atomic.h> | ||
17 | #include <asm/system.h> | ||
18 | #include <asm/io.h> | ||
19 | #include <asm/hw_irq.h> | ||
20 | #include <asm/pgtable.h> | ||
21 | #include <asm/delay.h> | ||
22 | #include <asm/desc.h> | ||
23 | #include <asm/apic.h> | ||
24 | #include <asm/i8259.h> | ||
25 | |||
26 | /* | ||
27 | * Common place to define all x86 IRQ vectors | ||
28 | * | ||
29 | * This builds up the IRQ handler stubs using some ugly macros in irq.h | ||
30 | * | ||
31 | * These macros create the low-level assembly IRQ routines that save | ||
32 | * register context and call do_IRQ(). do_IRQ() then does all the | ||
33 | * operations that are needed to keep the AT (or SMP IOAPIC) | ||
34 | * interrupt-controller happy. | ||
35 | */ | ||
36 | |||
37 | #define BI(x,y) \ | ||
38 | BUILD_IRQ(x##y) | ||
39 | |||
40 | #define BUILD_16_IRQS(x) \ | ||
41 | BI(x,0) BI(x,1) BI(x,2) BI(x,3) \ | ||
42 | BI(x,4) BI(x,5) BI(x,6) BI(x,7) \ | ||
43 | BI(x,8) BI(x,9) BI(x,a) BI(x,b) \ | ||
44 | BI(x,c) BI(x,d) BI(x,e) BI(x,f) | ||
45 | |||
46 | /* | ||
47 | * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts: | ||
48 | * (these are usually mapped to vectors 0x30-0x3f) | ||
49 | */ | ||
50 | |||
51 | /* | ||
52 | * The IO-APIC gives us many more interrupt sources. Most of these | ||
53 | * are unused but an SMP system is supposed to have enough memory ... | ||
54 | * sometimes (mostly wrt. hw bugs) we get corrupted vectors all | ||
55 | * across the spectrum, so we really want to be prepared to get all | ||
56 | * of these. Plus, more powerful systems might have more than 64 | ||
57 | * IO-APIC registers. | ||
58 | * | ||
59 | * (these are usually mapped into the 0x30-0xff vector range) | ||
60 | */ | ||
61 | BUILD_16_IRQS(0x2) BUILD_16_IRQS(0x3) | ||
62 | BUILD_16_IRQS(0x4) BUILD_16_IRQS(0x5) BUILD_16_IRQS(0x6) BUILD_16_IRQS(0x7) | ||
63 | BUILD_16_IRQS(0x8) BUILD_16_IRQS(0x9) BUILD_16_IRQS(0xa) BUILD_16_IRQS(0xb) | ||
64 | BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd) BUILD_16_IRQS(0xe) BUILD_16_IRQS(0xf) | ||
65 | |||
66 | #undef BUILD_16_IRQS | ||
67 | #undef BI | ||
68 | |||
69 | |||
70 | #define IRQ(x,y) \ | ||
71 | IRQ##x##y##_interrupt | ||
72 | |||
73 | #define IRQLIST_16(x) \ | ||
74 | IRQ(x,0), IRQ(x,1), IRQ(x,2), IRQ(x,3), \ | ||
75 | IRQ(x,4), IRQ(x,5), IRQ(x,6), IRQ(x,7), \ | ||
76 | IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \ | ||
77 | IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f) | ||
78 | |||
79 | /* for the irq vectors */ | ||
80 | static void (*__initdata interrupt[NR_VECTORS - FIRST_EXTERNAL_VECTOR])(void) = { | ||
81 | IRQLIST_16(0x2), IRQLIST_16(0x3), | ||
82 | IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7), | ||
83 | IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb), | ||
84 | IRQLIST_16(0xc), IRQLIST_16(0xd), IRQLIST_16(0xe), IRQLIST_16(0xf) | ||
85 | }; | ||
86 | |||
87 | #undef IRQ | ||
88 | #undef IRQLIST_16 | ||
89 | |||
90 | |||
91 | |||
92 | |||
93 | /* | ||
94 | * IRQ2 is cascade interrupt to second interrupt controller | ||
95 | */ | ||
96 | |||
97 | static struct irqaction irq2 = { | ||
98 | .handler = no_action, | ||
99 | .mask = CPU_MASK_NONE, | ||
100 | .name = "cascade", | ||
101 | }; | ||
102 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | ||
103 | [0 ... IRQ0_VECTOR - 1] = -1, | ||
104 | [IRQ0_VECTOR] = 0, | ||
105 | [IRQ1_VECTOR] = 1, | ||
106 | [IRQ2_VECTOR] = 2, | ||
107 | [IRQ3_VECTOR] = 3, | ||
108 | [IRQ4_VECTOR] = 4, | ||
109 | [IRQ5_VECTOR] = 5, | ||
110 | [IRQ6_VECTOR] = 6, | ||
111 | [IRQ7_VECTOR] = 7, | ||
112 | [IRQ8_VECTOR] = 8, | ||
113 | [IRQ9_VECTOR] = 9, | ||
114 | [IRQ10_VECTOR] = 10, | ||
115 | [IRQ11_VECTOR] = 11, | ||
116 | [IRQ12_VECTOR] = 12, | ||
117 | [IRQ13_VECTOR] = 13, | ||
118 | [IRQ14_VECTOR] = 14, | ||
119 | [IRQ15_VECTOR] = 15, | ||
120 | [IRQ15_VECTOR + 1 ... NR_VECTORS - 1] = -1 | ||
121 | }; | ||
122 | |||
123 | static void __init init_ISA_irqs (void) | ||
124 | { | ||
125 | int i; | ||
126 | |||
127 | init_bsp_APIC(); | ||
128 | init_8259A(0); | ||
129 | |||
130 | for (i = 0; i < NR_IRQS; i++) { | ||
131 | irq_desc[i].status = IRQ_DISABLED; | ||
132 | irq_desc[i].action = NULL; | ||
133 | irq_desc[i].depth = 1; | ||
134 | |||
135 | if (i < 16) { | ||
136 | /* | ||
137 | * 16 old-style INTA-cycle interrupts: | ||
138 | */ | ||
139 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
140 | handle_level_irq, "XT"); | ||
141 | } else { | ||
142 | /* | ||
143 | * 'high' PCI IRQs filled in on demand | ||
144 | */ | ||
145 | irq_desc[i].chip = &no_irq_chip; | ||
146 | } | ||
147 | } | ||
148 | } | ||
149 | |||
150 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
151 | |||
152 | void __init native_init_IRQ(void) | ||
153 | { | ||
154 | int i; | ||
155 | |||
156 | init_ISA_irqs(); | ||
157 | /* | ||
158 | * Cover the whole vector space, no vector can escape | ||
159 | * us. (some of these will be overridden and become | ||
160 | * 'special' SMP interrupts) | ||
161 | */ | ||
162 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
163 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
164 | if (vector != IA32_SYSCALL_VECTOR) | ||
165 | set_intr_gate(vector, interrupt[i]); | ||
166 | } | ||
167 | |||
168 | #ifdef CONFIG_SMP | ||
169 | /* | ||
170 | * The reschedule interrupt is a CPU-to-CPU reschedule-helper | ||
171 | * IPI, driven by wakeup. | ||
172 | */ | ||
173 | set_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt); | ||
174 | |||
175 | /* IPIs for invalidation */ | ||
176 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0); | ||
177 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1); | ||
178 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2); | ||
179 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3); | ||
180 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4); | ||
181 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5); | ||
182 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6); | ||
183 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7); | ||
184 | |||
185 | /* IPI for generic function call */ | ||
186 | set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt); | ||
187 | |||
188 | /* Low priority IPI to cleanup after moving an irq */ | ||
189 | set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt); | ||
190 | #endif | ||
191 | set_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | ||
192 | set_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); | ||
193 | |||
194 | /* self generated IPI for local APIC timer */ | ||
195 | set_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); | ||
196 | |||
197 | /* IPI vectors for APIC spurious and error interrupts */ | ||
198 | set_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); | ||
199 | set_intr_gate(ERROR_APIC_VECTOR, error_interrupt); | ||
200 | |||
201 | if (!acpi_ioapic) | ||
202 | setup_irq(2, &irq2); | ||
203 | } | ||
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 4bc1be5d5472..87edf1ceb1df 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c | |||
@@ -18,6 +18,7 @@ | |||
18 | 18 | ||
19 | #include <linux/clocksource.h> | 19 | #include <linux/clocksource.h> |
20 | #include <linux/kvm_para.h> | 20 | #include <linux/kvm_para.h> |
21 | #include <asm/pvclock.h> | ||
21 | #include <asm/arch_hooks.h> | 22 | #include <asm/arch_hooks.h> |
22 | #include <asm/msr.h> | 23 | #include <asm/msr.h> |
23 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
@@ -36,83 +37,47 @@ static int parse_no_kvmclock(char *arg) | |||
36 | early_param("no-kvmclock", parse_no_kvmclock); | 37 | early_param("no-kvmclock", parse_no_kvmclock); |
37 | 38 | ||
38 | /* The hypervisor will put information about time periodically here */ | 39 | /* The hypervisor will put information about time periodically here */ |
39 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct kvm_vcpu_time_info, hv_clock); | 40 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct pvclock_vcpu_time_info, hv_clock); |
40 | #define get_clock(cpu, field) per_cpu(hv_clock, cpu).field | 41 | static struct pvclock_wall_clock wall_clock; |
41 | 42 | ||
42 | static inline u64 kvm_get_delta(u64 last_tsc) | ||
43 | { | ||
44 | int cpu = smp_processor_id(); | ||
45 | u64 delta = native_read_tsc() - last_tsc; | ||
46 | return (delta * get_clock(cpu, tsc_to_system_mul)) >> KVM_SCALE; | ||
47 | } | ||
48 | |||
49 | static struct kvm_wall_clock wall_clock; | ||
50 | static cycle_t kvm_clock_read(void); | ||
51 | /* | 43 | /* |
52 | * The wallclock is the time of day when we booted. Since then, some time may | 44 | * The wallclock is the time of day when we booted. Since then, some time may |
53 | * have elapsed since the hypervisor wrote the data. So we try to account for | 45 | * have elapsed since the hypervisor wrote the data. So we try to account for |
54 | * that with system time | 46 | * that with system time |
55 | */ | 47 | */ |
56 | unsigned long kvm_get_wallclock(void) | 48 | static unsigned long kvm_get_wallclock(void) |
57 | { | 49 | { |
58 | u32 wc_sec, wc_nsec; | 50 | struct pvclock_vcpu_time_info *vcpu_time; |
59 | u64 delta; | ||
60 | struct timespec ts; | 51 | struct timespec ts; |
61 | int version, nsec; | ||
62 | int low, high; | 52 | int low, high; |
63 | 53 | ||
64 | low = (int)__pa(&wall_clock); | 54 | low = (int)__pa(&wall_clock); |
65 | high = ((u64)__pa(&wall_clock) >> 32); | 55 | high = ((u64)__pa(&wall_clock) >> 32); |
56 | native_write_msr(MSR_KVM_WALL_CLOCK, low, high); | ||
66 | 57 | ||
67 | delta = kvm_clock_read(); | 58 | vcpu_time = &get_cpu_var(hv_clock); |
59 | pvclock_read_wallclock(&wall_clock, vcpu_time, &ts); | ||
60 | put_cpu_var(hv_clock); | ||
68 | 61 | ||
69 | native_write_msr(MSR_KVM_WALL_CLOCK, low, high); | 62 | return ts.tv_sec; |
70 | do { | ||
71 | version = wall_clock.wc_version; | ||
72 | rmb(); | ||
73 | wc_sec = wall_clock.wc_sec; | ||
74 | wc_nsec = wall_clock.wc_nsec; | ||
75 | rmb(); | ||
76 | } while ((wall_clock.wc_version != version) || (version & 1)); | ||
77 | |||
78 | delta = kvm_clock_read() - delta; | ||
79 | delta += wc_nsec; | ||
80 | nsec = do_div(delta, NSEC_PER_SEC); | ||
81 | set_normalized_timespec(&ts, wc_sec + delta, nsec); | ||
82 | /* | ||
83 | * Of all mechanisms of time adjustment I've tested, this one | ||
84 | * was the champion! | ||
85 | */ | ||
86 | return ts.tv_sec + 1; | ||
87 | } | 63 | } |
88 | 64 | ||
89 | int kvm_set_wallclock(unsigned long now) | 65 | static int kvm_set_wallclock(unsigned long now) |
90 | { | 66 | { |
91 | return 0; | 67 | return -1; |
92 | } | 68 | } |
93 | 69 | ||
94 | /* | ||
95 | * This is our read_clock function. The host puts an tsc timestamp each time | ||
96 | * it updates a new time. Without the tsc adjustment, we can have a situation | ||
97 | * in which a vcpu starts to run earlier (smaller system_time), but probes | ||
98 | * time later (compared to another vcpu), leading to backwards time | ||
99 | */ | ||
100 | static cycle_t kvm_clock_read(void) | 70 | static cycle_t kvm_clock_read(void) |
101 | { | 71 | { |
102 | u64 last_tsc, now; | 72 | struct pvclock_vcpu_time_info *src; |
103 | int cpu; | 73 | cycle_t ret; |
104 | 74 | ||
105 | preempt_disable(); | 75 | src = &get_cpu_var(hv_clock); |
106 | cpu = smp_processor_id(); | 76 | ret = pvclock_clocksource_read(src); |
107 | 77 | put_cpu_var(hv_clock); | |
108 | last_tsc = get_clock(cpu, tsc_timestamp); | 78 | return ret; |
109 | now = get_clock(cpu, system_time); | ||
110 | |||
111 | now += kvm_get_delta(last_tsc); | ||
112 | preempt_enable(); | ||
113 | |||
114 | return now; | ||
115 | } | 79 | } |
80 | |||
116 | static struct clocksource kvm_clock = { | 81 | static struct clocksource kvm_clock = { |
117 | .name = "kvm-clock", | 82 | .name = "kvm-clock", |
118 | .read = kvm_clock_read, | 83 | .read = kvm_clock_read, |
@@ -123,13 +88,14 @@ static struct clocksource kvm_clock = { | |||
123 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 88 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
124 | }; | 89 | }; |
125 | 90 | ||
126 | static int kvm_register_clock(void) | 91 | static int kvm_register_clock(char *txt) |
127 | { | 92 | { |
128 | int cpu = smp_processor_id(); | 93 | int cpu = smp_processor_id(); |
129 | int low, high; | 94 | int low, high; |
130 | low = (int)__pa(&per_cpu(hv_clock, cpu)) | 1; | 95 | low = (int)__pa(&per_cpu(hv_clock, cpu)) | 1; |
131 | high = ((u64)__pa(&per_cpu(hv_clock, cpu)) >> 32); | 96 | high = ((u64)__pa(&per_cpu(hv_clock, cpu)) >> 32); |
132 | 97 | printk(KERN_INFO "kvm-clock: cpu %d, msr %x:%x, %s\n", | |
98 | cpu, high, low, txt); | ||
133 | return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high); | 99 | return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high); |
134 | } | 100 | } |
135 | 101 | ||
@@ -140,12 +106,20 @@ static void kvm_setup_secondary_clock(void) | |||
140 | * Now that the first cpu already had this clocksource initialized, | 106 | * Now that the first cpu already had this clocksource initialized, |
141 | * we shouldn't fail. | 107 | * we shouldn't fail. |
142 | */ | 108 | */ |
143 | WARN_ON(kvm_register_clock()); | 109 | WARN_ON(kvm_register_clock("secondary cpu clock")); |
144 | /* ok, done with our trickery, call native */ | 110 | /* ok, done with our trickery, call native */ |
145 | setup_secondary_APIC_clock(); | 111 | setup_secondary_APIC_clock(); |
146 | } | 112 | } |
147 | #endif | 113 | #endif |
148 | 114 | ||
115 | #ifdef CONFIG_SMP | ||
116 | void __init kvm_smp_prepare_boot_cpu(void) | ||
117 | { | ||
118 | WARN_ON(kvm_register_clock("primary cpu clock")); | ||
119 | native_smp_prepare_boot_cpu(); | ||
120 | } | ||
121 | #endif | ||
122 | |||
149 | /* | 123 | /* |
150 | * After the clock is registered, the host will keep writing to the | 124 | * After the clock is registered, the host will keep writing to the |
151 | * registered memory location. If the guest happens to shutdown, this memory | 125 | * registered memory location. If the guest happens to shutdown, this memory |
@@ -174,7 +148,7 @@ void __init kvmclock_init(void) | |||
174 | return; | 148 | return; |
175 | 149 | ||
176 | if (kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) { | 150 | if (kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) { |
177 | if (kvm_register_clock()) | 151 | if (kvm_register_clock("boot clock")) |
178 | return; | 152 | return; |
179 | pv_time_ops.get_wallclock = kvm_get_wallclock; | 153 | pv_time_ops.get_wallclock = kvm_get_wallclock; |
180 | pv_time_ops.set_wallclock = kvm_set_wallclock; | 154 | pv_time_ops.set_wallclock = kvm_set_wallclock; |
@@ -182,6 +156,9 @@ void __init kvmclock_init(void) | |||
182 | #ifdef CONFIG_X86_LOCAL_APIC | 156 | #ifdef CONFIG_X86_LOCAL_APIC |
183 | pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock; | 157 | pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock; |
184 | #endif | 158 | #endif |
159 | #ifdef CONFIG_SMP | ||
160 | smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu; | ||
161 | #endif | ||
185 | machine_ops.shutdown = kvm_shutdown; | 162 | machine_ops.shutdown = kvm_shutdown; |
186 | #ifdef CONFIG_KEXEC | 163 | #ifdef CONFIG_KEXEC |
187 | machine_ops.crash_shutdown = kvm_crash_shutdown; | 164 | machine_ops.crash_shutdown = kvm_crash_shutdown; |
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index 0224c3637c73..21f2bae98c15 100644 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c | |||
@@ -20,9 +20,9 @@ | |||
20 | #include <asm/mmu_context.h> | 20 | #include <asm/mmu_context.h> |
21 | 21 | ||
22 | #ifdef CONFIG_SMP | 22 | #ifdef CONFIG_SMP |
23 | static void flush_ldt(void *null) | 23 | static void flush_ldt(void *current_mm) |
24 | { | 24 | { |
25 | if (current->active_mm) | 25 | if (current->active_mm == current_mm) |
26 | load_LDT(¤t->active_mm->context); | 26 | load_LDT(¤t->active_mm->context); |
27 | } | 27 | } |
28 | #endif | 28 | #endif |
@@ -68,7 +68,7 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload) | |||
68 | load_LDT(pc); | 68 | load_LDT(pc); |
69 | mask = cpumask_of_cpu(smp_processor_id()); | 69 | mask = cpumask_of_cpu(smp_processor_id()); |
70 | if (!cpus_equal(current->mm->cpu_vm_mask, mask)) | 70 | if (!cpus_equal(current->mm->cpu_vm_mask, mask)) |
71 | smp_call_function(flush_ldt, NULL, 1, 1); | 71 | smp_call_function(flush_ldt, current->mm, 1, 1); |
72 | preempt_enable(); | 72 | preempt_enable(); |
73 | #else | 73 | #else |
74 | load_LDT(pc); | 74 | load_LDT(pc); |
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index d0b234c9fc31..f4960171bc66 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c | |||
@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit) | |||
39 | curidt.address = (unsigned long)newidt; | 39 | curidt.address = (unsigned long)newidt; |
40 | 40 | ||
41 | load_idt(&curidt); | 41 | load_idt(&curidt); |
42 | }; | 42 | } |
43 | 43 | ||
44 | 44 | ||
45 | static void set_gdt(void *newgdt, __u16 limit) | 45 | static void set_gdt(void *newgdt, __u16 limit) |
@@ -51,7 +51,7 @@ static void set_gdt(void *newgdt, __u16 limit) | |||
51 | curgdt.address = (unsigned long)newgdt; | 51 | curgdt.address = (unsigned long)newgdt; |
52 | 52 | ||
53 | load_gdt(&curgdt); | 53 | load_gdt(&curgdt); |
54 | }; | 54 | } |
55 | 55 | ||
56 | static void load_segments(void) | 56 | static void load_segments(void) |
57 | { | 57 | { |
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 3cad17fe026b..07c0f828f488 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
@@ -155,6 +155,7 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable) | |||
155 | wrmsr(msr, value, dummy); | 155 | wrmsr(msr, value, dummy); |
156 | return 0; | 156 | return 0; |
157 | } | 157 | } |
158 | EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event); | ||
158 | 159 | ||
159 | int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable) | 160 | int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable) |
160 | { | 161 | { |
@@ -222,6 +223,7 @@ int geode_mfgpt_alloc_timer(int timer, int domain) | |||
222 | /* No timers available - too bad */ | 223 | /* No timers available - too bad */ |
223 | return -1; | 224 | return -1; |
224 | } | 225 | } |
226 | EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer); | ||
225 | 227 | ||
226 | 228 | ||
227 | #ifdef CONFIG_GEODE_MFGPT_TIMER | 229 | #ifdef CONFIG_GEODE_MFGPT_TIMER |
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c index 69729e38b78a..9758fea87c5b 100644 --- a/arch/x86/kernel/microcode.c +++ b/arch/x86/kernel/microcode.c | |||
@@ -5,13 +5,14 @@ | |||
5 | * 2006 Shaohua Li <shaohua.li@intel.com> | 5 | * 2006 Shaohua Li <shaohua.li@intel.com> |
6 | * | 6 | * |
7 | * This driver allows to upgrade microcode on Intel processors | 7 | * This driver allows to upgrade microcode on Intel processors |
8 | * belonging to IA-32 family - PentiumPro, Pentium II, | 8 | * belonging to IA-32 family - PentiumPro, Pentium II, |
9 | * Pentium III, Xeon, Pentium 4, etc. | 9 | * Pentium III, Xeon, Pentium 4, etc. |
10 | * | 10 | * |
11 | * Reference: Section 8.10 of Volume III, Intel Pentium 4 Manual, | 11 | * Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture |
12 | * Order Number 245472 or free download from: | 12 | * Software Developer's Manual |
13 | * | 13 | * Order Number 253668 or free download from: |
14 | * http://developer.intel.com/design/pentium4/manuals/245472.htm | 14 | * |
15 | * http://developer.intel.com/design/pentium4/manuals/253668.htm | ||
15 | * | 16 | * |
16 | * For more information, go to http://www.urbanmyth.org/microcode | 17 | * For more information, go to http://www.urbanmyth.org/microcode |
17 | * | 18 | * |
@@ -58,12 +59,12 @@ | |||
58 | * nature of implementation. | 59 | * nature of implementation. |
59 | * 1.11 22 Mar 2002 Tigran Aivazian <tigran@veritas.com> | 60 | * 1.11 22 Mar 2002 Tigran Aivazian <tigran@veritas.com> |
60 | * Fix the panic when writing zero-length microcode chunk. | 61 | * Fix the panic when writing zero-length microcode chunk. |
61 | * 1.12 29 Sep 2003 Nitin Kamble <nitin.a.kamble@intel.com>, | 62 | * 1.12 29 Sep 2003 Nitin Kamble <nitin.a.kamble@intel.com>, |
62 | * Jun Nakajima <jun.nakajima@intel.com> | 63 | * Jun Nakajima <jun.nakajima@intel.com> |
63 | * Support for the microcode updates in the new format. | 64 | * Support for the microcode updates in the new format. |
64 | * 1.13 10 Oct 2003 Tigran Aivazian <tigran@veritas.com> | 65 | * 1.13 10 Oct 2003 Tigran Aivazian <tigran@veritas.com> |
65 | * Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl | 66 | * Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl |
66 | * because we no longer hold a copy of applied microcode | 67 | * because we no longer hold a copy of applied microcode |
67 | * in kernel memory. | 68 | * in kernel memory. |
68 | * 1.14 25 Jun 2004 Tigran Aivazian <tigran@veritas.com> | 69 | * 1.14 25 Jun 2004 Tigran Aivazian <tigran@veritas.com> |
69 | * Fix sigmatch() macro to handle old CPUs with pf == 0. | 70 | * Fix sigmatch() macro to handle old CPUs with pf == 0. |
@@ -320,11 +321,11 @@ static void apply_microcode(int cpu) | |||
320 | return; | 321 | return; |
321 | 322 | ||
322 | /* serialize access to the physical write to MSR 0x79 */ | 323 | /* serialize access to the physical write to MSR 0x79 */ |
323 | spin_lock_irqsave(µcode_update_lock, flags); | 324 | spin_lock_irqsave(µcode_update_lock, flags); |
324 | 325 | ||
325 | /* write microcode via MSR 0x79 */ | 326 | /* write microcode via MSR 0x79 */ |
326 | wrmsr(MSR_IA32_UCODE_WRITE, | 327 | wrmsr(MSR_IA32_UCODE_WRITE, |
327 | (unsigned long) uci->mc->bits, | 328 | (unsigned long) uci->mc->bits, |
328 | (unsigned long) uci->mc->bits >> 16 >> 16); | 329 | (unsigned long) uci->mc->bits >> 16 >> 16); |
329 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); | 330 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); |
330 | 331 | ||
@@ -341,7 +342,7 @@ static void apply_microcode(int cpu) | |||
341 | return; | 342 | return; |
342 | } | 343 | } |
343 | printk(KERN_INFO "microcode: CPU%d updated from revision " | 344 | printk(KERN_INFO "microcode: CPU%d updated from revision " |
344 | "0x%x to 0x%x, date = %08x \n", | 345 | "0x%x to 0x%x, date = %08x \n", |
345 | cpu_num, uci->rev, val[1], uci->mc->hdr.date); | 346 | cpu_num, uci->rev, val[1], uci->mc->hdr.date); |
346 | uci->rev = val[1]; | 347 | uci->rev = val[1]; |
347 | } | 348 | } |
@@ -534,7 +535,7 @@ static int cpu_request_microcode(int cpu) | |||
534 | c->x86, c->x86_model, c->x86_mask); | 535 | c->x86, c->x86_model, c->x86_mask); |
535 | error = request_firmware(&firmware, name, µcode_pdev->dev); | 536 | error = request_firmware(&firmware, name, µcode_pdev->dev); |
536 | if (error) { | 537 | if (error) { |
537 | pr_debug("microcode: ucode data file %s load failed\n", name); | 538 | pr_debug("microcode: data file %s load failed\n", name); |
538 | return error; | 539 | return error; |
539 | } | 540 | } |
540 | buf = firmware->data; | 541 | buf = firmware->data; |
@@ -805,6 +806,9 @@ static int __init microcode_init (void) | |||
805 | { | 806 | { |
806 | int error; | 807 | int error; |
807 | 808 | ||
809 | printk(KERN_INFO | ||
810 | "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@aivazian.fsnet.co.uk>\n"); | ||
811 | |||
808 | error = microcode_dev_init(); | 812 | error = microcode_dev_init(); |
809 | if (error) | 813 | if (error) |
810 | return error; | 814 | return error; |
@@ -825,9 +829,6 @@ static int __init microcode_init (void) | |||
825 | } | 829 | } |
826 | 830 | ||
827 | register_hotcpu_notifier(&mc_cpu_notifier); | 831 | register_hotcpu_notifier(&mc_cpu_notifier); |
828 | |||
829 | printk(KERN_INFO | ||
830 | "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@aivazian.fsnet.co.uk>\n"); | ||
831 | return 0; | 832 | return 0; |
832 | } | 833 | } |
833 | 834 | ||
diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c index edc5fbfe85c0..fdfdc550b366 100644 --- a/arch/x86/kernel/mmconf-fam10h_64.c +++ b/arch/x86/kernel/mmconf-fam10h_64.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <asm/io.h> | 12 | #include <asm/io.h> |
13 | #include <asm/msr.h> | 13 | #include <asm/msr.h> |
14 | #include <asm/acpi.h> | 14 | #include <asm/acpi.h> |
15 | #include <asm/mmconfig.h> | ||
15 | 16 | ||
16 | #include "../pci/pci.h" | 17 | #include "../pci/pci.h" |
17 | 18 | ||
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index 11b14bbaa61e..6580dae46277 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c | |||
@@ -24,6 +24,8 @@ | |||
24 | #include <linux/kdebug.h> | 24 | #include <linux/kdebug.h> |
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | 26 | ||
27 | #include <asm/i8259.h> | ||
28 | #include <asm/io_apic.h> | ||
27 | #include <asm/smp.h> | 29 | #include <asm/smp.h> |
28 | #include <asm/nmi.h> | 30 | #include <asm/nmi.h> |
29 | #include <asm/timer.h> | 31 | #include <asm/timer.h> |
@@ -131,7 +133,9 @@ int __init check_nmi_watchdog(void) | |||
131 | kfree(prev_nmi_count); | 133 | kfree(prev_nmi_count); |
132 | return 0; | 134 | return 0; |
133 | error: | 135 | error: |
134 | timer_ack = !cpu_has_tsc; | 136 | if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259) |
137 | disable_8259A_irq(0); | ||
138 | timer_ack = 0; | ||
135 | 139 | ||
136 | return -1; | 140 | return -1; |
137 | } | 141 | } |
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c index 5a29ded994fa..0060e44e8989 100644 --- a/arch/x86/kernel/nmi_64.c +++ b/arch/x86/kernel/nmi_64.c | |||
@@ -21,6 +21,8 @@ | |||
21 | #include <linux/cpumask.h> | 21 | #include <linux/cpumask.h> |
22 | #include <linux/kdebug.h> | 22 | #include <linux/kdebug.h> |
23 | 23 | ||
24 | #include <asm/i8259.h> | ||
25 | #include <asm/io_apic.h> | ||
24 | #include <asm/smp.h> | 26 | #include <asm/smp.h> |
25 | #include <asm/nmi.h> | 27 | #include <asm/nmi.h> |
26 | #include <asm/proto.h> | 28 | #include <asm/proto.h> |
@@ -90,7 +92,7 @@ int __init check_nmi_watchdog(void) | |||
90 | 92 | ||
91 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 93 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); |
92 | if (!prev_nmi_count) | 94 | if (!prev_nmi_count) |
93 | return -1; | 95 | goto error; |
94 | 96 | ||
95 | printk(KERN_INFO "Testing NMI watchdog ... "); | 97 | printk(KERN_INFO "Testing NMI watchdog ... "); |
96 | 98 | ||
@@ -121,7 +123,7 @@ int __init check_nmi_watchdog(void) | |||
121 | if (!atomic_read(&nmi_active)) { | 123 | if (!atomic_read(&nmi_active)) { |
122 | kfree(prev_nmi_count); | 124 | kfree(prev_nmi_count); |
123 | atomic_set(&nmi_active, -1); | 125 | atomic_set(&nmi_active, -1); |
124 | return -1; | 126 | goto error; |
125 | } | 127 | } |
126 | printk("OK.\n"); | 128 | printk("OK.\n"); |
127 | 129 | ||
@@ -132,6 +134,11 @@ int __init check_nmi_watchdog(void) | |||
132 | 134 | ||
133 | kfree(prev_nmi_count); | 135 | kfree(prev_nmi_count); |
134 | return 0; | 136 | return 0; |
137 | error: | ||
138 | if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259) | ||
139 | disable_8259A_irq(0); | ||
140 | |||
141 | return -1; | ||
135 | } | 142 | } |
136 | 143 | ||
137 | static int __init setup_nmi_watchdog(char *str) | 144 | static int __init setup_nmi_watchdog(char *str) |
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 74f0c5ea2a03..f1ab0f727007 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -380,6 +380,9 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
380 | .pte_update = paravirt_nop, | 380 | .pte_update = paravirt_nop, |
381 | .pte_update_defer = paravirt_nop, | 381 | .pte_update_defer = paravirt_nop, |
382 | 382 | ||
383 | .ptep_modify_prot_start = __ptep_modify_prot_start, | ||
384 | .ptep_modify_prot_commit = __ptep_modify_prot_commit, | ||
385 | |||
383 | #ifdef CONFIG_HIGHPTE | 386 | #ifdef CONFIG_HIGHPTE |
384 | .kmap_atomic_pte = kmap_atomic, | 387 | .kmap_atomic_pte = kmap_atomic, |
385 | #endif | 388 | #endif |
@@ -403,6 +406,7 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
403 | #endif /* PAGETABLE_LEVELS >= 3 */ | 406 | #endif /* PAGETABLE_LEVELS >= 3 */ |
404 | 407 | ||
405 | .pte_val = native_pte_val, | 408 | .pte_val = native_pte_val, |
409 | .pte_flags = native_pte_val, | ||
406 | .pgd_val = native_pgd_val, | 410 | .pgd_val = native_pgd_val, |
407 | 411 | ||
408 | .make_pte = native_make_pte, | 412 | .make_pte = native_make_pte, |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index c5ef1af8e79d..3c43109ba054 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
@@ -77,10 +77,14 @@ void __init dma32_reserve_bootmem(void) | |||
77 | if (end_pfn <= MAX_DMA32_PFN) | 77 | if (end_pfn <= MAX_DMA32_PFN) |
78 | return; | 78 | return; |
79 | 79 | ||
80 | /* | ||
81 | * check aperture_64.c allocate_aperture() for reason about | ||
82 | * using 512M as goal | ||
83 | */ | ||
80 | align = 64ULL<<20; | 84 | align = 64ULL<<20; |
81 | size = round_up(dma32_bootmem_size, align); | 85 | size = round_up(dma32_bootmem_size, align); |
82 | dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align, | 86 | dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align, |
83 | __pa(MAX_DMA_ADDRESS)); | 87 | 512ULL<<20); |
84 | if (dma32_bootmem_ptr) | 88 | if (dma32_bootmem_ptr) |
85 | dma32_bootmem_size = size; | 89 | dma32_bootmem_size = size; |
86 | else | 90 | else |
@@ -88,7 +92,6 @@ void __init dma32_reserve_bootmem(void) | |||
88 | } | 92 | } |
89 | static void __init dma32_free_bootmem(void) | 93 | static void __init dma32_free_bootmem(void) |
90 | { | 94 | { |
91 | int node; | ||
92 | 95 | ||
93 | if (end_pfn <= MAX_DMA32_PFN) | 96 | if (end_pfn <= MAX_DMA32_PFN) |
94 | return; | 97 | return; |
@@ -96,9 +99,7 @@ static void __init dma32_free_bootmem(void) | |||
96 | if (!dma32_bootmem_ptr) | 99 | if (!dma32_bootmem_ptr) |
97 | return; | 100 | return; |
98 | 101 | ||
99 | for_each_online_node(node) | 102 | free_bootmem(__pa(dma32_bootmem_ptr), dma32_bootmem_size); |
100 | free_bootmem_node(NODE_DATA(node), __pa(dma32_bootmem_ptr), | ||
101 | dma32_bootmem_size); | ||
102 | 103 | ||
103 | dma32_bootmem_ptr = NULL; | 104 | dma32_bootmem_ptr = NULL; |
104 | dma32_bootmem_size = 0; | 105 | dma32_bootmem_size = 0; |
@@ -357,7 +358,7 @@ int dma_supported(struct device *dev, u64 mask) | |||
357 | EXPORT_SYMBOL(dma_supported); | 358 | EXPORT_SYMBOL(dma_supported); |
358 | 359 | ||
359 | /* Allocate DMA memory on node near device */ | 360 | /* Allocate DMA memory on node near device */ |
360 | noinline struct page * | 361 | static noinline struct page * |
361 | dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order) | 362 | dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order) |
362 | { | 363 | { |
363 | int node; | 364 | int node; |
@@ -378,6 +379,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
378 | struct page *page; | 379 | struct page *page; |
379 | unsigned long dma_mask = 0; | 380 | unsigned long dma_mask = 0; |
380 | dma_addr_t bus; | 381 | dma_addr_t bus; |
382 | int noretry = 0; | ||
381 | 383 | ||
382 | /* ignore region specifiers */ | 384 | /* ignore region specifiers */ |
383 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); | 385 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); |
@@ -397,20 +399,25 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
397 | if (dev->dma_mask == NULL) | 399 | if (dev->dma_mask == NULL) |
398 | return NULL; | 400 | return NULL; |
399 | 401 | ||
400 | /* Don't invoke OOM killer */ | 402 | /* Don't invoke OOM killer or retry in lower 16MB DMA zone */ |
401 | gfp |= __GFP_NORETRY; | 403 | if (gfp & __GFP_DMA) |
404 | noretry = 1; | ||
402 | 405 | ||
403 | #ifdef CONFIG_X86_64 | 406 | #ifdef CONFIG_X86_64 |
404 | /* Why <=? Even when the mask is smaller than 4GB it is often | 407 | /* Why <=? Even when the mask is smaller than 4GB it is often |
405 | larger than 16MB and in this case we have a chance of | 408 | larger than 16MB and in this case we have a chance of |
406 | finding fitting memory in the next higher zone first. If | 409 | finding fitting memory in the next higher zone first. If |
407 | not retry with true GFP_DMA. -AK */ | 410 | not retry with true GFP_DMA. -AK */ |
408 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) | 411 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) { |
409 | gfp |= GFP_DMA32; | 412 | gfp |= GFP_DMA32; |
413 | if (dma_mask < DMA_32BIT_MASK) | ||
414 | noretry = 1; | ||
415 | } | ||
410 | #endif | 416 | #endif |
411 | 417 | ||
412 | again: | 418 | again: |
413 | page = dma_alloc_pages(dev, gfp, get_order(size)); | 419 | page = dma_alloc_pages(dev, |
420 | noretry ? gfp | __GFP_NORETRY : gfp, get_order(size)); | ||
414 | if (page == NULL) | 421 | if (page == NULL) |
415 | return NULL; | 422 | return NULL; |
416 | 423 | ||
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index c07455d1695f..021f3c684a62 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/kdebug.h> | 26 | #include <linux/kdebug.h> |
27 | #include <linux/scatterlist.h> | 27 | #include <linux/scatterlist.h> |
28 | #include <linux/iommu-helper.h> | 28 | #include <linux/iommu-helper.h> |
29 | #include <linux/sysdev.h> | ||
29 | #include <asm/atomic.h> | 30 | #include <asm/atomic.h> |
30 | #include <asm/io.h> | 31 | #include <asm/io.h> |
31 | #include <asm/mtrr.h> | 32 | #include <asm/mtrr.h> |
@@ -103,7 +104,6 @@ static unsigned long alloc_iommu(struct device *dev, int size) | |||
103 | size, base_index, boundary_size, 0); | 104 | size, base_index, boundary_size, 0); |
104 | } | 105 | } |
105 | if (offset != -1) { | 106 | if (offset != -1) { |
106 | set_bit_string(iommu_gart_bitmap, offset, size); | ||
107 | next_bit = offset+size; | 107 | next_bit = offset+size; |
108 | if (next_bit >= iommu_pages) { | 108 | if (next_bit >= iommu_pages) { |
109 | next_bit = 0; | 109 | next_bit = 0; |
@@ -533,8 +533,8 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size) | |||
533 | unsigned aper_size = 0, aper_base_32, aper_order; | 533 | unsigned aper_size = 0, aper_base_32, aper_order; |
534 | u64 aper_base; | 534 | u64 aper_base; |
535 | 535 | ||
536 | pci_read_config_dword(dev, 0x94, &aper_base_32); | 536 | pci_read_config_dword(dev, AMD64_GARTAPERTUREBASE, &aper_base_32); |
537 | pci_read_config_dword(dev, 0x90, &aper_order); | 537 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &aper_order); |
538 | aper_order = (aper_order >> 1) & 7; | 538 | aper_order = (aper_order >> 1) & 7; |
539 | 539 | ||
540 | aper_base = aper_base_32 & 0x7fff; | 540 | aper_base = aper_base_32 & 0x7fff; |
@@ -548,6 +548,77 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size) | |||
548 | return aper_base; | 548 | return aper_base; |
549 | } | 549 | } |
550 | 550 | ||
551 | static void enable_gart_translations(void) | ||
552 | { | ||
553 | int i; | ||
554 | |||
555 | for (i = 0; i < num_k8_northbridges; i++) { | ||
556 | struct pci_dev *dev = k8_northbridges[i]; | ||
557 | |||
558 | enable_gart_translation(dev, __pa(agp_gatt_table)); | ||
559 | } | ||
560 | } | ||
561 | |||
562 | /* | ||
563 | * If fix_up_north_bridges is set, the north bridges have to be fixed up on | ||
564 | * resume in the same way as they are handled in gart_iommu_hole_init(). | ||
565 | */ | ||
566 | static bool fix_up_north_bridges; | ||
567 | static u32 aperture_order; | ||
568 | static u32 aperture_alloc; | ||
569 | |||
570 | void set_up_gart_resume(u32 aper_order, u32 aper_alloc) | ||
571 | { | ||
572 | fix_up_north_bridges = true; | ||
573 | aperture_order = aper_order; | ||
574 | aperture_alloc = aper_alloc; | ||
575 | } | ||
576 | |||
577 | static int gart_resume(struct sys_device *dev) | ||
578 | { | ||
579 | printk(KERN_INFO "PCI-DMA: Resuming GART IOMMU\n"); | ||
580 | |||
581 | if (fix_up_north_bridges) { | ||
582 | int i; | ||
583 | |||
584 | printk(KERN_INFO "PCI-DMA: Restoring GART aperture settings\n"); | ||
585 | |||
586 | for (i = 0; i < num_k8_northbridges; i++) { | ||
587 | struct pci_dev *dev = k8_northbridges[i]; | ||
588 | |||
589 | /* | ||
590 | * Don't enable translations just yet. That is the next | ||
591 | * step. Restore the pre-suspend aperture settings. | ||
592 | */ | ||
593 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, | ||
594 | aperture_order << 1); | ||
595 | pci_write_config_dword(dev, AMD64_GARTAPERTUREBASE, | ||
596 | aperture_alloc >> 25); | ||
597 | } | ||
598 | } | ||
599 | |||
600 | enable_gart_translations(); | ||
601 | |||
602 | return 0; | ||
603 | } | ||
604 | |||
605 | static int gart_suspend(struct sys_device *dev, pm_message_t state) | ||
606 | { | ||
607 | return 0; | ||
608 | } | ||
609 | |||
610 | static struct sysdev_class gart_sysdev_class = { | ||
611 | .name = "gart", | ||
612 | .suspend = gart_suspend, | ||
613 | .resume = gart_resume, | ||
614 | |||
615 | }; | ||
616 | |||
617 | static struct sys_device device_gart = { | ||
618 | .id = 0, | ||
619 | .cls = &gart_sysdev_class, | ||
620 | }; | ||
621 | |||
551 | /* | 622 | /* |
552 | * Private Northbridge GATT initialization in case we cannot use the | 623 | * Private Northbridge GATT initialization in case we cannot use the |
553 | * AGP driver for some reason. | 624 | * AGP driver for some reason. |
@@ -558,7 +629,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
558 | unsigned aper_base, new_aper_base; | 629 | unsigned aper_base, new_aper_base; |
559 | struct pci_dev *dev; | 630 | struct pci_dev *dev; |
560 | void *gatt; | 631 | void *gatt; |
561 | int i; | 632 | int i, error; |
562 | 633 | ||
563 | printk(KERN_INFO "PCI-DMA: Disabling AGP.\n"); | 634 | printk(KERN_INFO "PCI-DMA: Disabling AGP.\n"); |
564 | aper_size = aper_base = info->aper_size = 0; | 635 | aper_size = aper_base = info->aper_size = 0; |
@@ -591,21 +662,14 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
591 | memset(gatt, 0, gatt_size); | 662 | memset(gatt, 0, gatt_size); |
592 | agp_gatt_table = gatt; | 663 | agp_gatt_table = gatt; |
593 | 664 | ||
594 | for (i = 0; i < num_k8_northbridges; i++) { | 665 | enable_gart_translations(); |
595 | u32 gatt_reg; | ||
596 | u32 ctl; | ||
597 | 666 | ||
598 | dev = k8_northbridges[i]; | 667 | error = sysdev_class_register(&gart_sysdev_class); |
599 | gatt_reg = __pa(gatt) >> 12; | 668 | if (!error) |
600 | gatt_reg <<= 4; | 669 | error = sysdev_register(&device_gart); |
601 | pci_write_config_dword(dev, 0x98, gatt_reg); | 670 | if (error) |
602 | pci_read_config_dword(dev, 0x90, &ctl); | 671 | panic("Could not register gart_sysdev -- would corrupt data on next suspend"); |
603 | 672 | ||
604 | ctl |= 1; | ||
605 | ctl &= ~((1<<4) | (1<<5)); | ||
606 | |||
607 | pci_write_config_dword(dev, 0x90, ctl); | ||
608 | } | ||
609 | flush_gart(); | 673 | flush_gart(); |
610 | 674 | ||
611 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", | 675 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", |
@@ -648,11 +712,11 @@ void gart_iommu_shutdown(void) | |||
648 | u32 ctl; | 712 | u32 ctl; |
649 | 713 | ||
650 | dev = k8_northbridges[i]; | 714 | dev = k8_northbridges[i]; |
651 | pci_read_config_dword(dev, 0x90, &ctl); | 715 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &ctl); |
652 | 716 | ||
653 | ctl &= ~1; | 717 | ctl &= ~GARTEN; |
654 | 718 | ||
655 | pci_write_config_dword(dev, 0x90, ctl); | 719 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl); |
656 | } | 720 | } |
657 | } | 721 | } |
658 | 722 | ||
@@ -759,10 +823,10 @@ void __init gart_iommu_init(void) | |||
759 | wbinvd(); | 823 | wbinvd(); |
760 | 824 | ||
761 | /* | 825 | /* |
762 | * Try to workaround a bug (thanks to BenH) | 826 | * Try to workaround a bug (thanks to BenH): |
763 | * Set unmapped entries to a scratch page instead of 0. | 827 | * Set unmapped entries to a scratch page instead of 0. |
764 | * Any prefetches that hit unmapped entries won't get an bus abort | 828 | * Any prefetches that hit unmapped entries won't get an bus abort |
765 | * then. | 829 | * then. (P2P bridge may be prefetching on DMA reads). |
766 | */ | 830 | */ |
767 | scratch = get_zeroed_page(GFP_KERNEL); | 831 | scratch = get_zeroed_page(GFP_KERNEL); |
768 | if (!scratch) | 832 | if (!scratch) |
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index ba370dc8685b..4061d63aabe7 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
8 | #include <linux/pm.h> | 8 | #include <linux/pm.h> |
9 | #include <linux/clockchips.h> | ||
9 | 10 | ||
10 | struct kmem_cache *task_xstate_cachep; | 11 | struct kmem_cache *task_xstate_cachep; |
11 | 12 | ||
@@ -45,6 +46,76 @@ void arch_task_cache_init(void) | |||
45 | SLAB_PANIC, NULL); | 46 | SLAB_PANIC, NULL); |
46 | } | 47 | } |
47 | 48 | ||
49 | /* | ||
50 | * Idle related variables and functions | ||
51 | */ | ||
52 | unsigned long boot_option_idle_override = 0; | ||
53 | EXPORT_SYMBOL(boot_option_idle_override); | ||
54 | |||
55 | /* | ||
56 | * Powermanagement idle function, if any.. | ||
57 | */ | ||
58 | void (*pm_idle)(void); | ||
59 | EXPORT_SYMBOL(pm_idle); | ||
60 | |||
61 | #ifdef CONFIG_X86_32 | ||
62 | /* | ||
63 | * This halt magic was a workaround for ancient floppy DMA | ||
64 | * wreckage. It should be safe to remove. | ||
65 | */ | ||
66 | static int hlt_counter; | ||
67 | void disable_hlt(void) | ||
68 | { | ||
69 | hlt_counter++; | ||
70 | } | ||
71 | EXPORT_SYMBOL(disable_hlt); | ||
72 | |||
73 | void enable_hlt(void) | ||
74 | { | ||
75 | hlt_counter--; | ||
76 | } | ||
77 | EXPORT_SYMBOL(enable_hlt); | ||
78 | |||
79 | static inline int hlt_use_halt(void) | ||
80 | { | ||
81 | return (!hlt_counter && boot_cpu_data.hlt_works_ok); | ||
82 | } | ||
83 | #else | ||
84 | static inline int hlt_use_halt(void) | ||
85 | { | ||
86 | return 1; | ||
87 | } | ||
88 | #endif | ||
89 | |||
90 | /* | ||
91 | * We use this if we don't have any better | ||
92 | * idle routine.. | ||
93 | */ | ||
94 | void default_idle(void) | ||
95 | { | ||
96 | if (hlt_use_halt()) { | ||
97 | current_thread_info()->status &= ~TS_POLLING; | ||
98 | /* | ||
99 | * TS_POLLING-cleared state must be visible before we | ||
100 | * test NEED_RESCHED: | ||
101 | */ | ||
102 | smp_mb(); | ||
103 | |||
104 | if (!need_resched()) | ||
105 | safe_halt(); /* enables interrupts racelessly */ | ||
106 | else | ||
107 | local_irq_enable(); | ||
108 | current_thread_info()->status |= TS_POLLING; | ||
109 | } else { | ||
110 | local_irq_enable(); | ||
111 | /* loop is done by the caller */ | ||
112 | cpu_relax(); | ||
113 | } | ||
114 | } | ||
115 | #ifdef CONFIG_APM_MODULE | ||
116 | EXPORT_SYMBOL(default_idle); | ||
117 | #endif | ||
118 | |||
48 | static void do_nothing(void *unused) | 119 | static void do_nothing(void *unused) |
49 | { | 120 | { |
50 | } | 121 | } |
@@ -122,44 +193,129 @@ static void poll_idle(void) | |||
122 | * | 193 | * |
123 | * idle=mwait overrides this decision and forces the usage of mwait. | 194 | * idle=mwait overrides this decision and forces the usage of mwait. |
124 | */ | 195 | */ |
196 | |||
197 | #define MWAIT_INFO 0x05 | ||
198 | #define MWAIT_ECX_EXTENDED_INFO 0x01 | ||
199 | #define MWAIT_EDX_C1 0xf0 | ||
200 | |||
125 | static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) | 201 | static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) |
126 | { | 202 | { |
203 | u32 eax, ebx, ecx, edx; | ||
204 | |||
127 | if (force_mwait) | 205 | if (force_mwait) |
128 | return 1; | 206 | return 1; |
129 | 207 | ||
130 | if (c->x86_vendor == X86_VENDOR_AMD) { | 208 | if (c->cpuid_level < MWAIT_INFO) |
131 | switch(c->x86) { | 209 | return 0; |
132 | case 0x10: | 210 | |
133 | case 0x11: | 211 | cpuid(MWAIT_INFO, &eax, &ebx, &ecx, &edx); |
134 | return 0; | 212 | /* Check, whether EDX has extended info about MWAIT */ |
135 | } | 213 | if (!(ecx & MWAIT_ECX_EXTENDED_INFO)) |
136 | } | 214 | return 1; |
215 | |||
216 | /* | ||
217 | * edx enumeratios MONITOR/MWAIT extensions. Check, whether | ||
218 | * C1 supports MWAIT | ||
219 | */ | ||
220 | return (edx & MWAIT_EDX_C1); | ||
221 | } | ||
222 | |||
223 | /* | ||
224 | * Check for AMD CPUs, which have potentially C1E support | ||
225 | */ | ||
226 | static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c) | ||
227 | { | ||
228 | if (c->x86_vendor != X86_VENDOR_AMD) | ||
229 | return 0; | ||
230 | |||
231 | if (c->x86 < 0x0F) | ||
232 | return 0; | ||
233 | |||
234 | /* Family 0x0f models < rev F do not have C1E */ | ||
235 | if (c->x86 == 0x0f && c->x86_model < 0x40) | ||
236 | return 0; | ||
237 | |||
137 | return 1; | 238 | return 1; |
138 | } | 239 | } |
139 | 240 | ||
140 | void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) | 241 | /* |
242 | * C1E aware idle routine. We check for C1E active in the interrupt | ||
243 | * pending message MSR. If we detect C1E, then we handle it the same | ||
244 | * way as C3 power states (local apic timer and TSC stop) | ||
245 | */ | ||
246 | static void c1e_idle(void) | ||
141 | { | 247 | { |
142 | static int selected; | 248 | static cpumask_t c1e_mask = CPU_MASK_NONE; |
249 | static int c1e_detected; | ||
143 | 250 | ||
144 | if (selected) | 251 | if (need_resched()) |
145 | return; | 252 | return; |
253 | |||
254 | if (!c1e_detected) { | ||
255 | u32 lo, hi; | ||
256 | |||
257 | rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi); | ||
258 | if (lo & K8_INTP_C1E_ACTIVE_MASK) { | ||
259 | c1e_detected = 1; | ||
260 | mark_tsc_unstable("TSC halt in C1E"); | ||
261 | printk(KERN_INFO "System has C1E enabled\n"); | ||
262 | } | ||
263 | } | ||
264 | |||
265 | if (c1e_detected) { | ||
266 | int cpu = smp_processor_id(); | ||
267 | |||
268 | if (!cpu_isset(cpu, c1e_mask)) { | ||
269 | cpu_set(cpu, c1e_mask); | ||
270 | /* | ||
271 | * Force broadcast so ACPI can not interfere. Needs | ||
272 | * to run with interrupts enabled as it uses | ||
273 | * smp_function_call. | ||
274 | */ | ||
275 | local_irq_enable(); | ||
276 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, | ||
277 | &cpu); | ||
278 | printk(KERN_INFO "Switch to broadcast mode on CPU%d\n", | ||
279 | cpu); | ||
280 | local_irq_disable(); | ||
281 | } | ||
282 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu); | ||
283 | |||
284 | default_idle(); | ||
285 | |||
286 | /* | ||
287 | * The switch back from broadcast mode needs to be | ||
288 | * called with interrupts disabled. | ||
289 | */ | ||
290 | local_irq_disable(); | ||
291 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu); | ||
292 | local_irq_enable(); | ||
293 | } else | ||
294 | default_idle(); | ||
295 | } | ||
296 | |||
297 | void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) | ||
298 | { | ||
146 | #ifdef CONFIG_X86_SMP | 299 | #ifdef CONFIG_X86_SMP |
147 | if (pm_idle == poll_idle && smp_num_siblings > 1) { | 300 | if (pm_idle == poll_idle && smp_num_siblings > 1) { |
148 | printk(KERN_WARNING "WARNING: polling idle and HT enabled," | 301 | printk(KERN_WARNING "WARNING: polling idle and HT enabled," |
149 | " performance may degrade.\n"); | 302 | " performance may degrade.\n"); |
150 | } | 303 | } |
151 | #endif | 304 | #endif |
305 | if (pm_idle) | ||
306 | return; | ||
307 | |||
152 | if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) { | 308 | if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) { |
153 | /* | 309 | /* |
154 | * Skip, if setup has overridden idle. | ||
155 | * One CPU supports mwait => All CPUs supports mwait | 310 | * One CPU supports mwait => All CPUs supports mwait |
156 | */ | 311 | */ |
157 | if (!pm_idle) { | 312 | printk(KERN_INFO "using mwait in idle threads.\n"); |
158 | printk(KERN_INFO "using mwait in idle threads.\n"); | 313 | pm_idle = mwait_idle; |
159 | pm_idle = mwait_idle; | 314 | } else if (check_c1e_idle(c)) { |
160 | } | 315 | printk(KERN_INFO "using C1E aware idle routine\n"); |
161 | } | 316 | pm_idle = c1e_idle; |
162 | selected = 1; | 317 | } else |
318 | pm_idle = default_idle; | ||
163 | } | 319 | } |
164 | 320 | ||
165 | static int __init idle_setup(char *str) | 321 | static int __init idle_setup(char *str) |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index f8476dfbb60d..c2a11d77b1b5 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -58,11 +58,6 @@ | |||
58 | 58 | ||
59 | asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); | 59 | asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); |
60 | 60 | ||
61 | static int hlt_counter; | ||
62 | |||
63 | unsigned long boot_option_idle_override = 0; | ||
64 | EXPORT_SYMBOL(boot_option_idle_override); | ||
65 | |||
66 | DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task; | 61 | DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task; |
67 | EXPORT_PER_CPU_SYMBOL(current_task); | 62 | EXPORT_PER_CPU_SYMBOL(current_task); |
68 | 63 | ||
@@ -77,55 +72,6 @@ unsigned long thread_saved_pc(struct task_struct *tsk) | |||
77 | return ((unsigned long *)tsk->thread.sp)[3]; | 72 | return ((unsigned long *)tsk->thread.sp)[3]; |
78 | } | 73 | } |
79 | 74 | ||
80 | /* | ||
81 | * Powermanagement idle function, if any.. | ||
82 | */ | ||
83 | void (*pm_idle)(void); | ||
84 | EXPORT_SYMBOL(pm_idle); | ||
85 | |||
86 | void disable_hlt(void) | ||
87 | { | ||
88 | hlt_counter++; | ||
89 | } | ||
90 | |||
91 | EXPORT_SYMBOL(disable_hlt); | ||
92 | |||
93 | void enable_hlt(void) | ||
94 | { | ||
95 | hlt_counter--; | ||
96 | } | ||
97 | |||
98 | EXPORT_SYMBOL(enable_hlt); | ||
99 | |||
100 | /* | ||
101 | * We use this if we don't have any better | ||
102 | * idle routine.. | ||
103 | */ | ||
104 | void default_idle(void) | ||
105 | { | ||
106 | if (!hlt_counter && boot_cpu_data.hlt_works_ok) { | ||
107 | current_thread_info()->status &= ~TS_POLLING; | ||
108 | /* | ||
109 | * TS_POLLING-cleared state must be visible before we | ||
110 | * test NEED_RESCHED: | ||
111 | */ | ||
112 | smp_mb(); | ||
113 | |||
114 | if (!need_resched()) | ||
115 | safe_halt(); /* enables interrupts racelessly */ | ||
116 | else | ||
117 | local_irq_enable(); | ||
118 | current_thread_info()->status |= TS_POLLING; | ||
119 | } else { | ||
120 | local_irq_enable(); | ||
121 | /* loop is done by the caller */ | ||
122 | cpu_relax(); | ||
123 | } | ||
124 | } | ||
125 | #ifdef CONFIG_APM_MODULE | ||
126 | EXPORT_SYMBOL(default_idle); | ||
127 | #endif | ||
128 | |||
129 | #ifdef CONFIG_HOTPLUG_CPU | 75 | #ifdef CONFIG_HOTPLUG_CPU |
130 | #include <asm/nmi.h> | 76 | #include <asm/nmi.h> |
131 | /* We don't actually take CPU down, just spin without interrupts. */ | 77 | /* We don't actually take CPU down, just spin without interrupts. */ |
@@ -168,24 +114,19 @@ void cpu_idle(void) | |||
168 | while (1) { | 114 | while (1) { |
169 | tick_nohz_stop_sched_tick(); | 115 | tick_nohz_stop_sched_tick(); |
170 | while (!need_resched()) { | 116 | while (!need_resched()) { |
171 | void (*idle)(void); | ||
172 | 117 | ||
173 | check_pgt_cache(); | 118 | check_pgt_cache(); |
174 | rmb(); | 119 | rmb(); |
175 | idle = pm_idle; | ||
176 | 120 | ||
177 | if (rcu_pending(cpu)) | 121 | if (rcu_pending(cpu)) |
178 | rcu_check_callbacks(cpu, 0); | 122 | rcu_check_callbacks(cpu, 0); |
179 | 123 | ||
180 | if (!idle) | ||
181 | idle = default_idle; | ||
182 | |||
183 | if (cpu_is_offline(cpu)) | 124 | if (cpu_is_offline(cpu)) |
184 | play_dead(); | 125 | play_dead(); |
185 | 126 | ||
186 | local_irq_disable(); | 127 | local_irq_disable(); |
187 | __get_cpu_var(irq_stat).idle_timestamp = jiffies; | 128 | __get_cpu_var(irq_stat).idle_timestamp = jiffies; |
188 | idle(); | 129 | pm_idle(); |
189 | } | 130 | } |
190 | tick_nohz_restart_sched_tick(); | 131 | tick_nohz_restart_sched_tick(); |
191 | preempt_enable_no_resched(); | 132 | preempt_enable_no_resched(); |
@@ -333,6 +274,7 @@ void flush_thread(void) | |||
333 | /* | 274 | /* |
334 | * Forget coprocessor state.. | 275 | * Forget coprocessor state.. |
335 | */ | 276 | */ |
277 | tsk->fpu_counter = 0; | ||
336 | clear_fpu(tsk); | 278 | clear_fpu(tsk); |
337 | clear_used_math(); | 279 | clear_used_math(); |
338 | } | 280 | } |
@@ -649,8 +591,11 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct | |||
649 | /* If the task has used fpu the last 5 timeslices, just do a full | 591 | /* If the task has used fpu the last 5 timeslices, just do a full |
650 | * restore of the math state immediately to avoid the trap; the | 592 | * restore of the math state immediately to avoid the trap; the |
651 | * chances of needing FPU soon are obviously high now | 593 | * chances of needing FPU soon are obviously high now |
594 | * | ||
595 | * tsk_used_math() checks prevent calling math_state_restore(), | ||
596 | * which can sleep in the case of !tsk_used_math() | ||
652 | */ | 597 | */ |
653 | if (next_p->fpu_counter > 5) | 598 | if (tsk_used_math(next_p) && next_p->fpu_counter > 5) |
654 | math_state_restore(); | 599 | math_state_restore(); |
655 | 600 | ||
656 | /* | 601 | /* |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index e2319f39988b..290183e9731a 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -56,15 +56,6 @@ asmlinkage extern void ret_from_fork(void); | |||
56 | 56 | ||
57 | unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED; | 57 | unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED; |
58 | 58 | ||
59 | unsigned long boot_option_idle_override = 0; | ||
60 | EXPORT_SYMBOL(boot_option_idle_override); | ||
61 | |||
62 | /* | ||
63 | * Powermanagement idle function, if any.. | ||
64 | */ | ||
65 | void (*pm_idle)(void); | ||
66 | EXPORT_SYMBOL(pm_idle); | ||
67 | |||
68 | static ATOMIC_NOTIFIER_HEAD(idle_notifier); | 59 | static ATOMIC_NOTIFIER_HEAD(idle_notifier); |
69 | 60 | ||
70 | void idle_notifier_register(struct notifier_block *n) | 61 | void idle_notifier_register(struct notifier_block *n) |
@@ -94,25 +85,6 @@ void exit_idle(void) | |||
94 | __exit_idle(); | 85 | __exit_idle(); |
95 | } | 86 | } |
96 | 87 | ||
97 | /* | ||
98 | * We use this if we don't have any better | ||
99 | * idle routine.. | ||
100 | */ | ||
101 | void default_idle(void) | ||
102 | { | ||
103 | current_thread_info()->status &= ~TS_POLLING; | ||
104 | /* | ||
105 | * TS_POLLING-cleared state must be visible before we | ||
106 | * test NEED_RESCHED: | ||
107 | */ | ||
108 | smp_mb(); | ||
109 | if (!need_resched()) | ||
110 | safe_halt(); /* enables interrupts racelessly */ | ||
111 | else | ||
112 | local_irq_enable(); | ||
113 | current_thread_info()->status |= TS_POLLING; | ||
114 | } | ||
115 | |||
116 | #ifdef CONFIG_HOTPLUG_CPU | 88 | #ifdef CONFIG_HOTPLUG_CPU |
117 | DECLARE_PER_CPU(int, cpu_state); | 89 | DECLARE_PER_CPU(int, cpu_state); |
118 | 90 | ||
@@ -150,12 +122,9 @@ void cpu_idle(void) | |||
150 | while (1) { | 122 | while (1) { |
151 | tick_nohz_stop_sched_tick(); | 123 | tick_nohz_stop_sched_tick(); |
152 | while (!need_resched()) { | 124 | while (!need_resched()) { |
153 | void (*idle)(void); | ||
154 | 125 | ||
155 | rmb(); | 126 | rmb(); |
156 | idle = pm_idle; | 127 | |
157 | if (!idle) | ||
158 | idle = default_idle; | ||
159 | if (cpu_is_offline(smp_processor_id())) | 128 | if (cpu_is_offline(smp_processor_id())) |
160 | play_dead(); | 129 | play_dead(); |
161 | /* | 130 | /* |
@@ -165,7 +134,7 @@ void cpu_idle(void) | |||
165 | */ | 134 | */ |
166 | local_irq_disable(); | 135 | local_irq_disable(); |
167 | enter_idle(); | 136 | enter_idle(); |
168 | idle(); | 137 | pm_idle(); |
169 | /* In many cases the interrupt that ended idle | 138 | /* In many cases the interrupt that ended idle |
170 | has already called exit_idle. But some idle | 139 | has already called exit_idle. But some idle |
171 | loops can be woken up without interrupt. */ | 140 | loops can be woken up without interrupt. */ |
@@ -294,6 +263,7 @@ void flush_thread(void) | |||
294 | /* | 263 | /* |
295 | * Forget coprocessor state.. | 264 | * Forget coprocessor state.. |
296 | */ | 265 | */ |
266 | tsk->fpu_counter = 0; | ||
297 | clear_fpu(tsk); | 267 | clear_fpu(tsk); |
298 | clear_used_math(); | 268 | clear_used_math(); |
299 | } | 269 | } |
@@ -658,8 +628,11 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | |||
658 | /* If the task has used fpu the last 5 timeslices, just do a full | 628 | /* If the task has used fpu the last 5 timeslices, just do a full |
659 | * restore of the math state immediately to avoid the trap; the | 629 | * restore of the math state immediately to avoid the trap; the |
660 | * chances of needing FPU soon are obviously high now | 630 | * chances of needing FPU soon are obviously high now |
631 | * | ||
632 | * tsk_used_math() checks prevent calling math_state_restore(), | ||
633 | * which can sleep in the case of !tsk_used_math() | ||
661 | */ | 634 | */ |
662 | if (next_p->fpu_counter>5) | 635 | if (tsk_used_math(next_p) && next_p->fpu_counter > 5) |
663 | math_state_restore(); | 636 | math_state_restore(); |
664 | return prev_p; | 637 | return prev_p; |
665 | } | 638 | } |
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c new file mode 100644 index 000000000000..05fbe9a0325a --- /dev/null +++ b/arch/x86/kernel/pvclock.c | |||
@@ -0,0 +1,141 @@ | |||
1 | /* paravirtual clock -- common code used by kvm/xen | ||
2 | |||
3 | This program is free software; you can redistribute it and/or modify | ||
4 | it under the terms of the GNU General Public License as published by | ||
5 | the Free Software Foundation; either version 2 of the License, or | ||
6 | (at your option) any later version. | ||
7 | |||
8 | This program is distributed in the hope that it will be useful, | ||
9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | GNU General Public License for more details. | ||
12 | |||
13 | You should have received a copy of the GNU General Public License | ||
14 | along with this program; if not, write to the Free Software | ||
15 | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
16 | */ | ||
17 | |||
18 | #include <linux/kernel.h> | ||
19 | #include <linux/percpu.h> | ||
20 | #include <asm/pvclock.h> | ||
21 | |||
22 | /* | ||
23 | * These are perodically updated | ||
24 | * xen: magic shared_info page | ||
25 | * kvm: gpa registered via msr | ||
26 | * and then copied here. | ||
27 | */ | ||
28 | struct pvclock_shadow_time { | ||
29 | u64 tsc_timestamp; /* TSC at last update of time vals. */ | ||
30 | u64 system_timestamp; /* Time, in nanosecs, since boot. */ | ||
31 | u32 tsc_to_nsec_mul; | ||
32 | int tsc_shift; | ||
33 | u32 version; | ||
34 | }; | ||
35 | |||
36 | /* | ||
37 | * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, | ||
38 | * yielding a 64-bit result. | ||
39 | */ | ||
40 | static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift) | ||
41 | { | ||
42 | u64 product; | ||
43 | #ifdef __i386__ | ||
44 | u32 tmp1, tmp2; | ||
45 | #endif | ||
46 | |||
47 | if (shift < 0) | ||
48 | delta >>= -shift; | ||
49 | else | ||
50 | delta <<= shift; | ||
51 | |||
52 | #ifdef __i386__ | ||
53 | __asm__ ( | ||
54 | "mul %5 ; " | ||
55 | "mov %4,%%eax ; " | ||
56 | "mov %%edx,%4 ; " | ||
57 | "mul %5 ; " | ||
58 | "xor %5,%5 ; " | ||
59 | "add %4,%%eax ; " | ||
60 | "adc %5,%%edx ; " | ||
61 | : "=A" (product), "=r" (tmp1), "=r" (tmp2) | ||
62 | : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); | ||
63 | #elif __x86_64__ | ||
64 | __asm__ ( | ||
65 | "mul %%rdx ; shrd $32,%%rdx,%%rax" | ||
66 | : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); | ||
67 | #else | ||
68 | #error implement me! | ||
69 | #endif | ||
70 | |||
71 | return product; | ||
72 | } | ||
73 | |||
74 | static u64 pvclock_get_nsec_offset(struct pvclock_shadow_time *shadow) | ||
75 | { | ||
76 | u64 delta = native_read_tsc() - shadow->tsc_timestamp; | ||
77 | return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift); | ||
78 | } | ||
79 | |||
80 | /* | ||
81 | * Reads a consistent set of time-base values from hypervisor, | ||
82 | * into a shadow data area. | ||
83 | */ | ||
84 | static unsigned pvclock_get_time_values(struct pvclock_shadow_time *dst, | ||
85 | struct pvclock_vcpu_time_info *src) | ||
86 | { | ||
87 | do { | ||
88 | dst->version = src->version; | ||
89 | rmb(); /* fetch version before data */ | ||
90 | dst->tsc_timestamp = src->tsc_timestamp; | ||
91 | dst->system_timestamp = src->system_time; | ||
92 | dst->tsc_to_nsec_mul = src->tsc_to_system_mul; | ||
93 | dst->tsc_shift = src->tsc_shift; | ||
94 | rmb(); /* test version after fetching data */ | ||
95 | } while ((src->version & 1) || (dst->version != src->version)); | ||
96 | |||
97 | return dst->version; | ||
98 | } | ||
99 | |||
100 | cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) | ||
101 | { | ||
102 | struct pvclock_shadow_time shadow; | ||
103 | unsigned version; | ||
104 | cycle_t ret, offset; | ||
105 | |||
106 | do { | ||
107 | version = pvclock_get_time_values(&shadow, src); | ||
108 | barrier(); | ||
109 | offset = pvclock_get_nsec_offset(&shadow); | ||
110 | ret = shadow.system_timestamp + offset; | ||
111 | barrier(); | ||
112 | } while (version != src->version); | ||
113 | |||
114 | return ret; | ||
115 | } | ||
116 | |||
117 | void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock, | ||
118 | struct pvclock_vcpu_time_info *vcpu_time, | ||
119 | struct timespec *ts) | ||
120 | { | ||
121 | u32 version; | ||
122 | u64 delta; | ||
123 | struct timespec now; | ||
124 | |||
125 | /* get wallclock at system boot */ | ||
126 | do { | ||
127 | version = wall_clock->version; | ||
128 | rmb(); /* fetch version before time */ | ||
129 | now.tv_sec = wall_clock->sec; | ||
130 | now.tv_nsec = wall_clock->nsec; | ||
131 | rmb(); /* fetch time before checking version */ | ||
132 | } while ((wall_clock->version & 1) || (version != wall_clock->version)); | ||
133 | |||
134 | delta = pvclock_clocksource_read(vcpu_time); /* time since system boot */ | ||
135 | delta += now.tv_sec * (u64)NSEC_PER_SEC + now.tv_nsec; | ||
136 | |||
137 | now.tv_nsec = do_div(delta, NSEC_PER_SEC); | ||
138 | now.tv_sec = delta; | ||
139 | |||
140 | set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); | ||
141 | } | ||
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index d89a648fe710..79bdcd11c66e 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c | |||
@@ -65,6 +65,7 @@ static enum { | |||
65 | ICH_FORCE_HPET_RESUME, | 65 | ICH_FORCE_HPET_RESUME, |
66 | VT8237_FORCE_HPET_RESUME, | 66 | VT8237_FORCE_HPET_RESUME, |
67 | NVIDIA_FORCE_HPET_RESUME, | 67 | NVIDIA_FORCE_HPET_RESUME, |
68 | ATI_FORCE_HPET_RESUME, | ||
68 | } force_hpet_resume_type; | 69 | } force_hpet_resume_type; |
69 | 70 | ||
70 | static void __iomem *rcba_base; | 71 | static void __iomem *rcba_base; |
@@ -158,6 +159,8 @@ static void ich_force_enable_hpet(struct pci_dev *dev) | |||
158 | 159 | ||
159 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, | 160 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, |
160 | ich_force_enable_hpet); | 161 | ich_force_enable_hpet); |
162 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0, | ||
163 | ich_force_enable_hpet); | ||
161 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, | 164 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, |
162 | ich_force_enable_hpet); | 165 | ich_force_enable_hpet); |
163 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0, | 166 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0, |
@@ -174,6 +177,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7, | |||
174 | 177 | ||
175 | static struct pci_dev *cached_dev; | 178 | static struct pci_dev *cached_dev; |
176 | 179 | ||
180 | static void hpet_print_force_info(void) | ||
181 | { | ||
182 | printk(KERN_INFO "HPET not enabled in BIOS. " | ||
183 | "You might try hpet=force boot option\n"); | ||
184 | } | ||
185 | |||
177 | static void old_ich_force_hpet_resume(void) | 186 | static void old_ich_force_hpet_resume(void) |
178 | { | 187 | { |
179 | u32 val; | 188 | u32 val; |
@@ -253,6 +262,8 @@ static void old_ich_force_enable_hpet_user(struct pci_dev *dev) | |||
253 | { | 262 | { |
254 | if (hpet_force_user) | 263 | if (hpet_force_user) |
255 | old_ich_force_enable_hpet(dev); | 264 | old_ich_force_enable_hpet(dev); |
265 | else | ||
266 | hpet_print_force_info(); | ||
256 | } | 267 | } |
257 | 268 | ||
258 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, | 269 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, |
@@ -290,8 +301,13 @@ static void vt8237_force_enable_hpet(struct pci_dev *dev) | |||
290 | { | 301 | { |
291 | u32 uninitialized_var(val); | 302 | u32 uninitialized_var(val); |
292 | 303 | ||
293 | if (!hpet_force_user || hpet_address || force_hpet_address) | 304 | if (hpet_address || force_hpet_address) |
305 | return; | ||
306 | |||
307 | if (!hpet_force_user) { | ||
308 | hpet_print_force_info(); | ||
294 | return; | 309 | return; |
310 | } | ||
295 | 311 | ||
296 | pci_read_config_dword(dev, 0x68, &val); | 312 | pci_read_config_dword(dev, 0x68, &val); |
297 | /* | 313 | /* |
@@ -330,6 +346,36 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, | |||
330 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, | 346 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, |
331 | vt8237_force_enable_hpet); | 347 | vt8237_force_enable_hpet); |
332 | 348 | ||
349 | static void ati_force_hpet_resume(void) | ||
350 | { | ||
351 | pci_write_config_dword(cached_dev, 0x14, 0xfed00000); | ||
352 | printk(KERN_DEBUG "Force enabled HPET at resume\n"); | ||
353 | } | ||
354 | |||
355 | static void ati_force_enable_hpet(struct pci_dev *dev) | ||
356 | { | ||
357 | u32 uninitialized_var(val); | ||
358 | |||
359 | if (hpet_address || force_hpet_address) | ||
360 | return; | ||
361 | |||
362 | if (!hpet_force_user) { | ||
363 | hpet_print_force_info(); | ||
364 | return; | ||
365 | } | ||
366 | |||
367 | pci_write_config_dword(dev, 0x14, 0xfed00000); | ||
368 | pci_read_config_dword(dev, 0x14, &val); | ||
369 | force_hpet_address = val; | ||
370 | force_hpet_resume_type = ATI_FORCE_HPET_RESUME; | ||
371 | dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at 0x%lx\n", | ||
372 | force_hpet_address); | ||
373 | cached_dev = dev; | ||
374 | return; | ||
375 | } | ||
376 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS, | ||
377 | ati_force_enable_hpet); | ||
378 | |||
333 | /* | 379 | /* |
334 | * Undocumented chipset feature taken from LinuxBIOS. | 380 | * Undocumented chipset feature taken from LinuxBIOS. |
335 | */ | 381 | */ |
@@ -343,8 +389,13 @@ static void nvidia_force_enable_hpet(struct pci_dev *dev) | |||
343 | { | 389 | { |
344 | u32 uninitialized_var(val); | 390 | u32 uninitialized_var(val); |
345 | 391 | ||
346 | if (!hpet_force_user || hpet_address || force_hpet_address) | 392 | if (hpet_address || force_hpet_address) |
393 | return; | ||
394 | |||
395 | if (!hpet_force_user) { | ||
396 | hpet_print_force_info(); | ||
347 | return; | 397 | return; |
398 | } | ||
348 | 399 | ||
349 | pci_write_config_dword(dev, 0x44, 0xfed00001); | 400 | pci_write_config_dword(dev, 0x44, 0xfed00001); |
350 | pci_read_config_dword(dev, 0x44, &val); | 401 | pci_read_config_dword(dev, 0x44, &val); |
@@ -397,6 +448,9 @@ void force_hpet_resume(void) | |||
397 | case NVIDIA_FORCE_HPET_RESUME: | 448 | case NVIDIA_FORCE_HPET_RESUME: |
398 | nvidia_force_hpet_resume(); | 449 | nvidia_force_hpet_resume(); |
399 | return; | 450 | return; |
451 | case ATI_FORCE_HPET_RESUME: | ||
452 | ati_force_hpet_resume(); | ||
453 | return; | ||
400 | default: | 454 | default: |
401 | break; | 455 | break; |
402 | } | 456 | } |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f6be7d5f82f8..f8a62160e151 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -27,7 +27,7 @@ | |||
27 | void (*pm_power_off)(void); | 27 | void (*pm_power_off)(void); |
28 | EXPORT_SYMBOL(pm_power_off); | 28 | EXPORT_SYMBOL(pm_power_off); |
29 | 29 | ||
30 | static long no_idt[3]; | 30 | static const struct desc_ptr no_idt = {}; |
31 | static int reboot_mode; | 31 | static int reboot_mode; |
32 | enum reboot_type reboot_type = BOOT_KBD; | 32 | enum reboot_type reboot_type = BOOT_KBD; |
33 | int reboot_force; | 33 | int reboot_force; |
@@ -201,15 +201,15 @@ core_initcall(reboot_init); | |||
201 | controller to pulse the CPU reset line, which is more thorough, but | 201 | controller to pulse the CPU reset line, which is more thorough, but |
202 | doesn't work with at least one type of 486 motherboard. It is easy | 202 | doesn't work with at least one type of 486 motherboard. It is easy |
203 | to stop this code working; hence the copious comments. */ | 203 | to stop this code working; hence the copious comments. */ |
204 | static unsigned long long | 204 | static const unsigned long long |
205 | real_mode_gdt_entries [3] = | 205 | real_mode_gdt_entries [3] = |
206 | { | 206 | { |
207 | 0x0000000000000000ULL, /* Null descriptor */ | 207 | 0x0000000000000000ULL, /* Null descriptor */ |
208 | 0x00009a000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ | 208 | 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ |
209 | 0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ | 209 | 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ |
210 | }; | 210 | }; |
211 | 211 | ||
212 | static struct desc_ptr | 212 | static const struct desc_ptr |
213 | real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, (long)real_mode_gdt_entries }, | 213 | real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, (long)real_mode_gdt_entries }, |
214 | real_mode_idt = { 0x3ff, 0 }; | 214 | real_mode_idt = { 0x3ff, 0 }; |
215 | 215 | ||
@@ -231,7 +231,7 @@ real_mode_idt = { 0x3ff, 0 }; | |||
231 | 231 | ||
232 | More could be done here to set up the registers as if a CPU reset had | 232 | More could be done here to set up the registers as if a CPU reset had |
233 | occurred; hopefully real BIOSs don't assume much. */ | 233 | occurred; hopefully real BIOSs don't assume much. */ |
234 | static unsigned char real_mode_switch [] = | 234 | static const unsigned char real_mode_switch [] = |
235 | { | 235 | { |
236 | 0x66, 0x0f, 0x20, 0xc0, /* movl %cr0,%eax */ | 236 | 0x66, 0x0f, 0x20, 0xc0, /* movl %cr0,%eax */ |
237 | 0x66, 0x83, 0xe0, 0x11, /* andl $0x00000011,%eax */ | 237 | 0x66, 0x83, 0xe0, 0x11, /* andl $0x00000011,%eax */ |
@@ -245,7 +245,7 @@ static unsigned char real_mode_switch [] = | |||
245 | 0x24, 0x10, /* f: andb $0x10,al */ | 245 | 0x24, 0x10, /* f: andb $0x10,al */ |
246 | 0x66, 0x0f, 0x22, 0xc0 /* movl %eax,%cr0 */ | 246 | 0x66, 0x0f, 0x22, 0xc0 /* movl %eax,%cr0 */ |
247 | }; | 247 | }; |
248 | static unsigned char jump_to_bios [] = | 248 | static const unsigned char jump_to_bios [] = |
249 | { | 249 | { |
250 | 0xea, 0x00, 0x00, 0xff, 0xff /* ljmp $0xffff,$0x0000 */ | 250 | 0xea, 0x00, 0x00, 0xff, 0xff /* ljmp $0xffff,$0x0000 */ |
251 | }; | 251 | }; |
@@ -255,7 +255,7 @@ static unsigned char jump_to_bios [] = | |||
255 | * specified by the code and length parameters. | 255 | * specified by the code and length parameters. |
256 | * We assume that length will aways be less that 100! | 256 | * We assume that length will aways be less that 100! |
257 | */ | 257 | */ |
258 | void machine_real_restart(unsigned char *code, int length) | 258 | void machine_real_restart(const unsigned char *code, int length) |
259 | { | 259 | { |
260 | local_irq_disable(); | 260 | local_irq_disable(); |
261 | 261 | ||
@@ -368,7 +368,7 @@ static void native_machine_emergency_restart(void) | |||
368 | } | 368 | } |
369 | 369 | ||
370 | case BOOT_TRIPLE: | 370 | case BOOT_TRIPLE: |
371 | load_idt((const struct desc_ptr *)&no_idt); | 371 | load_idt(&no_idt); |
372 | __asm__ __volatile__("int3"); | 372 | __asm__ __volatile__("int3"); |
373 | 373 | ||
374 | reboot_type = BOOT_KBD; | 374 | reboot_type = BOOT_KBD; |
diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c index dec0b5ec25c2..61a837743fe5 100644 --- a/arch/x86/kernel/reboot_fixups_32.c +++ b/arch/x86/kernel/reboot_fixups_32.c | |||
@@ -49,7 +49,7 @@ struct device_fixup { | |||
49 | void (*reboot_fixup)(struct pci_dev *); | 49 | void (*reboot_fixup)(struct pci_dev *); |
50 | }; | 50 | }; |
51 | 51 | ||
52 | static struct device_fixup fixups_table[] = { | 52 | static const struct device_fixup fixups_table[] = { |
53 | { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, | 53 | { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, |
54 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, | 54 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, |
55 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, | 55 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, |
@@ -64,7 +64,7 @@ static struct device_fixup fixups_table[] = { | |||
64 | */ | 64 | */ |
65 | void mach_reboot_fixups(void) | 65 | void mach_reboot_fixups(void) |
66 | { | 66 | { |
67 | struct device_fixup *cur; | 67 | const struct device_fixup *cur; |
68 | struct pci_dev *dev; | 68 | struct pci_dev *dev; |
69 | int i; | 69 | int i; |
70 | 70 | ||
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 9615eee9b775..05191bbc68b8 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c | |||
@@ -4,6 +4,8 @@ | |||
4 | #include <linux/acpi.h> | 4 | #include <linux/acpi.h> |
5 | #include <linux/bcd.h> | 5 | #include <linux/bcd.h> |
6 | #include <linux/mc146818rtc.h> | 6 | #include <linux/mc146818rtc.h> |
7 | #include <linux/platform_device.h> | ||
8 | #include <linux/pnp.h> | ||
7 | 9 | ||
8 | #include <asm/time.h> | 10 | #include <asm/time.h> |
9 | #include <asm/vsyscall.h> | 11 | #include <asm/vsyscall.h> |
@@ -197,3 +199,35 @@ unsigned long long native_read_tsc(void) | |||
197 | } | 199 | } |
198 | EXPORT_SYMBOL(native_read_tsc); | 200 | EXPORT_SYMBOL(native_read_tsc); |
199 | 201 | ||
202 | |||
203 | static struct resource rtc_resources[] = { | ||
204 | [0] = { | ||
205 | .start = RTC_PORT(0), | ||
206 | .end = RTC_PORT(1), | ||
207 | .flags = IORESOURCE_IO, | ||
208 | }, | ||
209 | [1] = { | ||
210 | .start = RTC_IRQ, | ||
211 | .end = RTC_IRQ, | ||
212 | .flags = IORESOURCE_IRQ, | ||
213 | } | ||
214 | }; | ||
215 | |||
216 | static struct platform_device rtc_device = { | ||
217 | .name = "rtc_cmos", | ||
218 | .id = -1, | ||
219 | .resource = rtc_resources, | ||
220 | .num_resources = ARRAY_SIZE(rtc_resources), | ||
221 | }; | ||
222 | |||
223 | static __init int add_rtc_cmos(void) | ||
224 | { | ||
225 | #ifdef CONFIG_PNP | ||
226 | if (!pnp_platform_devices) | ||
227 | platform_device_register(&rtc_device); | ||
228 | #else | ||
229 | platform_device_register(&rtc_device); | ||
230 | #endif /* CONFIG_PNP */ | ||
231 | return 0; | ||
232 | } | ||
233 | device_initcall(add_rtc_cmos); | ||
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 2c5f8b213e86..5a2f8e063887 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -532,10 +532,16 @@ static void __init reserve_crashkernel(void) | |||
532 | (unsigned long)(crash_size >> 20), | 532 | (unsigned long)(crash_size >> 20), |
533 | (unsigned long)(crash_base >> 20), | 533 | (unsigned long)(crash_base >> 20), |
534 | (unsigned long)(total_mem >> 20)); | 534 | (unsigned long)(total_mem >> 20)); |
535 | |||
536 | if (reserve_bootmem(crash_base, crash_size, | ||
537 | BOOTMEM_EXCLUSIVE) < 0) { | ||
538 | printk(KERN_INFO "crashkernel reservation " | ||
539 | "failed - memory is in use\n"); | ||
540 | return; | ||
541 | } | ||
542 | |||
535 | crashk_res.start = crash_base; | 543 | crashk_res.start = crash_base; |
536 | crashk_res.end = crash_base + crash_size - 1; | 544 | crashk_res.end = crash_base + crash_size - 1; |
537 | reserve_bootmem(crash_base, crash_size, | ||
538 | BOOTMEM_DEFAULT); | ||
539 | } else | 545 | } else |
540 | printk(KERN_INFO "crashkernel reservation failed - " | 546 | printk(KERN_INFO "crashkernel reservation failed - " |
541 | "you have to specify a base address\n"); | 547 | "you have to specify a base address\n"); |
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 6dff1286ad8a..545440e471b2 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
@@ -71,6 +71,7 @@ | |||
71 | #include <asm/topology.h> | 71 | #include <asm/topology.h> |
72 | #include <asm/trampoline.h> | 72 | #include <asm/trampoline.h> |
73 | #include <asm/pat.h> | 73 | #include <asm/pat.h> |
74 | #include <asm/mmconfig.h> | ||
74 | 75 | ||
75 | #include <mach_apic.h> | 76 | #include <mach_apic.h> |
76 | #ifdef CONFIG_PARAVIRT | 77 | #ifdef CONFIG_PARAVIRT |
@@ -79,6 +80,8 @@ | |||
79 | #define ARCH_SETUP | 80 | #define ARCH_SETUP |
80 | #endif | 81 | #endif |
81 | 82 | ||
83 | #include "cpu/cpu.h" | ||
84 | |||
82 | /* | 85 | /* |
83 | * Machine setup.. | 86 | * Machine setup.. |
84 | */ | 87 | */ |
@@ -95,8 +98,6 @@ int bootloader_type; | |||
95 | 98 | ||
96 | unsigned long saved_video_mode; | 99 | unsigned long saved_video_mode; |
97 | 100 | ||
98 | int force_mwait __cpuinitdata; | ||
99 | |||
100 | /* | 101 | /* |
101 | * Early DMI memory | 102 | * Early DMI memory |
102 | */ | 103 | */ |
@@ -118,7 +119,7 @@ EXPORT_SYMBOL_GPL(edid_info); | |||
118 | 119 | ||
119 | extern int root_mountflags; | 120 | extern int root_mountflags; |
120 | 121 | ||
121 | char __initdata command_line[COMMAND_LINE_SIZE]; | 122 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
122 | 123 | ||
123 | static struct resource standard_io_resources[] = { | 124 | static struct resource standard_io_resources[] = { |
124 | { .name = "dma1", .start = 0x00, .end = 0x1f, | 125 | { .name = "dma1", .start = 0x00, .end = 0x1f, |
@@ -164,6 +165,7 @@ static struct resource bss_resource = { | |||
164 | .flags = IORESOURCE_RAM, | 165 | .flags = IORESOURCE_RAM, |
165 | }; | 166 | }; |
166 | 167 | ||
168 | static void __init early_cpu_init(void); | ||
167 | static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c); | 169 | static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c); |
168 | 170 | ||
169 | #ifdef CONFIG_PROC_VMCORE | 171 | #ifdef CONFIG_PROC_VMCORE |
@@ -293,18 +295,6 @@ static void __init parse_setup_data(void) | |||
293 | } | 295 | } |
294 | } | 296 | } |
295 | 297 | ||
296 | #ifdef CONFIG_PCI_MMCONFIG | ||
297 | extern void __cpuinit fam10h_check_enable_mmcfg(void); | ||
298 | extern void __init check_enable_amd_mmconf_dmi(void); | ||
299 | #else | ||
300 | void __cpuinit fam10h_check_enable_mmcfg(void) | ||
301 | { | ||
302 | } | ||
303 | void __init check_enable_amd_mmconf_dmi(void) | ||
304 | { | ||
305 | } | ||
306 | #endif | ||
307 | |||
308 | /* | 298 | /* |
309 | * setup_arch - architecture-specific boot-time initializations | 299 | * setup_arch - architecture-specific boot-time initializations |
310 | * | 300 | * |
@@ -352,6 +342,7 @@ void __init setup_arch(char **cmdline_p) | |||
352 | bss_resource.start = virt_to_phys(&__bss_start); | 342 | bss_resource.start = virt_to_phys(&__bss_start); |
353 | bss_resource.end = virt_to_phys(&__bss_stop)-1; | 343 | bss_resource.end = virt_to_phys(&__bss_stop)-1; |
354 | 344 | ||
345 | early_cpu_init(); | ||
355 | early_identify_cpu(&boot_cpu_data); | 346 | early_identify_cpu(&boot_cpu_data); |
356 | 347 | ||
357 | strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); | 348 | strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); |
@@ -537,7 +528,20 @@ void __init setup_arch(char **cmdline_p) | |||
537 | check_enable_amd_mmconf_dmi(); | 528 | check_enable_amd_mmconf_dmi(); |
538 | } | 529 | } |
539 | 530 | ||
540 | static int __cpuinit get_model_name(struct cpuinfo_x86 *c) | 531 | struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {}; |
532 | |||
533 | static void __cpuinit default_init(struct cpuinfo_x86 *c) | ||
534 | { | ||
535 | display_cacheinfo(c); | ||
536 | } | ||
537 | |||
538 | static struct cpu_dev __cpuinitdata default_cpu = { | ||
539 | .c_init = default_init, | ||
540 | .c_vendor = "Unknown", | ||
541 | }; | ||
542 | static struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; | ||
543 | |||
544 | int __cpuinit get_model_name(struct cpuinfo_x86 *c) | ||
541 | { | 545 | { |
542 | unsigned int *v; | 546 | unsigned int *v; |
543 | 547 | ||
@@ -553,7 +557,7 @@ static int __cpuinit get_model_name(struct cpuinfo_x86 *c) | |||
553 | } | 557 | } |
554 | 558 | ||
555 | 559 | ||
556 | static void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) | 560 | void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) |
557 | { | 561 | { |
558 | unsigned int n, dummy, eax, ebx, ecx, edx; | 562 | unsigned int n, dummy, eax, ebx, ecx, edx; |
559 | 563 | ||
@@ -585,228 +589,6 @@ static void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) | |||
585 | } | 589 | } |
586 | } | 590 | } |
587 | 591 | ||
588 | #ifdef CONFIG_NUMA | ||
589 | static int __cpuinit nearby_node(int apicid) | ||
590 | { | ||
591 | int i, node; | ||
592 | |||
593 | for (i = apicid - 1; i >= 0; i--) { | ||
594 | node = apicid_to_node[i]; | ||
595 | if (node != NUMA_NO_NODE && node_online(node)) | ||
596 | return node; | ||
597 | } | ||
598 | for (i = apicid + 1; i < MAX_LOCAL_APIC; i++) { | ||
599 | node = apicid_to_node[i]; | ||
600 | if (node != NUMA_NO_NODE && node_online(node)) | ||
601 | return node; | ||
602 | } | ||
603 | return first_node(node_online_map); /* Shouldn't happen */ | ||
604 | } | ||
605 | #endif | ||
606 | |||
607 | /* | ||
608 | * On a AMD dual core setup the lower bits of the APIC id distingush the cores. | ||
609 | * Assumes number of cores is a power of two. | ||
610 | */ | ||
611 | static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) | ||
612 | { | ||
613 | #ifdef CONFIG_SMP | ||
614 | unsigned bits; | ||
615 | #ifdef CONFIG_NUMA | ||
616 | int cpu = smp_processor_id(); | ||
617 | int node = 0; | ||
618 | unsigned apicid = hard_smp_processor_id(); | ||
619 | #endif | ||
620 | bits = c->x86_coreid_bits; | ||
621 | |||
622 | /* Low order bits define the core id (index of core in socket) */ | ||
623 | c->cpu_core_id = c->initial_apicid & ((1 << bits)-1); | ||
624 | /* Convert the initial APIC ID into the socket ID */ | ||
625 | c->phys_proc_id = c->initial_apicid >> bits; | ||
626 | |||
627 | #ifdef CONFIG_NUMA | ||
628 | node = c->phys_proc_id; | ||
629 | if (apicid_to_node[apicid] != NUMA_NO_NODE) | ||
630 | node = apicid_to_node[apicid]; | ||
631 | if (!node_online(node)) { | ||
632 | /* Two possibilities here: | ||
633 | - The CPU is missing memory and no node was created. | ||
634 | In that case try picking one from a nearby CPU | ||
635 | - The APIC IDs differ from the HyperTransport node IDs | ||
636 | which the K8 northbridge parsing fills in. | ||
637 | Assume they are all increased by a constant offset, | ||
638 | but in the same order as the HT nodeids. | ||
639 | If that doesn't result in a usable node fall back to the | ||
640 | path for the previous case. */ | ||
641 | |||
642 | int ht_nodeid = c->initial_apicid; | ||
643 | |||
644 | if (ht_nodeid >= 0 && | ||
645 | apicid_to_node[ht_nodeid] != NUMA_NO_NODE) | ||
646 | node = apicid_to_node[ht_nodeid]; | ||
647 | /* Pick a nearby node */ | ||
648 | if (!node_online(node)) | ||
649 | node = nearby_node(apicid); | ||
650 | } | ||
651 | numa_set_node(cpu, node); | ||
652 | |||
653 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
654 | #endif | ||
655 | #endif | ||
656 | } | ||
657 | |||
658 | static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c) | ||
659 | { | ||
660 | #ifdef CONFIG_SMP | ||
661 | unsigned bits, ecx; | ||
662 | |||
663 | /* Multi core CPU? */ | ||
664 | if (c->extended_cpuid_level < 0x80000008) | ||
665 | return; | ||
666 | |||
667 | ecx = cpuid_ecx(0x80000008); | ||
668 | |||
669 | c->x86_max_cores = (ecx & 0xff) + 1; | ||
670 | |||
671 | /* CPU telling us the core id bits shift? */ | ||
672 | bits = (ecx >> 12) & 0xF; | ||
673 | |||
674 | /* Otherwise recompute */ | ||
675 | if (bits == 0) { | ||
676 | while ((1 << bits) < c->x86_max_cores) | ||
677 | bits++; | ||
678 | } | ||
679 | |||
680 | c->x86_coreid_bits = bits; | ||
681 | |||
682 | #endif | ||
683 | } | ||
684 | |||
685 | #define ENABLE_C1E_MASK 0x18000000 | ||
686 | #define CPUID_PROCESSOR_SIGNATURE 1 | ||
687 | #define CPUID_XFAM 0x0ff00000 | ||
688 | #define CPUID_XFAM_K8 0x00000000 | ||
689 | #define CPUID_XFAM_10H 0x00100000 | ||
690 | #define CPUID_XFAM_11H 0x00200000 | ||
691 | #define CPUID_XMOD 0x000f0000 | ||
692 | #define CPUID_XMOD_REV_F 0x00040000 | ||
693 | |||
694 | /* AMD systems with C1E don't have a working lAPIC timer. Check for that. */ | ||
695 | static __cpuinit int amd_apic_timer_broken(void) | ||
696 | { | ||
697 | u32 lo, hi, eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE); | ||
698 | |||
699 | switch (eax & CPUID_XFAM) { | ||
700 | case CPUID_XFAM_K8: | ||
701 | if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F) | ||
702 | break; | ||
703 | case CPUID_XFAM_10H: | ||
704 | case CPUID_XFAM_11H: | ||
705 | rdmsr(MSR_K8_ENABLE_C1E, lo, hi); | ||
706 | if (lo & ENABLE_C1E_MASK) | ||
707 | return 1; | ||
708 | break; | ||
709 | default: | ||
710 | /* err on the side of caution */ | ||
711 | return 1; | ||
712 | } | ||
713 | return 0; | ||
714 | } | ||
715 | |||
716 | static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) | ||
717 | { | ||
718 | early_init_amd_mc(c); | ||
719 | |||
720 | /* c->x86_power is 8000_0007 edx. Bit 8 is constant TSC */ | ||
721 | if (c->x86_power & (1<<8)) | ||
722 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
723 | } | ||
724 | |||
725 | static void __cpuinit init_amd(struct cpuinfo_x86 *c) | ||
726 | { | ||
727 | unsigned level; | ||
728 | |||
729 | #ifdef CONFIG_SMP | ||
730 | unsigned long value; | ||
731 | |||
732 | /* | ||
733 | * Disable TLB flush filter by setting HWCR.FFDIS on K8 | ||
734 | * bit 6 of msr C001_0015 | ||
735 | * | ||
736 | * Errata 63 for SH-B3 steppings | ||
737 | * Errata 122 for all steppings (F+ have it disabled by default) | ||
738 | */ | ||
739 | if (c->x86 == 15) { | ||
740 | rdmsrl(MSR_K8_HWCR, value); | ||
741 | value |= 1 << 6; | ||
742 | wrmsrl(MSR_K8_HWCR, value); | ||
743 | } | ||
744 | #endif | ||
745 | |||
746 | /* Bit 31 in normal CPUID used for nonstandard 3DNow ID; | ||
747 | 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */ | ||
748 | clear_cpu_cap(c, 0*32+31); | ||
749 | |||
750 | /* On C+ stepping K8 rep microcode works well for copy/memset */ | ||
751 | level = cpuid_eax(1); | ||
752 | if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || | ||
753 | level >= 0x0f58)) | ||
754 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
755 | if (c->x86 == 0x10 || c->x86 == 0x11) | ||
756 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
757 | |||
758 | /* Enable workaround for FXSAVE leak */ | ||
759 | if (c->x86 >= 6) | ||
760 | set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK); | ||
761 | |||
762 | level = get_model_name(c); | ||
763 | if (!level) { | ||
764 | switch (c->x86) { | ||
765 | case 15: | ||
766 | /* Should distinguish Models here, but this is only | ||
767 | a fallback anyways. */ | ||
768 | strcpy(c->x86_model_id, "Hammer"); | ||
769 | break; | ||
770 | } | ||
771 | } | ||
772 | display_cacheinfo(c); | ||
773 | |||
774 | /* Multi core CPU? */ | ||
775 | if (c->extended_cpuid_level >= 0x80000008) | ||
776 | amd_detect_cmp(c); | ||
777 | |||
778 | if (c->extended_cpuid_level >= 0x80000006 && | ||
779 | (cpuid_edx(0x80000006) & 0xf000)) | ||
780 | num_cache_leaves = 4; | ||
781 | else | ||
782 | num_cache_leaves = 3; | ||
783 | |||
784 | if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11) | ||
785 | set_cpu_cap(c, X86_FEATURE_K8); | ||
786 | |||
787 | /* MFENCE stops RDTSC speculation */ | ||
788 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); | ||
789 | |||
790 | if (c->x86 == 0x10) | ||
791 | fam10h_check_enable_mmcfg(); | ||
792 | |||
793 | if (amd_apic_timer_broken()) | ||
794 | disable_apic_timer = 1; | ||
795 | |||
796 | if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) { | ||
797 | unsigned long long tseg; | ||
798 | |||
799 | /* | ||
800 | * Split up direct mapping around the TSEG SMM area. | ||
801 | * Don't do it for gbpages because there seems very little | ||
802 | * benefit in doing so. | ||
803 | */ | ||
804 | if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &tseg) && | ||
805 | (tseg >> PMD_SHIFT) < (max_pfn_mapped >> (PMD_SHIFT-PAGE_SHIFT))) | ||
806 | set_memory_4k((unsigned long)__va(tseg), 1); | ||
807 | } | ||
808 | } | ||
809 | |||
810 | void __cpuinit detect_ht(struct cpuinfo_x86 *c) | 592 | void __cpuinit detect_ht(struct cpuinfo_x86 *c) |
811 | { | 593 | { |
812 | #ifdef CONFIG_SMP | 594 | #ifdef CONFIG_SMP |
@@ -857,135 +639,59 @@ out: | |||
857 | #endif | 639 | #endif |
858 | } | 640 | } |
859 | 641 | ||
860 | /* | 642 | static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) |
861 | * find out the number of processor cores on the die | ||
862 | */ | ||
863 | static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c) | ||
864 | { | ||
865 | unsigned int eax, t; | ||
866 | |||
867 | if (c->cpuid_level < 4) | ||
868 | return 1; | ||
869 | |||
870 | cpuid_count(4, 0, &eax, &t, &t, &t); | ||
871 | |||
872 | if (eax & 0x1f) | ||
873 | return ((eax >> 26) + 1); | ||
874 | else | ||
875 | return 1; | ||
876 | } | ||
877 | |||
878 | static void __cpuinit srat_detect_node(void) | ||
879 | { | ||
880 | #ifdef CONFIG_NUMA | ||
881 | unsigned node; | ||
882 | int cpu = smp_processor_id(); | ||
883 | int apicid = hard_smp_processor_id(); | ||
884 | |||
885 | /* Don't do the funky fallback heuristics the AMD version employs | ||
886 | for now. */ | ||
887 | node = apicid_to_node[apicid]; | ||
888 | if (node == NUMA_NO_NODE || !node_online(node)) | ||
889 | node = first_node(node_online_map); | ||
890 | numa_set_node(cpu, node); | ||
891 | |||
892 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
893 | #endif | ||
894 | } | ||
895 | |||
896 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | ||
897 | { | ||
898 | if ((c->x86 == 0xf && c->x86_model >= 0x03) || | ||
899 | (c->x86 == 0x6 && c->x86_model >= 0x0e)) | ||
900 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
901 | } | ||
902 | |||
903 | static void __cpuinit init_intel(struct cpuinfo_x86 *c) | ||
904 | { | 643 | { |
905 | /* Cache sizes */ | 644 | char *v = c->x86_vendor_id; |
906 | unsigned n; | 645 | int i; |
907 | 646 | static int printed; | |
908 | init_intel_cacheinfo(c); | 647 | |
909 | if (c->cpuid_level > 9) { | 648 | for (i = 0; i < X86_VENDOR_NUM; i++) { |
910 | unsigned eax = cpuid_eax(10); | 649 | if (cpu_devs[i]) { |
911 | /* Check for version and the number of counters */ | 650 | if (!strcmp(v, cpu_devs[i]->c_ident[0]) || |
912 | if ((eax & 0xff) && (((eax>>8) & 0xff) > 1)) | 651 | (cpu_devs[i]->c_ident[1] && |
913 | set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON); | 652 | !strcmp(v, cpu_devs[i]->c_ident[1]))) { |
653 | c->x86_vendor = i; | ||
654 | this_cpu = cpu_devs[i]; | ||
655 | return; | ||
656 | } | ||
657 | } | ||
914 | } | 658 | } |
915 | 659 | if (!printed) { | |
916 | if (cpu_has_ds) { | 660 | printed++; |
917 | unsigned int l1, l2; | 661 | printk(KERN_ERR "CPU: Vendor unknown, using generic init.\n"); |
918 | rdmsr(MSR_IA32_MISC_ENABLE, l1, l2); | 662 | printk(KERN_ERR "CPU: Your system may be unstable.\n"); |
919 | if (!(l1 & (1<<11))) | ||
920 | set_cpu_cap(c, X86_FEATURE_BTS); | ||
921 | if (!(l1 & (1<<12))) | ||
922 | set_cpu_cap(c, X86_FEATURE_PEBS); | ||
923 | } | 663 | } |
924 | 664 | c->x86_vendor = X86_VENDOR_UNKNOWN; | |
925 | |||
926 | if (cpu_has_bts) | ||
927 | ds_init_intel(c); | ||
928 | |||
929 | n = c->extended_cpuid_level; | ||
930 | if (n >= 0x80000008) { | ||
931 | unsigned eax = cpuid_eax(0x80000008); | ||
932 | c->x86_virt_bits = (eax >> 8) & 0xff; | ||
933 | c->x86_phys_bits = eax & 0xff; | ||
934 | /* CPUID workaround for Intel 0F34 CPU */ | ||
935 | if (c->x86_vendor == X86_VENDOR_INTEL && | ||
936 | c->x86 == 0xF && c->x86_model == 0x3 && | ||
937 | c->x86_mask == 0x4) | ||
938 | c->x86_phys_bits = 36; | ||
939 | } | ||
940 | |||
941 | if (c->x86 == 15) | ||
942 | c->x86_cache_alignment = c->x86_clflush_size * 2; | ||
943 | if (c->x86 == 6) | ||
944 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
945 | set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); | ||
946 | c->x86_max_cores = intel_num_cpu_cores(c); | ||
947 | |||
948 | srat_detect_node(); | ||
949 | } | ||
950 | |||
951 | static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c) | ||
952 | { | ||
953 | if (c->x86 == 0x6 && c->x86_model >= 0xf) | ||
954 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
955 | } | 665 | } |
956 | 666 | ||
957 | static void __cpuinit init_centaur(struct cpuinfo_x86 *c) | 667 | static void __init early_cpu_support_print(void) |
958 | { | 668 | { |
959 | /* Cache sizes */ | 669 | int i,j; |
960 | unsigned n; | 670 | struct cpu_dev *cpu_devx; |
961 | 671 | ||
962 | n = c->extended_cpuid_level; | 672 | printk("KERNEL supported cpus:\n"); |
963 | if (n >= 0x80000008) { | 673 | for (i = 0; i < X86_VENDOR_NUM; i++) { |
964 | unsigned eax = cpuid_eax(0x80000008); | 674 | cpu_devx = cpu_devs[i]; |
965 | c->x86_virt_bits = (eax >> 8) & 0xff; | 675 | if (!cpu_devx) |
966 | c->x86_phys_bits = eax & 0xff; | 676 | continue; |
967 | } | 677 | for (j = 0; j < 2; j++) { |
968 | 678 | if (!cpu_devx->c_ident[j]) | |
969 | if (c->x86 == 0x6 && c->x86_model >= 0xf) { | 679 | continue; |
970 | c->x86_cache_alignment = c->x86_clflush_size * 2; | 680 | printk(" %s %s\n", cpu_devx->c_vendor, |
971 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | 681 | cpu_devx->c_ident[j]); |
972 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | 682 | } |
973 | } | 683 | } |
974 | set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); | ||
975 | } | 684 | } |
976 | 685 | ||
977 | static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) | 686 | static void __init early_cpu_init(void) |
978 | { | 687 | { |
979 | char *v = c->x86_vendor_id; | 688 | struct cpu_vendor_dev *cvdev; |
980 | 689 | ||
981 | if (!strcmp(v, "AuthenticAMD")) | 690 | for (cvdev = __x86cpuvendor_start ; |
982 | c->x86_vendor = X86_VENDOR_AMD; | 691 | cvdev < __x86cpuvendor_end ; |
983 | else if (!strcmp(v, "GenuineIntel")) | 692 | cvdev++) |
984 | c->x86_vendor = X86_VENDOR_INTEL; | 693 | cpu_devs[cvdev->vendor] = cvdev->cpu_dev; |
985 | else if (!strcmp(v, "CentaurHauls")) | 694 | early_cpu_support_print(); |
986 | c->x86_vendor = X86_VENDOR_CENTAUR; | ||
987 | else | ||
988 | c->x86_vendor = X86_VENDOR_UNKNOWN; | ||
989 | } | 695 | } |
990 | 696 | ||
991 | /* Do some early cpuid on the boot CPU to get some parameter that are | 697 | /* Do some early cpuid on the boot CPU to get some parameter that are |
@@ -1066,17 +772,9 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) | |||
1066 | if (c->extended_cpuid_level >= 0x80000007) | 772 | if (c->extended_cpuid_level >= 0x80000007) |
1067 | c->x86_power = cpuid_edx(0x80000007); | 773 | c->x86_power = cpuid_edx(0x80000007); |
1068 | 774 | ||
1069 | switch (c->x86_vendor) { | 775 | if (c->x86_vendor != X86_VENDOR_UNKNOWN && |
1070 | case X86_VENDOR_AMD: | 776 | cpu_devs[c->x86_vendor]->c_early_init) |
1071 | early_init_amd(c); | 777 | cpu_devs[c->x86_vendor]->c_early_init(c); |
1072 | break; | ||
1073 | case X86_VENDOR_INTEL: | ||
1074 | early_init_intel(c); | ||
1075 | break; | ||
1076 | case X86_VENDOR_CENTAUR: | ||
1077 | early_init_centaur(c); | ||
1078 | break; | ||
1079 | } | ||
1080 | 778 | ||
1081 | validate_pat_support(c); | 779 | validate_pat_support(c); |
1082 | } | 780 | } |
@@ -1104,24 +802,8 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) | |||
1104 | * At the end of this section, c->x86_capability better | 802 | * At the end of this section, c->x86_capability better |
1105 | * indicate the features this CPU genuinely supports! | 803 | * indicate the features this CPU genuinely supports! |
1106 | */ | 804 | */ |
1107 | switch (c->x86_vendor) { | 805 | if (this_cpu->c_init) |
1108 | case X86_VENDOR_AMD: | 806 | this_cpu->c_init(c); |
1109 | init_amd(c); | ||
1110 | break; | ||
1111 | |||
1112 | case X86_VENDOR_INTEL: | ||
1113 | init_intel(c); | ||
1114 | break; | ||
1115 | |||
1116 | case X86_VENDOR_CENTAUR: | ||
1117 | init_centaur(c); | ||
1118 | break; | ||
1119 | |||
1120 | case X86_VENDOR_UNKNOWN: | ||
1121 | default: | ||
1122 | display_cacheinfo(c); | ||
1123 | break; | ||
1124 | } | ||
1125 | 807 | ||
1126 | detect_ht(c); | 808 | detect_ht(c); |
1127 | 809 | ||
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 38988491c622..f2b666756299 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #include <asm/pgtable.h> | 59 | #include <asm/pgtable.h> |
60 | #include <asm/tlbflush.h> | 60 | #include <asm/tlbflush.h> |
61 | #include <asm/mtrr.h> | 61 | #include <asm/mtrr.h> |
62 | #include <asm/nmi.h> | ||
63 | #include <asm/vmi.h> | 62 | #include <asm/vmi.h> |
64 | #include <asm/genapic.h> | 63 | #include <asm/genapic.h> |
65 | #include <linux/mc146818rtc.h> | 64 | #include <linux/mc146818rtc.h> |
@@ -996,7 +995,6 @@ do_rest: | |||
996 | #endif | 995 | #endif |
997 | cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ | 996 | cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ |
998 | cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ | 997 | cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ |
999 | cpu_clear(cpu, cpu_possible_map); | ||
1000 | cpu_clear(cpu, cpu_present_map); | 998 | cpu_clear(cpu, cpu_present_map); |
1001 | per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; | 999 | per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; |
1002 | } | 1000 | } |
@@ -1158,9 +1156,11 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
1158 | * If SMP should be disabled, then really disable it! | 1156 | * If SMP should be disabled, then really disable it! |
1159 | */ | 1157 | */ |
1160 | if (!max_cpus) { | 1158 | if (!max_cpus) { |
1161 | printk(KERN_INFO "SMP mode deactivated," | 1159 | printk(KERN_INFO "SMP mode deactivated.\n"); |
1162 | "forcing use of dummy APIC emulation.\n"); | ||
1163 | smpboot_clear_io_apic(); | 1160 | smpboot_clear_io_apic(); |
1161 | |||
1162 | localise_nmi_watchdog(); | ||
1163 | |||
1164 | #ifdef CONFIG_X86_32 | 1164 | #ifdef CONFIG_X86_32 |
1165 | connect_bsp_APIC(); | 1165 | connect_bsp_APIC(); |
1166 | #endif | 1166 | #endif |
@@ -1190,6 +1190,7 @@ static void __init smp_cpu_index_default(void) | |||
1190 | */ | 1190 | */ |
1191 | void __init native_smp_prepare_cpus(unsigned int max_cpus) | 1191 | void __init native_smp_prepare_cpus(unsigned int max_cpus) |
1192 | { | 1192 | { |
1193 | preempt_disable(); | ||
1193 | nmi_watchdog_default(); | 1194 | nmi_watchdog_default(); |
1194 | smp_cpu_index_default(); | 1195 | smp_cpu_index_default(); |
1195 | current_cpu_data = boot_cpu_data; | 1196 | current_cpu_data = boot_cpu_data; |
@@ -1206,7 +1207,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1206 | if (smp_sanity_check(max_cpus) < 0) { | 1207 | if (smp_sanity_check(max_cpus) < 0) { |
1207 | printk(KERN_INFO "SMP disabled\n"); | 1208 | printk(KERN_INFO "SMP disabled\n"); |
1208 | disable_smp(); | 1209 | disable_smp(); |
1209 | return; | 1210 | goto out; |
1210 | } | 1211 | } |
1211 | 1212 | ||
1212 | preempt_disable(); | 1213 | preempt_disable(); |
@@ -1246,6 +1247,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1246 | printk(KERN_INFO "CPU%d: ", 0); | 1247 | printk(KERN_INFO "CPU%d: ", 0); |
1247 | print_cpu_info(&cpu_data(0)); | 1248 | print_cpu_info(&cpu_data(0)); |
1248 | setup_boot_clock(); | 1249 | setup_boot_clock(); |
1250 | out: | ||
1251 | preempt_enable(); | ||
1249 | } | 1252 | } |
1250 | /* | 1253 | /* |
1251 | * Early setup to make printk work. | 1254 | * Early setup to make printk work. |
diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c index d2ab52cc1d6b..7066cb855a60 100644 --- a/arch/x86/kernel/sys_i386_32.c +++ b/arch/x86/kernel/sys_i386_32.c | |||
@@ -19,8 +19,8 @@ | |||
19 | #include <linux/utsname.h> | 19 | #include <linux/utsname.h> |
20 | #include <linux/ipc.h> | 20 | #include <linux/ipc.h> |
21 | 21 | ||
22 | #include <asm/uaccess.h> | 22 | #include <linux/uaccess.h> |
23 | #include <asm/unistd.h> | 23 | #include <linux/unistd.h> |
24 | 24 | ||
25 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | 25 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, |
26 | unsigned long prot, unsigned long flags, | 26 | unsigned long prot, unsigned long flags, |
@@ -103,7 +103,7 @@ asmlinkage int old_select(struct sel_arg_struct __user *arg) | |||
103 | * | 103 | * |
104 | * This is really horribly ugly. | 104 | * This is really horribly ugly. |
105 | */ | 105 | */ |
106 | asmlinkage int sys_ipc (uint call, int first, int second, | 106 | asmlinkage int sys_ipc(uint call, int first, int second, |
107 | int third, void __user *ptr, long fifth) | 107 | int third, void __user *ptr, long fifth) |
108 | { | 108 | { |
109 | int version, ret; | 109 | int version, ret; |
@@ -113,24 +113,24 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
113 | 113 | ||
114 | switch (call) { | 114 | switch (call) { |
115 | case SEMOP: | 115 | case SEMOP: |
116 | return sys_semtimedop (first, (struct sembuf __user *)ptr, second, NULL); | 116 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL); |
117 | case SEMTIMEDOP: | 117 | case SEMTIMEDOP: |
118 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, | 118 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, |
119 | (const struct timespec __user *)fifth); | 119 | (const struct timespec __user *)fifth); |
120 | 120 | ||
121 | case SEMGET: | 121 | case SEMGET: |
122 | return sys_semget (first, second, third); | 122 | return sys_semget(first, second, third); |
123 | case SEMCTL: { | 123 | case SEMCTL: { |
124 | union semun fourth; | 124 | union semun fourth; |
125 | if (!ptr) | 125 | if (!ptr) |
126 | return -EINVAL; | 126 | return -EINVAL; |
127 | if (get_user(fourth.__pad, (void __user * __user *) ptr)) | 127 | if (get_user(fourth.__pad, (void __user * __user *) ptr)) |
128 | return -EFAULT; | 128 | return -EFAULT; |
129 | return sys_semctl (first, second, third, fourth); | 129 | return sys_semctl(first, second, third, fourth); |
130 | } | 130 | } |
131 | 131 | ||
132 | case MSGSND: | 132 | case MSGSND: |
133 | return sys_msgsnd (first, (struct msgbuf __user *) ptr, | 133 | return sys_msgsnd(first, (struct msgbuf __user *) ptr, |
134 | second, third); | 134 | second, third); |
135 | case MSGRCV: | 135 | case MSGRCV: |
136 | switch (version) { | 136 | switch (version) { |
@@ -138,45 +138,45 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
138 | struct ipc_kludge tmp; | 138 | struct ipc_kludge tmp; |
139 | if (!ptr) | 139 | if (!ptr) |
140 | return -EINVAL; | 140 | return -EINVAL; |
141 | 141 | ||
142 | if (copy_from_user(&tmp, | 142 | if (copy_from_user(&tmp, |
143 | (struct ipc_kludge __user *) ptr, | 143 | (struct ipc_kludge __user *) ptr, |
144 | sizeof (tmp))) | 144 | sizeof(tmp))) |
145 | return -EFAULT; | 145 | return -EFAULT; |
146 | return sys_msgrcv (first, tmp.msgp, second, | 146 | return sys_msgrcv(first, tmp.msgp, second, |
147 | tmp.msgtyp, third); | 147 | tmp.msgtyp, third); |
148 | } | 148 | } |
149 | default: | 149 | default: |
150 | return sys_msgrcv (first, | 150 | return sys_msgrcv(first, |
151 | (struct msgbuf __user *) ptr, | 151 | (struct msgbuf __user *) ptr, |
152 | second, fifth, third); | 152 | second, fifth, third); |
153 | } | 153 | } |
154 | case MSGGET: | 154 | case MSGGET: |
155 | return sys_msgget ((key_t) first, second); | 155 | return sys_msgget((key_t) first, second); |
156 | case MSGCTL: | 156 | case MSGCTL: |
157 | return sys_msgctl (first, second, (struct msqid_ds __user *) ptr); | 157 | return sys_msgctl(first, second, (struct msqid_ds __user *) ptr); |
158 | 158 | ||
159 | case SHMAT: | 159 | case SHMAT: |
160 | switch (version) { | 160 | switch (version) { |
161 | default: { | 161 | default: { |
162 | ulong raddr; | 162 | ulong raddr; |
163 | ret = do_shmat (first, (char __user *) ptr, second, &raddr); | 163 | ret = do_shmat(first, (char __user *) ptr, second, &raddr); |
164 | if (ret) | 164 | if (ret) |
165 | return ret; | 165 | return ret; |
166 | return put_user (raddr, (ulong __user *) third); | 166 | return put_user(raddr, (ulong __user *) third); |
167 | } | 167 | } |
168 | case 1: /* iBCS2 emulator entry point */ | 168 | case 1: /* iBCS2 emulator entry point */ |
169 | if (!segment_eq(get_fs(), get_ds())) | 169 | if (!segment_eq(get_fs(), get_ds())) |
170 | return -EINVAL; | 170 | return -EINVAL; |
171 | /* The "(ulong *) third" is valid _only_ because of the kernel segment thing */ | 171 | /* The "(ulong *) third" is valid _only_ because of the kernel segment thing */ |
172 | return do_shmat (first, (char __user *) ptr, second, (ulong *) third); | 172 | return do_shmat(first, (char __user *) ptr, second, (ulong *) third); |
173 | } | 173 | } |
174 | case SHMDT: | 174 | case SHMDT: |
175 | return sys_shmdt ((char __user *)ptr); | 175 | return sys_shmdt((char __user *)ptr); |
176 | case SHMGET: | 176 | case SHMGET: |
177 | return sys_shmget (first, second, third); | 177 | return sys_shmget(first, second, third); |
178 | case SHMCTL: | 178 | case SHMCTL: |
179 | return sys_shmctl (first, second, | 179 | return sys_shmctl(first, second, |
180 | (struct shmid_ds __user *) ptr); | 180 | (struct shmid_ds __user *) ptr); |
181 | default: | 181 | default: |
182 | return -ENOSYS; | 182 | return -ENOSYS; |
@@ -186,28 +186,28 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
186 | /* | 186 | /* |
187 | * Old cruft | 187 | * Old cruft |
188 | */ | 188 | */ |
189 | asmlinkage int sys_uname(struct old_utsname __user * name) | 189 | asmlinkage int sys_uname(struct old_utsname __user *name) |
190 | { | 190 | { |
191 | int err; | 191 | int err; |
192 | if (!name) | 192 | if (!name) |
193 | return -EFAULT; | 193 | return -EFAULT; |
194 | down_read(&uts_sem); | 194 | down_read(&uts_sem); |
195 | err = copy_to_user(name, utsname(), sizeof (*name)); | 195 | err = copy_to_user(name, utsname(), sizeof(*name)); |
196 | up_read(&uts_sem); | 196 | up_read(&uts_sem); |
197 | return err?-EFAULT:0; | 197 | return err? -EFAULT:0; |
198 | } | 198 | } |
199 | 199 | ||
200 | asmlinkage int sys_olduname(struct oldold_utsname __user * name) | 200 | asmlinkage int sys_olduname(struct oldold_utsname __user *name) |
201 | { | 201 | { |
202 | int error; | 202 | int error; |
203 | 203 | ||
204 | if (!name) | 204 | if (!name) |
205 | return -EFAULT; | 205 | return -EFAULT; |
206 | if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) | 206 | if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname))) |
207 | return -EFAULT; | 207 | return -EFAULT; |
208 | 208 | ||
209 | down_read(&uts_sem); | 209 | down_read(&uts_sem); |
210 | 210 | ||
211 | error = __copy_to_user(&name->sysname, &utsname()->sysname, | 211 | error = __copy_to_user(&name->sysname, &utsname()->sysname, |
212 | __OLD_UTS_LEN); | 212 | __OLD_UTS_LEN); |
213 | error |= __put_user(0, name->sysname + __OLD_UTS_LEN); | 213 | error |= __put_user(0, name->sysname + __OLD_UTS_LEN); |
@@ -223,9 +223,9 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name) | |||
223 | error |= __copy_to_user(&name->machine, &utsname()->machine, | 223 | error |= __copy_to_user(&name->machine, &utsname()->machine, |
224 | __OLD_UTS_LEN); | 224 | __OLD_UTS_LEN); |
225 | error |= __put_user(0, name->machine + __OLD_UTS_LEN); | 225 | error |= __put_user(0, name->machine + __OLD_UTS_LEN); |
226 | 226 | ||
227 | up_read(&uts_sem); | 227 | up_read(&uts_sem); |
228 | 228 | ||
229 | error = error ? -EFAULT : 0; | 229 | error = error ? -EFAULT : 0; |
230 | 230 | ||
231 | return error; | 231 | return error; |
@@ -241,6 +241,6 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[]) | |||
241 | long __res; | 241 | long __res; |
242 | asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" | 242 | asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" |
243 | : "=a" (__res) | 243 | : "=a" (__res) |
244 | : "0" (__NR_execve),"ri" (filename),"c" (argv), "d" (envp) : "memory"); | 244 | : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory"); |
245 | return __res; | 245 | return __res; |
246 | } | 246 | } |
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index 2ff21f398934..5f29f12da50c 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c | |||
@@ -84,8 +84,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
84 | if (timer_ack) { | 84 | if (timer_ack) { |
85 | /* | 85 | /* |
86 | * Subtle, when I/O APICs are used we have to ack timer IRQ | 86 | * Subtle, when I/O APICs are used we have to ack timer IRQ |
87 | * manually to reset the IRR bit for do_slow_gettimeoffset(). | 87 | * manually to deassert NMI lines for the watchdog if run |
88 | * This will also deassert NMI lines for the watchdog if run | ||
89 | * on an 82489DX-based system. | 88 | * on an 82489DX-based system. |
90 | */ | 89 | */ |
91 | spin_lock(&i8259A_lock); | 90 | spin_lock(&i8259A_lock); |
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index bde6f63e15d5..08d752de4eee 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
@@ -544,6 +544,7 @@ vm86_trap: | |||
544 | #define DO_ERROR(trapnr, signr, str, name) \ | 544 | #define DO_ERROR(trapnr, signr, str, name) \ |
545 | void do_##name(struct pt_regs *regs, long error_code) \ | 545 | void do_##name(struct pt_regs *regs, long error_code) \ |
546 | { \ | 546 | { \ |
547 | trace_hardirqs_fixup(); \ | ||
547 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ | 548 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ |
548 | == NOTIFY_STOP) \ | 549 | == NOTIFY_STOP) \ |
549 | return; \ | 550 | return; \ |
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index adff76ea97c4..ec6d3b2130c4 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -71,7 +71,6 @@ asmlinkage void general_protection(void); | |||
71 | asmlinkage void page_fault(void); | 71 | asmlinkage void page_fault(void); |
72 | asmlinkage void coprocessor_error(void); | 72 | asmlinkage void coprocessor_error(void); |
73 | asmlinkage void simd_coprocessor_error(void); | 73 | asmlinkage void simd_coprocessor_error(void); |
74 | asmlinkage void reserved(void); | ||
75 | asmlinkage void alignment_check(void); | 74 | asmlinkage void alignment_check(void); |
76 | asmlinkage void machine_check(void); | 75 | asmlinkage void machine_check(void); |
77 | asmlinkage void spurious_interrupt_bug(void); | 76 | asmlinkage void spurious_interrupt_bug(void); |
@@ -702,12 +701,10 @@ DO_ERROR_INFO( 0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip) | |||
702 | DO_ERROR( 4, SIGSEGV, "overflow", overflow) | 701 | DO_ERROR( 4, SIGSEGV, "overflow", overflow) |
703 | DO_ERROR( 5, SIGSEGV, "bounds", bounds) | 702 | DO_ERROR( 5, SIGSEGV, "bounds", bounds) |
704 | DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip) | 703 | DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip) |
705 | DO_ERROR( 7, SIGSEGV, "device not available", device_not_available) | ||
706 | DO_ERROR( 9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) | 704 | DO_ERROR( 9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) |
707 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) | 705 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) |
708 | DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) | 706 | DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) |
709 | DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) | 707 | DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) |
710 | DO_ERROR(18, SIGSEGV, "reserved", reserved) | ||
711 | 708 | ||
712 | /* Runs on IST stack */ | 709 | /* Runs on IST stack */ |
713 | asmlinkage void do_stack_segment(struct pt_regs *regs, long error_code) | 710 | asmlinkage void do_stack_segment(struct pt_regs *regs, long error_code) |
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index e4790728b224..774a5a83c296 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
@@ -14,7 +14,10 @@ | |||
14 | 14 | ||
15 | #include "mach_timer.h" | 15 | #include "mach_timer.h" |
16 | 16 | ||
17 | static int tsc_enabled; | 17 | /* native_sched_clock() is called before tsc_init(), so |
18 | we must start with the TSC soft disabled to prevent | ||
19 | erroneous rdtsc usage on !cpu_has_tsc processors */ | ||
20 | static int tsc_disabled = -1; | ||
18 | 21 | ||
19 | /* | 22 | /* |
20 | * On some systems the TSC frequency does not | 23 | * On some systems the TSC frequency does not |
@@ -28,8 +31,8 @@ EXPORT_SYMBOL_GPL(tsc_khz); | |||
28 | static int __init tsc_setup(char *str) | 31 | static int __init tsc_setup(char *str) |
29 | { | 32 | { |
30 | printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, " | 33 | printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, " |
31 | "cannot disable TSC completely.\n"); | 34 | "cannot disable TSC completely.\n"); |
32 | mark_tsc_unstable("user disabled TSC"); | 35 | tsc_disabled = 1; |
33 | return 1; | 36 | return 1; |
34 | } | 37 | } |
35 | #else | 38 | #else |
@@ -120,7 +123,7 @@ unsigned long long native_sched_clock(void) | |||
120 | * very important for it to be as fast as the platform | 123 | * very important for it to be as fast as the platform |
121 | * can achive it. ) | 124 | * can achive it. ) |
122 | */ | 125 | */ |
123 | if (unlikely(!tsc_enabled && !tsc_unstable)) | 126 | if (unlikely(tsc_disabled)) |
124 | /* No locking but a rare wrong value is not a big deal: */ | 127 | /* No locking but a rare wrong value is not a big deal: */ |
125 | return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); | 128 | return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); |
126 | 129 | ||
@@ -283,7 +286,6 @@ core_initcall(cpufreq_tsc); | |||
283 | 286 | ||
284 | /* clock source code */ | 287 | /* clock source code */ |
285 | 288 | ||
286 | static unsigned long current_tsc_khz; | ||
287 | static struct clocksource clocksource_tsc; | 289 | static struct clocksource clocksource_tsc; |
288 | 290 | ||
289 | /* | 291 | /* |
@@ -322,7 +324,6 @@ void mark_tsc_unstable(char *reason) | |||
322 | { | 324 | { |
323 | if (!tsc_unstable) { | 325 | if (!tsc_unstable) { |
324 | tsc_unstable = 1; | 326 | tsc_unstable = 1; |
325 | tsc_enabled = 0; | ||
326 | printk("Marking TSC unstable due to: %s.\n", reason); | 327 | printk("Marking TSC unstable due to: %s.\n", reason); |
327 | /* Can be called before registration */ | 328 | /* Can be called before registration */ |
328 | if (clocksource_tsc.mult) | 329 | if (clocksource_tsc.mult) |
@@ -336,7 +337,7 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable); | |||
336 | static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d) | 337 | static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d) |
337 | { | 338 | { |
338 | printk(KERN_NOTICE "%s detected: marking TSC unstable.\n", | 339 | printk(KERN_NOTICE "%s detected: marking TSC unstable.\n", |
339 | d->ident); | 340 | d->ident); |
340 | tsc_unstable = 1; | 341 | tsc_unstable = 1; |
341 | return 0; | 342 | return 0; |
342 | } | 343 | } |
@@ -403,7 +404,7 @@ void __init tsc_init(void) | |||
403 | { | 404 | { |
404 | int cpu; | 405 | int cpu; |
405 | 406 | ||
406 | if (!cpu_has_tsc) | 407 | if (!cpu_has_tsc || tsc_disabled > 0) |
407 | return; | 408 | return; |
408 | 409 | ||
409 | cpu_khz = calculate_cpu_khz(); | 410 | cpu_khz = calculate_cpu_khz(); |
@@ -414,6 +415,9 @@ void __init tsc_init(void) | |||
414 | return; | 415 | return; |
415 | } | 416 | } |
416 | 417 | ||
418 | /* now allow native_sched_clock() to use rdtsc */ | ||
419 | tsc_disabled = 0; | ||
420 | |||
417 | printk("Detected %lu.%03lu MHz processor.\n", | 421 | printk("Detected %lu.%03lu MHz processor.\n", |
418 | (unsigned long)cpu_khz / 1000, | 422 | (unsigned long)cpu_khz / 1000, |
419 | (unsigned long)cpu_khz % 1000); | 423 | (unsigned long)cpu_khz % 1000); |
@@ -434,15 +438,12 @@ void __init tsc_init(void) | |||
434 | 438 | ||
435 | unsynchronized_tsc(); | 439 | unsynchronized_tsc(); |
436 | check_geode_tsc_reliable(); | 440 | check_geode_tsc_reliable(); |
437 | current_tsc_khz = tsc_khz; | 441 | clocksource_tsc.mult = clocksource_khz2mult(tsc_khz, |
438 | clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz, | 442 | clocksource_tsc.shift); |
439 | clocksource_tsc.shift); | ||
440 | /* lower the rating if we already know its unstable: */ | 443 | /* lower the rating if we already know its unstable: */ |
441 | if (check_tsc_unstable()) { | 444 | if (check_tsc_unstable()) { |
442 | clocksource_tsc.rating = 0; | 445 | clocksource_tsc.rating = 0; |
443 | clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; | 446 | clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; |
444 | } else | 447 | } |
445 | tsc_enabled = 1; | ||
446 | |||
447 | clocksource_register(&clocksource_tsc); | 448 | clocksource_register(&clocksource_tsc); |
448 | } | 449 | } |
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c index fcc16e58609e..9898fb01edfd 100644 --- a/arch/x86/kernel/tsc_64.c +++ b/arch/x86/kernel/tsc_64.c | |||
@@ -227,14 +227,14 @@ void __init tsc_calibrate(void) | |||
227 | /* hpet or pmtimer available ? */ | 227 | /* hpet or pmtimer available ? */ |
228 | if (!hpet && !pm1 && !pm2) { | 228 | if (!hpet && !pm1 && !pm2) { |
229 | printk(KERN_INFO "TSC calibrated against PIT\n"); | 229 | printk(KERN_INFO "TSC calibrated against PIT\n"); |
230 | return; | 230 | goto out; |
231 | } | 231 | } |
232 | 232 | ||
233 | /* Check, whether the sampling was disturbed by an SMI */ | 233 | /* Check, whether the sampling was disturbed by an SMI */ |
234 | if (tsc1 == ULONG_MAX || tsc2 == ULONG_MAX) { | 234 | if (tsc1 == ULONG_MAX || tsc2 == ULONG_MAX) { |
235 | printk(KERN_WARNING "TSC calibration disturbed by SMI, " | 235 | printk(KERN_WARNING "TSC calibration disturbed by SMI, " |
236 | "using PIT calibration result\n"); | 236 | "using PIT calibration result\n"); |
237 | return; | 237 | goto out; |
238 | } | 238 | } |
239 | 239 | ||
240 | tsc2 = (tsc2 - tsc1) * 1000000L; | 240 | tsc2 = (tsc2 - tsc1) * 1000000L; |
@@ -242,7 +242,7 @@ void __init tsc_calibrate(void) | |||
242 | if (hpet) { | 242 | if (hpet) { |
243 | printk(KERN_INFO "TSC calibrated against HPET\n"); | 243 | printk(KERN_INFO "TSC calibrated against HPET\n"); |
244 | if (hpet2 < hpet1) | 244 | if (hpet2 < hpet1) |
245 | hpet2 += 0x100000000; | 245 | hpet2 += 0x100000000UL; |
246 | hpet2 -= hpet1; | 246 | hpet2 -= hpet1; |
247 | tsc1 = (hpet2 * hpet_readl(HPET_PERIOD)) / 1000000; | 247 | tsc1 = (hpet2 * hpet_readl(HPET_PERIOD)) / 1000000; |
248 | } else { | 248 | } else { |
@@ -255,6 +255,7 @@ void __init tsc_calibrate(void) | |||
255 | 255 | ||
256 | tsc_khz = tsc2 / tsc1; | 256 | tsc_khz = tsc2 / tsc1; |
257 | 257 | ||
258 | out: | ||
258 | for_each_possible_cpu(cpu) | 259 | for_each_possible_cpu(cpu) |
259 | set_cyc2ns_scale(tsc_khz, cpu); | 260 | set_cyc2ns_scale(tsc_khz, cpu); |
260 | } | 261 | } |
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index ce5ed083a1e9..2674f5796275 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
@@ -60,13 +60,6 @@ SECTIONS | |||
60 | 60 | ||
61 | BUG_TABLE :text | 61 | BUG_TABLE :text |
62 | 62 | ||
63 | . = ALIGN(4); | ||
64 | .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { | ||
65 | __tracedata_start = .; | ||
66 | *(.tracedata) | ||
67 | __tracedata_end = .; | ||
68 | } | ||
69 | |||
70 | RODATA | 63 | RODATA |
71 | 64 | ||
72 | /* writeable */ | 65 | /* writeable */ |
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S index fad3674b06a5..fd246e22fe6b 100644 --- a/arch/x86/kernel/vmlinux_64.lds.S +++ b/arch/x86/kernel/vmlinux_64.lds.S | |||
@@ -53,13 +53,6 @@ SECTIONS | |||
53 | 53 | ||
54 | RODATA | 54 | RODATA |
55 | 55 | ||
56 | . = ALIGN(4); | ||
57 | .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { | ||
58 | __tracedata_start = .; | ||
59 | *(.tracedata) | ||
60 | __tracedata_end = .; | ||
61 | } | ||
62 | |||
63 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ | 56 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ |
64 | /* Data */ | 57 | /* Data */ |
65 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 58 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
@@ -177,6 +170,7 @@ SECTIONS | |||
177 | *(.con_initcall.init) | 170 | *(.con_initcall.init) |
178 | } | 171 | } |
179 | __con_initcall_end = .; | 172 | __con_initcall_end = .; |
173 | . = ALIGN(16); | ||
180 | __x86cpuvendor_start = .; | 174 | __x86cpuvendor_start = .; |
181 | .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) { | 175 | .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) { |
182 | *(.x86cpuvendor.init) | 176 | *(.x86cpuvendor.init) |
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index ba8c0b75ab0a..0c029e8959c7 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c | |||
@@ -15,9 +15,12 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/pci_ids.h> | 16 | #include <linux/pci_ids.h> |
17 | #include <linux/pci_regs.h> | 17 | #include <linux/pci_regs.h> |
18 | |||
19 | #include <asm/apic.h> | ||
18 | #include <asm/pci-direct.h> | 20 | #include <asm/pci-direct.h> |
19 | #include <asm/io.h> | 21 | #include <asm/io.h> |
20 | #include <asm/paravirt.h> | 22 | #include <asm/paravirt.h> |
23 | #include <asm/setup.h> | ||
21 | 24 | ||
22 | #if defined CONFIG_PCI && defined CONFIG_PARAVIRT | 25 | #if defined CONFIG_PCI && defined CONFIG_PARAVIRT |
23 | /* | 26 | /* |
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 7c077a9d9777..3829aa7b663f 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
@@ -200,10 +200,12 @@ int __pit_timer_fn(struct kvm_kpit_state *ps) | |||
200 | 200 | ||
201 | atomic_inc(&pt->pending); | 201 | atomic_inc(&pt->pending); |
202 | smp_mb__after_atomic_inc(); | 202 | smp_mb__after_atomic_inc(); |
203 | /* FIXME: handle case where the guest is in guest mode */ | 203 | if (vcpu0) { |
204 | if (vcpu0 && waitqueue_active(&vcpu0->wq)) { | 204 | set_bit(KVM_REQ_PENDING_TIMER, &vcpu0->requests); |
205 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; | 205 | if (waitqueue_active(&vcpu0->wq)) { |
206 | wake_up_interruptible(&vcpu0->wq); | 206 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; |
207 | wake_up_interruptible(&vcpu0->wq); | ||
208 | } | ||
207 | } | 209 | } |
208 | 210 | ||
209 | pt->timer.expires = ktime_add_ns(pt->timer.expires, pt->period); | 211 | pt->timer.expires = ktime_add_ns(pt->timer.expires, pt->period); |
@@ -237,6 +239,19 @@ static enum hrtimer_restart pit_timer_fn(struct hrtimer *data) | |||
237 | return HRTIMER_NORESTART; | 239 | return HRTIMER_NORESTART; |
238 | } | 240 | } |
239 | 241 | ||
242 | void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu) | ||
243 | { | ||
244 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; | ||
245 | struct hrtimer *timer; | ||
246 | |||
247 | if (vcpu->vcpu_id != 0 || !pit) | ||
248 | return; | ||
249 | |||
250 | timer = &pit->pit_state.pit_timer.timer; | ||
251 | if (hrtimer_cancel(timer)) | ||
252 | hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS); | ||
253 | } | ||
254 | |||
240 | static void destroy_pit_timer(struct kvm_kpit_timer *pt) | 255 | static void destroy_pit_timer(struct kvm_kpit_timer *pt) |
241 | { | 256 | { |
242 | pr_debug("pit: execute del timer!\n"); | 257 | pr_debug("pit: execute del timer!\n"); |
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index ce1f583459b1..76d736b5f664 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c | |||
@@ -94,3 +94,9 @@ void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec) | |||
94 | /* TODO: PIT, RTC etc. */ | 94 | /* TODO: PIT, RTC etc. */ |
95 | } | 95 | } |
96 | EXPORT_SYMBOL_GPL(kvm_timer_intr_post); | 96 | EXPORT_SYMBOL_GPL(kvm_timer_intr_post); |
97 | |||
98 | void __kvm_migrate_timers(struct kvm_vcpu *vcpu) | ||
99 | { | ||
100 | __kvm_migrate_apic_timer(vcpu); | ||
101 | __kvm_migrate_pit_timer(vcpu); | ||
102 | } | ||
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index 1802134b836f..2a15be2275c0 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h | |||
@@ -84,6 +84,8 @@ void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec); | |||
84 | void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); | 84 | void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); |
85 | void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); | 85 | void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); |
86 | void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); | 86 | void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); |
87 | void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu); | ||
88 | void __kvm_migrate_timers(struct kvm_vcpu *vcpu); | ||
87 | 89 | ||
88 | int pit_has_pending_timer(struct kvm_vcpu *vcpu); | 90 | int pit_has_pending_timer(struct kvm_vcpu *vcpu); |
89 | int apic_has_pending_timer(struct kvm_vcpu *vcpu); | 91 | int apic_has_pending_timer(struct kvm_vcpu *vcpu); |
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index c297c50eba63..ebc03f5ae162 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c | |||
@@ -940,6 +940,7 @@ static int __apic_timer_fn(struct kvm_lapic *apic) | |||
940 | wait_queue_head_t *q = &apic->vcpu->wq; | 940 | wait_queue_head_t *q = &apic->vcpu->wq; |
941 | 941 | ||
942 | atomic_inc(&apic->timer.pending); | 942 | atomic_inc(&apic->timer.pending); |
943 | set_bit(KVM_REQ_PENDING_TIMER, &apic->vcpu->requests); | ||
943 | if (waitqueue_active(q)) { | 944 | if (waitqueue_active(q)) { |
944 | apic->vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; | 945 | apic->vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; |
945 | wake_up_interruptible(q); | 946 | wake_up_interruptible(q); |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 36c5406b1813..7e7c3969f7a2 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -640,6 +640,7 @@ static void rmap_write_protect(struct kvm *kvm, u64 gfn) | |||
640 | rmap_remove(kvm, spte); | 640 | rmap_remove(kvm, spte); |
641 | --kvm->stat.lpages; | 641 | --kvm->stat.lpages; |
642 | set_shadow_pte(spte, shadow_trap_nonpresent_pte); | 642 | set_shadow_pte(spte, shadow_trap_nonpresent_pte); |
643 | spte = NULL; | ||
643 | write_protected = 1; | 644 | write_protected = 1; |
644 | } | 645 | } |
645 | spte = rmap_next(kvm, rmapp, spte); | 646 | spte = rmap_next(kvm, rmapp, spte); |
@@ -658,7 +659,7 @@ static int is_empty_shadow_page(u64 *spt) | |||
658 | u64 *end; | 659 | u64 *end; |
659 | 660 | ||
660 | for (pos = spt, end = pos + PAGE_SIZE / sizeof(u64); pos != end; pos++) | 661 | for (pos = spt, end = pos + PAGE_SIZE / sizeof(u64); pos != end; pos++) |
661 | if (*pos != shadow_trap_nonpresent_pte) { | 662 | if (is_shadow_present_pte(*pos)) { |
662 | printk(KERN_ERR "%s: %p %llx\n", __func__, | 663 | printk(KERN_ERR "%s: %p %llx\n", __func__, |
663 | pos, *pos); | 664 | pos, *pos); |
664 | return 0; | 665 | return 0; |
@@ -1082,10 +1083,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, | |||
1082 | struct kvm_mmu_page *shadow; | 1083 | struct kvm_mmu_page *shadow; |
1083 | 1084 | ||
1084 | spte |= PT_WRITABLE_MASK; | 1085 | spte |= PT_WRITABLE_MASK; |
1085 | if (user_fault) { | ||
1086 | mmu_unshadow(vcpu->kvm, gfn); | ||
1087 | goto unshadowed; | ||
1088 | } | ||
1089 | 1086 | ||
1090 | shadow = kvm_mmu_lookup_page(vcpu->kvm, gfn); | 1087 | shadow = kvm_mmu_lookup_page(vcpu->kvm, gfn); |
1091 | if (shadow || | 1088 | if (shadow || |
@@ -1102,8 +1099,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, | |||
1102 | } | 1099 | } |
1103 | } | 1100 | } |
1104 | 1101 | ||
1105 | unshadowed: | ||
1106 | |||
1107 | if (pte_access & ACC_WRITE_MASK) | 1102 | if (pte_access & ACC_WRITE_MASK) |
1108 | mark_page_dirty(vcpu->kvm, gfn); | 1103 | mark_page_dirty(vcpu->kvm, gfn); |
1109 | 1104 | ||
@@ -1580,11 +1575,13 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu, | |||
1580 | u64 *spte, | 1575 | u64 *spte, |
1581 | const void *new) | 1576 | const void *new) |
1582 | { | 1577 | { |
1583 | if ((sp->role.level != PT_PAGE_TABLE_LEVEL) | 1578 | if (sp->role.level != PT_PAGE_TABLE_LEVEL) { |
1584 | && !vcpu->arch.update_pte.largepage) { | 1579 | if (!vcpu->arch.update_pte.largepage || |
1585 | ++vcpu->kvm->stat.mmu_pde_zapped; | 1580 | sp->role.glevels == PT32_ROOT_LEVEL) { |
1586 | return; | 1581 | ++vcpu->kvm->stat.mmu_pde_zapped; |
1587 | } | 1582 | return; |
1583 | } | ||
1584 | } | ||
1588 | 1585 | ||
1589 | ++vcpu->kvm->stat.mmu_pte_updated; | 1586 | ++vcpu->kvm->stat.mmu_pte_updated; |
1590 | if (sp->role.glevels == PT32_ROOT_LEVEL) | 1587 | if (sp->role.glevels == PT32_ROOT_LEVEL) |
@@ -1858,6 +1855,7 @@ static void free_mmu_pages(struct kvm_vcpu *vcpu) | |||
1858 | sp = container_of(vcpu->kvm->arch.active_mmu_pages.next, | 1855 | sp = container_of(vcpu->kvm->arch.active_mmu_pages.next, |
1859 | struct kvm_mmu_page, link); | 1856 | struct kvm_mmu_page, link); |
1860 | kvm_mmu_zap_page(vcpu->kvm, sp); | 1857 | kvm_mmu_zap_page(vcpu->kvm, sp); |
1858 | cond_resched(); | ||
1861 | } | 1859 | } |
1862 | free_page((unsigned long)vcpu->arch.mmu.pae_root); | 1860 | free_page((unsigned long)vcpu->arch.mmu.pae_root); |
1863 | } | 1861 | } |
@@ -1996,7 +1994,7 @@ static struct shrinker mmu_shrinker = { | |||
1996 | .seeks = DEFAULT_SEEKS * 10, | 1994 | .seeks = DEFAULT_SEEKS * 10, |
1997 | }; | 1995 | }; |
1998 | 1996 | ||
1999 | void mmu_destroy_caches(void) | 1997 | static void mmu_destroy_caches(void) |
2000 | { | 1998 | { |
2001 | if (pte_chain_cache) | 1999 | if (pte_chain_cache) |
2002 | kmem_cache_destroy(pte_chain_cache); | 2000 | kmem_cache_destroy(pte_chain_cache); |
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 156fe10288ae..934c7b619396 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
@@ -418,7 +418,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, | |||
418 | 418 | ||
419 | /* mmio */ | 419 | /* mmio */ |
420 | if (is_error_pfn(pfn)) { | 420 | if (is_error_pfn(pfn)) { |
421 | pgprintk("gfn %x is mmio\n", walker.gfn); | 421 | pgprintk("gfn %lx is mmio\n", walker.gfn); |
422 | kvm_release_pfn_clean(pfn); | 422 | kvm_release_pfn_clean(pfn); |
423 | return 1; | 423 | return 1; |
424 | } | 424 | } |
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ab22615eee89..6b0d5fa5bab3 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
@@ -688,7 +688,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
688 | delta = vcpu->arch.host_tsc - tsc_this; | 688 | delta = vcpu->arch.host_tsc - tsc_this; |
689 | svm->vmcb->control.tsc_offset += delta; | 689 | svm->vmcb->control.tsc_offset += delta; |
690 | vcpu->cpu = cpu; | 690 | vcpu->cpu = cpu; |
691 | kvm_migrate_apic_timer(vcpu); | 691 | kvm_migrate_timers(vcpu); |
692 | } | 692 | } |
693 | 693 | ||
694 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) | 694 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index bfe4db11989c..540e95179074 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -566,7 +566,7 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu) | |||
566 | load_transition_efer(vmx); | 566 | load_transition_efer(vmx); |
567 | } | 567 | } |
568 | 568 | ||
569 | static void vmx_load_host_state(struct vcpu_vmx *vmx) | 569 | static void __vmx_load_host_state(struct vcpu_vmx *vmx) |
570 | { | 570 | { |
571 | unsigned long flags; | 571 | unsigned long flags; |
572 | 572 | ||
@@ -596,6 +596,13 @@ static void vmx_load_host_state(struct vcpu_vmx *vmx) | |||
596 | reload_host_efer(vmx); | 596 | reload_host_efer(vmx); |
597 | } | 597 | } |
598 | 598 | ||
599 | static void vmx_load_host_state(struct vcpu_vmx *vmx) | ||
600 | { | ||
601 | preempt_disable(); | ||
602 | __vmx_load_host_state(vmx); | ||
603 | preempt_enable(); | ||
604 | } | ||
605 | |||
599 | /* | 606 | /* |
600 | * Switches to specified vcpu, until a matching vcpu_put(), but assumes | 607 | * Switches to specified vcpu, until a matching vcpu_put(), but assumes |
601 | * vcpu mutex is already taken. | 608 | * vcpu mutex is already taken. |
@@ -608,7 +615,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
608 | 615 | ||
609 | if (vcpu->cpu != cpu) { | 616 | if (vcpu->cpu != cpu) { |
610 | vcpu_clear(vmx); | 617 | vcpu_clear(vmx); |
611 | kvm_migrate_apic_timer(vcpu); | 618 | kvm_migrate_timers(vcpu); |
612 | vpid_sync_vcpu_all(vmx); | 619 | vpid_sync_vcpu_all(vmx); |
613 | } | 620 | } |
614 | 621 | ||
@@ -654,7 +661,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
654 | 661 | ||
655 | static void vmx_vcpu_put(struct kvm_vcpu *vcpu) | 662 | static void vmx_vcpu_put(struct kvm_vcpu *vcpu) |
656 | { | 663 | { |
657 | vmx_load_host_state(to_vmx(vcpu)); | 664 | __vmx_load_host_state(to_vmx(vcpu)); |
658 | } | 665 | } |
659 | 666 | ||
660 | static void vmx_fpu_activate(struct kvm_vcpu *vcpu) | 667 | static void vmx_fpu_activate(struct kvm_vcpu *vcpu) |
@@ -884,11 +891,8 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) | |||
884 | switch (msr_index) { | 891 | switch (msr_index) { |
885 | #ifdef CONFIG_X86_64 | 892 | #ifdef CONFIG_X86_64 |
886 | case MSR_EFER: | 893 | case MSR_EFER: |
894 | vmx_load_host_state(vmx); | ||
887 | ret = kvm_set_msr_common(vcpu, msr_index, data); | 895 | ret = kvm_set_msr_common(vcpu, msr_index, data); |
888 | if (vmx->host_state.loaded) { | ||
889 | reload_host_efer(vmx); | ||
890 | load_transition_efer(vmx); | ||
891 | } | ||
892 | break; | 896 | break; |
893 | case MSR_FS_BASE: | 897 | case MSR_FS_BASE: |
894 | vmcs_writel(GUEST_FS_BASE, data); | 898 | vmcs_writel(GUEST_FS_BASE, data); |
@@ -910,11 +914,10 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) | |||
910 | guest_write_tsc(data); | 914 | guest_write_tsc(data); |
911 | break; | 915 | break; |
912 | default: | 916 | default: |
917 | vmx_load_host_state(vmx); | ||
913 | msr = find_msr_entry(vmx, msr_index); | 918 | msr = find_msr_entry(vmx, msr_index); |
914 | if (msr) { | 919 | if (msr) { |
915 | msr->data = data; | 920 | msr->data = data; |
916 | if (vmx->host_state.loaded) | ||
917 | load_msrs(vmx->guest_msrs, vmx->save_nmsrs); | ||
918 | break; | 921 | break; |
919 | } | 922 | } |
920 | ret = kvm_set_msr_common(vcpu, msr_index, data); | 923 | ret = kvm_set_msr_common(vcpu, msr_index, data); |
@@ -1036,6 +1039,7 @@ static void hardware_enable(void *garbage) | |||
1036 | static void hardware_disable(void *garbage) | 1039 | static void hardware_disable(void *garbage) |
1037 | { | 1040 | { |
1038 | asm volatile (ASM_VMX_VMXOFF : : : "cc"); | 1041 | asm volatile (ASM_VMX_VMXOFF : : : "cc"); |
1042 | write_cr4(read_cr4() & ~X86_CR4_VMXE); | ||
1039 | } | 1043 | } |
1040 | 1044 | ||
1041 | static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, | 1045 | static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 21338bdb28ff..63a77caa59f1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -492,8 +492,8 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data) | |||
492 | static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | 492 | static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) |
493 | { | 493 | { |
494 | static int version; | 494 | static int version; |
495 | struct kvm_wall_clock wc; | 495 | struct pvclock_wall_clock wc; |
496 | struct timespec wc_ts; | 496 | struct timespec now, sys, boot; |
497 | 497 | ||
498 | if (!wall_clock) | 498 | if (!wall_clock) |
499 | return; | 499 | return; |
@@ -502,10 +502,19 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | |||
502 | 502 | ||
503 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); | 503 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); |
504 | 504 | ||
505 | wc_ts = current_kernel_time(); | 505 | /* |
506 | wc.wc_sec = wc_ts.tv_sec; | 506 | * The guest calculates current wall clock time by adding |
507 | wc.wc_nsec = wc_ts.tv_nsec; | 507 | * system time (updated by kvm_write_guest_time below) to the |
508 | wc.wc_version = version; | 508 | * wall clock specified here. guest system time equals host |
509 | * system time for us, thus we must fill in host boot time here. | ||
510 | */ | ||
511 | now = current_kernel_time(); | ||
512 | ktime_get_ts(&sys); | ||
513 | boot = ns_to_timespec(timespec_to_ns(&now) - timespec_to_ns(&sys)); | ||
514 | |||
515 | wc.sec = boot.tv_sec; | ||
516 | wc.nsec = boot.tv_nsec; | ||
517 | wc.version = version; | ||
509 | 518 | ||
510 | kvm_write_guest(kvm, wall_clock, &wc, sizeof(wc)); | 519 | kvm_write_guest(kvm, wall_clock, &wc, sizeof(wc)); |
511 | 520 | ||
@@ -513,6 +522,45 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | |||
513 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); | 522 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); |
514 | } | 523 | } |
515 | 524 | ||
525 | static uint32_t div_frac(uint32_t dividend, uint32_t divisor) | ||
526 | { | ||
527 | uint32_t quotient, remainder; | ||
528 | |||
529 | /* Don't try to replace with do_div(), this one calculates | ||
530 | * "(dividend << 32) / divisor" */ | ||
531 | __asm__ ( "divl %4" | ||
532 | : "=a" (quotient), "=d" (remainder) | ||
533 | : "0" (0), "1" (dividend), "r" (divisor) ); | ||
534 | return quotient; | ||
535 | } | ||
536 | |||
537 | static void kvm_set_time_scale(uint32_t tsc_khz, struct pvclock_vcpu_time_info *hv_clock) | ||
538 | { | ||
539 | uint64_t nsecs = 1000000000LL; | ||
540 | int32_t shift = 0; | ||
541 | uint64_t tps64; | ||
542 | uint32_t tps32; | ||
543 | |||
544 | tps64 = tsc_khz * 1000LL; | ||
545 | while (tps64 > nsecs*2) { | ||
546 | tps64 >>= 1; | ||
547 | shift--; | ||
548 | } | ||
549 | |||
550 | tps32 = (uint32_t)tps64; | ||
551 | while (tps32 <= (uint32_t)nsecs) { | ||
552 | tps32 <<= 1; | ||
553 | shift++; | ||
554 | } | ||
555 | |||
556 | hv_clock->tsc_shift = shift; | ||
557 | hv_clock->tsc_to_system_mul = div_frac(nsecs, tps32); | ||
558 | |||
559 | pr_debug("%s: tsc_khz %u, tsc_shift %d, tsc_mul %u\n", | ||
560 | __FUNCTION__, tsc_khz, hv_clock->tsc_shift, | ||
561 | hv_clock->tsc_to_system_mul); | ||
562 | } | ||
563 | |||
516 | static void kvm_write_guest_time(struct kvm_vcpu *v) | 564 | static void kvm_write_guest_time(struct kvm_vcpu *v) |
517 | { | 565 | { |
518 | struct timespec ts; | 566 | struct timespec ts; |
@@ -523,6 +571,11 @@ static void kvm_write_guest_time(struct kvm_vcpu *v) | |||
523 | if ((!vcpu->time_page)) | 571 | if ((!vcpu->time_page)) |
524 | return; | 572 | return; |
525 | 573 | ||
574 | if (unlikely(vcpu->hv_clock_tsc_khz != tsc_khz)) { | ||
575 | kvm_set_time_scale(tsc_khz, &vcpu->hv_clock); | ||
576 | vcpu->hv_clock_tsc_khz = tsc_khz; | ||
577 | } | ||
578 | |||
526 | /* Keep irq disabled to prevent changes to the clock */ | 579 | /* Keep irq disabled to prevent changes to the clock */ |
527 | local_irq_save(flags); | 580 | local_irq_save(flags); |
528 | kvm_get_msr(v, MSR_IA32_TIME_STAMP_COUNTER, | 581 | kvm_get_msr(v, MSR_IA32_TIME_STAMP_COUNTER, |
@@ -537,14 +590,14 @@ static void kvm_write_guest_time(struct kvm_vcpu *v) | |||
537 | /* | 590 | /* |
538 | * The interface expects us to write an even number signaling that the | 591 | * The interface expects us to write an even number signaling that the |
539 | * update is finished. Since the guest won't see the intermediate | 592 | * update is finished. Since the guest won't see the intermediate |
540 | * state, we just write "2" at the end | 593 | * state, we just increase by 2 at the end. |
541 | */ | 594 | */ |
542 | vcpu->hv_clock.version = 2; | 595 | vcpu->hv_clock.version += 2; |
543 | 596 | ||
544 | shared_kaddr = kmap_atomic(vcpu->time_page, KM_USER0); | 597 | shared_kaddr = kmap_atomic(vcpu->time_page, KM_USER0); |
545 | 598 | ||
546 | memcpy(shared_kaddr + vcpu->time_offset, &vcpu->hv_clock, | 599 | memcpy(shared_kaddr + vcpu->time_offset, &vcpu->hv_clock, |
547 | sizeof(vcpu->hv_clock)); | 600 | sizeof(vcpu->hv_clock)); |
548 | 601 | ||
549 | kunmap_atomic(shared_kaddr, KM_USER0); | 602 | kunmap_atomic(shared_kaddr, KM_USER0); |
550 | 603 | ||
@@ -599,10 +652,6 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data) | |||
599 | /* ...but clean it before doing the actual write */ | 652 | /* ...but clean it before doing the actual write */ |
600 | vcpu->arch.time_offset = data & ~(PAGE_MASK | 1); | 653 | vcpu->arch.time_offset = data & ~(PAGE_MASK | 1); |
601 | 654 | ||
602 | vcpu->arch.hv_clock.tsc_to_system_mul = | ||
603 | clocksource_khz2mult(tsc_khz, 22); | ||
604 | vcpu->arch.hv_clock.tsc_shift = 22; | ||
605 | |||
606 | down_read(¤t->mm->mmap_sem); | 655 | down_read(¤t->mm->mmap_sem); |
607 | vcpu->arch.time_page = | 656 | vcpu->arch.time_page = |
608 | gfn_to_page(vcpu->kvm, data >> PAGE_SHIFT); | 657 | gfn_to_page(vcpu->kvm, data >> PAGE_SHIFT); |
@@ -2758,7 +2807,9 @@ again: | |||
2758 | 2807 | ||
2759 | if (vcpu->requests) { | 2808 | if (vcpu->requests) { |
2760 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) | 2809 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) |
2761 | __kvm_migrate_apic_timer(vcpu); | 2810 | __kvm_migrate_timers(vcpu); |
2811 | if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests)) | ||
2812 | kvm_x86_ops->tlb_flush(vcpu); | ||
2762 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, | 2813 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, |
2763 | &vcpu->requests)) { | 2814 | &vcpu->requests)) { |
2764 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; | 2815 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; |
@@ -2772,6 +2823,7 @@ again: | |||
2772 | } | 2823 | } |
2773 | } | 2824 | } |
2774 | 2825 | ||
2826 | clear_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests); | ||
2775 | kvm_inject_pending_timer_irqs(vcpu); | 2827 | kvm_inject_pending_timer_irqs(vcpu); |
2776 | 2828 | ||
2777 | preempt_disable(); | 2829 | preempt_disable(); |
@@ -2781,21 +2833,13 @@ again: | |||
2781 | 2833 | ||
2782 | local_irq_disable(); | 2834 | local_irq_disable(); |
2783 | 2835 | ||
2784 | if (need_resched()) { | 2836 | if (vcpu->requests || need_resched()) { |
2785 | local_irq_enable(); | 2837 | local_irq_enable(); |
2786 | preempt_enable(); | 2838 | preempt_enable(); |
2787 | r = 1; | 2839 | r = 1; |
2788 | goto out; | 2840 | goto out; |
2789 | } | 2841 | } |
2790 | 2842 | ||
2791 | if (vcpu->requests) | ||
2792 | if (test_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests)) { | ||
2793 | local_irq_enable(); | ||
2794 | preempt_enable(); | ||
2795 | r = 1; | ||
2796 | goto out; | ||
2797 | } | ||
2798 | |||
2799 | if (signal_pending(current)) { | 2843 | if (signal_pending(current)) { |
2800 | local_irq_enable(); | 2844 | local_irq_enable(); |
2801 | preempt_enable(); | 2845 | preempt_enable(); |
@@ -2825,9 +2869,6 @@ again: | |||
2825 | 2869 | ||
2826 | kvm_guest_enter(); | 2870 | kvm_guest_enter(); |
2827 | 2871 | ||
2828 | if (vcpu->requests) | ||
2829 | if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests)) | ||
2830 | kvm_x86_ops->tlb_flush(vcpu); | ||
2831 | 2872 | ||
2832 | KVMTRACE_0D(VMENTRY, vcpu, entryexit); | 2873 | KVMTRACE_0D(VMENTRY, vcpu, entryexit); |
2833 | kvm_x86_ops->run(vcpu, kvm_run); | 2874 | kvm_x86_ops->run(vcpu, kvm_run); |
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c index 8a96320ab071..932f216d890c 100644 --- a/arch/x86/kvm/x86_emulate.c +++ b/arch/x86/kvm/x86_emulate.c | |||
@@ -1727,7 +1727,8 @@ twobyte_insn: | |||
1727 | if (rc) | 1727 | if (rc) |
1728 | goto done; | 1728 | goto done; |
1729 | 1729 | ||
1730 | kvm_emulate_hypercall(ctxt->vcpu); | 1730 | /* Let the processor re-execute the fixed hypercall */ |
1731 | c->eip = ctxt->vcpu->arch.rip; | ||
1731 | /* Disable writeback. */ | 1732 | /* Disable writeback. */ |
1732 | c->dst.type = OP_NONE; | 1733 | c->dst.type = OP_NONE; |
1733 | break; | 1734 | break; |
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index af65b2da3ba0..5c7e2fd52075 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -582,8 +582,9 @@ static void __init lguest_init_IRQ(void) | |||
582 | int vector = FIRST_EXTERNAL_VECTOR + i; | 582 | int vector = FIRST_EXTERNAL_VECTOR + i; |
583 | if (vector != SYSCALL_VECTOR) { | 583 | if (vector != SYSCALL_VECTOR) { |
584 | set_intr_gate(vector, interrupt[i]); | 584 | set_intr_gate(vector, interrupt[i]); |
585 | set_irq_chip_and_handler(i, &lguest_irq_controller, | 585 | set_irq_chip_and_handler_name(i, &lguest_irq_controller, |
586 | handle_level_irq); | 586 | handle_level_irq, |
587 | "level"); | ||
587 | } | 588 | } |
588 | } | 589 | } |
589 | /* This call is required to set up for 4k stacks, where we have | 590 | /* This call is required to set up for 4k stacks, where we have |
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index 70bebd310408..ee1c3f635157 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S | |||
@@ -217,19 +217,19 @@ ENTRY(copy_user_generic_unrolled) | |||
217 | /* table sorted by exception address */ | 217 | /* table sorted by exception address */ |
218 | .section __ex_table,"a" | 218 | .section __ex_table,"a" |
219 | .align 8 | 219 | .align 8 |
220 | .quad .Ls1,.Ls1e | 220 | .quad .Ls1,.Ls1e /* Ls1-Ls4 have copied zero bytes */ |
221 | .quad .Ls2,.Ls2e | 221 | .quad .Ls2,.Ls1e |
222 | .quad .Ls3,.Ls3e | 222 | .quad .Ls3,.Ls1e |
223 | .quad .Ls4,.Ls4e | 223 | .quad .Ls4,.Ls1e |
224 | .quad .Ld1,.Ls1e | 224 | .quad .Ld1,.Ls1e /* Ld1-Ld4 have copied 0-24 bytes */ |
225 | .quad .Ld2,.Ls2e | 225 | .quad .Ld2,.Ls2e |
226 | .quad .Ld3,.Ls3e | 226 | .quad .Ld3,.Ls3e |
227 | .quad .Ld4,.Ls4e | 227 | .quad .Ld4,.Ls4e |
228 | .quad .Ls5,.Ls5e | 228 | .quad .Ls5,.Ls5e /* Ls5-Ls8 have copied 32 bytes */ |
229 | .quad .Ls6,.Ls6e | 229 | .quad .Ls6,.Ls5e |
230 | .quad .Ls7,.Ls7e | 230 | .quad .Ls7,.Ls5e |
231 | .quad .Ls8,.Ls8e | 231 | .quad .Ls8,.Ls5e |
232 | .quad .Ld5,.Ls5e | 232 | .quad .Ld5,.Ls5e /* Ld5-Ld8 have copied 32-56 bytes */ |
233 | .quad .Ld6,.Ls6e | 233 | .quad .Ld6,.Ls6e |
234 | .quad .Ld7,.Ls7e | 234 | .quad .Ld7,.Ls7e |
235 | .quad .Ld8,.Ls8e | 235 | .quad .Ld8,.Ls8e |
@@ -244,11 +244,8 @@ ENTRY(copy_user_generic_unrolled) | |||
244 | .quad .Le5,.Le_zero | 244 | .quad .Le5,.Le_zero |
245 | .previous | 245 | .previous |
246 | 246 | ||
247 | /* compute 64-offset for main loop. 8 bytes accuracy with error on the | ||
248 | pessimistic side. this is gross. it would be better to fix the | ||
249 | interface. */ | ||
250 | /* eax: zero, ebx: 64 */ | 247 | /* eax: zero, ebx: 64 */ |
251 | .Ls1e: addl $8,%eax | 248 | .Ls1e: addl $8,%eax /* eax is bytes left uncopied within the loop (Ls1e: 64 .. Ls8e: 8) */ |
252 | .Ls2e: addl $8,%eax | 249 | .Ls2e: addl $8,%eax |
253 | .Ls3e: addl $8,%eax | 250 | .Ls3e: addl $8,%eax |
254 | .Ls4e: addl $8,%eax | 251 | .Ls4e: addl $8,%eax |
diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S index 5196762b3b0e..9d3d1ab83763 100644 --- a/arch/x86/lib/copy_user_nocache_64.S +++ b/arch/x86/lib/copy_user_nocache_64.S | |||
@@ -145,19 +145,19 @@ ENTRY(__copy_user_nocache) | |||
145 | /* table sorted by exception address */ | 145 | /* table sorted by exception address */ |
146 | .section __ex_table,"a" | 146 | .section __ex_table,"a" |
147 | .align 8 | 147 | .align 8 |
148 | .quad .Ls1,.Ls1e | 148 | .quad .Ls1,.Ls1e /* .Ls[1-4] - 0 bytes copied */ |
149 | .quad .Ls2,.Ls2e | 149 | .quad .Ls2,.Ls1e |
150 | .quad .Ls3,.Ls3e | 150 | .quad .Ls3,.Ls1e |
151 | .quad .Ls4,.Ls4e | 151 | .quad .Ls4,.Ls1e |
152 | .quad .Ld1,.Ls1e | 152 | .quad .Ld1,.Ls1e /* .Ld[1-4] - 0..24 bytes coped */ |
153 | .quad .Ld2,.Ls2e | 153 | .quad .Ld2,.Ls2e |
154 | .quad .Ld3,.Ls3e | 154 | .quad .Ld3,.Ls3e |
155 | .quad .Ld4,.Ls4e | 155 | .quad .Ld4,.Ls4e |
156 | .quad .Ls5,.Ls5e | 156 | .quad .Ls5,.Ls5e /* .Ls[5-8] - 32 bytes copied */ |
157 | .quad .Ls6,.Ls6e | 157 | .quad .Ls6,.Ls5e |
158 | .quad .Ls7,.Ls7e | 158 | .quad .Ls7,.Ls5e |
159 | .quad .Ls8,.Ls8e | 159 | .quad .Ls8,.Ls5e |
160 | .quad .Ld5,.Ls5e | 160 | .quad .Ld5,.Ls5e /* .Ld[5-8] - 32..56 bytes copied */ |
161 | .quad .Ld6,.Ls6e | 161 | .quad .Ld6,.Ls6e |
162 | .quad .Ld7,.Ls7e | 162 | .quad .Ld7,.Ls7e |
163 | .quad .Ld8,.Ls8e | 163 | .quad .Ld8,.Ls8e |
@@ -172,11 +172,8 @@ ENTRY(__copy_user_nocache) | |||
172 | .quad .Le5,.Le_zero | 172 | .quad .Le5,.Le_zero |
173 | .previous | 173 | .previous |
174 | 174 | ||
175 | /* compute 64-offset for main loop. 8 bytes accuracy with error on the | ||
176 | pessimistic side. this is gross. it would be better to fix the | ||
177 | interface. */ | ||
178 | /* eax: zero, ebx: 64 */ | 175 | /* eax: zero, ebx: 64 */ |
179 | .Ls1e: addl $8,%eax | 176 | .Ls1e: addl $8,%eax /* eax: bytes left uncopied: Ls1e: 64 .. Ls8e: 8 */ |
180 | .Ls2e: addl $8,%eax | 177 | .Ls2e: addl $8,%eax |
181 | .Ls3e: addl $8,%eax | 178 | .Ls3e: addl $8,%eax |
182 | .Ls4e: addl $8,%eax | 179 | .Ls4e: addl $8,%eax |
diff --git a/arch/x86/lib/delay_32.c b/arch/x86/lib/delay_32.c index 4535e6d147ad..d710f2d167bb 100644 --- a/arch/x86/lib/delay_32.c +++ b/arch/x86/lib/delay_32.c | |||
@@ -44,13 +44,36 @@ static void delay_loop(unsigned long loops) | |||
44 | static void delay_tsc(unsigned long loops) | 44 | static void delay_tsc(unsigned long loops) |
45 | { | 45 | { |
46 | unsigned long bclock, now; | 46 | unsigned long bclock, now; |
47 | int cpu; | ||
47 | 48 | ||
48 | preempt_disable(); /* TSC's are per-cpu */ | 49 | preempt_disable(); |
50 | cpu = smp_processor_id(); | ||
49 | rdtscl(bclock); | 51 | rdtscl(bclock); |
50 | do { | 52 | for (;;) { |
51 | rep_nop(); | ||
52 | rdtscl(now); | 53 | rdtscl(now); |
53 | } while ((now-bclock) < loops); | 54 | if ((now - bclock) >= loops) |
55 | break; | ||
56 | |||
57 | /* Allow RT tasks to run */ | ||
58 | preempt_enable(); | ||
59 | rep_nop(); | ||
60 | preempt_disable(); | ||
61 | |||
62 | /* | ||
63 | * It is possible that we moved to another CPU, and | ||
64 | * since TSC's are per-cpu we need to calculate | ||
65 | * that. The delay must guarantee that we wait "at | ||
66 | * least" the amount of time. Being moved to another | ||
67 | * CPU could make the wait longer but we just need to | ||
68 | * make sure we waited long enough. Rebalance the | ||
69 | * counter for this CPU. | ||
70 | */ | ||
71 | if (unlikely(cpu != smp_processor_id())) { | ||
72 | loops -= (now - bclock); | ||
73 | cpu = smp_processor_id(); | ||
74 | rdtscl(bclock); | ||
75 | } | ||
76 | } | ||
54 | preempt_enable(); | 77 | preempt_enable(); |
55 | } | 78 | } |
56 | 79 | ||
diff --git a/arch/x86/lib/delay_64.c b/arch/x86/lib/delay_64.c index bbc610518516..4c441be92641 100644 --- a/arch/x86/lib/delay_64.c +++ b/arch/x86/lib/delay_64.c | |||
@@ -31,14 +31,36 @@ int __devinit read_current_timer(unsigned long *timer_value) | |||
31 | void __delay(unsigned long loops) | 31 | void __delay(unsigned long loops) |
32 | { | 32 | { |
33 | unsigned bclock, now; | 33 | unsigned bclock, now; |
34 | int cpu; | ||
34 | 35 | ||
35 | preempt_disable(); /* TSC's are pre-cpu */ | 36 | preempt_disable(); |
37 | cpu = smp_processor_id(); | ||
36 | rdtscl(bclock); | 38 | rdtscl(bclock); |
37 | do { | 39 | for (;;) { |
38 | rep_nop(); | ||
39 | rdtscl(now); | 40 | rdtscl(now); |
41 | if ((now - bclock) >= loops) | ||
42 | break; | ||
43 | |||
44 | /* Allow RT tasks to run */ | ||
45 | preempt_enable(); | ||
46 | rep_nop(); | ||
47 | preempt_disable(); | ||
48 | |||
49 | /* | ||
50 | * It is possible that we moved to another CPU, and | ||
51 | * since TSC's are per-cpu we need to calculate | ||
52 | * that. The delay must guarantee that we wait "at | ||
53 | * least" the amount of time. Being moved to another | ||
54 | * CPU could make the wait longer but we just need to | ||
55 | * make sure we waited long enough. Rebalance the | ||
56 | * counter for this CPU. | ||
57 | */ | ||
58 | if (unlikely(cpu != smp_processor_id())) { | ||
59 | loops -= (now - bclock); | ||
60 | cpu = smp_processor_id(); | ||
61 | rdtscl(bclock); | ||
62 | } | ||
40 | } | 63 | } |
41 | while ((now-bclock) < loops); | ||
42 | preempt_enable(); | 64 | preempt_enable(); |
43 | } | 65 | } |
44 | EXPORT_SYMBOL(__delay); | 66 | EXPORT_SYMBOL(__delay); |
diff --git a/arch/x86/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c index 6e38d877ea77..c7b06feb139b 100644 --- a/arch/x86/math-emu/fpu_entry.c +++ b/arch/x86/math-emu/fpu_entry.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <asm/uaccess.h> | 30 | #include <asm/uaccess.h> |
31 | #include <asm/desc.h> | 31 | #include <asm/desc.h> |
32 | #include <asm/user.h> | 32 | #include <asm/user.h> |
33 | #include <asm/i387.h> | ||
33 | 34 | ||
34 | #include "fpu_system.h" | 35 | #include "fpu_system.h" |
35 | #include "fpu_emu.h" | 36 | #include "fpu_emu.h" |
@@ -146,6 +147,13 @@ asmlinkage void math_emulate(long arg) | |||
146 | unsigned long code_limit = 0; /* Initialized to stop compiler warnings */ | 147 | unsigned long code_limit = 0; /* Initialized to stop compiler warnings */ |
147 | struct desc_struct code_descriptor; | 148 | struct desc_struct code_descriptor; |
148 | 149 | ||
150 | if (!used_math()) { | ||
151 | if (init_fpu(current)) { | ||
152 | do_group_exit(SIGKILL); | ||
153 | return; | ||
154 | } | ||
155 | } | ||
156 | |||
149 | #ifdef RE_ENTRANT_CHECKING | 157 | #ifdef RE_ENTRANT_CHECKING |
150 | if (emulating) { | 158 | if (emulating) { |
151 | printk("ERROR: wm-FPU-emu is not RE-ENTRANT!\n"); | 159 | printk("ERROR: wm-FPU-emu is not RE-ENTRANT!\n"); |
@@ -153,11 +161,6 @@ asmlinkage void math_emulate(long arg) | |||
153 | RE_ENTRANT_CHECK_ON; | 161 | RE_ENTRANT_CHECK_ON; |
154 | #endif /* RE_ENTRANT_CHECKING */ | 162 | #endif /* RE_ENTRANT_CHECKING */ |
155 | 163 | ||
156 | if (!used_math()) { | ||
157 | finit(); | ||
158 | set_used_math(); | ||
159 | } | ||
160 | |||
161 | SETUP_DATA_AREA(arg); | 164 | SETUP_DATA_AREA(arg); |
162 | 165 | ||
163 | FPU_ORIG_EIP = FPU_EIP; | 166 | FPU_ORIG_EIP = FPU_EIP; |
diff --git a/arch/x86/math-emu/reg_constant.c b/arch/x86/math-emu/reg_constant.c index 04869e64b18e..00548354912f 100644 --- a/arch/x86/math-emu/reg_constant.c +++ b/arch/x86/math-emu/reg_constant.c | |||
@@ -16,8 +16,8 @@ | |||
16 | #include "reg_constant.h" | 16 | #include "reg_constant.h" |
17 | #include "control_w.h" | 17 | #include "control_w.h" |
18 | 18 | ||
19 | #define MAKE_REG(s,e,l,h) { l, h, \ | 19 | #define MAKE_REG(s, e, l, h) { l, h, \ |
20 | ((EXTENDED_Ebias+(e)) | ((SIGN_##s != 0)*0x8000)) } | 20 | ((EXTENDED_Ebias+(e)) | ((SIGN_##s != 0)*0x8000)) } |
21 | 21 | ||
22 | FPU_REG const CONST_1 = MAKE_REG(POS, 0, 0x00000000, 0x80000000); | 22 | FPU_REG const CONST_1 = MAKE_REG(POS, 0, 0x00000000, 0x80000000); |
23 | #if 0 | 23 | #if 0 |
@@ -40,7 +40,7 @@ FPU_REG const CONST_PI2extra = MAKE_REG(NEG, -66, | |||
40 | FPU_REG const CONST_Z = MAKE_REG(POS, EXP_UNDER, 0x0, 0x0); | 40 | FPU_REG const CONST_Z = MAKE_REG(POS, EXP_UNDER, 0x0, 0x0); |
41 | 41 | ||
42 | /* Only the sign and significand (and tag) are used in internal NaNs */ | 42 | /* Only the sign and significand (and tag) are used in internal NaNs */ |
43 | /* The 80486 never generates one of these | 43 | /* The 80486 never generates one of these |
44 | FPU_REG const CONST_SNAN = MAKE_REG(POS, EXP_OVER, 0x00000001, 0x80000000); | 44 | FPU_REG const CONST_SNAN = MAKE_REG(POS, EXP_OVER, 0x00000001, 0x80000000); |
45 | */ | 45 | */ |
46 | /* This is the real indefinite QNaN */ | 46 | /* This is the real indefinite QNaN */ |
@@ -49,7 +49,7 @@ FPU_REG const CONST_QNaN = MAKE_REG(NEG, EXP_OVER, 0x00000000, 0xC0000000); | |||
49 | /* Only the sign (and tag) is used in internal infinities */ | 49 | /* Only the sign (and tag) is used in internal infinities */ |
50 | FPU_REG const CONST_INF = MAKE_REG(POS, EXP_OVER, 0x00000000, 0x80000000); | 50 | FPU_REG const CONST_INF = MAKE_REG(POS, EXP_OVER, 0x00000000, 0x80000000); |
51 | 51 | ||
52 | static void fld_const(FPU_REG const *c, int adj, u_char tag) | 52 | static void fld_const(FPU_REG const * c, int adj, u_char tag) |
53 | { | 53 | { |
54 | FPU_REG *st_new_ptr; | 54 | FPU_REG *st_new_ptr; |
55 | 55 | ||
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 2c24bea92c66..0bb0caed8971 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c | |||
@@ -42,7 +42,7 @@ static struct addr_marker address_markers[] = { | |||
42 | { 0, "User Space" }, | 42 | { 0, "User Space" }, |
43 | #ifdef CONFIG_X86_64 | 43 | #ifdef CONFIG_X86_64 |
44 | { 0x8000000000000000UL, "Kernel Space" }, | 44 | { 0x8000000000000000UL, "Kernel Space" }, |
45 | { 0xffff810000000000UL, "Low Kernel Mapping" }, | 45 | { PAGE_OFFSET, "Low Kernel Mapping" }, |
46 | { VMALLOC_START, "vmalloc() Area" }, | 46 | { VMALLOC_START, "vmalloc() Area" }, |
47 | { VMEMMAP_START, "Vmemmap" }, | 47 | { VMEMMAP_START, "Vmemmap" }, |
48 | { __START_KERNEL_map, "High Kernel Mapping" }, | 48 | { __START_KERNEL_map, "High Kernel Mapping" }, |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index fd7e1798c75a..1e64795714c8 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -55,11 +55,7 @@ static inline int notify_page_fault(struct pt_regs *regs) | |||
55 | int ret = 0; | 55 | int ret = 0; |
56 | 56 | ||
57 | /* kprobe_running() needs smp_processor_id() */ | 57 | /* kprobe_running() needs smp_processor_id() */ |
58 | #ifdef CONFIG_X86_32 | ||
59 | if (!user_mode_vm(regs)) { | 58 | if (!user_mode_vm(regs)) { |
60 | #else | ||
61 | if (!user_mode(regs)) { | ||
62 | #endif | ||
63 | preempt_disable(); | 59 | preempt_disable(); |
64 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) | 60 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) |
65 | ret = 1; | 61 | ret = 1; |
@@ -497,6 +493,11 @@ static int vmalloc_fault(unsigned long address) | |||
497 | unsigned long pgd_paddr; | 493 | unsigned long pgd_paddr; |
498 | pmd_t *pmd_k; | 494 | pmd_t *pmd_k; |
499 | pte_t *pte_k; | 495 | pte_t *pte_k; |
496 | |||
497 | /* Make sure we are in vmalloc area */ | ||
498 | if (!(address >= VMALLOC_START && address < VMALLOC_END)) | ||
499 | return -1; | ||
500 | |||
500 | /* | 501 | /* |
501 | * Synchronize this task's top level page-table | 502 | * Synchronize this task's top level page-table |
502 | * with the 'reference' page table. | 503 | * with the 'reference' page table. |
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index ec30d10154b6..d71be0eb0130 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -162,6 +162,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
162 | pgd_t *pgd; | 162 | pgd_t *pgd; |
163 | pmd_t *pmd; | 163 | pmd_t *pmd; |
164 | pte_t *pte; | 164 | pte_t *pte; |
165 | unsigned pages_2m = 0, pages_4k = 0; | ||
165 | 166 | ||
166 | pgd_idx = pgd_index(PAGE_OFFSET); | 167 | pgd_idx = pgd_index(PAGE_OFFSET); |
167 | pgd = pgd_base + pgd_idx; | 168 | pgd = pgd_base + pgd_idx; |
@@ -197,6 +198,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
197 | is_kernel_text(addr2)) | 198 | is_kernel_text(addr2)) |
198 | prot = PAGE_KERNEL_LARGE_EXEC; | 199 | prot = PAGE_KERNEL_LARGE_EXEC; |
199 | 200 | ||
201 | pages_2m++; | ||
200 | set_pmd(pmd, pfn_pmd(pfn, prot)); | 202 | set_pmd(pmd, pfn_pmd(pfn, prot)); |
201 | 203 | ||
202 | pfn += PTRS_PER_PTE; | 204 | pfn += PTRS_PER_PTE; |
@@ -213,11 +215,14 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
213 | if (is_kernel_text(addr)) | 215 | if (is_kernel_text(addr)) |
214 | prot = PAGE_KERNEL_EXEC; | 216 | prot = PAGE_KERNEL_EXEC; |
215 | 217 | ||
218 | pages_4k++; | ||
216 | set_pte(pte, pfn_pte(pfn, prot)); | 219 | set_pte(pte, pfn_pte(pfn, prot)); |
217 | } | 220 | } |
218 | max_pfn_mapped = pfn; | 221 | max_pfn_mapped = pfn; |
219 | } | 222 | } |
220 | } | 223 | } |
224 | update_page_count(PG_LEVEL_2M, pages_2m); | ||
225 | update_page_count(PG_LEVEL_4K, pages_4k); | ||
221 | } | 226 | } |
222 | 227 | ||
223 | static inline int page_kills_ppro(unsigned long pagenr) | 228 | static inline int page_kills_ppro(unsigned long pagenr) |
@@ -571,17 +576,6 @@ void __init mem_init(void) | |||
571 | #endif | 576 | #endif |
572 | bad_ppro = ppro_with_ram_bug(); | 577 | bad_ppro = ppro_with_ram_bug(); |
573 | 578 | ||
574 | #ifdef CONFIG_HIGHMEM | ||
575 | /* check that fixmap and pkmap do not overlap */ | ||
576 | if (PKMAP_BASE + LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) { | ||
577 | printk(KERN_ERR | ||
578 | "fixmap and kmap areas overlap - this will crash\n"); | ||
579 | printk(KERN_ERR "pkstart: %lxh pkend: %lxh fixstart %lxh\n", | ||
580 | PKMAP_BASE, PKMAP_BASE + LAST_PKMAP*PAGE_SIZE, | ||
581 | FIXADDR_START); | ||
582 | BUG(); | ||
583 | } | ||
584 | #endif | ||
585 | /* this will put all low memory onto the freelists */ | 579 | /* this will put all low memory onto the freelists */ |
586 | totalram_pages += free_all_bootmem(); | 580 | totalram_pages += free_all_bootmem(); |
587 | 581 | ||
@@ -614,7 +608,6 @@ void __init mem_init(void) | |||
614 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)) | 608 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)) |
615 | ); | 609 | ); |
616 | 610 | ||
617 | #if 1 /* double-sanity-check paranoia */ | ||
618 | printk(KERN_INFO "virtual kernel memory layout:\n" | 611 | printk(KERN_INFO "virtual kernel memory layout:\n" |
619 | " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" | 612 | " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" |
620 | #ifdef CONFIG_HIGHMEM | 613 | #ifdef CONFIG_HIGHMEM |
@@ -655,7 +648,6 @@ void __init mem_init(void) | |||
655 | #endif | 648 | #endif |
656 | BUG_ON(VMALLOC_START > VMALLOC_END); | 649 | BUG_ON(VMALLOC_START > VMALLOC_END); |
657 | BUG_ON((unsigned long)high_memory > VMALLOC_START); | 650 | BUG_ON((unsigned long)high_memory > VMALLOC_START); |
658 | #endif /* double-sanity-check paranoia */ | ||
659 | 651 | ||
660 | if (boot_cpu_data.wp_works_ok < 0) | 652 | if (boot_cpu_data.wp_works_ok < 0) |
661 | test_wp_bit(); | 653 | test_wp_bit(); |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 32ba13b0f818..48623ae628fb 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/swap.h> | 18 | #include <linux/swap.h> |
19 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/initrd.h> | ||
21 | #include <linux/pagemap.h> | 22 | #include <linux/pagemap.h> |
22 | #include <linux/bootmem.h> | 23 | #include <linux/bootmem.h> |
23 | #include <linux/proc_fs.h> | 24 | #include <linux/proc_fs.h> |
@@ -135,7 +136,7 @@ static __init void *spp_getpage(void) | |||
135 | return ptr; | 136 | return ptr; |
136 | } | 137 | } |
137 | 138 | ||
138 | static void | 139 | static __init void |
139 | set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot) | 140 | set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot) |
140 | { | 141 | { |
141 | pgd_t *pgd; | 142 | pgd_t *pgd; |
@@ -206,7 +207,7 @@ void __init cleanup_highmap(void) | |||
206 | pmd_t *last_pmd = pmd + PTRS_PER_PMD; | 207 | pmd_t *last_pmd = pmd + PTRS_PER_PMD; |
207 | 208 | ||
208 | for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) { | 209 | for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) { |
209 | if (!pmd_present(*pmd)) | 210 | if (pmd_none(*pmd)) |
210 | continue; | 211 | continue; |
211 | if (vaddr < (unsigned long) _text || vaddr > end) | 212 | if (vaddr < (unsigned long) _text || vaddr > end) |
212 | set_pmd(pmd, __pmd(0)); | 213 | set_pmd(pmd, __pmd(0)); |
@@ -214,7 +215,7 @@ void __init cleanup_highmap(void) | |||
214 | } | 215 | } |
215 | 216 | ||
216 | /* NOTE: this is meant to be run only at boot */ | 217 | /* NOTE: this is meant to be run only at boot */ |
217 | void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) | 218 | void __init __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) |
218 | { | 219 | { |
219 | unsigned long address = __fix_to_virt(idx); | 220 | unsigned long address = __fix_to_virt(idx); |
220 | 221 | ||
@@ -312,6 +313,8 @@ __meminit void early_iounmap(void *addr, unsigned long size) | |||
312 | static unsigned long __meminit | 313 | static unsigned long __meminit |
313 | phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) | 314 | phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) |
314 | { | 315 | { |
316 | unsigned long pages = 0; | ||
317 | |||
315 | int i = pmd_index(address); | 318 | int i = pmd_index(address); |
316 | 319 | ||
317 | for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) { | 320 | for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) { |
@@ -328,9 +331,11 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) | |||
328 | if (pmd_val(*pmd)) | 331 | if (pmd_val(*pmd)) |
329 | continue; | 332 | continue; |
330 | 333 | ||
334 | pages++; | ||
331 | set_pte((pte_t *)pmd, | 335 | set_pte((pte_t *)pmd, |
332 | pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); | 336 | pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); |
333 | } | 337 | } |
338 | update_page_count(PG_LEVEL_2M, pages); | ||
334 | return address; | 339 | return address; |
335 | } | 340 | } |
336 | 341 | ||
@@ -350,6 +355,7 @@ phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end) | |||
350 | static unsigned long __meminit | 355 | static unsigned long __meminit |
351 | phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | 356 | phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) |
352 | { | 357 | { |
358 | unsigned long pages = 0; | ||
353 | unsigned long last_map_addr = end; | 359 | unsigned long last_map_addr = end; |
354 | int i = pud_index(addr); | 360 | int i = pud_index(addr); |
355 | 361 | ||
@@ -374,6 +380,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | |||
374 | } | 380 | } |
375 | 381 | ||
376 | if (direct_gbpages) { | 382 | if (direct_gbpages) { |
383 | pages++; | ||
377 | set_pte((pte_t *)pud, | 384 | set_pte((pte_t *)pud, |
378 | pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); | 385 | pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); |
379 | last_map_addr = (addr & PUD_MASK) + PUD_SIZE; | 386 | last_map_addr = (addr & PUD_MASK) + PUD_SIZE; |
@@ -390,6 +397,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | |||
390 | unmap_low_page(pmd); | 397 | unmap_low_page(pmd); |
391 | } | 398 | } |
392 | __flush_tlb_all(); | 399 | __flush_tlb_all(); |
400 | update_page_count(PG_LEVEL_1G, pages); | ||
393 | 401 | ||
394 | return last_map_addr >> PAGE_SHIFT; | 402 | return last_map_addr >> PAGE_SHIFT; |
395 | } | 403 | } |
@@ -431,7 +439,7 @@ static void __init init_gbpages(void) | |||
431 | direct_gbpages = 0; | 439 | direct_gbpages = 0; |
432 | } | 440 | } |
433 | 441 | ||
434 | #ifdef CONFIG_MEMTEST_BOOTPARAM | 442 | #ifdef CONFIG_MEMTEST |
435 | 443 | ||
436 | static void __init memtest(unsigned long start_phys, unsigned long size, | 444 | static void __init memtest(unsigned long start_phys, unsigned long size, |
437 | unsigned pattern) | 445 | unsigned pattern) |
@@ -493,7 +501,8 @@ static void __init memtest(unsigned long start_phys, unsigned long size, | |||
493 | 501 | ||
494 | } | 502 | } |
495 | 503 | ||
496 | static int memtest_pattern __initdata = CONFIG_MEMTEST_BOOTPARAM_VALUE; | 504 | /* default is disabled */ |
505 | static int memtest_pattern __initdata; | ||
497 | 506 | ||
498 | static int __init parse_memtest(char *arg) | 507 | static int __init parse_memtest(char *arg) |
499 | { | 508 | { |
@@ -506,7 +515,7 @@ early_param("memtest", parse_memtest); | |||
506 | 515 | ||
507 | static void __init early_memtest(unsigned long start, unsigned long end) | 516 | static void __init early_memtest(unsigned long start, unsigned long end) |
508 | { | 517 | { |
509 | unsigned long t_start, t_size; | 518 | u64 t_start, t_size; |
510 | unsigned pattern; | 519 | unsigned pattern; |
511 | 520 | ||
512 | if (!memtest_pattern) | 521 | if (!memtest_pattern) |
@@ -525,8 +534,9 @@ static void __init early_memtest(unsigned long start, unsigned long end) | |||
525 | if (t_start + t_size > end) | 534 | if (t_start + t_size > end) |
526 | t_size = end - t_start; | 535 | t_size = end - t_start; |
527 | 536 | ||
528 | printk(KERN_CONT "\n %016lx - %016lx pattern %d", | 537 | printk(KERN_CONT "\n %016llx - %016llx pattern %d", |
529 | t_start, t_start + t_size, pattern); | 538 | (unsigned long long)t_start, |
539 | (unsigned long long)t_start + t_size, pattern); | ||
530 | 540 | ||
531 | memtest(t_start, t_size, pattern); | 541 | memtest(t_start, t_size, pattern); |
532 | 542 | ||
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 71bb3159031a..416ea415f5c2 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
@@ -142,7 +142,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, | |||
142 | /* | 142 | /* |
143 | * Don't remap the low PCI/ISA area, it's always mapped.. | 143 | * Don't remap the low PCI/ISA area, it's always mapped.. |
144 | */ | 144 | */ |
145 | if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS) | 145 | if (is_ISA_range(phys_addr, last_addr)) |
146 | return (__force void __iomem *)phys_to_virt(phys_addr); | 146 | return (__force void __iomem *)phys_to_virt(phys_addr); |
147 | 147 | ||
148 | /* | 148 | /* |
@@ -261,7 +261,7 @@ void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size) | |||
261 | { | 261 | { |
262 | /* | 262 | /* |
263 | * Ideally, this should be: | 263 | * Ideally, this should be: |
264 | * pat_wc_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS; | 264 | * pat_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS; |
265 | * | 265 | * |
266 | * Till we fix all X drivers to use ioremap_wc(), we will use | 266 | * Till we fix all X drivers to use ioremap_wc(), we will use |
267 | * UC MINUS. | 267 | * UC MINUS. |
@@ -285,7 +285,7 @@ EXPORT_SYMBOL(ioremap_nocache); | |||
285 | */ | 285 | */ |
286 | void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size) | 286 | void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size) |
287 | { | 287 | { |
288 | if (pat_wc_enabled) | 288 | if (pat_enabled) |
289 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, | 289 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, |
290 | __builtin_return_address(0)); | 290 | __builtin_return_address(0)); |
291 | else | 291 | else |
@@ -318,8 +318,8 @@ void iounmap(volatile void __iomem *addr) | |||
318 | * vm_area and by simply returning an address into the kernel mapping | 318 | * vm_area and by simply returning an address into the kernel mapping |
319 | * of ISA space. So handle that here. | 319 | * of ISA space. So handle that here. |
320 | */ | 320 | */ |
321 | if (addr >= phys_to_virt(ISA_START_ADDRESS) && | 321 | if ((void __force *)addr >= phys_to_virt(ISA_START_ADDRESS) && |
322 | addr < phys_to_virt(ISA_END_ADDRESS)) | 322 | (void __force *)addr < phys_to_virt(ISA_END_ADDRESS)) |
323 | return; | 323 | return; |
324 | 324 | ||
325 | addr = (volatile void __iomem *) | 325 | addr = (volatile void __iomem *) |
@@ -332,7 +332,7 @@ void iounmap(volatile void __iomem *addr) | |||
332 | cpa takes care of the direct mappings. */ | 332 | cpa takes care of the direct mappings. */ |
333 | read_lock(&vmlist_lock); | 333 | read_lock(&vmlist_lock); |
334 | for (p = vmlist; p; p = p->next) { | 334 | for (p = vmlist; p; p = p->next) { |
335 | if (p->addr == addr) | 335 | if (p->addr == (void __force *)addr) |
336 | break; | 336 | break; |
337 | } | 337 | } |
338 | read_unlock(&vmlist_lock); | 338 | read_unlock(&vmlist_lock); |
@@ -346,7 +346,7 @@ void iounmap(volatile void __iomem *addr) | |||
346 | free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p)); | 346 | free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p)); |
347 | 347 | ||
348 | /* Finally remove it */ | 348 | /* Finally remove it */ |
349 | o = remove_vm_area((void *)addr); | 349 | o = remove_vm_area((void __force *)addr); |
350 | BUG_ON(p != o || o == NULL); | 350 | BUG_ON(p != o || o == NULL); |
351 | kfree(p); | 351 | kfree(p); |
352 | } | 352 | } |
@@ -365,7 +365,7 @@ void *xlate_dev_mem_ptr(unsigned long phys) | |||
365 | if (page_is_ram(start >> PAGE_SHIFT)) | 365 | if (page_is_ram(start >> PAGE_SHIFT)) |
366 | return __va(phys); | 366 | return __va(phys); |
367 | 367 | ||
368 | addr = (void *)ioremap(start, PAGE_SIZE); | 368 | addr = (void __force *)ioremap(start, PAGE_SIZE); |
369 | if (addr) | 369 | if (addr) |
370 | addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); | 370 | addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); |
371 | 371 | ||
@@ -593,10 +593,11 @@ void __init early_iounmap(void *addr, unsigned long size) | |||
593 | unsigned long offset; | 593 | unsigned long offset; |
594 | unsigned int nrpages; | 594 | unsigned int nrpages; |
595 | enum fixed_addresses idx; | 595 | enum fixed_addresses idx; |
596 | unsigned int nesting; | 596 | int nesting; |
597 | 597 | ||
598 | nesting = --early_ioremap_nested; | 598 | nesting = --early_ioremap_nested; |
599 | WARN_ON(nesting < 0); | 599 | if (WARN_ON(nesting < 0)) |
600 | return; | ||
600 | 601 | ||
601 | if (early_ioremap_debug) { | 602 | if (early_ioremap_debug) { |
602 | printk(KERN_INFO "early_iounmap(%p, %08lx) [%d]\n", addr, | 603 | printk(KERN_INFO "early_iounmap(%p, %08lx) [%d]\n", addr, |
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c index 1f476e477844..0ea66b532c35 100644 --- a/arch/x86/mm/k8topology_64.c +++ b/arch/x86/mm/k8topology_64.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <asm/numa.h> | 22 | #include <asm/numa.h> |
23 | #include <asm/mpspec.h> | 23 | #include <asm/mpspec.h> |
24 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
25 | #include <asm/k8.h> | ||
25 | 26 | ||
26 | static __init int find_northbridge(void) | 27 | static __init int find_northbridge(void) |
27 | { | 28 | { |
@@ -73,17 +74,12 @@ static __init void early_get_boot_cpu_id(void) | |||
73 | 74 | ||
74 | int __init k8_scan_nodes(unsigned long start, unsigned long end) | 75 | int __init k8_scan_nodes(unsigned long start, unsigned long end) |
75 | { | 76 | { |
77 | unsigned numnodes, cores, bits, apicid_base; | ||
76 | unsigned long prevbase; | 78 | unsigned long prevbase; |
77 | struct bootnode nodes[8]; | 79 | struct bootnode nodes[8]; |
78 | int nodeid, i, nb; | ||
79 | unsigned char nodeids[8]; | 80 | unsigned char nodeids[8]; |
80 | int found = 0; | 81 | int i, j, nb, found = 0; |
81 | u32 reg; | 82 | u32 nodeid, reg; |
82 | unsigned numnodes; | ||
83 | unsigned cores; | ||
84 | unsigned bits; | ||
85 | int j; | ||
86 | unsigned apicid_base; | ||
87 | 83 | ||
88 | if (!early_pci_allowed()) | 84 | if (!early_pci_allowed()) |
89 | return -1; | 85 | return -1; |
@@ -105,7 +101,6 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) | |||
105 | prevbase = 0; | 101 | prevbase = 0; |
106 | for (i = 0; i < 8; i++) { | 102 | for (i = 0; i < 8; i++) { |
107 | unsigned long base, limit; | 103 | unsigned long base, limit; |
108 | u32 nodeid; | ||
109 | 104 | ||
110 | base = read_pci_config(0, nb, 1, 0x40 + i*8); | 105 | base = read_pci_config(0, nb, 1, 0x40 + i*8); |
111 | limit = read_pci_config(0, nb, 1, 0x44 + i*8); | 106 | limit = read_pci_config(0, nb, 1, 0x44 + i*8); |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 60bcb5b6a37e..afd40054d157 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
@@ -34,6 +34,41 @@ struct cpa_data { | |||
34 | unsigned force_split : 1; | 34 | unsigned force_split : 1; |
35 | }; | 35 | }; |
36 | 36 | ||
37 | #ifdef CONFIG_PROC_FS | ||
38 | static unsigned long direct_pages_count[PG_LEVEL_NUM]; | ||
39 | |||
40 | void update_page_count(int level, unsigned long pages) | ||
41 | { | ||
42 | unsigned long flags; | ||
43 | |||
44 | /* Protect against CPA */ | ||
45 | spin_lock_irqsave(&pgd_lock, flags); | ||
46 | direct_pages_count[level] += pages; | ||
47 | spin_unlock_irqrestore(&pgd_lock, flags); | ||
48 | } | ||
49 | |||
50 | static void split_page_count(int level) | ||
51 | { | ||
52 | direct_pages_count[level]--; | ||
53 | direct_pages_count[level - 1] += PTRS_PER_PTE; | ||
54 | } | ||
55 | |||
56 | int arch_report_meminfo(char *page) | ||
57 | { | ||
58 | int n = sprintf(page, "DirectMap4k: %8lu\n" | ||
59 | "DirectMap2M: %8lu\n", | ||
60 | direct_pages_count[PG_LEVEL_4K], | ||
61 | direct_pages_count[PG_LEVEL_2M]); | ||
62 | #ifdef CONFIG_X86_64 | ||
63 | n += sprintf(page + n, "DirectMap1G: %8lu\n", | ||
64 | direct_pages_count[PG_LEVEL_1G]); | ||
65 | #endif | ||
66 | return n; | ||
67 | } | ||
68 | #else | ||
69 | static inline void split_page_count(int level) { } | ||
70 | #endif | ||
71 | |||
37 | #ifdef CONFIG_X86_64 | 72 | #ifdef CONFIG_X86_64 |
38 | 73 | ||
39 | static inline unsigned long highmap_start_pfn(void) | 74 | static inline unsigned long highmap_start_pfn(void) |
@@ -500,6 +535,10 @@ static int split_large_page(pte_t *kpte, unsigned long address) | |||
500 | for (i = 0; i < PTRS_PER_PTE; i++, pfn += pfninc) | 535 | for (i = 0; i < PTRS_PER_PTE; i++, pfn += pfninc) |
501 | set_pte(&pbase[i], pfn_pte(pfn, ref_prot)); | 536 | set_pte(&pbase[i], pfn_pte(pfn, ref_prot)); |
502 | 537 | ||
538 | if (address >= (unsigned long)__va(0) && | ||
539 | address < (unsigned long)__va(max_pfn_mapped << PAGE_SHIFT)) | ||
540 | split_page_count(level); | ||
541 | |||
503 | /* | 542 | /* |
504 | * Install the new, split up pagetable. Important details here: | 543 | * Install the new, split up pagetable. Important details here: |
505 | * | 544 | * |
@@ -805,7 +844,7 @@ int _set_memory_wc(unsigned long addr, int numpages) | |||
805 | 844 | ||
806 | int set_memory_wc(unsigned long addr, int numpages) | 845 | int set_memory_wc(unsigned long addr, int numpages) |
807 | { | 846 | { |
808 | if (!pat_wc_enabled) | 847 | if (!pat_enabled) |
809 | return set_memory_uc(addr, numpages); | 848 | return set_memory_uc(addr, numpages); |
810 | 849 | ||
811 | if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, | 850 | if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, |
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index de3a99812450..a885a1019b8a 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
@@ -26,15 +26,15 @@ | |||
26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
27 | 27 | ||
28 | #ifdef CONFIG_X86_PAT | 28 | #ifdef CONFIG_X86_PAT |
29 | int __read_mostly pat_wc_enabled = 1; | 29 | int __read_mostly pat_enabled = 1; |
30 | 30 | ||
31 | void __cpuinit pat_disable(char *reason) | 31 | void __cpuinit pat_disable(char *reason) |
32 | { | 32 | { |
33 | pat_wc_enabled = 0; | 33 | pat_enabled = 0; |
34 | printk(KERN_INFO "%s\n", reason); | 34 | printk(KERN_INFO "%s\n", reason); |
35 | } | 35 | } |
36 | 36 | ||
37 | static int nopat(char *str) | 37 | static int __init nopat(char *str) |
38 | { | 38 | { |
39 | pat_disable("PAT support disabled."); | 39 | pat_disable("PAT support disabled."); |
40 | return 0; | 40 | return 0; |
@@ -42,6 +42,19 @@ static int nopat(char *str) | |||
42 | early_param("nopat", nopat); | 42 | early_param("nopat", nopat); |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | |||
46 | static int debug_enable; | ||
47 | static int __init pat_debug_setup(char *str) | ||
48 | { | ||
49 | debug_enable = 1; | ||
50 | return 0; | ||
51 | } | ||
52 | __setup("debugpat", pat_debug_setup); | ||
53 | |||
54 | #define dprintk(fmt, arg...) \ | ||
55 | do { if (debug_enable) printk(KERN_INFO fmt, ##arg); } while (0) | ||
56 | |||
57 | |||
45 | static u64 __read_mostly boot_pat_state; | 58 | static u64 __read_mostly boot_pat_state; |
46 | 59 | ||
47 | enum { | 60 | enum { |
@@ -53,24 +66,25 @@ enum { | |||
53 | PAT_UC_MINUS = 7, /* UC, but can be overriden by MTRR */ | 66 | PAT_UC_MINUS = 7, /* UC, but can be overriden by MTRR */ |
54 | }; | 67 | }; |
55 | 68 | ||
56 | #define PAT(x,y) ((u64)PAT_ ## y << ((x)*8)) | 69 | #define PAT(x, y) ((u64)PAT_ ## y << ((x)*8)) |
57 | 70 | ||
58 | void pat_init(void) | 71 | void pat_init(void) |
59 | { | 72 | { |
60 | u64 pat; | 73 | u64 pat; |
61 | 74 | ||
62 | if (!pat_wc_enabled) | 75 | if (!pat_enabled) |
63 | return; | 76 | return; |
64 | 77 | ||
65 | /* Paranoia check. */ | 78 | /* Paranoia check. */ |
66 | if (!cpu_has_pat) { | 79 | if (!cpu_has_pat && boot_pat_state) { |
67 | printk(KERN_ERR "PAT enabled, but CPU feature cleared\n"); | ||
68 | /* | 80 | /* |
69 | * Panic if this happens on the secondary CPU, and we | 81 | * If this happens we are on a secondary CPU, but |
70 | * switched to PAT on the boot CPU. We have no way to | 82 | * switched to PAT on the boot CPU. We have no way to |
71 | * undo PAT. | 83 | * undo PAT. |
72 | */ | 84 | */ |
73 | BUG_ON(boot_pat_state); | 85 | printk(KERN_ERR "PAT enabled, " |
86 | "but not supported by secondary CPU\n"); | ||
87 | BUG(); | ||
74 | } | 88 | } |
75 | 89 | ||
76 | /* Set PWT to Write-Combining. All other bits stay the same */ | 90 | /* Set PWT to Write-Combining. All other bits stay the same */ |
@@ -86,8 +100,8 @@ void pat_init(void) | |||
86 | * 011 UC _PAGE_CACHE_UC | 100 | * 011 UC _PAGE_CACHE_UC |
87 | * PAT bit unused | 101 | * PAT bit unused |
88 | */ | 102 | */ |
89 | pat = PAT(0,WB) | PAT(1,WC) | PAT(2,UC_MINUS) | PAT(3,UC) | | 103 | pat = PAT(0, WB) | PAT(1, WC) | PAT(2, UC_MINUS) | PAT(3, UC) | |
90 | PAT(4,WB) | PAT(5,WC) | PAT(6,UC_MINUS) | PAT(7,UC); | 104 | PAT(4, WB) | PAT(5, WC) | PAT(6, UC_MINUS) | PAT(7, UC); |
91 | 105 | ||
92 | /* Boot CPU check */ | 106 | /* Boot CPU check */ |
93 | if (!boot_pat_state) | 107 | if (!boot_pat_state) |
@@ -103,11 +117,11 @@ void pat_init(void) | |||
103 | static char *cattr_name(unsigned long flags) | 117 | static char *cattr_name(unsigned long flags) |
104 | { | 118 | { |
105 | switch (flags & _PAGE_CACHE_MASK) { | 119 | switch (flags & _PAGE_CACHE_MASK) { |
106 | case _PAGE_CACHE_UC: return "uncached"; | 120 | case _PAGE_CACHE_UC: return "uncached"; |
107 | case _PAGE_CACHE_UC_MINUS: return "uncached-minus"; | 121 | case _PAGE_CACHE_UC_MINUS: return "uncached-minus"; |
108 | case _PAGE_CACHE_WB: return "write-back"; | 122 | case _PAGE_CACHE_WB: return "write-back"; |
109 | case _PAGE_CACHE_WC: return "write-combining"; | 123 | case _PAGE_CACHE_WC: return "write-combining"; |
110 | default: return "broken"; | 124 | default: return "broken"; |
111 | } | 125 | } |
112 | } | 126 | } |
113 | 127 | ||
@@ -145,46 +159,50 @@ static DEFINE_SPINLOCK(memtype_lock); /* protects memtype list */ | |||
145 | * The intersection is based on "Effective Memory Type" tables in IA-32 | 159 | * The intersection is based on "Effective Memory Type" tables in IA-32 |
146 | * SDM vol 3a | 160 | * SDM vol 3a |
147 | */ | 161 | */ |
148 | static int pat_x_mtrr_type(u64 start, u64 end, unsigned long prot, | 162 | static unsigned long pat_x_mtrr_type(u64 start, u64 end, unsigned long req_type) |
149 | unsigned long *ret_prot) | ||
150 | { | 163 | { |
151 | unsigned long pat_type; | 164 | /* |
152 | u8 mtrr_type; | 165 | * Look for MTRR hint to get the effective type in case where PAT |
153 | 166 | * request is for WB. | |
154 | mtrr_type = mtrr_type_lookup(start, end); | 167 | */ |
155 | if (mtrr_type == 0xFF) { /* MTRR not enabled */ | 168 | if (req_type == _PAGE_CACHE_WB) { |
156 | *ret_prot = prot; | 169 | u8 mtrr_type; |
157 | return 0; | 170 | |
158 | } | 171 | mtrr_type = mtrr_type_lookup(start, end); |
159 | if (mtrr_type == 0xFE) { /* MTRR match error */ | 172 | if (mtrr_type == MTRR_TYPE_UNCACHABLE) |
160 | *ret_prot = _PAGE_CACHE_UC; | 173 | return _PAGE_CACHE_UC; |
161 | return -1; | 174 | if (mtrr_type == MTRR_TYPE_WRCOMB) |
162 | } | 175 | return _PAGE_CACHE_WC; |
163 | if (mtrr_type != MTRR_TYPE_UNCACHABLE && | ||
164 | mtrr_type != MTRR_TYPE_WRBACK && | ||
165 | mtrr_type != MTRR_TYPE_WRCOMB) { /* MTRR type unhandled */ | ||
166 | *ret_prot = _PAGE_CACHE_UC; | ||
167 | return -1; | ||
168 | } | 176 | } |
169 | 177 | ||
170 | pat_type = prot & _PAGE_CACHE_MASK; | 178 | return req_type; |
171 | prot &= (~_PAGE_CACHE_MASK); | 179 | } |
172 | 180 | ||
173 | /* Currently doing intersection by hand. Optimize it later. */ | 181 | static int chk_conflict(struct memtype *new, struct memtype *entry, |
174 | if (pat_type == _PAGE_CACHE_WC) { | 182 | unsigned long *type) |
175 | *ret_prot = prot | _PAGE_CACHE_WC; | 183 | { |
176 | } else if (pat_type == _PAGE_CACHE_UC_MINUS) { | 184 | if (new->type != entry->type) { |
177 | *ret_prot = prot | _PAGE_CACHE_UC_MINUS; | 185 | if (type) { |
178 | } else if (pat_type == _PAGE_CACHE_UC || | 186 | new->type = entry->type; |
179 | mtrr_type == MTRR_TYPE_UNCACHABLE) { | 187 | *type = entry->type; |
180 | *ret_prot = prot | _PAGE_CACHE_UC; | 188 | } else |
181 | } else if (mtrr_type == MTRR_TYPE_WRCOMB) { | 189 | goto conflict; |
182 | *ret_prot = prot | _PAGE_CACHE_WC; | ||
183 | } else { | ||
184 | *ret_prot = prot | _PAGE_CACHE_WB; | ||
185 | } | 190 | } |
186 | 191 | ||
192 | /* check overlaps with more than one entry in the list */ | ||
193 | list_for_each_entry_continue(entry, &memtype_list, nd) { | ||
194 | if (new->end <= entry->start) | ||
195 | break; | ||
196 | else if (new->type != entry->type) | ||
197 | goto conflict; | ||
198 | } | ||
187 | return 0; | 199 | return 0; |
200 | |||
201 | conflict: | ||
202 | printk(KERN_INFO "%s:%d conflicting memory types " | ||
203 | "%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start, | ||
204 | new->end, cattr_name(new->type), cattr_name(entry->type)); | ||
205 | return -EBUSY; | ||
188 | } | 206 | } |
189 | 207 | ||
190 | /* | 208 | /* |
@@ -197,251 +215,134 @@ static int pat_x_mtrr_type(u64 start, u64 end, unsigned long prot, | |||
197 | * req_type will have a special case value '-1', when requester want to inherit | 215 | * req_type will have a special case value '-1', when requester want to inherit |
198 | * the memory type from mtrr (if WB), existing PAT, defaulting to UC_MINUS. | 216 | * the memory type from mtrr (if WB), existing PAT, defaulting to UC_MINUS. |
199 | * | 217 | * |
200 | * If ret_type is NULL, function will return an error if it cannot reserve the | 218 | * If new_type is NULL, function will return an error if it cannot reserve the |
201 | * region with req_type. If ret_type is non-null, function will return | 219 | * region with req_type. If new_type is non-NULL, function will return |
202 | * available type in ret_type in case of no error. In case of any error | 220 | * available type in new_type in case of no error. In case of any error |
203 | * it will return a negative return value. | 221 | * it will return a negative return value. |
204 | */ | 222 | */ |
205 | int reserve_memtype(u64 start, u64 end, unsigned long req_type, | 223 | int reserve_memtype(u64 start, u64 end, unsigned long req_type, |
206 | unsigned long *ret_type) | 224 | unsigned long *new_type) |
207 | { | 225 | { |
208 | struct memtype *new_entry = NULL; | 226 | struct memtype *new, *entry; |
209 | struct memtype *parse; | ||
210 | unsigned long actual_type; | 227 | unsigned long actual_type; |
228 | struct list_head *where; | ||
211 | int err = 0; | 229 | int err = 0; |
212 | 230 | ||
213 | /* Only track when pat_wc_enabled */ | 231 | BUG_ON(start >= end); /* end is exclusive */ |
214 | if (!pat_wc_enabled) { | 232 | |
233 | if (!pat_enabled) { | ||
215 | /* This is identical to page table setting without PAT */ | 234 | /* This is identical to page table setting without PAT */ |
216 | if (ret_type) { | 235 | if (new_type) { |
217 | if (req_type == -1) { | 236 | if (req_type == -1) |
218 | *ret_type = _PAGE_CACHE_WB; | 237 | *new_type = _PAGE_CACHE_WB; |
219 | } else { | 238 | else |
220 | *ret_type = req_type; | 239 | *new_type = req_type & _PAGE_CACHE_MASK; |
221 | } | ||
222 | } | 240 | } |
223 | return 0; | 241 | return 0; |
224 | } | 242 | } |
225 | 243 | ||
226 | /* Low ISA region is always mapped WB in page table. No need to track */ | 244 | /* Low ISA region is always mapped WB in page table. No need to track */ |
227 | if (start >= ISA_START_ADDRESS && (end - 1) <= ISA_END_ADDRESS) { | 245 | if (is_ISA_range(start, end - 1)) { |
228 | if (ret_type) | 246 | if (new_type) |
229 | *ret_type = _PAGE_CACHE_WB; | 247 | *new_type = _PAGE_CACHE_WB; |
230 | |||
231 | return 0; | 248 | return 0; |
232 | } | 249 | } |
233 | 250 | ||
234 | if (req_type == -1) { | 251 | if (req_type == -1) { |
235 | /* | 252 | /* |
236 | * Special case where caller wants to inherit from mtrr or | 253 | * Call mtrr_lookup to get the type hint. This is an |
237 | * existing pat mapping, defaulting to UC_MINUS in case of | 254 | * optimization for /dev/mem mmap'ers into WB memory (BIOS |
238 | * no match. | 255 | * tools and ACPI tools). Use WB request for WB memory and use |
256 | * UC_MINUS otherwise. | ||
239 | */ | 257 | */ |
240 | u8 mtrr_type = mtrr_type_lookup(start, end); | 258 | u8 mtrr_type = mtrr_type_lookup(start, end); |
241 | if (mtrr_type == 0xFE) { /* MTRR match error */ | ||
242 | err = -1; | ||
243 | } | ||
244 | 259 | ||
245 | if (mtrr_type == MTRR_TYPE_WRBACK) { | 260 | if (mtrr_type == MTRR_TYPE_WRBACK) |
246 | req_type = _PAGE_CACHE_WB; | ||
247 | actual_type = _PAGE_CACHE_WB; | 261 | actual_type = _PAGE_CACHE_WB; |
248 | } else { | 262 | else |
249 | req_type = _PAGE_CACHE_UC_MINUS; | ||
250 | actual_type = _PAGE_CACHE_UC_MINUS; | 263 | actual_type = _PAGE_CACHE_UC_MINUS; |
251 | } | 264 | } else |
252 | } else { | 265 | actual_type = pat_x_mtrr_type(start, end, |
253 | req_type &= _PAGE_CACHE_MASK; | 266 | req_type & _PAGE_CACHE_MASK); |
254 | err = pat_x_mtrr_type(start, end, req_type, &actual_type); | ||
255 | } | ||
256 | 267 | ||
257 | if (err) { | 268 | new = kmalloc(sizeof(struct memtype), GFP_KERNEL); |
258 | if (ret_type) | 269 | if (!new) |
259 | *ret_type = actual_type; | ||
260 | |||
261 | return -EINVAL; | ||
262 | } | ||
263 | |||
264 | new_entry = kmalloc(sizeof(struct memtype), GFP_KERNEL); | ||
265 | if (!new_entry) | ||
266 | return -ENOMEM; | 270 | return -ENOMEM; |
267 | 271 | ||
268 | new_entry->start = start; | 272 | new->start = start; |
269 | new_entry->end = end; | 273 | new->end = end; |
270 | new_entry->type = actual_type; | 274 | new->type = actual_type; |
271 | 275 | ||
272 | if (ret_type) | 276 | if (new_type) |
273 | *ret_type = actual_type; | 277 | *new_type = actual_type; |
274 | 278 | ||
275 | spin_lock(&memtype_lock); | 279 | spin_lock(&memtype_lock); |
276 | 280 | ||
277 | /* Search for existing mapping that overlaps the current range */ | 281 | /* Search for existing mapping that overlaps the current range */ |
278 | list_for_each_entry(parse, &memtype_list, nd) { | 282 | where = NULL; |
279 | struct memtype *saved_ptr; | 283 | list_for_each_entry(entry, &memtype_list, nd) { |
280 | 284 | if (end <= entry->start) { | |
281 | if (parse->start >= end) { | 285 | where = entry->nd.prev; |
282 | pr_debug("New Entry\n"); | ||
283 | list_add(&new_entry->nd, parse->nd.prev); | ||
284 | new_entry = NULL; | ||
285 | break; | 286 | break; |
286 | } | 287 | } else if (start <= entry->start) { /* end > entry->start */ |
287 | 288 | err = chk_conflict(new, entry, new_type); | |
288 | if (start <= parse->start && end >= parse->start) { | 289 | if (!err) { |
289 | if (actual_type != parse->type && ret_type) { | 290 | dprintk("Overlap at 0x%Lx-0x%Lx\n", |
290 | actual_type = parse->type; | 291 | entry->start, entry->end); |
291 | *ret_type = actual_type; | 292 | where = entry->nd.prev; |
292 | new_entry->type = actual_type; | ||
293 | } | ||
294 | |||
295 | if (actual_type != parse->type) { | ||
296 | printk( | ||
297 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
298 | current->comm, current->pid, | ||
299 | start, end, | ||
300 | cattr_name(actual_type), | ||
301 | cattr_name(parse->type)); | ||
302 | err = -EBUSY; | ||
303 | break; | ||
304 | } | ||
305 | |||
306 | saved_ptr = parse; | ||
307 | /* | ||
308 | * Check to see whether the request overlaps more | ||
309 | * than one entry in the list | ||
310 | */ | ||
311 | list_for_each_entry_continue(parse, &memtype_list, nd) { | ||
312 | if (end <= parse->start) { | ||
313 | break; | ||
314 | } | ||
315 | |||
316 | if (actual_type != parse->type) { | ||
317 | printk( | ||
318 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
319 | current->comm, current->pid, | ||
320 | start, end, | ||
321 | cattr_name(actual_type), | ||
322 | cattr_name(parse->type)); | ||
323 | err = -EBUSY; | ||
324 | break; | ||
325 | } | ||
326 | } | 293 | } |
327 | |||
328 | if (err) { | ||
329 | break; | ||
330 | } | ||
331 | |||
332 | pr_debug("Overlap at 0x%Lx-0x%Lx\n", | ||
333 | saved_ptr->start, saved_ptr->end); | ||
334 | /* No conflict. Go ahead and add this new entry */ | ||
335 | list_add(&new_entry->nd, saved_ptr->nd.prev); | ||
336 | new_entry = NULL; | ||
337 | break; | 294 | break; |
338 | } | 295 | } else if (start < entry->end) { /* start > entry->start */ |
339 | 296 | err = chk_conflict(new, entry, new_type); | |
340 | if (start < parse->end) { | 297 | if (!err) { |
341 | if (actual_type != parse->type && ret_type) { | 298 | dprintk("Overlap at 0x%Lx-0x%Lx\n", |
342 | actual_type = parse->type; | 299 | entry->start, entry->end); |
343 | *ret_type = actual_type; | 300 | where = &entry->nd; |
344 | new_entry->type = actual_type; | ||
345 | } | ||
346 | |||
347 | if (actual_type != parse->type) { | ||
348 | printk( | ||
349 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
350 | current->comm, current->pid, | ||
351 | start, end, | ||
352 | cattr_name(actual_type), | ||
353 | cattr_name(parse->type)); | ||
354 | err = -EBUSY; | ||
355 | break; | ||
356 | } | 301 | } |
357 | |||
358 | saved_ptr = parse; | ||
359 | /* | ||
360 | * Check to see whether the request overlaps more | ||
361 | * than one entry in the list | ||
362 | */ | ||
363 | list_for_each_entry_continue(parse, &memtype_list, nd) { | ||
364 | if (end <= parse->start) { | ||
365 | break; | ||
366 | } | ||
367 | |||
368 | if (actual_type != parse->type) { | ||
369 | printk( | ||
370 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
371 | current->comm, current->pid, | ||
372 | start, end, | ||
373 | cattr_name(actual_type), | ||
374 | cattr_name(parse->type)); | ||
375 | err = -EBUSY; | ||
376 | break; | ||
377 | } | ||
378 | } | ||
379 | |||
380 | if (err) { | ||
381 | break; | ||
382 | } | ||
383 | |||
384 | pr_debug(KERN_INFO "Overlap at 0x%Lx-0x%Lx\n", | ||
385 | saved_ptr->start, saved_ptr->end); | ||
386 | /* No conflict. Go ahead and add this new entry */ | ||
387 | list_add(&new_entry->nd, &saved_ptr->nd); | ||
388 | new_entry = NULL; | ||
389 | break; | 302 | break; |
390 | } | 303 | } |
391 | } | 304 | } |
392 | 305 | ||
393 | if (err) { | 306 | if (err) { |
394 | printk(KERN_INFO | 307 | printk(KERN_INFO "reserve_memtype failed 0x%Lx-0x%Lx, " |
395 | "reserve_memtype failed 0x%Lx-0x%Lx, track %s, req %s\n", | 308 | "track %s, req %s\n", |
396 | start, end, cattr_name(new_entry->type), | 309 | start, end, cattr_name(new->type), cattr_name(req_type)); |
397 | cattr_name(req_type)); | 310 | kfree(new); |
398 | kfree(new_entry); | ||
399 | spin_unlock(&memtype_lock); | 311 | spin_unlock(&memtype_lock); |
400 | return err; | 312 | return err; |
401 | } | 313 | } |
402 | 314 | ||
403 | if (new_entry) { | 315 | if (where) |
404 | /* No conflict. Not yet added to the list. Add to the tail */ | 316 | list_add(&new->nd, where); |
405 | list_add_tail(&new_entry->nd, &memtype_list); | 317 | else |
406 | pr_debug("New Entry\n"); | 318 | list_add_tail(&new->nd, &memtype_list); |
407 | } | ||
408 | |||
409 | if (ret_type) { | ||
410 | pr_debug( | ||
411 | "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n", | ||
412 | start, end, cattr_name(actual_type), | ||
413 | cattr_name(req_type), cattr_name(*ret_type)); | ||
414 | } else { | ||
415 | pr_debug( | ||
416 | "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s\n", | ||
417 | start, end, cattr_name(actual_type), | ||
418 | cattr_name(req_type)); | ||
419 | } | ||
420 | 319 | ||
421 | spin_unlock(&memtype_lock); | 320 | spin_unlock(&memtype_lock); |
321 | |||
322 | dprintk("reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n", | ||
323 | start, end, cattr_name(new->type), cattr_name(req_type), | ||
324 | new_type ? cattr_name(*new_type) : "-"); | ||
325 | |||
422 | return err; | 326 | return err; |
423 | } | 327 | } |
424 | 328 | ||
425 | int free_memtype(u64 start, u64 end) | 329 | int free_memtype(u64 start, u64 end) |
426 | { | 330 | { |
427 | struct memtype *ml; | 331 | struct memtype *entry; |
428 | int err = -EINVAL; | 332 | int err = -EINVAL; |
429 | 333 | ||
430 | /* Only track when pat_wc_enabled */ | 334 | if (!pat_enabled) |
431 | if (!pat_wc_enabled) { | ||
432 | return 0; | 335 | return 0; |
433 | } | ||
434 | 336 | ||
435 | /* Low ISA region is always mapped WB. No need to track */ | 337 | /* Low ISA region is always mapped WB. No need to track */ |
436 | if (start >= ISA_START_ADDRESS && end <= ISA_END_ADDRESS) { | 338 | if (is_ISA_range(start, end - 1)) |
437 | return 0; | 339 | return 0; |
438 | } | ||
439 | 340 | ||
440 | spin_lock(&memtype_lock); | 341 | spin_lock(&memtype_lock); |
441 | list_for_each_entry(ml, &memtype_list, nd) { | 342 | list_for_each_entry(entry, &memtype_list, nd) { |
442 | if (ml->start == start && ml->end == end) { | 343 | if (entry->start == start && entry->end == end) { |
443 | list_del(&ml->nd); | 344 | list_del(&entry->nd); |
444 | kfree(ml); | 345 | kfree(entry); |
445 | err = 0; | 346 | err = 0; |
446 | break; | 347 | break; |
447 | } | 348 | } |
@@ -453,7 +354,7 @@ int free_memtype(u64 start, u64 end) | |||
453 | current->comm, current->pid, start, end); | 354 | current->comm, current->pid, start, end); |
454 | } | 355 | } |
455 | 356 | ||
456 | pr_debug("free_memtype request 0x%Lx-0x%Lx\n", start, end); | 357 | dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end); |
457 | return err; | 358 | return err; |
458 | } | 359 | } |
459 | 360 | ||
@@ -522,12 +423,12 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | |||
522 | * caching for the high addresses through the KEN pin, but | 423 | * caching for the high addresses through the KEN pin, but |
523 | * we maintain the tradition of paranoia in this code. | 424 | * we maintain the tradition of paranoia in this code. |
524 | */ | 425 | */ |
525 | if (!pat_wc_enabled && | 426 | if (!pat_enabled && |
526 | ! ( test_bit(X86_FEATURE_MTRR, boot_cpu_data.x86_capability) || | 427 | !(boot_cpu_has(X86_FEATURE_MTRR) || |
527 | test_bit(X86_FEATURE_K6_MTRR, boot_cpu_data.x86_capability) || | 428 | boot_cpu_has(X86_FEATURE_K6_MTRR) || |
528 | test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability) || | 429 | boot_cpu_has(X86_FEATURE_CYRIX_ARR) || |
529 | test_bit(X86_FEATURE_CENTAUR_MCR, boot_cpu_data.x86_capability)) && | 430 | boot_cpu_has(X86_FEATURE_CENTAUR_MCR)) && |
530 | (pfn << PAGE_SHIFT) >= __pa(high_memory)) { | 431 | (pfn << PAGE_SHIFT) >= __pa(high_memory)) { |
531 | flags = _PAGE_CACHE_UC; | 432 | flags = _PAGE_CACHE_UC; |
532 | } | 433 | } |
533 | #endif | 434 | #endif |
@@ -549,7 +450,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | |||
549 | return 0; | 450 | return 0; |
550 | 451 | ||
551 | if (pfn <= max_pfn_mapped && | 452 | if (pfn <= max_pfn_mapped && |
552 | ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) { | 453 | ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) { |
553 | free_memtype(offset, offset + size); | 454 | free_memtype(offset, offset + size); |
554 | printk(KERN_INFO | 455 | printk(KERN_INFO |
555 | "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n", | 456 | "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n", |
@@ -587,4 +488,3 @@ void unmap_devmem(unsigned long pfn, unsigned long size, pgprot_t vma_prot) | |||
587 | 488 | ||
588 | free_memtype(addr, addr + size); | 489 | free_memtype(addr, addr + size); |
589 | } | 490 | } |
590 | |||
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 50159764f694..ee1d6d39edd4 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c | |||
@@ -255,7 +255,7 @@ int ptep_test_and_clear_young(struct vm_area_struct *vma, | |||
255 | 255 | ||
256 | if (pte_young(*ptep)) | 256 | if (pte_young(*ptep)) |
257 | ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, | 257 | ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, |
258 | &ptep->pte); | 258 | (unsigned long *) &ptep->pte); |
259 | 259 | ||
260 | if (ret) | 260 | if (ret) |
261 | pte_update(vma->vm_mm, addr, ptep); | 261 | pte_update(vma->vm_mm, addr, ptep); |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 3890234e5b26..391d51035871 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
@@ -97,36 +97,9 @@ static __init inline int srat_disabled(void) | |||
97 | return numa_off || acpi_numa < 0; | 97 | return numa_off || acpi_numa < 0; |
98 | } | 98 | } |
99 | 99 | ||
100 | /* | ||
101 | * A lot of BIOS fill in 10 (= no distance) everywhere. This messes | ||
102 | * up the NUMA heuristics which wants the local node to have a smaller | ||
103 | * distance than the others. | ||
104 | * Do some quick checks here and only use the SLIT if it passes. | ||
105 | */ | ||
106 | static __init int slit_valid(struct acpi_table_slit *slit) | ||
107 | { | ||
108 | int i, j; | ||
109 | int d = slit->locality_count; | ||
110 | for (i = 0; i < d; i++) { | ||
111 | for (j = 0; j < d; j++) { | ||
112 | u8 val = slit->entry[d*i + j]; | ||
113 | if (i == j) { | ||
114 | if (val != LOCAL_DISTANCE) | ||
115 | return 0; | ||
116 | } else if (val <= LOCAL_DISTANCE) | ||
117 | return 0; | ||
118 | } | ||
119 | } | ||
120 | return 1; | ||
121 | } | ||
122 | |||
123 | /* Callback for SLIT parsing */ | 100 | /* Callback for SLIT parsing */ |
124 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | 101 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) |
125 | { | 102 | { |
126 | if (!slit_valid(slit)) { | ||
127 | printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n"); | ||
128 | return; | ||
129 | } | ||
130 | acpi_slit = slit; | 103 | acpi_slit = slit; |
131 | } | 104 | } |
132 | 105 | ||
@@ -522,6 +495,7 @@ int __node_distance(int a, int b) | |||
522 | 495 | ||
523 | EXPORT_SYMBOL(__node_distance); | 496 | EXPORT_SYMBOL(__node_distance); |
524 | 497 | ||
498 | #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) | ||
525 | int memory_add_physaddr_to_nid(u64 start) | 499 | int memory_add_physaddr_to_nid(u64 start) |
526 | { | 500 | { |
527 | int i, ret = 0; | 501 | int i, ret = 0; |
@@ -533,4 +507,4 @@ int memory_add_physaddr_to_nid(u64 start) | |||
533 | return ret; | 507 | return ret; |
534 | } | 508 | } |
535 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | 509 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); |
536 | 510 | #endif | |
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32 index 89ec35d00efd..f647e7e56da4 100644 --- a/arch/x86/pci/Makefile_32 +++ b/arch/x86/pci/Makefile_32 | |||
@@ -22,3 +22,4 @@ pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o | |||
22 | pci-$(CONFIG_NUMA) += mp_bus_to_node.o | 22 | pci-$(CONFIG_NUMA) += mp_bus_to_node.o |
23 | 23 | ||
24 | obj-y += $(pci-y) common.o early.o | 24 | obj-y += $(pci-y) common.o early.o |
25 | obj-y += amd_bus.o | ||
diff --git a/arch/x86/pci/Makefile_64 b/arch/x86/pci/Makefile_64 index 8fbd19832cf6..fd47068c95de 100644 --- a/arch/x86/pci/Makefile_64 +++ b/arch/x86/pci/Makefile_64 | |||
@@ -13,5 +13,5 @@ obj-y += legacy.o irq.o common.o early.o | |||
13 | # mmconfig has a 64bit special | 13 | # mmconfig has a 64bit special |
14 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o | 14 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o |
15 | 15 | ||
16 | obj-y += k8-bus_64.o | 16 | obj-y += amd_bus.o |
17 | 17 | ||
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index d95de2f199cd..464279da49c4 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
@@ -218,7 +218,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do | |||
218 | return bus; | 218 | return bus; |
219 | } | 219 | } |
220 | 220 | ||
221 | extern int pci_routeirq; | ||
222 | static int __init pci_acpi_init(void) | 221 | static int __init pci_acpi_init(void) |
223 | { | 222 | { |
224 | struct pci_dev *dev = NULL; | 223 | struct pci_dev *dev = NULL; |
diff --git a/arch/x86/pci/k8-bus_64.c b/arch/x86/pci/amd_bus.c index 5c2799c20e47..15f505d3a78e 100644 --- a/arch/x86/pci/k8-bus_64.c +++ b/arch/x86/pci/amd_bus.c | |||
@@ -1,5 +1,9 @@ | |||
1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
2 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
3 | #include "pci.h" | ||
4 | |||
5 | #ifdef CONFIG_X86_64 | ||
6 | |||
3 | #include <asm/pci-direct.h> | 7 | #include <asm/pci-direct.h> |
4 | #include <asm/mpspec.h> | 8 | #include <asm/mpspec.h> |
5 | #include <linux/cpumask.h> | 9 | #include <linux/cpumask.h> |
@@ -526,3 +530,31 @@ static int __init early_fill_mp_bus_info(void) | |||
526 | } | 530 | } |
527 | 531 | ||
528 | postcore_initcall(early_fill_mp_bus_info); | 532 | postcore_initcall(early_fill_mp_bus_info); |
533 | |||
534 | #endif | ||
535 | |||
536 | /* common 32/64 bit code */ | ||
537 | |||
538 | #define ENABLE_CF8_EXT_CFG (1ULL << 46) | ||
539 | |||
540 | static void enable_pci_io_ecs_per_cpu(void *unused) | ||
541 | { | ||
542 | u64 reg; | ||
543 | rdmsrl(MSR_AMD64_NB_CFG, reg); | ||
544 | if (!(reg & ENABLE_CF8_EXT_CFG)) { | ||
545 | reg |= ENABLE_CF8_EXT_CFG; | ||
546 | wrmsrl(MSR_AMD64_NB_CFG, reg); | ||
547 | } | ||
548 | } | ||
549 | |||
550 | static int __init enable_pci_io_ecs(void) | ||
551 | { | ||
552 | /* assume all cpus from fam10h have IO ECS */ | ||
553 | if (boot_cpu_data.x86 < 0x10) | ||
554 | return 0; | ||
555 | on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1, 1); | ||
556 | pci_probe |= PCI_HAS_IO_ECS; | ||
557 | return 0; | ||
558 | } | ||
559 | |||
560 | postcore_initcall(enable_pci_io_ecs); | ||
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 8545c8a9d107..940185ecaeda 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
@@ -302,18 +302,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { | |||
302 | }, | 302 | }, |
303 | { | 303 | { |
304 | .callback = set_bf_sort, | 304 | .callback = set_bf_sort, |
305 | .ident = "HP ProLiant DL385 G2", | 305 | .ident = "HP ProLiant DL360", |
306 | .matches = { | 306 | .matches = { |
307 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 307 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
308 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), | 308 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"), |
309 | }, | 309 | }, |
310 | }, | 310 | }, |
311 | { | 311 | { |
312 | .callback = set_bf_sort, | 312 | .callback = set_bf_sort, |
313 | .ident = "HP ProLiant DL585 G2", | 313 | .ident = "HP ProLiant DL380", |
314 | .matches = { | 314 | .matches = { |
315 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 315 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
316 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), | 316 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"), |
317 | }, | 317 | }, |
318 | }, | 318 | }, |
319 | #ifdef __i386__ | 319 | #ifdef __i386__ |
@@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { | |||
328 | #endif | 328 | #endif |
329 | { | 329 | { |
330 | .callback = set_bf_sort, | 330 | .callback = set_bf_sort, |
331 | .ident = "HP ProLiant DL385 G2", | 331 | .ident = "HP ProLiant DL360", |
332 | .matches = { | 332 | .matches = { |
333 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 333 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
334 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), | 334 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"), |
335 | }, | 335 | }, |
336 | }, | 336 | }, |
337 | { | 337 | { |
338 | .callback = set_bf_sort, | 338 | .callback = set_bf_sort, |
339 | .ident = "HP ProLiant DL585 G2", | 339 | .ident = "HP ProLiant DL380", |
340 | .matches = { | 340 | .matches = { |
341 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 341 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
342 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), | 342 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"), |
343 | }, | 343 | }, |
344 | }, | 344 | }, |
345 | {} | 345 | {} |
diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c index 21d1e0e0d535..9915293500fb 100644 --- a/arch/x86/pci/direct.c +++ b/arch/x86/pci/direct.c | |||
@@ -8,18 +8,21 @@ | |||
8 | #include "pci.h" | 8 | #include "pci.h" |
9 | 9 | ||
10 | /* | 10 | /* |
11 | * Functions for accessing PCI configuration space with type 1 accesses | 11 | * Functions for accessing PCI base (first 256 bytes) and extended |
12 | * (4096 bytes per PCI function) configuration space with type 1 | ||
13 | * accesses. | ||
12 | */ | 14 | */ |
13 | 15 | ||
14 | #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ | 16 | #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ |
15 | (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3)) | 17 | (0x80000000 | ((reg & 0xF00) << 16) | (bus << 16) \ |
18 | | (devfn << 8) | (reg & 0xFC)) | ||
16 | 19 | ||
17 | static int pci_conf1_read(unsigned int seg, unsigned int bus, | 20 | static int pci_conf1_read(unsigned int seg, unsigned int bus, |
18 | unsigned int devfn, int reg, int len, u32 *value) | 21 | unsigned int devfn, int reg, int len, u32 *value) |
19 | { | 22 | { |
20 | unsigned long flags; | 23 | unsigned long flags; |
21 | 24 | ||
22 | if ((bus > 255) || (devfn > 255) || (reg > 255)) { | 25 | if ((bus > 255) || (devfn > 255) || (reg > 4095)) { |
23 | *value = -1; | 26 | *value = -1; |
24 | return -EINVAL; | 27 | return -EINVAL; |
25 | } | 28 | } |
@@ -50,7 +53,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus, | |||
50 | { | 53 | { |
51 | unsigned long flags; | 54 | unsigned long flags; |
52 | 55 | ||
53 | if ((bus > 255) || (devfn > 255) || (reg > 255)) | 56 | if ((bus > 255) || (devfn > 255) || (reg > 4095)) |
54 | return -EINVAL; | 57 | return -EINVAL; |
55 | 58 | ||
56 | spin_lock_irqsave(&pci_config_lock, flags); | 59 | spin_lock_irqsave(&pci_config_lock, flags); |
@@ -260,10 +263,18 @@ void __init pci_direct_init(int type) | |||
260 | return; | 263 | return; |
261 | printk(KERN_INFO "PCI: Using configuration type %d for base access\n", | 264 | printk(KERN_INFO "PCI: Using configuration type %d for base access\n", |
262 | type); | 265 | type); |
263 | if (type == 1) | 266 | if (type == 1) { |
264 | raw_pci_ops = &pci_direct_conf1; | 267 | raw_pci_ops = &pci_direct_conf1; |
265 | else | 268 | if (raw_pci_ext_ops) |
266 | raw_pci_ops = &pci_direct_conf2; | 269 | return; |
270 | if (!(pci_probe & PCI_HAS_IO_ECS)) | ||
271 | return; | ||
272 | printk(KERN_INFO "PCI: Using configuration type 1 " | ||
273 | "for extended access\n"); | ||
274 | raw_pci_ext_ops = &pci_direct_conf1; | ||
275 | return; | ||
276 | } | ||
277 | raw_pci_ops = &pci_direct_conf2; | ||
267 | } | 278 | } |
268 | 279 | ||
269 | int __init pci_direct_probe(void) | 280 | int __init pci_direct_probe(void) |
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 10fb308fded8..6ccd7a108cd4 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c | |||
@@ -299,9 +299,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
299 | return -EINVAL; | 299 | return -EINVAL; |
300 | 300 | ||
301 | prot = pgprot_val(vma->vm_page_prot); | 301 | prot = pgprot_val(vma->vm_page_prot); |
302 | if (pat_wc_enabled && write_combine) | 302 | if (pat_enabled && write_combine) |
303 | prot |= _PAGE_CACHE_WC; | 303 | prot |= _PAGE_CACHE_WC; |
304 | else if (pat_wc_enabled || boot_cpu_data.x86 > 3) | 304 | else if (pat_enabled || boot_cpu_data.x86 > 3) |
305 | /* | 305 | /* |
306 | * ioremap() and ioremap_nocache() defaults to UC MINUS for now. | 306 | * ioremap() and ioremap_nocache() defaults to UC MINUS for now. |
307 | * To avoid attribute conflicts, request UC MINUS here | 307 | * To avoid attribute conflicts, request UC MINUS here |
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index e70b9c57b88e..b821f4462d99 100644 --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c | |||
@@ -15,7 +15,8 @@ static __init int pci_access_init(void) | |||
15 | pci_mmcfg_early_init(); | 15 | pci_mmcfg_early_init(); |
16 | 16 | ||
17 | #ifdef CONFIG_PCI_OLPC | 17 | #ifdef CONFIG_PCI_OLPC |
18 | pci_olpc_init(); | 18 | if (!pci_olpc_init()) |
19 | return 0; /* skip additional checks if it's an XO */ | ||
19 | #endif | 20 | #endif |
20 | #ifdef CONFIG_PCI_BIOS | 21 | #ifdef CONFIG_PCI_BIOS |
21 | pci_pcbios_init(); | 22 | pci_pcbios_init(); |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 0908fca901bf..f0859de23e20 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
@@ -11,8 +11,8 @@ | |||
11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
13 | #include <linux/dmi.h> | 13 | #include <linux/dmi.h> |
14 | #include <asm/io.h> | 14 | #include <linux/io.h> |
15 | #include <asm/smp.h> | 15 | #include <linux/smp.h> |
16 | #include <asm/io_apic.h> | 16 | #include <asm/io_apic.h> |
17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
18 | #include <linux/acpi.h> | 18 | #include <linux/acpi.h> |
@@ -61,7 +61,7 @@ void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL; | |||
61 | * and perform checksum verification. | 61 | * and perform checksum verification. |
62 | */ | 62 | */ |
63 | 63 | ||
64 | static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr) | 64 | static inline struct irq_routing_table *pirq_check_routing_table(u8 *addr) |
65 | { | 65 | { |
66 | struct irq_routing_table *rt; | 66 | struct irq_routing_table *rt; |
67 | int i; | 67 | int i; |
@@ -74,7 +74,7 @@ static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr) | |||
74 | rt->size < sizeof(struct irq_routing_table)) | 74 | rt->size < sizeof(struct irq_routing_table)) |
75 | return NULL; | 75 | return NULL; |
76 | sum = 0; | 76 | sum = 0; |
77 | for (i=0; i < rt->size; i++) | 77 | for (i = 0; i < rt->size; i++) |
78 | sum += addr[i]; | 78 | sum += addr[i]; |
79 | if (!sum) { | 79 | if (!sum) { |
80 | DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n", rt); | 80 | DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n", rt); |
@@ -100,7 +100,7 @@ static struct irq_routing_table * __init pirq_find_routing_table(void) | |||
100 | return rt; | 100 | return rt; |
101 | printk(KERN_WARNING "PCI: PIRQ table NOT found at pirqaddr\n"); | 101 | printk(KERN_WARNING "PCI: PIRQ table NOT found at pirqaddr\n"); |
102 | } | 102 | } |
103 | for(addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) { | 103 | for (addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) { |
104 | rt = pirq_check_routing_table(addr); | 104 | rt = pirq_check_routing_table(addr); |
105 | if (rt) | 105 | if (rt) |
106 | return rt; | 106 | return rt; |
@@ -122,20 +122,20 @@ static void __init pirq_peer_trick(void) | |||
122 | struct irq_info *e; | 122 | struct irq_info *e; |
123 | 123 | ||
124 | memset(busmap, 0, sizeof(busmap)); | 124 | memset(busmap, 0, sizeof(busmap)); |
125 | for(i=0; i < (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info); i++) { | 125 | for (i = 0; i < (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info); i++) { |
126 | e = &rt->slots[i]; | 126 | e = &rt->slots[i]; |
127 | #ifdef DEBUG | 127 | #ifdef DEBUG |
128 | { | 128 | { |
129 | int j; | 129 | int j; |
130 | DBG(KERN_DEBUG "%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot); | 130 | DBG(KERN_DEBUG "%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot); |
131 | for(j=0; j<4; j++) | 131 | for (j = 0; j < 4; j++) |
132 | DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap); | 132 | DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap); |
133 | DBG("\n"); | 133 | DBG("\n"); |
134 | } | 134 | } |
135 | #endif | 135 | #endif |
136 | busmap[e->bus] = 1; | 136 | busmap[e->bus] = 1; |
137 | } | 137 | } |
138 | for(i = 1; i < 256; i++) { | 138 | for (i = 1; i < 256; i++) { |
139 | int node; | 139 | int node; |
140 | if (!busmap[i] || pci_find_bus(0, i)) | 140 | if (!busmap[i] || pci_find_bus(0, i)) |
141 | continue; | 141 | continue; |
@@ -285,7 +285,7 @@ static int pirq_ite_get(struct pci_dev *router, struct pci_dev *dev, int pirq) | |||
285 | static const unsigned char pirqmap[4] = { 1, 0, 2, 3 }; | 285 | static const unsigned char pirqmap[4] = { 1, 0, 2, 3 }; |
286 | 286 | ||
287 | WARN_ON_ONCE(pirq > 4); | 287 | WARN_ON_ONCE(pirq > 4); |
288 | return read_config_nybble(router,0x43, pirqmap[pirq-1]); | 288 | return read_config_nybble(router, 0x43, pirqmap[pirq-1]); |
289 | } | 289 | } |
290 | 290 | ||
291 | static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) | 291 | static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) |
@@ -314,7 +314,7 @@ static int pirq_opti_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
314 | 314 | ||
315 | /* | 315 | /* |
316 | * Cyrix: nibble offset 0x5C | 316 | * Cyrix: nibble offset 0x5C |
317 | * 0x5C bits 7:4 is INTB bits 3:0 is INTA | 317 | * 0x5C bits 7:4 is INTB bits 3:0 is INTA |
318 | * 0x5D bits 7:4 is INTD bits 3:0 is INTC | 318 | * 0x5D bits 7:4 is INTD bits 3:0 is INTC |
319 | */ | 319 | */ |
320 | static int pirq_cyrix_get(struct pci_dev *router, struct pci_dev *dev, int pirq) | 320 | static int pirq_cyrix_get(struct pci_dev *router, struct pci_dev *dev, int pirq) |
@@ -350,7 +350,7 @@ static int pirq_cyrix_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
350 | * Apparently there are systems implementing PCI routing table using | 350 | * Apparently there are systems implementing PCI routing table using |
351 | * link values 0x01-0x04 and others using 0x41-0x44 for PCI INTA..D. | 351 | * link values 0x01-0x04 and others using 0x41-0x44 for PCI INTA..D. |
352 | * We try our best to handle both link mappings. | 352 | * We try our best to handle both link mappings. |
353 | * | 353 | * |
354 | * Currently (2003-05-21) it appears most SiS chipsets follow the | 354 | * Currently (2003-05-21) it appears most SiS chipsets follow the |
355 | * definition of routing registers from the SiS-5595 southbridge. | 355 | * definition of routing registers from the SiS-5595 southbridge. |
356 | * According to the SiS 5595 datasheets the revision id's of the | 356 | * According to the SiS 5595 datasheets the revision id's of the |
@@ -370,7 +370,7 @@ static int pirq_cyrix_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
370 | * | 370 | * |
371 | * 0x62: USBIRQ: | 371 | * 0x62: USBIRQ: |
372 | * bit 6 OHCI function disabled (0), enabled (1) | 372 | * bit 6 OHCI function disabled (0), enabled (1) |
373 | * | 373 | * |
374 | * 0x6a: ACPI/SCI IRQ: bits 4-6 reserved | 374 | * 0x6a: ACPI/SCI IRQ: bits 4-6 reserved |
375 | * | 375 | * |
376 | * 0x7e: Data Acq. Module IRQ - bits 4-6 reserved | 376 | * 0x7e: Data Acq. Module IRQ - bits 4-6 reserved |
@@ -487,9 +487,7 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq | |||
487 | u8 irq; | 487 | u8 irq; |
488 | irq = 0; | 488 | irq = 0; |
489 | if (pirq <= 4) | 489 | if (pirq <= 4) |
490 | { | ||
491 | irq = read_config_nybble(router, 0x56, pirq - 1); | 490 | irq = read_config_nybble(router, 0x56, pirq - 1); |
492 | } | ||
493 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n", | 491 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n", |
494 | dev->vendor, dev->device, pirq, irq); | 492 | dev->vendor, dev->device, pirq, irq); |
495 | return irq; | 493 | return irq; |
@@ -497,12 +495,10 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq | |||
497 | 495 | ||
498 | static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) | 496 | static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) |
499 | { | 497 | { |
500 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n", | 498 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n", |
501 | dev->vendor, dev->device, pirq, irq); | 499 | dev->vendor, dev->device, pirq, irq); |
502 | if (pirq <= 4) | 500 | if (pirq <= 4) |
503 | { | ||
504 | write_config_nybble(router, 0x56, pirq - 1, irq); | 501 | write_config_nybble(router, 0x56, pirq - 1, irq); |
505 | } | ||
506 | return 1; | 502 | return 1; |
507 | } | 503 | } |
508 | 504 | ||
@@ -549,50 +545,49 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
549 | if (pci_dev_present(pirq_440gx)) | 545 | if (pci_dev_present(pirq_440gx)) |
550 | return 0; | 546 | return 0; |
551 | 547 | ||
552 | switch(device) | 548 | switch (device) { |
553 | { | 549 | case PCI_DEVICE_ID_INTEL_82371FB_0: |
554 | case PCI_DEVICE_ID_INTEL_82371FB_0: | 550 | case PCI_DEVICE_ID_INTEL_82371SB_0: |
555 | case PCI_DEVICE_ID_INTEL_82371SB_0: | 551 | case PCI_DEVICE_ID_INTEL_82371AB_0: |
556 | case PCI_DEVICE_ID_INTEL_82371AB_0: | 552 | case PCI_DEVICE_ID_INTEL_82371MX: |
557 | case PCI_DEVICE_ID_INTEL_82371MX: | 553 | case PCI_DEVICE_ID_INTEL_82443MX_0: |
558 | case PCI_DEVICE_ID_INTEL_82443MX_0: | 554 | case PCI_DEVICE_ID_INTEL_82801AA_0: |
559 | case PCI_DEVICE_ID_INTEL_82801AA_0: | 555 | case PCI_DEVICE_ID_INTEL_82801AB_0: |
560 | case PCI_DEVICE_ID_INTEL_82801AB_0: | 556 | case PCI_DEVICE_ID_INTEL_82801BA_0: |
561 | case PCI_DEVICE_ID_INTEL_82801BA_0: | 557 | case PCI_DEVICE_ID_INTEL_82801BA_10: |
562 | case PCI_DEVICE_ID_INTEL_82801BA_10: | 558 | case PCI_DEVICE_ID_INTEL_82801CA_0: |
563 | case PCI_DEVICE_ID_INTEL_82801CA_0: | 559 | case PCI_DEVICE_ID_INTEL_82801CA_12: |
564 | case PCI_DEVICE_ID_INTEL_82801CA_12: | 560 | case PCI_DEVICE_ID_INTEL_82801DB_0: |
565 | case PCI_DEVICE_ID_INTEL_82801DB_0: | 561 | case PCI_DEVICE_ID_INTEL_82801E_0: |
566 | case PCI_DEVICE_ID_INTEL_82801E_0: | 562 | case PCI_DEVICE_ID_INTEL_82801EB_0: |
567 | case PCI_DEVICE_ID_INTEL_82801EB_0: | 563 | case PCI_DEVICE_ID_INTEL_ESB_1: |
568 | case PCI_DEVICE_ID_INTEL_ESB_1: | 564 | case PCI_DEVICE_ID_INTEL_ICH6_0: |
569 | case PCI_DEVICE_ID_INTEL_ICH6_0: | 565 | case PCI_DEVICE_ID_INTEL_ICH6_1: |
570 | case PCI_DEVICE_ID_INTEL_ICH6_1: | 566 | case PCI_DEVICE_ID_INTEL_ICH7_0: |
571 | case PCI_DEVICE_ID_INTEL_ICH7_0: | 567 | case PCI_DEVICE_ID_INTEL_ICH7_1: |
572 | case PCI_DEVICE_ID_INTEL_ICH7_1: | 568 | case PCI_DEVICE_ID_INTEL_ICH7_30: |
573 | case PCI_DEVICE_ID_INTEL_ICH7_30: | 569 | case PCI_DEVICE_ID_INTEL_ICH7_31: |
574 | case PCI_DEVICE_ID_INTEL_ICH7_31: | 570 | case PCI_DEVICE_ID_INTEL_ESB2_0: |
575 | case PCI_DEVICE_ID_INTEL_ESB2_0: | 571 | case PCI_DEVICE_ID_INTEL_ICH8_0: |
576 | case PCI_DEVICE_ID_INTEL_ICH8_0: | 572 | case PCI_DEVICE_ID_INTEL_ICH8_1: |
577 | case PCI_DEVICE_ID_INTEL_ICH8_1: | 573 | case PCI_DEVICE_ID_INTEL_ICH8_2: |
578 | case PCI_DEVICE_ID_INTEL_ICH8_2: | 574 | case PCI_DEVICE_ID_INTEL_ICH8_3: |
579 | case PCI_DEVICE_ID_INTEL_ICH8_3: | 575 | case PCI_DEVICE_ID_INTEL_ICH8_4: |
580 | case PCI_DEVICE_ID_INTEL_ICH8_4: | 576 | case PCI_DEVICE_ID_INTEL_ICH9_0: |
581 | case PCI_DEVICE_ID_INTEL_ICH9_0: | 577 | case PCI_DEVICE_ID_INTEL_ICH9_1: |
582 | case PCI_DEVICE_ID_INTEL_ICH9_1: | 578 | case PCI_DEVICE_ID_INTEL_ICH9_2: |
583 | case PCI_DEVICE_ID_INTEL_ICH9_2: | 579 | case PCI_DEVICE_ID_INTEL_ICH9_3: |
584 | case PCI_DEVICE_ID_INTEL_ICH9_3: | 580 | case PCI_DEVICE_ID_INTEL_ICH9_4: |
585 | case PCI_DEVICE_ID_INTEL_ICH9_4: | 581 | case PCI_DEVICE_ID_INTEL_ICH9_5: |
586 | case PCI_DEVICE_ID_INTEL_ICH9_5: | 582 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: |
587 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: | 583 | case PCI_DEVICE_ID_INTEL_ICH10_0: |
588 | case PCI_DEVICE_ID_INTEL_ICH10_0: | 584 | case PCI_DEVICE_ID_INTEL_ICH10_1: |
589 | case PCI_DEVICE_ID_INTEL_ICH10_1: | 585 | case PCI_DEVICE_ID_INTEL_ICH10_2: |
590 | case PCI_DEVICE_ID_INTEL_ICH10_2: | 586 | case PCI_DEVICE_ID_INTEL_ICH10_3: |
591 | case PCI_DEVICE_ID_INTEL_ICH10_3: | 587 | r->name = "PIIX/ICH"; |
592 | r->name = "PIIX/ICH"; | 588 | r->get = pirq_piix_get; |
593 | r->get = pirq_piix_get; | 589 | r->set = pirq_piix_set; |
594 | r->set = pirq_piix_set; | 590 | return 1; |
595 | return 1; | ||
596 | } | 591 | } |
597 | return 0; | 592 | return 0; |
598 | } | 593 | } |
@@ -606,7 +601,7 @@ static __init int via_router_probe(struct irq_router *r, | |||
606 | * workarounds for some buggy BIOSes | 601 | * workarounds for some buggy BIOSes |
607 | */ | 602 | */ |
608 | if (device == PCI_DEVICE_ID_VIA_82C586_0) { | 603 | if (device == PCI_DEVICE_ID_VIA_82C586_0) { |
609 | switch(router->device) { | 604 | switch (router->device) { |
610 | case PCI_DEVICE_ID_VIA_82C686: | 605 | case PCI_DEVICE_ID_VIA_82C686: |
611 | /* | 606 | /* |
612 | * Asus k7m bios wrongly reports 82C686A | 607 | * Asus k7m bios wrongly reports 82C686A |
@@ -621,10 +616,17 @@ static __init int via_router_probe(struct irq_router *r, | |||
621 | */ | 616 | */ |
622 | device = PCI_DEVICE_ID_VIA_8235; | 617 | device = PCI_DEVICE_ID_VIA_8235; |
623 | break; | 618 | break; |
619 | case PCI_DEVICE_ID_VIA_8237: | ||
620 | /** | ||
621 | * Asus a7v600 bios wrongly reports 8237 | ||
622 | * as 586-compatible | ||
623 | */ | ||
624 | device = PCI_DEVICE_ID_VIA_8237; | ||
625 | break; | ||
624 | } | 626 | } |
625 | } | 627 | } |
626 | 628 | ||
627 | switch(device) { | 629 | switch (device) { |
628 | case PCI_DEVICE_ID_VIA_82C586_0: | 630 | case PCI_DEVICE_ID_VIA_82C586_0: |
629 | r->name = "VIA"; | 631 | r->name = "VIA"; |
630 | r->get = pirq_via586_get; | 632 | r->get = pirq_via586_get; |
@@ -647,13 +649,12 @@ static __init int via_router_probe(struct irq_router *r, | |||
647 | 649 | ||
648 | static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 650 | static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
649 | { | 651 | { |
650 | switch(device) | 652 | switch (device) { |
651 | { | 653 | case PCI_DEVICE_ID_VLSI_82C534: |
652 | case PCI_DEVICE_ID_VLSI_82C534: | 654 | r->name = "VLSI 82C534"; |
653 | r->name = "VLSI 82C534"; | 655 | r->get = pirq_vlsi_get; |
654 | r->get = pirq_vlsi_get; | 656 | r->set = pirq_vlsi_set; |
655 | r->set = pirq_vlsi_set; | 657 | return 1; |
656 | return 1; | ||
657 | } | 658 | } |
658 | return 0; | 659 | return 0; |
659 | } | 660 | } |
@@ -661,14 +662,13 @@ static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router | |||
661 | 662 | ||
662 | static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 663 | static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
663 | { | 664 | { |
664 | switch(device) | 665 | switch (device) { |
665 | { | 666 | case PCI_DEVICE_ID_SERVERWORKS_OSB4: |
666 | case PCI_DEVICE_ID_SERVERWORKS_OSB4: | 667 | case PCI_DEVICE_ID_SERVERWORKS_CSB5: |
667 | case PCI_DEVICE_ID_SERVERWORKS_CSB5: | 668 | r->name = "ServerWorks"; |
668 | r->name = "ServerWorks"; | 669 | r->get = pirq_serverworks_get; |
669 | r->get = pirq_serverworks_get; | 670 | r->set = pirq_serverworks_set; |
670 | r->set = pirq_serverworks_set; | 671 | return 1; |
671 | return 1; | ||
672 | } | 672 | } |
673 | return 0; | 673 | return 0; |
674 | } | 674 | } |
@@ -677,7 +677,7 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router, | |||
677 | { | 677 | { |
678 | if (device != PCI_DEVICE_ID_SI_503) | 678 | if (device != PCI_DEVICE_ID_SI_503) |
679 | return 0; | 679 | return 0; |
680 | 680 | ||
681 | r->name = "SIS"; | 681 | r->name = "SIS"; |
682 | r->get = pirq_sis_get; | 682 | r->get = pirq_sis_get; |
683 | r->set = pirq_sis_set; | 683 | r->set = pirq_sis_set; |
@@ -686,47 +686,43 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router, | |||
686 | 686 | ||
687 | static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 687 | static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
688 | { | 688 | { |
689 | switch(device) | 689 | switch (device) { |
690 | { | 690 | case PCI_DEVICE_ID_CYRIX_5520: |
691 | case PCI_DEVICE_ID_CYRIX_5520: | 691 | r->name = "NatSemi"; |
692 | r->name = "NatSemi"; | 692 | r->get = pirq_cyrix_get; |
693 | r->get = pirq_cyrix_get; | 693 | r->set = pirq_cyrix_set; |
694 | r->set = pirq_cyrix_set; | 694 | return 1; |
695 | return 1; | ||
696 | } | 695 | } |
697 | return 0; | 696 | return 0; |
698 | } | 697 | } |
699 | 698 | ||
700 | static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 699 | static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
701 | { | 700 | { |
702 | switch(device) | 701 | switch (device) { |
703 | { | 702 | case PCI_DEVICE_ID_OPTI_82C700: |
704 | case PCI_DEVICE_ID_OPTI_82C700: | 703 | r->name = "OPTI"; |
705 | r->name = "OPTI"; | 704 | r->get = pirq_opti_get; |
706 | r->get = pirq_opti_get; | 705 | r->set = pirq_opti_set; |
707 | r->set = pirq_opti_set; | 706 | return 1; |
708 | return 1; | ||
709 | } | 707 | } |
710 | return 0; | 708 | return 0; |
711 | } | 709 | } |
712 | 710 | ||
713 | static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 711 | static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
714 | { | 712 | { |
715 | switch(device) | 713 | switch (device) { |
716 | { | 714 | case PCI_DEVICE_ID_ITE_IT8330G_0: |
717 | case PCI_DEVICE_ID_ITE_IT8330G_0: | 715 | r->name = "ITE"; |
718 | r->name = "ITE"; | 716 | r->get = pirq_ite_get; |
719 | r->get = pirq_ite_get; | 717 | r->set = pirq_ite_set; |
720 | r->set = pirq_ite_set; | 718 | return 1; |
721 | return 1; | ||
722 | } | 719 | } |
723 | return 0; | 720 | return 0; |
724 | } | 721 | } |
725 | 722 | ||
726 | static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 723 | static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
727 | { | 724 | { |
728 | switch(device) | 725 | switch (device) { |
729 | { | ||
730 | case PCI_DEVICE_ID_AL_M1533: | 726 | case PCI_DEVICE_ID_AL_M1533: |
731 | case PCI_DEVICE_ID_AL_M1563: | 727 | case PCI_DEVICE_ID_AL_M1563: |
732 | printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n"); | 728 | printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n"); |
@@ -740,25 +736,24 @@ static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, | |||
740 | 736 | ||
741 | static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 737 | static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
742 | { | 738 | { |
743 | switch(device) | 739 | switch (device) { |
744 | { | 740 | case PCI_DEVICE_ID_AMD_VIPER_740B: |
745 | case PCI_DEVICE_ID_AMD_VIPER_740B: | 741 | r->name = "AMD756"; |
746 | r->name = "AMD756"; | 742 | break; |
747 | break; | 743 | case PCI_DEVICE_ID_AMD_VIPER_7413: |
748 | case PCI_DEVICE_ID_AMD_VIPER_7413: | 744 | r->name = "AMD766"; |
749 | r->name = "AMD766"; | 745 | break; |
750 | break; | 746 | case PCI_DEVICE_ID_AMD_VIPER_7443: |
751 | case PCI_DEVICE_ID_AMD_VIPER_7443: | 747 | r->name = "AMD768"; |
752 | r->name = "AMD768"; | 748 | break; |
753 | break; | 749 | default: |
754 | default: | 750 | return 0; |
755 | return 0; | ||
756 | } | 751 | } |
757 | r->get = pirq_amd756_get; | 752 | r->get = pirq_amd756_get; |
758 | r->set = pirq_amd756_set; | 753 | r->set = pirq_amd756_set; |
759 | return 1; | 754 | return 1; |
760 | } | 755 | } |
761 | 756 | ||
762 | static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 757 | static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
763 | { | 758 | { |
764 | switch (device) { | 759 | switch (device) { |
@@ -800,7 +795,7 @@ static struct pci_dev *pirq_router_dev; | |||
800 | * FIXME: should we have an option to say "generic for | 795 | * FIXME: should we have an option to say "generic for |
801 | * chipset" ? | 796 | * chipset" ? |
802 | */ | 797 | */ |
803 | 798 | ||
804 | static void __init pirq_find_router(struct irq_router *r) | 799 | static void __init pirq_find_router(struct irq_router *r) |
805 | { | 800 | { |
806 | struct irq_routing_table *rt = pirq_table; | 801 | struct irq_routing_table *rt = pirq_table; |
@@ -819,7 +814,7 @@ static void __init pirq_find_router(struct irq_router *r) | |||
819 | r->name = "default"; | 814 | r->name = "default"; |
820 | r->get = NULL; | 815 | r->get = NULL; |
821 | r->set = NULL; | 816 | r->set = NULL; |
822 | 817 | ||
823 | DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n", | 818 | DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n", |
824 | rt->rtr_vendor, rt->rtr_device); | 819 | rt->rtr_vendor, rt->rtr_device); |
825 | 820 | ||
@@ -830,7 +825,7 @@ static void __init pirq_find_router(struct irq_router *r) | |||
830 | return; | 825 | return; |
831 | } | 826 | } |
832 | 827 | ||
833 | for( h = pirq_routers; h->vendor; h++) { | 828 | for (h = pirq_routers; h->vendor; h++) { |
834 | /* First look for a router match */ | 829 | /* First look for a router match */ |
835 | if (rt->rtr_vendor == h->vendor && h->probe(r, pirq_router_dev, rt->rtr_device)) | 830 | if (rt->rtr_vendor == h->vendor && h->probe(r, pirq_router_dev, rt->rtr_device)) |
836 | break; | 831 | break; |
@@ -882,7 +877,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
882 | 877 | ||
883 | if (!pirq_table) | 878 | if (!pirq_table) |
884 | return 0; | 879 | return 0; |
885 | 880 | ||
886 | DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin); | 881 | DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin); |
887 | info = pirq_get_info(dev); | 882 | info = pirq_get_info(dev); |
888 | if (!info) { | 883 | if (!info) { |
@@ -921,8 +916,10 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
921 | */ | 916 | */ |
922 | newirq = dev->irq; | 917 | newirq = dev->irq; |
923 | if (newirq && !((1 << newirq) & mask)) { | 918 | if (newirq && !((1 << newirq) & mask)) { |
924 | if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0; | 919 | if (pci_probe & PCI_USE_PIRQ_MASK) |
925 | else printk("\n" KERN_WARNING | 920 | newirq = 0; |
921 | else | ||
922 | printk("\n" KERN_WARNING | ||
926 | "PCI: IRQ %i for device %s doesn't match PIRQ mask " | 923 | "PCI: IRQ %i for device %s doesn't match PIRQ mask " |
927 | "- try pci=usepirqmask\n" KERN_DEBUG, newirq, | 924 | "- try pci=usepirqmask\n" KERN_DEBUG, newirq, |
928 | pci_name(dev)); | 925 | pci_name(dev)); |
@@ -942,8 +939,8 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
942 | irq = pirq & 0xf; | 939 | irq = pirq & 0xf; |
943 | DBG(" -> hardcoded IRQ %d\n", irq); | 940 | DBG(" -> hardcoded IRQ %d\n", irq); |
944 | msg = "Hardcoded"; | 941 | msg = "Hardcoded"; |
945 | } else if ( r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \ | 942 | } else if (r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \ |
946 | ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask)) ) { | 943 | ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask))) { |
947 | DBG(" -> got IRQ %d\n", irq); | 944 | DBG(" -> got IRQ %d\n", irq); |
948 | msg = "Found"; | 945 | msg = "Found"; |
949 | eisa_set_level_irq(irq); | 946 | eisa_set_level_irq(irq); |
@@ -978,15 +975,15 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
978 | continue; | 975 | continue; |
979 | if (info->irq[pin].link == pirq) { | 976 | if (info->irq[pin].link == pirq) { |
980 | /* We refuse to override the dev->irq information. Give a warning! */ | 977 | /* We refuse to override the dev->irq information. Give a warning! */ |
981 | if ( dev2->irq && dev2->irq != irq && \ | 978 | if (dev2->irq && dev2->irq != irq && \ |
982 | (!(pci_probe & PCI_USE_PIRQ_MASK) || \ | 979 | (!(pci_probe & PCI_USE_PIRQ_MASK) || \ |
983 | ((1 << dev2->irq) & mask)) ) { | 980 | ((1 << dev2->irq) & mask))) { |
984 | #ifndef CONFIG_PCI_MSI | 981 | #ifndef CONFIG_PCI_MSI |
985 | printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n", | 982 | printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n", |
986 | pci_name(dev2), dev2->irq, irq); | 983 | pci_name(dev2), dev2->irq, irq); |
987 | #endif | 984 | #endif |
988 | continue; | 985 | continue; |
989 | } | 986 | } |
990 | dev2->irq = irq; | 987 | dev2->irq = irq; |
991 | pirq_penalty[irq]++; | 988 | pirq_penalty[irq]++; |
992 | if (dev != dev2) | 989 | if (dev != dev2) |
@@ -1024,8 +1021,7 @@ static void __init pcibios_fixup_irqs(void) | |||
1024 | /* | 1021 | /* |
1025 | * Recalculate IRQ numbers if we use the I/O APIC. | 1022 | * Recalculate IRQ numbers if we use the I/O APIC. |
1026 | */ | 1023 | */ |
1027 | if (io_apic_assign_pci_irqs) | 1024 | if (io_apic_assign_pci_irqs) { |
1028 | { | ||
1029 | int irq; | 1025 | int irq; |
1030 | 1026 | ||
1031 | if (pin) { | 1027 | if (pin) { |
@@ -1038,10 +1034,10 @@ static void __init pcibios_fixup_irqs(void) | |||
1038 | * busses itself so we should get into this branch reliably. | 1034 | * busses itself so we should get into this branch reliably. |
1039 | */ | 1035 | */ |
1040 | if (irq < 0 && dev->bus->parent) { /* go back to the bridge */ | 1036 | if (irq < 0 && dev->bus->parent) { /* go back to the bridge */ |
1041 | struct pci_dev * bridge = dev->bus->self; | 1037 | struct pci_dev *bridge = dev->bus->self; |
1042 | 1038 | ||
1043 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; | 1039 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; |
1044 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, | 1040 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, |
1045 | PCI_SLOT(bridge->devfn), pin); | 1041 | PCI_SLOT(bridge->devfn), pin); |
1046 | if (irq >= 0) | 1042 | if (irq >= 0) |
1047 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", | 1043 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", |
@@ -1131,7 +1127,7 @@ static int __init pcibios_irq_init(void) | |||
1131 | pirq_find_router(&pirq_router); | 1127 | pirq_find_router(&pirq_router); |
1132 | if (pirq_table->exclusive_irqs) { | 1128 | if (pirq_table->exclusive_irqs) { |
1133 | int i; | 1129 | int i; |
1134 | for (i=0; i<16; i++) | 1130 | for (i = 0; i < 16; i++) |
1135 | if (!(pirq_table->exclusive_irqs & (1 << i))) | 1131 | if (!(pirq_table->exclusive_irqs & (1 << i))) |
1136 | pirq_penalty[i] += 100; | 1132 | pirq_penalty[i] += 100; |
1137 | } | 1133 | } |
@@ -1196,10 +1192,10 @@ static int pirq_enable_irq(struct pci_dev *dev) | |||
1196 | */ | 1192 | */ |
1197 | temp_dev = dev; | 1193 | temp_dev = dev; |
1198 | while (irq < 0 && dev->bus->parent) { /* go back to the bridge */ | 1194 | while (irq < 0 && dev->bus->parent) { /* go back to the bridge */ |
1199 | struct pci_dev * bridge = dev->bus->self; | 1195 | struct pci_dev *bridge = dev->bus->self; |
1200 | 1196 | ||
1201 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; | 1197 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; |
1202 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, | 1198 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, |
1203 | PCI_SLOT(bridge->devfn), pin); | 1199 | PCI_SLOT(bridge->devfn), pin); |
1204 | if (irq >= 0) | 1200 | if (irq >= 0) |
1205 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", | 1201 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", |
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 0cfebecf2a8f..23faaa890ffc 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
@@ -374,7 +374,7 @@ reject: | |||
374 | 374 | ||
375 | static int __initdata known_bridge; | 375 | static int __initdata known_bridge; |
376 | 376 | ||
377 | void __init __pci_mmcfg_init(int early) | 377 | static void __init __pci_mmcfg_init(int early) |
378 | { | 378 | { |
379 | /* MMCONFIG disabled */ | 379 | /* MMCONFIG disabled */ |
380 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) | 380 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) |
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c index 5e7636558c02..e11e9e803d5f 100644 --- a/arch/x86/pci/olpc.c +++ b/arch/x86/pci/olpc.c | |||
@@ -302,12 +302,13 @@ static struct pci_raw_ops pci_olpc_conf = { | |||
302 | .write = pci_olpc_write, | 302 | .write = pci_olpc_write, |
303 | }; | 303 | }; |
304 | 304 | ||
305 | void __init pci_olpc_init(void) | 305 | int __init pci_olpc_init(void) |
306 | { | 306 | { |
307 | if (!machine_is_olpc() || olpc_has_vsa()) | 307 | if (!machine_is_olpc() || olpc_has_vsa()) |
308 | return; | 308 | return -ENODEV; |
309 | 309 | ||
310 | printk(KERN_INFO "PCI: Using configuration type OLPC\n"); | 310 | printk(KERN_INFO "PCI: Using configuration type OLPC\n"); |
311 | raw_pci_ops = &pci_olpc_conf; | 311 | raw_pci_ops = &pci_olpc_conf; |
312 | is_lx = is_geode_lx(); | 312 | is_lx = is_geode_lx(); |
313 | return 0; | ||
313 | } | 314 | } |
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index f3972b12c60a..ba263e626a68 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 | 27 | #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 |
28 | #define PCI_USE__CRS 0x10000 | 28 | #define PCI_USE__CRS 0x10000 |
29 | #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 | 29 | #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 |
30 | #define PCI_HAS_IO_ECS 0x40000 | ||
30 | 31 | ||
31 | extern unsigned int pci_probe; | 32 | extern unsigned int pci_probe; |
32 | extern unsigned long pirq_table_addr; | 33 | extern unsigned long pirq_table_addr; |
@@ -101,7 +102,7 @@ extern struct pci_raw_ops pci_direct_conf1; | |||
101 | extern int pci_direct_probe(void); | 102 | extern int pci_direct_probe(void); |
102 | extern void pci_direct_init(int type); | 103 | extern void pci_direct_init(int type); |
103 | extern void pci_pcbios_init(void); | 104 | extern void pci_pcbios_init(void); |
104 | extern void pci_olpc_init(void); | 105 | extern int pci_olpc_init(void); |
105 | 106 | ||
106 | /* pci-mmconfig.c */ | 107 | /* pci-mmconfig.c */ |
107 | 108 | ||
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c index 23476c2ebfc4..efa2ba7c6005 100644 --- a/arch/x86/vdso/vclock_gettime.c +++ b/arch/x86/vdso/vclock_gettime.c | |||
@@ -106,9 +106,9 @@ int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) | |||
106 | do_realtime((struct timespec *)tv); | 106 | do_realtime((struct timespec *)tv); |
107 | tv->tv_usec /= 1000; | 107 | tv->tv_usec /= 1000; |
108 | if (unlikely(tz != NULL)) { | 108 | if (unlikely(tz != NULL)) { |
109 | /* This relies on gcc inlining the memcpy. We'll notice | 109 | /* Avoid memcpy. Some old compilers fail to inline it */ |
110 | if it ever fails to do so. */ | 110 | tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest; |
111 | memcpy(tz, >od->sys_tz, sizeof(struct timezone)); | 111 | tz->tz_dsttime = gtod->sys_tz.tz_dsttime; |
112 | } | 112 | } |
113 | return 0; | 113 | return 0; |
114 | } | 114 | } |
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c index 3fdd51497a83..19a6cfaf5db9 100644 --- a/arch/x86/vdso/vma.c +++ b/arch/x86/vdso/vma.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include "vextern.h" /* Just for VMAGIC. */ | 16 | #include "vextern.h" /* Just for VMAGIC. */ |
17 | #undef VEXTERN | 17 | #undef VEXTERN |
18 | 18 | ||
19 | int vdso_enabled = 1; | 19 | unsigned int __read_mostly vdso_enabled = 1; |
20 | 20 | ||
21 | extern char vdso_start[], vdso_end[]; | 21 | extern char vdso_start[], vdso_end[]; |
22 | extern unsigned short vdso_sync_cpuid; | 22 | extern unsigned short vdso_sync_cpuid; |
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 2e641be2737e..c2cc99580871 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig | |||
@@ -5,9 +5,20 @@ | |||
5 | config XEN | 5 | config XEN |
6 | bool "Xen guest support" | 6 | bool "Xen guest support" |
7 | select PARAVIRT | 7 | select PARAVIRT |
8 | select PARAVIRT_CLOCK | ||
8 | depends on X86_32 | 9 | depends on X86_32 |
9 | depends on X86_CMPXCHG && X86_TSC && !(X86_VISWS || X86_VOYAGER) | 10 | depends on X86_CMPXCHG && X86_TSC && X86_PAE && !(X86_VISWS || X86_VOYAGER) |
10 | help | 11 | help |
11 | This is the Linux Xen port. Enabling this will allow the | 12 | This is the Linux Xen port. Enabling this will allow the |
12 | kernel to boot in a paravirtualized environment under the | 13 | kernel to boot in a paravirtualized environment under the |
13 | Xen hypervisor. | 14 | Xen hypervisor. |
15 | |||
16 | config XEN_MAX_DOMAIN_MEMORY | ||
17 | int "Maximum allowed size of a domain in gigabytes" | ||
18 | default 8 | ||
19 | depends on XEN | ||
20 | help | ||
21 | The pseudo-physical to machine address array is sized | ||
22 | according to the maximum possible memory size of a Xen | ||
23 | domain. This array uses 1 page per gigabyte, so there's no | ||
24 | need to be too stingy here. \ No newline at end of file | ||
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 3d8df981d5fd..2ba2d1649131 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | obj-y := enlighten.o setup.o multicalls.o mmu.o \ | 1 | obj-y := enlighten.o setup.o multicalls.o mmu.o \ |
2 | time.o manage.o xen-asm.o grant-table.o | 2 | time.o xen-asm.o grant-table.o suspend.o |
3 | 3 | ||
4 | obj-$(CONFIG_SMP) += smp.o | 4 | obj-$(CONFIG_SMP) += smp.o |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index c8a56e457d61..bd74229081c3 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -75,13 +75,13 @@ DEFINE_PER_CPU(unsigned long, xen_current_cr3); /* actual vcpu cr3 */ | |||
75 | struct start_info *xen_start_info; | 75 | struct start_info *xen_start_info; |
76 | EXPORT_SYMBOL_GPL(xen_start_info); | 76 | EXPORT_SYMBOL_GPL(xen_start_info); |
77 | 77 | ||
78 | static /* __initdata */ struct shared_info dummy_shared_info; | 78 | struct shared_info xen_dummy_shared_info; |
79 | 79 | ||
80 | /* | 80 | /* |
81 | * Point at some empty memory to start with. We map the real shared_info | 81 | * Point at some empty memory to start with. We map the real shared_info |
82 | * page as soon as fixmap is up and running. | 82 | * page as soon as fixmap is up and running. |
83 | */ | 83 | */ |
84 | struct shared_info *HYPERVISOR_shared_info = (void *)&dummy_shared_info; | 84 | struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info; |
85 | 85 | ||
86 | /* | 86 | /* |
87 | * Flag to determine whether vcpu info placement is available on all | 87 | * Flag to determine whether vcpu info placement is available on all |
@@ -98,13 +98,13 @@ struct shared_info *HYPERVISOR_shared_info = (void *)&dummy_shared_info; | |||
98 | */ | 98 | */ |
99 | static int have_vcpu_info_placement = 1; | 99 | static int have_vcpu_info_placement = 1; |
100 | 100 | ||
101 | static void __init xen_vcpu_setup(int cpu) | 101 | static void xen_vcpu_setup(int cpu) |
102 | { | 102 | { |
103 | struct vcpu_register_vcpu_info info; | 103 | struct vcpu_register_vcpu_info info; |
104 | int err; | 104 | int err; |
105 | struct vcpu_info *vcpup; | 105 | struct vcpu_info *vcpup; |
106 | 106 | ||
107 | BUG_ON(HYPERVISOR_shared_info == &dummy_shared_info); | 107 | BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info); |
108 | per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; | 108 | per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; |
109 | 109 | ||
110 | if (!have_vcpu_info_placement) | 110 | if (!have_vcpu_info_placement) |
@@ -136,11 +136,41 @@ static void __init xen_vcpu_setup(int cpu) | |||
136 | } | 136 | } |
137 | } | 137 | } |
138 | 138 | ||
139 | /* | ||
140 | * On restore, set the vcpu placement up again. | ||
141 | * If it fails, then we're in a bad state, since | ||
142 | * we can't back out from using it... | ||
143 | */ | ||
144 | void xen_vcpu_restore(void) | ||
145 | { | ||
146 | if (have_vcpu_info_placement) { | ||
147 | int cpu; | ||
148 | |||
149 | for_each_online_cpu(cpu) { | ||
150 | bool other_cpu = (cpu != smp_processor_id()); | ||
151 | |||
152 | if (other_cpu && | ||
153 | HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL)) | ||
154 | BUG(); | ||
155 | |||
156 | xen_vcpu_setup(cpu); | ||
157 | |||
158 | if (other_cpu && | ||
159 | HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL)) | ||
160 | BUG(); | ||
161 | } | ||
162 | |||
163 | BUG_ON(!have_vcpu_info_placement); | ||
164 | } | ||
165 | } | ||
166 | |||
139 | static void __init xen_banner(void) | 167 | static void __init xen_banner(void) |
140 | { | 168 | { |
141 | printk(KERN_INFO "Booting paravirtualized kernel on %s\n", | 169 | printk(KERN_INFO "Booting paravirtualized kernel on %s\n", |
142 | pv_info.name); | 170 | pv_info.name); |
143 | printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic); | 171 | printk(KERN_INFO "Hypervisor signature: %s%s\n", |
172 | xen_start_info->magic, | ||
173 | xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : ""); | ||
144 | } | 174 | } |
145 | 175 | ||
146 | static void xen_cpuid(unsigned int *ax, unsigned int *bx, | 176 | static void xen_cpuid(unsigned int *ax, unsigned int *bx, |
@@ -235,13 +265,13 @@ static void xen_irq_enable(void) | |||
235 | { | 265 | { |
236 | struct vcpu_info *vcpu; | 266 | struct vcpu_info *vcpu; |
237 | 267 | ||
238 | /* There's a one instruction preempt window here. We need to | 268 | /* We don't need to worry about being preempted here, since |
239 | make sure we're don't switch CPUs between getting the vcpu | 269 | either a) interrupts are disabled, so no preemption, or b) |
240 | pointer and updating the mask. */ | 270 | the caller is confused and is trying to re-enable interrupts |
241 | preempt_disable(); | 271 | on an indeterminate processor. */ |
272 | |||
242 | vcpu = x86_read_percpu(xen_vcpu); | 273 | vcpu = x86_read_percpu(xen_vcpu); |
243 | vcpu->evtchn_upcall_mask = 0; | 274 | vcpu->evtchn_upcall_mask = 0; |
244 | preempt_enable_no_resched(); | ||
245 | 275 | ||
246 | /* Doesn't matter if we get preempted here, because any | 276 | /* Doesn't matter if we get preempted here, because any |
247 | pending event will get dealt with anyway. */ | 277 | pending event will get dealt with anyway. */ |
@@ -254,7 +284,7 @@ static void xen_irq_enable(void) | |||
254 | static void xen_safe_halt(void) | 284 | static void xen_safe_halt(void) |
255 | { | 285 | { |
256 | /* Blocking includes an implicit local_irq_enable(). */ | 286 | /* Blocking includes an implicit local_irq_enable(). */ |
257 | if (HYPERVISOR_sched_op(SCHEDOP_block, 0) != 0) | 287 | if (HYPERVISOR_sched_op(SCHEDOP_block, NULL) != 0) |
258 | BUG(); | 288 | BUG(); |
259 | } | 289 | } |
260 | 290 | ||
@@ -607,6 +637,30 @@ static void xen_flush_tlb_others(const cpumask_t *cpus, struct mm_struct *mm, | |||
607 | xen_mc_issue(PARAVIRT_LAZY_MMU); | 637 | xen_mc_issue(PARAVIRT_LAZY_MMU); |
608 | } | 638 | } |
609 | 639 | ||
640 | static void xen_clts(void) | ||
641 | { | ||
642 | struct multicall_space mcs; | ||
643 | |||
644 | mcs = xen_mc_entry(0); | ||
645 | |||
646 | MULTI_fpu_taskswitch(mcs.mc, 0); | ||
647 | |||
648 | xen_mc_issue(PARAVIRT_LAZY_CPU); | ||
649 | } | ||
650 | |||
651 | static void xen_write_cr0(unsigned long cr0) | ||
652 | { | ||
653 | struct multicall_space mcs; | ||
654 | |||
655 | /* Only pay attention to cr0.TS; everything else is | ||
656 | ignored. */ | ||
657 | mcs = xen_mc_entry(0); | ||
658 | |||
659 | MULTI_fpu_taskswitch(mcs.mc, (cr0 & X86_CR0_TS) != 0); | ||
660 | |||
661 | xen_mc_issue(PARAVIRT_LAZY_CPU); | ||
662 | } | ||
663 | |||
610 | static void xen_write_cr2(unsigned long cr2) | 664 | static void xen_write_cr2(unsigned long cr2) |
611 | { | 665 | { |
612 | x86_read_percpu(xen_vcpu)->arch.cr2 = cr2; | 666 | x86_read_percpu(xen_vcpu)->arch.cr2 = cr2; |
@@ -624,8 +678,10 @@ static unsigned long xen_read_cr2_direct(void) | |||
624 | 678 | ||
625 | static void xen_write_cr4(unsigned long cr4) | 679 | static void xen_write_cr4(unsigned long cr4) |
626 | { | 680 | { |
627 | /* Just ignore cr4 changes; Xen doesn't allow us to do | 681 | cr4 &= ~X86_CR4_PGE; |
628 | anything anyway. */ | 682 | cr4 &= ~X86_CR4_PSE; |
683 | |||
684 | native_write_cr4(cr4); | ||
629 | } | 685 | } |
630 | 686 | ||
631 | static unsigned long xen_read_cr3(void) | 687 | static unsigned long xen_read_cr3(void) |
@@ -785,38 +841,35 @@ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) | |||
785 | static __init void xen_pagetable_setup_start(pgd_t *base) | 841 | static __init void xen_pagetable_setup_start(pgd_t *base) |
786 | { | 842 | { |
787 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; | 843 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; |
844 | int i; | ||
788 | 845 | ||
789 | /* special set_pte for pagetable initialization */ | 846 | /* special set_pte for pagetable initialization */ |
790 | pv_mmu_ops.set_pte = xen_set_pte_init; | 847 | pv_mmu_ops.set_pte = xen_set_pte_init; |
791 | 848 | ||
792 | init_mm.pgd = base; | 849 | init_mm.pgd = base; |
793 | /* | 850 | /* |
794 | * copy top-level of Xen-supplied pagetable into place. For | 851 | * copy top-level of Xen-supplied pagetable into place. This |
795 | * !PAE we can use this as-is, but for PAE it is a stand-in | 852 | * is a stand-in while we copy the pmd pages. |
796 | * while we copy the pmd pages. | ||
797 | */ | 853 | */ |
798 | memcpy(base, xen_pgd, PTRS_PER_PGD * sizeof(pgd_t)); | 854 | memcpy(base, xen_pgd, PTRS_PER_PGD * sizeof(pgd_t)); |
799 | 855 | ||
800 | if (PTRS_PER_PMD > 1) { | 856 | /* |
801 | int i; | 857 | * For PAE, need to allocate new pmds, rather than |
802 | /* | 858 | * share Xen's, since Xen doesn't like pmd's being |
803 | * For PAE, need to allocate new pmds, rather than | 859 | * shared between address spaces. |
804 | * share Xen's, since Xen doesn't like pmd's being | 860 | */ |
805 | * shared between address spaces. | 861 | for (i = 0; i < PTRS_PER_PGD; i++) { |
806 | */ | 862 | if (pgd_val_ma(xen_pgd[i]) & _PAGE_PRESENT) { |
807 | for (i = 0; i < PTRS_PER_PGD; i++) { | 863 | pmd_t *pmd = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); |
808 | if (pgd_val_ma(xen_pgd[i]) & _PAGE_PRESENT) { | ||
809 | pmd_t *pmd = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); | ||
810 | 864 | ||
811 | memcpy(pmd, (void *)pgd_page_vaddr(xen_pgd[i]), | 865 | memcpy(pmd, (void *)pgd_page_vaddr(xen_pgd[i]), |
812 | PAGE_SIZE); | 866 | PAGE_SIZE); |
813 | 867 | ||
814 | make_lowmem_page_readonly(pmd); | 868 | make_lowmem_page_readonly(pmd); |
815 | 869 | ||
816 | set_pgd(&base[i], __pgd(1 + __pa(pmd))); | 870 | set_pgd(&base[i], __pgd(1 + __pa(pmd))); |
817 | } else | 871 | } else |
818 | pgd_clear(&base[i]); | 872 | pgd_clear(&base[i]); |
819 | } | ||
820 | } | 873 | } |
821 | 874 | ||
822 | /* make sure zero_page is mapped RO so we can use it in pagetables */ | 875 | /* make sure zero_page is mapped RO so we can use it in pagetables */ |
@@ -834,7 +887,7 @@ static __init void xen_pagetable_setup_start(pgd_t *base) | |||
834 | PFN_DOWN(__pa(xen_start_info->pt_base))); | 887 | PFN_DOWN(__pa(xen_start_info->pt_base))); |
835 | } | 888 | } |
836 | 889 | ||
837 | static __init void setup_shared_info(void) | 890 | void xen_setup_shared_info(void) |
838 | { | 891 | { |
839 | if (!xen_feature(XENFEAT_auto_translated_physmap)) { | 892 | if (!xen_feature(XENFEAT_auto_translated_physmap)) { |
840 | unsigned long addr = fix_to_virt(FIX_PARAVIRT_BOOTMAP); | 893 | unsigned long addr = fix_to_virt(FIX_PARAVIRT_BOOTMAP); |
@@ -857,6 +910,8 @@ static __init void setup_shared_info(void) | |||
857 | /* In UP this is as good a place as any to set up shared info */ | 910 | /* In UP this is as good a place as any to set up shared info */ |
858 | xen_setup_vcpu_info_placement(); | 911 | xen_setup_vcpu_info_placement(); |
859 | #endif | 912 | #endif |
913 | |||
914 | xen_setup_mfn_list_list(); | ||
860 | } | 915 | } |
861 | 916 | ||
862 | static __init void xen_pagetable_setup_done(pgd_t *base) | 917 | static __init void xen_pagetable_setup_done(pgd_t *base) |
@@ -869,25 +924,23 @@ static __init void xen_pagetable_setup_done(pgd_t *base) | |||
869 | pv_mmu_ops.release_pmd = xen_release_pmd; | 924 | pv_mmu_ops.release_pmd = xen_release_pmd; |
870 | pv_mmu_ops.set_pte = xen_set_pte; | 925 | pv_mmu_ops.set_pte = xen_set_pte; |
871 | 926 | ||
872 | setup_shared_info(); | 927 | xen_setup_shared_info(); |
873 | 928 | ||
874 | /* Actually pin the pagetable down, but we can't set PG_pinned | 929 | /* Actually pin the pagetable down, but we can't set PG_pinned |
875 | yet because the page structures don't exist yet. */ | 930 | yet because the page structures don't exist yet. */ |
876 | { | 931 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); |
877 | unsigned level; | 932 | } |
878 | 933 | ||
879 | #ifdef CONFIG_X86_PAE | 934 | static __init void xen_post_allocator_init(void) |
880 | level = MMUEXT_PIN_L3_TABLE; | 935 | { |
881 | #else | 936 | pv_mmu_ops.set_pmd = xen_set_pmd; |
882 | level = MMUEXT_PIN_L2_TABLE; | 937 | pv_mmu_ops.set_pud = xen_set_pud; |
883 | #endif | ||
884 | 938 | ||
885 | pin_pagetable_pfn(level, PFN_DOWN(__pa(base))); | 939 | xen_mark_init_mm_pinned(); |
886 | } | ||
887 | } | 940 | } |
888 | 941 | ||
889 | /* This is called once we have the cpu_possible_map */ | 942 | /* This is called once we have the cpu_possible_map */ |
890 | void __init xen_setup_vcpu_info_placement(void) | 943 | void xen_setup_vcpu_info_placement(void) |
891 | { | 944 | { |
892 | int cpu; | 945 | int cpu; |
893 | 946 | ||
@@ -973,7 +1026,7 @@ static const struct pv_init_ops xen_init_ops __initdata = { | |||
973 | .banner = xen_banner, | 1026 | .banner = xen_banner, |
974 | .memory_setup = xen_memory_setup, | 1027 | .memory_setup = xen_memory_setup, |
975 | .arch_setup = xen_arch_setup, | 1028 | .arch_setup = xen_arch_setup, |
976 | .post_allocator_init = xen_mark_init_mm_pinned, | 1029 | .post_allocator_init = xen_post_allocator_init, |
977 | }; | 1030 | }; |
978 | 1031 | ||
979 | static const struct pv_time_ops xen_time_ops __initdata = { | 1032 | static const struct pv_time_ops xen_time_ops __initdata = { |
@@ -991,10 +1044,10 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { | |||
991 | .set_debugreg = xen_set_debugreg, | 1044 | .set_debugreg = xen_set_debugreg, |
992 | .get_debugreg = xen_get_debugreg, | 1045 | .get_debugreg = xen_get_debugreg, |
993 | 1046 | ||
994 | .clts = native_clts, | 1047 | .clts = xen_clts, |
995 | 1048 | ||
996 | .read_cr0 = native_read_cr0, | 1049 | .read_cr0 = native_read_cr0, |
997 | .write_cr0 = native_write_cr0, | 1050 | .write_cr0 = xen_write_cr0, |
998 | 1051 | ||
999 | .read_cr4 = native_read_cr4, | 1052 | .read_cr4 = native_read_cr4, |
1000 | .read_cr4_safe = native_read_cr4_safe, | 1053 | .read_cr4_safe = native_read_cr4_safe, |
@@ -1085,24 +1138,26 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
1085 | 1138 | ||
1086 | .set_pte = NULL, /* see xen_pagetable_setup_* */ | 1139 | .set_pte = NULL, /* see xen_pagetable_setup_* */ |
1087 | .set_pte_at = xen_set_pte_at, | 1140 | .set_pte_at = xen_set_pte_at, |
1088 | .set_pmd = xen_set_pmd, | 1141 | .set_pmd = xen_set_pmd_hyper, |
1142 | |||
1143 | .ptep_modify_prot_start = __ptep_modify_prot_start, | ||
1144 | .ptep_modify_prot_commit = __ptep_modify_prot_commit, | ||
1089 | 1145 | ||
1090 | .pte_val = xen_pte_val, | 1146 | .pte_val = xen_pte_val, |
1147 | .pte_flags = native_pte_val, | ||
1091 | .pgd_val = xen_pgd_val, | 1148 | .pgd_val = xen_pgd_val, |
1092 | 1149 | ||
1093 | .make_pte = xen_make_pte, | 1150 | .make_pte = xen_make_pte, |
1094 | .make_pgd = xen_make_pgd, | 1151 | .make_pgd = xen_make_pgd, |
1095 | 1152 | ||
1096 | #ifdef CONFIG_X86_PAE | ||
1097 | .set_pte_atomic = xen_set_pte_atomic, | 1153 | .set_pte_atomic = xen_set_pte_atomic, |
1098 | .set_pte_present = xen_set_pte_at, | 1154 | .set_pte_present = xen_set_pte_at, |
1099 | .set_pud = xen_set_pud, | 1155 | .set_pud = xen_set_pud_hyper, |
1100 | .pte_clear = xen_pte_clear, | 1156 | .pte_clear = xen_pte_clear, |
1101 | .pmd_clear = xen_pmd_clear, | 1157 | .pmd_clear = xen_pmd_clear, |
1102 | 1158 | ||
1103 | .make_pmd = xen_make_pmd, | 1159 | .make_pmd = xen_make_pmd, |
1104 | .pmd_val = xen_pmd_val, | 1160 | .pmd_val = xen_pmd_val, |
1105 | #endif /* PAE */ | ||
1106 | 1161 | ||
1107 | .activate_mm = xen_activate_mm, | 1162 | .activate_mm = xen_activate_mm, |
1108 | .dup_mmap = xen_dup_mmap, | 1163 | .dup_mmap = xen_dup_mmap, |
@@ -1129,11 +1184,13 @@ static const struct smp_ops xen_smp_ops __initdata = { | |||
1129 | 1184 | ||
1130 | static void xen_reboot(int reason) | 1185 | static void xen_reboot(int reason) |
1131 | { | 1186 | { |
1187 | struct sched_shutdown r = { .reason = reason }; | ||
1188 | |||
1132 | #ifdef CONFIG_SMP | 1189 | #ifdef CONFIG_SMP |
1133 | smp_send_stop(); | 1190 | smp_send_stop(); |
1134 | #endif | 1191 | #endif |
1135 | 1192 | ||
1136 | if (HYPERVISOR_sched_op(SCHEDOP_shutdown, reason)) | 1193 | if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r)) |
1137 | BUG(); | 1194 | BUG(); |
1138 | } | 1195 | } |
1139 | 1196 | ||
@@ -1188,6 +1245,8 @@ asmlinkage void __init xen_start_kernel(void) | |||
1188 | 1245 | ||
1189 | BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0); | 1246 | BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0); |
1190 | 1247 | ||
1248 | xen_setup_features(); | ||
1249 | |||
1191 | /* Install Xen paravirt ops */ | 1250 | /* Install Xen paravirt ops */ |
1192 | pv_info = xen_info; | 1251 | pv_info = xen_info; |
1193 | pv_init_ops = xen_init_ops; | 1252 | pv_init_ops = xen_init_ops; |
@@ -1197,17 +1256,20 @@ asmlinkage void __init xen_start_kernel(void) | |||
1197 | pv_apic_ops = xen_apic_ops; | 1256 | pv_apic_ops = xen_apic_ops; |
1198 | pv_mmu_ops = xen_mmu_ops; | 1257 | pv_mmu_ops = xen_mmu_ops; |
1199 | 1258 | ||
1259 | if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) { | ||
1260 | pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start; | ||
1261 | pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit; | ||
1262 | } | ||
1263 | |||
1200 | machine_ops = xen_machine_ops; | 1264 | machine_ops = xen_machine_ops; |
1201 | 1265 | ||
1202 | #ifdef CONFIG_SMP | 1266 | #ifdef CONFIG_SMP |
1203 | smp_ops = xen_smp_ops; | 1267 | smp_ops = xen_smp_ops; |
1204 | #endif | 1268 | #endif |
1205 | 1269 | ||
1206 | xen_setup_features(); | ||
1207 | |||
1208 | /* Get mfn list */ | 1270 | /* Get mfn list */ |
1209 | if (!xen_feature(XENFEAT_auto_translated_physmap)) | 1271 | if (!xen_feature(XENFEAT_auto_translated_physmap)) |
1210 | phys_to_machine_mapping = (unsigned long *)xen_start_info->mfn_list; | 1272 | xen_build_dynamic_phys_to_machine(); |
1211 | 1273 | ||
1212 | pgd = (pgd_t *)xen_start_info->pt_base; | 1274 | pgd = (pgd_t *)xen_start_info->pt_base; |
1213 | 1275 | ||
@@ -1228,6 +1290,11 @@ asmlinkage void __init xen_start_kernel(void) | |||
1228 | if (xen_feature(XENFEAT_supervisor_mode_kernel)) | 1290 | if (xen_feature(XENFEAT_supervisor_mode_kernel)) |
1229 | pv_info.kernel_rpl = 0; | 1291 | pv_info.kernel_rpl = 0; |
1230 | 1292 | ||
1293 | /* Prevent unwanted bits from being set in PTEs. */ | ||
1294 | __supported_pte_mask &= ~_PAGE_GLOBAL; | ||
1295 | if (!is_initial_xendomain()) | ||
1296 | __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD); | ||
1297 | |||
1231 | /* set the limit of our address space */ | 1298 | /* set the limit of our address space */ |
1232 | xen_reserve_top(); | 1299 | xen_reserve_top(); |
1233 | 1300 | ||
@@ -1242,8 +1309,11 @@ asmlinkage void __init xen_start_kernel(void) | |||
1242 | ? __pa(xen_start_info->mod_start) : 0; | 1309 | ? __pa(xen_start_info->mod_start) : 0; |
1243 | boot_params.hdr.ramdisk_size = xen_start_info->mod_len; | 1310 | boot_params.hdr.ramdisk_size = xen_start_info->mod_len; |
1244 | 1311 | ||
1245 | if (!is_initial_xendomain()) | 1312 | if (!is_initial_xendomain()) { |
1313 | add_preferred_console("xenboot", 0, NULL); | ||
1314 | add_preferred_console("tty", 0, NULL); | ||
1246 | add_preferred_console("hvc", 0, NULL); | 1315 | add_preferred_console("hvc", 0, NULL); |
1316 | } | ||
1247 | 1317 | ||
1248 | /* Start the world */ | 1318 | /* Start the world */ |
1249 | start_kernel(); | 1319 | start_kernel(); |
diff --git a/arch/x86/xen/manage.c b/arch/x86/xen/manage.c deleted file mode 100644 index aa7af9e6abc0..000000000000 --- a/arch/x86/xen/manage.c +++ /dev/null | |||
@@ -1,143 +0,0 @@ | |||
1 | /* | ||
2 | * Handle extern requests for shutdown, reboot and sysrq | ||
3 | */ | ||
4 | #include <linux/kernel.h> | ||
5 | #include <linux/err.h> | ||
6 | #include <linux/reboot.h> | ||
7 | #include <linux/sysrq.h> | ||
8 | |||
9 | #include <xen/xenbus.h> | ||
10 | |||
11 | #define SHUTDOWN_INVALID -1 | ||
12 | #define SHUTDOWN_POWEROFF 0 | ||
13 | #define SHUTDOWN_SUSPEND 2 | ||
14 | /* Code 3 is SHUTDOWN_CRASH, which we don't use because the domain can only | ||
15 | * report a crash, not be instructed to crash! | ||
16 | * HALT is the same as POWEROFF, as far as we're concerned. The tools use | ||
17 | * the distinction when we return the reason code to them. | ||
18 | */ | ||
19 | #define SHUTDOWN_HALT 4 | ||
20 | |||
21 | /* Ignore multiple shutdown requests. */ | ||
22 | static int shutting_down = SHUTDOWN_INVALID; | ||
23 | |||
24 | static void shutdown_handler(struct xenbus_watch *watch, | ||
25 | const char **vec, unsigned int len) | ||
26 | { | ||
27 | char *str; | ||
28 | struct xenbus_transaction xbt; | ||
29 | int err; | ||
30 | |||
31 | if (shutting_down != SHUTDOWN_INVALID) | ||
32 | return; | ||
33 | |||
34 | again: | ||
35 | err = xenbus_transaction_start(&xbt); | ||
36 | if (err) | ||
37 | return; | ||
38 | |||
39 | str = (char *)xenbus_read(xbt, "control", "shutdown", NULL); | ||
40 | /* Ignore read errors and empty reads. */ | ||
41 | if (XENBUS_IS_ERR_READ(str)) { | ||
42 | xenbus_transaction_end(xbt, 1); | ||
43 | return; | ||
44 | } | ||
45 | |||
46 | xenbus_write(xbt, "control", "shutdown", ""); | ||
47 | |||
48 | err = xenbus_transaction_end(xbt, 0); | ||
49 | if (err == -EAGAIN) { | ||
50 | kfree(str); | ||
51 | goto again; | ||
52 | } | ||
53 | |||
54 | if (strcmp(str, "poweroff") == 0 || | ||
55 | strcmp(str, "halt") == 0) | ||
56 | orderly_poweroff(false); | ||
57 | else if (strcmp(str, "reboot") == 0) | ||
58 | ctrl_alt_del(); | ||
59 | else { | ||
60 | printk(KERN_INFO "Ignoring shutdown request: %s\n", str); | ||
61 | shutting_down = SHUTDOWN_INVALID; | ||
62 | } | ||
63 | |||
64 | kfree(str); | ||
65 | } | ||
66 | |||
67 | static void sysrq_handler(struct xenbus_watch *watch, const char **vec, | ||
68 | unsigned int len) | ||
69 | { | ||
70 | char sysrq_key = '\0'; | ||
71 | struct xenbus_transaction xbt; | ||
72 | int err; | ||
73 | |||
74 | again: | ||
75 | err = xenbus_transaction_start(&xbt); | ||
76 | if (err) | ||
77 | return; | ||
78 | if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) { | ||
79 | printk(KERN_ERR "Unable to read sysrq code in " | ||
80 | "control/sysrq\n"); | ||
81 | xenbus_transaction_end(xbt, 1); | ||
82 | return; | ||
83 | } | ||
84 | |||
85 | if (sysrq_key != '\0') | ||
86 | xenbus_printf(xbt, "control", "sysrq", "%c", '\0'); | ||
87 | |||
88 | err = xenbus_transaction_end(xbt, 0); | ||
89 | if (err == -EAGAIN) | ||
90 | goto again; | ||
91 | |||
92 | if (sysrq_key != '\0') | ||
93 | handle_sysrq(sysrq_key, NULL); | ||
94 | } | ||
95 | |||
96 | static struct xenbus_watch shutdown_watch = { | ||
97 | .node = "control/shutdown", | ||
98 | .callback = shutdown_handler | ||
99 | }; | ||
100 | |||
101 | static struct xenbus_watch sysrq_watch = { | ||
102 | .node = "control/sysrq", | ||
103 | .callback = sysrq_handler | ||
104 | }; | ||
105 | |||
106 | static int setup_shutdown_watcher(void) | ||
107 | { | ||
108 | int err; | ||
109 | |||
110 | err = register_xenbus_watch(&shutdown_watch); | ||
111 | if (err) { | ||
112 | printk(KERN_ERR "Failed to set shutdown watcher\n"); | ||
113 | return err; | ||
114 | } | ||
115 | |||
116 | err = register_xenbus_watch(&sysrq_watch); | ||
117 | if (err) { | ||
118 | printk(KERN_ERR "Failed to set sysrq watcher\n"); | ||
119 | return err; | ||
120 | } | ||
121 | |||
122 | return 0; | ||
123 | } | ||
124 | |||
125 | static int shutdown_event(struct notifier_block *notifier, | ||
126 | unsigned long event, | ||
127 | void *data) | ||
128 | { | ||
129 | setup_shutdown_watcher(); | ||
130 | return NOTIFY_DONE; | ||
131 | } | ||
132 | |||
133 | static int __init setup_shutdown_event(void) | ||
134 | { | ||
135 | static struct notifier_block xenstore_notifier = { | ||
136 | .notifier_call = shutdown_event | ||
137 | }; | ||
138 | register_xenstore_notifier(&xenstore_notifier); | ||
139 | |||
140 | return 0; | ||
141 | } | ||
142 | |||
143 | subsys_initcall(setup_shutdown_event); | ||
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 126766d43aea..42b3b9ed641d 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -56,11 +56,136 @@ | |||
56 | #include "multicalls.h" | 56 | #include "multicalls.h" |
57 | #include "mmu.h" | 57 | #include "mmu.h" |
58 | 58 | ||
59 | #define P2M_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(unsigned long)) | ||
60 | #define TOP_ENTRIES (MAX_DOMAIN_PAGES / P2M_ENTRIES_PER_PAGE) | ||
61 | |||
62 | /* Placeholder for holes in the address space */ | ||
63 | static unsigned long p2m_missing[P2M_ENTRIES_PER_PAGE] | ||
64 | __attribute__((section(".data.page_aligned"))) = | ||
65 | { [ 0 ... P2M_ENTRIES_PER_PAGE-1 ] = ~0UL }; | ||
66 | |||
67 | /* Array of pointers to pages containing p2m entries */ | ||
68 | static unsigned long *p2m_top[TOP_ENTRIES] | ||
69 | __attribute__((section(".data.page_aligned"))) = | ||
70 | { [ 0 ... TOP_ENTRIES - 1] = &p2m_missing[0] }; | ||
71 | |||
72 | /* Arrays of p2m arrays expressed in mfns used for save/restore */ | ||
73 | static unsigned long p2m_top_mfn[TOP_ENTRIES] | ||
74 | __attribute__((section(".bss.page_aligned"))); | ||
75 | |||
76 | static unsigned long p2m_top_mfn_list[ | ||
77 | PAGE_ALIGN(TOP_ENTRIES / P2M_ENTRIES_PER_PAGE)] | ||
78 | __attribute__((section(".bss.page_aligned"))); | ||
79 | |||
80 | static inline unsigned p2m_top_index(unsigned long pfn) | ||
81 | { | ||
82 | BUG_ON(pfn >= MAX_DOMAIN_PAGES); | ||
83 | return pfn / P2M_ENTRIES_PER_PAGE; | ||
84 | } | ||
85 | |||
86 | static inline unsigned p2m_index(unsigned long pfn) | ||
87 | { | ||
88 | return pfn % P2M_ENTRIES_PER_PAGE; | ||
89 | } | ||
90 | |||
91 | /* Build the parallel p2m_top_mfn structures */ | ||
92 | void xen_setup_mfn_list_list(void) | ||
93 | { | ||
94 | unsigned pfn, idx; | ||
95 | |||
96 | for(pfn = 0; pfn < MAX_DOMAIN_PAGES; pfn += P2M_ENTRIES_PER_PAGE) { | ||
97 | unsigned topidx = p2m_top_index(pfn); | ||
98 | |||
99 | p2m_top_mfn[topidx] = virt_to_mfn(p2m_top[topidx]); | ||
100 | } | ||
101 | |||
102 | for(idx = 0; idx < ARRAY_SIZE(p2m_top_mfn_list); idx++) { | ||
103 | unsigned topidx = idx * P2M_ENTRIES_PER_PAGE; | ||
104 | p2m_top_mfn_list[idx] = virt_to_mfn(&p2m_top_mfn[topidx]); | ||
105 | } | ||
106 | |||
107 | BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info); | ||
108 | |||
109 | HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list = | ||
110 | virt_to_mfn(p2m_top_mfn_list); | ||
111 | HYPERVISOR_shared_info->arch.max_pfn = xen_start_info->nr_pages; | ||
112 | } | ||
113 | |||
114 | /* Set up p2m_top to point to the domain-builder provided p2m pages */ | ||
115 | void __init xen_build_dynamic_phys_to_machine(void) | ||
116 | { | ||
117 | unsigned long *mfn_list = (unsigned long *)xen_start_info->mfn_list; | ||
118 | unsigned long max_pfn = min(MAX_DOMAIN_PAGES, xen_start_info->nr_pages); | ||
119 | unsigned pfn; | ||
120 | |||
121 | for(pfn = 0; pfn < max_pfn; pfn += P2M_ENTRIES_PER_PAGE) { | ||
122 | unsigned topidx = p2m_top_index(pfn); | ||
123 | |||
124 | p2m_top[topidx] = &mfn_list[pfn]; | ||
125 | } | ||
126 | } | ||
127 | |||
128 | unsigned long get_phys_to_machine(unsigned long pfn) | ||
129 | { | ||
130 | unsigned topidx, idx; | ||
131 | |||
132 | if (unlikely(pfn >= MAX_DOMAIN_PAGES)) | ||
133 | return INVALID_P2M_ENTRY; | ||
134 | |||
135 | topidx = p2m_top_index(pfn); | ||
136 | idx = p2m_index(pfn); | ||
137 | return p2m_top[topidx][idx]; | ||
138 | } | ||
139 | EXPORT_SYMBOL_GPL(get_phys_to_machine); | ||
140 | |||
141 | static void alloc_p2m(unsigned long **pp, unsigned long *mfnp) | ||
142 | { | ||
143 | unsigned long *p; | ||
144 | unsigned i; | ||
145 | |||
146 | p = (void *)__get_free_page(GFP_KERNEL | __GFP_NOFAIL); | ||
147 | BUG_ON(p == NULL); | ||
148 | |||
149 | for(i = 0; i < P2M_ENTRIES_PER_PAGE; i++) | ||
150 | p[i] = INVALID_P2M_ENTRY; | ||
151 | |||
152 | if (cmpxchg(pp, p2m_missing, p) != p2m_missing) | ||
153 | free_page((unsigned long)p); | ||
154 | else | ||
155 | *mfnp = virt_to_mfn(p); | ||
156 | } | ||
157 | |||
158 | void set_phys_to_machine(unsigned long pfn, unsigned long mfn) | ||
159 | { | ||
160 | unsigned topidx, idx; | ||
161 | |||
162 | if (unlikely(xen_feature(XENFEAT_auto_translated_physmap))) { | ||
163 | BUG_ON(pfn != mfn && mfn != INVALID_P2M_ENTRY); | ||
164 | return; | ||
165 | } | ||
166 | |||
167 | if (unlikely(pfn >= MAX_DOMAIN_PAGES)) { | ||
168 | BUG_ON(mfn != INVALID_P2M_ENTRY); | ||
169 | return; | ||
170 | } | ||
171 | |||
172 | topidx = p2m_top_index(pfn); | ||
173 | if (p2m_top[topidx] == p2m_missing) { | ||
174 | /* no need to allocate a page to store an invalid entry */ | ||
175 | if (mfn == INVALID_P2M_ENTRY) | ||
176 | return; | ||
177 | alloc_p2m(&p2m_top[topidx], &p2m_top_mfn[topidx]); | ||
178 | } | ||
179 | |||
180 | idx = p2m_index(pfn); | ||
181 | p2m_top[topidx][idx] = mfn; | ||
182 | } | ||
183 | |||
59 | xmaddr_t arbitrary_virt_to_machine(unsigned long address) | 184 | xmaddr_t arbitrary_virt_to_machine(unsigned long address) |
60 | { | 185 | { |
61 | unsigned int level; | 186 | unsigned int level; |
62 | pte_t *pte = lookup_address(address, &level); | 187 | pte_t *pte = lookup_address(address, &level); |
63 | unsigned offset = address & PAGE_MASK; | 188 | unsigned offset = address & ~PAGE_MASK; |
64 | 189 | ||
65 | BUG_ON(pte == NULL); | 190 | BUG_ON(pte == NULL); |
66 | 191 | ||
@@ -98,24 +223,60 @@ void make_lowmem_page_readwrite(void *vaddr) | |||
98 | } | 223 | } |
99 | 224 | ||
100 | 225 | ||
101 | void xen_set_pmd(pmd_t *ptr, pmd_t val) | 226 | static bool page_pinned(void *ptr) |
227 | { | ||
228 | struct page *page = virt_to_page(ptr); | ||
229 | |||
230 | return PagePinned(page); | ||
231 | } | ||
232 | |||
233 | static void extend_mmu_update(const struct mmu_update *update) | ||
102 | { | 234 | { |
103 | struct multicall_space mcs; | 235 | struct multicall_space mcs; |
104 | struct mmu_update *u; | 236 | struct mmu_update *u; |
105 | 237 | ||
106 | preempt_disable(); | 238 | mcs = xen_mc_extend_args(__HYPERVISOR_mmu_update, sizeof(*u)); |
239 | |||
240 | if (mcs.mc != NULL) | ||
241 | mcs.mc->args[1]++; | ||
242 | else { | ||
243 | mcs = __xen_mc_entry(sizeof(*u)); | ||
244 | MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, DOMID_SELF); | ||
245 | } | ||
107 | 246 | ||
108 | mcs = xen_mc_entry(sizeof(*u)); | ||
109 | u = mcs.args; | 247 | u = mcs.args; |
110 | u->ptr = virt_to_machine(ptr).maddr; | 248 | *u = *update; |
111 | u->val = pmd_val_ma(val); | 249 | } |
112 | MULTI_mmu_update(mcs.mc, u, 1, NULL, DOMID_SELF); | 250 | |
251 | void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val) | ||
252 | { | ||
253 | struct mmu_update u; | ||
254 | |||
255 | preempt_disable(); | ||
256 | |||
257 | xen_mc_batch(); | ||
258 | |||
259 | u.ptr = virt_to_machine(ptr).maddr; | ||
260 | u.val = pmd_val_ma(val); | ||
261 | extend_mmu_update(&u); | ||
113 | 262 | ||
114 | xen_mc_issue(PARAVIRT_LAZY_MMU); | 263 | xen_mc_issue(PARAVIRT_LAZY_MMU); |
115 | 264 | ||
116 | preempt_enable(); | 265 | preempt_enable(); |
117 | } | 266 | } |
118 | 267 | ||
268 | void xen_set_pmd(pmd_t *ptr, pmd_t val) | ||
269 | { | ||
270 | /* If page is not pinned, we can just update the entry | ||
271 | directly */ | ||
272 | if (!page_pinned(ptr)) { | ||
273 | *ptr = val; | ||
274 | return; | ||
275 | } | ||
276 | |||
277 | xen_set_pmd_hyper(ptr, val); | ||
278 | } | ||
279 | |||
119 | /* | 280 | /* |
120 | * Associate a virtual page frame with a given physical page frame | 281 | * Associate a virtual page frame with a given physical page frame |
121 | * and protection flags for that frame. | 282 | * and protection flags for that frame. |
@@ -179,68 +340,105 @@ out: | |||
179 | preempt_enable(); | 340 | preempt_enable(); |
180 | } | 341 | } |
181 | 342 | ||
182 | pteval_t xen_pte_val(pte_t pte) | 343 | pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep) |
183 | { | 344 | { |
184 | pteval_t ret = pte.pte; | 345 | /* Just return the pte as-is. We preserve the bits on commit */ |
346 | return *ptep; | ||
347 | } | ||
348 | |||
349 | void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, | ||
350 | pte_t *ptep, pte_t pte) | ||
351 | { | ||
352 | struct mmu_update u; | ||
353 | |||
354 | xen_mc_batch(); | ||
185 | 355 | ||
186 | if (ret & _PAGE_PRESENT) | 356 | u.ptr = virt_to_machine(ptep).maddr | MMU_PT_UPDATE_PRESERVE_AD; |
187 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | 357 | u.val = pte_val_ma(pte); |
358 | extend_mmu_update(&u); | ||
188 | 359 | ||
189 | return ret; | 360 | xen_mc_issue(PARAVIRT_LAZY_MMU); |
190 | } | 361 | } |
191 | 362 | ||
192 | pgdval_t xen_pgd_val(pgd_t pgd) | 363 | /* Assume pteval_t is equivalent to all the other *val_t types. */ |
364 | static pteval_t pte_mfn_to_pfn(pteval_t val) | ||
193 | { | 365 | { |
194 | pgdval_t ret = pgd.pgd; | 366 | if (val & _PAGE_PRESENT) { |
195 | if (ret & _PAGE_PRESENT) | 367 | unsigned long mfn = (val & PTE_MASK) >> PAGE_SHIFT; |
196 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | 368 | pteval_t flags = val & ~PTE_MASK; |
197 | return ret; | 369 | val = ((pteval_t)mfn_to_pfn(mfn) << PAGE_SHIFT) | flags; |
370 | } | ||
371 | |||
372 | return val; | ||
198 | } | 373 | } |
199 | 374 | ||
200 | pte_t xen_make_pte(pteval_t pte) | 375 | static pteval_t pte_pfn_to_mfn(pteval_t val) |
201 | { | 376 | { |
202 | if (pte & _PAGE_PRESENT) { | 377 | if (val & _PAGE_PRESENT) { |
203 | pte = phys_to_machine(XPADDR(pte)).maddr; | 378 | unsigned long pfn = (val & PTE_MASK) >> PAGE_SHIFT; |
204 | pte &= ~(_PAGE_PCD | _PAGE_PWT); | 379 | pteval_t flags = val & ~PTE_MASK; |
380 | val = ((pteval_t)pfn_to_mfn(pfn) << PAGE_SHIFT) | flags; | ||
205 | } | 381 | } |
206 | 382 | ||
207 | return (pte_t){ .pte = pte }; | 383 | return val; |
208 | } | 384 | } |
209 | 385 | ||
210 | pgd_t xen_make_pgd(pgdval_t pgd) | 386 | pteval_t xen_pte_val(pte_t pte) |
211 | { | 387 | { |
212 | if (pgd & _PAGE_PRESENT) | 388 | return pte_mfn_to_pfn(pte.pte); |
213 | pgd = phys_to_machine(XPADDR(pgd)).maddr; | 389 | } |
214 | 390 | ||
215 | return (pgd_t){ pgd }; | 391 | pgdval_t xen_pgd_val(pgd_t pgd) |
392 | { | ||
393 | return pte_mfn_to_pfn(pgd.pgd); | ||
394 | } | ||
395 | |||
396 | pte_t xen_make_pte(pteval_t pte) | ||
397 | { | ||
398 | pte = pte_pfn_to_mfn(pte); | ||
399 | return native_make_pte(pte); | ||
400 | } | ||
401 | |||
402 | pgd_t xen_make_pgd(pgdval_t pgd) | ||
403 | { | ||
404 | pgd = pte_pfn_to_mfn(pgd); | ||
405 | return native_make_pgd(pgd); | ||
216 | } | 406 | } |
217 | 407 | ||
218 | pmdval_t xen_pmd_val(pmd_t pmd) | 408 | pmdval_t xen_pmd_val(pmd_t pmd) |
219 | { | 409 | { |
220 | pmdval_t ret = native_pmd_val(pmd); | 410 | return pte_mfn_to_pfn(pmd.pmd); |
221 | if (ret & _PAGE_PRESENT) | ||
222 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | ||
223 | return ret; | ||
224 | } | 411 | } |
225 | #ifdef CONFIG_X86_PAE | 412 | |
226 | void xen_set_pud(pud_t *ptr, pud_t val) | 413 | void xen_set_pud_hyper(pud_t *ptr, pud_t val) |
227 | { | 414 | { |
228 | struct multicall_space mcs; | 415 | struct mmu_update u; |
229 | struct mmu_update *u; | ||
230 | 416 | ||
231 | preempt_disable(); | 417 | preempt_disable(); |
232 | 418 | ||
233 | mcs = xen_mc_entry(sizeof(*u)); | 419 | xen_mc_batch(); |
234 | u = mcs.args; | 420 | |
235 | u->ptr = virt_to_machine(ptr).maddr; | 421 | u.ptr = virt_to_machine(ptr).maddr; |
236 | u->val = pud_val_ma(val); | 422 | u.val = pud_val_ma(val); |
237 | MULTI_mmu_update(mcs.mc, u, 1, NULL, DOMID_SELF); | 423 | extend_mmu_update(&u); |
238 | 424 | ||
239 | xen_mc_issue(PARAVIRT_LAZY_MMU); | 425 | xen_mc_issue(PARAVIRT_LAZY_MMU); |
240 | 426 | ||
241 | preempt_enable(); | 427 | preempt_enable(); |
242 | } | 428 | } |
243 | 429 | ||
430 | void xen_set_pud(pud_t *ptr, pud_t val) | ||
431 | { | ||
432 | /* If page is not pinned, we can just update the entry | ||
433 | directly */ | ||
434 | if (!page_pinned(ptr)) { | ||
435 | *ptr = val; | ||
436 | return; | ||
437 | } | ||
438 | |||
439 | xen_set_pud_hyper(ptr, val); | ||
440 | } | ||
441 | |||
244 | void xen_set_pte(pte_t *ptep, pte_t pte) | 442 | void xen_set_pte(pte_t *ptep, pte_t pte) |
245 | { | 443 | { |
246 | ptep->pte_high = pte.pte_high; | 444 | ptep->pte_high = pte.pte_high; |
@@ -262,22 +460,14 @@ void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | |||
262 | 460 | ||
263 | void xen_pmd_clear(pmd_t *pmdp) | 461 | void xen_pmd_clear(pmd_t *pmdp) |
264 | { | 462 | { |
265 | xen_set_pmd(pmdp, __pmd(0)); | 463 | set_pmd(pmdp, __pmd(0)); |
266 | } | 464 | } |
267 | 465 | ||
268 | pmd_t xen_make_pmd(pmdval_t pmd) | 466 | pmd_t xen_make_pmd(pmdval_t pmd) |
269 | { | 467 | { |
270 | if (pmd & _PAGE_PRESENT) | 468 | pmd = pte_pfn_to_mfn(pmd); |
271 | pmd = phys_to_machine(XPADDR(pmd)).maddr; | ||
272 | |||
273 | return native_make_pmd(pmd); | 469 | return native_make_pmd(pmd); |
274 | } | 470 | } |
275 | #else /* !PAE */ | ||
276 | void xen_set_pte(pte_t *ptep, pte_t pte) | ||
277 | { | ||
278 | *ptep = pte; | ||
279 | } | ||
280 | #endif /* CONFIG_X86_PAE */ | ||
281 | 471 | ||
282 | /* | 472 | /* |
283 | (Yet another) pagetable walker. This one is intended for pinning a | 473 | (Yet another) pagetable walker. This one is intended for pinning a |
@@ -430,8 +620,6 @@ static int pin_page(struct page *page, enum pt_level level) | |||
430 | read-only, and can be pinned. */ | 620 | read-only, and can be pinned. */ |
431 | void xen_pgd_pin(pgd_t *pgd) | 621 | void xen_pgd_pin(pgd_t *pgd) |
432 | { | 622 | { |
433 | unsigned level; | ||
434 | |||
435 | xen_mc_batch(); | 623 | xen_mc_batch(); |
436 | 624 | ||
437 | if (pgd_walk(pgd, pin_page, TASK_SIZE)) { | 625 | if (pgd_walk(pgd, pin_page, TASK_SIZE)) { |
@@ -441,15 +629,31 @@ void xen_pgd_pin(pgd_t *pgd) | |||
441 | xen_mc_batch(); | 629 | xen_mc_batch(); |
442 | } | 630 | } |
443 | 631 | ||
444 | #ifdef CONFIG_X86_PAE | 632 | xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd))); |
445 | level = MMUEXT_PIN_L3_TABLE; | 633 | xen_mc_issue(0); |
446 | #else | 634 | } |
447 | level = MMUEXT_PIN_L2_TABLE; | 635 | |
448 | #endif | 636 | /* |
637 | * On save, we need to pin all pagetables to make sure they get their | ||
638 | * mfns turned into pfns. Search the list for any unpinned pgds and pin | ||
639 | * them (unpinned pgds are not currently in use, probably because the | ||
640 | * process is under construction or destruction). | ||
641 | */ | ||
642 | void xen_mm_pin_all(void) | ||
643 | { | ||
644 | unsigned long flags; | ||
645 | struct page *page; | ||
449 | 646 | ||
450 | xen_do_pin(level, PFN_DOWN(__pa(pgd))); | 647 | spin_lock_irqsave(&pgd_lock, flags); |
451 | 648 | ||
452 | xen_mc_issue(0); | 649 | list_for_each_entry(page, &pgd_list, lru) { |
650 | if (!PagePinned(page)) { | ||
651 | xen_pgd_pin((pgd_t *)page_address(page)); | ||
652 | SetPageSavePinned(page); | ||
653 | } | ||
654 | } | ||
655 | |||
656 | spin_unlock_irqrestore(&pgd_lock, flags); | ||
453 | } | 657 | } |
454 | 658 | ||
455 | /* The init_mm pagetable is really pinned as soon as its created, but | 659 | /* The init_mm pagetable is really pinned as soon as its created, but |
@@ -509,6 +713,29 @@ static void xen_pgd_unpin(pgd_t *pgd) | |||
509 | xen_mc_issue(0); | 713 | xen_mc_issue(0); |
510 | } | 714 | } |
511 | 715 | ||
716 | /* | ||
717 | * On resume, undo any pinning done at save, so that the rest of the | ||
718 | * kernel doesn't see any unexpected pinned pagetables. | ||
719 | */ | ||
720 | void xen_mm_unpin_all(void) | ||
721 | { | ||
722 | unsigned long flags; | ||
723 | struct page *page; | ||
724 | |||
725 | spin_lock_irqsave(&pgd_lock, flags); | ||
726 | |||
727 | list_for_each_entry(page, &pgd_list, lru) { | ||
728 | if (PageSavePinned(page)) { | ||
729 | BUG_ON(!PagePinned(page)); | ||
730 | printk("unpinning pinned %p\n", page_address(page)); | ||
731 | xen_pgd_unpin((pgd_t *)page_address(page)); | ||
732 | ClearPageSavePinned(page); | ||
733 | } | ||
734 | } | ||
735 | |||
736 | spin_unlock_irqrestore(&pgd_lock, flags); | ||
737 | } | ||
738 | |||
512 | void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next) | 739 | void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next) |
513 | { | 740 | { |
514 | spin_lock(&next->page_table_lock); | 741 | spin_lock(&next->page_table_lock); |
@@ -602,7 +829,7 @@ void xen_exit_mmap(struct mm_struct *mm) | |||
602 | spin_lock(&mm->page_table_lock); | 829 | spin_lock(&mm->page_table_lock); |
603 | 830 | ||
604 | /* pgd may not be pinned in the error exit path of execve */ | 831 | /* pgd may not be pinned in the error exit path of execve */ |
605 | if (PagePinned(virt_to_page(mm->pgd))) | 832 | if (page_pinned(mm->pgd)) |
606 | xen_pgd_unpin(mm->pgd); | 833 | xen_pgd_unpin(mm->pgd); |
607 | 834 | ||
608 | spin_unlock(&mm->page_table_lock); | 835 | spin_unlock(&mm->page_table_lock); |
diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index b5e189b1519d..297bf9f5b8bc 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h | |||
@@ -25,10 +25,6 @@ enum pt_level { | |||
25 | 25 | ||
26 | void set_pte_mfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags); | 26 | void set_pte_mfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags); |
27 | 27 | ||
28 | void xen_set_pte(pte_t *ptep, pte_t pteval); | ||
29 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, | ||
30 | pte_t *ptep, pte_t pteval); | ||
31 | void xen_set_pmd(pmd_t *pmdp, pmd_t pmdval); | ||
32 | 28 | ||
33 | void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next); | 29 | void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next); |
34 | void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm); | 30 | void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm); |
@@ -37,31 +33,27 @@ void xen_exit_mmap(struct mm_struct *mm); | |||
37 | void xen_pgd_pin(pgd_t *pgd); | 33 | void xen_pgd_pin(pgd_t *pgd); |
38 | //void xen_pgd_unpin(pgd_t *pgd); | 34 | //void xen_pgd_unpin(pgd_t *pgd); |
39 | 35 | ||
40 | #ifdef CONFIG_X86_PAE | 36 | pteval_t xen_pte_val(pte_t); |
41 | unsigned long long xen_pte_val(pte_t); | 37 | pmdval_t xen_pmd_val(pmd_t); |
42 | unsigned long long xen_pmd_val(pmd_t); | 38 | pgdval_t xen_pgd_val(pgd_t); |
43 | unsigned long long xen_pgd_val(pgd_t); | ||
44 | 39 | ||
45 | pte_t xen_make_pte(unsigned long long); | 40 | pte_t xen_make_pte(pteval_t); |
46 | pmd_t xen_make_pmd(unsigned long long); | 41 | pmd_t xen_make_pmd(pmdval_t); |
47 | pgd_t xen_make_pgd(unsigned long long); | 42 | pgd_t xen_make_pgd(pgdval_t); |
48 | 43 | ||
44 | void xen_set_pte(pte_t *ptep, pte_t pteval); | ||
49 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, | 45 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, |
50 | pte_t *ptep, pte_t pteval); | 46 | pte_t *ptep, pte_t pteval); |
51 | void xen_set_pte_atomic(pte_t *ptep, pte_t pte); | 47 | void xen_set_pte_atomic(pte_t *ptep, pte_t pte); |
48 | void xen_set_pmd(pmd_t *pmdp, pmd_t pmdval); | ||
52 | void xen_set_pud(pud_t *ptr, pud_t val); | 49 | void xen_set_pud(pud_t *ptr, pud_t val); |
50 | void xen_set_pmd_hyper(pmd_t *pmdp, pmd_t pmdval); | ||
51 | void xen_set_pud_hyper(pud_t *ptr, pud_t val); | ||
53 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); | 52 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); |
54 | void xen_pmd_clear(pmd_t *pmdp); | 53 | void xen_pmd_clear(pmd_t *pmdp); |
55 | 54 | ||
56 | 55 | pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep); | |
57 | #else | 56 | void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, |
58 | unsigned long xen_pte_val(pte_t); | 57 | pte_t *ptep, pte_t pte); |
59 | unsigned long xen_pmd_val(pmd_t); | ||
60 | unsigned long xen_pgd_val(pgd_t); | ||
61 | |||
62 | pte_t xen_make_pte(unsigned long); | ||
63 | pmd_t xen_make_pmd(unsigned long); | ||
64 | pgd_t xen_make_pgd(unsigned long); | ||
65 | #endif | ||
66 | 58 | ||
67 | #endif /* _XEN_MMU_H */ | 59 | #endif /* _XEN_MMU_H */ |
diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c index 5791eb2e3750..3c63c4da7ed1 100644 --- a/arch/x86/xen/multicalls.c +++ b/arch/x86/xen/multicalls.c | |||
@@ -29,14 +29,14 @@ | |||
29 | #define MC_DEBUG 1 | 29 | #define MC_DEBUG 1 |
30 | 30 | ||
31 | #define MC_BATCH 32 | 31 | #define MC_BATCH 32 |
32 | #define MC_ARGS (MC_BATCH * 16 / sizeof(u64)) | 32 | #define MC_ARGS (MC_BATCH * 16) |
33 | 33 | ||
34 | struct mc_buffer { | 34 | struct mc_buffer { |
35 | struct multicall_entry entries[MC_BATCH]; | 35 | struct multicall_entry entries[MC_BATCH]; |
36 | #if MC_DEBUG | 36 | #if MC_DEBUG |
37 | struct multicall_entry debug[MC_BATCH]; | 37 | struct multicall_entry debug[MC_BATCH]; |
38 | #endif | 38 | #endif |
39 | u64 args[MC_ARGS]; | 39 | unsigned char args[MC_ARGS]; |
40 | struct callback { | 40 | struct callback { |
41 | void (*fn)(void *); | 41 | void (*fn)(void *); |
42 | void *data; | 42 | void *data; |
@@ -107,20 +107,48 @@ struct multicall_space __xen_mc_entry(size_t args) | |||
107 | { | 107 | { |
108 | struct mc_buffer *b = &__get_cpu_var(mc_buffer); | 108 | struct mc_buffer *b = &__get_cpu_var(mc_buffer); |
109 | struct multicall_space ret; | 109 | struct multicall_space ret; |
110 | unsigned argspace = (args + sizeof(u64) - 1) / sizeof(u64); | 110 | unsigned argidx = roundup(b->argidx, sizeof(u64)); |
111 | 111 | ||
112 | BUG_ON(preemptible()); | 112 | BUG_ON(preemptible()); |
113 | BUG_ON(argspace > MC_ARGS); | 113 | BUG_ON(b->argidx > MC_ARGS); |
114 | 114 | ||
115 | if (b->mcidx == MC_BATCH || | 115 | if (b->mcidx == MC_BATCH || |
116 | (b->argidx + argspace) > MC_ARGS) | 116 | (argidx + args) > MC_ARGS) { |
117 | xen_mc_flush(); | 117 | xen_mc_flush(); |
118 | argidx = roundup(b->argidx, sizeof(u64)); | ||
119 | } | ||
118 | 120 | ||
119 | ret.mc = &b->entries[b->mcidx]; | 121 | ret.mc = &b->entries[b->mcidx]; |
120 | b->mcidx++; | 122 | b->mcidx++; |
123 | ret.args = &b->args[argidx]; | ||
124 | b->argidx = argidx + args; | ||
125 | |||
126 | BUG_ON(b->argidx > MC_ARGS); | ||
127 | return ret; | ||
128 | } | ||
129 | |||
130 | struct multicall_space xen_mc_extend_args(unsigned long op, size_t size) | ||
131 | { | ||
132 | struct mc_buffer *b = &__get_cpu_var(mc_buffer); | ||
133 | struct multicall_space ret = { NULL, NULL }; | ||
134 | |||
135 | BUG_ON(preemptible()); | ||
136 | BUG_ON(b->argidx > MC_ARGS); | ||
137 | |||
138 | if (b->mcidx == 0) | ||
139 | return ret; | ||
140 | |||
141 | if (b->entries[b->mcidx - 1].op != op) | ||
142 | return ret; | ||
143 | |||
144 | if ((b->argidx + size) > MC_ARGS) | ||
145 | return ret; | ||
146 | |||
147 | ret.mc = &b->entries[b->mcidx - 1]; | ||
121 | ret.args = &b->args[b->argidx]; | 148 | ret.args = &b->args[b->argidx]; |
122 | b->argidx += argspace; | 149 | b->argidx += size; |
123 | 150 | ||
151 | BUG_ON(b->argidx > MC_ARGS); | ||
124 | return ret; | 152 | return ret; |
125 | } | 153 | } |
126 | 154 | ||
diff --git a/arch/x86/xen/multicalls.h b/arch/x86/xen/multicalls.h index 8bae996d99a3..858938241616 100644 --- a/arch/x86/xen/multicalls.h +++ b/arch/x86/xen/multicalls.h | |||
@@ -45,4 +45,16 @@ static inline void xen_mc_issue(unsigned mode) | |||
45 | /* Set up a callback to be called when the current batch is flushed */ | 45 | /* Set up a callback to be called when the current batch is flushed */ |
46 | void xen_mc_callback(void (*fn)(void *), void *data); | 46 | void xen_mc_callback(void (*fn)(void *), void *data); |
47 | 47 | ||
48 | /* | ||
49 | * Try to extend the arguments of the previous multicall command. The | ||
50 | * previous command's op must match. If it does, then it attempts to | ||
51 | * extend the argument space allocated to the multicall entry by | ||
52 | * arg_size bytes. | ||
53 | * | ||
54 | * The returned multicall_space will return with mc pointing to the | ||
55 | * command on success, or NULL on failure, and args pointing to the | ||
56 | * newly allocated space. | ||
57 | */ | ||
58 | struct multicall_space xen_mc_extend_args(unsigned long op, size_t arg_size); | ||
59 | |||
48 | #endif /* _XEN_MULTICALLS_H */ | 60 | #endif /* _XEN_MULTICALLS_H */ |
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 82517e4a752a..488447878a9d 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <asm/xen/hypervisor.h> | 16 | #include <asm/xen/hypervisor.h> |
17 | #include <asm/xen/hypercall.h> | 17 | #include <asm/xen/hypercall.h> |
18 | 18 | ||
19 | #include <xen/page.h> | ||
19 | #include <xen/interface/callback.h> | 20 | #include <xen/interface/callback.h> |
20 | #include <xen/interface/physdev.h> | 21 | #include <xen/interface/physdev.h> |
21 | #include <xen/features.h> | 22 | #include <xen/features.h> |
@@ -27,8 +28,6 @@ | |||
27 | extern const char xen_hypervisor_callback[]; | 28 | extern const char xen_hypervisor_callback[]; |
28 | extern const char xen_failsafe_callback[]; | 29 | extern const char xen_failsafe_callback[]; |
29 | 30 | ||
30 | unsigned long *phys_to_machine_mapping; | ||
31 | EXPORT_SYMBOL(phys_to_machine_mapping); | ||
32 | 31 | ||
33 | /** | 32 | /** |
34 | * machine_specific_memory_setup - Hook for machine specific memory setup. | 33 | * machine_specific_memory_setup - Hook for machine specific memory setup. |
@@ -38,6 +37,8 @@ char * __init xen_memory_setup(void) | |||
38 | { | 37 | { |
39 | unsigned long max_pfn = xen_start_info->nr_pages; | 38 | unsigned long max_pfn = xen_start_info->nr_pages; |
40 | 39 | ||
40 | max_pfn = min(MAX_DOMAIN_PAGES, max_pfn); | ||
41 | |||
41 | e820.nr_map = 0; | 42 | e820.nr_map = 0; |
42 | add_memory_region(0, LOWMEMSIZE(), E820_RAM); | 43 | add_memory_region(0, LOWMEMSIZE(), E820_RAM); |
43 | add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); | 44 | add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 94e69000f982..d2e3c20127d7 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "xen-ops.h" | 35 | #include "xen-ops.h" |
36 | #include "mmu.h" | 36 | #include "mmu.h" |
37 | 37 | ||
38 | static cpumask_t xen_cpu_initialized_map; | 38 | cpumask_t xen_cpu_initialized_map; |
39 | static DEFINE_PER_CPU(int, resched_irq) = -1; | 39 | static DEFINE_PER_CPU(int, resched_irq) = -1; |
40 | static DEFINE_PER_CPU(int, callfunc_irq) = -1; | 40 | static DEFINE_PER_CPU(int, callfunc_irq) = -1; |
41 | static DEFINE_PER_CPU(int, debug_irq) = -1; | 41 | static DEFINE_PER_CPU(int, debug_irq) = -1; |
@@ -65,6 +65,12 @@ static struct call_data_struct *call_data; | |||
65 | */ | 65 | */ |
66 | static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id) | 66 | static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id) |
67 | { | 67 | { |
68 | #ifdef CONFIG_X86_32 | ||
69 | __get_cpu_var(irq_stat).irq_resched_count++; | ||
70 | #else | ||
71 | add_pda(irq_resched_count, 1); | ||
72 | #endif | ||
73 | |||
68 | return IRQ_HANDLED; | 74 | return IRQ_HANDLED; |
69 | } | 75 | } |
70 | 76 | ||
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c new file mode 100644 index 000000000000..251669a932d4 --- /dev/null +++ b/arch/x86/xen/suspend.c | |||
@@ -0,0 +1,45 @@ | |||
1 | #include <linux/types.h> | ||
2 | |||
3 | #include <xen/interface/xen.h> | ||
4 | #include <xen/grant_table.h> | ||
5 | #include <xen/events.h> | ||
6 | |||
7 | #include <asm/xen/hypercall.h> | ||
8 | #include <asm/xen/page.h> | ||
9 | |||
10 | #include "xen-ops.h" | ||
11 | #include "mmu.h" | ||
12 | |||
13 | void xen_pre_suspend(void) | ||
14 | { | ||
15 | xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn); | ||
16 | xen_start_info->console.domU.mfn = | ||
17 | mfn_to_pfn(xen_start_info->console.domU.mfn); | ||
18 | |||
19 | BUG_ON(!irqs_disabled()); | ||
20 | |||
21 | HYPERVISOR_shared_info = &xen_dummy_shared_info; | ||
22 | if (HYPERVISOR_update_va_mapping(fix_to_virt(FIX_PARAVIRT_BOOTMAP), | ||
23 | __pte_ma(0), 0)) | ||
24 | BUG(); | ||
25 | } | ||
26 | |||
27 | void xen_post_suspend(int suspend_cancelled) | ||
28 | { | ||
29 | xen_setup_shared_info(); | ||
30 | |||
31 | if (suspend_cancelled) { | ||
32 | xen_start_info->store_mfn = | ||
33 | pfn_to_mfn(xen_start_info->store_mfn); | ||
34 | xen_start_info->console.domU.mfn = | ||
35 | pfn_to_mfn(xen_start_info->console.domU.mfn); | ||
36 | } else { | ||
37 | #ifdef CONFIG_SMP | ||
38 | xen_cpu_initialized_map = cpu_online_map; | ||
39 | #endif | ||
40 | xen_vcpu_restore(); | ||
41 | xen_timer_resume(); | ||
42 | } | ||
43 | |||
44 | } | ||
45 | |||
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index c39e1a5aa241..64f0038b9558 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c | |||
@@ -12,7 +12,9 @@ | |||
12 | #include <linux/clocksource.h> | 12 | #include <linux/clocksource.h> |
13 | #include <linux/clockchips.h> | 13 | #include <linux/clockchips.h> |
14 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
15 | #include <linux/math64.h> | ||
15 | 16 | ||
17 | #include <asm/pvclock.h> | ||
16 | #include <asm/xen/hypervisor.h> | 18 | #include <asm/xen/hypervisor.h> |
17 | #include <asm/xen/hypercall.h> | 19 | #include <asm/xen/hypercall.h> |
18 | 20 | ||
@@ -30,17 +32,6 @@ | |||
30 | 32 | ||
31 | static cycle_t xen_clocksource_read(void); | 33 | static cycle_t xen_clocksource_read(void); |
32 | 34 | ||
33 | /* These are perodically updated in shared_info, and then copied here. */ | ||
34 | struct shadow_time_info { | ||
35 | u64 tsc_timestamp; /* TSC at last update of time vals. */ | ||
36 | u64 system_timestamp; /* Time, in nanosecs, since boot. */ | ||
37 | u32 tsc_to_nsec_mul; | ||
38 | int tsc_shift; | ||
39 | u32 version; | ||
40 | }; | ||
41 | |||
42 | static DEFINE_PER_CPU(struct shadow_time_info, shadow_time); | ||
43 | |||
44 | /* runstate info updated by Xen */ | 35 | /* runstate info updated by Xen */ |
45 | static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate); | 36 | static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate); |
46 | 37 | ||
@@ -150,11 +141,7 @@ static void do_stolen_accounting(void) | |||
150 | if (stolen < 0) | 141 | if (stolen < 0) |
151 | stolen = 0; | 142 | stolen = 0; |
152 | 143 | ||
153 | ticks = 0; | 144 | ticks = iter_div_u64_rem(stolen, NS_PER_TICK, &stolen); |
154 | while (stolen >= NS_PER_TICK) { | ||
155 | ticks++; | ||
156 | stolen -= NS_PER_TICK; | ||
157 | } | ||
158 | __get_cpu_var(residual_stolen) = stolen; | 145 | __get_cpu_var(residual_stolen) = stolen; |
159 | account_steal_time(NULL, ticks); | 146 | account_steal_time(NULL, ticks); |
160 | 147 | ||
@@ -166,11 +153,7 @@ static void do_stolen_accounting(void) | |||
166 | if (blocked < 0) | 153 | if (blocked < 0) |
167 | blocked = 0; | 154 | blocked = 0; |
168 | 155 | ||
169 | ticks = 0; | 156 | ticks = iter_div_u64_rem(blocked, NS_PER_TICK, &blocked); |
170 | while (blocked >= NS_PER_TICK) { | ||
171 | ticks++; | ||
172 | blocked -= NS_PER_TICK; | ||
173 | } | ||
174 | __get_cpu_var(residual_blocked) = blocked; | 157 | __get_cpu_var(residual_blocked) = blocked; |
175 | account_steal_time(idle_task(smp_processor_id()), ticks); | 158 | account_steal_time(idle_task(smp_processor_id()), ticks); |
176 | } | 159 | } |
@@ -218,7 +201,7 @@ unsigned long long xen_sched_clock(void) | |||
218 | unsigned long xen_cpu_khz(void) | 201 | unsigned long xen_cpu_khz(void) |
219 | { | 202 | { |
220 | u64 xen_khz = 1000000ULL << 32; | 203 | u64 xen_khz = 1000000ULL << 32; |
221 | const struct vcpu_time_info *info = | 204 | const struct pvclock_vcpu_time_info *info = |
222 | &HYPERVISOR_shared_info->vcpu_info[0].time; | 205 | &HYPERVISOR_shared_info->vcpu_info[0].time; |
223 | 206 | ||
224 | do_div(xen_khz, info->tsc_to_system_mul); | 207 | do_div(xen_khz, info->tsc_to_system_mul); |
@@ -230,121 +213,26 @@ unsigned long xen_cpu_khz(void) | |||
230 | return xen_khz; | 213 | return xen_khz; |
231 | } | 214 | } |
232 | 215 | ||
233 | /* | ||
234 | * Reads a consistent set of time-base values from Xen, into a shadow data | ||
235 | * area. | ||
236 | */ | ||
237 | static unsigned get_time_values_from_xen(void) | ||
238 | { | ||
239 | struct vcpu_time_info *src; | ||
240 | struct shadow_time_info *dst; | ||
241 | |||
242 | /* src is shared memory with the hypervisor, so we need to | ||
243 | make sure we get a consistent snapshot, even in the face of | ||
244 | being preempted. */ | ||
245 | src = &__get_cpu_var(xen_vcpu)->time; | ||
246 | dst = &__get_cpu_var(shadow_time); | ||
247 | |||
248 | do { | ||
249 | dst->version = src->version; | ||
250 | rmb(); /* fetch version before data */ | ||
251 | dst->tsc_timestamp = src->tsc_timestamp; | ||
252 | dst->system_timestamp = src->system_time; | ||
253 | dst->tsc_to_nsec_mul = src->tsc_to_system_mul; | ||
254 | dst->tsc_shift = src->tsc_shift; | ||
255 | rmb(); /* test version after fetching data */ | ||
256 | } while ((src->version & 1) | (dst->version ^ src->version)); | ||
257 | |||
258 | return dst->version; | ||
259 | } | ||
260 | |||
261 | /* | ||
262 | * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, | ||
263 | * yielding a 64-bit result. | ||
264 | */ | ||
265 | static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift) | ||
266 | { | ||
267 | u64 product; | ||
268 | #ifdef __i386__ | ||
269 | u32 tmp1, tmp2; | ||
270 | #endif | ||
271 | |||
272 | if (shift < 0) | ||
273 | delta >>= -shift; | ||
274 | else | ||
275 | delta <<= shift; | ||
276 | |||
277 | #ifdef __i386__ | ||
278 | __asm__ ( | ||
279 | "mul %5 ; " | ||
280 | "mov %4,%%eax ; " | ||
281 | "mov %%edx,%4 ; " | ||
282 | "mul %5 ; " | ||
283 | "xor %5,%5 ; " | ||
284 | "add %4,%%eax ; " | ||
285 | "adc %5,%%edx ; " | ||
286 | : "=A" (product), "=r" (tmp1), "=r" (tmp2) | ||
287 | : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); | ||
288 | #elif __x86_64__ | ||
289 | __asm__ ( | ||
290 | "mul %%rdx ; shrd $32,%%rdx,%%rax" | ||
291 | : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); | ||
292 | #else | ||
293 | #error implement me! | ||
294 | #endif | ||
295 | |||
296 | return product; | ||
297 | } | ||
298 | |||
299 | static u64 get_nsec_offset(struct shadow_time_info *shadow) | ||
300 | { | ||
301 | u64 now, delta; | ||
302 | now = native_read_tsc(); | ||
303 | delta = now - shadow->tsc_timestamp; | ||
304 | return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift); | ||
305 | } | ||
306 | |||
307 | static cycle_t xen_clocksource_read(void) | 216 | static cycle_t xen_clocksource_read(void) |
308 | { | 217 | { |
309 | struct shadow_time_info *shadow = &get_cpu_var(shadow_time); | 218 | struct pvclock_vcpu_time_info *src; |
310 | cycle_t ret; | 219 | cycle_t ret; |
311 | unsigned version; | ||
312 | |||
313 | do { | ||
314 | version = get_time_values_from_xen(); | ||
315 | barrier(); | ||
316 | ret = shadow->system_timestamp + get_nsec_offset(shadow); | ||
317 | barrier(); | ||
318 | } while (version != __get_cpu_var(xen_vcpu)->time.version); | ||
319 | |||
320 | put_cpu_var(shadow_time); | ||
321 | 220 | ||
221 | src = &get_cpu_var(xen_vcpu)->time; | ||
222 | ret = pvclock_clocksource_read(src); | ||
223 | put_cpu_var(xen_vcpu); | ||
322 | return ret; | 224 | return ret; |
323 | } | 225 | } |
324 | 226 | ||
325 | static void xen_read_wallclock(struct timespec *ts) | 227 | static void xen_read_wallclock(struct timespec *ts) |
326 | { | 228 | { |
327 | const struct shared_info *s = HYPERVISOR_shared_info; | 229 | struct shared_info *s = HYPERVISOR_shared_info; |
328 | u32 version; | 230 | struct pvclock_wall_clock *wall_clock = &(s->wc); |
329 | u64 delta; | 231 | struct pvclock_vcpu_time_info *vcpu_time; |
330 | struct timespec now; | ||
331 | |||
332 | /* get wallclock at system boot */ | ||
333 | do { | ||
334 | version = s->wc_version; | ||
335 | rmb(); /* fetch version before time */ | ||
336 | now.tv_sec = s->wc_sec; | ||
337 | now.tv_nsec = s->wc_nsec; | ||
338 | rmb(); /* fetch time before checking version */ | ||
339 | } while ((s->wc_version & 1) | (version ^ s->wc_version)); | ||
340 | |||
341 | delta = xen_clocksource_read(); /* time since system boot */ | ||
342 | delta += now.tv_sec * (u64)NSEC_PER_SEC + now.tv_nsec; | ||
343 | |||
344 | now.tv_nsec = do_div(delta, NSEC_PER_SEC); | ||
345 | now.tv_sec = delta; | ||
346 | 232 | ||
347 | set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); | 233 | vcpu_time = &get_cpu_var(xen_vcpu)->time; |
234 | pvclock_read_wallclock(wall_clock, vcpu_time, ts); | ||
235 | put_cpu_var(xen_vcpu); | ||
348 | } | 236 | } |
349 | 237 | ||
350 | unsigned long xen_get_wallclock(void) | 238 | unsigned long xen_get_wallclock(void) |
@@ -352,7 +240,6 @@ unsigned long xen_get_wallclock(void) | |||
352 | struct timespec ts; | 240 | struct timespec ts; |
353 | 241 | ||
354 | xen_read_wallclock(&ts); | 242 | xen_read_wallclock(&ts); |
355 | |||
356 | return ts.tv_sec; | 243 | return ts.tv_sec; |
357 | } | 244 | } |
358 | 245 | ||
@@ -572,12 +459,23 @@ void xen_setup_cpu_clockevents(void) | |||
572 | clockevents_register_device(&__get_cpu_var(xen_clock_events)); | 459 | clockevents_register_device(&__get_cpu_var(xen_clock_events)); |
573 | } | 460 | } |
574 | 461 | ||
462 | void xen_timer_resume(void) | ||
463 | { | ||
464 | int cpu; | ||
465 | |||
466 | if (xen_clockevent != &xen_vcpuop_clockevent) | ||
467 | return; | ||
468 | |||
469 | for_each_online_cpu(cpu) { | ||
470 | if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL)) | ||
471 | BUG(); | ||
472 | } | ||
473 | } | ||
474 | |||
575 | __init void xen_time_init(void) | 475 | __init void xen_time_init(void) |
576 | { | 476 | { |
577 | int cpu = smp_processor_id(); | 477 | int cpu = smp_processor_id(); |
578 | 478 | ||
579 | get_time_values_from_xen(); | ||
580 | |||
581 | clocksource_register(&xen_clocksource); | 479 | clocksource_register(&xen_clocksource); |
582 | 480 | ||
583 | if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) { | 481 | if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) { |
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 288d587ce73c..7c0cf6320a0a 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
8 | #include <asm/boot.h> | 8 | #include <asm/boot.h> |
9 | #include <xen/interface/elfnote.h> | 9 | #include <xen/interface/elfnote.h> |
10 | #include <asm/xen/interface.h> | ||
10 | 11 | ||
11 | __INIT | 12 | __INIT |
12 | ENTRY(startup_xen) | 13 | ENTRY(startup_xen) |
@@ -17,7 +18,7 @@ ENTRY(startup_xen) | |||
17 | 18 | ||
18 | __FINIT | 19 | __FINIT |
19 | 20 | ||
20 | .pushsection .bss.page_aligned | 21 | .pushsection .text |
21 | .align PAGE_SIZE_asm | 22 | .align PAGE_SIZE_asm |
22 | ENTRY(hypercall_page) | 23 | ENTRY(hypercall_page) |
23 | .skip 0x1000 | 24 | .skip 0x1000 |
@@ -30,11 +31,11 @@ ENTRY(hypercall_page) | |||
30 | ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long startup_xen) | 31 | ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long startup_xen) |
31 | ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long hypercall_page) | 32 | ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long hypercall_page) |
32 | ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") | 33 | ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") |
33 | #ifdef CONFIG_X86_PAE | ||
34 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") | 34 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") |
35 | #else | ||
36 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "no") | ||
37 | #endif | ||
38 | ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") | 35 | ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") |
36 | ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, | ||
37 | .quad _PAGE_PRESENT; .quad _PAGE_PRESENT) | ||
38 | ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1) | ||
39 | ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, .long __HYPERVISOR_VIRT_START) | ||
39 | 40 | ||
40 | #endif /*CONFIG_XEN */ | 41 | #endif /*CONFIG_XEN */ |
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index f1063ae08037..9a055592a307 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
@@ -9,18 +9,26 @@ | |||
9 | extern const char xen_hypervisor_callback[]; | 9 | extern const char xen_hypervisor_callback[]; |
10 | extern const char xen_failsafe_callback[]; | 10 | extern const char xen_failsafe_callback[]; |
11 | 11 | ||
12 | struct trap_info; | ||
12 | void xen_copy_trap_info(struct trap_info *traps); | 13 | void xen_copy_trap_info(struct trap_info *traps); |
13 | 14 | ||
14 | DECLARE_PER_CPU(unsigned long, xen_cr3); | 15 | DECLARE_PER_CPU(unsigned long, xen_cr3); |
15 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); | 16 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); |
16 | 17 | ||
17 | extern struct start_info *xen_start_info; | 18 | extern struct start_info *xen_start_info; |
19 | extern struct shared_info xen_dummy_shared_info; | ||
18 | extern struct shared_info *HYPERVISOR_shared_info; | 20 | extern struct shared_info *HYPERVISOR_shared_info; |
19 | 21 | ||
22 | void xen_setup_mfn_list_list(void); | ||
23 | void xen_setup_shared_info(void); | ||
24 | |||
20 | char * __init xen_memory_setup(void); | 25 | char * __init xen_memory_setup(void); |
21 | void __init xen_arch_setup(void); | 26 | void __init xen_arch_setup(void); |
22 | void __init xen_init_IRQ(void); | 27 | void __init xen_init_IRQ(void); |
23 | void xen_enable_sysenter(void); | 28 | void xen_enable_sysenter(void); |
29 | void xen_vcpu_restore(void); | ||
30 | |||
31 | void __init xen_build_dynamic_phys_to_machine(void); | ||
24 | 32 | ||
25 | void xen_setup_timer(int cpu); | 33 | void xen_setup_timer(int cpu); |
26 | void xen_setup_cpu_clockevents(void); | 34 | void xen_setup_cpu_clockevents(void); |
@@ -29,6 +37,7 @@ void __init xen_time_init(void); | |||
29 | unsigned long xen_get_wallclock(void); | 37 | unsigned long xen_get_wallclock(void); |
30 | int xen_set_wallclock(unsigned long time); | 38 | int xen_set_wallclock(unsigned long time); |
31 | unsigned long long xen_sched_clock(void); | 39 | unsigned long long xen_sched_clock(void); |
40 | void xen_timer_resume(void); | ||
32 | 41 | ||
33 | irqreturn_t xen_debug_interrupt(int irq, void *dev_id); | 42 | irqreturn_t xen_debug_interrupt(int irq, void *dev_id); |
34 | 43 | ||
@@ -54,6 +63,8 @@ int xen_smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
54 | int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *), | 63 | int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *), |
55 | void *info, int wait); | 64 | void *info, int wait); |
56 | 65 | ||
66 | extern cpumask_t xen_cpu_initialized_map; | ||
67 | |||
57 | 68 | ||
58 | /* Declare an asm function, along with symbols needed to make it | 69 | /* Declare an asm function, along with symbols needed to make it |
59 | inlineable */ | 70 | inlineable */ |