diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:20:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:20:28 -0400 |
| commit | faeca31d068090285b77c39574d2bda14b079c50 (patch) | |
| tree | 789841a7f0d336b24a74f2191542a2eb8177c8fa /arch | |
| parent | 499f8f84b8324ba27d756e03f373fa16eeed9ccc (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/pat
Diffstat (limited to 'arch')
347 files changed, 4576 insertions, 2885 deletions
diff --git a/arch/alpha/kernel/init_task.c b/arch/alpha/kernel/init_task.c index 835d09a7b332..1f762189fa64 100644 --- a/arch/alpha/kernel/init_task.c +++ b/arch/alpha/kernel/init_task.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | static struct fs_struct init_fs = INIT_FS; | 11 | static struct fs_struct init_fs = INIT_FS; |
| 12 | static struct files_struct init_files = INIT_FILES; | ||
| 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 15 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/kernel/init_task.c b/arch/arm/kernel/init_task.c index bd4ef53bc6b9..8b8c9d38a761 100644 --- a/arch/arm/kernel/init_task.c +++ b/arch/arm/kernel/init_task.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
| 14 | 14 | ||
| 15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
| 16 | static struct files_struct init_files = INIT_FILES; | ||
| 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
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-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-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-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/kernel/init_task.c b/arch/avr32/kernel/init_task.c index effcacf9d1a2..44058469c6ec 100644 --- a/arch/avr32/kernel/init_task.c +++ b/arch/avr32/kernel/init_task.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
| 15 | 15 | ||
| 16 | static struct fs_struct init_fs = INIT_FS; | 16 | static struct fs_struct init_fs = INIT_FS; |
| 17 | static struct files_struct init_files = INIT_FILES; | ||
| 18 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 19 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 20 | struct mm_struct init_mm = INIT_MM(init_mm); | 19 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/Kconfig b/arch/blackfin/Kconfig index fd5708523f2e..b87634e75f20 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -479,16 +479,6 @@ comment "Memory Setup" | |||
| 479 | 479 | ||
| 480 | comment "Misc" | 480 | comment "Misc" |
| 481 | 481 | ||
| 482 | config ENET_FLASH_PIN | ||
| 483 | int "PF port/pin used for flash and ethernet sharing" | ||
| 484 | depends on (BFIN533_STAMP) | ||
| 485 | default 0 | ||
| 486 | help | ||
| 487 | PF port/pin used for flash and ethernet sharing to allow other PF | ||
| 488 | pins to be used on other platforms without having to touch common | ||
| 489 | code. | ||
| 490 | For example: PF0 --> 0,PF1 --> 1,PF2 --> 2, etc. | ||
| 491 | |||
| 492 | choice | 482 | choice |
| 493 | prompt "Blackfin Exception Scratch Register" | 483 | prompt "Blackfin Exception Scratch Register" |
| 494 | default BFIN_SCRATCH_REG_RETN | 484 | default BFIN_SCRATCH_REG_RETN |
| @@ -695,6 +685,8 @@ choice | |||
| 695 | prompt "Uncached SDRAM region" | 685 | prompt "Uncached SDRAM region" |
| 696 | default DMA_UNCACHED_1M | 686 | default DMA_UNCACHED_1M |
| 697 | depends on BFIN_DMA_5XX | 687 | depends on BFIN_DMA_5XX |
| 688 | config DMA_UNCACHED_4M | ||
| 689 | bool "Enable 4M DMA region" | ||
| 698 | config DMA_UNCACHED_2M | 690 | config DMA_UNCACHED_2M |
| 699 | bool "Enable 2M DMA region" | 691 | bool "Enable 2M DMA region" |
| 700 | config DMA_UNCACHED_1M | 692 | config DMA_UNCACHED_1M |
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index 64876dfc2e55..5e6fb9d8e50f 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig | |||
| @@ -1,6 +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.22.16 | 3 | # Linux kernel version: 2.6.24.7 |
| 4 | # Fri May 16 10:02:29 2008 | ||
| 4 | # | 5 | # |
| 5 | # CONFIG_MMU is not set | 6 | # CONFIG_MMU is not set |
| 6 | # CONFIG_FPU is not set | 7 | # CONFIG_FPU is not set |
| @@ -13,35 +14,34 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_HARDIRQS=y | 15 | CONFIG_GENERIC_HARDIRQS=y |
| 15 | CONFIG_GENERIC_IRQ_PROBE=y | 16 | CONFIG_GENERIC_IRQ_PROBE=y |
| 16 | CONFIG_GENERIC_TIME=y | ||
| 17 | CONFIG_GENERIC_GPIO=y | 17 | CONFIG_GENERIC_GPIO=y |
| 18 | CONFIG_FORCE_MAX_ZONEORDER=14 | 18 | CONFIG_FORCE_MAX_ZONEORDER=14 |
| 19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 19 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 21 | 21 | ||
| 22 | # | 22 | # |
| 23 | # Code maturity level options | 23 | # General setup |
| 24 | # | 24 | # |
| 25 | CONFIG_EXPERIMENTAL=y | 25 | CONFIG_EXPERIMENTAL=y |
| 26 | CONFIG_BROKEN_ON_SMP=y | 26 | CONFIG_BROKEN_ON_SMP=y |
| 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 28 | |||
| 29 | # | ||
| 30 | # General setup | ||
| 31 | # | ||
| 32 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
| 33 | CONFIG_LOCALVERSION_AUTO=y | 29 | CONFIG_LOCALVERSION_AUTO=y |
| 34 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
| 35 | # CONFIG_IPC_NS is not set | ||
| 36 | CONFIG_SYSVIPC_SYSCTL=y | 31 | CONFIG_SYSVIPC_SYSCTL=y |
| 37 | # CONFIG_POSIX_MQUEUE is not set | 32 | # CONFIG_POSIX_MQUEUE is not set |
| 38 | # CONFIG_BSD_PROCESS_ACCT is not set | 33 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 39 | # CONFIG_TASKSTATS is not set | 34 | # CONFIG_TASKSTATS is not set |
| 40 | # CONFIG_UTS_NS is not set | 35 | # CONFIG_USER_NS is not set |
| 36 | # CONFIG_PID_NS is not set | ||
| 41 | # CONFIG_AUDIT is not set | 37 | # CONFIG_AUDIT is not set |
| 42 | CONFIG_IKCONFIG=y | 38 | CONFIG_IKCONFIG=y |
| 43 | CONFIG_IKCONFIG_PROC=y | 39 | CONFIG_IKCONFIG_PROC=y |
| 44 | CONFIG_LOG_BUF_SHIFT=14 | 40 | CONFIG_LOG_BUF_SHIFT=14 |
| 41 | # CONFIG_CGROUPS is not set | ||
| 42 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 43 | CONFIG_FAIR_USER_SCHED=y | ||
| 44 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 45 | CONFIG_SYSFS_DEPRECATED=y | 45 | CONFIG_SYSFS_DEPRECATED=y |
| 46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
| 47 | CONFIG_BLK_DEV_INITRD=y | 47 | CONFIG_BLK_DEV_INITRD=y |
| @@ -64,32 +64,24 @@ CONFIG_EPOLL=y | |||
| 64 | CONFIG_SIGNALFD=y | 64 | CONFIG_SIGNALFD=y |
| 65 | CONFIG_EVENTFD=y | 65 | CONFIG_EVENTFD=y |
| 66 | CONFIG_VM_EVENT_COUNTERS=y | 66 | CONFIG_VM_EVENT_COUNTERS=y |
| 67 | CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 | ||
| 68 | # CONFIG_NP2 is not set | ||
| 69 | CONFIG_SLAB=y | 67 | CONFIG_SLAB=y |
| 70 | # CONFIG_SLUB is not set | 68 | # CONFIG_SLUB is not set |
| 71 | # CONFIG_SLOB is not set | 69 | # CONFIG_SLOB is not set |
| 70 | CONFIG_SLABINFO=y | ||
| 72 | CONFIG_RT_MUTEXES=y | 71 | CONFIG_RT_MUTEXES=y |
| 73 | CONFIG_TINY_SHMEM=y | 72 | CONFIG_TINY_SHMEM=y |
| 74 | CONFIG_BASE_SMALL=0 | 73 | CONFIG_BASE_SMALL=0 |
| 75 | |||
| 76 | # | ||
| 77 | # Loadable module support | ||
| 78 | # | ||
| 79 | CONFIG_MODULES=y | 74 | CONFIG_MODULES=y |
| 80 | CONFIG_MODULE_UNLOAD=y | 75 | CONFIG_MODULE_UNLOAD=y |
| 81 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 76 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 82 | # CONFIG_MODVERSIONS is not set | 77 | # CONFIG_MODVERSIONS is not set |
| 83 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 78 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 84 | CONFIG_KMOD=y | 79 | CONFIG_KMOD=y |
| 85 | |||
| 86 | # | ||
| 87 | # Block layer | ||
| 88 | # | ||
| 89 | CONFIG_BLOCK=y | 80 | CONFIG_BLOCK=y |
| 90 | # CONFIG_LBD is not set | 81 | # CONFIG_LBD is not set |
| 91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 82 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 92 | # CONFIG_LSF is not set | 83 | # CONFIG_LSF is not set |
| 84 | # CONFIG_BLK_DEV_BSG is not set | ||
| 93 | 85 | ||
| 94 | # | 86 | # |
| 95 | # IO Schedulers | 87 | # IO Schedulers |
| @@ -141,7 +133,6 @@ CONFIG_BF_REV_0_0=y | |||
| 141 | # CONFIG_BF_REV_ANY is not set | 133 | # CONFIG_BF_REV_ANY is not set |
| 142 | # CONFIG_BF_REV_NONE is not set | 134 | # CONFIG_BF_REV_NONE is not set |
| 143 | CONFIG_BF52x=y | 135 | CONFIG_BF52x=y |
| 144 | CONFIG_BFIN_SINGLE_CORE=y | ||
| 145 | CONFIG_MEM_MT48LC32M16A2TG_75=y | 136 | CONFIG_MEM_MT48LC32M16A2TG_75=y |
| 146 | CONFIG_BFIN527_EZKIT=y | 137 | CONFIG_BFIN527_EZKIT=y |
| 147 | 138 | ||
| @@ -227,12 +218,14 @@ CONFIG_IRQ_USB_DMA=11 | |||
| 227 | # Board customizations | 218 | # Board customizations |
| 228 | # | 219 | # |
| 229 | # CONFIG_CMDLINE_BOOL is not set | 220 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | CONFIG_BOOT_LOAD=0x1000 | ||
| 230 | 222 | ||
| 231 | # | 223 | # |
| 232 | # Clock/PLL Setup | 224 | # Clock/PLL Setup |
| 233 | # | 225 | # |
| 234 | CONFIG_CLKIN_HZ=25000000 | 226 | CONFIG_CLKIN_HZ=25000000 |
| 235 | # CONFIG_BFIN_KERNEL_CLOCK is not set | 227 | # CONFIG_BFIN_KERNEL_CLOCK is not set |
| 228 | CONFIG_MAX_MEM_SIZE=512 | ||
| 236 | CONFIG_MAX_VCO_HZ=600000000 | 229 | CONFIG_MAX_VCO_HZ=600000000 |
| 237 | CONFIG_MIN_VCO_HZ=50000000 | 230 | CONFIG_MIN_VCO_HZ=50000000 |
| 238 | CONFIG_MAX_SCLK_HZ=133333333 | 231 | CONFIG_MAX_SCLK_HZ=133333333 |
| @@ -246,13 +239,17 @@ CONFIG_HZ_250=y | |||
| 246 | # CONFIG_HZ_300 is not set | 239 | # CONFIG_HZ_300 is not set |
| 247 | # CONFIG_HZ_1000 is not set | 240 | # CONFIG_HZ_1000 is not set |
| 248 | CONFIG_HZ=250 | 241 | CONFIG_HZ=250 |
| 242 | CONFIG_GENERIC_TIME=y | ||
| 243 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 244 | # CONFIG_CYCLES_CLOCKSOURCE is not set | ||
| 245 | # CONFIG_TICK_ONESHOT is not set | ||
| 246 | # CONFIG_NO_HZ is not set | ||
| 247 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 248 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 249 | 249 | ||
| 250 | # | 250 | # |
| 251 | # Memory Setup | 251 | # Misc |
| 252 | # | 252 | # |
| 253 | CONFIG_MAX_MEM_SIZE=512 | ||
| 254 | CONFIG_MEM_ADD_WIDTH=10 | ||
| 255 | CONFIG_BOOT_LOAD=0x1000 | ||
| 256 | CONFIG_BFIN_SCRATCH_REG_RETN=y | 253 | CONFIG_BFIN_SCRATCH_REG_RETN=y |
| 257 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set | 254 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set |
| 258 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set | 255 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set |
| @@ -288,12 +285,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 288 | CONFIG_FLATMEM=y | 285 | CONFIG_FLATMEM=y |
| 289 | CONFIG_FLAT_NODE_MEM_MAP=y | 286 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 290 | # CONFIG_SPARSEMEM_STATIC is not set | 287 | # CONFIG_SPARSEMEM_STATIC is not set |
| 288 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 291 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 289 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 292 | # CONFIG_RESOURCES_64BIT is not set | 290 | # CONFIG_RESOURCES_64BIT is not set |
| 293 | CONFIG_ZONE_DMA_FLAG=1 | 291 | CONFIG_ZONE_DMA_FLAG=1 |
| 294 | CONFIG_LARGE_ALLOCS=y | 292 | CONFIG_VIRT_TO_BUS=y |
| 295 | # CONFIG_BFIN_GPTIMERS is not set | 293 | # CONFIG_BFIN_GPTIMERS is not set |
| 296 | CONFIG_BFIN_DMA_5XX=y | 294 | CONFIG_BFIN_DMA_5XX=y |
| 295 | # CONFIG_DMA_UNCACHED_4M is not set | ||
| 297 | # CONFIG_DMA_UNCACHED_2M is not set | 296 | # CONFIG_DMA_UNCACHED_2M is not set |
| 298 | CONFIG_DMA_UNCACHED_1M=y | 297 | CONFIG_DMA_UNCACHED_1M=y |
| 299 | # CONFIG_DMA_UNCACHED_NONE is not set | 298 | # CONFIG_DMA_UNCACHED_NONE is not set |
| @@ -338,10 +337,6 @@ CONFIG_BANK_3=0xFFC0 | |||
| 338 | # | 337 | # |
| 339 | # CONFIG_PCI is not set | 338 | # CONFIG_PCI is not set |
| 340 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 339 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 341 | |||
| 342 | # | ||
| 343 | # PCCARD (PCMCIA/CardBus) support | ||
| 344 | # | ||
| 345 | # CONFIG_PCCARD is not set | 340 | # CONFIG_PCCARD is not set |
| 346 | 341 | ||
| 347 | # | 342 | # |
| @@ -357,9 +352,15 @@ CONFIG_BINFMT_ZFLAT=y | |||
| 357 | # Power management options | 352 | # Power management options |
| 358 | # | 353 | # |
| 359 | # CONFIG_PM is not set | 354 | # CONFIG_PM is not set |
| 355 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 360 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | 356 | # CONFIG_PM_WAKEUP_BY_GPIO is not set |
| 361 | 357 | ||
| 362 | # | 358 | # |
| 359 | # CPU Frequency scaling | ||
| 360 | # | ||
| 361 | # CONFIG_CPU_FREQ is not set | ||
| 362 | |||
| 363 | # | ||
| 363 | # Networking | 364 | # Networking |
| 364 | # | 365 | # |
| 365 | CONFIG_NET=y | 366 | CONFIG_NET=y |
| @@ -395,6 +396,7 @@ CONFIG_SYN_COOKIES=y | |||
| 395 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 396 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 396 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 397 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 397 | CONFIG_INET_XFRM_MODE_BEET=y | 398 | CONFIG_INET_XFRM_MODE_BEET=y |
| 399 | # CONFIG_INET_LRO is not set | ||
| 398 | CONFIG_INET_DIAG=y | 400 | CONFIG_INET_DIAG=y |
| 399 | CONFIG_INET_TCP_DIAG=y | 401 | CONFIG_INET_TCP_DIAG=y |
| 400 | # CONFIG_TCP_CONG_ADVANCED is not set | 402 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -421,10 +423,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 421 | # CONFIG_LAPB is not set | 423 | # CONFIG_LAPB is not set |
| 422 | # CONFIG_ECONET is not set | 424 | # CONFIG_ECONET is not set |
| 423 | # CONFIG_WAN_ROUTER is not set | 425 | # CONFIG_WAN_ROUTER is not set |
| 424 | |||
| 425 | # | ||
| 426 | # QoS and/or fair queueing | ||
| 427 | # | ||
| 428 | # CONFIG_NET_SCHED is not set | 426 | # CONFIG_NET_SCHED is not set |
| 429 | 427 | ||
| 430 | # | 428 | # |
| @@ -444,6 +442,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 444 | # CONFIG_MAC80211 is not set | 442 | # CONFIG_MAC80211 is not set |
| 445 | # CONFIG_IEEE80211 is not set | 443 | # CONFIG_IEEE80211 is not set |
| 446 | # CONFIG_RFKILL is not set | 444 | # CONFIG_RFKILL is not set |
| 445 | # CONFIG_NET_9P is not set | ||
| 447 | 446 | ||
| 448 | # | 447 | # |
| 449 | # Device Drivers | 448 | # Device Drivers |
| @@ -452,14 +451,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 452 | # | 451 | # |
| 453 | # Generic Driver Options | 452 | # Generic Driver Options |
| 454 | # | 453 | # |
| 454 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 455 | CONFIG_STANDALONE=y | 455 | CONFIG_STANDALONE=y |
| 456 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 456 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 457 | # CONFIG_FW_LOADER is not set | 457 | # CONFIG_FW_LOADER is not set |
| 458 | # CONFIG_SYS_HYPERVISOR is not set | 458 | # CONFIG_SYS_HYPERVISOR is not set |
| 459 | |||
| 460 | # | ||
| 461 | # Connector - unified userspace <-> kernelspace linker | ||
| 462 | # | ||
| 463 | # CONFIG_CONNECTOR is not set | 459 | # CONFIG_CONNECTOR is not set |
| 464 | CONFIG_MTD=y | 460 | CONFIG_MTD=y |
| 465 | # CONFIG_MTD_DEBUG is not set | 461 | # CONFIG_MTD_DEBUG is not set |
| @@ -479,6 +475,7 @@ CONFIG_MTD_BLOCK=y | |||
| 479 | # CONFIG_INFTL is not set | 475 | # CONFIG_INFTL is not set |
| 480 | # CONFIG_RFD_FTL is not set | 476 | # CONFIG_RFD_FTL is not set |
| 481 | # CONFIG_SSFDC is not set | 477 | # CONFIG_SSFDC is not set |
| 478 | # CONFIG_MTD_OOPS is not set | ||
| 482 | 479 | ||
| 483 | # | 480 | # |
| 484 | # RAM/ROM/Flash chip drivers | 481 | # RAM/ROM/Flash chip drivers |
| @@ -542,39 +539,27 @@ CONFIG_MTD_NAND_IDS=m | |||
| 542 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 539 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 543 | # CONFIG_MTD_NAND_NANDSIM is not set | 540 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 544 | # CONFIG_MTD_NAND_PLATFORM is not set | 541 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 542 | # CONFIG_MTD_ALAUDA is not set | ||
| 545 | # CONFIG_MTD_ONENAND is not set | 543 | # CONFIG_MTD_ONENAND is not set |
| 546 | 544 | ||
| 547 | # | 545 | # |
| 548 | # UBI - Unsorted block images | 546 | # UBI - Unsorted block images |
| 549 | # | 547 | # |
| 550 | # CONFIG_MTD_UBI is not set | 548 | # CONFIG_MTD_UBI is not set |
| 551 | |||
| 552 | # | ||
| 553 | # Parallel port support | ||
| 554 | # | ||
| 555 | # CONFIG_PARPORT is not set | 549 | # CONFIG_PARPORT is not set |
| 556 | 550 | CONFIG_BLK_DEV=y | |
| 557 | # | ||
| 558 | # Plug and Play support | ||
| 559 | # | ||
| 560 | # CONFIG_PNPACPI is not set | ||
| 561 | |||
| 562 | # | ||
| 563 | # Block devices | ||
| 564 | # | ||
| 565 | # CONFIG_BLK_DEV_COW_COMMON is not set | 551 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 566 | # CONFIG_BLK_DEV_LOOP is not set | 552 | # CONFIG_BLK_DEV_LOOP is not set |
| 567 | # CONFIG_BLK_DEV_NBD is not set | 553 | # CONFIG_BLK_DEV_NBD is not set |
| 554 | # CONFIG_BLK_DEV_UB is not set | ||
| 568 | CONFIG_BLK_DEV_RAM=y | 555 | CONFIG_BLK_DEV_RAM=y |
| 569 | CONFIG_BLK_DEV_RAM_COUNT=16 | 556 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 570 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 557 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 571 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 558 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 572 | # CONFIG_CDROM_PKTCDVD is not set | 559 | # CONFIG_CDROM_PKTCDVD is not set |
| 573 | # CONFIG_ATA_OVER_ETH is not set | 560 | # CONFIG_ATA_OVER_ETH is not set |
| 574 | 561 | CONFIG_MISC_DEVICES=y | |
| 575 | # | 562 | # CONFIG_EEPROM_93CX6 is not set |
| 576 | # Misc devices | ||
| 577 | # | ||
| 578 | # CONFIG_IDE is not set | 563 | # CONFIG_IDE is not set |
| 579 | 564 | ||
| 580 | # | 565 | # |
| @@ -582,22 +567,18 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 582 | # | 567 | # |
| 583 | # CONFIG_RAID_ATTRS is not set | 568 | # CONFIG_RAID_ATTRS is not set |
| 584 | # CONFIG_SCSI is not set | 569 | # CONFIG_SCSI is not set |
| 570 | # CONFIG_SCSI_DMA is not set | ||
| 585 | # CONFIG_SCSI_NETLINK is not set | 571 | # CONFIG_SCSI_NETLINK is not set |
| 586 | # CONFIG_ATA is not set | 572 | # CONFIG_ATA is not set |
| 587 | |||
| 588 | # | ||
| 589 | # Multi-device support (RAID and LVM) | ||
| 590 | # | ||
| 591 | # CONFIG_MD is not set | 573 | # CONFIG_MD is not set |
| 592 | |||
| 593 | # | ||
| 594 | # Network device support | ||
| 595 | # | ||
| 596 | CONFIG_NETDEVICES=y | 574 | CONFIG_NETDEVICES=y |
| 575 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 597 | # CONFIG_DUMMY is not set | 576 | # CONFIG_DUMMY is not set |
| 598 | # CONFIG_BONDING is not set | 577 | # CONFIG_BONDING is not set |
| 578 | # CONFIG_MACVLAN is not set | ||
| 599 | # CONFIG_EQUALIZER is not set | 579 | # CONFIG_EQUALIZER is not set |
| 600 | # CONFIG_TUN is not set | 580 | # CONFIG_TUN is not set |
| 581 | # CONFIG_VETH is not set | ||
| 601 | CONFIG_PHYLIB=y | 582 | CONFIG_PHYLIB=y |
| 602 | 583 | ||
| 603 | # | 584 | # |
| @@ -611,21 +592,24 @@ CONFIG_PHYLIB=y | |||
| 611 | # CONFIG_VITESSE_PHY is not set | 592 | # CONFIG_VITESSE_PHY is not set |
| 612 | # CONFIG_SMSC_PHY is not set | 593 | # CONFIG_SMSC_PHY is not set |
| 613 | # CONFIG_BROADCOM_PHY is not set | 594 | # CONFIG_BROADCOM_PHY is not set |
| 595 | # CONFIG_ICPLUS_PHY is not set | ||
| 614 | # CONFIG_FIXED_PHY is not set | 596 | # CONFIG_FIXED_PHY is not set |
| 615 | 597 | # CONFIG_MDIO_BITBANG is not set | |
| 616 | # | ||
| 617 | # Ethernet (10 or 100Mbit) | ||
| 618 | # | ||
| 619 | CONFIG_NET_ETHERNET=y | 598 | CONFIG_NET_ETHERNET=y |
| 620 | CONFIG_MII=y | 599 | CONFIG_MII=y |
| 621 | # CONFIG_SMC91X is not set | ||
| 622 | CONFIG_BFIN_MAC=y | 600 | CONFIG_BFIN_MAC=y |
| 623 | CONFIG_BFIN_MAC_USE_L1=y | 601 | CONFIG_BFIN_MAC_USE_L1=y |
| 624 | CONFIG_BFIN_TX_DESC_NUM=10 | 602 | CONFIG_BFIN_TX_DESC_NUM=10 |
| 625 | CONFIG_BFIN_RX_DESC_NUM=20 | 603 | CONFIG_BFIN_RX_DESC_NUM=20 |
| 626 | CONFIG_BFIN_MAC_RMII=y | 604 | CONFIG_BFIN_MAC_RMII=y |
| 605 | # CONFIG_SMC91X is not set | ||
| 627 | # CONFIG_SMSC911X is not set | 606 | # CONFIG_SMSC911X is not set |
| 628 | # CONFIG_DM9000 is not set | 607 | # CONFIG_DM9000 is not set |
| 608 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 609 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 610 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 611 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 612 | # CONFIG_B44 is not set | ||
| 629 | CONFIG_NETDEV_1000=y | 613 | CONFIG_NETDEV_1000=y |
| 630 | # CONFIG_AX88180 is not set | 614 | # CONFIG_AX88180 is not set |
| 631 | CONFIG_NETDEV_10000=y | 615 | CONFIG_NETDEV_10000=y |
| @@ -635,6 +619,15 @@ CONFIG_NETDEV_10000=y | |||
| 635 | # | 619 | # |
| 636 | # CONFIG_WLAN_PRE80211 is not set | 620 | # CONFIG_WLAN_PRE80211 is not set |
| 637 | # CONFIG_WLAN_80211 is not set | 621 | # CONFIG_WLAN_80211 is not set |
| 622 | |||
| 623 | # | ||
| 624 | # USB Network Adapters | ||
| 625 | # | ||
| 626 | # CONFIG_USB_CATC is not set | ||
| 627 | # CONFIG_USB_KAWETH is not set | ||
| 628 | # CONFIG_USB_PEGASUS is not set | ||
| 629 | # CONFIG_USB_RTL8150 is not set | ||
| 630 | # CONFIG_USB_USBNET is not set | ||
| 638 | # CONFIG_WAN is not set | 631 | # CONFIG_WAN is not set |
| 639 | # CONFIG_PPP is not set | 632 | # CONFIG_PPP is not set |
| 640 | # CONFIG_SLIP is not set | 633 | # CONFIG_SLIP is not set |
| @@ -642,15 +635,7 @@ CONFIG_NETDEV_10000=y | |||
| 642 | # CONFIG_NETCONSOLE is not set | 635 | # CONFIG_NETCONSOLE is not set |
| 643 | # CONFIG_NETPOLL is not set | 636 | # CONFIG_NETPOLL is not set |
| 644 | # CONFIG_NET_POLL_CONTROLLER is not set | 637 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 645 | |||
| 646 | # | ||
| 647 | # ISDN subsystem | ||
| 648 | # | ||
| 649 | # CONFIG_ISDN is not set | 638 | # CONFIG_ISDN is not set |
| 650 | |||
| 651 | # | ||
| 652 | # Telephony Support | ||
| 653 | # | ||
| 654 | # CONFIG_PHONE is not set | 639 | # CONFIG_PHONE is not set |
| 655 | 640 | ||
| 656 | # | 641 | # |
| @@ -665,7 +650,6 @@ CONFIG_INPUT=y | |||
| 665 | # | 650 | # |
| 666 | # CONFIG_INPUT_MOUSEDEV is not set | 651 | # CONFIG_INPUT_MOUSEDEV is not set |
| 667 | # CONFIG_INPUT_JOYDEV is not set | 652 | # CONFIG_INPUT_JOYDEV is not set |
| 668 | # CONFIG_INPUT_TSDEV is not set | ||
| 669 | # CONFIG_INPUT_EVDEV is not set | 653 | # CONFIG_INPUT_EVDEV is not set |
| 670 | # CONFIG_INPUT_EVBUG is not set | 654 | # CONFIG_INPUT_EVBUG is not set |
| 671 | 655 | ||
| @@ -697,7 +681,6 @@ CONFIG_INPUT_MISC=y | |||
| 697 | # | 681 | # |
| 698 | # CONFIG_AD9960 is not set | 682 | # CONFIG_AD9960 is not set |
| 699 | # CONFIG_SPI_ADC_BF533 is not set | 683 | # CONFIG_SPI_ADC_BF533 is not set |
| 700 | # CONFIG_BF5xx_PFLAGS is not set | ||
| 701 | # CONFIG_BF5xx_PPIFCD is not set | 684 | # CONFIG_BF5xx_PPIFCD is not set |
| 702 | # CONFIG_BFIN_SIMPLE_TIMER is not set | 685 | # CONFIG_BFIN_SIMPLE_TIMER is not set |
| 703 | # CONFIG_BF5xx_PPI is not set | 686 | # CONFIG_BF5xx_PPI is not set |
| @@ -706,7 +689,7 @@ CONFIG_BFIN_OTP=y | |||
| 706 | # CONFIG_BFIN_SPORT is not set | 689 | # CONFIG_BFIN_SPORT is not set |
| 707 | # CONFIG_BFIN_TIMER_LATENCY is not set | 690 | # CONFIG_BFIN_TIMER_LATENCY is not set |
| 708 | # CONFIG_TWI_LCD is not set | 691 | # CONFIG_TWI_LCD is not set |
| 709 | # CONFIG_AD5304 is not set | 692 | # CONFIG_SIMPLE_GPIO is not set |
| 710 | # CONFIG_VT is not set | 693 | # CONFIG_VT is not set |
| 711 | # CONFIG_SERIAL_NONSTANDARD is not set | 694 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 712 | 695 | ||
| @@ -735,27 +718,11 @@ CONFIG_UNIX98_PTYS=y | |||
| 735 | # CAN, the car bus and industrial fieldbus | 718 | # CAN, the car bus and industrial fieldbus |
| 736 | # | 719 | # |
| 737 | # CONFIG_CAN4LINUX is not set | 720 | # CONFIG_CAN4LINUX is not set |
| 738 | |||
| 739 | # | ||
| 740 | # IPMI | ||
| 741 | # | ||
| 742 | # CONFIG_IPMI_HANDLER is not set | 721 | # CONFIG_IPMI_HANDLER is not set |
| 743 | CONFIG_WATCHDOG=y | ||
| 744 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 745 | |||
| 746 | # | ||
| 747 | # Watchdog Device Drivers | ||
| 748 | # | ||
| 749 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 750 | CONFIG_BFIN_WDT=y | ||
| 751 | CONFIG_HW_RANDOM=y | 722 | CONFIG_HW_RANDOM=y |
| 752 | # CONFIG_GEN_RTC is not set | 723 | # CONFIG_GEN_RTC is not set |
| 753 | # CONFIG_R3964 is not set | 724 | # CONFIG_R3964 is not set |
| 754 | # CONFIG_RAW_DRIVER is not set | 725 | # CONFIG_RAW_DRIVER is not set |
| 755 | |||
| 756 | # | ||
| 757 | # TPM devices | ||
| 758 | # | ||
| 759 | # CONFIG_TCG_TPM is not set | 726 | # CONFIG_TCG_TPM is not set |
| 760 | CONFIG_I2C=y | 727 | CONFIG_I2C=y |
| 761 | CONFIG_I2C_BOARDINFO=y | 728 | CONFIG_I2C_BOARDINFO=y |
| @@ -777,21 +744,24 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50 | |||
| 777 | # CONFIG_I2C_OCORES is not set | 744 | # CONFIG_I2C_OCORES is not set |
| 778 | # CONFIG_I2C_PARPORT_LIGHT is not set | 745 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 779 | # CONFIG_I2C_SIMTEC is not set | 746 | # CONFIG_I2C_SIMTEC is not set |
| 747 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 780 | # CONFIG_I2C_STUB is not set | 748 | # CONFIG_I2C_STUB is not set |
| 749 | # CONFIG_I2C_TINY_USB is not set | ||
| 781 | 750 | ||
| 782 | # | 751 | # |
| 783 | # Miscellaneous I2C Chip support | 752 | # Miscellaneous I2C Chip support |
| 784 | # | 753 | # |
| 785 | # CONFIG_SENSORS_DS1337 is not set | 754 | # CONFIG_SENSORS_DS1337 is not set |
| 786 | # CONFIG_SENSORS_DS1374 is not set | 755 | # CONFIG_SENSORS_DS1374 is not set |
| 756 | # CONFIG_DS1682 is not set | ||
| 787 | # CONFIG_SENSORS_AD5252 is not set | 757 | # CONFIG_SENSORS_AD5252 is not set |
| 788 | # CONFIG_SENSORS_EEPROM is not set | 758 | # CONFIG_SENSORS_EEPROM is not set |
| 789 | # CONFIG_SENSORS_PCF8574 is not set | 759 | # CONFIG_SENSORS_PCF8574 is not set |
| 790 | # CONFIG_SENSORS_PCF8575 is not set | 760 | # CONFIG_SENSORS_PCF8575 is not set |
| 791 | # CONFIG_SENSORS_PCA9543 is not set | ||
| 792 | # CONFIG_SENSORS_PCA9539 is not set | 761 | # CONFIG_SENSORS_PCA9539 is not set |
| 793 | # CONFIG_SENSORS_PCF8591 is not set | 762 | # CONFIG_SENSORS_PCF8591 is not set |
| 794 | # CONFIG_SENSORS_MAX6875 is not set | 763 | # CONFIG_SENSORS_MAX6875 is not set |
| 764 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 795 | # CONFIG_I2C_DEBUG_CORE is not set | 765 | # CONFIG_I2C_DEBUG_CORE is not set |
| 796 | # CONFIG_I2C_DEBUG_ALGO is not set | 766 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 797 | # CONFIG_I2C_DEBUG_BUS is not set | 767 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -814,14 +784,11 @@ CONFIG_SPI_BFIN=y | |||
| 814 | # | 784 | # |
| 815 | # CONFIG_SPI_AT25 is not set | 785 | # CONFIG_SPI_AT25 is not set |
| 816 | # CONFIG_SPI_SPIDEV is not set | 786 | # CONFIG_SPI_SPIDEV is not set |
| 817 | 787 | # CONFIG_SPI_TLE62X0 is not set | |
| 818 | # | ||
| 819 | # Dallas's 1-wire bus | ||
| 820 | # | ||
| 821 | # CONFIG_W1 is not set | 788 | # CONFIG_W1 is not set |
| 789 | # CONFIG_POWER_SUPPLY is not set | ||
| 822 | CONFIG_HWMON=y | 790 | CONFIG_HWMON=y |
| 823 | # CONFIG_HWMON_VID is not set | 791 | # CONFIG_HWMON_VID is not set |
| 824 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 825 | # CONFIG_SENSORS_AD7418 is not set | 792 | # CONFIG_SENSORS_AD7418 is not set |
| 826 | # CONFIG_SENSORS_ADM1021 is not set | 793 | # CONFIG_SENSORS_ADM1021 is not set |
| 827 | # CONFIG_SENSORS_ADM1025 is not set | 794 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -829,12 +796,12 @@ CONFIG_HWMON=y | |||
| 829 | # CONFIG_SENSORS_ADM1029 is not set | 796 | # CONFIG_SENSORS_ADM1029 is not set |
| 830 | # CONFIG_SENSORS_ADM1031 is not set | 797 | # CONFIG_SENSORS_ADM1031 is not set |
| 831 | # CONFIG_SENSORS_ADM9240 is not set | 798 | # CONFIG_SENSORS_ADM9240 is not set |
| 832 | # CONFIG_SENSORS_ASB100 is not set | 799 | # CONFIG_SENSORS_ADT7470 is not set |
| 833 | # CONFIG_SENSORS_ATXP1 is not set | 800 | # CONFIG_SENSORS_ATXP1 is not set |
| 834 | # CONFIG_SENSORS_DS1621 is not set | 801 | # CONFIG_SENSORS_DS1621 is not set |
| 835 | # CONFIG_SENSORS_F71805F is not set | 802 | # CONFIG_SENSORS_F71805F is not set |
| 836 | # CONFIG_SENSORS_FSCHER is not set | 803 | # CONFIG_SENSORS_F71882FG is not set |
| 837 | # CONFIG_SENSORS_FSCPOS is not set | 804 | # CONFIG_SENSORS_F75375S is not set |
| 838 | # CONFIG_SENSORS_GL518SM is not set | 805 | # CONFIG_SENSORS_GL518SM is not set |
| 839 | # CONFIG_SENSORS_GL520SM is not set | 806 | # CONFIG_SENSORS_GL520SM is not set |
| 840 | # CONFIG_SENSORS_IT87 is not set | 807 | # CONFIG_SENSORS_IT87 is not set |
| @@ -849,13 +816,16 @@ CONFIG_HWMON=y | |||
| 849 | # CONFIG_SENSORS_LM87 is not set | 816 | # CONFIG_SENSORS_LM87 is not set |
| 850 | # CONFIG_SENSORS_LM90 is not set | 817 | # CONFIG_SENSORS_LM90 is not set |
| 851 | # CONFIG_SENSORS_LM92 is not set | 818 | # CONFIG_SENSORS_LM92 is not set |
| 819 | # CONFIG_SENSORS_LM93 is not set | ||
| 852 | # CONFIG_SENSORS_MAX1619 is not set | 820 | # CONFIG_SENSORS_MAX1619 is not set |
| 853 | # CONFIG_SENSORS_MAX6650 is not set | 821 | # CONFIG_SENSORS_MAX6650 is not set |
| 854 | # CONFIG_SENSORS_PC87360 is not set | 822 | # CONFIG_SENSORS_PC87360 is not set |
| 855 | # CONFIG_SENSORS_PC87427 is not set | 823 | # CONFIG_SENSORS_PC87427 is not set |
| 824 | # CONFIG_SENSORS_DME1737 is not set | ||
| 856 | # CONFIG_SENSORS_SMSC47M1 is not set | 825 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 857 | # CONFIG_SENSORS_SMSC47M192 is not set | 826 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 858 | # CONFIG_SENSORS_SMSC47B397 is not set | 827 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 828 | # CONFIG_SENSORS_THMC50 is not set | ||
| 859 | # CONFIG_SENSORS_VT1211 is not set | 829 | # CONFIG_SENSORS_VT1211 is not set |
| 860 | # CONFIG_SENSORS_W83781D is not set | 830 | # CONFIG_SENSORS_W83781D is not set |
| 861 | # CONFIG_SENSORS_W83791D is not set | 831 | # CONFIG_SENSORS_W83791D is not set |
| @@ -865,6 +835,25 @@ CONFIG_HWMON=y | |||
| 865 | # CONFIG_SENSORS_W83627HF is not set | 835 | # CONFIG_SENSORS_W83627HF is not set |
| 866 | # CONFIG_SENSORS_W83627EHF is not set | 836 | # CONFIG_SENSORS_W83627EHF is not set |
| 867 | # CONFIG_HWMON_DEBUG_CHIP is not set | 837 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 838 | CONFIG_WATCHDOG=y | ||
| 839 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 840 | |||
| 841 | # | ||
| 842 | # Watchdog Device Drivers | ||
| 843 | # | ||
| 844 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 845 | CONFIG_BFIN_WDT=y | ||
| 846 | |||
| 847 | # | ||
| 848 | # USB-based Watchdog Cards | ||
| 849 | # | ||
| 850 | # CONFIG_USBPCWATCHDOG is not set | ||
| 851 | |||
| 852 | # | ||
| 853 | # Sonics Silicon Backplane | ||
| 854 | # | ||
| 855 | CONFIG_SSB_POSSIBLE=y | ||
| 856 | # CONFIG_SSB is not set | ||
| 868 | 857 | ||
| 869 | # | 858 | # |
| 870 | # Multifunction device drivers | 859 | # Multifunction device drivers |
| @@ -881,72 +870,133 @@ CONFIG_HWMON=y | |||
| 881 | # | 870 | # |
| 882 | # Graphics support | 871 | # Graphics support |
| 883 | # | 872 | # |
| 873 | # CONFIG_VGASTATE is not set | ||
| 874 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 875 | # CONFIG_FB is not set | ||
| 884 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 876 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 885 | 877 | ||
| 886 | # | 878 | # |
| 887 | # Display device support | 879 | # Display device support |
| 888 | # | 880 | # |
| 889 | # CONFIG_DISPLAY_SUPPORT is not set | 881 | # CONFIG_DISPLAY_SUPPORT is not set |
| 890 | # CONFIG_VGASTATE is not set | ||
| 891 | # CONFIG_FB is not set | ||
| 892 | 882 | ||
| 893 | # | 883 | # |
| 894 | # Sound | 884 | # Sound |
| 895 | # | 885 | # |
| 896 | # CONFIG_SOUND is not set | 886 | # CONFIG_SOUND is not set |
| 897 | 887 | CONFIG_HID_SUPPORT=y | |
| 898 | # | ||
| 899 | # HID Devices | ||
| 900 | # | ||
| 901 | CONFIG_HID=y | 888 | CONFIG_HID=y |
| 902 | # CONFIG_HID_DEBUG is not set | 889 | # CONFIG_HID_DEBUG is not set |
| 890 | # CONFIG_HIDRAW is not set | ||
| 903 | 891 | ||
| 904 | # | 892 | # |
| 905 | # USB support | 893 | # USB Input Devices |
| 906 | # | 894 | # |
| 895 | CONFIG_USB_HID=y | ||
| 896 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 897 | # CONFIG_HID_FF is not set | ||
| 898 | # CONFIG_USB_HIDDEV is not set | ||
| 899 | CONFIG_USB_SUPPORT=y | ||
| 907 | CONFIG_USB_ARCH_HAS_HCD=y | 900 | CONFIG_USB_ARCH_HAS_HCD=y |
| 908 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 901 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 909 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 902 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 910 | # CONFIG_USB is not set | 903 | CONFIG_USB=y |
| 904 | # CONFIG_USB_DEBUG is not set | ||
| 905 | |||
| 906 | # | ||
| 907 | # Miscellaneous USB options | ||
| 908 | # | ||
| 909 | # CONFIG_USB_DEVICEFS is not set | ||
| 910 | CONFIG_USB_DEVICE_CLASS=y | ||
| 911 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 912 | # CONFIG_USB_OTG is not set | ||
| 913 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 914 | CONFIG_USB_OTG_BLACKLIST_HUB=y | ||
| 915 | |||
| 916 | # | ||
| 917 | # USB Host Controller Drivers | ||
| 918 | # | ||
| 919 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 920 | # CONFIG_USB_ISP1362_HCD is not set | ||
| 921 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 922 | # CONFIG_USB_SL811_HCD is not set | ||
| 923 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 924 | CONFIG_USB_MUSB_HDRC=y | ||
| 925 | CONFIG_USB_MUSB_SOC=y | ||
| 911 | 926 | ||
| 912 | # | 927 | # |
| 913 | # Enable Host or Gadget support to see Inventra options | 928 | # Blackfin high speed USB support |
| 914 | # | 929 | # |
| 930 | CONFIG_USB_MUSB_HOST=y | ||
| 931 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
| 932 | # CONFIG_USB_MUSB_OTG is not set | ||
| 933 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
| 934 | CONFIG_MUSB_PIO_ONLY=y | ||
| 935 | CONFIG_USB_MUSB_LOGLEVEL=0 | ||
| 936 | |||
| 937 | # | ||
| 938 | # USB Device Class drivers | ||
| 939 | # | ||
| 940 | # CONFIG_USB_ACM is not set | ||
| 941 | # CONFIG_USB_PRINTER is not set | ||
| 915 | 942 | ||
| 916 | # | 943 | # |
| 917 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 944 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 918 | # | 945 | # |
| 919 | 946 | ||
| 920 | # | 947 | # |
| 921 | # USB Gadget Support | 948 | # may also be needed; see USB_STORAGE Help for more information |
| 922 | # | 949 | # |
| 923 | # CONFIG_USB_GADGET is not set | 950 | # CONFIG_USB_LIBUSUAL is not set |
| 924 | # CONFIG_MMC is not set | ||
| 925 | 951 | ||
| 926 | # | 952 | # |
| 927 | # LED devices | 953 | # USB Imaging devices |
| 928 | # | 954 | # |
| 929 | # CONFIG_NEW_LEDS is not set | 955 | # CONFIG_USB_MDC800 is not set |
| 956 | CONFIG_USB_MON=y | ||
| 930 | 957 | ||
| 931 | # | 958 | # |
| 932 | # LED drivers | 959 | # USB port drivers |
| 933 | # | 960 | # |
| 934 | 961 | ||
| 935 | # | 962 | # |
| 936 | # LED Triggers | 963 | # USB Serial Converter support |
| 937 | # | 964 | # |
| 965 | # CONFIG_USB_SERIAL is not set | ||
| 938 | 966 | ||
| 939 | # | 967 | # |
| 940 | # InfiniBand support | 968 | # USB Miscellaneous drivers |
| 941 | # | 969 | # |
| 970 | # CONFIG_USB_EMI62 is not set | ||
| 971 | # CONFIG_USB_EMI26 is not set | ||
| 972 | # CONFIG_USB_ADUTUX is not set | ||
| 973 | # CONFIG_USB_AUERSWALD is not set | ||
| 974 | # CONFIG_USB_RIO500 is not set | ||
| 975 | # CONFIG_USB_LEGOTOWER is not set | ||
| 976 | # CONFIG_USB_LCD is not set | ||
| 977 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 978 | # CONFIG_USB_LED is not set | ||
| 979 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 980 | # CONFIG_USB_CYTHERM is not set | ||
| 981 | # CONFIG_USB_PHIDGET is not set | ||
| 982 | # CONFIG_USB_IDMOUSE is not set | ||
| 983 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 984 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 985 | # CONFIG_USB_SISUSBVGA is not set | ||
| 986 | # CONFIG_USB_LD is not set | ||
| 987 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 988 | # CONFIG_USB_IOWARRIOR is not set | ||
| 942 | 989 | ||
| 943 | # | 990 | # |
| 944 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 991 | # USB DSL modem support |
| 945 | # | 992 | # |
| 946 | 993 | ||
| 947 | # | 994 | # |
| 948 | # Real Time Clock | 995 | # USB Gadget Support |
| 949 | # | 996 | # |
| 997 | # CONFIG_USB_GADGET is not set | ||
| 998 | # CONFIG_MMC is not set | ||
| 999 | # CONFIG_NEW_LEDS is not set | ||
| 950 | CONFIG_RTC_LIB=y | 1000 | CONFIG_RTC_LIB=y |
| 951 | CONFIG_RTC_CLASS=y | 1001 | CONFIG_RTC_CLASS=y |
| 952 | CONFIG_RTC_HCTOSYS=y | 1002 | CONFIG_RTC_HCTOSYS=y |
| @@ -966,6 +1016,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 966 | # I2C RTC drivers | 1016 | # I2C RTC drivers |
| 967 | # | 1017 | # |
| 968 | # CONFIG_RTC_DRV_DS1307 is not set | 1018 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1019 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 969 | # CONFIG_RTC_DRV_DS1672 is not set | 1020 | # CONFIG_RTC_DRV_DS1672 is not set |
| 970 | # CONFIG_RTC_DRV_MAX6900 is not set | 1021 | # CONFIG_RTC_DRV_MAX6900 is not set |
| 971 | # CONFIG_RTC_DRV_RS5C372 is not set | 1022 | # CONFIG_RTC_DRV_RS5C372 is not set |
| @@ -973,6 +1024,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 973 | # CONFIG_RTC_DRV_X1205 is not set | 1024 | # CONFIG_RTC_DRV_X1205 is not set |
| 974 | # CONFIG_RTC_DRV_PCF8563 is not set | 1025 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 975 | # CONFIG_RTC_DRV_PCF8583 is not set | 1026 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1027 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 976 | 1028 | ||
| 977 | # | 1029 | # |
| 978 | # SPI RTC drivers | 1030 | # SPI RTC drivers |
| @@ -984,8 +1036,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 984 | # Platform RTC drivers | 1036 | # Platform RTC drivers |
| 985 | # | 1037 | # |
| 986 | # CONFIG_RTC_DRV_DS1553 is not set | 1038 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1039 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 987 | # CONFIG_RTC_DRV_DS1742 is not set | 1040 | # CONFIG_RTC_DRV_DS1742 is not set |
| 988 | # CONFIG_RTC_DRV_M48T86 is not set | 1041 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1042 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 989 | # CONFIG_RTC_DRV_V3020 is not set | 1043 | # CONFIG_RTC_DRV_V3020 is not set |
| 990 | 1044 | ||
| 991 | # | 1045 | # |
| @@ -994,22 +1048,9 @@ CONFIG_RTC_INTF_DEV=y | |||
| 994 | CONFIG_RTC_DRV_BFIN=y | 1048 | CONFIG_RTC_DRV_BFIN=y |
| 995 | 1049 | ||
| 996 | # | 1050 | # |
| 997 | # DMA Engine support | 1051 | # Userspace I/O |
| 998 | # | ||
| 999 | # CONFIG_DMA_ENGINE is not set | ||
| 1000 | |||
| 1001 | # | ||
| 1002 | # DMA Clients | ||
| 1003 | # | 1052 | # |
| 1004 | 1053 | # CONFIG_UIO is not set | |
| 1005 | # | ||
| 1006 | # DMA Devices | ||
| 1007 | # | ||
| 1008 | |||
| 1009 | # | ||
| 1010 | # PBX support | ||
| 1011 | # | ||
| 1012 | # CONFIG_PBX is not set | ||
| 1013 | 1054 | ||
| 1014 | # | 1055 | # |
| 1015 | # File systems | 1056 | # File systems |
| @@ -1054,7 +1095,6 @@ CONFIG_PROC_SYSCTL=y | |||
| 1054 | CONFIG_SYSFS=y | 1095 | CONFIG_SYSFS=y |
| 1055 | # CONFIG_TMPFS is not set | 1096 | # CONFIG_TMPFS is not set |
| 1056 | # CONFIG_HUGETLB_PAGE is not set | 1097 | # CONFIG_HUGETLB_PAGE is not set |
| 1057 | CONFIG_RAMFS=y | ||
| 1058 | # CONFIG_CONFIGFS_FS is not set | 1098 | # CONFIG_CONFIGFS_FS is not set |
| 1059 | 1099 | ||
| 1060 | # | 1100 | # |
| @@ -1080,10 +1120,12 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y | |||
| 1080 | CONFIG_JFFS2_FS=m | 1120 | CONFIG_JFFS2_FS=m |
| 1081 | CONFIG_JFFS2_FS_DEBUG=0 | 1121 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1082 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1122 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1123 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1083 | # CONFIG_JFFS2_SUMMARY is not set | 1124 | # CONFIG_JFFS2_SUMMARY is not set |
| 1084 | # CONFIG_JFFS2_FS_XATTR is not set | 1125 | # CONFIG_JFFS2_FS_XATTR is not set |
| 1085 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1126 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
| 1086 | CONFIG_JFFS2_ZLIB=y | 1127 | CONFIG_JFFS2_ZLIB=y |
| 1128 | # CONFIG_JFFS2_LZO is not set | ||
| 1087 | CONFIG_JFFS2_RTIME=y | 1129 | CONFIG_JFFS2_RTIME=y |
| 1088 | # CONFIG_JFFS2_RUBIN is not set | 1130 | # CONFIG_JFFS2_RUBIN is not set |
| 1089 | # CONFIG_CRAMFS is not set | 1131 | # CONFIG_CRAMFS is not set |
| @@ -1092,10 +1134,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1092 | # CONFIG_QNX4FS_FS is not set | 1134 | # CONFIG_QNX4FS_FS is not set |
| 1093 | # CONFIG_SYSV_FS is not set | 1135 | # CONFIG_SYSV_FS is not set |
| 1094 | # CONFIG_UFS_FS is not set | 1136 | # CONFIG_UFS_FS is not set |
| 1095 | 1137 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1096 | # | ||
| 1097 | # Network File Systems | ||
| 1098 | # | ||
| 1099 | CONFIG_NFS_FS=m | 1138 | CONFIG_NFS_FS=m |
| 1100 | CONFIG_NFS_V3=y | 1139 | CONFIG_NFS_V3=y |
| 1101 | # CONFIG_NFS_V3_ACL is not set | 1140 | # CONFIG_NFS_V3_ACL is not set |
| @@ -1115,17 +1154,12 @@ CONFIG_SMB_FS=m | |||
| 1115 | # CONFIG_NCP_FS is not set | 1154 | # CONFIG_NCP_FS is not set |
| 1116 | # CONFIG_CODA_FS is not set | 1155 | # CONFIG_CODA_FS is not set |
| 1117 | # CONFIG_AFS_FS is not set | 1156 | # CONFIG_AFS_FS is not set |
| 1118 | # CONFIG_9P_FS is not set | ||
| 1119 | 1157 | ||
| 1120 | # | 1158 | # |
| 1121 | # Partition Types | 1159 | # Partition Types |
| 1122 | # | 1160 | # |
| 1123 | # CONFIG_PARTITION_ADVANCED is not set | 1161 | # CONFIG_PARTITION_ADVANCED is not set |
| 1124 | CONFIG_MSDOS_PARTITION=y | 1162 | CONFIG_MSDOS_PARTITION=y |
| 1125 | |||
| 1126 | # | ||
| 1127 | # Native Language Support | ||
| 1128 | # | ||
| 1129 | CONFIG_NLS=m | 1163 | CONFIG_NLS=m |
| 1130 | CONFIG_NLS_DEFAULT="iso8859-1" | 1164 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1131 | # CONFIG_NLS_CODEPAGE_437 is not set | 1165 | # CONFIG_NLS_CODEPAGE_437 is not set |
| @@ -1166,21 +1200,16 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1166 | # CONFIG_NLS_KOI8_R is not set | 1200 | # CONFIG_NLS_KOI8_R is not set |
| 1167 | # CONFIG_NLS_KOI8_U is not set | 1201 | # CONFIG_NLS_KOI8_U is not set |
| 1168 | # CONFIG_NLS_UTF8 is not set | 1202 | # CONFIG_NLS_UTF8 is not set |
| 1169 | |||
| 1170 | # | ||
| 1171 | # Distributed Lock Manager | ||
| 1172 | # | ||
| 1173 | # CONFIG_DLM is not set | 1203 | # CONFIG_DLM is not set |
| 1174 | 1204 | CONFIG_INSTRUMENTATION=y | |
| 1175 | # | ||
| 1176 | # Profiling support | ||
| 1177 | # | ||
| 1178 | # CONFIG_PROFILING is not set | 1205 | # CONFIG_PROFILING is not set |
| 1206 | # CONFIG_MARKERS is not set | ||
| 1179 | 1207 | ||
| 1180 | # | 1208 | # |
| 1181 | # Kernel hacking | 1209 | # Kernel hacking |
| 1182 | # | 1210 | # |
| 1183 | # CONFIG_PRINTK_TIME is not set | 1211 | # CONFIG_PRINTK_TIME is not set |
| 1212 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1184 | CONFIG_ENABLE_MUST_CHECK=y | 1213 | CONFIG_ENABLE_MUST_CHECK=y |
| 1185 | # CONFIG_MAGIC_SYSRQ is not set | 1214 | # CONFIG_MAGIC_SYSRQ is not set |
| 1186 | # CONFIG_UNUSED_SYMBOLS is not set | 1215 | # CONFIG_UNUSED_SYMBOLS is not set |
| @@ -1188,6 +1217,7 @@ CONFIG_DEBUG_FS=y | |||
| 1188 | # CONFIG_HEADERS_CHECK is not set | 1217 | # CONFIG_HEADERS_CHECK is not set |
| 1189 | # CONFIG_DEBUG_KERNEL is not set | 1218 | # CONFIG_DEBUG_KERNEL is not set |
| 1190 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1219 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1220 | # CONFIG_SAMPLES is not set | ||
| 1191 | CONFIG_DEBUG_MMRS=y | 1221 | CONFIG_DEBUG_MMRS=y |
| 1192 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | 1222 | CONFIG_DEBUG_HUNT_FOR_ZERO=y |
| 1193 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | 1223 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y |
| @@ -1207,11 +1237,8 @@ CONFIG_ACCESS_CHECK=y | |||
| 1207 | # CONFIG_KEYS is not set | 1237 | # CONFIG_KEYS is not set |
| 1208 | CONFIG_SECURITY=y | 1238 | CONFIG_SECURITY=y |
| 1209 | # CONFIG_SECURITY_NETWORK is not set | 1239 | # CONFIG_SECURITY_NETWORK is not set |
| 1210 | CONFIG_SECURITY_CAPABILITIES=m | 1240 | # CONFIG_SECURITY_CAPABILITIES is not set |
| 1211 | 1241 | # CONFIG_SECURITY_ROOTPLUG is not set | |
| 1212 | # | ||
| 1213 | # Cryptographic options | ||
| 1214 | # | ||
| 1215 | # CONFIG_CRYPTO is not set | 1242 | # CONFIG_CRYPTO is not set |
| 1216 | 1243 | ||
| 1217 | # | 1244 | # |
| @@ -1222,6 +1249,7 @@ CONFIG_CRC_CCITT=m | |||
| 1222 | # CONFIG_CRC16 is not set | 1249 | # CONFIG_CRC16 is not set |
| 1223 | # CONFIG_CRC_ITU_T is not set | 1250 | # CONFIG_CRC_ITU_T is not set |
| 1224 | CONFIG_CRC32=y | 1251 | CONFIG_CRC32=y |
| 1252 | # CONFIG_CRC7 is not set | ||
| 1225 | # CONFIG_LIBCRC32C is not set | 1253 | # CONFIG_LIBCRC32C is not set |
| 1226 | CONFIG_ZLIB_INFLATE=y | 1254 | CONFIG_ZLIB_INFLATE=y |
| 1227 | CONFIG_ZLIB_DEFLATE=m | 1255 | CONFIG_ZLIB_DEFLATE=m |
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig index 5bfdfb287d13..1ff2ff4b49aa 100644 --- a/arch/blackfin/configs/BF548-EZKIT_defconfig +++ b/arch/blackfin/configs/BF548-EZKIT_defconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 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.16 | 3 | # Linux kernel version: 2.6.24.7 |
| 4 | # | 4 | # |
| 5 | # CONFIG_MMU is not set | 5 | # CONFIG_MMU is not set |
| 6 | # CONFIG_FPU is not set | 6 | # CONFIG_FPU is not set |
| @@ -13,35 +13,34 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 13 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_HARDIRQS=y | 14 | CONFIG_GENERIC_HARDIRQS=y |
| 15 | CONFIG_GENERIC_IRQ_PROBE=y | 15 | CONFIG_GENERIC_IRQ_PROBE=y |
| 16 | CONFIG_GENERIC_TIME=y | ||
| 17 | CONFIG_GENERIC_GPIO=y | 16 | CONFIG_GENERIC_GPIO=y |
| 18 | CONFIG_FORCE_MAX_ZONEORDER=14 | 17 | CONFIG_FORCE_MAX_ZONEORDER=14 |
| 19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 18 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 21 | 20 | ||
| 22 | # | 21 | # |
| 23 | # Code maturity level options | 22 | # General setup |
| 24 | # | 23 | # |
| 25 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
| 26 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
| 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 28 | |||
| 29 | # | ||
| 30 | # General setup | ||
| 31 | # | ||
| 32 | CONFIG_LOCALVERSION="" | 27 | CONFIG_LOCALVERSION="" |
| 33 | CONFIG_LOCALVERSION_AUTO=y | 28 | CONFIG_LOCALVERSION_AUTO=y |
| 34 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 35 | # CONFIG_IPC_NS is not set | ||
| 36 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 37 | # CONFIG_POSIX_MQUEUE is not set | 31 | # CONFIG_POSIX_MQUEUE is not set |
| 38 | # CONFIG_BSD_PROCESS_ACCT is not set | 32 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 39 | # CONFIG_TASKSTATS is not set | 33 | # CONFIG_TASKSTATS is not set |
| 40 | # CONFIG_UTS_NS is not set | 34 | # CONFIG_USER_NS is not set |
| 35 | # CONFIG_PID_NS is not set | ||
| 41 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 42 | CONFIG_IKCONFIG=y | 37 | CONFIG_IKCONFIG=y |
| 43 | CONFIG_IKCONFIG_PROC=y | 38 | CONFIG_IKCONFIG_PROC=y |
| 44 | CONFIG_LOG_BUF_SHIFT=14 | 39 | CONFIG_LOG_BUF_SHIFT=14 |
| 40 | # CONFIG_CGROUPS is not set | ||
| 41 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 42 | CONFIG_FAIR_USER_SCHED=y | ||
| 43 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 45 | CONFIG_SYSFS_DEPRECATED=y | 44 | CONFIG_SYSFS_DEPRECATED=y |
| 46 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
| 47 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
| @@ -64,32 +63,24 @@ CONFIG_EPOLL=y | |||
| 64 | CONFIG_SIGNALFD=y | 63 | CONFIG_SIGNALFD=y |
| 65 | CONFIG_EVENTFD=y | 64 | CONFIG_EVENTFD=y |
| 66 | CONFIG_VM_EVENT_COUNTERS=y | 65 | CONFIG_VM_EVENT_COUNTERS=y |
| 67 | CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 | ||
| 68 | # CONFIG_NP2 is not set | ||
| 69 | CONFIG_SLAB=y | 66 | CONFIG_SLAB=y |
| 70 | # CONFIG_SLUB is not set | 67 | # CONFIG_SLUB is not set |
| 71 | # CONFIG_SLOB is not set | 68 | # CONFIG_SLOB is not set |
| 69 | CONFIG_SLABINFO=y | ||
| 72 | CONFIG_RT_MUTEXES=y | 70 | CONFIG_RT_MUTEXES=y |
| 73 | CONFIG_TINY_SHMEM=y | 71 | CONFIG_TINY_SHMEM=y |
| 74 | CONFIG_BASE_SMALL=0 | 72 | CONFIG_BASE_SMALL=0 |
| 75 | |||
| 76 | # | ||
| 77 | # Loadable module support | ||
| 78 | # | ||
| 79 | CONFIG_MODULES=y | 73 | CONFIG_MODULES=y |
| 80 | CONFIG_MODULE_UNLOAD=y | 74 | CONFIG_MODULE_UNLOAD=y |
| 81 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 75 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 82 | # CONFIG_MODVERSIONS is not set | 76 | # CONFIG_MODVERSIONS is not set |
| 83 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 77 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 84 | CONFIG_KMOD=y | 78 | CONFIG_KMOD=y |
| 85 | |||
| 86 | # | ||
| 87 | # Block layer | ||
| 88 | # | ||
| 89 | CONFIG_BLOCK=y | 79 | CONFIG_BLOCK=y |
| 90 | # CONFIG_LBD is not set | 80 | # CONFIG_LBD is not set |
| 91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 81 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 92 | # CONFIG_LSF is not set | 82 | # CONFIG_LSF is not set |
| 83 | # CONFIG_BLK_DEV_BSG is not set | ||
| 93 | 84 | ||
| 94 | # | 85 | # |
| 95 | # IO Schedulers | 86 | # IO Schedulers |
| @@ -141,7 +132,6 @@ CONFIG_BF_REV_0_0=y | |||
| 141 | # CONFIG_BF_REV_ANY is not set | 132 | # CONFIG_BF_REV_ANY is not set |
| 142 | # CONFIG_BF_REV_NONE is not set | 133 | # CONFIG_BF_REV_NONE is not set |
| 143 | CONFIG_BF54x=y | 134 | CONFIG_BF54x=y |
| 144 | CONFIG_BFIN_SINGLE_CORE=y | ||
| 145 | CONFIG_IRQ_PLL_WAKEUP=7 | 135 | CONFIG_IRQ_PLL_WAKEUP=7 |
| 146 | CONFIG_IRQ_RTC=8 | 136 | CONFIG_IRQ_RTC=8 |
| 147 | CONFIG_IRQ_SPORT0_RX=9 | 137 | CONFIG_IRQ_SPORT0_RX=9 |
| @@ -169,6 +159,7 @@ CONFIG_IRQ_TIMER8=11 | |||
| 169 | CONFIG_IRQ_TIMER9=11 | 159 | CONFIG_IRQ_TIMER9=11 |
| 170 | CONFIG_IRQ_TIMER10=11 | 160 | CONFIG_IRQ_TIMER10=11 |
| 171 | CONFIG_BFIN548_EZKIT=y | 161 | CONFIG_BFIN548_EZKIT=y |
| 162 | # CONFIG_BFIN548_BLUETECHNIX_CM is not set | ||
| 172 | 163 | ||
| 173 | # | 164 | # |
| 174 | # BF548 Specific Configuration | 165 | # BF548 Specific Configuration |
| @@ -262,12 +253,14 @@ CONFIG_PINT3_ASSIGN=0x02020303 | |||
| 262 | # Board customizations | 253 | # Board customizations |
| 263 | # | 254 | # |
| 264 | # CONFIG_CMDLINE_BOOL is not set | 255 | # CONFIG_CMDLINE_BOOL is not set |
| 256 | CONFIG_BOOT_LOAD=0x1000 | ||
| 265 | 257 | ||
| 266 | # | 258 | # |
| 267 | # Clock/PLL Setup | 259 | # Clock/PLL Setup |
| 268 | # | 260 | # |
| 269 | CONFIG_CLKIN_HZ=25000000 | 261 | CONFIG_CLKIN_HZ=25000000 |
| 270 | # CONFIG_BFIN_KERNEL_CLOCK is not set | 262 | # CONFIG_BFIN_KERNEL_CLOCK is not set |
| 263 | CONFIG_MAX_MEM_SIZE=512 | ||
| 271 | CONFIG_MAX_VCO_HZ=600000000 | 264 | CONFIG_MAX_VCO_HZ=600000000 |
| 272 | CONFIG_MIN_VCO_HZ=50000000 | 265 | CONFIG_MIN_VCO_HZ=50000000 |
| 273 | CONFIG_MAX_SCLK_HZ=133333333 | 266 | CONFIG_MAX_SCLK_HZ=133333333 |
| @@ -281,14 +274,17 @@ CONFIG_HZ_250=y | |||
| 281 | # CONFIG_HZ_300 is not set | 274 | # CONFIG_HZ_300 is not set |
| 282 | # CONFIG_HZ_1000 is not set | 275 | # CONFIG_HZ_1000 is not set |
| 283 | CONFIG_HZ=250 | 276 | CONFIG_HZ=250 |
| 277 | CONFIG_GENERIC_TIME=y | ||
| 278 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 279 | # CONFIG_CYCLES_CLOCKSOURCE is not set | ||
| 280 | # CONFIG_TICK_ONESHOT is not set | ||
| 281 | # CONFIG_NO_HZ is not set | ||
| 282 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 283 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 284 | 284 | ||
| 285 | # | 285 | # |
| 286 | # Memory Setup | 286 | # Misc |
| 287 | # | 287 | # |
| 288 | CONFIG_MAX_MEM_SIZE=512 | ||
| 289 | # CONFIG_MEM_MT46V32M16_6T is not set | ||
| 290 | CONFIG_MEM_MT46V32M16_5B=y | ||
| 291 | CONFIG_BOOT_LOAD=0x1000 | ||
| 292 | CONFIG_BFIN_SCRATCH_REG_RETN=y | 288 | CONFIG_BFIN_SCRATCH_REG_RETN=y |
| 293 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set | 289 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set |
| 294 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set | 290 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set |
| @@ -324,12 +320,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 324 | CONFIG_FLATMEM=y | 320 | CONFIG_FLATMEM=y |
| 325 | CONFIG_FLAT_NODE_MEM_MAP=y | 321 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 326 | # CONFIG_SPARSEMEM_STATIC is not set | 322 | # CONFIG_SPARSEMEM_STATIC is not set |
| 323 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 327 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 324 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 328 | # CONFIG_RESOURCES_64BIT is not set | 325 | # CONFIG_RESOURCES_64BIT is not set |
| 329 | CONFIG_ZONE_DMA_FLAG=1 | 326 | CONFIG_ZONE_DMA_FLAG=1 |
| 330 | CONFIG_LARGE_ALLOCS=y | 327 | CONFIG_VIRT_TO_BUS=y |
| 331 | # CONFIG_BFIN_GPTIMERS is not set | 328 | # CONFIG_BFIN_GPTIMERS is not set |
| 332 | CONFIG_BFIN_DMA_5XX=y | 329 | CONFIG_BFIN_DMA_5XX=y |
| 330 | # CONFIG_DMA_UNCACHED_4M is not set | ||
| 333 | CONFIG_DMA_UNCACHED_2M=y | 331 | CONFIG_DMA_UNCACHED_2M=y |
| 334 | # CONFIG_DMA_UNCACHED_1M is not set | 332 | # CONFIG_DMA_UNCACHED_1M is not set |
| 335 | # CONFIG_DMA_UNCACHED_NONE is not set | 333 | # CONFIG_DMA_UNCACHED_NONE is not set |
| @@ -377,10 +375,6 @@ CONFIG_EBIU_FCTLVAL=0x6 | |||
| 377 | # | 375 | # |
| 378 | # CONFIG_PCI is not set | 376 | # CONFIG_PCI is not set |
| 379 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 377 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 380 | |||
| 381 | # | ||
| 382 | # PCCARD (PCMCIA/CardBus) support | ||
| 383 | # | ||
| 384 | # CONFIG_PCCARD is not set | 378 | # CONFIG_PCCARD is not set |
| 385 | 379 | ||
| 386 | # | 380 | # |
| @@ -396,6 +390,7 @@ CONFIG_BINFMT_ZFLAT=y | |||
| 396 | # Power management options | 390 | # Power management options |
| 397 | # | 391 | # |
| 398 | # CONFIG_PM is not set | 392 | # CONFIG_PM is not set |
| 393 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 399 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | 394 | # CONFIG_PM_WAKEUP_BY_GPIO is not set |
| 400 | 395 | ||
| 401 | # | 396 | # |
| @@ -439,6 +434,7 @@ CONFIG_SYN_COOKIES=y | |||
| 439 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 434 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 440 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 435 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 441 | CONFIG_INET_XFRM_MODE_BEET=y | 436 | CONFIG_INET_XFRM_MODE_BEET=y |
| 437 | # CONFIG_INET_LRO is not set | ||
| 442 | CONFIG_INET_DIAG=y | 438 | CONFIG_INET_DIAG=y |
| 443 | CONFIG_INET_TCP_DIAG=y | 439 | CONFIG_INET_TCP_DIAG=y |
| 444 | # CONFIG_TCP_CONG_ADVANCED is not set | 440 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -465,10 +461,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 465 | # CONFIG_LAPB is not set | 461 | # CONFIG_LAPB is not set |
| 466 | # CONFIG_ECONET is not set | 462 | # CONFIG_ECONET is not set |
| 467 | # CONFIG_WAN_ROUTER is not set | 463 | # CONFIG_WAN_ROUTER is not set |
| 468 | |||
| 469 | # | ||
| 470 | # QoS and/or fair queueing | ||
| 471 | # | ||
| 472 | # CONFIG_NET_SCHED is not set | 464 | # CONFIG_NET_SCHED is not set |
| 473 | 465 | ||
| 474 | # | 466 | # |
| @@ -488,6 +480,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 488 | # CONFIG_MAC80211 is not set | 480 | # CONFIG_MAC80211 is not set |
| 489 | # CONFIG_IEEE80211 is not set | 481 | # CONFIG_IEEE80211 is not set |
| 490 | # CONFIG_RFKILL is not set | 482 | # CONFIG_RFKILL is not set |
| 483 | # CONFIG_NET_9P is not set | ||
| 491 | 484 | ||
| 492 | # | 485 | # |
| 493 | # Device Drivers | 486 | # Device Drivers |
| @@ -496,14 +489,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 496 | # | 489 | # |
| 497 | # Generic Driver Options | 490 | # Generic Driver Options |
| 498 | # | 491 | # |
| 492 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 499 | CONFIG_STANDALONE=y | 493 | CONFIG_STANDALONE=y |
| 500 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 494 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 501 | # CONFIG_FW_LOADER is not set | 495 | # CONFIG_FW_LOADER is not set |
| 502 | # CONFIG_SYS_HYPERVISOR is not set | 496 | # CONFIG_SYS_HYPERVISOR is not set |
| 503 | |||
| 504 | # | ||
| 505 | # Connector - unified userspace <-> kernelspace linker | ||
| 506 | # | ||
| 507 | # CONFIG_CONNECTOR is not set | 497 | # CONFIG_CONNECTOR is not set |
| 508 | CONFIG_MTD=y | 498 | CONFIG_MTD=y |
| 509 | # CONFIG_MTD_DEBUG is not set | 499 | # CONFIG_MTD_DEBUG is not set |
| @@ -523,6 +513,7 @@ CONFIG_MTD_BLOCK=y | |||
| 523 | # CONFIG_INFTL is not set | 513 | # CONFIG_INFTL is not set |
| 524 | # CONFIG_RFD_FTL is not set | 514 | # CONFIG_RFD_FTL is not set |
| 525 | # CONFIG_SSFDC is not set | 515 | # CONFIG_SSFDC is not set |
| 516 | # CONFIG_MTD_OOPS is not set | ||
| 526 | 517 | ||
| 527 | # | 518 | # |
| 528 | # RAM/ROM/Flash chip drivers | 519 | # RAM/ROM/Flash chip drivers |
| @@ -587,39 +578,27 @@ CONFIG_MTD_NAND_BF5XX_HWECC=y | |||
| 587 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 578 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 588 | # CONFIG_MTD_NAND_NANDSIM is not set | 579 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 589 | # CONFIG_MTD_NAND_PLATFORM is not set | 580 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 581 | # CONFIG_MTD_ALAUDA is not set | ||
| 590 | # CONFIG_MTD_ONENAND is not set | 582 | # CONFIG_MTD_ONENAND is not set |
| 591 | 583 | ||
| 592 | # | 584 | # |
| 593 | # UBI - Unsorted block images | 585 | # UBI - Unsorted block images |
| 594 | # | 586 | # |
| 595 | # CONFIG_MTD_UBI is not set | 587 | # CONFIG_MTD_UBI is not set |
| 596 | |||
| 597 | # | ||
| 598 | # Parallel port support | ||
| 599 | # | ||
| 600 | # CONFIG_PARPORT is not set | 588 | # CONFIG_PARPORT is not set |
| 601 | 589 | CONFIG_BLK_DEV=y | |
| 602 | # | ||
| 603 | # Plug and Play support | ||
| 604 | # | ||
| 605 | # CONFIG_PNPACPI is not set | ||
| 606 | |||
| 607 | # | ||
| 608 | # Block devices | ||
| 609 | # | ||
| 610 | # CONFIG_BLK_DEV_COW_COMMON is not set | 590 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 611 | # CONFIG_BLK_DEV_LOOP is not set | 591 | # CONFIG_BLK_DEV_LOOP is not set |
| 612 | # CONFIG_BLK_DEV_NBD is not set | 592 | # CONFIG_BLK_DEV_NBD is not set |
| 593 | # CONFIG_BLK_DEV_UB is not set | ||
| 613 | CONFIG_BLK_DEV_RAM=y | 594 | CONFIG_BLK_DEV_RAM=y |
| 614 | CONFIG_BLK_DEV_RAM_COUNT=16 | 595 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 615 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 596 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 616 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 597 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 617 | # CONFIG_CDROM_PKTCDVD is not set | 598 | # CONFIG_CDROM_PKTCDVD is not set |
| 618 | # CONFIG_ATA_OVER_ETH is not set | 599 | # CONFIG_ATA_OVER_ETH is not set |
| 619 | 600 | CONFIG_MISC_DEVICES=y | |
| 620 | # | 601 | # CONFIG_EEPROM_93CX6 is not set |
| 621 | # Misc devices | ||
| 622 | # | ||
| 623 | # CONFIG_IDE is not set | 602 | # CONFIG_IDE is not set |
| 624 | 603 | ||
| 625 | # | 604 | # |
| @@ -627,6 +606,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 627 | # | 606 | # |
| 628 | # CONFIG_RAID_ATTRS is not set | 607 | # CONFIG_RAID_ATTRS is not set |
| 629 | CONFIG_SCSI=y | 608 | CONFIG_SCSI=y |
| 609 | CONFIG_SCSI_DMA=y | ||
| 630 | # CONFIG_SCSI_TGT is not set | 610 | # CONFIG_SCSI_TGT is not set |
| 631 | # CONFIG_SCSI_NETLINK is not set | 611 | # CONFIG_SCSI_NETLINK is not set |
| 632 | CONFIG_SCSI_PROC_FS=y | 612 | CONFIG_SCSI_PROC_FS=y |
| @@ -657,43 +637,35 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 657 | # CONFIG_SCSI_SPI_ATTRS is not set | 637 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 658 | # CONFIG_SCSI_FC_ATTRS is not set | 638 | # CONFIG_SCSI_FC_ATTRS is not set |
| 659 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 639 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 660 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 661 | # CONFIG_SCSI_SAS_LIBSAS is not set | 640 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 662 | 641 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 663 | # | 642 | CONFIG_SCSI_LOWLEVEL=y |
| 664 | # SCSI low-level drivers | ||
| 665 | # | ||
| 666 | # CONFIG_ISCSI_TCP is not set | 643 | # CONFIG_ISCSI_TCP is not set |
| 667 | # CONFIG_SCSI_DEBUG is not set | 644 | # CONFIG_SCSI_DEBUG is not set |
| 668 | CONFIG_ATA=y | 645 | CONFIG_ATA=y |
| 669 | # CONFIG_ATA_NONSTANDARD is not set | 646 | # CONFIG_ATA_NONSTANDARD is not set |
| 670 | # CONFIG_PATA_PLATFORM is not set | 647 | # CONFIG_PATA_PLATFORM is not set |
| 671 | CONFIG_PATA_BF54X=y | 648 | CONFIG_PATA_BF54X=y |
| 672 | CONFIG_PATA_BF54X_DMA=y | ||
| 673 | |||
| 674 | # | ||
| 675 | # Multi-device support (RAID and LVM) | ||
| 676 | # | ||
| 677 | # CONFIG_MD is not set | 649 | # CONFIG_MD is not set |
| 678 | |||
| 679 | # | ||
| 680 | # Network device support | ||
| 681 | # | ||
| 682 | CONFIG_NETDEVICES=y | 650 | CONFIG_NETDEVICES=y |
| 651 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 683 | # CONFIG_DUMMY is not set | 652 | # CONFIG_DUMMY is not set |
| 684 | # CONFIG_BONDING is not set | 653 | # CONFIG_BONDING is not set |
| 654 | # CONFIG_MACVLAN is not set | ||
| 685 | # CONFIG_EQUALIZER is not set | 655 | # CONFIG_EQUALIZER is not set |
| 686 | # CONFIG_TUN is not set | 656 | # CONFIG_TUN is not set |
| 657 | # CONFIG_VETH is not set | ||
| 687 | # CONFIG_PHYLIB is not set | 658 | # CONFIG_PHYLIB is not set |
| 688 | |||
| 689 | # | ||
| 690 | # Ethernet (10 or 100Mbit) | ||
| 691 | # | ||
| 692 | CONFIG_NET_ETHERNET=y | 659 | CONFIG_NET_ETHERNET=y |
| 693 | CONFIG_MII=y | 660 | CONFIG_MII=y |
| 694 | # CONFIG_SMC91X is not set | 661 | # CONFIG_SMC91X is not set |
| 695 | CONFIG_SMSC911X=y | 662 | CONFIG_SMSC911X=y |
| 696 | # CONFIG_DM9000 is not set | 663 | # CONFIG_DM9000 is not set |
| 664 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 665 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 666 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 667 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 668 | # CONFIG_B44 is not set | ||
| 697 | CONFIG_NETDEV_1000=y | 669 | CONFIG_NETDEV_1000=y |
| 698 | # CONFIG_AX88180 is not set | 670 | # CONFIG_AX88180 is not set |
| 699 | CONFIG_NETDEV_10000=y | 671 | CONFIG_NETDEV_10000=y |
| @@ -703,6 +675,15 @@ CONFIG_NETDEV_10000=y | |||
| 703 | # | 675 | # |
| 704 | # CONFIG_WLAN_PRE80211 is not set | 676 | # CONFIG_WLAN_PRE80211 is not set |
| 705 | # CONFIG_WLAN_80211 is not set | 677 | # CONFIG_WLAN_80211 is not set |
| 678 | |||
| 679 | # | ||
| 680 | # USB Network Adapters | ||
| 681 | # | ||
| 682 | # CONFIG_USB_CATC is not set | ||
| 683 | # CONFIG_USB_KAWETH is not set | ||
| 684 | # CONFIG_USB_PEGASUS is not set | ||
| 685 | # CONFIG_USB_RTL8150 is not set | ||
| 686 | # CONFIG_USB_USBNET is not set | ||
| 706 | # CONFIG_WAN is not set | 687 | # CONFIG_WAN is not set |
| 707 | # CONFIG_PPP is not set | 688 | # CONFIG_PPP is not set |
| 708 | # CONFIG_SLIP is not set | 689 | # CONFIG_SLIP is not set |
| @@ -710,15 +691,7 @@ CONFIG_NETDEV_10000=y | |||
| 710 | # CONFIG_NETCONSOLE is not set | 691 | # CONFIG_NETCONSOLE is not set |
| 711 | # CONFIG_NETPOLL is not set | 692 | # CONFIG_NETPOLL is not set |
| 712 | # CONFIG_NET_POLL_CONTROLLER is not set | 693 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 713 | |||
| 714 | # | ||
| 715 | # ISDN subsystem | ||
| 716 | # | ||
| 717 | # CONFIG_ISDN is not set | 694 | # CONFIG_ISDN is not set |
| 718 | |||
| 719 | # | ||
| 720 | # Telephony Support | ||
| 721 | # | ||
| 722 | # CONFIG_PHONE is not set | 695 | # CONFIG_PHONE is not set |
| 723 | 696 | ||
| 724 | # | 697 | # |
| @@ -733,9 +706,6 @@ CONFIG_INPUT=y | |||
| 733 | # | 706 | # |
| 734 | # CONFIG_INPUT_MOUSEDEV is not set | 707 | # CONFIG_INPUT_MOUSEDEV is not set |
| 735 | # CONFIG_INPUT_JOYDEV is not set | 708 | # CONFIG_INPUT_JOYDEV is not set |
| 736 | CONFIG_INPUT_TSDEV=m | ||
| 737 | CONFIG_INPUT_TSDEV_SCREEN_X=240 | ||
| 738 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 | ||
| 739 | CONFIG_INPUT_EVDEV=m | 709 | CONFIG_INPUT_EVDEV=m |
| 740 | CONFIG_INPUT_EVBUG=m | 710 | CONFIG_INPUT_EVBUG=m |
| 741 | 711 | ||
| @@ -758,6 +728,7 @@ CONFIG_KEYBOARD_BFIN=y | |||
| 758 | CONFIG_INPUT_TOUCHSCREEN=y | 728 | CONFIG_INPUT_TOUCHSCREEN=y |
| 759 | # CONFIG_TOUCHSCREEN_ADS7846 is not set | 729 | # CONFIG_TOUCHSCREEN_ADS7846 is not set |
| 760 | CONFIG_TOUCHSCREEN_AD7877=m | 730 | CONFIG_TOUCHSCREEN_AD7877=m |
| 731 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 761 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 732 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
| 762 | # CONFIG_TOUCHSCREEN_ELO is not set | 733 | # CONFIG_TOUCHSCREEN_ELO is not set |
| 763 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 734 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
| @@ -787,7 +758,6 @@ CONFIG_INPUT_MISC=y | |||
| 787 | # | 758 | # |
| 788 | # CONFIG_AD9960 is not set | 759 | # CONFIG_AD9960 is not set |
| 789 | # CONFIG_SPI_ADC_BF533 is not set | 760 | # CONFIG_SPI_ADC_BF533 is not set |
| 790 | # CONFIG_BF5xx_PFLAGS is not set | ||
| 791 | # CONFIG_BF5xx_PPIFCD is not set | 761 | # CONFIG_BF5xx_PPIFCD is not set |
| 792 | # CONFIG_BFIN_SIMPLE_TIMER is not set | 762 | # CONFIG_BFIN_SIMPLE_TIMER is not set |
| 793 | # CONFIG_BF5xx_PPI is not set | 763 | # CONFIG_BF5xx_PPI is not set |
| @@ -796,7 +766,7 @@ CONFIG_BFIN_OTP=y | |||
| 796 | # CONFIG_BFIN_SPORT is not set | 766 | # CONFIG_BFIN_SPORT is not set |
| 797 | # CONFIG_BFIN_TIMER_LATENCY is not set | 767 | # CONFIG_BFIN_TIMER_LATENCY is not set |
| 798 | # CONFIG_TWI_LCD is not set | 768 | # CONFIG_TWI_LCD is not set |
| 799 | # CONFIG_AD5304 is not set | 769 | # CONFIG_SIMPLE_GPIO is not set |
| 800 | CONFIG_VT=y | 770 | CONFIG_VT=y |
| 801 | CONFIG_VT_CONSOLE=y | 771 | CONFIG_VT_CONSOLE=y |
| 802 | CONFIG_HW_CONSOLE=y | 772 | CONFIG_HW_CONSOLE=y |
| @@ -830,27 +800,11 @@ CONFIG_UNIX98_PTYS=y | |||
| 830 | # CAN, the car bus and industrial fieldbus | 800 | # CAN, the car bus and industrial fieldbus |
| 831 | # | 801 | # |
| 832 | # CONFIG_CAN4LINUX is not set | 802 | # CONFIG_CAN4LINUX is not set |
| 833 | |||
| 834 | # | ||
| 835 | # IPMI | ||
| 836 | # | ||
| 837 | # CONFIG_IPMI_HANDLER is not set | 803 | # CONFIG_IPMI_HANDLER is not set |
| 838 | CONFIG_WATCHDOG=y | ||
| 839 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 840 | |||
| 841 | # | ||
| 842 | # Watchdog Device Drivers | ||
| 843 | # | ||
| 844 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 845 | CONFIG_BFIN_WDT=y | ||
| 846 | CONFIG_HW_RANDOM=y | 804 | CONFIG_HW_RANDOM=y |
| 847 | # CONFIG_GEN_RTC is not set | 805 | # CONFIG_GEN_RTC is not set |
| 848 | # CONFIG_R3964 is not set | 806 | # CONFIG_R3964 is not set |
| 849 | # CONFIG_RAW_DRIVER is not set | 807 | # CONFIG_RAW_DRIVER is not set |
| 850 | |||
| 851 | # | ||
| 852 | # TPM devices | ||
| 853 | # | ||
| 854 | # CONFIG_TCG_TPM is not set | 808 | # CONFIG_TCG_TPM is not set |
| 855 | CONFIG_I2C=y | 809 | CONFIG_I2C=y |
| 856 | CONFIG_I2C_BOARDINFO=y | 810 | CONFIG_I2C_BOARDINFO=y |
| @@ -872,21 +826,24 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50 | |||
| 872 | # CONFIG_I2C_OCORES is not set | 826 | # CONFIG_I2C_OCORES is not set |
| 873 | # CONFIG_I2C_PARPORT_LIGHT is not set | 827 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 874 | # CONFIG_I2C_SIMTEC is not set | 828 | # CONFIG_I2C_SIMTEC is not set |
| 829 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 875 | # CONFIG_I2C_STUB is not set | 830 | # CONFIG_I2C_STUB is not set |
| 831 | # CONFIG_I2C_TINY_USB is not set | ||
| 876 | 832 | ||
| 877 | # | 833 | # |
| 878 | # Miscellaneous I2C Chip support | 834 | # Miscellaneous I2C Chip support |
| 879 | # | 835 | # |
| 880 | # CONFIG_SENSORS_DS1337 is not set | 836 | # CONFIG_SENSORS_DS1337 is not set |
| 881 | # CONFIG_SENSORS_DS1374 is not set | 837 | # CONFIG_SENSORS_DS1374 is not set |
| 838 | # CONFIG_DS1682 is not set | ||
| 882 | # CONFIG_SENSORS_AD5252 is not set | 839 | # CONFIG_SENSORS_AD5252 is not set |
| 883 | # CONFIG_SENSORS_EEPROM is not set | 840 | # CONFIG_SENSORS_EEPROM is not set |
| 884 | # CONFIG_SENSORS_PCF8574 is not set | 841 | # CONFIG_SENSORS_PCF8574 is not set |
| 885 | # CONFIG_SENSORS_PCF8575 is not set | 842 | # CONFIG_SENSORS_PCF8575 is not set |
| 886 | # CONFIG_SENSORS_PCA9543 is not set | ||
| 887 | # CONFIG_SENSORS_PCA9539 is not set | 843 | # CONFIG_SENSORS_PCA9539 is not set |
| 888 | # CONFIG_SENSORS_PCF8591 is not set | 844 | # CONFIG_SENSORS_PCF8591 is not set |
| 889 | # CONFIG_SENSORS_MAX6875 is not set | 845 | # CONFIG_SENSORS_MAX6875 is not set |
| 846 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 890 | # CONFIG_I2C_DEBUG_CORE is not set | 847 | # CONFIG_I2C_DEBUG_CORE is not set |
| 891 | # CONFIG_I2C_DEBUG_ALGO is not set | 848 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 892 | # CONFIG_I2C_DEBUG_BUS is not set | 849 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -909,14 +866,11 @@ CONFIG_SPI_BFIN=y | |||
| 909 | # | 866 | # |
| 910 | # CONFIG_SPI_AT25 is not set | 867 | # CONFIG_SPI_AT25 is not set |
| 911 | # CONFIG_SPI_SPIDEV is not set | 868 | # CONFIG_SPI_SPIDEV is not set |
| 912 | 869 | # CONFIG_SPI_TLE62X0 is not set | |
| 913 | # | ||
| 914 | # Dallas's 1-wire bus | ||
| 915 | # | ||
| 916 | # CONFIG_W1 is not set | 870 | # CONFIG_W1 is not set |
| 871 | # CONFIG_POWER_SUPPLY is not set | ||
| 917 | CONFIG_HWMON=y | 872 | CONFIG_HWMON=y |
| 918 | # CONFIG_HWMON_VID is not set | 873 | # CONFIG_HWMON_VID is not set |
| 919 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 920 | # CONFIG_SENSORS_AD7418 is not set | 874 | # CONFIG_SENSORS_AD7418 is not set |
| 921 | # CONFIG_SENSORS_ADM1021 is not set | 875 | # CONFIG_SENSORS_ADM1021 is not set |
| 922 | # CONFIG_SENSORS_ADM1025 is not set | 876 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -924,12 +878,12 @@ CONFIG_HWMON=y | |||
| 924 | # CONFIG_SENSORS_ADM1029 is not set | 878 | # CONFIG_SENSORS_ADM1029 is not set |
| 925 | # CONFIG_SENSORS_ADM1031 is not set | 879 | # CONFIG_SENSORS_ADM1031 is not set |
| 926 | # CONFIG_SENSORS_ADM9240 is not set | 880 | # CONFIG_SENSORS_ADM9240 is not set |
| 927 | # CONFIG_SENSORS_ASB100 is not set | 881 | # CONFIG_SENSORS_ADT7470 is not set |
| 928 | # CONFIG_SENSORS_ATXP1 is not set | 882 | # CONFIG_SENSORS_ATXP1 is not set |
| 929 | # CONFIG_SENSORS_DS1621 is not set | 883 | # CONFIG_SENSORS_DS1621 is not set |
| 930 | # CONFIG_SENSORS_F71805F is not set | 884 | # CONFIG_SENSORS_F71805F is not set |
| 931 | # CONFIG_SENSORS_FSCHER is not set | 885 | # CONFIG_SENSORS_F71882FG is not set |
| 932 | # CONFIG_SENSORS_FSCPOS is not set | 886 | # CONFIG_SENSORS_F75375S is not set |
| 933 | # CONFIG_SENSORS_GL518SM is not set | 887 | # CONFIG_SENSORS_GL518SM is not set |
| 934 | # CONFIG_SENSORS_GL520SM is not set | 888 | # CONFIG_SENSORS_GL520SM is not set |
| 935 | # CONFIG_SENSORS_IT87 is not set | 889 | # CONFIG_SENSORS_IT87 is not set |
| @@ -944,13 +898,16 @@ CONFIG_HWMON=y | |||
| 944 | # CONFIG_SENSORS_LM87 is not set | 898 | # CONFIG_SENSORS_LM87 is not set |
| 945 | # CONFIG_SENSORS_LM90 is not set | 899 | # CONFIG_SENSORS_LM90 is not set |
| 946 | # CONFIG_SENSORS_LM92 is not set | 900 | # CONFIG_SENSORS_LM92 is not set |
| 901 | # CONFIG_SENSORS_LM93 is not set | ||
| 947 | # CONFIG_SENSORS_MAX1619 is not set | 902 | # CONFIG_SENSORS_MAX1619 is not set |
| 948 | # CONFIG_SENSORS_MAX6650 is not set | 903 | # CONFIG_SENSORS_MAX6650 is not set |
| 949 | # CONFIG_SENSORS_PC87360 is not set | 904 | # CONFIG_SENSORS_PC87360 is not set |
| 950 | # CONFIG_SENSORS_PC87427 is not set | 905 | # CONFIG_SENSORS_PC87427 is not set |
| 906 | # CONFIG_SENSORS_DME1737 is not set | ||
| 951 | # CONFIG_SENSORS_SMSC47M1 is not set | 907 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 952 | # CONFIG_SENSORS_SMSC47M192 is not set | 908 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 953 | # CONFIG_SENSORS_SMSC47B397 is not set | 909 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 910 | # CONFIG_SENSORS_THMC50 is not set | ||
| 954 | # CONFIG_SENSORS_VT1211 is not set | 911 | # CONFIG_SENSORS_VT1211 is not set |
| 955 | # CONFIG_SENSORS_W83781D is not set | 912 | # CONFIG_SENSORS_W83781D is not set |
| 956 | # CONFIG_SENSORS_W83791D is not set | 913 | # CONFIG_SENSORS_W83791D is not set |
| @@ -960,6 +917,25 @@ CONFIG_HWMON=y | |||
| 960 | # CONFIG_SENSORS_W83627HF is not set | 917 | # CONFIG_SENSORS_W83627HF is not set |
| 961 | # CONFIG_SENSORS_W83627EHF is not set | 918 | # CONFIG_SENSORS_W83627EHF is not set |
| 962 | # CONFIG_HWMON_DEBUG_CHIP is not set | 919 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 920 | CONFIG_WATCHDOG=y | ||
| 921 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 922 | |||
| 923 | # | ||
| 924 | # Watchdog Device Drivers | ||
| 925 | # | ||
| 926 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 927 | CONFIG_BFIN_WDT=y | ||
| 928 | |||
| 929 | # | ||
| 930 | # USB-based Watchdog Cards | ||
| 931 | # | ||
| 932 | # CONFIG_USBPCWATCHDOG is not set | ||
| 933 | |||
| 934 | # | ||
| 935 | # Sonics Silicon Backplane | ||
| 936 | # | ||
| 937 | CONFIG_SSB_POSSIBLE=y | ||
| 938 | # CONFIG_SSB is not set | ||
| 963 | 939 | ||
| 964 | # | 940 | # |
| 965 | # Multifunction device drivers | 941 | # Multifunction device drivers |
| @@ -972,23 +948,20 @@ CONFIG_HWMON=y | |||
| 972 | # CONFIG_VIDEO_DEV is not set | 948 | # CONFIG_VIDEO_DEV is not set |
| 973 | # CONFIG_DVB_CORE is not set | 949 | # CONFIG_DVB_CORE is not set |
| 974 | CONFIG_DAB=y | 950 | CONFIG_DAB=y |
| 951 | # CONFIG_USB_DABUSB is not set | ||
| 975 | 952 | ||
| 976 | # | 953 | # |
| 977 | # Graphics support | 954 | # Graphics support |
| 978 | # | 955 | # |
| 979 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 980 | |||
| 981 | # | ||
| 982 | # Display device support | ||
| 983 | # | ||
| 984 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 985 | # CONFIG_VGASTATE is not set | 956 | # CONFIG_VGASTATE is not set |
| 957 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 986 | CONFIG_FB=y | 958 | CONFIG_FB=y |
| 987 | CONFIG_FIRMWARE_EDID=y | 959 | CONFIG_FIRMWARE_EDID=y |
| 988 | # CONFIG_FB_DDC is not set | 960 | # CONFIG_FB_DDC is not set |
| 989 | CONFIG_FB_CFB_FILLRECT=y | 961 | CONFIG_FB_CFB_FILLRECT=y |
| 990 | CONFIG_FB_CFB_COPYAREA=y | 962 | CONFIG_FB_CFB_COPYAREA=y |
| 991 | CONFIG_FB_CFB_IMAGEBLIT=y | 963 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 964 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 992 | # CONFIG_FB_SYS_FILLRECT is not set | 965 | # CONFIG_FB_SYS_FILLRECT is not set |
| 993 | # CONFIG_FB_SYS_COPYAREA is not set | 966 | # CONFIG_FB_SYS_COPYAREA is not set |
| 994 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 967 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| @@ -1003,18 +976,24 @@ CONFIG_FB_DEFERRED_IO=y | |||
| 1003 | # | 976 | # |
| 1004 | # Frame buffer hardware drivers | 977 | # Frame buffer hardware drivers |
| 1005 | # | 978 | # |
| 1006 | # CONFIG_FB_BFIN_7171 is not set | ||
| 1007 | # CONFIG_FB_BFIN_7393 is not set | ||
| 1008 | CONFIG_FB_BF54X_LQ043=y | 979 | CONFIG_FB_BF54X_LQ043=y |
| 1009 | # CONFIG_FB_BFIN_T350MCQB is not set | 980 | # CONFIG_FB_BFIN_T350MCQB is not set |
| 981 | # CONFIG_FB_BFIN_7393 is not set | ||
| 1010 | # CONFIG_FB_S1D13XXX is not set | 982 | # CONFIG_FB_S1D13XXX is not set |
| 1011 | # CONFIG_FB_VIRTUAL is not set | 983 | # CONFIG_FB_VIRTUAL is not set |
| 984 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 985 | |||
| 986 | # | ||
| 987 | # Display device support | ||
| 988 | # | ||
| 989 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 1012 | 990 | ||
| 1013 | # | 991 | # |
| 1014 | # Console display driver support | 992 | # Console display driver support |
| 1015 | # | 993 | # |
| 1016 | CONFIG_DUMMY_CONSOLE=y | 994 | CONFIG_DUMMY_CONSOLE=y |
| 1017 | CONFIG_FRAMEBUFFER_CONSOLE=y | 995 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 996 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1018 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 997 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1019 | CONFIG_FONTS=y | 998 | CONFIG_FONTS=y |
| 1020 | # CONFIG_FONT_8x8 is not set | 999 | # CONFIG_FONT_8x8 is not set |
| @@ -1065,10 +1044,21 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1065 | # CONFIG_SND_MPU401 is not set | 1044 | # CONFIG_SND_MPU401 is not set |
| 1066 | 1045 | ||
| 1067 | # | 1046 | # |
| 1047 | # SPI devices | ||
| 1048 | # | ||
| 1049 | |||
| 1050 | # | ||
| 1068 | # ALSA Blackfin devices | 1051 | # ALSA Blackfin devices |
| 1069 | # | 1052 | # |
| 1070 | # CONFIG_SND_BLACKFIN_AD1836 is not set | 1053 | # CONFIG_SND_BLACKFIN_AD1836 is not set |
| 1071 | # CONFIG_SND_BFIN_AD73311 is not set | 1054 | # CONFIG_SND_BFIN_AD73311 is not set |
| 1055 | # CONFIG_SND_BFIN_AD73322 is not set | ||
| 1056 | |||
| 1057 | # | ||
| 1058 | # USB devices | ||
| 1059 | # | ||
| 1060 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1061 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1072 | 1062 | ||
| 1073 | # | 1063 | # |
| 1074 | # System on Chip audio support | 1064 | # System on Chip audio support |
| @@ -1084,6 +1074,10 @@ CONFIG_SND_BF5XX_SOC_BF548_EZKIT=y | |||
| 1084 | CONFIG_SND_BF5XX_SPORT_NUM=0 | 1074 | CONFIG_SND_BF5XX_SPORT_NUM=0 |
| 1085 | CONFIG_SND_BF5XX_HAVE_COLD_RESET=y | 1075 | CONFIG_SND_BF5XX_HAVE_COLD_RESET=y |
| 1086 | CONFIG_SND_BF5XX_RESET_GPIO_NUM=19 | 1076 | CONFIG_SND_BF5XX_RESET_GPIO_NUM=19 |
| 1077 | |||
| 1078 | # | ||
| 1079 | # SoC Audio support for SuperH | ||
| 1080 | # | ||
| 1087 | CONFIG_SND_SOC_AD1980=y | 1081 | CONFIG_SND_SOC_AD1980=y |
| 1088 | 1082 | ||
| 1089 | # | 1083 | # |
| @@ -1091,72 +1085,152 @@ CONFIG_SND_SOC_AD1980=y | |||
| 1091 | # | 1085 | # |
| 1092 | # CONFIG_SOUND_PRIME is not set | 1086 | # CONFIG_SOUND_PRIME is not set |
| 1093 | CONFIG_AC97_BUS=y | 1087 | CONFIG_AC97_BUS=y |
| 1094 | 1088 | CONFIG_HID_SUPPORT=y | |
| 1095 | # | 1089 | CONFIG_HID=y |
| 1096 | # HID Devices | ||
| 1097 | # | ||
| 1098 | CONFIG_HID=m | ||
| 1099 | # CONFIG_HID_DEBUG is not set | 1090 | # CONFIG_HID_DEBUG is not set |
| 1091 | # CONFIG_HIDRAW is not set | ||
| 1100 | 1092 | ||
| 1101 | # | 1093 | # |
| 1102 | # USB support | 1094 | # USB Input Devices |
| 1103 | # | 1095 | # |
| 1096 | CONFIG_USB_HID=y | ||
| 1097 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1098 | # CONFIG_HID_FF is not set | ||
| 1099 | # CONFIG_USB_HIDDEV is not set | ||
| 1100 | CONFIG_USB_SUPPORT=y | ||
| 1104 | CONFIG_USB_ARCH_HAS_HCD=y | 1101 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1105 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 1102 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 1106 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 1103 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 1107 | # CONFIG_USB is not set | 1104 | CONFIG_USB=y |
| 1105 | # CONFIG_USB_DEBUG is not set | ||
| 1106 | |||
| 1107 | # | ||
| 1108 | # Miscellaneous USB options | ||
| 1109 | # | ||
| 1110 | # CONFIG_USB_DEVICEFS is not set | ||
| 1111 | CONFIG_USB_DEVICE_CLASS=y | ||
| 1112 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 1113 | # CONFIG_USB_OTG is not set | ||
| 1114 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1115 | CONFIG_USB_OTG_BLACKLIST_HUB=y | ||
| 1108 | 1116 | ||
| 1109 | # | 1117 | # |
| 1110 | # Enable Host or Gadget support to see Inventra options | 1118 | # USB Host Controller Drivers |
| 1111 | # | 1119 | # |
| 1120 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 1121 | # CONFIG_USB_ISP1362_HCD is not set | ||
| 1122 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1123 | # CONFIG_USB_SL811_HCD is not set | ||
| 1124 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1125 | CONFIG_USB_MUSB_HDRC=y | ||
| 1126 | CONFIG_USB_MUSB_SOC=y | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Blackfin high speed USB support | ||
| 1130 | # | ||
| 1131 | CONFIG_USB_MUSB_HOST=y | ||
| 1132 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
| 1133 | # CONFIG_USB_MUSB_OTG is not set | ||
| 1134 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
| 1135 | # CONFIG_MUSB_PIO_ONLY is not set | ||
| 1136 | # CONFIG_USB_INVENTRA_DMA is not set | ||
| 1137 | # CONFIG_USB_TI_CPPI_DMA is not set | ||
| 1138 | CONFIG_USB_MUSB_LOGLEVEL=0 | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # USB Device Class drivers | ||
| 1142 | # | ||
| 1143 | # CONFIG_USB_ACM is not set | ||
| 1144 | # CONFIG_USB_PRINTER is not set | ||
| 1112 | 1145 | ||
| 1113 | # | 1146 | # |
| 1114 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1147 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 1115 | # | 1148 | # |
| 1116 | 1149 | ||
| 1117 | # | 1150 | # |
| 1118 | # USB Gadget Support | 1151 | # may also be needed; see USB_STORAGE Help for more information |
| 1119 | # | 1152 | # |
| 1120 | # CONFIG_USB_GADGET is not set | 1153 | CONFIG_USB_STORAGE=m |
| 1121 | CONFIG_MMC=m | 1154 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1122 | # CONFIG_MMC_DEBUG is not set | 1155 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 1123 | # CONFIG_MMC_UNSAFE_RESUME is not set | 1156 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 1157 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 1158 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 1159 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1160 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1161 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1162 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1163 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1164 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1165 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1166 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1124 | 1167 | ||
| 1125 | # | 1168 | # |
| 1126 | # MMC/SD Card Drivers | 1169 | # USB Imaging devices |
| 1127 | # | 1170 | # |
| 1128 | CONFIG_MMC_BLOCK=m | 1171 | # CONFIG_USB_MDC800 is not set |
| 1172 | # CONFIG_USB_MICROTEK is not set | ||
| 1173 | CONFIG_USB_MON=y | ||
| 1129 | 1174 | ||
| 1130 | # | 1175 | # |
| 1131 | # MMC/SD Host Controller Drivers | 1176 | # USB port drivers |
| 1132 | # | 1177 | # |
| 1133 | CONFIG_SDH_BFIN=m | ||
| 1134 | # CONFIG_SPI_MMC is not set | ||
| 1135 | 1178 | ||
| 1136 | # | 1179 | # |
| 1137 | # LED devices | 1180 | # USB Serial Converter support |
| 1138 | # | 1181 | # |
| 1139 | # CONFIG_NEW_LEDS is not set | 1182 | # CONFIG_USB_SERIAL is not set |
| 1140 | 1183 | ||
| 1141 | # | 1184 | # |
| 1142 | # LED drivers | 1185 | # USB Miscellaneous drivers |
| 1143 | # | 1186 | # |
| 1187 | # CONFIG_USB_EMI62 is not set | ||
| 1188 | # CONFIG_USB_EMI26 is not set | ||
| 1189 | # CONFIG_USB_ADUTUX is not set | ||
| 1190 | # CONFIG_USB_AUERSWALD is not set | ||
| 1191 | # CONFIG_USB_RIO500 is not set | ||
| 1192 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1193 | # CONFIG_USB_LCD is not set | ||
| 1194 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1195 | # CONFIG_USB_LED is not set | ||
| 1196 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1197 | # CONFIG_USB_CYTHERM is not set | ||
| 1198 | # CONFIG_USB_PHIDGET is not set | ||
| 1199 | # CONFIG_USB_IDMOUSE is not set | ||
| 1200 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1201 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1202 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1203 | # CONFIG_USB_LD is not set | ||
| 1204 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1205 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1144 | 1206 | ||
| 1145 | # | 1207 | # |
| 1146 | # LED Triggers | 1208 | # USB DSL modem support |
| 1147 | # | 1209 | # |
| 1148 | 1210 | ||
| 1149 | # | 1211 | # |
| 1150 | # InfiniBand support | 1212 | # USB Gadget Support |
| 1151 | # | 1213 | # |
| 1214 | # CONFIG_USB_GADGET is not set | ||
| 1215 | CONFIG_MMC=m | ||
| 1216 | # CONFIG_MMC_DEBUG is not set | ||
| 1217 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 1152 | 1218 | ||
| 1153 | # | 1219 | # |
| 1154 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1220 | # MMC/SD Card Drivers |
| 1155 | # | 1221 | # |
| 1222 | CONFIG_MMC_BLOCK=m | ||
| 1223 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 1224 | # CONFIG_SDIO_UART is not set | ||
| 1156 | 1225 | ||
| 1157 | # | 1226 | # |
| 1158 | # Real Time Clock | 1227 | # MMC/SD Host Controller Drivers |
| 1159 | # | 1228 | # |
| 1229 | CONFIG_SDH_BFIN=m | ||
| 1230 | # CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set | ||
| 1231 | # CONFIG_MMC_SPI is not set | ||
| 1232 | # CONFIG_SPI_MMC is not set | ||
| 1233 | # CONFIG_NEW_LEDS is not set | ||
| 1160 | CONFIG_RTC_LIB=y | 1234 | CONFIG_RTC_LIB=y |
| 1161 | CONFIG_RTC_CLASS=y | 1235 | CONFIG_RTC_CLASS=y |
| 1162 | CONFIG_RTC_HCTOSYS=y | 1236 | CONFIG_RTC_HCTOSYS=y |
| @@ -1176,6 +1250,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1176 | # I2C RTC drivers | 1250 | # I2C RTC drivers |
| 1177 | # | 1251 | # |
| 1178 | # CONFIG_RTC_DRV_DS1307 is not set | 1252 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1253 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1179 | # CONFIG_RTC_DRV_DS1672 is not set | 1254 | # CONFIG_RTC_DRV_DS1672 is not set |
| 1180 | # CONFIG_RTC_DRV_MAX6900 is not set | 1255 | # CONFIG_RTC_DRV_MAX6900 is not set |
| 1181 | # CONFIG_RTC_DRV_RS5C372 is not set | 1256 | # CONFIG_RTC_DRV_RS5C372 is not set |
| @@ -1183,6 +1258,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1183 | # CONFIG_RTC_DRV_X1205 is not set | 1258 | # CONFIG_RTC_DRV_X1205 is not set |
| 1184 | # CONFIG_RTC_DRV_PCF8563 is not set | 1259 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1185 | # CONFIG_RTC_DRV_PCF8583 is not set | 1260 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1261 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1186 | 1262 | ||
| 1187 | # | 1263 | # |
| 1188 | # SPI RTC drivers | 1264 | # SPI RTC drivers |
| @@ -1194,8 +1270,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1194 | # Platform RTC drivers | 1270 | # Platform RTC drivers |
| 1195 | # | 1271 | # |
| 1196 | # CONFIG_RTC_DRV_DS1553 is not set | 1272 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1273 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1197 | # CONFIG_RTC_DRV_DS1742 is not set | 1274 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1198 | # CONFIG_RTC_DRV_M48T86 is not set | 1275 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1276 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1199 | # CONFIG_RTC_DRV_V3020 is not set | 1277 | # CONFIG_RTC_DRV_V3020 is not set |
| 1200 | 1278 | ||
| 1201 | # | 1279 | # |
| @@ -1204,22 +1282,9 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1204 | CONFIG_RTC_DRV_BFIN=y | 1282 | CONFIG_RTC_DRV_BFIN=y |
| 1205 | 1283 | ||
| 1206 | # | 1284 | # |
| 1207 | # DMA Engine support | 1285 | # Userspace I/O |
| 1208 | # | ||
| 1209 | # CONFIG_DMA_ENGINE is not set | ||
| 1210 | |||
| 1211 | # | ||
| 1212 | # DMA Clients | ||
| 1213 | # | 1286 | # |
| 1214 | 1287 | # CONFIG_UIO is not set | |
| 1215 | # | ||
| 1216 | # DMA Devices | ||
| 1217 | # | ||
| 1218 | |||
| 1219 | # | ||
| 1220 | # PBX support | ||
| 1221 | # | ||
| 1222 | # CONFIG_PBX is not set | ||
| 1223 | 1288 | ||
| 1224 | # | 1289 | # |
| 1225 | # File systems | 1290 | # File systems |
| @@ -1280,7 +1345,6 @@ CONFIG_PROC_SYSCTL=y | |||
| 1280 | CONFIG_SYSFS=y | 1345 | CONFIG_SYSFS=y |
| 1281 | # CONFIG_TMPFS is not set | 1346 | # CONFIG_TMPFS is not set |
| 1282 | # CONFIG_HUGETLB_PAGE is not set | 1347 | # CONFIG_HUGETLB_PAGE is not set |
| 1283 | CONFIG_RAMFS=y | ||
| 1284 | # CONFIG_CONFIGFS_FS is not set | 1348 | # CONFIG_CONFIGFS_FS is not set |
| 1285 | 1349 | ||
| 1286 | # | 1350 | # |
| @@ -1306,10 +1370,12 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y | |||
| 1306 | CONFIG_JFFS2_FS=m | 1370 | CONFIG_JFFS2_FS=m |
| 1307 | CONFIG_JFFS2_FS_DEBUG=0 | 1371 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1308 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1372 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1373 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1309 | # CONFIG_JFFS2_SUMMARY is not set | 1374 | # CONFIG_JFFS2_SUMMARY is not set |
| 1310 | # CONFIG_JFFS2_FS_XATTR is not set | 1375 | # CONFIG_JFFS2_FS_XATTR is not set |
| 1311 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1376 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
| 1312 | CONFIG_JFFS2_ZLIB=y | 1377 | CONFIG_JFFS2_ZLIB=y |
| 1378 | # CONFIG_JFFS2_LZO is not set | ||
| 1313 | CONFIG_JFFS2_RTIME=y | 1379 | CONFIG_JFFS2_RTIME=y |
| 1314 | # CONFIG_JFFS2_RUBIN is not set | 1380 | # CONFIG_JFFS2_RUBIN is not set |
| 1315 | # CONFIG_CRAMFS is not set | 1381 | # CONFIG_CRAMFS is not set |
| @@ -1318,10 +1384,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1318 | # CONFIG_QNX4FS_FS is not set | 1384 | # CONFIG_QNX4FS_FS is not set |
| 1319 | # CONFIG_SYSV_FS is not set | 1385 | # CONFIG_SYSV_FS is not set |
| 1320 | # CONFIG_UFS_FS is not set | 1386 | # CONFIG_UFS_FS is not set |
| 1321 | 1387 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1322 | # | ||
| 1323 | # Network File Systems | ||
| 1324 | # | ||
| 1325 | CONFIG_NFS_FS=m | 1388 | CONFIG_NFS_FS=m |
| 1326 | CONFIG_NFS_V3=y | 1389 | CONFIG_NFS_V3=y |
| 1327 | # CONFIG_NFS_V3_ACL is not set | 1390 | # CONFIG_NFS_V3_ACL is not set |
| @@ -1352,7 +1415,6 @@ CONFIG_CIFS=y | |||
| 1352 | # CONFIG_NCP_FS is not set | 1415 | # CONFIG_NCP_FS is not set |
| 1353 | # CONFIG_CODA_FS is not set | 1416 | # CONFIG_CODA_FS is not set |
| 1354 | # CONFIG_AFS_FS is not set | 1417 | # CONFIG_AFS_FS is not set |
| 1355 | # CONFIG_9P_FS is not set | ||
| 1356 | 1418 | ||
| 1357 | # | 1419 | # |
| 1358 | # Partition Types | 1420 | # Partition Types |
| @@ -1375,10 +1437,6 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1375 | # CONFIG_KARMA_PARTITION is not set | 1437 | # CONFIG_KARMA_PARTITION is not set |
| 1376 | # CONFIG_EFI_PARTITION is not set | 1438 | # CONFIG_EFI_PARTITION is not set |
| 1377 | # CONFIG_SYSV68_PARTITION is not set | 1439 | # CONFIG_SYSV68_PARTITION is not set |
| 1378 | |||
| 1379 | # | ||
| 1380 | # Native Language Support | ||
| 1381 | # | ||
| 1382 | CONFIG_NLS=y | 1440 | CONFIG_NLS=y |
| 1383 | CONFIG_NLS_DEFAULT="iso8859-1" | 1441 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1384 | CONFIG_NLS_CODEPAGE_437=m | 1442 | CONFIG_NLS_CODEPAGE_437=m |
| @@ -1419,21 +1477,16 @@ CONFIG_NLS_ISO8859_15=m | |||
| 1419 | CONFIG_NLS_KOI8_R=m | 1477 | CONFIG_NLS_KOI8_R=m |
| 1420 | CONFIG_NLS_KOI8_U=m | 1478 | CONFIG_NLS_KOI8_U=m |
| 1421 | CONFIG_NLS_UTF8=m | 1479 | CONFIG_NLS_UTF8=m |
| 1422 | |||
| 1423 | # | ||
| 1424 | # Distributed Lock Manager | ||
| 1425 | # | ||
| 1426 | # CONFIG_DLM is not set | 1480 | # CONFIG_DLM is not set |
| 1427 | 1481 | CONFIG_INSTRUMENTATION=y | |
| 1428 | # | ||
| 1429 | # Profiling support | ||
| 1430 | # | ||
| 1431 | # CONFIG_PROFILING is not set | 1482 | # CONFIG_PROFILING is not set |
| 1483 | # CONFIG_MARKERS is not set | ||
| 1432 | 1484 | ||
| 1433 | # | 1485 | # |
| 1434 | # Kernel hacking | 1486 | # Kernel hacking |
| 1435 | # | 1487 | # |
| 1436 | # CONFIG_PRINTK_TIME is not set | 1488 | # CONFIG_PRINTK_TIME is not set |
| 1489 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1437 | CONFIG_ENABLE_MUST_CHECK=y | 1490 | CONFIG_ENABLE_MUST_CHECK=y |
| 1438 | # CONFIG_MAGIC_SYSRQ is not set | 1491 | # CONFIG_MAGIC_SYSRQ is not set |
| 1439 | # CONFIG_UNUSED_SYMBOLS is not set | 1492 | # CONFIG_UNUSED_SYMBOLS is not set |
| @@ -1441,6 +1494,7 @@ CONFIG_DEBUG_FS=y | |||
| 1441 | # CONFIG_HEADERS_CHECK is not set | 1494 | # CONFIG_HEADERS_CHECK is not set |
| 1442 | # CONFIG_DEBUG_KERNEL is not set | 1495 | # CONFIG_DEBUG_KERNEL is not set |
| 1443 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1496 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1497 | # CONFIG_SAMPLES is not set | ||
| 1444 | CONFIG_DEBUG_MMRS=y | 1498 | CONFIG_DEBUG_MMRS=y |
| 1445 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | 1499 | CONFIG_DEBUG_HUNT_FOR_ZERO=y |
| 1446 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | 1500 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y |
| @@ -1460,11 +1514,8 @@ CONFIG_ACCESS_CHECK=y | |||
| 1460 | # CONFIG_KEYS is not set | 1514 | # CONFIG_KEYS is not set |
| 1461 | CONFIG_SECURITY=y | 1515 | CONFIG_SECURITY=y |
| 1462 | # CONFIG_SECURITY_NETWORK is not set | 1516 | # CONFIG_SECURITY_NETWORK is not set |
| 1463 | CONFIG_SECURITY_CAPABILITIES=m | 1517 | # CONFIG_SECURITY_CAPABILITIES is not set |
| 1464 | 1518 | # CONFIG_SECURITY_ROOTPLUG is not set | |
| 1465 | # | ||
| 1466 | # Cryptographic options | ||
| 1467 | # | ||
| 1468 | # CONFIG_CRYPTO is not set | 1519 | # CONFIG_CRYPTO is not set |
| 1469 | 1520 | ||
| 1470 | # | 1521 | # |
| @@ -1475,6 +1526,7 @@ CONFIG_CRC_CCITT=m | |||
| 1475 | # CONFIG_CRC16 is not set | 1526 | # CONFIG_CRC16 is not set |
| 1476 | # CONFIG_CRC_ITU_T is not set | 1527 | # CONFIG_CRC_ITU_T is not set |
| 1477 | CONFIG_CRC32=y | 1528 | CONFIG_CRC32=y |
| 1529 | # CONFIG_CRC7 is not set | ||
| 1478 | # CONFIG_LIBCRC32C is not set | 1530 | # CONFIG_LIBCRC32C is not set |
| 1479 | CONFIG_ZLIB_INFLATE=y | 1531 | CONFIG_ZLIB_INFLATE=y |
| 1480 | CONFIG_ZLIB_DEFLATE=m | 1532 | CONFIG_ZLIB_DEFLATE=m |
diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig index 5f6ff04a86c3..4384a670a8b8 100644 --- a/arch/blackfin/configs/IP0X_defconfig +++ b/arch/blackfin/configs/IP0X_defconfig | |||
| @@ -212,7 +212,7 @@ CONFIG_HZ=250 | |||
| 212 | # | 212 | # |
| 213 | # Memory Setup | 213 | # Memory Setup |
| 214 | # | 214 | # |
| 215 | CONFIG_MEM_SIZE=64 | 215 | CONFIG_MAX_MEM_SIZE=64 |
| 216 | CONFIG_MEM_ADD_WIDTH=10 | 216 | CONFIG_MEM_ADD_WIDTH=10 |
| 217 | 217 | ||
| 218 | # | 218 | # |
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index fd5448d6107c..d54f19085f37 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c | |||
| @@ -90,6 +90,17 @@ int request_dma(unsigned int channel, char *device_id) | |||
| 90 | { | 90 | { |
| 91 | 91 | ||
| 92 | pr_debug("request_dma() : BEGIN \n"); | 92 | pr_debug("request_dma() : BEGIN \n"); |
| 93 | |||
| 94 | #if defined(CONFIG_BF561) && ANOMALY_05000182 | ||
| 95 | if (channel >= CH_IMEM_STREAM0_DEST && channel <= CH_IMEM_STREAM1_DEST) { | ||
| 96 | if (get_cclk() > 500000000) { | ||
| 97 | printk(KERN_WARNING | ||
| 98 | "Request IMDMA failed due to ANOMALY 05000182\n"); | ||
| 99 | return -EFAULT; | ||
| 100 | } | ||
| 101 | } | ||
| 102 | #endif | ||
| 103 | |||
| 93 | mutex_lock(&(dma_ch[channel].dmalock)); | 104 | mutex_lock(&(dma_ch[channel].dmalock)); |
| 94 | 105 | ||
| 95 | if ((dma_ch[channel].chan_status == DMA_CHANNEL_REQUESTED) | 106 | if ((dma_ch[channel].chan_status == DMA_CHANNEL_REQUESTED) |
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 7e8eaf4a31bb..b6d89d1644cc 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
| @@ -1130,6 +1130,25 @@ void bfin_gpio_irq_prepare(unsigned gpio) | |||
| 1130 | 1130 | ||
| 1131 | #else | 1131 | #else |
| 1132 | 1132 | ||
| 1133 | int gpio_get_value(unsigned gpio) | ||
| 1134 | { | ||
| 1135 | unsigned long flags; | ||
| 1136 | int ret; | ||
| 1137 | |||
| 1138 | if (unlikely(get_gpio_edge(gpio))) { | ||
| 1139 | local_irq_save(flags); | ||
| 1140 | set_gpio_edge(gpio, 0); | ||
| 1141 | ret = get_gpio_data(gpio); | ||
| 1142 | set_gpio_edge(gpio, 1); | ||
| 1143 | local_irq_restore(flags); | ||
| 1144 | |||
| 1145 | return ret; | ||
| 1146 | } else | ||
| 1147 | return get_gpio_data(gpio); | ||
| 1148 | } | ||
| 1149 | EXPORT_SYMBOL(gpio_get_value); | ||
| 1150 | |||
| 1151 | |||
| 1133 | int gpio_direction_input(unsigned gpio) | 1152 | int gpio_direction_input(unsigned gpio) |
| 1134 | { | 1153 | { |
| 1135 | unsigned long flags; | 1154 | unsigned long flags; |
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c index 053edff6c0d8..4367330909b2 100644 --- a/arch/blackfin/kernel/bfin_ksyms.c +++ b/arch/blackfin/kernel/bfin_ksyms.c | |||
| @@ -90,7 +90,9 @@ EXPORT_SYMBOL(__umodsi3); | |||
| 90 | EXPORT_SYMBOL(outsb); | 90 | EXPORT_SYMBOL(outsb); |
| 91 | EXPORT_SYMBOL(insb); | 91 | EXPORT_SYMBOL(insb); |
| 92 | EXPORT_SYMBOL(outsw); | 92 | EXPORT_SYMBOL(outsw); |
| 93 | EXPORT_SYMBOL(outsw_8); | ||
| 93 | EXPORT_SYMBOL(insw); | 94 | EXPORT_SYMBOL(insw); |
| 95 | EXPORT_SYMBOL(insw_8); | ||
| 94 | EXPORT_SYMBOL(outsl); | 96 | EXPORT_SYMBOL(outsl); |
| 95 | EXPORT_SYMBOL(insl); | 97 | EXPORT_SYMBOL(insl); |
| 96 | EXPORT_SYMBOL(insl_16); | 98 | EXPORT_SYMBOL(insl_16); |
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/init_task.c b/arch/blackfin/kernel/init_task.c index c640154030e2..6bdba7b21109 100644 --- a/arch/blackfin/kernel/init_task.c +++ b/arch/blackfin/kernel/init_task.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
| 35 | 35 | ||
| 36 | static struct fs_struct init_fs = INIT_FS; | 36 | static struct fs_struct init_fs = INIT_FS; |
| 37 | static struct files_struct init_files = INIT_FILES; | ||
| 38 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 37 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 39 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 38 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 40 | 39 | ||
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 5b847070dae5..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 | ||
| @@ -364,13 +364,13 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
| 364 | /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */ | 364 | /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */ |
| 365 | case VEC_CPLB_MHIT: | 365 | case VEC_CPLB_MHIT: |
| 366 | info.si_code = ILL_CPLB_MULHIT; | 366 | info.si_code = ILL_CPLB_MULHIT; |
| 367 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO | ||
| 368 | sig = SIGSEGV; | 367 | sig = SIGSEGV; |
| 369 | printk(KERN_NOTICE "NULL pointer access (probably)\n"); | 368 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO |
| 370 | #else | 369 | if (saved_dcplb_fault_addr < FIXED_CODE_START) |
| 371 | sig = SIGILL; | 370 | printk(KERN_NOTICE "NULL pointer access\n"); |
| 372 | printk(KERN_NOTICE EXC_0x27(KERN_NOTICE)); | 371 | else |
| 373 | #endif | 372 | #endif |
| 373 | printk(KERN_NOTICE EXC_0x27(KERN_NOTICE)); | ||
| 374 | CHK_DEBUGGER_TRAP(); | 374 | CHK_DEBUGGER_TRAP(); |
| 375 | break; | 375 | break; |
| 376 | /* 0x28 - Emulation Watchpoint, handled here */ | 376 | /* 0x28 - Emulation Watchpoint, handled here */ |
| @@ -419,13 +419,13 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
| 419 | /* 0x2D - Instruction CPLB Multiple Hits, handled here */ | 419 | /* 0x2D - Instruction CPLB Multiple Hits, handled here */ |
| 420 | case VEC_CPLB_I_MHIT: | 420 | case VEC_CPLB_I_MHIT: |
| 421 | info.si_code = ILL_CPLB_MULHIT; | 421 | info.si_code = ILL_CPLB_MULHIT; |
| 422 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO | ||
| 423 | sig = SIGSEGV; | 422 | sig = SIGSEGV; |
| 424 | printk(KERN_NOTICE "Jump to address 0 - 0x0fff\n"); | 423 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO |
| 425 | #else | 424 | if (saved_icplb_fault_addr < FIXED_CODE_START) |
| 426 | sig = SIGILL; | 425 | printk(KERN_NOTICE "Jump to NULL address\n"); |
| 427 | printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE)); | 426 | else |
| 428 | #endif | 427 | #endif |
| 428 | printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE)); | ||
| 429 | CHK_DEBUGGER_TRAP(); | 429 | CHK_DEBUGGER_TRAP(); |
| 430 | break; | 430 | break; |
| 431 | /* 0x2E - Illegal use of Supervisor Resource, handled here */ | 431 | /* 0x2E - Illegal use of Supervisor Resource, handled here */ |
| @@ -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/checksum.c b/arch/blackfin/lib/checksum.c index 42768e0c80ca..5c87505165d3 100644 --- a/arch/blackfin/lib/checksum.c +++ b/arch/blackfin/lib/checksum.c | |||
| @@ -72,9 +72,9 @@ static unsigned short do_csum(const unsigned char *buff, int len) | |||
| 72 | * This is a version of ip_compute_csum() optimized for IP headers, | 72 | * This is a version of ip_compute_csum() optimized for IP headers, |
| 73 | * which always checksum on 4 octet boundaries. | 73 | * which always checksum on 4 octet boundaries. |
| 74 | */ | 74 | */ |
| 75 | unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl) | 75 | __sum16 ip_fast_csum(unsigned char *iph, unsigned int ihl) |
| 76 | { | 76 | { |
| 77 | return ~do_csum(iph, ihl * 4); | 77 | return (__force __sum16)~do_csum(iph, ihl * 4); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | /* | 80 | /* |
| @@ -89,7 +89,7 @@ unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl) | |||
| 89 | * | 89 | * |
| 90 | * it's best to have buff aligned on a 32-bit boundary | 90 | * it's best to have buff aligned on a 32-bit boundary |
| 91 | */ | 91 | */ |
| 92 | unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum) | 92 | __wsum csum_partial(const void *buff, int len, __wsum sum) |
| 93 | { | 93 | { |
| 94 | /* | 94 | /* |
| 95 | * Just in case we get nasty checksum data... | 95 | * Just in case we get nasty checksum data... |
| @@ -109,22 +109,22 @@ unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum) | |||
| 109 | * this routine is used for miscellaneous IP-like checksums, mainly | 109 | * this routine is used for miscellaneous IP-like checksums, mainly |
| 110 | * in icmp.c | 110 | * in icmp.c |
| 111 | */ | 111 | */ |
| 112 | unsigned short ip_compute_csum(const unsigned char *buff, int len) | 112 | __sum16 ip_compute_csum(const void *buff, int len) |
| 113 | { | 113 | { |
| 114 | return ~do_csum(buff, len); | 114 | return (__force __sum16)~do_csum(buff, len); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | /* | 117 | /* |
| 118 | * copy from fs while checksumming, otherwise like csum_partial | 118 | * copy from fs while checksumming, otherwise like csum_partial |
| 119 | */ | 119 | */ |
| 120 | 120 | ||
| 121 | unsigned int | 121 | __wsum |
| 122 | csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, | 122 | csum_partial_copy_from_user(const void __user *src, void *dst, |
| 123 | int len, int sum, int *csum_err) | 123 | int len, __wsum sum, int *csum_err) |
| 124 | { | 124 | { |
| 125 | if (csum_err) | 125 | if (csum_err) |
| 126 | *csum_err = 0; | 126 | *csum_err = 0; |
| 127 | memcpy(dst, src, len); | 127 | memcpy(dst, (__force void *)src, len); |
| 128 | return csum_partial(dst, len, sum); | 128 | return csum_partial(dst, len, sum); |
| 129 | } | 129 | } |
| 130 | 130 | ||
| @@ -132,8 +132,7 @@ csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, | |||
| 132 | * copy from ds while checksumming, otherwise like csum_partial | 132 | * copy from ds while checksumming, otherwise like csum_partial |
| 133 | */ | 133 | */ |
| 134 | 134 | ||
| 135 | unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst, | 135 | __wsum csum_partial_copy(const void *src, void *dst, int len, __wsum sum) |
| 136 | int len, int sum) | ||
| 137 | { | 136 | { |
| 138 | memcpy(dst, src, len); | 137 | memcpy(dst, src, len); |
| 139 | return csum_partial(dst, len, sum); | 138 | return csum_partial(dst, len, sum); |
diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S index df7b8833a0c5..eba2343b1b59 100644 --- a/arch/blackfin/lib/ins.S +++ b/arch/blackfin/lib/ins.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Description: Implementation of ins{bwl} for BlackFin processors using zero overhead loops. | 7 | * Description: Implementation of ins{bwl} for BlackFin processors using zero overhead loops. |
| 8 | * | 8 | * |
| 9 | * Modified: | 9 | * Modified: |
| 10 | * Copyright 2004-2006 Analog Devices Inc. | 10 | * Copyright 2004-2008 Analog Devices Inc. |
| 11 | * Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> | 11 | * Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> |
| 12 | * | 12 | * |
| 13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
| @@ -63,6 +63,23 @@ ENTRY(_insw) | |||
| 63 | RTS; | 63 | RTS; |
| 64 | ENDPROC(_insw) | 64 | ENDPROC(_insw) |
| 65 | 65 | ||
| 66 | ENTRY(_insw_8) | ||
| 67 | P0 = R0; /* P0 = port */ | ||
| 68 | cli R3; | ||
| 69 | P1 = R1; /* P1 = address */ | ||
| 70 | P2 = R2; /* P2 = count */ | ||
| 71 | SSYNC; | ||
| 72 | LSETUP( .Lword8_loop_s, .Lword8_loop_e) LC0 = P2; | ||
| 73 | .Lword8_loop_s: R0 = W[P0]; | ||
| 74 | B[P1++] = R0; | ||
| 75 | R0 = R0 >> 8; | ||
| 76 | B[P1++] = R0; | ||
| 77 | NOP; | ||
| 78 | .Lword8_loop_e: NOP; | ||
| 79 | sti R3; | ||
| 80 | RTS; | ||
| 81 | ENDPROC(_insw_8) | ||
| 82 | |||
| 66 | ENTRY(_insb) | 83 | ENTRY(_insb) |
| 67 | P0 = R0; /* P0 = port */ | 84 | P0 = R0; /* P0 = port */ |
| 68 | cli R3; | 85 | cli R3; |
| @@ -78,8 +95,6 @@ ENTRY(_insb) | |||
| 78 | RTS; | 95 | RTS; |
| 79 | ENDPROC(_insb) | 96 | ENDPROC(_insb) |
| 80 | 97 | ||
| 81 | |||
| 82 | |||
| 83 | ENTRY(_insl_16) | 98 | ENTRY(_insl_16) |
| 84 | P0 = R0; /* P0 = port */ | 99 | P0 = R0; /* P0 = port */ |
| 85 | cli R3; | 100 | cli R3; |
diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S index 4c3da8ae094e..4685b7aa0080 100644 --- a/arch/blackfin/lib/outs.S +++ b/arch/blackfin/lib/outs.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Description: Implementation of outs{bwl} for BlackFin processors using zero overhead loops. | 7 | * Description: Implementation of outs{bwl} for BlackFin processors using zero overhead loops. |
| 8 | * | 8 | * |
| 9 | * Modified: Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> | 9 | * Modified: Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> |
| 10 | * Copyright 2004-2006 Analog Devices Inc. | 10 | * Copyright 2004-2008 Analog Devices Inc. |
| 11 | * | 11 | * |
| 12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
| 13 | * | 13 | * |
| @@ -63,3 +63,17 @@ ENTRY(_outsb) | |||
| 63 | .Lbyte_loop_e: B[P0] = R0; | 63 | .Lbyte_loop_e: B[P0] = R0; |
| 64 | RTS; | 64 | RTS; |
| 65 | ENDPROC(_outsb) | 65 | ENDPROC(_outsb) |
| 66 | |||
| 67 | ENTRY(_outsw_8) | ||
| 68 | P0 = R0; /* P0 = port */ | ||
| 69 | P1 = R1; /* P1 = address */ | ||
| 70 | P2 = R2; /* P2 = count */ | ||
| 71 | |||
| 72 | LSETUP( .Lword8_loop_s, .Lword8_loop_e) LC0 = P2; | ||
| 73 | .Lword8_loop_s: R1 = B[P1++]; | ||
| 74 | R0 = B[P1++]; | ||
| 75 | R0 = R0 << 8; | ||
| 76 | R0 = R0 + R1; | ||
| 77 | .Lword8_loop_e: W[P0] = R0; | ||
| 78 | RTS; | ||
| 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 7fd35fb32fd5..13ae49515f73 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
| @@ -111,7 +111,7 @@ static struct platform_device net2272_bfin_device = { | |||
| 111 | }; | 111 | }; |
| 112 | #endif | 112 | #endif |
| 113 | 113 | ||
| 114 | #if defined(CONFIG_MTD_BF5xx) || defined(CONFIG_MTD_BF5xx_MODULE) | 114 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) |
| 115 | static struct mtd_partition stamp_partitions[] = { | 115 | static struct mtd_partition stamp_partitions[] = { |
| 116 | { | 116 | { |
| 117 | .name = "Bootloader", | 117 | .name = "Bootloader", |
| @@ -141,13 +141,17 @@ static struct resource stamp_flash_resource[] = { | |||
| 141 | .end = 0x203fffff, | 141 | .end = 0x203fffff, |
| 142 | .flags = IORESOURCE_MEM, | 142 | .flags = IORESOURCE_MEM, |
| 143 | }, { | 143 | }, { |
| 144 | .start = CONFIG_ENET_FLASH_PIN, | 144 | .start = 0x7BB07BB0, /* AMBCTL0 setting when accessing flash */ |
| 145 | .end = 0x7BB07BB0, /* AMBCTL1 setting when accessing flash */ | ||
| 146 | .flags = IORESOURCE_MEM, | ||
| 147 | }, { | ||
| 148 | .start = GPIO_PF0, | ||
| 145 | .flags = IORESOURCE_IRQ, | 149 | .flags = IORESOURCE_IRQ, |
| 146 | } | 150 | } |
| 147 | }; | 151 | }; |
| 148 | 152 | ||
| 149 | static struct platform_device stamp_flash_device = { | 153 | static struct platform_device stamp_flash_device = { |
| 150 | .name = "BF5xx-Flash", | 154 | .name = "bfin-async-flash", |
| 151 | .id = 0, | 155 | .id = 0, |
| 152 | .dev = { | 156 | .dev = { |
| 153 | .platform_data = &stamp_flash_data, | 157 | .platform_data = &stamp_flash_data, |
| @@ -157,9 +161,6 @@ static struct platform_device stamp_flash_device = { | |||
| 157 | }; | 161 | }; |
| 158 | #endif | 162 | #endif |
| 159 | 163 | ||
| 160 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 161 | /* all SPI peripherals info goes here */ | ||
| 162 | |||
| 163 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 164 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 164 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 165 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 165 | { | 166 | { |
| @@ -316,6 +317,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 316 | #endif | 317 | #endif |
| 317 | }; | 318 | }; |
| 318 | 319 | ||
| 320 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 319 | /* SPI (0) */ | 321 | /* SPI (0) */ |
| 320 | static struct resource bfin_spi0_resource[] = { | 322 | static struct resource bfin_spi0_resource[] = { |
| 321 | [0] = { | 323 | [0] = { |
| @@ -595,7 +597,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
| 595 | 597 | ||
| 596 | &bfin_gpios_device, | 598 | &bfin_gpios_device, |
| 597 | 599 | ||
| 598 | #if defined(CONFIG_MTD_BF5xx) || defined(CONFIG_MTD_BF5xx_MODULE) | 600 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) |
| 599 | &stamp_flash_device, | 601 | &stamp_flash_device, |
| 600 | #endif | 602 | #endif |
| 601 | }; | 603 | }; |
| @@ -617,15 +619,13 @@ static int __init stamp_init(void) | |||
| 617 | 619 | ||
| 618 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 620 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) |
| 619 | /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */ | 621 | /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */ |
| 620 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | (1 << CONFIG_ENET_FLASH_PIN)); | 622 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF0); |
| 621 | bfin_write_FIO_FLAG_S(1 << CONFIG_ENET_FLASH_PIN); | 623 | bfin_write_FIO_FLAG_S(PF0); |
| 622 | SSYNC(); | 624 | SSYNC(); |
| 623 | #endif | 625 | #endif |
| 624 | 626 | ||
| 625 | #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)); |
| 626 | spi_register_board_info(bfin_spi_board_info, | 628 | |
| 627 | ARRAY_SIZE(bfin_spi_board_info)); | ||
| 628 | #endif | ||
| 629 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 629 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 630 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 630 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
| 631 | #endif | 631 | #endif |
| @@ -636,8 +636,8 @@ arch_initcall(stamp_init); | |||
| 636 | 636 | ||
| 637 | void native_machine_restart(char *cmd) | 637 | void native_machine_restart(char *cmd) |
| 638 | { | 638 | { |
| 639 | #define BIT_TO_SET (1 << CONFIG_ENET_FLASH_PIN) | 639 | /* workaround pull up on cpld / flash pin not being strong enough */ |
| 640 | bfin_write_FIO_INEN(~BIT_TO_SET); | 640 | bfin_write_FIO_INEN(~PF0); |
| 641 | bfin_write_FIO_DIR(BIT_TO_SET); | 641 | bfin_write_FIO_DIR(PF0); |
| 642 | bfin_write_FIO_FLAG_C(BIT_TO_SET); | 642 | bfin_write_FIO_FLAG_C(PF0); |
| 643 | } | 643 | } |
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/cris/kernel/process.c b/arch/cris/kernel/process.c index ef2db8fd102a..5933656db5a2 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | static struct fs_struct init_fs = INIT_FS; | 40 | static struct fs_struct init_fs = INIT_FS; |
| 41 | static struct files_struct init_files = INIT_FILES; | ||
| 42 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 41 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 43 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 42 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 44 | struct mm_struct init_mm = INIT_MM(init_mm); | 43 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/init_task.c b/arch/frv/kernel/init_task.c index 22993932b3fc..e2198815b630 100644 --- a/arch/frv/kernel/init_task.c +++ b/arch/frv/kernel/init_task.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
| 14 | static struct files_struct init_files = INIT_FILES; | ||
| 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 17 | struct mm_struct init_mm = INIT_MM(init_mm); | 16 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/h8300/kernel/init_task.c b/arch/h8300/kernel/init_task.c index 19272c2ac56a..93a4899e46c2 100644 --- a/arch/h8300/kernel/init_task.c +++ b/arch/h8300/kernel/init_task.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
| 14 | 14 | ||
| 15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
| 16 | static struct files_struct init_files = INIT_FILES; | ||
| 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/init_task.c b/arch/ia64/kernel/init_task.c index bc8efcad28b8..9d7e1c66faf4 100644 --- a/arch/ia64/kernel/init_task.c +++ b/arch/ia64/kernel/init_task.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/pgtable.h> | 18 | #include <asm/pgtable.h> |
| 19 | 19 | ||
| 20 | static struct fs_struct init_fs = INIT_FS; | 20 | static struct fs_struct init_fs = INIT_FS; |
| 21 | static struct files_struct init_files = INIT_FILES; | ||
| 22 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 21 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 23 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 22 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 24 | struct mm_struct init_mm = INIT_MM(init_mm); | 23 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/setup.c b/arch/ia64/kernel/setup.c index e9596cd0cdab..f48a809c686d 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -560,6 +560,17 @@ setup_arch (char **cmdline_p) | |||
| 560 | /* process SAL system table: */ | 560 | /* process SAL system table: */ |
| 561 | ia64_sal_init(__va(efi.sal_systab)); | 561 | ia64_sal_init(__va(efi.sal_systab)); |
| 562 | 562 | ||
| 563 | #ifdef CONFIG_ITANIUM | ||
| 564 | ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist); | ||
| 565 | #else | ||
| 566 | { | ||
| 567 | u64 num_phys_stacked; | ||
| 568 | |||
| 569 | if (ia64_pal_rse_info(&num_phys_stacked, 0) == 0 && num_phys_stacked > 96) | ||
| 570 | ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist); | ||
| 571 | } | ||
| 572 | #endif | ||
| 573 | |||
| 563 | #ifdef CONFIG_SMP | 574 | #ifdef CONFIG_SMP |
| 564 | cpu_physical_id(0) = hard_smp_processor_id(); | 575 | cpu_physical_id(0) = hard_smp_processor_id(); |
| 565 | #endif | 576 | #endif |
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/Makefile b/arch/ia64/kvm/Makefile index 52353397a1a4..112791dd2542 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile | |||
| @@ -7,7 +7,6 @@ offsets-file := asm-offsets.h | |||
| 7 | always := $(offsets-file) | 7 | always := $(offsets-file) |
| 8 | targets := $(offsets-file) | 8 | targets := $(offsets-file) |
| 9 | targets += arch/ia64/kvm/asm-offsets.s | 9 | targets += arch/ia64/kvm/asm-offsets.s |
| 10 | clean-files := $(addprefix $(objtree)/,$(targets) $(obj)/memcpy.S $(obj)/memset.S) | ||
| 11 | 10 | ||
| 12 | # Default sed regexp - multiline due to syntax constraints | 11 | # Default sed regexp - multiline due to syntax constraints |
| 13 | define sed-y | 12 | define sed-y |
| @@ -54,5 +53,5 @@ EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 | |||
| 54 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ | 53 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ |
| 55 | vtlb.o process.o | 54 | vtlb.o process.o |
| 56 | #Add link memcpy and memset to avoid possible structure assignment error | 55 | #Add link memcpy and memset to avoid possible structure assignment error |
| 57 | kvm-intel-objs += ../lib/memset.o ../lib/memcpy.o | 56 | kvm-intel-objs += memcpy.o memset.o |
| 58 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o | 57 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o |
diff --git a/arch/ia64/kvm/memcpy.S b/arch/ia64/kvm/memcpy.S new file mode 100644 index 000000000000..c04cdbe9f80f --- /dev/null +++ b/arch/ia64/kvm/memcpy.S | |||
| @@ -0,0 +1 @@ | |||
| #include "../lib/memcpy.S" | |||
diff --git a/arch/ia64/kvm/memset.S b/arch/ia64/kvm/memset.S new file mode 100644 index 000000000000..83c3066d844a --- /dev/null +++ b/arch/ia64/kvm/memset.S | |||
| @@ -0,0 +1 @@ | |||
| #include "../lib/memset.S" | |||
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/m32r/kernel/init_task.c b/arch/m32r/kernel/init_task.c index 9e508fd9d970..0d658dbb6766 100644 --- a/arch/m32r/kernel/init_task.c +++ b/arch/m32r/kernel/init_task.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <asm/pgtable.h> | 12 | #include <asm/pgtable.h> |
| 13 | 13 | ||
| 14 | static struct fs_struct init_fs = INIT_FS; | 14 | static struct fs_struct init_fs = INIT_FS; |
| 15 | static struct files_struct init_files = INIT_FILES; | ||
| 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 18 | struct mm_struct init_mm = INIT_MM(init_mm); | 17 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/kernel/process.c b/arch/m68k/kernel/process.c index 5de4e4ed76ab..7888cdf91f5d 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | * setup. | 41 | * setup. |
| 42 | */ | 42 | */ |
| 43 | static struct fs_struct init_fs = INIT_FS; | 43 | static struct fs_struct init_fs = INIT_FS; |
| 44 | static struct files_struct init_files = INIT_FILES; | ||
| 45 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 44 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 46 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 45 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 47 | struct mm_struct init_mm = INIT_MM(init_mm); | 46 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/kernel/init_task.c b/arch/m68knommu/kernel/init_task.c index 3897043a126a..344c01aede08 100644 --- a/arch/m68knommu/kernel/init_task.c +++ b/arch/m68knommu/kernel/init_task.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
| 14 | 14 | ||
| 15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
| 16 | static struct files_struct init_files = INIT_FILES; | ||
| 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/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/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/init_task.c b/arch/mips/kernel/init_task.c index aeda7f58391b..d72487ad7c15 100644 --- a/arch/mips/kernel/init_task.c +++ b/arch/mips/kernel/init_task.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
| 11 | 11 | ||
| 12 | static struct fs_struct init_fs = INIT_FS; | 12 | static struct fs_struct init_fs = INIT_FS; |
| 13 | static struct files_struct init_files = INIT_FILES; | ||
| 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 16 | struct mm_struct init_mm = INIT_MM(init_mm); | 15 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/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/mm/page.c b/arch/mips/mm/page.c index d827d6144369..cab81f42eee5 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_load / 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/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/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/mn10300/kernel/init_task.c b/arch/mn10300/kernel/init_task.c index 39fe6882dd1d..af16f6e5c918 100644 --- a/arch/mn10300/kernel/init_task.c +++ b/arch/mn10300/kernel/init_task.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
| 20 | 20 | ||
| 21 | static struct fs_struct init_fs = INIT_FS; | 21 | static struct fs_struct init_fs = INIT_FS; |
| 22 | static struct files_struct init_files = INIT_FILES; | ||
| 23 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 22 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 24 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 23 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 25 | struct mm_struct init_mm = INIT_MM(init_mm); | 24 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/init_task.c b/arch/parisc/kernel/init_task.c index 26198a074d67..f5941c086551 100644 --- a/arch/parisc/kernel/init_task.c +++ b/arch/parisc/kernel/init_task.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <asm/pgalloc.h> | 35 | #include <asm/pgalloc.h> |
| 36 | 36 | ||
| 37 | static struct fs_struct init_fs = INIT_FS; | 37 | static struct fs_struct init_fs = INIT_FS; |
| 38 | static struct files_struct init_files = INIT_FILES; | ||
| 39 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 38 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 40 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 39 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 41 | struct mm_struct init_mm = INIT_MM(init_mm); | 40 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/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/4xx.c b/arch/powerpc/boot/4xx.c index 758edf1c5815..5c878436f348 100644 --- a/arch/powerpc/boot/4xx.c +++ b/arch/powerpc/boot/4xx.c | |||
| @@ -21,6 +21,25 @@ | |||
| 21 | #include "reg.h" | 21 | #include "reg.h" |
| 22 | #include "dcr.h" | 22 | #include "dcr.h" |
| 23 | 23 | ||
| 24 | static unsigned long chip_11_errata(unsigned long memsize) | ||
| 25 | { | ||
| 26 | unsigned long pvr; | ||
| 27 | |||
| 28 | pvr = mfpvr(); | ||
| 29 | |||
| 30 | switch (pvr & 0xf0000ff0) { | ||
| 31 | case 0x40000850: | ||
| 32 | case 0x400008d0: | ||
| 33 | case 0x200008d0: | ||
| 34 | memsize -= 4096; | ||
| 35 | break; | ||
| 36 | default: | ||
| 37 | break; | ||
| 38 | } | ||
| 39 | |||
| 40 | return memsize; | ||
| 41 | } | ||
| 42 | |||
| 24 | /* Read the 4xx SDRAM controller to get size of system memory. */ | 43 | /* Read the 4xx SDRAM controller to get size of system memory. */ |
| 25 | void ibm4xx_sdram_fixup_memsize(void) | 44 | void ibm4xx_sdram_fixup_memsize(void) |
| 26 | { | 45 | { |
| @@ -34,6 +53,7 @@ void ibm4xx_sdram_fixup_memsize(void) | |||
| 34 | memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); | 53 | memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); |
| 35 | } | 54 | } |
| 36 | 55 | ||
| 56 | memsize = chip_11_errata(memsize); | ||
| 37 | dt_fixup_memory(0, memsize); | 57 | dt_fixup_memory(0, memsize); |
| 38 | } | 58 | } |
| 39 | 59 | ||
| @@ -199,6 +219,7 @@ void ibm4xx_denali_fixup_memsize(void) | |||
| 199 | bank = 4; /* 4 banks */ | 219 | bank = 4; /* 4 banks */ |
| 200 | 220 | ||
| 201 | memsize = cs * (1 << (col+row)) * bank * dpath; | 221 | memsize = cs * (1 << (col+row)) * bank * dpath; |
| 222 | memsize = chip_11_errata(memsize); | ||
| 202 | dt_fixup_memory(0, memsize); | 223 | dt_fixup_memory(0, memsize); |
| 203 | } | 224 | } |
| 204 | 225 | ||
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 7822d25c9d31..d53b84e761a9 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -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 |
| @@ -339,7 +339,9 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) | |||
| 339 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< | 339 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< |
| 340 | 340 | ||
| 341 | # anything not in $(targets) | 341 | # anything not in $(targets) |
| 342 | clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \ | 342 | clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ |
| 343 | zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ | ||
| 344 | zImage.iseries zImage.miboot zImage.pmac zImage.pseries \ | ||
| 343 | otheros.bld *.dtb | 345 | otheros.bld *.dtb |
| 344 | 346 | ||
| 345 | # clean up files cached by wrapper | 347 | # clean up files cached by wrapper |
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/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/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/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 88338a9f5e95..db34909831a2 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-rc3 |
| 4 | # Thu Mar 27 13:55:43 2008 | 4 | # Tue May 20 20:01:18 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,61 +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 |
| 588 | CONFIG_SATA_SVW=y | ||
| 589 | # CONFIG_ATA_PIIX is not set | ||
| 590 | # CONFIG_SATA_MV is not set | ||
| 591 | # CONFIG_SATA_NV is not set | ||
| 592 | # CONFIG_PDC_ADMA is not set | ||
| 593 | # CONFIG_SATA_QSTOR is not set | ||
| 594 | # CONFIG_SATA_PROMISE is not set | ||
| 595 | # CONFIG_SATA_SX4 is not set | ||
| 596 | # CONFIG_SATA_SIL is not set | ||
| 597 | # CONFIG_SATA_SIL24 is not set | 599 | # CONFIG_SATA_SIL24 is not set |
| 598 | # CONFIG_SATA_SIS is not set | 600 | # CONFIG_ATA_SFF is not set |
| 599 | # CONFIG_SATA_ULI is not set | ||
| 600 | # CONFIG_SATA_VIA is not set | ||
| 601 | # CONFIG_SATA_VITESSE is not set | ||
| 602 | # CONFIG_SATA_INIC162X is not set | ||
| 603 | # CONFIG_PATA_ALI is not set | ||
| 604 | # CONFIG_PATA_AMD is not set | ||
| 605 | # CONFIG_PATA_ARTOP is not set | ||
| 606 | # CONFIG_PATA_ATIIXP is not set | ||
| 607 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 608 | # CONFIG_PATA_CMD64X is not set | ||
| 609 | # CONFIG_PATA_CS5520 is not set | ||
| 610 | # CONFIG_PATA_CS5530 is not set | ||
| 611 | # CONFIG_PATA_CYPRESS is not set | ||
| 612 | # CONFIG_PATA_EFAR is not set | ||
| 613 | # CONFIG_ATA_GENERIC is not set | ||
| 614 | # CONFIG_PATA_HPT366 is not set | ||
| 615 | # CONFIG_PATA_HPT37X is not set | ||
| 616 | # CONFIG_PATA_HPT3X2N is not set | ||
| 617 | # CONFIG_PATA_HPT3X3 is not set | ||
| 618 | # CONFIG_PATA_IT821X is not set | ||
| 619 | # CONFIG_PATA_IT8213 is not set | ||
| 620 | # CONFIG_PATA_JMICRON is not set | ||
| 621 | # CONFIG_PATA_TRIFLEX is not set | ||
| 622 | # CONFIG_PATA_MARVELL is not set | ||
| 623 | # CONFIG_PATA_MPIIX is not set | ||
| 624 | # CONFIG_PATA_OLDPIIX is not set | ||
| 625 | # CONFIG_PATA_NETCELL is not set | ||
| 626 | # CONFIG_PATA_NINJA32 is not set | ||
| 627 | # CONFIG_PATA_NS87410 is not set | ||
| 628 | # CONFIG_PATA_NS87415 is not set | ||
| 629 | # CONFIG_PATA_OPTI is not set | ||
| 630 | # CONFIG_PATA_OPTIDMA is not set | ||
| 631 | # CONFIG_PATA_PDC_OLD is not set | ||
| 632 | # CONFIG_PATA_RADISYS is not set | ||
| 633 | # CONFIG_PATA_RZ1000 is not set | ||
| 634 | # CONFIG_PATA_SC1200 is not set | ||
| 635 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 636 | # CONFIG_PATA_PDC2027X is not set | ||
| 637 | # CONFIG_PATA_SIL680 is not set | ||
| 638 | # CONFIG_PATA_SIS is not set | ||
| 639 | # CONFIG_PATA_VIA is not set | ||
| 640 | # CONFIG_PATA_WINBOND is not set | ||
| 641 | # CONFIG_PATA_PLATFORM is not set | ||
| 642 | CONFIG_MD=y | 601 | CONFIG_MD=y |
| 643 | CONFIG_BLK_DEV_MD=y | 602 | CONFIG_BLK_DEV_MD=y |
| 644 | CONFIG_MD_LINEAR=y | 603 | CONFIG_MD_LINEAR=y |
| @@ -740,7 +699,6 @@ CONFIG_E1000=y | |||
| 740 | # CONFIG_SIS190 is not set | 699 | # CONFIG_SIS190 is not set |
| 741 | # CONFIG_SKGE is not set | 700 | # CONFIG_SKGE is not set |
| 742 | # CONFIG_SKY2 is not set | 701 | # CONFIG_SKY2 is not set |
| 743 | # CONFIG_SK98LIN is not set | ||
| 744 | # CONFIG_VIA_VELOCITY is not set | 702 | # CONFIG_VIA_VELOCITY is not set |
| 745 | CONFIG_TIGON3=y | 703 | CONFIG_TIGON3=y |
| 746 | # CONFIG_BNX2 is not set | 704 | # CONFIG_BNX2 is not set |
| @@ -755,10 +713,10 @@ CONFIG_NETDEV_10000=y | |||
| 755 | # CONFIG_MYRI10GE is not set | 713 | # CONFIG_MYRI10GE is not set |
| 756 | # CONFIG_NETXEN_NIC is not set | 714 | # CONFIG_NETXEN_NIC is not set |
| 757 | # CONFIG_NIU is not set | 715 | # CONFIG_NIU is not set |
| 758 | # CONFIG_PASEMI_MAC is not set | ||
| 759 | # CONFIG_MLX4_CORE is not set | 716 | # CONFIG_MLX4_CORE is not set |
| 760 | # CONFIG_TEHUTI is not set | 717 | # CONFIG_TEHUTI is not set |
| 761 | # CONFIG_BNX2X is not set | 718 | # CONFIG_BNX2X is not set |
| 719 | # CONFIG_SFC is not set | ||
| 762 | CONFIG_TR=y | 720 | CONFIG_TR=y |
| 763 | CONFIG_IBMOL=y | 721 | CONFIG_IBMOL=y |
| 764 | # CONFIG_3C359 is not set | 722 | # CONFIG_3C359 is not set |
| @@ -769,6 +727,7 @@ CONFIG_IBMOL=y | |||
| 769 | # | 727 | # |
| 770 | # CONFIG_WLAN_PRE80211 is not set | 728 | # CONFIG_WLAN_PRE80211 is not set |
| 771 | # CONFIG_WLAN_80211 is not set | 729 | # CONFIG_WLAN_80211 is not set |
| 730 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 772 | 731 | ||
| 773 | # | 732 | # |
| 774 | # USB Network Adapters | 733 | # USB Network Adapters |
| @@ -865,6 +824,7 @@ CONFIG_VT=y | |||
| 865 | CONFIG_VT_CONSOLE=y | 824 | CONFIG_VT_CONSOLE=y |
| 866 | CONFIG_HW_CONSOLE=y | 825 | CONFIG_HW_CONSOLE=y |
| 867 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 826 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 827 | CONFIG_DEVKMEM=y | ||
| 868 | # CONFIG_SERIAL_NONSTANDARD is not set | 828 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 869 | # CONFIG_NOZOMI is not set | 829 | # CONFIG_NOZOMI is not set |
| 870 | 830 | ||
| @@ -895,13 +855,7 @@ CONFIG_DEVPORT=y | |||
| 895 | CONFIG_I2C=y | 855 | CONFIG_I2C=y |
| 896 | CONFIG_I2C_BOARDINFO=y | 856 | CONFIG_I2C_BOARDINFO=y |
| 897 | CONFIG_I2C_CHARDEV=y | 857 | CONFIG_I2C_CHARDEV=y |
| 898 | |||
| 899 | # | ||
| 900 | # I2C Algorithms | ||
| 901 | # | ||
| 902 | CONFIG_I2C_ALGOBIT=y | 858 | CONFIG_I2C_ALGOBIT=y |
| 903 | # CONFIG_I2C_ALGOPCF is not set | ||
| 904 | # CONFIG_I2C_ALGOPCA is not set | ||
| 905 | 859 | ||
| 906 | # | 860 | # |
| 907 | # I2C Hardware Bus support | 861 | # I2C Hardware Bus support |
| @@ -930,6 +884,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 930 | # CONFIG_I2C_VIA is not set | 884 | # CONFIG_I2C_VIA is not set |
| 931 | # CONFIG_I2C_VIAPRO is not set | 885 | # CONFIG_I2C_VIAPRO is not set |
| 932 | # CONFIG_I2C_VOODOO3 is not set | 886 | # CONFIG_I2C_VOODOO3 is not set |
| 887 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 933 | 888 | ||
| 934 | # | 889 | # |
| 935 | # Miscellaneous I2C Chip support | 890 | # Miscellaneous I2C Chip support |
| @@ -939,19 +894,13 @@ CONFIG_I2C_POWERMAC=y | |||
| 939 | # CONFIG_SENSORS_PCF8574 is not set | 894 | # CONFIG_SENSORS_PCF8574 is not set |
| 940 | # CONFIG_PCF8575 is not set | 895 | # CONFIG_PCF8575 is not set |
| 941 | # CONFIG_SENSORS_PCF8591 is not set | 896 | # CONFIG_SENSORS_PCF8591 is not set |
| 942 | # CONFIG_TPS65010 is not set | ||
| 943 | # CONFIG_SENSORS_MAX6875 is not set | 897 | # CONFIG_SENSORS_MAX6875 is not set |
| 944 | # CONFIG_SENSORS_TSL2550 is not set | 898 | # CONFIG_SENSORS_TSL2550 is not set |
| 945 | # CONFIG_I2C_DEBUG_CORE is not set | 899 | # CONFIG_I2C_DEBUG_CORE is not set |
| 946 | # CONFIG_I2C_DEBUG_ALGO is not set | 900 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 947 | # CONFIG_I2C_DEBUG_BUS is not set | 901 | # CONFIG_I2C_DEBUG_BUS is not set |
| 948 | # CONFIG_I2C_DEBUG_CHIP is not set | 902 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 949 | |||
| 950 | # | ||
| 951 | # SPI support | ||
| 952 | # | ||
| 953 | # CONFIG_SPI is not set | 903 | # CONFIG_SPI is not set |
| 954 | # CONFIG_SPI_MASTER is not set | ||
| 955 | # CONFIG_W1 is not set | 904 | # CONFIG_W1 is not set |
| 956 | # CONFIG_POWER_SUPPLY is not set | 905 | # CONFIG_POWER_SUPPLY is not set |
| 957 | # CONFIG_HWMON is not set | 906 | # CONFIG_HWMON is not set |
| @@ -968,12 +917,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 968 | # Multifunction device drivers | 917 | # Multifunction device drivers |
| 969 | # | 918 | # |
| 970 | # CONFIG_MFD_SM501 is not set | 919 | # CONFIG_MFD_SM501 is not set |
| 920 | # CONFIG_HTC_PASIC3 is not set | ||
| 971 | 921 | ||
| 972 | # | 922 | # |
| 973 | # Multimedia devices | 923 | # Multimedia devices |
| 974 | # | 924 | # |
| 925 | |||
| 926 | # | ||
| 927 | # Multimedia core support | ||
| 928 | # | ||
| 975 | # CONFIG_VIDEO_DEV is not set | 929 | # CONFIG_VIDEO_DEV is not set |
| 976 | # CONFIG_DVB_CORE is not set | 930 | # CONFIG_DVB_CORE is not set |
| 931 | # CONFIG_VIDEO_MEDIA is not set | ||
| 932 | |||
| 933 | # | ||
| 934 | # Multimedia drivers | ||
| 935 | # | ||
| 977 | CONFIG_DAB=y | 936 | CONFIG_DAB=y |
| 978 | # CONFIG_USB_DABUSB is not set | 937 | # CONFIG_USB_DABUSB is not set |
| 979 | 938 | ||
| @@ -995,8 +954,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 995 | # CONFIG_FB_SYS_FILLRECT is not set | 954 | # CONFIG_FB_SYS_FILLRECT is not set |
| 996 | # CONFIG_FB_SYS_COPYAREA is not set | 955 | # CONFIG_FB_SYS_COPYAREA is not set |
| 997 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 956 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 957 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 998 | # CONFIG_FB_SYS_FOPS is not set | 958 | # CONFIG_FB_SYS_FOPS is not set |
| 999 | CONFIG_FB_DEFERRED_IO=y | ||
| 1000 | # CONFIG_FB_SVGALIB is not set | 959 | # CONFIG_FB_SVGALIB is not set |
| 1001 | CONFIG_FB_MACMODES=y | 960 | CONFIG_FB_MACMODES=y |
| 1002 | CONFIG_FB_BACKLIGHT=y | 961 | CONFIG_FB_BACKLIGHT=y |
| @@ -1112,6 +1071,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1112 | # CONFIG_SND_AU8810 is not set | 1071 | # CONFIG_SND_AU8810 is not set |
| 1113 | # CONFIG_SND_AU8820 is not set | 1072 | # CONFIG_SND_AU8820 is not set |
| 1114 | # CONFIG_SND_AU8830 is not set | 1073 | # CONFIG_SND_AU8830 is not set |
| 1074 | # CONFIG_SND_AW2 is not set | ||
| 1115 | # CONFIG_SND_AZT3328 is not set | 1075 | # CONFIG_SND_AZT3328 is not set |
| 1116 | # CONFIG_SND_BT87X is not set | 1076 | # CONFIG_SND_BT87X is not set |
| 1117 | # CONFIG_SND_CA0106 is not set | 1077 | # CONFIG_SND_CA0106 is not set |
| @@ -1198,11 +1158,11 @@ CONFIG_SND_USB_AUDIO=m | |||
| 1198 | # CONFIG_SND_SOC is not set | 1158 | # CONFIG_SND_SOC is not set |
| 1199 | 1159 | ||
| 1200 | # | 1160 | # |
| 1201 | # SoC Audio support for SuperH | 1161 | # ALSA SoC audio for Freescale SOCs |
| 1202 | # | 1162 | # |
| 1203 | 1163 | ||
| 1204 | # | 1164 | # |
| 1205 | # ALSA SoC audio for Freescale SOCs | 1165 | # SoC Audio for the Texas Instruments OMAP |
| 1206 | # | 1166 | # |
| 1207 | 1167 | ||
| 1208 | # | 1168 | # |
| @@ -1222,6 +1182,7 @@ CONFIG_USB_HID=y | |||
| 1222 | CONFIG_HID_FF=y | 1182 | CONFIG_HID_FF=y |
| 1223 | CONFIG_HID_PID=y | 1183 | CONFIG_HID_PID=y |
| 1224 | CONFIG_LOGITECH_FF=y | 1184 | CONFIG_LOGITECH_FF=y |
| 1185 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1225 | # CONFIG_PANTHERLORD_FF is not set | 1186 | # CONFIG_PANTHERLORD_FF is not set |
| 1226 | CONFIG_THRUSTMASTER_FF=y | 1187 | CONFIG_THRUSTMASTER_FF=y |
| 1227 | # CONFIG_ZEROPLUS_FF is not set | 1188 | # CONFIG_ZEROPLUS_FF is not set |
| @@ -1245,11 +1206,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1245 | # | 1206 | # |
| 1246 | # USB Host Controller Drivers | 1207 | # USB Host Controller Drivers |
| 1247 | # | 1208 | # |
| 1209 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1248 | CONFIG_USB_EHCI_HCD=y | 1210 | CONFIG_USB_EHCI_HCD=y |
| 1249 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1211 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1250 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1212 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1251 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1213 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 1252 | # CONFIG_USB_ISP116X_HCD is not set | 1214 | # CONFIG_USB_ISP116X_HCD is not set |
| 1215 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1253 | CONFIG_USB_OHCI_HCD=y | 1216 | CONFIG_USB_OHCI_HCD=y |
| 1254 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1217 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1255 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1218 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1288,6 +1251,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1288 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1251 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1289 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1252 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1290 | # CONFIG_USB_STORAGE_KARMA is not set | 1253 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1254 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1291 | # CONFIG_USB_LIBUSUAL is not set | 1255 | # CONFIG_USB_LIBUSUAL is not set |
| 1292 | 1256 | ||
| 1293 | # | 1257 | # |
| @@ -1342,9 +1306,11 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m | |||
| 1342 | CONFIG_USB_SERIAL_MCT_U232=m | 1306 | CONFIG_USB_SERIAL_MCT_U232=m |
| 1343 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1307 | # CONFIG_USB_SERIAL_MOS7720 is not set |
| 1344 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1308 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1309 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 1345 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1310 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1346 | CONFIG_USB_SERIAL_PL2303=m | 1311 | CONFIG_USB_SERIAL_PL2303=m |
| 1347 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1312 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1313 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
| 1348 | # CONFIG_USB_SERIAL_HP4X is not set | 1314 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1349 | CONFIG_USB_SERIAL_SAFE=m | 1315 | CONFIG_USB_SERIAL_SAFE=m |
| 1350 | CONFIG_USB_SERIAL_SAFE_PADDED=y | 1316 | CONFIG_USB_SERIAL_SAFE_PADDED=y |
| @@ -1383,14 +1349,11 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1383 | # CONFIG_MMC is not set | 1349 | # CONFIG_MMC is not set |
| 1384 | # CONFIG_MEMSTICK is not set | 1350 | # CONFIG_MEMSTICK is not set |
| 1385 | # CONFIG_NEW_LEDS is not set | 1351 | # CONFIG_NEW_LEDS is not set |
| 1352 | # CONFIG_ACCESSIBILITY is not set | ||
| 1386 | # CONFIG_INFINIBAND is not set | 1353 | # CONFIG_INFINIBAND is not set |
| 1387 | # CONFIG_EDAC is not set | 1354 | # CONFIG_EDAC is not set |
| 1388 | # CONFIG_RTC_CLASS is not set | 1355 | # CONFIG_RTC_CLASS is not set |
| 1389 | # CONFIG_DMADEVICES is not set | 1356 | # CONFIG_DMADEVICES is not set |
| 1390 | |||
| 1391 | # | ||
| 1392 | # Userspace I/O | ||
| 1393 | # | ||
| 1394 | # CONFIG_UIO is not set | 1357 | # CONFIG_UIO is not set |
| 1395 | 1358 | ||
| 1396 | # | 1359 | # |
| @@ -1420,9 +1383,9 @@ CONFIG_REISERFS_FS_SECURITY=y | |||
| 1420 | CONFIG_FS_POSIX_ACL=y | 1383 | CONFIG_FS_POSIX_ACL=y |
| 1421 | CONFIG_XFS_FS=m | 1384 | CONFIG_XFS_FS=m |
| 1422 | # CONFIG_XFS_QUOTA is not set | 1385 | # CONFIG_XFS_QUOTA is not set |
| 1423 | CONFIG_XFS_SECURITY=y | ||
| 1424 | CONFIG_XFS_POSIX_ACL=y | 1386 | CONFIG_XFS_POSIX_ACL=y |
| 1425 | # CONFIG_XFS_RT is not set | 1387 | # CONFIG_XFS_RT is not set |
| 1388 | # CONFIG_XFS_DEBUG is not set | ||
| 1426 | # CONFIG_GFS2_FS is not set | 1389 | # CONFIG_GFS2_FS is not set |
| 1427 | # CONFIG_OCFS2_FS is not set | 1390 | # CONFIG_OCFS2_FS is not set |
| 1428 | CONFIG_DNOTIFY=y | 1391 | CONFIG_DNOTIFY=y |
| @@ -1488,13 +1451,11 @@ CONFIG_NFS_FS=y | |||
| 1488 | CONFIG_NFS_V3=y | 1451 | CONFIG_NFS_V3=y |
| 1489 | CONFIG_NFS_V3_ACL=y | 1452 | CONFIG_NFS_V3_ACL=y |
| 1490 | CONFIG_NFS_V4=y | 1453 | CONFIG_NFS_V4=y |
| 1491 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1492 | CONFIG_NFSD=y | 1454 | CONFIG_NFSD=y |
| 1493 | CONFIG_NFSD_V2_ACL=y | 1455 | CONFIG_NFSD_V2_ACL=y |
| 1494 | CONFIG_NFSD_V3=y | 1456 | CONFIG_NFSD_V3=y |
| 1495 | CONFIG_NFSD_V3_ACL=y | 1457 | CONFIG_NFSD_V3_ACL=y |
| 1496 | CONFIG_NFSD_V4=y | 1458 | CONFIG_NFSD_V4=y |
| 1497 | CONFIG_NFSD_TCP=y | ||
| 1498 | CONFIG_LOCKD=y | 1459 | CONFIG_LOCKD=y |
| 1499 | CONFIG_LOCKD_V4=y | 1460 | CONFIG_LOCKD_V4=y |
| 1500 | CONFIG_EXPORTFS=y | 1461 | CONFIG_EXPORTFS=y |
| @@ -1583,9 +1544,10 @@ CONFIG_NLS_UTF8=y | |||
| 1583 | # Library routines | 1544 | # Library routines |
| 1584 | # | 1545 | # |
| 1585 | CONFIG_BITREVERSE=y | 1546 | CONFIG_BITREVERSE=y |
| 1547 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1586 | CONFIG_CRC_CCITT=m | 1548 | CONFIG_CRC_CCITT=m |
| 1587 | # CONFIG_CRC16 is not set | 1549 | # CONFIG_CRC16 is not set |
| 1588 | # CONFIG_CRC_ITU_T is not set | 1550 | CONFIG_CRC_ITU_T=m |
| 1589 | CONFIG_CRC32=y | 1551 | CONFIG_CRC32=y |
| 1590 | # CONFIG_CRC7 is not set | 1552 | # CONFIG_CRC7 is not set |
| 1591 | CONFIG_LIBCRC32C=m | 1553 | CONFIG_LIBCRC32C=m |
| @@ -1603,6 +1565,7 @@ CONFIG_HAVE_LMB=y | |||
| 1603 | # CONFIG_PRINTK_TIME is not set | 1565 | # CONFIG_PRINTK_TIME is not set |
| 1604 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1566 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1605 | CONFIG_ENABLE_MUST_CHECK=y | 1567 | CONFIG_ENABLE_MUST_CHECK=y |
| 1568 | CONFIG_FRAME_WARN=2048 | ||
| 1606 | CONFIG_MAGIC_SYSRQ=y | 1569 | CONFIG_MAGIC_SYSRQ=y |
| 1607 | # CONFIG_UNUSED_SYMBOLS is not set | 1570 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1608 | CONFIG_DEBUG_FS=y | 1571 | CONFIG_DEBUG_FS=y |
| @@ -1613,18 +1576,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1613 | CONFIG_SCHED_DEBUG=y | 1576 | CONFIG_SCHED_DEBUG=y |
| 1614 | # CONFIG_SCHEDSTATS is not set | 1577 | # CONFIG_SCHEDSTATS is not set |
| 1615 | # CONFIG_TIMER_STATS is not set | 1578 | # CONFIG_TIMER_STATS is not set |
| 1579 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1616 | # CONFIG_SLUB_DEBUG_ON is not set | 1580 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1617 | # CONFIG_SLUB_STATS is not set | 1581 | # CONFIG_SLUB_STATS is not set |
| 1618 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1582 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1619 | # CONFIG_RT_MUTEX_TESTER is not set | 1583 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1620 | # CONFIG_DEBUG_SPINLOCK is not set | 1584 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1621 | CONFIG_DEBUG_MUTEXES=y | 1585 | CONFIG_DEBUG_MUTEXES=y |
| 1586 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1587 | # CONFIG_PROVE_LOCKING is not set | ||
| 1588 | # CONFIG_LOCK_STAT is not set | ||
| 1622 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1589 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1623 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1590 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1624 | # CONFIG_DEBUG_KOBJECT is not set | 1591 | # CONFIG_DEBUG_KOBJECT is not set |
| 1625 | CONFIG_DEBUG_BUGVERBOSE=y | 1592 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1626 | # CONFIG_DEBUG_INFO is not set | 1593 | # CONFIG_DEBUG_INFO is not set |
| 1627 | # CONFIG_DEBUG_VM is not set | 1594 | # CONFIG_DEBUG_VM is not set |
| 1595 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1628 | # CONFIG_DEBUG_LIST is not set | 1596 | # CONFIG_DEBUG_LIST is not set |
| 1629 | # CONFIG_DEBUG_SG is not set | 1597 | # CONFIG_DEBUG_SG is not set |
| 1630 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1598 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1648,53 +1616,83 @@ CONFIG_BOOTX_TEXT=y | |||
| 1648 | # CONFIG_SECURITY is not set | 1616 | # CONFIG_SECURITY is not set |
| 1649 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1617 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1650 | CONFIG_CRYPTO=y | 1618 | CONFIG_CRYPTO=y |
| 1619 | |||
| 1620 | # | ||
| 1621 | # Crypto core or helper | ||
| 1622 | # | ||
| 1651 | CONFIG_CRYPTO_ALGAPI=y | 1623 | CONFIG_CRYPTO_ALGAPI=y |
| 1652 | CONFIG_CRYPTO_AEAD=m | 1624 | CONFIG_CRYPTO_AEAD=m |
| 1653 | CONFIG_CRYPTO_BLKCIPHER=y | 1625 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1654 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1655 | CONFIG_CRYPTO_HASH=y | 1626 | CONFIG_CRYPTO_HASH=y |
| 1656 | CONFIG_CRYPTO_MANAGER=y | 1627 | CONFIG_CRYPTO_MANAGER=y |
| 1628 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1629 | CONFIG_CRYPTO_NULL=m | ||
| 1630 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1631 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1632 | CONFIG_CRYPTO_TEST=m | ||
| 1633 | |||
| 1634 | # | ||
| 1635 | # Authenticated Encryption with Associated Data | ||
| 1636 | # | ||
| 1637 | # CONFIG_CRYPTO_CCM is not set | ||
| 1638 | # CONFIG_CRYPTO_GCM is not set | ||
| 1639 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1640 | |||
| 1641 | # | ||
| 1642 | # Block modes | ||
| 1643 | # | ||
| 1644 | CONFIG_CRYPTO_CBC=y | ||
| 1645 | # CONFIG_CRYPTO_CTR is not set | ||
| 1646 | # CONFIG_CRYPTO_CTS is not set | ||
| 1647 | CONFIG_CRYPTO_ECB=m | ||
| 1648 | # CONFIG_CRYPTO_LRW is not set | ||
| 1649 | CONFIG_CRYPTO_PCBC=m | ||
| 1650 | # CONFIG_CRYPTO_XTS is not set | ||
| 1651 | |||
| 1652 | # | ||
| 1653 | # Hash modes | ||
| 1654 | # | ||
| 1657 | CONFIG_CRYPTO_HMAC=y | 1655 | CONFIG_CRYPTO_HMAC=y |
| 1658 | # CONFIG_CRYPTO_XCBC is not set | 1656 | # CONFIG_CRYPTO_XCBC is not set |
| 1659 | CONFIG_CRYPTO_NULL=m | 1657 | |
| 1658 | # | ||
| 1659 | # Digest | ||
| 1660 | # | ||
| 1661 | CONFIG_CRYPTO_CRC32C=m | ||
| 1660 | CONFIG_CRYPTO_MD4=m | 1662 | CONFIG_CRYPTO_MD4=m |
| 1661 | CONFIG_CRYPTO_MD5=y | 1663 | CONFIG_CRYPTO_MD5=y |
| 1664 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1662 | CONFIG_CRYPTO_SHA1=m | 1665 | CONFIG_CRYPTO_SHA1=m |
| 1663 | CONFIG_CRYPTO_SHA256=m | 1666 | CONFIG_CRYPTO_SHA256=m |
| 1664 | CONFIG_CRYPTO_SHA512=m | 1667 | CONFIG_CRYPTO_SHA512=m |
| 1665 | CONFIG_CRYPTO_WP512=m | ||
| 1666 | # CONFIG_CRYPTO_TGR192 is not set | 1668 | # CONFIG_CRYPTO_TGR192 is not set |
| 1667 | # CONFIG_CRYPTO_GF128MUL is not set | 1669 | CONFIG_CRYPTO_WP512=m |
| 1668 | CONFIG_CRYPTO_ECB=m | 1670 | |
| 1669 | CONFIG_CRYPTO_CBC=y | 1671 | # |
| 1670 | CONFIG_CRYPTO_PCBC=m | 1672 | # Ciphers |
| 1671 | # CONFIG_CRYPTO_LRW is not set | 1673 | # |
| 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 | 1674 | CONFIG_CRYPTO_AES=m |
| 1675 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1676 | CONFIG_CRYPTO_ARC4=m | ||
| 1677 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1678 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1684 | CONFIG_CRYPTO_CAST5=m | 1679 | CONFIG_CRYPTO_CAST5=m |
| 1685 | CONFIG_CRYPTO_CAST6=m | 1680 | CONFIG_CRYPTO_CAST6=m |
| 1686 | CONFIG_CRYPTO_TEA=m | 1681 | CONFIG_CRYPTO_DES=y |
| 1687 | CONFIG_CRYPTO_ARC4=m | 1682 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1688 | CONFIG_CRYPTO_KHAZAD=m | 1683 | CONFIG_CRYPTO_KHAZAD=m |
| 1689 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1690 | # CONFIG_CRYPTO_SEED is not set | ||
| 1691 | # CONFIG_CRYPTO_SALSA20 is not set | 1684 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1685 | # CONFIG_CRYPTO_SEED is not set | ||
| 1686 | CONFIG_CRYPTO_SERPENT=m | ||
| 1687 | CONFIG_CRYPTO_TEA=m | ||
| 1688 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1689 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1690 | |||
| 1691 | # | ||
| 1692 | # Compression | ||
| 1693 | # | ||
| 1692 | CONFIG_CRYPTO_DEFLATE=m | 1694 | 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 | 1695 | # CONFIG_CRYPTO_LZO is not set |
| 1699 | # CONFIG_CRYPTO_HW is not set | 1696 | # CONFIG_CRYPTO_HW is not set |
| 1700 | # CONFIG_PPC_CLOCK is not set | 1697 | # CONFIG_PPC_CLOCK is not set |
| 1698 | # 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/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..40f84fa2bd29 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-rc3 |
| 4 | # Thu Mar 27 13:56:24 2008 | 4 | # Tue May 20 20:03:02 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,64 +760,10 @@ 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 |
| 751 | CONFIG_SATA_SVW=y | ||
| 752 | # CONFIG_ATA_PIIX is not set | ||
| 753 | CONFIG_SATA_MV=y | ||
| 754 | # CONFIG_SATA_NV is not set | ||
| 755 | # CONFIG_PDC_ADMA is not set | ||
| 756 | # CONFIG_SATA_QSTOR is not set | ||
| 757 | # CONFIG_SATA_PROMISE is not set | ||
| 758 | # CONFIG_SATA_SX4 is not set | ||
| 759 | # CONFIG_SATA_SIL is not set | ||
| 760 | CONFIG_SATA_SIL24=y | 765 | CONFIG_SATA_SIL24=y |
| 761 | # CONFIG_SATA_SIS is not set | 766 | # CONFIG_ATA_SFF is not set |
| 762 | # CONFIG_SATA_ULI is not set | ||
| 763 | # CONFIG_SATA_VIA is not set | ||
| 764 | # CONFIG_SATA_VITESSE is not set | ||
| 765 | # CONFIG_SATA_INIC162X is not set | ||
| 766 | # CONFIG_PATA_ALI is not set | ||
| 767 | # CONFIG_PATA_AMD is not set | ||
| 768 | # CONFIG_PATA_ARTOP is not set | ||
| 769 | # CONFIG_PATA_ATIIXP is not set | ||
| 770 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 771 | # CONFIG_PATA_CMD64X is not set | ||
| 772 | # CONFIG_PATA_CS5520 is not set | ||
| 773 | # CONFIG_PATA_CS5530 is not set | ||
| 774 | # CONFIG_PATA_CYPRESS is not set | ||
| 775 | # CONFIG_PATA_EFAR is not set | ||
| 776 | # CONFIG_ATA_GENERIC is not set | ||
| 777 | # CONFIG_PATA_HPT366 is not set | ||
| 778 | # CONFIG_PATA_HPT37X is not set | ||
| 779 | # CONFIG_PATA_HPT3X2N is not set | ||
| 780 | # CONFIG_PATA_HPT3X3 is not set | ||
| 781 | # CONFIG_PATA_IT821X is not set | ||
| 782 | # CONFIG_PATA_IT8213 is not set | ||
| 783 | # CONFIG_PATA_JMICRON is not set | ||
| 784 | # CONFIG_PATA_TRIFLEX is not set | ||
| 785 | # CONFIG_PATA_MARVELL is not set | ||
| 786 | # CONFIG_PATA_MPIIX is not set | ||
| 787 | # CONFIG_PATA_OLDPIIX is not set | ||
| 788 | # CONFIG_PATA_NETCELL is not set | ||
| 789 | # CONFIG_PATA_NINJA32 is not set | ||
| 790 | # CONFIG_PATA_NS87410 is not set | ||
| 791 | # CONFIG_PATA_NS87415 is not set | ||
| 792 | # CONFIG_PATA_OPTI is not set | ||
| 793 | # CONFIG_PATA_OPTIDMA is not set | ||
| 794 | CONFIG_PATA_PCMCIA=y | ||
| 795 | # CONFIG_PATA_PDC_OLD is not set | ||
| 796 | # CONFIG_PATA_RADISYS is not set | ||
| 797 | # CONFIG_PATA_RZ1000 is not set | ||
| 798 | # CONFIG_PATA_SC1200 is not set | ||
| 799 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 800 | # CONFIG_PATA_PDC2027X is not set | ||
| 801 | # CONFIG_PATA_SIL680 is not set | ||
| 802 | # CONFIG_PATA_SIS is not set | ||
| 803 | # CONFIG_PATA_VIA is not set | ||
| 804 | CONFIG_PATA_WINBOND=y | ||
| 805 | CONFIG_PATA_PLATFORM=y | ||
| 806 | # CONFIG_PATA_OF_PLATFORM is not set | ||
| 807 | CONFIG_PATA_SCC=y | ||
| 808 | CONFIG_MD=y | 767 | CONFIG_MD=y |
| 809 | CONFIG_BLK_DEV_MD=y | 768 | CONFIG_BLK_DEV_MD=y |
| 810 | CONFIG_MD_LINEAR=y | 769 | CONFIG_MD_LINEAR=y |
| @@ -866,6 +825,7 @@ CONFIG_WINDFARM=y | |||
| 866 | CONFIG_WINDFARM_PM81=y | 825 | CONFIG_WINDFARM_PM81=y |
| 867 | CONFIG_WINDFARM_PM91=y | 826 | CONFIG_WINDFARM_PM91=y |
| 868 | CONFIG_WINDFARM_PM112=y | 827 | CONFIG_WINDFARM_PM112=y |
| 828 | CONFIG_WINDFARM_PM121=y | ||
| 869 | # CONFIG_PMAC_RACKMETER is not set | 829 | # CONFIG_PMAC_RACKMETER is not set |
| 870 | CONFIG_NETDEVICES=y | 830 | CONFIG_NETDEVICES=y |
| 871 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 831 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
| @@ -911,7 +871,6 @@ CONFIG_IBM_NEW_EMAC_TAH=y | |||
| 911 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 871 | CONFIG_IBM_NEW_EMAC_EMAC4=y |
| 912 | CONFIG_NET_PCI=y | 872 | CONFIG_NET_PCI=y |
| 913 | CONFIG_PCNET32=y | 873 | CONFIG_PCNET32=y |
| 914 | # CONFIG_PCNET32_NAPI is not set | ||
| 915 | # CONFIG_AMD8111_ETH is not set | 874 | # CONFIG_AMD8111_ETH is not set |
| 916 | # CONFIG_ADAPTEC_STARFIRE is not set | 875 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 917 | # CONFIG_B44 is not set | 876 | # CONFIG_B44 is not set |
| @@ -947,7 +906,6 @@ CONFIG_E1000=y | |||
| 947 | # CONFIG_SIS190 is not set | 906 | # CONFIG_SIS190 is not set |
| 948 | # CONFIG_SKGE is not set | 907 | # CONFIG_SKGE is not set |
| 949 | # CONFIG_SKY2 is not set | 908 | # CONFIG_SKY2 is not set |
| 950 | # CONFIG_SK98LIN is not set | ||
| 951 | # CONFIG_VIA_VELOCITY is not set | 909 | # CONFIG_VIA_VELOCITY is not set |
| 952 | CONFIG_TIGON3=y | 910 | CONFIG_TIGON3=y |
| 953 | # CONFIG_BNX2 is not set | 911 | # CONFIG_BNX2 is not set |
| @@ -969,6 +927,7 @@ CONFIG_PASEMI_MAC=y | |||
| 969 | # CONFIG_MLX4_CORE is not set | 927 | # CONFIG_MLX4_CORE is not set |
| 970 | # CONFIG_TEHUTI is not set | 928 | # CONFIG_TEHUTI is not set |
| 971 | # CONFIG_BNX2X is not set | 929 | # CONFIG_BNX2X is not set |
| 930 | # CONFIG_SFC is not set | ||
| 972 | CONFIG_TR=y | 931 | CONFIG_TR=y |
| 973 | CONFIG_IBMOL=y | 932 | CONFIG_IBMOL=y |
| 974 | # CONFIG_3C359 is not set | 933 | # CONFIG_3C359 is not set |
| @@ -979,6 +938,7 @@ CONFIG_IBMOL=y | |||
| 979 | # | 938 | # |
| 980 | # CONFIG_WLAN_PRE80211 is not set | 939 | # CONFIG_WLAN_PRE80211 is not set |
| 981 | # CONFIG_WLAN_80211 is not set | 940 | # CONFIG_WLAN_80211 is not set |
| 941 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 982 | 942 | ||
| 983 | # | 943 | # |
| 984 | # USB Network Adapters | 944 | # USB Network Adapters |
| @@ -1083,6 +1043,7 @@ CONFIG_VT=y | |||
| 1083 | CONFIG_VT_CONSOLE=y | 1043 | CONFIG_VT_CONSOLE=y |
| 1084 | CONFIG_HW_CONSOLE=y | 1044 | CONFIG_HW_CONSOLE=y |
| 1085 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1045 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 1046 | CONFIG_DEVKMEM=y | ||
| 1086 | # CONFIG_SERIAL_NONSTANDARD is not set | 1047 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 1087 | # CONFIG_NOZOMI is not set | 1048 | # CONFIG_NOZOMI is not set |
| 1088 | 1049 | ||
| @@ -1121,8 +1082,6 @@ CONFIG_HVC_BEAT=y | |||
| 1121 | CONFIG_HVCS=m | 1082 | CONFIG_HVCS=m |
| 1122 | # CONFIG_IPMI_HANDLER is not set | 1083 | # CONFIG_IPMI_HANDLER is not set |
| 1123 | # CONFIG_HW_RANDOM is not set | 1084 | # 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 | 1085 | # CONFIG_R3964 is not set |
| 1127 | # CONFIG_APPLICOM is not set | 1086 | # CONFIG_APPLICOM is not set |
| 1128 | 1087 | ||
| @@ -1141,13 +1100,7 @@ CONFIG_DEVPORT=y | |||
| 1141 | CONFIG_I2C=y | 1100 | CONFIG_I2C=y |
| 1142 | CONFIG_I2C_BOARDINFO=y | 1101 | CONFIG_I2C_BOARDINFO=y |
| 1143 | CONFIG_I2C_CHARDEV=y | 1102 | CONFIG_I2C_CHARDEV=y |
| 1144 | |||
| 1145 | # | ||
| 1146 | # I2C Algorithms | ||
| 1147 | # | ||
| 1148 | CONFIG_I2C_ALGOBIT=y | 1103 | CONFIG_I2C_ALGOBIT=y |
| 1149 | # CONFIG_I2C_ALGOPCF is not set | ||
| 1150 | # CONFIG_I2C_ALGOPCA is not set | ||
| 1151 | 1104 | ||
| 1152 | # | 1105 | # |
| 1153 | # I2C Hardware Bus support | 1106 | # I2C Hardware Bus support |
| @@ -1177,6 +1130,7 @@ CONFIG_I2C_PASEMI=y | |||
| 1177 | # CONFIG_I2C_VIA is not set | 1130 | # CONFIG_I2C_VIA is not set |
| 1178 | # CONFIG_I2C_VIAPRO is not set | 1131 | # CONFIG_I2C_VIAPRO is not set |
| 1179 | # CONFIG_I2C_VOODOO3 is not set | 1132 | # CONFIG_I2C_VOODOO3 is not set |
| 1133 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1180 | 1134 | ||
| 1181 | # | 1135 | # |
| 1182 | # Miscellaneous I2C Chip support | 1136 | # Miscellaneous I2C Chip support |
| @@ -1186,19 +1140,13 @@ CONFIG_I2C_PASEMI=y | |||
| 1186 | # CONFIG_SENSORS_PCF8574 is not set | 1140 | # CONFIG_SENSORS_PCF8574 is not set |
| 1187 | # CONFIG_PCF8575 is not set | 1141 | # CONFIG_PCF8575 is not set |
| 1188 | # CONFIG_SENSORS_PCF8591 is not set | 1142 | # CONFIG_SENSORS_PCF8591 is not set |
| 1189 | # CONFIG_TPS65010 is not set | ||
| 1190 | # CONFIG_SENSORS_MAX6875 is not set | 1143 | # CONFIG_SENSORS_MAX6875 is not set |
| 1191 | # CONFIG_SENSORS_TSL2550 is not set | 1144 | # CONFIG_SENSORS_TSL2550 is not set |
| 1192 | # CONFIG_I2C_DEBUG_CORE is not set | 1145 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1193 | # CONFIG_I2C_DEBUG_ALGO is not set | 1146 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1194 | # CONFIG_I2C_DEBUG_BUS is not set | 1147 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1195 | # CONFIG_I2C_DEBUG_CHIP is not set | 1148 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1196 | |||
| 1197 | # | ||
| 1198 | # SPI support | ||
| 1199 | # | ||
| 1200 | # CONFIG_SPI is not set | 1149 | # CONFIG_SPI is not set |
| 1201 | # CONFIG_SPI_MASTER is not set | ||
| 1202 | # CONFIG_W1 is not set | 1150 | # CONFIG_W1 is not set |
| 1203 | # CONFIG_POWER_SUPPLY is not set | 1151 | # CONFIG_POWER_SUPPLY is not set |
| 1204 | # CONFIG_HWMON is not set | 1152 | # CONFIG_HWMON is not set |
| @@ -1215,12 +1163,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1215 | # Multifunction device drivers | 1163 | # Multifunction device drivers |
| 1216 | # | 1164 | # |
| 1217 | # CONFIG_MFD_SM501 is not set | 1165 | # CONFIG_MFD_SM501 is not set |
| 1166 | # CONFIG_HTC_PASIC3 is not set | ||
| 1218 | 1167 | ||
| 1219 | # | 1168 | # |
| 1220 | # Multimedia devices | 1169 | # Multimedia devices |
| 1221 | # | 1170 | # |
| 1171 | |||
| 1172 | # | ||
| 1173 | # Multimedia core support | ||
| 1174 | # | ||
| 1222 | # CONFIG_VIDEO_DEV is not set | 1175 | # CONFIG_VIDEO_DEV is not set |
| 1223 | # CONFIG_DVB_CORE is not set | 1176 | # CONFIG_DVB_CORE is not set |
| 1177 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1178 | |||
| 1179 | # | ||
| 1180 | # Multimedia drivers | ||
| 1181 | # | ||
| 1224 | # CONFIG_DAB is not set | 1182 | # CONFIG_DAB is not set |
| 1225 | 1183 | ||
| 1226 | # | 1184 | # |
| @@ -1240,8 +1198,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 1240 | # CONFIG_FB_SYS_FILLRECT is not set | 1198 | # CONFIG_FB_SYS_FILLRECT is not set |
| 1241 | # CONFIG_FB_SYS_COPYAREA is not set | 1199 | # CONFIG_FB_SYS_COPYAREA is not set |
| 1242 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1200 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1201 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1243 | # CONFIG_FB_SYS_FOPS is not set | 1202 | # CONFIG_FB_SYS_FOPS is not set |
| 1244 | CONFIG_FB_DEFERRED_IO=y | ||
| 1245 | # CONFIG_FB_SVGALIB is not set | 1203 | # CONFIG_FB_SVGALIB is not set |
| 1246 | CONFIG_FB_MACMODES=y | 1204 | CONFIG_FB_MACMODES=y |
| 1247 | CONFIG_FB_BACKLIGHT=y | 1205 | CONFIG_FB_BACKLIGHT=y |
| @@ -1363,6 +1321,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1363 | # CONFIG_SND_AU8810 is not set | 1321 | # CONFIG_SND_AU8810 is not set |
| 1364 | # CONFIG_SND_AU8820 is not set | 1322 | # CONFIG_SND_AU8820 is not set |
| 1365 | # CONFIG_SND_AU8830 is not set | 1323 | # CONFIG_SND_AU8830 is not set |
| 1324 | # CONFIG_SND_AW2 is not set | ||
| 1366 | # CONFIG_SND_AZT3328 is not set | 1325 | # CONFIG_SND_AZT3328 is not set |
| 1367 | # CONFIG_SND_BT87X is not set | 1326 | # CONFIG_SND_BT87X is not set |
| 1368 | # CONFIG_SND_CA0106 is not set | 1327 | # CONFIG_SND_CA0106 is not set |
| @@ -1455,11 +1414,11 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m | |||
| 1455 | # CONFIG_SND_SOC is not set | 1414 | # CONFIG_SND_SOC is not set |
| 1456 | 1415 | ||
| 1457 | # | 1416 | # |
| 1458 | # SoC Audio support for SuperH | 1417 | # ALSA SoC audio for Freescale SOCs |
| 1459 | # | 1418 | # |
| 1460 | 1419 | ||
| 1461 | # | 1420 | # |
| 1462 | # ALSA SoC audio for Freescale SOCs | 1421 | # SoC Audio for the Texas Instruments OMAP |
| 1463 | # | 1422 | # |
| 1464 | 1423 | ||
| 1465 | # | 1424 | # |
| @@ -1497,12 +1456,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1497 | # | 1456 | # |
| 1498 | # USB Host Controller Drivers | 1457 | # USB Host Controller Drivers |
| 1499 | # | 1458 | # |
| 1459 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1500 | CONFIG_USB_EHCI_HCD=y | 1460 | CONFIG_USB_EHCI_HCD=y |
| 1501 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1461 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1502 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1462 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
| 1503 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | 1463 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y |
| 1504 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1464 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 1505 | # CONFIG_USB_ISP116X_HCD is not set | 1465 | # CONFIG_USB_ISP116X_HCD is not set |
| 1466 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1506 | CONFIG_USB_OHCI_HCD=y | 1467 | CONFIG_USB_OHCI_HCD=y |
| 1507 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1468 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1508 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1469 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1538,6 +1499,7 @@ CONFIG_USB_STORAGE=m | |||
| 1538 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1499 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1539 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1500 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1540 | # CONFIG_USB_STORAGE_KARMA is not set | 1501 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1502 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1541 | # CONFIG_USB_LIBUSUAL is not set | 1503 | # CONFIG_USB_LIBUSUAL is not set |
| 1542 | 1504 | ||
| 1543 | # | 1505 | # |
| @@ -1579,6 +1541,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1579 | # CONFIG_MMC is not set | 1541 | # CONFIG_MMC is not set |
| 1580 | # CONFIG_MEMSTICK is not set | 1542 | # CONFIG_MEMSTICK is not set |
| 1581 | # CONFIG_NEW_LEDS is not set | 1543 | # CONFIG_NEW_LEDS is not set |
| 1544 | # CONFIG_ACCESSIBILITY is not set | ||
| 1582 | CONFIG_INFINIBAND=m | 1545 | CONFIG_INFINIBAND=m |
| 1583 | # CONFIG_INFINIBAND_USER_MAD is not set | 1546 | # CONFIG_INFINIBAND_USER_MAD is not set |
| 1584 | # CONFIG_INFINIBAND_USER_ACCESS is not set | 1547 | # CONFIG_INFINIBAND_USER_ACCESS is not set |
| @@ -1607,10 +1570,6 @@ CONFIG_EDAC_PASEMI=y | |||
| 1607 | # CONFIG_EDAC_CELL is not set | 1570 | # CONFIG_EDAC_CELL is not set |
| 1608 | CONFIG_RTC_LIB=y | 1571 | CONFIG_RTC_LIB=y |
| 1609 | CONFIG_RTC_CLASS=y | 1572 | CONFIG_RTC_CLASS=y |
| 1610 | |||
| 1611 | # | ||
| 1612 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
| 1613 | # | ||
| 1614 | CONFIG_RTC_HCTOSYS=y | 1573 | CONFIG_RTC_HCTOSYS=y |
| 1615 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1574 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
| 1616 | # CONFIG_RTC_DEBUG is not set | 1575 | # CONFIG_RTC_DEBUG is not set |
| @@ -1659,10 +1618,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1659 | # on-CPU RTC drivers | 1618 | # on-CPU RTC drivers |
| 1660 | # | 1619 | # |
| 1661 | # CONFIG_DMADEVICES is not set | 1620 | # CONFIG_DMADEVICES is not set |
| 1662 | |||
| 1663 | # | ||
| 1664 | # Userspace I/O | ||
| 1665 | # | ||
| 1666 | # CONFIG_UIO is not set | 1621 | # CONFIG_UIO is not set |
| 1667 | 1622 | ||
| 1668 | # | 1623 | # |
| @@ -1696,9 +1651,9 @@ CONFIG_JFS_SECURITY=y | |||
| 1696 | CONFIG_FS_POSIX_ACL=y | 1651 | CONFIG_FS_POSIX_ACL=y |
| 1697 | CONFIG_XFS_FS=m | 1652 | CONFIG_XFS_FS=m |
| 1698 | # CONFIG_XFS_QUOTA is not set | 1653 | # CONFIG_XFS_QUOTA is not set |
| 1699 | CONFIG_XFS_SECURITY=y | ||
| 1700 | CONFIG_XFS_POSIX_ACL=y | 1654 | CONFIG_XFS_POSIX_ACL=y |
| 1701 | # CONFIG_XFS_RT is not set | 1655 | # CONFIG_XFS_RT is not set |
| 1656 | # CONFIG_XFS_DEBUG is not set | ||
| 1702 | # CONFIG_GFS2_FS is not set | 1657 | # CONFIG_GFS2_FS is not set |
| 1703 | # CONFIG_OCFS2_FS is not set | 1658 | # CONFIG_OCFS2_FS is not set |
| 1704 | CONFIG_DNOTIFY=y | 1659 | CONFIG_DNOTIFY=y |
| @@ -1764,13 +1719,11 @@ CONFIG_NFS_FS=y | |||
| 1764 | CONFIG_NFS_V3=y | 1719 | CONFIG_NFS_V3=y |
| 1765 | CONFIG_NFS_V3_ACL=y | 1720 | CONFIG_NFS_V3_ACL=y |
| 1766 | CONFIG_NFS_V4=y | 1721 | CONFIG_NFS_V4=y |
| 1767 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1768 | CONFIG_NFSD=m | 1722 | CONFIG_NFSD=m |
| 1769 | CONFIG_NFSD_V2_ACL=y | 1723 | CONFIG_NFSD_V2_ACL=y |
| 1770 | CONFIG_NFSD_V3=y | 1724 | CONFIG_NFSD_V3=y |
| 1771 | CONFIG_NFSD_V3_ACL=y | 1725 | CONFIG_NFSD_V3_ACL=y |
| 1772 | CONFIG_NFSD_V4=y | 1726 | CONFIG_NFSD_V4=y |
| 1773 | CONFIG_NFSD_TCP=y | ||
| 1774 | CONFIG_ROOT_NFS=y | 1727 | CONFIG_ROOT_NFS=y |
| 1775 | CONFIG_LOCKD=y | 1728 | CONFIG_LOCKD=y |
| 1776 | CONFIG_LOCKD_V4=y | 1729 | CONFIG_LOCKD_V4=y |
| @@ -1862,9 +1815,10 @@ CONFIG_NLS_UTF8=m | |||
| 1862 | # Library routines | 1815 | # Library routines |
| 1863 | # | 1816 | # |
| 1864 | CONFIG_BITREVERSE=y | 1817 | CONFIG_BITREVERSE=y |
| 1818 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1865 | CONFIG_CRC_CCITT=m | 1819 | CONFIG_CRC_CCITT=m |
| 1866 | # CONFIG_CRC16 is not set | 1820 | # CONFIG_CRC16 is not set |
| 1867 | # CONFIG_CRC_ITU_T is not set | 1821 | CONFIG_CRC_ITU_T=m |
| 1868 | CONFIG_CRC32=y | 1822 | CONFIG_CRC32=y |
| 1869 | # CONFIG_CRC7 is not set | 1823 | # CONFIG_CRC7 is not set |
| 1870 | CONFIG_LIBCRC32C=m | 1824 | CONFIG_LIBCRC32C=m |
| @@ -1888,6 +1842,7 @@ CONFIG_HAVE_LMB=y | |||
| 1888 | # CONFIG_PRINTK_TIME is not set | 1842 | # CONFIG_PRINTK_TIME is not set |
| 1889 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1843 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1890 | CONFIG_ENABLE_MUST_CHECK=y | 1844 | CONFIG_ENABLE_MUST_CHECK=y |
| 1845 | CONFIG_FRAME_WARN=2048 | ||
| 1891 | CONFIG_MAGIC_SYSRQ=y | 1846 | CONFIG_MAGIC_SYSRQ=y |
| 1892 | # CONFIG_UNUSED_SYMBOLS is not set | 1847 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1893 | CONFIG_DEBUG_FS=y | 1848 | CONFIG_DEBUG_FS=y |
| @@ -1898,18 +1853,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1898 | CONFIG_SCHED_DEBUG=y | 1853 | CONFIG_SCHED_DEBUG=y |
| 1899 | # CONFIG_SCHEDSTATS is not set | 1854 | # CONFIG_SCHEDSTATS is not set |
| 1900 | # CONFIG_TIMER_STATS is not set | 1855 | # CONFIG_TIMER_STATS is not set |
| 1856 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1901 | # CONFIG_SLUB_DEBUG_ON is not set | 1857 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1902 | # CONFIG_SLUB_STATS is not set | 1858 | # CONFIG_SLUB_STATS is not set |
| 1903 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1859 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1904 | # CONFIG_RT_MUTEX_TESTER is not set | 1860 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1905 | # CONFIG_DEBUG_SPINLOCK is not set | 1861 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1906 | CONFIG_DEBUG_MUTEXES=y | 1862 | CONFIG_DEBUG_MUTEXES=y |
| 1863 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1864 | # CONFIG_PROVE_LOCKING is not set | ||
| 1865 | # CONFIG_LOCK_STAT is not set | ||
| 1907 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1866 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1908 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1867 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1909 | # CONFIG_DEBUG_KOBJECT is not set | 1868 | # CONFIG_DEBUG_KOBJECT is not set |
| 1910 | CONFIG_DEBUG_BUGVERBOSE=y | 1869 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1911 | # CONFIG_DEBUG_INFO is not set | 1870 | # CONFIG_DEBUG_INFO is not set |
| 1912 | # CONFIG_DEBUG_VM is not set | 1871 | # CONFIG_DEBUG_VM is not set |
| 1872 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1913 | # CONFIG_DEBUG_LIST is not set | 1873 | # CONFIG_DEBUG_LIST is not set |
| 1914 | # CONFIG_DEBUG_SG is not set | 1874 | # CONFIG_DEBUG_SG is not set |
| 1915 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1875 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1941,53 +1901,83 @@ CONFIG_ASYNC_CORE=y | |||
| 1941 | CONFIG_ASYNC_MEMCPY=y | 1901 | CONFIG_ASYNC_MEMCPY=y |
| 1942 | CONFIG_ASYNC_XOR=y | 1902 | CONFIG_ASYNC_XOR=y |
| 1943 | CONFIG_CRYPTO=y | 1903 | CONFIG_CRYPTO=y |
| 1904 | |||
| 1905 | # | ||
| 1906 | # Crypto core or helper | ||
| 1907 | # | ||
| 1944 | CONFIG_CRYPTO_ALGAPI=y | 1908 | CONFIG_CRYPTO_ALGAPI=y |
| 1945 | CONFIG_CRYPTO_AEAD=m | 1909 | CONFIG_CRYPTO_AEAD=m |
| 1946 | CONFIG_CRYPTO_BLKCIPHER=y | 1910 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1947 | CONFIG_CRYPTO_SEQIV=m | ||
| 1948 | CONFIG_CRYPTO_HASH=y | 1911 | CONFIG_CRYPTO_HASH=y |
| 1949 | CONFIG_CRYPTO_MANAGER=y | 1912 | CONFIG_CRYPTO_MANAGER=y |
| 1913 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1914 | CONFIG_CRYPTO_NULL=m | ||
| 1915 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1916 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1917 | CONFIG_CRYPTO_TEST=m | ||
| 1918 | |||
| 1919 | # | ||
| 1920 | # Authenticated Encryption with Associated Data | ||
| 1921 | # | ||
| 1922 | CONFIG_CRYPTO_CCM=m | ||
| 1923 | CONFIG_CRYPTO_GCM=m | ||
| 1924 | CONFIG_CRYPTO_SEQIV=m | ||
| 1925 | |||
| 1926 | # | ||
| 1927 | # Block modes | ||
| 1928 | # | ||
| 1929 | CONFIG_CRYPTO_CBC=y | ||
| 1930 | CONFIG_CRYPTO_CTR=m | ||
| 1931 | # CONFIG_CRYPTO_CTS is not set | ||
| 1932 | CONFIG_CRYPTO_ECB=m | ||
| 1933 | # CONFIG_CRYPTO_LRW is not set | ||
| 1934 | CONFIG_CRYPTO_PCBC=m | ||
| 1935 | # CONFIG_CRYPTO_XTS is not set | ||
| 1936 | |||
| 1937 | # | ||
| 1938 | # Hash modes | ||
| 1939 | # | ||
| 1950 | CONFIG_CRYPTO_HMAC=y | 1940 | CONFIG_CRYPTO_HMAC=y |
| 1951 | # CONFIG_CRYPTO_XCBC is not set | 1941 | # CONFIG_CRYPTO_XCBC is not set |
| 1952 | CONFIG_CRYPTO_NULL=m | 1942 | |
| 1943 | # | ||
| 1944 | # Digest | ||
| 1945 | # | ||
| 1946 | CONFIG_CRYPTO_CRC32C=m | ||
| 1953 | CONFIG_CRYPTO_MD4=m | 1947 | CONFIG_CRYPTO_MD4=m |
| 1954 | CONFIG_CRYPTO_MD5=y | 1948 | CONFIG_CRYPTO_MD5=y |
| 1949 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1955 | CONFIG_CRYPTO_SHA1=m | 1950 | CONFIG_CRYPTO_SHA1=m |
| 1956 | CONFIG_CRYPTO_SHA256=m | 1951 | CONFIG_CRYPTO_SHA256=m |
| 1957 | CONFIG_CRYPTO_SHA512=m | 1952 | CONFIG_CRYPTO_SHA512=m |
| 1958 | CONFIG_CRYPTO_WP512=m | ||
| 1959 | CONFIG_CRYPTO_TGR192=m | 1953 | CONFIG_CRYPTO_TGR192=m |
| 1960 | CONFIG_CRYPTO_GF128MUL=m | 1954 | CONFIG_CRYPTO_WP512=m |
| 1961 | CONFIG_CRYPTO_ECB=m | 1955 | |
| 1962 | CONFIG_CRYPTO_CBC=y | 1956 | # |
| 1963 | CONFIG_CRYPTO_PCBC=m | 1957 | # Ciphers |
| 1964 | # CONFIG_CRYPTO_LRW is not set | 1958 | # |
| 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 | 1959 | CONFIG_CRYPTO_AES=m |
| 1960 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1961 | CONFIG_CRYPTO_ARC4=m | ||
| 1962 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1963 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1977 | CONFIG_CRYPTO_CAST5=m | 1964 | CONFIG_CRYPTO_CAST5=m |
| 1978 | CONFIG_CRYPTO_CAST6=m | 1965 | CONFIG_CRYPTO_CAST6=m |
| 1979 | CONFIG_CRYPTO_TEA=m | 1966 | CONFIG_CRYPTO_DES=y |
| 1980 | CONFIG_CRYPTO_ARC4=m | 1967 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1981 | CONFIG_CRYPTO_KHAZAD=m | 1968 | CONFIG_CRYPTO_KHAZAD=m |
| 1982 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1983 | # CONFIG_CRYPTO_SEED is not set | ||
| 1984 | CONFIG_CRYPTO_SALSA20=m | 1969 | CONFIG_CRYPTO_SALSA20=m |
| 1970 | # CONFIG_CRYPTO_SEED is not set | ||
| 1971 | CONFIG_CRYPTO_SERPENT=m | ||
| 1972 | CONFIG_CRYPTO_TEA=m | ||
| 1973 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1974 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1975 | |||
| 1976 | # | ||
| 1977 | # Compression | ||
| 1978 | # | ||
| 1985 | CONFIG_CRYPTO_DEFLATE=m | 1979 | 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 | 1980 | CONFIG_CRYPTO_LZO=m |
| 1992 | # CONFIG_CRYPTO_HW is not set | 1981 | # CONFIG_CRYPTO_HW is not set |
| 1993 | # CONFIG_PPC_CLOCK is not set | 1982 | # CONFIG_PPC_CLOCK is not set |
| 1983 | # 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/kernel/init_task.c b/arch/powerpc/kernel/init_task.c index 941043ae040f..4c85b8d56478 100644 --- a/arch/powerpc/kernel/init_task.c +++ b/arch/powerpc/kernel/init_task.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <asm/uaccess.h> | 8 | #include <asm/uaccess.h> |
| 9 | 9 | ||
| 10 | static struct fs_struct init_fs = INIT_FS; | 10 | static struct fs_struct init_fs = INIT_FS; |
| 11 | static struct files_struct init_files = INIT_FILES; | ||
| 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 11 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 12 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 14 | struct mm_struct init_mm = INIT_MM(init_mm); | 13 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh index 8e24fc1821e8..31729a9387df 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" |
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/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/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/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/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/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/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/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/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/init_task.c b/arch/s390/kernel/init_task.c index d494161b05b4..7ad003969251 100644 --- a/arch/s390/kernel/init_task.c +++ b/arch/s390/kernel/init_task.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
| 18 | 18 | ||
| 19 | static struct fs_struct init_fs = INIT_FS; | 19 | static struct fs_struct init_fs = INIT_FS; |
| 20 | static struct files_struct init_files = INIT_FILES; | ||
| 21 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 20 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 22 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 21 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 23 | struct mm_struct init_mm = INIT_MM(init_mm); | 22 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c index 805535aa505e..27fa81bef6a0 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c | |||
| @@ -26,7 +26,7 @@ static int pfc_divisors[] = { 1, 1, 1, 1, 1, 1, 1, 18, | |||
| 26 | 26 | ||
| 27 | static void master_clk_init(struct clk *clk) | 27 | static void master_clk_init(struct clk *clk) |
| 28 | { | 28 | { |
| 29 | clk->rate *= 36; | 29 | clk->rate *= pfc_divisors[ctrl_inl(FRQMR1) & 0x000f]; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | static struct clk_ops sh7785_master_clk_ops = { | 32 | static struct clk_ops sh7785_master_clk_ops = { |
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/entry-common.S b/arch/sh/kernel/entry-common.S index 926b2e7b11c1..718bd2356b34 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | /* $Id: entry.S,v 1.37 2004/06/11 13:02:46 doyu Exp $ | 1 | /* |
| 2 | * | ||
| 3 | * linux/arch/sh/entry.S | ||
| 4 | * | ||
| 5 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka | 2 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka |
| 6 | * Copyright (C) 2003 Paul Mundt | 3 | * Copyright (C) 2003 - 2008 Paul Mundt |
| 7 | * | 4 | * |
| 8 | * This file is subject to the terms and conditions of the GNU General Public | 5 | * This file is subject to the terms and conditions of the GNU General Public |
| 9 | * License. See the file "COPYING" in the main directory of this archive | 6 | * License. See the file "COPYING" in the main directory of this archive |
| @@ -262,6 +259,7 @@ __restore_all: | |||
| 262 | 259 | ||
| 263 | .align 2 | 260 | .align 2 |
| 264 | syscall_badsys: ! Bad syscall number | 261 | syscall_badsys: ! Bad syscall number |
| 262 | get_current_thread_info r8, r0 | ||
| 265 | mov #-ENOSYS, r0 | 263 | mov #-ENOSYS, r0 |
| 266 | bra resume_userspace | 264 | bra resume_userspace |
| 267 | mov.l r0, @(OFF_R0,r15) ! Return value | 265 | mov.l r0, @(OFF_R0,r15) ! Return value |
| @@ -281,7 +279,9 @@ debug_trap: | |||
| 281 | mov.l 1f, r8 | 279 | mov.l 1f, r8 |
| 282 | add r0, r8 | 280 | add r0, r8 |
| 283 | mov.l @r8, r8 | 281 | mov.l @r8, r8 |
| 284 | jmp @r8 | 282 | jsr @r8 |
| 283 | nop | ||
| 284 | bra __restore_all | ||
| 285 | nop | 285 | nop |
| 286 | 286 | ||
| 287 | .align 2 | 287 | .align 2 |
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S index d67d7ed09f22..ae0a382a82eb 100644 --- a/arch/sh/kernel/head_32.S +++ b/arch/sh/kernel/head_32.S | |||
| @@ -30,8 +30,8 @@ ENTRY(empty_zero_page) | |||
| 30 | .long 0 /* RAMDISK_FLAGS */ | 30 | .long 0 /* RAMDISK_FLAGS */ |
| 31 | .long 0x0200 /* ORIG_ROOT_DEV */ | 31 | .long 0x0200 /* ORIG_ROOT_DEV */ |
| 32 | .long 1 /* LOADER_TYPE */ | 32 | .long 1 /* LOADER_TYPE */ |
| 33 | .long 0x00360000 /* INITRD_START */ | 33 | .long 0x00000000 /* INITRD_START */ |
| 34 | .long 0x000a0000 /* INITRD_SIZE */ | 34 | .long 0x00000000 /* INITRD_SIZE */ |
| 35 | #ifdef CONFIG_32BIT | 35 | #ifdef CONFIG_32BIT |
| 36 | .long 0x53453f00 + 32 /* "SE?" = 32 bit */ | 36 | .long 0x53453f00 + 32 /* "SE?" = 32 bit */ |
| 37 | #else | 37 | #else |
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c index f9bcc606127e..b151a25cb14d 100644 --- a/arch/sh/kernel/init_task.c +++ b/arch/sh/kernel/init_task.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <asm/pgtable.h> | 8 | #include <asm/pgtable.h> |
| 9 | 9 | ||
| 10 | static struct fs_struct init_fs = INIT_FS; | 10 | static struct fs_struct init_fs = INIT_FS; |
| 11 | static struct files_struct init_files = INIT_FILES; | ||
| 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 11 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 12 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 14 | struct pt_regs fake_swapper_regs; | 13 | struct pt_regs fake_swapper_regs; |
diff --git a/arch/sh/kernel/kgdb_stub.c b/arch/sh/kernel/kgdb_stub.c index 832641bbd47d..bf8ac4c71640 100644 --- a/arch/sh/kernel/kgdb_stub.c +++ b/arch/sh/kernel/kgdb_stub.c | |||
| @@ -274,8 +274,7 @@ static char *mem_to_hex(const char *mem, char *buf, const int count) | |||
| 274 | } | 274 | } |
| 275 | for (i = 0; i < count; i++) { | 275 | for (i = 0; i < count; i++) { |
| 276 | ch = *mem++; | 276 | ch = *mem++; |
| 277 | *buf++ = highhex(ch); | 277 | buf = pack_hex_byte(buf, ch); |
| 278 | *buf++ = lowhex(ch); | ||
| 279 | } | 278 | } |
| 280 | *buf = 0; | 279 | *buf = 0; |
| 281 | return (buf); | 280 | return (buf); |
| @@ -427,8 +426,8 @@ static void put_packet(char *buffer) | |||
| 427 | 426 | ||
| 428 | /* '#' Separator, put high and low components of checksum */ | 427 | /* '#' Separator, put high and low components of checksum */ |
| 429 | put_debug_char('#'); | 428 | put_debug_char('#'); |
| 430 | put_debug_char(highhex(checksum)); | 429 | put_debug_char(hex_asc_hi(checksum)); |
| 431 | put_debug_char(lowhex(checksum)); | 430 | put_debug_char(hex_asc_lo(checksum)); |
| 432 | } | 431 | } |
| 433 | while ((get_debug_char()) != '+'); /* While no ack */ | 432 | while ((get_debug_char()) != '+'); /* While no ack */ |
| 434 | } | 433 | } |
| @@ -650,8 +649,8 @@ static void undo_single_step(void) | |||
| 650 | static void send_signal_msg(const int signum) | 649 | static void send_signal_msg(const int signum) |
| 651 | { | 650 | { |
| 652 | out_buffer[0] = 'S'; | 651 | out_buffer[0] = 'S'; |
| 653 | out_buffer[1] = highhex(signum); | 652 | out_buffer[1] = hex_asc_hi(signum); |
| 654 | out_buffer[2] = lowhex(signum); | 653 | out_buffer[2] = hex_asc_lo(signum); |
| 655 | out_buffer[3] = 0; | 654 | out_buffer[3] = 0; |
| 656 | put_packet(out_buffer); | 655 | put_packet(out_buffer); |
| 657 | } | 656 | } |
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/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 516bde9c50fa..bca2bbc575db 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
| @@ -292,6 +292,17 @@ void __init setup_arch(char **cmdline_p) | |||
| 292 | 292 | ||
| 293 | ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); | 293 | ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); |
| 294 | 294 | ||
| 295 | printk(KERN_NOTICE "Boot params:\n" | ||
| 296 | "... MOUNT_ROOT_RDONLY - %08lx\n" | ||
| 297 | "... RAMDISK_FLAGS - %08lx\n" | ||
| 298 | "... ORIG_ROOT_DEV - %08lx\n" | ||
| 299 | "... LOADER_TYPE - %08lx\n" | ||
| 300 | "... INITRD_START - %08lx\n" | ||
| 301 | "... INITRD_SIZE - %08lx\n", | ||
| 302 | MOUNT_ROOT_RDONLY, RAMDISK_FLAGS, | ||
| 303 | ORIG_ROOT_DEV, LOADER_TYPE, | ||
| 304 | INITRD_START, INITRD_SIZE); | ||
| 305 | |||
| 295 | #ifdef CONFIG_BLK_DEV_RAM | 306 | #ifdef CONFIG_BLK_DEV_RAM |
| 296 | rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; | 307 | rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; |
| 297 | rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0); | 308 | rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0); |
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index a3bdc68ef02c..438f1ebcc453 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <linux/kdebug.h> | 4 | #include <linux/kdebug.h> |
| 5 | #include <linux/signal.h> | 5 | #include <linux/signal.h> |
| 6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 7 | #include <linux/uaccess.h> | ||
| 7 | #include <asm/system.h> | 8 | #include <asm/system.h> |
| 8 | 9 | ||
| 9 | #ifdef CONFIG_BUG | 10 | #ifdef CONFIG_BUG |
| @@ -21,7 +22,14 @@ static void handle_BUG(struct pt_regs *regs) | |||
| 21 | 22 | ||
| 22 | int is_valid_bugaddr(unsigned long addr) | 23 | int is_valid_bugaddr(unsigned long addr) |
| 23 | { | 24 | { |
| 24 | return addr >= PAGE_OFFSET; | 25 | unsigned short opcode; |
| 26 | |||
| 27 | if (addr < PAGE_OFFSET) | ||
| 28 | return 0; | ||
| 29 | if (probe_kernel_address((u16 *)addr, opcode)) | ||
| 30 | return 0; | ||
| 31 | |||
| 32 | return opcode == TRAPA_BUG_OPCODE; | ||
| 25 | } | 33 | } |
| 26 | #endif | 34 | #endif |
| 27 | 35 | ||
diff --git a/arch/sh/lib/memcpy-sh4.S b/arch/sh/lib/memcpy-sh4.S index 560bc17eebdd..459fa92a7c53 100644 --- a/arch/sh/lib/memcpy-sh4.S +++ b/arch/sh/lib/memcpy-sh4.S | |||
| @@ -126,10 +126,10 @@ | |||
| 126 | 126 | ||
| 127 | mov.l r3,@-r0 ! 30 LS | 127 | mov.l r3,@-r0 ! 30 LS |
| 128 | #else | 128 | #else |
| 129 | 3: mov r1,r3 ! OPQR | 129 | 3: mov r7,r3 ! OPQR |
| 130 | shlr8 r3 ! xOPQ | 130 | shlr8 r3 ! xOPQ |
| 131 | mov.l @(r0,r5),r1 ! KLMN | 131 | mov.l @(r0,r5),r7 ! KLMN |
| 132 | mov r1,r6 | 132 | mov r7,r6 |
| 133 | shll16 r6 | 133 | shll16 r6 |
| 134 | shll8 r6 ! Nxxx | 134 | shll8 r6 ! Nxxx |
| 135 | or r6,r3 ! NOPQ | 135 | or r6,r3 ! NOPQ |
| @@ -733,24 +733,24 @@ ENTRY(memcpy) | |||
| 733 | movca.l r0,@r1 ! 40 LS (latency=3-7) | 733 | movca.l r0,@r1 ! 40 LS (latency=3-7) |
| 734 | add #-0x1c, r1 ! 50 EX | 734 | add #-0x1c, r1 ! 50 EX |
| 735 | 735 | ||
| 736 | mov.l r3, @(0x1c,r1) ! 33 LS | 736 | mov.l r3, @(0x18,r1) ! 33 LS |
| 737 | xtrct r11, r10 ! 48 EX | 737 | xtrct r11, r10 ! 48 EX |
| 738 | 738 | ||
| 739 | mov.l r6, @(0x18,r1) ! 33 LS | 739 | mov.l r6, @(0x14,r1) ! 33 LS |
| 740 | xtrct r12, r11 ! 48 EX | 740 | xtrct r12, r11 ! 48 EX |
| 741 | 741 | ||
| 742 | mov.l r7, @(0x14,r1) ! 33 LS | 742 | mov.l r7, @(0x10,r1) ! 33 LS |
| 743 | 743 | ||
| 744 | mov.l r8, @(0x10,r1) ! 33 LS | 744 | mov.l r8, @(0x0c,r1) ! 33 LS |
| 745 | add #-0x3e, r5 ! 50 EX | 745 | add #-0x1e, r5 ! 50 EX |
| 746 | 746 | ||
| 747 | mov.l r9, @(0x0c,r1) ! 33 LS | 747 | mov.l r9, @(0x08,r1) ! 33 LS |
| 748 | cmp/eq r2,r1 ! 54 MT | 748 | cmp/eq r2,r1 ! 54 MT |
| 749 | 749 | ||
| 750 | mov.l r10, @(0x08,r1) ! 33 LS | 750 | mov.l r10, @(0x04,r1) ! 33 LS |
| 751 | bf/s 2b ! 109 BR | 751 | bf/s 2b ! 109 BR |
| 752 | 752 | ||
| 753 | mov.l r11, @(0x04,r1) ! 33 LS | 753 | mov.l r11, @(0x00,r1) ! 33 LS |
| 754 | #endif | 754 | #endif |
| 755 | 755 | ||
| 756 | mov.l @r15+, r12 | 756 | mov.l @r15+, r12 |
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/init_task.c b/arch/sparc/kernel/init_task.c index d9d4f96360c7..8e64ebc445ef 100644 --- a/arch/sparc/kernel/init_task.c +++ b/arch/sparc/kernel/init_task.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include <asm/uaccess.h> | 9 | #include <asm/uaccess.h> |
| 10 | 10 | ||
| 11 | static struct fs_struct init_fs = INIT_FS; | 11 | static struct fs_struct init_fs = INIT_FS; |
| 12 | static struct files_struct init_files = INIT_FILES; | ||
| 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 15 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/init_task.c b/arch/sparc64/kernel/init_task.c index 90007cf88bac..d2b312381c19 100644 --- a/arch/sparc64/kernel/init_task.c +++ b/arch/sparc64/kernel/init_task.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <asm/processor.h> | 10 | #include <asm/processor.h> |
| 11 | 11 | ||
| 12 | static struct fs_struct init_fs = INIT_FS; | 12 | static struct fs_struct init_fs = INIT_FS; |
| 13 | static struct files_struct init_files = INIT_FILES; | ||
| 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 16 | struct mm_struct init_mm = INIT_MM(init_mm); | 15 | struct mm_struct init_mm = INIT_MM(init_mm); |
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/init_task.c b/arch/um/kernel/init_task.c index dcfceca95052..910eda8fca18 100644 --- a/arch/um/kernel/init_task.c +++ b/arch/um/kernel/init_task.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
| 14 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
| 15 | static struct files_struct init_files = INIT_FILES; | ||
| 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 18 | EXPORT_SYMBOL(init_mm); | 17 | EXPORT_SYMBOL(init_mm); |
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/v850/kernel/init_task.c b/arch/v850/kernel/init_task.c index ed2f93cf7c66..44b274dff33f 100644 --- a/arch/v850/kernel/init_task.c +++ b/arch/v850/kernel/init_task.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
| 22 | 22 | ||
| 23 | static struct fs_struct init_fs = INIT_FS; | 23 | static struct fs_struct init_fs = INIT_FS; |
| 24 | static struct files_struct init_files = INIT_FILES; | ||
| 25 | static struct signal_struct init_signals = INIT_SIGNALS (init_signals); | 24 | static struct signal_struct init_signals = INIT_SIGNALS (init_signals); |
| 26 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 25 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 27 | struct mm_struct init_mm = INIT_MM (init_mm); | 26 | struct mm_struct init_mm = INIT_MM (init_mm); |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fe361ae7ef2f..52e18e6d2ba0 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 |
| @@ -1515,13 +1508,13 @@ config PCI_GOMMCONFIG | |||
| 1515 | config PCI_GODIRECT | 1508 | config PCI_GODIRECT |
| 1516 | bool "Direct" | 1509 | bool "Direct" |
| 1517 | 1510 | ||
| 1518 | config PCI_GOANY | ||
| 1519 | bool "Any" | ||
| 1520 | |||
| 1521 | config PCI_GOOLPC | 1511 | config PCI_GOOLPC |
| 1522 | bool "OLPC" | 1512 | bool "OLPC" |
| 1523 | depends on OLPC | 1513 | depends on OLPC |
| 1524 | 1514 | ||
| 1515 | config PCI_GOANY | ||
| 1516 | bool "Any" | ||
| 1517 | |||
| 1525 | endchoice | 1518 | endchoice |
| 1526 | 1519 | ||
| 1527 | config PCI_BIOS | 1520 | config PCI_BIOS |
| @@ -1538,9 +1531,8 @@ config PCI_MMCONFIG | |||
| 1538 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1531 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
| 1539 | 1532 | ||
| 1540 | config PCI_OLPC | 1533 | config PCI_OLPC |
| 1541 | bool | 1534 | def_bool y |
| 1542 | depends on PCI && PCI_GOOLPC | 1535 | depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY) |
| 1543 | default y | ||
| 1544 | 1536 | ||
| 1545 | config PCI_DOMAINS | 1537 | config PCI_DOMAINS |
| 1546 | def_bool y | 1538 | def_bool y |
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/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/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/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/apic_64.c b/arch/x86/kernel/apic_64.c index 5910020c3f24..0633cfd0dc29 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
| @@ -534,7 +534,7 @@ int setup_profiling_timer(unsigned int multiplier) | |||
| 534 | */ | 534 | */ |
| 535 | void clear_local_APIC(void) | 535 | void clear_local_APIC(void) |
| 536 | { | 536 | { |
| 537 | int maxlvt = lapic_get_maxlvt(); | 537 | int maxlvt; |
| 538 | u32 v; | 538 | u32 v; |
| 539 | 539 | ||
| 540 | /* APIC hasn't been mapped yet */ | 540 | /* APIC hasn't been mapped yet */ |
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/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/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/i387.c b/arch/x86/kernel/i387.c index e03cc952f233..eb9ddd8efb82 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 | ||
| @@ -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/init_task.c b/arch/x86/kernel/init_task.c index 3d01e47777db..a4f93b4120c1 100644 --- a/arch/x86/kernel/init_task.c +++ b/arch/x86/kernel/init_task.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <asm/desc.h> | 11 | #include <asm/desc.h> |
| 12 | 12 | ||
| 13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
| 14 | static struct files_struct init_files = INIT_FILES; | ||
| 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 17 | struct mm_struct init_mm = INIT_MM(init_mm); | 16 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index a40d54fc1fdd..4dc8600d9d20 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
| @@ -2130,14 +2130,10 @@ static inline void __init check_timer(void) | |||
| 2130 | { | 2130 | { |
| 2131 | int apic1, pin1, apic2, pin2; | 2131 | int apic1, pin1, apic2, pin2; |
| 2132 | int vector; | 2132 | int vector; |
| 2133 | unsigned int ver; | ||
| 2134 | unsigned long flags; | 2133 | unsigned long flags; |
| 2135 | 2134 | ||
| 2136 | local_irq_save(flags); | 2135 | local_irq_save(flags); |
| 2137 | 2136 | ||
| 2138 | ver = apic_read(APIC_LVR); | ||
| 2139 | ver = GET_APIC_VERSION(ver); | ||
| 2140 | |||
| 2141 | /* | 2137 | /* |
| 2142 | * get/set the timer IRQ vector: | 2138 | * get/set the timer IRQ vector: |
| 2143 | */ | 2139 | */ |
| @@ -2150,15 +2146,11 @@ static inline void __init check_timer(void) | |||
| 2150 | * mode for the 8259A whenever interrupts are routed | 2146 | * mode for the 8259A whenever interrupts are routed |
| 2151 | * through I/O APICs. Also IRQ0 has to be enabled in | 2147 | * through I/O APICs. Also IRQ0 has to be enabled in |
| 2152 | * the 8259A which implies the virtual wire has to be | 2148 | * the 8259A which implies the virtual wire has to be |
| 2153 | * disabled in the local APIC. Finally timer interrupts | 2149 | * disabled in the local APIC. |
| 2154 | * need to be acknowledged manually in the 8259A for | ||
| 2155 | * timer_interrupt() and for the i82489DX when using | ||
| 2156 | * the NMI watchdog. | ||
| 2157 | */ | 2150 | */ |
| 2158 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 2151 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
| 2159 | init_8259A(1); | 2152 | init_8259A(1); |
| 2160 | timer_ack = !cpu_has_tsc; | 2153 | timer_ack = 1; |
| 2161 | timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); | ||
| 2162 | if (timer_over_8254 > 0) | 2154 | if (timer_over_8254 > 0) |
| 2163 | enable_8259A_irq(0); | 2155 | enable_8259A_irq(0); |
| 2164 | 2156 | ||
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 4bc1be5d5472..08a30986d472 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c | |||
| @@ -53,7 +53,7 @@ static cycle_t kvm_clock_read(void); | |||
| 53 | * have elapsed since the hypervisor wrote the data. So we try to account for | 53 | * have elapsed since the hypervisor wrote the data. So we try to account for |
| 54 | * that with system time | 54 | * that with system time |
| 55 | */ | 55 | */ |
| 56 | unsigned long kvm_get_wallclock(void) | 56 | static unsigned long kvm_get_wallclock(void) |
| 57 | { | 57 | { |
| 58 | u32 wc_sec, wc_nsec; | 58 | u32 wc_sec, wc_nsec; |
| 59 | u64 delta; | 59 | u64 delta; |
| @@ -86,7 +86,7 @@ unsigned long kvm_get_wallclock(void) | |||
| 86 | return ts.tv_sec + 1; | 86 | return ts.tv_sec + 1; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | int kvm_set_wallclock(unsigned long now) | 89 | static int kvm_set_wallclock(unsigned long now) |
| 90 | { | 90 | { |
| 91 | return 0; | 91 | return 0; |
| 92 | } | 92 | } |
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/nmi_32.c b/arch/x86/kernel/nmi_32.c index 11b14bbaa61e..84160f74eeb0 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/smp.h> | 27 | #include <asm/smp.h> |
| 28 | #include <asm/nmi.h> | 28 | #include <asm/nmi.h> |
| 29 | #include <asm/timer.h> | ||
| 30 | 29 | ||
| 31 | #include "mach_traps.h" | 30 | #include "mach_traps.h" |
| 32 | 31 | ||
| @@ -82,7 +81,7 @@ int __init check_nmi_watchdog(void) | |||
| 82 | 81 | ||
| 83 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 82 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); |
| 84 | if (!prev_nmi_count) | 83 | if (!prev_nmi_count) |
| 85 | goto error; | 84 | return -1; |
| 86 | 85 | ||
| 87 | printk(KERN_INFO "Testing NMI watchdog ... "); | 86 | printk(KERN_INFO "Testing NMI watchdog ... "); |
| 88 | 87 | ||
| @@ -119,7 +118,7 @@ int __init check_nmi_watchdog(void) | |||
| 119 | if (!atomic_read(&nmi_active)) { | 118 | if (!atomic_read(&nmi_active)) { |
| 120 | kfree(prev_nmi_count); | 119 | kfree(prev_nmi_count); |
| 121 | atomic_set(&nmi_active, -1); | 120 | atomic_set(&nmi_active, -1); |
| 122 | goto error; | 121 | return -1; |
| 123 | } | 122 | } |
| 124 | printk("OK.\n"); | 123 | printk("OK.\n"); |
| 125 | 124 | ||
| @@ -130,10 +129,6 @@ int __init check_nmi_watchdog(void) | |||
| 130 | 129 | ||
| 131 | kfree(prev_nmi_count); | 130 | kfree(prev_nmi_count); |
| 132 | return 0; | 131 | return 0; |
| 133 | error: | ||
| 134 | timer_ack = !cpu_has_tsc; | ||
| 135 | |||
| 136 | return -1; | ||
| 137 | } | 132 | } |
| 138 | 133 | ||
| 139 | static int __init setup_nmi_watchdog(char *str) | 134 | static int __init setup_nmi_watchdog(char *str) |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index c5ef1af8e79d..dc00a1331ace 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -378,6 +378,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
| 378 | struct page *page; | 378 | struct page *page; |
| 379 | unsigned long dma_mask = 0; | 379 | unsigned long dma_mask = 0; |
| 380 | dma_addr_t bus; | 380 | dma_addr_t bus; |
| 381 | int noretry = 0; | ||
| 381 | 382 | ||
| 382 | /* ignore region specifiers */ | 383 | /* ignore region specifiers */ |
| 383 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); | 384 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); |
| @@ -397,20 +398,25 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
| 397 | if (dev->dma_mask == NULL) | 398 | if (dev->dma_mask == NULL) |
| 398 | return NULL; | 399 | return NULL; |
| 399 | 400 | ||
| 400 | /* Don't invoke OOM killer */ | 401 | /* Don't invoke OOM killer or retry in lower 16MB DMA zone */ |
| 401 | gfp |= __GFP_NORETRY; | 402 | if (gfp & __GFP_DMA) |
| 403 | noretry = 1; | ||
| 402 | 404 | ||
| 403 | #ifdef CONFIG_X86_64 | 405 | #ifdef CONFIG_X86_64 |
| 404 | /* Why <=? Even when the mask is smaller than 4GB it is often | 406 | /* 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 | 407 | larger than 16MB and in this case we have a chance of |
| 406 | finding fitting memory in the next higher zone first. If | 408 | finding fitting memory in the next higher zone first. If |
| 407 | not retry with true GFP_DMA. -AK */ | 409 | not retry with true GFP_DMA. -AK */ |
| 408 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) | 410 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) { |
| 409 | gfp |= GFP_DMA32; | 411 | gfp |= GFP_DMA32; |
| 412 | if (dma_mask < DMA_32BIT_MASK) | ||
| 413 | noretry = 1; | ||
| 414 | } | ||
| 410 | #endif | 415 | #endif |
| 411 | 416 | ||
| 412 | again: | 417 | again: |
| 413 | page = dma_alloc_pages(dev, gfp, get_order(size)); | 418 | page = dma_alloc_pages(dev, |
| 419 | noretry ? gfp | __GFP_NORETRY : gfp, get_order(size)); | ||
| 414 | if (page == NULL) | 420 | if (page == NULL) |
| 415 | return NULL; | 421 | return NULL; |
| 416 | 422 | ||
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index c07455d1695f..aa8ec928caa8 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> |
| @@ -548,6 +549,28 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size) | |||
| 548 | return aper_base; | 549 | return aper_base; |
| 549 | } | 550 | } |
| 550 | 551 | ||
| 552 | static int gart_resume(struct sys_device *dev) | ||
| 553 | { | ||
| 554 | return 0; | ||
| 555 | } | ||
| 556 | |||
| 557 | static int gart_suspend(struct sys_device *dev, pm_message_t state) | ||
| 558 | { | ||
| 559 | return -EINVAL; | ||
| 560 | } | ||
| 561 | |||
| 562 | static struct sysdev_class gart_sysdev_class = { | ||
| 563 | .name = "gart", | ||
| 564 | .suspend = gart_suspend, | ||
| 565 | .resume = gart_resume, | ||
| 566 | |||
| 567 | }; | ||
| 568 | |||
| 569 | static struct sys_device device_gart = { | ||
| 570 | .id = 0, | ||
| 571 | .cls = &gart_sysdev_class, | ||
| 572 | }; | ||
| 573 | |||
| 551 | /* | 574 | /* |
| 552 | * Private Northbridge GATT initialization in case we cannot use the | 575 | * Private Northbridge GATT initialization in case we cannot use the |
| 553 | * AGP driver for some reason. | 576 | * AGP driver for some reason. |
| @@ -558,7 +581,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
| 558 | unsigned aper_base, new_aper_base; | 581 | unsigned aper_base, new_aper_base; |
| 559 | struct pci_dev *dev; | 582 | struct pci_dev *dev; |
| 560 | void *gatt; | 583 | void *gatt; |
| 561 | int i; | 584 | int i, error; |
| 562 | 585 | ||
| 563 | printk(KERN_INFO "PCI-DMA: Disabling AGP.\n"); | 586 | printk(KERN_INFO "PCI-DMA: Disabling AGP.\n"); |
| 564 | aper_size = aper_base = info->aper_size = 0; | 587 | aper_size = aper_base = info->aper_size = 0; |
| @@ -606,6 +629,12 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
| 606 | 629 | ||
| 607 | pci_write_config_dword(dev, 0x90, ctl); | 630 | pci_write_config_dword(dev, 0x90, ctl); |
| 608 | } | 631 | } |
| 632 | |||
| 633 | error = sysdev_class_register(&gart_sysdev_class); | ||
| 634 | if (!error) | ||
| 635 | error = sysdev_register(&device_gart); | ||
| 636 | if (error) | ||
| 637 | panic("Could not register gart_sysdev -- would corrupt data on next suspend"); | ||
| 609 | flush_gart(); | 638 | flush_gart(); |
| 610 | 639 | ||
| 611 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", | 640 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index f8476dfbb60d..6d5483356e74 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
| @@ -649,8 +649,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 | 649 | /* 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 | 650 | * restore of the math state immediately to avoid the trap; the |
| 651 | * chances of needing FPU soon are obviously high now | 651 | * chances of needing FPU soon are obviously high now |
| 652 | * | ||
| 653 | * tsk_used_math() checks prevent calling math_state_restore(), | ||
| 654 | * which can sleep in the case of !tsk_used_math() | ||
| 652 | */ | 655 | */ |
| 653 | if (next_p->fpu_counter > 5) | 656 | if (tsk_used_math(next_p) && next_p->fpu_counter > 5) |
| 654 | math_state_restore(); | 657 | math_state_restore(); |
| 655 | 658 | ||
| 656 | /* | 659 | /* |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index e2319f39988b..ac54ff56df80 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -658,8 +658,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 | 658 | /* 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 | 659 | * restore of the math state immediately to avoid the trap; the |
| 660 | * chances of needing FPU soon are obviously high now | 660 | * chances of needing FPU soon are obviously high now |
| 661 | * | ||
| 662 | * tsk_used_math() checks prevent calling math_state_restore(), | ||
| 663 | * which can sleep in the case of !tsk_used_math() | ||
| 661 | */ | 664 | */ |
| 662 | if (next_p->fpu_counter>5) | 665 | if (tsk_used_math(next_p) && next_p->fpu_counter > 5) |
| 663 | math_state_restore(); | 666 | math_state_restore(); |
| 664 | return prev_p; | 667 | return prev_p; |
| 665 | } | 668 | } |
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/smpboot.c b/arch/x86/kernel/smpboot.c index 38988491c622..56078d61c793 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -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/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/tsc_32.c b/arch/x86/kernel/tsc_32.c index e4790728b224..068759db63dd 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include "mach_timer.h" | 15 | #include "mach_timer.h" |
| 16 | 16 | ||
| 17 | static int tsc_enabled; | 17 | static int tsc_disabled; |
| 18 | 18 | ||
| 19 | /* | 19 | /* |
| 20 | * On some systems the TSC frequency does not | 20 | * On some systems the TSC frequency does not |
| @@ -28,8 +28,8 @@ EXPORT_SYMBOL_GPL(tsc_khz); | |||
| 28 | static int __init tsc_setup(char *str) | 28 | static int __init tsc_setup(char *str) |
| 29 | { | 29 | { |
| 30 | printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, " | 30 | printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, " |
| 31 | "cannot disable TSC completely.\n"); | 31 | "cannot disable TSC completely.\n"); |
| 32 | mark_tsc_unstable("user disabled TSC"); | 32 | tsc_disabled = 1; |
| 33 | return 1; | 33 | return 1; |
| 34 | } | 34 | } |
| 35 | #else | 35 | #else |
| @@ -120,7 +120,7 @@ unsigned long long native_sched_clock(void) | |||
| 120 | * very important for it to be as fast as the platform | 120 | * very important for it to be as fast as the platform |
| 121 | * can achive it. ) | 121 | * can achive it. ) |
| 122 | */ | 122 | */ |
| 123 | if (unlikely(!tsc_enabled && !tsc_unstable)) | 123 | if (unlikely(tsc_disabled)) |
| 124 | /* No locking but a rare wrong value is not a big deal: */ | 124 | /* No locking but a rare wrong value is not a big deal: */ |
| 125 | return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); | 125 | return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); |
| 126 | 126 | ||
| @@ -322,7 +322,6 @@ void mark_tsc_unstable(char *reason) | |||
| 322 | { | 322 | { |
| 323 | if (!tsc_unstable) { | 323 | if (!tsc_unstable) { |
| 324 | tsc_unstable = 1; | 324 | tsc_unstable = 1; |
| 325 | tsc_enabled = 0; | ||
| 326 | printk("Marking TSC unstable due to: %s.\n", reason); | 325 | printk("Marking TSC unstable due to: %s.\n", reason); |
| 327 | /* Can be called before registration */ | 326 | /* Can be called before registration */ |
| 328 | if (clocksource_tsc.mult) | 327 | if (clocksource_tsc.mult) |
| @@ -336,7 +335,7 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable); | |||
| 336 | static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d) | 335 | static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d) |
| 337 | { | 336 | { |
| 338 | printk(KERN_NOTICE "%s detected: marking TSC unstable.\n", | 337 | printk(KERN_NOTICE "%s detected: marking TSC unstable.\n", |
| 339 | d->ident); | 338 | d->ident); |
| 340 | tsc_unstable = 1; | 339 | tsc_unstable = 1; |
| 341 | return 0; | 340 | return 0; |
| 342 | } | 341 | } |
| @@ -403,14 +402,22 @@ void __init tsc_init(void) | |||
| 403 | { | 402 | { |
| 404 | int cpu; | 403 | int cpu; |
| 405 | 404 | ||
| 406 | if (!cpu_has_tsc) | 405 | if (!cpu_has_tsc || tsc_disabled) { |
| 406 | /* Disable the TSC in case of !cpu_has_tsc */ | ||
| 407 | tsc_disabled = 1; | ||
| 407 | return; | 408 | return; |
| 409 | } | ||
| 408 | 410 | ||
| 409 | cpu_khz = calculate_cpu_khz(); | 411 | cpu_khz = calculate_cpu_khz(); |
| 410 | tsc_khz = cpu_khz; | 412 | tsc_khz = cpu_khz; |
| 411 | 413 | ||
| 412 | if (!cpu_khz) { | 414 | if (!cpu_khz) { |
| 413 | mark_tsc_unstable("could not calculate TSC khz"); | 415 | mark_tsc_unstable("could not calculate TSC khz"); |
| 416 | /* | ||
| 417 | * We need to disable the TSC completely in this case | ||
| 418 | * to prevent sched_clock() from using it. | ||
| 419 | */ | ||
| 420 | tsc_disabled = 1; | ||
| 414 | return; | 421 | return; |
| 415 | } | 422 | } |
| 416 | 423 | ||
| @@ -441,8 +448,6 @@ void __init tsc_init(void) | |||
| 441 | if (check_tsc_unstable()) { | 448 | if (check_tsc_unstable()) { |
| 442 | clocksource_tsc.rating = 0; | 449 | clocksource_tsc.rating = 0; |
| 443 | clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; | 450 | clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; |
| 444 | } else | 451 | } |
| 445 | tsc_enabled = 1; | ||
| 446 | |||
| 447 | clocksource_register(&clocksource_tsc); | 452 | clocksource_register(&clocksource_tsc); |
| 448 | } | 453 | } |
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c index fcc16e58609e..1784b8077a12 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; |
| @@ -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/kvm/i8254.c b/arch/x86/kvm/i8254.c index 3324d90038e4..f2f5d260874e 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
| @@ -200,7 +200,6 @@ 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 */ | ||
| 204 | if (vcpu0 && waitqueue_active(&vcpu0->wq)) { | 203 | if (vcpu0 && waitqueue_active(&vcpu0->wq)) { |
| 205 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; | 204 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; |
| 206 | wake_up_interruptible(&vcpu0->wq); | 205 | wake_up_interruptible(&vcpu0->wq); |
| @@ -216,7 +215,7 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu) | |||
| 216 | { | 215 | { |
| 217 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; | 216 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; |
| 218 | 217 | ||
| 219 | if (pit && vcpu->vcpu_id == 0) | 218 | if (pit && vcpu->vcpu_id == 0 && pit->pit_state.inject_pending) |
| 220 | return atomic_read(&pit->pit_state.pit_timer.pending); | 219 | return atomic_read(&pit->pit_state.pit_timer.pending); |
| 221 | 220 | ||
| 222 | return 0; | 221 | return 0; |
| @@ -237,6 +236,19 @@ static enum hrtimer_restart pit_timer_fn(struct hrtimer *data) | |||
| 237 | return HRTIMER_NORESTART; | 236 | return HRTIMER_NORESTART; |
| 238 | } | 237 | } |
| 239 | 238 | ||
| 239 | void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu) | ||
| 240 | { | ||
| 241 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; | ||
| 242 | struct hrtimer *timer; | ||
| 243 | |||
| 244 | if (vcpu->vcpu_id != 0 || !pit) | ||
| 245 | return; | ||
| 246 | |||
| 247 | timer = &pit->pit_state.pit_timer.timer; | ||
| 248 | if (hrtimer_cancel(timer)) | ||
| 249 | hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS); | ||
| 250 | } | ||
| 251 | |||
| 240 | static void destroy_pit_timer(struct kvm_kpit_timer *pt) | 252 | static void destroy_pit_timer(struct kvm_kpit_timer *pt) |
| 241 | { | 253 | { |
| 242 | pr_debug("pit: execute del timer!\n"); | 254 | 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 36809d79788b..c297c50eba63 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c | |||
| @@ -957,7 +957,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu) | |||
| 957 | { | 957 | { |
| 958 | struct kvm_lapic *lapic = vcpu->arch.apic; | 958 | struct kvm_lapic *lapic = vcpu->arch.apic; |
| 959 | 959 | ||
| 960 | if (lapic) | 960 | if (lapic && apic_enabled(lapic) && apic_lvt_enabled(lapic, APIC_LVTT)) |
| 961 | return atomic_read(&lapic->timer.pending); | 961 | return atomic_read(&lapic->timer.pending); |
| 962 | 962 | ||
| 963 | return 0; | 963 | return 0; |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 36c5406b1813..ee3f53098f0c 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
| @@ -658,7 +658,7 @@ static int is_empty_shadow_page(u64 *spt) | |||
| 658 | u64 *end; | 658 | u64 *end; |
| 659 | 659 | ||
| 660 | for (pos = spt, end = pos + PAGE_SIZE / sizeof(u64); pos != end; pos++) | 660 | for (pos = spt, end = pos + PAGE_SIZE / sizeof(u64); pos != end; pos++) |
| 661 | if (*pos != shadow_trap_nonpresent_pte) { | 661 | if (is_shadow_present_pte(*pos)) { |
| 662 | printk(KERN_ERR "%s: %p %llx\n", __func__, | 662 | printk(KERN_ERR "%s: %p %llx\n", __func__, |
| 663 | pos, *pos); | 663 | pos, *pos); |
| 664 | return 0; | 664 | return 0; |
| @@ -1858,6 +1858,7 @@ static void free_mmu_pages(struct kvm_vcpu *vcpu) | |||
| 1858 | sp = container_of(vcpu->kvm->arch.active_mmu_pages.next, | 1858 | sp = container_of(vcpu->kvm->arch.active_mmu_pages.next, |
| 1859 | struct kvm_mmu_page, link); | 1859 | struct kvm_mmu_page, link); |
| 1860 | kvm_mmu_zap_page(vcpu->kvm, sp); | 1860 | kvm_mmu_zap_page(vcpu->kvm, sp); |
| 1861 | cond_resched(); | ||
| 1861 | } | 1862 | } |
| 1862 | free_page((unsigned long)vcpu->arch.mmu.pae_root); | 1863 | free_page((unsigned long)vcpu->arch.mmu.pae_root); |
| 1863 | } | 1864 | } |
| @@ -1996,7 +1997,7 @@ static struct shrinker mmu_shrinker = { | |||
| 1996 | .seeks = DEFAULT_SEEKS * 10, | 1997 | .seeks = DEFAULT_SEEKS * 10, |
| 1997 | }; | 1998 | }; |
| 1998 | 1999 | ||
| 1999 | void mmu_destroy_caches(void) | 2000 | static void mmu_destroy_caches(void) |
| 2000 | { | 2001 | { |
| 2001 | if (pte_chain_cache) | 2002 | if (pte_chain_cache) |
| 2002 | kmem_cache_destroy(pte_chain_cache); | 2003 | 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..02efbe75f317 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -608,7 +608,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
| 608 | 608 | ||
| 609 | if (vcpu->cpu != cpu) { | 609 | if (vcpu->cpu != cpu) { |
| 610 | vcpu_clear(vmx); | 610 | vcpu_clear(vmx); |
| 611 | kvm_migrate_apic_timer(vcpu); | 611 | kvm_migrate_timers(vcpu); |
| 612 | vpid_sync_vcpu_all(vmx); | 612 | vpid_sync_vcpu_all(vmx); |
| 613 | } | 613 | } |
| 614 | 614 | ||
| @@ -1036,6 +1036,7 @@ static void hardware_enable(void *garbage) | |||
| 1036 | static void hardware_disable(void *garbage) | 1036 | static void hardware_disable(void *garbage) |
| 1037 | { | 1037 | { |
| 1038 | asm volatile (ASM_VMX_VMXOFF : : : "cc"); | 1038 | asm volatile (ASM_VMX_VMXOFF : : : "cc"); |
| 1039 | write_cr4(read_cr4() & ~X86_CR4_VMXE); | ||
| 1039 | } | 1040 | } |
| 1040 | 1041 | ||
| 1041 | static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, | 1042 | 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..00acf1301a15 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -2758,7 +2758,7 @@ again: | |||
| 2758 | 2758 | ||
| 2759 | if (vcpu->requests) { | 2759 | if (vcpu->requests) { |
| 2760 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) | 2760 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) |
| 2761 | __kvm_migrate_apic_timer(vcpu); | 2761 | __kvm_migrate_timers(vcpu); |
| 2762 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, | 2762 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, |
| 2763 | &vcpu->requests)) { | 2763 | &vcpu->requests)) { |
| 2764 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; | 2764 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; |
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c index f2a696d6a243..932f216d890c 100644 --- a/arch/x86/kvm/x86_emulate.c +++ b/arch/x86/kvm/x86_emulate.c | |||
| @@ -677,8 +677,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt, | |||
| 677 | c->use_modrm_ea = 1; | 677 | c->use_modrm_ea = 1; |
| 678 | 678 | ||
| 679 | if (c->modrm_mod == 3) { | 679 | if (c->modrm_mod == 3) { |
| 680 | c->modrm_val = *(unsigned long *) | 680 | c->modrm_ptr = decode_register(c->modrm_rm, |
| 681 | decode_register(c->modrm_rm, c->regs, c->d & ByteOp); | 681 | c->regs, c->d & ByteOp); |
| 682 | c->modrm_val = *(unsigned long *)c->modrm_ptr; | ||
| 682 | return rc; | 683 | return rc; |
| 683 | } | 684 | } |
| 684 | 685 | ||
| @@ -1005,6 +1006,7 @@ done_prefixes: | |||
| 1005 | if ((c->d & ModRM) && c->modrm_mod == 3) { | 1006 | if ((c->d & ModRM) && c->modrm_mod == 3) { |
| 1006 | c->src.type = OP_REG; | 1007 | c->src.type = OP_REG; |
| 1007 | c->src.val = c->modrm_val; | 1008 | c->src.val = c->modrm_val; |
| 1009 | c->src.ptr = c->modrm_ptr; | ||
| 1008 | break; | 1010 | break; |
| 1009 | } | 1011 | } |
| 1010 | c->src.type = OP_MEM; | 1012 | c->src.type = OP_MEM; |
| @@ -1049,6 +1051,7 @@ done_prefixes: | |||
| 1049 | if ((c->d & ModRM) && c->modrm_mod == 3) { | 1051 | if ((c->d & ModRM) && c->modrm_mod == 3) { |
| 1050 | c->dst.type = OP_REG; | 1052 | c->dst.type = OP_REG; |
| 1051 | c->dst.val = c->dst.orig_val = c->modrm_val; | 1053 | c->dst.val = c->dst.orig_val = c->modrm_val; |
| 1054 | c->dst.ptr = c->modrm_ptr; | ||
| 1052 | break; | 1055 | break; |
| 1053 | } | 1056 | } |
| 1054 | c->dst.type = OP_MEM; | 1057 | c->dst.type = OP_MEM; |
| @@ -1724,7 +1727,8 @@ twobyte_insn: | |||
| 1724 | if (rc) | 1727 | if (rc) |
| 1725 | goto done; | 1728 | goto done; |
| 1726 | 1729 | ||
| 1727 | kvm_emulate_hypercall(ctxt->vcpu); | 1730 | /* Let the processor re-execute the fixed hypercall */ |
| 1731 | c->eip = ctxt->vcpu->arch.rip; | ||
| 1728 | /* Disable writeback. */ | 1732 | /* Disable writeback. */ |
| 1729 | c->dst.type = OP_NONE; | 1733 | c->dst.type = OP_NONE; |
| 1730 | 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/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/mm/fault.c b/arch/x86/mm/fault.c index fd7e1798c75a..8bcb6f40ccb6 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -497,6 +497,11 @@ static int vmalloc_fault(unsigned long address) | |||
| 497 | unsigned long pgd_paddr; | 497 | unsigned long pgd_paddr; |
| 498 | pmd_t *pmd_k; | 498 | pmd_t *pmd_k; |
| 499 | pte_t *pte_k; | 499 | pte_t *pte_k; |
| 500 | |||
| 501 | /* Make sure we are in vmalloc area */ | ||
| 502 | if (!(address >= VMALLOC_START && address < VMALLOC_END)) | ||
| 503 | return -1; | ||
| 504 | |||
| 500 | /* | 505 | /* |
| 501 | * Synchronize this task's top level page-table | 506 | * Synchronize this task's top level page-table |
| 502 | * with the 'reference' page table. | 507 | * with the 'reference' page table. |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 32ba13b0f818..156e6d7b0e32 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
| @@ -206,7 +206,7 @@ void __init cleanup_highmap(void) | |||
| 206 | pmd_t *last_pmd = pmd + PTRS_PER_PMD; | 206 | pmd_t *last_pmd = pmd + PTRS_PER_PMD; |
| 207 | 207 | ||
| 208 | for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) { | 208 | for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) { |
| 209 | if (!pmd_present(*pmd)) | 209 | if (pmd_none(*pmd)) |
| 210 | continue; | 210 | continue; |
| 211 | if (vaddr < (unsigned long) _text || vaddr > end) | 211 | if (vaddr < (unsigned long) _text || vaddr > end) |
| 212 | set_pmd(pmd, __pmd(0)); | 212 | set_pmd(pmd, __pmd(0)); |
| @@ -506,7 +506,7 @@ early_param("memtest", parse_memtest); | |||
| 506 | 506 | ||
| 507 | static void __init early_memtest(unsigned long start, unsigned long end) | 507 | static void __init early_memtest(unsigned long start, unsigned long end) |
| 508 | { | 508 | { |
| 509 | unsigned long t_start, t_size; | 509 | u64 t_start, t_size; |
| 510 | unsigned pattern; | 510 | unsigned pattern; |
| 511 | 511 | ||
| 512 | if (!memtest_pattern) | 512 | if (!memtest_pattern) |
| @@ -525,7 +525,7 @@ static void __init early_memtest(unsigned long start, unsigned long end) | |||
| 525 | if (t_start + t_size > end) | 525 | if (t_start + t_size > end) |
| 526 | t_size = end - t_start; | 526 | t_size = end - t_start; |
| 527 | 527 | ||
| 528 | printk(KERN_CONT "\n %016lx - %016lx pattern %d", | 528 | printk(KERN_CONT "\n %016llx - %016llx pattern %d", |
| 529 | t_start, t_start + t_size, pattern); | 529 | t_start, t_start + t_size, pattern); |
| 530 | 530 | ||
| 531 | memtest(t_start, t_size, pattern); | 531 | memtest(t_start, t_size, pattern); |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index ddeafed1171e..7452eb31ed12 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -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/pat.c b/arch/x86/mm/pat.c index 4beccea0897f..7c21572bbdda 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -34,7 +34,7 @@ void __cpuinit pat_disable(char *reason) | |||
| 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; |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 3890234e5b26..99649dccad28 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 | ||
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/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..ca8df9c260bc 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
| @@ -621,6 +621,13 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 621 | */ | 621 | */ |
| 622 | device = PCI_DEVICE_ID_VIA_8235; | 622 | device = PCI_DEVICE_ID_VIA_8235; |
| 623 | break; | 623 | break; |
| 624 | case PCI_DEVICE_ID_VIA_8237: | ||
| 625 | /** | ||
| 626 | * Asus a7v600 bios wrongly reports 8237 | ||
| 627 | * as 586-compatible | ||
| 628 | */ | ||
| 629 | device = PCI_DEVICE_ID_VIA_8237; | ||
| 630 | break; | ||
| 624 | } | 631 | } |
| 625 | } | 632 | } |
| 626 | 633 | ||
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..720c4c554534 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h | |||
| @@ -101,7 +101,7 @@ extern struct pci_raw_ops pci_direct_conf1; | |||
| 101 | extern int pci_direct_probe(void); | 101 | extern int pci_direct_probe(void); |
| 102 | extern void pci_direct_init(int type); | 102 | extern void pci_direct_init(int type); |
| 103 | extern void pci_pcbios_init(void); | 103 | extern void pci_pcbios_init(void); |
| 104 | extern void pci_olpc_init(void); | 104 | extern int pci_olpc_init(void); |
| 105 | 105 | ||
| 106 | /* pci-mmconfig.c */ | 106 | /* pci-mmconfig.c */ |
| 107 | 107 | ||
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/xen/mmu.c b/arch/x86/xen/mmu.c index 126766d43aea..3525ef523a74 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -60,7 +60,7 @@ xmaddr_t arbitrary_virt_to_machine(unsigned long address) | |||
| 60 | { | 60 | { |
| 61 | unsigned int level; | 61 | unsigned int level; |
| 62 | pte_t *pte = lookup_address(address, &level); | 62 | pte_t *pte = lookup_address(address, &level); |
| 63 | unsigned offset = address & PAGE_MASK; | 63 | unsigned offset = address & ~PAGE_MASK; |
| 64 | 64 | ||
| 65 | BUG_ON(pte == NULL); | 65 | BUG_ON(pte == NULL); |
| 66 | 66 | ||
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index c39e1a5aa241..52b2e3856980 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c | |||
| @@ -12,6 +12,7 @@ | |||
| 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 | ||
| 16 | #include <asm/xen/hypervisor.h> | 17 | #include <asm/xen/hypervisor.h> |
| 17 | #include <asm/xen/hypercall.h> | 18 | #include <asm/xen/hypercall.h> |
| @@ -150,11 +151,7 @@ static void do_stolen_accounting(void) | |||
| 150 | if (stolen < 0) | 151 | if (stolen < 0) |
| 151 | stolen = 0; | 152 | stolen = 0; |
| 152 | 153 | ||
| 153 | ticks = 0; | 154 | 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; | 155 | __get_cpu_var(residual_stolen) = stolen; |
| 159 | account_steal_time(NULL, ticks); | 156 | account_steal_time(NULL, ticks); |
| 160 | 157 | ||
| @@ -166,11 +163,7 @@ static void do_stolen_accounting(void) | |||
| 166 | if (blocked < 0) | 163 | if (blocked < 0) |
| 167 | blocked = 0; | 164 | blocked = 0; |
| 168 | 165 | ||
| 169 | ticks = 0; | 166 | 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; | 167 | __get_cpu_var(residual_blocked) = blocked; |
| 175 | account_steal_time(idle_task(smp_processor_id()), ticks); | 168 | account_steal_time(idle_task(smp_processor_id()), ticks); |
| 176 | } | 169 | } |
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c index 021b4f46ff94..3df469dbe814 100644 --- a/arch/xtensa/kernel/init_task.c +++ b/arch/xtensa/kernel/init_task.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
| 23 | 23 | ||
| 24 | static struct fs_struct init_fs = INIT_FS; | 24 | static struct fs_struct init_fs = INIT_FS; |
| 25 | static struct files_struct init_files = INIT_FILES; | ||
| 26 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 25 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 27 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 26 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 28 | struct mm_struct init_mm = INIT_MM(init_mm); | 27 | struct mm_struct init_mm = INIT_MM(init_mm); |