aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/Kconfig1
-rw-r--r--arch/alpha/include/asm/ftrace.h1
-rw-r--r--arch/alpha/include/asm/hardirq.h13
-rw-r--r--arch/arm/boot/compressed/misc.c5
-rw-r--r--arch/avr32/Kconfig14
-rw-r--r--arch/avr32/Makefile1
-rw-r--r--arch/avr32/boards/atngw100/evklcd10x.c50
-rw-r--r--arch/avr32/boards/atngw100/setup.c7
-rw-r--r--arch/avr32/boards/atstk1000/atstk1002.c6
-rw-r--r--arch/avr32/boards/atstk1000/atstk1003.c6
-rw-r--r--arch/avr32/boards/atstk1000/atstk1004.c6
-rw-r--r--arch/avr32/boards/favr-32/setup.c9
-rw-r--r--arch/avr32/boards/hammerhead/setup.c6
-rw-r--r--arch/avr32/boards/merisc/Kconfig5
-rw-r--r--arch/avr32/boards/merisc/Makefile1
-rw-r--r--arch/avr32/boards/merisc/display.c65
-rw-r--r--arch/avr32/boards/merisc/flash.c139
-rw-r--r--arch/avr32/boards/merisc/merisc.h18
-rw-r--r--arch/avr32/boards/merisc/merisc_sysfs.c65
-rw-r--r--arch/avr32/boards/merisc/setup.c297
-rw-r--r--arch/avr32/boards/mimc200/setup.c8
-rw-r--r--arch/avr32/configs/merisc_defconfig1237
-rw-r--r--arch/avr32/include/asm/ftrace.h1
-rw-r--r--arch/avr32/include/asm/hardirq.h11
-rw-r--r--arch/avr32/mach-at32ap/at32ap700x.c112
-rw-r--r--arch/avr32/mach-at32ap/include/mach/at32ap700x.h52
-rw-r--r--arch/avr32/mach-at32ap/include/mach/board.h24
-rw-r--r--arch/blackfin/include/asm/ftrace.h1
-rw-r--r--arch/cris/include/asm/ftrace.h1
-rw-r--r--arch/h8300/include/asm/ftrace.h1
-rw-r--r--arch/ia64/Kconfig3
-rw-r--r--arch/ia64/include/asm/ftrace.h28
-rw-r--r--arch/ia64/include/asm/hardirq.h10
-rw-r--r--arch/ia64/kernel/Makefile5
-rw-r--r--arch/ia64/kernel/entry.S100
-rw-r--r--arch/ia64/kernel/ftrace.c206
-rw-r--r--arch/ia64/kernel/ia64_ksyms.c6
-rw-r--r--arch/m68k/include/asm/ftrace.h1
-rw-r--r--arch/mips/include/asm/ftrace.h1
-rw-r--r--arch/powerpc/include/asm/mmzone.h1
-rw-r--r--arch/powerpc/kernel/ftrace.c6
-rw-r--r--arch/sh/Kconfig6
-rw-r--r--arch/sh/boards/board-ap325rxa.c57
-rw-r--r--arch/sh/boards/board-urquell.c4
-rw-r--r--arch/sh/boards/mach-migor/setup.c4
-rw-r--r--arch/sh/configs/ap325rxa_defconfig70
-rw-r--r--arch/sh/configs/cayman_defconfig235
-rw-r--r--arch/sh/configs/dreamcast_defconfig71
-rw-r--r--arch/sh/configs/edosk7705_defconfig29
-rw-r--r--arch/sh/configs/edosk7760_defconfig78
-rw-r--r--arch/sh/configs/espt_defconfig39
-rw-r--r--arch/sh/configs/hp6xx_defconfig54
-rw-r--r--arch/sh/configs/landisk_defconfig97
-rw-r--r--arch/sh/configs/lboxre2_defconfig69
-rw-r--r--arch/sh/configs/magicpanelr2_defconfig73
-rw-r--r--arch/sh/configs/microdev_defconfig74
-rw-r--r--arch/sh/configs/migor_defconfig82
-rw-r--r--arch/sh/configs/polaris_defconfig31
-rw-r--r--arch/sh/configs/r7780mp_defconfig91
-rw-r--r--arch/sh/configs/r7785rp_defconfig96
-rw-r--r--arch/sh/configs/rsk7201_defconfig57
-rw-r--r--arch/sh/configs/rsk7203_defconfig94
-rw-r--r--arch/sh/configs/rts7751r2d1_defconfig83
-rw-r--r--arch/sh/configs/rts7751r2dplus_defconfig83
-rw-r--r--arch/sh/configs/sdk7780_defconfig78
-rw-r--r--arch/sh/configs/se7206_defconfig82
-rw-r--r--arch/sh/configs/se7343_defconfig89
-rw-r--r--arch/sh/configs/se7619_defconfig55
-rw-r--r--arch/sh/configs/se7705_defconfig75
-rw-r--r--arch/sh/configs/se7712_defconfig79
-rw-r--r--arch/sh/configs/se7721_defconfig82
-rw-r--r--arch/sh/configs/se7722_defconfig76
-rw-r--r--arch/sh/configs/se7750_defconfig71
-rw-r--r--arch/sh/configs/se7751_defconfig74
-rw-r--r--arch/sh/configs/se7780_defconfig78
-rw-r--r--arch/sh/configs/sh03_defconfig79
-rw-r--r--arch/sh/configs/sh7710voipgw_defconfig69
-rw-r--r--arch/sh/configs/sh7763rdp_defconfig82
-rw-r--r--arch/sh/configs/sh7785lcr_32bit_defconfig42
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig90
-rw-r--r--arch/sh/configs/shmin_defconfig73
-rw-r--r--arch/sh/configs/shx3_defconfig99
-rw-r--r--arch/sh/configs/snapgear_defconfig62
-rw-r--r--arch/sh/configs/systemh_defconfig54
-rw-r--r--arch/sh/configs/titan_defconfig101
-rw-r--r--arch/sh/configs/ul2_defconfig93
-rw-r--r--arch/sh/configs/urquell_defconfig45
-rw-r--r--arch/sh/drivers/dma/Kconfig20
-rw-r--r--arch/sh/drivers/pci/ops-sh7785lcr.c9
-rw-r--r--arch/sh/drivers/pci/pci-sh7780.c16
-rw-r--r--arch/sh/include/asm/mmu.h35
-rw-r--r--arch/sh/include/asm/processor_32.h13
-rw-r--r--arch/sh/include/asm/ptrace.h8
-rw-r--r--arch/sh/include/asm/system.h1
-rw-r--r--arch/sh/include/asm/system_32.h170
-rw-r--r--arch/sh/include/cpu-sh4/cpu/sh7786.h214
-rw-r--r--arch/sh/kernel/cpu/sh3/entry.S85
-rw-r--r--arch/sh/kernel/cpu/sh4/probe.c5
-rw-r--r--arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c185
-rw-r--r--arch/sh/kernel/idle.c2
-rw-r--r--arch/sh/kernel/io_trapped.c13
-rw-r--r--arch/sh/kernel/process_32.c14
-rw-r--r--arch/sh/kernel/ptrace_32.c6
-rw-r--r--arch/sh/kernel/setup.c5
-rw-r--r--arch/sh/kernel/traps_32.c2
-rw-r--r--arch/sh/mm/Kconfig12
-rw-r--r--arch/sparc/include/asm/mmzone.h2
-rw-r--r--arch/um/include/asm/ftrace.h1
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--arch/x86/include/asm/cacheflush.h5
-rw-r--r--arch/x86/include/asm/cpumask.h18
-rw-r--r--arch/x86/include/asm/fixmap.h2
-rw-r--r--arch/x86/include/asm/ftrace.h7
-rw-r--r--arch/x86/include/asm/pci.h5
-rw-r--r--arch/x86/include/asm/processor.h3
-rw-r--r--arch/x86/include/asm/ptrace-abi.h3
-rw-r--r--arch/x86/include/asm/smp.h13
-rw-r--r--arch/x86/include/asm/thread_info.h9
-rw-r--r--arch/x86/include/asm/topology.h87
-rw-r--r--arch/x86/kernel/Makefile3
-rw-r--r--arch/x86/kernel/alternative.c29
-rw-r--r--arch/x86/kernel/apic/bigsmp_32.c16
-rw-r--r--arch/x86/kernel/apic/es7000_32.c17
-rw-r--r--arch/x86/kernel/apic/nmi.c11
-rw-r--r--arch/x86/kernel/apic/numaq_32.c11
-rw-r--r--arch/x86/kernel/apic/probe_32.c3
-rw-r--r--arch/x86/kernel/apic/summit_32.c21
-rw-r--r--arch/x86/kernel/apm_32.c248
-rw-r--r--arch/x86/kernel/cpu/common.c13
-rw-r--r--arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c4
-rw-r--r--arch/x86/kernel/cpu/cpufreq/p4-clockmod.c2
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k8.c13
-rw-r--r--arch/x86/kernel/cpu/cpufreq/speedstep-ich.c2
-rw-r--r--arch/x86/kernel/cpu/intel_cacheinfo.c24
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_64.c10
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_amd_64.c6
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_intel_64.c2
-rw-r--r--arch/x86/kernel/cpu/proc.c6
-rw-r--r--arch/x86/kernel/dumpstack.c6
-rw-r--r--arch/x86/kernel/ftrace.c192
-rw-r--r--arch/x86/kernel/kprobes.c17
-rw-r--r--arch/x86/kernel/microcode_amd.c43
-rw-r--r--arch/x86/kernel/microcode_core.c160
-rw-r--r--arch/x86/kernel/microcode_intel.c83
-rw-r--r--arch/x86/kernel/process.c25
-rw-r--r--arch/x86/kernel/ptrace.c7
-rw-r--r--arch/x86/kernel/smpboot.c70
-rw-r--r--arch/x86/kernel/tlb_uv.c9
-rw-r--r--arch/x86/kvm/Kconfig3
-rw-r--r--arch/x86/mm/Makefile2
-rw-r--r--arch/x86/mm/init_32.c35
-rw-r--r--arch/x86/mm/init_64.c37
-rw-r--r--arch/x86/mm/mmio-mod.c19
-rw-r--r--arch/x86/mm/numa.c67
-rw-r--r--arch/x86/mm/numa_64.c111
-rw-r--r--arch/x86/oprofile/op_model_p4.c2
-rw-r--r--arch/x86/xen/smp.c6
-rw-r--r--arch/xtensa/include/asm/ftrace.h1
158 files changed, 5837 insertions, 2306 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 830c16a2b801..dc81b34c5d82 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -6,6 +6,7 @@ config OPROFILE
6 tristate "OProfile system profiling (EXPERIMENTAL)" 6 tristate "OProfile system profiling (EXPERIMENTAL)"
7 depends on PROFILING 7 depends on PROFILING
8 depends on HAVE_OPROFILE 8 depends on HAVE_OPROFILE
9 depends on TRACING_SUPPORT
9 select TRACING 10 select TRACING
10 select RING_BUFFER 11 select RING_BUFFER
11 help 12 help
diff --git a/arch/alpha/include/asm/ftrace.h b/arch/alpha/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/alpha/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/alpha/include/asm/hardirq.h b/arch/alpha/include/asm/hardirq.h
index d953e234daa8..88971460fa6c 100644
--- a/arch/alpha/include/asm/hardirq.h
+++ b/arch/alpha/include/asm/hardirq.h
@@ -14,17 +14,4 @@ typedef struct {
14 14
15void ack_bad_irq(unsigned int irq); 15void ack_bad_irq(unsigned int irq);
16 16
17#define HARDIRQ_BITS 12
18
19/*
20 * The hardirq mask has to be large enough to have
21 * space for potentially nestable IRQ sources in the system
22 * to nest on a single CPU. On Alpha, interrupts are masked at the CPU
23 * by IPL as well as at the system level. We only have 8 IPLs (UNIX PALcode)
24 * so we really only have 8 nestable IRQs, but allow some overhead
25 */
26#if (1 << HARDIRQ_BITS) < 16
27#error HARDIRQ_BITS is too low!
28#endif
29
30#endif /* _ALPHA_HARDIRQ_H */ 17#endif /* _ALPHA_HARDIRQ_H */
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 393c81641314..9e6e512f0117 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -18,7 +18,10 @@
18 18
19unsigned int __machine_arch_type; 19unsigned int __machine_arch_type;
20 20
21#include <linux/string.h> 21#include <linux/compiler.h> /* for inline */
22#include <linux/types.h> /* for size_t */
23#include <linux/stddef.h> /* for NULL */
24#include <asm/string.h>
22 25
23#ifdef STANDALONE_DEBUG 26#ifdef STANDALONE_DEBUG
24#define putstr printf 27#define putstr printf
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 414a8ad97f52..35e3bd9858df 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -144,6 +144,19 @@ config BOARD_FAVR_32
144 bool "Favr-32 LCD-board" 144 bool "Favr-32 LCD-board"
145 select CPU_AT32AP7000 145 select CPU_AT32AP7000
146 146
147config BOARD_MERISC
148 bool "Merisc board"
149 select CPU_AT32AP7000
150 help
151 Merisc is the family name for a range of AVR32-based boards.
152
153 The boards are designed to be used in a man-machine
154 interfacing environment, utilizing a touch-based graphical
155 user interface. They host a vast range of I/O peripherals as
156 well as a large SDRAM & Flash memory bank.
157
158 For more information see: http://www.martinsson.se/merisc
159
147config BOARD_MIMC200 160config BOARD_MIMC200
148 bool "MIMC200 CPU board" 161 bool "MIMC200 CPU board"
149 select CPU_AT32AP7000 162 select CPU_AT32AP7000
@@ -153,6 +166,7 @@ source "arch/avr32/boards/atstk1000/Kconfig"
153source "arch/avr32/boards/atngw100/Kconfig" 166source "arch/avr32/boards/atngw100/Kconfig"
154source "arch/avr32/boards/hammerhead/Kconfig" 167source "arch/avr32/boards/hammerhead/Kconfig"
155source "arch/avr32/boards/favr-32/Kconfig" 168source "arch/avr32/boards/favr-32/Kconfig"
169source "arch/avr32/boards/merisc/Kconfig"
156 170
157choice 171choice
158 prompt "Boot loader type" 172 prompt "Boot loader type"
diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile
index f3ef3bbf797c..0b97e14f73f6 100644
--- a/arch/avr32/Makefile
+++ b/arch/avr32/Makefile
@@ -35,6 +35,7 @@ core-$(CONFIG_BOARD_ATSTK1000) += arch/avr32/boards/atstk1000/
35core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/ 35core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/
36core-$(CONFIG_BOARD_HAMMERHEAD) += arch/avr32/boards/hammerhead/ 36core-$(CONFIG_BOARD_HAMMERHEAD) += arch/avr32/boards/hammerhead/
37core-$(CONFIG_BOARD_FAVR_32) += arch/avr32/boards/favr-32/ 37core-$(CONFIG_BOARD_FAVR_32) += arch/avr32/boards/favr-32/
38core-$(CONFIG_BOARD_MERISC) += arch/avr32/boards/merisc/
38core-$(CONFIG_BOARD_MIMC200) += arch/avr32/boards/mimc200/ 39core-$(CONFIG_BOARD_MIMC200) += arch/avr32/boards/mimc200/
39core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/ 40core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/
40core-y += arch/avr32/kernel/ 41core-y += arch/avr32/kernel/
diff --git a/arch/avr32/boards/atngw100/evklcd10x.c b/arch/avr32/boards/atngw100/evklcd10x.c
index 8140b22b3461..00337112c5ac 100644
--- a/arch/avr32/boards/atngw100/evklcd10x.c
+++ b/arch/avr32/boards/atngw100/evklcd10x.c
@@ -11,6 +11,7 @@
11 11
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/linkage.h> 13#include <linux/linkage.h>
14#include <linux/gpio.h>
14#include <linux/fb.h> 15#include <linux/fb.h>
15#include <linux/platform_device.h> 16#include <linux/platform_device.h>
16 17
@@ -19,26 +20,26 @@
19#include <asm/setup.h> 20#include <asm/setup.h>
20 21
21#include <mach/at32ap700x.h> 22#include <mach/at32ap700x.h>
23#include <mach/portmux.h>
22#include <mach/board.h> 24#include <mach/board.h>
23 25
26#include <sound/atmel-ac97c.h>
27
24static struct ac97c_platform_data __initdata ac97c0_data = { 28static struct ac97c_platform_data __initdata ac97c0_data = {
25 .dma_rx_periph_id = 3, 29 .reset_pin = GPIO_PIN_PB(19),
26 .dma_tx_periph_id = 4,
27 .dma_controller_id = 0,
28 .reset_pin = GPIO_PIN_PB(19),
29}; 30};
30 31
31#ifdef CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA 32#ifdef CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA
32static struct fb_videomode __initdata tcg057vglad_modes[] = { 33static struct fb_videomode __initdata tcg057vglad_modes[] = {
33 { 34 {
34 .name = "640x480 @ 60", 35 .name = "640x480 @ 50",
35 .refresh = 60, 36 .refresh = 50,
36 .xres = 640, .yres = 480, 37 .xres = 640, .yres = 480,
37 .pixclock = KHZ2PICOS(25180), 38 .pixclock = KHZ2PICOS(25180),
38 39
39 .left_margin = 64, .right_margin = 31, 40 .left_margin = 64, .right_margin = 96,
40 .upper_margin = 34, .lower_margin = 2, 41 .upper_margin = 34, .lower_margin = 11,
41 .hsync_len = 96, .vsync_len = 4, 42 .hsync_len = 64, .vsync_len = 15,
42 43
43 .sync = 0, 44 .sync = 0,
44 .vmode = FB_VMODE_NONINTERLACED, 45 .vmode = FB_VMODE_NONINTERLACED,
@@ -69,14 +70,14 @@ static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
69#elif CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA 70#elif CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA
70static struct fb_videomode __initdata tcg057qvlad_modes[] = { 71static struct fb_videomode __initdata tcg057qvlad_modes[] = {
71 { 72 {
72 .name = "320x240 @ 60", 73 .name = "320x240 @ 50",
73 .refresh = 60, 74 .refresh = 50,
74 .xres = 320, .yres = 240, 75 .xres = 320, .yres = 240,
75 .pixclock = KHZ2PICOS(6300), 76 .pixclock = KHZ2PICOS(6300),
76 77
77 .left_margin = 52, .right_margin = 28, 78 .left_margin = 34, .right_margin = 46,
78 .upper_margin = 7, .lower_margin = 2, 79 .upper_margin = 7, .lower_margin = 15,
79 .hsync_len = 96, .vsync_len = 4, 80 .hsync_len = 64, .vsync_len = 12,
80 81
81 .sync = 0, 82 .sync = 0,
82 .vmode = FB_VMODE_NONINTERLACED, 83 .vmode = FB_VMODE_NONINTERLACED,
@@ -144,12 +145,29 @@ static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
144}; 145};
145#endif 146#endif
146 147
148static void atevklcd10x_lcdc_power_control(int on)
149{
150 gpio_set_value(GPIO_PIN_PB(15), on);
151}
152
147static int __init atevklcd10x_init(void) 153static int __init atevklcd10x_init(void)
148{ 154{
149 at32_add_device_ac97c(0, &ac97c0_data); 155 /* PB15 is connected to the enable line on the boost regulator
156 * controlling the backlight for the LCD panel.
157 */
158 at32_select_gpio(GPIO_PIN_PB(15), AT32_GPIOF_OUTPUT);
159 gpio_request(GPIO_PIN_PB(15), "backlight");
160 gpio_direction_output(GPIO_PIN_PB(15), 0);
161
162 atevklcd10x_lcdc_data.atmel_lcdfb_power_control =
163 atevklcd10x_lcdc_power_control;
150 164
151 at32_add_device_lcdc(0, &atevklcd10x_lcdc_data, 165 at32_add_device_lcdc(0, &atevklcd10x_lcdc_data,
152 fbmem_start, fbmem_size, 1); 166 fbmem_start, fbmem_size,
167 ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL);
168
169 at32_add_device_ac97c(0, &ac97c0_data, AC97C_BOTH);
170
153 return 0; 171 return 0;
154} 172}
155postcore_initcall(atevklcd10x_init); 173postcore_initcall(atevklcd10x_init);
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 05d3722fff18..5b022aad4bd9 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -56,13 +56,8 @@ static struct spi_board_info spi0_board_info[] __initdata = {
56static struct mci_platform_data __initdata mci0_data = { 56static struct mci_platform_data __initdata mci0_data = {
57 .slot[0] = { 57 .slot[0] = {
58 .bus_width = 4, 58 .bus_width = 4,
59#ifndef CONFIG_BOARD_ATNGW100_EVKLCD10X
60 .detect_pin = GPIO_PIN_PC(25), 59 .detect_pin = GPIO_PIN_PC(25),
61 .wp_pin = GPIO_PIN_PE(0), 60 .wp_pin = GPIO_PIN_PE(0),
62#else
63 .detect_pin = GPIO_PIN_NONE,
64 .wp_pin = GPIO_PIN_NONE,
65#endif
66 }, 61 },
67}; 62};
68 63
@@ -123,7 +118,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
123 118
124void __init setup_board(void) 119void __init setup_board(void)
125{ 120{
126 at32_map_usart(1, 0); /* USART 1: /dev/ttyS0, DB9 */ 121 at32_map_usart(1, 0, 0); /* USART 1: /dev/ttyS0, DB9 */
127 at32_setup_serial_console(0); 122 at32_setup_serial_console(0);
128} 123}
129 124
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 1f33a106905c..2adc261c9e3d 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -252,12 +252,12 @@ static void __init atstk1002_setup_extdac(void)
252void __init setup_board(void) 252void __init setup_board(void)
253{ 253{
254#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM 254#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
255 at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ 255 at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */
256#else 256#else
257 at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ 257 at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */
258#endif 258#endif
259 /* USART 2/unused: expansion connector */ 259 /* USART 2/unused: expansion connector */
260 at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */ 260 at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */
261 261
262 at32_setup_serial_console(0); 262 at32_setup_serial_console(0);
263} 263}
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index b3a23c88bcfe..ff7e23298827 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -115,12 +115,12 @@ static void __init atstk1003_setup_extdac(void)
115void __init setup_board(void) 115void __init setup_board(void)
116{ 116{
117#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM 117#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
118 at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ 118 at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */
119#else 119#else
120 at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ 120 at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */
121#endif 121#endif
122 /* USART 2/unused: expansion connector */ 122 /* USART 2/unused: expansion connector */
123 at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */ 123 at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */
124 124
125 at32_setup_serial_console(0); 125 at32_setup_serial_console(0);
126} 126}
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index 29b35aca96cd..69a9f0f08c6e 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -120,12 +120,12 @@ static void __init atstk1004_setup_extdac(void)
120void __init setup_board(void) 120void __init setup_board(void)
121{ 121{
122#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM 122#ifdef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
123 at32_map_usart(0, 1); /* USART 0/B: /dev/ttyS1, IRDA */ 123 at32_map_usart(0, 1, 0); /* USART 0/B: /dev/ttyS1, IRDA */
124#else 124#else
125 at32_map_usart(1, 0); /* USART 1/A: /dev/ttyS0, DB9 */ 125 at32_map_usart(1, 0, 0); /* USART 1/A: /dev/ttyS0, DB9 */
126#endif 126#endif
127 /* USART 2/unused: expansion connector */ 127 /* USART 2/unused: expansion connector */
128 at32_map_usart(3, 2); /* USART 3/C: /dev/ttyS2, DB9 */ 128 at32_map_usart(3, 2, 0); /* USART 3/C: /dev/ttyS2, DB9 */
129 129
130 at32_setup_serial_console(0); 130 at32_setup_serial_console(0);
131} 131}
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index 745c408c2ac5..46c9b0a224cf 100644
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -22,6 +22,8 @@
22#include <linux/spi/spi.h> 22#include <linux/spi/spi.h>
23#include <linux/spi/ads7846.h> 23#include <linux/spi/ads7846.h>
24 24
25#include <sound/atmel-abdac.h>
26
25#include <video/atmel_lcdc.h> 27#include <video/atmel_lcdc.h>
26 28
27#include <asm/setup.h> 29#include <asm/setup.h>
@@ -41,6 +43,9 @@ unsigned long at32_board_osc_rates[3] = {
41/* Initialized by bootloader-specific startup code. */ 43/* Initialized by bootloader-specific startup code. */
42struct tag *bootloader_tags __initdata; 44struct tag *bootloader_tags __initdata;
43 45
46static struct atmel_abdac_pdata __initdata abdac0_data = {
47};
48
44struct eth_addr { 49struct eth_addr {
45 u8 addr[6]; 50 u8 addr[6];
46}; 51};
@@ -245,7 +250,7 @@ static void __init favr32_setup_atmel_pwm_bl(void)
245 250
246void __init setup_board(void) 251void __init setup_board(void)
247{ 252{
248 at32_map_usart(3, 0); /* USART 3 => /dev/ttyS0 */ 253 at32_map_usart(3, 0, 0); /* USART 3 => /dev/ttyS0 */
249 at32_setup_serial_console(0); 254 at32_setup_serial_console(0);
250} 255}
251 256
@@ -326,7 +331,7 @@ static int __init favr32_init(void)
326 331
327 spi1_board_info[0].irq = gpio_to_irq(GPIO_PIN_PB(3)); 332 spi1_board_info[0].irq = gpio_to_irq(GPIO_PIN_PB(3));
328 333
329 set_abdac_rate(at32_add_device_abdac(0)); 334 set_abdac_rate(at32_add_device_abdac(0, &abdac0_data));
330 335
331 at32_add_device_pwm(1 << atmel_pwm_bl_pdata.pwm_channel); 336 at32_add_device_pwm(1 << atmel_pwm_bl_pdata.pwm_channel);
332 at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); 337 at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c
index 4d2fe82b2029..dd009875a405 100644
--- a/arch/avr32/boards/hammerhead/setup.c
+++ b/arch/avr32/boards/hammerhead/setup.c
@@ -29,6 +29,8 @@
29#include <mach/init.h> 29#include <mach/init.h>
30#include <mach/portmux.h> 30#include <mach/portmux.h>
31 31
32#include <sound/atmel-ac97c.h>
33
32#include "../../mach-at32ap/clock.h" 34#include "../../mach-at32ap/clock.h"
33#include "flash.h" 35#include "flash.h"
34 36
@@ -163,7 +165,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
163 165
164void __init setup_board(void) 166void __init setup_board(void)
165{ 167{
166 at32_map_usart(1, 0); /* USART 1: /dev/ttyS0, DB9 */ 168 at32_map_usart(1, 0, 0); /* USART 1: /dev/ttyS0, DB9 */
167 at32_setup_serial_console(0); 169 at32_setup_serial_console(0);
168} 170}
169 171
@@ -233,7 +235,7 @@ static int __init hammerhead_init(void)
233 i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info)); 235 i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
234 236
235#ifdef CONFIG_BOARD_HAMMERHEAD_SND 237#ifdef CONFIG_BOARD_HAMMERHEAD_SND
236 at32_add_device_ac97c(0, &ac97c_data); 238 at32_add_device_ac97c(0, &ac97c_data, AC97C_BOTH);
237#endif 239#endif
238 240
239 /* Select the Touchscreen interrupt pin mode */ 241 /* Select the Touchscreen interrupt pin mode */
diff --git a/arch/avr32/boards/merisc/Kconfig b/arch/avr32/boards/merisc/Kconfig
new file mode 100644
index 000000000000..7e043275d5a9
--- /dev/null
+++ b/arch/avr32/boards/merisc/Kconfig
@@ -0,0 +1,5 @@
1# Merisc customization
2
3if BOARD_MERISC
4
5endif # BOARD_MERISC
diff --git a/arch/avr32/boards/merisc/Makefile b/arch/avr32/boards/merisc/Makefile
new file mode 100644
index 000000000000..d24c78729bd1
--- /dev/null
+++ b/arch/avr32/boards/merisc/Makefile
@@ -0,0 +1 @@
obj-y += setup.o flash.o display.o merisc_sysfs.o
diff --git a/arch/avr32/boards/merisc/display.c b/arch/avr32/boards/merisc/display.c
new file mode 100644
index 000000000000..85a543cd4abc
--- /dev/null
+++ b/arch/avr32/boards/merisc/display.c
@@ -0,0 +1,65 @@
1/*
2 * Display setup code for the Merisc board
3 *
4 * Copyright (C) 2008 Martinsson Elektronik AB
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10#include <linux/init.h>
11#include <linux/platform_device.h>
12#include <linux/fb.h>
13#include <video/atmel_lcdc.h>
14#include <asm/setup.h>
15#include <mach/board.h>
16#include "merisc.h"
17
18static struct fb_videomode merisc_fb_videomode[] = {
19 {
20 .refresh = 44,
21 .xres = 640,
22 .yres = 480,
23 .left_margin = 96,
24 .right_margin = 96,
25 .upper_margin = 34,
26 .lower_margin = 8,
27 .hsync_len = 64,
28 .vsync_len = 64,
29 .name = "640x480 @ 44",
30 .pixclock = KHZ2PICOS(25180),
31 .sync = 0,
32 .vmode = FB_VMODE_NONINTERLACED,
33 },
34};
35
36static struct fb_monspecs merisc_fb_monspecs = {
37 .manufacturer = "Kyo",
38 .monitor = "TCG075VG2AD",
39 .modedb = merisc_fb_videomode,
40 .modedb_len = ARRAY_SIZE(merisc_fb_videomode),
41 .hfmin = 30000,
42 .hfmax = 33333,
43 .vfmin = 60,
44 .vfmax = 90,
45 .dclkmax = 30000000,
46};
47
48struct atmel_lcdfb_info merisc_lcdc_data = {
49 .default_bpp = 24,
50 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
51 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
52 | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
53 | ATMEL_LCDC_MEMOR_BIG),
54 .default_monspecs = &merisc_fb_monspecs,
55 .guard_time = 2,
56};
57
58static int __init merisc_display_init(void)
59{
60 at32_add_device_lcdc(0, &merisc_lcdc_data, fbmem_start,
61 fbmem_size, 0);
62
63 return 0;
64}
65device_initcall(merisc_display_init);
diff --git a/arch/avr32/boards/merisc/flash.c b/arch/avr32/boards/merisc/flash.c
new file mode 100644
index 000000000000..8e856fd6f013
--- /dev/null
+++ b/arch/avr32/boards/merisc/flash.c
@@ -0,0 +1,139 @@
1/*
2 * Merisc board-specific flash initialization
3 *
4 * Copyright (C) 2008 Martinsson Elektronik AB
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10#include <linux/init.h>
11#include <linux/platform_device.h>
12#include <linux/mtd/mtd.h>
13#include <linux/mtd/partitions.h>
14#include <linux/mtd/physmap.h>
15#include <mach/smc.h>
16
17/* Will be translated to units of 14.3 ns, rounded up */
18static struct smc_timing flash_timing __initdata = {
19 .ncs_read_setup = 1 * 14,
20 .nrd_setup = 5 * 14,
21 .ncs_write_setup = 1 * 14,
22 .nwe_setup = 2 * 14,
23
24 .ncs_read_pulse = 12 * 14,
25 .nrd_pulse = 7 * 14,
26 .ncs_write_pulse = 8 * 14,
27 .nwe_pulse = 4 * 14,
28
29 .read_cycle = 14 * 14,
30 .write_cycle = 10 * 14,
31};
32
33static struct smc_config flash_config __initdata = {
34 .bus_width = 2,
35 .nrd_controlled = 1,
36 .nwe_controlled = 1,
37 .byte_write = 1,
38 .tdf_cycles = 3,
39};
40
41static struct mtd_partition flash_0_parts[] = {
42 {
43 .name = "boot",
44 .offset = 0x00000000,
45 .size = 0x00060000,
46 .mask_flags = 0,
47 },
48 {
49 .name = "kernel",
50 .offset = 0x00060000,
51 .size = 0x00200000,
52 .mask_flags = 0,
53 },
54 {
55 .name = "root",
56 .offset = 0x00260000,
57 .size = MTDPART_SIZ_FULL,
58 .mask_flags = 0,
59 },
60};
61
62static struct mtd_partition flash_1_parts[] = {
63 {
64 .name = "2ndflash",
65 .offset = 0x00000000,
66 .size = MTDPART_SIZ_FULL,
67 .mask_flags = 0,
68 },
69};
70
71static struct physmap_flash_data flash_data[] = {
72 {
73 .width = 2,
74 .nr_parts = ARRAY_SIZE(flash_0_parts),
75 .parts = flash_0_parts,
76 },
77 {
78 .width = 2,
79 .nr_parts = ARRAY_SIZE(flash_1_parts),
80 .parts = flash_1_parts,
81 }
82};
83
84static struct resource flash_resource[] = {
85 {
86 .start = 0x00000000,
87 .end = 0x03ffffff,
88 .flags = IORESOURCE_MEM,
89 },
90 {
91 .start = 0x04000000,
92 .end = 0x07ffffff,
93 .flags = IORESOURCE_MEM,
94 },
95};
96
97static struct platform_device flash_device[] = {
98 {
99 .name = "physmap-flash",
100 .id = 0,
101 .resource = &flash_resource[0],
102 .num_resources = 1,
103 .dev = {
104 .platform_data = &flash_data[0],
105 },
106 },
107 {
108 .name = "physmap-flash",
109 .id = 1,
110 .resource = &flash_resource[1],
111 .num_resources = 1,
112 .dev = {
113 .platform_data = &flash_data[1],
114 },
115 },
116};
117
118static int __init merisc_flash_init(void)
119{
120 int ret;
121 smc_set_timing(&flash_config, &flash_timing);
122
123 ret = smc_set_configuration(0, &flash_config);
124 if (ret < 0) {
125 printk(KERN_ERR "Merisc: failed to set NOR flash timing #0\n");
126 return ret;
127 }
128
129 ret = smc_set_configuration(4, &flash_config);
130 if (ret < 0) {
131 printk(KERN_ERR "Merisc: failed to set NOR flash timing #1\n");
132 return ret;
133 }
134
135 platform_device_register(&flash_device[0]);
136 platform_device_register(&flash_device[1]);
137 return 0;
138}
139device_initcall(merisc_flash_init);
diff --git a/arch/avr32/boards/merisc/merisc.h b/arch/avr32/boards/merisc/merisc.h
new file mode 100644
index 000000000000..50ffb2f3fcbf
--- /dev/null
+++ b/arch/avr32/boards/merisc/merisc.h
@@ -0,0 +1,18 @@
1/*
2 * Merisc exports
3 *
4 * Copyright (C) 2008 Martinsson Elektronik AB
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10#ifndef __ARCH_AVR32_BOARDS_MERISC_MERISC_H
11#define __ARCH_AVR32_BOARDS_MERISC_MERISC_H
12
13const char *merisc_revision(void);
14const char *merisc_model(void);
15
16extern struct class merisc_class;
17
18#endif /* __ARCH_AVR32_BOARDS_MERISC_MERISC_H */
diff --git a/arch/avr32/boards/merisc/merisc_sysfs.c b/arch/avr32/boards/merisc/merisc_sysfs.c
new file mode 100644
index 000000000000..df431fdba9ad
--- /dev/null
+++ b/arch/avr32/boards/merisc/merisc_sysfs.c
@@ -0,0 +1,65 @@
1/*
2 * Merisc sysfs exports
3 *
4 * Copyright (C) 2008 Martinsson Elektronik AB
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10#include <linux/module.h>
11#include <linux/kernel.h>
12#include <linux/init.h>
13#include <linux/list.h>
14#include <linux/spinlock.h>
15#include <linux/device.h>
16#include <linux/sysdev.h>
17#include <linux/timer.h>
18#include <linux/err.h>
19#include <linux/ctype.h>
20#include "merisc.h"
21
22static ssize_t merisc_model_show(struct class *class, char *buf)
23{
24 ssize_t ret = 0;
25
26 sprintf(buf, "%s\n", merisc_model());
27 ret = strlen(buf) + 1;
28
29 return ret;
30}
31
32static ssize_t merisc_revision_show(struct class *class, char *buf)
33{
34 ssize_t ret = 0;
35
36 sprintf(buf, "%s\n", merisc_revision());
37 ret = strlen(buf) + 1;
38
39 return ret;
40}
41
42static struct class_attribute merisc_class_attrs[] = {
43 __ATTR(model, S_IRUGO, merisc_model_show, NULL),
44 __ATTR(revision, S_IRUGO, merisc_revision_show, NULL),
45 __ATTR_NULL,
46};
47
48struct class merisc_class = {
49 .name = "merisc",
50 .owner = THIS_MODULE,
51 .class_attrs = merisc_class_attrs,
52};
53
54static int __init merisc_sysfs_init(void)
55{
56 int status;
57
58 status = class_register(&merisc_class);
59 if (status < 0)
60 return status;
61
62 return 0;
63}
64
65postcore_initcall(merisc_sysfs_init);
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
new file mode 100644
index 000000000000..20b300cf105a
--- /dev/null
+++ b/arch/avr32/boards/merisc/setup.c
@@ -0,0 +1,297 @@
1/*
2 * Board-specific setup code for the Merisc
3 *
4 * Copyright (C) 2008 Martinsson Elektronik AB
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10#include <linux/clk.h>
11#include <linux/etherdevice.h>
12#include <linux/i2c.h>
13#include <linux/i2c-gpio.h>
14#include <linux/gpio.h>
15#include <linux/init.h>
16#include <linux/linkage.h>
17#include <linux/platform_device.h>
18#include <linux/types.h>
19#include <linux/leds.h>
20#include <linux/spi/spi.h>
21#include <linux/spi/ads7846.h>
22#include <linux/irq.h>
23#include <linux/fb.h>
24#include <linux/atmel-mci.h>
25
26#include <asm/io.h>
27#include <asm/setup.h>
28#include <asm/gpio.h>
29
30#include <mach/at32ap700x.h>
31#include <mach/board.h>
32#include <mach/init.h>
33#include <mach/portmux.h>
34
35#include "merisc.h"
36
37/* Holds the autodetected board model and revision */
38static int merisc_board_id;
39
40/* Initialized by bootloader-specific startup code. */
41struct tag *bootloader_tags __initdata;
42
43/* Oscillator frequencies. These are board specific */
44unsigned long at32_board_osc_rates[3] = {
45 [0] = 32768, /* 32.768 kHz on RTC osc */
46 [1] = 20000000, /* 20 MHz on osc0 */
47 [2] = 12000000, /* 12 MHz on osc1 */
48};
49
50struct eth_addr {
51 u8 addr[6];
52};
53
54static struct eth_addr __initdata hw_addr[2];
55static struct eth_platform_data __initdata eth_data[2];
56
57static int ads7846_get_pendown_state_PB26(void)
58{
59 return !gpio_get_value(GPIO_PIN_PB(26));
60}
61
62static int ads7846_get_pendown_state_PB28(void)
63{
64 return !gpio_get_value(GPIO_PIN_PB(28));
65}
66
67static struct ads7846_platform_data __initdata ads7846_data = {
68 .model = 7846,
69 .vref_delay_usecs = 100,
70 .vref_mv = 0,
71 .keep_vref_on = 0,
72 .settle_delay_usecs = 150,
73 .penirq_recheck_delay_usecs = 1,
74 .x_plate_ohms = 800,
75 .debounce_rep = 4,
76 .debounce_max = 10,
77 .debounce_tol = 50,
78 .get_pendown_state = ads7846_get_pendown_state_PB26,
79 .filter_init = NULL,
80 .filter = NULL,
81 .filter_cleanup = NULL,
82};
83
84static struct spi_board_info __initdata spi0_board_info[] = {
85 {
86 .modalias = "ads7846",
87 .max_speed_hz = 3250000,
88 .chip_select = 0,
89 .bus_num = 0,
90 .platform_data = &ads7846_data,
91 .mode = SPI_MODE_0,
92 },
93};
94
95static struct mci_platform_data __initdata mci0_data = {
96 .slot[0] = {
97 .bus_width = 4,
98 .detect_pin = GPIO_PIN_PE(19),
99 .wp_pin = GPIO_PIN_PE(20),
100 },
101};
102
103static int __init parse_tag_ethernet(struct tag *tag)
104{
105 int i;
106
107 i = tag->u.ethernet.mac_index;
108 if (i < ARRAY_SIZE(hw_addr)) {
109 memcpy(hw_addr[i].addr, tag->u.ethernet.hw_address,
110 sizeof(hw_addr[i].addr));
111 }
112
113 return 0;
114}
115__tagtable(ATAG_ETHERNET, parse_tag_ethernet);
116
117static void __init set_hw_addr(struct platform_device *pdev)
118{
119 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
120 const u8 *addr;
121 void __iomem *regs;
122 struct clk *pclk;
123
124 if (!res)
125 return;
126
127 if (pdev->id >= ARRAY_SIZE(hw_addr))
128 return;
129
130 addr = hw_addr[pdev->id].addr;
131 if (!is_valid_ether_addr(addr))
132 return;
133
134 regs = (void __iomem __force *)res->start;
135 pclk = clk_get(&pdev->dev, "pclk");
136 if (!pclk)
137 return;
138
139 clk_enable(pclk);
140 __raw_writel((addr[3] << 24) | (addr[2] << 16)
141 | (addr[1] << 8) | addr[0], regs + 0x98);
142 __raw_writel((addr[5] << 8) | addr[4], regs + 0x9c);
143 clk_disable(pclk);
144 clk_put(pclk);
145}
146
147static struct i2c_gpio_platform_data i2c_gpio_data = {
148 .sda_pin = GPIO_PIN_PA(6),
149 .scl_pin = GPIO_PIN_PA(7),
150 .sda_is_open_drain = 1,
151 .scl_is_open_drain = 1,
152 .udelay = 2,
153};
154
155static struct platform_device i2c_gpio_device = {
156 .name = "i2c-gpio",
157 .id = 0,
158 .dev = {
159 .platform_data = &i2c_gpio_data,
160 },
161};
162
163static struct i2c_board_info __initdata i2c_info[] = {
164 {
165 I2C_BOARD_INFO("pcf8563", 0x51)
166 },
167};
168
169#ifdef CONFIG_LEDS_ATMEL_PWM
170static struct gpio_led stk_pwm_led[] = {
171 {
172 .name = "backlight",
173 .gpio = 0, /* PWM channel 0 (LCD backlight) */
174 },
175};
176
177static struct gpio_led_platform_data stk_pwm_led_data = {
178 .num_leds = ARRAY_SIZE(stk_pwm_led),
179 .leds = stk_pwm_led,
180};
181
182static struct platform_device stk_pwm_led_dev = {
183 .name = "leds-atmel-pwm",
184 .id = -1,
185 .dev = {
186 .platform_data = &stk_pwm_led_data,
187 },
188};
189#endif
190
191const char *merisc_model(void)
192{
193 switch (merisc_board_id) {
194 case 0:
195 case 1:
196 return "500-01";
197 case 2:
198 return "BT";
199 default:
200 return "Unknown";
201 }
202}
203
204const char *merisc_revision(void)
205{
206 switch (merisc_board_id) {
207 case 0:
208 return "B";
209 case 1:
210 return "D";
211 case 2:
212 return "A";
213 default:
214 return "Unknown";
215 }
216}
217
218static void detect_merisc_board_id(void)
219{
220 /* Board ID pins MUST be set as input or the board may be damaged */
221 at32_select_gpio(GPIO_PIN_PA(24), AT32_GPIOF_PULLUP);
222 at32_select_gpio(GPIO_PIN_PA(25), AT32_GPIOF_PULLUP);
223 at32_select_gpio(GPIO_PIN_PA(26), AT32_GPIOF_PULLUP);
224 at32_select_gpio(GPIO_PIN_PA(27), AT32_GPIOF_PULLUP);
225
226 merisc_board_id = !gpio_get_value(GPIO_PIN_PA(24)) +
227 !gpio_get_value(GPIO_PIN_PA(25)) * 2 +
228 !gpio_get_value(GPIO_PIN_PA(26)) * 4 +
229 !gpio_get_value(GPIO_PIN_PA(27)) * 8;
230}
231
232void __init setup_board(void)
233{
234 at32_map_usart(0, 0, 0);
235 at32_map_usart(1, 1, 0);
236 at32_map_usart(3, 3, 0);
237 at32_setup_serial_console(1);
238}
239
240static int __init merisc_init(void)
241{
242 detect_merisc_board_id();
243
244 printk(KERN_NOTICE "BOARD: Merisc %s revision %s\n", merisc_model(),
245 merisc_revision());
246
247 /* Reserve pins for SDRAM */
248 at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL | (1 << 26));
249
250 if (merisc_board_id >= 1)
251 at32_map_usart(2, 2, 0);
252
253 at32_add_device_usart(0);
254 at32_add_device_usart(1);
255 if (merisc_board_id >= 1)
256 at32_add_device_usart(2);
257 at32_add_device_usart(3);
258 set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
259
260 /* ADS7846 PENIRQ */
261 if (merisc_board_id == 0) {
262 ads7846_data.get_pendown_state = ads7846_get_pendown_state_PB26;
263 at32_select_periph(GPIO_PIOB_BASE, 1 << 26,
264 GPIO_PERIPH_A, AT32_GPIOF_PULLUP);
265 spi0_board_info[0].irq = AT32_EXTINT(1);
266 } else {
267 ads7846_data.get_pendown_state = ads7846_get_pendown_state_PB28;
268 at32_select_periph(GPIO_PIOB_BASE, 1 << 28, GPIO_PERIPH_A,
269 AT32_GPIOF_PULLUP);
270 spi0_board_info[0].irq = AT32_EXTINT(3);
271 }
272
273 /* ADS7846 busy pin */
274 at32_select_gpio(GPIO_PIN_PA(4), AT32_GPIOF_PULLUP);
275
276 at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
277
278 at32_add_device_mci(0, &mci0_data);
279
280#ifdef CONFIG_LEDS_ATMEL_PWM
281 at32_add_device_pwm((1 << 0) | (1 << 2));
282 platform_device_register(&stk_pwm_led_dev);
283#else
284 at32_add_device_pwm((1 << 2));
285#endif
286
287 at32_select_gpio(i2c_gpio_data.sda_pin,
288 AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
289 at32_select_gpio(i2c_gpio_data.scl_pin,
290 AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
291 platform_device_register(&i2c_gpio_device);
292
293 i2c_register_board_info(0, i2c_info, ARRAY_SIZE(i2c_info));
294
295 return 0;
296}
297postcore_initcall(merisc_init);
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index 2b58d61f0afc..c1b2175b4fea 100644
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -175,10 +175,10 @@ static void __init set_hw_addr(struct platform_device *pdev)
175 175
176void __init setup_board(void) 176void __init setup_board(void)
177{ 177{
178 at32_map_usart(0, 0); /* USART 0: /dev/ttyS0 (TTL --> Altera) */ 178 at32_map_usart(0, 0, 0); /* USART 0: /dev/ttyS0 (TTL --> Altera) */
179 at32_map_usart(1, 1); /* USART 1: /dev/ttyS1 (RS232) */ 179 at32_map_usart(1, 1, 0); /* USART 1: /dev/ttyS1 (RS232) */
180 at32_map_usart(2, 2); /* USART 2: /dev/ttyS2 (RS485) */ 180 at32_map_usart(2, 2, 0); /* USART 2: /dev/ttyS2 (RS485) */
181 at32_map_usart(3, 3); /* USART 3: /dev/ttyS3 (RS422 Multidrop) */ 181 at32_map_usart(3, 3, 0); /* USART 3: /dev/ttyS3 (RS422 Multidrop) */
182} 182}
183 183
184static struct i2c_gpio_platform_data i2c_gpio_data = { 184static struct i2c_gpio_platform_data i2c_gpio_data = {
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig
new file mode 100644
index 000000000000..41554db4877f
--- /dev/null
+++ b/arch/avr32/configs/merisc_defconfig
@@ -0,0 +1,1237 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29-rc1
4# Wed Mar 25 14:06:15 2009
5#
6CONFIG_AVR32=y
7CONFIG_GENERIC_GPIO=y
8CONFIG_GENERIC_HARDIRQS=y
9CONFIG_STACKTRACE_SUPPORT=y
10CONFIG_LOCKDEP_SUPPORT=y
11CONFIG_TRACE_IRQFLAGS_SUPPORT=y
12CONFIG_HARDIRQS_SW_RESEND=y
13CONFIG_GENERIC_IRQ_PROBE=y
14CONFIG_RWSEM_GENERIC_SPINLOCK=y
15CONFIG_GENERIC_TIME=y
16CONFIG_GENERIC_CLOCKEVENTS=y
17# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
18# CONFIG_ARCH_HAS_ILOG2_U32 is not set
19# CONFIG_ARCH_HAS_ILOG2_U64 is not set
20CONFIG_GENERIC_HWEIGHT=y
21CONFIG_GENERIC_CALIBRATE_DELAY=y
22CONFIG_GENERIC_BUG=y
23CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
24
25#
26# General setup
27#
28CONFIG_EXPERIMENTAL=y
29CONFIG_BROKEN_ON_SMP=y
30CONFIG_INIT_ENV_ARG_LIMIT=32
31CONFIG_LOCALVERSION=""
32# CONFIG_LOCALVERSION_AUTO is not set
33CONFIG_SWAP=y
34CONFIG_SYSVIPC=y
35CONFIG_SYSVIPC_SYSCTL=y
36CONFIG_POSIX_MQUEUE=y
37CONFIG_BSD_PROCESS_ACCT=y
38CONFIG_BSD_PROCESS_ACCT_V3=y
39# CONFIG_TASKSTATS is not set
40# CONFIG_AUDIT is not set
41# CONFIG_IKCONFIG is not set
42CONFIG_LOG_BUF_SHIFT=14
43CONFIG_GROUP_SCHED=y
44CONFIG_FAIR_GROUP_SCHED=y
45# CONFIG_RT_GROUP_SCHED is not set
46CONFIG_USER_SCHED=y
47# CONFIG_CGROUP_SCHED is not set
48# CONFIG_CGROUPS is not set
49CONFIG_SYSFS_DEPRECATED=y
50CONFIG_SYSFS_DEPRECATED_V2=y
51# CONFIG_RELAY is not set
52# CONFIG_NAMESPACES is not set
53CONFIG_BLK_DEV_INITRD=y
54CONFIG_INITRAMFS_SOURCE=""
55CONFIG_CC_OPTIMIZE_FOR_SIZE=y
56CONFIG_SYSCTL=y
57CONFIG_EMBEDDED=y
58# CONFIG_SYSCTL_SYSCALL is not set
59CONFIG_KALLSYMS=y
60# CONFIG_KALLSYMS_EXTRA_PASS is not set
61CONFIG_HOTPLUG=y
62CONFIG_PRINTK=y
63CONFIG_BUG=y
64CONFIG_ELF_CORE=y
65CONFIG_COMPAT_BRK=y
66# CONFIG_BASE_FULL is not set
67CONFIG_FUTEX=y
68CONFIG_ANON_INODES=y
69CONFIG_EPOLL=y
70CONFIG_SIGNALFD=y
71CONFIG_TIMERFD=y
72CONFIG_EVENTFD=y
73CONFIG_SHMEM=y
74CONFIG_AIO=y
75CONFIG_VM_EVENT_COUNTERS=y
76CONFIG_SLUB_DEBUG=y
77# CONFIG_SLAB is not set
78CONFIG_SLUB=y
79# CONFIG_SLOB is not set
80# CONFIG_PROFILING is not set
81CONFIG_HAVE_OPROFILE=y
82# CONFIG_KPROBES is not set
83CONFIG_HAVE_KPROBES=y
84CONFIG_HAVE_CLK=y
85# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
86CONFIG_SLABINFO=y
87CONFIG_RT_MUTEXES=y
88CONFIG_BASE_SMALL=1
89CONFIG_MODULES=y
90# CONFIG_MODULE_FORCE_LOAD is not set
91CONFIG_MODULE_UNLOAD=y
92CONFIG_MODULE_FORCE_UNLOAD=y
93# CONFIG_MODVERSIONS is not set
94# CONFIG_MODULE_SRCVERSION_ALL is not set
95CONFIG_BLOCK=y
96# CONFIG_LBD is not set
97# CONFIG_BLK_DEV_IO_TRACE is not set
98# CONFIG_BLK_DEV_BSG is not set
99# CONFIG_BLK_DEV_INTEGRITY is not set
100
101#
102# IO Schedulers
103#
104CONFIG_IOSCHED_NOOP=y
105# CONFIG_IOSCHED_AS is not set
106# CONFIG_IOSCHED_DEADLINE is not set
107CONFIG_IOSCHED_CFQ=y
108# CONFIG_DEFAULT_AS is not set
109# CONFIG_DEFAULT_DEADLINE is not set
110CONFIG_DEFAULT_CFQ=y
111# CONFIG_DEFAULT_NOOP is not set
112CONFIG_DEFAULT_IOSCHED="cfq"
113CONFIG_CLASSIC_RCU=y
114# CONFIG_TREE_RCU is not set
115# CONFIG_PREEMPT_RCU is not set
116# CONFIG_TREE_RCU_TRACE is not set
117# CONFIG_PREEMPT_RCU_TRACE is not set
118# CONFIG_FREEZER is not set
119
120#
121# System Type and features
122#
123CONFIG_TICK_ONESHOT=y
124CONFIG_NO_HZ=y
125CONFIG_HIGH_RES_TIMERS=y
126CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
127CONFIG_SUBARCH_AVR32B=y
128CONFIG_MMU=y
129CONFIG_PERFORMANCE_COUNTERS=y
130CONFIG_PLATFORM_AT32AP=y
131CONFIG_CPU_AT32AP700X=y
132CONFIG_CPU_AT32AP7000=y
133# CONFIG_BOARD_ATSTK1000 is not set
134# CONFIG_BOARD_ATNGW100 is not set
135# CONFIG_BOARD_HAMMERHEAD is not set
136# CONFIG_BOARD_FAVR_32 is not set
137# CONFIG_BOARD_MIMC200 is not set
138CONFIG_BOARD_MERISC=y
139CONFIG_LOADER_U_BOOT=y
140
141#
142# Atmel AVR32 AP options
143#
144CONFIG_AP700X_32_BIT_SMC=y
145# CONFIG_AP700X_16_BIT_SMC is not set
146# CONFIG_AP700X_8_BIT_SMC is not set
147CONFIG_LOAD_ADDRESS=0x10000000
148CONFIG_ENTRY_ADDRESS=0x90000000
149CONFIG_PHYS_OFFSET=0x10000000
150CONFIG_PREEMPT_NONE=y
151# CONFIG_PREEMPT_VOLUNTARY is not set
152# CONFIG_PREEMPT is not set
153CONFIG_QUICKLIST=y
154# CONFIG_HAVE_ARCH_BOOTMEM_NODE is not set
155# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
156# CONFIG_NEED_NODE_MEMMAP_SIZE is not set
157CONFIG_ARCH_FLATMEM_ENABLE=y
158# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
159# CONFIG_ARCH_SPARSEMEM_ENABLE is not set
160CONFIG_SELECT_MEMORY_MODEL=y
161CONFIG_FLATMEM_MANUAL=y
162# CONFIG_DISCONTIGMEM_MANUAL is not set
163# CONFIG_SPARSEMEM_MANUAL is not set
164CONFIG_FLATMEM=y
165CONFIG_FLAT_NODE_MEM_MAP=y
166CONFIG_PAGEFLAGS_EXTENDED=y
167CONFIG_SPLIT_PTLOCK_CPUS=4
168# CONFIG_PHYS_ADDR_T_64BIT is not set
169CONFIG_ZONE_DMA_FLAG=0
170CONFIG_NR_QUICK=2
171CONFIG_VIRT_TO_BUS=y
172CONFIG_UNEVICTABLE_LRU=y
173# CONFIG_OWNERSHIP_TRACE is not set
174# CONFIG_NMI_DEBUGGING is not set
175# CONFIG_HZ_100 is not set
176CONFIG_HZ_250=y
177# CONFIG_HZ_300 is not set
178# CONFIG_HZ_1000 is not set
179CONFIG_HZ=250
180CONFIG_SCHED_HRTICK=y
181CONFIG_CMDLINE=""
182
183#
184# Power management options
185#
186# CONFIG_PM is not set
187CONFIG_ARCH_SUSPEND_POSSIBLE=y
188
189#
190# CPU Frequency scaling
191#
192# CONFIG_CPU_FREQ is not set
193
194#
195# Bus options
196#
197# CONFIG_ARCH_SUPPORTS_MSI is not set
198# CONFIG_PCCARD is not set
199
200#
201# Executable file formats
202#
203CONFIG_BINFMT_ELF=y
204# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
205# CONFIG_HAVE_AOUT is not set
206# CONFIG_BINFMT_MISC is not set
207CONFIG_NET=y
208
209#
210# Networking options
211#
212CONFIG_COMPAT_NET_DEV_OPS=y
213CONFIG_PACKET=y
214CONFIG_PACKET_MMAP=y
215CONFIG_UNIX=y
216CONFIG_XFRM=y
217CONFIG_XFRM_USER=y
218# CONFIG_XFRM_SUB_POLICY is not set
219# CONFIG_XFRM_MIGRATE is not set
220# CONFIG_XFRM_STATISTICS is not set
221CONFIG_XFRM_IPCOMP=y
222CONFIG_NET_KEY=y
223# CONFIG_NET_KEY_MIGRATE is not set
224CONFIG_INET=y
225CONFIG_IP_MULTICAST=y
226CONFIG_IP_ADVANCED_ROUTER=y
227CONFIG_ASK_IP_FIB_HASH=y
228# CONFIG_IP_FIB_TRIE is not set
229CONFIG_IP_FIB_HASH=y
230# CONFIG_IP_MULTIPLE_TABLES is not set
231# CONFIG_IP_ROUTE_MULTIPATH is not set
232# CONFIG_IP_ROUTE_VERBOSE is not set
233CONFIG_IP_PNP=y
234CONFIG_IP_PNP_DHCP=y
235# CONFIG_IP_PNP_BOOTP is not set
236# CONFIG_IP_PNP_RARP is not set
237# CONFIG_NET_IPIP is not set
238# CONFIG_NET_IPGRE is not set
239CONFIG_IP_MROUTE=y
240CONFIG_IP_PIMSM_V1=y
241# CONFIG_IP_PIMSM_V2 is not set
242# CONFIG_ARPD is not set
243CONFIG_SYN_COOKIES=y
244CONFIG_INET_AH=y
245CONFIG_INET_ESP=y
246CONFIG_INET_IPCOMP=y
247CONFIG_INET_XFRM_TUNNEL=y
248CONFIG_INET_TUNNEL=y
249CONFIG_INET_XFRM_MODE_TRANSPORT=y
250CONFIG_INET_XFRM_MODE_TUNNEL=y
251CONFIG_INET_XFRM_MODE_BEET=y
252# CONFIG_INET_LRO is not set
253CONFIG_INET_DIAG=y
254CONFIG_INET_TCP_DIAG=y
255# CONFIG_TCP_CONG_ADVANCED is not set
256CONFIG_TCP_CONG_CUBIC=y
257CONFIG_DEFAULT_TCP_CONG="cubic"
258# CONFIG_TCP_MD5SIG is not set
259# CONFIG_IPV6 is not set
260# CONFIG_NETWORK_SECMARK is not set
261# CONFIG_NETFILTER is not set
262# CONFIG_IP_DCCP is not set
263# CONFIG_IP_SCTP is not set
264# CONFIG_TIPC is not set
265# CONFIG_ATM is not set
266# CONFIG_BRIDGE is not set
267# CONFIG_NET_DSA is not set
268# CONFIG_VLAN_8021Q is not set
269# CONFIG_DECNET is not set
270# CONFIG_LLC2 is not set
271# CONFIG_IPX is not set
272# CONFIG_ATALK is not set
273# CONFIG_X25 is not set
274# CONFIG_LAPB is not set
275# CONFIG_ECONET is not set
276# CONFIG_WAN_ROUTER is not set
277# CONFIG_NET_SCHED is not set
278# CONFIG_DCB is not set
279
280#
281# Network testing
282#
283# CONFIG_NET_PKTGEN is not set
284# CONFIG_HAMRADIO is not set
285CONFIG_CAN=y
286CONFIG_CAN_RAW=y
287CONFIG_CAN_BCM=y
288
289#
290# CAN Device Drivers
291#
292# CONFIG_CAN_VCAN is not set
293# CONFIG_CAN_DEBUG_DEVICES is not set
294# CONFIG_IRDA is not set
295# CONFIG_BT is not set
296# CONFIG_AF_RXRPC is not set
297# CONFIG_PHONET is not set
298# CONFIG_WIRELESS is not set
299# CONFIG_WIMAX is not set
300# CONFIG_RFKILL is not set
301# CONFIG_NET_9P is not set
302
303#
304# Device Drivers
305#
306
307#
308# Generic Driver Options
309#
310CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
311CONFIG_STANDALONE=y
312# CONFIG_PREVENT_FIRMWARE_BUILD is not set
313# CONFIG_FW_LOADER is not set
314# CONFIG_SYS_HYPERVISOR is not set
315# CONFIG_CONNECTOR is not set
316CONFIG_MTD=y
317# CONFIG_MTD_DEBUG is not set
318CONFIG_MTD_CONCAT=y
319CONFIG_MTD_PARTITIONS=y
320# CONFIG_MTD_TESTS is not set
321# CONFIG_MTD_REDBOOT_PARTS is not set
322# CONFIG_MTD_CMDLINE_PARTS is not set
323# CONFIG_MTD_AR7_PARTS is not set
324
325#
326# User Modules And Translation Layers
327#
328CONFIG_MTD_CHAR=y
329CONFIG_MTD_BLKDEVS=y
330CONFIG_MTD_BLOCK=y
331# CONFIG_FTL is not set
332# CONFIG_NFTL is not set
333# CONFIG_INFTL is not set
334# CONFIG_RFD_FTL is not set
335# CONFIG_SSFDC is not set
336# CONFIG_MTD_OOPS is not set
337
338#
339# RAM/ROM/Flash chip drivers
340#
341CONFIG_MTD_CFI=y
342CONFIG_MTD_JEDECPROBE=y
343CONFIG_MTD_GEN_PROBE=y
344# CONFIG_MTD_CFI_ADV_OPTIONS is not set
345CONFIG_MTD_MAP_BANK_WIDTH_1=y
346CONFIG_MTD_MAP_BANK_WIDTH_2=y
347CONFIG_MTD_MAP_BANK_WIDTH_4=y
348# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
349# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
350# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
351CONFIG_MTD_CFI_I1=y
352CONFIG_MTD_CFI_I2=y
353# CONFIG_MTD_CFI_I4 is not set
354# CONFIG_MTD_CFI_I8 is not set
355# CONFIG_MTD_CFI_INTELEXT is not set
356CONFIG_MTD_CFI_AMDSTD=y
357# CONFIG_MTD_CFI_STAA is not set
358CONFIG_MTD_CFI_UTIL=y
359# CONFIG_MTD_RAM is not set
360# CONFIG_MTD_ROM is not set
361CONFIG_MTD_ABSENT=y
362
363#
364# Mapping drivers for chip access
365#
366# CONFIG_MTD_COMPLEX_MAPPINGS is not set
367CONFIG_MTD_PHYSMAP=y
368# CONFIG_MTD_PHYSMAP_COMPAT is not set
369# CONFIG_MTD_PLATRAM is not set
370
371#
372# Self-contained MTD device drivers
373#
374# CONFIG_MTD_DATAFLASH is not set
375# CONFIG_MTD_M25P80 is not set
376# CONFIG_MTD_SLRAM is not set
377# CONFIG_MTD_PHRAM is not set
378# CONFIG_MTD_MTDRAM is not set
379CONFIG_MTD_BLOCK2MTD=y
380
381#
382# Disk-On-Chip Device Drivers
383#
384# CONFIG_MTD_DOC2000 is not set
385# CONFIG_MTD_DOC2001 is not set
386# CONFIG_MTD_DOC2001PLUS is not set
387# CONFIG_MTD_NAND is not set
388# CONFIG_MTD_ONENAND is not set
389
390#
391# LPDDR flash memory drivers
392#
393# CONFIG_MTD_LPDDR is not set
394# CONFIG_MTD_QINFO_PROBE is not set
395
396#
397# UBI - Unsorted block images
398#
399# CONFIG_MTD_UBI is not set
400# CONFIG_PARPORT is not set
401CONFIG_BLK_DEV=y
402# CONFIG_BLK_DEV_COW_COMMON is not set
403CONFIG_BLK_DEV_LOOP=y
404# CONFIG_BLK_DEV_CRYPTOLOOP is not set
405# CONFIG_BLK_DEV_NBD is not set
406# CONFIG_BLK_DEV_RAM is not set
407# CONFIG_CDROM_PKTCDVD is not set
408# CONFIG_ATA_OVER_ETH is not set
409CONFIG_MISC_DEVICES=y
410CONFIG_ATMEL_PWM=y
411# CONFIG_ATMEL_TCLIB is not set
412# CONFIG_EEPROM_93CX6 is not set
413# CONFIG_ICS932S401 is not set
414CONFIG_ATMEL_SSC=y
415# CONFIG_ENCLOSURE_SERVICES is not set
416# CONFIG_C2PORT is not set
417
418#
419# SCSI device support
420#
421# CONFIG_RAID_ATTRS is not set
422CONFIG_SCSI=y
423CONFIG_SCSI_DMA=y
424# CONFIG_SCSI_TGT is not set
425# CONFIG_SCSI_NETLINK is not set
426CONFIG_SCSI_PROC_FS=y
427
428#
429# SCSI support type (disk, tape, CD-ROM)
430#
431CONFIG_BLK_DEV_SD=y
432# CONFIG_CHR_DEV_ST is not set
433# CONFIG_CHR_DEV_OSST is not set
434# CONFIG_BLK_DEV_SR is not set
435# CONFIG_CHR_DEV_SG is not set
436# CONFIG_CHR_DEV_SCH is not set
437
438#
439# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
440#
441# CONFIG_SCSI_MULTI_LUN is not set
442# CONFIG_SCSI_CONSTANTS is not set
443# CONFIG_SCSI_LOGGING is not set
444# CONFIG_SCSI_SCAN_ASYNC is not set
445CONFIG_SCSI_WAIT_SCAN=m
446
447#
448# SCSI Transports
449#
450# CONFIG_SCSI_SPI_ATTRS is not set
451# CONFIG_SCSI_FC_ATTRS is not set
452# CONFIG_SCSI_ISCSI_ATTRS is not set
453# CONFIG_SCSI_SAS_LIBSAS is not set
454# CONFIG_SCSI_SRP_ATTRS is not set
455# CONFIG_SCSI_LOWLEVEL is not set
456# CONFIG_SCSI_DH is not set
457# CONFIG_ATA is not set
458# CONFIG_MD is not set
459CONFIG_NETDEVICES=y
460# CONFIG_DUMMY is not set
461# CONFIG_BONDING is not set
462# CONFIG_MACVLAN is not set
463# CONFIG_EQUALIZER is not set
464# CONFIG_TUN is not set
465# CONFIG_VETH is not set
466CONFIG_PHYLIB=y
467
468#
469# MII PHY device drivers
470#
471# CONFIG_MARVELL_PHY is not set
472# CONFIG_DAVICOM_PHY is not set
473# CONFIG_QSEMI_PHY is not set
474# CONFIG_LXT_PHY is not set
475# CONFIG_CICADA_PHY is not set
476# CONFIG_VITESSE_PHY is not set
477# CONFIG_SMSC_PHY is not set
478# CONFIG_BROADCOM_PHY is not set
479# CONFIG_ICPLUS_PHY is not set
480# CONFIG_REALTEK_PHY is not set
481# CONFIG_NATIONAL_PHY is not set
482# CONFIG_STE10XP is not set
483# CONFIG_LSI_ET1011C_PHY is not set
484# CONFIG_FIXED_PHY is not set
485# CONFIG_MDIO_BITBANG is not set
486CONFIG_NET_ETHERNET=y
487# CONFIG_MII is not set
488CONFIG_MACB=y
489# CONFIG_ENC28J60 is not set
490# CONFIG_IBM_NEW_EMAC_ZMII is not set
491# CONFIG_IBM_NEW_EMAC_RGMII is not set
492# CONFIG_IBM_NEW_EMAC_TAH is not set
493# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
494# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
495# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
496# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
497# CONFIG_B44 is not set
498# CONFIG_NETDEV_1000 is not set
499# CONFIG_NETDEV_10000 is not set
500
501#
502# Wireless LAN
503#
504# CONFIG_WLAN_PRE80211 is not set
505# CONFIG_WLAN_80211 is not set
506# CONFIG_IWLWIFI_LEDS is not set
507
508#
509# Enable WiMAX (Networking options) to see the WiMAX drivers
510#
511# CONFIG_WAN is not set
512# CONFIG_PPP is not set
513# CONFIG_SLIP is not set
514# CONFIG_NETCONSOLE is not set
515# CONFIG_NETPOLL is not set
516# CONFIG_NET_POLL_CONTROLLER is not set
517# CONFIG_ISDN is not set
518# CONFIG_PHONE is not set
519
520#
521# Input device support
522#
523CONFIG_INPUT=y
524# CONFIG_INPUT_FF_MEMLESS is not set
525# CONFIG_INPUT_POLLDEV is not set
526
527#
528# Userland interfaces
529#
530# CONFIG_INPUT_MOUSEDEV is not set
531# CONFIG_INPUT_JOYDEV is not set
532CONFIG_INPUT_EVDEV=y
533# CONFIG_INPUT_EVBUG is not set
534
535#
536# Input Device Drivers
537#
538CONFIG_INPUT_KEYBOARD=y
539# CONFIG_KEYBOARD_ATKBD is not set
540# CONFIG_KEYBOARD_SUNKBD is not set
541# CONFIG_KEYBOARD_LKKBD is not set
542# CONFIG_KEYBOARD_XTKBD is not set
543# CONFIG_KEYBOARD_NEWTON is not set
544# CONFIG_KEYBOARD_STOWAWAY is not set
545# CONFIG_KEYBOARD_GPIO is not set
546# CONFIG_INPUT_MOUSE is not set
547# CONFIG_INPUT_JOYSTICK is not set
548# CONFIG_INPUT_TABLET is not set
549CONFIG_INPUT_TOUCHSCREEN=y
550CONFIG_TOUCHSCREEN_ADS7846=y
551# CONFIG_TOUCHSCREEN_FUJITSU is not set
552# CONFIG_TOUCHSCREEN_GUNZE is not set
553# CONFIG_TOUCHSCREEN_ELO is not set
554# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
555# CONFIG_TOUCHSCREEN_MTOUCH is not set
556# CONFIG_TOUCHSCREEN_INEXIO is not set
557# CONFIG_TOUCHSCREEN_MK712 is not set
558# CONFIG_TOUCHSCREEN_PENMOUNT is not set
559# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
560# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
561# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
562# CONFIG_TOUCHSCREEN_TSC2007 is not set
563CONFIG_INPUT_MISC=y
564CONFIG_INPUT_UINPUT=y
565
566#
567# Hardware I/O ports
568#
569# CONFIG_SERIO is not set
570# CONFIG_GAMEPORT is not set
571
572#
573# Character devices
574#
575CONFIG_VT=y
576# CONFIG_CONSOLE_TRANSLATIONS is not set
577CONFIG_VT_CONSOLE=y
578CONFIG_HW_CONSOLE=y
579CONFIG_VT_HW_CONSOLE_BINDING=y
580# CONFIG_DEVKMEM is not set
581# CONFIG_SERIAL_NONSTANDARD is not set
582
583#
584# Serial drivers
585#
586# CONFIG_SERIAL_8250 is not set
587
588#
589# Non-8250 serial port support
590#
591CONFIG_SERIAL_ATMEL=y
592CONFIG_SERIAL_ATMEL_CONSOLE=y
593CONFIG_SERIAL_ATMEL_PDC=y
594# CONFIG_SERIAL_ATMEL_TTYAT is not set
595CONFIG_SERIAL_CORE=y
596CONFIG_SERIAL_CORE_CONSOLE=y
597CONFIG_UNIX98_PTYS=y
598# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
599# CONFIG_LEGACY_PTYS is not set
600# CONFIG_IPMI_HANDLER is not set
601# CONFIG_HW_RANDOM is not set
602# CONFIG_R3964 is not set
603# CONFIG_RAW_DRIVER is not set
604# CONFIG_TCG_TPM is not set
605CONFIG_I2C=y
606CONFIG_I2C_BOARDINFO=y
607CONFIG_I2C_CHARDEV=y
608CONFIG_I2C_HELPER_AUTO=y
609CONFIG_I2C_ALGOBIT=y
610
611#
612# I2C Hardware Bus support
613#
614
615#
616# I2C system bus drivers (mostly embedded / system-on-chip)
617#
618CONFIG_I2C_GPIO=y
619# CONFIG_I2C_OCORES is not set
620# CONFIG_I2C_SIMTEC is not set
621
622#
623# External I2C/SMBus adapter drivers
624#
625# CONFIG_I2C_PARPORT_LIGHT is not set
626# CONFIG_I2C_TAOS_EVM is not set
627
628#
629# Other I2C/SMBus bus drivers
630#
631# CONFIG_I2C_PCA_PLATFORM is not set
632# CONFIG_I2C_STUB is not set
633
634#
635# Miscellaneous I2C Chip support
636#
637# CONFIG_DS1682 is not set
638# CONFIG_AT24 is not set
639# CONFIG_SENSORS_EEPROM is not set
640# CONFIG_SENSORS_PCF8574 is not set
641# CONFIG_PCF8575 is not set
642# CONFIG_SENSORS_PCA9539 is not set
643# CONFIG_SENSORS_PCF8591 is not set
644# CONFIG_SENSORS_MAX6875 is not set
645# CONFIG_SENSORS_TSL2550 is not set
646# CONFIG_I2C_DEBUG_CORE is not set
647# CONFIG_I2C_DEBUG_ALGO is not set
648# CONFIG_I2C_DEBUG_BUS is not set
649# CONFIG_I2C_DEBUG_CHIP is not set
650CONFIG_SPI=y
651CONFIG_SPI_MASTER=y
652
653#
654# SPI Master Controller Drivers
655#
656CONFIG_SPI_ATMEL=y
657# CONFIG_SPI_BITBANG is not set
658# CONFIG_SPI_GPIO is not set
659
660#
661# SPI Protocol Masters
662#
663# CONFIG_SPI_AT25 is not set
664CONFIG_SPI_SPIDEV=y
665# CONFIG_SPI_TLE62X0 is not set
666CONFIG_ARCH_REQUIRE_GPIOLIB=y
667CONFIG_GPIOLIB=y
668CONFIG_GPIO_SYSFS=y
669
670#
671# Memory mapped GPIO expanders:
672#
673
674#
675# I2C GPIO expanders:
676#
677# CONFIG_GPIO_MAX732X is not set
678# CONFIG_GPIO_PCA953X is not set
679# CONFIG_GPIO_PCF857X is not set
680
681#
682# PCI GPIO expanders:
683#
684
685#
686# SPI GPIO expanders:
687#
688# CONFIG_GPIO_MAX7301 is not set
689# CONFIG_GPIO_MCP23S08 is not set
690# CONFIG_W1 is not set
691# CONFIG_POWER_SUPPLY is not set
692# CONFIG_HWMON is not set
693# CONFIG_THERMAL is not set
694# CONFIG_THERMAL_HWMON is not set
695CONFIG_WATCHDOG=y
696# CONFIG_WATCHDOG_NOWAYOUT is not set
697
698#
699# Watchdog Device Drivers
700#
701# CONFIG_SOFT_WATCHDOG is not set
702# CONFIG_AT32AP700X_WDT is not set
703CONFIG_SSB_POSSIBLE=y
704
705#
706# Sonics Silicon Backplane
707#
708# CONFIG_SSB is not set
709
710#
711# Multifunction device drivers
712#
713# CONFIG_MFD_CORE is not set
714# CONFIG_MFD_SM501 is not set
715# CONFIG_HTC_PASIC3 is not set
716# CONFIG_TPS65010 is not set
717# CONFIG_TWL4030_CORE is not set
718# CONFIG_MFD_TMIO is not set
719# CONFIG_PMIC_DA903X is not set
720# CONFIG_MFD_WM8400 is not set
721# CONFIG_MFD_WM8350_I2C is not set
722# CONFIG_MFD_PCF50633 is not set
723# CONFIG_REGULATOR is not set
724
725#
726# Multimedia devices
727#
728
729#
730# Multimedia core support
731#
732# CONFIG_VIDEO_DEV is not set
733# CONFIG_DVB_CORE is not set
734# CONFIG_VIDEO_MEDIA is not set
735
736#
737# Multimedia drivers
738#
739# CONFIG_DAB is not set
740
741#
742# Graphics support
743#
744# CONFIG_VGASTATE is not set
745CONFIG_VIDEO_OUTPUT_CONTROL=y
746CONFIG_FB=y
747# CONFIG_FIRMWARE_EDID is not set
748# CONFIG_FB_DDC is not set
749# CONFIG_FB_BOOT_VESA_SUPPORT is not set
750CONFIG_FB_CFB_FILLRECT=y
751CONFIG_FB_CFB_COPYAREA=y
752CONFIG_FB_CFB_IMAGEBLIT=y
753# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
754# CONFIG_FB_SYS_FILLRECT is not set
755# CONFIG_FB_SYS_COPYAREA is not set
756# CONFIG_FB_SYS_IMAGEBLIT is not set
757# CONFIG_FB_FOREIGN_ENDIAN is not set
758# CONFIG_FB_SYS_FOPS is not set
759# CONFIG_FB_SVGALIB is not set
760# CONFIG_FB_MACMODES is not set
761# CONFIG_FB_BACKLIGHT is not set
762# CONFIG_FB_MODE_HELPERS is not set
763# CONFIG_FB_TILEBLITTING is not set
764
765#
766# Frame buffer hardware drivers
767#
768# CONFIG_FB_S1D13XXX is not set
769CONFIG_FB_ATMEL=y
770# CONFIG_FB_VIRTUAL is not set
771# CONFIG_FB_METRONOME is not set
772# CONFIG_FB_MB862XX is not set
773CONFIG_BACKLIGHT_LCD_SUPPORT=y
774# CONFIG_LCD_CLASS_DEVICE is not set
775# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
776
777#
778# Display device support
779#
780CONFIG_DISPLAY_SUPPORT=y
781
782#
783# Display hardware drivers
784#
785
786#
787# Console display driver support
788#
789CONFIG_DUMMY_CONSOLE=y
790CONFIG_FRAMEBUFFER_CONSOLE=y
791# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
792# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
793# CONFIG_FONTS is not set
794CONFIG_FONT_8x8=y
795CONFIG_FONT_8x16=y
796CONFIG_LOGO=y
797CONFIG_LOGO_LINUX_MONO=y
798CONFIG_LOGO_LINUX_VGA16=y
799CONFIG_LOGO_LINUX_CLUT224=y
800# CONFIG_SOUND is not set
801CONFIG_HID_SUPPORT=y
802CONFIG_HID=y
803# CONFIG_HID_DEBUG is not set
804# CONFIG_HIDRAW is not set
805# CONFIG_HID_PID is not set
806
807#
808# Special HID drivers
809#
810CONFIG_HID_COMPAT=y
811CONFIG_USB_SUPPORT=y
812# CONFIG_USB_ARCH_HAS_HCD is not set
813# CONFIG_USB_ARCH_HAS_OHCI is not set
814# CONFIG_USB_ARCH_HAS_EHCI is not set
815# CONFIG_USB_OTG_WHITELIST is not set
816# CONFIG_USB_OTG_BLACKLIST_HUB is not set
817
818#
819# Enable Host or Gadget support to see Inventra options
820#
821
822#
823# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
824#
825# CONFIG_USB_GADGET is not set
826
827#
828# OTG and related infrastructure
829#
830CONFIG_MMC=y
831# CONFIG_MMC_DEBUG is not set
832# CONFIG_MMC_UNSAFE_RESUME is not set
833
834#
835# MMC/SD/SDIO Card Drivers
836#
837CONFIG_MMC_BLOCK=y
838CONFIG_MMC_BLOCK_BOUNCE=y
839# CONFIG_SDIO_UART is not set
840# CONFIG_MMC_TEST is not set
841
842#
843# MMC/SD/SDIO Host Controller Drivers
844#
845# CONFIG_MMC_SDHCI is not set
846CONFIG_MMC_ATMELMCI=y
847CONFIG_MMC_ATMELMCI_DMA=y
848# CONFIG_MMC_SPI is not set
849# CONFIG_MEMSTICK is not set
850CONFIG_NEW_LEDS=y
851CONFIG_LEDS_CLASS=y
852
853#
854# LED drivers
855#
856CONFIG_LEDS_ATMEL_PWM=y
857# CONFIG_LEDS_PCA9532 is not set
858# CONFIG_LEDS_GPIO is not set
859# CONFIG_LEDS_PCA955X is not set
860
861#
862# LED Triggers
863#
864# CONFIG_LEDS_TRIGGERS is not set
865# CONFIG_ACCESSIBILITY is not set
866CONFIG_RTC_LIB=y
867CONFIG_RTC_CLASS=y
868# CONFIG_RTC_HCTOSYS is not set
869# CONFIG_RTC_DEBUG is not set
870
871#
872# RTC interfaces
873#
874CONFIG_RTC_INTF_SYSFS=y
875CONFIG_RTC_INTF_PROC=y
876CONFIG_RTC_INTF_DEV=y
877# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
878# CONFIG_RTC_DRV_TEST is not set
879
880#
881# I2C RTC drivers
882#
883# CONFIG_RTC_DRV_DS1307 is not set
884# CONFIG_RTC_DRV_DS1374 is not set
885# CONFIG_RTC_DRV_DS1672 is not set
886# CONFIG_RTC_DRV_MAX6900 is not set
887# CONFIG_RTC_DRV_RS5C372 is not set
888# CONFIG_RTC_DRV_ISL1208 is not set
889# CONFIG_RTC_DRV_X1205 is not set
890CONFIG_RTC_DRV_PCF8563=y
891# CONFIG_RTC_DRV_PCF8583 is not set
892# CONFIG_RTC_DRV_M41T80 is not set
893# CONFIG_RTC_DRV_S35390A is not set
894# CONFIG_RTC_DRV_FM3130 is not set
895# CONFIG_RTC_DRV_RX8581 is not set
896
897#
898# SPI RTC drivers
899#
900# CONFIG_RTC_DRV_M41T94 is not set
901# CONFIG_RTC_DRV_DS1305 is not set
902# CONFIG_RTC_DRV_DS1390 is not set
903# CONFIG_RTC_DRV_MAX6902 is not set
904# CONFIG_RTC_DRV_R9701 is not set
905# CONFIG_RTC_DRV_RS5C348 is not set
906# CONFIG_RTC_DRV_DS3234 is not set
907
908#
909# Platform RTC drivers
910#
911# CONFIG_RTC_DRV_DS1286 is not set
912# CONFIG_RTC_DRV_DS1511 is not set
913# CONFIG_RTC_DRV_DS1553 is not set
914# CONFIG_RTC_DRV_DS1742 is not set
915# CONFIG_RTC_DRV_STK17TA8 is not set
916# CONFIG_RTC_DRV_M48T86 is not set
917# CONFIG_RTC_DRV_M48T35 is not set
918# CONFIG_RTC_DRV_M48T59 is not set
919# CONFIG_RTC_DRV_BQ4802 is not set
920# CONFIG_RTC_DRV_V3020 is not set
921
922#
923# on-CPU RTC drivers
924#
925# CONFIG_RTC_DRV_AT32AP700X is not set
926CONFIG_DMADEVICES=y
927
928#
929# DMA Devices
930#
931CONFIG_DW_DMAC=y
932CONFIG_DMA_ENGINE=y
933
934#
935# DMA Clients
936#
937# CONFIG_NET_DMA is not set
938# CONFIG_DMATEST is not set
939CONFIG_UIO=y
940# CONFIG_UIO_PDRV is not set
941# CONFIG_UIO_PDRV_GENIRQ is not set
942# CONFIG_UIO_SMX is not set
943# CONFIG_UIO_SERCOS3 is not set
944# CONFIG_STAGING is not set
945
946#
947# File systems
948#
949CONFIG_EXT2_FS=y
950# CONFIG_EXT2_FS_XATTR is not set
951# CONFIG_EXT2_FS_XIP is not set
952# CONFIG_EXT3_FS is not set
953# CONFIG_EXT4_FS is not set
954# CONFIG_REISERFS_FS is not set
955# CONFIG_JFS_FS is not set
956# CONFIG_FS_POSIX_ACL is not set
957CONFIG_FILE_LOCKING=y
958# CONFIG_XFS_FS is not set
959# CONFIG_OCFS2_FS is not set
960# CONFIG_BTRFS_FS is not set
961# CONFIG_DNOTIFY is not set
962CONFIG_INOTIFY=y
963CONFIG_INOTIFY_USER=y
964# CONFIG_QUOTA is not set
965# CONFIG_AUTOFS_FS is not set
966# CONFIG_AUTOFS4_FS is not set
967CONFIG_FUSE_FS=y
968
969#
970# CD-ROM/DVD Filesystems
971#
972# CONFIG_ISO9660_FS is not set
973# CONFIG_UDF_FS is not set
974
975#
976# DOS/FAT/NT Filesystems
977#
978CONFIG_FAT_FS=y
979CONFIG_MSDOS_FS=y
980CONFIG_VFAT_FS=y
981CONFIG_FAT_DEFAULT_CODEPAGE=437
982CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
983# CONFIG_NTFS_FS is not set
984
985#
986# Pseudo filesystems
987#
988CONFIG_PROC_FS=y
989# CONFIG_PROC_KCORE is not set
990CONFIG_PROC_SYSCTL=y
991CONFIG_PROC_PAGE_MONITOR=y
992CONFIG_SYSFS=y
993CONFIG_TMPFS=y
994# CONFIG_TMPFS_POSIX_ACL is not set
995# CONFIG_HUGETLB_PAGE is not set
996CONFIG_CONFIGFS_FS=y
997CONFIG_MISC_FILESYSTEMS=y
998# CONFIG_ADFS_FS is not set
999# CONFIG_AFFS_FS is not set
1000# CONFIG_HFS_FS is not set
1001# CONFIG_HFSPLUS_FS is not set
1002# CONFIG_BEFS_FS is not set
1003# CONFIG_BFS_FS is not set
1004# CONFIG_EFS_FS is not set
1005CONFIG_JFFS2_FS=y
1006CONFIG_JFFS2_FS_DEBUG=0
1007CONFIG_JFFS2_FS_WRITEBUFFER=y
1008CONFIG_JFFS2_FS_WBUF_VERIFY=y
1009# CONFIG_JFFS2_SUMMARY is not set
1010# CONFIG_JFFS2_FS_XATTR is not set
1011# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1012CONFIG_JFFS2_ZLIB=y
1013# CONFIG_JFFS2_LZO is not set
1014CONFIG_JFFS2_RTIME=y
1015# CONFIG_JFFS2_RUBIN is not set
1016CONFIG_CRAMFS=y
1017# CONFIG_SQUASHFS is not set
1018# CONFIG_VXFS_FS is not set
1019# CONFIG_MINIX_FS is not set
1020# CONFIG_OMFS_FS is not set
1021# CONFIG_HPFS_FS is not set
1022# CONFIG_QNX4FS_FS is not set
1023# CONFIG_ROMFS_FS is not set
1024# CONFIG_SYSV_FS is not set
1025# CONFIG_UFS_FS is not set
1026CONFIG_NETWORK_FILESYSTEMS=y
1027CONFIG_NFS_FS=y
1028CONFIG_NFS_V3=y
1029# CONFIG_NFS_V3_ACL is not set
1030# CONFIG_NFS_V4 is not set
1031CONFIG_ROOT_NFS=y
1032# CONFIG_NFSD is not set
1033CONFIG_LOCKD=y
1034CONFIG_LOCKD_V4=y
1035CONFIG_NFS_COMMON=y
1036CONFIG_SUNRPC=y
1037# CONFIG_SUNRPC_REGISTER_V4 is not set
1038# CONFIG_RPCSEC_GSS_KRB5 is not set
1039# CONFIG_RPCSEC_GSS_SPKM3 is not set
1040# CONFIG_SMB_FS is not set
1041# CONFIG_CIFS is not set
1042# CONFIG_NCP_FS is not set
1043# CONFIG_CODA_FS is not set
1044# CONFIG_AFS_FS is not set
1045
1046#
1047# Partition Types
1048#
1049# CONFIG_PARTITION_ADVANCED is not set
1050CONFIG_MSDOS_PARTITION=y
1051CONFIG_NLS=y
1052CONFIG_NLS_DEFAULT="iso8859-1"
1053CONFIG_NLS_CODEPAGE_437=y
1054# CONFIG_NLS_CODEPAGE_737 is not set
1055# CONFIG_NLS_CODEPAGE_775 is not set
1056CONFIG_NLS_CODEPAGE_850=y
1057# CONFIG_NLS_CODEPAGE_852 is not set
1058# CONFIG_NLS_CODEPAGE_855 is not set
1059# CONFIG_NLS_CODEPAGE_857 is not set
1060# CONFIG_NLS_CODEPAGE_860 is not set
1061# CONFIG_NLS_CODEPAGE_861 is not set
1062# CONFIG_NLS_CODEPAGE_862 is not set
1063# CONFIG_NLS_CODEPAGE_863 is not set
1064# CONFIG_NLS_CODEPAGE_864 is not set
1065# CONFIG_NLS_CODEPAGE_865 is not set
1066# CONFIG_NLS_CODEPAGE_866 is not set
1067# CONFIG_NLS_CODEPAGE_869 is not set
1068# CONFIG_NLS_CODEPAGE_936 is not set
1069# CONFIG_NLS_CODEPAGE_950 is not set
1070# CONFIG_NLS_CODEPAGE_932 is not set
1071# CONFIG_NLS_CODEPAGE_949 is not set
1072# CONFIG_NLS_CODEPAGE_874 is not set
1073# CONFIG_NLS_ISO8859_8 is not set
1074# CONFIG_NLS_CODEPAGE_1250 is not set
1075# CONFIG_NLS_CODEPAGE_1251 is not set
1076# CONFIG_NLS_ASCII is not set
1077CONFIG_NLS_ISO8859_1=y
1078# CONFIG_NLS_ISO8859_2 is not set
1079# CONFIG_NLS_ISO8859_3 is not set
1080# CONFIG_NLS_ISO8859_4 is not set
1081# CONFIG_NLS_ISO8859_5 is not set
1082# CONFIG_NLS_ISO8859_6 is not set
1083# CONFIG_NLS_ISO8859_7 is not set
1084# CONFIG_NLS_ISO8859_9 is not set
1085# CONFIG_NLS_ISO8859_13 is not set
1086# CONFIG_NLS_ISO8859_14 is not set
1087# CONFIG_NLS_ISO8859_15 is not set
1088# CONFIG_NLS_KOI8_R is not set
1089# CONFIG_NLS_KOI8_U is not set
1090CONFIG_NLS_UTF8=y
1091# CONFIG_DLM is not set
1092
1093#
1094# Kernel hacking
1095#
1096# CONFIG_PRINTK_TIME is not set
1097CONFIG_ENABLE_WARN_DEPRECATED=y
1098CONFIG_ENABLE_MUST_CHECK=y
1099CONFIG_FRAME_WARN=1024
1100# CONFIG_MAGIC_SYSRQ is not set
1101# CONFIG_UNUSED_SYMBOLS is not set
1102# CONFIG_DEBUG_FS is not set
1103# CONFIG_HEADERS_CHECK is not set
1104# CONFIG_DEBUG_KERNEL is not set
1105# CONFIG_SLUB_DEBUG_ON is not set
1106# CONFIG_SLUB_STATS is not set
1107# CONFIG_DEBUG_BUGVERBOSE is not set
1108# CONFIG_DEBUG_MEMORY_INIT is not set
1109# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1110
1111#
1112# Tracers
1113#
1114# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1115# CONFIG_SAMPLES is not set
1116
1117#
1118# Security options
1119#
1120# CONFIG_KEYS is not set
1121# CONFIG_SECURITY is not set
1122# CONFIG_SECURITYFS is not set
1123# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1124CONFIG_CRYPTO=y
1125
1126#
1127# Crypto core or helper
1128#
1129# CONFIG_CRYPTO_FIPS is not set
1130CONFIG_CRYPTO_ALGAPI=y
1131CONFIG_CRYPTO_ALGAPI2=y
1132CONFIG_CRYPTO_AEAD=y
1133CONFIG_CRYPTO_AEAD2=y
1134CONFIG_CRYPTO_BLKCIPHER=y
1135CONFIG_CRYPTO_BLKCIPHER2=y
1136CONFIG_CRYPTO_HASH=y
1137CONFIG_CRYPTO_HASH2=y
1138CONFIG_CRYPTO_RNG2=y
1139CONFIG_CRYPTO_MANAGER=y
1140CONFIG_CRYPTO_MANAGER2=y
1141# CONFIG_CRYPTO_GF128MUL is not set
1142# CONFIG_CRYPTO_NULL is not set
1143# CONFIG_CRYPTO_CRYPTD is not set
1144CONFIG_CRYPTO_AUTHENC=y
1145# CONFIG_CRYPTO_TEST is not set
1146
1147#
1148# Authenticated Encryption with Associated Data
1149#
1150# CONFIG_CRYPTO_CCM is not set
1151# CONFIG_CRYPTO_GCM is not set
1152# CONFIG_CRYPTO_SEQIV is not set
1153
1154#
1155# Block modes
1156#
1157CONFIG_CRYPTO_CBC=y
1158# CONFIG_CRYPTO_CTR is not set
1159# CONFIG_CRYPTO_CTS is not set
1160# CONFIG_CRYPTO_ECB is not set
1161# CONFIG_CRYPTO_LRW is not set
1162# CONFIG_CRYPTO_PCBC is not set
1163# CONFIG_CRYPTO_XTS is not set
1164
1165#
1166# Hash modes
1167#
1168CONFIG_CRYPTO_HMAC=y
1169# CONFIG_CRYPTO_XCBC is not set
1170
1171#
1172# Digest
1173#
1174# CONFIG_CRYPTO_CRC32C is not set
1175# CONFIG_CRYPTO_MD4 is not set
1176CONFIG_CRYPTO_MD5=y
1177# CONFIG_CRYPTO_MICHAEL_MIC is not set
1178# CONFIG_CRYPTO_RMD128 is not set
1179# CONFIG_CRYPTO_RMD160 is not set
1180# CONFIG_CRYPTO_RMD256 is not set
1181# CONFIG_CRYPTO_RMD320 is not set
1182CONFIG_CRYPTO_SHA1=y
1183# CONFIG_CRYPTO_SHA256 is not set
1184# CONFIG_CRYPTO_SHA512 is not set
1185# CONFIG_CRYPTO_TGR192 is not set
1186# CONFIG_CRYPTO_WP512 is not set
1187
1188#
1189# Ciphers
1190#
1191# CONFIG_CRYPTO_AES is not set
1192# CONFIG_CRYPTO_ANUBIS is not set
1193# CONFIG_CRYPTO_ARC4 is not set
1194# CONFIG_CRYPTO_BLOWFISH is not set
1195# CONFIG_CRYPTO_CAMELLIA is not set
1196# CONFIG_CRYPTO_CAST5 is not set
1197# CONFIG_CRYPTO_CAST6 is not set
1198CONFIG_CRYPTO_DES=y
1199# CONFIG_CRYPTO_FCRYPT is not set
1200# CONFIG_CRYPTO_KHAZAD is not set
1201# CONFIG_CRYPTO_SALSA20 is not set
1202# CONFIG_CRYPTO_SEED is not set
1203# CONFIG_CRYPTO_SERPENT is not set
1204# CONFIG_CRYPTO_TEA is not set
1205# CONFIG_CRYPTO_TWOFISH is not set
1206
1207#
1208# Compression
1209#
1210CONFIG_CRYPTO_DEFLATE=y
1211# CONFIG_CRYPTO_LZO is not set
1212
1213#
1214# Random Number Generation
1215#
1216# CONFIG_CRYPTO_ANSI_CPRNG is not set
1217# CONFIG_CRYPTO_HW is not set
1218
1219#
1220# Library routines
1221#
1222CONFIG_BITREVERSE=y
1223CONFIG_GENERIC_FIND_LAST_BIT=y
1224# CONFIG_CRC_CCITT is not set
1225# CONFIG_CRC16 is not set
1226# CONFIG_CRC_T10DIF is not set
1227# CONFIG_CRC_ITU_T is not set
1228CONFIG_CRC32=y
1229# CONFIG_CRC7 is not set
1230# CONFIG_LIBCRC32C is not set
1231CONFIG_ZLIB_INFLATE=y
1232CONFIG_ZLIB_DEFLATE=y
1233CONFIG_GENERIC_ALLOCATOR=y
1234CONFIG_PLIST=y
1235CONFIG_HAS_IOMEM=y
1236CONFIG_HAS_IOPORT=y
1237CONFIG_HAS_DMA=y
diff --git a/arch/avr32/include/asm/ftrace.h b/arch/avr32/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/avr32/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/avr32/include/asm/hardirq.h b/arch/avr32/include/asm/hardirq.h
index 267354356f60..015bc75ea798 100644
--- a/arch/avr32/include/asm/hardirq.h
+++ b/arch/avr32/include/asm/hardirq.h
@@ -20,15 +20,4 @@ void ack_bad_irq(unsigned int irq);
20 20
21#endif /* __ASSEMBLY__ */ 21#endif /* __ASSEMBLY__ */
22 22
23#define HARDIRQ_BITS 12
24
25/*
26 * The hardirq mask has to be large enough to have
27 * space for potentially all IRQ sources in the system
28 * nesting on a single CPU:
29 */
30#if (1 << HARDIRQ_BITS) < NR_IRQS
31# error HARDIRQ_BITS is too low!
32#endif
33
34#endif /* __ASM_AVR32_HARDIRQ_H */ 23#endif /* __ASM_AVR32_HARDIRQ_H */
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 3fbfd1e32a9e..7cc653798327 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -26,6 +26,9 @@
26#include <mach/portmux.h> 26#include <mach/portmux.h>
27#include <mach/sram.h> 27#include <mach/sram.h>
28 28
29#include <sound/atmel-abdac.h>
30#include <sound/atmel-ac97c.h>
31
29#include <video/atmel_lcdc.h> 32#include <video/atmel_lcdc.h>
30 33
31#include "clock.h" 34#include "clock.h"
@@ -963,56 +966,68 @@ static struct resource atmel_usart3_resource[] = {
963DEFINE_DEV_DATA(atmel_usart, 3); 966DEFINE_DEV_DATA(atmel_usart, 3);
964DEV_CLK(usart, atmel_usart3, pba, 6); 967DEV_CLK(usart, atmel_usart3, pba, 6);
965 968
966static inline void configure_usart0_pins(void) 969static inline void configure_usart0_pins(int flags)
967{ 970{
968 u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */ 971 u32 pin_mask = (1 << 8) | (1 << 9); /* RXD & TXD */
972 if (flags & ATMEL_USART_RTS) pin_mask |= (1 << 6);
973 if (flags & ATMEL_USART_CTS) pin_mask |= (1 << 7);
974 if (flags & ATMEL_USART_CLK) pin_mask |= (1 << 10);
969 975
970 select_peripheral(PIOA, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); 976 select_peripheral(PIOA, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
971} 977}
972 978
973static inline void configure_usart1_pins(void) 979static inline void configure_usart1_pins(int flags)
974{ 980{
975 u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */ 981 u32 pin_mask = (1 << 17) | (1 << 18); /* RXD & TXD */
982 if (flags & ATMEL_USART_RTS) pin_mask |= (1 << 19);
983 if (flags & ATMEL_USART_CTS) pin_mask |= (1 << 20);
984 if (flags & ATMEL_USART_CLK) pin_mask |= (1 << 16);
976 985
977 select_peripheral(PIOA, pin_mask, PERIPH_A, AT32_GPIOF_PULLUP); 986 select_peripheral(PIOA, pin_mask, PERIPH_A, AT32_GPIOF_PULLUP);
978} 987}
979 988
980static inline void configure_usart2_pins(void) 989static inline void configure_usart2_pins(int flags)
981{ 990{
982 u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */ 991 u32 pin_mask = (1 << 26) | (1 << 27); /* RXD & TXD */
992 if (flags & ATMEL_USART_RTS) pin_mask |= (1 << 30);
993 if (flags & ATMEL_USART_CTS) pin_mask |= (1 << 29);
994 if (flags & ATMEL_USART_CLK) pin_mask |= (1 << 28);
983 995
984 select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); 996 select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
985} 997}
986 998
987static inline void configure_usart3_pins(void) 999static inline void configure_usart3_pins(int flags)
988{ 1000{
989 u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */ 1001 u32 pin_mask = (1 << 18) | (1 << 17); /* RXD & TXD */
1002 if (flags & ATMEL_USART_RTS) pin_mask |= (1 << 16);
1003 if (flags & ATMEL_USART_CTS) pin_mask |= (1 << 15);
1004 if (flags & ATMEL_USART_CLK) pin_mask |= (1 << 19);
990 1005
991 select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP); 1006 select_peripheral(PIOB, pin_mask, PERIPH_B, AT32_GPIOF_PULLUP);
992} 1007}
993 1008
994static struct platform_device *__initdata at32_usarts[4]; 1009static struct platform_device *__initdata at32_usarts[4];
995 1010
996void __init at32_map_usart(unsigned int hw_id, unsigned int line) 1011void __init at32_map_usart(unsigned int hw_id, unsigned int line, int flags)
997{ 1012{
998 struct platform_device *pdev; 1013 struct platform_device *pdev;
999 1014
1000 switch (hw_id) { 1015 switch (hw_id) {
1001 case 0: 1016 case 0:
1002 pdev = &atmel_usart0_device; 1017 pdev = &atmel_usart0_device;
1003 configure_usart0_pins(); 1018 configure_usart0_pins(flags);
1004 break; 1019 break;
1005 case 1: 1020 case 1:
1006 pdev = &atmel_usart1_device; 1021 pdev = &atmel_usart1_device;
1007 configure_usart1_pins(); 1022 configure_usart1_pins(flags);
1008 break; 1023 break;
1009 case 2: 1024 case 2:
1010 pdev = &atmel_usart2_device; 1025 pdev = &atmel_usart2_device;
1011 configure_usart2_pins(); 1026 configure_usart2_pins(flags);
1012 break; 1027 break;
1013 case 3: 1028 case 3:
1014 pdev = &atmel_usart3_device; 1029 pdev = &atmel_usart3_device;
1015 configure_usart3_pins(); 1030 configure_usart3_pins(flags);
1016 break; 1031 break;
1017 default: 1032 default:
1018 return; 1033 return;
@@ -1753,7 +1768,7 @@ at32_add_device_usba(unsigned int id, struct usba_platform_data *data)
1753 if (platform_device_add_data(pdev, data, sizeof(usba_data))) 1768 if (platform_device_add_data(pdev, data, sizeof(usba_data)))
1754 goto out_free_pdev; 1769 goto out_free_pdev;
1755 1770
1756 if (data->vbus_pin >= 0) 1771 if (gpio_is_valid(data->vbus_pin))
1757 at32_select_gpio(data->vbus_pin, 0); 1772 at32_select_gpio(data->vbus_pin, 0);
1758 1773
1759 usba0_pclk.dev = &pdev->dev; 1774 usba0_pclk.dev = &pdev->dev;
@@ -1980,11 +1995,14 @@ static struct clk atmel_ac97c0_pclk = {
1980}; 1995};
1981 1996
1982struct platform_device *__init 1997struct platform_device *__init
1983at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data) 1998at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
1999 unsigned int flags)
1984{ 2000{
1985 struct platform_device *pdev; 2001 struct platform_device *pdev;
1986 struct ac97c_platform_data _data; 2002 struct dw_dma_slave *rx_dws;
1987 u32 pin_mask; 2003 struct dw_dma_slave *tx_dws;
2004 struct ac97c_platform_data _data;
2005 u32 pin_mask;
1988 2006
1989 if (id != 0) 2007 if (id != 0)
1990 return NULL; 2008 return NULL;
@@ -1995,37 +2013,52 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data)
1995 2013
1996 if (platform_device_add_resources(pdev, atmel_ac97c0_resource, 2014 if (platform_device_add_resources(pdev, atmel_ac97c0_resource,
1997 ARRAY_SIZE(atmel_ac97c0_resource))) 2015 ARRAY_SIZE(atmel_ac97c0_resource)))
1998 goto fail; 2016 goto out_free_resources;
1999 2017
2000 if (!data) { 2018 if (!data) {
2001 data = &_data; 2019 data = &_data;
2002 memset(data, 0, sizeof(struct ac97c_platform_data)); 2020 memset(data, 0, sizeof(struct ac97c_platform_data));
2003 data->reset_pin = GPIO_PIN_NONE; 2021 data->reset_pin = -ENODEV;
2004 } 2022 }
2005 2023
2006 data->dma_rx_periph_id = 3; 2024 rx_dws = &data->rx_dws;
2007 data->dma_tx_periph_id = 4; 2025 tx_dws = &data->tx_dws;
2008 data->dma_controller_id = 0; 2026
2027 /* Check if DMA slave interface for capture should be configured. */
2028 if (flags & AC97C_CAPTURE) {
2029 rx_dws->dma_dev = &dw_dmac0_device.dev;
2030 rx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT;
2031 rx_dws->cfg_hi = DWC_CFGH_SRC_PER(3);
2032 rx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
2033 }
2034
2035 /* Check if DMA slave interface for playback should be configured. */
2036 if (flags & AC97C_PLAYBACK) {
2037 tx_dws->dma_dev = &dw_dmac0_device.dev;
2038 tx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT;
2039 tx_dws->cfg_hi = DWC_CFGH_DST_PER(4);
2040 tx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
2041 }
2009 2042
2010 if (platform_device_add_data(pdev, data, 2043 if (platform_device_add_data(pdev, data,
2011 sizeof(struct ac97c_platform_data))) 2044 sizeof(struct ac97c_platform_data)))
2012 goto fail; 2045 goto out_free_resources;
2013 2046
2014 pin_mask = (1 << 20) | (1 << 21); /* SDO & SYNC */ 2047 /* SDO | SYNC | SCLK | SDI */
2015 pin_mask |= (1 << 22) | (1 << 23); /* SCLK & SDI */ 2048 pin_mask = (1 << 20) | (1 << 21) | (1 << 22) | (1 << 23);
2016 2049
2017 select_peripheral(PIOB, pin_mask, PERIPH_B, 0); 2050 select_peripheral(PIOB, pin_mask, PERIPH_B, 0);
2018 2051
2019 /* TODO: gpio_is_valid(data->reset_pin) with kernel 2.6.26. */ 2052 if (gpio_is_valid(data->reset_pin))
2020 if (data->reset_pin != GPIO_PIN_NONE) 2053 at32_select_gpio(data->reset_pin, AT32_GPIOF_OUTPUT
2021 at32_select_gpio(data->reset_pin, 0); 2054 | AT32_GPIOF_HIGH);
2022 2055
2023 atmel_ac97c0_pclk.dev = &pdev->dev; 2056 atmel_ac97c0_pclk.dev = &pdev->dev;
2024 2057
2025 platform_device_add(pdev); 2058 platform_device_add(pdev);
2026 return pdev; 2059 return pdev;
2027 2060
2028fail: 2061out_free_resources:
2029 platform_device_put(pdev); 2062 platform_device_put(pdev);
2030 return NULL; 2063 return NULL;
2031} 2064}
@@ -2053,21 +2086,34 @@ static struct clk abdac0_sample_clk = {
2053 .index = 6, 2086 .index = 6,
2054}; 2087};
2055 2088
2056struct platform_device *__init at32_add_device_abdac(unsigned int id) 2089struct platform_device *__init
2090at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data)
2057{ 2091{
2058 struct platform_device *pdev; 2092 struct platform_device *pdev;
2059 u32 pin_mask; 2093 struct dw_dma_slave *dws;
2094 u32 pin_mask;
2060 2095
2061 if (id != 0) 2096 if (id != 0 || !data)
2062 return NULL; 2097 return NULL;
2063 2098
2064 pdev = platform_device_alloc("abdac", id); 2099 pdev = platform_device_alloc("atmel_abdac", id);
2065 if (!pdev) 2100 if (!pdev)
2066 return NULL; 2101 return NULL;
2067 2102
2068 if (platform_device_add_resources(pdev, abdac0_resource, 2103 if (platform_device_add_resources(pdev, abdac0_resource,
2069 ARRAY_SIZE(abdac0_resource))) 2104 ARRAY_SIZE(abdac0_resource)))
2070 goto err_add_resources; 2105 goto out_free_resources;
2106
2107 dws = &data->dws;
2108
2109 dws->dma_dev = &dw_dmac0_device.dev;
2110 dws->reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
2111 dws->cfg_hi = DWC_CFGH_DST_PER(2);
2112 dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
2113
2114 if (platform_device_add_data(pdev, data,
2115 sizeof(struct atmel_abdac_pdata)))
2116 goto out_free_resources;
2071 2117
2072 pin_mask = (1 << 20) | (1 << 22); /* DATA1 & DATAN1 */ 2118 pin_mask = (1 << 20) | (1 << 22); /* DATA1 & DATAN1 */
2073 pin_mask |= (1 << 21) | (1 << 23); /* DATA0 & DATAN0 */ 2119 pin_mask |= (1 << 21) | (1 << 23); /* DATA0 & DATAN0 */
@@ -2080,7 +2126,7 @@ struct platform_device *__init at32_add_device_abdac(unsigned int id)
2080 platform_device_add(pdev); 2126 platform_device_add(pdev);
2081 return pdev; 2127 return pdev;
2082 2128
2083err_add_resources: 2129out_free_resources:
2084 platform_device_put(pdev); 2130 platform_device_put(pdev);
2085 return NULL; 2131 return NULL;
2086} 2132}
diff --git a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
index 5c4c971eed8e..b9222bf895bc 100644
--- a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
+++ b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
@@ -171,25 +171,49 @@
171 ATMEL_LCDC(PE, DATA20) | ATMEL_LCDC(PE, DATA21) | \ 171 ATMEL_LCDC(PE, DATA20) | ATMEL_LCDC(PE, DATA21) | \
172 ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23)) 172 ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23))
173 173
174#define ATMEL_LCDC_PRI_15B_DATA ( \ 174#define ATMEL_LCDC_PRI_18B_DATA ( \
175 ATMEL_LCDC(PC, DATA0) | ATMEL_LCDC(PC, DATA1) | \
176 ATMEL_LCDC(PC, DATA2) | ATMEL_LCDC(PC, DATA3) | \ 175 ATMEL_LCDC(PC, DATA2) | ATMEL_LCDC(PC, DATA3) | \
177 ATMEL_LCDC(PC, DATA4) | ATMEL_LCDC(PC, DATA5) | \ 176 ATMEL_LCDC(PC, DATA4) | ATMEL_LCDC(PC, DATA5) | \
178 ATMEL_LCDC(PD, DATA8) | ATMEL_LCDC(PD, DATA9) | \ 177 ATMEL_LCDC(PD, DATA6) | ATMEL_LCDC(PD, DATA7) | \
179 ATMEL_LCDC(PD, DATA10) | ATMEL_LCDC(PD, DATA11) | \ 178 ATMEL_LCDC(PD, DATA10) | ATMEL_LCDC(PD, DATA11) | \
180 ATMEL_LCDC(PD, DATA12) | ATMEL_LCDC(PD, DATA16) | \ 179 ATMEL_LCDC(PD, DATA12) | ATMEL_LCDC(PD, DATA13) | \
181 ATMEL_LCDC(PD, DATA17) | ATMEL_LCDC(PD, DATA18) | \ 180 ATMEL_LCDC(PD, DATA14) | ATMEL_LCDC(PD, DATA15) | \
182 ATMEL_LCDC(PD, DATA19) | ATMEL_LCDC(PD, DATA20)) 181 ATMEL_LCDC(PD, DATA18) | ATMEL_LCDC(PD, DATA19) | \
182 ATMEL_LCDC(PD, DATA20) | ATMEL_LCDC(PD, DATA21) | \
183 ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23))
183 184
184#define ATMEL_LCDC_ALT_15B_DATA ( \ 185#define ATMEL_LCDC_ALT_18B_DATA ( \
185 ATMEL_LCDC(PE, DATA0) | ATMEL_LCDC(PE, DATA1) | \
186 ATMEL_LCDC(PE, DATA2) | ATMEL_LCDC(PE, DATA3) | \ 186 ATMEL_LCDC(PE, DATA2) | ATMEL_LCDC(PE, DATA3) | \
187 ATMEL_LCDC(PE, DATA4) | ATMEL_LCDC(PC, DATA5) | \ 187 ATMEL_LCDC(PE, DATA4) | ATMEL_LCDC(PC, DATA5) | \
188 ATMEL_LCDC(PE, DATA8) | ATMEL_LCDC(PE, DATA9) | \ 188 ATMEL_LCDC(PD, DATA6) | ATMEL_LCDC(PD, DATA7) | \
189 ATMEL_LCDC(PE, DATA10) | ATMEL_LCDC(PE, DATA11) | \ 189 ATMEL_LCDC(PE, DATA10) | ATMEL_LCDC(PE, DATA11) | \
190 ATMEL_LCDC(PE, DATA12) | ATMEL_LCDC(PE, DATA16) | \ 190 ATMEL_LCDC(PE, DATA12) | ATMEL_LCDC(PD, DATA13) | \
191 ATMEL_LCDC(PE, DATA17) | ATMEL_LCDC(PE, DATA18) | \ 191 ATMEL_LCDC(PD, DATA14) | ATMEL_LCDC(PD, DATA15) | \
192 ATMEL_LCDC(PE, DATA19) | ATMEL_LCDC(PE, DATA20)) 192 ATMEL_LCDC(PE, DATA18) | ATMEL_LCDC(PE, DATA19) | \
193 ATMEL_LCDC(PE, DATA20) | ATMEL_LCDC(PE, DATA21) | \
194 ATMEL_LCDC(PD, DATA22) | ATMEL_LCDC(PD, DATA23))
195
196#define ATMEL_LCDC_PRI_15B_DATA ( \
197 ATMEL_LCDC(PC, DATA3) | ATMEL_LCDC(PC, DATA4) | \
198 ATMEL_LCDC(PC, DATA5) | ATMEL_LCDC(PD, DATA6) | \
199 ATMEL_LCDC(PD, DATA7) | \
200 ATMEL_LCDC(PD, DATA11) | ATMEL_LCDC(PD, DATA12) | \
201 ATMEL_LCDC(PD, DATA13) | ATMEL_LCDC(PD, DATA14) | \
202 ATMEL_LCDC(PD, DATA15) | \
203 ATMEL_LCDC(PD, DATA19) | ATMEL_LCDC(PD, DATA20) | \
204 ATMEL_LCDC(PD, DATA21) | ATMEL_LCDC(PD, DATA22) | \
205 ATMEL_LCDC(PD, DATA23))
206
207#define ATMEL_LCDC_ALT_15B_DATA ( \
208 ATMEL_LCDC(PE, DATA3) | ATMEL_LCDC(PE, DATA4) | \
209 ATMEL_LCDC(PC, DATA5) | ATMEL_LCDC(PD, DATA6) | \
210 ATMEL_LCDC(PD, DATA7) | \
211 ATMEL_LCDC(PE, DATA11) | ATMEL_LCDC(PE, DATA12) | \
212 ATMEL_LCDC(PD, DATA13) | ATMEL_LCDC(PD, DATA14) | \
213 ATMEL_LCDC(PD, DATA15) | \
214 ATMEL_LCDC(PE, DATA19) | ATMEL_LCDC(PE, DATA20) | \
215 ATMEL_LCDC(PE, DATA21) | ATMEL_LCDC(PD, DATA22) | \
216 ATMEL_LCDC(PD, DATA23))
193 217
194#define ATMEL_LCDC_PRI_CONTROL ( \ 218#define ATMEL_LCDC_PRI_CONTROL ( \
195 ATMEL_LCDC(PC, CC) | ATMEL_LCDC(PC, DVAL) | \ 219 ATMEL_LCDC(PC, CC) | ATMEL_LCDC(PC, DVAL) | \
@@ -207,6 +231,10 @@
207 231
208#define ATMEL_LCDC_ALT_24BIT (ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_24B_DATA) 232#define ATMEL_LCDC_ALT_24BIT (ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_24B_DATA)
209 233
234#define ATMEL_LCDC_PRI_18BIT (ATMEL_LCDC_CONTROL | ATMEL_LCDC_PRI_18B_DATA)
235
236#define ATMEL_LCDC_ALT_18BIT (ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_18B_DATA)
237
210#define ATMEL_LCDC_PRI_15BIT (ATMEL_LCDC_CONTROL | ATMEL_LCDC_PRI_15B_DATA) 238#define ATMEL_LCDC_PRI_15BIT (ATMEL_LCDC_CONTROL | ATMEL_LCDC_PRI_15B_DATA)
211 239
212#define ATMEL_LCDC_ALT_15BIT (ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_15B_DATA) 240#define ATMEL_LCDC_ALT_15BIT (ATMEL_LCDC_CONTROL | ATMEL_LCDC_ALT_15B_DATA)
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index cff8e84f78f2..0b8164281899 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -13,7 +13,7 @@
13 * in this array is chip-dependent. 13 * in this array is chip-dependent.
14 */ 14 */
15extern unsigned long at32_board_osc_rates[]; 15extern unsigned long at32_board_osc_rates[];
16 16
17/* 17/*
18 * This used to add essential system devices, but this is now done 18 * This used to add essential system devices, but this is now done
19 * automatically. Please don't use it in new board code. 19 * automatically. Please don't use it in new board code.
@@ -26,12 +26,17 @@ static inline void __deprecated at32_add_system_devices(void)
26#define ATMEL_MAX_UART 4 26#define ATMEL_MAX_UART 4
27extern struct platform_device *atmel_default_console_device; 27extern struct platform_device *atmel_default_console_device;
28 28
29/* Flags for selecting USART extra pins */
30#define ATMEL_USART_RTS 0x01
31#define ATMEL_USART_CTS 0x02
32#define ATMEL_USART_CLK 0x03
33
29struct atmel_uart_data { 34struct atmel_uart_data {
30 short use_dma_tx; /* use transmit DMA? */ 35 short use_dma_tx; /* use transmit DMA? */
31 short use_dma_rx; /* use receive DMA? */ 36 short use_dma_rx; /* use receive DMA? */
32 void __iomem *regs; /* virtual base address, if any */ 37 void __iomem *regs; /* virtual base address, if any */
33}; 38};
34void at32_map_usart(unsigned int hw_id, unsigned int line); 39void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);
35struct platform_device *at32_add_device_usart(unsigned int id); 40struct platform_device *at32_add_device_usart(unsigned int id);
36 41
37struct eth_platform_data { 42struct eth_platform_data {
@@ -88,16 +93,15 @@ struct mci_platform_data;
88struct platform_device * 93struct platform_device *
89at32_add_device_mci(unsigned int id, struct mci_platform_data *data); 94at32_add_device_mci(unsigned int id, struct mci_platform_data *data);
90 95
91struct ac97c_platform_data { 96struct ac97c_platform_data;
92 unsigned short dma_rx_periph_id; 97struct platform_device *
93 unsigned short dma_tx_periph_id; 98at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
94 unsigned short dma_controller_id; 99 unsigned int flags);
95 int reset_pin; 100
96}; 101struct atmel_abdac_pdata;
97struct platform_device * 102struct platform_device *
98at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data); 103at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data);
99 104
100struct platform_device *at32_add_device_abdac(unsigned int id);
101struct platform_device *at32_add_device_psif(unsigned int id); 105struct platform_device *at32_add_device_psif(unsigned int id);
102 106
103struct cf_platform_data { 107struct cf_platform_data {
diff --git a/arch/blackfin/include/asm/ftrace.h b/arch/blackfin/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/blackfin/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/cris/include/asm/ftrace.h b/arch/cris/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/cris/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/h8300/include/asm/ftrace.h b/arch/h8300/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/h8300/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 153e727a6e8e..294a3b13ecac 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -22,6 +22,9 @@ config IA64
22 select HAVE_OPROFILE 22 select HAVE_OPROFILE
23 select HAVE_KPROBES 23 select HAVE_KPROBES
24 select HAVE_KRETPROBES 24 select HAVE_KRETPROBES
25 select HAVE_FTRACE_MCOUNT_RECORD
26 select HAVE_DYNAMIC_FTRACE if (!ITANIUM)
27 select HAVE_FUNCTION_TRACER
25 select HAVE_DMA_ATTRS 28 select HAVE_DMA_ATTRS
26 select HAVE_KVM 29 select HAVE_KVM
27 select HAVE_ARCH_TRACEHOOK 30 select HAVE_ARCH_TRACEHOOK
diff --git a/arch/ia64/include/asm/ftrace.h b/arch/ia64/include/asm/ftrace.h
new file mode 100644
index 000000000000..d20db3c2a656
--- /dev/null
+++ b/arch/ia64/include/asm/ftrace.h
@@ -0,0 +1,28 @@
1#ifndef _ASM_IA64_FTRACE_H
2#define _ASM_IA64_FTRACE_H
3
4#ifdef CONFIG_FUNCTION_TRACER
5#define MCOUNT_INSN_SIZE 32 /* sizeof mcount call */
6
7#ifndef __ASSEMBLY__
8extern void _mcount(unsigned long pfs, unsigned long r1, unsigned long b0, unsigned long r0);
9#define mcount _mcount
10
11#include <asm/kprobes.h>
12/* In IA64, MCOUNT_ADDR is set in link time, so it's not a constant at compile time */
13#define MCOUNT_ADDR (((struct fnptr *)mcount)->ip)
14#define FTRACE_ADDR (((struct fnptr *)ftrace_caller)->ip)
15
16static inline unsigned long ftrace_call_adjust(unsigned long addr)
17{
18 /* second bundle, insn 2 */
19 return addr - 0x12;
20}
21
22struct dyn_arch_ftrace {
23};
24#endif
25
26#endif /* CONFIG_FUNCTION_TRACER */
27
28#endif /* _ASM_IA64_FTRACE_H */
diff --git a/arch/ia64/include/asm/hardirq.h b/arch/ia64/include/asm/hardirq.h
index 140e495b8e0e..d514cd9edb49 100644
--- a/arch/ia64/include/asm/hardirq.h
+++ b/arch/ia64/include/asm/hardirq.h
@@ -20,16 +20,6 @@
20 20
21#define local_softirq_pending() (local_cpu_data->softirq_pending) 21#define local_softirq_pending() (local_cpu_data->softirq_pending)
22 22
23#define HARDIRQ_BITS 14
24
25/*
26 * The hardirq mask has to be large enough to have space for potentially all IRQ sources
27 * in the system nesting on a single CPU:
28 */
29#if (1 << HARDIRQ_BITS) < NR_IRQS
30# error HARDIRQ_BITS is too low!
31#endif
32
33extern void __iomem *ipi_base_addr; 23extern void __iomem *ipi_base_addr;
34 24
35void ack_bad_irq(unsigned int irq); 25void ack_bad_irq(unsigned int irq);
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 5628e9a990a6..6b7edcab0cb5 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -2,6 +2,10 @@
2# Makefile for the linux kernel. 2# Makefile for the linux kernel.
3# 3#
4 4
5ifdef CONFIG_DYNAMIC_FTRACE
6CFLAGS_REMOVE_ftrace.o = -pg
7endif
8
5extra-y := head.o init_task.o vmlinux.lds 9extra-y := head.o init_task.o vmlinux.lds
6 10
7obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \ 11obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o \
@@ -28,6 +32,7 @@ obj-$(CONFIG_IA64_CYCLONE) += cyclone.o
28obj-$(CONFIG_CPU_FREQ) += cpufreq/ 32obj-$(CONFIG_CPU_FREQ) += cpufreq/
29obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o 33obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
30obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o 34obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o
35obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
31obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o 36obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o
32obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 37obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
33obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o 38obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index ccfdeee9d89f..8dc69669586a 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -47,6 +47,7 @@
47#include <asm/processor.h> 47#include <asm/processor.h>
48#include <asm/thread_info.h> 48#include <asm/thread_info.h>
49#include <asm/unistd.h> 49#include <asm/unistd.h>
50#include <asm/ftrace.h>
50 51
51#include "minstate.h" 52#include "minstate.h"
52 53
@@ -1404,6 +1405,105 @@ GLOBAL_ENTRY(unw_init_running)
1404 br.ret.sptk.many rp 1405 br.ret.sptk.many rp
1405END(unw_init_running) 1406END(unw_init_running)
1406 1407
1408#ifdef CONFIG_FUNCTION_TRACER
1409#ifdef CONFIG_DYNAMIC_FTRACE
1410GLOBAL_ENTRY(_mcount)
1411 br ftrace_stub
1412END(_mcount)
1413
1414.here:
1415 br.ret.sptk.many b0
1416
1417GLOBAL_ENTRY(ftrace_caller)
1418 alloc out0 = ar.pfs, 8, 0, 4, 0
1419 mov out3 = r0
1420 ;;
1421 mov out2 = b0
1422 add r3 = 0x20, r3
1423 mov out1 = r1;
1424 br.call.sptk.many b0 = ftrace_patch_gp
1425 //this might be called from module, so we must patch gp
1426ftrace_patch_gp:
1427 movl gp=__gp
1428 mov b0 = r3
1429 ;;
1430.global ftrace_call;
1431ftrace_call:
1432{
1433 .mlx
1434 nop.m 0x0
1435 movl r3 = .here;;
1436}
1437 alloc loc0 = ar.pfs, 4, 4, 2, 0
1438 ;;
1439 mov loc1 = b0
1440 mov out0 = b0
1441 mov loc2 = r8
1442 mov loc3 = r15
1443 ;;
1444 adds out0 = -MCOUNT_INSN_SIZE, out0
1445 mov out1 = in2
1446 mov b6 = r3
1447
1448 br.call.sptk.many b0 = b6
1449 ;;
1450 mov ar.pfs = loc0
1451 mov b0 = loc1
1452 mov r8 = loc2
1453 mov r15 = loc3
1454 br ftrace_stub
1455 ;;
1456END(ftrace_caller)
1457
1458#else
1459GLOBAL_ENTRY(_mcount)
1460 movl r2 = ftrace_stub
1461 movl r3 = ftrace_trace_function;;
1462 ld8 r3 = [r3];;
1463 ld8 r3 = [r3];;
1464 cmp.eq p7,p0 = r2, r3
1465(p7) br.sptk.many ftrace_stub
1466 ;;
1467
1468 alloc loc0 = ar.pfs, 4, 4, 2, 0
1469 ;;
1470 mov loc1 = b0
1471 mov out0 = b0
1472 mov loc2 = r8
1473 mov loc3 = r15
1474 ;;
1475 adds out0 = -MCOUNT_INSN_SIZE, out0
1476 mov out1 = in2
1477 mov b6 = r3
1478
1479 br.call.sptk.many b0 = b6
1480 ;;
1481 mov ar.pfs = loc0
1482 mov b0 = loc1
1483 mov r8 = loc2
1484 mov r15 = loc3
1485 br ftrace_stub
1486 ;;
1487END(_mcount)
1488#endif
1489
1490GLOBAL_ENTRY(ftrace_stub)
1491 mov r3 = b0
1492 movl r2 = _mcount_ret_helper
1493 ;;
1494 mov b6 = r2
1495 mov b7 = r3
1496 br.ret.sptk.many b6
1497
1498_mcount_ret_helper:
1499 mov b0 = r42
1500 mov r1 = r41
1501 mov ar.pfs = r40
1502 br b7
1503END(ftrace_stub)
1504
1505#endif /* CONFIG_FUNCTION_TRACER */
1506
1407 .rodata 1507 .rodata
1408 .align 8 1508 .align 8
1409 .globl sys_call_table 1509 .globl sys_call_table
diff --git a/arch/ia64/kernel/ftrace.c b/arch/ia64/kernel/ftrace.c
new file mode 100644
index 000000000000..7fc8c961b1f7
--- /dev/null
+++ b/arch/ia64/kernel/ftrace.c
@@ -0,0 +1,206 @@
1/*
2 * Dynamic function tracing support.
3 *
4 * Copyright (C) 2008 Shaohua Li <shaohua.li@intel.com>
5 *
6 * For licencing details, see COPYING.
7 *
8 * Defines low-level handling of mcount calls when the kernel
9 * is compiled with the -pg flag. When using dynamic ftrace, the
10 * mcount call-sites get patched lazily with NOP till they are
11 * enabled. All code mutation routines here take effect atomically.
12 */
13
14#include <linux/uaccess.h>
15#include <linux/ftrace.h>
16
17#include <asm/cacheflush.h>
18#include <asm/patch.h>
19
20/* In IA64, each function will be added below two bundles with -pg option */
21static unsigned char __attribute__((aligned(8)))
22ftrace_orig_code[MCOUNT_INSN_SIZE] = {
23 0x02, 0x40, 0x31, 0x10, 0x80, 0x05, /* alloc r40=ar.pfs,12,8,0 */
24 0xb0, 0x02, 0x00, 0x00, 0x42, 0x40, /* mov r43=r0;; */
25 0x05, 0x00, 0xc4, 0x00, /* mov r42=b0 */
26 0x11, 0x48, 0x01, 0x02, 0x00, 0x21, /* mov r41=r1 */
27 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* nop.i 0x0 */
28 0x08, 0x00, 0x00, 0x50 /* br.call.sptk.many b0 = _mcount;; */
29};
30
31struct ftrace_orig_insn {
32 u64 dummy1, dummy2, dummy3;
33 u64 dummy4:64-41+13;
34 u64 imm20:20;
35 u64 dummy5:3;
36 u64 sign:1;
37 u64 dummy6:4;
38};
39
40/* mcount stub will be converted below for nop */
41static unsigned char ftrace_nop_code[MCOUNT_INSN_SIZE] = {
42 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MII] nop.m 0x0 */
43 0x30, 0x00, 0x00, 0x60, 0x00, 0x00, /* mov r3=ip */
44 0x00, 0x00, 0x04, 0x00, /* nop.i 0x0 */
45 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MLX] nop.m 0x0 */
46 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* nop.x 0x0;; */
47 0x00, 0x00, 0x04, 0x00
48};
49
50static unsigned char *ftrace_nop_replace(void)
51{
52 return ftrace_nop_code;
53}
54
55/*
56 * mcount stub will be converted below for call
57 * Note: Just the last instruction is changed against nop
58 * */
59static unsigned char __attribute__((aligned(8)))
60ftrace_call_code[MCOUNT_INSN_SIZE] = {
61 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MII] nop.m 0x0 */
62 0x30, 0x00, 0x00, 0x60, 0x00, 0x00, /* mov r3=ip */
63 0x00, 0x00, 0x04, 0x00, /* nop.i 0x0 */
64 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, /* [MLX] nop.m 0x0 */
65 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, /* brl.many .;;*/
66 0xf8, 0xff, 0xff, 0xc8
67};
68
69struct ftrace_call_insn {
70 u64 dummy1, dummy2;
71 u64 dummy3:48;
72 u64 imm39_l:16;
73 u64 imm39_h:23;
74 u64 dummy4:13;
75 u64 imm20:20;
76 u64 dummy5:3;
77 u64 i:1;
78 u64 dummy6:4;
79};
80
81static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
82{
83 struct ftrace_call_insn *code = (void *)ftrace_call_code;
84 unsigned long offset = addr - (ip + 0x10);
85
86 code->imm39_l = offset >> 24;
87 code->imm39_h = offset >> 40;
88 code->imm20 = offset >> 4;
89 code->i = offset >> 63;
90 return ftrace_call_code;
91}
92
93static int
94ftrace_modify_code(unsigned long ip, unsigned char *old_code,
95 unsigned char *new_code, int do_check)
96{
97 unsigned char replaced[MCOUNT_INSN_SIZE];
98
99 /*
100 * Note: Due to modules and __init, code can
101 * disappear and change, we need to protect against faulting
102 * as well as code changing. We do this by using the
103 * probe_kernel_* functions.
104 *
105 * No real locking needed, this code is run through
106 * kstop_machine, or before SMP starts.
107 */
108
109 if (!do_check)
110 goto skip_check;
111
112 /* read the text we want to modify */
113 if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
114 return -EFAULT;
115
116 /* Make sure it is what we expect it to be */
117 if (memcmp(replaced, old_code, MCOUNT_INSN_SIZE) != 0)
118 return -EINVAL;
119
120skip_check:
121 /* replace the text with the new text */
122 if (probe_kernel_write(((void *)ip), new_code, MCOUNT_INSN_SIZE))
123 return -EPERM;
124 flush_icache_range(ip, ip + MCOUNT_INSN_SIZE);
125
126 return 0;
127}
128
129static int ftrace_make_nop_check(struct dyn_ftrace *rec, unsigned long addr)
130{
131 unsigned char __attribute__((aligned(8))) replaced[MCOUNT_INSN_SIZE];
132 unsigned long ip = rec->ip;
133
134 if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
135 return -EFAULT;
136 if (rec->flags & FTRACE_FL_CONVERTED) {
137 struct ftrace_call_insn *call_insn, *tmp_call;
138
139 call_insn = (void *)ftrace_call_code;
140 tmp_call = (void *)replaced;
141 call_insn->imm39_l = tmp_call->imm39_l;
142 call_insn->imm39_h = tmp_call->imm39_h;
143 call_insn->imm20 = tmp_call->imm20;
144 call_insn->i = tmp_call->i;
145 if (memcmp(replaced, ftrace_call_code, MCOUNT_INSN_SIZE) != 0)
146 return -EINVAL;
147 return 0;
148 } else {
149 struct ftrace_orig_insn *call_insn, *tmp_call;
150
151 call_insn = (void *)ftrace_orig_code;
152 tmp_call = (void *)replaced;
153 call_insn->sign = tmp_call->sign;
154 call_insn->imm20 = tmp_call->imm20;
155 if (memcmp(replaced, ftrace_orig_code, MCOUNT_INSN_SIZE) != 0)
156 return -EINVAL;
157 return 0;
158 }
159}
160
161int ftrace_make_nop(struct module *mod,
162 struct dyn_ftrace *rec, unsigned long addr)
163{
164 int ret;
165 char *new;
166
167 ret = ftrace_make_nop_check(rec, addr);
168 if (ret)
169 return ret;
170 new = ftrace_nop_replace();
171 return ftrace_modify_code(rec->ip, NULL, new, 0);
172}
173
174int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
175{
176 unsigned long ip = rec->ip;
177 unsigned char *old, *new;
178
179 old= ftrace_nop_replace();
180 new = ftrace_call_replace(ip, addr);
181 return ftrace_modify_code(ip, old, new, 1);
182}
183
184/* in IA64, _mcount can't directly call ftrace_stub. Only jump is ok */
185int ftrace_update_ftrace_func(ftrace_func_t func)
186{
187 unsigned long ip;
188 unsigned long addr = ((struct fnptr *)ftrace_call)->ip;
189
190 if (func == ftrace_stub)
191 return 0;
192 ip = ((struct fnptr *)func)->ip;
193
194 ia64_patch_imm64(addr + 2, ip);
195
196 flush_icache_range(addr, addr + 16);
197 return 0;
198}
199
200/* run from kstop_machine */
201int __init ftrace_dyn_arch_init(void *data)
202{
203 *(unsigned long *)data = 0;
204
205 return 0;
206}
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
index 6da1f20d7372..2d311864e359 100644
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@ -112,3 +112,9 @@ EXPORT_SYMBOL_GPL(esi_call_phys);
112#endif 112#endif
113extern char ia64_ivt[]; 113extern char ia64_ivt[];
114EXPORT_SYMBOL(ia64_ivt); 114EXPORT_SYMBOL(ia64_ivt);
115
116#include <asm/ftrace.h>
117#ifdef CONFIG_FUNCTION_TRACER
118/* mcount is defined in assembly */
119EXPORT_SYMBOL(_mcount);
120#endif
diff --git a/arch/m68k/include/asm/ftrace.h b/arch/m68k/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/m68k/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/mips/include/asm/ftrace.h b/arch/mips/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/mips/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/powerpc/include/asm/mmzone.h b/arch/powerpc/include/asm/mmzone.h
index 19f299b7e256..35acac90c8ca 100644
--- a/arch/powerpc/include/asm/mmzone.h
+++ b/arch/powerpc/include/asm/mmzone.h
@@ -8,6 +8,7 @@
8#define _ASM_MMZONE_H_ 8#define _ASM_MMZONE_H_
9#ifdef __KERNEL__ 9#ifdef __KERNEL__
10 10
11#include <linux/cpumask.h>
11 12
12/* 13/*
13 * generic non-linear memory support: 14 * generic non-linear memory support:
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 5b5d16b2cac8..5455943f16aa 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -557,7 +557,6 @@ extern void mod_return_to_handler(void);
557void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 557void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
558{ 558{
559 unsigned long old; 559 unsigned long old;
560 unsigned long long calltime;
561 int faulted; 560 int faulted;
562 struct ftrace_graph_ent trace; 561 struct ftrace_graph_ent trace;
563 unsigned long return_hooker = (unsigned long)&return_to_handler; 562 unsigned long return_hooker = (unsigned long)&return_to_handler;
@@ -606,10 +605,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
606 return; 605 return;
607 } 606 }
608 607
609 calltime = cpu_clock(raw_smp_processor_id()); 608 if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) {
610
611 if (ftrace_push_return_trace(old, calltime,
612 self_addr, &trace.depth) == -EBUSY) {
613 *parent = old; 609 *parent = old;
614 return; 610 return;
615 } 611 }
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 2d52b515c241..5e4babecf934 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -28,6 +28,7 @@ config SUPERH32
28 select HAVE_FTRACE_MCOUNT_RECORD 28 select HAVE_FTRACE_MCOUNT_RECORD
29 select HAVE_DYNAMIC_FTRACE 29 select HAVE_DYNAMIC_FTRACE
30 select HAVE_ARCH_KGDB 30 select HAVE_ARCH_KGDB
31 select ARCH_HIBERNATION_POSSIBLE if MMU
31 32
32config SUPERH64 33config SUPERH64
33 def_bool y if CPU_SH5 34 def_bool y if CPU_SH5
@@ -129,6 +130,9 @@ config ARCH_HAS_ILOG2_U64
129config ARCH_NO_VIRT_TO_BUS 130config ARCH_NO_VIRT_TO_BUS
130 def_bool y 131 def_bool y
131 132
133config ARCH_HAS_DEFAULT_IDLE
134 def_bool y
135
132config IO_TRAPPED 136config IO_TRAPPED
133 bool 137 bool
134 138
@@ -530,7 +534,7 @@ source kernel/Kconfig.hz
530 534
531config KEXEC 535config KEXEC
532 bool "kexec system call (EXPERIMENTAL)" 536 bool "kexec system call (EXPERIMENTAL)"
533 depends on SUPERH32 && EXPERIMENTAL 537 depends on SUPERH32 && EXPERIMENTAL && MMU
534 help 538 help
535 kexec is a system call that implements the ability to shutdown your 539 kexec is a system call that implements the ability to shutdown your
536 current kernel, and to start another kernel. It is like a reboot 540 current kernel, and to start another kernel. It is like a reboot
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index e27655b8a98d..912458f666eb 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -22,6 +22,7 @@
22#include <linux/gpio.h> 22#include <linux/gpio.h>
23#include <linux/spi/spi.h> 23#include <linux/spi/spi.h>
24#include <linux/spi/spi_gpio.h> 24#include <linux/spi/spi_gpio.h>
25#include <media/ov772x.h>
25#include <media/soc_camera.h> 26#include <media/soc_camera.h>
26#include <media/soc_camera_platform.h> 27#include <media/soc_camera_platform.h>
27#include <media/sh_mobile_ceu.h> 28#include <media/sh_mobile_ceu.h>
@@ -235,6 +236,7 @@ static void camera_power(int val)
235} 236}
236 237
237#ifdef CONFIG_I2C 238#ifdef CONFIG_I2C
239/* support for the old ncm03j camera */
238static unsigned char camera_ncm03j_magic[] = 240static unsigned char camera_ncm03j_magic[] =
239{ 241{
240 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8, 242 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
@@ -255,6 +257,23 @@ static unsigned char camera_ncm03j_magic[] =
255 0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F, 257 0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F,
256}; 258};
257 259
260static int camera_probe(void)
261{
262 struct i2c_adapter *a = i2c_get_adapter(0);
263 struct i2c_msg msg;
264 int ret;
265
266 camera_power(1);
267 msg.addr = 0x6e;
268 msg.buf = camera_ncm03j_magic;
269 msg.len = 2;
270 msg.flags = 0;
271 ret = i2c_transfer(a, &msg, 1);
272 camera_power(0);
273
274 return ret;
275}
276
258static int camera_set_capture(struct soc_camera_platform_info *info, 277static int camera_set_capture(struct soc_camera_platform_info *info,
259 int enable) 278 int enable)
260{ 279{
@@ -306,12 +325,37 @@ static struct platform_device camera_device = {
306 .platform_data = &camera_info, 325 .platform_data = &camera_info,
307 }, 326 },
308}; 327};
328
329static int __init camera_setup(void)
330{
331 if (camera_probe() > 0)
332 platform_device_register(&camera_device);
333
334 return 0;
335}
336late_initcall(camera_setup);
337
309#endif /* CONFIG_I2C */ 338#endif /* CONFIG_I2C */
310 339
340static int ov7725_power(struct device *dev, int mode)
341{
342 camera_power(0);
343 if (mode)
344 camera_power(1);
345
346 return 0;
347}
348
349static struct ov772x_camera_info ov7725_info = {
350 .buswidth = SOCAM_DATAWIDTH_8,
351 .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
352 .link = {
353 .power = ov7725_power,
354 },
355};
356
311static struct sh_mobile_ceu_info sh_mobile_ceu_info = { 357static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
312 .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | 358 .flags = SH_CEU_FLAG_USE_8BIT_BUS,
313 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER |
314 SOCAM_DATAWIDTH_8,
315}; 359};
316 360
317static struct resource ceu_resources[] = { 361static struct resource ceu_resources[] = {
@@ -359,9 +403,6 @@ static struct platform_device *ap325rxa_devices[] __initdata = {
359 &ap325rxa_nor_flash_device, 403 &ap325rxa_nor_flash_device,
360 &lcdc_device, 404 &lcdc_device,
361 &ceu_device, 405 &ceu_device,
362#ifdef CONFIG_I2C
363 &camera_device,
364#endif
365 &nand_flash_device, 406 &nand_flash_device,
366 &sdcard_cn3_device, 407 &sdcard_cn3_device,
367}; 408};
@@ -370,6 +411,10 @@ static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
370 { 411 {
371 I2C_BOARD_INFO("pcf8563", 0x51), 412 I2C_BOARD_INFO("pcf8563", 0x51),
372 }, 413 },
414 {
415 I2C_BOARD_INFO("ov772x", 0x21),
416 .platform_data = &ov7725_info,
417 },
373}; 418};
374 419
375static struct spi_board_info ap325rxa_spi_devices[] = { 420static struct spi_board_info ap325rxa_spi_devices[] = {
diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c
index 17036ce20086..8367d1d789c3 100644
--- a/arch/sh/boards/board-urquell.c
+++ b/arch/sh/boards/board-urquell.c
@@ -129,6 +129,10 @@ static int __init urquell_devices_setup(void)
129 gpio_request(GPIO_FN_USB_OVC0, NULL); 129 gpio_request(GPIO_FN_USB_OVC0, NULL);
130 gpio_request(GPIO_FN_USB_PENC0, NULL); 130 gpio_request(GPIO_FN_USB_PENC0, NULL);
131 131
132 /* enable LAN */
133 __raw_writew(__raw_readw(UBOARDREG(IRL2MSKR)) & ~0x00000001,
134 UBOARDREG(IRL2MSKR));
135
132 return platform_add_devices(urquell_devices, 136 return platform_add_devices(urquell_devices,
133 ARRAY_SIZE(urquell_devices)); 137 ARRAY_SIZE(urquell_devices));
134} 138}
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 4fd6a727873c..1ee1de0bc1c3 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -352,9 +352,7 @@ static int tw9910_power(struct device *dev, int mode)
352} 352}
353 353
354static struct sh_mobile_ceu_info sh_mobile_ceu_info = { 354static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
355 .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING 355 .flags = SH_CEU_FLAG_USE_8BIT_BUS,
356 | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH
357 | SOCAM_DATA_ACTIVE_HIGH,
358}; 356};
359 357
360static struct resource migor_ceu_resources[] = { 358static struct resource migor_ceu_resources[] = {
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig
index 352f87d50fdc..c8d982a8a2e6 100644
--- a/arch/sh/configs/ap325rxa_defconfig
+++ b/arch/sh/configs/ap325rxa_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.29-rc2 3# Linux kernel version: 2.6.29
4# Tue Jan 27 11:45:08 2009 4# Thu Apr 2 17:46:53 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,14 +16,16 @@ CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_GENERIC_GPIO=y 16CONFIG_GENERIC_GPIO=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19CONFIG_ARCH_SUSPEND_POSSIBLE=y
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_CMT=y
21CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 24CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 30
29# 31#
@@ -43,6 +45,15 @@ CONFIG_BSD_PROCESS_ACCT=y
43# CONFIG_BSD_PROCESS_ACCT_V3 is not set 45# CONFIG_BSD_PROCESS_ACCT_V3 is not set
44# CONFIG_TASKSTATS is not set 46# CONFIG_TASKSTATS is not set
45# CONFIG_AUDIT is not set 47# CONFIG_AUDIT is not set
48
49#
50# RCU Subsystem
51#
52CONFIG_CLASSIC_RCU=y
53# CONFIG_TREE_RCU is not set
54# CONFIG_PREEMPT_RCU is not set
55# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
46# CONFIG_IKCONFIG is not set 57# CONFIG_IKCONFIG is not set
47CONFIG_LOG_BUF_SHIFT=14 58CONFIG_LOG_BUF_SHIFT=14
48CONFIG_GROUP_SCHED=y 59CONFIG_GROUP_SCHED=y
@@ -58,6 +69,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
58# CONFIG_BLK_DEV_INITRD is not set 69# CONFIG_BLK_DEV_INITRD is not set
59CONFIG_CC_OPTIMIZE_FOR_SIZE=y 70CONFIG_CC_OPTIMIZE_FOR_SIZE=y
60CONFIG_SYSCTL=y 71CONFIG_SYSCTL=y
72CONFIG_ANON_INODES=y
61CONFIG_EMBEDDED=y 73CONFIG_EMBEDDED=y
62CONFIG_UID16=y 74CONFIG_UID16=y
63CONFIG_SYSCTL_SYSCALL=y 75CONFIG_SYSCTL_SYSCALL=y
@@ -66,10 +78,8 @@ CONFIG_HOTPLUG=y
66CONFIG_PRINTK=y 78CONFIG_PRINTK=y
67CONFIG_BUG=y 79CONFIG_BUG=y
68CONFIG_ELF_CORE=y 80CONFIG_ELF_CORE=y
69CONFIG_COMPAT_BRK=y
70CONFIG_BASE_FULL=y 81CONFIG_BASE_FULL=y
71CONFIG_FUTEX=y 82CONFIG_FUTEX=y
72CONFIG_ANON_INODES=y
73CONFIG_EPOLL=y 83CONFIG_EPOLL=y
74CONFIG_SIGNALFD=y 84CONFIG_SIGNALFD=y
75CONFIG_TIMERFD=y 85CONFIG_TIMERFD=y
@@ -77,6 +87,7 @@ CONFIG_EVENTFD=y
77CONFIG_SHMEM=y 87CONFIG_SHMEM=y
78CONFIG_AIO=y 88CONFIG_AIO=y
79CONFIG_VM_EVENT_COUNTERS=y 89CONFIG_VM_EVENT_COUNTERS=y
90CONFIG_COMPAT_BRK=y
80CONFIG_SLAB=y 91CONFIG_SLAB=y
81# CONFIG_SLUB is not set 92# CONFIG_SLUB is not set
82# CONFIG_SLOB is not set 93# CONFIG_SLOB is not set
@@ -115,11 +126,6 @@ CONFIG_IOSCHED_CFQ=y
115CONFIG_DEFAULT_CFQ=y 126CONFIG_DEFAULT_CFQ=y
116# CONFIG_DEFAULT_NOOP is not set 127# CONFIG_DEFAULT_NOOP is not set
117CONFIG_DEFAULT_IOSCHED="cfq" 128CONFIG_DEFAULT_IOSCHED="cfq"
118CONFIG_CLASSIC_RCU=y
119# CONFIG_TREE_RCU is not set
120# CONFIG_PREEMPT_RCU is not set
121# CONFIG_TREE_RCU_TRACE is not set
122# CONFIG_PREEMPT_RCU_TRACE is not set
123# CONFIG_FREEZER is not set 129# CONFIG_FREEZER is not set
124 130
125# 131#
@@ -128,6 +134,7 @@ CONFIG_CLASSIC_RCU=y
128CONFIG_CPU_SH4=y 134CONFIG_CPU_SH4=y
129CONFIG_CPU_SH4A=y 135CONFIG_CPU_SH4A=y
130CONFIG_CPU_SHX2=y 136CONFIG_CPU_SHX2=y
137CONFIG_ARCH_SHMOBILE=y
131# CONFIG_CPU_SUBTYPE_SH7619 is not set 138# CONFIG_CPU_SUBTYPE_SH7619 is not set
132# CONFIG_CPU_SUBTYPE_SH7201 is not set 139# CONFIG_CPU_SUBTYPE_SH7201 is not set
133# CONFIG_CPU_SUBTYPE_SH7203 is not set 140# CONFIG_CPU_SUBTYPE_SH7203 is not set
@@ -156,6 +163,7 @@ CONFIG_CPU_SUBTYPE_SH7723=y
156# CONFIG_CPU_SUBTYPE_SH7770 is not set 163# CONFIG_CPU_SUBTYPE_SH7770 is not set
157# CONFIG_CPU_SUBTYPE_SH7780 is not set 164# CONFIG_CPU_SUBTYPE_SH7780 is not set
158# CONFIG_CPU_SUBTYPE_SH7785 is not set 165# CONFIG_CPU_SUBTYPE_SH7785 is not set
166# CONFIG_CPU_SUBTYPE_SH7786 is not set
159# CONFIG_CPU_SUBTYPE_SHX3 is not set 167# CONFIG_CPU_SUBTYPE_SHX3 is not set
160# CONFIG_CPU_SUBTYPE_SH7343 is not set 168# CONFIG_CPU_SUBTYPE_SH7343 is not set
161# CONFIG_CPU_SUBTYPE_SH7722 is not set 169# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -198,11 +206,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
198CONFIG_ZONE_DMA_FLAG=0 206CONFIG_ZONE_DMA_FLAG=0
199CONFIG_NR_QUICK=2 207CONFIG_NR_QUICK=2
200CONFIG_UNEVICTABLE_LRU=y 208CONFIG_UNEVICTABLE_LRU=y
209CONFIG_HAVE_MLOCK=y
210CONFIG_HAVE_MLOCKED_PAGE_BIT=y
201 211
202# 212#
203# Cache configuration 213# Cache configuration
204# 214#
205# CONFIG_SH_DIRECT_MAPPED is not set
206CONFIG_CACHE_WRITEBACK=y 215CONFIG_CACHE_WRITEBACK=y
207# CONFIG_CACHE_WRITETHROUGH is not set 216# CONFIG_CACHE_WRITETHROUGH is not set
208# CONFIG_CACHE_OFF is not set 217# CONFIG_CACHE_OFF is not set
@@ -228,6 +237,7 @@ CONFIG_SH_AP325RXA=y
228# Timer and clock configuration 237# Timer and clock configuration
229# 238#
230CONFIG_SH_TMU=y 239CONFIG_SH_TMU=y
240# CONFIG_SH_TIMER_CMT is not set
231CONFIG_SH_TIMER_IRQ=16 241CONFIG_SH_TIMER_IRQ=16
232CONFIG_SH_PCLK_FREQ=33333333 242CONFIG_SH_PCLK_FREQ=33333333
233CONFIG_TICK_ONESHOT=y 243CONFIG_TICK_ONESHOT=y
@@ -304,7 +314,6 @@ CONFIG_NET=y
304# 314#
305# Networking options 315# Networking options
306# 316#
307CONFIG_COMPAT_NET_DEV_OPS=y
308CONFIG_PACKET=y 317CONFIG_PACKET=y
309# CONFIG_PACKET_MMAP is not set 318# CONFIG_PACKET_MMAP is not set
310CONFIG_UNIX=y 319CONFIG_UNIX=y
@@ -359,6 +368,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
359# CONFIG_LAPB is not set 368# CONFIG_LAPB is not set
360# CONFIG_ECONET is not set 369# CONFIG_ECONET is not set
361# CONFIG_WAN_ROUTER is not set 370# CONFIG_WAN_ROUTER is not set
371# CONFIG_PHONET is not set
362# CONFIG_NET_SCHED is not set 372# CONFIG_NET_SCHED is not set
363# CONFIG_DCB is not set 373# CONFIG_DCB is not set
364 374
@@ -371,7 +381,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
371# CONFIG_IRDA is not set 381# CONFIG_IRDA is not set
372# CONFIG_BT is not set 382# CONFIG_BT is not set
373# CONFIG_AF_RXRPC is not set 383# CONFIG_AF_RXRPC is not set
374# CONFIG_PHONET is not set
375CONFIG_WIRELESS=y 384CONFIG_WIRELESS=y
376# CONFIG_CFG80211 is not set 385# CONFIG_CFG80211 is not set
377# CONFIG_WIRELESS_OLD_REGULATORY is not set 386# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -483,7 +492,6 @@ CONFIG_MTD_NAND_SH_FLCTL=y
483# LPDDR flash memory drivers 492# LPDDR flash memory drivers
484# 493#
485# CONFIG_MTD_LPDDR is not set 494# CONFIG_MTD_LPDDR is not set
486# CONFIG_MTD_QINFO_PROBE is not set
487 495
488# 496#
489# UBI - Unsorted block images 497# UBI - Unsorted block images
@@ -510,10 +518,18 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
510# CONFIG_ATA_OVER_ETH is not set 518# CONFIG_ATA_OVER_ETH is not set
511# CONFIG_BLK_DEV_HD is not set 519# CONFIG_BLK_DEV_HD is not set
512CONFIG_MISC_DEVICES=y 520CONFIG_MISC_DEVICES=y
513# CONFIG_EEPROM_93CX6 is not set
514# CONFIG_ICS932S401 is not set 521# CONFIG_ICS932S401 is not set
515# CONFIG_ENCLOSURE_SERVICES is not set 522# CONFIG_ENCLOSURE_SERVICES is not set
523# CONFIG_ISL29003 is not set
516# CONFIG_C2PORT is not set 524# CONFIG_C2PORT is not set
525
526#
527# EEPROM support
528#
529# CONFIG_EEPROM_AT24 is not set
530# CONFIG_EEPROM_AT25 is not set
531# CONFIG_EEPROM_LEGACY is not set
532# CONFIG_EEPROM_93CX6 is not set
517CONFIG_HAVE_IDE=y 533CONFIG_HAVE_IDE=y
518# CONFIG_IDE is not set 534# CONFIG_IDE is not set
519 535
@@ -559,9 +575,11 @@ CONFIG_SCSI_LOWLEVEL=y
559# CONFIG_LIBFC is not set 575# CONFIG_LIBFC is not set
560# CONFIG_SCSI_DEBUG is not set 576# CONFIG_SCSI_DEBUG is not set
561# CONFIG_SCSI_DH is not set 577# CONFIG_SCSI_DH is not set
578# CONFIG_SCSI_OSD_INITIATOR is not set
562# CONFIG_ATA is not set 579# CONFIG_ATA is not set
563# CONFIG_MD is not set 580# CONFIG_MD is not set
564CONFIG_NETDEVICES=y 581CONFIG_NETDEVICES=y
582CONFIG_COMPAT_NET_DEV_OPS=y
565# CONFIG_DUMMY is not set 583# CONFIG_DUMMY is not set
566# CONFIG_BONDING is not set 584# CONFIG_BONDING is not set
567# CONFIG_MACVLAN is not set 585# CONFIG_MACVLAN is not set
@@ -594,8 +612,10 @@ CONFIG_MII=y
594# CONFIG_STNIC is not set 612# CONFIG_STNIC is not set
595# CONFIG_SMC91X is not set 613# CONFIG_SMC91X is not set
596# CONFIG_ENC28J60 is not set 614# CONFIG_ENC28J60 is not set
615# CONFIG_ETHOC is not set
597# CONFIG_SMC911X is not set 616# CONFIG_SMC911X is not set
598CONFIG_SMSC911X=y 617CONFIG_SMSC911X=y
618# CONFIG_DNET is not set
599# CONFIG_IBM_NEW_EMAC_ZMII is not set 619# CONFIG_IBM_NEW_EMAC_ZMII is not set
600# CONFIG_IBM_NEW_EMAC_RGMII is not set 620# CONFIG_IBM_NEW_EMAC_RGMII is not set
601# CONFIG_IBM_NEW_EMAC_TAH is not set 621# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -612,7 +632,6 @@ CONFIG_SMSC911X=y
612# 632#
613# CONFIG_WLAN_PRE80211 is not set 633# CONFIG_WLAN_PRE80211 is not set
614# CONFIG_WLAN_80211 is not set 634# CONFIG_WLAN_80211 is not set
615# CONFIG_IWLWIFI_LEDS is not set
616 635
617# 636#
618# Enable WiMAX (Networking options) to see the WiMAX drivers 637# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -687,6 +706,7 @@ CONFIG_LEGACY_PTYS=y
687CONFIG_LEGACY_PTY_COUNT=256 706CONFIG_LEGACY_PTY_COUNT=256
688# CONFIG_IPMI_HANDLER is not set 707# CONFIG_IPMI_HANDLER is not set
689CONFIG_HW_RANDOM=y 708CONFIG_HW_RANDOM=y
709# CONFIG_HW_RANDOM_TIMERIOMEM is not set
690# CONFIG_R3964 is not set 710# CONFIG_R3964 is not set
691# CONFIG_RAW_DRIVER is not set 711# CONFIG_RAW_DRIVER is not set
692# CONFIG_TCG_TPM is not set 712# CONFIG_TCG_TPM is not set
@@ -723,12 +743,9 @@ CONFIG_I2C_SH_MOBILE=y
723# Miscellaneous I2C Chip support 743# Miscellaneous I2C Chip support
724# 744#
725# CONFIG_DS1682 is not set 745# CONFIG_DS1682 is not set
726# CONFIG_AT24 is not set
727# CONFIG_SENSORS_EEPROM is not set
728# CONFIG_SENSORS_PCF8574 is not set 746# CONFIG_SENSORS_PCF8574 is not set
729# CONFIG_PCF8575 is not set 747# CONFIG_PCF8575 is not set
730# CONFIG_SENSORS_PCA9539 is not set 748# CONFIG_SENSORS_PCA9539 is not set
731# CONFIG_SENSORS_PCF8591 is not set
732# CONFIG_SENSORS_MAX6875 is not set 749# CONFIG_SENSORS_MAX6875 is not set
733# CONFIG_SENSORS_TSL2550 is not set 750# CONFIG_SENSORS_TSL2550 is not set
734# CONFIG_I2C_DEBUG_CORE is not set 751# CONFIG_I2C_DEBUG_CORE is not set
@@ -748,7 +765,6 @@ CONFIG_SPI_GPIO=y
748# 765#
749# SPI Protocol Masters 766# SPI Protocol Masters
750# 767#
751# CONFIG_SPI_AT25 is not set
752# CONFIG_SPI_SPIDEV is not set 768# CONFIG_SPI_SPIDEV is not set
753# CONFIG_SPI_TLE62X0 is not set 769# CONFIG_SPI_TLE62X0 is not set
754CONFIG_ARCH_REQUIRE_GPIOLIB=y 770CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -822,7 +838,7 @@ CONFIG_VIDEO_MEDIA=y
822# 838#
823# CONFIG_MEDIA_ATTACH is not set 839# CONFIG_MEDIA_ATTACH is not set
824CONFIG_MEDIA_TUNER=y 840CONFIG_MEDIA_TUNER=y
825# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set 841# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
826CONFIG_MEDIA_TUNER_SIMPLE=y 842CONFIG_MEDIA_TUNER_SIMPLE=y
827CONFIG_MEDIA_TUNER_TDA8290=y 843CONFIG_MEDIA_TUNER_TDA8290=y
828CONFIG_MEDIA_TUNER_TDA9887=y 844CONFIG_MEDIA_TUNER_TDA9887=y
@@ -831,6 +847,7 @@ CONFIG_MEDIA_TUNER_TEA5767=y
831CONFIG_MEDIA_TUNER_MT20XX=y 847CONFIG_MEDIA_TUNER_MT20XX=y
832CONFIG_MEDIA_TUNER_XC2028=y 848CONFIG_MEDIA_TUNER_XC2028=y
833CONFIG_MEDIA_TUNER_XC5000=y 849CONFIG_MEDIA_TUNER_XC5000=y
850CONFIG_MEDIA_TUNER_MC44S803=y
834CONFIG_VIDEO_V4L2=y 851CONFIG_VIDEO_V4L2=y
835CONFIG_VIDEOBUF_GEN=y 852CONFIG_VIDEOBUF_GEN=y
836CONFIG_VIDEOBUF_DMA_CONTIG=y 853CONFIG_VIDEOBUF_DMA_CONTIG=y
@@ -886,6 +903,7 @@ CONFIG_FB_SH_MOBILE_LCDC=y
886# CONFIG_FB_VIRTUAL is not set 903# CONFIG_FB_VIRTUAL is not set
887# CONFIG_FB_METRONOME is not set 904# CONFIG_FB_METRONOME is not set
888# CONFIG_FB_MB862XX is not set 905# CONFIG_FB_MB862XX is not set
906# CONFIG_FB_BROADSHEET is not set
889# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 907# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
890 908
891# 909#
@@ -995,6 +1013,7 @@ CONFIG_RTC_DRV_PCF8563=y
995# 1013#
996# CONFIG_RTC_DRV_SH is not set 1014# CONFIG_RTC_DRV_SH is not set
997# CONFIG_DMADEVICES is not set 1015# CONFIG_DMADEVICES is not set
1016# CONFIG_AUXDISPLAY is not set
998CONFIG_UIO=y 1017CONFIG_UIO=y
999# CONFIG_UIO_PDRV is not set 1018# CONFIG_UIO_PDRV is not set
1000CONFIG_UIO_PDRV_GENIRQ=y 1019CONFIG_UIO_PDRV_GENIRQ=y
@@ -1096,7 +1115,6 @@ CONFIG_LOCKD_V4=y
1096CONFIG_EXPORTFS=y 1115CONFIG_EXPORTFS=y
1097CONFIG_NFS_COMMON=y 1116CONFIG_NFS_COMMON=y
1098CONFIG_SUNRPC=y 1117CONFIG_SUNRPC=y
1099# CONFIG_SUNRPC_REGISTER_V4 is not set
1100# CONFIG_RPCSEC_GSS_KRB5 is not set 1118# CONFIG_RPCSEC_GSS_KRB5 is not set
1101# CONFIG_RPCSEC_GSS_SPKM3 is not set 1119# CONFIG_RPCSEC_GSS_SPKM3 is not set
1102# CONFIG_SMB_FS is not set 1120# CONFIG_SMB_FS is not set
@@ -1177,7 +1195,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1177# 1195#
1178# Tracers 1196# Tracers
1179# 1197#
1180# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1181# CONFIG_SAMPLES is not set 1198# CONFIG_SAMPLES is not set
1182CONFIG_HAVE_ARCH_KGDB=y 1199CONFIG_HAVE_ARCH_KGDB=y
1183# CONFIG_SH_STANDARD_BIOS is not set 1200# CONFIG_SH_STANDARD_BIOS is not set
@@ -1204,10 +1221,12 @@ CONFIG_CRYPTO_BLKCIPHER=y
1204CONFIG_CRYPTO_BLKCIPHER2=y 1221CONFIG_CRYPTO_BLKCIPHER2=y
1205CONFIG_CRYPTO_HASH2=y 1222CONFIG_CRYPTO_HASH2=y
1206CONFIG_CRYPTO_RNG2=y 1223CONFIG_CRYPTO_RNG2=y
1224CONFIG_CRYPTO_PCOMP=y
1207CONFIG_CRYPTO_MANAGER=y 1225CONFIG_CRYPTO_MANAGER=y
1208CONFIG_CRYPTO_MANAGER2=y 1226CONFIG_CRYPTO_MANAGER2=y
1209# CONFIG_CRYPTO_GF128MUL is not set 1227# CONFIG_CRYPTO_GF128MUL is not set
1210# CONFIG_CRYPTO_NULL is not set 1228# CONFIG_CRYPTO_NULL is not set
1229CONFIG_CRYPTO_WORKQUEUE=y
1211# CONFIG_CRYPTO_CRYPTD is not set 1230# CONFIG_CRYPTO_CRYPTD is not set
1212# CONFIG_CRYPTO_AUTHENC is not set 1231# CONFIG_CRYPTO_AUTHENC is not set
1213# CONFIG_CRYPTO_TEST is not set 1232# CONFIG_CRYPTO_TEST is not set
@@ -1276,6 +1295,7 @@ CONFIG_CRYPTO_CBC=y
1276# Compression 1295# Compression
1277# 1296#
1278# CONFIG_CRYPTO_DEFLATE is not set 1297# CONFIG_CRYPTO_DEFLATE is not set
1298# CONFIG_CRYPTO_ZLIB is not set
1279# CONFIG_CRYPTO_LZO is not set 1299# CONFIG_CRYPTO_LZO is not set
1280 1300
1281# 1301#
@@ -1296,7 +1316,7 @@ CONFIG_CRC_ITU_T=y
1296CONFIG_CRC32=y 1316CONFIG_CRC32=y
1297CONFIG_CRC7=y 1317CONFIG_CRC7=y
1298# CONFIG_LIBCRC32C is not set 1318# CONFIG_LIBCRC32C is not set
1299CONFIG_PLIST=y
1300CONFIG_HAS_IOMEM=y 1319CONFIG_HAS_IOMEM=y
1301CONFIG_HAS_IOPORT=y 1320CONFIG_HAS_IOPORT=y
1302CONFIG_HAS_DMA=y 1321CONFIG_HAS_DMA=y
1322CONFIG_NLATTR=y
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index 92895013813d..fa5fc1e1e980 100644
--- a/arch/sh/configs/cayman_defconfig
+++ b/arch/sh/configs/cayman_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27 3# Linux kernel version: 2.6.29
4# Wed Oct 22 18:04:52 2008 4# Thu Apr 2 17:49:14 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7# CONFIG_SUPERH32 is not set 7# CONFIG_SUPERH32 is not set
@@ -16,6 +16,8 @@ CONFIG_GENERIC_IRQ_PROBE=y
16# CONFIG_GENERIC_GPIO is not set 16# CONFIG_GENERIC_GPIO is not set
17# CONFIG_GENERIC_TIME is not set 17# CONFIG_GENERIC_TIME is not set
18# CONFIG_GENERIC_CLOCKEVENTS is not set 18# CONFIG_GENERIC_CLOCKEVENTS is not set
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
19CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
20CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
21CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -23,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
23# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
24# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
25CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
26CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
27 30
28# 31#
@@ -40,10 +43,19 @@ CONFIG_POSIX_MQUEUE=y
40# CONFIG_BSD_PROCESS_ACCT is not set 43# CONFIG_BSD_PROCESS_ACCT is not set
41# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
42# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
43# CONFIG_IKCONFIG is not set 55# CONFIG_IKCONFIG is not set
44CONFIG_LOG_BUF_SHIFT=14 56CONFIG_LOG_BUF_SHIFT=14
45# CONFIG_CGROUPS is not set
46# CONFIG_GROUP_SCHED is not set 57# CONFIG_GROUP_SCHED is not set
58# CONFIG_CGROUPS is not set
47CONFIG_SYSFS_DEPRECATED=y 59CONFIG_SYSFS_DEPRECATED=y
48CONFIG_SYSFS_DEPRECATED_V2=y 60CONFIG_SYSFS_DEPRECATED_V2=y
49# CONFIG_RELAY is not set 61# CONFIG_RELAY is not set
@@ -51,6 +63,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
51# CONFIG_BLK_DEV_INITRD is not set 63# CONFIG_BLK_DEV_INITRD is not set
52# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 64# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
53CONFIG_SYSCTL=y 65CONFIG_SYSCTL=y
66CONFIG_ANON_INODES=y
54CONFIG_EMBEDDED=y 67CONFIG_EMBEDDED=y
55CONFIG_UID16=y 68CONFIG_UID16=y
56CONFIG_SYSCTL_SYSCALL=y 69CONFIG_SYSCTL_SYSCALL=y
@@ -61,10 +74,8 @@ CONFIG_HOTPLUG=y
61CONFIG_PRINTK=y 74CONFIG_PRINTK=y
62CONFIG_BUG=y 75CONFIG_BUG=y
63CONFIG_ELF_CORE=y 76CONFIG_ELF_CORE=y
64CONFIG_COMPAT_BRK=y
65CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
66CONFIG_FUTEX=y 78CONFIG_FUTEX=y
67CONFIG_ANON_INODES=y
68CONFIG_EPOLL=y 79CONFIG_EPOLL=y
69CONFIG_SIGNALFD=y 80CONFIG_SIGNALFD=y
70CONFIG_TIMERFD=y 81CONFIG_TIMERFD=y
@@ -73,18 +84,18 @@ CONFIG_SHMEM=y
73CONFIG_AIO=y 84CONFIG_AIO=y
74CONFIG_VM_EVENT_COUNTERS=y 85CONFIG_VM_EVENT_COUNTERS=y
75CONFIG_PCI_QUIRKS=y 86CONFIG_PCI_QUIRKS=y
87CONFIG_COMPAT_BRK=y
76CONFIG_SLAB=y 88CONFIG_SLAB=y
77# CONFIG_SLUB is not set 89# CONFIG_SLUB is not set
78# CONFIG_SLOB is not set 90# CONFIG_SLOB is not set
79# CONFIG_PROFILING is not set 91# CONFIG_PROFILING is not set
80# CONFIG_MARKERS is not set
81CONFIG_HAVE_OPROFILE=y 92CONFIG_HAVE_OPROFILE=y
82CONFIG_HAVE_IOREMAP_PROT=y 93CONFIG_HAVE_IOREMAP_PROT=y
94CONFIG_HAVE_ARCH_TRACEHOOK=y
83CONFIG_HAVE_CLK=y 95CONFIG_HAVE_CLK=y
84CONFIG_HAVE_GENERIC_DMA_COHERENT=y 96CONFIG_HAVE_GENERIC_DMA_COHERENT=y
85CONFIG_SLABINFO=y 97CONFIG_SLABINFO=y
86CONFIG_RT_MUTEXES=y 98CONFIG_RT_MUTEXES=y
87# CONFIG_TINY_SHMEM is not set
88CONFIG_BASE_SMALL=0 99CONFIG_BASE_SMALL=0
89CONFIG_MODULES=y 100CONFIG_MODULES=y
90# CONFIG_MODULE_FORCE_LOAD is not set 101# CONFIG_MODULE_FORCE_LOAD is not set
@@ -92,11 +103,9 @@ CONFIG_MODULE_UNLOAD=y
92# CONFIG_MODULE_FORCE_UNLOAD is not set 103# CONFIG_MODULE_FORCE_UNLOAD is not set
93# CONFIG_MODVERSIONS is not set 104# CONFIG_MODVERSIONS is not set
94# CONFIG_MODULE_SRCVERSION_ALL is not set 105# CONFIG_MODULE_SRCVERSION_ALL is not set
95CONFIG_KMOD=y
96CONFIG_BLOCK=y 106CONFIG_BLOCK=y
97# CONFIG_LBD is not set 107# CONFIG_LBD is not set
98# CONFIG_BLK_DEV_IO_TRACE is not set 108# CONFIG_BLK_DEV_IO_TRACE is not set
99# CONFIG_LSF is not set
100# CONFIG_BLK_DEV_BSG is not set 109# CONFIG_BLK_DEV_BSG is not set
101# CONFIG_BLK_DEV_INTEGRITY is not set 110# CONFIG_BLK_DEV_INTEGRITY is not set
102 111
@@ -112,7 +121,6 @@ CONFIG_IOSCHED_CFQ=y
112CONFIG_DEFAULT_CFQ=y 121CONFIG_DEFAULT_CFQ=y
113# CONFIG_DEFAULT_NOOP is not set 122# CONFIG_DEFAULT_NOOP is not set
114CONFIG_DEFAULT_IOSCHED="cfq" 123CONFIG_DEFAULT_IOSCHED="cfq"
115CONFIG_CLASSIC_RCU=y
116# CONFIG_FREEZER is not set 124# CONFIG_FREEZER is not set
117 125
118# 126#
@@ -120,6 +128,7 @@ CONFIG_CLASSIC_RCU=y
120# 128#
121CONFIG_CPU_SH5=y 129CONFIG_CPU_SH5=y
122# CONFIG_CPU_SUBTYPE_SH7619 is not set 130# CONFIG_CPU_SUBTYPE_SH7619 is not set
131# CONFIG_CPU_SUBTYPE_SH7201 is not set
123# CONFIG_CPU_SUBTYPE_SH7203 is not set 132# CONFIG_CPU_SUBTYPE_SH7203 is not set
124# CONFIG_CPU_SUBTYPE_SH7206 is not set 133# CONFIG_CPU_SUBTYPE_SH7206 is not set
125# CONFIG_CPU_SUBTYPE_SH7263 is not set 134# CONFIG_CPU_SUBTYPE_SH7263 is not set
@@ -146,6 +155,7 @@ CONFIG_CPU_SH5=y
146# CONFIG_CPU_SUBTYPE_SH7770 is not set 155# CONFIG_CPU_SUBTYPE_SH7770 is not set
147# CONFIG_CPU_SUBTYPE_SH7780 is not set 156# CONFIG_CPU_SUBTYPE_SH7780 is not set
148# CONFIG_CPU_SUBTYPE_SH7785 is not set 157# CONFIG_CPU_SUBTYPE_SH7785 is not set
158# CONFIG_CPU_SUBTYPE_SH7786 is not set
149# CONFIG_CPU_SUBTYPE_SHX3 is not set 159# CONFIG_CPU_SUBTYPE_SHX3 is not set
150# CONFIG_CPU_SUBTYPE_SH7343 is not set 160# CONFIG_CPU_SUBTYPE_SH7343 is not set
151# CONFIG_CPU_SUBTYPE_SH7722 is not set 161# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -188,16 +198,16 @@ CONFIG_FLAT_NODE_MEM_MAP=y
188CONFIG_SPARSEMEM_STATIC=y 198CONFIG_SPARSEMEM_STATIC=y
189CONFIG_PAGEFLAGS_EXTENDED=y 199CONFIG_PAGEFLAGS_EXTENDED=y
190CONFIG_SPLIT_PTLOCK_CPUS=4 200CONFIG_SPLIT_PTLOCK_CPUS=4
191CONFIG_RESOURCES_64BIT=y
192# CONFIG_PHYS_ADDR_T_64BIT is not set 201# CONFIG_PHYS_ADDR_T_64BIT is not set
193CONFIG_ZONE_DMA_FLAG=0 202CONFIG_ZONE_DMA_FLAG=0
194CONFIG_NR_QUICK=2 203CONFIG_NR_QUICK=2
195CONFIG_UNEVICTABLE_LRU=y 204CONFIG_UNEVICTABLE_LRU=y
205CONFIG_HAVE_MLOCK=y
206CONFIG_HAVE_MLOCKED_PAGE_BIT=y
196 207
197# 208#
198# Cache configuration 209# Cache configuration
199# 210#
200# CONFIG_SH_DIRECT_MAPPED is not set
201# CONFIG_CACHE_WRITEBACK is not set 211# CONFIG_CACHE_WRITEBACK is not set
202# CONFIG_CACHE_WRITETHROUGH is not set 212# CONFIG_CACHE_WRITETHROUGH is not set
203CONFIG_CACHE_OFF=y 213CONFIG_CACHE_OFF=y
@@ -256,7 +266,6 @@ CONFIG_HZ=250
256# CONFIG_PREEMPT_NONE is not set 266# CONFIG_PREEMPT_NONE is not set
257# CONFIG_PREEMPT_VOLUNTARY is not set 267# CONFIG_PREEMPT_VOLUNTARY is not set
258CONFIG_PREEMPT=y 268CONFIG_PREEMPT=y
259# CONFIG_PREEMPT_RCU is not set
260 269
261# 270#
262# Boot options 271# Boot options
@@ -272,9 +281,12 @@ CONFIG_PCI=y
272CONFIG_SH_PCIDMA_NONCOHERENT=y 281CONFIG_SH_PCIDMA_NONCOHERENT=y
273CONFIG_PCI_AUTO=y 282CONFIG_PCI_AUTO=y
274CONFIG_PCI_AUTO_UPDATE_RESOURCES=y 283CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
284# CONFIG_PCIEPORTBUS is not set
275# CONFIG_ARCH_SUPPORTS_MSI is not set 285# CONFIG_ARCH_SUPPORTS_MSI is not set
276CONFIG_PCI_LEGACY=y 286CONFIG_PCI_LEGACY=y
277# CONFIG_PCI_DEBUG is not set 287# CONFIG_PCI_DEBUG is not set
288# CONFIG_PCI_STUB is not set
289# CONFIG_PCI_IOV is not set
278# CONFIG_PCCARD is not set 290# CONFIG_PCCARD is not set
279# CONFIG_HOTPLUG_PCI is not set 291# CONFIG_HOTPLUG_PCI is not set
280 292
@@ -285,6 +297,12 @@ CONFIG_BINFMT_ELF=y
285# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 297# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
286# CONFIG_HAVE_AOUT is not set 298# CONFIG_HAVE_AOUT is not set
287# CONFIG_BINFMT_MISC is not set 299# CONFIG_BINFMT_MISC is not set
300
301#
302# Power management options (EXPERIMENTAL)
303#
304# CONFIG_PM is not set
305# CONFIG_CPU_IDLE is not set
288CONFIG_NET=y 306CONFIG_NET=y
289 307
290# 308#
@@ -344,7 +362,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_LAPB is not set 362# CONFIG_LAPB is not set
345# CONFIG_ECONET is not set 363# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 364# CONFIG_WAN_ROUTER is not set
365# CONFIG_PHONET is not set
347# CONFIG_NET_SCHED is not set 366# CONFIG_NET_SCHED is not set
367# CONFIG_DCB is not set
348 368
349# 369#
350# Network testing 370# Network testing
@@ -355,13 +375,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
355# CONFIG_IRDA is not set 375# CONFIG_IRDA is not set
356# CONFIG_BT is not set 376# CONFIG_BT is not set
357# CONFIG_AF_RXRPC is not set 377# CONFIG_AF_RXRPC is not set
358# CONFIG_PHONET is not set
359CONFIG_WIRELESS=y 378CONFIG_WIRELESS=y
360# CONFIG_CFG80211 is not set 379# CONFIG_CFG80211 is not set
361# CONFIG_WIRELESS_OLD_REGULATORY is not set 380# CONFIG_WIRELESS_OLD_REGULATORY is not set
362# CONFIG_WIRELESS_EXT is not set 381# CONFIG_WIRELESS_EXT is not set
382# CONFIG_LIB80211 is not set
363# CONFIG_MAC80211 is not set 383# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 384# CONFIG_WIMAX is not set
365# CONFIG_RFKILL is not set 385# CONFIG_RFKILL is not set
366# CONFIG_NET_9P is not set 386# CONFIG_NET_9P is not set
367 387
@@ -400,11 +420,20 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
400# CONFIG_BLK_DEV_HD is not set 420# CONFIG_BLK_DEV_HD is not set
401CONFIG_MISC_DEVICES=y 421CONFIG_MISC_DEVICES=y
402# CONFIG_PHANTOM is not set 422# CONFIG_PHANTOM is not set
403# CONFIG_EEPROM_93CX6 is not set
404# CONFIG_SGI_IOC4 is not set 423# CONFIG_SGI_IOC4 is not set
405# CONFIG_TIFM_CORE is not set 424# CONFIG_TIFM_CORE is not set
425# CONFIG_ICS932S401 is not set
406# CONFIG_ENCLOSURE_SERVICES is not set 426# CONFIG_ENCLOSURE_SERVICES is not set
407# CONFIG_HP_ILO is not set 427# CONFIG_HP_ILO is not set
428# CONFIG_ISL29003 is not set
429# CONFIG_C2PORT is not set
430
431#
432# EEPROM support
433#
434# CONFIG_EEPROM_AT24 is not set
435# CONFIG_EEPROM_LEGACY is not set
436# CONFIG_EEPROM_93CX6 is not set
408CONFIG_HAVE_IDE=y 437CONFIG_HAVE_IDE=y
409# CONFIG_IDE is not set 438# CONFIG_IDE is not set
410 439
@@ -447,6 +476,7 @@ CONFIG_SCSI_SPI_ATTRS=y
447# CONFIG_SCSI_SRP_ATTRS is not set 476# CONFIG_SCSI_SRP_ATTRS is not set
448CONFIG_SCSI_LOWLEVEL=y 477CONFIG_SCSI_LOWLEVEL=y
449# CONFIG_ISCSI_TCP is not set 478# CONFIG_ISCSI_TCP is not set
479# CONFIG_SCSI_CXGB3_ISCSI is not set
450# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 480# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
451# CONFIG_SCSI_3W_9XXX is not set 481# CONFIG_SCSI_3W_9XXX is not set
452# CONFIG_SCSI_ACARD is not set 482# CONFIG_SCSI_ACARD is not set
@@ -459,7 +489,10 @@ CONFIG_SCSI_LOWLEVEL=y
459# CONFIG_MEGARAID_NEWGEN is not set 489# CONFIG_MEGARAID_NEWGEN is not set
460# CONFIG_MEGARAID_LEGACY is not set 490# CONFIG_MEGARAID_LEGACY is not set
461# CONFIG_MEGARAID_SAS is not set 491# CONFIG_MEGARAID_SAS is not set
492# CONFIG_SCSI_MPT2SAS is not set
462# CONFIG_SCSI_HPTIOP is not set 493# CONFIG_SCSI_HPTIOP is not set
494# CONFIG_LIBFC is not set
495# CONFIG_FCOE is not set
463# CONFIG_SCSI_DMX3191D is not set 496# CONFIG_SCSI_DMX3191D is not set
464# CONFIG_SCSI_FUTURE_DOMAIN is not set 497# CONFIG_SCSI_FUTURE_DOMAIN is not set
465# CONFIG_SCSI_IPS is not set 498# CONFIG_SCSI_IPS is not set
@@ -478,6 +511,7 @@ CONFIG_SCSI_LOWLEVEL=y
478# CONFIG_SCSI_DEBUG is not set 511# CONFIG_SCSI_DEBUG is not set
479# CONFIG_SCSI_SRP is not set 512# CONFIG_SCSI_SRP is not set
480# CONFIG_SCSI_DH is not set 513# CONFIG_SCSI_DH is not set
514# CONFIG_SCSI_OSD_INITIATOR is not set
481# CONFIG_ATA is not set 515# CONFIG_ATA is not set
482# CONFIG_MD is not set 516# CONFIG_MD is not set
483# CONFIG_FUSION is not set 517# CONFIG_FUSION is not set
@@ -493,6 +527,7 @@ CONFIG_SCSI_LOWLEVEL=y
493# CONFIG_IEEE1394 is not set 527# CONFIG_IEEE1394 is not set
494# CONFIG_I2O is not set 528# CONFIG_I2O is not set
495CONFIG_NETDEVICES=y 529CONFIG_NETDEVICES=y
530CONFIG_COMPAT_NET_DEV_OPS=y
496# CONFIG_DUMMY is not set 531# CONFIG_DUMMY is not set
497# CONFIG_BONDING is not set 532# CONFIG_BONDING is not set
498# CONFIG_MACVLAN is not set 533# CONFIG_MACVLAN is not set
@@ -510,7 +545,10 @@ CONFIG_NET_ETHERNET=y
510# CONFIG_CASSINI is not set 545# CONFIG_CASSINI is not set
511# CONFIG_NET_VENDOR_3COM is not set 546# CONFIG_NET_VENDOR_3COM is not set
512# CONFIG_SMC91X is not set 547# CONFIG_SMC91X is not set
548# CONFIG_ETHOC is not set
513# CONFIG_SMC911X is not set 549# CONFIG_SMC911X is not set
550# CONFIG_SMSC911X is not set
551# CONFIG_DNET is not set
514# CONFIG_NET_TULIP is not set 552# CONFIG_NET_TULIP is not set
515# CONFIG_HP100 is not set 553# CONFIG_HP100 is not set
516# CONFIG_IBM_NEW_EMAC_ZMII is not set 554# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -543,9 +581,11 @@ CONFIG_NETDEV_1000=y
543# CONFIG_QLA3XXX is not set 581# CONFIG_QLA3XXX is not set
544# CONFIG_ATL1 is not set 582# CONFIG_ATL1 is not set
545# CONFIG_ATL1E is not set 583# CONFIG_ATL1E is not set
584# CONFIG_ATL1C is not set
546# CONFIG_JME is not set 585# CONFIG_JME is not set
547CONFIG_NETDEV_10000=y 586CONFIG_NETDEV_10000=y
548# CONFIG_CHELSIO_T1 is not set 587# CONFIG_CHELSIO_T1 is not set
588CONFIG_CHELSIO_T3_DEPENDS=y
549# CONFIG_CHELSIO_T3 is not set 589# CONFIG_CHELSIO_T3 is not set
550# CONFIG_ENIC is not set 590# CONFIG_ENIC is not set
551# CONFIG_IXGBE is not set 591# CONFIG_IXGBE is not set
@@ -554,11 +594,13 @@ CONFIG_NETDEV_10000=y
554# CONFIG_MYRI10GE is not set 594# CONFIG_MYRI10GE is not set
555# CONFIG_NETXEN_NIC is not set 595# CONFIG_NETXEN_NIC is not set
556# CONFIG_NIU is not set 596# CONFIG_NIU is not set
597# CONFIG_MLX4_EN is not set
557# CONFIG_MLX4_CORE is not set 598# CONFIG_MLX4_CORE is not set
558# CONFIG_TEHUTI is not set 599# CONFIG_TEHUTI is not set
559# CONFIG_BNX2X is not set 600# CONFIG_BNX2X is not set
560# CONFIG_QLGE is not set 601# CONFIG_QLGE is not set
561# CONFIG_SFC is not set 602# CONFIG_SFC is not set
603# CONFIG_BE2NET is not set
562# CONFIG_TR is not set 604# CONFIG_TR is not set
563 605
564# 606#
@@ -566,7 +608,10 @@ CONFIG_NETDEV_10000=y
566# 608#
567# CONFIG_WLAN_PRE80211 is not set 609# CONFIG_WLAN_PRE80211 is not set
568# CONFIG_WLAN_80211 is not set 610# CONFIG_WLAN_80211 is not set
569# CONFIG_IWLWIFI_LEDS is not set 611
612#
613# Enable WiMAX (Networking options) to see the WiMAX drivers
614#
570# CONFIG_WAN is not set 615# CONFIG_WAN is not set
571# CONFIG_FDDI is not set 616# CONFIG_FDDI is not set
572# CONFIG_HIPPI is not set 617# CONFIG_HIPPI is not set
@@ -636,10 +681,12 @@ CONFIG_DEVKMEM=y
636# CONFIG_SERIAL_SH_SCI is not set 681# CONFIG_SERIAL_SH_SCI is not set
637# CONFIG_SERIAL_JSM is not set 682# CONFIG_SERIAL_JSM is not set
638CONFIG_UNIX98_PTYS=y 683CONFIG_UNIX98_PTYS=y
684# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
639CONFIG_LEGACY_PTYS=y 685CONFIG_LEGACY_PTYS=y
640CONFIG_LEGACY_PTY_COUNT=256 686CONFIG_LEGACY_PTY_COUNT=256
641# CONFIG_IPMI_HANDLER is not set 687# CONFIG_IPMI_HANDLER is not set
642CONFIG_HW_RANDOM=y 688CONFIG_HW_RANDOM=y
689# CONFIG_HW_RANDOM_TIMERIOMEM is not set
643# CONFIG_R3964 is not set 690# CONFIG_R3964 is not set
644# CONFIG_APPLICOM is not set 691# CONFIG_APPLICOM is not set
645# CONFIG_RAW_DRIVER is not set 692# CONFIG_RAW_DRIVER is not set
@@ -700,12 +747,9 @@ CONFIG_I2C_HELPER_AUTO=y
700# Miscellaneous I2C Chip support 747# Miscellaneous I2C Chip support
701# 748#
702# CONFIG_DS1682 is not set 749# CONFIG_DS1682 is not set
703# CONFIG_EEPROM_AT24 is not set
704# CONFIG_EEPROM_LEGACY is not set
705# CONFIG_SENSORS_PCF8574 is not set 750# CONFIG_SENSORS_PCF8574 is not set
706# CONFIG_PCF8575 is not set 751# CONFIG_PCF8575 is not set
707# CONFIG_SENSORS_PCA9539 is not set 752# CONFIG_SENSORS_PCA9539 is not set
708# CONFIG_SENSORS_PCF8591 is not set
709# CONFIG_SENSORS_MAX6875 is not set 753# CONFIG_SENSORS_MAX6875 is not set
710# CONFIG_SENSORS_TSL2550 is not set 754# CONFIG_SENSORS_TSL2550 is not set
711# CONFIG_I2C_DEBUG_CORE is not set 755# CONFIG_I2C_DEBUG_CORE is not set
@@ -725,8 +769,10 @@ CONFIG_HWMON=y
725# CONFIG_SENSORS_ADM1029 is not set 769# CONFIG_SENSORS_ADM1029 is not set
726# CONFIG_SENSORS_ADM1031 is not set 770# CONFIG_SENSORS_ADM1031 is not set
727# CONFIG_SENSORS_ADM9240 is not set 771# CONFIG_SENSORS_ADM9240 is not set
772# CONFIG_SENSORS_ADT7462 is not set
728# CONFIG_SENSORS_ADT7470 is not set 773# CONFIG_SENSORS_ADT7470 is not set
729# CONFIG_SENSORS_ADT7473 is not set 774# CONFIG_SENSORS_ADT7473 is not set
775# CONFIG_SENSORS_ADT7475 is not set
730# CONFIG_SENSORS_ATXP1 is not set 776# CONFIG_SENSORS_ATXP1 is not set
731# CONFIG_SENSORS_DS1621 is not set 777# CONFIG_SENSORS_DS1621 is not set
732# CONFIG_SENSORS_I5K_AMB is not set 778# CONFIG_SENSORS_I5K_AMB is not set
@@ -747,10 +793,14 @@ CONFIG_HWMON=y
747# CONFIG_SENSORS_LM90 is not set 793# CONFIG_SENSORS_LM90 is not set
748# CONFIG_SENSORS_LM92 is not set 794# CONFIG_SENSORS_LM92 is not set
749# CONFIG_SENSORS_LM93 is not set 795# CONFIG_SENSORS_LM93 is not set
796# CONFIG_SENSORS_LTC4215 is not set
797# CONFIG_SENSORS_LTC4245 is not set
798# CONFIG_SENSORS_LM95241 is not set
750# CONFIG_SENSORS_MAX1619 is not set 799# CONFIG_SENSORS_MAX1619 is not set
751# CONFIG_SENSORS_MAX6650 is not set 800# CONFIG_SENSORS_MAX6650 is not set
752# CONFIG_SENSORS_PC87360 is not set 801# CONFIG_SENSORS_PC87360 is not set
753# CONFIG_SENSORS_PC87427 is not set 802# CONFIG_SENSORS_PC87427 is not set
803# CONFIG_SENSORS_PCF8591 is not set
754# CONFIG_SENSORS_SIS5595 is not set 804# CONFIG_SENSORS_SIS5595 is not set
755# CONFIG_SENSORS_DME1737 is not set 805# CONFIG_SENSORS_DME1737 is not set
756# CONFIG_SENSORS_SMSC47M1 is not set 806# CONFIG_SENSORS_SMSC47M1 is not set
@@ -786,11 +836,11 @@ CONFIG_WATCHDOG=y
786# 836#
787# CONFIG_PCIPCWATCHDOG is not set 837# CONFIG_PCIPCWATCHDOG is not set
788# CONFIG_WDTPCI is not set 838# CONFIG_WDTPCI is not set
839CONFIG_SSB_POSSIBLE=y
789 840
790# 841#
791# Sonics Silicon Backplane 842# Sonics Silicon Backplane
792# 843#
793CONFIG_SSB_POSSIBLE=y
794# CONFIG_SSB is not set 844# CONFIG_SSB is not set
795 845
796# 846#
@@ -802,6 +852,8 @@ CONFIG_SSB_POSSIBLE=y
802# CONFIG_MFD_TMIO is not set 852# CONFIG_MFD_TMIO is not set
803# CONFIG_MFD_WM8400 is not set 853# CONFIG_MFD_WM8400 is not set
804# CONFIG_MFD_WM8350_I2C is not set 854# CONFIG_MFD_WM8350_I2C is not set
855# CONFIG_MFD_PCF50633 is not set
856# CONFIG_REGULATOR is not set
805 857
806# 858#
807# Multimedia devices 859# Multimedia devices
@@ -822,7 +874,7 @@ CONFIG_VIDEO_MEDIA=m
822# 874#
823# CONFIG_MEDIA_ATTACH is not set 875# CONFIG_MEDIA_ATTACH is not set
824CONFIG_MEDIA_TUNER=m 876CONFIG_MEDIA_TUNER=m
825# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set 877# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
826CONFIG_MEDIA_TUNER_SIMPLE=m 878CONFIG_MEDIA_TUNER_SIMPLE=m
827CONFIG_MEDIA_TUNER_TDA8290=m 879CONFIG_MEDIA_TUNER_TDA8290=m
828CONFIG_MEDIA_TUNER_TDA9887=m 880CONFIG_MEDIA_TUNER_TDA9887=m
@@ -831,6 +883,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
831CONFIG_MEDIA_TUNER_MT20XX=m 883CONFIG_MEDIA_TUNER_MT20XX=m
832CONFIG_MEDIA_TUNER_XC2028=m 884CONFIG_MEDIA_TUNER_XC2028=m
833CONFIG_MEDIA_TUNER_XC5000=m 885CONFIG_MEDIA_TUNER_XC5000=m
886CONFIG_MEDIA_TUNER_MC44S803=m
834CONFIG_VIDEO_V4L2=m 887CONFIG_VIDEO_V4L2=m
835CONFIG_VIDEO_V4L1=m 888CONFIG_VIDEO_V4L1=m
836CONFIG_VIDEO_CAPTURE_DRIVERS=y 889CONFIG_VIDEO_CAPTURE_DRIVERS=y
@@ -853,6 +906,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
853# CONFIG_VIDEO_CAFE_CCIC is not set 906# CONFIG_VIDEO_CAFE_CCIC is not set
854# CONFIG_SOC_CAMERA is not set 907# CONFIG_SOC_CAMERA is not set
855# CONFIG_RADIO_ADAPTERS is not set 908# CONFIG_RADIO_ADAPTERS is not set
909# CONFIG_DVB_DYNAMIC_MINORS is not set
856CONFIG_DVB_CAPTURE_DRIVERS=y 910CONFIG_DVB_CAPTURE_DRIVERS=y
857 911
858# 912#
@@ -884,89 +938,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
884# 938#
885# Supported DVB Frontends 939# Supported DVB Frontends
886# 940#
887
888#
889# Customise DVB Frontends
890#
891# CONFIG_DVB_FE_CUSTOMISE is not set 941# CONFIG_DVB_FE_CUSTOMISE is not set
892
893#
894# DVB-S (satellite) frontends
895#
896# CONFIG_DVB_CX24110 is not set
897# CONFIG_DVB_CX24123 is not set
898# CONFIG_DVB_MT312 is not set
899# CONFIG_DVB_S5H1420 is not set
900# CONFIG_DVB_STV0288 is not set
901# CONFIG_DVB_STB6000 is not set
902# CONFIG_DVB_STV0299 is not set
903# CONFIG_DVB_TDA8083 is not set
904# CONFIG_DVB_TDA10086 is not set
905# CONFIG_DVB_VES1X93 is not set
906# CONFIG_DVB_TUNER_ITD1000 is not set
907# CONFIG_DVB_TDA826X is not set
908# CONFIG_DVB_TUA6100 is not set
909# CONFIG_DVB_CX24116 is not set
910# CONFIG_DVB_SI21XX is not set
911
912#
913# DVB-T (terrestrial) frontends
914#
915# CONFIG_DVB_SP8870 is not set
916# CONFIG_DVB_SP887X is not set
917# CONFIG_DVB_CX22700 is not set
918# CONFIG_DVB_CX22702 is not set
919# CONFIG_DVB_DRX397XD is not set
920# CONFIG_DVB_L64781 is not set
921# CONFIG_DVB_TDA1004X is not set
922# CONFIG_DVB_NXT6000 is not set
923# CONFIG_DVB_MT352 is not set
924# CONFIG_DVB_ZL10353 is not set
925# CONFIG_DVB_DIB3000MB is not set
926# CONFIG_DVB_DIB3000MC is not set
927# CONFIG_DVB_DIB7000M is not set
928# CONFIG_DVB_DIB7000P is not set
929# CONFIG_DVB_TDA10048 is not set
930
931#
932# DVB-C (cable) frontends
933#
934# CONFIG_DVB_VES1820 is not set
935# CONFIG_DVB_TDA10021 is not set
936# CONFIG_DVB_TDA10023 is not set
937# CONFIG_DVB_STV0297 is not set
938
939#
940# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
941#
942# CONFIG_DVB_NXT200X is not set
943# CONFIG_DVB_OR51211 is not set
944# CONFIG_DVB_OR51132 is not set
945# CONFIG_DVB_BCM3510 is not set
946# CONFIG_DVB_LGDT330X is not set
947# CONFIG_DVB_S5H1409 is not set
948# CONFIG_DVB_AU8522 is not set
949# CONFIG_DVB_S5H1411 is not set
950
951#
952# Digital terrestrial only tuners/PLL
953#
954# CONFIG_DVB_PLL is not set
955# CONFIG_DVB_TUNER_DIB0070 is not set
956
957#
958# SEC control devices for DVB-S
959#
960# CONFIG_DVB_LNBP21 is not set
961# CONFIG_DVB_ISL6405 is not set
962# CONFIG_DVB_ISL6421 is not set
963# CONFIG_DVB_LGS8GL5 is not set
964
965#
966# Tools to develop new frontends
967#
968# CONFIG_DVB_DUMMY_FE is not set
969# CONFIG_DVB_AF9013 is not set
970CONFIG_DAB=y 942CONFIG_DAB=y
971 943
972# 944#
@@ -979,15 +951,16 @@ CONFIG_FB=y
979CONFIG_FIRMWARE_EDID=y 951CONFIG_FIRMWARE_EDID=y
980# CONFIG_FB_DDC is not set 952# CONFIG_FB_DDC is not set
981# CONFIG_FB_BOOT_VESA_SUPPORT is not set 953# CONFIG_FB_BOOT_VESA_SUPPORT is not set
982CONFIG_FB_CFB_FILLRECT=m 954# CONFIG_FB_CFB_FILLRECT is not set
983CONFIG_FB_CFB_COPYAREA=m 955# CONFIG_FB_CFB_COPYAREA is not set
984CONFIG_FB_CFB_IMAGEBLIT=m 956# CONFIG_FB_CFB_IMAGEBLIT is not set
985# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set 957# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
986# CONFIG_FB_SYS_FILLRECT is not set 958CONFIG_FB_SYS_FILLRECT=m
987# CONFIG_FB_SYS_COPYAREA is not set 959CONFIG_FB_SYS_COPYAREA=m
988# CONFIG_FB_SYS_IMAGEBLIT is not set 960CONFIG_FB_SYS_IMAGEBLIT=m
989# CONFIG_FB_FOREIGN_ENDIAN is not set 961# CONFIG_FB_FOREIGN_ENDIAN is not set
990# CONFIG_FB_SYS_FOPS is not set 962CONFIG_FB_SYS_FOPS=m
963CONFIG_FB_DEFERRED_IO=y
991# CONFIG_FB_SVGALIB is not set 964# CONFIG_FB_SVGALIB is not set
992# CONFIG_FB_MACMODES is not set 965# CONFIG_FB_MACMODES is not set
993# CONFIG_FB_BACKLIGHT is not set 966# CONFIG_FB_BACKLIGHT is not set
@@ -1025,6 +998,8 @@ CONFIG_FB_MODE_HELPERS=y
1025CONFIG_FB_SH_MOBILE_LCDC=m 998CONFIG_FB_SH_MOBILE_LCDC=m
1026# CONFIG_FB_VIRTUAL is not set 999# CONFIG_FB_VIRTUAL is not set
1027# CONFIG_FB_METRONOME is not set 1000# CONFIG_FB_METRONOME is not set
1001# CONFIG_FB_MB862XX is not set
1002# CONFIG_FB_BROADSHEET is not set
1028# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1003# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1029 1004
1030# 1005#
@@ -1081,9 +1056,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1081# 1056#
1082 1057
1083# 1058#
1084# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1059# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1085# 1060#
1086# CONFIG_USB_GADGET is not set 1061# CONFIG_USB_GADGET is not set
1062
1063#
1064# OTG and related infrastructure
1065#
1066# CONFIG_UWB is not set
1087# CONFIG_MMC is not set 1067# CONFIG_MMC is not set
1088# CONFIG_MEMSTICK is not set 1068# CONFIG_MEMSTICK is not set
1089# CONFIG_NEW_LEDS is not set 1069# CONFIG_NEW_LEDS is not set
@@ -1091,6 +1071,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1091# CONFIG_INFINIBAND is not set 1071# CONFIG_INFINIBAND is not set
1092# CONFIG_RTC_CLASS is not set 1072# CONFIG_RTC_CLASS is not set
1093# CONFIG_DMADEVICES is not set 1073# CONFIG_DMADEVICES is not set
1074# CONFIG_AUXDISPLAY is not set
1094# CONFIG_UIO is not set 1075# CONFIG_UIO is not set
1095# CONFIG_STAGING is not set 1076# CONFIG_STAGING is not set
1096 1077
@@ -1114,6 +1095,7 @@ CONFIG_FS_MBCACHE=y
1114CONFIG_FILE_LOCKING=y 1095CONFIG_FILE_LOCKING=y
1115# CONFIG_XFS_FS is not set 1096# CONFIG_XFS_FS is not set
1116# CONFIG_OCFS2_FS is not set 1097# CONFIG_OCFS2_FS is not set
1098# CONFIG_BTRFS_FS is not set
1117CONFIG_DNOTIFY=y 1099CONFIG_DNOTIFY=y
1118CONFIG_INOTIFY=y 1100CONFIG_INOTIFY=y
1119CONFIG_INOTIFY_USER=y 1101CONFIG_INOTIFY_USER=y
@@ -1148,10 +1130,7 @@ CONFIG_TMPFS=y
1148CONFIG_HUGETLBFS=y 1130CONFIG_HUGETLBFS=y
1149CONFIG_HUGETLB_PAGE=y 1131CONFIG_HUGETLB_PAGE=y
1150# CONFIG_CONFIGFS_FS is not set 1132# CONFIG_CONFIGFS_FS is not set
1151 1133CONFIG_MISC_FILESYSTEMS=y
1152#
1153# Miscellaneous filesystems
1154#
1155# CONFIG_ADFS_FS is not set 1134# CONFIG_ADFS_FS is not set
1156# CONFIG_AFFS_FS is not set 1135# CONFIG_AFFS_FS is not set
1157# CONFIG_HFS_FS is not set 1136# CONFIG_HFS_FS is not set
@@ -1160,6 +1139,7 @@ CONFIG_HUGETLB_PAGE=y
1160# CONFIG_BFS_FS is not set 1139# CONFIG_BFS_FS is not set
1161# CONFIG_EFS_FS is not set 1140# CONFIG_EFS_FS is not set
1162# CONFIG_CRAMFS is not set 1141# CONFIG_CRAMFS is not set
1142# CONFIG_SQUASHFS is not set
1163# CONFIG_VXFS_FS is not set 1143# CONFIG_VXFS_FS is not set
1164CONFIG_MINIX_FS=y 1144CONFIG_MINIX_FS=y
1165# CONFIG_OMFS_FS is not set 1145# CONFIG_OMFS_FS is not set
@@ -1179,7 +1159,6 @@ CONFIG_LOCKD=y
1179CONFIG_LOCKD_V4=y 1159CONFIG_LOCKD_V4=y
1180CONFIG_NFS_COMMON=y 1160CONFIG_NFS_COMMON=y
1181CONFIG_SUNRPC=y 1161CONFIG_SUNRPC=y
1182# CONFIG_SUNRPC_REGISTER_V4 is not set
1183# CONFIG_RPCSEC_GSS_KRB5 is not set 1162# CONFIG_RPCSEC_GSS_KRB5 is not set
1184# CONFIG_RPCSEC_GSS_SPKM3 is not set 1163# CONFIG_RPCSEC_GSS_SPKM3 is not set
1185# CONFIG_SMB_FS is not set 1164# CONFIG_SMB_FS is not set
@@ -1252,6 +1231,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
1252# CONFIG_DEBUG_MEMORY_INIT is not set 1231# CONFIG_DEBUG_MEMORY_INIT is not set
1253# CONFIG_DEBUG_LIST is not set 1232# CONFIG_DEBUG_LIST is not set
1254# CONFIG_DEBUG_SG is not set 1233# CONFIG_DEBUG_SG is not set
1234# CONFIG_DEBUG_NOTIFIERS is not set
1255CONFIG_FRAME_POINTER=y 1235CONFIG_FRAME_POINTER=y
1256# CONFIG_RCU_TORTURE_TEST is not set 1236# CONFIG_RCU_TORTURE_TEST is not set
1257# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1237# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1260,17 +1240,25 @@ CONFIG_FRAME_POINTER=y
1260# CONFIG_FAULT_INJECTION is not set 1240# CONFIG_FAULT_INJECTION is not set
1261# CONFIG_LATENCYTOP is not set 1241# CONFIG_LATENCYTOP is not set
1262# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1242# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1263# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1243# CONFIG_PAGE_POISONING is not set
1244
1245#
1246# Tracers
1247#
1248# CONFIG_SCHED_TRACER is not set
1249# CONFIG_CONTEXT_SWITCH_TRACER is not set
1250# CONFIG_BOOT_TRACER is not set
1251# CONFIG_TRACE_BRANCH_PROFILING is not set
1252# CONFIG_DYNAMIC_DEBUG is not set
1264# CONFIG_SAMPLES is not set 1253# CONFIG_SAMPLES is not set
1265# CONFIG_EARLY_SCIF_CONSOLE is not set 1254# CONFIG_EARLY_SCIF_CONSOLE is not set
1266# CONFIG_DEBUG_BOOTMEM is not set 1255# CONFIG_DEBUG_BOOTMEM is not set
1267# CONFIG_DEBUG_STACK_USAGE is not set 1256# CONFIG_DEBUG_STACK_USAGE is not set
1268# CONFIG_4KSTACKS is not set 1257# CONFIG_4KSTACKS is not set
1269CONFIG_SH64_PROC_ASIDS=y 1258# CONFIG_SH_NO_BSS_INIT is not set
1259# CONFIG_MORE_COMPILE_OPTIONS is not set
1270CONFIG_SH64_SR_WATCH=y 1260CONFIG_SH64_SR_WATCH=y
1271# CONFIG_POOR_MANS_STRACE is not set 1261# CONFIG_POOR_MANS_STRACE is not set
1272# CONFIG_SH_ALPHANUMERIC is not set
1273# CONFIG_SH_NO_BSS_INIT is not set
1274 1262
1275# 1263#
1276# Security options 1264# Security options
@@ -1286,6 +1274,7 @@ CONFIG_CRYPTO=y
1286# 1274#
1287# CONFIG_CRYPTO_FIPS is not set 1275# CONFIG_CRYPTO_FIPS is not set
1288# CONFIG_CRYPTO_MANAGER is not set 1276# CONFIG_CRYPTO_MANAGER is not set
1277# CONFIG_CRYPTO_MANAGER2 is not set
1289# CONFIG_CRYPTO_GF128MUL is not set 1278# CONFIG_CRYPTO_GF128MUL is not set
1290# CONFIG_CRYPTO_NULL is not set 1279# CONFIG_CRYPTO_NULL is not set
1291# CONFIG_CRYPTO_CRYPTD is not set 1280# CONFIG_CRYPTO_CRYPTD is not set
@@ -1356,6 +1345,7 @@ CONFIG_CRYPTO=y
1356# Compression 1345# Compression
1357# 1346#
1358# CONFIG_CRYPTO_DEFLATE is not set 1347# CONFIG_CRYPTO_DEFLATE is not set
1348# CONFIG_CRYPTO_ZLIB is not set
1359# CONFIG_CRYPTO_LZO is not set 1349# CONFIG_CRYPTO_LZO is not set
1360 1350
1361# 1351#
@@ -1369,6 +1359,7 @@ CONFIG_CRYPTO_HW=y
1369# Library routines 1359# Library routines
1370# 1360#
1371CONFIG_BITREVERSE=y 1361CONFIG_BITREVERSE=y
1362CONFIG_GENERIC_FIND_LAST_BIT=y
1372# CONFIG_CRC_CCITT is not set 1363# CONFIG_CRC_CCITT is not set
1373# CONFIG_CRC16 is not set 1364# CONFIG_CRC16 is not set
1374# CONFIG_CRC_T10DIF is not set 1365# CONFIG_CRC_T10DIF is not set
@@ -1376,7 +1367,7 @@ CONFIG_BITREVERSE=y
1376CONFIG_CRC32=y 1367CONFIG_CRC32=y
1377# CONFIG_CRC7 is not set 1368# CONFIG_CRC7 is not set
1378# CONFIG_LIBCRC32C is not set 1369# CONFIG_LIBCRC32C is not set
1379CONFIG_PLIST=y
1380CONFIG_HAS_IOMEM=y 1370CONFIG_HAS_IOMEM=y
1381CONFIG_HAS_IOPORT=y 1371CONFIG_HAS_IOPORT=y
1382CONFIG_HAS_DMA=y 1372CONFIG_HAS_DMA=y
1373CONFIG_NLATTR=y
diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig
index 2d86e0487517..5c1123640142 100644
--- a/arch/sh/configs/dreamcast_defconfig
+++ b/arch/sh/configs/dreamcast_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 16:54:55 2009 4# Thu Apr 2 17:51:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -44,10 +45,19 @@ CONFIG_BSD_PROCESS_ACCT=y
44# CONFIG_BSD_PROCESS_ACCT_V3 is not set 45# CONFIG_BSD_PROCESS_ACCT_V3 is not set
45# CONFIG_TASKSTATS is not set 46# CONFIG_TASKSTATS is not set
46# CONFIG_AUDIT is not set 47# CONFIG_AUDIT is not set
48
49#
50# RCU Subsystem
51#
52CONFIG_CLASSIC_RCU=y
53# CONFIG_TREE_RCU is not set
54# CONFIG_PREEMPT_RCU is not set
55# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
47# CONFIG_IKCONFIG is not set 57# CONFIG_IKCONFIG is not set
48CONFIG_LOG_BUF_SHIFT=14 58CONFIG_LOG_BUF_SHIFT=14
49# CONFIG_CGROUPS is not set
50# CONFIG_GROUP_SCHED is not set 59# CONFIG_GROUP_SCHED is not set
60# CONFIG_CGROUPS is not set
51CONFIG_SYSFS_DEPRECATED=y 61CONFIG_SYSFS_DEPRECATED=y
52CONFIG_SYSFS_DEPRECATED_V2=y 62CONFIG_SYSFS_DEPRECATED_V2=y
53# CONFIG_RELAY is not set 63# CONFIG_RELAY is not set
@@ -55,6 +65,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
55# CONFIG_BLK_DEV_INITRD is not set 65# CONFIG_BLK_DEV_INITRD is not set
56CONFIG_CC_OPTIMIZE_FOR_SIZE=y 66CONFIG_CC_OPTIMIZE_FOR_SIZE=y
57CONFIG_SYSCTL=y 67CONFIG_SYSCTL=y
68CONFIG_ANON_INODES=y
58CONFIG_EMBEDDED=y 69CONFIG_EMBEDDED=y
59CONFIG_UID16=y 70CONFIG_UID16=y
60# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
@@ -64,10 +75,8 @@ CONFIG_HOTPLUG=y
64CONFIG_PRINTK=y 75CONFIG_PRINTK=y
65CONFIG_BUG=y 76CONFIG_BUG=y
66CONFIG_ELF_CORE=y 77CONFIG_ELF_CORE=y
67CONFIG_COMPAT_BRK=y
68CONFIG_BASE_FULL=y 78CONFIG_BASE_FULL=y
69CONFIG_FUTEX=y 79CONFIG_FUTEX=y
70CONFIG_ANON_INODES=y
71CONFIG_EPOLL=y 80CONFIG_EPOLL=y
72CONFIG_SIGNALFD=y 81CONFIG_SIGNALFD=y
73CONFIG_TIMERFD=y 82CONFIG_TIMERFD=y
@@ -76,6 +85,7 @@ CONFIG_SHMEM=y
76CONFIG_AIO=y 85CONFIG_AIO=y
77CONFIG_VM_EVENT_COUNTERS=y 86CONFIG_VM_EVENT_COUNTERS=y
78CONFIG_PCI_QUIRKS=y 87CONFIG_PCI_QUIRKS=y
88CONFIG_COMPAT_BRK=y
79CONFIG_SLAB=y 89CONFIG_SLAB=y
80# CONFIG_SLUB is not set 90# CONFIG_SLUB is not set
81# CONFIG_SLOB is not set 91# CONFIG_SLOB is not set
@@ -116,11 +126,6 @@ CONFIG_DEFAULT_AS=y
116# CONFIG_DEFAULT_CFQ is not set 126# CONFIG_DEFAULT_CFQ is not set
117# CONFIG_DEFAULT_NOOP is not set 127# CONFIG_DEFAULT_NOOP is not set
118CONFIG_DEFAULT_IOSCHED="anticipatory" 128CONFIG_DEFAULT_IOSCHED="anticipatory"
119CONFIG_CLASSIC_RCU=y
120# CONFIG_TREE_RCU is not set
121# CONFIG_PREEMPT_RCU is not set
122# CONFIG_TREE_RCU_TRACE is not set
123# CONFIG_PREEMPT_RCU_TRACE is not set
124# CONFIG_FREEZER is not set 129# CONFIG_FREEZER is not set
125 130
126# 131#
@@ -155,6 +160,7 @@ CONFIG_CPU_SUBTYPE_SH7091=y
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 160# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 161# CONFIG_CPU_SUBTYPE_SH7780 is not set
157# CONFIG_CPU_SUBTYPE_SH7785 is not set 162# CONFIG_CPU_SUBTYPE_SH7785 is not set
163# CONFIG_CPU_SUBTYPE_SH7786 is not set
158# CONFIG_CPU_SUBTYPE_SHX3 is not set 164# CONFIG_CPU_SUBTYPE_SHX3 is not set
159# CONFIG_CPU_SUBTYPE_SH7343 is not set 165# CONFIG_CPU_SUBTYPE_SH7343 is not set
160# CONFIG_CPU_SUBTYPE_SH7722 is not set 166# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -202,11 +208,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
202CONFIG_ZONE_DMA_FLAG=0 208CONFIG_ZONE_DMA_FLAG=0
203CONFIG_NR_QUICK=2 209CONFIG_NR_QUICK=2
204CONFIG_UNEVICTABLE_LRU=y 210CONFIG_UNEVICTABLE_LRU=y
211CONFIG_HAVE_MLOCK=y
212CONFIG_HAVE_MLOCKED_PAGE_BIT=y
205 213
206# 214#
207# Cache configuration 215# Cache configuration
208# 216#
209# CONFIG_SH_DIRECT_MAPPED is not set
210CONFIG_CACHE_WRITEBACK=y 217CONFIG_CACHE_WRITEBACK=y
211# CONFIG_CACHE_WRITETHROUGH is not set 218# CONFIG_CACHE_WRITETHROUGH is not set
212# CONFIG_CACHE_OFF is not set 219# CONFIG_CACHE_OFF is not set
@@ -263,9 +270,12 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
263# 270#
264CONFIG_SH_DMA_API=y 271CONFIG_SH_DMA_API=y
265CONFIG_SH_DMA=y 272CONFIG_SH_DMA=y
266CONFIG_NR_ONCHIP_DMA_CHANNELS=4 273CONFIG_SH_DMA_IRQ_MULTI=y
274CONFIG_NR_ONCHIP_DMA_CHANNELS=6
267CONFIG_NR_DMA_CHANNELS_BOOL=y 275CONFIG_NR_DMA_CHANNELS_BOOL=y
268CONFIG_NR_DMA_CHANNELS=9 276CONFIG_NR_DMA_CHANNELS=9
277# CONFIG_PVR2_DMA is not set
278# CONFIG_G2_DMA is not set
269 279
270# 280#
271# Companion Chips 281# Companion Chips
@@ -314,6 +324,8 @@ CONFIG_PCI_AUTO=y
314# CONFIG_PCIEPORTBUS is not set 324# CONFIG_PCIEPORTBUS is not set
315# CONFIG_ARCH_SUPPORTS_MSI is not set 325# CONFIG_ARCH_SUPPORTS_MSI is not set
316CONFIG_PCI_LEGACY=y 326CONFIG_PCI_LEGACY=y
327# CONFIG_PCI_STUB is not set
328# CONFIG_PCI_IOV is not set
317# CONFIG_PCCARD is not set 329# CONFIG_PCCARD is not set
318# CONFIG_HOTPLUG_PCI is not set 330# CONFIG_HOTPLUG_PCI is not set
319 331
@@ -335,7 +347,6 @@ CONFIG_NET=y
335# 347#
336# Networking options 348# Networking options
337# 349#
338CONFIG_COMPAT_NET_DEV_OPS=y
339CONFIG_PACKET=y 350CONFIG_PACKET=y
340# CONFIG_PACKET_MMAP is not set 351# CONFIG_PACKET_MMAP is not set
341CONFIG_UNIX=y 352CONFIG_UNIX=y
@@ -387,6 +398,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
387# CONFIG_LAPB is not set 398# CONFIG_LAPB is not set
388# CONFIG_ECONET is not set 399# CONFIG_ECONET is not set
389# CONFIG_WAN_ROUTER is not set 400# CONFIG_WAN_ROUTER is not set
401# CONFIG_PHONET is not set
390# CONFIG_NET_SCHED is not set 402# CONFIG_NET_SCHED is not set
391# CONFIG_DCB is not set 403# CONFIG_DCB is not set
392 404
@@ -399,13 +411,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
399# CONFIG_IRDA is not set 411# CONFIG_IRDA is not set
400# CONFIG_BT is not set 412# CONFIG_BT is not set
401# CONFIG_AF_RXRPC is not set 413# CONFIG_AF_RXRPC is not set
402# CONFIG_PHONET is not set
403CONFIG_WIRELESS=y 414CONFIG_WIRELESS=y
404# CONFIG_CFG80211 is not set 415# CONFIG_CFG80211 is not set
405# CONFIG_WIRELESS_OLD_REGULATORY is not set 416# CONFIG_WIRELESS_OLD_REGULATORY is not set
406# CONFIG_WIRELESS_EXT is not set 417# CONFIG_WIRELESS_EXT is not set
407# CONFIG_LIB80211 is not set 418# CONFIG_LIB80211 is not set
408# CONFIG_MAC80211 is not set 419# CONFIG_MAC80211 is not set
420# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 421# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 422# CONFIG_NET_9P is not set
411 423
@@ -439,12 +451,16 @@ CONFIG_GDROM=y
439# CONFIG_BLK_DEV_HD is not set 451# CONFIG_BLK_DEV_HD is not set
440CONFIG_MISC_DEVICES=y 452CONFIG_MISC_DEVICES=y
441# CONFIG_PHANTOM is not set 453# CONFIG_PHANTOM is not set
442# CONFIG_EEPROM_93CX6 is not set
443# CONFIG_SGI_IOC4 is not set 454# CONFIG_SGI_IOC4 is not set
444# CONFIG_TIFM_CORE is not set 455# CONFIG_TIFM_CORE is not set
445# CONFIG_ENCLOSURE_SERVICES is not set 456# CONFIG_ENCLOSURE_SERVICES is not set
446# CONFIG_HP_ILO is not set 457# CONFIG_HP_ILO is not set
447# CONFIG_C2PORT is not set 458# CONFIG_C2PORT is not set
459
460#
461# EEPROM support
462#
463# CONFIG_EEPROM_93CX6 is not set
448CONFIG_HAVE_IDE=y 464CONFIG_HAVE_IDE=y
449# CONFIG_IDE is not set 465# CONFIG_IDE is not set
450 466
@@ -470,6 +486,7 @@ CONFIG_HAVE_IDE=y
470# CONFIG_IEEE1394 is not set 486# CONFIG_IEEE1394 is not set
471# CONFIG_I2O is not set 487# CONFIG_I2O is not set
472CONFIG_NETDEVICES=y 488CONFIG_NETDEVICES=y
489CONFIG_COMPAT_NET_DEV_OPS=y
473# CONFIG_DUMMY is not set 490# CONFIG_DUMMY is not set
474# CONFIG_BONDING is not set 491# CONFIG_BONDING is not set
475# CONFIG_MACVLAN is not set 492# CONFIG_MACVLAN is not set
@@ -487,8 +504,10 @@ CONFIG_MII=y
487# CONFIG_CASSINI is not set 504# CONFIG_CASSINI is not set
488# CONFIG_NET_VENDOR_3COM is not set 505# CONFIG_NET_VENDOR_3COM is not set
489# CONFIG_SMC91X is not set 506# CONFIG_SMC91X is not set
507# CONFIG_ETHOC is not set
490# CONFIG_SMC911X is not set 508# CONFIG_SMC911X is not set
491# CONFIG_SMSC911X is not set 509# CONFIG_SMSC911X is not set
510# CONFIG_DNET is not set
492# CONFIG_NET_TULIP is not set 511# CONFIG_NET_TULIP is not set
493# CONFIG_HP100 is not set 512# CONFIG_HP100 is not set
494# CONFIG_IBM_NEW_EMAC_ZMII is not set 513# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -532,7 +551,10 @@ CONFIG_8139TOO=y
532# 551#
533# CONFIG_WLAN_PRE80211 is not set 552# CONFIG_WLAN_PRE80211 is not set
534# CONFIG_WLAN_80211 is not set 553# CONFIG_WLAN_80211 is not set
535# CONFIG_IWLWIFI_LEDS is not set 554
555#
556# Enable WiMAX (Networking options) to see the WiMAX drivers
557#
536# CONFIG_WAN is not set 558# CONFIG_WAN is not set
537# CONFIG_FDDI is not set 559# CONFIG_FDDI is not set
538# CONFIG_HIPPI is not set 560# CONFIG_HIPPI is not set
@@ -628,6 +650,7 @@ CONFIG_LEGACY_PTYS=y
628CONFIG_LEGACY_PTY_COUNT=256 650CONFIG_LEGACY_PTY_COUNT=256
629# CONFIG_IPMI_HANDLER is not set 651# CONFIG_IPMI_HANDLER is not set
630CONFIG_HW_RANDOM=y 652CONFIG_HW_RANDOM=y
653# CONFIG_HW_RANDOM_TIMERIOMEM is not set
631# CONFIG_R3964 is not set 654# CONFIG_R3964 is not set
632# CONFIG_APPLICOM is not set 655# CONFIG_APPLICOM is not set
633# CONFIG_RAW_DRIVER is not set 656# CONFIG_RAW_DRIVER is not set
@@ -746,6 +769,7 @@ CONFIG_FB_PVR2=y
746# CONFIG_FB_VIRTUAL is not set 769# CONFIG_FB_VIRTUAL is not set
747# CONFIG_FB_METRONOME is not set 770# CONFIG_FB_METRONOME is not set
748# CONFIG_FB_MB862XX is not set 771# CONFIG_FB_MB862XX is not set
772# CONFIG_FB_BROADSHEET is not set
749# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 773# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
750 774
751# 775#
@@ -802,9 +826,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
802# 826#
803 827
804# 828#
805# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 829# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
806# 830#
807# CONFIG_USB_GADGET is not set 831# CONFIG_USB_GADGET is not set
832
833#
834# OTG and related infrastructure
835#
808# CONFIG_UWB is not set 836# CONFIG_UWB is not set
809# CONFIG_MMC is not set 837# CONFIG_MMC is not set
810# CONFIG_MEMSTICK is not set 838# CONFIG_MEMSTICK is not set
@@ -813,6 +841,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
813# CONFIG_INFINIBAND is not set 841# CONFIG_INFINIBAND is not set
814# CONFIG_RTC_CLASS is not set 842# CONFIG_RTC_CLASS is not set
815# CONFIG_DMADEVICES is not set 843# CONFIG_DMADEVICES is not set
844# CONFIG_AUXDISPLAY is not set
816# CONFIG_UIO is not set 845# CONFIG_UIO is not set
817# CONFIG_STAGING is not set 846# CONFIG_STAGING is not set
818 847
@@ -828,6 +857,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
828CONFIG_FILE_LOCKING=y 857CONFIG_FILE_LOCKING=y
829# CONFIG_XFS_FS is not set 858# CONFIG_XFS_FS is not set
830# CONFIG_OCFS2_FS is not set 859# CONFIG_OCFS2_FS is not set
860# CONFIG_BTRFS_FS is not set
831# CONFIG_DNOTIFY is not set 861# CONFIG_DNOTIFY is not set
832CONFIG_INOTIFY=y 862CONFIG_INOTIFY=y
833CONFIG_INOTIFY_USER=y 863CONFIG_INOTIFY_USER=y
@@ -871,6 +901,7 @@ CONFIG_MISC_FILESYSTEMS=y
871# CONFIG_BFS_FS is not set 901# CONFIG_BFS_FS is not set
872# CONFIG_EFS_FS is not set 902# CONFIG_EFS_FS is not set
873# CONFIG_CRAMFS is not set 903# CONFIG_CRAMFS is not set
904# CONFIG_SQUASHFS is not set
874# CONFIG_VXFS_FS is not set 905# CONFIG_VXFS_FS is not set
875# CONFIG_MINIX_FS is not set 906# CONFIG_MINIX_FS is not set
876# CONFIG_OMFS_FS is not set 907# CONFIG_OMFS_FS is not set
@@ -920,7 +951,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
920# 951#
921# Tracers 952# Tracers
922# 953#
923# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
924# CONFIG_SAMPLES is not set 954# CONFIG_SAMPLES is not set
925CONFIG_HAVE_ARCH_KGDB=y 955CONFIG_HAVE_ARCH_KGDB=y
926# CONFIG_SH_STANDARD_BIOS is not set 956# CONFIG_SH_STANDARD_BIOS is not set
@@ -1012,6 +1042,7 @@ CONFIG_CRYPTO=y
1012# Compression 1042# Compression
1013# 1043#
1014# CONFIG_CRYPTO_DEFLATE is not set 1044# CONFIG_CRYPTO_DEFLATE is not set
1045# CONFIG_CRYPTO_ZLIB is not set
1015# CONFIG_CRYPTO_LZO is not set 1046# CONFIG_CRYPTO_LZO is not set
1016 1047
1017# 1048#
@@ -1033,7 +1064,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
1033CONFIG_CRC32=y 1064CONFIG_CRC32=y
1034# CONFIG_CRC7 is not set 1065# CONFIG_CRC7 is not set
1035# CONFIG_LIBCRC32C is not set 1066# CONFIG_LIBCRC32C is not set
1036CONFIG_PLIST=y
1037CONFIG_HAS_IOMEM=y 1067CONFIG_HAS_IOMEM=y
1038CONFIG_HAS_IOPORT=y 1068CONFIG_HAS_IOPORT=y
1039CONFIG_HAS_DMA=y 1069CONFIG_HAS_DMA=y
1070CONFIG_NLATTR=y
diff --git a/arch/sh/configs/edosk7705_defconfig b/arch/sh/configs/edosk7705_defconfig
index 461bfb350221..f4c34b039312 100644
--- a/arch/sh/configs/edosk7705_defconfig
+++ b/arch/sh/configs/edosk7705_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 16:55:29 2009 4# Thu Apr 2 17:54:02 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,13 +16,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_GENERIC_TIME=y 16CONFIG_GENERIC_TIME=y
17CONFIG_GENERIC_CLOCKEVENTS=y 17CONFIG_GENERIC_CLOCKEVENTS=y
18# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 18# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
19# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 19CONFIG_ARCH_HIBERNATION_POSSIBLE=y
20CONFIG_STACKTRACE_SUPPORT=y 20CONFIG_STACKTRACE_SUPPORT=y
21CONFIG_LOCKDEP_SUPPORT=y 21CONFIG_LOCKDEP_SUPPORT=y
22CONFIG_HAVE_LATENCYTOP_SUPPORT=y 22CONFIG_HAVE_LATENCYTOP_SUPPORT=y
23# CONFIG_ARCH_HAS_ILOG2_U32 is not set 23# CONFIG_ARCH_HAS_ILOG2_U32 is not set
24# CONFIG_ARCH_HAS_ILOG2_U64 is not set 24# CONFIG_ARCH_HAS_ILOG2_U64 is not set
25CONFIG_ARCH_NO_VIRT_TO_BUS=y 25CONFIG_ARCH_NO_VIRT_TO_BUS=y
26CONFIG_ARCH_HAS_DEFAULT_IDLE=y
26CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
27 28
28# 29#
@@ -35,6 +36,15 @@ CONFIG_LOCALVERSION=""
35# CONFIG_LOCALVERSION_AUTO is not set 36# CONFIG_LOCALVERSION_AUTO is not set
36# CONFIG_SYSVIPC is not set 37# CONFIG_SYSVIPC is not set
37# CONFIG_BSD_PROCESS_ACCT is not set 38# CONFIG_BSD_PROCESS_ACCT is not set
39
40#
41# RCU Subsystem
42#
43CONFIG_CLASSIC_RCU=y
44# CONFIG_TREE_RCU is not set
45# CONFIG_PREEMPT_RCU is not set
46# CONFIG_TREE_RCU_TRACE is not set
47# CONFIG_PREEMPT_RCU_TRACE is not set
38# CONFIG_IKCONFIG is not set 48# CONFIG_IKCONFIG is not set
39CONFIG_LOG_BUF_SHIFT=17 49CONFIG_LOG_BUF_SHIFT=17
40# CONFIG_CGROUPS is not set 50# CONFIG_CGROUPS is not set
@@ -50,7 +60,6 @@ CONFIG_EMBEDDED=y
50# CONFIG_PRINTK is not set 60# CONFIG_PRINTK is not set
51# CONFIG_BUG is not set 61# CONFIG_BUG is not set
52# CONFIG_ELF_CORE is not set 62# CONFIG_ELF_CORE is not set
53# CONFIG_COMPAT_BRK is not set
54# CONFIG_BASE_FULL is not set 63# CONFIG_BASE_FULL is not set
55# CONFIG_FUTEX is not set 64# CONFIG_FUTEX is not set
56# CONFIG_EPOLL is not set 65# CONFIG_EPOLL is not set
@@ -60,6 +69,7 @@ CONFIG_EMBEDDED=y
60CONFIG_SHMEM=y 69CONFIG_SHMEM=y
61# CONFIG_AIO is not set 70# CONFIG_AIO is not set
62# CONFIG_VM_EVENT_COUNTERS is not set 71# CONFIG_VM_EVENT_COUNTERS is not set
72# CONFIG_COMPAT_BRK is not set
63# CONFIG_SLAB is not set 73# CONFIG_SLAB is not set
64CONFIG_SLUB=y 74CONFIG_SLUB=y
65# CONFIG_SLOB is not set 75# CONFIG_SLOB is not set
@@ -74,11 +84,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
74CONFIG_BASE_SMALL=1 84CONFIG_BASE_SMALL=1
75# CONFIG_MODULES is not set 85# CONFIG_MODULES is not set
76# CONFIG_BLOCK is not set 86# CONFIG_BLOCK is not set
77CONFIG_CLASSIC_RCU=y
78# CONFIG_TREE_RCU is not set
79# CONFIG_PREEMPT_RCU is not set
80# CONFIG_TREE_RCU_TRACE is not set
81# CONFIG_PREEMPT_RCU_TRACE is not set
82# CONFIG_FREEZER is not set 87# CONFIG_FREEZER is not set
83 88
84# 89#
@@ -113,6 +118,7 @@ CONFIG_CPU_SUBTYPE_SH7705=y
113# CONFIG_CPU_SUBTYPE_SH7770 is not set 118# CONFIG_CPU_SUBTYPE_SH7770 is not set
114# CONFIG_CPU_SUBTYPE_SH7780 is not set 119# CONFIG_CPU_SUBTYPE_SH7780 is not set
115# CONFIG_CPU_SUBTYPE_SH7785 is not set 120# CONFIG_CPU_SUBTYPE_SH7785 is not set
121# CONFIG_CPU_SUBTYPE_SH7786 is not set
116# CONFIG_CPU_SUBTYPE_SHX3 is not set 122# CONFIG_CPU_SUBTYPE_SHX3 is not set
117# CONFIG_CPU_SUBTYPE_SH7343 is not set 123# CONFIG_CPU_SUBTYPE_SH7343 is not set
118# CONFIG_CPU_SUBTYPE_SH7722 is not set 124# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -157,12 +163,13 @@ CONFIG_MIGRATION=y
157CONFIG_ZONE_DMA_FLAG=0 163CONFIG_ZONE_DMA_FLAG=0
158CONFIG_NR_QUICK=2 164CONFIG_NR_QUICK=2
159CONFIG_UNEVICTABLE_LRU=y 165CONFIG_UNEVICTABLE_LRU=y
166CONFIG_HAVE_MLOCK=y
167CONFIG_HAVE_MLOCKED_PAGE_BIT=y
160 168
161# 169#
162# Cache configuration 170# Cache configuration
163# 171#
164CONFIG_SH7705_CACHE_32KB=y 172CONFIG_SH7705_CACHE_32KB=y
165# CONFIG_SH_DIRECT_MAPPED is not set
166CONFIG_CACHE_WRITEBACK=y 173CONFIG_CACHE_WRITEBACK=y
167# CONFIG_CACHE_WRITETHROUGH is not set 174# CONFIG_CACHE_WRITETHROUGH is not set
168# CONFIG_CACHE_OFF is not set 175# CONFIG_CACHE_OFF is not set
@@ -243,7 +250,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
243# Executable file formats 250# Executable file formats
244# 251#
245CONFIG_BINFMT_ELF=y 252CONFIG_BINFMT_ELF=y
246# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
247# CONFIG_HAVE_AOUT is not set 253# CONFIG_HAVE_AOUT is not set
248# CONFIG_BINFMT_MISC is not set 254# CONFIG_BINFMT_MISC is not set
249# CONFIG_NET is not set 255# CONFIG_NET is not set
@@ -361,6 +367,7 @@ CONFIG_SSB_POSSIBLE=y
361# CONFIG_ACCESSIBILITY is not set 367# CONFIG_ACCESSIBILITY is not set
362# CONFIG_RTC_CLASS is not set 368# CONFIG_RTC_CLASS is not set
363# CONFIG_DMADEVICES is not set 369# CONFIG_DMADEVICES is not set
370# CONFIG_AUXDISPLAY is not set
364# CONFIG_UIO is not set 371# CONFIG_UIO is not set
365# CONFIG_STAGING is not set 372# CONFIG_STAGING is not set
366 373
diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig
index 14d4b35685a1..7825c2699f18 100644
--- a/arch/sh/configs/edosk7760_defconfig
+++ b/arch/sh/configs/edosk7760_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 16:55:48 2009 4# Thu Apr 2 17:54:57 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -43,34 +44,45 @@ CONFIG_BSD_PROCESS_ACCT=y
43# CONFIG_BSD_PROCESS_ACCT_V3 is not set 44# CONFIG_BSD_PROCESS_ACCT_V3 is not set
44# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
45# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
47
48#
49# RCU Subsystem
50#
51CONFIG_CLASSIC_RCU=y
52# CONFIG_TREE_RCU is not set
53# CONFIG_PREEMPT_RCU is not set
54# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
46CONFIG_IKCONFIG=y 56CONFIG_IKCONFIG=y
47CONFIG_IKCONFIG_PROC=y 57CONFIG_IKCONFIG_PROC=y
48CONFIG_LOG_BUF_SHIFT=17 58CONFIG_LOG_BUF_SHIFT=17
49# CONFIG_CGROUPS is not set
50# CONFIG_GROUP_SCHED is not set 59# CONFIG_GROUP_SCHED is not set
60# CONFIG_CGROUPS is not set
51CONFIG_SYSFS_DEPRECATED=y 61CONFIG_SYSFS_DEPRECATED=y
52CONFIG_SYSFS_DEPRECATED_V2=y 62CONFIG_SYSFS_DEPRECATED_V2=y
53# CONFIG_RELAY is not set 63# CONFIG_RELAY is not set
54# CONFIG_NAMESPACES is not set 64# CONFIG_NAMESPACES is not set
55CONFIG_BLK_DEV_INITRD=y 65CONFIG_BLK_DEV_INITRD=y
56CONFIG_INITRAMFS_SOURCE="" 66CONFIG_INITRAMFS_SOURCE=""
67CONFIG_RD_GZIP=y
68# CONFIG_RD_BZIP2 is not set
69# CONFIG_RD_LZMA is not set
70CONFIG_INITRAMFS_COMPRESSION_NONE=y
57CONFIG_CC_OPTIMIZE_FOR_SIZE=y 71CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58CONFIG_SYSCTL=y 72CONFIG_SYSCTL=y
73CONFIG_ANON_INODES=y
59CONFIG_EMBEDDED=y 74CONFIG_EMBEDDED=y
60CONFIG_UID16=y 75CONFIG_UID16=y
61CONFIG_SYSCTL_SYSCALL=y 76CONFIG_SYSCTL_SYSCALL=y
62CONFIG_KALLSYMS=y 77CONFIG_KALLSYMS=y
63CONFIG_KALLSYMS_ALL=y 78CONFIG_KALLSYMS_ALL=y
64CONFIG_KALLSYMS_STRIP_GENERATED=y
65# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
66CONFIG_HOTPLUG=y 80CONFIG_HOTPLUG=y
67CONFIG_PRINTK=y 81CONFIG_PRINTK=y
68CONFIG_BUG=y 82CONFIG_BUG=y
69CONFIG_ELF_CORE=y 83CONFIG_ELF_CORE=y
70CONFIG_COMPAT_BRK=y
71CONFIG_BASE_FULL=y 84CONFIG_BASE_FULL=y
72CONFIG_FUTEX=y 85CONFIG_FUTEX=y
73CONFIG_ANON_INODES=y
74CONFIG_EPOLL=y 86CONFIG_EPOLL=y
75CONFIG_SIGNALFD=y 87CONFIG_SIGNALFD=y
76CONFIG_TIMERFD=y 88CONFIG_TIMERFD=y
@@ -79,6 +91,7 @@ CONFIG_SHMEM=y
79CONFIG_AIO=y 91CONFIG_AIO=y
80CONFIG_VM_EVENT_COUNTERS=y 92CONFIG_VM_EVENT_COUNTERS=y
81CONFIG_SLUB_DEBUG=y 93CONFIG_SLUB_DEBUG=y
94CONFIG_COMPAT_BRK=y
82# CONFIG_SLAB is not set 95# CONFIG_SLAB is not set
83CONFIG_SLUB=y 96CONFIG_SLUB=y
84# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
@@ -118,11 +131,6 @@ CONFIG_IOSCHED_CFQ=y
118CONFIG_DEFAULT_CFQ=y 131CONFIG_DEFAULT_CFQ=y
119# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
120CONFIG_DEFAULT_IOSCHED="cfq" 133CONFIG_DEFAULT_IOSCHED="cfq"
121CONFIG_CLASSIC_RCU=y
122# CONFIG_TREE_RCU is not set
123# CONFIG_PREEMPT_RCU is not set
124# CONFIG_TREE_RCU_TRACE is not set
125# CONFIG_PREEMPT_RCU_TRACE is not set
126# CONFIG_FREEZER is not set 134# CONFIG_FREEZER is not set
127 135
128# 136#
@@ -157,6 +165,7 @@ CONFIG_CPU_SUBTYPE_SH7760=y
157# CONFIG_CPU_SUBTYPE_SH7770 is not set 165# CONFIG_CPU_SUBTYPE_SH7770 is not set
158# CONFIG_CPU_SUBTYPE_SH7780 is not set 166# CONFIG_CPU_SUBTYPE_SH7780 is not set
159# CONFIG_CPU_SUBTYPE_SH7785 is not set 167# CONFIG_CPU_SUBTYPE_SH7785 is not set
168# CONFIG_CPU_SUBTYPE_SH7786 is not set
160# CONFIG_CPU_SUBTYPE_SHX3 is not set 169# CONFIG_CPU_SUBTYPE_SHX3 is not set
161# CONFIG_CPU_SUBTYPE_SH7343 is not set 170# CONFIG_CPU_SUBTYPE_SH7343 is not set
162# CONFIG_CPU_SUBTYPE_SH7722 is not set 171# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -198,11 +207,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
198CONFIG_ZONE_DMA_FLAG=0 207CONFIG_ZONE_DMA_FLAG=0
199CONFIG_NR_QUICK=2 208CONFIG_NR_QUICK=2
200CONFIG_UNEVICTABLE_LRU=y 209CONFIG_UNEVICTABLE_LRU=y
210CONFIG_HAVE_MLOCK=y
211CONFIG_HAVE_MLOCKED_PAGE_BIT=y
201 212
202# 213#
203# Cache configuration 214# Cache configuration
204# 215#
205# CONFIG_SH_DIRECT_MAPPED is not set
206CONFIG_CACHE_WRITEBACK=y 216CONFIG_CACHE_WRITEBACK=y
207# CONFIG_CACHE_WRITETHROUGH is not set 217# CONFIG_CACHE_WRITETHROUGH is not set
208# CONFIG_CACHE_OFF is not set 218# CONFIG_CACHE_OFF is not set
@@ -245,7 +255,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
245# 255#
246CONFIG_SH_DMA_API=y 256CONFIG_SH_DMA_API=y
247CONFIG_SH_DMA=y 257CONFIG_SH_DMA=y
248CONFIG_NR_ONCHIP_DMA_CHANNELS=4 258CONFIG_NR_ONCHIP_DMA_CHANNELS=8
249# CONFIG_NR_DMA_CHANNELS_BOOL is not set 259# CONFIG_NR_DMA_CHANNELS_BOOL is not set
250# CONFIG_SH_DMABRG is not set 260# CONFIG_SH_DMABRG is not set
251 261
@@ -310,7 +320,6 @@ CONFIG_NET=y
310# 320#
311# Networking options 321# Networking options
312# 322#
313CONFIG_COMPAT_NET_DEV_OPS=y
314CONFIG_PACKET=y 323CONFIG_PACKET=y
315# CONFIG_PACKET_MMAP is not set 324# CONFIG_PACKET_MMAP is not set
316CONFIG_UNIX=y 325CONFIG_UNIX=y
@@ -360,6 +369,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
360# CONFIG_LAPB is not set 369# CONFIG_LAPB is not set
361# CONFIG_ECONET is not set 370# CONFIG_ECONET is not set
362# CONFIG_WAN_ROUTER is not set 371# CONFIG_WAN_ROUTER is not set
372# CONFIG_PHONET is not set
363# CONFIG_NET_SCHED is not set 373# CONFIG_NET_SCHED is not set
364# CONFIG_DCB is not set 374# CONFIG_DCB is not set
365 375
@@ -372,13 +382,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
372# CONFIG_IRDA is not set 382# CONFIG_IRDA is not set
373# CONFIG_BT is not set 383# CONFIG_BT is not set
374# CONFIG_AF_RXRPC is not set 384# CONFIG_AF_RXRPC is not set
375# CONFIG_PHONET is not set
376CONFIG_WIRELESS=y 385CONFIG_WIRELESS=y
377# CONFIG_CFG80211 is not set 386# CONFIG_CFG80211 is not set
378# CONFIG_WIRELESS_OLD_REGULATORY is not set 387# CONFIG_WIRELESS_OLD_REGULATORY is not set
379# CONFIG_WIRELESS_EXT is not set 388# CONFIG_WIRELESS_EXT is not set
380# CONFIG_LIB80211 is not set 389# CONFIG_LIB80211 is not set
381# CONFIG_MAC80211 is not set 390# CONFIG_MAC80211 is not set
391# CONFIG_WIMAX is not set
382# CONFIG_RFKILL is not set 392# CONFIG_RFKILL is not set
383# CONFIG_NET_9P is not set 393# CONFIG_NET_9P is not set
384 394
@@ -402,6 +412,7 @@ CONFIG_MTD_DEBUG=y
402CONFIG_MTD_DEBUG_VERBOSE=0 412CONFIG_MTD_DEBUG_VERBOSE=0
403CONFIG_MTD_CONCAT=y 413CONFIG_MTD_CONCAT=y
404CONFIG_MTD_PARTITIONS=y 414CONFIG_MTD_PARTITIONS=y
415# CONFIG_MTD_TESTS is not set
405# CONFIG_MTD_REDBOOT_PARTS is not set 416# CONFIG_MTD_REDBOOT_PARTS is not set
406CONFIG_MTD_CMDLINE_PARTS=y 417CONFIG_MTD_CMDLINE_PARTS=y
407# CONFIG_MTD_AR7_PARTS is not set 418# CONFIG_MTD_AR7_PARTS is not set
@@ -454,9 +465,7 @@ CONFIG_MTD_ABSENT=y
454# 465#
455# CONFIG_MTD_COMPLEX_MAPPINGS is not set 466# CONFIG_MTD_COMPLEX_MAPPINGS is not set
456CONFIG_MTD_PHYSMAP=y 467CONFIG_MTD_PHYSMAP=y
457CONFIG_MTD_PHYSMAP_START=0xffffffff 468# CONFIG_MTD_PHYSMAP_COMPAT is not set
458CONFIG_MTD_PHYSMAP_LEN=0x0
459CONFIG_MTD_PHYSMAP_BANKWIDTH=4
460# CONFIG_MTD_PLATRAM is not set 469# CONFIG_MTD_PLATRAM is not set
461 470
462# 471#
@@ -477,6 +486,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
477# CONFIG_MTD_ONENAND is not set 486# CONFIG_MTD_ONENAND is not set
478 487
479# 488#
489# LPDDR flash memory drivers
490#
491# CONFIG_MTD_LPDDR is not set
492
493#
480# UBI - Unsorted block images 494# UBI - Unsorted block images
481# 495#
482# CONFIG_MTD_UBI is not set 496# CONFIG_MTD_UBI is not set
@@ -506,6 +520,7 @@ CONFIG_HAVE_IDE=y
506# CONFIG_ATA is not set 520# CONFIG_ATA is not set
507# CONFIG_MD is not set 521# CONFIG_MD is not set
508CONFIG_NETDEVICES=y 522CONFIG_NETDEVICES=y
523CONFIG_COMPAT_NET_DEV_OPS=y
509# CONFIG_DUMMY is not set 524# CONFIG_DUMMY is not set
510# CONFIG_BONDING is not set 525# CONFIG_BONDING is not set
511# CONFIG_MACVLAN is not set 526# CONFIG_MACVLAN is not set
@@ -518,8 +533,10 @@ CONFIG_MII=y
518# CONFIG_AX88796 is not set 533# CONFIG_AX88796 is not set
519# CONFIG_STNIC is not set 534# CONFIG_STNIC is not set
520CONFIG_SMC91X=y 535CONFIG_SMC91X=y
536# CONFIG_ETHOC is not set
521# CONFIG_SMC911X is not set 537# CONFIG_SMC911X is not set
522# CONFIG_SMSC911X is not set 538# CONFIG_SMSC911X is not set
539# CONFIG_DNET is not set
523# CONFIG_IBM_NEW_EMAC_ZMII is not set 540# CONFIG_IBM_NEW_EMAC_ZMII is not set
524# CONFIG_IBM_NEW_EMAC_RGMII is not set 541# CONFIG_IBM_NEW_EMAC_RGMII is not set
525# CONFIG_IBM_NEW_EMAC_TAH is not set 542# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -536,7 +553,10 @@ CONFIG_SMC91X=y
536# 553#
537# CONFIG_WLAN_PRE80211 is not set 554# CONFIG_WLAN_PRE80211 is not set
538# CONFIG_WLAN_80211 is not set 555# CONFIG_WLAN_80211 is not set
539# CONFIG_IWLWIFI_LEDS is not set 556
557#
558# Enable WiMAX (Networking options) to see the WiMAX drivers
559#
540# CONFIG_WAN is not set 560# CONFIG_WAN is not set
541# CONFIG_PPP is not set 561# CONFIG_PPP is not set
542# CONFIG_SLIP is not set 562# CONFIG_SLIP is not set
@@ -607,6 +627,7 @@ CONFIG_LEGACY_PTYS=y
607CONFIG_LEGACY_PTY_COUNT=256 627CONFIG_LEGACY_PTY_COUNT=256
608# CONFIG_IPMI_HANDLER is not set 628# CONFIG_IPMI_HANDLER is not set
609CONFIG_HW_RANDOM=y 629CONFIG_HW_RANDOM=y
630# CONFIG_HW_RANDOM_TIMERIOMEM is not set
610# CONFIG_R3964 is not set 631# CONFIG_R3964 is not set
611# CONFIG_RAW_DRIVER is not set 632# CONFIG_RAW_DRIVER is not set
612# CONFIG_TCG_TPM is not set 633# CONFIG_TCG_TPM is not set
@@ -643,12 +664,9 @@ CONFIG_I2C_SH7760=y
643# Miscellaneous I2C Chip support 664# Miscellaneous I2C Chip support
644# 665#
645# CONFIG_DS1682 is not set 666# CONFIG_DS1682 is not set
646# CONFIG_EEPROM_AT24 is not set
647# CONFIG_EEPROM_LEGACY is not set
648# CONFIG_SENSORS_PCF8574 is not set 667# CONFIG_SENSORS_PCF8574 is not set
649# CONFIG_PCF8575 is not set 668# CONFIG_PCF8575 is not set
650# CONFIG_SENSORS_PCA9539 is not set 669# CONFIG_SENSORS_PCA9539 is not set
651# CONFIG_SENSORS_PCF8591 is not set
652# CONFIG_SENSORS_MAX6875 is not set 670# CONFIG_SENSORS_MAX6875 is not set
653# CONFIG_SENSORS_TSL2550 is not set 671# CONFIG_SENSORS_TSL2550 is not set
654CONFIG_I2C_DEBUG_CORE=y 672CONFIG_I2C_DEBUG_CORE=y
@@ -680,6 +698,7 @@ CONFIG_SSB_POSSIBLE=y
680# CONFIG_PMIC_DA903X is not set 698# CONFIG_PMIC_DA903X is not set
681# CONFIG_MFD_WM8400 is not set 699# CONFIG_MFD_WM8400 is not set
682# CONFIG_MFD_WM8350_I2C is not set 700# CONFIG_MFD_WM8350_I2C is not set
701# CONFIG_MFD_PCF50633 is not set
683# CONFIG_REGULATOR is not set 702# CONFIG_REGULATOR is not set
684 703
685# 704#
@@ -732,6 +751,7 @@ CONFIG_FB_SH_MOBILE_LCDC=m
732# CONFIG_FB_VIRTUAL is not set 751# CONFIG_FB_VIRTUAL is not set
733# CONFIG_FB_METRONOME is not set 752# CONFIG_FB_METRONOME is not set
734# CONFIG_FB_MB862XX is not set 753# CONFIG_FB_MB862XX is not set
754# CONFIG_FB_BROADSHEET is not set
735# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 755# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
736 756
737# 757#
@@ -750,6 +770,7 @@ CONFIG_SOUND=y
750CONFIG_SND=y 770CONFIG_SND=y
751CONFIG_SND_TIMER=y 771CONFIG_SND_TIMER=y
752CONFIG_SND_PCM=y 772CONFIG_SND_PCM=y
773CONFIG_SND_JACK=y
753# CONFIG_SND_SEQUENCER is not set 774# CONFIG_SND_SEQUENCER is not set
754# CONFIG_SND_MIXER_OSS is not set 775# CONFIG_SND_MIXER_OSS is not set
755# CONFIG_SND_PCM_OSS is not set 776# CONFIG_SND_PCM_OSS is not set
@@ -781,6 +802,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
781# CONFIG_ACCESSIBILITY is not set 802# CONFIG_ACCESSIBILITY is not set
782# CONFIG_RTC_CLASS is not set 803# CONFIG_RTC_CLASS is not set
783# CONFIG_DMADEVICES is not set 804# CONFIG_DMADEVICES is not set
805# CONFIG_AUXDISPLAY is not set
784# CONFIG_UIO is not set 806# CONFIG_UIO is not set
785# CONFIG_STAGING is not set 807# CONFIG_STAGING is not set
786 808
@@ -806,6 +828,7 @@ CONFIG_FS_POSIX_ACL=y
806CONFIG_FILE_LOCKING=y 828CONFIG_FILE_LOCKING=y
807# CONFIG_XFS_FS is not set 829# CONFIG_XFS_FS is not set
808# CONFIG_OCFS2_FS is not set 830# CONFIG_OCFS2_FS is not set
831# CONFIG_BTRFS_FS is not set
809CONFIG_DNOTIFY=y 832CONFIG_DNOTIFY=y
810CONFIG_INOTIFY=y 833CONFIG_INOTIFY=y
811CONFIG_INOTIFY_USER=y 834CONFIG_INOTIFY_USER=y
@@ -851,6 +874,7 @@ CONFIG_MISC_FILESYSTEMS=y
851# CONFIG_EFS_FS is not set 874# CONFIG_EFS_FS is not set
852# CONFIG_JFFS2_FS is not set 875# CONFIG_JFFS2_FS is not set
853# CONFIG_CRAMFS is not set 876# CONFIG_CRAMFS is not set
877# CONFIG_SQUASHFS is not set
854# CONFIG_VXFS_FS is not set 878# CONFIG_VXFS_FS is not set
855# CONFIG_MINIX_FS is not set 879# CONFIG_MINIX_FS is not set
856# CONFIG_OMFS_FS is not set 880# CONFIG_OMFS_FS is not set
@@ -868,7 +892,6 @@ CONFIG_ROOT_NFS=y
868CONFIG_LOCKD=y 892CONFIG_LOCKD=y
869CONFIG_NFS_COMMON=y 893CONFIG_NFS_COMMON=y
870CONFIG_SUNRPC=y 894CONFIG_SUNRPC=y
871# CONFIG_SUNRPC_REGISTER_V4 is not set
872# CONFIG_RPCSEC_GSS_KRB5 is not set 895# CONFIG_RPCSEC_GSS_KRB5 is not set
873# CONFIG_RPCSEC_GSS_SPKM3 is not set 896# CONFIG_RPCSEC_GSS_SPKM3 is not set
874# CONFIG_SMB_FS is not set 897# CONFIG_SMB_FS is not set
@@ -974,6 +997,7 @@ CONFIG_DEBUG_INFO=y
974# CONFIG_FAULT_INJECTION is not set 997# CONFIG_FAULT_INJECTION is not set
975# CONFIG_LATENCYTOP is not set 998# CONFIG_LATENCYTOP is not set
976CONFIG_SYSCTL_SYSCALL_CHECK=y 999CONFIG_SYSCTL_SYSCALL_CHECK=y
1000# CONFIG_PAGE_POISONING is not set
977CONFIG_HAVE_FUNCTION_TRACER=y 1001CONFIG_HAVE_FUNCTION_TRACER=y
978CONFIG_HAVE_DYNAMIC_FTRACE=y 1002CONFIG_HAVE_DYNAMIC_FTRACE=y
979CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1003CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -989,7 +1013,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
989# CONFIG_BOOT_TRACER is not set 1013# CONFIG_BOOT_TRACER is not set
990# CONFIG_TRACE_BRANCH_PROFILING is not set 1014# CONFIG_TRACE_BRANCH_PROFILING is not set
991# CONFIG_STACK_TRACER is not set 1015# CONFIG_STACK_TRACER is not set
992# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
993# CONFIG_SAMPLES is not set 1016# CONFIG_SAMPLES is not set
994CONFIG_HAVE_ARCH_KGDB=y 1017CONFIG_HAVE_ARCH_KGDB=y
995# CONFIG_KGDB is not set 1018# CONFIG_KGDB is not set
@@ -1095,6 +1118,7 @@ CONFIG_CRYPTO_DES=y
1095# Compression 1118# Compression
1096# 1119#
1097# CONFIG_CRYPTO_DEFLATE is not set 1120# CONFIG_CRYPTO_DEFLATE is not set
1121# CONFIG_CRYPTO_ZLIB is not set
1098# CONFIG_CRYPTO_LZO is not set 1122# CONFIG_CRYPTO_LZO is not set
1099 1123
1100# 1124#
@@ -1115,7 +1139,9 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
1115CONFIG_CRC32=y 1139CONFIG_CRC32=y
1116# CONFIG_CRC7 is not set 1140# CONFIG_CRC7 is not set
1117# CONFIG_LIBCRC32C is not set 1141# CONFIG_LIBCRC32C is not set
1118CONFIG_PLIST=y 1142CONFIG_ZLIB_INFLATE=y
1143CONFIG_DECOMPRESS_GZIP=y
1119CONFIG_HAS_IOMEM=y 1144CONFIG_HAS_IOMEM=y
1120CONFIG_HAS_IOPORT=y 1145CONFIG_HAS_IOPORT=y
1121CONFIG_HAS_DMA=y 1146CONFIG_HAS_DMA=y
1147CONFIG_NLATTR=y
diff --git a/arch/sh/configs/espt_defconfig b/arch/sh/configs/espt_defconfig
index 873ec42c6e69..ebb4c37abaa6 100644
--- a/arch/sh/configs/espt_defconfig
+++ b/arch/sh/configs/espt_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.29-rc7 3# Linux kernel version: 2.6.29
4# Tue Mar 17 13:25:58 2009 4# Thu Apr 2 17:58:18 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -71,6 +72,7 @@ CONFIG_IPC_NS=y
71# CONFIG_BLK_DEV_INITRD is not set 72# CONFIG_BLK_DEV_INITRD is not set
72CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
73CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
75CONFIG_ANON_INODES=y
74CONFIG_EMBEDDED=y 76CONFIG_EMBEDDED=y
75CONFIG_UID16=y 77CONFIG_UID16=y
76# CONFIG_SYSCTL_SYSCALL is not set 78# CONFIG_SYSCTL_SYSCALL is not set
@@ -80,10 +82,8 @@ CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 82CONFIG_PRINTK=y
81CONFIG_BUG=y 83CONFIG_BUG=y
82CONFIG_ELF_CORE=y 84CONFIG_ELF_CORE=y
83CONFIG_COMPAT_BRK=y
84CONFIG_BASE_FULL=y 85CONFIG_BASE_FULL=y
85CONFIG_FUTEX=y 86CONFIG_FUTEX=y
86CONFIG_ANON_INODES=y
87CONFIG_EPOLL=y 87CONFIG_EPOLL=y
88CONFIG_SIGNALFD=y 88CONFIG_SIGNALFD=y
89CONFIG_TIMERFD=y 89CONFIG_TIMERFD=y
@@ -91,6 +91,7 @@ CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 91CONFIG_SHMEM=y
92CONFIG_AIO=y 92CONFIG_AIO=y
93CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
94CONFIG_COMPAT_BRK=y
94CONFIG_SLAB=y 95CONFIG_SLAB=y
95# CONFIG_SLUB is not set 96# CONFIG_SLUB is not set
96# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
@@ -213,11 +214,12 @@ CONFIG_MIGRATION=y
213CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
214CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
215CONFIG_UNEVICTABLE_LRU=y 216CONFIG_UNEVICTABLE_LRU=y
217CONFIG_HAVE_MLOCK=y
218CONFIG_HAVE_MLOCKED_PAGE_BIT=y
216 219
217# 220#
218# Cache configuration 221# Cache configuration
219# 222#
220# CONFIG_SH_DIRECT_MAPPED is not set
221CONFIG_CACHE_WRITEBACK=y 223CONFIG_CACHE_WRITEBACK=y
222# CONFIG_CACHE_WRITETHROUGH is not set 224# CONFIG_CACHE_WRITETHROUGH is not set
223# CONFIG_CACHE_OFF is not set 225# CONFIG_CACHE_OFF is not set
@@ -318,7 +320,6 @@ CONFIG_NET=y
318# 320#
319# Networking options 321# Networking options
320# 322#
321CONFIG_COMPAT_NET_DEV_OPS=y
322CONFIG_PACKET=y 323CONFIG_PACKET=y
323# CONFIG_PACKET_MMAP is not set 324# CONFIG_PACKET_MMAP is not set
324CONFIG_UNIX=y 325CONFIG_UNIX=y
@@ -373,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_LAPB is not set 374# CONFIG_LAPB is not set
374# CONFIG_ECONET is not set 375# CONFIG_ECONET is not set
375# CONFIG_WAN_ROUTER is not set 376# CONFIG_WAN_ROUTER is not set
377# CONFIG_PHONET is not set
376# CONFIG_NET_SCHED is not set 378# CONFIG_NET_SCHED is not set
377# CONFIG_DCB is not set 379# CONFIG_DCB is not set
378 380
@@ -380,12 +382,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
380# Network testing 382# Network testing
381# 383#
382# CONFIG_NET_PKTGEN is not set 384# CONFIG_NET_PKTGEN is not set
385# CONFIG_NET_DROP_MONITOR is not set
383# CONFIG_HAMRADIO is not set 386# CONFIG_HAMRADIO is not set
384# CONFIG_CAN is not set 387# CONFIG_CAN is not set
385# CONFIG_IRDA is not set 388# CONFIG_IRDA is not set
386# CONFIG_BT is not set 389# CONFIG_BT is not set
387# CONFIG_AF_RXRPC is not set 390# CONFIG_AF_RXRPC is not set
388# CONFIG_PHONET is not set
389# CONFIG_WIRELESS is not set 391# CONFIG_WIRELESS is not set
390# CONFIG_WIMAX is not set 392# CONFIG_WIMAX is not set
391# CONFIG_RFKILL is not set 393# CONFIG_RFKILL is not set
@@ -548,9 +550,11 @@ CONFIG_SCSI_LOWLEVEL=y
548# CONFIG_LIBFC is not set 550# CONFIG_LIBFC is not set
549# CONFIG_SCSI_DEBUG is not set 551# CONFIG_SCSI_DEBUG is not set
550# CONFIG_SCSI_DH is not set 552# CONFIG_SCSI_DH is not set
553# CONFIG_SCSI_OSD_INITIATOR is not set
551# CONFIG_ATA is not set 554# CONFIG_ATA is not set
552# CONFIG_MD is not set 555# CONFIG_MD is not set
553CONFIG_NETDEVICES=y 556CONFIG_NETDEVICES=y
557CONFIG_COMPAT_NET_DEV_OPS=y
554# CONFIG_DUMMY is not set 558# CONFIG_DUMMY is not set
555# CONFIG_BONDING is not set 559# CONFIG_BONDING is not set
556# CONFIG_MACVLAN is not set 560# CONFIG_MACVLAN is not set
@@ -583,8 +587,10 @@ CONFIG_MII=y
583# CONFIG_STNIC is not set 587# CONFIG_STNIC is not set
584CONFIG_SH_ETH=y 588CONFIG_SH_ETH=y
585# CONFIG_SMC91X is not set 589# CONFIG_SMC91X is not set
590# CONFIG_ETHOC is not set
586# CONFIG_SMC911X is not set 591# CONFIG_SMC911X is not set
587# CONFIG_SMSC911X is not set 592# CONFIG_SMSC911X is not set
593# CONFIG_DNET is not set
588# CONFIG_IBM_NEW_EMAC_ZMII is not set 594# CONFIG_IBM_NEW_EMAC_ZMII is not set
589# CONFIG_IBM_NEW_EMAC_RGMII is not set 595# CONFIG_IBM_NEW_EMAC_RGMII is not set
590# CONFIG_IBM_NEW_EMAC_TAH is not set 596# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -601,7 +607,6 @@ CONFIG_SH_ETH=y
601# 607#
602# CONFIG_WLAN_PRE80211 is not set 608# CONFIG_WLAN_PRE80211 is not set
603# CONFIG_WLAN_80211 is not set 609# CONFIG_WLAN_80211 is not set
604# CONFIG_IWLWIFI_LEDS is not set
605 610
606# 611#
607# Enable WiMAX (Networking options) to see the WiMAX drivers 612# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -685,6 +690,7 @@ CONFIG_LEGACY_PTYS=y
685CONFIG_LEGACY_PTY_COUNT=256 690CONFIG_LEGACY_PTY_COUNT=256
686# CONFIG_IPMI_HANDLER is not set 691# CONFIG_IPMI_HANDLER is not set
687CONFIG_HW_RANDOM=y 692CONFIG_HW_RANDOM=y
693# CONFIG_HW_RANDOM_TIMERIOMEM is not set
688# CONFIG_R3964 is not set 694# CONFIG_R3964 is not set
689# CONFIG_RAW_DRIVER is not set 695# CONFIG_RAW_DRIVER is not set
690# CONFIG_TCG_TPM is not set 696# CONFIG_TCG_TPM is not set
@@ -764,6 +770,7 @@ CONFIG_FB_SH7760=y
764# CONFIG_FB_VIRTUAL is not set 770# CONFIG_FB_VIRTUAL is not set
765# CONFIG_FB_METRONOME is not set 771# CONFIG_FB_METRONOME is not set
766# CONFIG_FB_MB862XX is not set 772# CONFIG_FB_MB862XX is not set
773# CONFIG_FB_BROADSHEET is not set
767# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 774# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
768 775
769# 776#
@@ -817,6 +824,7 @@ CONFIG_USB_MON=y
817# CONFIG_USB_C67X00_HCD is not set 824# CONFIG_USB_C67X00_HCD is not set
818# CONFIG_USB_OXU210HP_HCD is not set 825# CONFIG_USB_OXU210HP_HCD is not set
819# CONFIG_USB_ISP116X_HCD is not set 826# CONFIG_USB_ISP116X_HCD is not set
827# CONFIG_USB_ISP1760_HCD is not set
820CONFIG_USB_OHCI_HCD=y 828CONFIG_USB_OHCI_HCD=y
821# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 829# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
822# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 830# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -834,11 +842,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
834# CONFIG_USB_TMC is not set 842# CONFIG_USB_TMC is not set
835 843
836# 844#
837# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 845# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
838# 846#
839 847
840# 848#
841# see USB_STORAGE Help for more information 849# also be needed; see USB_STORAGE Help for more info
842# 850#
843CONFIG_USB_STORAGE=y 851CONFIG_USB_STORAGE=y
844# CONFIG_USB_STORAGE_DEBUG is not set 852# CONFIG_USB_STORAGE_DEBUG is not set
@@ -880,7 +888,6 @@ CONFIG_USB_STORAGE=y
880# CONFIG_USB_LED is not set 888# CONFIG_USB_LED is not set
881# CONFIG_USB_CYPRESS_CY7C63 is not set 889# CONFIG_USB_CYPRESS_CY7C63 is not set
882# CONFIG_USB_CYTHERM is not set 890# CONFIG_USB_CYTHERM is not set
883# CONFIG_USB_PHIDGET is not set
884# CONFIG_USB_IDMOUSE is not set 891# CONFIG_USB_IDMOUSE is not set
885# CONFIG_USB_FTDI_ELAN is not set 892# CONFIG_USB_FTDI_ELAN is not set
886# CONFIG_USB_APPLEDISPLAY is not set 893# CONFIG_USB_APPLEDISPLAY is not set
@@ -894,12 +901,14 @@ CONFIG_USB_STORAGE=y
894# 901#
895# OTG and related infrastructure 902# OTG and related infrastructure
896# 903#
904# CONFIG_NOP_USB_XCEIV is not set
897# CONFIG_MMC is not set 905# CONFIG_MMC is not set
898# CONFIG_MEMSTICK is not set 906# CONFIG_MEMSTICK is not set
899# CONFIG_NEW_LEDS is not set 907# CONFIG_NEW_LEDS is not set
900# CONFIG_ACCESSIBILITY is not set 908# CONFIG_ACCESSIBILITY is not set
901# CONFIG_RTC_CLASS is not set 909# CONFIG_RTC_CLASS is not set
902# CONFIG_DMADEVICES is not set 910# CONFIG_DMADEVICES is not set
911# CONFIG_AUXDISPLAY is not set
903# CONFIG_UIO is not set 912# CONFIG_UIO is not set
904# CONFIG_STAGING is not set 913# CONFIG_STAGING is not set
905 914
@@ -987,7 +996,6 @@ CONFIG_ROOT_NFS=y
987CONFIG_LOCKD=y 996CONFIG_LOCKD=y
988CONFIG_NFS_COMMON=y 997CONFIG_NFS_COMMON=y
989CONFIG_SUNRPC=y 998CONFIG_SUNRPC=y
990# CONFIG_SUNRPC_REGISTER_V4 is not set
991# CONFIG_RPCSEC_GSS_KRB5 is not set 999# CONFIG_RPCSEC_GSS_KRB5 is not set
992# CONFIG_RPCSEC_GSS_SPKM3 is not set 1000# CONFIG_RPCSEC_GSS_SPKM3 is not set
993# CONFIG_SMB_FS is not set 1001# CONFIG_SMB_FS is not set
@@ -1071,7 +1079,7 @@ CONFIG_TRACING=y
1071# 1079#
1072# Tracers 1080# Tracers
1073# 1081#
1074# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1082# CONFIG_DYNAMIC_DEBUG is not set
1075# CONFIG_SAMPLES is not set 1083# CONFIG_SAMPLES is not set
1076CONFIG_HAVE_ARCH_KGDB=y 1084CONFIG_HAVE_ARCH_KGDB=y
1077# CONFIG_SH_STANDARD_BIOS is not set 1085# CONFIG_SH_STANDARD_BIOS is not set
@@ -1163,6 +1171,7 @@ CONFIG_CRYPTO=y
1163# Compression 1171# Compression
1164# 1172#
1165# CONFIG_CRYPTO_DEFLATE is not set 1173# CONFIG_CRYPTO_DEFLATE is not set
1174# CONFIG_CRYPTO_ZLIB is not set
1166# CONFIG_CRYPTO_LZO is not set 1175# CONFIG_CRYPTO_LZO is not set
1167 1176
1168# 1177#
@@ -1184,7 +1193,7 @@ CONFIG_CRC32=y
1184# CONFIG_CRC7 is not set 1193# CONFIG_CRC7 is not set
1185# CONFIG_LIBCRC32C is not set 1194# CONFIG_LIBCRC32C is not set
1186CONFIG_ZLIB_INFLATE=y 1195CONFIG_ZLIB_INFLATE=y
1187CONFIG_PLIST=y
1188CONFIG_HAS_IOMEM=y 1196CONFIG_HAS_IOMEM=y
1189CONFIG_HAS_IOPORT=y 1197CONFIG_HAS_IOPORT=y
1190CONFIG_HAS_DMA=y 1198CONFIG_HAS_DMA=y
1199CONFIG_NLATTR=y
diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig
index 847a25106635..82b113af08d3 100644
--- a/arch/sh/configs/hp6xx_defconfig
+++ b/arch/sh/configs/hp6xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 16:56:55 2009 4# Thu Apr 2 18:01:05 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19CONFIG_ARCH_SUSPEND_POSSIBLE=y 19CONFIG_ARCH_SUSPEND_POSSIBLE=y
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_APM_EMULATION=y 21CONFIG_SYS_SUPPORTS_APM_EMULATION=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -39,11 +40,20 @@ CONFIG_SWAP=y
39# CONFIG_SYSVIPC is not set 40# CONFIG_SYSVIPC is not set
40CONFIG_BSD_PROCESS_ACCT=y 41CONFIG_BSD_PROCESS_ACCT=y
41# CONFIG_BSD_PROCESS_ACCT_V3 is not set 42# CONFIG_BSD_PROCESS_ACCT_V3 is not set
43
44#
45# RCU Subsystem
46#
47CONFIG_CLASSIC_RCU=y
48# CONFIG_TREE_RCU is not set
49# CONFIG_PREEMPT_RCU is not set
50# CONFIG_TREE_RCU_TRACE is not set
51# CONFIG_PREEMPT_RCU_TRACE is not set
42CONFIG_IKCONFIG=y 52CONFIG_IKCONFIG=y
43CONFIG_IKCONFIG_PROC=y 53CONFIG_IKCONFIG_PROC=y
44CONFIG_LOG_BUF_SHIFT=14 54CONFIG_LOG_BUF_SHIFT=14
45# CONFIG_CGROUPS is not set
46# CONFIG_GROUP_SCHED is not set 55# CONFIG_GROUP_SCHED is not set
56# CONFIG_CGROUPS is not set
47CONFIG_SYSFS_DEPRECATED=y 57CONFIG_SYSFS_DEPRECATED=y
48CONFIG_SYSFS_DEPRECATED_V2=y 58CONFIG_SYSFS_DEPRECATED_V2=y
49# CONFIG_RELAY is not set 59# CONFIG_RELAY is not set
@@ -51,6 +61,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
51# CONFIG_BLK_DEV_INITRD is not set 61# CONFIG_BLK_DEV_INITRD is not set
52# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 62# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
53CONFIG_SYSCTL=y 63CONFIG_SYSCTL=y
64CONFIG_ANON_INODES=y
54CONFIG_EMBEDDED=y 65CONFIG_EMBEDDED=y
55CONFIG_UID16=y 66CONFIG_UID16=y
56# CONFIG_SYSCTL_SYSCALL is not set 67# CONFIG_SYSCTL_SYSCALL is not set
@@ -60,10 +71,8 @@ CONFIG_HOTPLUG=y
60CONFIG_PRINTK=y 71CONFIG_PRINTK=y
61CONFIG_BUG=y 72CONFIG_BUG=y
62CONFIG_ELF_CORE=y 73CONFIG_ELF_CORE=y
63CONFIG_COMPAT_BRK=y
64CONFIG_BASE_FULL=y 74CONFIG_BASE_FULL=y
65CONFIG_FUTEX=y 75CONFIG_FUTEX=y
66CONFIG_ANON_INODES=y
67CONFIG_EPOLL=y 76CONFIG_EPOLL=y
68CONFIG_SIGNALFD=y 77CONFIG_SIGNALFD=y
69CONFIG_TIMERFD=y 78CONFIG_TIMERFD=y
@@ -71,6 +80,7 @@ CONFIG_EVENTFD=y
71CONFIG_SHMEM=y 80CONFIG_SHMEM=y
72CONFIG_AIO=y 81CONFIG_AIO=y
73CONFIG_VM_EVENT_COUNTERS=y 82CONFIG_VM_EVENT_COUNTERS=y
83CONFIG_COMPAT_BRK=y
74CONFIG_SLAB=y 84CONFIG_SLAB=y
75# CONFIG_SLUB is not set 85# CONFIG_SLUB is not set
76# CONFIG_SLOB is not set 86# CONFIG_SLOB is not set
@@ -104,11 +114,6 @@ CONFIG_DEFAULT_AS=y
104# CONFIG_DEFAULT_CFQ is not set 114# CONFIG_DEFAULT_CFQ is not set
105# CONFIG_DEFAULT_NOOP is not set 115# CONFIG_DEFAULT_NOOP is not set
106CONFIG_DEFAULT_IOSCHED="anticipatory" 116CONFIG_DEFAULT_IOSCHED="anticipatory"
107CONFIG_CLASSIC_RCU=y
108# CONFIG_TREE_RCU is not set
109# CONFIG_PREEMPT_RCU is not set
110# CONFIG_TREE_RCU_TRACE is not set
111# CONFIG_PREEMPT_RCU_TRACE is not set
112CONFIG_FREEZER=y 117CONFIG_FREEZER=y
113 118
114# 119#
@@ -143,6 +148,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y
143# CONFIG_CPU_SUBTYPE_SH7770 is not set 148# CONFIG_CPU_SUBTYPE_SH7770 is not set
144# CONFIG_CPU_SUBTYPE_SH7780 is not set 149# CONFIG_CPU_SUBTYPE_SH7780 is not set
145# CONFIG_CPU_SUBTYPE_SH7785 is not set 150# CONFIG_CPU_SUBTYPE_SH7785 is not set
151# CONFIG_CPU_SUBTYPE_SH7786 is not set
146# CONFIG_CPU_SUBTYPE_SHX3 is not set 152# CONFIG_CPU_SUBTYPE_SHX3 is not set
147# CONFIG_CPU_SUBTYPE_SH7343 is not set 153# CONFIG_CPU_SUBTYPE_SH7343 is not set
148# CONFIG_CPU_SUBTYPE_SH7722 is not set 154# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -184,11 +190,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_ZONE_DMA_FLAG=0 190CONFIG_ZONE_DMA_FLAG=0
185CONFIG_NR_QUICK=2 191CONFIG_NR_QUICK=2
186CONFIG_UNEVICTABLE_LRU=y 192CONFIG_UNEVICTABLE_LRU=y
193CONFIG_HAVE_MLOCK=y
194CONFIG_HAVE_MLOCKED_PAGE_BIT=y
187 195
188# 196#
189# Cache configuration 197# Cache configuration
190# 198#
191# CONFIG_SH_DIRECT_MAPPED is not set
192CONFIG_CACHE_WRITEBACK=y 199CONFIG_CACHE_WRITEBACK=y
193# CONFIG_CACHE_WRITETHROUGH is not set 200# CONFIG_CACHE_WRITETHROUGH is not set
194# CONFIG_CACHE_OFF is not set 201# CONFIG_CACHE_OFF is not set
@@ -208,6 +215,7 @@ CONFIG_CPU_HAS_SR_RB=y
208# 215#
209# CONFIG_SH_SOLUTION_ENGINE is not set 216# CONFIG_SH_SOLUTION_ENGINE is not set
210CONFIG_SH_HP6XX=y 217CONFIG_SH_HP6XX=y
218# CONFIG_SH_POLARIS is not set
211 219
212# 220#
213# Timer and clock configuration 221# Timer and clock configuration
@@ -229,7 +237,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
229# 237#
230CONFIG_SH_DMA_API=y 238CONFIG_SH_DMA_API=y
231CONFIG_SH_DMA=y 239CONFIG_SH_DMA=y
232CONFIG_NR_ONCHIP_DMA_CHANNELS=4 240CONFIG_NR_ONCHIP_DMA_CHANNELS=6
233# CONFIG_NR_DMA_CHANNELS_BOOL is not set 241# CONFIG_NR_DMA_CHANNELS_BOOL is not set
234 242
235# 243#
@@ -302,6 +310,7 @@ CONFIG_PM=y
302CONFIG_PM_SLEEP=y 310CONFIG_PM_SLEEP=y
303CONFIG_SUSPEND=y 311CONFIG_SUSPEND=y
304CONFIG_SUSPEND_FREEZER=y 312CONFIG_SUSPEND_FREEZER=y
313# CONFIG_HIBERNATION is not set
305CONFIG_APM_EMULATION=y 314CONFIG_APM_EMULATION=y
306# CONFIG_CPU_IDLE is not set 315# CONFIG_CPU_IDLE is not set
307# CONFIG_NET is not set 316# CONFIG_NET is not set
@@ -329,9 +338,13 @@ CONFIG_BLK_DEV=y
329# CONFIG_CDROM_PKTCDVD is not set 338# CONFIG_CDROM_PKTCDVD is not set
330# CONFIG_BLK_DEV_HD is not set 339# CONFIG_BLK_DEV_HD is not set
331CONFIG_MISC_DEVICES=y 340CONFIG_MISC_DEVICES=y
332# CONFIG_EEPROM_93CX6 is not set
333# CONFIG_ENCLOSURE_SERVICES is not set 341# CONFIG_ENCLOSURE_SERVICES is not set
334# CONFIG_C2PORT is not set 342# CONFIG_C2PORT is not set
343
344#
345# EEPROM support
346#
347# CONFIG_EEPROM_93CX6 is not set
335CONFIG_HAVE_IDE=y 348CONFIG_HAVE_IDE=y
336# CONFIG_IDE is not set 349# CONFIG_IDE is not set
337 350
@@ -375,6 +388,7 @@ CONFIG_SCSI_LOWLEVEL=y
375# CONFIG_SCSI_DEBUG is not set 388# CONFIG_SCSI_DEBUG is not set
376# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 389# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
377# CONFIG_SCSI_DH is not set 390# CONFIG_SCSI_DH is not set
391# CONFIG_SCSI_OSD_INITIATOR is not set
378CONFIG_ATA=y 392CONFIG_ATA=y
379# CONFIG_ATA_NONSTANDARD is not set 393# CONFIG_ATA_NONSTANDARD is not set
380CONFIG_SATA_PMP=y 394CONFIG_SATA_PMP=y
@@ -471,6 +485,7 @@ CONFIG_LEGACY_PTYS=y
471CONFIG_LEGACY_PTY_COUNT=64 485CONFIG_LEGACY_PTY_COUNT=64
472# CONFIG_IPMI_HANDLER is not set 486# CONFIG_IPMI_HANDLER is not set
473CONFIG_HW_RANDOM=y 487CONFIG_HW_RANDOM=y
488# CONFIG_HW_RANDOM_TIMERIOMEM is not set
474# CONFIG_R3964 is not set 489# CONFIG_R3964 is not set
475 490
476# 491#
@@ -554,12 +569,13 @@ CONFIG_FB_SH_MOBILE_LCDC=y
554# CONFIG_FB_VIRTUAL is not set 569# CONFIG_FB_VIRTUAL is not set
555# CONFIG_FB_METRONOME is not set 570# CONFIG_FB_METRONOME is not set
556# CONFIG_FB_MB862XX is not set 571# CONFIG_FB_MB862XX is not set
572# CONFIG_FB_BROADSHEET is not set
557CONFIG_BACKLIGHT_LCD_SUPPORT=y 573CONFIG_BACKLIGHT_LCD_SUPPORT=y
558CONFIG_LCD_CLASS_DEVICE=y 574CONFIG_LCD_CLASS_DEVICE=y
559# CONFIG_LCD_ILI9320 is not set 575# CONFIG_LCD_ILI9320 is not set
560# CONFIG_LCD_PLATFORM is not set 576# CONFIG_LCD_PLATFORM is not set
561CONFIG_BACKLIGHT_CLASS_DEVICE=y 577CONFIG_BACKLIGHT_CLASS_DEVICE=y
562# CONFIG_BACKLIGHT_CORGI is not set 578CONFIG_BACKLIGHT_GENERIC=y
563CONFIG_BACKLIGHT_HP680=y 579CONFIG_BACKLIGHT_HP680=y
564 580
565# 581#
@@ -631,6 +647,7 @@ CONFIG_RTC_INTF_DEV=y
631# 647#
632CONFIG_RTC_DRV_SH=y 648CONFIG_RTC_DRV_SH=y
633# CONFIG_DMADEVICES is not set 649# CONFIG_DMADEVICES is not set
650# CONFIG_AUXDISPLAY is not set
634# CONFIG_UIO is not set 651# CONFIG_UIO is not set
635# CONFIG_STAGING is not set 652# CONFIG_STAGING is not set
636 653
@@ -647,6 +664,7 @@ CONFIG_EXT2_FS=y
647# CONFIG_FS_POSIX_ACL is not set 664# CONFIG_FS_POSIX_ACL is not set
648CONFIG_FILE_LOCKING=y 665CONFIG_FILE_LOCKING=y
649# CONFIG_XFS_FS is not set 666# CONFIG_XFS_FS is not set
667# CONFIG_BTRFS_FS is not set
650CONFIG_DNOTIFY=y 668CONFIG_DNOTIFY=y
651CONFIG_INOTIFY=y 669CONFIG_INOTIFY=y
652CONFIG_INOTIFY_USER=y 670CONFIG_INOTIFY_USER=y
@@ -692,6 +710,7 @@ CONFIG_MISC_FILESYSTEMS=y
692# CONFIG_BFS_FS is not set 710# CONFIG_BFS_FS is not set
693# CONFIG_EFS_FS is not set 711# CONFIG_EFS_FS is not set
694# CONFIG_CRAMFS is not set 712# CONFIG_CRAMFS is not set
713# CONFIG_SQUASHFS is not set
695# CONFIG_VXFS_FS is not set 714# CONFIG_VXFS_FS is not set
696# CONFIG_MINIX_FS is not set 715# CONFIG_MINIX_FS is not set
697# CONFIG_OMFS_FS is not set 716# CONFIG_OMFS_FS is not set
@@ -771,7 +790,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
771# 790#
772# Tracers 791# Tracers
773# 792#
774# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
775# CONFIG_SAMPLES is not set 793# CONFIG_SAMPLES is not set
776CONFIG_HAVE_ARCH_KGDB=y 794CONFIG_HAVE_ARCH_KGDB=y
777# CONFIG_SH_STANDARD_BIOS is not set 795# CONFIG_SH_STANDARD_BIOS is not set
@@ -799,10 +817,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
799CONFIG_CRYPTO_HASH=y 817CONFIG_CRYPTO_HASH=y
800CONFIG_CRYPTO_HASH2=y 818CONFIG_CRYPTO_HASH2=y
801CONFIG_CRYPTO_RNG2=y 819CONFIG_CRYPTO_RNG2=y
820CONFIG_CRYPTO_PCOMP=y
802CONFIG_CRYPTO_MANAGER=y 821CONFIG_CRYPTO_MANAGER=y
803CONFIG_CRYPTO_MANAGER2=y 822CONFIG_CRYPTO_MANAGER2=y
804# CONFIG_CRYPTO_GF128MUL is not set 823# CONFIG_CRYPTO_GF128MUL is not set
805# CONFIG_CRYPTO_NULL is not set 824# CONFIG_CRYPTO_NULL is not set
825CONFIG_CRYPTO_WORKQUEUE=y
806# CONFIG_CRYPTO_CRYPTD is not set 826# CONFIG_CRYPTO_CRYPTD is not set
807# CONFIG_CRYPTO_AUTHENC is not set 827# CONFIG_CRYPTO_AUTHENC is not set
808 828
@@ -870,6 +890,7 @@ CONFIG_CRYPTO_MD5=y
870# Compression 890# Compression
871# 891#
872# CONFIG_CRYPTO_DEFLATE is not set 892# CONFIG_CRYPTO_DEFLATE is not set
893# CONFIG_CRYPTO_ZLIB is not set
873# CONFIG_CRYPTO_LZO is not set 894# CONFIG_CRYPTO_LZO is not set
874 895
875# 896#
@@ -890,7 +911,6 @@ CONFIG_CRC_T10DIF=y
890CONFIG_CRC32=y 911CONFIG_CRC32=y
891# CONFIG_CRC7 is not set 912# CONFIG_CRC7 is not set
892# CONFIG_LIBCRC32C is not set 913# CONFIG_LIBCRC32C is not set
893CONFIG_PLIST=y
894CONFIG_HAS_IOMEM=y 914CONFIG_HAS_IOMEM=y
895CONFIG_HAS_IOPORT=y 915CONFIG_HAS_IOPORT=y
896CONFIG_HAS_DMA=y 916CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index d3bbbb037716..b6fa4a7599d0 100644
--- a/arch/sh/configs/landisk_defconfig
+++ b/arch/sh/configs/landisk_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 16:58:46 2009 4# Thu Apr 2 18:02:54 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -42,10 +43,19 @@ CONFIG_SYSVIPC_SYSCTL=y
42# CONFIG_BSD_PROCESS_ACCT is not set 43# CONFIG_BSD_PROCESS_ACCT is not set
43# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
44# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
45# CONFIG_IKCONFIG is not set 55# CONFIG_IKCONFIG is not set
46CONFIG_LOG_BUF_SHIFT=14 56CONFIG_LOG_BUF_SHIFT=14
47# CONFIG_CGROUPS is not set
48# CONFIG_GROUP_SCHED is not set 57# CONFIG_GROUP_SCHED is not set
58# CONFIG_CGROUPS is not set
49CONFIG_SYSFS_DEPRECATED=y 59CONFIG_SYSFS_DEPRECATED=y
50CONFIG_SYSFS_DEPRECATED_V2=y 60CONFIG_SYSFS_DEPRECATED_V2=y
51# CONFIG_RELAY is not set 61# CONFIG_RELAY is not set
@@ -53,6 +63,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
53# CONFIG_BLK_DEV_INITRD is not set 63# CONFIG_BLK_DEV_INITRD is not set
54CONFIG_CC_OPTIMIZE_FOR_SIZE=y 64CONFIG_CC_OPTIMIZE_FOR_SIZE=y
55CONFIG_SYSCTL=y 65CONFIG_SYSCTL=y
66CONFIG_ANON_INODES=y
56CONFIG_EMBEDDED=y 67CONFIG_EMBEDDED=y
57CONFIG_UID16=y 68CONFIG_UID16=y
58# CONFIG_SYSCTL_SYSCALL is not set 69# CONFIG_SYSCTL_SYSCALL is not set
@@ -62,10 +73,8 @@ CONFIG_HOTPLUG=y
62CONFIG_PRINTK=y 73CONFIG_PRINTK=y
63CONFIG_BUG=y 74CONFIG_BUG=y
64CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
65CONFIG_COMPAT_BRK=y
66CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
67CONFIG_FUTEX=y 77CONFIG_FUTEX=y
68CONFIG_ANON_INODES=y
69CONFIG_EPOLL=y 78CONFIG_EPOLL=y
70CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
71CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -74,6 +83,7 @@ CONFIG_SHMEM=y
74CONFIG_AIO=y 83CONFIG_AIO=y
75CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
76CONFIG_PCI_QUIRKS=y 85CONFIG_PCI_QUIRKS=y
86CONFIG_COMPAT_BRK=y
77CONFIG_SLAB=y 87CONFIG_SLAB=y
78# CONFIG_SLUB is not set 88# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 89# CONFIG_SLOB is not set
@@ -113,11 +123,6 @@ CONFIG_DEFAULT_AS=y
113# CONFIG_DEFAULT_CFQ is not set 123# CONFIG_DEFAULT_CFQ is not set
114# CONFIG_DEFAULT_NOOP is not set 124# CONFIG_DEFAULT_NOOP is not set
115CONFIG_DEFAULT_IOSCHED="anticipatory" 125CONFIG_DEFAULT_IOSCHED="anticipatory"
116CONFIG_CLASSIC_RCU=y
117# CONFIG_TREE_RCU is not set
118# CONFIG_PREEMPT_RCU is not set
119# CONFIG_TREE_RCU_TRACE is not set
120# CONFIG_PREEMPT_RCU_TRACE is not set
121# CONFIG_FREEZER is not set 126# CONFIG_FREEZER is not set
122 127
123# 128#
@@ -152,6 +157,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
152# CONFIG_CPU_SUBTYPE_SH7770 is not set 157# CONFIG_CPU_SUBTYPE_SH7770 is not set
153# CONFIG_CPU_SUBTYPE_SH7780 is not set 158# CONFIG_CPU_SUBTYPE_SH7780 is not set
154# CONFIG_CPU_SUBTYPE_SH7785 is not set 159# CONFIG_CPU_SUBTYPE_SH7785 is not set
160# CONFIG_CPU_SUBTYPE_SH7786 is not set
155# CONFIG_CPU_SUBTYPE_SHX3 is not set 161# CONFIG_CPU_SUBTYPE_SHX3 is not set
156# CONFIG_CPU_SUBTYPE_SH7343 is not set 162# CONFIG_CPU_SUBTYPE_SH7343 is not set
157# CONFIG_CPU_SUBTYPE_SH7722 is not set 163# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -193,11 +199,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
193CONFIG_ZONE_DMA_FLAG=0 199CONFIG_ZONE_DMA_FLAG=0
194CONFIG_NR_QUICK=2 200CONFIG_NR_QUICK=2
195CONFIG_UNEVICTABLE_LRU=y 201CONFIG_UNEVICTABLE_LRU=y
202CONFIG_HAVE_MLOCK=y
203CONFIG_HAVE_MLOCKED_PAGE_BIT=y
196 204
197# 205#
198# Cache configuration 206# Cache configuration
199# 207#
200# CONFIG_SH_DIRECT_MAPPED is not set
201CONFIG_CACHE_WRITEBACK=y 208CONFIG_CACHE_WRITEBACK=y
202# CONFIG_CACHE_WRITETHROUGH is not set 209# CONFIG_CACHE_WRITETHROUGH is not set
203# CONFIG_CACHE_OFF is not set 210# CONFIG_CACHE_OFF is not set
@@ -290,6 +297,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
290# CONFIG_PCIEPORTBUS is not set 297# CONFIG_PCIEPORTBUS is not set
291# CONFIG_ARCH_SUPPORTS_MSI is not set 298# CONFIG_ARCH_SUPPORTS_MSI is not set
292CONFIG_PCI_LEGACY=y 299CONFIG_PCI_LEGACY=y
300# CONFIG_PCI_STUB is not set
301# CONFIG_PCI_IOV is not set
293CONFIG_PCCARD=y 302CONFIG_PCCARD=y
294# CONFIG_PCMCIA_DEBUG is not set 303# CONFIG_PCMCIA_DEBUG is not set
295CONFIG_PCMCIA=y 304CONFIG_PCMCIA=y
@@ -329,7 +338,6 @@ CONFIG_NET=y
329# 338#
330# Networking options 339# Networking options
331# 340#
332CONFIG_COMPAT_NET_DEV_OPS=y
333CONFIG_PACKET=y 341CONFIG_PACKET=y
334# CONFIG_PACKET_MMAP is not set 342# CONFIG_PACKET_MMAP is not set
335CONFIG_UNIX=y 343CONFIG_UNIX=y
@@ -410,6 +418,7 @@ CONFIG_ATALK=m
410# CONFIG_LAPB is not set 418# CONFIG_LAPB is not set
411# CONFIG_ECONET is not set 419# CONFIG_ECONET is not set
412# CONFIG_WAN_ROUTER is not set 420# CONFIG_WAN_ROUTER is not set
421# CONFIG_PHONET is not set
413# CONFIG_NET_SCHED is not set 422# CONFIG_NET_SCHED is not set
414# CONFIG_DCB is not set 423# CONFIG_DCB is not set
415 424
@@ -422,13 +431,13 @@ CONFIG_ATALK=m
422# CONFIG_IRDA is not set 431# CONFIG_IRDA is not set
423# CONFIG_BT is not set 432# CONFIG_BT is not set
424# CONFIG_AF_RXRPC is not set 433# CONFIG_AF_RXRPC is not set
425# CONFIG_PHONET is not set
426CONFIG_WIRELESS=y 434CONFIG_WIRELESS=y
427# CONFIG_CFG80211 is not set 435# CONFIG_CFG80211 is not set
428# CONFIG_WIRELESS_OLD_REGULATORY is not set 436# CONFIG_WIRELESS_OLD_REGULATORY is not set
429# CONFIG_WIRELESS_EXT is not set 437# CONFIG_WIRELESS_EXT is not set
430# CONFIG_LIB80211 is not set 438# CONFIG_LIB80211 is not set
431# CONFIG_MAC80211 is not set 439# CONFIG_MAC80211 is not set
440# CONFIG_WIMAX is not set
432# CONFIG_RFKILL is not set 441# CONFIG_RFKILL is not set
433# CONFIG_NET_9P is not set 442# CONFIG_NET_9P is not set
434 443
@@ -468,18 +477,23 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
468# CONFIG_BLK_DEV_HD is not set 477# CONFIG_BLK_DEV_HD is not set
469CONFIG_MISC_DEVICES=y 478CONFIG_MISC_DEVICES=y
470# CONFIG_PHANTOM is not set 479# CONFIG_PHANTOM is not set
471# CONFIG_EEPROM_93CX6 is not set
472# CONFIG_SGI_IOC4 is not set 480# CONFIG_SGI_IOC4 is not set
473# CONFIG_TIFM_CORE is not set 481# CONFIG_TIFM_CORE is not set
474# CONFIG_ENCLOSURE_SERVICES is not set 482# CONFIG_ENCLOSURE_SERVICES is not set
475# CONFIG_HP_ILO is not set 483# CONFIG_HP_ILO is not set
476# CONFIG_C2PORT is not set 484# CONFIG_C2PORT is not set
485
486#
487# EEPROM support
488#
489# CONFIG_EEPROM_93CX6 is not set
477CONFIG_HAVE_IDE=y 490CONFIG_HAVE_IDE=y
478CONFIG_IDE=y 491CONFIG_IDE=y
479 492
480# 493#
481# Please see Documentation/ide/ide.txt for help/info on IDE drives 494# Please see Documentation/ide/ide.txt for help/info on IDE drives
482# 495#
496CONFIG_IDE_XFER_MODE=y
483CONFIG_IDE_ATAPI=y 497CONFIG_IDE_ATAPI=y
484# CONFIG_BLK_DEV_IDE_SATA is not set 498# CONFIG_BLK_DEV_IDE_SATA is not set
485CONFIG_IDE_GD=y 499CONFIG_IDE_GD=y
@@ -585,6 +599,7 @@ CONFIG_SCSI_LOWLEVEL=y
585# CONFIG_MEGARAID_NEWGEN is not set 599# CONFIG_MEGARAID_NEWGEN is not set
586# CONFIG_MEGARAID_LEGACY is not set 600# CONFIG_MEGARAID_LEGACY is not set
587# CONFIG_MEGARAID_SAS is not set 601# CONFIG_MEGARAID_SAS is not set
602# CONFIG_SCSI_MPT2SAS is not set
588# CONFIG_SCSI_HPTIOP is not set 603# CONFIG_SCSI_HPTIOP is not set
589# CONFIG_LIBFC is not set 604# CONFIG_LIBFC is not set
590# CONFIG_FCOE is not set 605# CONFIG_FCOE is not set
@@ -607,6 +622,7 @@ CONFIG_SCSI_LOWLEVEL=y
607# CONFIG_SCSI_SRP is not set 622# CONFIG_SCSI_SRP is not set
608# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 623# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
609# CONFIG_SCSI_DH is not set 624# CONFIG_SCSI_DH is not set
625# CONFIG_SCSI_OSD_INITIATOR is not set
610# CONFIG_ATA is not set 626# CONFIG_ATA is not set
611CONFIG_MD=y 627CONFIG_MD=y
612CONFIG_BLK_DEV_MD=m 628CONFIG_BLK_DEV_MD=m
@@ -631,6 +647,7 @@ CONFIG_MD_RAID1=m
631# CONFIG_IEEE1394 is not set 647# CONFIG_IEEE1394 is not set
632# CONFIG_I2O is not set 648# CONFIG_I2O is not set
633CONFIG_NETDEVICES=y 649CONFIG_NETDEVICES=y
650CONFIG_COMPAT_NET_DEV_OPS=y
634# CONFIG_DUMMY is not set 651# CONFIG_DUMMY is not set
635# CONFIG_BONDING is not set 652# CONFIG_BONDING is not set
636# CONFIG_MACVLAN is not set 653# CONFIG_MACVLAN is not set
@@ -648,8 +665,10 @@ CONFIG_MII=y
648# CONFIG_CASSINI is not set 665# CONFIG_CASSINI is not set
649# CONFIG_NET_VENDOR_3COM is not set 666# CONFIG_NET_VENDOR_3COM is not set
650# CONFIG_SMC91X is not set 667# CONFIG_SMC91X is not set
668# CONFIG_ETHOC is not set
651# CONFIG_SMC911X is not set 669# CONFIG_SMC911X is not set
652# CONFIG_SMSC911X is not set 670# CONFIG_SMSC911X is not set
671# CONFIG_DNET is not set
653# CONFIG_NET_TULIP is not set 672# CONFIG_NET_TULIP is not set
654# CONFIG_HP100 is not set 673# CONFIG_HP100 is not set
655# CONFIG_IBM_NEW_EMAC_ZMII is not set 674# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -700,6 +719,7 @@ CONFIG_NETDEV_1000=y
700# CONFIG_QLA3XXX is not set 719# CONFIG_QLA3XXX is not set
701# CONFIG_ATL1 is not set 720# CONFIG_ATL1 is not set
702# CONFIG_ATL1E is not set 721# CONFIG_ATL1E is not set
722# CONFIG_ATL1C is not set
703# CONFIG_JME is not set 723# CONFIG_JME is not set
704CONFIG_NETDEV_10000=y 724CONFIG_NETDEV_10000=y
705# CONFIG_CHELSIO_T1 is not set 725# CONFIG_CHELSIO_T1 is not set
@@ -718,6 +738,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
718# CONFIG_BNX2X is not set 738# CONFIG_BNX2X is not set
719# CONFIG_QLGE is not set 739# CONFIG_QLGE is not set
720# CONFIG_SFC is not set 740# CONFIG_SFC is not set
741# CONFIG_BE2NET is not set
721# CONFIG_TR is not set 742# CONFIG_TR is not set
722 743
723# 744#
@@ -725,7 +746,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
725# 746#
726# CONFIG_WLAN_PRE80211 is not set 747# CONFIG_WLAN_PRE80211 is not set
727# CONFIG_WLAN_80211 is not set 748# CONFIG_WLAN_80211 is not set
728# CONFIG_IWLWIFI_LEDS is not set 749
750#
751# Enable WiMAX (Networking options) to see the WiMAX drivers
752#
729 753
730# 754#
731# USB Network Adapters 755# USB Network Adapters
@@ -814,6 +838,7 @@ CONFIG_LEGACY_PTYS=y
814CONFIG_LEGACY_PTY_COUNT=256 838CONFIG_LEGACY_PTY_COUNT=256
815# CONFIG_IPMI_HANDLER is not set 839# CONFIG_IPMI_HANDLER is not set
816CONFIG_HW_RANDOM=y 840CONFIG_HW_RANDOM=y
841# CONFIG_HW_RANDOM_TIMERIOMEM is not set
817# CONFIG_R3964 is not set 842# CONFIG_R3964 is not set
818# CONFIG_APPLICOM is not set 843# CONFIG_APPLICOM is not set
819 844
@@ -898,6 +923,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
898CONFIG_V4L_USB_DRIVERS=y 923CONFIG_V4L_USB_DRIVERS=y
899# CONFIG_USB_VIDEO_CLASS is not set 924# CONFIG_USB_VIDEO_CLASS is not set
900# CONFIG_USB_GSPCA is not set 925# CONFIG_USB_GSPCA is not set
926# CONFIG_VIDEO_HDPVR is not set
901CONFIG_VIDEO_USBVIDEO=m 927CONFIG_VIDEO_USBVIDEO=m
902CONFIG_USB_VICAM=m 928CONFIG_USB_VICAM=m
903CONFIG_USB_IBMCAM=m 929CONFIG_USB_IBMCAM=m
@@ -911,6 +937,7 @@ CONFIG_USB_STV680=m
911# CONFIG_USB_ZC0301 is not set 937# CONFIG_USB_ZC0301 is not set
912CONFIG_USB_PWC=m 938CONFIG_USB_PWC=m
913# CONFIG_USB_PWC_DEBUG is not set 939# CONFIG_USB_PWC_DEBUG is not set
940CONFIG_USB_PWC_INPUT_EVDEV=y
914# CONFIG_USB_ZR364XX is not set 941# CONFIG_USB_ZR364XX is not set
915# CONFIG_USB_STKWEBCAM is not set 942# CONFIG_USB_STKWEBCAM is not set
916# CONFIG_USB_S2255 is not set 943# CONFIG_USB_S2255 is not set
@@ -1020,6 +1047,7 @@ CONFIG_USB_MON=y
1020CONFIG_USB_EHCI_HCD=y 1047CONFIG_USB_EHCI_HCD=y
1021# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1048# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1022# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1049# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1050# CONFIG_USB_OXU210HP_HCD is not set
1023# CONFIG_USB_ISP116X_HCD is not set 1051# CONFIG_USB_ISP116X_HCD is not set
1024# CONFIG_USB_ISP1760_HCD is not set 1052# CONFIG_USB_ISP1760_HCD is not set
1025CONFIG_USB_OHCI_HCD=y 1053CONFIG_USB_OHCI_HCD=y
@@ -1041,22 +1069,21 @@ CONFIG_USB_PRINTER=m
1041# CONFIG_USB_TMC is not set 1069# CONFIG_USB_TMC is not set
1042 1070
1043# 1071#
1044# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1072# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1045# 1073#
1046 1074
1047# 1075#
1048# see USB_STORAGE Help for more information 1076# also be needed; see USB_STORAGE Help for more info
1049# 1077#
1050CONFIG_USB_STORAGE=m 1078CONFIG_USB_STORAGE=m
1051# CONFIG_USB_STORAGE_DEBUG is not set 1079# CONFIG_USB_STORAGE_DEBUG is not set
1052CONFIG_USB_STORAGE_DATAFAB=y 1080CONFIG_USB_STORAGE_DATAFAB=m
1053CONFIG_USB_STORAGE_FREECOM=y 1081CONFIG_USB_STORAGE_FREECOM=m
1054CONFIG_USB_STORAGE_ISD200=y 1082CONFIG_USB_STORAGE_ISD200=m
1055CONFIG_USB_STORAGE_DPCM=y
1056# CONFIG_USB_STORAGE_USBAT is not set 1083# CONFIG_USB_STORAGE_USBAT is not set
1057CONFIG_USB_STORAGE_SDDR09=y 1084CONFIG_USB_STORAGE_SDDR09=m
1058CONFIG_USB_STORAGE_SDDR55=y 1085CONFIG_USB_STORAGE_SDDR55=m
1059CONFIG_USB_STORAGE_JUMPSHOT=y 1086CONFIG_USB_STORAGE_JUMPSHOT=m
1060# CONFIG_USB_STORAGE_ALAUDA is not set 1087# CONFIG_USB_STORAGE_ALAUDA is not set
1061# CONFIG_USB_STORAGE_ONETOUCH is not set 1088# CONFIG_USB_STORAGE_ONETOUCH is not set
1062# CONFIG_USB_STORAGE_KARMA is not set 1089# CONFIG_USB_STORAGE_KARMA is not set
@@ -1081,7 +1108,7 @@ CONFIG_USB_SERIAL=m
1081# CONFIG_USB_SERIAL_CH341 is not set 1108# CONFIG_USB_SERIAL_CH341 is not set
1082# CONFIG_USB_SERIAL_WHITEHEAT is not set 1109# CONFIG_USB_SERIAL_WHITEHEAT is not set
1083# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 1110# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
1084# CONFIG_USB_SERIAL_CP2101 is not set 1111# CONFIG_USB_SERIAL_CP210X is not set
1085# CONFIG_USB_SERIAL_CYPRESS_M8 is not set 1112# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
1086# CONFIG_USB_SERIAL_EMPEG is not set 1113# CONFIG_USB_SERIAL_EMPEG is not set
1087CONFIG_USB_SERIAL_FTDI_SIO=m 1114CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -1105,15 +1132,19 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
1105# CONFIG_USB_SERIAL_NAVMAN is not set 1132# CONFIG_USB_SERIAL_NAVMAN is not set
1106CONFIG_USB_SERIAL_PL2303=m 1133CONFIG_USB_SERIAL_PL2303=m
1107# CONFIG_USB_SERIAL_OTI6858 is not set 1134# CONFIG_USB_SERIAL_OTI6858 is not set
1135# CONFIG_USB_SERIAL_QUALCOMM is not set
1108# CONFIG_USB_SERIAL_SPCP8X5 is not set 1136# CONFIG_USB_SERIAL_SPCP8X5 is not set
1109# CONFIG_USB_SERIAL_HP4X is not set 1137# CONFIG_USB_SERIAL_HP4X is not set
1110# CONFIG_USB_SERIAL_SAFE is not set 1138# CONFIG_USB_SERIAL_SAFE is not set
1139# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
1111# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 1140# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1141# CONFIG_USB_SERIAL_SYMBOL is not set
1112# CONFIG_USB_SERIAL_TI is not set 1142# CONFIG_USB_SERIAL_TI is not set
1113# CONFIG_USB_SERIAL_CYBERJACK is not set 1143# CONFIG_USB_SERIAL_CYBERJACK is not set
1114# CONFIG_USB_SERIAL_XIRCOM is not set 1144# CONFIG_USB_SERIAL_XIRCOM is not set
1115# CONFIG_USB_SERIAL_OPTION is not set 1145# CONFIG_USB_SERIAL_OPTION is not set
1116# CONFIG_USB_SERIAL_OMNINET is not set 1146# CONFIG_USB_SERIAL_OMNINET is not set
1147# CONFIG_USB_SERIAL_OPTICON is not set
1117# CONFIG_USB_SERIAL_DEBUG is not set 1148# CONFIG_USB_SERIAL_DEBUG is not set
1118 1149
1119# 1150#
@@ -1130,7 +1161,6 @@ CONFIG_USB_EMI26=m
1130# CONFIG_USB_LED is not set 1161# CONFIG_USB_LED is not set
1131# CONFIG_USB_CYPRESS_CY7C63 is not set 1162# CONFIG_USB_CYPRESS_CY7C63 is not set
1132# CONFIG_USB_CYTHERM is not set 1163# CONFIG_USB_CYTHERM is not set
1133# CONFIG_USB_PHIDGET is not set
1134# CONFIG_USB_IDMOUSE is not set 1164# CONFIG_USB_IDMOUSE is not set
1135# CONFIG_USB_FTDI_ELAN is not set 1165# CONFIG_USB_FTDI_ELAN is not set
1136# CONFIG_USB_APPLEDISPLAY is not set 1166# CONFIG_USB_APPLEDISPLAY is not set
@@ -1143,6 +1173,11 @@ CONFIG_USB_SISUSBVGA_CON=y
1143# CONFIG_USB_ISIGHTFW is not set 1173# CONFIG_USB_ISIGHTFW is not set
1144# CONFIG_USB_VST is not set 1174# CONFIG_USB_VST is not set
1145# CONFIG_USB_GADGET is not set 1175# CONFIG_USB_GADGET is not set
1176
1177#
1178# OTG and related infrastructure
1179#
1180# CONFIG_NOP_USB_XCEIV is not set
1146# CONFIG_UWB is not set 1181# CONFIG_UWB is not set
1147# CONFIG_MMC is not set 1182# CONFIG_MMC is not set
1148# CONFIG_MEMSTICK is not set 1183# CONFIG_MEMSTICK is not set
@@ -1151,6 +1186,7 @@ CONFIG_USB_SISUSBVGA_CON=y
1151# CONFIG_INFINIBAND is not set 1186# CONFIG_INFINIBAND is not set
1152# CONFIG_RTC_CLASS is not set 1187# CONFIG_RTC_CLASS is not set
1153# CONFIG_DMADEVICES is not set 1188# CONFIG_DMADEVICES is not set
1189# CONFIG_AUXDISPLAY is not set
1154# CONFIG_UIO is not set 1190# CONFIG_UIO is not set
1155# CONFIG_STAGING is not set 1191# CONFIG_STAGING is not set
1156 1192
@@ -1176,6 +1212,7 @@ CONFIG_REISERFS_FS=y
1176CONFIG_FILE_LOCKING=y 1212CONFIG_FILE_LOCKING=y
1177# CONFIG_XFS_FS is not set 1213# CONFIG_XFS_FS is not set
1178# CONFIG_OCFS2_FS is not set 1214# CONFIG_OCFS2_FS is not set
1215# CONFIG_BTRFS_FS is not set
1179CONFIG_DNOTIFY=y 1216CONFIG_DNOTIFY=y
1180CONFIG_INOTIFY=y 1217CONFIG_INOTIFY=y
1181CONFIG_INOTIFY_USER=y 1218CONFIG_INOTIFY_USER=y
@@ -1226,6 +1263,7 @@ CONFIG_MISC_FILESYSTEMS=y
1226# CONFIG_BFS_FS is not set 1263# CONFIG_BFS_FS is not set
1227# CONFIG_EFS_FS is not set 1264# CONFIG_EFS_FS is not set
1228# CONFIG_CRAMFS is not set 1265# CONFIG_CRAMFS is not set
1266# CONFIG_SQUASHFS is not set
1229# CONFIG_VXFS_FS is not set 1267# CONFIG_VXFS_FS is not set
1230# CONFIG_MINIX_FS is not set 1268# CONFIG_MINIX_FS is not set
1231# CONFIG_OMFS_FS is not set 1269# CONFIG_OMFS_FS is not set
@@ -1250,7 +1288,6 @@ CONFIG_LOCKD_V4=y
1250CONFIG_EXPORTFS=m 1288CONFIG_EXPORTFS=m
1251CONFIG_NFS_COMMON=y 1289CONFIG_NFS_COMMON=y
1252CONFIG_SUNRPC=m 1290CONFIG_SUNRPC=m
1253# CONFIG_SUNRPC_REGISTER_V4 is not set
1254# CONFIG_RPCSEC_GSS_KRB5 is not set 1291# CONFIG_RPCSEC_GSS_KRB5 is not set
1255# CONFIG_RPCSEC_GSS_SPKM3 is not set 1292# CONFIG_RPCSEC_GSS_SPKM3 is not set
1256CONFIG_SMB_FS=m 1293CONFIG_SMB_FS=m
@@ -1331,7 +1368,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1331# 1368#
1332# Tracers 1369# Tracers
1333# 1370#
1334# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1335# CONFIG_SAMPLES is not set 1371# CONFIG_SAMPLES is not set
1336CONFIG_HAVE_ARCH_KGDB=y 1372CONFIG_HAVE_ARCH_KGDB=y
1337CONFIG_SH_STANDARD_BIOS=y 1373CONFIG_SH_STANDARD_BIOS=y
@@ -1424,6 +1460,7 @@ CONFIG_CRYPTO=y
1424# Compression 1460# Compression
1425# 1461#
1426# CONFIG_CRYPTO_DEFLATE is not set 1462# CONFIG_CRYPTO_DEFLATE is not set
1463# CONFIG_CRYPTO_ZLIB is not set
1427# CONFIG_CRYPTO_LZO is not set 1464# CONFIG_CRYPTO_LZO is not set
1428 1465
1429# 1466#
@@ -1445,7 +1482,7 @@ CONFIG_CRC_T10DIF=y
1445CONFIG_CRC32=y 1482CONFIG_CRC32=y
1446# CONFIG_CRC7 is not set 1483# CONFIG_CRC7 is not set
1447# CONFIG_LIBCRC32C is not set 1484# CONFIG_LIBCRC32C is not set
1448CONFIG_PLIST=y
1449CONFIG_HAS_IOMEM=y 1485CONFIG_HAS_IOMEM=y
1450CONFIG_HAS_IOPORT=y 1486CONFIG_HAS_IOPORT=y
1451CONFIG_HAS_DMA=y 1487CONFIG_HAS_DMA=y
1488CONFIG_NLATTR=y
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig
index d5c5a1dbaa62..92c515c4199f 100644
--- a/arch/sh/configs/lboxre2_defconfig
+++ b/arch/sh/configs/lboxre2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:02:46 2009 4# Thu Apr 2 18:06:51 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -42,10 +43,19 @@ CONFIG_SYSVIPC_SYSCTL=y
42# CONFIG_BSD_PROCESS_ACCT is not set 43# CONFIG_BSD_PROCESS_ACCT is not set
43# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
44# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
45# CONFIG_IKCONFIG is not set 55# CONFIG_IKCONFIG is not set
46CONFIG_LOG_BUF_SHIFT=14 56CONFIG_LOG_BUF_SHIFT=14
47# CONFIG_CGROUPS is not set
48# CONFIG_GROUP_SCHED is not set 57# CONFIG_GROUP_SCHED is not set
58# CONFIG_CGROUPS is not set
49CONFIG_SYSFS_DEPRECATED=y 59CONFIG_SYSFS_DEPRECATED=y
50CONFIG_SYSFS_DEPRECATED_V2=y 60CONFIG_SYSFS_DEPRECATED_V2=y
51# CONFIG_RELAY is not set 61# CONFIG_RELAY is not set
@@ -53,6 +63,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
53# CONFIG_BLK_DEV_INITRD is not set 63# CONFIG_BLK_DEV_INITRD is not set
54CONFIG_CC_OPTIMIZE_FOR_SIZE=y 64CONFIG_CC_OPTIMIZE_FOR_SIZE=y
55CONFIG_SYSCTL=y 65CONFIG_SYSCTL=y
66CONFIG_ANON_INODES=y
56CONFIG_EMBEDDED=y 67CONFIG_EMBEDDED=y
57CONFIG_UID16=y 68CONFIG_UID16=y
58# CONFIG_SYSCTL_SYSCALL is not set 69# CONFIG_SYSCTL_SYSCALL is not set
@@ -62,10 +73,8 @@ CONFIG_HOTPLUG=y
62CONFIG_PRINTK=y 73CONFIG_PRINTK=y
63CONFIG_BUG=y 74CONFIG_BUG=y
64CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
65CONFIG_COMPAT_BRK=y
66CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
67CONFIG_FUTEX=y 77CONFIG_FUTEX=y
68CONFIG_ANON_INODES=y
69CONFIG_EPOLL=y 78CONFIG_EPOLL=y
70CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
71CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -74,6 +83,7 @@ CONFIG_SHMEM=y
74CONFIG_AIO=y 83CONFIG_AIO=y
75CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
76CONFIG_PCI_QUIRKS=y 85CONFIG_PCI_QUIRKS=y
86CONFIG_COMPAT_BRK=y
77CONFIG_SLAB=y 87CONFIG_SLAB=y
78# CONFIG_SLUB is not set 88# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 89# CONFIG_SLOB is not set
@@ -113,11 +123,6 @@ CONFIG_DEFAULT_AS=y
113# CONFIG_DEFAULT_CFQ is not set 123# CONFIG_DEFAULT_CFQ is not set
114# CONFIG_DEFAULT_NOOP is not set 124# CONFIG_DEFAULT_NOOP is not set
115CONFIG_DEFAULT_IOSCHED="anticipatory" 125CONFIG_DEFAULT_IOSCHED="anticipatory"
116CONFIG_CLASSIC_RCU=y
117# CONFIG_TREE_RCU is not set
118# CONFIG_PREEMPT_RCU is not set
119# CONFIG_TREE_RCU_TRACE is not set
120# CONFIG_PREEMPT_RCU_TRACE is not set
121# CONFIG_FREEZER is not set 126# CONFIG_FREEZER is not set
122 127
123# 128#
@@ -152,6 +157,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
152# CONFIG_CPU_SUBTYPE_SH7770 is not set 157# CONFIG_CPU_SUBTYPE_SH7770 is not set
153# CONFIG_CPU_SUBTYPE_SH7780 is not set 158# CONFIG_CPU_SUBTYPE_SH7780 is not set
154# CONFIG_CPU_SUBTYPE_SH7785 is not set 159# CONFIG_CPU_SUBTYPE_SH7785 is not set
160# CONFIG_CPU_SUBTYPE_SH7786 is not set
155# CONFIG_CPU_SUBTYPE_SHX3 is not set 161# CONFIG_CPU_SUBTYPE_SHX3 is not set
156# CONFIG_CPU_SUBTYPE_SH7343 is not set 162# CONFIG_CPU_SUBTYPE_SH7343 is not set
157# CONFIG_CPU_SUBTYPE_SH7722 is not set 163# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -193,11 +199,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
193CONFIG_ZONE_DMA_FLAG=0 199CONFIG_ZONE_DMA_FLAG=0
194CONFIG_NR_QUICK=2 200CONFIG_NR_QUICK=2
195CONFIG_UNEVICTABLE_LRU=y 201CONFIG_UNEVICTABLE_LRU=y
202CONFIG_HAVE_MLOCK=y
203CONFIG_HAVE_MLOCKED_PAGE_BIT=y
196 204
197# 205#
198# Cache configuration 206# Cache configuration
199# 207#
200# CONFIG_SH_DIRECT_MAPPED is not set
201CONFIG_CACHE_WRITEBACK=y 208CONFIG_CACHE_WRITEBACK=y
202# CONFIG_CACHE_WRITETHROUGH is not set 209# CONFIG_CACHE_WRITETHROUGH is not set
203# CONFIG_CACHE_OFF is not set 210# CONFIG_CACHE_OFF is not set
@@ -291,6 +298,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
291# CONFIG_PCIEPORTBUS is not set 298# CONFIG_PCIEPORTBUS is not set
292# CONFIG_ARCH_SUPPORTS_MSI is not set 299# CONFIG_ARCH_SUPPORTS_MSI is not set
293CONFIG_PCI_LEGACY=y 300CONFIG_PCI_LEGACY=y
301# CONFIG_PCI_STUB is not set
302# CONFIG_PCI_IOV is not set
294CONFIG_PCCARD=y 303CONFIG_PCCARD=y
295CONFIG_PCMCIA_DEBUG=y 304CONFIG_PCMCIA_DEBUG=y
296CONFIG_PCMCIA=y 305CONFIG_PCMCIA=y
@@ -329,7 +338,6 @@ CONFIG_NET=y
329# 338#
330# Networking options 339# Networking options
331# 340#
332CONFIG_COMPAT_NET_DEV_OPS=y
333CONFIG_PACKET=y 341CONFIG_PACKET=y
334# CONFIG_PACKET_MMAP is not set 342# CONFIG_PACKET_MMAP is not set
335CONFIG_UNIX=y 343CONFIG_UNIX=y
@@ -408,6 +416,7 @@ CONFIG_NETFILTER_ADVANCED=y
408# CONFIG_LAPB is not set 416# CONFIG_LAPB is not set
409# CONFIG_ECONET is not set 417# CONFIG_ECONET is not set
410# CONFIG_WAN_ROUTER is not set 418# CONFIG_WAN_ROUTER is not set
419# CONFIG_PHONET is not set
411# CONFIG_NET_SCHED is not set 420# CONFIG_NET_SCHED is not set
412# CONFIG_DCB is not set 421# CONFIG_DCB is not set
413 422
@@ -420,13 +429,13 @@ CONFIG_NETFILTER_ADVANCED=y
420# CONFIG_IRDA is not set 429# CONFIG_IRDA is not set
421# CONFIG_BT is not set 430# CONFIG_BT is not set
422# CONFIG_AF_RXRPC is not set 431# CONFIG_AF_RXRPC is not set
423# CONFIG_PHONET is not set
424CONFIG_WIRELESS=y 432CONFIG_WIRELESS=y
425# CONFIG_CFG80211 is not set 433# CONFIG_CFG80211 is not set
426# CONFIG_WIRELESS_OLD_REGULATORY is not set 434# CONFIG_WIRELESS_OLD_REGULATORY is not set
427# CONFIG_WIRELESS_EXT is not set 435# CONFIG_WIRELESS_EXT is not set
428# CONFIG_LIB80211 is not set 436# CONFIG_LIB80211 is not set
429# CONFIG_MAC80211 is not set 437# CONFIG_MAC80211 is not set
438# CONFIG_WIMAX is not set
430# CONFIG_RFKILL is not set 439# CONFIG_RFKILL is not set
431# CONFIG_NET_9P is not set 440# CONFIG_NET_9P is not set
432 441
@@ -465,12 +474,16 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
465# CONFIG_BLK_DEV_HD is not set 474# CONFIG_BLK_DEV_HD is not set
466CONFIG_MISC_DEVICES=y 475CONFIG_MISC_DEVICES=y
467# CONFIG_PHANTOM is not set 476# CONFIG_PHANTOM is not set
468# CONFIG_EEPROM_93CX6 is not set
469# CONFIG_SGI_IOC4 is not set 477# CONFIG_SGI_IOC4 is not set
470# CONFIG_TIFM_CORE is not set 478# CONFIG_TIFM_CORE is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 479# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 480# CONFIG_HP_ILO is not set
473# CONFIG_C2PORT is not set 481# CONFIG_C2PORT is not set
482
483#
484# EEPROM support
485#
486# CONFIG_EEPROM_93CX6 is not set
474CONFIG_HAVE_IDE=y 487CONFIG_HAVE_IDE=y
475# CONFIG_IDE is not set 488# CONFIG_IDE is not set
476 489
@@ -526,6 +539,7 @@ CONFIG_SCSI_LOWLEVEL=y
526# CONFIG_MEGARAID_NEWGEN is not set 539# CONFIG_MEGARAID_NEWGEN is not set
527# CONFIG_MEGARAID_LEGACY is not set 540# CONFIG_MEGARAID_LEGACY is not set
528# CONFIG_MEGARAID_SAS is not set 541# CONFIG_MEGARAID_SAS is not set
542# CONFIG_SCSI_MPT2SAS is not set
529# CONFIG_SCSI_HPTIOP is not set 543# CONFIG_SCSI_HPTIOP is not set
530# CONFIG_LIBFC is not set 544# CONFIG_LIBFC is not set
531# CONFIG_FCOE is not set 545# CONFIG_FCOE is not set
@@ -549,6 +563,7 @@ CONFIG_SCSI_LOWLEVEL=y
549# CONFIG_SCSI_SRP is not set 563# CONFIG_SCSI_SRP is not set
550# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 564# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
551# CONFIG_SCSI_DH is not set 565# CONFIG_SCSI_DH is not set
566# CONFIG_SCSI_OSD_INITIATOR is not set
552CONFIG_ATA=y 567CONFIG_ATA=y
553# CONFIG_ATA_NONSTANDARD is not set 568# CONFIG_ATA_NONSTANDARD is not set
554CONFIG_SATA_PMP=y 569CONFIG_SATA_PMP=y
@@ -624,6 +639,7 @@ CONFIG_PATA_PLATFORM=y
624# CONFIG_IEEE1394 is not set 639# CONFIG_IEEE1394 is not set
625# CONFIG_I2O is not set 640# CONFIG_I2O is not set
626CONFIG_NETDEVICES=y 641CONFIG_NETDEVICES=y
642CONFIG_COMPAT_NET_DEV_OPS=y
627# CONFIG_DUMMY is not set 643# CONFIG_DUMMY is not set
628# CONFIG_BONDING is not set 644# CONFIG_BONDING is not set
629# CONFIG_MACVLAN is not set 645# CONFIG_MACVLAN is not set
@@ -641,8 +657,10 @@ CONFIG_MII=y
641# CONFIG_CASSINI is not set 657# CONFIG_CASSINI is not set
642# CONFIG_NET_VENDOR_3COM is not set 658# CONFIG_NET_VENDOR_3COM is not set
643# CONFIG_SMC91X is not set 659# CONFIG_SMC91X is not set
660# CONFIG_ETHOC is not set
644# CONFIG_SMC911X is not set 661# CONFIG_SMC911X is not set
645# CONFIG_SMSC911X is not set 662# CONFIG_SMSC911X is not set
663# CONFIG_DNET is not set
646# CONFIG_NET_TULIP is not set 664# CONFIG_NET_TULIP is not set
647# CONFIG_HP100 is not set 665# CONFIG_HP100 is not set
648# CONFIG_IBM_NEW_EMAC_ZMII is not set 666# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -697,6 +715,7 @@ CONFIG_NETDEV_1000=y
697# CONFIG_QLA3XXX is not set 715# CONFIG_QLA3XXX is not set
698# CONFIG_ATL1 is not set 716# CONFIG_ATL1 is not set
699# CONFIG_ATL1E is not set 717# CONFIG_ATL1E is not set
718# CONFIG_ATL1C is not set
700# CONFIG_JME is not set 719# CONFIG_JME is not set
701CONFIG_NETDEV_10000=y 720CONFIG_NETDEV_10000=y
702# CONFIG_CHELSIO_T1 is not set 721# CONFIG_CHELSIO_T1 is not set
@@ -715,6 +734,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
715# CONFIG_BNX2X is not set 734# CONFIG_BNX2X is not set
716# CONFIG_QLGE is not set 735# CONFIG_QLGE is not set
717# CONFIG_SFC is not set 736# CONFIG_SFC is not set
737# CONFIG_BE2NET is not set
718# CONFIG_TR is not set 738# CONFIG_TR is not set
719 739
720# 740#
@@ -722,7 +742,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
722# 742#
723# CONFIG_WLAN_PRE80211 is not set 743# CONFIG_WLAN_PRE80211 is not set
724# CONFIG_WLAN_80211 is not set 744# CONFIG_WLAN_80211 is not set
725# CONFIG_IWLWIFI_LEDS is not set 745
746#
747# Enable WiMAX (Networking options) to see the WiMAX drivers
748#
726CONFIG_NET_PCMCIA=y 749CONFIG_NET_PCMCIA=y
727# CONFIG_PCMCIA_3C589 is not set 750# CONFIG_PCMCIA_3C589 is not set
728# CONFIG_PCMCIA_3C574 is not set 751# CONFIG_PCMCIA_3C574 is not set
@@ -810,6 +833,7 @@ CONFIG_LEGACY_PTYS=y
810CONFIG_LEGACY_PTY_COUNT=256 833CONFIG_LEGACY_PTY_COUNT=256
811# CONFIG_IPMI_HANDLER is not set 834# CONFIG_IPMI_HANDLER is not set
812CONFIG_HW_RANDOM=y 835CONFIG_HW_RANDOM=y
836# CONFIG_HW_RANDOM_TIMERIOMEM is not set
813# CONFIG_R3964 is not set 837# CONFIG_R3964 is not set
814# CONFIG_APPLICOM is not set 838# CONFIG_APPLICOM is not set
815 839
@@ -921,9 +945,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
921# 945#
922 946
923# 947#
924# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 948# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
925# 949#
926# CONFIG_USB_GADGET is not set 950# CONFIG_USB_GADGET is not set
951
952#
953# OTG and related infrastructure
954#
927# CONFIG_UWB is not set 955# CONFIG_UWB is not set
928# CONFIG_MMC is not set 956# CONFIG_MMC is not set
929# CONFIG_MEMSTICK is not set 957# CONFIG_MEMSTICK is not set
@@ -968,6 +996,7 @@ CONFIG_RTC_INTF_DEV=y
968# 996#
969# CONFIG_RTC_DRV_SH is not set 997# CONFIG_RTC_DRV_SH is not set
970# CONFIG_DMADEVICES is not set 998# CONFIG_DMADEVICES is not set
999# CONFIG_AUXDISPLAY is not set
971# CONFIG_UIO is not set 1000# CONFIG_UIO is not set
972# CONFIG_STAGING is not set 1001# CONFIG_STAGING is not set
973 1002
@@ -990,6 +1019,7 @@ CONFIG_FS_MBCACHE=y
990CONFIG_FILE_LOCKING=y 1019CONFIG_FILE_LOCKING=y
991# CONFIG_XFS_FS is not set 1020# CONFIG_XFS_FS is not set
992# CONFIG_OCFS2_FS is not set 1021# CONFIG_OCFS2_FS is not set
1022# CONFIG_BTRFS_FS is not set
993CONFIG_DNOTIFY=y 1023CONFIG_DNOTIFY=y
994CONFIG_INOTIFY=y 1024CONFIG_INOTIFY=y
995CONFIG_INOTIFY_USER=y 1025CONFIG_INOTIFY_USER=y
@@ -1036,6 +1066,7 @@ CONFIG_MISC_FILESYSTEMS=y
1036# CONFIG_BFS_FS is not set 1066# CONFIG_BFS_FS is not set
1037# CONFIG_EFS_FS is not set 1067# CONFIG_EFS_FS is not set
1038# CONFIG_CRAMFS is not set 1068# CONFIG_CRAMFS is not set
1069# CONFIG_SQUASHFS is not set
1039# CONFIG_VXFS_FS is not set 1070# CONFIG_VXFS_FS is not set
1040# CONFIG_MINIX_FS is not set 1071# CONFIG_MINIX_FS is not set
1041# CONFIG_OMFS_FS is not set 1072# CONFIG_OMFS_FS is not set
@@ -1124,7 +1155,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1124# 1155#
1125# Tracers 1156# Tracers
1126# 1157#
1127# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1128# CONFIG_SAMPLES is not set 1158# CONFIG_SAMPLES is not set
1129CONFIG_HAVE_ARCH_KGDB=y 1159CONFIG_HAVE_ARCH_KGDB=y
1130CONFIG_SH_STANDARD_BIOS=y 1160CONFIG_SH_STANDARD_BIOS=y
@@ -1217,6 +1247,7 @@ CONFIG_CRYPTO=y
1217# Compression 1247# Compression
1218# 1248#
1219# CONFIG_CRYPTO_DEFLATE is not set 1249# CONFIG_CRYPTO_DEFLATE is not set
1250# CONFIG_CRYPTO_ZLIB is not set
1220# CONFIG_CRYPTO_LZO is not set 1251# CONFIG_CRYPTO_LZO is not set
1221 1252
1222# 1253#
@@ -1238,7 +1269,7 @@ CONFIG_CRC_T10DIF=y
1238CONFIG_CRC32=y 1269CONFIG_CRC32=y
1239# CONFIG_CRC7 is not set 1270# CONFIG_CRC7 is not set
1240# CONFIG_LIBCRC32C is not set 1271# CONFIG_LIBCRC32C is not set
1241CONFIG_PLIST=y
1242CONFIG_HAS_IOMEM=y 1272CONFIG_HAS_IOMEM=y
1243CONFIG_HAS_IOPORT=y 1273CONFIG_HAS_IOPORT=y
1244CONFIG_HAS_DMA=y 1274CONFIG_HAS_DMA=y
1275CONFIG_NLATTR=y
diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig
index 125d8019dc2f..26586c2d64ca 100644
--- a/arch/sh/configs/magicpanelr2_defconfig
+++ b/arch/sh/configs/magicpanelr2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:03:37 2009 4# Thu Apr 2 18:07:39 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_GPIO=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -43,33 +44,44 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
43# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
44CONFIG_AUDIT=y 45CONFIG_AUDIT=y
45# CONFIG_AUDITSYSCALL is not set 46# CONFIG_AUDITSYSCALL is not set
47
48#
49# RCU Subsystem
50#
51CONFIG_CLASSIC_RCU=y
52# CONFIG_TREE_RCU is not set
53# CONFIG_PREEMPT_RCU is not set
54# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
46# CONFIG_IKCONFIG is not set 56# CONFIG_IKCONFIG is not set
47CONFIG_LOG_BUF_SHIFT=17 57CONFIG_LOG_BUF_SHIFT=17
48# CONFIG_CGROUPS is not set
49# CONFIG_GROUP_SCHED is not set 58# CONFIG_GROUP_SCHED is not set
59# CONFIG_CGROUPS is not set
50CONFIG_SYSFS_DEPRECATED=y 60CONFIG_SYSFS_DEPRECATED=y
51CONFIG_SYSFS_DEPRECATED_V2=y 61CONFIG_SYSFS_DEPRECATED_V2=y
52CONFIG_RELAY=y 62CONFIG_RELAY=y
53# CONFIG_NAMESPACES is not set 63# CONFIG_NAMESPACES is not set
54CONFIG_BLK_DEV_INITRD=y 64CONFIG_BLK_DEV_INITRD=y
55CONFIG_INITRAMFS_SOURCE="" 65CONFIG_INITRAMFS_SOURCE=""
66CONFIG_RD_GZIP=y
67# CONFIG_RD_BZIP2 is not set
68# CONFIG_RD_LZMA is not set
69CONFIG_INITRAMFS_COMPRESSION_NONE=y
56# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 70# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
57CONFIG_SYSCTL=y 71CONFIG_SYSCTL=y
72CONFIG_ANON_INODES=y
58CONFIG_EMBEDDED=y 73CONFIG_EMBEDDED=y
59CONFIG_UID16=y 74CONFIG_UID16=y
60CONFIG_SYSCTL_SYSCALL=y 75CONFIG_SYSCTL_SYSCALL=y
61CONFIG_KALLSYMS=y 76CONFIG_KALLSYMS=y
62CONFIG_KALLSYMS_ALL=y 77CONFIG_KALLSYMS_ALL=y
63CONFIG_KALLSYMS_STRIP_GENERATED=y
64# CONFIG_KALLSYMS_EXTRA_PASS is not set 78# CONFIG_KALLSYMS_EXTRA_PASS is not set
65CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
66CONFIG_PRINTK=y 80CONFIG_PRINTK=y
67CONFIG_BUG=y 81CONFIG_BUG=y
68CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
69CONFIG_COMPAT_BRK=y
70CONFIG_BASE_FULL=y 83CONFIG_BASE_FULL=y
71CONFIG_FUTEX=y 84CONFIG_FUTEX=y
72CONFIG_ANON_INODES=y
73CONFIG_EPOLL=y 85CONFIG_EPOLL=y
74CONFIG_SIGNALFD=y 86CONFIG_SIGNALFD=y
75CONFIG_TIMERFD=y 87CONFIG_TIMERFD=y
@@ -77,6 +89,7 @@ CONFIG_EVENTFD=y
77CONFIG_SHMEM=y 89CONFIG_SHMEM=y
78CONFIG_AIO=y 90CONFIG_AIO=y
79CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_COMPAT_BRK=y
80CONFIG_SLAB=y 93CONFIG_SLAB=y
81# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
82# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
@@ -116,11 +129,6 @@ CONFIG_IOSCHED_NOOP=y
116# CONFIG_DEFAULT_CFQ is not set 129# CONFIG_DEFAULT_CFQ is not set
117CONFIG_DEFAULT_NOOP=y 130CONFIG_DEFAULT_NOOP=y
118CONFIG_DEFAULT_IOSCHED="noop" 131CONFIG_DEFAULT_IOSCHED="noop"
119CONFIG_CLASSIC_RCU=y
120# CONFIG_TREE_RCU is not set
121# CONFIG_PREEMPT_RCU is not set
122# CONFIG_TREE_RCU_TRACE is not set
123# CONFIG_PREEMPT_RCU_TRACE is not set
124# CONFIG_FREEZER is not set 132# CONFIG_FREEZER is not set
125 133
126# 134#
@@ -155,6 +163,7 @@ CONFIG_CPU_SUBTYPE_SH7720=y
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 163# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 164# CONFIG_CPU_SUBTYPE_SH7780 is not set
157# CONFIG_CPU_SUBTYPE_SH7785 is not set 165# CONFIG_CPU_SUBTYPE_SH7785 is not set
166# CONFIG_CPU_SUBTYPE_SH7786 is not set
158# CONFIG_CPU_SUBTYPE_SHX3 is not set 167# CONFIG_CPU_SUBTYPE_SHX3 is not set
159# CONFIG_CPU_SUBTYPE_SH7343 is not set 168# CONFIG_CPU_SUBTYPE_SH7343 is not set
160# CONFIG_CPU_SUBTYPE_SH7722 is not set 169# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -196,11 +205,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
196CONFIG_ZONE_DMA_FLAG=0 205CONFIG_ZONE_DMA_FLAG=0
197CONFIG_NR_QUICK=2 206CONFIG_NR_QUICK=2
198CONFIG_UNEVICTABLE_LRU=y 207CONFIG_UNEVICTABLE_LRU=y
208CONFIG_HAVE_MLOCK=y
209CONFIG_HAVE_MLOCKED_PAGE_BIT=y
199 210
200# 211#
201# Cache configuration 212# Cache configuration
202# 213#
203# CONFIG_SH_DIRECT_MAPPED is not set
204CONFIG_CACHE_WRITEBACK=y 214CONFIG_CACHE_WRITEBACK=y
205# CONFIG_CACHE_WRITETHROUGH is not set 215# CONFIG_CACHE_WRITETHROUGH is not set
206# CONFIG_CACHE_OFF is not set 216# CONFIG_CACHE_OFF is not set
@@ -309,7 +319,6 @@ CONFIG_NET=y
309# 319#
310# Networking options 320# Networking options
311# 321#
312CONFIG_COMPAT_NET_DEV_OPS=y
313CONFIG_PACKET=y 322CONFIG_PACKET=y
314CONFIG_PACKET_MMAP=y 323CONFIG_PACKET_MMAP=y
315CONFIG_UNIX=y 324CONFIG_UNIX=y
@@ -359,6 +368,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
359# CONFIG_LAPB is not set 368# CONFIG_LAPB is not set
360# CONFIG_ECONET is not set 369# CONFIG_ECONET is not set
361# CONFIG_WAN_ROUTER is not set 370# CONFIG_WAN_ROUTER is not set
371# CONFIG_PHONET is not set
362# CONFIG_NET_SCHED is not set 372# CONFIG_NET_SCHED is not set
363# CONFIG_DCB is not set 373# CONFIG_DCB is not set
364 374
@@ -371,13 +381,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
371# CONFIG_IRDA is not set 381# CONFIG_IRDA is not set
372# CONFIG_BT is not set 382# CONFIG_BT is not set
373# CONFIG_AF_RXRPC is not set 383# CONFIG_AF_RXRPC is not set
374# CONFIG_PHONET is not set
375CONFIG_WIRELESS=y 384CONFIG_WIRELESS=y
376# CONFIG_CFG80211 is not set 385# CONFIG_CFG80211 is not set
377# CONFIG_WIRELESS_OLD_REGULATORY is not set 386# CONFIG_WIRELESS_OLD_REGULATORY is not set
378# CONFIG_WIRELESS_EXT is not set 387# CONFIG_WIRELESS_EXT is not set
379# CONFIG_LIB80211 is not set 388# CONFIG_LIB80211 is not set
380# CONFIG_MAC80211 is not set 389# CONFIG_MAC80211 is not set
390# CONFIG_WIMAX is not set
381# CONFIG_RFKILL is not set 391# CONFIG_RFKILL is not set
382# CONFIG_NET_9P is not set 392# CONFIG_NET_9P is not set
383 393
@@ -402,6 +412,7 @@ CONFIG_MTD=y
402# CONFIG_MTD_DEBUG is not set 412# CONFIG_MTD_DEBUG is not set
403# CONFIG_MTD_CONCAT is not set 413# CONFIG_MTD_CONCAT is not set
404CONFIG_MTD_PARTITIONS=y 414CONFIG_MTD_PARTITIONS=y
415# CONFIG_MTD_TESTS is not set
405CONFIG_MTD_REDBOOT_PARTS=y 416CONFIG_MTD_REDBOOT_PARTS=y
406CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 417CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
407# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 418# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -452,9 +463,7 @@ CONFIG_MTD_CFI_UTIL=y
452# 463#
453# CONFIG_MTD_COMPLEX_MAPPINGS is not set 464# CONFIG_MTD_COMPLEX_MAPPINGS is not set
454CONFIG_MTD_PHYSMAP=y 465CONFIG_MTD_PHYSMAP=y
455CONFIG_MTD_PHYSMAP_START=0x0000000 466# CONFIG_MTD_PHYSMAP_COMPAT is not set
456CONFIG_MTD_PHYSMAP_LEN=0
457CONFIG_MTD_PHYSMAP_BANKWIDTH=0
458# CONFIG_MTD_PLATRAM is not set 467# CONFIG_MTD_PLATRAM is not set
459 468
460# 469#
@@ -475,6 +484,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
475# CONFIG_MTD_ONENAND is not set 484# CONFIG_MTD_ONENAND is not set
476 485
477# 486#
487# LPDDR flash memory drivers
488#
489# CONFIG_MTD_LPDDR is not set
490
491#
478# UBI - Unsorted block images 492# UBI - Unsorted block images
479# 493#
480# CONFIG_MTD_UBI is not set 494# CONFIG_MTD_UBI is not set
@@ -491,9 +505,13 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
491# CONFIG_ATA_OVER_ETH is not set 505# CONFIG_ATA_OVER_ETH is not set
492# CONFIG_BLK_DEV_HD is not set 506# CONFIG_BLK_DEV_HD is not set
493CONFIG_MISC_DEVICES=y 507CONFIG_MISC_DEVICES=y
494# CONFIG_EEPROM_93CX6 is not set
495# CONFIG_ENCLOSURE_SERVICES is not set 508# CONFIG_ENCLOSURE_SERVICES is not set
496# CONFIG_C2PORT is not set 509# CONFIG_C2PORT is not set
510
511#
512# EEPROM support
513#
514# CONFIG_EEPROM_93CX6 is not set
497CONFIG_HAVE_IDE=y 515CONFIG_HAVE_IDE=y
498# CONFIG_IDE is not set 516# CONFIG_IDE is not set
499 517
@@ -507,6 +525,7 @@ CONFIG_HAVE_IDE=y
507# CONFIG_ATA is not set 525# CONFIG_ATA is not set
508# CONFIG_MD is not set 526# CONFIG_MD is not set
509CONFIG_NETDEVICES=y 527CONFIG_NETDEVICES=y
528CONFIG_COMPAT_NET_DEV_OPS=y
510# CONFIG_DUMMY is not set 529# CONFIG_DUMMY is not set
511# CONFIG_BONDING is not set 530# CONFIG_BONDING is not set
512# CONFIG_MACVLAN is not set 531# CONFIG_MACVLAN is not set
@@ -538,8 +557,10 @@ CONFIG_MII=y
538# CONFIG_AX88796 is not set 557# CONFIG_AX88796 is not set
539# CONFIG_STNIC is not set 558# CONFIG_STNIC is not set
540# CONFIG_SMC91X is not set 559# CONFIG_SMC91X is not set
560# CONFIG_ETHOC is not set
541# CONFIG_SMC911X is not set 561# CONFIG_SMC911X is not set
542CONFIG_SMSC911X=y 562CONFIG_SMSC911X=y
563# CONFIG_DNET is not set
543# CONFIG_IBM_NEW_EMAC_ZMII is not set 564# CONFIG_IBM_NEW_EMAC_ZMII is not set
544# CONFIG_IBM_NEW_EMAC_RGMII is not set 565# CONFIG_IBM_NEW_EMAC_RGMII is not set
545# CONFIG_IBM_NEW_EMAC_TAH is not set 566# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -556,7 +577,10 @@ CONFIG_SMSC911X=y
556# 577#
557# CONFIG_WLAN_PRE80211 is not set 578# CONFIG_WLAN_PRE80211 is not set
558# CONFIG_WLAN_80211 is not set 579# CONFIG_WLAN_80211 is not set
559# CONFIG_IWLWIFI_LEDS is not set 580
581#
582# Enable WiMAX (Networking options) to see the WiMAX drivers
583#
560# CONFIG_WAN is not set 584# CONFIG_WAN is not set
561# CONFIG_PPP is not set 585# CONFIG_PPP is not set
562# CONFIG_SLIP is not set 586# CONFIG_SLIP is not set
@@ -778,6 +802,7 @@ CONFIG_RTC_INTF_DEV=y
778# 802#
779CONFIG_RTC_DRV_SH=y 803CONFIG_RTC_DRV_SH=y
780# CONFIG_DMADEVICES is not set 804# CONFIG_DMADEVICES is not set
805# CONFIG_AUXDISPLAY is not set
781# CONFIG_UIO is not set 806# CONFIG_UIO is not set
782# CONFIG_STAGING is not set 807# CONFIG_STAGING is not set
783 808
@@ -797,6 +822,7 @@ CONFIG_JBD=y
797CONFIG_FILE_LOCKING=y 822CONFIG_FILE_LOCKING=y
798# CONFIG_XFS_FS is not set 823# CONFIG_XFS_FS is not set
799# CONFIG_OCFS2_FS is not set 824# CONFIG_OCFS2_FS is not set
825# CONFIG_BTRFS_FS is not set
800# CONFIG_DNOTIFY is not set 826# CONFIG_DNOTIFY is not set
801# CONFIG_INOTIFY is not set 827# CONFIG_INOTIFY is not set
802# CONFIG_QUOTA is not set 828# CONFIG_QUOTA is not set
@@ -849,6 +875,7 @@ CONFIG_JFFS2_ZLIB=y
849CONFIG_JFFS2_RTIME=y 875CONFIG_JFFS2_RTIME=y
850# CONFIG_JFFS2_RUBIN is not set 876# CONFIG_JFFS2_RUBIN is not set
851# CONFIG_CRAMFS is not set 877# CONFIG_CRAMFS is not set
878# CONFIG_SQUASHFS is not set
852# CONFIG_VXFS_FS is not set 879# CONFIG_VXFS_FS is not set
853# CONFIG_MINIX_FS is not set 880# CONFIG_MINIX_FS is not set
854# CONFIG_OMFS_FS is not set 881# CONFIG_OMFS_FS is not set
@@ -868,7 +895,6 @@ CONFIG_LOCKD=y
868CONFIG_LOCKD_V4=y 895CONFIG_LOCKD_V4=y
869CONFIG_NFS_COMMON=y 896CONFIG_NFS_COMMON=y
870CONFIG_SUNRPC=y 897CONFIG_SUNRPC=y
871# CONFIG_SUNRPC_REGISTER_V4 is not set
872# CONFIG_RPCSEC_GSS_KRB5 is not set 898# CONFIG_RPCSEC_GSS_KRB5 is not set
873# CONFIG_RPCSEC_GSS_SPKM3 is not set 899# CONFIG_RPCSEC_GSS_SPKM3 is not set
874# CONFIG_SMB_FS is not set 900# CONFIG_SMB_FS is not set
@@ -970,6 +996,7 @@ CONFIG_FRAME_POINTER=y
970# CONFIG_FAULT_INJECTION is not set 996# CONFIG_FAULT_INJECTION is not set
971# CONFIG_LATENCYTOP is not set 997# CONFIG_LATENCYTOP is not set
972CONFIG_SYSCTL_SYSCALL_CHECK=y 998CONFIG_SYSCTL_SYSCALL_CHECK=y
999# CONFIG_PAGE_POISONING is not set
973CONFIG_HAVE_FUNCTION_TRACER=y 1000CONFIG_HAVE_FUNCTION_TRACER=y
974CONFIG_HAVE_DYNAMIC_FTRACE=y 1001CONFIG_HAVE_DYNAMIC_FTRACE=y
975CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1002CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -984,7 +1011,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
984# CONFIG_BOOT_TRACER is not set 1011# CONFIG_BOOT_TRACER is not set
985# CONFIG_TRACE_BRANCH_PROFILING is not set 1012# CONFIG_TRACE_BRANCH_PROFILING is not set
986# CONFIG_STACK_TRACER is not set 1013# CONFIG_STACK_TRACER is not set
987# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
988# CONFIG_SAMPLES is not set 1014# CONFIG_SAMPLES is not set
989CONFIG_HAVE_ARCH_KGDB=y 1015CONFIG_HAVE_ARCH_KGDB=y
990# CONFIG_KGDB is not set 1016# CONFIG_KGDB is not set
@@ -1025,7 +1051,8 @@ CONFIG_CRC32=y
1025CONFIG_AUDIT_GENERIC=y 1051CONFIG_AUDIT_GENERIC=y
1026CONFIG_ZLIB_INFLATE=y 1052CONFIG_ZLIB_INFLATE=y
1027CONFIG_ZLIB_DEFLATE=y 1053CONFIG_ZLIB_DEFLATE=y
1028CONFIG_PLIST=y 1054CONFIG_DECOMPRESS_GZIP=y
1029CONFIG_HAS_IOMEM=y 1055CONFIG_HAS_IOMEM=y
1030CONFIG_HAS_IOPORT=y 1056CONFIG_HAS_IOPORT=y
1031CONFIG_HAS_DMA=y 1057CONFIG_HAS_DMA=y
1058CONFIG_NLATTR=y
diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig
index 5a1c0485a354..75178355d69a 100644
--- a/arch/sh/configs/microdev_defconfig
+++ b/arch/sh/configs/microdev_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:06:47 2009 4# Thu Apr 2 18:11:13 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -42,18 +43,32 @@ CONFIG_BSD_PROCESS_ACCT=y
42# CONFIG_BSD_PROCESS_ACCT_V3 is not set 43# CONFIG_BSD_PROCESS_ACCT_V3 is not set
43# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
44# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
45# CONFIG_IKCONFIG is not set 55# CONFIG_IKCONFIG is not set
46CONFIG_LOG_BUF_SHIFT=14 56CONFIG_LOG_BUF_SHIFT=14
47# CONFIG_CGROUPS is not set
48# CONFIG_GROUP_SCHED is not set 57# CONFIG_GROUP_SCHED is not set
58# CONFIG_CGROUPS is not set
49CONFIG_SYSFS_DEPRECATED=y 59CONFIG_SYSFS_DEPRECATED=y
50CONFIG_SYSFS_DEPRECATED_V2=y 60CONFIG_SYSFS_DEPRECATED_V2=y
51# CONFIG_RELAY is not set 61# CONFIG_RELAY is not set
52# CONFIG_NAMESPACES is not set 62# CONFIG_NAMESPACES is not set
53CONFIG_BLK_DEV_INITRD=y 63CONFIG_BLK_DEV_INITRD=y
54CONFIG_INITRAMFS_SOURCE="" 64CONFIG_INITRAMFS_SOURCE=""
65CONFIG_RD_GZIP=y
66# CONFIG_RD_BZIP2 is not set
67# CONFIG_RD_LZMA is not set
68CONFIG_INITRAMFS_COMPRESSION_NONE=y
55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
56CONFIG_SYSCTL=y 70CONFIG_SYSCTL=y
71CONFIG_ANON_INODES=y
57CONFIG_EMBEDDED=y 72CONFIG_EMBEDDED=y
58CONFIG_UID16=y 73CONFIG_UID16=y
59# CONFIG_SYSCTL_SYSCALL is not set 74# CONFIG_SYSCTL_SYSCALL is not set
@@ -63,10 +78,8 @@ CONFIG_HOTPLUG=y
63CONFIG_PRINTK=y 78CONFIG_PRINTK=y
64CONFIG_BUG=y 79CONFIG_BUG=y
65CONFIG_ELF_CORE=y 80CONFIG_ELF_CORE=y
66CONFIG_COMPAT_BRK=y
67CONFIG_BASE_FULL=y 81CONFIG_BASE_FULL=y
68CONFIG_FUTEX=y 82CONFIG_FUTEX=y
69CONFIG_ANON_INODES=y
70CONFIG_EPOLL=y 83CONFIG_EPOLL=y
71CONFIG_SIGNALFD=y 84CONFIG_SIGNALFD=y
72CONFIG_TIMERFD=y 85CONFIG_TIMERFD=y
@@ -74,6 +87,7 @@ CONFIG_EVENTFD=y
74CONFIG_SHMEM=y 87CONFIG_SHMEM=y
75CONFIG_AIO=y 88CONFIG_AIO=y
76CONFIG_VM_EVENT_COUNTERS=y 89CONFIG_VM_EVENT_COUNTERS=y
90CONFIG_COMPAT_BRK=y
77CONFIG_SLAB=y 91CONFIG_SLAB=y
78# CONFIG_SLUB is not set 92# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 93# CONFIG_SLOB is not set
@@ -107,11 +121,6 @@ CONFIG_DEFAULT_AS=y
107# CONFIG_DEFAULT_CFQ is not set 121# CONFIG_DEFAULT_CFQ is not set
108# CONFIG_DEFAULT_NOOP is not set 122# CONFIG_DEFAULT_NOOP is not set
109CONFIG_DEFAULT_IOSCHED="anticipatory" 123CONFIG_DEFAULT_IOSCHED="anticipatory"
110CONFIG_CLASSIC_RCU=y
111# CONFIG_TREE_RCU is not set
112# CONFIG_PREEMPT_RCU is not set
113# CONFIG_TREE_RCU_TRACE is not set
114# CONFIG_PREEMPT_RCU_TRACE is not set
115# CONFIG_FREEZER is not set 124# CONFIG_FREEZER is not set
116 125
117# 126#
@@ -146,6 +155,7 @@ CONFIG_CPU_SUBTYPE_SH4_202=y
146# CONFIG_CPU_SUBTYPE_SH7770 is not set 155# CONFIG_CPU_SUBTYPE_SH7770 is not set
147# CONFIG_CPU_SUBTYPE_SH7780 is not set 156# CONFIG_CPU_SUBTYPE_SH7780 is not set
148# CONFIG_CPU_SUBTYPE_SH7785 is not set 157# CONFIG_CPU_SUBTYPE_SH7785 is not set
158# CONFIG_CPU_SUBTYPE_SH7786 is not set
149# CONFIG_CPU_SUBTYPE_SHX3 is not set 159# CONFIG_CPU_SUBTYPE_SHX3 is not set
150# CONFIG_CPU_SUBTYPE_SH7343 is not set 160# CONFIG_CPU_SUBTYPE_SH7343 is not set
151# CONFIG_CPU_SUBTYPE_SH7722 is not set 161# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -193,11 +203,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
193CONFIG_ZONE_DMA_FLAG=0 203CONFIG_ZONE_DMA_FLAG=0
194CONFIG_NR_QUICK=2 204CONFIG_NR_QUICK=2
195CONFIG_UNEVICTABLE_LRU=y 205CONFIG_UNEVICTABLE_LRU=y
206CONFIG_HAVE_MLOCK=y
207CONFIG_HAVE_MLOCKED_PAGE_BIT=y
196 208
197# 209#
198# Cache configuration 210# Cache configuration
199# 211#
200# CONFIG_SH_DIRECT_MAPPED is not set
201CONFIG_CACHE_WRITEBACK=y 212CONFIG_CACHE_WRITEBACK=y
202# CONFIG_CACHE_WRITETHROUGH is not set 213# CONFIG_CACHE_WRITETHROUGH is not set
203# CONFIG_CACHE_OFF is not set 214# CONFIG_CACHE_OFF is not set
@@ -239,7 +250,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
239# 250#
240CONFIG_SH_DMA_API=y 251CONFIG_SH_DMA_API=y
241CONFIG_SH_DMA=y 252CONFIG_SH_DMA=y
242CONFIG_NR_ONCHIP_DMA_CHANNELS=4 253CONFIG_NR_ONCHIP_DMA_CHANNELS=6
243# CONFIG_NR_DMA_CHANNELS_BOOL is not set 254# CONFIG_NR_DMA_CHANNELS_BOOL is not set
244 255
245# 256#
@@ -304,7 +315,6 @@ CONFIG_NET=y
304# 315#
305# Networking options 316# Networking options
306# 317#
307CONFIG_COMPAT_NET_DEV_OPS=y
308# CONFIG_PACKET is not set 318# CONFIG_PACKET is not set
309# CONFIG_UNIX is not set 319# CONFIG_UNIX is not set
310CONFIG_XFRM=y 320CONFIG_XFRM=y
@@ -358,6 +368,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
358# CONFIG_LAPB is not set 368# CONFIG_LAPB is not set
359# CONFIG_ECONET is not set 369# CONFIG_ECONET is not set
360# CONFIG_WAN_ROUTER is not set 370# CONFIG_WAN_ROUTER is not set
371# CONFIG_PHONET is not set
361# CONFIG_NET_SCHED is not set 372# CONFIG_NET_SCHED is not set
362# CONFIG_DCB is not set 373# CONFIG_DCB is not set
363 374
@@ -370,13 +381,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
370# CONFIG_IRDA is not set 381# CONFIG_IRDA is not set
371# CONFIG_BT is not set 382# CONFIG_BT is not set
372# CONFIG_AF_RXRPC is not set 383# CONFIG_AF_RXRPC is not set
373# CONFIG_PHONET is not set
374CONFIG_WIRELESS=y 384CONFIG_WIRELESS=y
375# CONFIG_CFG80211 is not set 385# CONFIG_CFG80211 is not set
376# CONFIG_WIRELESS_OLD_REGULATORY is not set 386# CONFIG_WIRELESS_OLD_REGULATORY is not set
377# CONFIG_WIRELESS_EXT is not set 387# CONFIG_WIRELESS_EXT is not set
378# CONFIG_LIB80211 is not set 388# CONFIG_LIB80211 is not set
379# CONFIG_MAC80211 is not set 389# CONFIG_MAC80211 is not set
390# CONFIG_WIMAX is not set
380# CONFIG_RFKILL is not set 391# CONFIG_RFKILL is not set
381# CONFIG_NET_9P is not set 392# CONFIG_NET_9P is not set
382 393
@@ -407,9 +418,13 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
407# CONFIG_ATA_OVER_ETH is not set 418# CONFIG_ATA_OVER_ETH is not set
408# CONFIG_BLK_DEV_HD is not set 419# CONFIG_BLK_DEV_HD is not set
409CONFIG_MISC_DEVICES=y 420CONFIG_MISC_DEVICES=y
410# CONFIG_EEPROM_93CX6 is not set
411# CONFIG_ENCLOSURE_SERVICES is not set 421# CONFIG_ENCLOSURE_SERVICES is not set
412# CONFIG_C2PORT is not set 422# CONFIG_C2PORT is not set
423
424#
425# EEPROM support
426#
427# CONFIG_EEPROM_93CX6 is not set
413CONFIG_HAVE_IDE=y 428CONFIG_HAVE_IDE=y
414CONFIG_IDE=y 429CONFIG_IDE=y
415 430
@@ -443,6 +458,7 @@ CONFIG_IDE_PROC_FS=y
443# CONFIG_ATA is not set 458# CONFIG_ATA is not set
444# CONFIG_MD is not set 459# CONFIG_MD is not set
445CONFIG_NETDEVICES=y 460CONFIG_NETDEVICES=y
461CONFIG_COMPAT_NET_DEV_OPS=y
446# CONFIG_DUMMY is not set 462# CONFIG_DUMMY is not set
447# CONFIG_BONDING is not set 463# CONFIG_BONDING is not set
448# CONFIG_MACVLAN is not set 464# CONFIG_MACVLAN is not set
@@ -455,8 +471,10 @@ CONFIG_MII=y
455# CONFIG_AX88796 is not set 471# CONFIG_AX88796 is not set
456# CONFIG_STNIC is not set 472# CONFIG_STNIC is not set
457CONFIG_SMC91X=y 473CONFIG_SMC91X=y
474# CONFIG_ETHOC is not set
458# CONFIG_SMC911X is not set 475# CONFIG_SMC911X is not set
459# CONFIG_SMSC911X is not set 476# CONFIG_SMSC911X is not set
477# CONFIG_DNET is not set
460# CONFIG_IBM_NEW_EMAC_ZMII is not set 478# CONFIG_IBM_NEW_EMAC_ZMII is not set
461# CONFIG_IBM_NEW_EMAC_RGMII is not set 479# CONFIG_IBM_NEW_EMAC_RGMII is not set
462# CONFIG_IBM_NEW_EMAC_TAH is not set 480# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -473,7 +491,10 @@ CONFIG_NETDEV_10000=y
473# 491#
474# CONFIG_WLAN_PRE80211 is not set 492# CONFIG_WLAN_PRE80211 is not set
475# CONFIG_WLAN_80211 is not set 493# CONFIG_WLAN_80211 is not set
476# CONFIG_IWLWIFI_LEDS is not set 494
495#
496# Enable WiMAX (Networking options) to see the WiMAX drivers
497#
477# CONFIG_WAN is not set 498# CONFIG_WAN is not set
478# CONFIG_PPP is not set 499# CONFIG_PPP is not set
479# CONFIG_SLIP is not set 500# CONFIG_SLIP is not set
@@ -520,6 +541,7 @@ CONFIG_LEGACY_PTYS=y
520CONFIG_LEGACY_PTY_COUNT=256 541CONFIG_LEGACY_PTY_COUNT=256
521# CONFIG_IPMI_HANDLER is not set 542# CONFIG_IPMI_HANDLER is not set
522CONFIG_HW_RANDOM=y 543CONFIG_HW_RANDOM=y
544# CONFIG_HW_RANDOM_TIMERIOMEM is not set
523# CONFIG_R3964 is not set 545# CONFIG_R3964 is not set
524# CONFIG_RAW_DRIVER is not set 546# CONFIG_RAW_DRIVER is not set
525# CONFIG_TCG_TPM is not set 547# CONFIG_TCG_TPM is not set
@@ -601,15 +623,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
601# 623#
602 624
603# 625#
604# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 626# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
605# 627#
606# CONFIG_USB_GADGET is not set 628# CONFIG_USB_GADGET is not set
629
630#
631# OTG and related infrastructure
632#
607# CONFIG_MMC is not set 633# CONFIG_MMC is not set
608# CONFIG_MEMSTICK is not set 634# CONFIG_MEMSTICK is not set
609# CONFIG_NEW_LEDS is not set 635# CONFIG_NEW_LEDS is not set
610# CONFIG_ACCESSIBILITY is not set 636# CONFIG_ACCESSIBILITY is not set
611# CONFIG_RTC_CLASS is not set 637# CONFIG_RTC_CLASS is not set
612# CONFIG_DMADEVICES is not set 638# CONFIG_DMADEVICES is not set
639# CONFIG_AUXDISPLAY is not set
613# CONFIG_UIO is not set 640# CONFIG_UIO is not set
614# CONFIG_STAGING is not set 641# CONFIG_STAGING is not set
615 642
@@ -632,6 +659,7 @@ CONFIG_FS_MBCACHE=y
632CONFIG_FILE_LOCKING=y 659CONFIG_FILE_LOCKING=y
633# CONFIG_XFS_FS is not set 660# CONFIG_XFS_FS is not set
634# CONFIG_OCFS2_FS is not set 661# CONFIG_OCFS2_FS is not set
662# CONFIG_BTRFS_FS is not set
635CONFIG_DNOTIFY=y 663CONFIG_DNOTIFY=y
636CONFIG_INOTIFY=y 664CONFIG_INOTIFY=y
637CONFIG_INOTIFY_USER=y 665CONFIG_INOTIFY_USER=y
@@ -678,6 +706,7 @@ CONFIG_MISC_FILESYSTEMS=y
678# CONFIG_BFS_FS is not set 706# CONFIG_BFS_FS is not set
679# CONFIG_EFS_FS is not set 707# CONFIG_EFS_FS is not set
680# CONFIG_CRAMFS is not set 708# CONFIG_CRAMFS is not set
709# CONFIG_SQUASHFS is not set
681# CONFIG_VXFS_FS is not set 710# CONFIG_VXFS_FS is not set
682# CONFIG_MINIX_FS is not set 711# CONFIG_MINIX_FS is not set
683# CONFIG_OMFS_FS is not set 712# CONFIG_OMFS_FS is not set
@@ -698,7 +727,6 @@ CONFIG_LOCKD_V4=y
698CONFIG_NFS_COMMON=y 727CONFIG_NFS_COMMON=y
699CONFIG_SUNRPC=y 728CONFIG_SUNRPC=y
700CONFIG_SUNRPC_GSS=y 729CONFIG_SUNRPC_GSS=y
701# CONFIG_SUNRPC_REGISTER_V4 is not set
702CONFIG_RPCSEC_GSS_KRB5=y 730CONFIG_RPCSEC_GSS_KRB5=y
703# CONFIG_RPCSEC_GSS_SPKM3 is not set 731# CONFIG_RPCSEC_GSS_SPKM3 is not set
704# CONFIG_SMB_FS is not set 732# CONFIG_SMB_FS is not set
@@ -778,7 +806,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
778# 806#
779# Tracers 807# Tracers
780# 808#
781# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
782# CONFIG_SAMPLES is not set 809# CONFIG_SAMPLES is not set
783CONFIG_HAVE_ARCH_KGDB=y 810CONFIG_HAVE_ARCH_KGDB=y
784# CONFIG_SH_STANDARD_BIOS is not set 811# CONFIG_SH_STANDARD_BIOS is not set
@@ -806,10 +833,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
806CONFIG_CRYPTO_HASH=y 833CONFIG_CRYPTO_HASH=y
807CONFIG_CRYPTO_HASH2=y 834CONFIG_CRYPTO_HASH2=y
808CONFIG_CRYPTO_RNG2=y 835CONFIG_CRYPTO_RNG2=y
836CONFIG_CRYPTO_PCOMP=y
809CONFIG_CRYPTO_MANAGER=y 837CONFIG_CRYPTO_MANAGER=y
810CONFIG_CRYPTO_MANAGER2=y 838CONFIG_CRYPTO_MANAGER2=y
811# CONFIG_CRYPTO_GF128MUL is not set 839# CONFIG_CRYPTO_GF128MUL is not set
812# CONFIG_CRYPTO_NULL is not set 840# CONFIG_CRYPTO_NULL is not set
841CONFIG_CRYPTO_WORKQUEUE=y
813# CONFIG_CRYPTO_CRYPTD is not set 842# CONFIG_CRYPTO_CRYPTD is not set
814# CONFIG_CRYPTO_AUTHENC is not set 843# CONFIG_CRYPTO_AUTHENC is not set
815 844
@@ -877,6 +906,7 @@ CONFIG_CRYPTO_DES=y
877# Compression 906# Compression
878# 907#
879# CONFIG_CRYPTO_DEFLATE is not set 908# CONFIG_CRYPTO_DEFLATE is not set
909# CONFIG_CRYPTO_ZLIB is not set
880# CONFIG_CRYPTO_LZO is not set 910# CONFIG_CRYPTO_LZO is not set
881 911
882# 912#
@@ -897,7 +927,9 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
897CONFIG_CRC32=y 927CONFIG_CRC32=y
898# CONFIG_CRC7 is not set 928# CONFIG_CRC7 is not set
899# CONFIG_LIBCRC32C is not set 929# CONFIG_LIBCRC32C is not set
900CONFIG_PLIST=y 930CONFIG_ZLIB_INFLATE=y
931CONFIG_DECOMPRESS_GZIP=y
901CONFIG_HAS_IOMEM=y 932CONFIG_HAS_IOMEM=y
902CONFIG_HAS_IOPORT=y 933CONFIG_HAS_IOPORT=y
903CONFIG_HAS_DMA=y 934CONFIG_HAS_DMA=y
935CONFIG_NLATTR=y
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index 678576796bdf..a8720f9c6047 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.29-rc1 3# Linux kernel version: 2.6.29
4# Thu Jan 22 09:16:16 2009 4# Thu Apr 2 18:14:03 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,15 +16,17 @@ CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_GENERIC_GPIO=y 16CONFIG_GENERIC_GPIO=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19CONFIG_ARCH_SUSPEND_POSSIBLE=y
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_NUMA=y 21CONFIG_SYS_SUPPORTS_NUMA=y
22CONFIG_SYS_SUPPORTS_CMT=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 26# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 31
30# 32#
@@ -42,14 +44,19 @@ CONFIG_SYSVIPC_SYSCTL=y
42# CONFIG_BSD_PROCESS_ACCT is not set 44# CONFIG_BSD_PROCESS_ACCT is not set
43# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
44# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
47
48#
49# RCU Subsystem
50#
51CONFIG_CLASSIC_RCU=y
52# CONFIG_TREE_RCU is not set
53# CONFIG_PREEMPT_RCU is not set
54# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
45CONFIG_IKCONFIG=y 56CONFIG_IKCONFIG=y
46CONFIG_IKCONFIG_PROC=y 57CONFIG_IKCONFIG_PROC=y
47CONFIG_LOG_BUF_SHIFT=14 58CONFIG_LOG_BUF_SHIFT=14
48# CONFIG_GROUP_SCHED is not set 59# CONFIG_GROUP_SCHED is not set
49
50#
51# Control Group support
52#
53# CONFIG_CGROUPS is not set 60# CONFIG_CGROUPS is not set
54CONFIG_SYSFS_DEPRECATED=y 61CONFIG_SYSFS_DEPRECATED=y
55CONFIG_SYSFS_DEPRECATED_V2=y 62CONFIG_SYSFS_DEPRECATED_V2=y
@@ -57,8 +64,13 @@ CONFIG_SYSFS_DEPRECATED_V2=y
57# CONFIG_NAMESPACES is not set 64# CONFIG_NAMESPACES is not set
58CONFIG_BLK_DEV_INITRD=y 65CONFIG_BLK_DEV_INITRD=y
59CONFIG_INITRAMFS_SOURCE="" 66CONFIG_INITRAMFS_SOURCE=""
67CONFIG_RD_GZIP=y
68# CONFIG_RD_BZIP2 is not set
69# CONFIG_RD_LZMA is not set
70CONFIG_INITRAMFS_COMPRESSION_NONE=y
60# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 71# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
61CONFIG_SYSCTL=y 72CONFIG_SYSCTL=y
73CONFIG_ANON_INODES=y
62CONFIG_EMBEDDED=y 74CONFIG_EMBEDDED=y
63CONFIG_UID16=y 75CONFIG_UID16=y
64# CONFIG_SYSCTL_SYSCALL is not set 76# CONFIG_SYSCTL_SYSCALL is not set
@@ -68,10 +80,8 @@ CONFIG_HOTPLUG=y
68CONFIG_PRINTK=y 80CONFIG_PRINTK=y
69CONFIG_BUG=y 81CONFIG_BUG=y
70CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
71CONFIG_COMPAT_BRK=y
72CONFIG_BASE_FULL=y 83CONFIG_BASE_FULL=y
73CONFIG_FUTEX=y 84CONFIG_FUTEX=y
74CONFIG_ANON_INODES=y
75CONFIG_EPOLL=y 85CONFIG_EPOLL=y
76CONFIG_SIGNALFD=y 86CONFIG_SIGNALFD=y
77CONFIG_TIMERFD=y 87CONFIG_TIMERFD=y
@@ -79,6 +89,7 @@ CONFIG_EVENTFD=y
79CONFIG_SHMEM=y 89CONFIG_SHMEM=y
80CONFIG_AIO=y 90CONFIG_AIO=y
81CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_COMPAT_BRK=y
82CONFIG_SLAB=y 93CONFIG_SLAB=y
83# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
84# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
@@ -120,11 +131,6 @@ CONFIG_DEFAULT_AS=y
120# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
121# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
122CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
123CONFIG_CLASSIC_RCU=y
124# CONFIG_TREE_RCU is not set
125# CONFIG_PREEMPT_RCU is not set
126# CONFIG_TREE_RCU_TRACE is not set
127# CONFIG_PREEMPT_RCU_TRACE is not set
128# CONFIG_FREEZER is not set 134# CONFIG_FREEZER is not set
129 135
130# 136#
@@ -134,6 +140,7 @@ CONFIG_CPU_SH4=y
134CONFIG_CPU_SH4A=y 140CONFIG_CPU_SH4A=y
135CONFIG_CPU_SH4AL_DSP=y 141CONFIG_CPU_SH4AL_DSP=y
136CONFIG_CPU_SHX2=y 142CONFIG_CPU_SHX2=y
143CONFIG_ARCH_SHMOBILE=y
137# CONFIG_CPU_SUBTYPE_SH7619 is not set 144# CONFIG_CPU_SUBTYPE_SH7619 is not set
138# CONFIG_CPU_SUBTYPE_SH7201 is not set 145# CONFIG_CPU_SUBTYPE_SH7201 is not set
139# CONFIG_CPU_SUBTYPE_SH7203 is not set 146# CONFIG_CPU_SUBTYPE_SH7203 is not set
@@ -162,6 +169,7 @@ CONFIG_CPU_SHX2=y
162# CONFIG_CPU_SUBTYPE_SH7770 is not set 169# CONFIG_CPU_SUBTYPE_SH7770 is not set
163# CONFIG_CPU_SUBTYPE_SH7780 is not set 170# CONFIG_CPU_SUBTYPE_SH7780 is not set
164# CONFIG_CPU_SUBTYPE_SH7785 is not set 171# CONFIG_CPU_SUBTYPE_SH7785 is not set
172# CONFIG_CPU_SUBTYPE_SH7786 is not set
165# CONFIG_CPU_SUBTYPE_SHX3 is not set 173# CONFIG_CPU_SUBTYPE_SHX3 is not set
166# CONFIG_CPU_SUBTYPE_SH7343 is not set 174# CONFIG_CPU_SUBTYPE_SH7343 is not set
167CONFIG_CPU_SUBTYPE_SH7722=y 175CONFIG_CPU_SUBTYPE_SH7722=y
@@ -209,11 +217,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
209CONFIG_ZONE_DMA_FLAG=0 217CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 218CONFIG_NR_QUICK=2
211CONFIG_UNEVICTABLE_LRU=y 219CONFIG_UNEVICTABLE_LRU=y
220CONFIG_HAVE_MLOCK=y
221CONFIG_HAVE_MLOCKED_PAGE_BIT=y
212 222
213# 223#
214# Cache configuration 224# Cache configuration
215# 225#
216# CONFIG_SH_DIRECT_MAPPED is not set
217CONFIG_CACHE_WRITEBACK=y 226CONFIG_CACHE_WRITEBACK=y
218# CONFIG_CACHE_WRITETHROUGH is not set 227# CONFIG_CACHE_WRITETHROUGH is not set
219# CONFIG_CACHE_OFF is not set 228# CONFIG_CACHE_OFF is not set
@@ -243,6 +252,7 @@ CONFIG_SH_MIGOR_QVGA=y
243# Timer and clock configuration 252# Timer and clock configuration
244# 253#
245CONFIG_SH_TMU=y 254CONFIG_SH_TMU=y
255# CONFIG_SH_TIMER_CMT is not set
246CONFIG_SH_TIMER_IRQ=16 256CONFIG_SH_TIMER_IRQ=16
247CONFIG_SH_PCLK_FREQ=33333333 257CONFIG_SH_PCLK_FREQ=33333333
248# CONFIG_NO_HZ is not set 258# CONFIG_NO_HZ is not set
@@ -318,7 +328,6 @@ CONFIG_NET=y
318# 328#
319# Networking options 329# Networking options
320# 330#
321CONFIG_COMPAT_NET_DEV_OPS=y
322CONFIG_PACKET=y 331CONFIG_PACKET=y
323# CONFIG_PACKET_MMAP is not set 332# CONFIG_PACKET_MMAP is not set
324CONFIG_UNIX=y 333CONFIG_UNIX=y
@@ -373,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_LAPB is not set 382# CONFIG_LAPB is not set
374# CONFIG_ECONET is not set 383# CONFIG_ECONET is not set
375# CONFIG_WAN_ROUTER is not set 384# CONFIG_WAN_ROUTER is not set
385# CONFIG_PHONET is not set
376# CONFIG_NET_SCHED is not set 386# CONFIG_NET_SCHED is not set
377# CONFIG_DCB is not set 387# CONFIG_DCB is not set
378 388
@@ -380,12 +390,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
380# Network testing 390# Network testing
381# 391#
382# CONFIG_NET_PKTGEN is not set 392# CONFIG_NET_PKTGEN is not set
393# CONFIG_NET_DROP_MONITOR is not set
383# CONFIG_HAMRADIO is not set 394# CONFIG_HAMRADIO is not set
384# CONFIG_CAN is not set 395# CONFIG_CAN is not set
385# CONFIG_IRDA is not set 396# CONFIG_IRDA is not set
386# CONFIG_BT is not set 397# CONFIG_BT is not set
387# CONFIG_AF_RXRPC is not set 398# CONFIG_AF_RXRPC is not set
388# CONFIG_PHONET is not set
389CONFIG_WIRELESS=y 399CONFIG_WIRELESS=y
390# CONFIG_CFG80211 is not set 400# CONFIG_CFG80211 is not set
391# CONFIG_WIRELESS_OLD_REGULATORY is not set 401# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -495,7 +505,6 @@ CONFIG_MTD_NAND_PLATFORM=y
495# LPDDR flash memory drivers 505# LPDDR flash memory drivers
496# 506#
497# CONFIG_MTD_LPDDR is not set 507# CONFIG_MTD_LPDDR is not set
498# CONFIG_MTD_QINFO_PROBE is not set
499 508
500# 509#
501# UBI - Unsorted block images 510# UBI - Unsorted block images
@@ -514,10 +523,17 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
514# CONFIG_ATA_OVER_ETH is not set 523# CONFIG_ATA_OVER_ETH is not set
515# CONFIG_BLK_DEV_HD is not set 524# CONFIG_BLK_DEV_HD is not set
516CONFIG_MISC_DEVICES=y 525CONFIG_MISC_DEVICES=y
517# CONFIG_EEPROM_93CX6 is not set
518# CONFIG_ICS932S401 is not set 526# CONFIG_ICS932S401 is not set
519# CONFIG_ENCLOSURE_SERVICES is not set 527# CONFIG_ENCLOSURE_SERVICES is not set
528# CONFIG_ISL29003 is not set
520# CONFIG_C2PORT is not set 529# CONFIG_C2PORT is not set
530
531#
532# EEPROM support
533#
534# CONFIG_EEPROM_AT24 is not set
535# CONFIG_EEPROM_LEGACY is not set
536# CONFIG_EEPROM_93CX6 is not set
521CONFIG_HAVE_IDE=y 537CONFIG_HAVE_IDE=y
522# CONFIG_IDE is not set 538# CONFIG_IDE is not set
523 539
@@ -563,9 +579,11 @@ CONFIG_SCSI_LOWLEVEL=y
563# CONFIG_LIBFC is not set 579# CONFIG_LIBFC is not set
564# CONFIG_SCSI_DEBUG is not set 580# CONFIG_SCSI_DEBUG is not set
565# CONFIG_SCSI_DH is not set 581# CONFIG_SCSI_DH is not set
582# CONFIG_SCSI_OSD_INITIATOR is not set
566# CONFIG_ATA is not set 583# CONFIG_ATA is not set
567# CONFIG_MD is not set 584# CONFIG_MD is not set
568CONFIG_NETDEVICES=y 585CONFIG_NETDEVICES=y
586CONFIG_COMPAT_NET_DEV_OPS=y
569# CONFIG_DUMMY is not set 587# CONFIG_DUMMY is not set
570# CONFIG_BONDING is not set 588# CONFIG_BONDING is not set
571# CONFIG_MACVLAN is not set 589# CONFIG_MACVLAN is not set
@@ -578,8 +596,10 @@ CONFIG_MII=y
578# CONFIG_AX88796 is not set 596# CONFIG_AX88796 is not set
579# CONFIG_STNIC is not set 597# CONFIG_STNIC is not set
580CONFIG_SMC91X=y 598CONFIG_SMC91X=y
599# CONFIG_ETHOC is not set
581# CONFIG_SMC911X is not set 600# CONFIG_SMC911X is not set
582# CONFIG_SMSC911X is not set 601# CONFIG_SMSC911X is not set
602# CONFIG_DNET is not set
583# CONFIG_IBM_NEW_EMAC_ZMII is not set 603# CONFIG_IBM_NEW_EMAC_ZMII is not set
584# CONFIG_IBM_NEW_EMAC_RGMII is not set 604# CONFIG_IBM_NEW_EMAC_RGMII is not set
585# CONFIG_IBM_NEW_EMAC_TAH is not set 605# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -596,7 +616,6 @@ CONFIG_SMC91X=y
596# 616#
597# CONFIG_WLAN_PRE80211 is not set 617# CONFIG_WLAN_PRE80211 is not set
598# CONFIG_WLAN_80211 is not set 618# CONFIG_WLAN_80211 is not set
599# CONFIG_IWLWIFI_LEDS is not set
600 619
601# 620#
602# Enable WiMAX (Networking options) to see the WiMAX drivers 621# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -679,6 +698,7 @@ CONFIG_LEGACY_PTYS=y
679CONFIG_LEGACY_PTY_COUNT=256 698CONFIG_LEGACY_PTY_COUNT=256
680# CONFIG_IPMI_HANDLER is not set 699# CONFIG_IPMI_HANDLER is not set
681CONFIG_HW_RANDOM=y 700CONFIG_HW_RANDOM=y
701# CONFIG_HW_RANDOM_TIMERIOMEM is not set
682# CONFIG_R3964 is not set 702# CONFIG_R3964 is not set
683# CONFIG_RAW_DRIVER is not set 703# CONFIG_RAW_DRIVER is not set
684# CONFIG_TCG_TPM is not set 704# CONFIG_TCG_TPM is not set
@@ -715,12 +735,9 @@ CONFIG_I2C_SH_MOBILE=y
715# Miscellaneous I2C Chip support 735# Miscellaneous I2C Chip support
716# 736#
717# CONFIG_DS1682 is not set 737# CONFIG_DS1682 is not set
718# CONFIG_EEPROM_AT24 is not set
719# CONFIG_EEPROM_LEGACY is not set
720# CONFIG_SENSORS_PCF8574 is not set 738# CONFIG_SENSORS_PCF8574 is not set
721# CONFIG_PCF8575 is not set 739# CONFIG_PCF8575 is not set
722# CONFIG_SENSORS_PCA9539 is not set 740# CONFIG_SENSORS_PCA9539 is not set
723# CONFIG_SENSORS_PCF8591 is not set
724# CONFIG_SENSORS_MAX6875 is not set 741# CONFIG_SENSORS_MAX6875 is not set
725# CONFIG_SENSORS_TSL2550 is not set 742# CONFIG_SENSORS_TSL2550 is not set
726# CONFIG_I2C_DEBUG_CORE is not set 743# CONFIG_I2C_DEBUG_CORE is not set
@@ -797,7 +814,7 @@ CONFIG_VIDEO_MEDIA=y
797# 814#
798# CONFIG_MEDIA_ATTACH is not set 815# CONFIG_MEDIA_ATTACH is not set
799CONFIG_MEDIA_TUNER=y 816CONFIG_MEDIA_TUNER=y
800# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set 817# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
801CONFIG_MEDIA_TUNER_SIMPLE=y 818CONFIG_MEDIA_TUNER_SIMPLE=y
802CONFIG_MEDIA_TUNER_TDA8290=y 819CONFIG_MEDIA_TUNER_TDA8290=y
803CONFIG_MEDIA_TUNER_TDA9887=y 820CONFIG_MEDIA_TUNER_TDA9887=y
@@ -806,6 +823,7 @@ CONFIG_MEDIA_TUNER_TEA5767=y
806CONFIG_MEDIA_TUNER_MT20XX=y 823CONFIG_MEDIA_TUNER_MT20XX=y
807CONFIG_MEDIA_TUNER_XC2028=y 824CONFIG_MEDIA_TUNER_XC2028=y
808CONFIG_MEDIA_TUNER_XC5000=y 825CONFIG_MEDIA_TUNER_XC5000=y
826CONFIG_MEDIA_TUNER_MC44S803=y
809CONFIG_VIDEO_V4L2=y 827CONFIG_VIDEO_V4L2=y
810CONFIG_VIDEOBUF_GEN=y 828CONFIG_VIDEOBUF_GEN=y
811CONFIG_VIDEOBUF_DMA_CONTIG=y 829CONFIG_VIDEOBUF_DMA_CONTIG=y
@@ -866,7 +884,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
866# CONFIG_USB_GADGET_MUSB_HDRC is not set 884# CONFIG_USB_GADGET_MUSB_HDRC is not set
867 885
868# 886#
869# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 887# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
870# 888#
871CONFIG_USB_GADGET=y 889CONFIG_USB_GADGET=y
872# CONFIG_USB_GADGET_DEBUG_FILES is not set 890# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -905,6 +923,7 @@ CONFIG_USB_G_SERIAL=y
905# OTG and related infrastructure 923# OTG and related infrastructure
906# 924#
907# CONFIG_USB_GPIO_VBUS is not set 925# CONFIG_USB_GPIO_VBUS is not set
926# CONFIG_NOP_USB_XCEIV is not set
908# CONFIG_MMC is not set 927# CONFIG_MMC is not set
909# CONFIG_MEMSTICK is not set 928# CONFIG_MEMSTICK is not set
910# CONFIG_NEW_LEDS is not set 929# CONFIG_NEW_LEDS is not set
@@ -964,6 +983,7 @@ CONFIG_RTC_DRV_RS5C372=y
964# 983#
965CONFIG_RTC_DRV_SH=y 984CONFIG_RTC_DRV_SH=y
966# CONFIG_DMADEVICES is not set 985# CONFIG_DMADEVICES is not set
986# CONFIG_AUXDISPLAY is not set
967CONFIG_UIO=y 987CONFIG_UIO=y
968# CONFIG_UIO_PDRV is not set 988# CONFIG_UIO_PDRV is not set
969CONFIG_UIO_PDRV_GENIRQ=y 989CONFIG_UIO_PDRV_GENIRQ=y
@@ -1045,7 +1065,6 @@ CONFIG_ROOT_NFS=y
1045CONFIG_LOCKD=y 1065CONFIG_LOCKD=y
1046CONFIG_NFS_COMMON=y 1066CONFIG_NFS_COMMON=y
1047CONFIG_SUNRPC=y 1067CONFIG_SUNRPC=y
1048# CONFIG_SUNRPC_REGISTER_V4 is not set
1049# CONFIG_RPCSEC_GSS_KRB5 is not set 1068# CONFIG_RPCSEC_GSS_KRB5 is not set
1050# CONFIG_RPCSEC_GSS_SPKM3 is not set 1069# CONFIG_RPCSEC_GSS_SPKM3 is not set
1051# CONFIG_SMB_FS is not set 1070# CONFIG_SMB_FS is not set
@@ -1090,7 +1109,7 @@ CONFIG_TRACING=y
1090# 1109#
1091# Tracers 1110# Tracers
1092# 1111#
1093# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1112# CONFIG_DYNAMIC_DEBUG is not set
1094# CONFIG_SAMPLES is not set 1113# CONFIG_SAMPLES is not set
1095CONFIG_HAVE_ARCH_KGDB=y 1114CONFIG_HAVE_ARCH_KGDB=y
1096# CONFIG_SH_STANDARD_BIOS is not set 1115# CONFIG_SH_STANDARD_BIOS is not set
@@ -1117,10 +1136,12 @@ CONFIG_CRYPTO_AEAD2=y
1117CONFIG_CRYPTO_BLKCIPHER2=y 1136CONFIG_CRYPTO_BLKCIPHER2=y
1118CONFIG_CRYPTO_HASH2=y 1137CONFIG_CRYPTO_HASH2=y
1119CONFIG_CRYPTO_RNG2=y 1138CONFIG_CRYPTO_RNG2=y
1139CONFIG_CRYPTO_PCOMP=y
1120CONFIG_CRYPTO_MANAGER=y 1140CONFIG_CRYPTO_MANAGER=y
1121CONFIG_CRYPTO_MANAGER2=y 1141CONFIG_CRYPTO_MANAGER2=y
1122# CONFIG_CRYPTO_GF128MUL is not set 1142# CONFIG_CRYPTO_GF128MUL is not set
1123# CONFIG_CRYPTO_NULL is not set 1143# CONFIG_CRYPTO_NULL is not set
1144CONFIG_CRYPTO_WORKQUEUE=y
1124# CONFIG_CRYPTO_CRYPTD is not set 1145# CONFIG_CRYPTO_CRYPTD is not set
1125# CONFIG_CRYPTO_AUTHENC is not set 1146# CONFIG_CRYPTO_AUTHENC is not set
1126# CONFIG_CRYPTO_TEST is not set 1147# CONFIG_CRYPTO_TEST is not set
@@ -1189,6 +1210,7 @@ CONFIG_CRYPTO_MANAGER2=y
1189# Compression 1210# Compression
1190# 1211#
1191# CONFIG_CRYPTO_DEFLATE is not set 1212# CONFIG_CRYPTO_DEFLATE is not set
1213# CONFIG_CRYPTO_ZLIB is not set
1192# CONFIG_CRYPTO_LZO is not set 1214# CONFIG_CRYPTO_LZO is not set
1193 1215
1194# 1216#
@@ -1209,7 +1231,9 @@ CONFIG_CRC_T10DIF=y
1209CONFIG_CRC32=y 1231CONFIG_CRC32=y
1210# CONFIG_CRC7 is not set 1232# CONFIG_CRC7 is not set
1211# CONFIG_LIBCRC32C is not set 1233# CONFIG_LIBCRC32C is not set
1212CONFIG_PLIST=y 1234CONFIG_ZLIB_INFLATE=y
1235CONFIG_DECOMPRESS_GZIP=y
1213CONFIG_HAS_IOMEM=y 1236CONFIG_HAS_IOMEM=y
1214CONFIG_HAS_IOPORT=y 1237CONFIG_HAS_IOPORT=y
1215CONFIG_HAS_DMA=y 1238CONFIG_HAS_DMA=y
1239CONFIG_NLATTR=y
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index 320def233b2f..df2d177d5346 100644
--- a/arch/sh/configs/polaris_defconfig
+++ b/arch/sh/configs/polaris_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.29-rc4 3# Linux kernel version: 2.6.29
4# Wed Feb 11 18:41:59 2009 4# Thu Apr 2 18:16:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -68,6 +69,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
68# CONFIG_BLK_DEV_INITRD is not set 69# CONFIG_BLK_DEV_INITRD is not set
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 70# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
70CONFIG_SYSCTL=y 71CONFIG_SYSCTL=y
72CONFIG_ANON_INODES=y
71CONFIG_EMBEDDED=y 73CONFIG_EMBEDDED=y
72CONFIG_UID16=y 74CONFIG_UID16=y
73CONFIG_SYSCTL_SYSCALL=y 75CONFIG_SYSCTL_SYSCALL=y
@@ -78,10 +80,8 @@ CONFIG_HOTPLUG=y
78CONFIG_PRINTK=y 80CONFIG_PRINTK=y
79CONFIG_BUG=y 81CONFIG_BUG=y
80CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
81CONFIG_COMPAT_BRK=y
82CONFIG_BASE_FULL=y 83CONFIG_BASE_FULL=y
83CONFIG_FUTEX=y 84CONFIG_FUTEX=y
84CONFIG_ANON_INODES=y
85CONFIG_EPOLL=y 85CONFIG_EPOLL=y
86CONFIG_SIGNALFD=y 86CONFIG_SIGNALFD=y
87CONFIG_TIMERFD=y 87CONFIG_TIMERFD=y
@@ -89,6 +89,7 @@ CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 89CONFIG_SHMEM=y
90CONFIG_AIO=y 90CONFIG_AIO=y
91CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_COMPAT_BRK=y
92CONFIG_SLAB=y 93CONFIG_SLAB=y
93# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
94# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
@@ -162,6 +163,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y
162# CONFIG_CPU_SUBTYPE_SH7770 is not set 163# CONFIG_CPU_SUBTYPE_SH7770 is not set
163# CONFIG_CPU_SUBTYPE_SH7780 is not set 164# CONFIG_CPU_SUBTYPE_SH7780 is not set
164# CONFIG_CPU_SUBTYPE_SH7785 is not set 165# CONFIG_CPU_SUBTYPE_SH7785 is not set
166# CONFIG_CPU_SUBTYPE_SH7786 is not set
165# CONFIG_CPU_SUBTYPE_SHX3 is not set 167# CONFIG_CPU_SUBTYPE_SHX3 is not set
166# CONFIG_CPU_SUBTYPE_SH7343 is not set 168# CONFIG_CPU_SUBTYPE_SH7343 is not set
167# CONFIG_CPU_SUBTYPE_SH7722 is not set 169# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -203,11 +205,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
203CONFIG_ZONE_DMA_FLAG=0 205CONFIG_ZONE_DMA_FLAG=0
204CONFIG_NR_QUICK=2 206CONFIG_NR_QUICK=2
205CONFIG_UNEVICTABLE_LRU=y 207CONFIG_UNEVICTABLE_LRU=y
208CONFIG_HAVE_MLOCK=y
209CONFIG_HAVE_MLOCKED_PAGE_BIT=y
206 210
207# 211#
208# Cache configuration 212# Cache configuration
209# 213#
210# CONFIG_SH_DIRECT_MAPPED is not set
211CONFIG_CACHE_WRITEBACK=y 214CONFIG_CACHE_WRITEBACK=y
212# CONFIG_CACHE_WRITETHROUGH is not set 215# CONFIG_CACHE_WRITETHROUGH is not set
213# CONFIG_CACHE_OFF is not set 216# CONFIG_CACHE_OFF is not set
@@ -251,7 +254,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
251# 254#
252CONFIG_SH_DMA_API=y 255CONFIG_SH_DMA_API=y
253CONFIG_SH_DMA=y 256CONFIG_SH_DMA=y
254CONFIG_NR_ONCHIP_DMA_CHANNELS=4 257CONFIG_NR_ONCHIP_DMA_CHANNELS=6
255# CONFIG_NR_DMA_CHANNELS_BOOL is not set 258# CONFIG_NR_DMA_CHANNELS_BOOL is not set
256 259
257# 260#
@@ -314,7 +317,6 @@ CONFIG_NET=y
314# 317#
315# Networking options 318# Networking options
316# 319#
317CONFIG_COMPAT_NET_DEV_OPS=y
318CONFIG_PACKET=y 320CONFIG_PACKET=y
319CONFIG_PACKET_MMAP=y 321CONFIG_PACKET_MMAP=y
320CONFIG_UNIX=y 322CONFIG_UNIX=y
@@ -362,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
362# CONFIG_LAPB is not set 364# CONFIG_LAPB is not set
363# CONFIG_ECONET is not set 365# CONFIG_ECONET is not set
364# CONFIG_WAN_ROUTER is not set 366# CONFIG_WAN_ROUTER is not set
367# CONFIG_PHONET is not set
365# CONFIG_NET_SCHED is not set 368# CONFIG_NET_SCHED is not set
366# CONFIG_DCB is not set 369# CONFIG_DCB is not set
367 370
@@ -374,7 +377,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
374# CONFIG_IRDA is not set 377# CONFIG_IRDA is not set
375# CONFIG_BT is not set 378# CONFIG_BT is not set
376# CONFIG_AF_RXRPC is not set 379# CONFIG_AF_RXRPC is not set
377# CONFIG_PHONET is not set
378# CONFIG_WIRELESS is not set 380# CONFIG_WIRELESS is not set
379# CONFIG_WIMAX is not set 381# CONFIG_WIMAX is not set
380# CONFIG_RFKILL is not set 382# CONFIG_RFKILL is not set
@@ -481,7 +483,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
481# LPDDR flash memory drivers 483# LPDDR flash memory drivers
482# 484#
483# CONFIG_MTD_LPDDR is not set 485# CONFIG_MTD_LPDDR is not set
484# CONFIG_MTD_QINFO_PROBE is not set
485 486
486# 487#
487# UBI - Unsorted block images 488# UBI - Unsorted block images
@@ -517,6 +518,7 @@ CONFIG_HAVE_IDE=y
517# CONFIG_ATA is not set 518# CONFIG_ATA is not set
518# CONFIG_MD is not set 519# CONFIG_MD is not set
519CONFIG_NETDEVICES=y 520CONFIG_NETDEVICES=y
521CONFIG_COMPAT_NET_DEV_OPS=y
520# CONFIG_DUMMY is not set 522# CONFIG_DUMMY is not set
521# CONFIG_BONDING is not set 523# CONFIG_BONDING is not set
522# CONFIG_MACVLAN is not set 524# CONFIG_MACVLAN is not set
@@ -548,8 +550,10 @@ CONFIG_MII=y
548# CONFIG_AX88796 is not set 550# CONFIG_AX88796 is not set
549# CONFIG_STNIC is not set 551# CONFIG_STNIC is not set
550# CONFIG_SMC91X is not set 552# CONFIG_SMC91X is not set
553# CONFIG_ETHOC is not set
551# CONFIG_SMC911X is not set 554# CONFIG_SMC911X is not set
552CONFIG_SMSC911X=y 555CONFIG_SMSC911X=y
556# CONFIG_DNET is not set
553# CONFIG_IBM_NEW_EMAC_ZMII is not set 557# CONFIG_IBM_NEW_EMAC_ZMII is not set
554# CONFIG_IBM_NEW_EMAC_RGMII is not set 558# CONFIG_IBM_NEW_EMAC_RGMII is not set
555# CONFIG_IBM_NEW_EMAC_TAH is not set 559# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -566,7 +570,6 @@ CONFIG_SMSC911X=y
566# 570#
567# CONFIG_WLAN_PRE80211 is not set 571# CONFIG_WLAN_PRE80211 is not set
568# CONFIG_WLAN_80211 is not set 572# CONFIG_WLAN_80211 is not set
569# CONFIG_IWLWIFI_LEDS is not set
570 573
571# 574#
572# Enable WiMAX (Networking options) to see the WiMAX drivers 575# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -750,6 +753,7 @@ CONFIG_RTC_INTF_DEV=y
750# 753#
751CONFIG_RTC_DRV_SH=y 754CONFIG_RTC_DRV_SH=y
752# CONFIG_DMADEVICES is not set 755# CONFIG_DMADEVICES is not set
756# CONFIG_AUXDISPLAY is not set
753# CONFIG_UIO is not set 757# CONFIG_UIO is not set
754# CONFIG_STAGING is not set 758# CONFIG_STAGING is not set
755 759
@@ -837,7 +841,6 @@ CONFIG_LOCKD=y
837CONFIG_LOCKD_V4=y 841CONFIG_LOCKD_V4=y
838CONFIG_NFS_COMMON=y 842CONFIG_NFS_COMMON=y
839CONFIG_SUNRPC=y 843CONFIG_SUNRPC=y
840# CONFIG_SUNRPC_REGISTER_V4 is not set
841# CONFIG_RPCSEC_GSS_KRB5 is not set 844# CONFIG_RPCSEC_GSS_KRB5 is not set
842# CONFIG_RPCSEC_GSS_SPKM3 is not set 845# CONFIG_RPCSEC_GSS_SPKM3 is not set
843# CONFIG_SMB_FS is not set 846# CONFIG_SMB_FS is not set
@@ -907,6 +910,7 @@ CONFIG_FRAME_POINTER=y
907# CONFIG_FAULT_INJECTION is not set 910# CONFIG_FAULT_INJECTION is not set
908# CONFIG_LATENCYTOP is not set 911# CONFIG_LATENCYTOP is not set
909CONFIG_SYSCTL_SYSCALL_CHECK=y 912CONFIG_SYSCTL_SYSCALL_CHECK=y
913# CONFIG_PAGE_POISONING is not set
910CONFIG_HAVE_FUNCTION_TRACER=y 914CONFIG_HAVE_FUNCTION_TRACER=y
911CONFIG_HAVE_DYNAMIC_FTRACE=y 915CONFIG_HAVE_DYNAMIC_FTRACE=y
912CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 916CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -922,7 +926,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
922# CONFIG_BOOT_TRACER is not set 926# CONFIG_BOOT_TRACER is not set
923# CONFIG_TRACE_BRANCH_PROFILING is not set 927# CONFIG_TRACE_BRANCH_PROFILING is not set
924# CONFIG_STACK_TRACER is not set 928# CONFIG_STACK_TRACER is not set
925# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
926# CONFIG_SAMPLES is not set 929# CONFIG_SAMPLES is not set
927CONFIG_HAVE_ARCH_KGDB=y 930CONFIG_HAVE_ARCH_KGDB=y
928# CONFIG_KGDB is not set 931# CONFIG_KGDB is not set
@@ -963,7 +966,7 @@ CONFIG_CRC32=y
963CONFIG_AUDIT_GENERIC=y 966CONFIG_AUDIT_GENERIC=y
964CONFIG_ZLIB_INFLATE=y 967CONFIG_ZLIB_INFLATE=y
965CONFIG_ZLIB_DEFLATE=y 968CONFIG_ZLIB_DEFLATE=y
966CONFIG_PLIST=y
967CONFIG_HAS_IOMEM=y 969CONFIG_HAS_IOMEM=y
968CONFIG_HAS_IOPORT=y 970CONFIG_HAS_IOPORT=y
969CONFIG_HAS_DMA=y 971CONFIG_HAS_DMA=y
972CONFIG_NLATTR=y
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index 65b01a9e5934..7def4df46ddb 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:10:19 2009 4# Thu Apr 2 18:20:17 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_IO_TRAPPED=y 29CONFIG_IO_TRAPPED=y
29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
30 31
@@ -45,15 +46,24 @@ CONFIG_BSD_PROCESS_ACCT=y
45# CONFIG_BSD_PROCESS_ACCT_V3 is not set 46# CONFIG_BSD_PROCESS_ACCT_V3 is not set
46# CONFIG_TASKSTATS is not set 47# CONFIG_TASKSTATS is not set
47# CONFIG_AUDIT is not set 48# CONFIG_AUDIT is not set
49
50#
51# RCU Subsystem
52#
53CONFIG_CLASSIC_RCU=y
54# CONFIG_TREE_RCU is not set
55# CONFIG_PREEMPT_RCU is not set
56# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
48CONFIG_IKCONFIG=y 58CONFIG_IKCONFIG=y
49CONFIG_IKCONFIG_PROC=y 59CONFIG_IKCONFIG_PROC=y
50CONFIG_LOG_BUF_SHIFT=14 60CONFIG_LOG_BUF_SHIFT=14
51# CONFIG_CGROUPS is not set
52CONFIG_GROUP_SCHED=y 61CONFIG_GROUP_SCHED=y
53CONFIG_FAIR_GROUP_SCHED=y 62CONFIG_FAIR_GROUP_SCHED=y
54# CONFIG_RT_GROUP_SCHED is not set 63# CONFIG_RT_GROUP_SCHED is not set
55CONFIG_USER_SCHED=y 64CONFIG_USER_SCHED=y
56# CONFIG_CGROUP_SCHED is not set 65# CONFIG_CGROUP_SCHED is not set
66# CONFIG_CGROUPS is not set
57CONFIG_SYSFS_DEPRECATED=y 67CONFIG_SYSFS_DEPRECATED=y
58CONFIG_SYSFS_DEPRECATED_V2=y 68CONFIG_SYSFS_DEPRECATED_V2=y
59# CONFIG_RELAY is not set 69# CONFIG_RELAY is not set
@@ -61,6 +71,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
61# CONFIG_BLK_DEV_INITRD is not set 71# CONFIG_BLK_DEV_INITRD is not set
62CONFIG_CC_OPTIMIZE_FOR_SIZE=y 72CONFIG_CC_OPTIMIZE_FOR_SIZE=y
63CONFIG_SYSCTL=y 73CONFIG_SYSCTL=y
74CONFIG_ANON_INODES=y
64CONFIG_EMBEDDED=y 75CONFIG_EMBEDDED=y
65CONFIG_UID16=y 76CONFIG_UID16=y
66# CONFIG_SYSCTL_SYSCALL is not set 77# CONFIG_SYSCTL_SYSCALL is not set
@@ -71,10 +82,8 @@ CONFIG_HOTPLUG=y
71CONFIG_PRINTK=y 82CONFIG_PRINTK=y
72CONFIG_BUG=y 83CONFIG_BUG=y
73CONFIG_ELF_CORE=y 84CONFIG_ELF_CORE=y
74CONFIG_COMPAT_BRK=y
75CONFIG_BASE_FULL=y 85CONFIG_BASE_FULL=y
76# CONFIG_FUTEX is not set 86# CONFIG_FUTEX is not set
77CONFIG_ANON_INODES=y
78# CONFIG_EPOLL is not set 87# CONFIG_EPOLL is not set
79CONFIG_SIGNALFD=y 88CONFIG_SIGNALFD=y
80CONFIG_TIMERFD=y 89CONFIG_TIMERFD=y
@@ -83,6 +92,7 @@ CONFIG_SHMEM=y
83CONFIG_AIO=y 92CONFIG_AIO=y
84CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_PCI_QUIRKS=y 94CONFIG_PCI_QUIRKS=y
95CONFIG_COMPAT_BRK=y
86CONFIG_SLAB=y 96CONFIG_SLAB=y
87# CONFIG_SLUB is not set 97# CONFIG_SLUB is not set
88# CONFIG_SLOB is not set 98# CONFIG_SLOB is not set
@@ -124,11 +134,6 @@ CONFIG_IOSCHED_NOOP=y
124# CONFIG_DEFAULT_CFQ is not set 134# CONFIG_DEFAULT_CFQ is not set
125CONFIG_DEFAULT_NOOP=y 135CONFIG_DEFAULT_NOOP=y
126CONFIG_DEFAULT_IOSCHED="noop" 136CONFIG_DEFAULT_IOSCHED="noop"
127CONFIG_CLASSIC_RCU=y
128# CONFIG_TREE_RCU is not set
129# CONFIG_PREEMPT_RCU is not set
130# CONFIG_TREE_RCU_TRACE is not set
131# CONFIG_PREEMPT_RCU_TRACE is not set
132# CONFIG_FREEZER is not set 137# CONFIG_FREEZER is not set
133 138
134# 139#
@@ -164,6 +169,7 @@ CONFIG_CPU_SH4A=y
164# CONFIG_CPU_SUBTYPE_SH7770 is not set 169# CONFIG_CPU_SUBTYPE_SH7770 is not set
165CONFIG_CPU_SUBTYPE_SH7780=y 170CONFIG_CPU_SUBTYPE_SH7780=y
166# CONFIG_CPU_SUBTYPE_SH7785 is not set 171# CONFIG_CPU_SUBTYPE_SH7785 is not set
172# CONFIG_CPU_SUBTYPE_SH7786 is not set
167# CONFIG_CPU_SUBTYPE_SHX3 is not set 173# CONFIG_CPU_SUBTYPE_SHX3 is not set
168# CONFIG_CPU_SUBTYPE_SH7343 is not set 174# CONFIG_CPU_SUBTYPE_SH7343 is not set
169# CONFIG_CPU_SUBTYPE_SH7722 is not set 175# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -179,8 +185,11 @@ CONFIG_MMU=y
179CONFIG_PAGE_OFFSET=0x80000000 185CONFIG_PAGE_OFFSET=0x80000000
180CONFIG_MEMORY_START=0x08000000 186CONFIG_MEMORY_START=0x08000000
181CONFIG_MEMORY_SIZE=0x08000000 187CONFIG_MEMORY_SIZE=0x08000000
182CONFIG_29BIT=y 188# CONFIG_29BIT is not set
189CONFIG_32BIT=y
190CONFIG_PMB_ENABLE=y
183# CONFIG_PMB is not set 191# CONFIG_PMB is not set
192CONFIG_PMB_FIXED=y
184CONFIG_VSYSCALL=y 193CONFIG_VSYSCALL=y
185CONFIG_ARCH_FLATMEM_ENABLE=y 194CONFIG_ARCH_FLATMEM_ENABLE=y
186CONFIG_ARCH_SPARSEMEM_ENABLE=y 195CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -212,11 +221,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
212CONFIG_ZONE_DMA_FLAG=0 221CONFIG_ZONE_DMA_FLAG=0
213CONFIG_NR_QUICK=2 222CONFIG_NR_QUICK=2
214CONFIG_UNEVICTABLE_LRU=y 223CONFIG_UNEVICTABLE_LRU=y
224CONFIG_HAVE_MLOCK=y
225CONFIG_HAVE_MLOCKED_PAGE_BIT=y
215 226
216# 227#
217# Cache configuration 228# Cache configuration
218# 229#
219# CONFIG_SH_DIRECT_MAPPED is not set
220CONFIG_CACHE_WRITEBACK=y 230CONFIG_CACHE_WRITEBACK=y
221# CONFIG_CACHE_WRITETHROUGH is not set 231# CONFIG_CACHE_WRITETHROUGH is not set
222# CONFIG_CACHE_OFF is not set 232# CONFIG_CACHE_OFF is not set
@@ -309,6 +319,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
309# CONFIG_ARCH_SUPPORTS_MSI is not set 319# CONFIG_ARCH_SUPPORTS_MSI is not set
310CONFIG_PCI_LEGACY=y 320CONFIG_PCI_LEGACY=y
311# CONFIG_PCI_DEBUG is not set 321# CONFIG_PCI_DEBUG is not set
322# CONFIG_PCI_STUB is not set
323# CONFIG_PCI_IOV is not set
312# CONFIG_PCCARD is not set 324# CONFIG_PCCARD is not set
313# CONFIG_HOTPLUG_PCI is not set 325# CONFIG_HOTPLUG_PCI is not set
314 326
@@ -330,7 +342,6 @@ CONFIG_NET=y
330# 342#
331# Networking options 343# Networking options
332# 344#
333CONFIG_COMPAT_NET_DEV_OPS=y
334CONFIG_PACKET=y 345CONFIG_PACKET=y
335# CONFIG_PACKET_MMAP is not set 346# CONFIG_PACKET_MMAP is not set
336CONFIG_UNIX=y 347CONFIG_UNIX=y
@@ -392,6 +403,7 @@ CONFIG_LLC=m
392# CONFIG_LAPB is not set 403# CONFIG_LAPB is not set
393# CONFIG_ECONET is not set 404# CONFIG_ECONET is not set
394# CONFIG_WAN_ROUTER is not set 405# CONFIG_WAN_ROUTER is not set
406# CONFIG_PHONET is not set
395# CONFIG_NET_SCHED is not set 407# CONFIG_NET_SCHED is not set
396# CONFIG_DCB is not set 408# CONFIG_DCB is not set
397 409
@@ -399,12 +411,12 @@ CONFIG_LLC=m
399# Network testing 411# Network testing
400# 412#
401# CONFIG_NET_PKTGEN is not set 413# CONFIG_NET_PKTGEN is not set
414# CONFIG_NET_DROP_MONITOR is not set
402# CONFIG_HAMRADIO is not set 415# CONFIG_HAMRADIO is not set
403# CONFIG_CAN is not set 416# CONFIG_CAN is not set
404# CONFIG_IRDA is not set 417# CONFIG_IRDA is not set
405# CONFIG_BT is not set 418# CONFIG_BT is not set
406# CONFIG_AF_RXRPC is not set 419# CONFIG_AF_RXRPC is not set
407# CONFIG_PHONET is not set
408CONFIG_WIRELESS=y 420CONFIG_WIRELESS=y
409# CONFIG_CFG80211 is not set 421# CONFIG_CFG80211 is not set
410# CONFIG_WIRELESS_OLD_REGULATORY is not set 422# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -412,6 +424,7 @@ CONFIG_WIRELESS_EXT=y
412CONFIG_WIRELESS_EXT_SYSFS=y 424CONFIG_WIRELESS_EXT_SYSFS=y
413# CONFIG_LIB80211 is not set 425# CONFIG_LIB80211 is not set
414# CONFIG_MAC80211 is not set 426# CONFIG_MAC80211 is not set
427# CONFIG_WIMAX is not set
415# CONFIG_RFKILL is not set 428# CONFIG_RFKILL is not set
416# CONFIG_NET_9P is not set 429# CONFIG_NET_9P is not set
417 430
@@ -451,13 +464,20 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
451# CONFIG_BLK_DEV_HD is not set 464# CONFIG_BLK_DEV_HD is not set
452CONFIG_MISC_DEVICES=y 465CONFIG_MISC_DEVICES=y
453# CONFIG_PHANTOM is not set 466# CONFIG_PHANTOM is not set
454CONFIG_EEPROM_93CX6=y
455# CONFIG_SGI_IOC4 is not set 467# CONFIG_SGI_IOC4 is not set
456# CONFIG_TIFM_CORE is not set 468# CONFIG_TIFM_CORE is not set
457# CONFIG_ICS932S401 is not set 469# CONFIG_ICS932S401 is not set
458# CONFIG_ENCLOSURE_SERVICES is not set 470# CONFIG_ENCLOSURE_SERVICES is not set
459# CONFIG_HP_ILO is not set 471# CONFIG_HP_ILO is not set
472# CONFIG_ISL29003 is not set
460# CONFIG_C2PORT is not set 473# CONFIG_C2PORT is not set
474
475#
476# EEPROM support
477#
478# CONFIG_EEPROM_AT24 is not set
479# CONFIG_EEPROM_LEGACY is not set
480CONFIG_EEPROM_93CX6=y
461CONFIG_HAVE_IDE=y 481CONFIG_HAVE_IDE=y
462# CONFIG_IDE is not set 482# CONFIG_IDE is not set
463 483
@@ -513,6 +533,7 @@ CONFIG_SCSI_LOWLEVEL=y
513# CONFIG_MEGARAID_NEWGEN is not set 533# CONFIG_MEGARAID_NEWGEN is not set
514# CONFIG_MEGARAID_LEGACY is not set 534# CONFIG_MEGARAID_LEGACY is not set
515# CONFIG_MEGARAID_SAS is not set 535# CONFIG_MEGARAID_SAS is not set
536# CONFIG_SCSI_MPT2SAS is not set
516# CONFIG_SCSI_HPTIOP is not set 537# CONFIG_SCSI_HPTIOP is not set
517# CONFIG_LIBFC is not set 538# CONFIG_LIBFC is not set
518# CONFIG_FCOE is not set 539# CONFIG_FCOE is not set
@@ -535,6 +556,7 @@ CONFIG_SCSI_LOWLEVEL=y
535# CONFIG_SCSI_DEBUG is not set 556# CONFIG_SCSI_DEBUG is not set
536# CONFIG_SCSI_SRP is not set 557# CONFIG_SCSI_SRP is not set
537# CONFIG_SCSI_DH is not set 558# CONFIG_SCSI_DH is not set
559# CONFIG_SCSI_OSD_INITIATOR is not set
538CONFIG_ATA=y 560CONFIG_ATA=y
539# CONFIG_ATA_NONSTANDARD is not set 561# CONFIG_ATA_NONSTANDARD is not set
540CONFIG_SATA_PMP=y 562CONFIG_SATA_PMP=y
@@ -609,6 +631,7 @@ CONFIG_PATA_PLATFORM=y
609# CONFIG_IEEE1394 is not set 631# CONFIG_IEEE1394 is not set
610# CONFIG_I2O is not set 632# CONFIG_I2O is not set
611CONFIG_NETDEVICES=y 633CONFIG_NETDEVICES=y
634CONFIG_COMPAT_NET_DEV_OPS=y
612# CONFIG_DUMMY is not set 635# CONFIG_DUMMY is not set
613# CONFIG_BONDING is not set 636# CONFIG_BONDING is not set
614# CONFIG_MACVLAN is not set 637# CONFIG_MACVLAN is not set
@@ -627,8 +650,10 @@ CONFIG_AX88796_93CX6=y
627# CONFIG_CASSINI is not set 650# CONFIG_CASSINI is not set
628# CONFIG_NET_VENDOR_3COM is not set 651# CONFIG_NET_VENDOR_3COM is not set
629# CONFIG_SMC91X is not set 652# CONFIG_SMC91X is not set
653# CONFIG_ETHOC is not set
630# CONFIG_SMC911X is not set 654# CONFIG_SMC911X is not set
631# CONFIG_SMSC911X is not set 655# CONFIG_SMSC911X is not set
656# CONFIG_DNET is not set
632# CONFIG_NET_TULIP is not set 657# CONFIG_NET_TULIP is not set
633# CONFIG_HP100 is not set 658# CONFIG_HP100 is not set
634# CONFIG_IBM_NEW_EMAC_ZMII is not set 659# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -684,6 +709,7 @@ CONFIG_R8169=y
684# CONFIG_QLA3XXX is not set 709# CONFIG_QLA3XXX is not set
685# CONFIG_ATL1 is not set 710# CONFIG_ATL1 is not set
686# CONFIG_ATL1E is not set 711# CONFIG_ATL1E is not set
712# CONFIG_ATL1C is not set
687# CONFIG_JME is not set 713# CONFIG_JME is not set
688CONFIG_NETDEV_10000=y 714CONFIG_NETDEV_10000=y
689# CONFIG_CHELSIO_T1 is not set 715# CONFIG_CHELSIO_T1 is not set
@@ -702,6 +728,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
702# CONFIG_BNX2X is not set 728# CONFIG_BNX2X is not set
703# CONFIG_QLGE is not set 729# CONFIG_QLGE is not set
704# CONFIG_SFC is not set 730# CONFIG_SFC is not set
731# CONFIG_BE2NET is not set
705# CONFIG_TR is not set 732# CONFIG_TR is not set
706 733
707# 734#
@@ -709,7 +736,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
709# 736#
710# CONFIG_WLAN_PRE80211 is not set 737# CONFIG_WLAN_PRE80211 is not set
711# CONFIG_WLAN_80211 is not set 738# CONFIG_WLAN_80211 is not set
712# CONFIG_IWLWIFI_LEDS is not set 739
740#
741# Enable WiMAX (Networking options) to see the WiMAX drivers
742#
713# CONFIG_WAN is not set 743# CONFIG_WAN is not set
714# CONFIG_FDDI is not set 744# CONFIG_FDDI is not set
715# CONFIG_HIPPI is not set 745# CONFIG_HIPPI is not set
@@ -796,6 +826,7 @@ CONFIG_LEGACY_PTYS=y
796CONFIG_LEGACY_PTY_COUNT=256 826CONFIG_LEGACY_PTY_COUNT=256
797# CONFIG_IPMI_HANDLER is not set 827# CONFIG_IPMI_HANDLER is not set
798CONFIG_HW_RANDOM=y 828CONFIG_HW_RANDOM=y
829# CONFIG_HW_RANDOM_TIMERIOMEM is not set
799# CONFIG_R3964 is not set 830# CONFIG_R3964 is not set
800# CONFIG_APPLICOM is not set 831# CONFIG_APPLICOM is not set
801# CONFIG_RAW_DRIVER is not set 832# CONFIG_RAW_DRIVER is not set
@@ -857,12 +888,9 @@ CONFIG_I2C_HIGHLANDER=y
857# Miscellaneous I2C Chip support 888# Miscellaneous I2C Chip support
858# 889#
859# CONFIG_DS1682 is not set 890# CONFIG_DS1682 is not set
860# CONFIG_EEPROM_AT24 is not set
861# CONFIG_EEPROM_LEGACY is not set
862# CONFIG_SENSORS_PCF8574 is not set 891# CONFIG_SENSORS_PCF8574 is not set
863# CONFIG_PCF8575 is not set 892# CONFIG_PCF8575 is not set
864# CONFIG_SENSORS_PCA9539 is not set 893# CONFIG_SENSORS_PCA9539 is not set
865# CONFIG_SENSORS_PCF8591 is not set
866# CONFIG_SENSORS_MAX6875 is not set 894# CONFIG_SENSORS_MAX6875 is not set
867# CONFIG_SENSORS_TSL2550 is not set 895# CONFIG_SENSORS_TSL2550 is not set
868# CONFIG_I2C_DEBUG_CORE is not set 896# CONFIG_I2C_DEBUG_CORE is not set
@@ -885,6 +913,7 @@ CONFIG_HWMON=y
885# CONFIG_SENSORS_ADT7462 is not set 913# CONFIG_SENSORS_ADT7462 is not set
886# CONFIG_SENSORS_ADT7470 is not set 914# CONFIG_SENSORS_ADT7470 is not set
887# CONFIG_SENSORS_ADT7473 is not set 915# CONFIG_SENSORS_ADT7473 is not set
916# CONFIG_SENSORS_ADT7475 is not set
888# CONFIG_SENSORS_ATXP1 is not set 917# CONFIG_SENSORS_ATXP1 is not set
889# CONFIG_SENSORS_DS1621 is not set 918# CONFIG_SENSORS_DS1621 is not set
890# CONFIG_SENSORS_I5K_AMB is not set 919# CONFIG_SENSORS_I5K_AMB is not set
@@ -905,10 +934,14 @@ CONFIG_HWMON=y
905# CONFIG_SENSORS_LM90 is not set 934# CONFIG_SENSORS_LM90 is not set
906# CONFIG_SENSORS_LM92 is not set 935# CONFIG_SENSORS_LM92 is not set
907# CONFIG_SENSORS_LM93 is not set 936# CONFIG_SENSORS_LM93 is not set
937# CONFIG_SENSORS_LTC4215 is not set
938# CONFIG_SENSORS_LTC4245 is not set
939# CONFIG_SENSORS_LM95241 is not set
908# CONFIG_SENSORS_MAX1619 is not set 940# CONFIG_SENSORS_MAX1619 is not set
909# CONFIG_SENSORS_MAX6650 is not set 941# CONFIG_SENSORS_MAX6650 is not set
910# CONFIG_SENSORS_PC87360 is not set 942# CONFIG_SENSORS_PC87360 is not set
911# CONFIG_SENSORS_PC87427 is not set 943# CONFIG_SENSORS_PC87427 is not set
944# CONFIG_SENSORS_PCF8591 is not set
912# CONFIG_SENSORS_SIS5595 is not set 945# CONFIG_SENSORS_SIS5595 is not set
913# CONFIG_SENSORS_DME1737 is not set 946# CONFIG_SENSORS_DME1737 is not set
914# CONFIG_SENSORS_SMSC47M1 is not set 947# CONFIG_SENSORS_SMSC47M1 is not set
@@ -949,6 +982,7 @@ CONFIG_SSB_POSSIBLE=y
949# CONFIG_PMIC_DA903X is not set 982# CONFIG_PMIC_DA903X is not set
950# CONFIG_MFD_WM8400 is not set 983# CONFIG_MFD_WM8400 is not set
951# CONFIG_MFD_WM8350_I2C is not set 984# CONFIG_MFD_WM8350_I2C is not set
985# CONFIG_MFD_PCF50633 is not set
952# CONFIG_REGULATOR is not set 986# CONFIG_REGULATOR is not set
953 987
954# 988#
@@ -1007,9 +1041,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1007# 1041#
1008 1042
1009# 1043#
1010# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1044# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1011# 1045#
1012# CONFIG_USB_GADGET is not set 1046# CONFIG_USB_GADGET is not set
1047
1048#
1049# OTG and related infrastructure
1050#
1013# CONFIG_UWB is not set 1051# CONFIG_UWB is not set
1014# CONFIG_MMC is not set 1052# CONFIG_MMC is not set
1015# CONFIG_MEMSTICK is not set 1053# CONFIG_MEMSTICK is not set
@@ -1071,6 +1109,7 @@ CONFIG_RTC_DRV_RS5C372=y
1071# 1109#
1072CONFIG_RTC_DRV_SH=y 1110CONFIG_RTC_DRV_SH=y
1073# CONFIG_DMADEVICES is not set 1111# CONFIG_DMADEVICES is not set
1112# CONFIG_AUXDISPLAY is not set
1074# CONFIG_UIO is not set 1113# CONFIG_UIO is not set
1075# CONFIG_STAGING is not set 1114# CONFIG_STAGING is not set
1076 1115
@@ -1094,6 +1133,7 @@ CONFIG_FS_POSIX_ACL=y
1094CONFIG_FILE_LOCKING=y 1133CONFIG_FILE_LOCKING=y
1095# CONFIG_XFS_FS is not set 1134# CONFIG_XFS_FS is not set
1096# CONFIG_OCFS2_FS is not set 1135# CONFIG_OCFS2_FS is not set
1136# CONFIG_BTRFS_FS is not set
1097CONFIG_DNOTIFY=y 1137CONFIG_DNOTIFY=y
1098CONFIG_INOTIFY=y 1138CONFIG_INOTIFY=y
1099CONFIG_INOTIFY_USER=y 1139CONFIG_INOTIFY_USER=y
@@ -1142,6 +1182,7 @@ CONFIG_MISC_FILESYSTEMS=y
1142# CONFIG_BFS_FS is not set 1182# CONFIG_BFS_FS is not set
1143# CONFIG_EFS_FS is not set 1183# CONFIG_EFS_FS is not set
1144# CONFIG_CRAMFS is not set 1184# CONFIG_CRAMFS is not set
1185# CONFIG_SQUASHFS is not set
1145# CONFIG_VXFS_FS is not set 1186# CONFIG_VXFS_FS is not set
1146CONFIG_MINIX_FS=y 1187CONFIG_MINIX_FS=y
1147# CONFIG_OMFS_FS is not set 1188# CONFIG_OMFS_FS is not set
@@ -1166,7 +1207,6 @@ CONFIG_EXPORTFS=y
1166CONFIG_NFS_COMMON=y 1207CONFIG_NFS_COMMON=y
1167CONFIG_SUNRPC=y 1208CONFIG_SUNRPC=y
1168CONFIG_SUNRPC_GSS=y 1209CONFIG_SUNRPC_GSS=y
1169# CONFIG_SUNRPC_REGISTER_V4 is not set
1170CONFIG_RPCSEC_GSS_KRB5=y 1210CONFIG_RPCSEC_GSS_KRB5=y
1171# CONFIG_RPCSEC_GSS_SPKM3 is not set 1211# CONFIG_RPCSEC_GSS_SPKM3 is not set
1172# CONFIG_SMB_FS is not set 1212# CONFIG_SMB_FS is not set
@@ -1269,6 +1309,7 @@ CONFIG_DEBUG_INFO=y
1269# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1309# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1270# CONFIG_FAULT_INJECTION is not set 1310# CONFIG_FAULT_INJECTION is not set
1271# CONFIG_LATENCYTOP is not set 1311# CONFIG_LATENCYTOP is not set
1312# CONFIG_PAGE_POISONING is not set
1272CONFIG_NOP_TRACER=y 1313CONFIG_NOP_TRACER=y
1273CONFIG_HAVE_FUNCTION_TRACER=y 1314CONFIG_HAVE_FUNCTION_TRACER=y
1274CONFIG_HAVE_DYNAMIC_FTRACE=y 1315CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -1288,7 +1329,7 @@ CONFIG_TRACING=y
1288# CONFIG_TRACE_BRANCH_PROFILING is not set 1329# CONFIG_TRACE_BRANCH_PROFILING is not set
1289# CONFIG_STACK_TRACER is not set 1330# CONFIG_STACK_TRACER is not set
1290# CONFIG_FTRACE_STARTUP_TEST is not set 1331# CONFIG_FTRACE_STARTUP_TEST is not set
1291# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1332# CONFIG_DYNAMIC_DEBUG is not set
1292# CONFIG_SAMPLES is not set 1333# CONFIG_SAMPLES is not set
1293CONFIG_HAVE_ARCH_KGDB=y 1334CONFIG_HAVE_ARCH_KGDB=y
1294# CONFIG_KGDB is not set 1335# CONFIG_KGDB is not set
@@ -1325,10 +1366,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1325CONFIG_CRYPTO_HASH=y 1366CONFIG_CRYPTO_HASH=y
1326CONFIG_CRYPTO_HASH2=y 1367CONFIG_CRYPTO_HASH2=y
1327CONFIG_CRYPTO_RNG2=y 1368CONFIG_CRYPTO_RNG2=y
1369CONFIG_CRYPTO_PCOMP=y
1328CONFIG_CRYPTO_MANAGER=y 1370CONFIG_CRYPTO_MANAGER=y
1329CONFIG_CRYPTO_MANAGER2=y 1371CONFIG_CRYPTO_MANAGER2=y
1330# CONFIG_CRYPTO_GF128MUL is not set 1372# CONFIG_CRYPTO_GF128MUL is not set
1331# CONFIG_CRYPTO_NULL is not set 1373# CONFIG_CRYPTO_NULL is not set
1374CONFIG_CRYPTO_WORKQUEUE=y
1332# CONFIG_CRYPTO_CRYPTD is not set 1375# CONFIG_CRYPTO_CRYPTD is not set
1333# CONFIG_CRYPTO_AUTHENC is not set 1376# CONFIG_CRYPTO_AUTHENC is not set
1334# CONFIG_CRYPTO_TEST is not set 1377# CONFIG_CRYPTO_TEST is not set
@@ -1397,6 +1440,7 @@ CONFIG_CRYPTO_DES=y
1397# Compression 1440# Compression
1398# 1441#
1399# CONFIG_CRYPTO_DEFLATE is not set 1442# CONFIG_CRYPTO_DEFLATE is not set
1443# CONFIG_CRYPTO_ZLIB is not set
1400# CONFIG_CRYPTO_LZO is not set 1444# CONFIG_CRYPTO_LZO is not set
1401 1445
1402# 1446#
@@ -1421,3 +1465,4 @@ CONFIG_CRC32=y
1421CONFIG_HAS_IOMEM=y 1465CONFIG_HAS_IOMEM=y
1422CONFIG_HAS_IOPORT=y 1466CONFIG_HAS_IOPORT=y
1423CONFIG_HAS_DMA=y 1467CONFIG_HAS_DMA=y
1468CONFIG_NLATTR=y
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index 8defaa5f13b9..cb134ffc2118 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:14:41 2009 4# Thu Apr 2 18:24:35 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_GPIO=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_NUMA=y 21CONFIG_SYS_SUPPORTS_NUMA=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
@@ -26,6 +26,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
26# CONFIG_ARCH_HAS_ILOG2_U32 is not set 26# CONFIG_ARCH_HAS_ILOG2_U32 is not set
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
29CONFIG_IO_TRAPPED=y 30CONFIG_IO_TRAPPED=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
31 32
@@ -48,11 +49,21 @@ CONFIG_BSD_PROCESS_ACCT=y
48CONFIG_AUDIT=y 49CONFIG_AUDIT=y
49CONFIG_AUDITSYSCALL=y 50CONFIG_AUDITSYSCALL=y
50CONFIG_AUDIT_TREE=y 51CONFIG_AUDIT_TREE=y
52
53#
54# RCU Subsystem
55#
56# CONFIG_CLASSIC_RCU is not set
57# CONFIG_TREE_RCU is not set
58CONFIG_PREEMPT_RCU=y
59CONFIG_RCU_TRACE=y
60# CONFIG_TREE_RCU_TRACE is not set
61CONFIG_PREEMPT_RCU_TRACE=y
51CONFIG_IKCONFIG=y 62CONFIG_IKCONFIG=y
52CONFIG_IKCONFIG_PROC=y 63CONFIG_IKCONFIG_PROC=y
53CONFIG_LOG_BUF_SHIFT=14 64CONFIG_LOG_BUF_SHIFT=14
54# CONFIG_CGROUPS is not set
55# CONFIG_GROUP_SCHED is not set 65# CONFIG_GROUP_SCHED is not set
66# CONFIG_CGROUPS is not set
56CONFIG_SYSFS_DEPRECATED=y 67CONFIG_SYSFS_DEPRECATED=y
57CONFIG_SYSFS_DEPRECATED_V2=y 68CONFIG_SYSFS_DEPRECATED_V2=y
58# CONFIG_RELAY is not set 69# CONFIG_RELAY is not set
@@ -60,21 +71,19 @@ CONFIG_SYSFS_DEPRECATED_V2=y
60# CONFIG_BLK_DEV_INITRD is not set 71# CONFIG_BLK_DEV_INITRD is not set
61CONFIG_CC_OPTIMIZE_FOR_SIZE=y 72CONFIG_CC_OPTIMIZE_FOR_SIZE=y
62CONFIG_SYSCTL=y 73CONFIG_SYSCTL=y
74CONFIG_ANON_INODES=y
63CONFIG_EMBEDDED=y 75CONFIG_EMBEDDED=y
64CONFIG_UID16=y 76CONFIG_UID16=y
65# CONFIG_SYSCTL_SYSCALL is not set 77# CONFIG_SYSCTL_SYSCALL is not set
66CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
67CONFIG_KALLSYMS_ALL=y 79CONFIG_KALLSYMS_ALL=y
68CONFIG_KALLSYMS_STRIP_GENERATED=y
69# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
70CONFIG_HOTPLUG=y 81CONFIG_HOTPLUG=y
71CONFIG_PRINTK=y 82CONFIG_PRINTK=y
72CONFIG_BUG=y 83CONFIG_BUG=y
73CONFIG_ELF_CORE=y 84CONFIG_ELF_CORE=y
74CONFIG_COMPAT_BRK=y
75CONFIG_BASE_FULL=y 85CONFIG_BASE_FULL=y
76CONFIG_FUTEX=y 86CONFIG_FUTEX=y
77CONFIG_ANON_INODES=y
78CONFIG_EPOLL=y 87CONFIG_EPOLL=y
79CONFIG_SIGNALFD=y 88CONFIG_SIGNALFD=y
80CONFIG_TIMERFD=y 89CONFIG_TIMERFD=y
@@ -83,6 +92,7 @@ CONFIG_SHMEM=y
83CONFIG_AIO=y 92CONFIG_AIO=y
84CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_PCI_QUIRKS=y 94CONFIG_PCI_QUIRKS=y
95CONFIG_COMPAT_BRK=y
86CONFIG_SLAB=y 96CONFIG_SLAB=y
87# CONFIG_SLUB is not set 97# CONFIG_SLUB is not set
88# CONFIG_SLOB is not set 98# CONFIG_SLOB is not set
@@ -126,12 +136,6 @@ CONFIG_IOSCHED_NOOP=y
126# CONFIG_DEFAULT_CFQ is not set 136# CONFIG_DEFAULT_CFQ is not set
127CONFIG_DEFAULT_NOOP=y 137CONFIG_DEFAULT_NOOP=y
128CONFIG_DEFAULT_IOSCHED="noop" 138CONFIG_DEFAULT_IOSCHED="noop"
129# CONFIG_CLASSIC_RCU is not set
130# CONFIG_TREE_RCU is not set
131CONFIG_PREEMPT_RCU=y
132CONFIG_RCU_TRACE=y
133# CONFIG_TREE_RCU_TRACE is not set
134CONFIG_PREEMPT_RCU_TRACE=y
135# CONFIG_FREEZER is not set 139# CONFIG_FREEZER is not set
136 140
137# 141#
@@ -168,6 +172,7 @@ CONFIG_CPU_SHX2=y
168# CONFIG_CPU_SUBTYPE_SH7770 is not set 172# CONFIG_CPU_SUBTYPE_SH7770 is not set
169# CONFIG_CPU_SUBTYPE_SH7780 is not set 173# CONFIG_CPU_SUBTYPE_SH7780 is not set
170CONFIG_CPU_SUBTYPE_SH7785=y 174CONFIG_CPU_SUBTYPE_SH7785=y
175# CONFIG_CPU_SUBTYPE_SH7786 is not set
171# CONFIG_CPU_SUBTYPE_SHX3 is not set 176# CONFIG_CPU_SUBTYPE_SHX3 is not set
172# CONFIG_CPU_SUBTYPE_SH7343 is not set 177# CONFIG_CPU_SUBTYPE_SH7343 is not set
173# CONFIG_CPU_SUBTYPE_SH7722 is not set 178# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -183,8 +188,11 @@ CONFIG_MMU=y
183CONFIG_PAGE_OFFSET=0x80000000 188CONFIG_PAGE_OFFSET=0x80000000
184CONFIG_MEMORY_START=0x08000000 189CONFIG_MEMORY_START=0x08000000
185CONFIG_MEMORY_SIZE=0x08000000 190CONFIG_MEMORY_SIZE=0x08000000
186CONFIG_29BIT=y 191# CONFIG_29BIT is not set
192CONFIG_32BIT=y
193CONFIG_PMB_ENABLE=y
187# CONFIG_PMB is not set 194# CONFIG_PMB is not set
195CONFIG_PMB_FIXED=y
188# CONFIG_X2TLB is not set 196# CONFIG_X2TLB is not set
189CONFIG_VSYSCALL=y 197CONFIG_VSYSCALL=y
190# CONFIG_NUMA is not set 198# CONFIG_NUMA is not set
@@ -222,11 +230,12 @@ CONFIG_MIGRATION=y
222CONFIG_ZONE_DMA_FLAG=0 230CONFIG_ZONE_DMA_FLAG=0
223CONFIG_NR_QUICK=2 231CONFIG_NR_QUICK=2
224CONFIG_UNEVICTABLE_LRU=y 232CONFIG_UNEVICTABLE_LRU=y
233CONFIG_HAVE_MLOCK=y
234CONFIG_HAVE_MLOCKED_PAGE_BIT=y
225 235
226# 236#
227# Cache configuration 237# Cache configuration
228# 238#
229# CONFIG_SH_DIRECT_MAPPED is not set
230CONFIG_CACHE_WRITEBACK=y 239CONFIG_CACHE_WRITEBACK=y
231# CONFIG_CACHE_WRITETHROUGH is not set 240# CONFIG_CACHE_WRITETHROUGH is not set
232# CONFIG_CACHE_OFF is not set 241# CONFIG_CACHE_OFF is not set
@@ -334,6 +343,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
334# CONFIG_ARCH_SUPPORTS_MSI is not set 343# CONFIG_ARCH_SUPPORTS_MSI is not set
335# CONFIG_PCI_LEGACY is not set 344# CONFIG_PCI_LEGACY is not set
336# CONFIG_PCI_DEBUG is not set 345# CONFIG_PCI_DEBUG is not set
346# CONFIG_PCI_STUB is not set
347# CONFIG_PCI_IOV is not set
337# CONFIG_PCCARD is not set 348# CONFIG_PCCARD is not set
338# CONFIG_HOTPLUG_PCI is not set 349# CONFIG_HOTPLUG_PCI is not set
339 350
@@ -355,7 +366,6 @@ CONFIG_NET=y
355# 366#
356# Networking options 367# Networking options
357# 368#
358CONFIG_COMPAT_NET_DEV_OPS=y
359CONFIG_PACKET=y 369CONFIG_PACKET=y
360# CONFIG_PACKET_MMAP is not set 370# CONFIG_PACKET_MMAP is not set
361CONFIG_UNIX=y 371CONFIG_UNIX=y
@@ -417,6 +427,7 @@ CONFIG_LLC=m
417# CONFIG_LAPB is not set 427# CONFIG_LAPB is not set
418# CONFIG_ECONET is not set 428# CONFIG_ECONET is not set
419# CONFIG_WAN_ROUTER is not set 429# CONFIG_WAN_ROUTER is not set
430# CONFIG_PHONET is not set
420# CONFIG_NET_SCHED is not set 431# CONFIG_NET_SCHED is not set
421# CONFIG_DCB is not set 432# CONFIG_DCB is not set
422 433
@@ -425,12 +436,12 @@ CONFIG_LLC=m
425# 436#
426# CONFIG_NET_PKTGEN is not set 437# CONFIG_NET_PKTGEN is not set
427# CONFIG_NET_TCPPROBE is not set 438# CONFIG_NET_TCPPROBE is not set
439# CONFIG_NET_DROP_MONITOR is not set
428# CONFIG_HAMRADIO is not set 440# CONFIG_HAMRADIO is not set
429# CONFIG_CAN is not set 441# CONFIG_CAN is not set
430# CONFIG_IRDA is not set 442# CONFIG_IRDA is not set
431# CONFIG_BT is not set 443# CONFIG_BT is not set
432# CONFIG_AF_RXRPC is not set 444# CONFIG_AF_RXRPC is not set
433# CONFIG_PHONET is not set
434CONFIG_WIRELESS=y 445CONFIG_WIRELESS=y
435# CONFIG_CFG80211 is not set 446# CONFIG_CFG80211 is not set
436# CONFIG_WIRELESS_OLD_REGULATORY is not set 447# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -438,6 +449,7 @@ CONFIG_WIRELESS_EXT=y
438CONFIG_WIRELESS_EXT_SYSFS=y 449CONFIG_WIRELESS_EXT_SYSFS=y
439# CONFIG_LIB80211 is not set 450# CONFIG_LIB80211 is not set
440# CONFIG_MAC80211 is not set 451# CONFIG_MAC80211 is not set
452# CONFIG_WIMAX is not set
441# CONFIG_RFKILL is not set 453# CONFIG_RFKILL is not set
442# CONFIG_NET_9P is not set 454# CONFIG_NET_9P is not set
443 455
@@ -477,13 +489,20 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
477# CONFIG_BLK_DEV_HD is not set 489# CONFIG_BLK_DEV_HD is not set
478CONFIG_MISC_DEVICES=y 490CONFIG_MISC_DEVICES=y
479# CONFIG_PHANTOM is not set 491# CONFIG_PHANTOM is not set
480CONFIG_EEPROM_93CX6=y
481# CONFIG_SGI_IOC4 is not set 492# CONFIG_SGI_IOC4 is not set
482# CONFIG_TIFM_CORE is not set 493# CONFIG_TIFM_CORE is not set
483# CONFIG_ICS932S401 is not set 494# CONFIG_ICS932S401 is not set
484# CONFIG_ENCLOSURE_SERVICES is not set 495# CONFIG_ENCLOSURE_SERVICES is not set
485# CONFIG_HP_ILO is not set 496# CONFIG_HP_ILO is not set
497# CONFIG_ISL29003 is not set
486# CONFIG_C2PORT is not set 498# CONFIG_C2PORT is not set
499
500#
501# EEPROM support
502#
503# CONFIG_EEPROM_AT24 is not set
504# CONFIG_EEPROM_LEGACY is not set
505CONFIG_EEPROM_93CX6=y
487CONFIG_HAVE_IDE=y 506CONFIG_HAVE_IDE=y
488# CONFIG_IDE is not set 507# CONFIG_IDE is not set
489 508
@@ -539,6 +558,7 @@ CONFIG_SCSI_LOWLEVEL=y
539# CONFIG_MEGARAID_NEWGEN is not set 558# CONFIG_MEGARAID_NEWGEN is not set
540# CONFIG_MEGARAID_LEGACY is not set 559# CONFIG_MEGARAID_LEGACY is not set
541# CONFIG_MEGARAID_SAS is not set 560# CONFIG_MEGARAID_SAS is not set
561# CONFIG_SCSI_MPT2SAS is not set
542# CONFIG_SCSI_HPTIOP is not set 562# CONFIG_SCSI_HPTIOP is not set
543# CONFIG_LIBFC is not set 563# CONFIG_LIBFC is not set
544# CONFIG_FCOE is not set 564# CONFIG_FCOE is not set
@@ -561,6 +581,7 @@ CONFIG_SCSI_LOWLEVEL=y
561# CONFIG_SCSI_DEBUG is not set 581# CONFIG_SCSI_DEBUG is not set
562# CONFIG_SCSI_SRP is not set 582# CONFIG_SCSI_SRP is not set
563# CONFIG_SCSI_DH is not set 583# CONFIG_SCSI_DH is not set
584# CONFIG_SCSI_OSD_INITIATOR is not set
564CONFIG_ATA=y 585CONFIG_ATA=y
565# CONFIG_ATA_NONSTANDARD is not set 586# CONFIG_ATA_NONSTANDARD is not set
566CONFIG_SATA_PMP=y 587CONFIG_SATA_PMP=y
@@ -635,6 +656,7 @@ CONFIG_PATA_PLATFORM=y
635# CONFIG_IEEE1394 is not set 656# CONFIG_IEEE1394 is not set
636# CONFIG_I2O is not set 657# CONFIG_I2O is not set
637CONFIG_NETDEVICES=y 658CONFIG_NETDEVICES=y
659CONFIG_COMPAT_NET_DEV_OPS=y
638# CONFIG_DUMMY is not set 660# CONFIG_DUMMY is not set
639# CONFIG_BONDING is not set 661# CONFIG_BONDING is not set
640# CONFIG_MACVLAN is not set 662# CONFIG_MACVLAN is not set
@@ -653,8 +675,10 @@ CONFIG_AX88796_93CX6=y
653# CONFIG_CASSINI is not set 675# CONFIG_CASSINI is not set
654# CONFIG_NET_VENDOR_3COM is not set 676# CONFIG_NET_VENDOR_3COM is not set
655# CONFIG_SMC91X is not set 677# CONFIG_SMC91X is not set
678# CONFIG_ETHOC is not set
656# CONFIG_SMC911X is not set 679# CONFIG_SMC911X is not set
657# CONFIG_SMSC911X is not set 680# CONFIG_SMSC911X is not set
681# CONFIG_DNET is not set
658# CONFIG_NET_TULIP is not set 682# CONFIG_NET_TULIP is not set
659# CONFIG_HP100 is not set 683# CONFIG_HP100 is not set
660# CONFIG_IBM_NEW_EMAC_ZMII is not set 684# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -687,6 +711,7 @@ CONFIG_R8169=y
687# CONFIG_QLA3XXX is not set 711# CONFIG_QLA3XXX is not set
688# CONFIG_ATL1 is not set 712# CONFIG_ATL1 is not set
689# CONFIG_ATL1E is not set 713# CONFIG_ATL1E is not set
714# CONFIG_ATL1C is not set
690# CONFIG_JME is not set 715# CONFIG_JME is not set
691CONFIG_NETDEV_10000=y 716CONFIG_NETDEV_10000=y
692# CONFIG_CHELSIO_T1 is not set 717# CONFIG_CHELSIO_T1 is not set
@@ -705,6 +730,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
705# CONFIG_BNX2X is not set 730# CONFIG_BNX2X is not set
706# CONFIG_QLGE is not set 731# CONFIG_QLGE is not set
707# CONFIG_SFC is not set 732# CONFIG_SFC is not set
733# CONFIG_BE2NET is not set
708# CONFIG_TR is not set 734# CONFIG_TR is not set
709 735
710# 736#
@@ -712,7 +738,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
712# 738#
713# CONFIG_WLAN_PRE80211 is not set 739# CONFIG_WLAN_PRE80211 is not set
714# CONFIG_WLAN_80211 is not set 740# CONFIG_WLAN_80211 is not set
715# CONFIG_IWLWIFI_LEDS is not set 741
742#
743# Enable WiMAX (Networking options) to see the WiMAX drivers
744#
716# CONFIG_WAN is not set 745# CONFIG_WAN is not set
717# CONFIG_FDDI is not set 746# CONFIG_FDDI is not set
718# CONFIG_HIPPI is not set 747# CONFIG_HIPPI is not set
@@ -800,6 +829,7 @@ CONFIG_LEGACY_PTYS=y
800CONFIG_LEGACY_PTY_COUNT=256 829CONFIG_LEGACY_PTY_COUNT=256
801# CONFIG_IPMI_HANDLER is not set 830# CONFIG_IPMI_HANDLER is not set
802CONFIG_HW_RANDOM=y 831CONFIG_HW_RANDOM=y
832# CONFIG_HW_RANDOM_TIMERIOMEM is not set
803# CONFIG_R3964 is not set 833# CONFIG_R3964 is not set
804# CONFIG_APPLICOM is not set 834# CONFIG_APPLICOM is not set
805# CONFIG_RAW_DRIVER is not set 835# CONFIG_RAW_DRIVER is not set
@@ -862,12 +892,9 @@ CONFIG_I2C_HIGHLANDER=y
862# Miscellaneous I2C Chip support 892# Miscellaneous I2C Chip support
863# 893#
864# CONFIG_DS1682 is not set 894# CONFIG_DS1682 is not set
865# CONFIG_EEPROM_AT24 is not set
866# CONFIG_EEPROM_LEGACY is not set
867# CONFIG_SENSORS_PCF8574 is not set 895# CONFIG_SENSORS_PCF8574 is not set
868# CONFIG_PCF8575 is not set 896# CONFIG_PCF8575 is not set
869# CONFIG_SENSORS_PCA9539 is not set 897# CONFIG_SENSORS_PCA9539 is not set
870# CONFIG_SENSORS_PCF8591 is not set
871# CONFIG_SENSORS_MAX6875 is not set 898# CONFIG_SENSORS_MAX6875 is not set
872# CONFIG_SENSORS_TSL2550 is not set 899# CONFIG_SENSORS_TSL2550 is not set
873# CONFIG_I2C_DEBUG_CORE is not set 900# CONFIG_I2C_DEBUG_CORE is not set
@@ -914,6 +941,7 @@ CONFIG_HWMON=y
914# CONFIG_SENSORS_ADT7462 is not set 941# CONFIG_SENSORS_ADT7462 is not set
915# CONFIG_SENSORS_ADT7470 is not set 942# CONFIG_SENSORS_ADT7470 is not set
916# CONFIG_SENSORS_ADT7473 is not set 943# CONFIG_SENSORS_ADT7473 is not set
944# CONFIG_SENSORS_ADT7475 is not set
917# CONFIG_SENSORS_ATXP1 is not set 945# CONFIG_SENSORS_ATXP1 is not set
918# CONFIG_SENSORS_DS1621 is not set 946# CONFIG_SENSORS_DS1621 is not set
919# CONFIG_SENSORS_I5K_AMB is not set 947# CONFIG_SENSORS_I5K_AMB is not set
@@ -934,10 +962,14 @@ CONFIG_HWMON=y
934# CONFIG_SENSORS_LM90 is not set 962# CONFIG_SENSORS_LM90 is not set
935# CONFIG_SENSORS_LM92 is not set 963# CONFIG_SENSORS_LM92 is not set
936# CONFIG_SENSORS_LM93 is not set 964# CONFIG_SENSORS_LM93 is not set
965# CONFIG_SENSORS_LTC4215 is not set
966# CONFIG_SENSORS_LTC4245 is not set
967# CONFIG_SENSORS_LM95241 is not set
937# CONFIG_SENSORS_MAX1619 is not set 968# CONFIG_SENSORS_MAX1619 is not set
938# CONFIG_SENSORS_MAX6650 is not set 969# CONFIG_SENSORS_MAX6650 is not set
939# CONFIG_SENSORS_PC87360 is not set 970# CONFIG_SENSORS_PC87360 is not set
940# CONFIG_SENSORS_PC87427 is not set 971# CONFIG_SENSORS_PC87427 is not set
972# CONFIG_SENSORS_PCF8591 is not set
941# CONFIG_SENSORS_SIS5595 is not set 973# CONFIG_SENSORS_SIS5595 is not set
942# CONFIG_SENSORS_DME1737 is not set 974# CONFIG_SENSORS_DME1737 is not set
943# CONFIG_SENSORS_SMSC47M1 is not set 975# CONFIG_SENSORS_SMSC47M1 is not set
@@ -979,6 +1011,7 @@ CONFIG_SSB_POSSIBLE=y
979# CONFIG_PMIC_DA903X is not set 1011# CONFIG_PMIC_DA903X is not set
980# CONFIG_MFD_WM8400 is not set 1012# CONFIG_MFD_WM8400 is not set
981# CONFIG_MFD_WM8350_I2C is not set 1013# CONFIG_MFD_WM8350_I2C is not set
1014# CONFIG_MFD_PCF50633 is not set
982# CONFIG_REGULATOR is not set 1015# CONFIG_REGULATOR is not set
983 1016
984# 1017#
@@ -1055,6 +1088,7 @@ CONFIG_FB_SH_MOBILE_LCDC=m
1055# CONFIG_FB_VIRTUAL is not set 1088# CONFIG_FB_VIRTUAL is not set
1056# CONFIG_FB_METRONOME is not set 1089# CONFIG_FB_METRONOME is not set
1057# CONFIG_FB_MB862XX is not set 1090# CONFIG_FB_MB862XX is not set
1091# CONFIG_FB_BROADSHEET is not set
1058# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1092# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1059 1093
1060# 1094#
@@ -1089,9 +1123,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1089# 1123#
1090 1124
1091# 1125#
1092# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1126# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1093# 1127#
1094# CONFIG_USB_GADGET is not set 1128# CONFIG_USB_GADGET is not set
1129
1130#
1131# OTG and related infrastructure
1132#
1095# CONFIG_UWB is not set 1133# CONFIG_UWB is not set
1096# CONFIG_MMC is not set 1134# CONFIG_MMC is not set
1097# CONFIG_MEMSTICK is not set 1135# CONFIG_MEMSTICK is not set
@@ -1153,6 +1191,7 @@ CONFIG_RTC_DRV_RS5C372=y
1153# 1191#
1154CONFIG_RTC_DRV_SH=y 1192CONFIG_RTC_DRV_SH=y
1155# CONFIG_DMADEVICES is not set 1193# CONFIG_DMADEVICES is not set
1194# CONFIG_AUXDISPLAY is not set
1156# CONFIG_UIO is not set 1195# CONFIG_UIO is not set
1157# CONFIG_STAGING is not set 1196# CONFIG_STAGING is not set
1158 1197
@@ -1176,6 +1215,7 @@ CONFIG_FS_POSIX_ACL=y
1176CONFIG_FILE_LOCKING=y 1215CONFIG_FILE_LOCKING=y
1177# CONFIG_XFS_FS is not set 1216# CONFIG_XFS_FS is not set
1178# CONFIG_OCFS2_FS is not set 1217# CONFIG_OCFS2_FS is not set
1218# CONFIG_BTRFS_FS is not set
1179CONFIG_DNOTIFY=y 1219CONFIG_DNOTIFY=y
1180CONFIG_INOTIFY=y 1220CONFIG_INOTIFY=y
1181CONFIG_INOTIFY_USER=y 1221CONFIG_INOTIFY_USER=y
@@ -1224,6 +1264,7 @@ CONFIG_MISC_FILESYSTEMS=y
1224# CONFIG_BFS_FS is not set 1264# CONFIG_BFS_FS is not set
1225# CONFIG_EFS_FS is not set 1265# CONFIG_EFS_FS is not set
1226# CONFIG_CRAMFS is not set 1266# CONFIG_CRAMFS is not set
1267# CONFIG_SQUASHFS is not set
1227# CONFIG_VXFS_FS is not set 1268# CONFIG_VXFS_FS is not set
1228CONFIG_MINIX_FS=y 1269CONFIG_MINIX_FS=y
1229# CONFIG_OMFS_FS is not set 1270# CONFIG_OMFS_FS is not set
@@ -1248,7 +1289,6 @@ CONFIG_EXPORTFS=y
1248CONFIG_NFS_COMMON=y 1289CONFIG_NFS_COMMON=y
1249CONFIG_SUNRPC=y 1290CONFIG_SUNRPC=y
1250CONFIG_SUNRPC_GSS=y 1291CONFIG_SUNRPC_GSS=y
1251# CONFIG_SUNRPC_REGISTER_V4 is not set
1252CONFIG_RPCSEC_GSS_KRB5=y 1292CONFIG_RPCSEC_GSS_KRB5=y
1253# CONFIG_RPCSEC_GSS_SPKM3 is not set 1293# CONFIG_RPCSEC_GSS_SPKM3 is not set
1254# CONFIG_SMB_FS is not set 1294# CONFIG_SMB_FS is not set
@@ -1354,6 +1394,7 @@ CONFIG_FRAME_POINTER=y
1354# CONFIG_LKDTM is not set 1394# CONFIG_LKDTM is not set
1355# CONFIG_FAULT_INJECTION is not set 1395# CONFIG_FAULT_INJECTION is not set
1356# CONFIG_LATENCYTOP is not set 1396# CONFIG_LATENCYTOP is not set
1397# CONFIG_PAGE_POISONING is not set
1357CONFIG_NOP_TRACER=y 1398CONFIG_NOP_TRACER=y
1358CONFIG_HAVE_FUNCTION_TRACER=y 1399CONFIG_HAVE_FUNCTION_TRACER=y
1359CONFIG_HAVE_DYNAMIC_FTRACE=y 1400CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -1373,7 +1414,7 @@ CONFIG_TRACING=y
1373# CONFIG_TRACE_BRANCH_PROFILING is not set 1414# CONFIG_TRACE_BRANCH_PROFILING is not set
1374# CONFIG_STACK_TRACER is not set 1415# CONFIG_STACK_TRACER is not set
1375# CONFIG_FTRACE_STARTUP_TEST is not set 1416# CONFIG_FTRACE_STARTUP_TEST is not set
1376# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1417# CONFIG_DYNAMIC_DEBUG is not set
1377# CONFIG_SAMPLES is not set 1418# CONFIG_SAMPLES is not set
1378CONFIG_HAVE_ARCH_KGDB=y 1419CONFIG_HAVE_ARCH_KGDB=y
1379# CONFIG_KGDB is not set 1420# CONFIG_KGDB is not set
@@ -1410,10 +1451,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1410CONFIG_CRYPTO_HASH=y 1451CONFIG_CRYPTO_HASH=y
1411CONFIG_CRYPTO_HASH2=y 1452CONFIG_CRYPTO_HASH2=y
1412CONFIG_CRYPTO_RNG2=y 1453CONFIG_CRYPTO_RNG2=y
1454CONFIG_CRYPTO_PCOMP=y
1413CONFIG_CRYPTO_MANAGER=y 1455CONFIG_CRYPTO_MANAGER=y
1414CONFIG_CRYPTO_MANAGER2=y 1456CONFIG_CRYPTO_MANAGER2=y
1415# CONFIG_CRYPTO_GF128MUL is not set 1457# CONFIG_CRYPTO_GF128MUL is not set
1416# CONFIG_CRYPTO_NULL is not set 1458# CONFIG_CRYPTO_NULL is not set
1459CONFIG_CRYPTO_WORKQUEUE=y
1417# CONFIG_CRYPTO_CRYPTD is not set 1460# CONFIG_CRYPTO_CRYPTD is not set
1418# CONFIG_CRYPTO_AUTHENC is not set 1461# CONFIG_CRYPTO_AUTHENC is not set
1419# CONFIG_CRYPTO_TEST is not set 1462# CONFIG_CRYPTO_TEST is not set
@@ -1482,6 +1525,7 @@ CONFIG_CRYPTO_DES=y
1482# Compression 1525# Compression
1483# 1526#
1484# CONFIG_CRYPTO_DEFLATE is not set 1527# CONFIG_CRYPTO_DEFLATE is not set
1528# CONFIG_CRYPTO_ZLIB is not set
1485# CONFIG_CRYPTO_LZO is not set 1529# CONFIG_CRYPTO_LZO is not set
1486 1530
1487# 1531#
@@ -1504,7 +1548,7 @@ CONFIG_CRC32=y
1504# CONFIG_CRC7 is not set 1548# CONFIG_CRC7 is not set
1505# CONFIG_LIBCRC32C is not set 1549# CONFIG_LIBCRC32C is not set
1506CONFIG_AUDIT_GENERIC=y 1550CONFIG_AUDIT_GENERIC=y
1507CONFIG_PLIST=y
1508CONFIG_HAS_IOMEM=y 1551CONFIG_HAS_IOMEM=y
1509CONFIG_HAS_IOPORT=y 1552CONFIG_HAS_IOPORT=y
1510CONFIG_HAS_DMA=y 1553CONFIG_HAS_DMA=y
1554CONFIG_NLATTR=y
diff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk7201_defconfig
index 64ee69eef47c..a037c744b798 100644
--- a/arch/sh/configs/rsk7201_defconfig
+++ b/arch/sh/configs/rsk7201_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:19:04 2009 4# Thu Apr 2 18:29:08 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -24,6 +24,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -38,11 +39,20 @@ CONFIG_SYSVIPC=y
38CONFIG_SYSVIPC_SYSCTL=y 39CONFIG_SYSVIPC_SYSCTL=y
39CONFIG_BSD_PROCESS_ACCT=y 40CONFIG_BSD_PROCESS_ACCT=y
40# CONFIG_BSD_PROCESS_ACCT_V3 is not set 41# CONFIG_BSD_PROCESS_ACCT_V3 is not set
42
43#
44# RCU Subsystem
45#
46CONFIG_CLASSIC_RCU=y
47# CONFIG_TREE_RCU is not set
48# CONFIG_PREEMPT_RCU is not set
49# CONFIG_TREE_RCU_TRACE is not set
50# CONFIG_PREEMPT_RCU_TRACE is not set
41CONFIG_IKCONFIG=y 51CONFIG_IKCONFIG=y
42# CONFIG_IKCONFIG_PROC is not set 52# CONFIG_IKCONFIG_PROC is not set
43CONFIG_LOG_BUF_SHIFT=14 53CONFIG_LOG_BUF_SHIFT=14
44# CONFIG_CGROUPS is not set
45# CONFIG_GROUP_SCHED is not set 54# CONFIG_GROUP_SCHED is not set
55# CONFIG_CGROUPS is not set
46# CONFIG_SYSFS_DEPRECATED_V2 is not set 56# CONFIG_SYSFS_DEPRECATED_V2 is not set
47# CONFIG_RELAY is not set 57# CONFIG_RELAY is not set
48CONFIG_NAMESPACES=y 58CONFIG_NAMESPACES=y
@@ -52,8 +62,13 @@ CONFIG_USER_NS=y
52CONFIG_PID_NS=y 62CONFIG_PID_NS=y
53CONFIG_BLK_DEV_INITRD=y 63CONFIG_BLK_DEV_INITRD=y
54CONFIG_INITRAMFS_SOURCE="" 64CONFIG_INITRAMFS_SOURCE=""
65CONFIG_RD_GZIP=y
66# CONFIG_RD_BZIP2 is not set
67# CONFIG_RD_LZMA is not set
68CONFIG_INITRAMFS_COMPRESSION_NONE=y
55CONFIG_CC_OPTIMIZE_FOR_SIZE=y 69CONFIG_CC_OPTIMIZE_FOR_SIZE=y
56CONFIG_SYSCTL=y 70CONFIG_SYSCTL=y
71CONFIG_ANON_INODES=y
57CONFIG_EMBEDDED=y 72CONFIG_EMBEDDED=y
58CONFIG_UID16=y 73CONFIG_UID16=y
59CONFIG_SYSCTL_SYSCALL=y 74CONFIG_SYSCTL_SYSCALL=y
@@ -63,16 +78,15 @@ CONFIG_HOTPLUG=y
63CONFIG_PRINTK=y 78CONFIG_PRINTK=y
64CONFIG_BUG=y 79CONFIG_BUG=y
65CONFIG_ELF_CORE=y 80CONFIG_ELF_CORE=y
66CONFIG_COMPAT_BRK=y
67CONFIG_BASE_FULL=y 81CONFIG_BASE_FULL=y
68CONFIG_FUTEX=y 82CONFIG_FUTEX=y
69CONFIG_ANON_INODES=y
70CONFIG_EPOLL=y 83CONFIG_EPOLL=y
71CONFIG_SIGNALFD=y 84CONFIG_SIGNALFD=y
72CONFIG_TIMERFD=y 85CONFIG_TIMERFD=y
73CONFIG_EVENTFD=y 86CONFIG_EVENTFD=y
74# CONFIG_AIO is not set 87# CONFIG_AIO is not set
75CONFIG_VM_EVENT_COUNTERS=y 88CONFIG_VM_EVENT_COUNTERS=y
89CONFIG_COMPAT_BRK=y
76# CONFIG_SLAB is not set 90# CONFIG_SLAB is not set
77# CONFIG_SLUB is not set 91# CONFIG_SLUB is not set
78CONFIG_SLOB=y 92CONFIG_SLOB=y
@@ -112,11 +126,6 @@ CONFIG_IOSCHED_NOOP=y
112# CONFIG_DEFAULT_CFQ is not set 126# CONFIG_DEFAULT_CFQ is not set
113CONFIG_DEFAULT_NOOP=y 127CONFIG_DEFAULT_NOOP=y
114CONFIG_DEFAULT_IOSCHED="noop" 128CONFIG_DEFAULT_IOSCHED="noop"
115CONFIG_CLASSIC_RCU=y
116# CONFIG_TREE_RCU is not set
117# CONFIG_PREEMPT_RCU is not set
118# CONFIG_TREE_RCU_TRACE is not set
119# CONFIG_PREEMPT_RCU_TRACE is not set
120# CONFIG_FREEZER is not set 129# CONFIG_FREEZER is not set
121 130
122# 131#
@@ -152,6 +161,7 @@ CONFIG_CPU_SUBTYPE_SH7201=y
152# CONFIG_CPU_SUBTYPE_SH7770 is not set 161# CONFIG_CPU_SUBTYPE_SH7770 is not set
153# CONFIG_CPU_SUBTYPE_SH7780 is not set 162# CONFIG_CPU_SUBTYPE_SH7780 is not set
154# CONFIG_CPU_SUBTYPE_SH7785 is not set 163# CONFIG_CPU_SUBTYPE_SH7785 is not set
164# CONFIG_CPU_SUBTYPE_SH7786 is not set
155# CONFIG_CPU_SUBTYPE_SHX3 is not set 165# CONFIG_CPU_SUBTYPE_SHX3 is not set
156# CONFIG_CPU_SUBTYPE_SH7343 is not set 166# CONFIG_CPU_SUBTYPE_SH7343 is not set
157# CONFIG_CPU_SUBTYPE_SH7722 is not set 167# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -190,11 +200,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_PHYS_ADDR_T_64BIT is not set 200# CONFIG_PHYS_ADDR_T_64BIT is not set
191CONFIG_ZONE_DMA_FLAG=0 201CONFIG_ZONE_DMA_FLAG=0
192CONFIG_NR_QUICK=2 202CONFIG_NR_QUICK=2
203CONFIG_UNEVICTABLE_LRU=y
193 204
194# 205#
195# Cache configuration 206# Cache configuration
196# 207#
197# CONFIG_SH_DIRECT_MAPPED is not set
198CONFIG_CACHE_WRITEBACK=y 208CONFIG_CACHE_WRITEBACK=y
199# CONFIG_CACHE_WRITETHROUGH is not set 209# CONFIG_CACHE_WRITETHROUGH is not set
200# CONFIG_CACHE_OFF is not set 210# CONFIG_CACHE_OFF is not set
@@ -217,7 +227,6 @@ CONFIG_SH_RSK7201=y
217# 227#
218# Timer and clock configuration 228# Timer and clock configuration
219# 229#
220# CONFIG_SH_CMT is not set
221CONFIG_SH_MTU2=y 230CONFIG_SH_MTU2=y
222CONFIG_SH_TIMER_IRQ=16 231CONFIG_SH_TIMER_IRQ=16
223CONFIG_SH_PCLK_FREQ=40000000 232CONFIG_SH_PCLK_FREQ=40000000
@@ -251,7 +260,6 @@ CONFIG_SH_CLK_MD=0
251CONFIG_HZ_1000=y 260CONFIG_HZ_1000=y
252CONFIG_HZ=1000 261CONFIG_HZ=1000
253# CONFIG_SCHED_HRTICK is not set 262# CONFIG_SCHED_HRTICK is not set
254# CONFIG_KEXEC is not set
255# CONFIG_CRASH_DUMP is not set 263# CONFIG_CRASH_DUMP is not set
256# CONFIG_SECCOMP is not set 264# CONFIG_SECCOMP is not set
257CONFIG_PREEMPT_NONE=y 265CONFIG_PREEMPT_NONE=y
@@ -308,6 +316,7 @@ CONFIG_MTD=y
308# CONFIG_MTD_DEBUG is not set 316# CONFIG_MTD_DEBUG is not set
309CONFIG_MTD_CONCAT=y 317CONFIG_MTD_CONCAT=y
310CONFIG_MTD_PARTITIONS=y 318CONFIG_MTD_PARTITIONS=y
319# CONFIG_MTD_TESTS is not set
311CONFIG_MTD_REDBOOT_PARTS=y 320CONFIG_MTD_REDBOOT_PARTS=y
312CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 321CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
313# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 322# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -358,9 +367,7 @@ CONFIG_MTD_CFI_UTIL=y
358# 367#
359# CONFIG_MTD_COMPLEX_MAPPINGS is not set 368# CONFIG_MTD_COMPLEX_MAPPINGS is not set
360CONFIG_MTD_PHYSMAP=y 369CONFIG_MTD_PHYSMAP=y
361CONFIG_MTD_PHYSMAP_START=0x0 370# CONFIG_MTD_PHYSMAP_COMPAT is not set
362CONFIG_MTD_PHYSMAP_LEN=0x0
363CONFIG_MTD_PHYSMAP_BANKWIDTH=4
364# CONFIG_MTD_PLATRAM is not set 371# CONFIG_MTD_PLATRAM is not set
365 372
366# 373#
@@ -381,6 +388,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
381# CONFIG_MTD_ONENAND is not set 388# CONFIG_MTD_ONENAND is not set
382 389
383# 390#
391# LPDDR flash memory drivers
392#
393# CONFIG_MTD_LPDDR is not set
394
395#
384# UBI - Unsorted block images 396# UBI - Unsorted block images
385# 397#
386# CONFIG_MTD_UBI is not set 398# CONFIG_MTD_UBI is not set
@@ -392,9 +404,13 @@ CONFIG_BLK_DEV=y
392# CONFIG_CDROM_PKTCDVD is not set 404# CONFIG_CDROM_PKTCDVD is not set
393# CONFIG_BLK_DEV_HD is not set 405# CONFIG_BLK_DEV_HD is not set
394CONFIG_MISC_DEVICES=y 406CONFIG_MISC_DEVICES=y
395# CONFIG_EEPROM_93CX6 is not set
396# CONFIG_ENCLOSURE_SERVICES is not set 407# CONFIG_ENCLOSURE_SERVICES is not set
397# CONFIG_C2PORT is not set 408# CONFIG_C2PORT is not set
409
410#
411# EEPROM support
412#
413# CONFIG_EEPROM_93CX6 is not set
398CONFIG_HAVE_IDE=y 414CONFIG_HAVE_IDE=y
399# CONFIG_IDE is not set 415# CONFIG_IDE is not set
400 416
@@ -562,6 +578,7 @@ CONFIG_RTC_INTF_DEV=y
562# 578#
563CONFIG_RTC_DRV_SH=y 579CONFIG_RTC_DRV_SH=y
564# CONFIG_DMADEVICES is not set 580# CONFIG_DMADEVICES is not set
581# CONFIG_AUXDISPLAY is not set
565# CONFIG_UIO is not set 582# CONFIG_UIO is not set
566# CONFIG_STAGING is not set 583# CONFIG_STAGING is not set
567 584
@@ -577,6 +594,7 @@ CONFIG_EXT2_FS=y
577# CONFIG_FS_POSIX_ACL is not set 594# CONFIG_FS_POSIX_ACL is not set
578# CONFIG_FILE_LOCKING is not set 595# CONFIG_FILE_LOCKING is not set
579# CONFIG_XFS_FS is not set 596# CONFIG_XFS_FS is not set
597# CONFIG_BTRFS_FS is not set
580# CONFIG_DNOTIFY is not set 598# CONFIG_DNOTIFY is not set
581# CONFIG_INOTIFY is not set 599# CONFIG_INOTIFY is not set
582# CONFIG_QUOTA is not set 600# CONFIG_QUOTA is not set
@@ -626,6 +644,7 @@ CONFIG_JFFS2_ZLIB=y
626CONFIG_JFFS2_RTIME=y 644CONFIG_JFFS2_RTIME=y
627# CONFIG_JFFS2_RUBIN is not set 645# CONFIG_JFFS2_RUBIN is not set
628# CONFIG_CRAMFS is not set 646# CONFIG_CRAMFS is not set
647# CONFIG_SQUASHFS is not set
629# CONFIG_VXFS_FS is not set 648# CONFIG_VXFS_FS is not set
630# CONFIG_MINIX_FS is not set 649# CONFIG_MINIX_FS is not set
631# CONFIG_OMFS_FS is not set 650# CONFIG_OMFS_FS is not set
@@ -671,7 +690,7 @@ CONFIG_TRACING=y
671# 690#
672# Tracers 691# Tracers
673# 692#
674# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 693# CONFIG_DYNAMIC_DEBUG is not set
675# CONFIG_SAMPLES is not set 694# CONFIG_SAMPLES is not set
676CONFIG_HAVE_ARCH_KGDB=y 695CONFIG_HAVE_ARCH_KGDB=y
677# CONFIG_SH_STANDARD_BIOS is not set 696# CONFIG_SH_STANDARD_BIOS is not set
@@ -701,7 +720,7 @@ CONFIG_CRC32=y
701# CONFIG_LIBCRC32C is not set 720# CONFIG_LIBCRC32C is not set
702CONFIG_ZLIB_INFLATE=y 721CONFIG_ZLIB_INFLATE=y
703CONFIG_ZLIB_DEFLATE=y 722CONFIG_ZLIB_DEFLATE=y
704CONFIG_PLIST=y 723CONFIG_DECOMPRESS_GZIP=y
705CONFIG_HAS_IOMEM=y 724CONFIG_HAS_IOMEM=y
706CONFIG_HAS_IOPORT=y 725CONFIG_HAS_IOPORT=y
707CONFIG_HAS_DMA=y 726CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig
index 8d7a5972a86a..9ae28e88426c 100644
--- a/arch/sh/configs/rsk7203_defconfig
+++ b/arch/sh/configs/rsk7203_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:20:31 2009 4# Thu Apr 2 18:30:34 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -18,12 +18,14 @@ CONFIG_GENERIC_GPIO=y
18# CONFIG_GENERIC_CLOCKEVENTS is not set 18# CONFIG_GENERIC_CLOCKEVENTS is not set
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
21CONFIG_SYS_SUPPORTS_CMT=y
21CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 24CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 30
29# 31#
@@ -41,11 +43,20 @@ CONFIG_BSD_PROCESS_ACCT=y
41# CONFIG_BSD_PROCESS_ACCT_V3 is not set 43# CONFIG_BSD_PROCESS_ACCT_V3 is not set
42# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
44CONFIG_IKCONFIG=y 55CONFIG_IKCONFIG=y
45# CONFIG_IKCONFIG_PROC is not set 56# CONFIG_IKCONFIG_PROC is not set
46CONFIG_LOG_BUF_SHIFT=14 57CONFIG_LOG_BUF_SHIFT=14
47# CONFIG_CGROUPS is not set
48# CONFIG_GROUP_SCHED is not set 58# CONFIG_GROUP_SCHED is not set
59# CONFIG_CGROUPS is not set
49# CONFIG_SYSFS_DEPRECATED_V2 is not set 60# CONFIG_SYSFS_DEPRECATED_V2 is not set
50# CONFIG_RELAY is not set 61# CONFIG_RELAY is not set
51CONFIG_NAMESPACES=y 62CONFIG_NAMESPACES=y
@@ -53,31 +64,35 @@ CONFIG_UTS_NS=y
53CONFIG_IPC_NS=y 64CONFIG_IPC_NS=y
54CONFIG_USER_NS=y 65CONFIG_USER_NS=y
55CONFIG_PID_NS=y 66CONFIG_PID_NS=y
67# CONFIG_NET_NS is not set
56CONFIG_BLK_DEV_INITRD=y 68CONFIG_BLK_DEV_INITRD=y
57CONFIG_INITRAMFS_SOURCE="" 69CONFIG_INITRAMFS_SOURCE=""
70CONFIG_RD_GZIP=y
71# CONFIG_RD_BZIP2 is not set
72# CONFIG_RD_LZMA is not set
73CONFIG_INITRAMFS_COMPRESSION_NONE=y
58CONFIG_CC_OPTIMIZE_FOR_SIZE=y 74CONFIG_CC_OPTIMIZE_FOR_SIZE=y
59CONFIG_SYSCTL=y 75CONFIG_SYSCTL=y
76CONFIG_ANON_INODES=y
60CONFIG_EMBEDDED=y 77CONFIG_EMBEDDED=y
61CONFIG_UID16=y 78CONFIG_UID16=y
62CONFIG_SYSCTL_SYSCALL=y 79CONFIG_SYSCTL_SYSCALL=y
63CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
64CONFIG_KALLSYMS_ALL=y 81CONFIG_KALLSYMS_ALL=y
65CONFIG_KALLSYMS_STRIP_GENERATED=y
66# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
67CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
68CONFIG_PRINTK=y 84CONFIG_PRINTK=y
69CONFIG_BUG=y 85CONFIG_BUG=y
70CONFIG_ELF_CORE=y 86CONFIG_ELF_CORE=y
71CONFIG_COMPAT_BRK=y
72CONFIG_BASE_FULL=y 87CONFIG_BASE_FULL=y
73CONFIG_FUTEX=y 88CONFIG_FUTEX=y
74CONFIG_ANON_INODES=y
75CONFIG_EPOLL=y 89CONFIG_EPOLL=y
76CONFIG_SIGNALFD=y 90CONFIG_SIGNALFD=y
77CONFIG_TIMERFD=y 91CONFIG_TIMERFD=y
78CONFIG_EVENTFD=y 92CONFIG_EVENTFD=y
79CONFIG_AIO=y 93CONFIG_AIO=y
80CONFIG_VM_EVENT_COUNTERS=y 94CONFIG_VM_EVENT_COUNTERS=y
95CONFIG_COMPAT_BRK=y
81# CONFIG_SLAB is not set 96# CONFIG_SLAB is not set
82# CONFIG_SLUB is not set 97# CONFIG_SLUB is not set
83CONFIG_SLOB=y 98CONFIG_SLOB=y
@@ -117,11 +132,6 @@ CONFIG_IOSCHED_NOOP=y
117# CONFIG_DEFAULT_CFQ is not set 132# CONFIG_DEFAULT_CFQ is not set
118CONFIG_DEFAULT_NOOP=y 133CONFIG_DEFAULT_NOOP=y
119CONFIG_DEFAULT_IOSCHED="noop" 134CONFIG_DEFAULT_IOSCHED="noop"
120CONFIG_CLASSIC_RCU=y
121# CONFIG_TREE_RCU is not set
122# CONFIG_PREEMPT_RCU is not set
123# CONFIG_TREE_RCU_TRACE is not set
124# CONFIG_PREEMPT_RCU_TRACE is not set
125# CONFIG_FREEZER is not set 135# CONFIG_FREEZER is not set
126 136
127# 137#
@@ -157,6 +167,7 @@ CONFIG_CPU_SUBTYPE_SH7203=y
157# CONFIG_CPU_SUBTYPE_SH7770 is not set 167# CONFIG_CPU_SUBTYPE_SH7770 is not set
158# CONFIG_CPU_SUBTYPE_SH7780 is not set 168# CONFIG_CPU_SUBTYPE_SH7780 is not set
159# CONFIG_CPU_SUBTYPE_SH7785 is not set 169# CONFIG_CPU_SUBTYPE_SH7785 is not set
170# CONFIG_CPU_SUBTYPE_SH7786 is not set
160# CONFIG_CPU_SUBTYPE_SHX3 is not set 171# CONFIG_CPU_SUBTYPE_SHX3 is not set
161# CONFIG_CPU_SUBTYPE_SH7343 is not set 172# CONFIG_CPU_SUBTYPE_SH7343 is not set
162# CONFIG_CPU_SUBTYPE_SH7722 is not set 173# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -195,11 +206,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
195# CONFIG_PHYS_ADDR_T_64BIT is not set 206# CONFIG_PHYS_ADDR_T_64BIT is not set
196CONFIG_ZONE_DMA_FLAG=0 207CONFIG_ZONE_DMA_FLAG=0
197CONFIG_NR_QUICK=2 208CONFIG_NR_QUICK=2
209CONFIG_UNEVICTABLE_LRU=y
198 210
199# 211#
200# Cache configuration 212# Cache configuration
201# 213#
202# CONFIG_SH_DIRECT_MAPPED is not set
203CONFIG_CACHE_WRITEBACK=y 214CONFIG_CACHE_WRITEBACK=y
204# CONFIG_CACHE_WRITETHROUGH is not set 215# CONFIG_CACHE_WRITETHROUGH is not set
205# CONFIG_CACHE_OFF is not set 216# CONFIG_CACHE_OFF is not set
@@ -271,7 +282,6 @@ CONFIG_HEARTBEAT=y
271CONFIG_HZ_1000=y 282CONFIG_HZ_1000=y
272CONFIG_HZ=1000 283CONFIG_HZ=1000
273# CONFIG_SCHED_HRTICK is not set 284# CONFIG_SCHED_HRTICK is not set
274# CONFIG_KEXEC is not set
275# CONFIG_CRASH_DUMP is not set 285# CONFIG_CRASH_DUMP is not set
276# CONFIG_SECCOMP is not set 286# CONFIG_SECCOMP is not set
277CONFIG_PREEMPT_NONE=y 287CONFIG_PREEMPT_NONE=y
@@ -315,8 +325,6 @@ CONFIG_NET=y
315# 325#
316# Networking options 326# Networking options
317# 327#
318# CONFIG_NET_NS is not set
319CONFIG_COMPAT_NET_DEV_OPS=y
320# CONFIG_PACKET is not set 328# CONFIG_PACKET is not set
321# CONFIG_UNIX is not set 329# CONFIG_UNIX is not set
322# CONFIG_NET_KEY is not set 330# CONFIG_NET_KEY is not set
@@ -364,6 +372,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
364# CONFIG_LAPB is not set 372# CONFIG_LAPB is not set
365# CONFIG_ECONET is not set 373# CONFIG_ECONET is not set
366# CONFIG_WAN_ROUTER is not set 374# CONFIG_WAN_ROUTER is not set
375# CONFIG_PHONET is not set
367# CONFIG_NET_SCHED is not set 376# CONFIG_NET_SCHED is not set
368# CONFIG_DCB is not set 377# CONFIG_DCB is not set
369 378
@@ -371,18 +380,19 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
371# Network testing 380# Network testing
372# 381#
373# CONFIG_NET_PKTGEN is not set 382# CONFIG_NET_PKTGEN is not set
383# CONFIG_NET_DROP_MONITOR is not set
374# CONFIG_HAMRADIO is not set 384# CONFIG_HAMRADIO is not set
375# CONFIG_CAN is not set 385# CONFIG_CAN is not set
376# CONFIG_IRDA is not set 386# CONFIG_IRDA is not set
377# CONFIG_BT is not set 387# CONFIG_BT is not set
378# CONFIG_AF_RXRPC is not set 388# CONFIG_AF_RXRPC is not set
379# CONFIG_PHONET is not set
380CONFIG_WIRELESS=y 389CONFIG_WIRELESS=y
381# CONFIG_CFG80211 is not set 390# CONFIG_CFG80211 is not set
382# CONFIG_WIRELESS_OLD_REGULATORY is not set 391# CONFIG_WIRELESS_OLD_REGULATORY is not set
383# CONFIG_WIRELESS_EXT is not set 392# CONFIG_WIRELESS_EXT is not set
384# CONFIG_LIB80211 is not set 393# CONFIG_LIB80211 is not set
385# CONFIG_MAC80211 is not set 394# CONFIG_MAC80211 is not set
395# CONFIG_WIMAX is not set
386# CONFIG_RFKILL is not set 396# CONFIG_RFKILL is not set
387# CONFIG_NET_9P is not set 397# CONFIG_NET_9P is not set
388 398
@@ -405,6 +415,7 @@ CONFIG_MTD=y
405# CONFIG_MTD_DEBUG is not set 415# CONFIG_MTD_DEBUG is not set
406CONFIG_MTD_CONCAT=y 416CONFIG_MTD_CONCAT=y
407CONFIG_MTD_PARTITIONS=y 417CONFIG_MTD_PARTITIONS=y
418# CONFIG_MTD_TESTS is not set
408CONFIG_MTD_REDBOOT_PARTS=y 419CONFIG_MTD_REDBOOT_PARTS=y
409CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 420CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
410# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 421# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -455,9 +466,7 @@ CONFIG_MTD_CFI_UTIL=y
455# 466#
456# CONFIG_MTD_COMPLEX_MAPPINGS is not set 467# CONFIG_MTD_COMPLEX_MAPPINGS is not set
457CONFIG_MTD_PHYSMAP=y 468CONFIG_MTD_PHYSMAP=y
458CONFIG_MTD_PHYSMAP_START=0x0 469# CONFIG_MTD_PHYSMAP_COMPAT is not set
459CONFIG_MTD_PHYSMAP_LEN=0x0
460CONFIG_MTD_PHYSMAP_BANKWIDTH=4
461# CONFIG_MTD_PLATRAM is not set 470# CONFIG_MTD_PLATRAM is not set
462 471
463# 472#
@@ -478,6 +487,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
478# CONFIG_MTD_ONENAND is not set 487# CONFIG_MTD_ONENAND is not set
479 488
480# 489#
490# LPDDR flash memory drivers
491#
492# CONFIG_MTD_LPDDR is not set
493
494#
481# UBI - Unsorted block images 495# UBI - Unsorted block images
482# 496#
483# CONFIG_MTD_UBI is not set 497# CONFIG_MTD_UBI is not set
@@ -492,9 +506,13 @@ CONFIG_BLK_DEV=y
492# CONFIG_ATA_OVER_ETH is not set 506# CONFIG_ATA_OVER_ETH is not set
493# CONFIG_BLK_DEV_HD is not set 507# CONFIG_BLK_DEV_HD is not set
494CONFIG_MISC_DEVICES=y 508CONFIG_MISC_DEVICES=y
495# CONFIG_EEPROM_93CX6 is not set
496# CONFIG_ENCLOSURE_SERVICES is not set 509# CONFIG_ENCLOSURE_SERVICES is not set
497# CONFIG_C2PORT is not set 510# CONFIG_C2PORT is not set
511
512#
513# EEPROM support
514#
515# CONFIG_EEPROM_93CX6 is not set
498CONFIG_HAVE_IDE=y 516CONFIG_HAVE_IDE=y
499# CONFIG_IDE is not set 517# CONFIG_IDE is not set
500 518
@@ -508,6 +526,7 @@ CONFIG_HAVE_IDE=y
508# CONFIG_ATA is not set 526# CONFIG_ATA is not set
509# CONFIG_MD is not set 527# CONFIG_MD is not set
510CONFIG_NETDEVICES=y 528CONFIG_NETDEVICES=y
529CONFIG_COMPAT_NET_DEV_OPS=y
511# CONFIG_DUMMY is not set 530# CONFIG_DUMMY is not set
512# CONFIG_BONDING is not set 531# CONFIG_BONDING is not set
513# CONFIG_MACVLAN is not set 532# CONFIG_MACVLAN is not set
@@ -539,8 +558,10 @@ CONFIG_MII=y
539# CONFIG_AX88796 is not set 558# CONFIG_AX88796 is not set
540# CONFIG_STNIC is not set 559# CONFIG_STNIC is not set
541# CONFIG_SMC91X is not set 560# CONFIG_SMC91X is not set
561# CONFIG_ETHOC is not set
542# CONFIG_SMC911X is not set 562# CONFIG_SMC911X is not set
543CONFIG_SMSC911X=y 563CONFIG_SMSC911X=y
564# CONFIG_DNET is not set
544# CONFIG_IBM_NEW_EMAC_ZMII is not set 565# CONFIG_IBM_NEW_EMAC_ZMII is not set
545# CONFIG_IBM_NEW_EMAC_RGMII is not set 566# CONFIG_IBM_NEW_EMAC_RGMII is not set
546# CONFIG_IBM_NEW_EMAC_TAH is not set 567# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -557,7 +578,10 @@ CONFIG_SMSC911X=y
557# 578#
558# CONFIG_WLAN_PRE80211 is not set 579# CONFIG_WLAN_PRE80211 is not set
559# CONFIG_WLAN_80211 is not set 580# CONFIG_WLAN_80211 is not set
560# CONFIG_IWLWIFI_LEDS is not set 581
582#
583# Enable WiMAX (Networking options) to see the WiMAX drivers
584#
561 585
562# 586#
563# USB Network Adapters 587# USB Network Adapters
@@ -777,7 +801,9 @@ CONFIG_USB_MON=y
777# USB Host Controller Drivers 801# USB Host Controller Drivers
778# 802#
779# CONFIG_USB_C67X00_HCD is not set 803# CONFIG_USB_C67X00_HCD is not set
804# CONFIG_USB_OXU210HP_HCD is not set
780# CONFIG_USB_ISP116X_HCD is not set 805# CONFIG_USB_ISP116X_HCD is not set
806# CONFIG_USB_ISP1760_HCD is not set
781# CONFIG_USB_SL811_HCD is not set 807# CONFIG_USB_SL811_HCD is not set
782CONFIG_USB_R8A66597_HCD=y 808CONFIG_USB_R8A66597_HCD=y
783# CONFIG_USB_HWA_HCD is not set 809# CONFIG_USB_HWA_HCD is not set
@@ -791,11 +817,11 @@ CONFIG_USB_R8A66597_HCD=y
791# CONFIG_USB_TMC is not set 817# CONFIG_USB_TMC is not set
792 818
793# 819#
794# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 820# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
795# 821#
796 822
797# 823#
798# see USB_STORAGE Help for more information 824# also be needed; see USB_STORAGE Help for more info
799# 825#
800# CONFIG_USB_LIBUSUAL is not set 826# CONFIG_USB_LIBUSUAL is not set
801 827
@@ -823,7 +849,6 @@ CONFIG_USB_R8A66597_HCD=y
823# CONFIG_USB_LED is not set 849# CONFIG_USB_LED is not set
824# CONFIG_USB_CYPRESS_CY7C63 is not set 850# CONFIG_USB_CYPRESS_CY7C63 is not set
825# CONFIG_USB_CYTHERM is not set 851# CONFIG_USB_CYTHERM is not set
826# CONFIG_USB_PHIDGET is not set
827# CONFIG_USB_IDMOUSE is not set 852# CONFIG_USB_IDMOUSE is not set
828# CONFIG_USB_FTDI_ELAN is not set 853# CONFIG_USB_FTDI_ELAN is not set
829# CONFIG_USB_APPLEDISPLAY is not set 854# CONFIG_USB_APPLEDISPLAY is not set
@@ -834,6 +859,12 @@ CONFIG_USB_R8A66597_HCD=y
834# CONFIG_USB_ISIGHTFW is not set 859# CONFIG_USB_ISIGHTFW is not set
835# CONFIG_USB_VST is not set 860# CONFIG_USB_VST is not set
836# CONFIG_USB_GADGET is not set 861# CONFIG_USB_GADGET is not set
862
863#
864# OTG and related infrastructure
865#
866# CONFIG_USB_GPIO_VBUS is not set
867# CONFIG_NOP_USB_XCEIV is not set
837# CONFIG_MMC is not set 868# CONFIG_MMC is not set
838# CONFIG_MEMSTICK is not set 869# CONFIG_MEMSTICK is not set
839CONFIG_NEW_LEDS=y 870CONFIG_NEW_LEDS=y
@@ -852,6 +883,10 @@ CONFIG_LEDS_TRIGGER_TIMER=y
852CONFIG_LEDS_TRIGGER_HEARTBEAT=y 883CONFIG_LEDS_TRIGGER_HEARTBEAT=y
853CONFIG_LEDS_TRIGGER_BACKLIGHT=y 884CONFIG_LEDS_TRIGGER_BACKLIGHT=y
854CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 885CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
886
887#
888# iptables trigger is under Netfilter config (LED target)
889#
855# CONFIG_ACCESSIBILITY is not set 890# CONFIG_ACCESSIBILITY is not set
856CONFIG_RTC_LIB=y 891CONFIG_RTC_LIB=y
857CONFIG_RTC_CLASS=y 892CONFIG_RTC_CLASS=y
@@ -891,6 +926,7 @@ CONFIG_RTC_INTF_DEV=y
891# 926#
892CONFIG_RTC_DRV_SH=y 927CONFIG_RTC_DRV_SH=y
893# CONFIG_DMADEVICES is not set 928# CONFIG_DMADEVICES is not set
929# CONFIG_AUXDISPLAY is not set
894# CONFIG_UIO is not set 930# CONFIG_UIO is not set
895# CONFIG_STAGING is not set 931# CONFIG_STAGING is not set
896 932
@@ -906,6 +942,7 @@ CONFIG_RTC_DRV_SH=y
906CONFIG_FILE_LOCKING=y 942CONFIG_FILE_LOCKING=y
907# CONFIG_XFS_FS is not set 943# CONFIG_XFS_FS is not set
908# CONFIG_OCFS2_FS is not set 944# CONFIG_OCFS2_FS is not set
945# CONFIG_BTRFS_FS is not set
909# CONFIG_DNOTIFY is not set 946# CONFIG_DNOTIFY is not set
910# CONFIG_INOTIFY is not set 947# CONFIG_INOTIFY is not set
911# CONFIG_QUOTA is not set 948# CONFIG_QUOTA is not set
@@ -945,6 +982,7 @@ CONFIG_MISC_FILESYSTEMS=y
945# CONFIG_EFS_FS is not set 982# CONFIG_EFS_FS is not set
946# CONFIG_JFFS2_FS is not set 983# CONFIG_JFFS2_FS is not set
947# CONFIG_CRAMFS is not set 984# CONFIG_CRAMFS is not set
985# CONFIG_SQUASHFS is not set
948# CONFIG_VXFS_FS is not set 986# CONFIG_VXFS_FS is not set
949# CONFIG_MINIX_FS is not set 987# CONFIG_MINIX_FS is not set
950# CONFIG_OMFS_FS is not set 988# CONFIG_OMFS_FS is not set
@@ -962,7 +1000,6 @@ CONFIG_ROOT_NFS=y
962CONFIG_LOCKD=y 1000CONFIG_LOCKD=y
963CONFIG_NFS_COMMON=y 1001CONFIG_NFS_COMMON=y
964CONFIG_SUNRPC=y 1002CONFIG_SUNRPC=y
965# CONFIG_SUNRPC_REGISTER_V4 is not set
966# CONFIG_RPCSEC_GSS_KRB5 is not set 1003# CONFIG_RPCSEC_GSS_KRB5 is not set
967# CONFIG_RPCSEC_GSS_SPKM3 is not set 1004# CONFIG_RPCSEC_GSS_SPKM3 is not set
968# CONFIG_SMB_FS is not set 1005# CONFIG_SMB_FS is not set
@@ -1018,6 +1055,7 @@ CONFIG_STACKTRACE=y
1018CONFIG_DEBUG_BUGVERBOSE=y 1055CONFIG_DEBUG_BUGVERBOSE=y
1019CONFIG_DEBUG_INFO=y 1056CONFIG_DEBUG_INFO=y
1020CONFIG_DEBUG_VM=y 1057CONFIG_DEBUG_VM=y
1058# CONFIG_DEBUG_NOMMU_REGIONS is not set
1021CONFIG_DEBUG_WRITECOUNT=y 1059CONFIG_DEBUG_WRITECOUNT=y
1022# CONFIG_DEBUG_MEMORY_INIT is not set 1060# CONFIG_DEBUG_MEMORY_INIT is not set
1023CONFIG_DEBUG_LIST=y 1061CONFIG_DEBUG_LIST=y
@@ -1031,6 +1069,7 @@ CONFIG_FRAME_POINTER=y
1031# CONFIG_FAULT_INJECTION is not set 1069# CONFIG_FAULT_INJECTION is not set
1032# CONFIG_LATENCYTOP is not set 1070# CONFIG_LATENCYTOP is not set
1033CONFIG_SYSCTL_SYSCALL_CHECK=y 1071CONFIG_SYSCTL_SYSCALL_CHECK=y
1072# CONFIG_PAGE_POISONING is not set
1034CONFIG_NOP_TRACER=y 1073CONFIG_NOP_TRACER=y
1035CONFIG_HAVE_FUNCTION_TRACER=y 1074CONFIG_HAVE_FUNCTION_TRACER=y
1036CONFIG_HAVE_DYNAMIC_FTRACE=y 1075CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -1048,7 +1087,7 @@ CONFIG_TRACING=y
1048# CONFIG_TRACE_BRANCH_PROFILING is not set 1087# CONFIG_TRACE_BRANCH_PROFILING is not set
1049# CONFIG_STACK_TRACER is not set 1088# CONFIG_STACK_TRACER is not set
1050# CONFIG_FTRACE_STARTUP_TEST is not set 1089# CONFIG_FTRACE_STARTUP_TEST is not set
1051# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1090# CONFIG_DYNAMIC_DEBUG is not set
1052# CONFIG_SAMPLES is not set 1091# CONFIG_SAMPLES is not set
1053CONFIG_HAVE_ARCH_KGDB=y 1092CONFIG_HAVE_ARCH_KGDB=y
1054# CONFIG_KGDB is not set 1093# CONFIG_KGDB is not set
@@ -1086,7 +1125,8 @@ CONFIG_CRC32=y
1086# CONFIG_CRC7 is not set 1125# CONFIG_CRC7 is not set
1087# CONFIG_LIBCRC32C is not set 1126# CONFIG_LIBCRC32C is not set
1088CONFIG_ZLIB_INFLATE=y 1127CONFIG_ZLIB_INFLATE=y
1089CONFIG_PLIST=y 1128CONFIG_DECOMPRESS_GZIP=y
1090CONFIG_HAS_IOMEM=y 1129CONFIG_HAS_IOMEM=y
1091CONFIG_HAS_IOPORT=y 1130CONFIG_HAS_IOPORT=y
1092CONFIG_HAS_DMA=y 1131CONFIG_HAS_DMA=y
1132CONFIG_NLATTR=y
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index d6680f4382c2..c0f741af6da8 100644
--- a/arch/sh/configs/rts7751r2d1_defconfig
+++ b/arch/sh/configs/rts7751r2d1_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:23:15 2009 4# Thu Apr 2 18:33:25 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_IO_TRAPPED=y 29CONFIG_IO_TRAPPED=y
29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
30 31
@@ -43,10 +44,19 @@ CONFIG_SYSVIPC_SYSCTL=y
43# CONFIG_BSD_PROCESS_ACCT is not set 44# CONFIG_BSD_PROCESS_ACCT is not set
44# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
45# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
47
48#
49# RCU Subsystem
50#
51CONFIG_CLASSIC_RCU=y
52# CONFIG_TREE_RCU is not set
53# CONFIG_PREEMPT_RCU is not set
54# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
46# CONFIG_IKCONFIG is not set 56# CONFIG_IKCONFIG is not set
47CONFIG_LOG_BUF_SHIFT=14 57CONFIG_LOG_BUF_SHIFT=14
48# CONFIG_CGROUPS is not set
49# CONFIG_GROUP_SCHED is not set 58# CONFIG_GROUP_SCHED is not set
59# CONFIG_CGROUPS is not set
50CONFIG_SYSFS_DEPRECATED=y 60CONFIG_SYSFS_DEPRECATED=y
51CONFIG_SYSFS_DEPRECATED_V2=y 61CONFIG_SYSFS_DEPRECATED_V2=y
52# CONFIG_RELAY is not set 62# CONFIG_RELAY is not set
@@ -54,6 +64,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
54# CONFIG_BLK_DEV_INITRD is not set 64# CONFIG_BLK_DEV_INITRD is not set
55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 65# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
56CONFIG_SYSCTL=y 66CONFIG_SYSCTL=y
67CONFIG_ANON_INODES=y
57CONFIG_EMBEDDED=y 68CONFIG_EMBEDDED=y
58CONFIG_UID16=y 69CONFIG_UID16=y
59# CONFIG_SYSCTL_SYSCALL is not set 70# CONFIG_SYSCTL_SYSCALL is not set
@@ -63,10 +74,8 @@ CONFIG_HOTPLUG=y
63CONFIG_PRINTK=y 74CONFIG_PRINTK=y
64CONFIG_BUG=y 75CONFIG_BUG=y
65CONFIG_ELF_CORE=y 76CONFIG_ELF_CORE=y
66CONFIG_COMPAT_BRK=y
67CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
68CONFIG_FUTEX=y 78CONFIG_FUTEX=y
69CONFIG_ANON_INODES=y
70CONFIG_EPOLL=y 79CONFIG_EPOLL=y
71CONFIG_SIGNALFD=y 80CONFIG_SIGNALFD=y
72CONFIG_TIMERFD=y 81CONFIG_TIMERFD=y
@@ -75,6 +84,7 @@ CONFIG_SHMEM=y
75CONFIG_AIO=y 84CONFIG_AIO=y
76CONFIG_VM_EVENT_COUNTERS=y 85CONFIG_VM_EVENT_COUNTERS=y
77CONFIG_PCI_QUIRKS=y 86CONFIG_PCI_QUIRKS=y
87CONFIG_COMPAT_BRK=y
78CONFIG_SLAB=y 88CONFIG_SLAB=y
79# CONFIG_SLUB is not set 89# CONFIG_SLUB is not set
80# CONFIG_SLOB is not set 90# CONFIG_SLOB is not set
@@ -116,11 +126,6 @@ CONFIG_DEFAULT_AS=y
116# CONFIG_DEFAULT_CFQ is not set 126# CONFIG_DEFAULT_CFQ is not set
117# CONFIG_DEFAULT_NOOP is not set 127# CONFIG_DEFAULT_NOOP is not set
118CONFIG_DEFAULT_IOSCHED="anticipatory" 128CONFIG_DEFAULT_IOSCHED="anticipatory"
119CONFIG_CLASSIC_RCU=y
120# CONFIG_TREE_RCU is not set
121# CONFIG_PREEMPT_RCU is not set
122# CONFIG_TREE_RCU_TRACE is not set
123# CONFIG_PREEMPT_RCU_TRACE is not set
124# CONFIG_FREEZER is not set 129# CONFIG_FREEZER is not set
125 130
126# 131#
@@ -155,6 +160,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 160# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 161# CONFIG_CPU_SUBTYPE_SH7780 is not set
157# CONFIG_CPU_SUBTYPE_SH7785 is not set 162# CONFIG_CPU_SUBTYPE_SH7785 is not set
163# CONFIG_CPU_SUBTYPE_SH7786 is not set
158# CONFIG_CPU_SUBTYPE_SHX3 is not set 164# CONFIG_CPU_SUBTYPE_SHX3 is not set
159# CONFIG_CPU_SUBTYPE_SH7343 is not set 165# CONFIG_CPU_SUBTYPE_SH7343 is not set
160# CONFIG_CPU_SUBTYPE_SH7722 is not set 166# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -196,11 +202,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
196CONFIG_ZONE_DMA_FLAG=0 202CONFIG_ZONE_DMA_FLAG=0
197CONFIG_NR_QUICK=2 203CONFIG_NR_QUICK=2
198CONFIG_UNEVICTABLE_LRU=y 204CONFIG_UNEVICTABLE_LRU=y
205CONFIG_HAVE_MLOCK=y
206CONFIG_HAVE_MLOCKED_PAGE_BIT=y
199 207
200# 208#
201# Cache configuration 209# Cache configuration
202# 210#
203# CONFIG_SH_DIRECT_MAPPED is not set
204CONFIG_CACHE_WRITEBACK=y 211CONFIG_CACHE_WRITEBACK=y
205# CONFIG_CACHE_WRITETHROUGH is not set 212# CONFIG_CACHE_WRITETHROUGH is not set
206# CONFIG_CACHE_OFF is not set 213# CONFIG_CACHE_OFF is not set
@@ -300,6 +307,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
300# CONFIG_PCIEPORTBUS is not set 307# CONFIG_PCIEPORTBUS is not set
301# CONFIG_ARCH_SUPPORTS_MSI is not set 308# CONFIG_ARCH_SUPPORTS_MSI is not set
302CONFIG_PCI_LEGACY=y 309CONFIG_PCI_LEGACY=y
310# CONFIG_PCI_STUB is not set
311# CONFIG_PCI_IOV is not set
303# CONFIG_PCCARD is not set 312# CONFIG_PCCARD is not set
304CONFIG_HOTPLUG_PCI=y 313CONFIG_HOTPLUG_PCI=y
305# CONFIG_HOTPLUG_PCI_FAKE is not set 314# CONFIG_HOTPLUG_PCI_FAKE is not set
@@ -324,7 +333,6 @@ CONFIG_NET=y
324# 333#
325# Networking options 334# Networking options
326# 335#
327CONFIG_COMPAT_NET_DEV_OPS=y
328CONFIG_PACKET=y 336CONFIG_PACKET=y
329# CONFIG_PACKET_MMAP is not set 337# CONFIG_PACKET_MMAP is not set
330CONFIG_UNIX=y 338CONFIG_UNIX=y
@@ -376,6 +384,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
376# CONFIG_LAPB is not set 384# CONFIG_LAPB is not set
377# CONFIG_ECONET is not set 385# CONFIG_ECONET is not set
378# CONFIG_WAN_ROUTER is not set 386# CONFIG_WAN_ROUTER is not set
387# CONFIG_PHONET is not set
379# CONFIG_NET_SCHED is not set 388# CONFIG_NET_SCHED is not set
380# CONFIG_DCB is not set 389# CONFIG_DCB is not set
381 390
@@ -383,12 +392,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
383# Network testing 392# Network testing
384# 393#
385# CONFIG_NET_PKTGEN is not set 394# CONFIG_NET_PKTGEN is not set
395# CONFIG_NET_DROP_MONITOR is not set
386# CONFIG_HAMRADIO is not set 396# CONFIG_HAMRADIO is not set
387# CONFIG_CAN is not set 397# CONFIG_CAN is not set
388# CONFIG_IRDA is not set 398# CONFIG_IRDA is not set
389# CONFIG_BT is not set 399# CONFIG_BT is not set
390# CONFIG_AF_RXRPC is not set 400# CONFIG_AF_RXRPC is not set
391# CONFIG_PHONET is not set
392CONFIG_WIRELESS=y 401CONFIG_WIRELESS=y
393# CONFIG_CFG80211 is not set 402# CONFIG_CFG80211 is not set
394# CONFIG_WIRELESS_OLD_REGULATORY is not set 403# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -396,6 +405,7 @@ CONFIG_WIRELESS_EXT=y
396CONFIG_WIRELESS_EXT_SYSFS=y 405CONFIG_WIRELESS_EXT_SYSFS=y
397# CONFIG_LIB80211 is not set 406# CONFIG_LIB80211 is not set
398# CONFIG_MAC80211 is not set 407# CONFIG_MAC80211 is not set
408# CONFIG_WIMAX is not set
399# CONFIG_RFKILL is not set 409# CONFIG_RFKILL is not set
400# CONFIG_NET_9P is not set 410# CONFIG_NET_9P is not set
401 411
@@ -434,12 +444,17 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
434# CONFIG_BLK_DEV_HD is not set 444# CONFIG_BLK_DEV_HD is not set
435CONFIG_MISC_DEVICES=y 445CONFIG_MISC_DEVICES=y
436# CONFIG_PHANTOM is not set 446# CONFIG_PHANTOM is not set
437# CONFIG_EEPROM_93CX6 is not set
438# CONFIG_SGI_IOC4 is not set 447# CONFIG_SGI_IOC4 is not set
439# CONFIG_TIFM_CORE is not set 448# CONFIG_TIFM_CORE is not set
440# CONFIG_ENCLOSURE_SERVICES is not set 449# CONFIG_ENCLOSURE_SERVICES is not set
441# CONFIG_HP_ILO is not set 450# CONFIG_HP_ILO is not set
442# CONFIG_C2PORT is not set 451# CONFIG_C2PORT is not set
452
453#
454# EEPROM support
455#
456# CONFIG_EEPROM_AT25 is not set
457# CONFIG_EEPROM_93CX6 is not set
443CONFIG_HAVE_IDE=y 458CONFIG_HAVE_IDE=y
444# CONFIG_IDE is not set 459# CONFIG_IDE is not set
445 460
@@ -495,6 +510,7 @@ CONFIG_SCSI_LOWLEVEL=y
495# CONFIG_MEGARAID_NEWGEN is not set 510# CONFIG_MEGARAID_NEWGEN is not set
496# CONFIG_MEGARAID_LEGACY is not set 511# CONFIG_MEGARAID_LEGACY is not set
497# CONFIG_MEGARAID_SAS is not set 512# CONFIG_MEGARAID_SAS is not set
513# CONFIG_SCSI_MPT2SAS is not set
498# CONFIG_SCSI_HPTIOP is not set 514# CONFIG_SCSI_HPTIOP is not set
499# CONFIG_LIBFC is not set 515# CONFIG_LIBFC is not set
500# CONFIG_FCOE is not set 516# CONFIG_FCOE is not set
@@ -517,6 +533,7 @@ CONFIG_SCSI_LOWLEVEL=y
517# CONFIG_SCSI_DEBUG is not set 533# CONFIG_SCSI_DEBUG is not set
518# CONFIG_SCSI_SRP is not set 534# CONFIG_SCSI_SRP is not set
519# CONFIG_SCSI_DH is not set 535# CONFIG_SCSI_DH is not set
536# CONFIG_SCSI_OSD_INITIATOR is not set
520CONFIG_ATA=y 537CONFIG_ATA=y
521# CONFIG_ATA_NONSTANDARD is not set 538# CONFIG_ATA_NONSTANDARD is not set
522CONFIG_SATA_PMP=y 539CONFIG_SATA_PMP=y
@@ -591,6 +608,7 @@ CONFIG_PATA_PLATFORM=y
591# CONFIG_IEEE1394 is not set 608# CONFIG_IEEE1394 is not set
592# CONFIG_I2O is not set 609# CONFIG_I2O is not set
593CONFIG_NETDEVICES=y 610CONFIG_NETDEVICES=y
611CONFIG_COMPAT_NET_DEV_OPS=y
594# CONFIG_DUMMY is not set 612# CONFIG_DUMMY is not set
595# CONFIG_BONDING is not set 613# CONFIG_BONDING is not set
596# CONFIG_MACVLAN is not set 614# CONFIG_MACVLAN is not set
@@ -609,8 +627,10 @@ CONFIG_MII=y
609# CONFIG_NET_VENDOR_3COM is not set 627# CONFIG_NET_VENDOR_3COM is not set
610# CONFIG_SMC91X is not set 628# CONFIG_SMC91X is not set
611# CONFIG_ENC28J60 is not set 629# CONFIG_ENC28J60 is not set
630# CONFIG_ETHOC is not set
612# CONFIG_SMC911X is not set 631# CONFIG_SMC911X is not set
613# CONFIG_SMSC911X is not set 632# CONFIG_SMSC911X is not set
633# CONFIG_DNET is not set
614# CONFIG_NET_TULIP is not set 634# CONFIG_NET_TULIP is not set
615# CONFIG_HP100 is not set 635# CONFIG_HP100 is not set
616# CONFIG_IBM_NEW_EMAC_ZMII is not set 636# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -665,6 +685,7 @@ CONFIG_NETDEV_1000=y
665# CONFIG_QLA3XXX is not set 685# CONFIG_QLA3XXX is not set
666# CONFIG_ATL1 is not set 686# CONFIG_ATL1 is not set
667# CONFIG_ATL1E is not set 687# CONFIG_ATL1E is not set
688# CONFIG_ATL1C is not set
668# CONFIG_JME is not set 689# CONFIG_JME is not set
669CONFIG_NETDEV_10000=y 690CONFIG_NETDEV_10000=y
670# CONFIG_CHELSIO_T1 is not set 691# CONFIG_CHELSIO_T1 is not set
@@ -683,6 +704,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
683# CONFIG_BNX2X is not set 704# CONFIG_BNX2X is not set
684# CONFIG_QLGE is not set 705# CONFIG_QLGE is not set
685# CONFIG_SFC is not set 706# CONFIG_SFC is not set
707# CONFIG_BE2NET is not set
686# CONFIG_TR is not set 708# CONFIG_TR is not set
687 709
688# 710#
@@ -690,7 +712,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
690# 712#
691# CONFIG_WLAN_PRE80211 is not set 713# CONFIG_WLAN_PRE80211 is not set
692# CONFIG_WLAN_80211 is not set 714# CONFIG_WLAN_80211 is not set
693# CONFIG_IWLWIFI_LEDS is not set 715
716#
717# Enable WiMAX (Networking options) to see the WiMAX drivers
718#
694 719
695# 720#
696# USB Network Adapters 721# USB Network Adapters
@@ -780,6 +805,7 @@ CONFIG_LEGACY_PTYS=y
780CONFIG_LEGACY_PTY_COUNT=256 805CONFIG_LEGACY_PTY_COUNT=256
781# CONFIG_IPMI_HANDLER is not set 806# CONFIG_IPMI_HANDLER is not set
782CONFIG_HW_RANDOM=y 807CONFIG_HW_RANDOM=y
808# CONFIG_HW_RANDOM_TIMERIOMEM is not set
783# CONFIG_R3964 is not set 809# CONFIG_R3964 is not set
784# CONFIG_APPLICOM is not set 810# CONFIG_APPLICOM is not set
785# CONFIG_RAW_DRIVER is not set 811# CONFIG_RAW_DRIVER is not set
@@ -798,7 +824,6 @@ CONFIG_SPI_SH_SCI=y
798# 824#
799# SPI Protocol Masters 825# SPI Protocol Masters
800# 826#
801# CONFIG_EEPROM_AT25 is not set
802# CONFIG_SPI_SPIDEV is not set 827# CONFIG_SPI_SPIDEV is not set
803# CONFIG_SPI_TLE62X0 is not set 828# CONFIG_SPI_TLE62X0 is not set
804# CONFIG_W1 is not set 829# CONFIG_W1 is not set
@@ -822,6 +847,7 @@ CONFIG_HWMON=y
822# CONFIG_SENSORS_VT8231 is not set 847# CONFIG_SENSORS_VT8231 is not set
823# CONFIG_SENSORS_W83627HF is not set 848# CONFIG_SENSORS_W83627HF is not set
824# CONFIG_SENSORS_W83627EHF is not set 849# CONFIG_SENSORS_W83627EHF is not set
850# CONFIG_SENSORS_LIS3_SPI is not set
825# CONFIG_HWMON_DEBUG_CHIP is not set 851# CONFIG_HWMON_DEBUG_CHIP is not set
826# CONFIG_THERMAL is not set 852# CONFIG_THERMAL is not set
827# CONFIG_THERMAL_HWMON is not set 853# CONFIG_THERMAL_HWMON is not set
@@ -918,6 +944,7 @@ CONFIG_FB_SM501=y
918# CONFIG_FB_VIRTUAL is not set 944# CONFIG_FB_VIRTUAL is not set
919# CONFIG_FB_METRONOME is not set 945# CONFIG_FB_METRONOME is not set
920# CONFIG_FB_MB862XX is not set 946# CONFIG_FB_MB862XX is not set
947# CONFIG_FB_BROADSHEET is not set
921# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 948# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
922 949
923# 950#
@@ -996,6 +1023,8 @@ CONFIG_SND_PCI=y
996# CONFIG_SND_INDIGO is not set 1023# CONFIG_SND_INDIGO is not set
997# CONFIG_SND_INDIGOIO is not set 1024# CONFIG_SND_INDIGOIO is not set
998# CONFIG_SND_INDIGODJ is not set 1025# CONFIG_SND_INDIGODJ is not set
1026# CONFIG_SND_INDIGOIOX is not set
1027# CONFIG_SND_INDIGODJX is not set
999# CONFIG_SND_EMU10K1 is not set 1028# CONFIG_SND_EMU10K1 is not set
1000# CONFIG_SND_EMU10K1X is not set 1029# CONFIG_SND_EMU10K1X is not set
1001# CONFIG_SND_ENS1370 is not set 1030# CONFIG_SND_ENS1370 is not set
@@ -1101,6 +1130,7 @@ CONFIG_USB_DEVICE_CLASS=y
1101# 1130#
1102# CONFIG_USB_C67X00_HCD is not set 1131# CONFIG_USB_C67X00_HCD is not set
1103# CONFIG_USB_EHCI_HCD is not set 1132# CONFIG_USB_EHCI_HCD is not set
1133# CONFIG_USB_OXU210HP_HCD is not set
1104# CONFIG_USB_ISP116X_HCD is not set 1134# CONFIG_USB_ISP116X_HCD is not set
1105# CONFIG_USB_ISP1760_HCD is not set 1135# CONFIG_USB_ISP1760_HCD is not set
1106CONFIG_USB_OHCI_HCD=y 1136CONFIG_USB_OHCI_HCD=y
@@ -1122,18 +1152,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1122# CONFIG_USB_TMC is not set 1152# CONFIG_USB_TMC is not set
1123 1153
1124# 1154#
1125# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1155# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1126# 1156#
1127 1157
1128# 1158#
1129# see USB_STORAGE Help for more information 1159# also be needed; see USB_STORAGE Help for more info
1130# 1160#
1131CONFIG_USB_STORAGE=y 1161CONFIG_USB_STORAGE=y
1132# CONFIG_USB_STORAGE_DEBUG is not set 1162# CONFIG_USB_STORAGE_DEBUG is not set
1133# CONFIG_USB_STORAGE_DATAFAB is not set 1163# CONFIG_USB_STORAGE_DATAFAB is not set
1134# CONFIG_USB_STORAGE_FREECOM is not set 1164# CONFIG_USB_STORAGE_FREECOM is not set
1135# CONFIG_USB_STORAGE_ISD200 is not set 1165# CONFIG_USB_STORAGE_ISD200 is not set
1136# CONFIG_USB_STORAGE_DPCM is not set
1137# CONFIG_USB_STORAGE_USBAT is not set 1166# CONFIG_USB_STORAGE_USBAT is not set
1138# CONFIG_USB_STORAGE_SDDR09 is not set 1167# CONFIG_USB_STORAGE_SDDR09 is not set
1139# CONFIG_USB_STORAGE_SDDR55 is not set 1168# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1169,7 +1198,6 @@ CONFIG_USB_LIBUSUAL=y
1169# CONFIG_USB_LED is not set 1198# CONFIG_USB_LED is not set
1170# CONFIG_USB_CYPRESS_CY7C63 is not set 1199# CONFIG_USB_CYPRESS_CY7C63 is not set
1171# CONFIG_USB_CYTHERM is not set 1200# CONFIG_USB_CYTHERM is not set
1172# CONFIG_USB_PHIDGET is not set
1173# CONFIG_USB_IDMOUSE is not set 1201# CONFIG_USB_IDMOUSE is not set
1174# CONFIG_USB_FTDI_ELAN is not set 1202# CONFIG_USB_FTDI_ELAN is not set
1175# CONFIG_USB_APPLEDISPLAY is not set 1203# CONFIG_USB_APPLEDISPLAY is not set
@@ -1179,6 +1207,11 @@ CONFIG_USB_LIBUSUAL=y
1179# CONFIG_USB_ISIGHTFW is not set 1207# CONFIG_USB_ISIGHTFW is not set
1180# CONFIG_USB_VST is not set 1208# CONFIG_USB_VST is not set
1181# CONFIG_USB_GADGET is not set 1209# CONFIG_USB_GADGET is not set
1210
1211#
1212# OTG and related infrastructure
1213#
1214# CONFIG_NOP_USB_XCEIV is not set
1182# CONFIG_UWB is not set 1215# CONFIG_UWB is not set
1183# CONFIG_MMC is not set 1216# CONFIG_MMC is not set
1184# CONFIG_MEMSTICK is not set 1217# CONFIG_MEMSTICK is not set
@@ -1230,6 +1263,7 @@ CONFIG_RTC_DRV_R9701=y
1230# 1263#
1231# CONFIG_RTC_DRV_SH is not set 1264# CONFIG_RTC_DRV_SH is not set
1232# CONFIG_DMADEVICES is not set 1265# CONFIG_DMADEVICES is not set
1266# CONFIG_AUXDISPLAY is not set
1233# CONFIG_UIO is not set 1267# CONFIG_UIO is not set
1234# CONFIG_STAGING is not set 1268# CONFIG_STAGING is not set
1235 1269
@@ -1247,6 +1281,7 @@ CONFIG_EXT2_FS=y
1247CONFIG_FILE_LOCKING=y 1281CONFIG_FILE_LOCKING=y
1248# CONFIG_XFS_FS is not set 1282# CONFIG_XFS_FS is not set
1249# CONFIG_OCFS2_FS is not set 1283# CONFIG_OCFS2_FS is not set
1284# CONFIG_BTRFS_FS is not set
1250CONFIG_DNOTIFY=y 1285CONFIG_DNOTIFY=y
1251CONFIG_INOTIFY=y 1286CONFIG_INOTIFY=y
1252CONFIG_INOTIFY_USER=y 1287CONFIG_INOTIFY_USER=y
@@ -1293,6 +1328,7 @@ CONFIG_MISC_FILESYSTEMS=y
1293# CONFIG_BFS_FS is not set 1328# CONFIG_BFS_FS is not set
1294# CONFIG_EFS_FS is not set 1329# CONFIG_EFS_FS is not set
1295# CONFIG_CRAMFS is not set 1330# CONFIG_CRAMFS is not set
1331# CONFIG_SQUASHFS is not set
1296# CONFIG_VXFS_FS is not set 1332# CONFIG_VXFS_FS is not set
1297CONFIG_MINIX_FS=y 1333CONFIG_MINIX_FS=y
1298# CONFIG_OMFS_FS is not set 1334# CONFIG_OMFS_FS is not set
@@ -1385,7 +1421,7 @@ CONFIG_TRACING=y
1385# 1421#
1386# Tracers 1422# Tracers
1387# 1423#
1388# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1424# CONFIG_DYNAMIC_DEBUG is not set
1389# CONFIG_SAMPLES is not set 1425# CONFIG_SAMPLES is not set
1390CONFIG_HAVE_ARCH_KGDB=y 1426CONFIG_HAVE_ARCH_KGDB=y
1391# CONFIG_SH_STANDARD_BIOS is not set 1427# CONFIG_SH_STANDARD_BIOS is not set
@@ -1479,6 +1515,7 @@ CONFIG_CRYPTO=y
1479# Compression 1515# Compression
1480# 1516#
1481# CONFIG_CRYPTO_DEFLATE is not set 1517# CONFIG_CRYPTO_DEFLATE is not set
1518# CONFIG_CRYPTO_ZLIB is not set
1482# CONFIG_CRYPTO_LZO is not set 1519# CONFIG_CRYPTO_LZO is not set
1483 1520
1484# 1521#
@@ -1500,7 +1537,7 @@ CONFIG_CRC_T10DIF=y
1500CONFIG_CRC32=y 1537CONFIG_CRC32=y
1501# CONFIG_CRC7 is not set 1538# CONFIG_CRC7 is not set
1502# CONFIG_LIBCRC32C is not set 1539# CONFIG_LIBCRC32C is not set
1503CONFIG_PLIST=y
1504CONFIG_HAS_IOMEM=y 1540CONFIG_HAS_IOMEM=y
1505CONFIG_HAS_IOPORT=y 1541CONFIG_HAS_IOPORT=y
1506CONFIG_HAS_DMA=y 1542CONFIG_HAS_DMA=y
1543CONFIG_NLATTR=y
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index 3fca10e24833..8feef629e49c 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:26:10 2009 4# Thu Apr 2 18:34:12 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_IO_TRAPPED=y 29CONFIG_IO_TRAPPED=y
29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
30 31
@@ -43,10 +44,19 @@ CONFIG_SYSVIPC_SYSCTL=y
43# CONFIG_BSD_PROCESS_ACCT is not set 44# CONFIG_BSD_PROCESS_ACCT is not set
44# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
45# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
47
48#
49# RCU Subsystem
50#
51CONFIG_CLASSIC_RCU=y
52# CONFIG_TREE_RCU is not set
53# CONFIG_PREEMPT_RCU is not set
54# CONFIG_TREE_RCU_TRACE is not set
55# CONFIG_PREEMPT_RCU_TRACE is not set
46# CONFIG_IKCONFIG is not set 56# CONFIG_IKCONFIG is not set
47CONFIG_LOG_BUF_SHIFT=14 57CONFIG_LOG_BUF_SHIFT=14
48# CONFIG_CGROUPS is not set
49# CONFIG_GROUP_SCHED is not set 58# CONFIG_GROUP_SCHED is not set
59# CONFIG_CGROUPS is not set
50CONFIG_SYSFS_DEPRECATED=y 60CONFIG_SYSFS_DEPRECATED=y
51CONFIG_SYSFS_DEPRECATED_V2=y 61CONFIG_SYSFS_DEPRECATED_V2=y
52# CONFIG_RELAY is not set 62# CONFIG_RELAY is not set
@@ -54,6 +64,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
54# CONFIG_BLK_DEV_INITRD is not set 64# CONFIG_BLK_DEV_INITRD is not set
55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 65# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
56CONFIG_SYSCTL=y 66CONFIG_SYSCTL=y
67CONFIG_ANON_INODES=y
57CONFIG_EMBEDDED=y 68CONFIG_EMBEDDED=y
58CONFIG_UID16=y 69CONFIG_UID16=y
59# CONFIG_SYSCTL_SYSCALL is not set 70# CONFIG_SYSCTL_SYSCALL is not set
@@ -63,10 +74,8 @@ CONFIG_HOTPLUG=y
63CONFIG_PRINTK=y 74CONFIG_PRINTK=y
64CONFIG_BUG=y 75CONFIG_BUG=y
65CONFIG_ELF_CORE=y 76CONFIG_ELF_CORE=y
66CONFIG_COMPAT_BRK=y
67CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
68CONFIG_FUTEX=y 78CONFIG_FUTEX=y
69CONFIG_ANON_INODES=y
70CONFIG_EPOLL=y 79CONFIG_EPOLL=y
71CONFIG_SIGNALFD=y 80CONFIG_SIGNALFD=y
72CONFIG_TIMERFD=y 81CONFIG_TIMERFD=y
@@ -75,6 +84,7 @@ CONFIG_SHMEM=y
75CONFIG_AIO=y 84CONFIG_AIO=y
76CONFIG_VM_EVENT_COUNTERS=y 85CONFIG_VM_EVENT_COUNTERS=y
77CONFIG_PCI_QUIRKS=y 86CONFIG_PCI_QUIRKS=y
87CONFIG_COMPAT_BRK=y
78CONFIG_SLAB=y 88CONFIG_SLAB=y
79# CONFIG_SLUB is not set 89# CONFIG_SLUB is not set
80# CONFIG_SLOB is not set 90# CONFIG_SLOB is not set
@@ -116,11 +126,6 @@ CONFIG_DEFAULT_AS=y
116# CONFIG_DEFAULT_CFQ is not set 126# CONFIG_DEFAULT_CFQ is not set
117# CONFIG_DEFAULT_NOOP is not set 127# CONFIG_DEFAULT_NOOP is not set
118CONFIG_DEFAULT_IOSCHED="anticipatory" 128CONFIG_DEFAULT_IOSCHED="anticipatory"
119CONFIG_CLASSIC_RCU=y
120# CONFIG_TREE_RCU is not set
121# CONFIG_PREEMPT_RCU is not set
122# CONFIG_TREE_RCU_TRACE is not set
123# CONFIG_PREEMPT_RCU_TRACE is not set
124# CONFIG_FREEZER is not set 129# CONFIG_FREEZER is not set
125 130
126# 131#
@@ -155,6 +160,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 160# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 161# CONFIG_CPU_SUBTYPE_SH7780 is not set
157# CONFIG_CPU_SUBTYPE_SH7785 is not set 162# CONFIG_CPU_SUBTYPE_SH7785 is not set
163# CONFIG_CPU_SUBTYPE_SH7786 is not set
158# CONFIG_CPU_SUBTYPE_SHX3 is not set 164# CONFIG_CPU_SUBTYPE_SHX3 is not set
159# CONFIG_CPU_SUBTYPE_SH7343 is not set 165# CONFIG_CPU_SUBTYPE_SH7343 is not set
160# CONFIG_CPU_SUBTYPE_SH7722 is not set 166# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -196,11 +202,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
196CONFIG_ZONE_DMA_FLAG=0 202CONFIG_ZONE_DMA_FLAG=0
197CONFIG_NR_QUICK=2 203CONFIG_NR_QUICK=2
198CONFIG_UNEVICTABLE_LRU=y 204CONFIG_UNEVICTABLE_LRU=y
205CONFIG_HAVE_MLOCK=y
206CONFIG_HAVE_MLOCKED_PAGE_BIT=y
199 207
200# 208#
201# Cache configuration 209# Cache configuration
202# 210#
203# CONFIG_SH_DIRECT_MAPPED is not set
204CONFIG_CACHE_WRITEBACK=y 211CONFIG_CACHE_WRITEBACK=y
205# CONFIG_CACHE_WRITETHROUGH is not set 212# CONFIG_CACHE_WRITETHROUGH is not set
206# CONFIG_CACHE_OFF is not set 213# CONFIG_CACHE_OFF is not set
@@ -300,6 +307,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
300# CONFIG_PCIEPORTBUS is not set 307# CONFIG_PCIEPORTBUS is not set
301# CONFIG_ARCH_SUPPORTS_MSI is not set 308# CONFIG_ARCH_SUPPORTS_MSI is not set
302CONFIG_PCI_LEGACY=y 309CONFIG_PCI_LEGACY=y
310# CONFIG_PCI_STUB is not set
311# CONFIG_PCI_IOV is not set
303# CONFIG_PCCARD is not set 312# CONFIG_PCCARD is not set
304CONFIG_HOTPLUG_PCI=y 313CONFIG_HOTPLUG_PCI=y
305# CONFIG_HOTPLUG_PCI_FAKE is not set 314# CONFIG_HOTPLUG_PCI_FAKE is not set
@@ -324,7 +333,6 @@ CONFIG_NET=y
324# 333#
325# Networking options 334# Networking options
326# 335#
327CONFIG_COMPAT_NET_DEV_OPS=y
328CONFIG_PACKET=y 336CONFIG_PACKET=y
329# CONFIG_PACKET_MMAP is not set 337# CONFIG_PACKET_MMAP is not set
330CONFIG_UNIX=y 338CONFIG_UNIX=y
@@ -376,6 +384,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
376# CONFIG_LAPB is not set 384# CONFIG_LAPB is not set
377# CONFIG_ECONET is not set 385# CONFIG_ECONET is not set
378# CONFIG_WAN_ROUTER is not set 386# CONFIG_WAN_ROUTER is not set
387# CONFIG_PHONET is not set
379# CONFIG_NET_SCHED is not set 388# CONFIG_NET_SCHED is not set
380# CONFIG_DCB is not set 389# CONFIG_DCB is not set
381 390
@@ -383,12 +392,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
383# Network testing 392# Network testing
384# 393#
385# CONFIG_NET_PKTGEN is not set 394# CONFIG_NET_PKTGEN is not set
395# CONFIG_NET_DROP_MONITOR is not set
386# CONFIG_HAMRADIO is not set 396# CONFIG_HAMRADIO is not set
387# CONFIG_CAN is not set 397# CONFIG_CAN is not set
388# CONFIG_IRDA is not set 398# CONFIG_IRDA is not set
389# CONFIG_BT is not set 399# CONFIG_BT is not set
390# CONFIG_AF_RXRPC is not set 400# CONFIG_AF_RXRPC is not set
391# CONFIG_PHONET is not set
392CONFIG_WIRELESS=y 401CONFIG_WIRELESS=y
393# CONFIG_CFG80211 is not set 402# CONFIG_CFG80211 is not set
394# CONFIG_WIRELESS_OLD_REGULATORY is not set 403# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -396,6 +405,7 @@ CONFIG_WIRELESS_EXT=y
396CONFIG_WIRELESS_EXT_SYSFS=y 405CONFIG_WIRELESS_EXT_SYSFS=y
397# CONFIG_LIB80211 is not set 406# CONFIG_LIB80211 is not set
398# CONFIG_MAC80211 is not set 407# CONFIG_MAC80211 is not set
408# CONFIG_WIMAX is not set
399# CONFIG_RFKILL is not set 409# CONFIG_RFKILL is not set
400# CONFIG_NET_9P is not set 410# CONFIG_NET_9P is not set
401 411
@@ -434,12 +444,17 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
434# CONFIG_BLK_DEV_HD is not set 444# CONFIG_BLK_DEV_HD is not set
435CONFIG_MISC_DEVICES=y 445CONFIG_MISC_DEVICES=y
436# CONFIG_PHANTOM is not set 446# CONFIG_PHANTOM is not set
437# CONFIG_EEPROM_93CX6 is not set
438# CONFIG_SGI_IOC4 is not set 447# CONFIG_SGI_IOC4 is not set
439# CONFIG_TIFM_CORE is not set 448# CONFIG_TIFM_CORE is not set
440# CONFIG_ENCLOSURE_SERVICES is not set 449# CONFIG_ENCLOSURE_SERVICES is not set
441# CONFIG_HP_ILO is not set 450# CONFIG_HP_ILO is not set
442# CONFIG_C2PORT is not set 451# CONFIG_C2PORT is not set
452
453#
454# EEPROM support
455#
456# CONFIG_EEPROM_AT25 is not set
457# CONFIG_EEPROM_93CX6 is not set
443CONFIG_HAVE_IDE=y 458CONFIG_HAVE_IDE=y
444# CONFIG_IDE is not set 459# CONFIG_IDE is not set
445 460
@@ -495,6 +510,7 @@ CONFIG_SCSI_LOWLEVEL=y
495# CONFIG_MEGARAID_NEWGEN is not set 510# CONFIG_MEGARAID_NEWGEN is not set
496# CONFIG_MEGARAID_LEGACY is not set 511# CONFIG_MEGARAID_LEGACY is not set
497# CONFIG_MEGARAID_SAS is not set 512# CONFIG_MEGARAID_SAS is not set
513# CONFIG_SCSI_MPT2SAS is not set
498# CONFIG_SCSI_HPTIOP is not set 514# CONFIG_SCSI_HPTIOP is not set
499# CONFIG_LIBFC is not set 515# CONFIG_LIBFC is not set
500# CONFIG_FCOE is not set 516# CONFIG_FCOE is not set
@@ -517,6 +533,7 @@ CONFIG_SCSI_LOWLEVEL=y
517# CONFIG_SCSI_DEBUG is not set 533# CONFIG_SCSI_DEBUG is not set
518# CONFIG_SCSI_SRP is not set 534# CONFIG_SCSI_SRP is not set
519# CONFIG_SCSI_DH is not set 535# CONFIG_SCSI_DH is not set
536# CONFIG_SCSI_OSD_INITIATOR is not set
520CONFIG_ATA=y 537CONFIG_ATA=y
521# CONFIG_ATA_NONSTANDARD is not set 538# CONFIG_ATA_NONSTANDARD is not set
522CONFIG_SATA_PMP=y 539CONFIG_SATA_PMP=y
@@ -591,6 +608,7 @@ CONFIG_PATA_PLATFORM=y
591# CONFIG_IEEE1394 is not set 608# CONFIG_IEEE1394 is not set
592# CONFIG_I2O is not set 609# CONFIG_I2O is not set
593CONFIG_NETDEVICES=y 610CONFIG_NETDEVICES=y
611CONFIG_COMPAT_NET_DEV_OPS=y
594# CONFIG_DUMMY is not set 612# CONFIG_DUMMY is not set
595# CONFIG_BONDING is not set 613# CONFIG_BONDING is not set
596# CONFIG_MACVLAN is not set 614# CONFIG_MACVLAN is not set
@@ -609,8 +627,10 @@ CONFIG_MII=y
609# CONFIG_NET_VENDOR_3COM is not set 627# CONFIG_NET_VENDOR_3COM is not set
610# CONFIG_SMC91X is not set 628# CONFIG_SMC91X is not set
611# CONFIG_ENC28J60 is not set 629# CONFIG_ENC28J60 is not set
630# CONFIG_ETHOC is not set
612# CONFIG_SMC911X is not set 631# CONFIG_SMC911X is not set
613# CONFIG_SMSC911X is not set 632# CONFIG_SMSC911X is not set
633# CONFIG_DNET is not set
614# CONFIG_NET_TULIP is not set 634# CONFIG_NET_TULIP is not set
615# CONFIG_HP100 is not set 635# CONFIG_HP100 is not set
616# CONFIG_IBM_NEW_EMAC_ZMII is not set 636# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -665,6 +685,7 @@ CONFIG_NETDEV_1000=y
665# CONFIG_QLA3XXX is not set 685# CONFIG_QLA3XXX is not set
666# CONFIG_ATL1 is not set 686# CONFIG_ATL1 is not set
667# CONFIG_ATL1E is not set 687# CONFIG_ATL1E is not set
688# CONFIG_ATL1C is not set
668# CONFIG_JME is not set 689# CONFIG_JME is not set
669CONFIG_NETDEV_10000=y 690CONFIG_NETDEV_10000=y
670# CONFIG_CHELSIO_T1 is not set 691# CONFIG_CHELSIO_T1 is not set
@@ -683,6 +704,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
683# CONFIG_BNX2X is not set 704# CONFIG_BNX2X is not set
684# CONFIG_QLGE is not set 705# CONFIG_QLGE is not set
685# CONFIG_SFC is not set 706# CONFIG_SFC is not set
707# CONFIG_BE2NET is not set
686# CONFIG_TR is not set 708# CONFIG_TR is not set
687 709
688# 710#
@@ -690,7 +712,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
690# 712#
691# CONFIG_WLAN_PRE80211 is not set 713# CONFIG_WLAN_PRE80211 is not set
692# CONFIG_WLAN_80211 is not set 714# CONFIG_WLAN_80211 is not set
693# CONFIG_IWLWIFI_LEDS is not set 715
716#
717# Enable WiMAX (Networking options) to see the WiMAX drivers
718#
694 719
695# 720#
696# USB Network Adapters 721# USB Network Adapters
@@ -780,6 +805,7 @@ CONFIG_LEGACY_PTYS=y
780CONFIG_LEGACY_PTY_COUNT=256 805CONFIG_LEGACY_PTY_COUNT=256
781# CONFIG_IPMI_HANDLER is not set 806# CONFIG_IPMI_HANDLER is not set
782CONFIG_HW_RANDOM=y 807CONFIG_HW_RANDOM=y
808# CONFIG_HW_RANDOM_TIMERIOMEM is not set
783# CONFIG_R3964 is not set 809# CONFIG_R3964 is not set
784# CONFIG_APPLICOM is not set 810# CONFIG_APPLICOM is not set
785# CONFIG_RAW_DRIVER is not set 811# CONFIG_RAW_DRIVER is not set
@@ -798,7 +824,6 @@ CONFIG_SPI_SH_SCI=y
798# 824#
799# SPI Protocol Masters 825# SPI Protocol Masters
800# 826#
801# CONFIG_EEPROM_AT25 is not set
802# CONFIG_SPI_SPIDEV is not set 827# CONFIG_SPI_SPIDEV is not set
803# CONFIG_SPI_TLE62X0 is not set 828# CONFIG_SPI_TLE62X0 is not set
804# CONFIG_W1 is not set 829# CONFIG_W1 is not set
@@ -822,6 +847,7 @@ CONFIG_HWMON=y
822# CONFIG_SENSORS_VT8231 is not set 847# CONFIG_SENSORS_VT8231 is not set
823# CONFIG_SENSORS_W83627HF is not set 848# CONFIG_SENSORS_W83627HF is not set
824# CONFIG_SENSORS_W83627EHF is not set 849# CONFIG_SENSORS_W83627EHF is not set
850# CONFIG_SENSORS_LIS3_SPI is not set
825# CONFIG_HWMON_DEBUG_CHIP is not set 851# CONFIG_HWMON_DEBUG_CHIP is not set
826# CONFIG_THERMAL is not set 852# CONFIG_THERMAL is not set
827# CONFIG_THERMAL_HWMON is not set 853# CONFIG_THERMAL_HWMON is not set
@@ -918,6 +944,7 @@ CONFIG_FB_SM501=y
918# CONFIG_FB_VIRTUAL is not set 944# CONFIG_FB_VIRTUAL is not set
919# CONFIG_FB_METRONOME is not set 945# CONFIG_FB_METRONOME is not set
920# CONFIG_FB_MB862XX is not set 946# CONFIG_FB_MB862XX is not set
947# CONFIG_FB_BROADSHEET is not set
921# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 948# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
922 949
923# 950#
@@ -996,6 +1023,8 @@ CONFIG_SND_PCI=y
996# CONFIG_SND_INDIGO is not set 1023# CONFIG_SND_INDIGO is not set
997# CONFIG_SND_INDIGOIO is not set 1024# CONFIG_SND_INDIGOIO is not set
998# CONFIG_SND_INDIGODJ is not set 1025# CONFIG_SND_INDIGODJ is not set
1026# CONFIG_SND_INDIGOIOX is not set
1027# CONFIG_SND_INDIGODJX is not set
999# CONFIG_SND_EMU10K1 is not set 1028# CONFIG_SND_EMU10K1 is not set
1000# CONFIG_SND_EMU10K1X is not set 1029# CONFIG_SND_EMU10K1X is not set
1001# CONFIG_SND_ENS1370 is not set 1030# CONFIG_SND_ENS1370 is not set
@@ -1101,6 +1130,7 @@ CONFIG_USB_DEVICE_CLASS=y
1101# 1130#
1102# CONFIG_USB_C67X00_HCD is not set 1131# CONFIG_USB_C67X00_HCD is not set
1103# CONFIG_USB_EHCI_HCD is not set 1132# CONFIG_USB_EHCI_HCD is not set
1133# CONFIG_USB_OXU210HP_HCD is not set
1104# CONFIG_USB_ISP116X_HCD is not set 1134# CONFIG_USB_ISP116X_HCD is not set
1105# CONFIG_USB_ISP1760_HCD is not set 1135# CONFIG_USB_ISP1760_HCD is not set
1106CONFIG_USB_OHCI_HCD=y 1136CONFIG_USB_OHCI_HCD=y
@@ -1122,18 +1152,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1122# CONFIG_USB_TMC is not set 1152# CONFIG_USB_TMC is not set
1123 1153
1124# 1154#
1125# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1155# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1126# 1156#
1127 1157
1128# 1158#
1129# see USB_STORAGE Help for more information 1159# also be needed; see USB_STORAGE Help for more info
1130# 1160#
1131CONFIG_USB_STORAGE=y 1161CONFIG_USB_STORAGE=y
1132# CONFIG_USB_STORAGE_DEBUG is not set 1162# CONFIG_USB_STORAGE_DEBUG is not set
1133# CONFIG_USB_STORAGE_DATAFAB is not set 1163# CONFIG_USB_STORAGE_DATAFAB is not set
1134# CONFIG_USB_STORAGE_FREECOM is not set 1164# CONFIG_USB_STORAGE_FREECOM is not set
1135# CONFIG_USB_STORAGE_ISD200 is not set 1165# CONFIG_USB_STORAGE_ISD200 is not set
1136# CONFIG_USB_STORAGE_DPCM is not set
1137# CONFIG_USB_STORAGE_USBAT is not set 1166# CONFIG_USB_STORAGE_USBAT is not set
1138# CONFIG_USB_STORAGE_SDDR09 is not set 1167# CONFIG_USB_STORAGE_SDDR09 is not set
1139# CONFIG_USB_STORAGE_SDDR55 is not set 1168# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1169,7 +1198,6 @@ CONFIG_USB_LIBUSUAL=y
1169# CONFIG_USB_LED is not set 1198# CONFIG_USB_LED is not set
1170# CONFIG_USB_CYPRESS_CY7C63 is not set 1199# CONFIG_USB_CYPRESS_CY7C63 is not set
1171# CONFIG_USB_CYTHERM is not set 1200# CONFIG_USB_CYTHERM is not set
1172# CONFIG_USB_PHIDGET is not set
1173# CONFIG_USB_IDMOUSE is not set 1201# CONFIG_USB_IDMOUSE is not set
1174# CONFIG_USB_FTDI_ELAN is not set 1202# CONFIG_USB_FTDI_ELAN is not set
1175# CONFIG_USB_APPLEDISPLAY is not set 1203# CONFIG_USB_APPLEDISPLAY is not set
@@ -1179,6 +1207,11 @@ CONFIG_USB_LIBUSUAL=y
1179# CONFIG_USB_ISIGHTFW is not set 1207# CONFIG_USB_ISIGHTFW is not set
1180# CONFIG_USB_VST is not set 1208# CONFIG_USB_VST is not set
1181# CONFIG_USB_GADGET is not set 1209# CONFIG_USB_GADGET is not set
1210
1211#
1212# OTG and related infrastructure
1213#
1214# CONFIG_NOP_USB_XCEIV is not set
1182# CONFIG_UWB is not set 1215# CONFIG_UWB is not set
1183# CONFIG_MMC is not set 1216# CONFIG_MMC is not set
1184# CONFIG_MEMSTICK is not set 1217# CONFIG_MEMSTICK is not set
@@ -1230,6 +1263,7 @@ CONFIG_RTC_DRV_R9701=y
1230# 1263#
1231# CONFIG_RTC_DRV_SH is not set 1264# CONFIG_RTC_DRV_SH is not set
1232# CONFIG_DMADEVICES is not set 1265# CONFIG_DMADEVICES is not set
1266# CONFIG_AUXDISPLAY is not set
1233# CONFIG_UIO is not set 1267# CONFIG_UIO is not set
1234# CONFIG_STAGING is not set 1268# CONFIG_STAGING is not set
1235 1269
@@ -1247,6 +1281,7 @@ CONFIG_EXT2_FS=y
1247CONFIG_FILE_LOCKING=y 1281CONFIG_FILE_LOCKING=y
1248# CONFIG_XFS_FS is not set 1282# CONFIG_XFS_FS is not set
1249# CONFIG_OCFS2_FS is not set 1283# CONFIG_OCFS2_FS is not set
1284# CONFIG_BTRFS_FS is not set
1250CONFIG_DNOTIFY=y 1285CONFIG_DNOTIFY=y
1251CONFIG_INOTIFY=y 1286CONFIG_INOTIFY=y
1252CONFIG_INOTIFY_USER=y 1287CONFIG_INOTIFY_USER=y
@@ -1293,6 +1328,7 @@ CONFIG_MISC_FILESYSTEMS=y
1293# CONFIG_BFS_FS is not set 1328# CONFIG_BFS_FS is not set
1294# CONFIG_EFS_FS is not set 1329# CONFIG_EFS_FS is not set
1295# CONFIG_CRAMFS is not set 1330# CONFIG_CRAMFS is not set
1331# CONFIG_SQUASHFS is not set
1296# CONFIG_VXFS_FS is not set 1332# CONFIG_VXFS_FS is not set
1297CONFIG_MINIX_FS=y 1333CONFIG_MINIX_FS=y
1298# CONFIG_OMFS_FS is not set 1334# CONFIG_OMFS_FS is not set
@@ -1385,7 +1421,7 @@ CONFIG_TRACING=y
1385# 1421#
1386# Tracers 1422# Tracers
1387# 1423#
1388# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1424# CONFIG_DYNAMIC_DEBUG is not set
1389# CONFIG_SAMPLES is not set 1425# CONFIG_SAMPLES is not set
1390CONFIG_HAVE_ARCH_KGDB=y 1426CONFIG_HAVE_ARCH_KGDB=y
1391# CONFIG_SH_STANDARD_BIOS is not set 1427# CONFIG_SH_STANDARD_BIOS is not set
@@ -1479,6 +1515,7 @@ CONFIG_CRYPTO=y
1479# Compression 1515# Compression
1480# 1516#
1481# CONFIG_CRYPTO_DEFLATE is not set 1517# CONFIG_CRYPTO_DEFLATE is not set
1518# CONFIG_CRYPTO_ZLIB is not set
1482# CONFIG_CRYPTO_LZO is not set 1519# CONFIG_CRYPTO_LZO is not set
1483 1520
1484# 1521#
@@ -1500,7 +1537,7 @@ CONFIG_CRC_T10DIF=y
1500CONFIG_CRC32=y 1537CONFIG_CRC32=y
1501# CONFIG_CRC7 is not set 1538# CONFIG_CRC7 is not set
1502# CONFIG_LIBCRC32C is not set 1539# CONFIG_LIBCRC32C is not set
1503CONFIG_PLIST=y
1504CONFIG_HAS_IOMEM=y 1540CONFIG_HAS_IOMEM=y
1505CONFIG_HAS_IOPORT=y 1541CONFIG_HAS_IOPORT=y
1506CONFIG_HAS_DMA=y 1542CONFIG_HAS_DMA=y
1543CONFIG_NLATTR=y
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index 5d6b06755ae7..739e2299ae80 100644
--- a/arch/sh/configs/sdk7780_defconfig
+++ b/arch/sh/configs/sdk7780_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:26:40 2009 4# Thu Apr 2 18:34:43 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -44,11 +45,20 @@ CONFIG_BSD_PROCESS_ACCT=y
44# CONFIG_BSD_PROCESS_ACCT_V3 is not set 45# CONFIG_BSD_PROCESS_ACCT_V3 is not set
45# CONFIG_TASKSTATS is not set 46# CONFIG_TASKSTATS is not set
46# CONFIG_AUDIT is not set 47# CONFIG_AUDIT is not set
48
49#
50# RCU Subsystem
51#
52CONFIG_CLASSIC_RCU=y
53# CONFIG_TREE_RCU is not set
54# CONFIG_PREEMPT_RCU is not set
55# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
47CONFIG_IKCONFIG=y 57CONFIG_IKCONFIG=y
48CONFIG_IKCONFIG_PROC=y 58CONFIG_IKCONFIG_PROC=y
49CONFIG_LOG_BUF_SHIFT=18 59CONFIG_LOG_BUF_SHIFT=18
50# CONFIG_CGROUPS is not set
51# CONFIG_GROUP_SCHED is not set 60# CONFIG_GROUP_SCHED is not set
61# CONFIG_CGROUPS is not set
52CONFIG_SYSFS_DEPRECATED=y 62CONFIG_SYSFS_DEPRECATED=y
53CONFIG_SYSFS_DEPRECATED_V2=y 63CONFIG_SYSFS_DEPRECATED_V2=y
54CONFIG_RELAY=y 64CONFIG_RELAY=y
@@ -56,21 +66,19 @@ CONFIG_RELAY=y
56# CONFIG_BLK_DEV_INITRD is not set 66# CONFIG_BLK_DEV_INITRD is not set
57CONFIG_CC_OPTIMIZE_FOR_SIZE=y 67CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58CONFIG_SYSCTL=y 68CONFIG_SYSCTL=y
69CONFIG_ANON_INODES=y
59CONFIG_EMBEDDED=y 70CONFIG_EMBEDDED=y
60CONFIG_UID16=y 71CONFIG_UID16=y
61CONFIG_SYSCTL_SYSCALL=y 72CONFIG_SYSCTL_SYSCALL=y
62CONFIG_KALLSYMS=y 73CONFIG_KALLSYMS=y
63CONFIG_KALLSYMS_ALL=y 74CONFIG_KALLSYMS_ALL=y
64CONFIG_KALLSYMS_STRIP_GENERATED=y
65# CONFIG_KALLSYMS_EXTRA_PASS is not set 75# CONFIG_KALLSYMS_EXTRA_PASS is not set
66CONFIG_HOTPLUG=y 76CONFIG_HOTPLUG=y
67CONFIG_PRINTK=y 77CONFIG_PRINTK=y
68CONFIG_BUG=y 78CONFIG_BUG=y
69CONFIG_ELF_CORE=y 79CONFIG_ELF_CORE=y
70CONFIG_COMPAT_BRK=y
71CONFIG_BASE_FULL=y 80CONFIG_BASE_FULL=y
72CONFIG_FUTEX=y 81CONFIG_FUTEX=y
73CONFIG_ANON_INODES=y
74CONFIG_EPOLL=y 82CONFIG_EPOLL=y
75CONFIG_SIGNALFD=y 83CONFIG_SIGNALFD=y
76CONFIG_TIMERFD=y 84CONFIG_TIMERFD=y
@@ -80,6 +88,7 @@ CONFIG_AIO=y
80CONFIG_VM_EVENT_COUNTERS=y 88CONFIG_VM_EVENT_COUNTERS=y
81CONFIG_PCI_QUIRKS=y 89CONFIG_PCI_QUIRKS=y
82CONFIG_SLUB_DEBUG=y 90CONFIG_SLUB_DEBUG=y
91CONFIG_COMPAT_BRK=y
83# CONFIG_SLAB is not set 92# CONFIG_SLAB is not set
84CONFIG_SLUB=y 93CONFIG_SLUB=y
85# CONFIG_SLOB is not set 94# CONFIG_SLOB is not set
@@ -119,11 +128,6 @@ CONFIG_DEFAULT_AS=y
119# CONFIG_DEFAULT_CFQ is not set 128# CONFIG_DEFAULT_CFQ is not set
120# CONFIG_DEFAULT_NOOP is not set 129# CONFIG_DEFAULT_NOOP is not set
121CONFIG_DEFAULT_IOSCHED="anticipatory" 130CONFIG_DEFAULT_IOSCHED="anticipatory"
122CONFIG_CLASSIC_RCU=y
123# CONFIG_TREE_RCU is not set
124# CONFIG_PREEMPT_RCU is not set
125# CONFIG_TREE_RCU_TRACE is not set
126# CONFIG_PREEMPT_RCU_TRACE is not set
127# CONFIG_FREEZER is not set 131# CONFIG_FREEZER is not set
128 132
129# 133#
@@ -159,6 +163,7 @@ CONFIG_CPU_SH4A=y
159# CONFIG_CPU_SUBTYPE_SH7770 is not set 163# CONFIG_CPU_SUBTYPE_SH7770 is not set
160CONFIG_CPU_SUBTYPE_SH7780=y 164CONFIG_CPU_SUBTYPE_SH7780=y
161# CONFIG_CPU_SUBTYPE_SH7785 is not set 165# CONFIG_CPU_SUBTYPE_SH7785 is not set
166# CONFIG_CPU_SUBTYPE_SH7786 is not set
162# CONFIG_CPU_SUBTYPE_SHX3 is not set 167# CONFIG_CPU_SUBTYPE_SHX3 is not set
163# CONFIG_CPU_SUBTYPE_SH7343 is not set 168# CONFIG_CPU_SUBTYPE_SH7343 is not set
164# CONFIG_CPU_SUBTYPE_SH7722 is not set 169# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -174,8 +179,11 @@ CONFIG_MMU=y
174CONFIG_PAGE_OFFSET=0x80000000 179CONFIG_PAGE_OFFSET=0x80000000
175CONFIG_MEMORY_START=0x08000000 180CONFIG_MEMORY_START=0x08000000
176CONFIG_MEMORY_SIZE=0x08000000 181CONFIG_MEMORY_SIZE=0x08000000
177CONFIG_29BIT=y 182# CONFIG_29BIT is not set
183CONFIG_32BIT=y
184CONFIG_PMB_ENABLE=y
178# CONFIG_PMB is not set 185# CONFIG_PMB is not set
186CONFIG_PMB_FIXED=y
179CONFIG_VSYSCALL=y 187CONFIG_VSYSCALL=y
180CONFIG_ARCH_FLATMEM_ENABLE=y 188CONFIG_ARCH_FLATMEM_ENABLE=y
181CONFIG_ARCH_SPARSEMEM_ENABLE=y 189CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -207,11 +215,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
207CONFIG_ZONE_DMA_FLAG=0 215CONFIG_ZONE_DMA_FLAG=0
208CONFIG_NR_QUICK=2 216CONFIG_NR_QUICK=2
209CONFIG_UNEVICTABLE_LRU=y 217CONFIG_UNEVICTABLE_LRU=y
218CONFIG_HAVE_MLOCK=y
219CONFIG_HAVE_MLOCKED_PAGE_BIT=y
210 220
211# 221#
212# Cache configuration 222# Cache configuration
213# 223#
214# CONFIG_SH_DIRECT_MAPPED is not set
215CONFIG_CACHE_WRITEBACK=y 224CONFIG_CACHE_WRITEBACK=y
216# CONFIG_CACHE_WRITETHROUGH is not set 225# CONFIG_CACHE_WRITETHROUGH is not set
217# CONFIG_CACHE_OFF is not set 226# CONFIG_CACHE_OFF is not set
@@ -257,6 +266,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
257# 266#
258CONFIG_SH_DMA_API=y 267CONFIG_SH_DMA_API=y
259CONFIG_SH_DMA=y 268CONFIG_SH_DMA=y
269CONFIG_SH_DMA_IRQ_MULTI=y
260CONFIG_NR_ONCHIP_DMA_CHANNELS=12 270CONFIG_NR_ONCHIP_DMA_CHANNELS=12
261# CONFIG_NR_DMA_CHANNELS_BOOL is not set 271# CONFIG_NR_DMA_CHANNELS_BOOL is not set
262 272
@@ -306,6 +316,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
306# CONFIG_ARCH_SUPPORTS_MSI is not set 316# CONFIG_ARCH_SUPPORTS_MSI is not set
307# CONFIG_PCI_LEGACY is not set 317# CONFIG_PCI_LEGACY is not set
308CONFIG_PCI_DEBUG=y 318CONFIG_PCI_DEBUG=y
319# CONFIG_PCI_STUB is not set
320# CONFIG_PCI_IOV is not set
309CONFIG_PCCARD=y 321CONFIG_PCCARD=y
310# CONFIG_PCMCIA_DEBUG is not set 322# CONFIG_PCMCIA_DEBUG is not set
311CONFIG_PCMCIA=y 323CONFIG_PCMCIA=y
@@ -348,7 +360,6 @@ CONFIG_NET=y
348# 360#
349# Networking options 361# Networking options
350# 362#
351CONFIG_COMPAT_NET_DEV_OPS=y
352CONFIG_PACKET=y 363CONFIG_PACKET=y
353# CONFIG_PACKET_MMAP is not set 364# CONFIG_PACKET_MMAP is not set
354CONFIG_UNIX=y 365CONFIG_UNIX=y
@@ -427,6 +438,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
427# CONFIG_LAPB is not set 438# CONFIG_LAPB is not set
428# CONFIG_ECONET is not set 439# CONFIG_ECONET is not set
429# CONFIG_WAN_ROUTER is not set 440# CONFIG_WAN_ROUTER is not set
441# CONFIG_PHONET is not set
430CONFIG_NET_SCHED=y 442CONFIG_NET_SCHED=y
431 443
432# 444#
@@ -471,13 +483,13 @@ CONFIG_NET_SCH_FIFO=y
471# CONFIG_IRDA is not set 483# CONFIG_IRDA is not set
472# CONFIG_BT is not set 484# CONFIG_BT is not set
473# CONFIG_AF_RXRPC is not set 485# CONFIG_AF_RXRPC is not set
474# CONFIG_PHONET is not set
475CONFIG_WIRELESS=y 486CONFIG_WIRELESS=y
476# CONFIG_CFG80211 is not set 487# CONFIG_CFG80211 is not set
477# CONFIG_WIRELESS_OLD_REGULATORY is not set 488# CONFIG_WIRELESS_OLD_REGULATORY is not set
478# CONFIG_WIRELESS_EXT is not set 489# CONFIG_WIRELESS_EXT is not set
479# CONFIG_LIB80211 is not set 490# CONFIG_LIB80211 is not set
480# CONFIG_MAC80211 is not set 491# CONFIG_MAC80211 is not set
492# CONFIG_WIMAX is not set
481# CONFIG_RFKILL is not set 493# CONFIG_RFKILL is not set
482# CONFIG_NET_9P is not set 494# CONFIG_NET_9P is not set
483 495
@@ -631,6 +643,7 @@ CONFIG_SCSI_LOWLEVEL=y
631# CONFIG_MEGARAID_NEWGEN is not set 643# CONFIG_MEGARAID_NEWGEN is not set
632# CONFIG_MEGARAID_LEGACY is not set 644# CONFIG_MEGARAID_LEGACY is not set
633# CONFIG_MEGARAID_SAS is not set 645# CONFIG_MEGARAID_SAS is not set
646# CONFIG_SCSI_MPT2SAS is not set
634# CONFIG_SCSI_HPTIOP is not set 647# CONFIG_SCSI_HPTIOP is not set
635# CONFIG_LIBFC is not set 648# CONFIG_LIBFC is not set
636# CONFIG_FCOE is not set 649# CONFIG_FCOE is not set
@@ -654,6 +667,7 @@ CONFIG_SCSI_LOWLEVEL=y
654# CONFIG_SCSI_SRP is not set 667# CONFIG_SCSI_SRP is not set
655# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 668# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
656# CONFIG_SCSI_DH is not set 669# CONFIG_SCSI_DH is not set
670# CONFIG_SCSI_OSD_INITIATOR is not set
657CONFIG_ATA=y 671CONFIG_ATA=y
658# CONFIG_ATA_NONSTANDARD is not set 672# CONFIG_ATA_NONSTANDARD is not set
659CONFIG_SATA_PMP=y 673CONFIG_SATA_PMP=y
@@ -739,6 +753,7 @@ CONFIG_BLK_DEV_DM=y
739# CONFIG_IEEE1394 is not set 753# CONFIG_IEEE1394 is not set
740# CONFIG_I2O is not set 754# CONFIG_I2O is not set
741CONFIG_NETDEVICES=y 755CONFIG_NETDEVICES=y
756CONFIG_COMPAT_NET_DEV_OPS=y
742# CONFIG_DUMMY is not set 757# CONFIG_DUMMY is not set
743# CONFIG_BONDING is not set 758# CONFIG_BONDING is not set
744# CONFIG_MACVLAN is not set 759# CONFIG_MACVLAN is not set
@@ -756,8 +771,10 @@ CONFIG_MII=y
756# CONFIG_CASSINI is not set 771# CONFIG_CASSINI is not set
757# CONFIG_NET_VENDOR_3COM is not set 772# CONFIG_NET_VENDOR_3COM is not set
758CONFIG_SMC91X=y 773CONFIG_SMC91X=y
774# CONFIG_ETHOC is not set
759# CONFIG_SMC911X is not set 775# CONFIG_SMC911X is not set
760# CONFIG_SMSC911X is not set 776# CONFIG_SMSC911X is not set
777# CONFIG_DNET is not set
761# CONFIG_NET_TULIP is not set 778# CONFIG_NET_TULIP is not set
762# CONFIG_HP100 is not set 779# CONFIG_HP100 is not set
763# CONFIG_IBM_NEW_EMAC_ZMII is not set 780# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -780,7 +797,10 @@ CONFIG_SMC91X=y
780# 797#
781# CONFIG_WLAN_PRE80211 is not set 798# CONFIG_WLAN_PRE80211 is not set
782# CONFIG_WLAN_80211 is not set 799# CONFIG_WLAN_80211 is not set
783# CONFIG_IWLWIFI_LEDS is not set 800
801#
802# Enable WiMAX (Networking options) to see the WiMAX drivers
803#
784 804
785# 805#
786# USB Network Adapters 806# USB Network Adapters
@@ -840,7 +860,6 @@ CONFIG_MOUSE_PS2=y
840CONFIG_MOUSE_PS2_ALPS=y 860CONFIG_MOUSE_PS2_ALPS=y
841CONFIG_MOUSE_PS2_LOGIPS2PP=y 861CONFIG_MOUSE_PS2_LOGIPS2PP=y
842CONFIG_MOUSE_PS2_SYNAPTICS=y 862CONFIG_MOUSE_PS2_SYNAPTICS=y
843CONFIG_MOUSE_PS2_LIFEBOOK=y
844CONFIG_MOUSE_PS2_TRACKPOINT=y 863CONFIG_MOUSE_PS2_TRACKPOINT=y
845# CONFIG_MOUSE_PS2_ELANTECH is not set 864# CONFIG_MOUSE_PS2_ELANTECH is not set
846# CONFIG_MOUSE_PS2_TOUCHKIT is not set 865# CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -899,6 +918,7 @@ CONFIG_LEGACY_PTY_COUNT=256
899# CONFIG_PPDEV is not set 918# CONFIG_PPDEV is not set
900# CONFIG_IPMI_HANDLER is not set 919# CONFIG_IPMI_HANDLER is not set
901CONFIG_HW_RANDOM=y 920CONFIG_HW_RANDOM=y
921# CONFIG_HW_RANDOM_TIMERIOMEM is not set
902# CONFIG_R3964 is not set 922# CONFIG_R3964 is not set
903# CONFIG_APPLICOM is not set 923# CONFIG_APPLICOM is not set
904 924
@@ -1023,6 +1043,7 @@ CONFIG_FB_SH_MOBILE_LCDC=m
1023# CONFIG_FB_VIRTUAL is not set 1043# CONFIG_FB_VIRTUAL is not set
1024# CONFIG_FB_METRONOME is not set 1044# CONFIG_FB_METRONOME is not set
1025# CONFIG_FB_MB862XX is not set 1045# CONFIG_FB_MB862XX is not set
1046# CONFIG_FB_BROADSHEET is not set
1026# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1047# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1027 1048
1028# 1049#
@@ -1123,6 +1144,7 @@ CONFIG_USB_MON=y
1123CONFIG_USB_EHCI_HCD=y 1144CONFIG_USB_EHCI_HCD=y
1124# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1145# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1125# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1146# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1147# CONFIG_USB_OXU210HP_HCD is not set
1126# CONFIG_USB_ISP116X_HCD is not set 1148# CONFIG_USB_ISP116X_HCD is not set
1127# CONFIG_USB_ISP1760_HCD is not set 1149# CONFIG_USB_ISP1760_HCD is not set
1128# CONFIG_USB_OHCI_HCD is not set 1150# CONFIG_USB_OHCI_HCD is not set
@@ -1141,18 +1163,17 @@ CONFIG_USB_PRINTER=y
1141# CONFIG_USB_TMC is not set 1163# CONFIG_USB_TMC is not set
1142 1164
1143# 1165#
1144# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1166# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1145# 1167#
1146 1168
1147# 1169#
1148# see USB_STORAGE Help for more information 1170# also be needed; see USB_STORAGE Help for more info
1149# 1171#
1150CONFIG_USB_STORAGE=y 1172CONFIG_USB_STORAGE=y
1151# CONFIG_USB_STORAGE_DEBUG is not set 1173# CONFIG_USB_STORAGE_DEBUG is not set
1152# CONFIG_USB_STORAGE_DATAFAB is not set 1174# CONFIG_USB_STORAGE_DATAFAB is not set
1153# CONFIG_USB_STORAGE_FREECOM is not set 1175# CONFIG_USB_STORAGE_FREECOM is not set
1154# CONFIG_USB_STORAGE_ISD200 is not set 1176# CONFIG_USB_STORAGE_ISD200 is not set
1155# CONFIG_USB_STORAGE_DPCM is not set
1156# CONFIG_USB_STORAGE_USBAT is not set 1177# CONFIG_USB_STORAGE_USBAT is not set
1157# CONFIG_USB_STORAGE_SDDR09 is not set 1178# CONFIG_USB_STORAGE_SDDR09 is not set
1158# CONFIG_USB_STORAGE_SDDR55 is not set 1179# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1189,7 +1210,6 @@ CONFIG_USB_STORAGE=y
1189# CONFIG_USB_LED is not set 1210# CONFIG_USB_LED is not set
1190# CONFIG_USB_CYPRESS_CY7C63 is not set 1211# CONFIG_USB_CYPRESS_CY7C63 is not set
1191# CONFIG_USB_CYTHERM is not set 1212# CONFIG_USB_CYTHERM is not set
1192# CONFIG_USB_PHIDGET is not set
1193# CONFIG_USB_IDMOUSE is not set 1213# CONFIG_USB_IDMOUSE is not set
1194# CONFIG_USB_FTDI_ELAN is not set 1214# CONFIG_USB_FTDI_ELAN is not set
1195# CONFIG_USB_APPLEDISPLAY is not set 1215# CONFIG_USB_APPLEDISPLAY is not set
@@ -1201,6 +1221,11 @@ CONFIG_USB_STORAGE=y
1201# CONFIG_USB_ISIGHTFW is not set 1221# CONFIG_USB_ISIGHTFW is not set
1202# CONFIG_USB_VST is not set 1222# CONFIG_USB_VST is not set
1203# CONFIG_USB_GADGET is not set 1223# CONFIG_USB_GADGET is not set
1224
1225#
1226# OTG and related infrastructure
1227#
1228# CONFIG_NOP_USB_XCEIV is not set
1204# CONFIG_UWB is not set 1229# CONFIG_UWB is not set
1205# CONFIG_MMC is not set 1230# CONFIG_MMC is not set
1206# CONFIG_MEMSTICK is not set 1231# CONFIG_MEMSTICK is not set
@@ -1243,7 +1268,9 @@ CONFIG_FS_MBCACHE=y
1243CONFIG_FS_POSIX_ACL=y 1268CONFIG_FS_POSIX_ACL=y
1244CONFIG_FILE_LOCKING=y 1269CONFIG_FILE_LOCKING=y
1245# CONFIG_XFS_FS is not set 1270# CONFIG_XFS_FS is not set
1271# CONFIG_GFS2_FS is not set
1246# CONFIG_OCFS2_FS is not set 1272# CONFIG_OCFS2_FS is not set
1273# CONFIG_BTRFS_FS is not set
1247CONFIG_DNOTIFY=y 1274CONFIG_DNOTIFY=y
1248CONFIG_INOTIFY=y 1275CONFIG_INOTIFY=y
1249CONFIG_INOTIFY_USER=y 1276CONFIG_INOTIFY_USER=y
@@ -1295,6 +1322,7 @@ CONFIG_MISC_FILESYSTEMS=y
1295# CONFIG_BFS_FS is not set 1322# CONFIG_BFS_FS is not set
1296# CONFIG_EFS_FS is not set 1323# CONFIG_EFS_FS is not set
1297# CONFIG_CRAMFS is not set 1324# CONFIG_CRAMFS is not set
1325# CONFIG_SQUASHFS is not set
1298# CONFIG_VXFS_FS is not set 1326# CONFIG_VXFS_FS is not set
1299CONFIG_MINIX_FS=y 1327CONFIG_MINIX_FS=y
1300# CONFIG_OMFS_FS is not set 1328# CONFIG_OMFS_FS is not set
@@ -1318,7 +1346,6 @@ CONFIG_LOCKD_V4=y
1318CONFIG_EXPORTFS=y 1346CONFIG_EXPORTFS=y
1319CONFIG_NFS_COMMON=y 1347CONFIG_NFS_COMMON=y
1320CONFIG_SUNRPC=y 1348CONFIG_SUNRPC=y
1321# CONFIG_SUNRPC_REGISTER_V4 is not set
1322# CONFIG_RPCSEC_GSS_KRB5 is not set 1349# CONFIG_RPCSEC_GSS_KRB5 is not set
1323# CONFIG_RPCSEC_GSS_SPKM3 is not set 1350# CONFIG_RPCSEC_GSS_SPKM3 is not set
1324# CONFIG_SMB_FS is not set 1351# CONFIG_SMB_FS is not set
@@ -1424,6 +1451,7 @@ CONFIG_DEBUG_INFO=y
1424# CONFIG_FAULT_INJECTION is not set 1451# CONFIG_FAULT_INJECTION is not set
1425# CONFIG_LATENCYTOP is not set 1452# CONFIG_LATENCYTOP is not set
1426CONFIG_SYSCTL_SYSCALL_CHECK=y 1453CONFIG_SYSCTL_SYSCALL_CHECK=y
1454# CONFIG_PAGE_POISONING is not set
1427CONFIG_HAVE_FUNCTION_TRACER=y 1455CONFIG_HAVE_FUNCTION_TRACER=y
1428CONFIG_HAVE_DYNAMIC_FTRACE=y 1456CONFIG_HAVE_DYNAMIC_FTRACE=y
1429CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1457CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -1439,7 +1467,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1439# CONFIG_BOOT_TRACER is not set 1467# CONFIG_BOOT_TRACER is not set
1440# CONFIG_TRACE_BRANCH_PROFILING is not set 1468# CONFIG_TRACE_BRANCH_PROFILING is not set
1441# CONFIG_STACK_TRACER is not set 1469# CONFIG_STACK_TRACER is not set
1442# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1443# CONFIG_SAMPLES is not set 1470# CONFIG_SAMPLES is not set
1444CONFIG_HAVE_ARCH_KGDB=y 1471CONFIG_HAVE_ARCH_KGDB=y
1445# CONFIG_KGDB is not set 1472# CONFIG_KGDB is not set
@@ -1544,6 +1571,7 @@ CONFIG_CRYPTO_DES=y
1544# Compression 1571# Compression
1545# 1572#
1546# CONFIG_CRYPTO_DEFLATE is not set 1573# CONFIG_CRYPTO_DEFLATE is not set
1574# CONFIG_CRYPTO_ZLIB is not set
1547# CONFIG_CRYPTO_LZO is not set 1575# CONFIG_CRYPTO_LZO is not set
1548 1576
1549# 1577#
@@ -1565,7 +1593,7 @@ CONFIG_CRC_T10DIF=y
1565CONFIG_CRC32=y 1593CONFIG_CRC32=y
1566# CONFIG_CRC7 is not set 1594# CONFIG_CRC7 is not set
1567# CONFIG_LIBCRC32C is not set 1595# CONFIG_LIBCRC32C is not set
1568CONFIG_PLIST=y
1569CONFIG_HAS_IOMEM=y 1596CONFIG_HAS_IOMEM=y
1570CONFIG_HAS_IOPORT=y 1597CONFIG_HAS_IOPORT=y
1571CONFIG_HAS_DMA=y 1598CONFIG_HAS_DMA=y
1599CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index e5b55b6f002d..d30e0a7ad9f1 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:31:27 2009 4# Thu Apr 2 18:39:37 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -18,12 +18,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
18# CONFIG_GENERIC_CLOCKEVENTS is not set 18# CONFIG_GENERIC_CLOCKEVENTS is not set
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
21CONFIG_SYS_SUPPORTS_CMT=y
21CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 24CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 30
29# 31#
@@ -43,18 +45,28 @@ CONFIG_BSD_PROCESS_ACCT=y
43# CONFIG_TASKSTATS is not set 45# CONFIG_TASKSTATS is not set
44CONFIG_AUDIT=y 46CONFIG_AUDIT=y
45CONFIG_AUDITSYSCALL=y 47CONFIG_AUDITSYSCALL=y
48
49#
50# RCU Subsystem
51#
52# CONFIG_CLASSIC_RCU is not set
53# CONFIG_TREE_RCU is not set
54CONFIG_PREEMPT_RCU=y
55CONFIG_RCU_TRACE=y
56# CONFIG_TREE_RCU_TRACE is not set
57CONFIG_PREEMPT_RCU_TRACE=y
46# CONFIG_IKCONFIG is not set 58# CONFIG_IKCONFIG is not set
47CONFIG_LOG_BUF_SHIFT=14 59CONFIG_LOG_BUF_SHIFT=14
60# CONFIG_GROUP_SCHED is not set
48CONFIG_CGROUPS=y 61CONFIG_CGROUPS=y
49CONFIG_CGROUP_DEBUG=y 62CONFIG_CGROUP_DEBUG=y
50CONFIG_CGROUP_NS=y 63CONFIG_CGROUP_NS=y
51# CONFIG_CGROUP_FREEZER is not set 64# CONFIG_CGROUP_FREEZER is not set
52CONFIG_CGROUP_DEVICE=y 65CONFIG_CGROUP_DEVICE=y
53# CONFIG_GROUP_SCHED is not set
54CONFIG_CGROUP_CPUACCT=y 66CONFIG_CGROUP_CPUACCT=y
55CONFIG_RESOURCE_COUNTERS=y 67CONFIG_RESOURCE_COUNTERS=y
56CONFIG_MM_OWNER=y
57CONFIG_CGROUP_MEM_RES_CTLR=y 68CONFIG_CGROUP_MEM_RES_CTLR=y
69CONFIG_MM_OWNER=y
58# CONFIG_SYSFS_DEPRECATED_V2 is not set 70# CONFIG_SYSFS_DEPRECATED_V2 is not set
59CONFIG_RELAY=y 71CONFIG_RELAY=y
60CONFIG_NAMESPACES=y 72CONFIG_NAMESPACES=y
@@ -62,31 +74,35 @@ CONFIG_UTS_NS=y
62CONFIG_IPC_NS=y 74CONFIG_IPC_NS=y
63CONFIG_USER_NS=y 75CONFIG_USER_NS=y
64CONFIG_PID_NS=y 76CONFIG_PID_NS=y
77# CONFIG_NET_NS is not set
65CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
66CONFIG_INITRAMFS_SOURCE="" 79CONFIG_INITRAMFS_SOURCE=""
80CONFIG_RD_GZIP=y
81# CONFIG_RD_BZIP2 is not set
82# CONFIG_RD_LZMA is not set
83CONFIG_INITRAMFS_COMPRESSION_NONE=y
67CONFIG_CC_OPTIMIZE_FOR_SIZE=y 84CONFIG_CC_OPTIMIZE_FOR_SIZE=y
68CONFIG_SYSCTL=y 85CONFIG_SYSCTL=y
86CONFIG_ANON_INODES=y
69CONFIG_EMBEDDED=y 87CONFIG_EMBEDDED=y
70# CONFIG_UID16 is not set 88# CONFIG_UID16 is not set
71# CONFIG_SYSCTL_SYSCALL is not set 89# CONFIG_SYSCTL_SYSCALL is not set
72CONFIG_KALLSYMS=y 90CONFIG_KALLSYMS=y
73CONFIG_KALLSYMS_ALL=y 91CONFIG_KALLSYMS_ALL=y
74CONFIG_KALLSYMS_STRIP_GENERATED=y
75# CONFIG_KALLSYMS_EXTRA_PASS is not set 92# CONFIG_KALLSYMS_EXTRA_PASS is not set
76CONFIG_HOTPLUG=y 93CONFIG_HOTPLUG=y
77CONFIG_PRINTK=y 94CONFIG_PRINTK=y
78CONFIG_BUG=y 95CONFIG_BUG=y
79# CONFIG_ELF_CORE is not set 96# CONFIG_ELF_CORE is not set
80# CONFIG_COMPAT_BRK is not set
81CONFIG_BASE_FULL=y 97CONFIG_BASE_FULL=y
82CONFIG_FUTEX=y 98CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y
84CONFIG_EPOLL=y 99CONFIG_EPOLL=y
85CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y 101CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 102CONFIG_EVENTFD=y
88CONFIG_AIO=y 103CONFIG_AIO=y
89CONFIG_VM_EVENT_COUNTERS=y 104CONFIG_VM_EVENT_COUNTERS=y
105# CONFIG_COMPAT_BRK is not set
90# CONFIG_SLAB is not set 106# CONFIG_SLAB is not set
91# CONFIG_SLUB is not set 107# CONFIG_SLUB is not set
92CONFIG_SLOB=y 108CONFIG_SLOB=y
@@ -127,12 +143,6 @@ CONFIG_IOSCHED_NOOP=y
127# CONFIG_DEFAULT_CFQ is not set 143# CONFIG_DEFAULT_CFQ is not set
128CONFIG_DEFAULT_NOOP=y 144CONFIG_DEFAULT_NOOP=y
129CONFIG_DEFAULT_IOSCHED="noop" 145CONFIG_DEFAULT_IOSCHED="noop"
130# CONFIG_CLASSIC_RCU is not set
131# CONFIG_TREE_RCU is not set
132CONFIG_PREEMPT_RCU=y
133CONFIG_RCU_TRACE=y
134# CONFIG_TREE_RCU_TRACE is not set
135CONFIG_PREEMPT_RCU_TRACE=y
136# CONFIG_FREEZER is not set 146# CONFIG_FREEZER is not set
137 147
138# 148#
@@ -168,6 +178,7 @@ CONFIG_CPU_SUBTYPE_SH7206=y
168# CONFIG_CPU_SUBTYPE_SH7770 is not set 178# CONFIG_CPU_SUBTYPE_SH7770 is not set
169# CONFIG_CPU_SUBTYPE_SH7780 is not set 179# CONFIG_CPU_SUBTYPE_SH7780 is not set
170# CONFIG_CPU_SUBTYPE_SH7785 is not set 180# CONFIG_CPU_SUBTYPE_SH7785 is not set
181# CONFIG_CPU_SUBTYPE_SH7786 is not set
171# CONFIG_CPU_SUBTYPE_SHX3 is not set 182# CONFIG_CPU_SUBTYPE_SHX3 is not set
172# CONFIG_CPU_SUBTYPE_SH7343 is not set 183# CONFIG_CPU_SUBTYPE_SH7343 is not set
173# CONFIG_CPU_SUBTYPE_SH7722 is not set 184# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -206,11 +217,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
206# CONFIG_PHYS_ADDR_T_64BIT is not set 217# CONFIG_PHYS_ADDR_T_64BIT is not set
207CONFIG_ZONE_DMA_FLAG=0 218CONFIG_ZONE_DMA_FLAG=0
208CONFIG_NR_QUICK=2 219CONFIG_NR_QUICK=2
220CONFIG_UNEVICTABLE_LRU=y
209 221
210# 222#
211# Cache configuration 223# Cache configuration
212# 224#
213# CONFIG_SH_DIRECT_MAPPED is not set
214CONFIG_CACHE_WRITEBACK=y 225CONFIG_CACHE_WRITEBACK=y
215# CONFIG_CACHE_WRITETHROUGH is not set 226# CONFIG_CACHE_WRITETHROUGH is not set
216# CONFIG_CACHE_OFF is not set 227# CONFIG_CACHE_OFF is not set
@@ -280,7 +291,6 @@ CONFIG_HEARTBEAT=y
280CONFIG_HZ_1000=y 291CONFIG_HZ_1000=y
281CONFIG_HZ=1000 292CONFIG_HZ=1000
282# CONFIG_SCHED_HRTICK is not set 293# CONFIG_SCHED_HRTICK is not set
283CONFIG_KEXEC=y
284# CONFIG_CRASH_DUMP is not set 294# CONFIG_CRASH_DUMP is not set
285# CONFIG_SECCOMP is not set 295# CONFIG_SECCOMP is not set
286# CONFIG_PREEMPT_NONE is not set 296# CONFIG_PREEMPT_NONE is not set
@@ -322,8 +332,6 @@ CONFIG_NET=y
322# 332#
323# Networking options 333# Networking options
324# 334#
325# CONFIG_NET_NS is not set
326CONFIG_COMPAT_NET_DEV_OPS=y
327CONFIG_PACKET=y 335CONFIG_PACKET=y
328# CONFIG_PACKET_MMAP is not set 336# CONFIG_PACKET_MMAP is not set
329CONFIG_UNIX=y 337CONFIG_UNIX=y
@@ -378,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_LAPB is not set 386# CONFIG_LAPB is not set
379# CONFIG_ECONET is not set 387# CONFIG_ECONET is not set
380# CONFIG_WAN_ROUTER is not set 388# CONFIG_WAN_ROUTER is not set
389# CONFIG_PHONET is not set
381# CONFIG_NET_SCHED is not set 390# CONFIG_NET_SCHED is not set
382# CONFIG_DCB is not set 391# CONFIG_DCB is not set
383 392
@@ -385,18 +394,19 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# Network testing 394# Network testing
386# 395#
387# CONFIG_NET_PKTGEN is not set 396# CONFIG_NET_PKTGEN is not set
397# CONFIG_NET_DROP_MONITOR is not set
388# CONFIG_HAMRADIO is not set 398# CONFIG_HAMRADIO is not set
389# CONFIG_CAN is not set 399# CONFIG_CAN is not set
390# CONFIG_IRDA is not set 400# CONFIG_IRDA is not set
391# CONFIG_BT is not set 401# CONFIG_BT is not set
392# CONFIG_AF_RXRPC is not set 402# CONFIG_AF_RXRPC is not set
393# CONFIG_PHONET is not set
394CONFIG_WIRELESS=y 403CONFIG_WIRELESS=y
395# CONFIG_CFG80211 is not set 404# CONFIG_CFG80211 is not set
396# CONFIG_WIRELESS_OLD_REGULATORY is not set 405# CONFIG_WIRELESS_OLD_REGULATORY is not set
397# CONFIG_WIRELESS_EXT is not set 406# CONFIG_WIRELESS_EXT is not set
398# CONFIG_LIB80211 is not set 407# CONFIG_LIB80211 is not set
399# CONFIG_MAC80211 is not set 408# CONFIG_MAC80211 is not set
409# CONFIG_WIMAX is not set
400# CONFIG_RFKILL is not set 410# CONFIG_RFKILL is not set
401# CONFIG_NET_9P is not set 411# CONFIG_NET_9P is not set
402 412
@@ -419,6 +429,7 @@ CONFIG_MTD=y
419# CONFIG_MTD_DEBUG is not set 429# CONFIG_MTD_DEBUG is not set
420CONFIG_MTD_CONCAT=y 430CONFIG_MTD_CONCAT=y
421CONFIG_MTD_PARTITIONS=y 431CONFIG_MTD_PARTITIONS=y
432# CONFIG_MTD_TESTS is not set
422# CONFIG_MTD_REDBOOT_PARTS is not set 433# CONFIG_MTD_REDBOOT_PARTS is not set
423# CONFIG_MTD_CMDLINE_PARTS is not set 434# CONFIG_MTD_CMDLINE_PARTS is not set
424# CONFIG_MTD_AR7_PARTS is not set 435# CONFIG_MTD_AR7_PARTS is not set
@@ -466,9 +477,7 @@ CONFIG_MTD_CFI_UTIL=y
466# 477#
467# CONFIG_MTD_COMPLEX_MAPPINGS is not set 478# CONFIG_MTD_COMPLEX_MAPPINGS is not set
468CONFIG_MTD_PHYSMAP=y 479CONFIG_MTD_PHYSMAP=y
469CONFIG_MTD_PHYSMAP_START=0x20000000 480# CONFIG_MTD_PHYSMAP_COMPAT is not set
470CONFIG_MTD_PHYSMAP_LEN=0x01000000
471CONFIG_MTD_PHYSMAP_BANKWIDTH=4
472# CONFIG_MTD_PLATRAM is not set 481# CONFIG_MTD_PLATRAM is not set
473 482
474# 483#
@@ -489,6 +498,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4
489# CONFIG_MTD_ONENAND is not set 498# CONFIG_MTD_ONENAND is not set
490 499
491# 500#
501# LPDDR flash memory drivers
502#
503# CONFIG_MTD_LPDDR is not set
504
505#
492# UBI - Unsorted block images 506# UBI - Unsorted block images
493# 507#
494# CONFIG_MTD_UBI is not set 508# CONFIG_MTD_UBI is not set
@@ -506,9 +520,13 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
506# CONFIG_ATA_OVER_ETH is not set 520# CONFIG_ATA_OVER_ETH is not set
507# CONFIG_BLK_DEV_HD is not set 521# CONFIG_BLK_DEV_HD is not set
508CONFIG_MISC_DEVICES=y 522CONFIG_MISC_DEVICES=y
509CONFIG_EEPROM_93CX6=y
510# CONFIG_ENCLOSURE_SERVICES is not set 523# CONFIG_ENCLOSURE_SERVICES is not set
511# CONFIG_C2PORT is not set 524# CONFIG_C2PORT is not set
525
526#
527# EEPROM support
528#
529CONFIG_EEPROM_93CX6=y
512CONFIG_HAVE_IDE=y 530CONFIG_HAVE_IDE=y
513# CONFIG_IDE is not set 531# CONFIG_IDE is not set
514 532
@@ -522,6 +540,7 @@ CONFIG_HAVE_IDE=y
522# CONFIG_ATA is not set 540# CONFIG_ATA is not set
523# CONFIG_MD is not set 541# CONFIG_MD is not set
524CONFIG_NETDEVICES=y 542CONFIG_NETDEVICES=y
543CONFIG_COMPAT_NET_DEV_OPS=y
525# CONFIG_DUMMY is not set 544# CONFIG_DUMMY is not set
526# CONFIG_BONDING is not set 545# CONFIG_BONDING is not set
527# CONFIG_MACVLAN is not set 546# CONFIG_MACVLAN is not set
@@ -534,8 +553,10 @@ CONFIG_MII=y
534# CONFIG_AX88796 is not set 553# CONFIG_AX88796 is not set
535# CONFIG_STNIC is not set 554# CONFIG_STNIC is not set
536CONFIG_SMC91X=y 555CONFIG_SMC91X=y
556# CONFIG_ETHOC is not set
537# CONFIG_SMC911X is not set 557# CONFIG_SMC911X is not set
538# CONFIG_SMSC911X is not set 558# CONFIG_SMSC911X is not set
559# CONFIG_DNET is not set
539# CONFIG_IBM_NEW_EMAC_ZMII is not set 560# CONFIG_IBM_NEW_EMAC_ZMII is not set
540# CONFIG_IBM_NEW_EMAC_RGMII is not set 561# CONFIG_IBM_NEW_EMAC_RGMII is not set
541# CONFIG_IBM_NEW_EMAC_TAH is not set 562# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -552,7 +573,10 @@ CONFIG_SMC91X=y
552# 573#
553# CONFIG_WLAN_PRE80211 is not set 574# CONFIG_WLAN_PRE80211 is not set
554# CONFIG_WLAN_80211 is not set 575# CONFIG_WLAN_80211 is not set
555# CONFIG_IWLWIFI_LEDS is not set 576
577#
578# Enable WiMAX (Networking options) to see the WiMAX drivers
579#
556# CONFIG_WAN is not set 580# CONFIG_WAN is not set
557# CONFIG_PPP is not set 581# CONFIG_PPP is not set
558# CONFIG_SLIP is not set 582# CONFIG_SLIP is not set
@@ -696,6 +720,7 @@ CONFIG_RTC_INTF_DEV=y
696# 720#
697CONFIG_RTC_DRV_SH=y 721CONFIG_RTC_DRV_SH=y
698# CONFIG_DMADEVICES is not set 722# CONFIG_DMADEVICES is not set
723# CONFIG_AUXDISPLAY is not set
699# CONFIG_UIO is not set 724# CONFIG_UIO is not set
700# CONFIG_STAGING is not set 725# CONFIG_STAGING is not set
701 726
@@ -712,6 +737,7 @@ CONFIG_EXT2_FS=y
712CONFIG_FILE_LOCKING=y 737CONFIG_FILE_LOCKING=y
713# CONFIG_XFS_FS is not set 738# CONFIG_XFS_FS is not set
714# CONFIG_OCFS2_FS is not set 739# CONFIG_OCFS2_FS is not set
740# CONFIG_BTRFS_FS is not set
715# CONFIG_DNOTIFY is not set 741# CONFIG_DNOTIFY is not set
716# CONFIG_INOTIFY is not set 742# CONFIG_INOTIFY is not set
717# CONFIG_QUOTA is not set 743# CONFIG_QUOTA is not set
@@ -752,6 +778,7 @@ CONFIG_MISC_FILESYSTEMS=y
752# CONFIG_EFS_FS is not set 778# CONFIG_EFS_FS is not set
753# CONFIG_JFFS2_FS is not set 779# CONFIG_JFFS2_FS is not set
754CONFIG_CRAMFS=y 780CONFIG_CRAMFS=y
781# CONFIG_SQUASHFS is not set
755# CONFIG_VXFS_FS is not set 782# CONFIG_VXFS_FS is not set
756# CONFIG_MINIX_FS is not set 783# CONFIG_MINIX_FS is not set
757# CONFIG_OMFS_FS is not set 784# CONFIG_OMFS_FS is not set
@@ -771,7 +798,6 @@ CONFIG_LOCKD=y
771CONFIG_LOCKD_V4=y 798CONFIG_LOCKD_V4=y
772CONFIG_NFS_COMMON=y 799CONFIG_NFS_COMMON=y
773CONFIG_SUNRPC=y 800CONFIG_SUNRPC=y
774# CONFIG_SUNRPC_REGISTER_V4 is not set
775# CONFIG_RPCSEC_GSS_KRB5 is not set 801# CONFIG_RPCSEC_GSS_KRB5 is not set
776# CONFIG_RPCSEC_GSS_SPKM3 is not set 802# CONFIG_RPCSEC_GSS_SPKM3 is not set
777# CONFIG_SMB_FS is not set 803# CONFIG_SMB_FS is not set
@@ -824,6 +850,7 @@ CONFIG_STACKTRACE=y
824CONFIG_DEBUG_BUGVERBOSE=y 850CONFIG_DEBUG_BUGVERBOSE=y
825# CONFIG_DEBUG_INFO is not set 851# CONFIG_DEBUG_INFO is not set
826CONFIG_DEBUG_VM=y 852CONFIG_DEBUG_VM=y
853# CONFIG_DEBUG_NOMMU_REGIONS is not set
827# CONFIG_DEBUG_WRITECOUNT is not set 854# CONFIG_DEBUG_WRITECOUNT is not set
828# CONFIG_DEBUG_MEMORY_INIT is not set 855# CONFIG_DEBUG_MEMORY_INIT is not set
829CONFIG_DEBUG_LIST=y 856CONFIG_DEBUG_LIST=y
@@ -835,6 +862,7 @@ CONFIG_FRAME_POINTER=y
835# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 862# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
836# CONFIG_FAULT_INJECTION is not set 863# CONFIG_FAULT_INJECTION is not set
837# CONFIG_LATENCYTOP is not set 864# CONFIG_LATENCYTOP is not set
865# CONFIG_PAGE_POISONING is not set
838CONFIG_NOP_TRACER=y 866CONFIG_NOP_TRACER=y
839CONFIG_HAVE_FUNCTION_TRACER=y 867CONFIG_HAVE_FUNCTION_TRACER=y
840CONFIG_HAVE_DYNAMIC_FTRACE=y 868CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -852,7 +880,7 @@ CONFIG_TRACING=y
852# CONFIG_TRACE_BRANCH_PROFILING is not set 880# CONFIG_TRACE_BRANCH_PROFILING is not set
853# CONFIG_STACK_TRACER is not set 881# CONFIG_STACK_TRACER is not set
854# CONFIG_FTRACE_STARTUP_TEST is not set 882# CONFIG_FTRACE_STARTUP_TEST is not set
855# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 883# CONFIG_DYNAMIC_DEBUG is not set
856# CONFIG_SAMPLES is not set 884# CONFIG_SAMPLES is not set
857CONFIG_HAVE_ARCH_KGDB=y 885CONFIG_HAVE_ARCH_KGDB=y
858# CONFIG_KGDB is not set 886# CONFIG_KGDB is not set
@@ -955,6 +983,7 @@ CONFIG_CRYPTO_CRC32C=y
955# Compression 983# Compression
956# 984#
957CONFIG_CRYPTO_DEFLATE=y 985CONFIG_CRYPTO_DEFLATE=y
986# CONFIG_CRYPTO_ZLIB is not set
958CONFIG_CRYPTO_LZO=y 987CONFIG_CRYPTO_LZO=y
959 988
960# 989#
@@ -980,7 +1009,8 @@ CONFIG_ZLIB_INFLATE=y
980CONFIG_ZLIB_DEFLATE=y 1009CONFIG_ZLIB_DEFLATE=y
981CONFIG_LZO_COMPRESS=y 1010CONFIG_LZO_COMPRESS=y
982CONFIG_LZO_DECOMPRESS=y 1011CONFIG_LZO_DECOMPRESS=y
983CONFIG_PLIST=y 1012CONFIG_DECOMPRESS_GZIP=y
984CONFIG_HAS_IOMEM=y 1013CONFIG_HAS_IOMEM=y
985CONFIG_HAS_IOPORT=y 1014CONFIG_HAS_IOPORT=y
986CONFIG_HAS_DMA=y 1015CONFIG_HAS_DMA=y
1016CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index 390052577031..fbb72d029e68 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:33:53 2009 4# Thu Apr 2 18:42:00 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,14 +16,16 @@ CONFIG_GENERIC_IRQ_PROBE=y
16# CONFIG_GENERIC_GPIO is not set 16# CONFIG_GENERIC_GPIO is not set
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19CONFIG_ARCH_SUSPEND_POSSIBLE=y
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_CMT=y
21CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 24CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 30
29# 31#
@@ -41,14 +43,23 @@ CONFIG_POSIX_MQUEUE=y
41# CONFIG_BSD_PROCESS_ACCT is not set 43# CONFIG_BSD_PROCESS_ACCT is not set
42# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
44# CONFIG_IKCONFIG is not set 55# CONFIG_IKCONFIG is not set
45CONFIG_LOG_BUF_SHIFT=14 56CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_CGROUPS is not set
47CONFIG_GROUP_SCHED=y 57CONFIG_GROUP_SCHED=y
48CONFIG_FAIR_GROUP_SCHED=y 58CONFIG_FAIR_GROUP_SCHED=y
49# CONFIG_RT_GROUP_SCHED is not set 59# CONFIG_RT_GROUP_SCHED is not set
50CONFIG_USER_SCHED=y 60CONFIG_USER_SCHED=y
51# CONFIG_CGROUP_SCHED is not set 61# CONFIG_CGROUP_SCHED is not set
62# CONFIG_CGROUPS is not set
52CONFIG_SYSFS_DEPRECATED=y 63CONFIG_SYSFS_DEPRECATED=y
53CONFIG_SYSFS_DEPRECATED_V2=y 64CONFIG_SYSFS_DEPRECATED_V2=y
54# CONFIG_RELAY is not set 65# CONFIG_RELAY is not set
@@ -56,6 +67,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
56# CONFIG_BLK_DEV_INITRD is not set 67# CONFIG_BLK_DEV_INITRD is not set
57CONFIG_CC_OPTIMIZE_FOR_SIZE=y 68CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58CONFIG_SYSCTL=y 69CONFIG_SYSCTL=y
70CONFIG_ANON_INODES=y
59CONFIG_EMBEDDED=y 71CONFIG_EMBEDDED=y
60CONFIG_UID16=y 72CONFIG_UID16=y
61# CONFIG_SYSCTL_SYSCALL is not set 73# CONFIG_SYSCTL_SYSCALL is not set
@@ -65,10 +77,8 @@ CONFIG_HOTPLUG=y
65CONFIG_PRINTK=y 77CONFIG_PRINTK=y
66CONFIG_BUG=y 78CONFIG_BUG=y
67CONFIG_ELF_CORE=y 79CONFIG_ELF_CORE=y
68CONFIG_COMPAT_BRK=y
69CONFIG_BASE_FULL=y 80CONFIG_BASE_FULL=y
70# CONFIG_FUTEX is not set 81# CONFIG_FUTEX is not set
71CONFIG_ANON_INODES=y
72# CONFIG_EPOLL is not set 82# CONFIG_EPOLL is not set
73CONFIG_SIGNALFD=y 83CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y 84CONFIG_TIMERFD=y
@@ -76,6 +86,7 @@ CONFIG_EVENTFD=y
76# CONFIG_SHMEM is not set 86# CONFIG_SHMEM is not set
77CONFIG_AIO=y 87CONFIG_AIO=y
78CONFIG_VM_EVENT_COUNTERS=y 88CONFIG_VM_EVENT_COUNTERS=y
89CONFIG_COMPAT_BRK=y
79CONFIG_SLAB=y 90CONFIG_SLAB=y
80# CONFIG_SLUB is not set 91# CONFIG_SLUB is not set
81# CONFIG_SLOB is not set 92# CONFIG_SLOB is not set
@@ -114,11 +125,6 @@ CONFIG_DEFAULT_DEADLINE=y
114# CONFIG_DEFAULT_CFQ is not set 125# CONFIG_DEFAULT_CFQ is not set
115# CONFIG_DEFAULT_NOOP is not set 126# CONFIG_DEFAULT_NOOP is not set
116CONFIG_DEFAULT_IOSCHED="deadline" 127CONFIG_DEFAULT_IOSCHED="deadline"
117CONFIG_CLASSIC_RCU=y
118# CONFIG_TREE_RCU is not set
119# CONFIG_PREEMPT_RCU is not set
120# CONFIG_TREE_RCU_TRACE is not set
121# CONFIG_PREEMPT_RCU_TRACE is not set
122# CONFIG_FREEZER is not set 128# CONFIG_FREEZER is not set
123 129
124# 130#
@@ -127,6 +133,7 @@ CONFIG_CLASSIC_RCU=y
127CONFIG_CPU_SH4=y 133CONFIG_CPU_SH4=y
128CONFIG_CPU_SH4A=y 134CONFIG_CPU_SH4A=y
129CONFIG_CPU_SH4AL_DSP=y 135CONFIG_CPU_SH4AL_DSP=y
136CONFIG_ARCH_SHMOBILE=y
130# CONFIG_CPU_SUBTYPE_SH7619 is not set 137# CONFIG_CPU_SUBTYPE_SH7619 is not set
131# CONFIG_CPU_SUBTYPE_SH7201 is not set 138# CONFIG_CPU_SUBTYPE_SH7201 is not set
132# CONFIG_CPU_SUBTYPE_SH7203 is not set 139# CONFIG_CPU_SUBTYPE_SH7203 is not set
@@ -155,6 +162,7 @@ CONFIG_CPU_SH4AL_DSP=y
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 162# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 163# CONFIG_CPU_SUBTYPE_SH7780 is not set
157# CONFIG_CPU_SUBTYPE_SH7785 is not set 164# CONFIG_CPU_SUBTYPE_SH7785 is not set
165# CONFIG_CPU_SUBTYPE_SH7786 is not set
158# CONFIG_CPU_SUBTYPE_SHX3 is not set 166# CONFIG_CPU_SUBTYPE_SHX3 is not set
159CONFIG_CPU_SUBTYPE_SH7343=y 167CONFIG_CPU_SUBTYPE_SH7343=y
160# CONFIG_CPU_SUBTYPE_SH7722 is not set 168# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -196,11 +204,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
196CONFIG_ZONE_DMA_FLAG=0 204CONFIG_ZONE_DMA_FLAG=0
197CONFIG_NR_QUICK=2 205CONFIG_NR_QUICK=2
198CONFIG_UNEVICTABLE_LRU=y 206CONFIG_UNEVICTABLE_LRU=y
207CONFIG_HAVE_MLOCK=y
208CONFIG_HAVE_MLOCKED_PAGE_BIT=y
199 209
200# 210#
201# Cache configuration 211# Cache configuration
202# 212#
203# CONFIG_SH_DIRECT_MAPPED is not set
204CONFIG_CACHE_WRITEBACK=y 213CONFIG_CACHE_WRITEBACK=y
205# CONFIG_CACHE_WRITETHROUGH is not set 214# CONFIG_CACHE_WRITETHROUGH is not set
206# CONFIG_CACHE_OFF is not set 215# CONFIG_CACHE_OFF is not set
@@ -227,6 +236,7 @@ CONFIG_SH_7343_SOLUTION_ENGINE=y
227# Timer and clock configuration 236# Timer and clock configuration
228# 237#
229CONFIG_SH_TMU=y 238CONFIG_SH_TMU=y
239# CONFIG_SH_TIMER_CMT is not set
230CONFIG_SH_TIMER_IRQ=16 240CONFIG_SH_TIMER_IRQ=16
231CONFIG_SH_PCLK_FREQ=33333333 241CONFIG_SH_PCLK_FREQ=33333333
232# CONFIG_NO_HZ is not set 242# CONFIG_NO_HZ is not set
@@ -302,7 +312,6 @@ CONFIG_NET=y
302# 312#
303# Networking options 313# Networking options
304# 314#
305CONFIG_COMPAT_NET_DEV_OPS=y
306CONFIG_PACKET=y 315CONFIG_PACKET=y
307CONFIG_PACKET_MMAP=y 316CONFIG_PACKET_MMAP=y
308CONFIG_UNIX=y 317CONFIG_UNIX=y
@@ -353,6 +362,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
353# CONFIG_LAPB is not set 362# CONFIG_LAPB is not set
354# CONFIG_ECONET is not set 363# CONFIG_ECONET is not set
355# CONFIG_WAN_ROUTER is not set 364# CONFIG_WAN_ROUTER is not set
365# CONFIG_PHONET is not set
356# CONFIG_NET_SCHED is not set 366# CONFIG_NET_SCHED is not set
357# CONFIG_DCB is not set 367# CONFIG_DCB is not set
358 368
@@ -365,13 +375,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
365# CONFIG_IRDA is not set 375# CONFIG_IRDA is not set
366# CONFIG_BT is not set 376# CONFIG_BT is not set
367# CONFIG_AF_RXRPC is not set 377# CONFIG_AF_RXRPC is not set
368# CONFIG_PHONET is not set
369CONFIG_WIRELESS=y 378CONFIG_WIRELESS=y
370# CONFIG_CFG80211 is not set 379# CONFIG_CFG80211 is not set
371# CONFIG_WIRELESS_OLD_REGULATORY is not set 380# CONFIG_WIRELESS_OLD_REGULATORY is not set
372# CONFIG_WIRELESS_EXT is not set 381# CONFIG_WIRELESS_EXT is not set
373# CONFIG_LIB80211 is not set 382# CONFIG_LIB80211 is not set
374# CONFIG_MAC80211 is not set 383# CONFIG_MAC80211 is not set
384# CONFIG_WIMAX is not set
375# CONFIG_RFKILL is not set 385# CONFIG_RFKILL is not set
376# CONFIG_NET_9P is not set 386# CONFIG_NET_9P is not set
377 387
@@ -394,6 +404,7 @@ CONFIG_MTD=y
394# CONFIG_MTD_DEBUG is not set 404# CONFIG_MTD_DEBUG is not set
395CONFIG_MTD_CONCAT=y 405CONFIG_MTD_CONCAT=y
396CONFIG_MTD_PARTITIONS=y 406CONFIG_MTD_PARTITIONS=y
407# CONFIG_MTD_TESTS is not set
397# CONFIG_MTD_REDBOOT_PARTS is not set 408# CONFIG_MTD_REDBOOT_PARTS is not set
398# CONFIG_MTD_CMDLINE_PARTS is not set 409# CONFIG_MTD_CMDLINE_PARTS is not set
399# CONFIG_MTD_AR7_PARTS is not set 410# CONFIG_MTD_AR7_PARTS is not set
@@ -441,9 +452,7 @@ CONFIG_MTD_RAM=y
441# 452#
442# CONFIG_MTD_COMPLEX_MAPPINGS is not set 453# CONFIG_MTD_COMPLEX_MAPPINGS is not set
443CONFIG_MTD_PHYSMAP=y 454CONFIG_MTD_PHYSMAP=y
444CONFIG_MTD_PHYSMAP_START=0x0 455# CONFIG_MTD_PHYSMAP_COMPAT is not set
445CONFIG_MTD_PHYSMAP_LEN=0
446CONFIG_MTD_PHYSMAP_BANKWIDTH=0
447# CONFIG_MTD_PLATRAM is not set 456# CONFIG_MTD_PLATRAM is not set
448 457
449# 458#
@@ -464,6 +473,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
464# CONFIG_MTD_ONENAND is not set 473# CONFIG_MTD_ONENAND is not set
465 474
466# 475#
476# LPDDR flash memory drivers
477#
478# CONFIG_MTD_LPDDR is not set
479
480#
467# UBI - Unsorted block images 481# UBI - Unsorted block images
468# 482#
469# CONFIG_MTD_UBI is not set 483# CONFIG_MTD_UBI is not set
@@ -520,9 +534,11 @@ CONFIG_SCSI_WAIT_SCAN=m
520# CONFIG_SCSI_SRP_ATTRS is not set 534# CONFIG_SCSI_SRP_ATTRS is not set
521# CONFIG_SCSI_LOWLEVEL is not set 535# CONFIG_SCSI_LOWLEVEL is not set
522# CONFIG_SCSI_DH is not set 536# CONFIG_SCSI_DH is not set
537# CONFIG_SCSI_OSD_INITIATOR is not set
523# CONFIG_ATA is not set 538# CONFIG_ATA is not set
524# CONFIG_MD is not set 539# CONFIG_MD is not set
525CONFIG_NETDEVICES=y 540CONFIG_NETDEVICES=y
541CONFIG_COMPAT_NET_DEV_OPS=y
526# CONFIG_DUMMY is not set 542# CONFIG_DUMMY is not set
527# CONFIG_BONDING is not set 543# CONFIG_BONDING is not set
528# CONFIG_MACVLAN is not set 544# CONFIG_MACVLAN is not set
@@ -539,7 +555,10 @@ CONFIG_MII=y
539# 555#
540# CONFIG_WLAN_PRE80211 is not set 556# CONFIG_WLAN_PRE80211 is not set
541# CONFIG_WLAN_80211 is not set 557# CONFIG_WLAN_80211 is not set
542# CONFIG_IWLWIFI_LEDS is not set 558
559#
560# Enable WiMAX (Networking options) to see the WiMAX drivers
561#
543 562
544# 563#
545# USB Network Adapters 564# USB Network Adapters
@@ -633,6 +652,7 @@ CONFIG_LEGACY_PTYS=y
633CONFIG_LEGACY_PTY_COUNT=256 652CONFIG_LEGACY_PTY_COUNT=256
634# CONFIG_IPMI_HANDLER is not set 653# CONFIG_IPMI_HANDLER is not set
635CONFIG_HW_RANDOM=y 654CONFIG_HW_RANDOM=y
655# CONFIG_HW_RANDOM_TIMERIOMEM is not set
636# CONFIG_R3964 is not set 656# CONFIG_R3964 is not set
637# CONFIG_RAW_DRIVER is not set 657# CONFIG_RAW_DRIVER is not set
638# CONFIG_TCG_TPM is not set 658# CONFIG_TCG_TPM is not set
@@ -669,12 +689,9 @@ CONFIG_I2C_SH_MOBILE=y
669# Miscellaneous I2C Chip support 689# Miscellaneous I2C Chip support
670# 690#
671# CONFIG_DS1682 is not set 691# CONFIG_DS1682 is not set
672# CONFIG_EEPROM_AT24 is not set
673# CONFIG_EEPROM_LEGACY is not set
674# CONFIG_SENSORS_PCF8574 is not set 692# CONFIG_SENSORS_PCF8574 is not set
675# CONFIG_PCF8575 is not set 693# CONFIG_PCF8575 is not set
676# CONFIG_SENSORS_PCA9539 is not set 694# CONFIG_SENSORS_PCA9539 is not set
677# CONFIG_SENSORS_PCF8591 is not set
678# CONFIG_SENSORS_MAX6875 is not set 695# CONFIG_SENSORS_MAX6875 is not set
679# CONFIG_SENSORS_TSL2550 is not set 696# CONFIG_SENSORS_TSL2550 is not set
680# CONFIG_I2C_DEBUG_CORE is not set 697# CONFIG_I2C_DEBUG_CORE is not set
@@ -706,6 +723,7 @@ CONFIG_SSB_POSSIBLE=y
706# CONFIG_PMIC_DA903X is not set 723# CONFIG_PMIC_DA903X is not set
707# CONFIG_MFD_WM8400 is not set 724# CONFIG_MFD_WM8400 is not set
708# CONFIG_MFD_WM8350_I2C is not set 725# CONFIG_MFD_WM8350_I2C is not set
726# CONFIG_MFD_PCF50633 is not set
709# CONFIG_REGULATOR is not set 727# CONFIG_REGULATOR is not set
710 728
711# 729#
@@ -727,7 +745,7 @@ CONFIG_VIDEO_MEDIA=y
727# 745#
728# CONFIG_MEDIA_ATTACH is not set 746# CONFIG_MEDIA_ATTACH is not set
729CONFIG_MEDIA_TUNER=y 747CONFIG_MEDIA_TUNER=y
730# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set 748# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
731CONFIG_MEDIA_TUNER_SIMPLE=y 749CONFIG_MEDIA_TUNER_SIMPLE=y
732CONFIG_MEDIA_TUNER_TDA8290=y 750CONFIG_MEDIA_TUNER_TDA8290=y
733CONFIG_MEDIA_TUNER_TDA9887=y 751CONFIG_MEDIA_TUNER_TDA9887=y
@@ -736,6 +754,7 @@ CONFIG_MEDIA_TUNER_TEA5767=y
736CONFIG_MEDIA_TUNER_MT20XX=y 754CONFIG_MEDIA_TUNER_MT20XX=y
737CONFIG_MEDIA_TUNER_XC2028=y 755CONFIG_MEDIA_TUNER_XC2028=y
738CONFIG_MEDIA_TUNER_XC5000=y 756CONFIG_MEDIA_TUNER_XC5000=y
757CONFIG_MEDIA_TUNER_MC44S803=y
739CONFIG_VIDEO_V4L2=y 758CONFIG_VIDEO_V4L2=y
740CONFIG_VIDEO_V4L1=y 759CONFIG_VIDEO_V4L1=y
741CONFIG_VIDEO_CAPTURE_DRIVERS=y 760CONFIG_VIDEO_CAPTURE_DRIVERS=y
@@ -757,6 +776,7 @@ CONFIG_USB_GSPCA=m
757# CONFIG_USB_GSPCA_ETOMS is not set 776# CONFIG_USB_GSPCA_ETOMS is not set
758# CONFIG_USB_GSPCA_FINEPIX is not set 777# CONFIG_USB_GSPCA_FINEPIX is not set
759# CONFIG_USB_GSPCA_MARS is not set 778# CONFIG_USB_GSPCA_MARS is not set
779# CONFIG_USB_GSPCA_MR97310A is not set
760# CONFIG_USB_GSPCA_OV519 is not set 780# CONFIG_USB_GSPCA_OV519 is not set
761# CONFIG_USB_GSPCA_OV534 is not set 781# CONFIG_USB_GSPCA_OV534 is not set
762# CONFIG_USB_GSPCA_PAC207 is not set 782# CONFIG_USB_GSPCA_PAC207 is not set
@@ -769,6 +789,8 @@ CONFIG_USB_GSPCA=m
769# CONFIG_USB_GSPCA_SPCA506 is not set 789# CONFIG_USB_GSPCA_SPCA506 is not set
770# CONFIG_USB_GSPCA_SPCA508 is not set 790# CONFIG_USB_GSPCA_SPCA508 is not set
771# CONFIG_USB_GSPCA_SPCA561 is not set 791# CONFIG_USB_GSPCA_SPCA561 is not set
792# CONFIG_USB_GSPCA_SQ905 is not set
793# CONFIG_USB_GSPCA_SQ905C is not set
772# CONFIG_USB_GSPCA_STK014 is not set 794# CONFIG_USB_GSPCA_STK014 is not set
773# CONFIG_USB_GSPCA_SUNPLUS is not set 795# CONFIG_USB_GSPCA_SUNPLUS is not set
774# CONFIG_USB_GSPCA_T613 is not set 796# CONFIG_USB_GSPCA_T613 is not set
@@ -776,6 +798,7 @@ CONFIG_USB_GSPCA=m
776# CONFIG_USB_GSPCA_VC032X is not set 798# CONFIG_USB_GSPCA_VC032X is not set
777# CONFIG_USB_GSPCA_ZC3XX is not set 799# CONFIG_USB_GSPCA_ZC3XX is not set
778# CONFIG_VIDEO_PVRUSB2 is not set 800# CONFIG_VIDEO_PVRUSB2 is not set
801# CONFIG_VIDEO_HDPVR is not set
779# CONFIG_VIDEO_EM28XX is not set 802# CONFIG_VIDEO_EM28XX is not set
780# CONFIG_VIDEO_USBVISION is not set 803# CONFIG_VIDEO_USBVISION is not set
781# CONFIG_USB_VICAM is not set 804# CONFIG_USB_VICAM is not set
@@ -833,6 +856,7 @@ CONFIG_FB_SH_MOBILE_LCDC=m
833# CONFIG_FB_VIRTUAL is not set 856# CONFIG_FB_VIRTUAL is not set
834# CONFIG_FB_METRONOME is not set 857# CONFIG_FB_METRONOME is not set
835# CONFIG_FB_MB862XX is not set 858# CONFIG_FB_MB862XX is not set
859# CONFIG_FB_BROADSHEET is not set
836# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 860# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
837 861
838# 862#
@@ -940,7 +964,9 @@ CONFIG_USB_DEVICE_CLASS=y
940# USB Host Controller Drivers 964# USB Host Controller Drivers
941# 965#
942# CONFIG_USB_C67X00_HCD is not set 966# CONFIG_USB_C67X00_HCD is not set
967# CONFIG_USB_OXU210HP_HCD is not set
943CONFIG_USB_ISP116X_HCD=y 968CONFIG_USB_ISP116X_HCD=y
969# CONFIG_USB_ISP1760_HCD is not set
944# CONFIG_USB_SL811_HCD is not set 970# CONFIG_USB_SL811_HCD is not set
945# CONFIG_USB_R8A66597_HCD is not set 971# CONFIG_USB_R8A66597_HCD is not set
946# CONFIG_USB_HWA_HCD is not set 972# CONFIG_USB_HWA_HCD is not set
@@ -954,11 +980,11 @@ CONFIG_USB_ISP116X_HCD=y
954# CONFIG_USB_TMC is not set 980# CONFIG_USB_TMC is not set
955 981
956# 982#
957# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 983# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
958# 984#
959 985
960# 986#
961# see USB_STORAGE Help for more information 987# also be needed; see USB_STORAGE Help for more info
962# 988#
963# CONFIG_USB_STORAGE is not set 989# CONFIG_USB_STORAGE is not set
964# CONFIG_USB_LIBUSUAL is not set 990# CONFIG_USB_LIBUSUAL is not set
@@ -988,7 +1014,6 @@ CONFIG_USB_ISP116X_HCD=y
988# CONFIG_USB_LED is not set 1014# CONFIG_USB_LED is not set
989# CONFIG_USB_CYPRESS_CY7C63 is not set 1015# CONFIG_USB_CYPRESS_CY7C63 is not set
990# CONFIG_USB_CYTHERM is not set 1016# CONFIG_USB_CYTHERM is not set
991# CONFIG_USB_PHIDGET is not set
992# CONFIG_USB_IDMOUSE is not set 1017# CONFIG_USB_IDMOUSE is not set
993# CONFIG_USB_FTDI_ELAN is not set 1018# CONFIG_USB_FTDI_ELAN is not set
994# CONFIG_USB_APPLEDISPLAY is not set 1019# CONFIG_USB_APPLEDISPLAY is not set
@@ -999,12 +1024,18 @@ CONFIG_USB_ISP116X_HCD=y
999# CONFIG_USB_ISIGHTFW is not set 1024# CONFIG_USB_ISIGHTFW is not set
1000# CONFIG_USB_VST is not set 1025# CONFIG_USB_VST is not set
1001# CONFIG_USB_GADGET is not set 1026# CONFIG_USB_GADGET is not set
1027
1028#
1029# OTG and related infrastructure
1030#
1031# CONFIG_NOP_USB_XCEIV is not set
1002# CONFIG_MMC is not set 1032# CONFIG_MMC is not set
1003# CONFIG_MEMSTICK is not set 1033# CONFIG_MEMSTICK is not set
1004# CONFIG_NEW_LEDS is not set 1034# CONFIG_NEW_LEDS is not set
1005# CONFIG_ACCESSIBILITY is not set 1035# CONFIG_ACCESSIBILITY is not set
1006# CONFIG_RTC_CLASS is not set 1036# CONFIG_RTC_CLASS is not set
1007# CONFIG_DMADEVICES is not set 1037# CONFIG_DMADEVICES is not set
1038# CONFIG_AUXDISPLAY is not set
1008CONFIG_UIO=y 1039CONFIG_UIO=y
1009# CONFIG_UIO_PDRV is not set 1040# CONFIG_UIO_PDRV is not set
1010# CONFIG_UIO_PDRV_GENIRQ is not set 1041# CONFIG_UIO_PDRV_GENIRQ is not set
@@ -1031,6 +1062,7 @@ CONFIG_FS_MBCACHE=y
1031CONFIG_FILE_LOCKING=y 1062CONFIG_FILE_LOCKING=y
1032# CONFIG_XFS_FS is not set 1063# CONFIG_XFS_FS is not set
1033# CONFIG_OCFS2_FS is not set 1064# CONFIG_OCFS2_FS is not set
1065# CONFIG_BTRFS_FS is not set
1034# CONFIG_DNOTIFY is not set 1066# CONFIG_DNOTIFY is not set
1035# CONFIG_INOTIFY is not set 1067# CONFIG_INOTIFY is not set
1036# CONFIG_QUOTA is not set 1068# CONFIG_QUOTA is not set
@@ -1084,6 +1116,7 @@ CONFIG_JFFS2_ZLIB=y
1084CONFIG_JFFS2_RTIME=y 1116CONFIG_JFFS2_RTIME=y
1085# CONFIG_JFFS2_RUBIN is not set 1117# CONFIG_JFFS2_RUBIN is not set
1086CONFIG_CRAMFS=y 1118CONFIG_CRAMFS=y
1119# CONFIG_SQUASHFS is not set
1087# CONFIG_VXFS_FS is not set 1120# CONFIG_VXFS_FS is not set
1088# CONFIG_MINIX_FS is not set 1121# CONFIG_MINIX_FS is not set
1089# CONFIG_OMFS_FS is not set 1122# CONFIG_OMFS_FS is not set
@@ -1105,7 +1138,6 @@ CONFIG_LOCKD_V4=y
1105CONFIG_EXPORTFS=y 1138CONFIG_EXPORTFS=y
1106CONFIG_NFS_COMMON=y 1139CONFIG_NFS_COMMON=y
1107CONFIG_SUNRPC=y 1140CONFIG_SUNRPC=y
1108# CONFIG_SUNRPC_REGISTER_V4 is not set
1109# CONFIG_RPCSEC_GSS_KRB5 is not set 1141# CONFIG_RPCSEC_GSS_KRB5 is not set
1110# CONFIG_RPCSEC_GSS_SPKM3 is not set 1142# CONFIG_RPCSEC_GSS_SPKM3 is not set
1111# CONFIG_SMB_FS is not set 1143# CONFIG_SMB_FS is not set
@@ -1146,7 +1178,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1146# 1178#
1147# Tracers 1179# Tracers
1148# 1180#
1149# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1150# CONFIG_SAMPLES is not set 1181# CONFIG_SAMPLES is not set
1151CONFIG_HAVE_ARCH_KGDB=y 1182CONFIG_HAVE_ARCH_KGDB=y
1152# CONFIG_SH_STANDARD_BIOS is not set 1183# CONFIG_SH_STANDARD_BIOS is not set
@@ -1240,6 +1271,7 @@ CONFIG_CRYPTO=y
1240# Compression 1271# Compression
1241# 1272#
1242# CONFIG_CRYPTO_DEFLATE is not set 1273# CONFIG_CRYPTO_DEFLATE is not set
1274# CONFIG_CRYPTO_ZLIB is not set
1243# CONFIG_CRYPTO_LZO is not set 1275# CONFIG_CRYPTO_LZO is not set
1244 1276
1245# 1277#
@@ -1265,3 +1297,4 @@ CONFIG_ZLIB_DEFLATE=y
1265CONFIG_HAS_IOMEM=y 1297CONFIG_HAS_IOMEM=y
1266CONFIG_HAS_IOPORT=y 1298CONFIG_HAS_IOPORT=y
1267CONFIG_HAS_DMA=y 1299CONFIG_HAS_DMA=y
1300CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig
index 932b0235b1de..125304e80f57 100644
--- a/arch/sh/configs/se7619_defconfig
+++ b/arch/sh/configs/se7619_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:36:46 2009 4# Thu Apr 2 18:44:53 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -18,12 +18,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
18# CONFIG_GENERIC_CLOCKEVENTS is not set 18# CONFIG_GENERIC_CLOCKEVENTS is not set
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
21CONFIG_SYS_SUPPORTS_CMT=y
21CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 24CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 30
29# 31#
@@ -36,15 +38,25 @@ CONFIG_LOCALVERSION=""
36# CONFIG_LOCALVERSION_AUTO is not set 38# CONFIG_LOCALVERSION_AUTO is not set
37# CONFIG_SYSVIPC is not set 39# CONFIG_SYSVIPC is not set
38# CONFIG_BSD_PROCESS_ACCT is not set 40# CONFIG_BSD_PROCESS_ACCT is not set
41
42#
43# RCU Subsystem
44#
45CONFIG_CLASSIC_RCU=y
46# CONFIG_TREE_RCU is not set
47# CONFIG_PREEMPT_RCU is not set
48# CONFIG_TREE_RCU_TRACE is not set
49# CONFIG_PREEMPT_RCU_TRACE is not set
39# CONFIG_IKCONFIG is not set 50# CONFIG_IKCONFIG is not set
40CONFIG_LOG_BUF_SHIFT=14 51CONFIG_LOG_BUF_SHIFT=14
41# CONFIG_CGROUPS is not set
42# CONFIG_GROUP_SCHED is not set 52# CONFIG_GROUP_SCHED is not set
53# CONFIG_CGROUPS is not set
43# CONFIG_RELAY is not set 54# CONFIG_RELAY is not set
44# CONFIG_NAMESPACES is not set 55# CONFIG_NAMESPACES is not set
45# CONFIG_BLK_DEV_INITRD is not set 56# CONFIG_BLK_DEV_INITRD is not set
46CONFIG_CC_OPTIMIZE_FOR_SIZE=y 57CONFIG_CC_OPTIMIZE_FOR_SIZE=y
47CONFIG_SYSCTL=y 58CONFIG_SYSCTL=y
59CONFIG_ANON_INODES=y
48CONFIG_EMBEDDED=y 60CONFIG_EMBEDDED=y
49# CONFIG_UID16 is not set 61# CONFIG_UID16 is not set
50# CONFIG_SYSCTL_SYSCALL is not set 62# CONFIG_SYSCTL_SYSCALL is not set
@@ -53,16 +65,15 @@ CONFIG_EMBEDDED=y
53CONFIG_PRINTK=y 65CONFIG_PRINTK=y
54CONFIG_BUG=y 66CONFIG_BUG=y
55# CONFIG_ELF_CORE is not set 67# CONFIG_ELF_CORE is not set
56CONFIG_COMPAT_BRK=y
57# CONFIG_BASE_FULL is not set 68# CONFIG_BASE_FULL is not set
58# CONFIG_FUTEX is not set 69# CONFIG_FUTEX is not set
59CONFIG_ANON_INODES=y
60# CONFIG_EPOLL is not set 70# CONFIG_EPOLL is not set
61CONFIG_SIGNALFD=y 71CONFIG_SIGNALFD=y
62CONFIG_TIMERFD=y 72CONFIG_TIMERFD=y
63CONFIG_EVENTFD=y 73CONFIG_EVENTFD=y
64CONFIG_AIO=y 74CONFIG_AIO=y
65# CONFIG_VM_EVENT_COUNTERS is not set 75# CONFIG_VM_EVENT_COUNTERS is not set
76CONFIG_COMPAT_BRK=y
66CONFIG_SLAB=y 77CONFIG_SLAB=y
67# CONFIG_SLUB is not set 78# CONFIG_SLUB is not set
68# CONFIG_SLOB is not set 79# CONFIG_SLOB is not set
@@ -93,11 +104,6 @@ CONFIG_IOSCHED_NOOP=y
93# CONFIG_DEFAULT_CFQ is not set 104# CONFIG_DEFAULT_CFQ is not set
94CONFIG_DEFAULT_NOOP=y 105CONFIG_DEFAULT_NOOP=y
95CONFIG_DEFAULT_IOSCHED="noop" 106CONFIG_DEFAULT_IOSCHED="noop"
96CONFIG_CLASSIC_RCU=y
97# CONFIG_TREE_RCU is not set
98# CONFIG_PREEMPT_RCU is not set
99# CONFIG_TREE_RCU_TRACE is not set
100# CONFIG_PREEMPT_RCU_TRACE is not set
101# CONFIG_FREEZER is not set 107# CONFIG_FREEZER is not set
102 108
103# 109#
@@ -132,6 +138,7 @@ CONFIG_CPU_SUBTYPE_SH7619=y
132# CONFIG_CPU_SUBTYPE_SH7770 is not set 138# CONFIG_CPU_SUBTYPE_SH7770 is not set
133# CONFIG_CPU_SUBTYPE_SH7780 is not set 139# CONFIG_CPU_SUBTYPE_SH7780 is not set
134# CONFIG_CPU_SUBTYPE_SH7785 is not set 140# CONFIG_CPU_SUBTYPE_SH7785 is not set
141# CONFIG_CPU_SUBTYPE_SH7786 is not set
135# CONFIG_CPU_SUBTYPE_SHX3 is not set 142# CONFIG_CPU_SUBTYPE_SHX3 is not set
136# CONFIG_CPU_SUBTYPE_SH7343 is not set 143# CONFIG_CPU_SUBTYPE_SH7343 is not set
137# CONFIG_CPU_SUBTYPE_SH7722 is not set 144# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -170,11 +177,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
170# CONFIG_PHYS_ADDR_T_64BIT is not set 177# CONFIG_PHYS_ADDR_T_64BIT is not set
171CONFIG_ZONE_DMA_FLAG=0 178CONFIG_ZONE_DMA_FLAG=0
172CONFIG_NR_QUICK=2 179CONFIG_NR_QUICK=2
180CONFIG_UNEVICTABLE_LRU=y
173 181
174# 182#
175# Cache configuration 183# Cache configuration
176# 184#
177# CONFIG_SH_DIRECT_MAPPED is not set
178# CONFIG_CACHE_WRITEBACK is not set 185# CONFIG_CACHE_WRITEBACK is not set
179CONFIG_CACHE_WRITETHROUGH=y 186CONFIG_CACHE_WRITETHROUGH=y
180# CONFIG_CACHE_OFF is not set 187# CONFIG_CACHE_OFF is not set
@@ -228,7 +235,6 @@ CONFIG_HZ_100=y
228# CONFIG_HZ_1000 is not set 235# CONFIG_HZ_1000 is not set
229CONFIG_HZ=100 236CONFIG_HZ=100
230# CONFIG_SCHED_HRTICK is not set 237# CONFIG_SCHED_HRTICK is not set
231# CONFIG_KEXEC is not set
232# CONFIG_CRASH_DUMP is not set 238# CONFIG_CRASH_DUMP is not set
233# CONFIG_SECCOMP is not set 239# CONFIG_SECCOMP is not set
234CONFIG_PREEMPT_NONE=y 240CONFIG_PREEMPT_NONE=y
@@ -329,9 +335,7 @@ CONFIG_MTD_CFI_UTIL=y
329# 335#
330# CONFIG_MTD_COMPLEX_MAPPINGS is not set 336# CONFIG_MTD_COMPLEX_MAPPINGS is not set
331CONFIG_MTD_PHYSMAP=y 337CONFIG_MTD_PHYSMAP=y
332CONFIG_MTD_PHYSMAP_START=0xa0000000 338# CONFIG_MTD_PHYSMAP_COMPAT is not set
333CONFIG_MTD_PHYSMAP_LEN=0x01000000
334CONFIG_MTD_PHYSMAP_BANKWIDTH=2
335# CONFIG_MTD_SOLUTIONENGINE is not set 339# CONFIG_MTD_SOLUTIONENGINE is not set
336# CONFIG_MTD_PLATRAM is not set 340# CONFIG_MTD_PLATRAM is not set
337 341
@@ -353,6 +357,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
353# CONFIG_MTD_ONENAND is not set 357# CONFIG_MTD_ONENAND is not set
354 358
355# 359#
360# LPDDR flash memory drivers
361#
362# CONFIG_MTD_LPDDR is not set
363
364#
356# UBI - Unsorted block images 365# UBI - Unsorted block images
357# 366#
358# CONFIG_MTD_UBI is not set 367# CONFIG_MTD_UBI is not set
@@ -364,9 +373,13 @@ CONFIG_BLK_DEV=y
364# CONFIG_CDROM_PKTCDVD is not set 373# CONFIG_CDROM_PKTCDVD is not set
365# CONFIG_BLK_DEV_HD is not set 374# CONFIG_BLK_DEV_HD is not set
366CONFIG_MISC_DEVICES=y 375CONFIG_MISC_DEVICES=y
367# CONFIG_EEPROM_93CX6 is not set
368# CONFIG_ENCLOSURE_SERVICES is not set 376# CONFIG_ENCLOSURE_SERVICES is not set
369# CONFIG_C2PORT is not set 377# CONFIG_C2PORT is not set
378
379#
380# EEPROM support
381#
382# CONFIG_EEPROM_93CX6 is not set
370CONFIG_HAVE_IDE=y 383CONFIG_HAVE_IDE=y
371# CONFIG_IDE is not set 384# CONFIG_IDE is not set
372 385
@@ -514,15 +527,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
514# 527#
515 528
516# 529#
517# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 530# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
518# 531#
519# CONFIG_USB_GADGET is not set 532# CONFIG_USB_GADGET is not set
533
534#
535# OTG and related infrastructure
536#
520# CONFIG_MMC is not set 537# CONFIG_MMC is not set
521# CONFIG_MEMSTICK is not set 538# CONFIG_MEMSTICK is not set
522# CONFIG_NEW_LEDS is not set 539# CONFIG_NEW_LEDS is not set
523# CONFIG_ACCESSIBILITY is not set 540# CONFIG_ACCESSIBILITY is not set
524# CONFIG_RTC_CLASS is not set 541# CONFIG_RTC_CLASS is not set
525# CONFIG_DMADEVICES is not set 542# CONFIG_DMADEVICES is not set
543# CONFIG_AUXDISPLAY is not set
526# CONFIG_UIO is not set 544# CONFIG_UIO is not set
527# CONFIG_STAGING is not set 545# CONFIG_STAGING is not set
528 546
@@ -537,6 +555,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
537# CONFIG_FS_POSIX_ACL is not set 555# CONFIG_FS_POSIX_ACL is not set
538CONFIG_FILE_LOCKING=y 556CONFIG_FILE_LOCKING=y
539# CONFIG_XFS_FS is not set 557# CONFIG_XFS_FS is not set
558# CONFIG_BTRFS_FS is not set
540# CONFIG_DNOTIFY is not set 559# CONFIG_DNOTIFY is not set
541# CONFIG_INOTIFY is not set 560# CONFIG_INOTIFY is not set
542# CONFIG_QUOTA is not set 561# CONFIG_QUOTA is not set
@@ -575,6 +594,7 @@ CONFIG_MISC_FILESYSTEMS=y
575# CONFIG_EFS_FS is not set 594# CONFIG_EFS_FS is not set
576# CONFIG_JFFS2_FS is not set 595# CONFIG_JFFS2_FS is not set
577# CONFIG_CRAMFS is not set 596# CONFIG_CRAMFS is not set
597# CONFIG_SQUASHFS is not set
578# CONFIG_VXFS_FS is not set 598# CONFIG_VXFS_FS is not set
579# CONFIG_MINIX_FS is not set 599# CONFIG_MINIX_FS is not set
580# CONFIG_OMFS_FS is not set 600# CONFIG_OMFS_FS is not set
@@ -614,7 +634,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
614# 634#
615# Tracers 635# Tracers
616# 636#
617# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
618# CONFIG_SAMPLES is not set 637# CONFIG_SAMPLES is not set
619CONFIG_HAVE_ARCH_KGDB=y 638CONFIG_HAVE_ARCH_KGDB=y
620# CONFIG_SH_STANDARD_BIOS is not set 639# CONFIG_SH_STANDARD_BIOS is not set
diff --git a/arch/sh/configs/se7705_defconfig b/arch/sh/configs/se7705_defconfig
index 8574d6eb00a3..0308abf52384 100644
--- a/arch/sh/configs/se7705_defconfig
+++ b/arch/sh/configs/se7705_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:37:50 2009 4# Thu Apr 2 18:45:56 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -41,16 +42,30 @@ CONFIG_LOCALVERSION_AUTO=y
41# CONFIG_BSD_PROCESS_ACCT is not set 42# CONFIG_BSD_PROCESS_ACCT is not set
42# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
45
46#
47# RCU Subsystem
48#
49CONFIG_CLASSIC_RCU=y
50# CONFIG_TREE_RCU is not set
51# CONFIG_PREEMPT_RCU is not set
52# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
44# CONFIG_IKCONFIG is not set 54# CONFIG_IKCONFIG is not set
45CONFIG_LOG_BUF_SHIFT=14 55CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_CGROUPS is not set
47# CONFIG_GROUP_SCHED is not set 56# CONFIG_GROUP_SCHED is not set
57# CONFIG_CGROUPS is not set
48# CONFIG_RELAY is not set 58# CONFIG_RELAY is not set
49# CONFIG_NAMESPACES is not set 59# CONFIG_NAMESPACES is not set
50CONFIG_BLK_DEV_INITRD=y 60CONFIG_BLK_DEV_INITRD=y
51CONFIG_INITRAMFS_SOURCE="" 61CONFIG_INITRAMFS_SOURCE=""
62CONFIG_RD_GZIP=y
63# CONFIG_RD_BZIP2 is not set
64# CONFIG_RD_LZMA is not set
65CONFIG_INITRAMFS_COMPRESSION_NONE=y
52# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 66# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
53CONFIG_SYSCTL=y 67CONFIG_SYSCTL=y
68CONFIG_ANON_INODES=y
54CONFIG_EMBEDDED=y 69CONFIG_EMBEDDED=y
55CONFIG_UID16=y 70CONFIG_UID16=y
56# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
@@ -59,10 +74,8 @@ CONFIG_UID16=y
59CONFIG_PRINTK=y 74CONFIG_PRINTK=y
60CONFIG_BUG=y 75CONFIG_BUG=y
61CONFIG_ELF_CORE=y 76CONFIG_ELF_CORE=y
62CONFIG_COMPAT_BRK=y
63CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
64CONFIG_FUTEX=y 78CONFIG_FUTEX=y
65CONFIG_ANON_INODES=y
66CONFIG_EPOLL=y 79CONFIG_EPOLL=y
67CONFIG_SIGNALFD=y 80CONFIG_SIGNALFD=y
68CONFIG_TIMERFD=y 81CONFIG_TIMERFD=y
@@ -70,6 +83,7 @@ CONFIG_EVENTFD=y
70CONFIG_SHMEM=y 83CONFIG_SHMEM=y
71CONFIG_AIO=y 84CONFIG_AIO=y
72CONFIG_VM_EVENT_COUNTERS=y 85CONFIG_VM_EVENT_COUNTERS=y
86CONFIG_COMPAT_BRK=y
73CONFIG_SLAB=y 87CONFIG_SLAB=y
74# CONFIG_SLUB is not set 88# CONFIG_SLUB is not set
75# CONFIG_SLOB is not set 89# CONFIG_SLOB is not set
@@ -106,11 +120,6 @@ CONFIG_DEFAULT_AS=y
106# CONFIG_DEFAULT_CFQ is not set 120# CONFIG_DEFAULT_CFQ is not set
107# CONFIG_DEFAULT_NOOP is not set 121# CONFIG_DEFAULT_NOOP is not set
108CONFIG_DEFAULT_IOSCHED="anticipatory" 122CONFIG_DEFAULT_IOSCHED="anticipatory"
109CONFIG_CLASSIC_RCU=y
110# CONFIG_TREE_RCU is not set
111# CONFIG_PREEMPT_RCU is not set
112# CONFIG_TREE_RCU_TRACE is not set
113# CONFIG_PREEMPT_RCU_TRACE is not set
114# CONFIG_FREEZER is not set 123# CONFIG_FREEZER is not set
115 124
116# 125#
@@ -145,6 +154,7 @@ CONFIG_CPU_SUBTYPE_SH7705=y
145# CONFIG_CPU_SUBTYPE_SH7770 is not set 154# CONFIG_CPU_SUBTYPE_SH7770 is not set
146# CONFIG_CPU_SUBTYPE_SH7780 is not set 155# CONFIG_CPU_SUBTYPE_SH7780 is not set
147# CONFIG_CPU_SUBTYPE_SH7785 is not set 156# CONFIG_CPU_SUBTYPE_SH7785 is not set
157# CONFIG_CPU_SUBTYPE_SH7786 is not set
148# CONFIG_CPU_SUBTYPE_SHX3 is not set 158# CONFIG_CPU_SUBTYPE_SHX3 is not set
149# CONFIG_CPU_SUBTYPE_SH7343 is not set 159# CONFIG_CPU_SUBTYPE_SH7343 is not set
150# CONFIG_CPU_SUBTYPE_SH7722 is not set 160# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -186,12 +196,13 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_ZONE_DMA_FLAG=0 196CONFIG_ZONE_DMA_FLAG=0
187CONFIG_NR_QUICK=2 197CONFIG_NR_QUICK=2
188CONFIG_UNEVICTABLE_LRU=y 198CONFIG_UNEVICTABLE_LRU=y
199CONFIG_HAVE_MLOCK=y
200CONFIG_HAVE_MLOCKED_PAGE_BIT=y
189 201
190# 202#
191# Cache configuration 203# Cache configuration
192# 204#
193CONFIG_SH7705_CACHE_32KB=y 205CONFIG_SH7705_CACHE_32KB=y
194# CONFIG_SH_DIRECT_MAPPED is not set
195CONFIG_CACHE_WRITEBACK=y 206CONFIG_CACHE_WRITEBACK=y
196# CONFIG_CACHE_WRITETHROUGH is not set 207# CONFIG_CACHE_WRITETHROUGH is not set
197# CONFIG_CACHE_OFF is not set 208# CONFIG_CACHE_OFF is not set
@@ -292,7 +303,6 @@ CONFIG_NET=y
292# 303#
293# Networking options 304# Networking options
294# 305#
295CONFIG_COMPAT_NET_DEV_OPS=y
296CONFIG_PACKET=y 306CONFIG_PACKET=y
297# CONFIG_PACKET_MMAP is not set 307# CONFIG_PACKET_MMAP is not set
298CONFIG_UNIX=y 308CONFIG_UNIX=y
@@ -347,6 +357,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
347# CONFIG_LAPB is not set 357# CONFIG_LAPB is not set
348# CONFIG_ECONET is not set 358# CONFIG_ECONET is not set
349# CONFIG_WAN_ROUTER is not set 359# CONFIG_WAN_ROUTER is not set
360# CONFIG_PHONET is not set
350# CONFIG_NET_SCHED is not set 361# CONFIG_NET_SCHED is not set
351# CONFIG_DCB is not set 362# CONFIG_DCB is not set
352 363
@@ -359,13 +370,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
359# CONFIG_IRDA is not set 370# CONFIG_IRDA is not set
360# CONFIG_BT is not set 371# CONFIG_BT is not set
361# CONFIG_AF_RXRPC is not set 372# CONFIG_AF_RXRPC is not set
362# CONFIG_PHONET is not set
363CONFIG_WIRELESS=y 373CONFIG_WIRELESS=y
364# CONFIG_CFG80211 is not set 374# CONFIG_CFG80211 is not set
365# CONFIG_WIRELESS_OLD_REGULATORY is not set 375# CONFIG_WIRELESS_OLD_REGULATORY is not set
366# CONFIG_WIRELESS_EXT is not set 376# CONFIG_WIRELESS_EXT is not set
367# CONFIG_LIB80211 is not set 377# CONFIG_LIB80211 is not set
368# CONFIG_MAC80211 is not set 378# CONFIG_MAC80211 is not set
379# CONFIG_WIMAX is not set
369# CONFIG_RFKILL is not set 380# CONFIG_RFKILL is not set
370# CONFIG_NET_9P is not set 381# CONFIG_NET_9P is not set
371 382
@@ -384,6 +395,7 @@ CONFIG_MTD=y
384# CONFIG_MTD_DEBUG is not set 395# CONFIG_MTD_DEBUG is not set
385# CONFIG_MTD_CONCAT is not set 396# CONFIG_MTD_CONCAT is not set
386CONFIG_MTD_PARTITIONS=y 397CONFIG_MTD_PARTITIONS=y
398# CONFIG_MTD_TESTS is not set
387# CONFIG_MTD_REDBOOT_PARTS is not set 399# CONFIG_MTD_REDBOOT_PARTS is not set
388# CONFIG_MTD_CMDLINE_PARTS is not set 400# CONFIG_MTD_CMDLINE_PARTS is not set
389# CONFIG_MTD_AR7_PARTS is not set 401# CONFIG_MTD_AR7_PARTS is not set
@@ -451,6 +463,11 @@ CONFIG_MTD_CFI_UTIL=y
451# CONFIG_MTD_ONENAND is not set 463# CONFIG_MTD_ONENAND is not set
452 464
453# 465#
466# LPDDR flash memory drivers
467#
468# CONFIG_MTD_LPDDR is not set
469
470#
454# UBI - Unsorted block images 471# UBI - Unsorted block images
455# 472#
456# CONFIG_MTD_UBI is not set 473# CONFIG_MTD_UBI is not set
@@ -467,9 +484,13 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
467# CONFIG_ATA_OVER_ETH is not set 484# CONFIG_ATA_OVER_ETH is not set
468# CONFIG_BLK_DEV_HD is not set 485# CONFIG_BLK_DEV_HD is not set
469CONFIG_MISC_DEVICES=y 486CONFIG_MISC_DEVICES=y
470# CONFIG_EEPROM_93CX6 is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_C2PORT is not set 488# CONFIG_C2PORT is not set
489
490#
491# EEPROM support
492#
493# CONFIG_EEPROM_93CX6 is not set
473CONFIG_HAVE_IDE=y 494CONFIG_HAVE_IDE=y
474# CONFIG_IDE is not set 495# CONFIG_IDE is not set
475 496
@@ -483,6 +504,7 @@ CONFIG_HAVE_IDE=y
483# CONFIG_ATA is not set 504# CONFIG_ATA is not set
484# CONFIG_MD is not set 505# CONFIG_MD is not set
485CONFIG_NETDEVICES=y 506CONFIG_NETDEVICES=y
507CONFIG_COMPAT_NET_DEV_OPS=y
486# CONFIG_DUMMY is not set 508# CONFIG_DUMMY is not set
487# CONFIG_BONDING is not set 509# CONFIG_BONDING is not set
488# CONFIG_MACVLAN is not set 510# CONFIG_MACVLAN is not set
@@ -495,8 +517,10 @@ CONFIG_NET_ETHERNET=y
495# CONFIG_AX88796 is not set 517# CONFIG_AX88796 is not set
496CONFIG_STNIC=y 518CONFIG_STNIC=y
497# CONFIG_SMC91X is not set 519# CONFIG_SMC91X is not set
520# CONFIG_ETHOC is not set
498# CONFIG_SMC911X is not set 521# CONFIG_SMC911X is not set
499# CONFIG_SMSC911X is not set 522# CONFIG_SMSC911X is not set
523# CONFIG_DNET is not set
500# CONFIG_IBM_NEW_EMAC_ZMII is not set 524# CONFIG_IBM_NEW_EMAC_ZMII is not set
501# CONFIG_IBM_NEW_EMAC_RGMII is not set 525# CONFIG_IBM_NEW_EMAC_RGMII is not set
502# CONFIG_IBM_NEW_EMAC_TAH is not set 526# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -513,7 +537,10 @@ CONFIG_NETDEV_10000=y
513# 537#
514# CONFIG_WLAN_PRE80211 is not set 538# CONFIG_WLAN_PRE80211 is not set
515# CONFIG_WLAN_80211 is not set 539# CONFIG_WLAN_80211 is not set
516# CONFIG_IWLWIFI_LEDS is not set 540
541#
542# Enable WiMAX (Networking options) to see the WiMAX drivers
543#
517# CONFIG_WAN is not set 544# CONFIG_WAN is not set
518CONFIG_PPP=y 545CONFIG_PPP=y
519# CONFIG_PPP_MULTILINK is not set 546# CONFIG_PPP_MULTILINK is not set
@@ -593,6 +620,7 @@ CONFIG_UNIX98_PTYS=y
593# CONFIG_LEGACY_PTYS is not set 620# CONFIG_LEGACY_PTYS is not set
594# CONFIG_IPMI_HANDLER is not set 621# CONFIG_IPMI_HANDLER is not set
595CONFIG_HW_RANDOM=y 622CONFIG_HW_RANDOM=y
623# CONFIG_HW_RANDOM_TIMERIOMEM is not set
596# CONFIG_R3964 is not set 624# CONFIG_R3964 is not set
597# CONFIG_RAW_DRIVER is not set 625# CONFIG_RAW_DRIVER is not set
598# CONFIG_TCG_TPM is not set 626# CONFIG_TCG_TPM is not set
@@ -684,15 +712,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
684# 712#
685 713
686# 714#
687# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 715# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
688# 716#
689# CONFIG_USB_GADGET is not set 717# CONFIG_USB_GADGET is not set
718
719#
720# OTG and related infrastructure
721#
690# CONFIG_MMC is not set 722# CONFIG_MMC is not set
691# CONFIG_MEMSTICK is not set 723# CONFIG_MEMSTICK is not set
692# CONFIG_NEW_LEDS is not set 724# CONFIG_NEW_LEDS is not set
693# CONFIG_ACCESSIBILITY is not set 725# CONFIG_ACCESSIBILITY is not set
694# CONFIG_RTC_CLASS is not set 726# CONFIG_RTC_CLASS is not set
695# CONFIG_DMADEVICES is not set 727# CONFIG_DMADEVICES is not set
728# CONFIG_AUXDISPLAY is not set
696# CONFIG_UIO is not set 729# CONFIG_UIO is not set
697# CONFIG_STAGING is not set 730# CONFIG_STAGING is not set
698 731
@@ -709,6 +742,7 @@ CONFIG_EXT2_FS=y
709# CONFIG_FS_POSIX_ACL is not set 742# CONFIG_FS_POSIX_ACL is not set
710CONFIG_FILE_LOCKING=y 743CONFIG_FILE_LOCKING=y
711# CONFIG_XFS_FS is not set 744# CONFIG_XFS_FS is not set
745# CONFIG_BTRFS_FS is not set
712CONFIG_DNOTIFY=y 746CONFIG_DNOTIFY=y
713CONFIG_INOTIFY=y 747CONFIG_INOTIFY=y
714CONFIG_INOTIFY_USER=y 748CONFIG_INOTIFY_USER=y
@@ -761,6 +795,7 @@ CONFIG_JFFS2_ZLIB=y
761CONFIG_JFFS2_RTIME=y 795CONFIG_JFFS2_RTIME=y
762# CONFIG_JFFS2_RUBIN is not set 796# CONFIG_JFFS2_RUBIN is not set
763# CONFIG_CRAMFS is not set 797# CONFIG_CRAMFS is not set
798# CONFIG_SQUASHFS is not set
764# CONFIG_VXFS_FS is not set 799# CONFIG_VXFS_FS is not set
765# CONFIG_MINIX_FS is not set 800# CONFIG_MINIX_FS is not set
766# CONFIG_OMFS_FS is not set 801# CONFIG_OMFS_FS is not set
@@ -778,7 +813,6 @@ CONFIG_ROOT_NFS=y
778CONFIG_LOCKD=y 813CONFIG_LOCKD=y
779CONFIG_NFS_COMMON=y 814CONFIG_NFS_COMMON=y
780CONFIG_SUNRPC=y 815CONFIG_SUNRPC=y
781# CONFIG_SUNRPC_REGISTER_V4 is not set
782# CONFIG_RPCSEC_GSS_KRB5 is not set 816# CONFIG_RPCSEC_GSS_KRB5 is not set
783# CONFIG_RPCSEC_GSS_SPKM3 is not set 817# CONFIG_RPCSEC_GSS_SPKM3 is not set
784# CONFIG_SMB_FS is not set 818# CONFIG_SMB_FS is not set
@@ -817,7 +851,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
817# 851#
818# Tracers 852# Tracers
819# 853#
820# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
821# CONFIG_SAMPLES is not set 854# CONFIG_SAMPLES is not set
822CONFIG_HAVE_ARCH_KGDB=y 855CONFIG_HAVE_ARCH_KGDB=y
823# CONFIG_SH_STANDARD_BIOS is not set 856# CONFIG_SH_STANDARD_BIOS is not set
@@ -908,6 +941,7 @@ CONFIG_CRYPTO=y
908# Compression 941# Compression
909# 942#
910# CONFIG_CRYPTO_DEFLATE is not set 943# CONFIG_CRYPTO_DEFLATE is not set
944# CONFIG_CRYPTO_ZLIB is not set
911# CONFIG_CRYPTO_LZO is not set 945# CONFIG_CRYPTO_LZO is not set
912 946
913# 947#
@@ -930,7 +964,8 @@ CONFIG_CRC32=y
930# CONFIG_LIBCRC32C is not set 964# CONFIG_LIBCRC32C is not set
931CONFIG_ZLIB_INFLATE=y 965CONFIG_ZLIB_INFLATE=y
932CONFIG_ZLIB_DEFLATE=y 966CONFIG_ZLIB_DEFLATE=y
933CONFIG_PLIST=y 967CONFIG_DECOMPRESS_GZIP=y
934CONFIG_HAS_IOMEM=y 968CONFIG_HAS_IOMEM=y
935CONFIG_HAS_IOPORT=y 969CONFIG_HAS_IOPORT=y
936CONFIG_HAS_DMA=y 970CONFIG_HAS_DMA=y
971CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index e31ea84f116d..a8c24b703489 100644
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:40:12 2009 4# Thu Apr 2 18:48:18 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,13 +16,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_GENERIC_TIME=y 16CONFIG_GENERIC_TIME=y
17CONFIG_GENERIC_CLOCKEVENTS=y 17CONFIG_GENERIC_CLOCKEVENTS=y
18# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 18# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
19# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 19CONFIG_ARCH_HIBERNATION_POSSIBLE=y
20CONFIG_STACKTRACE_SUPPORT=y 20CONFIG_STACKTRACE_SUPPORT=y
21CONFIG_LOCKDEP_SUPPORT=y 21CONFIG_LOCKDEP_SUPPORT=y
22CONFIG_HAVE_LATENCYTOP_SUPPORT=y 22CONFIG_HAVE_LATENCYTOP_SUPPORT=y
23# CONFIG_ARCH_HAS_ILOG2_U32 is not set 23# CONFIG_ARCH_HAS_ILOG2_U32 is not set
24# CONFIG_ARCH_HAS_ILOG2_U64 is not set 24# CONFIG_ARCH_HAS_ILOG2_U64 is not set
25CONFIG_ARCH_NO_VIRT_TO_BUS=y 25CONFIG_ARCH_NO_VIRT_TO_BUS=y
26CONFIG_ARCH_HAS_DEFAULT_IDLE=y
26CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
27 28
28# 29#
@@ -41,10 +42,19 @@ CONFIG_BSD_PROCESS_ACCT=y
41# CONFIG_BSD_PROCESS_ACCT_V3 is not set 42# CONFIG_BSD_PROCESS_ACCT_V3 is not set
42# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
45
46#
47# RCU Subsystem
48#
49CONFIG_CLASSIC_RCU=y
50# CONFIG_TREE_RCU is not set
51# CONFIG_PREEMPT_RCU is not set
52# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
44# CONFIG_IKCONFIG is not set 54# CONFIG_IKCONFIG is not set
45CONFIG_LOG_BUF_SHIFT=14 55CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_CGROUPS is not set
47# CONFIG_GROUP_SCHED is not set 56# CONFIG_GROUP_SCHED is not set
57# CONFIG_CGROUPS is not set
48CONFIG_SYSFS_DEPRECATED=y 58CONFIG_SYSFS_DEPRECATED=y
49CONFIG_SYSFS_DEPRECATED_V2=y 59CONFIG_SYSFS_DEPRECATED_V2=y
50# CONFIG_RELAY is not set 60# CONFIG_RELAY is not set
@@ -52,21 +62,19 @@ CONFIG_SYSFS_DEPRECATED_V2=y
52# CONFIG_BLK_DEV_INITRD is not set 62# CONFIG_BLK_DEV_INITRD is not set
53# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 63# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
54CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
55CONFIG_EMBEDDED=y 66CONFIG_EMBEDDED=y
56CONFIG_UID16=y 67CONFIG_UID16=y
57CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
58CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
59CONFIG_KALLSYMS_ALL=y 70CONFIG_KALLSYMS_ALL=y
60CONFIG_KALLSYMS_STRIP_GENERATED=y
61# CONFIG_KALLSYMS_EXTRA_PASS is not set 71# CONFIG_KALLSYMS_EXTRA_PASS is not set
62CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
63CONFIG_PRINTK=y 73CONFIG_PRINTK=y
64# CONFIG_BUG is not set 74# CONFIG_BUG is not set
65CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
66CONFIG_COMPAT_BRK=y
67# CONFIG_BASE_FULL is not set 76# CONFIG_BASE_FULL is not set
68CONFIG_FUTEX=y 77CONFIG_FUTEX=y
69CONFIG_ANON_INODES=y
70CONFIG_EPOLL=y 78CONFIG_EPOLL=y
71CONFIG_SIGNALFD=y 79CONFIG_SIGNALFD=y
72CONFIG_TIMERFD=y 80CONFIG_TIMERFD=y
@@ -74,6 +82,7 @@ CONFIG_EVENTFD=y
74# CONFIG_SHMEM is not set 82# CONFIG_SHMEM is not set
75CONFIG_AIO=y 83CONFIG_AIO=y
76CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_COMPAT_BRK=y
77CONFIG_SLAB=y 86CONFIG_SLAB=y
78# CONFIG_SLUB is not set 87# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 88# CONFIG_SLOB is not set
@@ -112,11 +121,6 @@ CONFIG_IOSCHED_NOOP=y
112# CONFIG_DEFAULT_CFQ is not set 121# CONFIG_DEFAULT_CFQ is not set
113CONFIG_DEFAULT_NOOP=y 122CONFIG_DEFAULT_NOOP=y
114CONFIG_DEFAULT_IOSCHED="noop" 123CONFIG_DEFAULT_IOSCHED="noop"
115CONFIG_CLASSIC_RCU=y
116# CONFIG_TREE_RCU is not set
117# CONFIG_PREEMPT_RCU is not set
118# CONFIG_TREE_RCU_TRACE is not set
119# CONFIG_PREEMPT_RCU_TRACE is not set
120# CONFIG_FREEZER is not set 124# CONFIG_FREEZER is not set
121 125
122# 126#
@@ -151,6 +155,7 @@ CONFIG_CPU_SUBTYPE_SH7712=y
151# CONFIG_CPU_SUBTYPE_SH7770 is not set 155# CONFIG_CPU_SUBTYPE_SH7770 is not set
152# CONFIG_CPU_SUBTYPE_SH7780 is not set 156# CONFIG_CPU_SUBTYPE_SH7780 is not set
153# CONFIG_CPU_SUBTYPE_SH7785 is not set 157# CONFIG_CPU_SUBTYPE_SH7785 is not set
158# CONFIG_CPU_SUBTYPE_SH7786 is not set
154# CONFIG_CPU_SUBTYPE_SHX3 is not set 159# CONFIG_CPU_SUBTYPE_SHX3 is not set
155# CONFIG_CPU_SUBTYPE_SH7343 is not set 160# CONFIG_CPU_SUBTYPE_SH7343 is not set
156# CONFIG_CPU_SUBTYPE_SH7722 is not set 161# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -192,11 +197,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
192CONFIG_ZONE_DMA_FLAG=0 197CONFIG_ZONE_DMA_FLAG=0
193CONFIG_NR_QUICK=2 198CONFIG_NR_QUICK=2
194CONFIG_UNEVICTABLE_LRU=y 199CONFIG_UNEVICTABLE_LRU=y
200CONFIG_HAVE_MLOCK=y
201CONFIG_HAVE_MLOCKED_PAGE_BIT=y
195 202
196# 203#
197# Cache configuration 204# Cache configuration
198# 205#
199# CONFIG_SH_DIRECT_MAPPED is not set
200CONFIG_CACHE_WRITEBACK=y 206CONFIG_CACHE_WRITEBACK=y
201# CONFIG_CACHE_WRITETHROUGH is not set 207# CONFIG_CACHE_WRITETHROUGH is not set
202# CONFIG_CACHE_OFF is not set 208# CONFIG_CACHE_OFF is not set
@@ -300,7 +306,6 @@ CONFIG_NET=y
300# 306#
301# Networking options 307# Networking options
302# 308#
303CONFIG_COMPAT_NET_DEV_OPS=y
304CONFIG_PACKET=y 309CONFIG_PACKET=y
305CONFIG_PACKET_MMAP=y 310CONFIG_PACKET_MMAP=y
306CONFIG_UNIX=y 311CONFIG_UNIX=y
@@ -364,6 +369,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
364# CONFIG_LAPB is not set 369# CONFIG_LAPB is not set
365# CONFIG_ECONET is not set 370# CONFIG_ECONET is not set
366# CONFIG_WAN_ROUTER is not set 371# CONFIG_WAN_ROUTER is not set
372# CONFIG_PHONET is not set
367CONFIG_NET_SCHED=y 373CONFIG_NET_SCHED=y
368 374
369# 375#
@@ -411,7 +417,6 @@ CONFIG_NET_SCH_FIFO=y
411# CONFIG_IRDA is not set 417# CONFIG_IRDA is not set
412# CONFIG_BT is not set 418# CONFIG_BT is not set
413# CONFIG_AF_RXRPC is not set 419# CONFIG_AF_RXRPC is not set
414# CONFIG_PHONET is not set
415CONFIG_FIB_RULES=y 420CONFIG_FIB_RULES=y
416CONFIG_WIRELESS=y 421CONFIG_WIRELESS=y
417# CONFIG_CFG80211 is not set 422# CONFIG_CFG80211 is not set
@@ -419,6 +424,7 @@ CONFIG_WIRELESS=y
419# CONFIG_WIRELESS_EXT is not set 424# CONFIG_WIRELESS_EXT is not set
420# CONFIG_LIB80211 is not set 425# CONFIG_LIB80211 is not set
421# CONFIG_MAC80211 is not set 426# CONFIG_MAC80211 is not set
427# CONFIG_WIMAX is not set
422# CONFIG_RFKILL is not set 428# CONFIG_RFKILL is not set
423# CONFIG_NET_9P is not set 429# CONFIG_NET_9P is not set
424 430
@@ -443,6 +449,7 @@ CONFIG_MTD=y
443# CONFIG_MTD_DEBUG is not set 449# CONFIG_MTD_DEBUG is not set
444CONFIG_MTD_CONCAT=y 450CONFIG_MTD_CONCAT=y
445CONFIG_MTD_PARTITIONS=y 451CONFIG_MTD_PARTITIONS=y
452# CONFIG_MTD_TESTS is not set
446# CONFIG_MTD_REDBOOT_PARTS is not set 453# CONFIG_MTD_REDBOOT_PARTS is not set
447# CONFIG_MTD_CMDLINE_PARTS is not set 454# CONFIG_MTD_CMDLINE_PARTS is not set
448# CONFIG_MTD_AR7_PARTS is not set 455# CONFIG_MTD_AR7_PARTS is not set
@@ -510,6 +517,11 @@ CONFIG_MTD_CFI_UTIL=y
510# CONFIG_MTD_ONENAND is not set 517# CONFIG_MTD_ONENAND is not set
511 518
512# 519#
520# LPDDR flash memory drivers
521#
522# CONFIG_MTD_LPDDR is not set
523
524#
513# UBI - Unsorted block images 525# UBI - Unsorted block images
514# 526#
515# CONFIG_MTD_UBI is not set 527# CONFIG_MTD_UBI is not set
@@ -523,9 +535,13 @@ CONFIG_BLK_DEV=y
523# CONFIG_ATA_OVER_ETH is not set 535# CONFIG_ATA_OVER_ETH is not set
524# CONFIG_BLK_DEV_HD is not set 536# CONFIG_BLK_DEV_HD is not set
525CONFIG_MISC_DEVICES=y 537CONFIG_MISC_DEVICES=y
526# CONFIG_EEPROM_93CX6 is not set
527# CONFIG_ENCLOSURE_SERVICES is not set 538# CONFIG_ENCLOSURE_SERVICES is not set
528# CONFIG_C2PORT is not set 539# CONFIG_C2PORT is not set
540
541#
542# EEPROM support
543#
544# CONFIG_EEPROM_93CX6 is not set
529CONFIG_HAVE_IDE=y 545CONFIG_HAVE_IDE=y
530# CONFIG_IDE is not set 546# CONFIG_IDE is not set
531 547
@@ -571,6 +587,7 @@ CONFIG_SCSI_LOWLEVEL=y
571# CONFIG_LIBFC is not set 587# CONFIG_LIBFC is not set
572# CONFIG_SCSI_DEBUG is not set 588# CONFIG_SCSI_DEBUG is not set
573# CONFIG_SCSI_DH is not set 589# CONFIG_SCSI_DH is not set
590# CONFIG_SCSI_OSD_INITIATOR is not set
574CONFIG_ATA=y 591CONFIG_ATA=y
575# CONFIG_ATA_NONSTANDARD is not set 592# CONFIG_ATA_NONSTANDARD is not set
576CONFIG_SATA_PMP=y 593CONFIG_SATA_PMP=y
@@ -579,6 +596,7 @@ CONFIG_ATA_SFF=y
579CONFIG_PATA_PLATFORM=y 596CONFIG_PATA_PLATFORM=y
580# CONFIG_MD is not set 597# CONFIG_MD is not set
581CONFIG_NETDEVICES=y 598CONFIG_NETDEVICES=y
599CONFIG_COMPAT_NET_DEV_OPS=y
582# CONFIG_DUMMY is not set 600# CONFIG_DUMMY is not set
583# CONFIG_BONDING is not set 601# CONFIG_BONDING is not set
584# CONFIG_MACVLAN is not set 602# CONFIG_MACVLAN is not set
@@ -611,8 +629,10 @@ CONFIG_MII=y
611# CONFIG_STNIC is not set 629# CONFIG_STNIC is not set
612CONFIG_SH_ETH=y 630CONFIG_SH_ETH=y
613# CONFIG_SMC91X is not set 631# CONFIG_SMC91X is not set
632# CONFIG_ETHOC is not set
614# CONFIG_SMC911X is not set 633# CONFIG_SMC911X is not set
615# CONFIG_SMSC911X is not set 634# CONFIG_SMSC911X is not set
635# CONFIG_DNET is not set
616# CONFIG_IBM_NEW_EMAC_ZMII is not set 636# CONFIG_IBM_NEW_EMAC_ZMII is not set
617# CONFIG_IBM_NEW_EMAC_RGMII is not set 637# CONFIG_IBM_NEW_EMAC_RGMII is not set
618# CONFIG_IBM_NEW_EMAC_TAH is not set 638# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -629,7 +649,10 @@ CONFIG_NETDEV_10000=y
629# 649#
630# CONFIG_WLAN_PRE80211 is not set 650# CONFIG_WLAN_PRE80211 is not set
631# CONFIG_WLAN_80211 is not set 651# CONFIG_WLAN_80211 is not set
632# CONFIG_IWLWIFI_LEDS is not set 652
653#
654# Enable WiMAX (Networking options) to see the WiMAX drivers
655#
633# CONFIG_WAN is not set 656# CONFIG_WAN is not set
634# CONFIG_PPP is not set 657# CONFIG_PPP is not set
635# CONFIG_SLIP is not set 658# CONFIG_SLIP is not set
@@ -675,6 +698,7 @@ CONFIG_UNIX98_PTYS=y
675# CONFIG_LEGACY_PTYS is not set 698# CONFIG_LEGACY_PTYS is not set
676# CONFIG_IPMI_HANDLER is not set 699# CONFIG_IPMI_HANDLER is not set
677CONFIG_HW_RANDOM=m 700CONFIG_HW_RANDOM=m
701# CONFIG_HW_RANDOM_TIMERIOMEM is not set
678# CONFIG_R3964 is not set 702# CONFIG_R3964 is not set
679# CONFIG_RAW_DRIVER is not set 703# CONFIG_RAW_DRIVER is not set
680# CONFIG_TCG_TPM is not set 704# CONFIG_TCG_TPM is not set
@@ -744,9 +768,13 @@ CONFIG_USB_ARCH_HAS_HCD=y
744# 768#
745 769
746# 770#
747# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 771# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
748# 772#
749# CONFIG_USB_GADGET is not set 773# CONFIG_USB_GADGET is not set
774
775#
776# OTG and related infrastructure
777#
750# CONFIG_MMC is not set 778# CONFIG_MMC is not set
751# CONFIG_MEMSTICK is not set 779# CONFIG_MEMSTICK is not set
752CONFIG_NEW_LEDS=y 780CONFIG_NEW_LEDS=y
@@ -764,9 +792,14 @@ CONFIG_LEDS_TRIGGERS=y
764# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 792# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
765# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 793# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
766# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set 794# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
795
796#
797# iptables trigger is under Netfilter config (LED target)
798#
767# CONFIG_ACCESSIBILITY is not set 799# CONFIG_ACCESSIBILITY is not set
768# CONFIG_RTC_CLASS is not set 800# CONFIG_RTC_CLASS is not set
769# CONFIG_DMADEVICES is not set 801# CONFIG_DMADEVICES is not set
802# CONFIG_AUXDISPLAY is not set
770# CONFIG_UIO is not set 803# CONFIG_UIO is not set
771# CONFIG_STAGING is not set 804# CONFIG_STAGING is not set
772 805
@@ -791,6 +824,7 @@ CONFIG_FS_POSIX_ACL=y
791CONFIG_FILE_LOCKING=y 824CONFIG_FILE_LOCKING=y
792# CONFIG_XFS_FS is not set 825# CONFIG_XFS_FS is not set
793# CONFIG_OCFS2_FS is not set 826# CONFIG_OCFS2_FS is not set
827# CONFIG_BTRFS_FS is not set
794# CONFIG_DNOTIFY is not set 828# CONFIG_DNOTIFY is not set
795# CONFIG_INOTIFY is not set 829# CONFIG_INOTIFY is not set
796# CONFIG_QUOTA is not set 830# CONFIG_QUOTA is not set
@@ -844,6 +878,7 @@ CONFIG_JFFS2_ZLIB=y
844CONFIG_JFFS2_RTIME=y 878CONFIG_JFFS2_RTIME=y
845# CONFIG_JFFS2_RUBIN is not set 879# CONFIG_JFFS2_RUBIN is not set
846CONFIG_CRAMFS=y 880CONFIG_CRAMFS=y
881# CONFIG_SQUASHFS is not set
847# CONFIG_VXFS_FS is not set 882# CONFIG_VXFS_FS is not set
848# CONFIG_MINIX_FS is not set 883# CONFIG_MINIX_FS is not set
849# CONFIG_OMFS_FS is not set 884# CONFIG_OMFS_FS is not set
@@ -861,7 +896,6 @@ CONFIG_ROOT_NFS=y
861CONFIG_LOCKD=y 896CONFIG_LOCKD=y
862CONFIG_NFS_COMMON=y 897CONFIG_NFS_COMMON=y
863CONFIG_SUNRPC=y 898CONFIG_SUNRPC=y
864# CONFIG_SUNRPC_REGISTER_V4 is not set
865# CONFIG_RPCSEC_GSS_KRB5 is not set 899# CONFIG_RPCSEC_GSS_KRB5 is not set
866# CONFIG_RPCSEC_GSS_SPKM3 is not set 900# CONFIG_RPCSEC_GSS_SPKM3 is not set
867# CONFIG_SMB_FS is not set 901# CONFIG_SMB_FS is not set
@@ -923,6 +957,7 @@ CONFIG_FRAME_POINTER=y
923# CONFIG_FAULT_INJECTION is not set 957# CONFIG_FAULT_INJECTION is not set
924# CONFIG_LATENCYTOP is not set 958# CONFIG_LATENCYTOP is not set
925CONFIG_SYSCTL_SYSCALL_CHECK=y 959CONFIG_SYSCTL_SYSCALL_CHECK=y
960# CONFIG_PAGE_POISONING is not set
926CONFIG_HAVE_FUNCTION_TRACER=y 961CONFIG_HAVE_FUNCTION_TRACER=y
927CONFIG_HAVE_DYNAMIC_FTRACE=y 962CONFIG_HAVE_DYNAMIC_FTRACE=y
928CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 963CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -937,7 +972,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
937# CONFIG_BOOT_TRACER is not set 972# CONFIG_BOOT_TRACER is not set
938# CONFIG_TRACE_BRANCH_PROFILING is not set 973# CONFIG_TRACE_BRANCH_PROFILING is not set
939# CONFIG_STACK_TRACER is not set 974# CONFIG_STACK_TRACER is not set
940# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
941# CONFIG_SAMPLES is not set 975# CONFIG_SAMPLES is not set
942CONFIG_HAVE_ARCH_KGDB=y 976CONFIG_HAVE_ARCH_KGDB=y
943# CONFIG_KGDB is not set 977# CONFIG_KGDB is not set
@@ -974,10 +1008,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
974CONFIG_CRYPTO_HASH=y 1008CONFIG_CRYPTO_HASH=y
975CONFIG_CRYPTO_HASH2=y 1009CONFIG_CRYPTO_HASH2=y
976CONFIG_CRYPTO_RNG2=y 1010CONFIG_CRYPTO_RNG2=y
1011CONFIG_CRYPTO_PCOMP=y
977CONFIG_CRYPTO_MANAGER=y 1012CONFIG_CRYPTO_MANAGER=y
978CONFIG_CRYPTO_MANAGER2=y 1013CONFIG_CRYPTO_MANAGER2=y
979# CONFIG_CRYPTO_GF128MUL is not set 1014# CONFIG_CRYPTO_GF128MUL is not set
980# CONFIG_CRYPTO_NULL is not set 1015# CONFIG_CRYPTO_NULL is not set
1016CONFIG_CRYPTO_WORKQUEUE=y
981# CONFIG_CRYPTO_CRYPTD is not set 1017# CONFIG_CRYPTO_CRYPTD is not set
982CONFIG_CRYPTO_AUTHENC=y 1018CONFIG_CRYPTO_AUTHENC=y
983# CONFIG_CRYPTO_TEST is not set 1019# CONFIG_CRYPTO_TEST is not set
@@ -1046,6 +1082,7 @@ CONFIG_CRYPTO_DES=y
1046# Compression 1082# Compression
1047# 1083#
1048CONFIG_CRYPTO_DEFLATE=y 1084CONFIG_CRYPTO_DEFLATE=y
1085# CONFIG_CRYPTO_ZLIB is not set
1049# CONFIG_CRYPTO_LZO is not set 1086# CONFIG_CRYPTO_LZO is not set
1050 1087
1051# 1088#
@@ -1068,7 +1105,7 @@ CONFIG_CRC32=y
1068# CONFIG_LIBCRC32C is not set 1105# CONFIG_LIBCRC32C is not set
1069CONFIG_ZLIB_INFLATE=y 1106CONFIG_ZLIB_INFLATE=y
1070CONFIG_ZLIB_DEFLATE=y 1107CONFIG_ZLIB_DEFLATE=y
1071CONFIG_PLIST=y
1072CONFIG_HAS_IOMEM=y 1108CONFIG_HAS_IOMEM=y
1073CONFIG_HAS_IOPORT=y 1109CONFIG_HAS_IOPORT=y
1074CONFIG_HAS_DMA=y 1110CONFIG_HAS_DMA=y
1111CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig
index ad1bace3ad46..4b79c2567dc8 100644
--- a/arch/sh/configs/se7721_defconfig
+++ b/arch/sh/configs/se7721_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:43:33 2009 4# Thu Apr 2 18:51:44 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,13 +16,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_GENERIC_TIME=y 16CONFIG_GENERIC_TIME=y
17CONFIG_GENERIC_CLOCKEVENTS=y 17CONFIG_GENERIC_CLOCKEVENTS=y
18# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 18# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
19# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 19CONFIG_ARCH_HIBERNATION_POSSIBLE=y
20CONFIG_STACKTRACE_SUPPORT=y 20CONFIG_STACKTRACE_SUPPORT=y
21CONFIG_LOCKDEP_SUPPORT=y 21CONFIG_LOCKDEP_SUPPORT=y
22CONFIG_HAVE_LATENCYTOP_SUPPORT=y 22CONFIG_HAVE_LATENCYTOP_SUPPORT=y
23# CONFIG_ARCH_HAS_ILOG2_U32 is not set 23# CONFIG_ARCH_HAS_ILOG2_U32 is not set
24# CONFIG_ARCH_HAS_ILOG2_U64 is not set 24# CONFIG_ARCH_HAS_ILOG2_U64 is not set
25CONFIG_ARCH_NO_VIRT_TO_BUS=y 25CONFIG_ARCH_NO_VIRT_TO_BUS=y
26CONFIG_ARCH_HAS_DEFAULT_IDLE=y
26CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
27 28
28# 29#
@@ -41,14 +42,23 @@ CONFIG_BSD_PROCESS_ACCT=y
41# CONFIG_BSD_PROCESS_ACCT_V3 is not set 42# CONFIG_BSD_PROCESS_ACCT_V3 is not set
42# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
45
46#
47# RCU Subsystem
48#
49CONFIG_CLASSIC_RCU=y
50# CONFIG_TREE_RCU is not set
51# CONFIG_PREEMPT_RCU is not set
52# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
44# CONFIG_IKCONFIG is not set 54# CONFIG_IKCONFIG is not set
45CONFIG_LOG_BUF_SHIFT=14 55CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_CGROUPS is not set
47CONFIG_GROUP_SCHED=y 56CONFIG_GROUP_SCHED=y
48CONFIG_FAIR_GROUP_SCHED=y 57CONFIG_FAIR_GROUP_SCHED=y
49# CONFIG_RT_GROUP_SCHED is not set 58# CONFIG_RT_GROUP_SCHED is not set
50CONFIG_USER_SCHED=y 59CONFIG_USER_SCHED=y
51# CONFIG_CGROUP_SCHED is not set 60# CONFIG_CGROUP_SCHED is not set
61# CONFIG_CGROUPS is not set
52CONFIG_SYSFS_DEPRECATED=y 62CONFIG_SYSFS_DEPRECATED=y
53CONFIG_SYSFS_DEPRECATED_V2=y 63CONFIG_SYSFS_DEPRECATED_V2=y
54# CONFIG_RELAY is not set 64# CONFIG_RELAY is not set
@@ -56,21 +66,19 @@ CONFIG_SYSFS_DEPRECATED_V2=y
56# CONFIG_BLK_DEV_INITRD is not set 66# CONFIG_BLK_DEV_INITRD is not set
57# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 67# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
58CONFIG_SYSCTL=y 68CONFIG_SYSCTL=y
69CONFIG_ANON_INODES=y
59CONFIG_EMBEDDED=y 70CONFIG_EMBEDDED=y
60CONFIG_UID16=y 71CONFIG_UID16=y
61CONFIG_SYSCTL_SYSCALL=y 72CONFIG_SYSCTL_SYSCALL=y
62CONFIG_KALLSYMS=y 73CONFIG_KALLSYMS=y
63CONFIG_KALLSYMS_ALL=y 74CONFIG_KALLSYMS_ALL=y
64CONFIG_KALLSYMS_STRIP_GENERATED=y
65# CONFIG_KALLSYMS_EXTRA_PASS is not set 75# CONFIG_KALLSYMS_EXTRA_PASS is not set
66CONFIG_HOTPLUG=y 76CONFIG_HOTPLUG=y
67CONFIG_PRINTK=y 77CONFIG_PRINTK=y
68# CONFIG_BUG is not set 78# CONFIG_BUG is not set
69CONFIG_ELF_CORE=y 79CONFIG_ELF_CORE=y
70CONFIG_COMPAT_BRK=y
71# CONFIG_BASE_FULL is not set 80# CONFIG_BASE_FULL is not set
72CONFIG_FUTEX=y 81CONFIG_FUTEX=y
73CONFIG_ANON_INODES=y
74CONFIG_EPOLL=y 82CONFIG_EPOLL=y
75CONFIG_SIGNALFD=y 83CONFIG_SIGNALFD=y
76CONFIG_TIMERFD=y 84CONFIG_TIMERFD=y
@@ -78,6 +86,7 @@ CONFIG_EVENTFD=y
78# CONFIG_SHMEM is not set 86# CONFIG_SHMEM is not set
79CONFIG_AIO=y 87CONFIG_AIO=y
80CONFIG_VM_EVENT_COUNTERS=y 88CONFIG_VM_EVENT_COUNTERS=y
89CONFIG_COMPAT_BRK=y
81CONFIG_SLAB=y 90CONFIG_SLAB=y
82# CONFIG_SLUB is not set 91# CONFIG_SLUB is not set
83# CONFIG_SLOB is not set 92# CONFIG_SLOB is not set
@@ -116,11 +125,6 @@ CONFIG_IOSCHED_NOOP=y
116# CONFIG_DEFAULT_CFQ is not set 125# CONFIG_DEFAULT_CFQ is not set
117CONFIG_DEFAULT_NOOP=y 126CONFIG_DEFAULT_NOOP=y
118CONFIG_DEFAULT_IOSCHED="noop" 127CONFIG_DEFAULT_IOSCHED="noop"
119CONFIG_CLASSIC_RCU=y
120# CONFIG_TREE_RCU is not set
121# CONFIG_PREEMPT_RCU is not set
122# CONFIG_TREE_RCU_TRACE is not set
123# CONFIG_PREEMPT_RCU_TRACE is not set
124# CONFIG_FREEZER is not set 128# CONFIG_FREEZER is not set
125 129
126# 130#
@@ -155,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7721=y
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 159# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 160# CONFIG_CPU_SUBTYPE_SH7780 is not set
157# CONFIG_CPU_SUBTYPE_SH7785 is not set 161# CONFIG_CPU_SUBTYPE_SH7785 is not set
162# CONFIG_CPU_SUBTYPE_SH7786 is not set
158# CONFIG_CPU_SUBTYPE_SHX3 is not set 163# CONFIG_CPU_SUBTYPE_SHX3 is not set
159# CONFIG_CPU_SUBTYPE_SH7343 is not set 164# CONFIG_CPU_SUBTYPE_SH7343 is not set
160# CONFIG_CPU_SUBTYPE_SH7722 is not set 165# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -196,11 +201,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
196CONFIG_ZONE_DMA_FLAG=0 201CONFIG_ZONE_DMA_FLAG=0
197CONFIG_NR_QUICK=2 202CONFIG_NR_QUICK=2
198CONFIG_UNEVICTABLE_LRU=y 203CONFIG_UNEVICTABLE_LRU=y
204CONFIG_HAVE_MLOCK=y
205CONFIG_HAVE_MLOCKED_PAGE_BIT=y
199 206
200# 207#
201# Cache configuration 208# Cache configuration
202# 209#
203# CONFIG_SH_DIRECT_MAPPED is not set
204CONFIG_CACHE_WRITEBACK=y 210CONFIG_CACHE_WRITEBACK=y
205# CONFIG_CACHE_WRITETHROUGH is not set 211# CONFIG_CACHE_WRITETHROUGH is not set
206# CONFIG_CACHE_OFF is not set 212# CONFIG_CACHE_OFF is not set
@@ -303,7 +309,6 @@ CONFIG_NET=y
303# 309#
304# Networking options 310# Networking options
305# 311#
306CONFIG_COMPAT_NET_DEV_OPS=y
307CONFIG_PACKET=y 312CONFIG_PACKET=y
308CONFIG_PACKET_MMAP=y 313CONFIG_PACKET_MMAP=y
309CONFIG_UNIX=y 314CONFIG_UNIX=y
@@ -367,6 +372,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
367# CONFIG_LAPB is not set 372# CONFIG_LAPB is not set
368# CONFIG_ECONET is not set 373# CONFIG_ECONET is not set
369# CONFIG_WAN_ROUTER is not set 374# CONFIG_WAN_ROUTER is not set
375# CONFIG_PHONET is not set
370CONFIG_NET_SCHED=y 376CONFIG_NET_SCHED=y
371 377
372# 378#
@@ -414,7 +420,6 @@ CONFIG_NET_SCH_FIFO=y
414# CONFIG_IRDA is not set 420# CONFIG_IRDA is not set
415# CONFIG_BT is not set 421# CONFIG_BT is not set
416# CONFIG_AF_RXRPC is not set 422# CONFIG_AF_RXRPC is not set
417# CONFIG_PHONET is not set
418CONFIG_FIB_RULES=y 423CONFIG_FIB_RULES=y
419CONFIG_WIRELESS=y 424CONFIG_WIRELESS=y
420# CONFIG_CFG80211 is not set 425# CONFIG_CFG80211 is not set
@@ -422,6 +427,7 @@ CONFIG_WIRELESS=y
422# CONFIG_WIRELESS_EXT is not set 427# CONFIG_WIRELESS_EXT is not set
423# CONFIG_LIB80211 is not set 428# CONFIG_LIB80211 is not set
424# CONFIG_MAC80211 is not set 429# CONFIG_MAC80211 is not set
430# CONFIG_WIMAX is not set
425# CONFIG_RFKILL is not set 431# CONFIG_RFKILL is not set
426# CONFIG_NET_9P is not set 432# CONFIG_NET_9P is not set
427 433
@@ -446,6 +452,7 @@ CONFIG_MTD=y
446# CONFIG_MTD_DEBUG is not set 452# CONFIG_MTD_DEBUG is not set
447CONFIG_MTD_CONCAT=y 453CONFIG_MTD_CONCAT=y
448CONFIG_MTD_PARTITIONS=y 454CONFIG_MTD_PARTITIONS=y
455# CONFIG_MTD_TESTS is not set
449# CONFIG_MTD_REDBOOT_PARTS is not set 456# CONFIG_MTD_REDBOOT_PARTS is not set
450# CONFIG_MTD_CMDLINE_PARTS is not set 457# CONFIG_MTD_CMDLINE_PARTS is not set
451# CONFIG_MTD_AR7_PARTS is not set 458# CONFIG_MTD_AR7_PARTS is not set
@@ -513,6 +520,11 @@ CONFIG_MTD_CFI_UTIL=y
513# CONFIG_MTD_ONENAND is not set 520# CONFIG_MTD_ONENAND is not set
514 521
515# 522#
523# LPDDR flash memory drivers
524#
525# CONFIG_MTD_LPDDR is not set
526
527#
516# UBI - Unsorted block images 528# UBI - Unsorted block images
517# 529#
518# CONFIG_MTD_UBI is not set 530# CONFIG_MTD_UBI is not set
@@ -527,9 +539,13 @@ CONFIG_BLK_DEV=y
527# CONFIG_ATA_OVER_ETH is not set 539# CONFIG_ATA_OVER_ETH is not set
528# CONFIG_BLK_DEV_HD is not set 540# CONFIG_BLK_DEV_HD is not set
529CONFIG_MISC_DEVICES=y 541CONFIG_MISC_DEVICES=y
530# CONFIG_EEPROM_93CX6 is not set
531# CONFIG_ENCLOSURE_SERVICES is not set 542# CONFIG_ENCLOSURE_SERVICES is not set
532# CONFIG_C2PORT is not set 543# CONFIG_C2PORT is not set
544
545#
546# EEPROM support
547#
548# CONFIG_EEPROM_93CX6 is not set
533CONFIG_HAVE_IDE=y 549CONFIG_HAVE_IDE=y
534# CONFIG_IDE is not set 550# CONFIG_IDE is not set
535 551
@@ -572,6 +588,7 @@ CONFIG_SCSI_WAIT_SCAN=m
572# CONFIG_SCSI_SRP_ATTRS is not set 588# CONFIG_SCSI_SRP_ATTRS is not set
573# CONFIG_SCSI_LOWLEVEL is not set 589# CONFIG_SCSI_LOWLEVEL is not set
574# CONFIG_SCSI_DH is not set 590# CONFIG_SCSI_DH is not set
591# CONFIG_SCSI_OSD_INITIATOR is not set
575CONFIG_ATA=y 592CONFIG_ATA=y
576# CONFIG_ATA_NONSTANDARD is not set 593# CONFIG_ATA_NONSTANDARD is not set
577CONFIG_SATA_PMP=y 594CONFIG_SATA_PMP=y
@@ -580,6 +597,7 @@ CONFIG_ATA_SFF=y
580CONFIG_PATA_PLATFORM=y 597CONFIG_PATA_PLATFORM=y
581# CONFIG_MD is not set 598# CONFIG_MD is not set
582CONFIG_NETDEVICES=y 599CONFIG_NETDEVICES=y
600CONFIG_COMPAT_NET_DEV_OPS=y
583# CONFIG_DUMMY is not set 601# CONFIG_DUMMY is not set
584# CONFIG_BONDING is not set 602# CONFIG_BONDING is not set
585# CONFIG_MACVLAN is not set 603# CONFIG_MACVLAN is not set
@@ -595,7 +613,10 @@ CONFIG_NETDEV_10000=y
595# 613#
596# CONFIG_WLAN_PRE80211 is not set 614# CONFIG_WLAN_PRE80211 is not set
597# CONFIG_WLAN_80211 is not set 615# CONFIG_WLAN_80211 is not set
598# CONFIG_IWLWIFI_LEDS is not set 616
617#
618# Enable WiMAX (Networking options) to see the WiMAX drivers
619#
599 620
600# 621#
601# USB Network Adapters 622# USB Network Adapters
@@ -805,7 +826,9 @@ CONFIG_USB_MON=y
805# USB Host Controller Drivers 826# USB Host Controller Drivers
806# 827#
807# CONFIG_USB_C67X00_HCD is not set 828# CONFIG_USB_C67X00_HCD is not set
829# CONFIG_USB_OXU210HP_HCD is not set
808# CONFIG_USB_ISP116X_HCD is not set 830# CONFIG_USB_ISP116X_HCD is not set
831# CONFIG_USB_ISP1760_HCD is not set
809CONFIG_USB_OHCI_HCD=y 832CONFIG_USB_OHCI_HCD=y
810# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 833# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
811# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 834# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -823,18 +846,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
823# CONFIG_USB_TMC is not set 846# CONFIG_USB_TMC is not set
824 847
825# 848#
826# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 849# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
827# 850#
828 851
829# 852#
830# see USB_STORAGE Help for more information 853# also be needed; see USB_STORAGE Help for more info
831# 854#
832CONFIG_USB_STORAGE=y 855CONFIG_USB_STORAGE=y
833# CONFIG_USB_STORAGE_DEBUG is not set 856# CONFIG_USB_STORAGE_DEBUG is not set
834# CONFIG_USB_STORAGE_DATAFAB is not set 857# CONFIG_USB_STORAGE_DATAFAB is not set
835# CONFIG_USB_STORAGE_FREECOM is not set 858# CONFIG_USB_STORAGE_FREECOM is not set
836# CONFIG_USB_STORAGE_ISD200 is not set 859# CONFIG_USB_STORAGE_ISD200 is not set
837# CONFIG_USB_STORAGE_DPCM is not set
838# CONFIG_USB_STORAGE_USBAT is not set 860# CONFIG_USB_STORAGE_USBAT is not set
839# CONFIG_USB_STORAGE_SDDR09 is not set 861# CONFIG_USB_STORAGE_SDDR09 is not set
840# CONFIG_USB_STORAGE_SDDR55 is not set 862# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -870,7 +892,6 @@ CONFIG_USB_STORAGE=y
870# CONFIG_USB_LED is not set 892# CONFIG_USB_LED is not set
871# CONFIG_USB_CYPRESS_CY7C63 is not set 893# CONFIG_USB_CYPRESS_CY7C63 is not set
872# CONFIG_USB_CYTHERM is not set 894# CONFIG_USB_CYTHERM is not set
873# CONFIG_USB_PHIDGET is not set
874# CONFIG_USB_IDMOUSE is not set 895# CONFIG_USB_IDMOUSE is not set
875# CONFIG_USB_FTDI_ELAN is not set 896# CONFIG_USB_FTDI_ELAN is not set
876# CONFIG_USB_APPLEDISPLAY is not set 897# CONFIG_USB_APPLEDISPLAY is not set
@@ -880,6 +901,11 @@ CONFIG_USB_STORAGE=y
880# CONFIG_USB_ISIGHTFW is not set 901# CONFIG_USB_ISIGHTFW is not set
881# CONFIG_USB_VST is not set 902# CONFIG_USB_VST is not set
882# CONFIG_USB_GADGET is not set 903# CONFIG_USB_GADGET is not set
904
905#
906# OTG and related infrastructure
907#
908# CONFIG_NOP_USB_XCEIV is not set
883# CONFIG_MMC is not set 909# CONFIG_MMC is not set
884# CONFIG_MEMSTICK is not set 910# CONFIG_MEMSTICK is not set
885CONFIG_NEW_LEDS=y 911CONFIG_NEW_LEDS=y
@@ -897,9 +923,14 @@ CONFIG_LEDS_TRIGGERS=y
897# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 923# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
898# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 924# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
899# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set 925# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
926
927#
928# iptables trigger is under Netfilter config (LED target)
929#
900# CONFIG_ACCESSIBILITY is not set 930# CONFIG_ACCESSIBILITY is not set
901# CONFIG_RTC_CLASS is not set 931# CONFIG_RTC_CLASS is not set
902# CONFIG_DMADEVICES is not set 932# CONFIG_DMADEVICES is not set
933# CONFIG_AUXDISPLAY is not set
903# CONFIG_UIO is not set 934# CONFIG_UIO is not set
904# CONFIG_STAGING is not set 935# CONFIG_STAGING is not set
905 936
@@ -924,6 +955,7 @@ CONFIG_FS_POSIX_ACL=y
924CONFIG_FILE_LOCKING=y 955CONFIG_FILE_LOCKING=y
925# CONFIG_XFS_FS is not set 956# CONFIG_XFS_FS is not set
926# CONFIG_OCFS2_FS is not set 957# CONFIG_OCFS2_FS is not set
958# CONFIG_BTRFS_FS is not set
927# CONFIG_DNOTIFY is not set 959# CONFIG_DNOTIFY is not set
928# CONFIG_INOTIFY is not set 960# CONFIG_INOTIFY is not set
929# CONFIG_QUOTA is not set 961# CONFIG_QUOTA is not set
@@ -980,6 +1012,7 @@ CONFIG_JFFS2_ZLIB=y
980CONFIG_JFFS2_RTIME=y 1012CONFIG_JFFS2_RTIME=y
981# CONFIG_JFFS2_RUBIN is not set 1013# CONFIG_JFFS2_RUBIN is not set
982CONFIG_CRAMFS=y 1014CONFIG_CRAMFS=y
1015# CONFIG_SQUASHFS is not set
983# CONFIG_VXFS_FS is not set 1016# CONFIG_VXFS_FS is not set
984# CONFIG_MINIX_FS is not set 1017# CONFIG_MINIX_FS is not set
985# CONFIG_OMFS_FS is not set 1018# CONFIG_OMFS_FS is not set
@@ -1082,6 +1115,7 @@ CONFIG_FRAME_POINTER=y
1082# CONFIG_FAULT_INJECTION is not set 1115# CONFIG_FAULT_INJECTION is not set
1083# CONFIG_LATENCYTOP is not set 1116# CONFIG_LATENCYTOP is not set
1084# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1117# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1118# CONFIG_PAGE_POISONING is not set
1085CONFIG_HAVE_FUNCTION_TRACER=y 1119CONFIG_HAVE_FUNCTION_TRACER=y
1086CONFIG_HAVE_DYNAMIC_FTRACE=y 1120CONFIG_HAVE_DYNAMIC_FTRACE=y
1087CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1121CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -1096,7 +1130,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1096# CONFIG_BOOT_TRACER is not set 1130# CONFIG_BOOT_TRACER is not set
1097# CONFIG_TRACE_BRANCH_PROFILING is not set 1131# CONFIG_TRACE_BRANCH_PROFILING is not set
1098# CONFIG_STACK_TRACER is not set 1132# CONFIG_STACK_TRACER is not set
1099# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1100# CONFIG_SAMPLES is not set 1133# CONFIG_SAMPLES is not set
1101CONFIG_HAVE_ARCH_KGDB=y 1134CONFIG_HAVE_ARCH_KGDB=y
1102# CONFIG_KGDB is not set 1135# CONFIG_KGDB is not set
@@ -1133,10 +1166,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1133CONFIG_CRYPTO_HASH=y 1166CONFIG_CRYPTO_HASH=y
1134CONFIG_CRYPTO_HASH2=y 1167CONFIG_CRYPTO_HASH2=y
1135CONFIG_CRYPTO_RNG2=y 1168CONFIG_CRYPTO_RNG2=y
1169CONFIG_CRYPTO_PCOMP=y
1136CONFIG_CRYPTO_MANAGER=y 1170CONFIG_CRYPTO_MANAGER=y
1137CONFIG_CRYPTO_MANAGER2=y 1171CONFIG_CRYPTO_MANAGER2=y
1138# CONFIG_CRYPTO_GF128MUL is not set 1172# CONFIG_CRYPTO_GF128MUL is not set
1139# CONFIG_CRYPTO_NULL is not set 1173# CONFIG_CRYPTO_NULL is not set
1174CONFIG_CRYPTO_WORKQUEUE=y
1140# CONFIG_CRYPTO_CRYPTD is not set 1175# CONFIG_CRYPTO_CRYPTD is not set
1141CONFIG_CRYPTO_AUTHENC=y 1176CONFIG_CRYPTO_AUTHENC=y
1142# CONFIG_CRYPTO_TEST is not set 1177# CONFIG_CRYPTO_TEST is not set
@@ -1205,6 +1240,7 @@ CONFIG_CRYPTO_DES=y
1205# Compression 1240# Compression
1206# 1241#
1207CONFIG_CRYPTO_DEFLATE=y 1242CONFIG_CRYPTO_DEFLATE=y
1243# CONFIG_CRYPTO_ZLIB is not set
1208# CONFIG_CRYPTO_LZO is not set 1244# CONFIG_CRYPTO_LZO is not set
1209 1245
1210# 1246#
@@ -1227,7 +1263,7 @@ CONFIG_CRC32=y
1227# CONFIG_LIBCRC32C is not set 1263# CONFIG_LIBCRC32C is not set
1228CONFIG_ZLIB_INFLATE=y 1264CONFIG_ZLIB_INFLATE=y
1229CONFIG_ZLIB_DEFLATE=y 1265CONFIG_ZLIB_DEFLATE=y
1230CONFIG_PLIST=y
1231CONFIG_HAS_IOMEM=y 1266CONFIG_HAS_IOMEM=y
1232CONFIG_HAS_IOPORT=y 1267CONFIG_HAS_IOPORT=y
1233CONFIG_HAS_DMA=y 1268CONFIG_HAS_DMA=y
1269CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index abb189a1d314..82bdaac45fb5 100644
--- a/arch/sh/configs/se7722_defconfig
+++ b/arch/sh/configs/se7722_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:46:59 2009 4# Thu Apr 2 18:55:10 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,15 +16,17 @@ CONFIG_GENERIC_IRQ_PROBE=y
16# CONFIG_GENERIC_GPIO is not set 16# CONFIG_GENERIC_GPIO is not set
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19CONFIG_ARCH_SUSPEND_POSSIBLE=y
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_NUMA=y 21CONFIG_SYS_SUPPORTS_NUMA=y
22CONFIG_SYS_SUPPORTS_CMT=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 26# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 31
30# 32#
@@ -44,19 +46,33 @@ CONFIG_BSD_PROCESS_ACCT=y
44# CONFIG_BSD_PROCESS_ACCT_V3 is not set 46# CONFIG_BSD_PROCESS_ACCT_V3 is not set
45# CONFIG_TASKSTATS is not set 47# CONFIG_TASKSTATS is not set
46# CONFIG_AUDIT is not set 48# CONFIG_AUDIT is not set
49
50#
51# RCU Subsystem
52#
53CONFIG_CLASSIC_RCU=y
54# CONFIG_TREE_RCU is not set
55# CONFIG_PREEMPT_RCU is not set
56# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
47CONFIG_IKCONFIG=y 58CONFIG_IKCONFIG=y
48CONFIG_IKCONFIG_PROC=y 59CONFIG_IKCONFIG_PROC=y
49CONFIG_LOG_BUF_SHIFT=14 60CONFIG_LOG_BUF_SHIFT=14
50# CONFIG_CGROUPS is not set
51# CONFIG_GROUP_SCHED is not set 61# CONFIG_GROUP_SCHED is not set
62# CONFIG_CGROUPS is not set
52CONFIG_SYSFS_DEPRECATED=y 63CONFIG_SYSFS_DEPRECATED=y
53CONFIG_SYSFS_DEPRECATED_V2=y 64CONFIG_SYSFS_DEPRECATED_V2=y
54# CONFIG_RELAY is not set 65# CONFIG_RELAY is not set
55# CONFIG_NAMESPACES is not set 66# CONFIG_NAMESPACES is not set
56CONFIG_BLK_DEV_INITRD=y 67CONFIG_BLK_DEV_INITRD=y
57CONFIG_INITRAMFS_SOURCE="" 68CONFIG_INITRAMFS_SOURCE=""
69CONFIG_RD_GZIP=y
70# CONFIG_RD_BZIP2 is not set
71# CONFIG_RD_LZMA is not set
72CONFIG_INITRAMFS_COMPRESSION_NONE=y
58CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
59CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
75CONFIG_ANON_INODES=y
60CONFIG_EMBEDDED=y 76CONFIG_EMBEDDED=y
61CONFIG_UID16=y 77CONFIG_UID16=y
62CONFIG_SYSCTL_SYSCALL=y 78CONFIG_SYSCTL_SYSCALL=y
@@ -66,10 +82,8 @@ CONFIG_HOTPLUG=y
66CONFIG_PRINTK=y 82CONFIG_PRINTK=y
67CONFIG_BUG=y 83CONFIG_BUG=y
68CONFIG_ELF_CORE=y 84CONFIG_ELF_CORE=y
69CONFIG_COMPAT_BRK=y
70CONFIG_BASE_FULL=y 85CONFIG_BASE_FULL=y
71CONFIG_FUTEX=y 86CONFIG_FUTEX=y
72CONFIG_ANON_INODES=y
73CONFIG_EPOLL=y 87CONFIG_EPOLL=y
74CONFIG_SIGNALFD=y 88CONFIG_SIGNALFD=y
75CONFIG_TIMERFD=y 89CONFIG_TIMERFD=y
@@ -78,6 +92,7 @@ CONFIG_SHMEM=y
78CONFIG_AIO=y 92CONFIG_AIO=y
79CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
80CONFIG_SLUB_DEBUG=y 94CONFIG_SLUB_DEBUG=y
95CONFIG_COMPAT_BRK=y
81# CONFIG_SLAB is not set 96# CONFIG_SLAB is not set
82CONFIG_SLUB=y 97CONFIG_SLUB=y
83# CONFIG_SLOB is not set 98# CONFIG_SLOB is not set
@@ -118,11 +133,6 @@ CONFIG_IOSCHED_NOOP=y
118# CONFIG_DEFAULT_CFQ is not set 133# CONFIG_DEFAULT_CFQ is not set
119CONFIG_DEFAULT_NOOP=y 134CONFIG_DEFAULT_NOOP=y
120CONFIG_DEFAULT_IOSCHED="noop" 135CONFIG_DEFAULT_IOSCHED="noop"
121CONFIG_CLASSIC_RCU=y
122# CONFIG_TREE_RCU is not set
123# CONFIG_PREEMPT_RCU is not set
124# CONFIG_TREE_RCU_TRACE is not set
125# CONFIG_PREEMPT_RCU_TRACE is not set
126# CONFIG_FREEZER is not set 136# CONFIG_FREEZER is not set
127 137
128# 138#
@@ -132,6 +142,7 @@ CONFIG_CPU_SH4=y
132CONFIG_CPU_SH4A=y 142CONFIG_CPU_SH4A=y
133CONFIG_CPU_SH4AL_DSP=y 143CONFIG_CPU_SH4AL_DSP=y
134CONFIG_CPU_SHX2=y 144CONFIG_CPU_SHX2=y
145CONFIG_ARCH_SHMOBILE=y
135# CONFIG_CPU_SUBTYPE_SH7619 is not set 146# CONFIG_CPU_SUBTYPE_SH7619 is not set
136# CONFIG_CPU_SUBTYPE_SH7201 is not set 147# CONFIG_CPU_SUBTYPE_SH7201 is not set
137# CONFIG_CPU_SUBTYPE_SH7203 is not set 148# CONFIG_CPU_SUBTYPE_SH7203 is not set
@@ -160,6 +171,7 @@ CONFIG_CPU_SHX2=y
160# CONFIG_CPU_SUBTYPE_SH7770 is not set 171# CONFIG_CPU_SUBTYPE_SH7770 is not set
161# CONFIG_CPU_SUBTYPE_SH7780 is not set 172# CONFIG_CPU_SUBTYPE_SH7780 is not set
162# CONFIG_CPU_SUBTYPE_SH7785 is not set 173# CONFIG_CPU_SUBTYPE_SH7785 is not set
174# CONFIG_CPU_SUBTYPE_SH7786 is not set
163# CONFIG_CPU_SUBTYPE_SHX3 is not set 175# CONFIG_CPU_SUBTYPE_SHX3 is not set
164# CONFIG_CPU_SUBTYPE_SH7343 is not set 176# CONFIG_CPU_SUBTYPE_SH7343 is not set
165CONFIG_CPU_SUBTYPE_SH7722=y 177CONFIG_CPU_SUBTYPE_SH7722=y
@@ -213,11 +225,12 @@ CONFIG_MIGRATION=y
213CONFIG_ZONE_DMA_FLAG=0 225CONFIG_ZONE_DMA_FLAG=0
214CONFIG_NR_QUICK=2 226CONFIG_NR_QUICK=2
215CONFIG_UNEVICTABLE_LRU=y 227CONFIG_UNEVICTABLE_LRU=y
228CONFIG_HAVE_MLOCK=y
229CONFIG_HAVE_MLOCKED_PAGE_BIT=y
216 230
217# 231#
218# Cache configuration 232# Cache configuration
219# 233#
220# CONFIG_SH_DIRECT_MAPPED is not set
221CONFIG_CACHE_WRITEBACK=y 234CONFIG_CACHE_WRITEBACK=y
222# CONFIG_CACHE_WRITETHROUGH is not set 235# CONFIG_CACHE_WRITETHROUGH is not set
223# CONFIG_CACHE_OFF is not set 236# CONFIG_CACHE_OFF is not set
@@ -246,6 +259,7 @@ CONFIG_SH_7722_SOLUTION_ENGINE=y
246# Timer and clock configuration 259# Timer and clock configuration
247# 260#
248CONFIG_SH_TMU=y 261CONFIG_SH_TMU=y
262# CONFIG_SH_TIMER_CMT is not set
249CONFIG_SH_TIMER_IRQ=16 263CONFIG_SH_TIMER_IRQ=16
250CONFIG_SH_PCLK_FREQ=33333333 264CONFIG_SH_PCLK_FREQ=33333333
251CONFIG_TICK_ONESHOT=y 265CONFIG_TICK_ONESHOT=y
@@ -321,7 +335,6 @@ CONFIG_NET=y
321# 335#
322# Networking options 336# Networking options
323# 337#
324CONFIG_COMPAT_NET_DEV_OPS=y
325CONFIG_PACKET=y 338CONFIG_PACKET=y
326CONFIG_PACKET_MMAP=y 339CONFIG_PACKET_MMAP=y
327CONFIG_UNIX=y 340CONFIG_UNIX=y
@@ -373,6 +386,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_LAPB is not set 386# CONFIG_LAPB is not set
374# CONFIG_ECONET is not set 387# CONFIG_ECONET is not set
375# CONFIG_WAN_ROUTER is not set 388# CONFIG_WAN_ROUTER is not set
389# CONFIG_PHONET is not set
376# CONFIG_NET_SCHED is not set 390# CONFIG_NET_SCHED is not set
377# CONFIG_DCB is not set 391# CONFIG_DCB is not set
378 392
@@ -385,13 +399,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_IRDA is not set 399# CONFIG_IRDA is not set
386# CONFIG_BT is not set 400# CONFIG_BT is not set
387# CONFIG_AF_RXRPC is not set 401# CONFIG_AF_RXRPC is not set
388# CONFIG_PHONET is not set
389CONFIG_WIRELESS=y 402CONFIG_WIRELESS=y
390# CONFIG_CFG80211 is not set 403# CONFIG_CFG80211 is not set
391# CONFIG_WIRELESS_OLD_REGULATORY is not set 404# CONFIG_WIRELESS_OLD_REGULATORY is not set
392# CONFIG_WIRELESS_EXT is not set 405# CONFIG_WIRELESS_EXT is not set
393# CONFIG_LIB80211 is not set 406# CONFIG_LIB80211 is not set
394# CONFIG_MAC80211 is not set 407# CONFIG_MAC80211 is not set
408# CONFIG_WIMAX is not set
395# CONFIG_RFKILL is not set 409# CONFIG_RFKILL is not set
396# CONFIG_NET_9P is not set 410# CONFIG_NET_9P is not set
397 411
@@ -422,9 +436,13 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
422# CONFIG_ATA_OVER_ETH is not set 436# CONFIG_ATA_OVER_ETH is not set
423# CONFIG_BLK_DEV_HD is not set 437# CONFIG_BLK_DEV_HD is not set
424CONFIG_MISC_DEVICES=y 438CONFIG_MISC_DEVICES=y
425# CONFIG_EEPROM_93CX6 is not set
426# CONFIG_ENCLOSURE_SERVICES is not set 439# CONFIG_ENCLOSURE_SERVICES is not set
427# CONFIG_C2PORT is not set 440# CONFIG_C2PORT is not set
441
442#
443# EEPROM support
444#
445# CONFIG_EEPROM_93CX6 is not set
428CONFIG_HAVE_IDE=y 446CONFIG_HAVE_IDE=y
429# CONFIG_IDE is not set 447# CONFIG_IDE is not set
430 448
@@ -470,6 +488,7 @@ CONFIG_SCSI_LOWLEVEL=y
470# CONFIG_LIBFC is not set 488# CONFIG_LIBFC is not set
471# CONFIG_SCSI_DEBUG is not set 489# CONFIG_SCSI_DEBUG is not set
472# CONFIG_SCSI_DH is not set 490# CONFIG_SCSI_DH is not set
491# CONFIG_SCSI_OSD_INITIATOR is not set
473CONFIG_ATA=y 492CONFIG_ATA=y
474# CONFIG_ATA_NONSTANDARD is not set 493# CONFIG_ATA_NONSTANDARD is not set
475CONFIG_SATA_PMP=y 494CONFIG_SATA_PMP=y
@@ -478,6 +497,7 @@ CONFIG_ATA_SFF=y
478CONFIG_PATA_PLATFORM=y 497CONFIG_PATA_PLATFORM=y
479# CONFIG_MD is not set 498# CONFIG_MD is not set
480CONFIG_NETDEVICES=y 499CONFIG_NETDEVICES=y
500CONFIG_COMPAT_NET_DEV_OPS=y
481# CONFIG_DUMMY is not set 501# CONFIG_DUMMY is not set
482# CONFIG_BONDING is not set 502# CONFIG_BONDING is not set
483# CONFIG_MACVLAN is not set 503# CONFIG_MACVLAN is not set
@@ -490,8 +510,10 @@ CONFIG_MII=y
490# CONFIG_AX88796 is not set 510# CONFIG_AX88796 is not set
491# CONFIG_STNIC is not set 511# CONFIG_STNIC is not set
492CONFIG_SMC91X=y 512CONFIG_SMC91X=y
513# CONFIG_ETHOC is not set
493# CONFIG_SMC911X is not set 514# CONFIG_SMC911X is not set
494# CONFIG_SMSC911X is not set 515# CONFIG_SMSC911X is not set
516# CONFIG_DNET is not set
495# CONFIG_IBM_NEW_EMAC_ZMII is not set 517# CONFIG_IBM_NEW_EMAC_ZMII is not set
496# CONFIG_IBM_NEW_EMAC_RGMII is not set 518# CONFIG_IBM_NEW_EMAC_RGMII is not set
497# CONFIG_IBM_NEW_EMAC_TAH is not set 519# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -508,7 +530,10 @@ CONFIG_NETDEV_10000=y
508# 530#
509# CONFIG_WLAN_PRE80211 is not set 531# CONFIG_WLAN_PRE80211 is not set
510# CONFIG_WLAN_80211 is not set 532# CONFIG_WLAN_80211 is not set
511# CONFIG_IWLWIFI_LEDS is not set 533
534#
535# Enable WiMAX (Networking options) to see the WiMAX drivers
536#
512# CONFIG_WAN is not set 537# CONFIG_WAN is not set
513# CONFIG_PPP is not set 538# CONFIG_PPP is not set
514# CONFIG_SLIP is not set 539# CONFIG_SLIP is not set
@@ -589,6 +614,7 @@ CONFIG_LEGACY_PTYS=y
589CONFIG_LEGACY_PTY_COUNT=256 614CONFIG_LEGACY_PTY_COUNT=256
590# CONFIG_IPMI_HANDLER is not set 615# CONFIG_IPMI_HANDLER is not set
591CONFIG_HW_RANDOM=y 616CONFIG_HW_RANDOM=y
617# CONFIG_HW_RANDOM_TIMERIOMEM is not set
592# CONFIG_R3964 is not set 618# CONFIG_R3964 is not set
593# CONFIG_RAW_DRIVER is not set 619# CONFIG_RAW_DRIVER is not set
594# CONFIG_TCG_TPM is not set 620# CONFIG_TCG_TPM is not set
@@ -680,9 +706,13 @@ CONFIG_USB_ARCH_HAS_HCD=y
680# 706#
681 707
682# 708#
683# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 709# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
684# 710#
685# CONFIG_USB_GADGET is not set 711# CONFIG_USB_GADGET is not set
712
713#
714# OTG and related infrastructure
715#
686# CONFIG_MMC is not set 716# CONFIG_MMC is not set
687# CONFIG_MEMSTICK is not set 717# CONFIG_MEMSTICK is not set
688# CONFIG_NEW_LEDS is not set 718# CONFIG_NEW_LEDS is not set
@@ -725,6 +755,7 @@ CONFIG_RTC_INTF_DEV=y
725# 755#
726CONFIG_RTC_DRV_SH=y 756CONFIG_RTC_DRV_SH=y
727# CONFIG_DMADEVICES is not set 757# CONFIG_DMADEVICES is not set
758# CONFIG_AUXDISPLAY is not set
728# CONFIG_UIO is not set 759# CONFIG_UIO is not set
729# CONFIG_STAGING is not set 760# CONFIG_STAGING is not set
730 761
@@ -748,6 +779,7 @@ CONFIG_FS_MBCACHE=y
748CONFIG_FILE_LOCKING=y 779CONFIG_FILE_LOCKING=y
749# CONFIG_XFS_FS is not set 780# CONFIG_XFS_FS is not set
750# CONFIG_OCFS2_FS is not set 781# CONFIG_OCFS2_FS is not set
782# CONFIG_BTRFS_FS is not set
751CONFIG_DNOTIFY=y 783CONFIG_DNOTIFY=y
752CONFIG_INOTIFY=y 784CONFIG_INOTIFY=y
753CONFIG_INOTIFY_USER=y 785CONFIG_INOTIFY_USER=y
@@ -791,6 +823,7 @@ CONFIG_MISC_FILESYSTEMS=y
791# CONFIG_BFS_FS is not set 823# CONFIG_BFS_FS is not set
792# CONFIG_EFS_FS is not set 824# CONFIG_EFS_FS is not set
793# CONFIG_CRAMFS is not set 825# CONFIG_CRAMFS is not set
826# CONFIG_SQUASHFS is not set
794# CONFIG_VXFS_FS is not set 827# CONFIG_VXFS_FS is not set
795# CONFIG_MINIX_FS is not set 828# CONFIG_MINIX_FS is not set
796# CONFIG_OMFS_FS is not set 829# CONFIG_OMFS_FS is not set
@@ -843,7 +876,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
843# 876#
844# Tracers 877# Tracers
845# 878#
846# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 879# CONFIG_DYNAMIC_DEBUG is not set
847# CONFIG_SAMPLES is not set 880# CONFIG_SAMPLES is not set
848CONFIG_HAVE_ARCH_KGDB=y 881CONFIG_HAVE_ARCH_KGDB=y
849CONFIG_SH_STANDARD_BIOS=y 882CONFIG_SH_STANDARD_BIOS=y
@@ -936,6 +969,7 @@ CONFIG_CRYPTO=y
936# Compression 969# Compression
937# 970#
938# CONFIG_CRYPTO_DEFLATE is not set 971# CONFIG_CRYPTO_DEFLATE is not set
972# CONFIG_CRYPTO_ZLIB is not set
939# CONFIG_CRYPTO_LZO is not set 973# CONFIG_CRYPTO_LZO is not set
940 974
941# 975#
@@ -956,7 +990,9 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
956CONFIG_CRC32=y 990CONFIG_CRC32=y
957# CONFIG_CRC7 is not set 991# CONFIG_CRC7 is not set
958# CONFIG_LIBCRC32C is not set 992# CONFIG_LIBCRC32C is not set
959CONFIG_PLIST=y 993CONFIG_ZLIB_INFLATE=y
994CONFIG_DECOMPRESS_GZIP=y
960CONFIG_HAS_IOMEM=y 995CONFIG_HAS_IOMEM=y
961CONFIG_HAS_IOPORT=y 996CONFIG_HAS_IOPORT=y
962CONFIG_HAS_DMA=y 997CONFIG_HAS_DMA=y
998CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defconfig
index ac874f63a625..ceef6d9138ee 100644
--- a/arch/sh/configs/se7750_defconfig
+++ b/arch/sh/configs/se7750_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:49:22 2009 4# Thu Apr 2 18:57:31 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -42,11 +43,20 @@ CONFIG_BSD_PROCESS_ACCT=y
42# CONFIG_BSD_PROCESS_ACCT_V3 is not set 43# CONFIG_BSD_PROCESS_ACCT_V3 is not set
43# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
44# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
45CONFIG_IKCONFIG=y 55CONFIG_IKCONFIG=y
46CONFIG_IKCONFIG_PROC=y 56CONFIG_IKCONFIG_PROC=y
47CONFIG_LOG_BUF_SHIFT=14 57CONFIG_LOG_BUF_SHIFT=14
48# CONFIG_CGROUPS is not set
49# CONFIG_GROUP_SCHED is not set 58# CONFIG_GROUP_SCHED is not set
59# CONFIG_CGROUPS is not set
50CONFIG_SYSFS_DEPRECATED=y 60CONFIG_SYSFS_DEPRECATED=y
51CONFIG_SYSFS_DEPRECATED_V2=y 61CONFIG_SYSFS_DEPRECATED_V2=y
52# CONFIG_RELAY is not set 62# CONFIG_RELAY is not set
@@ -54,6 +64,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
54# CONFIG_BLK_DEV_INITRD is not set 64# CONFIG_BLK_DEV_INITRD is not set
55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 65# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
56CONFIG_SYSCTL=y 66CONFIG_SYSCTL=y
67CONFIG_ANON_INODES=y
57CONFIG_EMBEDDED=y 68CONFIG_EMBEDDED=y
58CONFIG_UID16=y 69CONFIG_UID16=y
59# CONFIG_SYSCTL_SYSCALL is not set 70# CONFIG_SYSCTL_SYSCALL is not set
@@ -63,10 +74,8 @@ CONFIG_KALLSYMS=y
63CONFIG_PRINTK=y 74CONFIG_PRINTK=y
64CONFIG_BUG=y 75CONFIG_BUG=y
65CONFIG_ELF_CORE=y 76CONFIG_ELF_CORE=y
66CONFIG_COMPAT_BRK=y
67CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
68CONFIG_FUTEX=y 78CONFIG_FUTEX=y
69CONFIG_ANON_INODES=y
70CONFIG_EPOLL=y 79CONFIG_EPOLL=y
71CONFIG_SIGNALFD=y 80CONFIG_SIGNALFD=y
72CONFIG_TIMERFD=y 81CONFIG_TIMERFD=y
@@ -74,6 +83,7 @@ CONFIG_EVENTFD=y
74CONFIG_SHMEM=y 83CONFIG_SHMEM=y
75CONFIG_AIO=y 84CONFIG_AIO=y
76CONFIG_VM_EVENT_COUNTERS=y 85CONFIG_VM_EVENT_COUNTERS=y
86CONFIG_COMPAT_BRK=y
77CONFIG_SLAB=y 87CONFIG_SLAB=y
78# CONFIG_SLUB is not set 88# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 89# CONFIG_SLOB is not set
@@ -112,11 +122,6 @@ CONFIG_DEFAULT_AS=y
112# CONFIG_DEFAULT_CFQ is not set 122# CONFIG_DEFAULT_CFQ is not set
113# CONFIG_DEFAULT_NOOP is not set 123# CONFIG_DEFAULT_NOOP is not set
114CONFIG_DEFAULT_IOSCHED="anticipatory" 124CONFIG_DEFAULT_IOSCHED="anticipatory"
115CONFIG_CLASSIC_RCU=y
116# CONFIG_TREE_RCU is not set
117# CONFIG_PREEMPT_RCU is not set
118# CONFIG_TREE_RCU_TRACE is not set
119# CONFIG_PREEMPT_RCU_TRACE is not set
120# CONFIG_FREEZER is not set 125# CONFIG_FREEZER is not set
121 126
122# 127#
@@ -151,6 +156,7 @@ CONFIG_CPU_SUBTYPE_SH7750=y
151# CONFIG_CPU_SUBTYPE_SH7770 is not set 156# CONFIG_CPU_SUBTYPE_SH7770 is not set
152# CONFIG_CPU_SUBTYPE_SH7780 is not set 157# CONFIG_CPU_SUBTYPE_SH7780 is not set
153# CONFIG_CPU_SUBTYPE_SH7785 is not set 158# CONFIG_CPU_SUBTYPE_SH7785 is not set
159# CONFIG_CPU_SUBTYPE_SH7786 is not set
154# CONFIG_CPU_SUBTYPE_SHX3 is not set 160# CONFIG_CPU_SUBTYPE_SHX3 is not set
155# CONFIG_CPU_SUBTYPE_SH7343 is not set 161# CONFIG_CPU_SUBTYPE_SH7343 is not set
156# CONFIG_CPU_SUBTYPE_SH7722 is not set 162# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -192,11 +198,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
192CONFIG_ZONE_DMA_FLAG=0 198CONFIG_ZONE_DMA_FLAG=0
193CONFIG_NR_QUICK=2 199CONFIG_NR_QUICK=2
194CONFIG_UNEVICTABLE_LRU=y 200CONFIG_UNEVICTABLE_LRU=y
201CONFIG_HAVE_MLOCK=y
202CONFIG_HAVE_MLOCKED_PAGE_BIT=y
195 203
196# 204#
197# Cache configuration 205# Cache configuration
198# 206#
199# CONFIG_SH_DIRECT_MAPPED is not set
200CONFIG_CACHE_WRITEBACK=y 207CONFIG_CACHE_WRITEBACK=y
201# CONFIG_CACHE_WRITETHROUGH is not set 208# CONFIG_CACHE_WRITETHROUGH is not set
202# CONFIG_CACHE_OFF is not set 209# CONFIG_CACHE_OFF is not set
@@ -299,7 +306,6 @@ CONFIG_NET=y
299# 306#
300# Networking options 307# Networking options
301# 308#
302CONFIG_COMPAT_NET_DEV_OPS=y
303CONFIG_PACKET=y 309CONFIG_PACKET=y
304# CONFIG_PACKET_MMAP is not set 310# CONFIG_PACKET_MMAP is not set
305CONFIG_UNIX=y 311CONFIG_UNIX=y
@@ -355,6 +361,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
355# CONFIG_LAPB is not set 361# CONFIG_LAPB is not set
356# CONFIG_ECONET is not set 362# CONFIG_ECONET is not set
357# CONFIG_WAN_ROUTER is not set 363# CONFIG_WAN_ROUTER is not set
364# CONFIG_PHONET is not set
358# CONFIG_NET_SCHED is not set 365# CONFIG_NET_SCHED is not set
359# CONFIG_DCB is not set 366# CONFIG_DCB is not set
360 367
@@ -367,13 +374,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
367# CONFIG_IRDA is not set 374# CONFIG_IRDA is not set
368# CONFIG_BT is not set 375# CONFIG_BT is not set
369# CONFIG_AF_RXRPC is not set 376# CONFIG_AF_RXRPC is not set
370# CONFIG_PHONET is not set
371CONFIG_WIRELESS=y 377CONFIG_WIRELESS=y
372# CONFIG_CFG80211 is not set 378# CONFIG_CFG80211 is not set
373# CONFIG_WIRELESS_OLD_REGULATORY is not set 379# CONFIG_WIRELESS_OLD_REGULATORY is not set
374# CONFIG_WIRELESS_EXT is not set 380# CONFIG_WIRELESS_EXT is not set
375# CONFIG_LIB80211 is not set 381# CONFIG_LIB80211 is not set
376# CONFIG_MAC80211 is not set 382# CONFIG_MAC80211 is not set
383# CONFIG_WIMAX is not set
377# CONFIG_RFKILL is not set 384# CONFIG_RFKILL is not set
378# CONFIG_NET_9P is not set 385# CONFIG_NET_9P is not set
379 386
@@ -392,6 +399,7 @@ CONFIG_MTD=y
392# CONFIG_MTD_DEBUG is not set 399# CONFIG_MTD_DEBUG is not set
393# CONFIG_MTD_CONCAT is not set 400# CONFIG_MTD_CONCAT is not set
394CONFIG_MTD_PARTITIONS=y 401CONFIG_MTD_PARTITIONS=y
402# CONFIG_MTD_TESTS is not set
395# CONFIG_MTD_REDBOOT_PARTS is not set 403# CONFIG_MTD_REDBOOT_PARTS is not set
396# CONFIG_MTD_CMDLINE_PARTS is not set 404# CONFIG_MTD_CMDLINE_PARTS is not set
397# CONFIG_MTD_AR7_PARTS is not set 405# CONFIG_MTD_AR7_PARTS is not set
@@ -459,6 +467,11 @@ CONFIG_MTD_ROM=y
459# CONFIG_MTD_ONENAND is not set 467# CONFIG_MTD_ONENAND is not set
460 468
461# 469#
470# LPDDR flash memory drivers
471#
472# CONFIG_MTD_LPDDR is not set
473
474#
462# UBI - Unsorted block images 475# UBI - Unsorted block images
463# 476#
464# CONFIG_MTD_UBI is not set 477# CONFIG_MTD_UBI is not set
@@ -472,9 +485,13 @@ CONFIG_BLK_DEV=y
472# CONFIG_ATA_OVER_ETH is not set 485# CONFIG_ATA_OVER_ETH is not set
473# CONFIG_BLK_DEV_HD is not set 486# CONFIG_BLK_DEV_HD is not set
474CONFIG_MISC_DEVICES=y 487CONFIG_MISC_DEVICES=y
475# CONFIG_EEPROM_93CX6 is not set
476# CONFIG_ENCLOSURE_SERVICES is not set 488# CONFIG_ENCLOSURE_SERVICES is not set
477# CONFIG_C2PORT is not set 489# CONFIG_C2PORT is not set
490
491#
492# EEPROM support
493#
494# CONFIG_EEPROM_93CX6 is not set
478CONFIG_HAVE_IDE=y 495CONFIG_HAVE_IDE=y
479CONFIG_IDE=y 496CONFIG_IDE=y
480 497
@@ -538,9 +555,11 @@ CONFIG_SCSI_LOWLEVEL=y
538# CONFIG_LIBFC is not set 555# CONFIG_LIBFC is not set
539# CONFIG_SCSI_DEBUG is not set 556# CONFIG_SCSI_DEBUG is not set
540# CONFIG_SCSI_DH is not set 557# CONFIG_SCSI_DH is not set
558# CONFIG_SCSI_OSD_INITIATOR is not set
541# CONFIG_ATA is not set 559# CONFIG_ATA is not set
542# CONFIG_MD is not set 560# CONFIG_MD is not set
543CONFIG_NETDEVICES=y 561CONFIG_NETDEVICES=y
562CONFIG_COMPAT_NET_DEV_OPS=y
544# CONFIG_DUMMY is not set 563# CONFIG_DUMMY is not set
545# CONFIG_BONDING is not set 564# CONFIG_BONDING is not set
546# CONFIG_MACVLAN is not set 565# CONFIG_MACVLAN is not set
@@ -553,8 +572,10 @@ CONFIG_NET_ETHERNET=y
553# CONFIG_AX88796 is not set 572# CONFIG_AX88796 is not set
554CONFIG_STNIC=y 573CONFIG_STNIC=y
555# CONFIG_SMC91X is not set 574# CONFIG_SMC91X is not set
575# CONFIG_ETHOC is not set
556# CONFIG_SMC911X is not set 576# CONFIG_SMC911X is not set
557# CONFIG_SMSC911X is not set 577# CONFIG_SMSC911X is not set
578# CONFIG_DNET is not set
558# CONFIG_IBM_NEW_EMAC_ZMII is not set 579# CONFIG_IBM_NEW_EMAC_ZMII is not set
559# CONFIG_IBM_NEW_EMAC_RGMII is not set 580# CONFIG_IBM_NEW_EMAC_RGMII is not set
560# CONFIG_IBM_NEW_EMAC_TAH is not set 581# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -571,7 +592,10 @@ CONFIG_NETDEV_10000=y
571# 592#
572# CONFIG_WLAN_PRE80211 is not set 593# CONFIG_WLAN_PRE80211 is not set
573# CONFIG_WLAN_80211 is not set 594# CONFIG_WLAN_80211 is not set
574# CONFIG_IWLWIFI_LEDS is not set 595
596#
597# Enable WiMAX (Networking options) to see the WiMAX drivers
598#
575# CONFIG_WAN is not set 599# CONFIG_WAN is not set
576# CONFIG_PPP is not set 600# CONFIG_PPP is not set
577# CONFIG_SLIP is not set 601# CONFIG_SLIP is not set
@@ -622,6 +646,7 @@ CONFIG_LEGACY_PTYS=y
622CONFIG_LEGACY_PTY_COUNT=256 646CONFIG_LEGACY_PTY_COUNT=256
623# CONFIG_IPMI_HANDLER is not set 647# CONFIG_IPMI_HANDLER is not set
624CONFIG_HW_RANDOM=y 648CONFIG_HW_RANDOM=y
649# CONFIG_HW_RANDOM_TIMERIOMEM is not set
625# CONFIG_R3964 is not set 650# CONFIG_R3964 is not set
626# CONFIG_RAW_DRIVER is not set 651# CONFIG_RAW_DRIVER is not set
627# CONFIG_TCG_TPM is not set 652# CONFIG_TCG_TPM is not set
@@ -711,15 +736,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
711# 736#
712 737
713# 738#
714# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 739# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
715# 740#
716# CONFIG_USB_GADGET is not set 741# CONFIG_USB_GADGET is not set
742
743#
744# OTG and related infrastructure
745#
717# CONFIG_MMC is not set 746# CONFIG_MMC is not set
718# CONFIG_MEMSTICK is not set 747# CONFIG_MEMSTICK is not set
719# CONFIG_NEW_LEDS is not set 748# CONFIG_NEW_LEDS is not set
720# CONFIG_ACCESSIBILITY is not set 749# CONFIG_ACCESSIBILITY is not set
721# CONFIG_RTC_CLASS is not set 750# CONFIG_RTC_CLASS is not set
722# CONFIG_DMADEVICES is not set 751# CONFIG_DMADEVICES is not set
752# CONFIG_AUXDISPLAY is not set
723# CONFIG_UIO is not set 753# CONFIG_UIO is not set
724# CONFIG_STAGING is not set 754# CONFIG_STAGING is not set
725 755
@@ -735,6 +765,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
735CONFIG_FILE_LOCKING=y 765CONFIG_FILE_LOCKING=y
736# CONFIG_XFS_FS is not set 766# CONFIG_XFS_FS is not set
737# CONFIG_OCFS2_FS is not set 767# CONFIG_OCFS2_FS is not set
768# CONFIG_BTRFS_FS is not set
738CONFIG_DNOTIFY=y 769CONFIG_DNOTIFY=y
739CONFIG_INOTIFY=y 770CONFIG_INOTIFY=y
740CONFIG_INOTIFY_USER=y 771CONFIG_INOTIFY_USER=y
@@ -789,6 +820,7 @@ CONFIG_JFFS2_ZLIB=y
789CONFIG_JFFS2_RTIME=y 820CONFIG_JFFS2_RTIME=y
790# CONFIG_JFFS2_RUBIN is not set 821# CONFIG_JFFS2_RUBIN is not set
791# CONFIG_CRAMFS is not set 822# CONFIG_CRAMFS is not set
823# CONFIG_SQUASHFS is not set
792# CONFIG_VXFS_FS is not set 824# CONFIG_VXFS_FS is not set
793# CONFIG_MINIX_FS is not set 825# CONFIG_MINIX_FS is not set
794# CONFIG_OMFS_FS is not set 826# CONFIG_OMFS_FS is not set
@@ -806,7 +838,6 @@ CONFIG_ROOT_NFS=y
806CONFIG_LOCKD=y 838CONFIG_LOCKD=y
807CONFIG_NFS_COMMON=y 839CONFIG_NFS_COMMON=y
808CONFIG_SUNRPC=y 840CONFIG_SUNRPC=y
809# CONFIG_SUNRPC_REGISTER_V4 is not set
810# CONFIG_RPCSEC_GSS_KRB5 is not set 841# CONFIG_RPCSEC_GSS_KRB5 is not set
811# CONFIG_RPCSEC_GSS_SPKM3 is not set 842# CONFIG_RPCSEC_GSS_SPKM3 is not set
812# CONFIG_SMB_FS is not set 843# CONFIG_SMB_FS is not set
@@ -859,7 +890,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
859# 890#
860# Tracers 891# Tracers
861# 892#
862# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
863# CONFIG_SAMPLES is not set 893# CONFIG_SAMPLES is not set
864CONFIG_HAVE_ARCH_KGDB=y 894CONFIG_HAVE_ARCH_KGDB=y
865# CONFIG_SH_STANDARD_BIOS is not set 895# CONFIG_SH_STANDARD_BIOS is not set
@@ -951,6 +981,7 @@ CONFIG_CRYPTO=y
951# Compression 981# Compression
952# 982#
953# CONFIG_CRYPTO_DEFLATE is not set 983# CONFIG_CRYPTO_DEFLATE is not set
984# CONFIG_CRYPTO_ZLIB is not set
954# CONFIG_CRYPTO_LZO is not set 985# CONFIG_CRYPTO_LZO is not set
955 986
956# 987#
@@ -973,7 +1004,7 @@ CONFIG_CRC32=y
973# CONFIG_LIBCRC32C is not set 1004# CONFIG_LIBCRC32C is not set
974CONFIG_ZLIB_INFLATE=y 1005CONFIG_ZLIB_INFLATE=y
975CONFIG_ZLIB_DEFLATE=y 1006CONFIG_ZLIB_DEFLATE=y
976CONFIG_PLIST=y
977CONFIG_HAS_IOMEM=y 1007CONFIG_HAS_IOMEM=y
978CONFIG_HAS_IOPORT=y 1008CONFIG_HAS_IOPORT=y
979CONFIG_HAS_DMA=y 1009CONFIG_HAS_DMA=y
1010CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7751_defconfig b/arch/sh/configs/se7751_defconfig
index f54ae056f177..67fc26b3a7d0 100644
--- a/arch/sh/configs/se7751_defconfig
+++ b/arch/sh/configs/se7751_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:51:47 2009 4# Thu Apr 2 18:59:59 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -42,18 +43,32 @@ CONFIG_BSD_PROCESS_ACCT=y
42# CONFIG_BSD_PROCESS_ACCT_V3 is not set 43# CONFIG_BSD_PROCESS_ACCT_V3 is not set
43# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
44# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
45# CONFIG_IKCONFIG is not set 55# CONFIG_IKCONFIG is not set
46CONFIG_LOG_BUF_SHIFT=14 56CONFIG_LOG_BUF_SHIFT=14
47# CONFIG_CGROUPS is not set
48# CONFIG_GROUP_SCHED is not set 57# CONFIG_GROUP_SCHED is not set
58# CONFIG_CGROUPS is not set
49CONFIG_SYSFS_DEPRECATED=y 59CONFIG_SYSFS_DEPRECATED=y
50CONFIG_SYSFS_DEPRECATED_V2=y 60CONFIG_SYSFS_DEPRECATED_V2=y
51# CONFIG_RELAY is not set 61# CONFIG_RELAY is not set
52# CONFIG_NAMESPACES is not set 62# CONFIG_NAMESPACES is not set
53CONFIG_BLK_DEV_INITRD=y 63CONFIG_BLK_DEV_INITRD=y
54CONFIG_INITRAMFS_SOURCE="" 64CONFIG_INITRAMFS_SOURCE=""
65CONFIG_RD_GZIP=y
66# CONFIG_RD_BZIP2 is not set
67# CONFIG_RD_LZMA is not set
68CONFIG_INITRAMFS_COMPRESSION_NONE=y
55# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
56CONFIG_SYSCTL=y 70CONFIG_SYSCTL=y
71CONFIG_ANON_INODES=y
57CONFIG_EMBEDDED=y 72CONFIG_EMBEDDED=y
58CONFIG_UID16=y 73CONFIG_UID16=y
59# CONFIG_SYSCTL_SYSCALL is not set 74# CONFIG_SYSCTL_SYSCALL is not set
@@ -63,10 +78,8 @@ CONFIG_KALLSYMS=y
63CONFIG_PRINTK=y 78CONFIG_PRINTK=y
64CONFIG_BUG=y 79CONFIG_BUG=y
65CONFIG_ELF_CORE=y 80CONFIG_ELF_CORE=y
66CONFIG_COMPAT_BRK=y
67CONFIG_BASE_FULL=y 81CONFIG_BASE_FULL=y
68CONFIG_FUTEX=y 82CONFIG_FUTEX=y
69CONFIG_ANON_INODES=y
70CONFIG_EPOLL=y 83CONFIG_EPOLL=y
71CONFIG_SIGNALFD=y 84CONFIG_SIGNALFD=y
72CONFIG_TIMERFD=y 85CONFIG_TIMERFD=y
@@ -74,6 +87,7 @@ CONFIG_EVENTFD=y
74CONFIG_SHMEM=y 87CONFIG_SHMEM=y
75CONFIG_AIO=y 88CONFIG_AIO=y
76CONFIG_VM_EVENT_COUNTERS=y 89CONFIG_VM_EVENT_COUNTERS=y
90CONFIG_COMPAT_BRK=y
77CONFIG_SLAB=y 91CONFIG_SLAB=y
78# CONFIG_SLUB is not set 92# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 93# CONFIG_SLOB is not set
@@ -112,11 +126,6 @@ CONFIG_DEFAULT_AS=y
112# CONFIG_DEFAULT_CFQ is not set 126# CONFIG_DEFAULT_CFQ is not set
113# CONFIG_DEFAULT_NOOP is not set 127# CONFIG_DEFAULT_NOOP is not set
114CONFIG_DEFAULT_IOSCHED="anticipatory" 128CONFIG_DEFAULT_IOSCHED="anticipatory"
115CONFIG_CLASSIC_RCU=y
116# CONFIG_TREE_RCU is not set
117# CONFIG_PREEMPT_RCU is not set
118# CONFIG_TREE_RCU_TRACE is not set
119# CONFIG_PREEMPT_RCU_TRACE is not set
120# CONFIG_FREEZER is not set 129# CONFIG_FREEZER is not set
121 130
122# 131#
@@ -151,6 +160,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y
151# CONFIG_CPU_SUBTYPE_SH7770 is not set 160# CONFIG_CPU_SUBTYPE_SH7770 is not set
152# CONFIG_CPU_SUBTYPE_SH7780 is not set 161# CONFIG_CPU_SUBTYPE_SH7780 is not set
153# CONFIG_CPU_SUBTYPE_SH7785 is not set 162# CONFIG_CPU_SUBTYPE_SH7785 is not set
163# CONFIG_CPU_SUBTYPE_SH7786 is not set
154# CONFIG_CPU_SUBTYPE_SHX3 is not set 164# CONFIG_CPU_SUBTYPE_SHX3 is not set
155# CONFIG_CPU_SUBTYPE_SH7343 is not set 165# CONFIG_CPU_SUBTYPE_SH7343 is not set
156# CONFIG_CPU_SUBTYPE_SH7722 is not set 166# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -192,11 +202,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
192CONFIG_ZONE_DMA_FLAG=0 202CONFIG_ZONE_DMA_FLAG=0
193CONFIG_NR_QUICK=2 203CONFIG_NR_QUICK=2
194CONFIG_UNEVICTABLE_LRU=y 204CONFIG_UNEVICTABLE_LRU=y
205CONFIG_HAVE_MLOCK=y
206CONFIG_HAVE_MLOCKED_PAGE_BIT=y
195 207
196# 208#
197# Cache configuration 209# Cache configuration
198# 210#
199# CONFIG_SH_DIRECT_MAPPED is not set
200CONFIG_CACHE_WRITEBACK=y 211CONFIG_CACHE_WRITEBACK=y
201# CONFIG_CACHE_WRITETHROUGH is not set 212# CONFIG_CACHE_WRITETHROUGH is not set
202# CONFIG_CACHE_OFF is not set 213# CONFIG_CACHE_OFF is not set
@@ -301,7 +312,6 @@ CONFIG_NET=y
301# 312#
302# Networking options 313# Networking options
303# 314#
304CONFIG_COMPAT_NET_DEV_OPS=y
305CONFIG_PACKET=y 315CONFIG_PACKET=y
306# CONFIG_PACKET_MMAP is not set 316# CONFIG_PACKET_MMAP is not set
307CONFIG_UNIX=y 317CONFIG_UNIX=y
@@ -376,6 +386,7 @@ CONFIG_IP_NF_QUEUE=y
376# CONFIG_LAPB is not set 386# CONFIG_LAPB is not set
377# CONFIG_ECONET is not set 387# CONFIG_ECONET is not set
378# CONFIG_WAN_ROUTER is not set 388# CONFIG_WAN_ROUTER is not set
389# CONFIG_PHONET is not set
379# CONFIG_NET_SCHED is not set 390# CONFIG_NET_SCHED is not set
380# CONFIG_DCB is not set 391# CONFIG_DCB is not set
381 392
@@ -388,13 +399,13 @@ CONFIG_IP_NF_QUEUE=y
388# CONFIG_IRDA is not set 399# CONFIG_IRDA is not set
389# CONFIG_BT is not set 400# CONFIG_BT is not set
390# CONFIG_AF_RXRPC is not set 401# CONFIG_AF_RXRPC is not set
391# CONFIG_PHONET is not set
392CONFIG_WIRELESS=y 402CONFIG_WIRELESS=y
393# CONFIG_CFG80211 is not set 403# CONFIG_CFG80211 is not set
394# CONFIG_WIRELESS_OLD_REGULATORY is not set 404# CONFIG_WIRELESS_OLD_REGULATORY is not set
395# CONFIG_WIRELESS_EXT is not set 405# CONFIG_WIRELESS_EXT is not set
396# CONFIG_LIB80211 is not set 406# CONFIG_LIB80211 is not set
397# CONFIG_MAC80211 is not set 407# CONFIG_MAC80211 is not set
408# CONFIG_WIMAX is not set
398# CONFIG_RFKILL is not set 409# CONFIG_RFKILL is not set
399# CONFIG_NET_9P is not set 410# CONFIG_NET_9P is not set
400 411
@@ -413,6 +424,7 @@ CONFIG_MTD=y
413# CONFIG_MTD_DEBUG is not set 424# CONFIG_MTD_DEBUG is not set
414# CONFIG_MTD_CONCAT is not set 425# CONFIG_MTD_CONCAT is not set
415CONFIG_MTD_PARTITIONS=y 426CONFIG_MTD_PARTITIONS=y
427# CONFIG_MTD_TESTS is not set
416# CONFIG_MTD_REDBOOT_PARTS is not set 428# CONFIG_MTD_REDBOOT_PARTS is not set
417# CONFIG_MTD_CMDLINE_PARTS is not set 429# CONFIG_MTD_CMDLINE_PARTS is not set
418# CONFIG_MTD_AR7_PARTS is not set 430# CONFIG_MTD_AR7_PARTS is not set
@@ -480,6 +492,11 @@ CONFIG_MTD_RAM=y
480# CONFIG_MTD_ONENAND is not set 492# CONFIG_MTD_ONENAND is not set
481 493
482# 494#
495# LPDDR flash memory drivers
496#
497# CONFIG_MTD_LPDDR is not set
498
499#
483# UBI - Unsorted block images 500# UBI - Unsorted block images
484# 501#
485# CONFIG_MTD_UBI is not set 502# CONFIG_MTD_UBI is not set
@@ -496,9 +513,13 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
496# CONFIG_ATA_OVER_ETH is not set 513# CONFIG_ATA_OVER_ETH is not set
497# CONFIG_BLK_DEV_HD is not set 514# CONFIG_BLK_DEV_HD is not set
498CONFIG_MISC_DEVICES=y 515CONFIG_MISC_DEVICES=y
499# CONFIG_EEPROM_93CX6 is not set
500# CONFIG_ENCLOSURE_SERVICES is not set 516# CONFIG_ENCLOSURE_SERVICES is not set
501# CONFIG_C2PORT is not set 517# CONFIG_C2PORT is not set
518
519#
520# EEPROM support
521#
522# CONFIG_EEPROM_93CX6 is not set
502CONFIG_HAVE_IDE=y 523CONFIG_HAVE_IDE=y
503# CONFIG_IDE is not set 524# CONFIG_IDE is not set
504 525
@@ -512,6 +533,7 @@ CONFIG_HAVE_IDE=y
512# CONFIG_ATA is not set 533# CONFIG_ATA is not set
513# CONFIG_MD is not set 534# CONFIG_MD is not set
514CONFIG_NETDEVICES=y 535CONFIG_NETDEVICES=y
536CONFIG_COMPAT_NET_DEV_OPS=y
515# CONFIG_DUMMY is not set 537# CONFIG_DUMMY is not set
516# CONFIG_BONDING is not set 538# CONFIG_BONDING is not set
517# CONFIG_MACVLAN is not set 539# CONFIG_MACVLAN is not set
@@ -524,8 +546,10 @@ CONFIG_MII=y
524# CONFIG_AX88796 is not set 546# CONFIG_AX88796 is not set
525# CONFIG_STNIC is not set 547# CONFIG_STNIC is not set
526# CONFIG_SMC91X is not set 548# CONFIG_SMC91X is not set
549# CONFIG_ETHOC is not set
527# CONFIG_SMC911X is not set 550# CONFIG_SMC911X is not set
528# CONFIG_SMSC911X is not set 551# CONFIG_SMSC911X is not set
552# CONFIG_DNET is not set
529# CONFIG_IBM_NEW_EMAC_ZMII is not set 553# CONFIG_IBM_NEW_EMAC_ZMII is not set
530# CONFIG_IBM_NEW_EMAC_RGMII is not set 554# CONFIG_IBM_NEW_EMAC_RGMII is not set
531# CONFIG_IBM_NEW_EMAC_TAH is not set 555# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -542,7 +566,10 @@ CONFIG_NETDEV_10000=y
542# 566#
543# CONFIG_WLAN_PRE80211 is not set 567# CONFIG_WLAN_PRE80211 is not set
544# CONFIG_WLAN_80211 is not set 568# CONFIG_WLAN_80211 is not set
545# CONFIG_IWLWIFI_LEDS is not set 569
570#
571# Enable WiMAX (Networking options) to see the WiMAX drivers
572#
546# CONFIG_WAN is not set 573# CONFIG_WAN is not set
547# CONFIG_PPP is not set 574# CONFIG_PPP is not set
548# CONFIG_SLIP is not set 575# CONFIG_SLIP is not set
@@ -585,6 +612,7 @@ CONFIG_LEGACY_PTYS=y
585CONFIG_LEGACY_PTY_COUNT=256 612CONFIG_LEGACY_PTY_COUNT=256
586# CONFIG_IPMI_HANDLER is not set 613# CONFIG_IPMI_HANDLER is not set
587CONFIG_HW_RANDOM=y 614CONFIG_HW_RANDOM=y
615# CONFIG_HW_RANDOM_TIMERIOMEM is not set
588# CONFIG_R3964 is not set 616# CONFIG_R3964 is not set
589# CONFIG_RAW_DRIVER is not set 617# CONFIG_RAW_DRIVER is not set
590# CONFIG_TCG_TPM is not set 618# CONFIG_TCG_TPM is not set
@@ -673,15 +701,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
673# 701#
674 702
675# 703#
676# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 704# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
677# 705#
678# CONFIG_USB_GADGET is not set 706# CONFIG_USB_GADGET is not set
707
708#
709# OTG and related infrastructure
710#
679# CONFIG_MMC is not set 711# CONFIG_MMC is not set
680# CONFIG_MEMSTICK is not set 712# CONFIG_MEMSTICK is not set
681# CONFIG_NEW_LEDS is not set 713# CONFIG_NEW_LEDS is not set
682# CONFIG_ACCESSIBILITY is not set 714# CONFIG_ACCESSIBILITY is not set
683# CONFIG_RTC_CLASS is not set 715# CONFIG_RTC_CLASS is not set
684# CONFIG_DMADEVICES is not set 716# CONFIG_DMADEVICES is not set
717# CONFIG_AUXDISPLAY is not set
685# CONFIG_UIO is not set 718# CONFIG_UIO is not set
686# CONFIG_STAGING is not set 719# CONFIG_STAGING is not set
687 720
@@ -699,6 +732,7 @@ CONFIG_EXT2_FS=y
699CONFIG_FILE_LOCKING=y 732CONFIG_FILE_LOCKING=y
700# CONFIG_XFS_FS is not set 733# CONFIG_XFS_FS is not set
701# CONFIG_OCFS2_FS is not set 734# CONFIG_OCFS2_FS is not set
735# CONFIG_BTRFS_FS is not set
702CONFIG_DNOTIFY=y 736CONFIG_DNOTIFY=y
703CONFIG_INOTIFY=y 737CONFIG_INOTIFY=y
704CONFIG_INOTIFY_USER=y 738CONFIG_INOTIFY_USER=y
@@ -753,6 +787,7 @@ CONFIG_JFFS2_ZLIB=y
753CONFIG_JFFS2_RTIME=y 787CONFIG_JFFS2_RTIME=y
754# CONFIG_JFFS2_RUBIN is not set 788# CONFIG_JFFS2_RUBIN is not set
755# CONFIG_CRAMFS is not set 789# CONFIG_CRAMFS is not set
790# CONFIG_SQUASHFS is not set
756# CONFIG_VXFS_FS is not set 791# CONFIG_VXFS_FS is not set
757# CONFIG_MINIX_FS is not set 792# CONFIG_MINIX_FS is not set
758# CONFIG_OMFS_FS is not set 793# CONFIG_OMFS_FS is not set
@@ -802,7 +837,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
802# 837#
803# Tracers 838# Tracers
804# 839#
805# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
806# CONFIG_SAMPLES is not set 840# CONFIG_SAMPLES is not set
807CONFIG_HAVE_ARCH_KGDB=y 841CONFIG_HAVE_ARCH_KGDB=y
808# CONFIG_SH_STANDARD_BIOS is not set 842# CONFIG_SH_STANDARD_BIOS is not set
@@ -894,6 +928,7 @@ CONFIG_CRYPTO=y
894# Compression 928# Compression
895# 929#
896# CONFIG_CRYPTO_DEFLATE is not set 930# CONFIG_CRYPTO_DEFLATE is not set
931# CONFIG_CRYPTO_ZLIB is not set
897# CONFIG_CRYPTO_LZO is not set 932# CONFIG_CRYPTO_LZO is not set
898 933
899# 934#
@@ -916,7 +951,8 @@ CONFIG_CRC32=y
916# CONFIG_LIBCRC32C is not set 951# CONFIG_LIBCRC32C is not set
917CONFIG_ZLIB_INFLATE=y 952CONFIG_ZLIB_INFLATE=y
918CONFIG_ZLIB_DEFLATE=y 953CONFIG_ZLIB_DEFLATE=y
919CONFIG_PLIST=y 954CONFIG_DECOMPRESS_GZIP=y
920CONFIG_HAS_IOMEM=y 955CONFIG_HAS_IOMEM=y
921CONFIG_HAS_IOPORT=y 956CONFIG_HAS_IOPORT=y
922CONFIG_HAS_DMA=y 957CONFIG_HAS_DMA=y
958CONFIG_NLATTR=y
diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig
index 7504978e8747..ebce23cc2ad8 100644
--- a/arch/sh/configs/se7780_defconfig
+++ b/arch/sh/configs/se7780_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:53:50 2009 4# Thu Apr 2 19:02:05 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -41,6 +42,15 @@ CONFIG_SYSVIPC_SYSCTL=y
41# CONFIG_BSD_PROCESS_ACCT is not set 42# CONFIG_BSD_PROCESS_ACCT is not set
42# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
45
46#
47# RCU Subsystem
48#
49CONFIG_CLASSIC_RCU=y
50# CONFIG_TREE_RCU is not set
51# CONFIG_PREEMPT_RCU is not set
52# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
44CONFIG_IKCONFIG=y 54CONFIG_IKCONFIG=y
45CONFIG_IKCONFIG_PROC=y 55CONFIG_IKCONFIG_PROC=y
46CONFIG_LOG_BUF_SHIFT=14 56CONFIG_LOG_BUF_SHIFT=14
@@ -52,6 +62,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
52# CONFIG_BLK_DEV_INITRD is not set 62# CONFIG_BLK_DEV_INITRD is not set
53CONFIG_CC_OPTIMIZE_FOR_SIZE=y 63CONFIG_CC_OPTIMIZE_FOR_SIZE=y
54CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
55CONFIG_EMBEDDED=y 66CONFIG_EMBEDDED=y
56CONFIG_UID16=y 67CONFIG_UID16=y
57CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
@@ -60,10 +71,8 @@ CONFIG_SYSCTL_SYSCALL=y
60CONFIG_PRINTK=y 71CONFIG_PRINTK=y
61CONFIG_BUG=y 72CONFIG_BUG=y
62CONFIG_ELF_CORE=y 73CONFIG_ELF_CORE=y
63CONFIG_COMPAT_BRK=y
64CONFIG_BASE_FULL=y 74CONFIG_BASE_FULL=y
65CONFIG_FUTEX=y 75CONFIG_FUTEX=y
66CONFIG_ANON_INODES=y
67# CONFIG_EPOLL is not set 76# CONFIG_EPOLL is not set
68CONFIG_SIGNALFD=y 77CONFIG_SIGNALFD=y
69CONFIG_TIMERFD=y 78CONFIG_TIMERFD=y
@@ -72,6 +81,7 @@ CONFIG_SHMEM=y
72CONFIG_AIO=y 81CONFIG_AIO=y
73CONFIG_VM_EVENT_COUNTERS=y 82CONFIG_VM_EVENT_COUNTERS=y
74CONFIG_PCI_QUIRKS=y 83CONFIG_PCI_QUIRKS=y
84CONFIG_COMPAT_BRK=y
75CONFIG_SLAB=y 85CONFIG_SLAB=y
76# CONFIG_SLUB is not set 86# CONFIG_SLUB is not set
77# CONFIG_SLOB is not set 87# CONFIG_SLOB is not set
@@ -108,11 +118,6 @@ CONFIG_DEFAULT_DEADLINE=y
108# CONFIG_DEFAULT_CFQ is not set 118# CONFIG_DEFAULT_CFQ is not set
109# CONFIG_DEFAULT_NOOP is not set 119# CONFIG_DEFAULT_NOOP is not set
110CONFIG_DEFAULT_IOSCHED="deadline" 120CONFIG_DEFAULT_IOSCHED="deadline"
111CONFIG_CLASSIC_RCU=y
112# CONFIG_TREE_RCU is not set
113# CONFIG_PREEMPT_RCU is not set
114# CONFIG_TREE_RCU_TRACE is not set
115# CONFIG_PREEMPT_RCU_TRACE is not set
116# CONFIG_FREEZER is not set 121# CONFIG_FREEZER is not set
117 122
118# 123#
@@ -148,6 +153,7 @@ CONFIG_CPU_SH4A=y
148# CONFIG_CPU_SUBTYPE_SH7770 is not set 153# CONFIG_CPU_SUBTYPE_SH7770 is not set
149CONFIG_CPU_SUBTYPE_SH7780=y 154CONFIG_CPU_SUBTYPE_SH7780=y
150# CONFIG_CPU_SUBTYPE_SH7785 is not set 155# CONFIG_CPU_SUBTYPE_SH7785 is not set
156# CONFIG_CPU_SUBTYPE_SH7786 is not set
151# CONFIG_CPU_SUBTYPE_SHX3 is not set 157# CONFIG_CPU_SUBTYPE_SHX3 is not set
152# CONFIG_CPU_SUBTYPE_SH7343 is not set 158# CONFIG_CPU_SUBTYPE_SH7343 is not set
153# CONFIG_CPU_SUBTYPE_SH7722 is not set 159# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -192,11 +198,12 @@ CONFIG_MIGRATION=y
192CONFIG_ZONE_DMA_FLAG=0 198CONFIG_ZONE_DMA_FLAG=0
193CONFIG_NR_QUICK=2 199CONFIG_NR_QUICK=2
194CONFIG_UNEVICTABLE_LRU=y 200CONFIG_UNEVICTABLE_LRU=y
201CONFIG_HAVE_MLOCK=y
202CONFIG_HAVE_MLOCKED_PAGE_BIT=y
195 203
196# 204#
197# Cache configuration 205# Cache configuration
198# 206#
199# CONFIG_SH_DIRECT_MAPPED is not set
200CONFIG_CACHE_WRITEBACK=y 207CONFIG_CACHE_WRITEBACK=y
201# CONFIG_CACHE_WRITETHROUGH is not set 208# CONFIG_CACHE_WRITETHROUGH is not set
202# CONFIG_CACHE_OFF is not set 209# CONFIG_CACHE_OFF is not set
@@ -283,6 +290,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
283# CONFIG_PCIEPORTBUS is not set 290# CONFIG_PCIEPORTBUS is not set
284# CONFIG_ARCH_SUPPORTS_MSI is not set 291# CONFIG_ARCH_SUPPORTS_MSI is not set
285CONFIG_PCI_LEGACY=y 292CONFIG_PCI_LEGACY=y
293# CONFIG_PCI_STUB is not set
294# CONFIG_PCI_IOV is not set
286 295
287# 296#
288# Executable file formats 297# Executable file formats
@@ -296,7 +305,6 @@ CONFIG_NET=y
296# 305#
297# Networking options 306# Networking options
298# 307#
299CONFIG_COMPAT_NET_DEV_OPS=y
300CONFIG_PACKET=y 308CONFIG_PACKET=y
301# CONFIG_PACKET_MMAP is not set 309# CONFIG_PACKET_MMAP is not set
302CONFIG_UNIX=y 310CONFIG_UNIX=y
@@ -351,6 +359,7 @@ CONFIG_IPV6=y
351# CONFIG_LLC2 is not set 359# CONFIG_LLC2 is not set
352# CONFIG_IPX is not set 360# CONFIG_IPX is not set
353# CONFIG_ATALK is not set 361# CONFIG_ATALK is not set
362# CONFIG_PHONET is not set
354# CONFIG_NET_SCHED is not set 363# CONFIG_NET_SCHED is not set
355# CONFIG_DCB is not set 364# CONFIG_DCB is not set
356 365
@@ -362,13 +371,13 @@ CONFIG_IPV6=y
362# CONFIG_CAN is not set 371# CONFIG_CAN is not set
363# CONFIG_IRDA is not set 372# CONFIG_IRDA is not set
364# CONFIG_BT is not set 373# CONFIG_BT is not set
365# CONFIG_PHONET is not set
366CONFIG_WIRELESS=y 374CONFIG_WIRELESS=y
367# CONFIG_CFG80211 is not set 375# CONFIG_CFG80211 is not set
368# CONFIG_WIRELESS_OLD_REGULATORY is not set 376# CONFIG_WIRELESS_OLD_REGULATORY is not set
369# CONFIG_WIRELESS_EXT is not set 377# CONFIG_WIRELESS_EXT is not set
370# CONFIG_LIB80211 is not set 378# CONFIG_LIB80211 is not set
371# CONFIG_MAC80211 is not set 379# CONFIG_MAC80211 is not set
380# CONFIG_WIMAX is not set
372# CONFIG_RFKILL is not set 381# CONFIG_RFKILL is not set
373 382
374# 383#
@@ -386,6 +395,7 @@ CONFIG_MTD=y
386# CONFIG_MTD_DEBUG is not set 395# CONFIG_MTD_DEBUG is not set
387# CONFIG_MTD_CONCAT is not set 396# CONFIG_MTD_CONCAT is not set
388CONFIG_MTD_PARTITIONS=y 397CONFIG_MTD_PARTITIONS=y
398# CONFIG_MTD_TESTS is not set
389# CONFIG_MTD_REDBOOT_PARTS is not set 399# CONFIG_MTD_REDBOOT_PARTS is not set
390# CONFIG_MTD_CMDLINE_PARTS is not set 400# CONFIG_MTD_CMDLINE_PARTS is not set
391# CONFIG_MTD_AR7_PARTS is not set 401# CONFIG_MTD_AR7_PARTS is not set
@@ -460,6 +470,11 @@ CONFIG_MTD_ROM=y
460# CONFIG_MTD_ONENAND is not set 470# CONFIG_MTD_ONENAND is not set
461 471
462# 472#
473# LPDDR flash memory drivers
474#
475# CONFIG_MTD_LPDDR is not set
476
477#
463# UBI - Unsorted block images 478# UBI - Unsorted block images
464# 479#
465# CONFIG_MTD_UBI is not set 480# CONFIG_MTD_UBI is not set
@@ -479,10 +494,14 @@ CONFIG_BLK_DEV_LOOP=y
479# CONFIG_BLK_DEV_HD is not set 494# CONFIG_BLK_DEV_HD is not set
480CONFIG_MISC_DEVICES=y 495CONFIG_MISC_DEVICES=y
481# CONFIG_PHANTOM is not set 496# CONFIG_PHANTOM is not set
482# CONFIG_EEPROM_93CX6 is not set
483# CONFIG_SGI_IOC4 is not set 497# CONFIG_SGI_IOC4 is not set
484# CONFIG_ENCLOSURE_SERVICES is not set 498# CONFIG_ENCLOSURE_SERVICES is not set
485# CONFIG_HP_ILO is not set 499# CONFIG_HP_ILO is not set
500
501#
502# EEPROM support
503#
504# CONFIG_EEPROM_93CX6 is not set
486CONFIG_HAVE_IDE=y 505CONFIG_HAVE_IDE=y
487# CONFIG_IDE is not set 506# CONFIG_IDE is not set
488 507
@@ -536,6 +555,7 @@ CONFIG_SCSI_LOWLEVEL=y
536# CONFIG_MEGARAID_NEWGEN is not set 555# CONFIG_MEGARAID_NEWGEN is not set
537# CONFIG_MEGARAID_LEGACY is not set 556# CONFIG_MEGARAID_LEGACY is not set
538# CONFIG_MEGARAID_SAS is not set 557# CONFIG_MEGARAID_SAS is not set
558# CONFIG_SCSI_MPT2SAS is not set
539# CONFIG_SCSI_HPTIOP is not set 559# CONFIG_SCSI_HPTIOP is not set
540# CONFIG_LIBFC is not set 560# CONFIG_LIBFC is not set
541# CONFIG_FCOE is not set 561# CONFIG_FCOE is not set
@@ -557,6 +577,7 @@ CONFIG_SCSI_LOWLEVEL=y
557# CONFIG_SCSI_DEBUG is not set 577# CONFIG_SCSI_DEBUG is not set
558# CONFIG_SCSI_SRP is not set 578# CONFIG_SCSI_SRP is not set
559# CONFIG_SCSI_DH is not set 579# CONFIG_SCSI_DH is not set
580# CONFIG_SCSI_OSD_INITIATOR is not set
560CONFIG_ATA=y 581CONFIG_ATA=y
561# CONFIG_ATA_NONSTANDARD is not set 582# CONFIG_ATA_NONSTANDARD is not set
562CONFIG_SATA_PMP=y 583CONFIG_SATA_PMP=y
@@ -565,6 +586,7 @@ CONFIG_SATA_PMP=y
565CONFIG_ATA_SFF=y 586CONFIG_ATA_SFF=y
566# CONFIG_SATA_SVW is not set 587# CONFIG_SATA_SVW is not set
567# CONFIG_ATA_PIIX is not set 588# CONFIG_ATA_PIIX is not set
589# CONFIG_SATA_MV is not set
568# CONFIG_SATA_NV is not set 590# CONFIG_SATA_NV is not set
569# CONFIG_PDC_ADMA is not set 591# CONFIG_PDC_ADMA is not set
570# CONFIG_SATA_QSTOR is not set 592# CONFIG_SATA_QSTOR is not set
@@ -619,6 +641,7 @@ CONFIG_SATA_SIL=y
619# CONFIG_IEEE1394 is not set 641# CONFIG_IEEE1394 is not set
620# CONFIG_I2O is not set 642# CONFIG_I2O is not set
621CONFIG_NETDEVICES=y 643CONFIG_NETDEVICES=y
644CONFIG_COMPAT_NET_DEV_OPS=y
622# CONFIG_DUMMY is not set 645# CONFIG_DUMMY is not set
623# CONFIG_BONDING is not set 646# CONFIG_BONDING is not set
624# CONFIG_EQUALIZER is not set 647# CONFIG_EQUALIZER is not set
@@ -654,8 +677,10 @@ CONFIG_MII=y
654# CONFIG_CASSINI is not set 677# CONFIG_CASSINI is not set
655# CONFIG_NET_VENDOR_3COM is not set 678# CONFIG_NET_VENDOR_3COM is not set
656CONFIG_SMC91X=y 679CONFIG_SMC91X=y
680# CONFIG_ETHOC is not set
657# CONFIG_SMC911X is not set 681# CONFIG_SMC911X is not set
658# CONFIG_SMSC911X is not set 682# CONFIG_SMSC911X is not set
683# CONFIG_DNET is not set
659# CONFIG_NET_TULIP is not set 684# CONFIG_NET_TULIP is not set
660# CONFIG_HP100 is not set 685# CONFIG_HP100 is not set
661# CONFIG_IBM_NEW_EMAC_ZMII is not set 686# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -693,7 +718,10 @@ CONFIG_NET_PCI=y
693# 718#
694# CONFIG_WLAN_PRE80211 is not set 719# CONFIG_WLAN_PRE80211 is not set
695# CONFIG_WLAN_80211 is not set 720# CONFIG_WLAN_80211 is not set
696# CONFIG_IWLWIFI_LEDS is not set 721
722#
723# Enable WiMAX (Networking options) to see the WiMAX drivers
724#
697 725
698# 726#
699# USB Network Adapters 727# USB Network Adapters
@@ -885,6 +913,7 @@ CONFIG_FB_SH_MOBILE_LCDC=m
885# CONFIG_FB_VIRTUAL is not set 913# CONFIG_FB_VIRTUAL is not set
886# CONFIG_FB_METRONOME is not set 914# CONFIG_FB_METRONOME is not set
887# CONFIG_FB_MB862XX is not set 915# CONFIG_FB_MB862XX is not set
916# CONFIG_FB_BROADSHEET is not set
888# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 917# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
889 918
890# 919#
@@ -978,6 +1007,7 @@ CONFIG_USB_MON=y
978# CONFIG_USB_C67X00_HCD is not set 1007# CONFIG_USB_C67X00_HCD is not set
979CONFIG_USB_EHCI_HCD=y 1008CONFIG_USB_EHCI_HCD=y
980# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1009# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1010# CONFIG_USB_OXU210HP_HCD is not set
981# CONFIG_USB_ISP116X_HCD is not set 1011# CONFIG_USB_ISP116X_HCD is not set
982CONFIG_USB_OHCI_HCD=y 1012CONFIG_USB_OHCI_HCD=y
983# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1013# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -996,18 +1026,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
996# CONFIG_USB_TMC is not set 1026# CONFIG_USB_TMC is not set
997 1027
998# 1028#
999# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1029# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1000# 1030#
1001 1031
1002# 1032#
1003# see USB_STORAGE Help for more information 1033# also be needed; see USB_STORAGE Help for more info
1004# 1034#
1005CONFIG_USB_STORAGE=y 1035CONFIG_USB_STORAGE=y
1006# CONFIG_USB_STORAGE_DEBUG is not set 1036# CONFIG_USB_STORAGE_DEBUG is not set
1007# CONFIG_USB_STORAGE_DATAFAB is not set 1037# CONFIG_USB_STORAGE_DATAFAB is not set
1008# CONFIG_USB_STORAGE_FREECOM is not set 1038# CONFIG_USB_STORAGE_FREECOM is not set
1009# CONFIG_USB_STORAGE_ISD200 is not set 1039# CONFIG_USB_STORAGE_ISD200 is not set
1010# CONFIG_USB_STORAGE_DPCM is not set
1011# CONFIG_USB_STORAGE_USBAT is not set 1040# CONFIG_USB_STORAGE_USBAT is not set
1012# CONFIG_USB_STORAGE_SDDR09 is not set 1041# CONFIG_USB_STORAGE_SDDR09 is not set
1013# CONFIG_USB_STORAGE_SDDR55 is not set 1042# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1043,7 +1072,6 @@ CONFIG_USB_STORAGE=y
1043# CONFIG_USB_LED is not set 1072# CONFIG_USB_LED is not set
1044# CONFIG_USB_CYPRESS_CY7C63 is not set 1073# CONFIG_USB_CYPRESS_CY7C63 is not set
1045# CONFIG_USB_CYTHERM is not set 1074# CONFIG_USB_CYTHERM is not set
1046# CONFIG_USB_PHIDGET is not set
1047# CONFIG_USB_IDMOUSE is not set 1075# CONFIG_USB_IDMOUSE is not set
1048# CONFIG_USB_FTDI_ELAN is not set 1076# CONFIG_USB_FTDI_ELAN is not set
1049# CONFIG_USB_APPLEDISPLAY is not set 1077# CONFIG_USB_APPLEDISPLAY is not set
@@ -1055,6 +1083,11 @@ CONFIG_USB_STORAGE=y
1055# CONFIG_USB_ISIGHTFW is not set 1083# CONFIG_USB_ISIGHTFW is not set
1056# CONFIG_USB_VST is not set 1084# CONFIG_USB_VST is not set
1057# CONFIG_USB_GADGET is not set 1085# CONFIG_USB_GADGET is not set
1086
1087#
1088# OTG and related infrastructure
1089#
1090# CONFIG_NOP_USB_XCEIV is not set
1058# CONFIG_MMC is not set 1091# CONFIG_MMC is not set
1059# CONFIG_MEMSTICK is not set 1092# CONFIG_MEMSTICK is not set
1060# CONFIG_NEW_LEDS is not set 1093# CONFIG_NEW_LEDS is not set
@@ -1062,6 +1095,7 @@ CONFIG_USB_STORAGE=y
1062# CONFIG_INFINIBAND is not set 1095# CONFIG_INFINIBAND is not set
1063# CONFIG_RTC_CLASS is not set 1096# CONFIG_RTC_CLASS is not set
1064# CONFIG_DMADEVICES is not set 1097# CONFIG_DMADEVICES is not set
1098# CONFIG_AUXDISPLAY is not set
1065# CONFIG_UIO is not set 1099# CONFIG_UIO is not set
1066# CONFIG_STAGING is not set 1100# CONFIG_STAGING is not set
1067 1101
@@ -1120,6 +1154,7 @@ CONFIG_MISC_FILESYSTEMS=y
1120# CONFIG_HFSPLUS_FS is not set 1154# CONFIG_HFSPLUS_FS is not set
1121# CONFIG_JFFS2_FS is not set 1155# CONFIG_JFFS2_FS is not set
1122CONFIG_CRAMFS=y 1156CONFIG_CRAMFS=y
1157# CONFIG_SQUASHFS is not set
1123# CONFIG_VXFS_FS is not set 1158# CONFIG_VXFS_FS is not set
1124# CONFIG_MINIX_FS is not set 1159# CONFIG_MINIX_FS is not set
1125# CONFIG_OMFS_FS is not set 1160# CONFIG_OMFS_FS is not set
@@ -1214,7 +1249,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1214# 1249#
1215# Tracers 1250# Tracers
1216# 1251#
1217# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1252# CONFIG_DYNAMIC_DEBUG is not set
1218# CONFIG_SAMPLES is not set 1253# CONFIG_SAMPLES is not set
1219CONFIG_HAVE_ARCH_KGDB=y 1254CONFIG_HAVE_ARCH_KGDB=y
1220# CONFIG_SH_STANDARD_BIOS is not set 1255# CONFIG_SH_STANDARD_BIOS is not set
@@ -1301,6 +1336,7 @@ CONFIG_CRYPTO=y
1301# Compression 1336# Compression
1302# 1337#
1303# CONFIG_CRYPTO_DEFLATE is not set 1338# CONFIG_CRYPTO_DEFLATE is not set
1339# CONFIG_CRYPTO_ZLIB is not set
1304# CONFIG_CRYPTO_LZO is not set 1340# CONFIG_CRYPTO_LZO is not set
1305 1341
1306# 1342#
@@ -1323,7 +1359,7 @@ CONFIG_CRC32=y
1323# CONFIG_CRC7 is not set 1359# CONFIG_CRC7 is not set
1324# CONFIG_LIBCRC32C is not set 1360# CONFIG_LIBCRC32C is not set
1325CONFIG_ZLIB_INFLATE=y 1361CONFIG_ZLIB_INFLATE=y
1326CONFIG_PLIST=y
1327CONFIG_HAS_IOMEM=y 1362CONFIG_HAS_IOMEM=y
1328CONFIG_HAS_IOPORT=y 1363CONFIG_HAS_IOPORT=y
1329CONFIG_HAS_DMA=y 1364CONFIG_HAS_DMA=y
1365CONFIG_NLATTR=y
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index 04bde1e96965..6fcdb090cf32 100644
--- a/arch/sh/configs/sh03_defconfig
+++ b/arch/sh/configs/sh03_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 17:56:46 2009 4# Thu Apr 2 19:04:59 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -44,18 +45,32 @@ CONFIG_BSD_PROCESS_ACCT=y
44# CONFIG_BSD_PROCESS_ACCT_V3 is not set 45# CONFIG_BSD_PROCESS_ACCT_V3 is not set
45# CONFIG_TASKSTATS is not set 46# CONFIG_TASKSTATS is not set
46# CONFIG_AUDIT is not set 47# CONFIG_AUDIT is not set
48
49#
50# RCU Subsystem
51#
52CONFIG_CLASSIC_RCU=y
53# CONFIG_TREE_RCU is not set
54# CONFIG_PREEMPT_RCU is not set
55# CONFIG_TREE_RCU_TRACE is not set
56# CONFIG_PREEMPT_RCU_TRACE is not set
47# CONFIG_IKCONFIG is not set 57# CONFIG_IKCONFIG is not set
48CONFIG_LOG_BUF_SHIFT=14 58CONFIG_LOG_BUF_SHIFT=14
49# CONFIG_CGROUPS is not set
50# CONFIG_GROUP_SCHED is not set 59# CONFIG_GROUP_SCHED is not set
60# CONFIG_CGROUPS is not set
51CONFIG_SYSFS_DEPRECATED=y 61CONFIG_SYSFS_DEPRECATED=y
52CONFIG_SYSFS_DEPRECATED_V2=y 62CONFIG_SYSFS_DEPRECATED_V2=y
53# CONFIG_RELAY is not set 63# CONFIG_RELAY is not set
54# CONFIG_NAMESPACES is not set 64# CONFIG_NAMESPACES is not set
55CONFIG_BLK_DEV_INITRD=y 65CONFIG_BLK_DEV_INITRD=y
56CONFIG_INITRAMFS_SOURCE="" 66CONFIG_INITRAMFS_SOURCE=""
67CONFIG_RD_GZIP=y
68# CONFIG_RD_BZIP2 is not set
69# CONFIG_RD_LZMA is not set
70CONFIG_INITRAMFS_COMPRESSION_NONE=y
57CONFIG_CC_OPTIMIZE_FOR_SIZE=y 71CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58CONFIG_SYSCTL=y 72CONFIG_SYSCTL=y
73CONFIG_ANON_INODES=y
59CONFIG_EMBEDDED=y 74CONFIG_EMBEDDED=y
60CONFIG_UID16=y 75CONFIG_UID16=y
61# CONFIG_SYSCTL_SYSCALL is not set 76# CONFIG_SYSCTL_SYSCALL is not set
@@ -65,10 +80,8 @@ CONFIG_HOTPLUG=y
65CONFIG_PRINTK=y 80CONFIG_PRINTK=y
66CONFIG_BUG=y 81CONFIG_BUG=y
67CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
68CONFIG_COMPAT_BRK=y
69CONFIG_BASE_FULL=y 83CONFIG_BASE_FULL=y
70CONFIG_FUTEX=y 84CONFIG_FUTEX=y
71CONFIG_ANON_INODES=y
72CONFIG_EPOLL=y 85CONFIG_EPOLL=y
73CONFIG_SIGNALFD=y 86CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y 87CONFIG_TIMERFD=y
@@ -77,6 +90,7 @@ CONFIG_SHMEM=y
77CONFIG_AIO=y 90CONFIG_AIO=y
78CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
79CONFIG_PCI_QUIRKS=y 92CONFIG_PCI_QUIRKS=y
93CONFIG_COMPAT_BRK=y
80CONFIG_SLAB=y 94CONFIG_SLAB=y
81# CONFIG_SLUB is not set 95# CONFIG_SLUB is not set
82# CONFIG_SLOB is not set 96# CONFIG_SLOB is not set
@@ -119,11 +133,6 @@ CONFIG_DEFAULT_AS=y
119# CONFIG_DEFAULT_CFQ is not set 133# CONFIG_DEFAULT_CFQ is not set
120# CONFIG_DEFAULT_NOOP is not set 134# CONFIG_DEFAULT_NOOP is not set
121CONFIG_DEFAULT_IOSCHED="anticipatory" 135CONFIG_DEFAULT_IOSCHED="anticipatory"
122CONFIG_CLASSIC_RCU=y
123# CONFIG_TREE_RCU is not set
124# CONFIG_PREEMPT_RCU is not set
125# CONFIG_TREE_RCU_TRACE is not set
126# CONFIG_PREEMPT_RCU_TRACE is not set
127# CONFIG_FREEZER is not set 136# CONFIG_FREEZER is not set
128 137
129# 138#
@@ -158,6 +167,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y
158# CONFIG_CPU_SUBTYPE_SH7770 is not set 167# CONFIG_CPU_SUBTYPE_SH7770 is not set
159# CONFIG_CPU_SUBTYPE_SH7780 is not set 168# CONFIG_CPU_SUBTYPE_SH7780 is not set
160# CONFIG_CPU_SUBTYPE_SH7785 is not set 169# CONFIG_CPU_SUBTYPE_SH7785 is not set
170# CONFIG_CPU_SUBTYPE_SH7786 is not set
161# CONFIG_CPU_SUBTYPE_SHX3 is not set 171# CONFIG_CPU_SUBTYPE_SHX3 is not set
162# CONFIG_CPU_SUBTYPE_SH7343 is not set 172# CONFIG_CPU_SUBTYPE_SH7343 is not set
163# CONFIG_CPU_SUBTYPE_SH7722 is not set 173# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -199,11 +209,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
199CONFIG_ZONE_DMA_FLAG=0 209CONFIG_ZONE_DMA_FLAG=0
200CONFIG_NR_QUICK=2 210CONFIG_NR_QUICK=2
201CONFIG_UNEVICTABLE_LRU=y 211CONFIG_UNEVICTABLE_LRU=y
212CONFIG_HAVE_MLOCK=y
213CONFIG_HAVE_MLOCKED_PAGE_BIT=y
202 214
203# 215#
204# Cache configuration 216# Cache configuration
205# 217#
206# CONFIG_SH_DIRECT_MAPPED is not set
207CONFIG_CACHE_WRITEBACK=y 218CONFIG_CACHE_WRITEBACK=y
208# CONFIG_CACHE_WRITETHROUGH is not set 219# CONFIG_CACHE_WRITETHROUGH is not set
209# CONFIG_CACHE_OFF is not set 220# CONFIG_CACHE_OFF is not set
@@ -294,6 +305,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
294# CONFIG_PCIEPORTBUS is not set 305# CONFIG_PCIEPORTBUS is not set
295# CONFIG_ARCH_SUPPORTS_MSI is not set 306# CONFIG_ARCH_SUPPORTS_MSI is not set
296CONFIG_PCI_LEGACY=y 307CONFIG_PCI_LEGACY=y
308# CONFIG_PCI_STUB is not set
309# CONFIG_PCI_IOV is not set
297# CONFIG_PCCARD is not set 310# CONFIG_PCCARD is not set
298CONFIG_HOTPLUG_PCI=m 311CONFIG_HOTPLUG_PCI=m
299# CONFIG_HOTPLUG_PCI_FAKE is not set 312# CONFIG_HOTPLUG_PCI_FAKE is not set
@@ -318,7 +331,6 @@ CONFIG_NET=y
318# 331#
319# Networking options 332# Networking options
320# 333#
321CONFIG_COMPAT_NET_DEV_OPS=y
322CONFIG_PACKET=y 334CONFIG_PACKET=y
323# CONFIG_PACKET_MMAP is not set 335# CONFIG_PACKET_MMAP is not set
324CONFIG_UNIX=y 336CONFIG_UNIX=y
@@ -375,6 +387,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
375# CONFIG_LAPB is not set 387# CONFIG_LAPB is not set
376# CONFIG_ECONET is not set 388# CONFIG_ECONET is not set
377# CONFIG_WAN_ROUTER is not set 389# CONFIG_WAN_ROUTER is not set
390# CONFIG_PHONET is not set
378# CONFIG_NET_SCHED is not set 391# CONFIG_NET_SCHED is not set
379# CONFIG_DCB is not set 392# CONFIG_DCB is not set
380 393
@@ -382,18 +395,19 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
382# Network testing 395# Network testing
383# 396#
384# CONFIG_NET_PKTGEN is not set 397# CONFIG_NET_PKTGEN is not set
398# CONFIG_NET_DROP_MONITOR is not set
385# CONFIG_HAMRADIO is not set 399# CONFIG_HAMRADIO is not set
386# CONFIG_CAN is not set 400# CONFIG_CAN is not set
387# CONFIG_IRDA is not set 401# CONFIG_IRDA is not set
388# CONFIG_BT is not set 402# CONFIG_BT is not set
389# CONFIG_AF_RXRPC is not set 403# CONFIG_AF_RXRPC is not set
390# CONFIG_PHONET is not set
391CONFIG_WIRELESS=y 404CONFIG_WIRELESS=y
392# CONFIG_CFG80211 is not set 405# CONFIG_CFG80211 is not set
393# CONFIG_WIRELESS_OLD_REGULATORY is not set 406# CONFIG_WIRELESS_OLD_REGULATORY is not set
394# CONFIG_WIRELESS_EXT is not set 407# CONFIG_WIRELESS_EXT is not set
395# CONFIG_LIB80211 is not set 408# CONFIG_LIB80211 is not set
396# CONFIG_MAC80211 is not set 409# CONFIG_MAC80211 is not set
410# CONFIG_WIMAX is not set
397# CONFIG_RFKILL is not set 411# CONFIG_RFKILL is not set
398# CONFIG_NET_9P is not set 412# CONFIG_NET_9P is not set
399 413
@@ -430,12 +444,16 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
430# CONFIG_BLK_DEV_HD is not set 444# CONFIG_BLK_DEV_HD is not set
431CONFIG_MISC_DEVICES=y 445CONFIG_MISC_DEVICES=y
432# CONFIG_PHANTOM is not set 446# CONFIG_PHANTOM is not set
433# CONFIG_EEPROM_93CX6 is not set
434# CONFIG_SGI_IOC4 is not set 447# CONFIG_SGI_IOC4 is not set
435# CONFIG_TIFM_CORE is not set 448# CONFIG_TIFM_CORE is not set
436# CONFIG_ENCLOSURE_SERVICES is not set 449# CONFIG_ENCLOSURE_SERVICES is not set
437# CONFIG_HP_ILO is not set 450# CONFIG_HP_ILO is not set
438# CONFIG_C2PORT is not set 451# CONFIG_C2PORT is not set
452
453#
454# EEPROM support
455#
456# CONFIG_EEPROM_93CX6 is not set
439CONFIG_HAVE_IDE=y 457CONFIG_HAVE_IDE=y
440CONFIG_IDE=y 458CONFIG_IDE=y
441 459
@@ -541,6 +559,7 @@ CONFIG_SCSI_LOWLEVEL=y
541# CONFIG_MEGARAID_NEWGEN is not set 559# CONFIG_MEGARAID_NEWGEN is not set
542# CONFIG_MEGARAID_LEGACY is not set 560# CONFIG_MEGARAID_LEGACY is not set
543# CONFIG_MEGARAID_SAS is not set 561# CONFIG_MEGARAID_SAS is not set
562# CONFIG_SCSI_MPT2SAS is not set
544# CONFIG_SCSI_HPTIOP is not set 563# CONFIG_SCSI_HPTIOP is not set
545# CONFIG_LIBFC is not set 564# CONFIG_LIBFC is not set
546# CONFIG_FCOE is not set 565# CONFIG_FCOE is not set
@@ -562,6 +581,7 @@ CONFIG_SCSI_LOWLEVEL=y
562# CONFIG_SCSI_DEBUG is not set 581# CONFIG_SCSI_DEBUG is not set
563# CONFIG_SCSI_SRP is not set 582# CONFIG_SCSI_SRP is not set
564# CONFIG_SCSI_DH is not set 583# CONFIG_SCSI_DH is not set
584# CONFIG_SCSI_OSD_INITIATOR is not set
565# CONFIG_ATA is not set 585# CONFIG_ATA is not set
566# CONFIG_MD is not set 586# CONFIG_MD is not set
567# CONFIG_FUSION is not set 587# CONFIG_FUSION is not set
@@ -577,6 +597,7 @@ CONFIG_SCSI_LOWLEVEL=y
577# CONFIG_IEEE1394 is not set 597# CONFIG_IEEE1394 is not set
578# CONFIG_I2O is not set 598# CONFIG_I2O is not set
579CONFIG_NETDEVICES=y 599CONFIG_NETDEVICES=y
600CONFIG_COMPAT_NET_DEV_OPS=y
580# CONFIG_DUMMY is not set 601# CONFIG_DUMMY is not set
581# CONFIG_BONDING is not set 602# CONFIG_BONDING is not set
582# CONFIG_MACVLAN is not set 603# CONFIG_MACVLAN is not set
@@ -594,8 +615,10 @@ CONFIG_MII=y
594# CONFIG_CASSINI is not set 615# CONFIG_CASSINI is not set
595# CONFIG_NET_VENDOR_3COM is not set 616# CONFIG_NET_VENDOR_3COM is not set
596# CONFIG_SMC91X is not set 617# CONFIG_SMC91X is not set
618# CONFIG_ETHOC is not set
597# CONFIG_SMC911X is not set 619# CONFIG_SMC911X is not set
598# CONFIG_SMSC911X is not set 620# CONFIG_SMSC911X is not set
621# CONFIG_DNET is not set
599# CONFIG_NET_TULIP is not set 622# CONFIG_NET_TULIP is not set
600# CONFIG_HP100 is not set 623# CONFIG_HP100 is not set
601# CONFIG_IBM_NEW_EMAC_ZMII is not set 624# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -646,6 +669,7 @@ CONFIG_NETDEV_1000=y
646# CONFIG_QLA3XXX is not set 669# CONFIG_QLA3XXX is not set
647# CONFIG_ATL1 is not set 670# CONFIG_ATL1 is not set
648# CONFIG_ATL1E is not set 671# CONFIG_ATL1E is not set
672# CONFIG_ATL1C is not set
649# CONFIG_JME is not set 673# CONFIG_JME is not set
650CONFIG_NETDEV_10000=y 674CONFIG_NETDEV_10000=y
651# CONFIG_CHELSIO_T1 is not set 675# CONFIG_CHELSIO_T1 is not set
@@ -664,6 +688,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
664# CONFIG_BNX2X is not set 688# CONFIG_BNX2X is not set
665# CONFIG_QLGE is not set 689# CONFIG_QLGE is not set
666# CONFIG_SFC is not set 690# CONFIG_SFC is not set
691# CONFIG_BE2NET is not set
667# CONFIG_TR is not set 692# CONFIG_TR is not set
668 693
669# 694#
@@ -671,7 +696,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
671# 696#
672# CONFIG_WLAN_PRE80211 is not set 697# CONFIG_WLAN_PRE80211 is not set
673# CONFIG_WLAN_80211 is not set 698# CONFIG_WLAN_80211 is not set
674# CONFIG_IWLWIFI_LEDS is not set 699
700#
701# Enable WiMAX (Networking options) to see the WiMAX drivers
702#
675# CONFIG_WAN is not set 703# CONFIG_WAN is not set
676# CONFIG_FDDI is not set 704# CONFIG_FDDI is not set
677# CONFIG_HIPPI is not set 705# CONFIG_HIPPI is not set
@@ -754,6 +782,7 @@ CONFIG_LEGACY_PTYS=y
754CONFIG_LEGACY_PTY_COUNT=256 782CONFIG_LEGACY_PTY_COUNT=256
755# CONFIG_IPMI_HANDLER is not set 783# CONFIG_IPMI_HANDLER is not set
756CONFIG_HW_RANDOM=y 784CONFIG_HW_RANDOM=y
785# CONFIG_HW_RANDOM_TIMERIOMEM is not set
757# CONFIG_R3964 is not set 786# CONFIG_R3964 is not set
758# CONFIG_APPLICOM is not set 787# CONFIG_APPLICOM is not set
759# CONFIG_RAW_DRIVER is not set 788# CONFIG_RAW_DRIVER is not set
@@ -872,9 +901,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
872# 901#
873 902
874# 903#
875# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 904# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
876# 905#
877# CONFIG_USB_GADGET is not set 906# CONFIG_USB_GADGET is not set
907
908#
909# OTG and related infrastructure
910#
878# CONFIG_UWB is not set 911# CONFIG_UWB is not set
879# CONFIG_MMC is not set 912# CONFIG_MMC is not set
880# CONFIG_MEMSTICK is not set 913# CONFIG_MEMSTICK is not set
@@ -883,6 +916,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
883# CONFIG_INFINIBAND is not set 916# CONFIG_INFINIBAND is not set
884# CONFIG_RTC_CLASS is not set 917# CONFIG_RTC_CLASS is not set
885# CONFIG_DMADEVICES is not set 918# CONFIG_DMADEVICES is not set
919# CONFIG_AUXDISPLAY is not set
886# CONFIG_UIO is not set 920# CONFIG_UIO is not set
887# CONFIG_STAGING is not set 921# CONFIG_STAGING is not set
888 922
@@ -908,6 +942,7 @@ CONFIG_FS_POSIX_ACL=y
908CONFIG_FILE_LOCKING=y 942CONFIG_FILE_LOCKING=y
909# CONFIG_XFS_FS is not set 943# CONFIG_XFS_FS is not set
910# CONFIG_OCFS2_FS is not set 944# CONFIG_OCFS2_FS is not set
945# CONFIG_BTRFS_FS is not set
911CONFIG_DNOTIFY=y 946CONFIG_DNOTIFY=y
912CONFIG_INOTIFY=y 947CONFIG_INOTIFY=y
913CONFIG_INOTIFY_USER=y 948CONFIG_INOTIFY_USER=y
@@ -957,6 +992,7 @@ CONFIG_MISC_FILESYSTEMS=y
957# CONFIG_BFS_FS is not set 992# CONFIG_BFS_FS is not set
958# CONFIG_EFS_FS is not set 993# CONFIG_EFS_FS is not set
959# CONFIG_CRAMFS is not set 994# CONFIG_CRAMFS is not set
995# CONFIG_SQUASHFS is not set
960# CONFIG_VXFS_FS is not set 996# CONFIG_VXFS_FS is not set
961# CONFIG_MINIX_FS is not set 997# CONFIG_MINIX_FS is not set
962# CONFIG_OMFS_FS is not set 998# CONFIG_OMFS_FS is not set
@@ -981,7 +1017,6 @@ CONFIG_EXPORTFS=y
981CONFIG_NFS_COMMON=y 1017CONFIG_NFS_COMMON=y
982CONFIG_SUNRPC=y 1018CONFIG_SUNRPC=y
983CONFIG_SUNRPC_GSS=y 1019CONFIG_SUNRPC_GSS=y
984# CONFIG_SUNRPC_REGISTER_V4 is not set
985CONFIG_RPCSEC_GSS_KRB5=y 1020CONFIG_RPCSEC_GSS_KRB5=y
986# CONFIG_RPCSEC_GSS_SPKM3 is not set 1021# CONFIG_RPCSEC_GSS_SPKM3 is not set
987# CONFIG_SMB_FS is not set 1022# CONFIG_SMB_FS is not set
@@ -1081,7 +1116,7 @@ CONFIG_TRACING=y
1081# 1116#
1082# Tracers 1117# Tracers
1083# 1118#
1084# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1119# CONFIG_DYNAMIC_DEBUG is not set
1085# CONFIG_SAMPLES is not set 1120# CONFIG_SAMPLES is not set
1086CONFIG_HAVE_ARCH_KGDB=y 1121CONFIG_HAVE_ARCH_KGDB=y
1087CONFIG_SH_STANDARD_BIOS=y 1122CONFIG_SH_STANDARD_BIOS=y
@@ -1110,10 +1145,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1110CONFIG_CRYPTO_HASH=y 1145CONFIG_CRYPTO_HASH=y
1111CONFIG_CRYPTO_HASH2=y 1146CONFIG_CRYPTO_HASH2=y
1112CONFIG_CRYPTO_RNG2=y 1147CONFIG_CRYPTO_RNG2=y
1148CONFIG_CRYPTO_PCOMP=y
1113CONFIG_CRYPTO_MANAGER=y 1149CONFIG_CRYPTO_MANAGER=y
1114CONFIG_CRYPTO_MANAGER2=y 1150CONFIG_CRYPTO_MANAGER2=y
1115# CONFIG_CRYPTO_GF128MUL is not set 1151# CONFIG_CRYPTO_GF128MUL is not set
1116# CONFIG_CRYPTO_NULL is not set 1152# CONFIG_CRYPTO_NULL is not set
1153CONFIG_CRYPTO_WORKQUEUE=y
1117# CONFIG_CRYPTO_CRYPTD is not set 1154# CONFIG_CRYPTO_CRYPTD is not set
1118# CONFIG_CRYPTO_AUTHENC is not set 1155# CONFIG_CRYPTO_AUTHENC is not set
1119# CONFIG_CRYPTO_TEST is not set 1156# CONFIG_CRYPTO_TEST is not set
@@ -1182,6 +1219,7 @@ CONFIG_CRYPTO_DES=y
1182# Compression 1219# Compression
1183# 1220#
1184CONFIG_CRYPTO_DEFLATE=y 1221CONFIG_CRYPTO_DEFLATE=y
1222# CONFIG_CRYPTO_ZLIB is not set
1185# CONFIG_CRYPTO_LZO is not set 1223# CONFIG_CRYPTO_LZO is not set
1186 1224
1187# 1225#
@@ -1205,7 +1243,8 @@ CONFIG_CRC32=y
1205# CONFIG_LIBCRC32C is not set 1243# CONFIG_LIBCRC32C is not set
1206CONFIG_ZLIB_INFLATE=y 1244CONFIG_ZLIB_INFLATE=y
1207CONFIG_ZLIB_DEFLATE=y 1245CONFIG_ZLIB_DEFLATE=y
1208CONFIG_PLIST=y 1246CONFIG_DECOMPRESS_GZIP=y
1209CONFIG_HAS_IOMEM=y 1247CONFIG_HAS_IOMEM=y
1210CONFIG_HAS_IOPORT=y 1248CONFIG_HAS_IOPORT=y
1211CONFIG_HAS_DMA=y 1249CONFIG_HAS_DMA=y
1250CONFIG_NLATTR=y
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
index 1b869f452ad1..1ab37c01da6e 100644
--- a/arch/sh/configs/sh7710voipgw_defconfig
+++ b/arch/sh/configs/sh7710voipgw_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:00:31 2009 4# Thu Apr 2 19:09:01 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -41,14 +42,23 @@ CONFIG_POSIX_MQUEUE=y
41# CONFIG_BSD_PROCESS_ACCT is not set 42# CONFIG_BSD_PROCESS_ACCT is not set
42# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
45
46#
47# RCU Subsystem
48#
49CONFIG_CLASSIC_RCU=y
50# CONFIG_TREE_RCU is not set
51# CONFIG_PREEMPT_RCU is not set
52# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
44# CONFIG_IKCONFIG is not set 54# CONFIG_IKCONFIG is not set
45CONFIG_LOG_BUF_SHIFT=14 55CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_CGROUPS is not set
47CONFIG_GROUP_SCHED=y 56CONFIG_GROUP_SCHED=y
48CONFIG_FAIR_GROUP_SCHED=y 57CONFIG_FAIR_GROUP_SCHED=y
49# CONFIG_RT_GROUP_SCHED is not set 58# CONFIG_RT_GROUP_SCHED is not set
50CONFIG_USER_SCHED=y 59CONFIG_USER_SCHED=y
51# CONFIG_CGROUP_SCHED is not set 60# CONFIG_CGROUP_SCHED is not set
61# CONFIG_CGROUPS is not set
52CONFIG_SYSFS_DEPRECATED=y 62CONFIG_SYSFS_DEPRECATED=y
53CONFIG_SYSFS_DEPRECATED_V2=y 63CONFIG_SYSFS_DEPRECATED_V2=y
54# CONFIG_RELAY is not set 64# CONFIG_RELAY is not set
@@ -56,6 +66,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
56# CONFIG_BLK_DEV_INITRD is not set 66# CONFIG_BLK_DEV_INITRD is not set
57CONFIG_CC_OPTIMIZE_FOR_SIZE=y 67CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58CONFIG_SYSCTL=y 68CONFIG_SYSCTL=y
69CONFIG_ANON_INODES=y
59CONFIG_EMBEDDED=y 70CONFIG_EMBEDDED=y
60CONFIG_UID16=y 71CONFIG_UID16=y
61# CONFIG_SYSCTL_SYSCALL is not set 72# CONFIG_SYSCTL_SYSCALL is not set
@@ -65,10 +76,8 @@ CONFIG_HOTPLUG=y
65CONFIG_PRINTK=y 76CONFIG_PRINTK=y
66CONFIG_BUG=y 77CONFIG_BUG=y
67CONFIG_ELF_CORE=y 78CONFIG_ELF_CORE=y
68CONFIG_COMPAT_BRK=y
69CONFIG_BASE_FULL=y 79CONFIG_BASE_FULL=y
70# CONFIG_FUTEX is not set 80# CONFIG_FUTEX is not set
71CONFIG_ANON_INODES=y
72# CONFIG_EPOLL is not set 81# CONFIG_EPOLL is not set
73CONFIG_SIGNALFD=y 82CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y 83CONFIG_TIMERFD=y
@@ -76,6 +85,7 @@ CONFIG_EVENTFD=y
76# CONFIG_SHMEM is not set 85# CONFIG_SHMEM is not set
77CONFIG_AIO=y 86CONFIG_AIO=y
78CONFIG_VM_EVENT_COUNTERS=y 87CONFIG_VM_EVENT_COUNTERS=y
88CONFIG_COMPAT_BRK=y
79CONFIG_SLAB=y 89CONFIG_SLAB=y
80# CONFIG_SLUB is not set 90# CONFIG_SLUB is not set
81# CONFIG_SLOB is not set 91# CONFIG_SLOB is not set
@@ -114,11 +124,6 @@ CONFIG_DEFAULT_DEADLINE=y
114# CONFIG_DEFAULT_CFQ is not set 124# CONFIG_DEFAULT_CFQ is not set
115# CONFIG_DEFAULT_NOOP is not set 125# CONFIG_DEFAULT_NOOP is not set
116CONFIG_DEFAULT_IOSCHED="deadline" 126CONFIG_DEFAULT_IOSCHED="deadline"
117CONFIG_CLASSIC_RCU=y
118# CONFIG_TREE_RCU is not set
119# CONFIG_PREEMPT_RCU is not set
120# CONFIG_TREE_RCU_TRACE is not set
121# CONFIG_PREEMPT_RCU_TRACE is not set
122# CONFIG_FREEZER is not set 127# CONFIG_FREEZER is not set
123 128
124# 129#
@@ -153,6 +158,7 @@ CONFIG_CPU_SUBTYPE_SH7710=y
153# CONFIG_CPU_SUBTYPE_SH7770 is not set 158# CONFIG_CPU_SUBTYPE_SH7770 is not set
154# CONFIG_CPU_SUBTYPE_SH7780 is not set 159# CONFIG_CPU_SUBTYPE_SH7780 is not set
155# CONFIG_CPU_SUBTYPE_SH7785 is not set 160# CONFIG_CPU_SUBTYPE_SH7785 is not set
161# CONFIG_CPU_SUBTYPE_SH7786 is not set
156# CONFIG_CPU_SUBTYPE_SHX3 is not set 162# CONFIG_CPU_SUBTYPE_SHX3 is not set
157# CONFIG_CPU_SUBTYPE_SH7343 is not set 163# CONFIG_CPU_SUBTYPE_SH7343 is not set
158# CONFIG_CPU_SUBTYPE_SH7722 is not set 164# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -194,11 +200,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
194CONFIG_ZONE_DMA_FLAG=0 200CONFIG_ZONE_DMA_FLAG=0
195CONFIG_NR_QUICK=2 201CONFIG_NR_QUICK=2
196CONFIG_UNEVICTABLE_LRU=y 202CONFIG_UNEVICTABLE_LRU=y
203CONFIG_HAVE_MLOCK=y
204CONFIG_HAVE_MLOCKED_PAGE_BIT=y
197 205
198# 206#
199# Cache configuration 207# Cache configuration
200# 208#
201# CONFIG_SH_DIRECT_MAPPED is not set
202CONFIG_CACHE_WRITEBACK=y 209CONFIG_CACHE_WRITEBACK=y
203# CONFIG_CACHE_WRITETHROUGH is not set 210# CONFIG_CACHE_WRITETHROUGH is not set
204# CONFIG_CACHE_OFF is not set 211# CONFIG_CACHE_OFF is not set
@@ -299,7 +306,6 @@ CONFIG_NET=y
299# 306#
300# Networking options 307# Networking options
301# 308#
302CONFIG_COMPAT_NET_DEV_OPS=y
303CONFIG_PACKET=y 309CONFIG_PACKET=y
304# CONFIG_PACKET_MMAP is not set 310# CONFIG_PACKET_MMAP is not set
305CONFIG_UNIX=y 311CONFIG_UNIX=y
@@ -369,6 +375,7 @@ CONFIG_NETFILTER_ADVANCED=y
369# CONFIG_LAPB is not set 375# CONFIG_LAPB is not set
370# CONFIG_ECONET is not set 376# CONFIG_ECONET is not set
371# CONFIG_WAN_ROUTER is not set 377# CONFIG_WAN_ROUTER is not set
378# CONFIG_PHONET is not set
372CONFIG_NET_SCHED=y 379CONFIG_NET_SCHED=y
373 380
374# 381#
@@ -418,13 +425,13 @@ CONFIG_NET_SCH_FIFO=y
418# CONFIG_IRDA is not set 425# CONFIG_IRDA is not set
419# CONFIG_BT is not set 426# CONFIG_BT is not set
420# CONFIG_AF_RXRPC is not set 427# CONFIG_AF_RXRPC is not set
421# CONFIG_PHONET is not set
422CONFIG_WIRELESS=y 428CONFIG_WIRELESS=y
423# CONFIG_CFG80211 is not set 429# CONFIG_CFG80211 is not set
424# CONFIG_WIRELESS_OLD_REGULATORY is not set 430# CONFIG_WIRELESS_OLD_REGULATORY is not set
425# CONFIG_WIRELESS_EXT is not set 431# CONFIG_WIRELESS_EXT is not set
426# CONFIG_LIB80211 is not set 432# CONFIG_LIB80211 is not set
427# CONFIG_MAC80211 is not set 433# CONFIG_MAC80211 is not set
434# CONFIG_WIMAX is not set
428# CONFIG_RFKILL is not set 435# CONFIG_RFKILL is not set
429# CONFIG_NET_9P is not set 436# CONFIG_NET_9P is not set
430 437
@@ -447,6 +454,7 @@ CONFIG_MTD=y
447# CONFIG_MTD_DEBUG is not set 454# CONFIG_MTD_DEBUG is not set
448# CONFIG_MTD_CONCAT is not set 455# CONFIG_MTD_CONCAT is not set
449CONFIG_MTD_PARTITIONS=y 456CONFIG_MTD_PARTITIONS=y
457# CONFIG_MTD_TESTS is not set
450# CONFIG_MTD_REDBOOT_PARTS is not set 458# CONFIG_MTD_REDBOOT_PARTS is not set
451# CONFIG_MTD_CMDLINE_PARTS is not set 459# CONFIG_MTD_CMDLINE_PARTS is not set
452# CONFIG_MTD_AR7_PARTS is not set 460# CONFIG_MTD_AR7_PARTS is not set
@@ -514,6 +522,11 @@ CONFIG_MTD_RAM=y
514# CONFIG_MTD_ONENAND is not set 522# CONFIG_MTD_ONENAND is not set
515 523
516# 524#
525# LPDDR flash memory drivers
526#
527# CONFIG_MTD_LPDDR is not set
528
529#
517# UBI - Unsorted block images 530# UBI - Unsorted block images
518# 531#
519# CONFIG_MTD_UBI is not set 532# CONFIG_MTD_UBI is not set
@@ -527,9 +540,13 @@ CONFIG_BLK_DEV=y
527# CONFIG_ATA_OVER_ETH is not set 540# CONFIG_ATA_OVER_ETH is not set
528# CONFIG_BLK_DEV_HD is not set 541# CONFIG_BLK_DEV_HD is not set
529CONFIG_MISC_DEVICES=y 542CONFIG_MISC_DEVICES=y
530# CONFIG_EEPROM_93CX6 is not set
531# CONFIG_ENCLOSURE_SERVICES is not set 543# CONFIG_ENCLOSURE_SERVICES is not set
532# CONFIG_C2PORT is not set 544# CONFIG_C2PORT is not set
545
546#
547# EEPROM support
548#
549# CONFIG_EEPROM_93CX6 is not set
533CONFIG_HAVE_IDE=y 550CONFIG_HAVE_IDE=y
534# CONFIG_IDE is not set 551# CONFIG_IDE is not set
535 552
@@ -543,6 +560,7 @@ CONFIG_HAVE_IDE=y
543# CONFIG_ATA is not set 560# CONFIG_ATA is not set
544# CONFIG_MD is not set 561# CONFIG_MD is not set
545CONFIG_NETDEVICES=y 562CONFIG_NETDEVICES=y
563CONFIG_COMPAT_NET_DEV_OPS=y
546# CONFIG_DUMMY is not set 564# CONFIG_DUMMY is not set
547# CONFIG_BONDING is not set 565# CONFIG_BONDING is not set
548# CONFIG_MACVLAN is not set 566# CONFIG_MACVLAN is not set
@@ -556,8 +574,10 @@ CONFIG_NET_ETHERNET=y
556# CONFIG_STNIC is not set 574# CONFIG_STNIC is not set
557# CONFIG_SH_ETH is not set 575# CONFIG_SH_ETH is not set
558# CONFIG_SMC91X is not set 576# CONFIG_SMC91X is not set
577# CONFIG_ETHOC is not set
559# CONFIG_SMC911X is not set 578# CONFIG_SMC911X is not set
560# CONFIG_SMSC911X is not set 579# CONFIG_SMSC911X is not set
580# CONFIG_DNET is not set
561# CONFIG_IBM_NEW_EMAC_ZMII is not set 581# CONFIG_IBM_NEW_EMAC_ZMII is not set
562# CONFIG_IBM_NEW_EMAC_RGMII is not set 582# CONFIG_IBM_NEW_EMAC_RGMII is not set
563# CONFIG_IBM_NEW_EMAC_TAH is not set 583# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -574,7 +594,10 @@ CONFIG_NETDEV_10000=y
574# 594#
575# CONFIG_WLAN_PRE80211 is not set 595# CONFIG_WLAN_PRE80211 is not set
576# CONFIG_WLAN_80211 is not set 596# CONFIG_WLAN_80211 is not set
577# CONFIG_IWLWIFI_LEDS is not set 597
598#
599# Enable WiMAX (Networking options) to see the WiMAX drivers
600#
578# CONFIG_WAN is not set 601# CONFIG_WAN is not set
579# CONFIG_PPP is not set 602# CONFIG_PPP is not set
580# CONFIG_SLIP is not set 603# CONFIG_SLIP is not set
@@ -640,6 +663,7 @@ CONFIG_LEGACY_PTYS=y
640CONFIG_LEGACY_PTY_COUNT=256 663CONFIG_LEGACY_PTY_COUNT=256
641# CONFIG_IPMI_HANDLER is not set 664# CONFIG_IPMI_HANDLER is not set
642CONFIG_HW_RANDOM=y 665CONFIG_HW_RANDOM=y
666# CONFIG_HW_RANDOM_TIMERIOMEM is not set
643# CONFIG_R3964 is not set 667# CONFIG_R3964 is not set
644# CONFIG_RAW_DRIVER is not set 668# CONFIG_RAW_DRIVER is not set
645# CONFIG_TCG_TPM is not set 669# CONFIG_TCG_TPM is not set
@@ -718,15 +742,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
718# 742#
719 743
720# 744#
721# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 745# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
722# 746#
723# CONFIG_USB_GADGET is not set 747# CONFIG_USB_GADGET is not set
748
749#
750# OTG and related infrastructure
751#
724# CONFIG_MMC is not set 752# CONFIG_MMC is not set
725# CONFIG_MEMSTICK is not set 753# CONFIG_MEMSTICK is not set
726# CONFIG_NEW_LEDS is not set 754# CONFIG_NEW_LEDS is not set
727# CONFIG_ACCESSIBILITY is not set 755# CONFIG_ACCESSIBILITY is not set
728# CONFIG_RTC_CLASS is not set 756# CONFIG_RTC_CLASS is not set
729# CONFIG_DMADEVICES is not set 757# CONFIG_DMADEVICES is not set
758# CONFIG_AUXDISPLAY is not set
730# CONFIG_UIO is not set 759# CONFIG_UIO is not set
731# CONFIG_STAGING is not set 760# CONFIG_STAGING is not set
732 761
@@ -742,6 +771,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
742CONFIG_FILE_LOCKING=y 771CONFIG_FILE_LOCKING=y
743# CONFIG_XFS_FS is not set 772# CONFIG_XFS_FS is not set
744# CONFIG_OCFS2_FS is not set 773# CONFIG_OCFS2_FS is not set
774# CONFIG_BTRFS_FS is not set
745# CONFIG_DNOTIFY is not set 775# CONFIG_DNOTIFY is not set
746# CONFIG_INOTIFY is not set 776# CONFIG_INOTIFY is not set
747# CONFIG_QUOTA is not set 777# CONFIG_QUOTA is not set
@@ -795,6 +825,7 @@ CONFIG_JFFS2_ZLIB=y
795CONFIG_JFFS2_RTIME=y 825CONFIG_JFFS2_RTIME=y
796# CONFIG_JFFS2_RUBIN is not set 826# CONFIG_JFFS2_RUBIN is not set
797# CONFIG_CRAMFS is not set 827# CONFIG_CRAMFS is not set
828# CONFIG_SQUASHFS is not set
798# CONFIG_VXFS_FS is not set 829# CONFIG_VXFS_FS is not set
799# CONFIG_MINIX_FS is not set 830# CONFIG_MINIX_FS is not set
800# CONFIG_OMFS_FS is not set 831# CONFIG_OMFS_FS is not set
@@ -844,7 +875,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
844# 875#
845# Tracers 876# Tracers
846# 877#
847# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 878# CONFIG_DYNAMIC_DEBUG is not set
848# CONFIG_SAMPLES is not set 879# CONFIG_SAMPLES is not set
849CONFIG_HAVE_ARCH_KGDB=y 880CONFIG_HAVE_ARCH_KGDB=y
850# CONFIG_SH_STANDARD_BIOS is not set 881# CONFIG_SH_STANDARD_BIOS is not set
@@ -936,6 +967,7 @@ CONFIG_CRYPTO=y
936# Compression 967# Compression
937# 968#
938# CONFIG_CRYPTO_DEFLATE is not set 969# CONFIG_CRYPTO_DEFLATE is not set
970# CONFIG_CRYPTO_ZLIB is not set
939# CONFIG_CRYPTO_LZO is not set 971# CONFIG_CRYPTO_LZO is not set
940 972
941# 973#
@@ -961,3 +993,4 @@ CONFIG_ZLIB_DEFLATE=y
961CONFIG_HAS_IOMEM=y 993CONFIG_HAS_IOMEM=y
962CONFIG_HAS_IOPORT=y 994CONFIG_HAS_IOPORT=y
963CONFIG_HAS_DMA=y 995CONFIG_HAS_DMA=y
996CONFIG_NLATTR=y
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig
index ba33aca75af6..c79bb84ec305 100644
--- a/arch/sh/configs/sh7763rdp_defconfig
+++ b/arch/sh/configs/sh7763rdp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:02:28 2009 4# Thu Apr 2 19:10:57 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -41,15 +42,24 @@ CONFIG_SYSVIPC_SYSCTL=y
41# CONFIG_BSD_PROCESS_ACCT is not set 42# CONFIG_BSD_PROCESS_ACCT is not set
42# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
45
46#
47# RCU Subsystem
48#
49CONFIG_CLASSIC_RCU=y
50# CONFIG_TREE_RCU is not set
51# CONFIG_PREEMPT_RCU is not set
52# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
44CONFIG_IKCONFIG=y 54CONFIG_IKCONFIG=y
45CONFIG_IKCONFIG_PROC=y 55CONFIG_IKCONFIG_PROC=y
46CONFIG_LOG_BUF_SHIFT=14 56CONFIG_LOG_BUF_SHIFT=14
47# CONFIG_CGROUPS is not set
48CONFIG_GROUP_SCHED=y 57CONFIG_GROUP_SCHED=y
49CONFIG_FAIR_GROUP_SCHED=y 58CONFIG_FAIR_GROUP_SCHED=y
50# CONFIG_RT_GROUP_SCHED is not set 59# CONFIG_RT_GROUP_SCHED is not set
51CONFIG_USER_SCHED=y 60CONFIG_USER_SCHED=y
52# CONFIG_CGROUP_SCHED is not set 61# CONFIG_CGROUP_SCHED is not set
62# CONFIG_CGROUPS is not set
53CONFIG_SYSFS_DEPRECATED=y 63CONFIG_SYSFS_DEPRECATED=y
54CONFIG_SYSFS_DEPRECATED_V2=y 64CONFIG_SYSFS_DEPRECATED_V2=y
55# CONFIG_RELAY is not set 65# CONFIG_RELAY is not set
@@ -58,9 +68,11 @@ CONFIG_UTS_NS=y
58CONFIG_IPC_NS=y 68CONFIG_IPC_NS=y
59# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
60# CONFIG_PID_NS is not set 70# CONFIG_PID_NS is not set
71# CONFIG_NET_NS is not set
61# CONFIG_BLK_DEV_INITRD is not set 72# CONFIG_BLK_DEV_INITRD is not set
62CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
63CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
75CONFIG_ANON_INODES=y
64CONFIG_EMBEDDED=y 76CONFIG_EMBEDDED=y
65CONFIG_UID16=y 77CONFIG_UID16=y
66# CONFIG_SYSCTL_SYSCALL is not set 78# CONFIG_SYSCTL_SYSCALL is not set
@@ -70,10 +82,8 @@ CONFIG_HOTPLUG=y
70CONFIG_PRINTK=y 82CONFIG_PRINTK=y
71CONFIG_BUG=y 83CONFIG_BUG=y
72CONFIG_ELF_CORE=y 84CONFIG_ELF_CORE=y
73CONFIG_COMPAT_BRK=y
74CONFIG_BASE_FULL=y 85CONFIG_BASE_FULL=y
75CONFIG_FUTEX=y 86CONFIG_FUTEX=y
76CONFIG_ANON_INODES=y
77CONFIG_EPOLL=y 87CONFIG_EPOLL=y
78CONFIG_SIGNALFD=y 88CONFIG_SIGNALFD=y
79CONFIG_TIMERFD=y 89CONFIG_TIMERFD=y
@@ -81,6 +91,7 @@ CONFIG_EVENTFD=y
81CONFIG_SHMEM=y 91CONFIG_SHMEM=y
82CONFIG_AIO=y 92CONFIG_AIO=y
83CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
94CONFIG_COMPAT_BRK=y
84CONFIG_SLAB=y 95CONFIG_SLAB=y
85# CONFIG_SLUB is not set 96# CONFIG_SLUB is not set
86# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
@@ -122,11 +133,6 @@ CONFIG_DEFAULT_AS=y
122# CONFIG_DEFAULT_CFQ is not set 133# CONFIG_DEFAULT_CFQ is not set
123# CONFIG_DEFAULT_NOOP is not set 134# CONFIG_DEFAULT_NOOP is not set
124CONFIG_DEFAULT_IOSCHED="anticipatory" 135CONFIG_DEFAULT_IOSCHED="anticipatory"
125CONFIG_CLASSIC_RCU=y
126# CONFIG_TREE_RCU is not set
127# CONFIG_PREEMPT_RCU is not set
128# CONFIG_TREE_RCU_TRACE is not set
129# CONFIG_PREEMPT_RCU_TRACE is not set
130# CONFIG_FREEZER is not set 136# CONFIG_FREEZER is not set
131 137
132# 138#
@@ -162,6 +168,7 @@ CONFIG_CPU_SUBTYPE_SH7763=y
162# CONFIG_CPU_SUBTYPE_SH7770 is not set 168# CONFIG_CPU_SUBTYPE_SH7770 is not set
163# CONFIG_CPU_SUBTYPE_SH7780 is not set 169# CONFIG_CPU_SUBTYPE_SH7780 is not set
164# CONFIG_CPU_SUBTYPE_SH7785 is not set 170# CONFIG_CPU_SUBTYPE_SH7785 is not set
171# CONFIG_CPU_SUBTYPE_SH7786 is not set
165# CONFIG_CPU_SUBTYPE_SHX3 is not set 172# CONFIG_CPU_SUBTYPE_SHX3 is not set
166# CONFIG_CPU_SUBTYPE_SH7343 is not set 173# CONFIG_CPU_SUBTYPE_SH7343 is not set
167# CONFIG_CPU_SUBTYPE_SH7722 is not set 174# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -207,11 +214,12 @@ CONFIG_MIGRATION=y
207CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
208CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
209CONFIG_UNEVICTABLE_LRU=y 216CONFIG_UNEVICTABLE_LRU=y
217CONFIG_HAVE_MLOCK=y
218CONFIG_HAVE_MLOCKED_PAGE_BIT=y
210 219
211# 220#
212# Cache configuration 221# Cache configuration
213# 222#
214# CONFIG_SH_DIRECT_MAPPED is not set
215CONFIG_CACHE_WRITEBACK=y 223CONFIG_CACHE_WRITEBACK=y
216# CONFIG_CACHE_WRITETHROUGH is not set 224# CONFIG_CACHE_WRITETHROUGH is not set
217# CONFIG_CACHE_OFF is not set 225# CONFIG_CACHE_OFF is not set
@@ -231,6 +239,7 @@ CONFIG_CPU_HAS_FPU=y
231# Board support 239# Board support
232# 240#
233CONFIG_SH_SH7763RDP=y 241CONFIG_SH_SH7763RDP=y
242# CONFIG_SH_ESPT is not set
234 243
235# 244#
236# Timer and clock configuration 245# Timer and clock configuration
@@ -311,8 +320,6 @@ CONFIG_NET=y
311# 320#
312# Networking options 321# Networking options
313# 322#
314# CONFIG_NET_NS is not set
315CONFIG_COMPAT_NET_DEV_OPS=y
316CONFIG_PACKET=y 323CONFIG_PACKET=y
317# CONFIG_PACKET_MMAP is not set 324# CONFIG_PACKET_MMAP is not set
318CONFIG_UNIX=y 325CONFIG_UNIX=y
@@ -367,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
367# CONFIG_LAPB is not set 374# CONFIG_LAPB is not set
368# CONFIG_ECONET is not set 375# CONFIG_ECONET is not set
369# CONFIG_WAN_ROUTER is not set 376# CONFIG_WAN_ROUTER is not set
377# CONFIG_PHONET is not set
370# CONFIG_NET_SCHED is not set 378# CONFIG_NET_SCHED is not set
371# CONFIG_DCB is not set 379# CONFIG_DCB is not set
372 380
@@ -374,12 +382,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
374# Network testing 382# Network testing
375# 383#
376# CONFIG_NET_PKTGEN is not set 384# CONFIG_NET_PKTGEN is not set
385# CONFIG_NET_DROP_MONITOR is not set
377# CONFIG_HAMRADIO is not set 386# CONFIG_HAMRADIO is not set
378# CONFIG_CAN is not set 387# CONFIG_CAN is not set
379# CONFIG_IRDA is not set 388# CONFIG_IRDA is not set
380# CONFIG_BT is not set 389# CONFIG_BT is not set
381# CONFIG_AF_RXRPC is not set 390# CONFIG_AF_RXRPC is not set
382# CONFIG_PHONET is not set
383CONFIG_WIRELESS=y 391CONFIG_WIRELESS=y
384# CONFIG_CFG80211 is not set 392# CONFIG_CFG80211 is not set
385# CONFIG_WIRELESS_OLD_REGULATORY is not set 393# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -387,6 +395,7 @@ CONFIG_WIRELESS_EXT=y
387CONFIG_WIRELESS_EXT_SYSFS=y 395CONFIG_WIRELESS_EXT_SYSFS=y
388# CONFIG_LIB80211 is not set 396# CONFIG_LIB80211 is not set
389# CONFIG_MAC80211 is not set 397# CONFIG_MAC80211 is not set
398# CONFIG_WIMAX is not set
390# CONFIG_RFKILL is not set 399# CONFIG_RFKILL is not set
391# CONFIG_NET_9P is not set 400# CONFIG_NET_9P is not set
392 401
@@ -409,6 +418,7 @@ CONFIG_MTD=y
409# CONFIG_MTD_DEBUG is not set 418# CONFIG_MTD_DEBUG is not set
410# CONFIG_MTD_CONCAT is not set 419# CONFIG_MTD_CONCAT is not set
411CONFIG_MTD_PARTITIONS=y 420CONFIG_MTD_PARTITIONS=y
421# CONFIG_MTD_TESTS is not set
412# CONFIG_MTD_REDBOOT_PARTS is not set 422# CONFIG_MTD_REDBOOT_PARTS is not set
413CONFIG_MTD_CMDLINE_PARTS=y 423CONFIG_MTD_CMDLINE_PARTS=y
414# CONFIG_MTD_AR7_PARTS is not set 424# CONFIG_MTD_AR7_PARTS is not set
@@ -462,9 +472,7 @@ CONFIG_MTD_CFI_UTIL=y
462# 472#
463CONFIG_MTD_COMPLEX_MAPPINGS=y 473CONFIG_MTD_COMPLEX_MAPPINGS=y
464CONFIG_MTD_PHYSMAP=y 474CONFIG_MTD_PHYSMAP=y
465CONFIG_MTD_PHYSMAP_START=0x8000000 475# CONFIG_MTD_PHYSMAP_COMPAT is not set
466CONFIG_MTD_PHYSMAP_LEN=0
467CONFIG_MTD_PHYSMAP_BANKWIDTH=2
468# CONFIG_MTD_PLATRAM is not set 476# CONFIG_MTD_PLATRAM is not set
469 477
470# 478#
@@ -485,6 +493,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
485# CONFIG_MTD_ONENAND is not set 493# CONFIG_MTD_ONENAND is not set
486 494
487# 495#
496# LPDDR flash memory drivers
497#
498# CONFIG_MTD_LPDDR is not set
499
500#
488# UBI - Unsorted block images 501# UBI - Unsorted block images
489# 502#
490# CONFIG_MTD_UBI is not set 503# CONFIG_MTD_UBI is not set
@@ -544,9 +557,11 @@ CONFIG_SCSI_LOWLEVEL=y
544# CONFIG_LIBFC is not set 557# CONFIG_LIBFC is not set
545# CONFIG_SCSI_DEBUG is not set 558# CONFIG_SCSI_DEBUG is not set
546# CONFIG_SCSI_DH is not set 559# CONFIG_SCSI_DH is not set
560# CONFIG_SCSI_OSD_INITIATOR is not set
547# CONFIG_ATA is not set 561# CONFIG_ATA is not set
548# CONFIG_MD is not set 562# CONFIG_MD is not set
549CONFIG_NETDEVICES=y 563CONFIG_NETDEVICES=y
564CONFIG_COMPAT_NET_DEV_OPS=y
550# CONFIG_DUMMY is not set 565# CONFIG_DUMMY is not set
551# CONFIG_BONDING is not set 566# CONFIG_BONDING is not set
552# CONFIG_MACVLAN is not set 567# CONFIG_MACVLAN is not set
@@ -579,8 +594,10 @@ CONFIG_MII=y
579# CONFIG_STNIC is not set 594# CONFIG_STNIC is not set
580CONFIG_SH_ETH=y 595CONFIG_SH_ETH=y
581# CONFIG_SMC91X is not set 596# CONFIG_SMC91X is not set
597# CONFIG_ETHOC is not set
582# CONFIG_SMC911X is not set 598# CONFIG_SMC911X is not set
583# CONFIG_SMSC911X is not set 599# CONFIG_SMSC911X is not set
600# CONFIG_DNET is not set
584# CONFIG_IBM_NEW_EMAC_ZMII is not set 601# CONFIG_IBM_NEW_EMAC_ZMII is not set
585# CONFIG_IBM_NEW_EMAC_RGMII is not set 602# CONFIG_IBM_NEW_EMAC_RGMII is not set
586# CONFIG_IBM_NEW_EMAC_TAH is not set 603# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -597,7 +614,10 @@ CONFIG_SH_ETH=y
597# 614#
598# CONFIG_WLAN_PRE80211 is not set 615# CONFIG_WLAN_PRE80211 is not set
599# CONFIG_WLAN_80211 is not set 616# CONFIG_WLAN_80211 is not set
600# CONFIG_IWLWIFI_LEDS is not set 617
618#
619# Enable WiMAX (Networking options) to see the WiMAX drivers
620#
601 621
602# 622#
603# USB Network Adapters 623# USB Network Adapters
@@ -677,6 +697,7 @@ CONFIG_LEGACY_PTYS=y
677CONFIG_LEGACY_PTY_COUNT=256 697CONFIG_LEGACY_PTY_COUNT=256
678# CONFIG_IPMI_HANDLER is not set 698# CONFIG_IPMI_HANDLER is not set
679CONFIG_HW_RANDOM=y 699CONFIG_HW_RANDOM=y
700# CONFIG_HW_RANDOM_TIMERIOMEM is not set
680# CONFIG_R3964 is not set 701# CONFIG_R3964 is not set
681# CONFIG_RAW_DRIVER is not set 702# CONFIG_RAW_DRIVER is not set
682# CONFIG_TCG_TPM is not set 703# CONFIG_TCG_TPM is not set
@@ -756,6 +777,7 @@ CONFIG_FB_SH7760=y
756# CONFIG_FB_VIRTUAL is not set 777# CONFIG_FB_VIRTUAL is not set
757# CONFIG_FB_METRONOME is not set 778# CONFIG_FB_METRONOME is not set
758# CONFIG_FB_MB862XX is not set 779# CONFIG_FB_MB862XX is not set
780# CONFIG_FB_BROADSHEET is not set
759# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 781# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
760 782
761# 783#
@@ -807,7 +829,9 @@ CONFIG_USB_MON=y
807# USB Host Controller Drivers 829# USB Host Controller Drivers
808# 830#
809# CONFIG_USB_C67X00_HCD is not set 831# CONFIG_USB_C67X00_HCD is not set
832# CONFIG_USB_OXU210HP_HCD is not set
810# CONFIG_USB_ISP116X_HCD is not set 833# CONFIG_USB_ISP116X_HCD is not set
834# CONFIG_USB_ISP1760_HCD is not set
811CONFIG_USB_OHCI_HCD=y 835CONFIG_USB_OHCI_HCD=y
812# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 836# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
813# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 837# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -825,18 +849,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
825# CONFIG_USB_TMC is not set 849# CONFIG_USB_TMC is not set
826 850
827# 851#
828# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 852# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
829# 853#
830 854
831# 855#
832# see USB_STORAGE Help for more information 856# also be needed; see USB_STORAGE Help for more info
833# 857#
834CONFIG_USB_STORAGE=y 858CONFIG_USB_STORAGE=y
835# CONFIG_USB_STORAGE_DEBUG is not set 859# CONFIG_USB_STORAGE_DEBUG is not set
836# CONFIG_USB_STORAGE_DATAFAB is not set 860# CONFIG_USB_STORAGE_DATAFAB is not set
837# CONFIG_USB_STORAGE_FREECOM is not set 861# CONFIG_USB_STORAGE_FREECOM is not set
838# CONFIG_USB_STORAGE_ISD200 is not set 862# CONFIG_USB_STORAGE_ISD200 is not set
839# CONFIG_USB_STORAGE_DPCM is not set
840# CONFIG_USB_STORAGE_USBAT is not set 863# CONFIG_USB_STORAGE_USBAT is not set
841# CONFIG_USB_STORAGE_SDDR09 is not set 864# CONFIG_USB_STORAGE_SDDR09 is not set
842# CONFIG_USB_STORAGE_SDDR55 is not set 865# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -872,7 +895,6 @@ CONFIG_USB_STORAGE=y
872# CONFIG_USB_LED is not set 895# CONFIG_USB_LED is not set
873# CONFIG_USB_CYPRESS_CY7C63 is not set 896# CONFIG_USB_CYPRESS_CY7C63 is not set
874# CONFIG_USB_CYTHERM is not set 897# CONFIG_USB_CYTHERM is not set
875# CONFIG_USB_PHIDGET is not set
876# CONFIG_USB_IDMOUSE is not set 898# CONFIG_USB_IDMOUSE is not set
877# CONFIG_USB_FTDI_ELAN is not set 899# CONFIG_USB_FTDI_ELAN is not set
878# CONFIG_USB_APPLEDISPLAY is not set 900# CONFIG_USB_APPLEDISPLAY is not set
@@ -882,6 +904,11 @@ CONFIG_USB_STORAGE=y
882# CONFIG_USB_ISIGHTFW is not set 904# CONFIG_USB_ISIGHTFW is not set
883# CONFIG_USB_VST is not set 905# CONFIG_USB_VST is not set
884# CONFIG_USB_GADGET is not set 906# CONFIG_USB_GADGET is not set
907
908#
909# OTG and related infrastructure
910#
911# CONFIG_NOP_USB_XCEIV is not set
885CONFIG_MMC=y 912CONFIG_MMC=y
886# CONFIG_MMC_DEBUG is not set 913# CONFIG_MMC_DEBUG is not set
887# CONFIG_MMC_UNSAFE_RESUME is not set 914# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -903,6 +930,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
903# CONFIG_ACCESSIBILITY is not set 930# CONFIG_ACCESSIBILITY is not set
904# CONFIG_RTC_CLASS is not set 931# CONFIG_RTC_CLASS is not set
905# CONFIG_DMADEVICES is not set 932# CONFIG_DMADEVICES is not set
933# CONFIG_AUXDISPLAY is not set
906# CONFIG_UIO is not set 934# CONFIG_UIO is not set
907# CONFIG_STAGING is not set 935# CONFIG_STAGING is not set
908 936
@@ -926,6 +954,7 @@ CONFIG_FS_POSIX_ACL=y
926CONFIG_FILE_LOCKING=y 954CONFIG_FILE_LOCKING=y
927# CONFIG_XFS_FS is not set 955# CONFIG_XFS_FS is not set
928# CONFIG_OCFS2_FS is not set 956# CONFIG_OCFS2_FS is not set
957# CONFIG_BTRFS_FS is not set
929CONFIG_DNOTIFY=y 958CONFIG_DNOTIFY=y
930CONFIG_INOTIFY=y 959CONFIG_INOTIFY=y
931CONFIG_INOTIFY_USER=y 960CONFIG_INOTIFY_USER=y
@@ -974,6 +1003,7 @@ CONFIG_MISC_FILESYSTEMS=y
974# CONFIG_EFS_FS is not set 1003# CONFIG_EFS_FS is not set
975# CONFIG_JFFS2_FS is not set 1004# CONFIG_JFFS2_FS is not set
976# CONFIG_CRAMFS is not set 1005# CONFIG_CRAMFS is not set
1006# CONFIG_SQUASHFS is not set
977# CONFIG_VXFS_FS is not set 1007# CONFIG_VXFS_FS is not set
978# CONFIG_MINIX_FS is not set 1008# CONFIG_MINIX_FS is not set
979# CONFIG_OMFS_FS is not set 1009# CONFIG_OMFS_FS is not set
@@ -991,7 +1021,6 @@ CONFIG_ROOT_NFS=y
991CONFIG_LOCKD=y 1021CONFIG_LOCKD=y
992CONFIG_NFS_COMMON=y 1022CONFIG_NFS_COMMON=y
993CONFIG_SUNRPC=y 1023CONFIG_SUNRPC=y
994# CONFIG_SUNRPC_REGISTER_V4 is not set
995# CONFIG_RPCSEC_GSS_KRB5 is not set 1024# CONFIG_RPCSEC_GSS_KRB5 is not set
996# CONFIG_RPCSEC_GSS_SPKM3 is not set 1025# CONFIG_RPCSEC_GSS_SPKM3 is not set
997# CONFIG_SMB_FS is not set 1026# CONFIG_SMB_FS is not set
@@ -1075,7 +1104,7 @@ CONFIG_TRACING=y
1075# 1104#
1076# Tracers 1105# Tracers
1077# 1106#
1078# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1107# CONFIG_DYNAMIC_DEBUG is not set
1079# CONFIG_SAMPLES is not set 1108# CONFIG_SAMPLES is not set
1080CONFIG_HAVE_ARCH_KGDB=y 1109CONFIG_HAVE_ARCH_KGDB=y
1081# CONFIG_SH_STANDARD_BIOS is not set 1110# CONFIG_SH_STANDARD_BIOS is not set
@@ -1167,6 +1196,7 @@ CONFIG_CRYPTO=y
1167# Compression 1196# Compression
1168# 1197#
1169# CONFIG_CRYPTO_DEFLATE is not set 1198# CONFIG_CRYPTO_DEFLATE is not set
1199# CONFIG_CRYPTO_ZLIB is not set
1170# CONFIG_CRYPTO_LZO is not set 1200# CONFIG_CRYPTO_LZO is not set
1171 1201
1172# 1202#
@@ -1187,7 +1217,7 @@ CONFIG_CRC_T10DIF=y
1187CONFIG_CRC32=y 1217CONFIG_CRC32=y
1188# CONFIG_CRC7 is not set 1218# CONFIG_CRC7 is not set
1189# CONFIG_LIBCRC32C is not set 1219# CONFIG_LIBCRC32C is not set
1190CONFIG_PLIST=y
1191CONFIG_HAS_IOMEM=y 1220CONFIG_HAS_IOMEM=y
1192CONFIG_HAS_IOPORT=y 1221CONFIG_HAS_IOPORT=y
1193CONFIG_HAS_DMA=y 1222CONFIG_HAS_DMA=y
1223CONFIG_NLATTR=y
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig
index 54e1dee8e24a..a6cf4505741c 100644
--- a/arch/sh/configs/sh7785lcr_32bit_defconfig
+++ b/arch/sh/configs/sh7785lcr_32bit_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.29-rc4 3# Linux kernel version: 2.6.29
4# Fri Feb 20 18:25:29 2009 4# Thu Apr 2 19:12:18 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_NUMA=y 21CONFIG_SYS_SUPPORTS_NUMA=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
@@ -26,6 +26,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
26# CONFIG_ARCH_HAS_ILOG2_U32 is not set 26# CONFIG_ARCH_HAS_ILOG2_U32 is not set
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
29CONFIG_IO_TRAPPED=y 30CONFIG_IO_TRAPPED=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
31 32
@@ -71,6 +72,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
71# CONFIG_BLK_DEV_INITRD is not set 72# CONFIG_BLK_DEV_INITRD is not set
72CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
73CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
75CONFIG_ANON_INODES=y
74CONFIG_EMBEDDED=y 76CONFIG_EMBEDDED=y
75CONFIG_UID16=y 77CONFIG_UID16=y
76CONFIG_SYSCTL_SYSCALL=y 78CONFIG_SYSCTL_SYSCALL=y
@@ -81,10 +83,8 @@ CONFIG_HOTPLUG=y
81CONFIG_PRINTK=y 83CONFIG_PRINTK=y
82CONFIG_BUG=y 84CONFIG_BUG=y
83CONFIG_ELF_CORE=y 85CONFIG_ELF_CORE=y
84CONFIG_COMPAT_BRK=y
85CONFIG_BASE_FULL=y 86CONFIG_BASE_FULL=y
86CONFIG_FUTEX=y 87CONFIG_FUTEX=y
87CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 88CONFIG_EPOLL=y
89CONFIG_SIGNALFD=y 89CONFIG_SIGNALFD=y
90CONFIG_TIMERFD=y 90CONFIG_TIMERFD=y
@@ -93,6 +93,7 @@ CONFIG_SHMEM=y
93CONFIG_AIO=y 93CONFIG_AIO=y
94CONFIG_VM_EVENT_COUNTERS=y 94CONFIG_VM_EVENT_COUNTERS=y
95CONFIG_PCI_QUIRKS=y 95CONFIG_PCI_QUIRKS=y
96CONFIG_COMPAT_BRK=y
96CONFIG_SLAB=y 97CONFIG_SLAB=y
97# CONFIG_SLUB is not set 98# CONFIG_SLUB is not set
98# CONFIG_SLOB is not set 99# CONFIG_SLOB is not set
@@ -169,6 +170,7 @@ CONFIG_CPU_SHX2=y
169# CONFIG_CPU_SUBTYPE_SH7770 is not set 170# CONFIG_CPU_SUBTYPE_SH7770 is not set
170# CONFIG_CPU_SUBTYPE_SH7780 is not set 171# CONFIG_CPU_SUBTYPE_SH7780 is not set
171CONFIG_CPU_SUBTYPE_SH7785=y 172CONFIG_CPU_SUBTYPE_SH7785=y
173# CONFIG_CPU_SUBTYPE_SH7786 is not set
172# CONFIG_CPU_SUBTYPE_SHX3 is not set 174# CONFIG_CPU_SUBTYPE_SHX3 is not set
173# CONFIG_CPU_SUBTYPE_SH7343 is not set 175# CONFIG_CPU_SUBTYPE_SH7343 is not set
174# CONFIG_CPU_SUBTYPE_SH7722 is not set 176# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -220,11 +222,12 @@ CONFIG_MIGRATION=y
220CONFIG_ZONE_DMA_FLAG=0 222CONFIG_ZONE_DMA_FLAG=0
221CONFIG_NR_QUICK=2 223CONFIG_NR_QUICK=2
222CONFIG_UNEVICTABLE_LRU=y 224CONFIG_UNEVICTABLE_LRU=y
225CONFIG_HAVE_MLOCK=y
226CONFIG_HAVE_MLOCKED_PAGE_BIT=y
223 227
224# 228#
225# Cache configuration 229# Cache configuration
226# 230#
227# CONFIG_SH_DIRECT_MAPPED is not set
228CONFIG_CACHE_WRITEBACK=y 231CONFIG_CACHE_WRITEBACK=y
229# CONFIG_CACHE_WRITETHROUGH is not set 232# CONFIG_CACHE_WRITETHROUGH is not set
230# CONFIG_CACHE_OFF is not set 233# CONFIG_CACHE_OFF is not set
@@ -314,6 +317,7 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
314CONFIG_PCI_LEGACY=y 317CONFIG_PCI_LEGACY=y
315# CONFIG_PCI_DEBUG is not set 318# CONFIG_PCI_DEBUG is not set
316# CONFIG_PCI_STUB is not set 319# CONFIG_PCI_STUB is not set
320# CONFIG_PCI_IOV is not set
317# CONFIG_PCCARD is not set 321# CONFIG_PCCARD is not set
318# CONFIG_HOTPLUG_PCI is not set 322# CONFIG_HOTPLUG_PCI is not set
319 323
@@ -335,7 +339,6 @@ CONFIG_NET=y
335# 339#
336# Networking options 340# Networking options
337# 341#
338CONFIG_COMPAT_NET_DEV_OPS=y
339CONFIG_PACKET=y 342CONFIG_PACKET=y
340# CONFIG_PACKET_MMAP is not set 343# CONFIG_PACKET_MMAP is not set
341CONFIG_UNIX=y 344CONFIG_UNIX=y
@@ -395,6 +398,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
395# CONFIG_LAPB is not set 398# CONFIG_LAPB is not set
396# CONFIG_ECONET is not set 399# CONFIG_ECONET is not set
397# CONFIG_WAN_ROUTER is not set 400# CONFIG_WAN_ROUTER is not set
401# CONFIG_PHONET is not set
398# CONFIG_NET_SCHED is not set 402# CONFIG_NET_SCHED is not set
399# CONFIG_DCB is not set 403# CONFIG_DCB is not set
400 404
@@ -407,7 +411,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
407# CONFIG_IRDA is not set 411# CONFIG_IRDA is not set
408# CONFIG_BT is not set 412# CONFIG_BT is not set
409# CONFIG_AF_RXRPC is not set 413# CONFIG_AF_RXRPC is not set
410# CONFIG_PHONET is not set
411CONFIG_WIRELESS=y 414CONFIG_WIRELESS=y
412# CONFIG_CFG80211 is not set 415# CONFIG_CFG80211 is not set
413# CONFIG_WIRELESS_OLD_REGULATORY is not set 416# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -512,7 +515,6 @@ CONFIG_MTD_PHYSMAP=y
512# LPDDR flash memory drivers 515# LPDDR flash memory drivers
513# 516#
514# CONFIG_MTD_LPDDR is not set 517# CONFIG_MTD_LPDDR is not set
515# CONFIG_MTD_QINFO_PROBE is not set
516 518
517# 519#
518# UBI - Unsorted block images 520# UBI - Unsorted block images
@@ -578,6 +580,7 @@ CONFIG_SCSI_WAIT_SCAN=m
578# CONFIG_SCSI_SRP_ATTRS is not set 580# CONFIG_SCSI_SRP_ATTRS is not set
579# CONFIG_SCSI_LOWLEVEL is not set 581# CONFIG_SCSI_LOWLEVEL is not set
580# CONFIG_SCSI_DH is not set 582# CONFIG_SCSI_DH is not set
583# CONFIG_SCSI_OSD_INITIATOR is not set
581CONFIG_ATA=y 584CONFIG_ATA=y
582# CONFIG_ATA_NONSTANDARD is not set 585# CONFIG_ATA_NONSTANDARD is not set
583CONFIG_SATA_PMP=y 586CONFIG_SATA_PMP=y
@@ -652,6 +655,7 @@ CONFIG_SATA_SIL=y
652# CONFIG_IEEE1394 is not set 655# CONFIG_IEEE1394 is not set
653# CONFIG_I2O is not set 656# CONFIG_I2O is not set
654CONFIG_NETDEVICES=y 657CONFIG_NETDEVICES=y
658CONFIG_COMPAT_NET_DEV_OPS=y
655# CONFIG_DUMMY is not set 659# CONFIG_DUMMY is not set
656# CONFIG_BONDING is not set 660# CONFIG_BONDING is not set
657# CONFIG_MACVLAN is not set 661# CONFIG_MACVLAN is not set
@@ -681,6 +685,7 @@ CONFIG_R8169=y
681# CONFIG_QLA3XXX is not set 685# CONFIG_QLA3XXX is not set
682# CONFIG_ATL1 is not set 686# CONFIG_ATL1 is not set
683# CONFIG_ATL1E is not set 687# CONFIG_ATL1E is not set
688# CONFIG_ATL1C is not set
684# CONFIG_JME is not set 689# CONFIG_JME is not set
685# CONFIG_NETDEV_10000 is not set 690# CONFIG_NETDEV_10000 is not set
686# CONFIG_TR is not set 691# CONFIG_TR is not set
@@ -690,7 +695,6 @@ CONFIG_R8169=y
690# 695#
691# CONFIG_WLAN_PRE80211 is not set 696# CONFIG_WLAN_PRE80211 is not set
692# CONFIG_WLAN_80211 is not set 697# CONFIG_WLAN_80211 is not set
693# CONFIG_IWLWIFI_LEDS is not set
694 698
695# 699#
696# Enable WiMAX (Networking options) to see the WiMAX drivers 700# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -789,6 +793,7 @@ CONFIG_LEGACY_PTYS=y
789CONFIG_LEGACY_PTY_COUNT=256 793CONFIG_LEGACY_PTY_COUNT=256
790# CONFIG_IPMI_HANDLER is not set 794# CONFIG_IPMI_HANDLER is not set
791CONFIG_HW_RANDOM=y 795CONFIG_HW_RANDOM=y
796# CONFIG_HW_RANDOM_TIMERIOMEM is not set
792# CONFIG_R3964 is not set 797# CONFIG_R3964 is not set
793# CONFIG_APPLICOM is not set 798# CONFIG_APPLICOM is not set
794# CONFIG_RAW_DRIVER is not set 799# CONFIG_RAW_DRIVER is not set
@@ -854,7 +859,6 @@ CONFIG_I2C_PCA_PLATFORM=y
854# CONFIG_SENSORS_PCF8574 is not set 859# CONFIG_SENSORS_PCF8574 is not set
855# CONFIG_PCF8575 is not set 860# CONFIG_PCF8575 is not set
856# CONFIG_SENSORS_PCA9539 is not set 861# CONFIG_SENSORS_PCA9539 is not set
857# CONFIG_SENSORS_PCF8591 is not set
858# CONFIG_SENSORS_MAX6875 is not set 862# CONFIG_SENSORS_MAX6875 is not set
859# CONFIG_SENSORS_TSL2550 is not set 863# CONFIG_SENSORS_TSL2550 is not set
860# CONFIG_I2C_DEBUG_CORE is not set 864# CONFIG_I2C_DEBUG_CORE is not set
@@ -964,6 +968,7 @@ CONFIG_FB_SM501=y
964# CONFIG_FB_VIRTUAL is not set 968# CONFIG_FB_VIRTUAL is not set
965# CONFIG_FB_METRONOME is not set 969# CONFIG_FB_METRONOME is not set
966# CONFIG_FB_MB862XX is not set 970# CONFIG_FB_MB862XX is not set
971# CONFIG_FB_BROADSHEET is not set
967# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 972# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
968 973
969# 974#
@@ -1079,11 +1084,11 @@ CONFIG_USB_R8A66597_HCD=y
1079# CONFIG_USB_TMC is not set 1084# CONFIG_USB_TMC is not set
1080 1085
1081# 1086#
1082# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1087# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1083# 1088#
1084 1089
1085# 1090#
1086# see USB_STORAGE Help for more information 1091# also be needed; see USB_STORAGE Help for more info
1087# 1092#
1088CONFIG_USB_STORAGE=y 1093CONFIG_USB_STORAGE=y
1089# CONFIG_USB_STORAGE_DEBUG is not set 1094# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1125,7 +1130,6 @@ CONFIG_USB_STORAGE=y
1125# CONFIG_USB_LED is not set 1130# CONFIG_USB_LED is not set
1126# CONFIG_USB_CYPRESS_CY7C63 is not set 1131# CONFIG_USB_CYPRESS_CY7C63 is not set
1127# CONFIG_USB_CYTHERM is not set 1132# CONFIG_USB_CYTHERM is not set
1128# CONFIG_USB_PHIDGET is not set
1129# CONFIG_USB_IDMOUSE is not set 1133# CONFIG_USB_IDMOUSE is not set
1130# CONFIG_USB_FTDI_ELAN is not set 1134# CONFIG_USB_FTDI_ELAN is not set
1131# CONFIG_USB_APPLEDISPLAY is not set 1135# CONFIG_USB_APPLEDISPLAY is not set
@@ -1141,6 +1145,7 @@ CONFIG_USB_TEST=m
1141# 1145#
1142# OTG and related infrastructure 1146# OTG and related infrastructure
1143# 1147#
1148# CONFIG_NOP_USB_XCEIV is not set
1144# CONFIG_UWB is not set 1149# CONFIG_UWB is not set
1145# CONFIG_MMC is not set 1150# CONFIG_MMC is not set
1146# CONFIG_MEMSTICK is not set 1151# CONFIG_MEMSTICK is not set
@@ -1202,6 +1207,7 @@ CONFIG_RTC_DRV_RS5C372=y
1202# 1207#
1203# CONFIG_RTC_DRV_SH is not set 1208# CONFIG_RTC_DRV_SH is not set
1204# CONFIG_DMADEVICES is not set 1209# CONFIG_DMADEVICES is not set
1210# CONFIG_AUXDISPLAY is not set
1205# CONFIG_UIO is not set 1211# CONFIG_UIO is not set
1206# CONFIG_STAGING is not set 1212# CONFIG_STAGING is not set
1207 1213
@@ -1299,7 +1305,6 @@ CONFIG_EXPORTFS=y
1299CONFIG_NFS_COMMON=y 1305CONFIG_NFS_COMMON=y
1300CONFIG_SUNRPC=y 1306CONFIG_SUNRPC=y
1301CONFIG_SUNRPC_GSS=y 1307CONFIG_SUNRPC_GSS=y
1302# CONFIG_SUNRPC_REGISTER_V4 is not set
1303CONFIG_RPCSEC_GSS_KRB5=y 1308CONFIG_RPCSEC_GSS_KRB5=y
1304# CONFIG_RPCSEC_GSS_SPKM3 is not set 1309# CONFIG_RPCSEC_GSS_SPKM3 is not set
1305# CONFIG_SMB_FS is not set 1310# CONFIG_SMB_FS is not set
@@ -1404,6 +1409,7 @@ CONFIG_DEBUG_PREEMPT=y
1404# CONFIG_FAULT_INJECTION is not set 1409# CONFIG_FAULT_INJECTION is not set
1405# CONFIG_LATENCYTOP is not set 1410# CONFIG_LATENCYTOP is not set
1406CONFIG_SYSCTL_SYSCALL_CHECK=y 1411CONFIG_SYSCTL_SYSCALL_CHECK=y
1412# CONFIG_PAGE_POISONING is not set
1407CONFIG_HAVE_FUNCTION_TRACER=y 1413CONFIG_HAVE_FUNCTION_TRACER=y
1408CONFIG_HAVE_DYNAMIC_FTRACE=y 1414CONFIG_HAVE_DYNAMIC_FTRACE=y
1409CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1415CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -1419,7 +1425,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1419# CONFIG_BOOT_TRACER is not set 1425# CONFIG_BOOT_TRACER is not set
1420# CONFIG_TRACE_BRANCH_PROFILING is not set 1426# CONFIG_TRACE_BRANCH_PROFILING is not set
1421# CONFIG_STACK_TRACER is not set 1427# CONFIG_STACK_TRACER is not set
1422# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1423# CONFIG_SAMPLES is not set 1428# CONFIG_SAMPLES is not set
1424CONFIG_HAVE_ARCH_KGDB=y 1429CONFIG_HAVE_ARCH_KGDB=y
1425# CONFIG_KGDB is not set 1430# CONFIG_KGDB is not set
@@ -1455,10 +1460,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1455CONFIG_CRYPTO_HASH=y 1460CONFIG_CRYPTO_HASH=y
1456CONFIG_CRYPTO_HASH2=y 1461CONFIG_CRYPTO_HASH2=y
1457CONFIG_CRYPTO_RNG2=y 1462CONFIG_CRYPTO_RNG2=y
1463CONFIG_CRYPTO_PCOMP=y
1458CONFIG_CRYPTO_MANAGER=y 1464CONFIG_CRYPTO_MANAGER=y
1459CONFIG_CRYPTO_MANAGER2=y 1465CONFIG_CRYPTO_MANAGER2=y
1460# CONFIG_CRYPTO_GF128MUL is not set 1466# CONFIG_CRYPTO_GF128MUL is not set
1461# CONFIG_CRYPTO_NULL is not set 1467# CONFIG_CRYPTO_NULL is not set
1468CONFIG_CRYPTO_WORKQUEUE=y
1462# CONFIG_CRYPTO_CRYPTD is not set 1469# CONFIG_CRYPTO_CRYPTD is not set
1463# CONFIG_CRYPTO_AUTHENC is not set 1470# CONFIG_CRYPTO_AUTHENC is not set
1464# CONFIG_CRYPTO_TEST is not set 1471# CONFIG_CRYPTO_TEST is not set
@@ -1527,6 +1534,7 @@ CONFIG_CRYPTO_DES=y
1527# Compression 1534# Compression
1528# 1535#
1529# CONFIG_CRYPTO_DEFLATE is not set 1536# CONFIG_CRYPTO_DEFLATE is not set
1537# CONFIG_CRYPTO_ZLIB is not set
1530# CONFIG_CRYPTO_LZO is not set 1538# CONFIG_CRYPTO_LZO is not set
1531 1539
1532# 1540#
@@ -1547,7 +1555,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
1547CONFIG_CRC32=y 1555CONFIG_CRC32=y
1548# CONFIG_CRC7 is not set 1556# CONFIG_CRC7 is not set
1549# CONFIG_LIBCRC32C is not set 1557# CONFIG_LIBCRC32C is not set
1550CONFIG_PLIST=y
1551CONFIG_HAS_IOMEM=y 1558CONFIG_HAS_IOMEM=y
1552CONFIG_HAS_IOPORT=y 1559CONFIG_HAS_IOPORT=y
1553CONFIG_HAS_DMA=y 1560CONFIG_HAS_DMA=y
1561CONFIG_NLATTR=y
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index 1d63628df6f6..8a42bbef1f50 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:05:18 2009 4# Thu Apr 2 19:15:58 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_NUMA=y 21CONFIG_SYS_SUPPORTS_NUMA=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
@@ -26,6 +26,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
26# CONFIG_ARCH_HAS_ILOG2_U32 is not set 26# CONFIG_ARCH_HAS_ILOG2_U32 is not set
27# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
28CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
29CONFIG_IO_TRAPPED=y 30CONFIG_IO_TRAPPED=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
31 32
@@ -46,15 +47,24 @@ CONFIG_BSD_PROCESS_ACCT=y
46# CONFIG_BSD_PROCESS_ACCT_V3 is not set 47# CONFIG_BSD_PROCESS_ACCT_V3 is not set
47# CONFIG_TASKSTATS is not set 48# CONFIG_TASKSTATS is not set
48# CONFIG_AUDIT is not set 49# CONFIG_AUDIT is not set
50
51#
52# RCU Subsystem
53#
54CONFIG_CLASSIC_RCU=y
55# CONFIG_TREE_RCU is not set
56# CONFIG_PREEMPT_RCU is not set
57# CONFIG_TREE_RCU_TRACE is not set
58# CONFIG_PREEMPT_RCU_TRACE is not set
49CONFIG_IKCONFIG=y 59CONFIG_IKCONFIG=y
50CONFIG_IKCONFIG_PROC=y 60CONFIG_IKCONFIG_PROC=y
51CONFIG_LOG_BUF_SHIFT=14 61CONFIG_LOG_BUF_SHIFT=14
52# CONFIG_CGROUPS is not set
53CONFIG_GROUP_SCHED=y 62CONFIG_GROUP_SCHED=y
54CONFIG_FAIR_GROUP_SCHED=y 63CONFIG_FAIR_GROUP_SCHED=y
55# CONFIG_RT_GROUP_SCHED is not set 64# CONFIG_RT_GROUP_SCHED is not set
56CONFIG_USER_SCHED=y 65CONFIG_USER_SCHED=y
57# CONFIG_CGROUP_SCHED is not set 66# CONFIG_CGROUP_SCHED is not set
67# CONFIG_CGROUPS is not set
58CONFIG_SYSFS_DEPRECATED=y 68CONFIG_SYSFS_DEPRECATED=y
59CONFIG_SYSFS_DEPRECATED_V2=y 69CONFIG_SYSFS_DEPRECATED_V2=y
60# CONFIG_RELAY is not set 70# CONFIG_RELAY is not set
@@ -62,6 +72,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
62# CONFIG_BLK_DEV_INITRD is not set 72# CONFIG_BLK_DEV_INITRD is not set
63CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
64CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
75CONFIG_ANON_INODES=y
65CONFIG_EMBEDDED=y 76CONFIG_EMBEDDED=y
66CONFIG_UID16=y 77CONFIG_UID16=y
67CONFIG_SYSCTL_SYSCALL=y 78CONFIG_SYSCTL_SYSCALL=y
@@ -72,10 +83,8 @@ CONFIG_HOTPLUG=y
72CONFIG_PRINTK=y 83CONFIG_PRINTK=y
73CONFIG_BUG=y 84CONFIG_BUG=y
74CONFIG_ELF_CORE=y 85CONFIG_ELF_CORE=y
75CONFIG_COMPAT_BRK=y
76CONFIG_BASE_FULL=y 86CONFIG_BASE_FULL=y
77CONFIG_FUTEX=y 87CONFIG_FUTEX=y
78CONFIG_ANON_INODES=y
79CONFIG_EPOLL=y 88CONFIG_EPOLL=y
80CONFIG_SIGNALFD=y 89CONFIG_SIGNALFD=y
81CONFIG_TIMERFD=y 90CONFIG_TIMERFD=y
@@ -84,6 +93,7 @@ CONFIG_SHMEM=y
84CONFIG_AIO=y 93CONFIG_AIO=y
85CONFIG_VM_EVENT_COUNTERS=y 94CONFIG_VM_EVENT_COUNTERS=y
86CONFIG_PCI_QUIRKS=y 95CONFIG_PCI_QUIRKS=y
96CONFIG_COMPAT_BRK=y
87CONFIG_SLAB=y 97CONFIG_SLAB=y
88# CONFIG_SLUB is not set 98# CONFIG_SLUB is not set
89# CONFIG_SLOB is not set 99# CONFIG_SLOB is not set
@@ -124,11 +134,6 @@ CONFIG_IOSCHED_CFQ=y
124CONFIG_DEFAULT_CFQ=y 134CONFIG_DEFAULT_CFQ=y
125# CONFIG_DEFAULT_NOOP is not set 135# CONFIG_DEFAULT_NOOP is not set
126CONFIG_DEFAULT_IOSCHED="cfq" 136CONFIG_DEFAULT_IOSCHED="cfq"
127CONFIG_CLASSIC_RCU=y
128# CONFIG_TREE_RCU is not set
129# CONFIG_PREEMPT_RCU is not set
130# CONFIG_TREE_RCU_TRACE is not set
131# CONFIG_PREEMPT_RCU_TRACE is not set
132# CONFIG_FREEZER is not set 137# CONFIG_FREEZER is not set
133 138
134# 139#
@@ -165,6 +170,7 @@ CONFIG_CPU_SHX2=y
165# CONFIG_CPU_SUBTYPE_SH7770 is not set 170# CONFIG_CPU_SUBTYPE_SH7770 is not set
166# CONFIG_CPU_SUBTYPE_SH7780 is not set 171# CONFIG_CPU_SUBTYPE_SH7780 is not set
167CONFIG_CPU_SUBTYPE_SH7785=y 172CONFIG_CPU_SUBTYPE_SH7785=y
173# CONFIG_CPU_SUBTYPE_SH7786 is not set
168# CONFIG_CPU_SUBTYPE_SHX3 is not set 174# CONFIG_CPU_SUBTYPE_SHX3 is not set
169# CONFIG_CPU_SUBTYPE_SH7343 is not set 175# CONFIG_CPU_SUBTYPE_SH7343 is not set
170# CONFIG_CPU_SUBTYPE_SH7722 is not set 176# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -180,8 +186,11 @@ CONFIG_MMU=y
180CONFIG_PAGE_OFFSET=0x80000000 186CONFIG_PAGE_OFFSET=0x80000000
181CONFIG_MEMORY_START=0x08000000 187CONFIG_MEMORY_START=0x08000000
182CONFIG_MEMORY_SIZE=0x08000000 188CONFIG_MEMORY_SIZE=0x08000000
183CONFIG_29BIT=y 189# CONFIG_29BIT is not set
190CONFIG_32BIT=y
191CONFIG_PMB_ENABLE=y
184# CONFIG_PMB is not set 192# CONFIG_PMB is not set
193CONFIG_PMB_FIXED=y
185# CONFIG_X2TLB is not set 194# CONFIG_X2TLB is not set
186CONFIG_VSYSCALL=y 195CONFIG_VSYSCALL=y
187# CONFIG_NUMA is not set 196# CONFIG_NUMA is not set
@@ -213,11 +222,12 @@ CONFIG_MIGRATION=y
213CONFIG_ZONE_DMA_FLAG=0 222CONFIG_ZONE_DMA_FLAG=0
214CONFIG_NR_QUICK=2 223CONFIG_NR_QUICK=2
215CONFIG_UNEVICTABLE_LRU=y 224CONFIG_UNEVICTABLE_LRU=y
225CONFIG_HAVE_MLOCK=y
226CONFIG_HAVE_MLOCKED_PAGE_BIT=y
216 227
217# 228#
218# Cache configuration 229# Cache configuration
219# 230#
220# CONFIG_SH_DIRECT_MAPPED is not set
221CONFIG_CACHE_WRITEBACK=y 231CONFIG_CACHE_WRITEBACK=y
222# CONFIG_CACHE_WRITETHROUGH is not set 232# CONFIG_CACHE_WRITETHROUGH is not set
223# CONFIG_CACHE_OFF is not set 233# CONFIG_CACHE_OFF is not set
@@ -239,7 +249,6 @@ CONFIG_CPU_HAS_FPU=y
239# 249#
240# CONFIG_SH_HIGHLANDER is not set 250# CONFIG_SH_HIGHLANDER is not set
241CONFIG_SH_SH7785LCR=y 251CONFIG_SH_SH7785LCR=y
242CONFIG_SH_SH7785LCR_29BIT_PHYSMAPS=y
243 252
244# 253#
245# Timer and clock configuration 254# Timer and clock configuration
@@ -307,6 +316,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
307# CONFIG_ARCH_SUPPORTS_MSI is not set 316# CONFIG_ARCH_SUPPORTS_MSI is not set
308CONFIG_PCI_LEGACY=y 317CONFIG_PCI_LEGACY=y
309# CONFIG_PCI_DEBUG is not set 318# CONFIG_PCI_DEBUG is not set
319# CONFIG_PCI_STUB is not set
320# CONFIG_PCI_IOV is not set
310# CONFIG_PCCARD is not set 321# CONFIG_PCCARD is not set
311# CONFIG_HOTPLUG_PCI is not set 322# CONFIG_HOTPLUG_PCI is not set
312 323
@@ -328,7 +339,6 @@ CONFIG_NET=y
328# 339#
329# Networking options 340# Networking options
330# 341#
331CONFIG_COMPAT_NET_DEV_OPS=y
332CONFIG_PACKET=y 342CONFIG_PACKET=y
333# CONFIG_PACKET_MMAP is not set 343# CONFIG_PACKET_MMAP is not set
334CONFIG_UNIX=y 344CONFIG_UNIX=y
@@ -388,6 +398,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
388# CONFIG_LAPB is not set 398# CONFIG_LAPB is not set
389# CONFIG_ECONET is not set 399# CONFIG_ECONET is not set
390# CONFIG_WAN_ROUTER is not set 400# CONFIG_WAN_ROUTER is not set
401# CONFIG_PHONET is not set
391# CONFIG_NET_SCHED is not set 402# CONFIG_NET_SCHED is not set
392# CONFIG_DCB is not set 403# CONFIG_DCB is not set
393 404
@@ -400,7 +411,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
400# CONFIG_IRDA is not set 411# CONFIG_IRDA is not set
401# CONFIG_BT is not set 412# CONFIG_BT is not set
402# CONFIG_AF_RXRPC is not set 413# CONFIG_AF_RXRPC is not set
403# CONFIG_PHONET is not set
404CONFIG_WIRELESS=y 414CONFIG_WIRELESS=y
405# CONFIG_CFG80211 is not set 415# CONFIG_CFG80211 is not set
406# CONFIG_WIRELESS_OLD_REGULATORY is not set 416# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -408,6 +418,7 @@ CONFIG_WIRELESS_EXT=y
408CONFIG_WIRELESS_EXT_SYSFS=y 418CONFIG_WIRELESS_EXT_SYSFS=y
409# CONFIG_LIB80211 is not set 419# CONFIG_LIB80211 is not set
410# CONFIG_MAC80211 is not set 420# CONFIG_MAC80211 is not set
421# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
413 424
@@ -430,6 +441,7 @@ CONFIG_MTD=y
430# CONFIG_MTD_DEBUG is not set 441# CONFIG_MTD_DEBUG is not set
431CONFIG_MTD_CONCAT=y 442CONFIG_MTD_CONCAT=y
432CONFIG_MTD_PARTITIONS=y 443CONFIG_MTD_PARTITIONS=y
444# CONFIG_MTD_TESTS is not set
433# CONFIG_MTD_REDBOOT_PARTS is not set 445# CONFIG_MTD_REDBOOT_PARTS is not set
434# CONFIG_MTD_CMDLINE_PARTS is not set 446# CONFIG_MTD_CMDLINE_PARTS is not set
435# CONFIG_MTD_AR7_PARTS is not set 447# CONFIG_MTD_AR7_PARTS is not set
@@ -477,9 +489,7 @@ CONFIG_MTD_CFI_UTIL=y
477# 489#
478# CONFIG_MTD_COMPLEX_MAPPINGS is not set 490# CONFIG_MTD_COMPLEX_MAPPINGS is not set
479CONFIG_MTD_PHYSMAP=y 491CONFIG_MTD_PHYSMAP=y
480CONFIG_MTD_PHYSMAP_START=0x00000000 492# CONFIG_MTD_PHYSMAP_COMPAT is not set
481CONFIG_MTD_PHYSMAP_LEN=0x0
482CONFIG_MTD_PHYSMAP_BANKWIDTH=0
483# CONFIG_MTD_INTEL_VR_NOR is not set 493# CONFIG_MTD_INTEL_VR_NOR is not set
484# CONFIG_MTD_PLATRAM is not set 494# CONFIG_MTD_PLATRAM is not set
485 495
@@ -502,6 +512,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
502# CONFIG_MTD_ONENAND is not set 512# CONFIG_MTD_ONENAND is not set
503 513
504# 514#
515# LPDDR flash memory drivers
516#
517# CONFIG_MTD_LPDDR is not set
518
519#
505# UBI - Unsorted block images 520# UBI - Unsorted block images
506# 521#
507# CONFIG_MTD_UBI is not set 522# CONFIG_MTD_UBI is not set
@@ -565,6 +580,7 @@ CONFIG_SCSI_WAIT_SCAN=m
565# CONFIG_SCSI_SRP_ATTRS is not set 580# CONFIG_SCSI_SRP_ATTRS is not set
566# CONFIG_SCSI_LOWLEVEL is not set 581# CONFIG_SCSI_LOWLEVEL is not set
567# CONFIG_SCSI_DH is not set 582# CONFIG_SCSI_DH is not set
583# CONFIG_SCSI_OSD_INITIATOR is not set
568CONFIG_ATA=y 584CONFIG_ATA=y
569# CONFIG_ATA_NONSTANDARD is not set 585# CONFIG_ATA_NONSTANDARD is not set
570CONFIG_SATA_PMP=y 586CONFIG_SATA_PMP=y
@@ -639,6 +655,7 @@ CONFIG_SATA_SIL=y
639# CONFIG_IEEE1394 is not set 655# CONFIG_IEEE1394 is not set
640# CONFIG_I2O is not set 656# CONFIG_I2O is not set
641CONFIG_NETDEVICES=y 657CONFIG_NETDEVICES=y
658CONFIG_COMPAT_NET_DEV_OPS=y
642# CONFIG_DUMMY is not set 659# CONFIG_DUMMY is not set
643# CONFIG_BONDING is not set 660# CONFIG_BONDING is not set
644# CONFIG_MACVLAN is not set 661# CONFIG_MACVLAN is not set
@@ -668,6 +685,7 @@ CONFIG_R8169=y
668# CONFIG_QLA3XXX is not set 685# CONFIG_QLA3XXX is not set
669# CONFIG_ATL1 is not set 686# CONFIG_ATL1 is not set
670# CONFIG_ATL1E is not set 687# CONFIG_ATL1E is not set
688# CONFIG_ATL1C is not set
671# CONFIG_JME is not set 689# CONFIG_JME is not set
672# CONFIG_NETDEV_10000 is not set 690# CONFIG_NETDEV_10000 is not set
673# CONFIG_TR is not set 691# CONFIG_TR is not set
@@ -677,7 +695,10 @@ CONFIG_R8169=y
677# 695#
678# CONFIG_WLAN_PRE80211 is not set 696# CONFIG_WLAN_PRE80211 is not set
679# CONFIG_WLAN_80211 is not set 697# CONFIG_WLAN_80211 is not set
680# CONFIG_IWLWIFI_LEDS is not set 698
699#
700# Enable WiMAX (Networking options) to see the WiMAX drivers
701#
681 702
682# 703#
683# USB Network Adapters 704# USB Network Adapters
@@ -772,6 +793,7 @@ CONFIG_LEGACY_PTYS=y
772CONFIG_LEGACY_PTY_COUNT=256 793CONFIG_LEGACY_PTY_COUNT=256
773# CONFIG_IPMI_HANDLER is not set 794# CONFIG_IPMI_HANDLER is not set
774CONFIG_HW_RANDOM=y 795CONFIG_HW_RANDOM=y
796# CONFIG_HW_RANDOM_TIMERIOMEM is not set
775# CONFIG_R3964 is not set 797# CONFIG_R3964 is not set
776# CONFIG_APPLICOM is not set 798# CONFIG_APPLICOM is not set
777# CONFIG_RAW_DRIVER is not set 799# CONFIG_RAW_DRIVER is not set
@@ -834,12 +856,9 @@ CONFIG_I2C_PCA_PLATFORM=y
834# Miscellaneous I2C Chip support 856# Miscellaneous I2C Chip support
835# 857#
836# CONFIG_DS1682 is not set 858# CONFIG_DS1682 is not set
837# CONFIG_EEPROM_AT24 is not set
838# CONFIG_EEPROM_LEGACY is not set
839# CONFIG_SENSORS_PCF8574 is not set 859# CONFIG_SENSORS_PCF8574 is not set
840# CONFIG_PCF8575 is not set 860# CONFIG_PCF8575 is not set
841# CONFIG_SENSORS_PCA9539 is not set 861# CONFIG_SENSORS_PCA9539 is not set
842# CONFIG_SENSORS_PCF8591 is not set
843# CONFIG_SENSORS_MAX6875 is not set 862# CONFIG_SENSORS_MAX6875 is not set
844# CONFIG_SENSORS_TSL2550 is not set 863# CONFIG_SENSORS_TSL2550 is not set
845# CONFIG_I2C_DEBUG_CORE is not set 864# CONFIG_I2C_DEBUG_CORE is not set
@@ -871,6 +890,7 @@ CONFIG_MFD_SM501=y
871# CONFIG_PMIC_DA903X is not set 890# CONFIG_PMIC_DA903X is not set
872# CONFIG_MFD_WM8400 is not set 891# CONFIG_MFD_WM8400 is not set
873# CONFIG_MFD_WM8350_I2C is not set 892# CONFIG_MFD_WM8350_I2C is not set
893# CONFIG_MFD_PCF50633 is not set
874# CONFIG_REGULATOR is not set 894# CONFIG_REGULATOR is not set
875 895
876# 896#
@@ -948,6 +968,7 @@ CONFIG_FB_SM501=y
948# CONFIG_FB_VIRTUAL is not set 968# CONFIG_FB_VIRTUAL is not set
949# CONFIG_FB_METRONOME is not set 969# CONFIG_FB_METRONOME is not set
950# CONFIG_FB_MB862XX is not set 970# CONFIG_FB_MB862XX is not set
971# CONFIG_FB_BROADSHEET is not set
951# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 972# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
952 973
953# 974#
@@ -1041,6 +1062,7 @@ CONFIG_USB_MON=y
1041CONFIG_USB_EHCI_HCD=m 1062CONFIG_USB_EHCI_HCD=m
1042# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1063# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1043# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1064# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1065# CONFIG_USB_OXU210HP_HCD is not set
1044# CONFIG_USB_ISP116X_HCD is not set 1066# CONFIG_USB_ISP116X_HCD is not set
1045# CONFIG_USB_ISP1760_HCD is not set 1067# CONFIG_USB_ISP1760_HCD is not set
1046CONFIG_USB_OHCI_HCD=m 1068CONFIG_USB_OHCI_HCD=m
@@ -1062,18 +1084,17 @@ CONFIG_USB_R8A66597_HCD=y
1062# CONFIG_USB_TMC is not set 1084# CONFIG_USB_TMC is not set
1063 1085
1064# 1086#
1065# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1087# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1066# 1088#
1067 1089
1068# 1090#
1069# see USB_STORAGE Help for more information 1091# also be needed; see USB_STORAGE Help for more info
1070# 1092#
1071CONFIG_USB_STORAGE=y 1093CONFIG_USB_STORAGE=y
1072# CONFIG_USB_STORAGE_DEBUG is not set 1094# CONFIG_USB_STORAGE_DEBUG is not set
1073# CONFIG_USB_STORAGE_DATAFAB is not set 1095# CONFIG_USB_STORAGE_DATAFAB is not set
1074# CONFIG_USB_STORAGE_FREECOM is not set 1096# CONFIG_USB_STORAGE_FREECOM is not set
1075# CONFIG_USB_STORAGE_ISD200 is not set 1097# CONFIG_USB_STORAGE_ISD200 is not set
1076# CONFIG_USB_STORAGE_DPCM is not set
1077# CONFIG_USB_STORAGE_USBAT is not set 1098# CONFIG_USB_STORAGE_USBAT is not set
1078# CONFIG_USB_STORAGE_SDDR09 is not set 1099# CONFIG_USB_STORAGE_SDDR09 is not set
1079# CONFIG_USB_STORAGE_SDDR55 is not set 1100# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1109,7 +1130,6 @@ CONFIG_USB_STORAGE=y
1109# CONFIG_USB_LED is not set 1130# CONFIG_USB_LED is not set
1110# CONFIG_USB_CYPRESS_CY7C63 is not set 1131# CONFIG_USB_CYPRESS_CY7C63 is not set
1111# CONFIG_USB_CYTHERM is not set 1132# CONFIG_USB_CYTHERM is not set
1112# CONFIG_USB_PHIDGET is not set
1113# CONFIG_USB_IDMOUSE is not set 1133# CONFIG_USB_IDMOUSE is not set
1114# CONFIG_USB_FTDI_ELAN is not set 1134# CONFIG_USB_FTDI_ELAN is not set
1115# CONFIG_USB_APPLEDISPLAY is not set 1135# CONFIG_USB_APPLEDISPLAY is not set
@@ -1121,6 +1141,11 @@ CONFIG_USB_TEST=m
1121# CONFIG_USB_ISIGHTFW is not set 1141# CONFIG_USB_ISIGHTFW is not set
1122# CONFIG_USB_VST is not set 1142# CONFIG_USB_VST is not set
1123# CONFIG_USB_GADGET is not set 1143# CONFIG_USB_GADGET is not set
1144
1145#
1146# OTG and related infrastructure
1147#
1148# CONFIG_NOP_USB_XCEIV is not set
1124# CONFIG_UWB is not set 1149# CONFIG_UWB is not set
1125# CONFIG_MMC is not set 1150# CONFIG_MMC is not set
1126# CONFIG_MEMSTICK is not set 1151# CONFIG_MEMSTICK is not set
@@ -1182,6 +1207,7 @@ CONFIG_RTC_DRV_RS5C372=y
1182# 1207#
1183# CONFIG_RTC_DRV_SH is not set 1208# CONFIG_RTC_DRV_SH is not set
1184# CONFIG_DMADEVICES is not set 1209# CONFIG_DMADEVICES is not set
1210# CONFIG_AUXDISPLAY is not set
1185# CONFIG_UIO is not set 1211# CONFIG_UIO is not set
1186# CONFIG_STAGING is not set 1212# CONFIG_STAGING is not set
1187 1213
@@ -1204,6 +1230,7 @@ CONFIG_FS_POSIX_ACL=y
1204CONFIG_FILE_LOCKING=y 1230CONFIG_FILE_LOCKING=y
1205# CONFIG_XFS_FS is not set 1231# CONFIG_XFS_FS is not set
1206# CONFIG_OCFS2_FS is not set 1232# CONFIG_OCFS2_FS is not set
1233# CONFIG_BTRFS_FS is not set
1207CONFIG_DNOTIFY=y 1234CONFIG_DNOTIFY=y
1208CONFIG_INOTIFY=y 1235CONFIG_INOTIFY=y
1209CONFIG_INOTIFY_USER=y 1236CONFIG_INOTIFY_USER=y
@@ -1253,6 +1280,7 @@ CONFIG_MISC_FILESYSTEMS=y
1253# CONFIG_EFS_FS is not set 1280# CONFIG_EFS_FS is not set
1254# CONFIG_JFFS2_FS is not set 1281# CONFIG_JFFS2_FS is not set
1255# CONFIG_CRAMFS is not set 1282# CONFIG_CRAMFS is not set
1283# CONFIG_SQUASHFS is not set
1256# CONFIG_VXFS_FS is not set 1284# CONFIG_VXFS_FS is not set
1257CONFIG_MINIX_FS=y 1285CONFIG_MINIX_FS=y
1258# CONFIG_OMFS_FS is not set 1286# CONFIG_OMFS_FS is not set
@@ -1277,7 +1305,6 @@ CONFIG_EXPORTFS=y
1277CONFIG_NFS_COMMON=y 1305CONFIG_NFS_COMMON=y
1278CONFIG_SUNRPC=y 1306CONFIG_SUNRPC=y
1279CONFIG_SUNRPC_GSS=y 1307CONFIG_SUNRPC_GSS=y
1280# CONFIG_SUNRPC_REGISTER_V4 is not set
1281CONFIG_RPCSEC_GSS_KRB5=y 1308CONFIG_RPCSEC_GSS_KRB5=y
1282# CONFIG_RPCSEC_GSS_SPKM3 is not set 1309# CONFIG_RPCSEC_GSS_SPKM3 is not set
1283# CONFIG_SMB_FS is not set 1310# CONFIG_SMB_FS is not set
@@ -1382,6 +1409,7 @@ CONFIG_DEBUG_PREEMPT=y
1382# CONFIG_FAULT_INJECTION is not set 1409# CONFIG_FAULT_INJECTION is not set
1383# CONFIG_LATENCYTOP is not set 1410# CONFIG_LATENCYTOP is not set
1384CONFIG_SYSCTL_SYSCALL_CHECK=y 1411CONFIG_SYSCTL_SYSCALL_CHECK=y
1412# CONFIG_PAGE_POISONING is not set
1385CONFIG_HAVE_FUNCTION_TRACER=y 1413CONFIG_HAVE_FUNCTION_TRACER=y
1386CONFIG_HAVE_DYNAMIC_FTRACE=y 1414CONFIG_HAVE_DYNAMIC_FTRACE=y
1387CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1415CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -1397,7 +1425,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1397# CONFIG_BOOT_TRACER is not set 1425# CONFIG_BOOT_TRACER is not set
1398# CONFIG_TRACE_BRANCH_PROFILING is not set 1426# CONFIG_TRACE_BRANCH_PROFILING is not set
1399# CONFIG_STACK_TRACER is not set 1427# CONFIG_STACK_TRACER is not set
1400# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1401# CONFIG_SAMPLES is not set 1428# CONFIG_SAMPLES is not set
1402CONFIG_HAVE_ARCH_KGDB=y 1429CONFIG_HAVE_ARCH_KGDB=y
1403# CONFIG_KGDB is not set 1430# CONFIG_KGDB is not set
@@ -1433,10 +1460,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1433CONFIG_CRYPTO_HASH=y 1460CONFIG_CRYPTO_HASH=y
1434CONFIG_CRYPTO_HASH2=y 1461CONFIG_CRYPTO_HASH2=y
1435CONFIG_CRYPTO_RNG2=y 1462CONFIG_CRYPTO_RNG2=y
1463CONFIG_CRYPTO_PCOMP=y
1436CONFIG_CRYPTO_MANAGER=y 1464CONFIG_CRYPTO_MANAGER=y
1437CONFIG_CRYPTO_MANAGER2=y 1465CONFIG_CRYPTO_MANAGER2=y
1438# CONFIG_CRYPTO_GF128MUL is not set 1466# CONFIG_CRYPTO_GF128MUL is not set
1439# CONFIG_CRYPTO_NULL is not set 1467# CONFIG_CRYPTO_NULL is not set
1468CONFIG_CRYPTO_WORKQUEUE=y
1440# CONFIG_CRYPTO_CRYPTD is not set 1469# CONFIG_CRYPTO_CRYPTD is not set
1441# CONFIG_CRYPTO_AUTHENC is not set 1470# CONFIG_CRYPTO_AUTHENC is not set
1442# CONFIG_CRYPTO_TEST is not set 1471# CONFIG_CRYPTO_TEST is not set
@@ -1505,6 +1534,7 @@ CONFIG_CRYPTO_DES=y
1505# Compression 1534# Compression
1506# 1535#
1507# CONFIG_CRYPTO_DEFLATE is not set 1536# CONFIG_CRYPTO_DEFLATE is not set
1537# CONFIG_CRYPTO_ZLIB is not set
1508# CONFIG_CRYPTO_LZO is not set 1538# CONFIG_CRYPTO_LZO is not set
1509 1539
1510# 1540#
@@ -1525,7 +1555,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
1525CONFIG_CRC32=y 1555CONFIG_CRC32=y
1526# CONFIG_CRC7 is not set 1556# CONFIG_CRC7 is not set
1527# CONFIG_LIBCRC32C is not set 1557# CONFIG_LIBCRC32C is not set
1528CONFIG_PLIST=y
1529CONFIG_HAS_IOMEM=y 1558CONFIG_HAS_IOMEM=y
1530CONFIG_HAS_IOPORT=y 1559CONFIG_HAS_IOPORT=y
1531CONFIG_HAS_DMA=y 1560CONFIG_HAS_DMA=y
1561CONFIG_NLATTR=y
diff --git a/arch/sh/configs/shmin_defconfig b/arch/sh/configs/shmin_defconfig
index 8ba10e1e08cd..d695e9061874 100644
--- a/arch/sh/configs/shmin_defconfig
+++ b/arch/sh/configs/shmin_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:09:00 2009 4# Thu Apr 2 19:19:03 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,13 +16,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_GENERIC_TIME=y 16CONFIG_GENERIC_TIME=y
17CONFIG_GENERIC_CLOCKEVENTS=y 17CONFIG_GENERIC_CLOCKEVENTS=y
18# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 18# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
19# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 19CONFIG_ARCH_HIBERNATION_POSSIBLE=y
20CONFIG_STACKTRACE_SUPPORT=y 20CONFIG_STACKTRACE_SUPPORT=y
21CONFIG_LOCKDEP_SUPPORT=y 21CONFIG_LOCKDEP_SUPPORT=y
22CONFIG_HAVE_LATENCYTOP_SUPPORT=y 22CONFIG_HAVE_LATENCYTOP_SUPPORT=y
23# CONFIG_ARCH_HAS_ILOG2_U32 is not set 23# CONFIG_ARCH_HAS_ILOG2_U32 is not set
24# CONFIG_ARCH_HAS_ILOG2_U64 is not set 24# CONFIG_ARCH_HAS_ILOG2_U64 is not set
25CONFIG_ARCH_NO_VIRT_TO_BUS=y 25CONFIG_ARCH_NO_VIRT_TO_BUS=y
26CONFIG_ARCH_HAS_DEFAULT_IDLE=y
26CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
27 28
28# 29#
@@ -39,15 +40,25 @@ CONFIG_LOCALVERSION_AUTO=y
39# CONFIG_BSD_PROCESS_ACCT is not set 40# CONFIG_BSD_PROCESS_ACCT is not set
40# CONFIG_TASKSTATS is not set 41# CONFIG_TASKSTATS is not set
41# CONFIG_AUDIT is not set 42# CONFIG_AUDIT is not set
43
44#
45# RCU Subsystem
46#
47CONFIG_CLASSIC_RCU=y
48# CONFIG_TREE_RCU is not set
49# CONFIG_PREEMPT_RCU is not set
50# CONFIG_TREE_RCU_TRACE is not set
51# CONFIG_PREEMPT_RCU_TRACE is not set
42# CONFIG_IKCONFIG is not set 52# CONFIG_IKCONFIG is not set
43CONFIG_LOG_BUF_SHIFT=14 53CONFIG_LOG_BUF_SHIFT=14
44# CONFIG_CGROUPS is not set
45# CONFIG_GROUP_SCHED is not set 54# CONFIG_GROUP_SCHED is not set
55# CONFIG_CGROUPS is not set
46# CONFIG_RELAY is not set 56# CONFIG_RELAY is not set
47# CONFIG_NAMESPACES is not set 57# CONFIG_NAMESPACES is not set
48# CONFIG_BLK_DEV_INITRD is not set 58# CONFIG_BLK_DEV_INITRD is not set
49CONFIG_CC_OPTIMIZE_FOR_SIZE=y 59CONFIG_CC_OPTIMIZE_FOR_SIZE=y
50CONFIG_SYSCTL=y 60CONFIG_SYSCTL=y
61CONFIG_ANON_INODES=y
51CONFIG_EMBEDDED=y 62CONFIG_EMBEDDED=y
52# CONFIG_UID16 is not set 63# CONFIG_UID16 is not set
53# CONFIG_SYSCTL_SYSCALL is not set 64# CONFIG_SYSCTL_SYSCALL is not set
@@ -56,10 +67,8 @@ CONFIG_EMBEDDED=y
56CONFIG_PRINTK=y 67CONFIG_PRINTK=y
57# CONFIG_BUG is not set 68# CONFIG_BUG is not set
58# CONFIG_ELF_CORE is not set 69# CONFIG_ELF_CORE is not set
59CONFIG_COMPAT_BRK=y
60# CONFIG_BASE_FULL is not set 70# CONFIG_BASE_FULL is not set
61# CONFIG_FUTEX is not set 71# CONFIG_FUTEX is not set
62CONFIG_ANON_INODES=y
63# CONFIG_EPOLL is not set 72# CONFIG_EPOLL is not set
64CONFIG_SIGNALFD=y 73CONFIG_SIGNALFD=y
65CONFIG_TIMERFD=y 74CONFIG_TIMERFD=y
@@ -67,6 +76,7 @@ CONFIG_EVENTFD=y
67# CONFIG_SHMEM is not set 76# CONFIG_SHMEM is not set
68CONFIG_AIO=y 77CONFIG_AIO=y
69CONFIG_VM_EVENT_COUNTERS=y 78CONFIG_VM_EVENT_COUNTERS=y
79CONFIG_COMPAT_BRK=y
70# CONFIG_SLAB is not set 80# CONFIG_SLAB is not set
71# CONFIG_SLUB is not set 81# CONFIG_SLUB is not set
72CONFIG_SLOB=y 82CONFIG_SLOB=y
@@ -97,11 +107,6 @@ CONFIG_IOSCHED_NOOP=y
97# CONFIG_DEFAULT_CFQ is not set 107# CONFIG_DEFAULT_CFQ is not set
98CONFIG_DEFAULT_NOOP=y 108CONFIG_DEFAULT_NOOP=y
99CONFIG_DEFAULT_IOSCHED="noop" 109CONFIG_DEFAULT_IOSCHED="noop"
100CONFIG_CLASSIC_RCU=y
101# CONFIG_TREE_RCU is not set
102# CONFIG_PREEMPT_RCU is not set
103# CONFIG_TREE_RCU_TRACE is not set
104# CONFIG_PREEMPT_RCU_TRACE is not set
105# CONFIG_FREEZER is not set 110# CONFIG_FREEZER is not set
106 111
107# 112#
@@ -136,6 +141,7 @@ CONFIG_CPU_SUBTYPE_SH7706=y
136# CONFIG_CPU_SUBTYPE_SH7770 is not set 141# CONFIG_CPU_SUBTYPE_SH7770 is not set
137# CONFIG_CPU_SUBTYPE_SH7780 is not set 142# CONFIG_CPU_SUBTYPE_SH7780 is not set
138# CONFIG_CPU_SUBTYPE_SH7785 is not set 143# CONFIG_CPU_SUBTYPE_SH7785 is not set
144# CONFIG_CPU_SUBTYPE_SH7786 is not set
139# CONFIG_CPU_SUBTYPE_SHX3 is not set 145# CONFIG_CPU_SUBTYPE_SHX3 is not set
140# CONFIG_CPU_SUBTYPE_SH7343 is not set 146# CONFIG_CPU_SUBTYPE_SH7343 is not set
141# CONFIG_CPU_SUBTYPE_SH7722 is not set 147# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -177,11 +183,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
177CONFIG_ZONE_DMA_FLAG=0 183CONFIG_ZONE_DMA_FLAG=0
178CONFIG_NR_QUICK=2 184CONFIG_NR_QUICK=2
179CONFIG_UNEVICTABLE_LRU=y 185CONFIG_UNEVICTABLE_LRU=y
186CONFIG_HAVE_MLOCK=y
187CONFIG_HAVE_MLOCKED_PAGE_BIT=y
180 188
181# 189#
182# Cache configuration 190# Cache configuration
183# 191#
184# CONFIG_SH_DIRECT_MAPPED is not set
185CONFIG_CACHE_WRITEBACK=y 192CONFIG_CACHE_WRITEBACK=y
186# CONFIG_CACHE_WRITETHROUGH is not set 193# CONFIG_CACHE_WRITETHROUGH is not set
187# CONFIG_CACHE_OFF is not set 194# CONFIG_CACHE_OFF is not set
@@ -267,7 +274,6 @@ CONFIG_CMDLINE="console=ttySC1,115200 root=1f01 mtdparts=phys_mapped_flash:64k(f
267# Executable file formats 274# Executable file formats
268# 275#
269CONFIG_BINFMT_ELF=y 276CONFIG_BINFMT_ELF=y
270# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
271# CONFIG_HAVE_AOUT is not set 277# CONFIG_HAVE_AOUT is not set
272# CONFIG_BINFMT_MISC is not set 278# CONFIG_BINFMT_MISC is not set
273 279
@@ -281,7 +287,6 @@ CONFIG_NET=y
281# 287#
282# Networking options 288# Networking options
283# 289#
284CONFIG_COMPAT_NET_DEV_OPS=y
285# CONFIG_PACKET is not set 290# CONFIG_PACKET is not set
286CONFIG_UNIX=y 291CONFIG_UNIX=y
287CONFIG_XFRM=y 292CONFIG_XFRM=y
@@ -335,6 +340,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
335# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
336# CONFIG_ECONET is not set 341# CONFIG_ECONET is not set
337# CONFIG_WAN_ROUTER is not set 342# CONFIG_WAN_ROUTER is not set
343# CONFIG_PHONET is not set
338# CONFIG_NET_SCHED is not set 344# CONFIG_NET_SCHED is not set
339# CONFIG_DCB is not set 345# CONFIG_DCB is not set
340 346
@@ -347,13 +353,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
347# CONFIG_IRDA is not set 353# CONFIG_IRDA is not set
348# CONFIG_BT is not set 354# CONFIG_BT is not set
349# CONFIG_AF_RXRPC is not set 355# CONFIG_AF_RXRPC is not set
350# CONFIG_PHONET is not set
351CONFIG_WIRELESS=y 356CONFIG_WIRELESS=y
352# CONFIG_CFG80211 is not set 357# CONFIG_CFG80211 is not set
353# CONFIG_WIRELESS_OLD_REGULATORY is not set 358# CONFIG_WIRELESS_OLD_REGULATORY is not set
354# CONFIG_WIRELESS_EXT is not set 359# CONFIG_WIRELESS_EXT is not set
355# CONFIG_LIB80211 is not set 360# CONFIG_LIB80211 is not set
356# CONFIG_MAC80211 is not set 361# CONFIG_MAC80211 is not set
362# CONFIG_WIMAX is not set
357# CONFIG_RFKILL is not set 363# CONFIG_RFKILL is not set
358# CONFIG_NET_9P is not set 364# CONFIG_NET_9P is not set
359 365
@@ -419,9 +425,7 @@ CONFIG_MTD_CFI_UTIL=y
419# 425#
420# CONFIG_MTD_COMPLEX_MAPPINGS is not set 426# CONFIG_MTD_COMPLEX_MAPPINGS is not set
421CONFIG_MTD_PHYSMAP=y 427CONFIG_MTD_PHYSMAP=y
422CONFIG_MTD_PHYSMAP_START=0xa0000000 428# CONFIG_MTD_PHYSMAP_COMPAT is not set
423CONFIG_MTD_PHYSMAP_LEN=0x80000
424CONFIG_MTD_PHYSMAP_BANKWIDTH=1
425# CONFIG_MTD_PLATRAM is not set 429# CONFIG_MTD_PLATRAM is not set
426 430
427# 431#
@@ -442,6 +446,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
442# CONFIG_MTD_ONENAND is not set 446# CONFIG_MTD_ONENAND is not set
443 447
444# 448#
449# LPDDR flash memory drivers
450#
451# CONFIG_MTD_LPDDR is not set
452
453#
445# UBI - Unsorted block images 454# UBI - Unsorted block images
446# 455#
447# CONFIG_MTD_UBI is not set 456# CONFIG_MTD_UBI is not set
@@ -456,9 +465,13 @@ CONFIG_BLK_DEV_LOOP=y
456# CONFIG_ATA_OVER_ETH is not set 465# CONFIG_ATA_OVER_ETH is not set
457# CONFIG_BLK_DEV_HD is not set 466# CONFIG_BLK_DEV_HD is not set
458CONFIG_MISC_DEVICES=y 467CONFIG_MISC_DEVICES=y
459# CONFIG_EEPROM_93CX6 is not set
460# CONFIG_ENCLOSURE_SERVICES is not set 468# CONFIG_ENCLOSURE_SERVICES is not set
461# CONFIG_C2PORT is not set 469# CONFIG_C2PORT is not set
470
471#
472# EEPROM support
473#
474# CONFIG_EEPROM_93CX6 is not set
462CONFIG_HAVE_IDE=y 475CONFIG_HAVE_IDE=y
463# CONFIG_IDE is not set 476# CONFIG_IDE is not set
464 477
@@ -472,6 +485,7 @@ CONFIG_HAVE_IDE=y
472# CONFIG_ATA is not set 485# CONFIG_ATA is not set
473# CONFIG_MD is not set 486# CONFIG_MD is not set
474CONFIG_NETDEVICES=y 487CONFIG_NETDEVICES=y
488CONFIG_COMPAT_NET_DEV_OPS=y
475# CONFIG_DUMMY is not set 489# CONFIG_DUMMY is not set
476# CONFIG_BONDING is not set 490# CONFIG_BONDING is not set
477# CONFIG_MACVLAN is not set 491# CONFIG_MACVLAN is not set
@@ -484,8 +498,10 @@ CONFIG_NET_ETHERNET=y
484# CONFIG_AX88796 is not set 498# CONFIG_AX88796 is not set
485# CONFIG_STNIC is not set 499# CONFIG_STNIC is not set
486# CONFIG_SMC91X is not set 500# CONFIG_SMC91X is not set
501# CONFIG_ETHOC is not set
487# CONFIG_SMC911X is not set 502# CONFIG_SMC911X is not set
488# CONFIG_SMSC911X is not set 503# CONFIG_SMSC911X is not set
504# CONFIG_DNET is not set
489# CONFIG_IBM_NEW_EMAC_ZMII is not set 505# CONFIG_IBM_NEW_EMAC_ZMII is not set
490# CONFIG_IBM_NEW_EMAC_RGMII is not set 506# CONFIG_IBM_NEW_EMAC_RGMII is not set
491# CONFIG_IBM_NEW_EMAC_TAH is not set 507# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -502,7 +518,10 @@ CONFIG_NETDEV_10000=y
502# 518#
503# CONFIG_WLAN_PRE80211 is not set 519# CONFIG_WLAN_PRE80211 is not set
504# CONFIG_WLAN_80211 is not set 520# CONFIG_WLAN_80211 is not set
505# CONFIG_IWLWIFI_LEDS is not set 521
522#
523# Enable WiMAX (Networking options) to see the WiMAX drivers
524#
506# CONFIG_WAN is not set 525# CONFIG_WAN is not set
507# CONFIG_PPP is not set 526# CONFIG_PPP is not set
508# CONFIG_SLIP is not set 527# CONFIG_SLIP is not set
@@ -549,6 +568,7 @@ CONFIG_LEGACY_PTYS=y
549CONFIG_LEGACY_PTY_COUNT=256 568CONFIG_LEGACY_PTY_COUNT=256
550# CONFIG_IPMI_HANDLER is not set 569# CONFIG_IPMI_HANDLER is not set
551CONFIG_HW_RANDOM=y 570CONFIG_HW_RANDOM=y
571# CONFIG_HW_RANDOM_TIMERIOMEM is not set
552# CONFIG_R3964 is not set 572# CONFIG_R3964 is not set
553# CONFIG_RAW_DRIVER is not set 573# CONFIG_RAW_DRIVER is not set
554# CONFIG_TCG_TPM is not set 574# CONFIG_TCG_TPM is not set
@@ -618,15 +638,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
618# 638#
619 639
620# 640#
621# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 641# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
622# 642#
623# CONFIG_USB_GADGET is not set 643# CONFIG_USB_GADGET is not set
644
645#
646# OTG and related infrastructure
647#
624# CONFIG_MMC is not set 648# CONFIG_MMC is not set
625# CONFIG_MEMSTICK is not set 649# CONFIG_MEMSTICK is not set
626# CONFIG_NEW_LEDS is not set 650# CONFIG_NEW_LEDS is not set
627# CONFIG_ACCESSIBILITY is not set 651# CONFIG_ACCESSIBILITY is not set
628# CONFIG_RTC_CLASS is not set 652# CONFIG_RTC_CLASS is not set
629# CONFIG_DMADEVICES is not set 653# CONFIG_DMADEVICES is not set
654# CONFIG_AUXDISPLAY is not set
630# CONFIG_UIO is not set 655# CONFIG_UIO is not set
631# CONFIG_STAGING is not set 656# CONFIG_STAGING is not set
632 657
@@ -641,6 +666,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
641# CONFIG_FS_POSIX_ACL is not set 666# CONFIG_FS_POSIX_ACL is not set
642CONFIG_FILE_LOCKING=y 667CONFIG_FILE_LOCKING=y
643# CONFIG_XFS_FS is not set 668# CONFIG_XFS_FS is not set
669# CONFIG_BTRFS_FS is not set
644# CONFIG_DNOTIFY is not set 670# CONFIG_DNOTIFY is not set
645# CONFIG_INOTIFY is not set 671# CONFIG_INOTIFY is not set
646# CONFIG_QUOTA is not set 672# CONFIG_QUOTA is not set
@@ -683,6 +709,7 @@ CONFIG_MISC_FILESYSTEMS=y
683# CONFIG_EFS_FS is not set 709# CONFIG_EFS_FS is not set
684# CONFIG_JFFS2_FS is not set 710# CONFIG_JFFS2_FS is not set
685CONFIG_CRAMFS=y 711CONFIG_CRAMFS=y
712# CONFIG_SQUASHFS is not set
686# CONFIG_VXFS_FS is not set 713# CONFIG_VXFS_FS is not set
687# CONFIG_MINIX_FS is not set 714# CONFIG_MINIX_FS is not set
688# CONFIG_OMFS_FS is not set 715# CONFIG_OMFS_FS is not set
@@ -702,7 +729,6 @@ CONFIG_LOCKD=y
702CONFIG_LOCKD_V4=y 729CONFIG_LOCKD_V4=y
703CONFIG_NFS_COMMON=y 730CONFIG_NFS_COMMON=y
704CONFIG_SUNRPC=y 731CONFIG_SUNRPC=y
705# CONFIG_SUNRPC_REGISTER_V4 is not set
706# CONFIG_RPCSEC_GSS_KRB5 is not set 732# CONFIG_RPCSEC_GSS_KRB5 is not set
707# CONFIG_RPCSEC_GSS_SPKM3 is not set 733# CONFIG_RPCSEC_GSS_SPKM3 is not set
708# CONFIG_SMB_FS is not set 734# CONFIG_SMB_FS is not set
@@ -740,7 +766,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
740# 766#
741# Tracers 767# Tracers
742# 768#
743# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
744# CONFIG_SAMPLES is not set 769# CONFIG_SAMPLES is not set
745CONFIG_HAVE_ARCH_KGDB=y 770CONFIG_HAVE_ARCH_KGDB=y
746CONFIG_SH_STANDARD_BIOS=y 771CONFIG_SH_STANDARD_BIOS=y
@@ -831,6 +856,7 @@ CONFIG_CRYPTO=y
831# Compression 856# Compression
832# 857#
833# CONFIG_CRYPTO_DEFLATE is not set 858# CONFIG_CRYPTO_DEFLATE is not set
859# CONFIG_CRYPTO_ZLIB is not set
834# CONFIG_CRYPTO_LZO is not set 860# CONFIG_CRYPTO_LZO is not set
835 861
836# 862#
@@ -855,3 +881,4 @@ CONFIG_ZLIB_INFLATE=y
855CONFIG_HAS_IOMEM=y 881CONFIG_HAS_IOMEM=y
856CONFIG_HAS_IOPORT=y 882CONFIG_HAS_IOPORT=y
857CONFIG_HAS_DMA=y 883CONFIG_HAS_DMA=y
884CONFIG_NLATTR=y
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index ed90a7e81099..e3651f574399 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:10:57 2009 4# Thu Apr 2 19:20:54 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,7 +19,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
19CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y 19CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
20CONFIG_GENERIC_LOCKBREAK=y 20CONFIG_GENERIC_LOCKBREAK=y
21# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 21# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
22# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 22CONFIG_ARCH_HIBERNATION_POSSIBLE=y
23CONFIG_SYS_SUPPORTS_SMP=y 23CONFIG_SYS_SUPPORTS_SMP=y
24CONFIG_SYS_SUPPORTS_NUMA=y 24CONFIG_SYS_SUPPORTS_NUMA=y
25CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
@@ -27,6 +27,7 @@ CONFIG_LOCKDEP_SUPPORT=y
27# CONFIG_ARCH_HAS_ILOG2_U32 is not set 27# CONFIG_ARCH_HAS_ILOG2_U32 is not set
28# CONFIG_ARCH_HAS_ILOG2_U64 is not set 28# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29CONFIG_ARCH_NO_VIRT_TO_BUS=y 29CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 31CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
31 32
32# 33#
@@ -47,24 +48,35 @@ CONFIG_BSD_PROCESS_ACCT=y
47CONFIG_AUDIT=y 48CONFIG_AUDIT=y
48CONFIG_AUDITSYSCALL=y 49CONFIG_AUDITSYSCALL=y
49CONFIG_AUDIT_TREE=y 50CONFIG_AUDIT_TREE=y
51
52#
53# RCU Subsystem
54#
55# CONFIG_CLASSIC_RCU is not set
56# CONFIG_TREE_RCU is not set
57CONFIG_PREEMPT_RCU=y
58CONFIG_RCU_TRACE=y
59# CONFIG_TREE_RCU_TRACE is not set
60CONFIG_PREEMPT_RCU_TRACE=y
50CONFIG_IKCONFIG=y 61CONFIG_IKCONFIG=y
51CONFIG_IKCONFIG_PROC=y 62CONFIG_IKCONFIG_PROC=y
52CONFIG_LOG_BUF_SHIFT=14 63CONFIG_LOG_BUF_SHIFT=14
64CONFIG_GROUP_SCHED=y
65CONFIG_FAIR_GROUP_SCHED=y
66CONFIG_RT_GROUP_SCHED=y
67CONFIG_USER_SCHED=y
68# CONFIG_CGROUP_SCHED is not set
53CONFIG_CGROUPS=y 69CONFIG_CGROUPS=y
54# CONFIG_CGROUP_DEBUG is not set 70# CONFIG_CGROUP_DEBUG is not set
55CONFIG_CGROUP_NS=y 71CONFIG_CGROUP_NS=y
56CONFIG_CGROUP_FREEZER=y 72CONFIG_CGROUP_FREEZER=y
57CONFIG_CGROUP_DEVICE=y 73CONFIG_CGROUP_DEVICE=y
58# CONFIG_CPUSETS is not set 74# CONFIG_CPUSETS is not set
59CONFIG_GROUP_SCHED=y
60CONFIG_FAIR_GROUP_SCHED=y
61CONFIG_RT_GROUP_SCHED=y
62CONFIG_USER_SCHED=y
63# CONFIG_CGROUP_SCHED is not set
64CONFIG_CGROUP_CPUACCT=y 75CONFIG_CGROUP_CPUACCT=y
65CONFIG_RESOURCE_COUNTERS=y 76CONFIG_RESOURCE_COUNTERS=y
66CONFIG_MM_OWNER=y
67CONFIG_CGROUP_MEM_RES_CTLR=y 77CONFIG_CGROUP_MEM_RES_CTLR=y
78# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
79CONFIG_MM_OWNER=y
68CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
69CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
70CONFIG_RELAY=y 82CONFIG_RELAY=y
@@ -73,24 +85,23 @@ CONFIG_UTS_NS=y
73CONFIG_IPC_NS=y 85CONFIG_IPC_NS=y
74CONFIG_USER_NS=y 86CONFIG_USER_NS=y
75CONFIG_PID_NS=y 87CONFIG_PID_NS=y
88# CONFIG_NET_NS is not set
76# CONFIG_BLK_DEV_INITRD is not set 89# CONFIG_BLK_DEV_INITRD is not set
77# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 90# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
78CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
92CONFIG_ANON_INODES=y
79CONFIG_EMBEDDED=y 93CONFIG_EMBEDDED=y
80CONFIG_UID16=y 94CONFIG_UID16=y
81CONFIG_SYSCTL_SYSCALL=y 95CONFIG_SYSCTL_SYSCALL=y
82CONFIG_KALLSYMS=y 96CONFIG_KALLSYMS=y
83CONFIG_KALLSYMS_ALL=y 97CONFIG_KALLSYMS_ALL=y
84CONFIG_KALLSYMS_STRIP_GENERATED=y
85# CONFIG_KALLSYMS_EXTRA_PASS is not set 98# CONFIG_KALLSYMS_EXTRA_PASS is not set
86CONFIG_HOTPLUG=y 99CONFIG_HOTPLUG=y
87CONFIG_PRINTK=y 100CONFIG_PRINTK=y
88CONFIG_BUG=y 101CONFIG_BUG=y
89CONFIG_ELF_CORE=y 102CONFIG_ELF_CORE=y
90CONFIG_COMPAT_BRK=y
91CONFIG_BASE_FULL=y 103CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 104CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y
94CONFIG_EPOLL=y 105CONFIG_EPOLL=y
95CONFIG_SIGNALFD=y 106CONFIG_SIGNALFD=y
96CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
@@ -98,6 +109,7 @@ CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 109CONFIG_SHMEM=y
99CONFIG_AIO=y 110CONFIG_AIO=y
100CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_COMPAT_BRK=y
101# CONFIG_SLAB is not set 113# CONFIG_SLAB is not set
102# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
103CONFIG_SLOB=y 115CONFIG_SLOB=y
@@ -142,12 +154,6 @@ CONFIG_DEFAULT_AS=y
142# CONFIG_DEFAULT_CFQ is not set 154# CONFIG_DEFAULT_CFQ is not set
143# CONFIG_DEFAULT_NOOP is not set 155# CONFIG_DEFAULT_NOOP is not set
144CONFIG_DEFAULT_IOSCHED="anticipatory" 156CONFIG_DEFAULT_IOSCHED="anticipatory"
145# CONFIG_CLASSIC_RCU is not set
146# CONFIG_TREE_RCU is not set
147CONFIG_PREEMPT_RCU=y
148CONFIG_RCU_TRACE=y
149# CONFIG_TREE_RCU_TRACE is not set
150CONFIG_PREEMPT_RCU_TRACE=y
151CONFIG_FREEZER=y 157CONFIG_FREEZER=y
152 158
153# 159#
@@ -184,6 +190,7 @@ CONFIG_CPU_SHX3=y
184# CONFIG_CPU_SUBTYPE_SH7770 is not set 190# CONFIG_CPU_SUBTYPE_SH7770 is not set
185# CONFIG_CPU_SUBTYPE_SH7780 is not set 191# CONFIG_CPU_SUBTYPE_SH7780 is not set
186# CONFIG_CPU_SUBTYPE_SH7785 is not set 192# CONFIG_CPU_SUBTYPE_SH7785 is not set
193# CONFIG_CPU_SUBTYPE_SH7786 is not set
187CONFIG_CPU_SUBTYPE_SHX3=y 194CONFIG_CPU_SUBTYPE_SHX3=y
188# CONFIG_CPU_SUBTYPE_SH7343 is not set 195# CONFIG_CPU_SUBTYPE_SH7343 is not set
189# CONFIG_CPU_SUBTYPE_SH7722 is not set 196# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -240,11 +247,12 @@ CONFIG_MIGRATION=y
240CONFIG_ZONE_DMA_FLAG=0 247CONFIG_ZONE_DMA_FLAG=0
241CONFIG_NR_QUICK=2 248CONFIG_NR_QUICK=2
242CONFIG_UNEVICTABLE_LRU=y 249CONFIG_UNEVICTABLE_LRU=y
250CONFIG_HAVE_MLOCK=y
251CONFIG_HAVE_MLOCKED_PAGE_BIT=y
243 252
244# 253#
245# Cache configuration 254# Cache configuration
246# 255#
247# CONFIG_SH_DIRECT_MAPPED is not set
248CONFIG_CACHE_WRITEBACK=y 256CONFIG_CACHE_WRITEBACK=y
249# CONFIG_CACHE_WRITETHROUGH is not set 257# CONFIG_CACHE_WRITETHROUGH is not set
250# CONFIG_CACHE_OFF is not set 258# CONFIG_CACHE_OFF is not set
@@ -361,8 +369,6 @@ CONFIG_NET=y
361# 369#
362# Networking options 370# Networking options
363# 371#
364# CONFIG_NET_NS is not set
365CONFIG_COMPAT_NET_DEV_OPS=y
366# CONFIG_PACKET is not set 372# CONFIG_PACKET is not set
367# CONFIG_UNIX is not set 373# CONFIG_UNIX is not set
368CONFIG_XFRM=y 374CONFIG_XFRM=y
@@ -434,6 +440,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
434# CONFIG_LAPB is not set 440# CONFIG_LAPB is not set
435# CONFIG_ECONET is not set 441# CONFIG_ECONET is not set
436# CONFIG_WAN_ROUTER is not set 442# CONFIG_WAN_ROUTER is not set
443# CONFIG_PHONET is not set
437# CONFIG_NET_SCHED is not set 444# CONFIG_NET_SCHED is not set
438# CONFIG_DCB is not set 445# CONFIG_DCB is not set
439 446
@@ -442,6 +449,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
442# 449#
443# CONFIG_NET_PKTGEN is not set 450# CONFIG_NET_PKTGEN is not set
444# CONFIG_NET_TCPPROBE is not set 451# CONFIG_NET_TCPPROBE is not set
452# CONFIG_NET_DROP_MONITOR is not set
445# CONFIG_HAMRADIO is not set 453# CONFIG_HAMRADIO is not set
446CONFIG_CAN=m 454CONFIG_CAN=m
447CONFIG_CAN_RAW=m 455CONFIG_CAN_RAW=m
@@ -455,8 +463,8 @@ CONFIG_CAN_VCAN=m
455# CONFIG_IRDA is not set 463# CONFIG_IRDA is not set
456# CONFIG_BT is not set 464# CONFIG_BT is not set
457# CONFIG_AF_RXRPC is not set 465# CONFIG_AF_RXRPC is not set
458# CONFIG_PHONET is not set
459# CONFIG_WIRELESS is not set 466# CONFIG_WIRELESS is not set
467# CONFIG_WIMAX is not set
460# CONFIG_RFKILL is not set 468# CONFIG_RFKILL is not set
461# CONFIG_NET_9P is not set 469# CONFIG_NET_9P is not set
462 470
@@ -490,10 +498,18 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
490# CONFIG_ATA_OVER_ETH is not set 498# CONFIG_ATA_OVER_ETH is not set
491# CONFIG_BLK_DEV_HD is not set 499# CONFIG_BLK_DEV_HD is not set
492CONFIG_MISC_DEVICES=y 500CONFIG_MISC_DEVICES=y
493# CONFIG_EEPROM_93CX6 is not set
494# CONFIG_ICS932S401 is not set 501# CONFIG_ICS932S401 is not set
495# CONFIG_ENCLOSURE_SERVICES is not set 502# CONFIG_ENCLOSURE_SERVICES is not set
503# CONFIG_ISL29003 is not set
496# CONFIG_C2PORT is not set 504# CONFIG_C2PORT is not set
505
506#
507# EEPROM support
508#
509# CONFIG_EEPROM_AT24 is not set
510# CONFIG_EEPROM_AT25 is not set
511# CONFIG_EEPROM_LEGACY is not set
512# CONFIG_EEPROM_93CX6 is not set
497CONFIG_HAVE_IDE=y 513CONFIG_HAVE_IDE=y
498# CONFIG_IDE is not set 514# CONFIG_IDE is not set
499 515
@@ -539,6 +555,7 @@ CONFIG_SCSI_LOWLEVEL=y
539# CONFIG_LIBFC is not set 555# CONFIG_LIBFC is not set
540# CONFIG_SCSI_DEBUG is not set 556# CONFIG_SCSI_DEBUG is not set
541# CONFIG_SCSI_DH is not set 557# CONFIG_SCSI_DH is not set
558# CONFIG_SCSI_OSD_INITIATOR is not set
542CONFIG_ATA=y 559CONFIG_ATA=y
543# CONFIG_ATA_NONSTANDARD is not set 560# CONFIG_ATA_NONSTANDARD is not set
544CONFIG_SATA_PMP=y 561CONFIG_SATA_PMP=y
@@ -547,6 +564,7 @@ CONFIG_ATA_SFF=y
547CONFIG_PATA_PLATFORM=y 564CONFIG_PATA_PLATFORM=y
548# CONFIG_MD is not set 565# CONFIG_MD is not set
549CONFIG_NETDEVICES=y 566CONFIG_NETDEVICES=y
567CONFIG_COMPAT_NET_DEV_OPS=y
550# CONFIG_DUMMY is not set 568# CONFIG_DUMMY is not set
551# CONFIG_BONDING is not set 569# CONFIG_BONDING is not set
552# CONFIG_MACVLAN is not set 570# CONFIG_MACVLAN is not set
@@ -560,8 +578,10 @@ CONFIG_MII=y
560# CONFIG_STNIC is not set 578# CONFIG_STNIC is not set
561CONFIG_SMC91X=y 579CONFIG_SMC91X=y
562# CONFIG_ENC28J60 is not set 580# CONFIG_ENC28J60 is not set
581# CONFIG_ETHOC is not set
563# CONFIG_SMC911X is not set 582# CONFIG_SMC911X is not set
564# CONFIG_SMSC911X is not set 583# CONFIG_SMSC911X is not set
584# CONFIG_DNET is not set
565# CONFIG_IBM_NEW_EMAC_ZMII is not set 585# CONFIG_IBM_NEW_EMAC_ZMII is not set
566# CONFIG_IBM_NEW_EMAC_RGMII is not set 586# CONFIG_IBM_NEW_EMAC_RGMII is not set
567# CONFIG_IBM_NEW_EMAC_TAH is not set 587# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -578,7 +598,10 @@ CONFIG_SMC91X=y
578# 598#
579# CONFIG_WLAN_PRE80211 is not set 599# CONFIG_WLAN_PRE80211 is not set
580# CONFIG_WLAN_80211 is not set 600# CONFIG_WLAN_80211 is not set
581# CONFIG_IWLWIFI_LEDS is not set 601
602#
603# Enable WiMAX (Networking options) to see the WiMAX drivers
604#
582 605
583# 606#
584# USB Network Adapters 607# USB Network Adapters
@@ -670,12 +693,9 @@ CONFIG_I2C_HELPER_AUTO=y
670# Miscellaneous I2C Chip support 693# Miscellaneous I2C Chip support
671# 694#
672# CONFIG_DS1682 is not set 695# CONFIG_DS1682 is not set
673# CONFIG_EEPROM_AT24 is not set
674# CONFIG_EEPROM_LEGACY is not set
675# CONFIG_SENSORS_PCF8574 is not set 696# CONFIG_SENSORS_PCF8574 is not set
676# CONFIG_PCF8575 is not set 697# CONFIG_PCF8575 is not set
677# CONFIG_SENSORS_PCA9539 is not set 698# CONFIG_SENSORS_PCA9539 is not set
678# CONFIG_SENSORS_PCF8591 is not set
679# CONFIG_SENSORS_MAX6875 is not set 699# CONFIG_SENSORS_MAX6875 is not set
680# CONFIG_SENSORS_TSL2550 is not set 700# CONFIG_SENSORS_TSL2550 is not set
681# CONFIG_I2C_DEBUG_CORE is not set 701# CONFIG_I2C_DEBUG_CORE is not set
@@ -695,7 +715,6 @@ CONFIG_SPI_MASTER=y
695# 715#
696# SPI Protocol Masters 716# SPI Protocol Masters
697# 717#
698# CONFIG_EEPROM_AT25 is not set
699# CONFIG_SPI_SPIDEV is not set 718# CONFIG_SPI_SPIDEV is not set
700# CONFIG_SPI_TLE62X0 is not set 719# CONFIG_SPI_TLE62X0 is not set
701# CONFIG_W1 is not set 720# CONFIG_W1 is not set
@@ -732,6 +751,7 @@ CONFIG_SSB_POSSIBLE=y
732# CONFIG_MFD_TMIO is not set 751# CONFIG_MFD_TMIO is not set
733# CONFIG_MFD_WM8400 is not set 752# CONFIG_MFD_WM8400 is not set
734# CONFIG_MFD_WM8350_I2C is not set 753# CONFIG_MFD_WM8350_I2C is not set
754# CONFIG_MFD_PCF50633 is not set
735# CONFIG_REGULATOR is not set 755# CONFIG_REGULATOR is not set
736 756
737# 757#
@@ -788,7 +808,9 @@ CONFIG_USB_MON=y
788# USB Host Controller Drivers 808# USB Host Controller Drivers
789# 809#
790# CONFIG_USB_C67X00_HCD is not set 810# CONFIG_USB_C67X00_HCD is not set
811# CONFIG_USB_OXU210HP_HCD is not set
791# CONFIG_USB_ISP116X_HCD is not set 812# CONFIG_USB_ISP116X_HCD is not set
813# CONFIG_USB_ISP1760_HCD is not set
792# CONFIG_USB_SL811_HCD is not set 814# CONFIG_USB_SL811_HCD is not set
793CONFIG_USB_R8A66597_HCD=m 815CONFIG_USB_R8A66597_HCD=m
794# CONFIG_USB_HWA_HCD is not set 816# CONFIG_USB_HWA_HCD is not set
@@ -803,11 +825,11 @@ CONFIG_USB_R8A66597_HCD=m
803# CONFIG_USB_TMC is not set 825# CONFIG_USB_TMC is not set
804 826
805# 827#
806# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 828# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
807# 829#
808 830
809# 831#
810# see USB_STORAGE Help for more information 832# also be needed; see USB_STORAGE Help for more info
811# 833#
812# CONFIG_USB_STORAGE is not set 834# CONFIG_USB_STORAGE is not set
813# CONFIG_USB_LIBUSUAL is not set 835# CONFIG_USB_LIBUSUAL is not set
@@ -837,7 +859,6 @@ CONFIG_USB_R8A66597_HCD=m
837# CONFIG_USB_LED is not set 859# CONFIG_USB_LED is not set
838# CONFIG_USB_CYPRESS_CY7C63 is not set 860# CONFIG_USB_CYPRESS_CY7C63 is not set
839# CONFIG_USB_CYTHERM is not set 861# CONFIG_USB_CYTHERM is not set
840# CONFIG_USB_PHIDGET is not set
841# CONFIG_USB_IDMOUSE is not set 862# CONFIG_USB_IDMOUSE is not set
842# CONFIG_USB_FTDI_ELAN is not set 863# CONFIG_USB_FTDI_ELAN is not set
843# CONFIG_USB_APPLEDISPLAY is not set 864# CONFIG_USB_APPLEDISPLAY is not set
@@ -860,10 +881,12 @@ CONFIG_USB_GADGET_SELECTED=y
860# CONFIG_USB_GADGET_PXA25X is not set 881# CONFIG_USB_GADGET_PXA25X is not set
861# CONFIG_USB_GADGET_PXA27X is not set 882# CONFIG_USB_GADGET_PXA27X is not set
862# CONFIG_USB_GADGET_S3C2410 is not set 883# CONFIG_USB_GADGET_S3C2410 is not set
884# CONFIG_USB_GADGET_IMX is not set
863CONFIG_USB_GADGET_M66592=y 885CONFIG_USB_GADGET_M66592=y
864CONFIG_USB_M66592=y 886CONFIG_USB_M66592=y
865# CONFIG_USB_GADGET_AMD5536UDC is not set 887# CONFIG_USB_GADGET_AMD5536UDC is not set
866# CONFIG_USB_GADGET_FSL_QE is not set 888# CONFIG_USB_GADGET_FSL_QE is not set
889# CONFIG_USB_GADGET_CI13XXX is not set
867# CONFIG_USB_GADGET_NET2280 is not set 890# CONFIG_USB_GADGET_NET2280 is not set
868# CONFIG_USB_GADGET_GOKU is not set 891# CONFIG_USB_GADGET_GOKU is not set
869# CONFIG_USB_GADGET_DUMMY_HCD is not set 892# CONFIG_USB_GADGET_DUMMY_HCD is not set
@@ -876,6 +899,11 @@ CONFIG_USB_GADGET_DUALSPEED=y
876# CONFIG_USB_MIDI_GADGET is not set 899# CONFIG_USB_MIDI_GADGET is not set
877# CONFIG_USB_G_PRINTER is not set 900# CONFIG_USB_G_PRINTER is not set
878# CONFIG_USB_CDC_COMPOSITE is not set 901# CONFIG_USB_CDC_COMPOSITE is not set
902
903#
904# OTG and related infrastructure
905#
906# CONFIG_NOP_USB_XCEIV is not set
879# CONFIG_MMC is not set 907# CONFIG_MMC is not set
880# CONFIG_MEMSTICK is not set 908# CONFIG_MEMSTICK is not set
881# CONFIG_NEW_LEDS is not set 909# CONFIG_NEW_LEDS is not set
@@ -942,6 +970,7 @@ CONFIG_RTC_INTF_DEV=y
942# 970#
943CONFIG_RTC_DRV_SH=y 971CONFIG_RTC_DRV_SH=y
944# CONFIG_DMADEVICES is not set 972# CONFIG_DMADEVICES is not set
973# CONFIG_AUXDISPLAY is not set
945CONFIG_UIO=m 974CONFIG_UIO=m
946# CONFIG_UIO_PDRV is not set 975# CONFIG_UIO_PDRV is not set
947# CONFIG_UIO_PDRV_GENIRQ is not set 976# CONFIG_UIO_PDRV_GENIRQ is not set
@@ -969,6 +998,7 @@ CONFIG_FS_MBCACHE=y
969CONFIG_FILE_LOCKING=y 998CONFIG_FILE_LOCKING=y
970# CONFIG_XFS_FS is not set 999# CONFIG_XFS_FS is not set
971# CONFIG_OCFS2_FS is not set 1000# CONFIG_OCFS2_FS is not set
1001# CONFIG_BTRFS_FS is not set
972CONFIG_DNOTIFY=y 1002CONFIG_DNOTIFY=y
973CONFIG_INOTIFY=y 1003CONFIG_INOTIFY=y
974CONFIG_INOTIFY_USER=y 1004CONFIG_INOTIFY_USER=y
@@ -1012,6 +1042,7 @@ CONFIG_MISC_FILESYSTEMS=y
1012# CONFIG_BFS_FS is not set 1042# CONFIG_BFS_FS is not set
1013# CONFIG_EFS_FS is not set 1043# CONFIG_EFS_FS is not set
1014# CONFIG_CRAMFS is not set 1044# CONFIG_CRAMFS is not set
1045# CONFIG_SQUASHFS is not set
1015# CONFIG_VXFS_FS is not set 1046# CONFIG_VXFS_FS is not set
1016# CONFIG_MINIX_FS is not set 1047# CONFIG_MINIX_FS is not set
1017# CONFIG_OMFS_FS is not set 1048# CONFIG_OMFS_FS is not set
@@ -1086,6 +1117,7 @@ CONFIG_FRAME_POINTER=y
1086# CONFIG_LKDTM is not set 1117# CONFIG_LKDTM is not set
1087# CONFIG_FAULT_INJECTION is not set 1118# CONFIG_FAULT_INJECTION is not set
1088# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1119# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1120# CONFIG_PAGE_POISONING is not set
1089CONFIG_NOP_TRACER=y 1121CONFIG_NOP_TRACER=y
1090CONFIG_HAVE_FUNCTION_TRACER=y 1122CONFIG_HAVE_FUNCTION_TRACER=y
1091CONFIG_HAVE_DYNAMIC_FTRACE=y 1123CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -1105,7 +1137,7 @@ CONFIG_TRACING=y
1105# CONFIG_TRACE_BRANCH_PROFILING is not set 1137# CONFIG_TRACE_BRANCH_PROFILING is not set
1106# CONFIG_STACK_TRACER is not set 1138# CONFIG_STACK_TRACER is not set
1107# CONFIG_FTRACE_STARTUP_TEST is not set 1139# CONFIG_FTRACE_STARTUP_TEST is not set
1108# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1140# CONFIG_DYNAMIC_DEBUG is not set
1109# CONFIG_SAMPLES is not set 1141# CONFIG_SAMPLES is not set
1110CONFIG_HAVE_ARCH_KGDB=y 1142CONFIG_HAVE_ARCH_KGDB=y
1111# CONFIG_KGDB is not set 1143# CONFIG_KGDB is not set
@@ -1205,6 +1237,7 @@ CONFIG_CRYPTO=y
1205# Compression 1237# Compression
1206# 1238#
1207# CONFIG_CRYPTO_DEFLATE is not set 1239# CONFIG_CRYPTO_DEFLATE is not set
1240# CONFIG_CRYPTO_ZLIB is not set
1208# CONFIG_CRYPTO_LZO is not set 1241# CONFIG_CRYPTO_LZO is not set
1209 1242
1210# 1243#
@@ -1226,7 +1259,7 @@ CONFIG_CRC32=y
1226# CONFIG_CRC7 is not set 1259# CONFIG_CRC7 is not set
1227# CONFIG_LIBCRC32C is not set 1260# CONFIG_LIBCRC32C is not set
1228CONFIG_AUDIT_GENERIC=y 1261CONFIG_AUDIT_GENERIC=y
1229CONFIG_PLIST=y
1230CONFIG_HAS_IOMEM=y 1262CONFIG_HAS_IOMEM=y
1231CONFIG_HAS_IOPORT=y 1263CONFIG_HAS_IOPORT=y
1232CONFIG_HAS_DMA=y 1264CONFIG_HAS_DMA=y
1265CONFIG_NLATTR=y
diff --git a/arch/sh/configs/snapgear_defconfig b/arch/sh/configs/snapgear_defconfig
index 98377e502650..6960f60bf52e 100644
--- a/arch/sh/configs/snapgear_defconfig
+++ b/arch/sh/configs/snapgear_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:14:08 2009 4# Thu Apr 2 19:21:39 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -41,18 +42,32 @@ CONFIG_LOCALVERSION_AUTO=y
41# CONFIG_BSD_PROCESS_ACCT is not set 42# CONFIG_BSD_PROCESS_ACCT is not set
42# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
43# CONFIG_AUDIT is not set 44# CONFIG_AUDIT is not set
45
46#
47# RCU Subsystem
48#
49CONFIG_CLASSIC_RCU=y
50# CONFIG_TREE_RCU is not set
51# CONFIG_PREEMPT_RCU is not set
52# CONFIG_TREE_RCU_TRACE is not set
53# CONFIG_PREEMPT_RCU_TRACE is not set
44# CONFIG_IKCONFIG is not set 54# CONFIG_IKCONFIG is not set
45CONFIG_LOG_BUF_SHIFT=14 55CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_CGROUPS is not set
47# CONFIG_GROUP_SCHED is not set 56# CONFIG_GROUP_SCHED is not set
57# CONFIG_CGROUPS is not set
48CONFIG_SYSFS_DEPRECATED=y 58CONFIG_SYSFS_DEPRECATED=y
49CONFIG_SYSFS_DEPRECATED_V2=y 59CONFIG_SYSFS_DEPRECATED_V2=y
50# CONFIG_RELAY is not set 60# CONFIG_RELAY is not set
51# CONFIG_NAMESPACES is not set 61# CONFIG_NAMESPACES is not set
52CONFIG_BLK_DEV_INITRD=y 62CONFIG_BLK_DEV_INITRD=y
53CONFIG_INITRAMFS_SOURCE="" 63CONFIG_INITRAMFS_SOURCE=""
64CONFIG_RD_GZIP=y
65# CONFIG_RD_BZIP2 is not set
66# CONFIG_RD_LZMA is not set
67CONFIG_INITRAMFS_COMPRESSION_NONE=y
54CONFIG_CC_OPTIMIZE_FOR_SIZE=y 68CONFIG_CC_OPTIMIZE_FOR_SIZE=y
55CONFIG_SYSCTL=y 69CONFIG_SYSCTL=y
70CONFIG_ANON_INODES=y
56CONFIG_EMBEDDED=y 71CONFIG_EMBEDDED=y
57CONFIG_UID16=y 72CONFIG_UID16=y
58# CONFIG_SYSCTL_SYSCALL is not set 73# CONFIG_SYSCTL_SYSCALL is not set
@@ -62,10 +77,8 @@ CONFIG_KALLSYMS=y
62CONFIG_PRINTK=y 77CONFIG_PRINTK=y
63CONFIG_BUG=y 78CONFIG_BUG=y
64CONFIG_ELF_CORE=y 79CONFIG_ELF_CORE=y
65CONFIG_COMPAT_BRK=y
66CONFIG_BASE_FULL=y 80CONFIG_BASE_FULL=y
67CONFIG_FUTEX=y 81CONFIG_FUTEX=y
68CONFIG_ANON_INODES=y
69CONFIG_EPOLL=y 82CONFIG_EPOLL=y
70CONFIG_SIGNALFD=y 83CONFIG_SIGNALFD=y
71CONFIG_TIMERFD=y 84CONFIG_TIMERFD=y
@@ -74,6 +87,7 @@ CONFIG_SHMEM=y
74CONFIG_AIO=y 87CONFIG_AIO=y
75CONFIG_VM_EVENT_COUNTERS=y 88CONFIG_VM_EVENT_COUNTERS=y
76CONFIG_PCI_QUIRKS=y 89CONFIG_PCI_QUIRKS=y
90CONFIG_COMPAT_BRK=y
77CONFIG_SLAB=y 91CONFIG_SLAB=y
78# CONFIG_SLUB is not set 92# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 93# CONFIG_SLOB is not set
@@ -107,11 +121,6 @@ CONFIG_DEFAULT_AS=y
107# CONFIG_DEFAULT_CFQ is not set 121# CONFIG_DEFAULT_CFQ is not set
108# CONFIG_DEFAULT_NOOP is not set 122# CONFIG_DEFAULT_NOOP is not set
109CONFIG_DEFAULT_IOSCHED="anticipatory" 123CONFIG_DEFAULT_IOSCHED="anticipatory"
110CONFIG_CLASSIC_RCU=y
111# CONFIG_TREE_RCU is not set
112# CONFIG_PREEMPT_RCU is not set
113# CONFIG_TREE_RCU_TRACE is not set
114# CONFIG_PREEMPT_RCU_TRACE is not set
115# CONFIG_FREEZER is not set 124# CONFIG_FREEZER is not set
116 125
117# 126#
@@ -146,6 +155,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
146# CONFIG_CPU_SUBTYPE_SH7770 is not set 155# CONFIG_CPU_SUBTYPE_SH7770 is not set
147# CONFIG_CPU_SUBTYPE_SH7780 is not set 156# CONFIG_CPU_SUBTYPE_SH7780 is not set
148# CONFIG_CPU_SUBTYPE_SH7785 is not set 157# CONFIG_CPU_SUBTYPE_SH7785 is not set
158# CONFIG_CPU_SUBTYPE_SH7786 is not set
149# CONFIG_CPU_SUBTYPE_SHX3 is not set 159# CONFIG_CPU_SUBTYPE_SHX3 is not set
150# CONFIG_CPU_SUBTYPE_SH7343 is not set 160# CONFIG_CPU_SUBTYPE_SH7343 is not set
151# CONFIG_CPU_SUBTYPE_SH7722 is not set 161# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -187,11 +197,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_ZONE_DMA_FLAG=0 197CONFIG_ZONE_DMA_FLAG=0
188CONFIG_NR_QUICK=2 198CONFIG_NR_QUICK=2
189CONFIG_UNEVICTABLE_LRU=y 199CONFIG_UNEVICTABLE_LRU=y
200CONFIG_HAVE_MLOCK=y
201CONFIG_HAVE_MLOCKED_PAGE_BIT=y
190 202
191# 203#
192# Cache configuration 204# Cache configuration
193# 205#
194# CONFIG_SH_DIRECT_MAPPED is not set
195CONFIG_CACHE_WRITEBACK=y 206CONFIG_CACHE_WRITEBACK=y
196# CONFIG_CACHE_WRITETHROUGH is not set 207# CONFIG_CACHE_WRITETHROUGH is not set
197# CONFIG_CACHE_OFF is not set 208# CONFIG_CACHE_OFF is not set
@@ -239,6 +250,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
239# 250#
240CONFIG_SH_DMA_API=y 251CONFIG_SH_DMA_API=y
241CONFIG_SH_DMA=y 252CONFIG_SH_DMA=y
253CONFIG_SH_DMA_IRQ_MULTI=y
242CONFIG_NR_ONCHIP_DMA_CHANNELS=8 254CONFIG_NR_ONCHIP_DMA_CHANNELS=8
243# CONFIG_NR_DMA_CHANNELS_BOOL is not set 255# CONFIG_NR_DMA_CHANNELS_BOOL is not set
244 256
@@ -288,6 +300,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
288# CONFIG_PCIEPORTBUS is not set 300# CONFIG_PCIEPORTBUS is not set
289# CONFIG_ARCH_SUPPORTS_MSI is not set 301# CONFIG_ARCH_SUPPORTS_MSI is not set
290CONFIG_PCI_LEGACY=y 302CONFIG_PCI_LEGACY=y
303# CONFIG_PCI_STUB is not set
304# CONFIG_PCI_IOV is not set
291 305
292# 306#
293# Executable file formats 307# Executable file formats
@@ -307,7 +321,6 @@ CONFIG_NET=y
307# 321#
308# Networking options 322# Networking options
309# 323#
310CONFIG_COMPAT_NET_DEV_OPS=y
311# CONFIG_PACKET is not set 324# CONFIG_PACKET is not set
312# CONFIG_UNIX is not set 325# CONFIG_UNIX is not set
313# CONFIG_NET_KEY is not set 326# CONFIG_NET_KEY is not set
@@ -352,6 +365,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
352# CONFIG_LAPB is not set 365# CONFIG_LAPB is not set
353# CONFIG_ECONET is not set 366# CONFIG_ECONET is not set
354# CONFIG_WAN_ROUTER is not set 367# CONFIG_WAN_ROUTER is not set
368# CONFIG_PHONET is not set
355# CONFIG_NET_SCHED is not set 369# CONFIG_NET_SCHED is not set
356# CONFIG_DCB is not set 370# CONFIG_DCB is not set
357 371
@@ -364,13 +378,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
364# CONFIG_IRDA is not set 378# CONFIG_IRDA is not set
365# CONFIG_BT is not set 379# CONFIG_BT is not set
366# CONFIG_AF_RXRPC is not set 380# CONFIG_AF_RXRPC is not set
367# CONFIG_PHONET is not set
368CONFIG_WIRELESS=y 381CONFIG_WIRELESS=y
369# CONFIG_CFG80211 is not set 382# CONFIG_CFG80211 is not set
370# CONFIG_WIRELESS_OLD_REGULATORY is not set 383# CONFIG_WIRELESS_OLD_REGULATORY is not set
371# CONFIG_WIRELESS_EXT is not set 384# CONFIG_WIRELESS_EXT is not set
372# CONFIG_LIB80211 is not set 385# CONFIG_LIB80211 is not set
373# CONFIG_MAC80211 is not set 386# CONFIG_MAC80211 is not set
387# CONFIG_WIMAX is not set
374# CONFIG_RFKILL is not set 388# CONFIG_RFKILL is not set
375# CONFIG_NET_9P is not set 389# CONFIG_NET_9P is not set
376 390
@@ -464,6 +478,11 @@ CONFIG_MTD_PLATRAM=y
464# CONFIG_MTD_ONENAND is not set 478# CONFIG_MTD_ONENAND is not set
465 479
466# 480#
481# LPDDR flash memory drivers
482#
483# CONFIG_MTD_LPDDR is not set
484
485#
467# UBI - Unsorted block images 486# UBI - Unsorted block images
468# 487#
469# CONFIG_MTD_UBI is not set 488# CONFIG_MTD_UBI is not set
@@ -509,6 +528,7 @@ CONFIG_HAVE_IDE=y
509# CONFIG_IEEE1394 is not set 528# CONFIG_IEEE1394 is not set
510# CONFIG_I2O is not set 529# CONFIG_I2O is not set
511CONFIG_NETDEVICES=y 530CONFIG_NETDEVICES=y
531CONFIG_COMPAT_NET_DEV_OPS=y
512# CONFIG_DUMMY is not set 532# CONFIG_DUMMY is not set
513# CONFIG_BONDING is not set 533# CONFIG_BONDING is not set
514# CONFIG_MACVLAN is not set 534# CONFIG_MACVLAN is not set
@@ -526,8 +546,10 @@ CONFIG_MII=y
526# CONFIG_CASSINI is not set 546# CONFIG_CASSINI is not set
527# CONFIG_NET_VENDOR_3COM is not set 547# CONFIG_NET_VENDOR_3COM is not set
528# CONFIG_SMC91X is not set 548# CONFIG_SMC91X is not set
549# CONFIG_ETHOC is not set
529# CONFIG_SMC911X is not set 550# CONFIG_SMC911X is not set
530# CONFIG_SMSC911X is not set 551# CONFIG_SMSC911X is not set
552# CONFIG_DNET is not set
531# CONFIG_NET_TULIP is not set 553# CONFIG_NET_TULIP is not set
532# CONFIG_HP100 is not set 554# CONFIG_HP100 is not set
533# CONFIG_IBM_NEW_EMAC_ZMII is not set 555# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -571,7 +593,10 @@ CONFIG_8139TOO_PIO=y
571# 593#
572# CONFIG_WLAN_PRE80211 is not set 594# CONFIG_WLAN_PRE80211 is not set
573# CONFIG_WLAN_80211 is not set 595# CONFIG_WLAN_80211 is not set
574# CONFIG_IWLWIFI_LEDS is not set 596
597#
598# Enable WiMAX (Networking options) to see the WiMAX drivers
599#
575# CONFIG_WAN is not set 600# CONFIG_WAN is not set
576# CONFIG_FDDI is not set 601# CONFIG_FDDI is not set
577# CONFIG_HIPPI is not set 602# CONFIG_HIPPI is not set
@@ -711,6 +736,7 @@ CONFIG_SSB_POSSIBLE=y
711# CONFIG_INFINIBAND is not set 736# CONFIG_INFINIBAND is not set
712# CONFIG_RTC_CLASS is not set 737# CONFIG_RTC_CLASS is not set
713# CONFIG_DMADEVICES is not set 738# CONFIG_DMADEVICES is not set
739# CONFIG_AUXDISPLAY is not set
714# CONFIG_UIO is not set 740# CONFIG_UIO is not set
715# CONFIG_STAGING is not set 741# CONFIG_STAGING is not set
716 742
@@ -728,6 +754,7 @@ CONFIG_EXT2_FS=y
728CONFIG_FILE_LOCKING=y 754CONFIG_FILE_LOCKING=y
729# CONFIG_XFS_FS is not set 755# CONFIG_XFS_FS is not set
730# CONFIG_OCFS2_FS is not set 756# CONFIG_OCFS2_FS is not set
757# CONFIG_BTRFS_FS is not set
731# CONFIG_DNOTIFY is not set 758# CONFIG_DNOTIFY is not set
732# CONFIG_INOTIFY is not set 759# CONFIG_INOTIFY is not set
733# CONFIG_QUOTA is not set 760# CONFIG_QUOTA is not set
@@ -771,6 +798,7 @@ CONFIG_MISC_FILESYSTEMS=y
771# CONFIG_EFS_FS is not set 798# CONFIG_EFS_FS is not set
772# CONFIG_JFFS2_FS is not set 799# CONFIG_JFFS2_FS is not set
773CONFIG_CRAMFS=y 800CONFIG_CRAMFS=y
801# CONFIG_SQUASHFS is not set
774# CONFIG_VXFS_FS is not set 802# CONFIG_VXFS_FS is not set
775# CONFIG_MINIX_FS is not set 803# CONFIG_MINIX_FS is not set
776# CONFIG_OMFS_FS is not set 804# CONFIG_OMFS_FS is not set
@@ -820,7 +848,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
820# 848#
821# Tracers 849# Tracers
822# 850#
823# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
824# CONFIG_SAMPLES is not set 851# CONFIG_SAMPLES is not set
825CONFIG_HAVE_ARCH_KGDB=y 852CONFIG_HAVE_ARCH_KGDB=y
826# CONFIG_SH_STANDARD_BIOS is not set 853# CONFIG_SH_STANDARD_BIOS is not set
@@ -849,7 +876,8 @@ CONFIG_CRC32=y
849# CONFIG_CRC7 is not set 876# CONFIG_CRC7 is not set
850# CONFIG_LIBCRC32C is not set 877# CONFIG_LIBCRC32C is not set
851CONFIG_ZLIB_INFLATE=y 878CONFIG_ZLIB_INFLATE=y
852CONFIG_PLIST=y 879CONFIG_DECOMPRESS_GZIP=y
853CONFIG_HAS_IOMEM=y 880CONFIG_HAS_IOMEM=y
854CONFIG_HAS_IOPORT=y 881CONFIG_HAS_IOPORT=y
855CONFIG_HAS_DMA=y 882CONFIG_HAS_DMA=y
883CONFIG_NLATTR=y
diff --git a/arch/sh/configs/systemh_defconfig b/arch/sh/configs/systemh_defconfig
index 72703bf57afa..7ea639bc5936 100644
--- a/arch/sh/configs/systemh_defconfig
+++ b/arch/sh/configs/systemh_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:15:56 2009 4# Thu Apr 2 19:23:31 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,13 +17,14 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_STACKTRACE_SUPPORT=y 21CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 22CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 23CONFIG_HAVE_LATENCYTOP_SUPPORT=y
24# CONFIG_ARCH_HAS_ILOG2_U32 is not set 24# CONFIG_ARCH_HAS_ILOG2_U32 is not set
25# CONFIG_ARCH_HAS_ILOG2_U64 is not set 25# CONFIG_ARCH_HAS_ILOG2_U64 is not set
26CONFIG_ARCH_NO_VIRT_TO_BUS=y 26CONFIG_ARCH_NO_VIRT_TO_BUS=y
27CONFIG_ARCH_HAS_DEFAULT_IDLE=y
27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
28 29
29# 30#
@@ -38,18 +39,32 @@ CONFIG_LOCALVERSION_AUTO=y
38CONFIG_SWAP=y 39CONFIG_SWAP=y
39# CONFIG_SYSVIPC is not set 40# CONFIG_SYSVIPC is not set
40# CONFIG_BSD_PROCESS_ACCT is not set 41# CONFIG_BSD_PROCESS_ACCT is not set
42
43#
44# RCU Subsystem
45#
46CONFIG_CLASSIC_RCU=y
47# CONFIG_TREE_RCU is not set
48# CONFIG_PREEMPT_RCU is not set
49# CONFIG_TREE_RCU_TRACE is not set
50# CONFIG_PREEMPT_RCU_TRACE is not set
41# CONFIG_IKCONFIG is not set 51# CONFIG_IKCONFIG is not set
42CONFIG_LOG_BUF_SHIFT=14 52CONFIG_LOG_BUF_SHIFT=14
43# CONFIG_CGROUPS is not set
44# CONFIG_GROUP_SCHED is not set 53# CONFIG_GROUP_SCHED is not set
54# CONFIG_CGROUPS is not set
45CONFIG_SYSFS_DEPRECATED=y 55CONFIG_SYSFS_DEPRECATED=y
46CONFIG_SYSFS_DEPRECATED_V2=y 56CONFIG_SYSFS_DEPRECATED_V2=y
47# CONFIG_RELAY is not set 57# CONFIG_RELAY is not set
48# CONFIG_NAMESPACES is not set 58# CONFIG_NAMESPACES is not set
49CONFIG_BLK_DEV_INITRD=y 59CONFIG_BLK_DEV_INITRD=y
50CONFIG_INITRAMFS_SOURCE="" 60CONFIG_INITRAMFS_SOURCE=""
61CONFIG_RD_GZIP=y
62# CONFIG_RD_BZIP2 is not set
63# CONFIG_RD_LZMA is not set
64CONFIG_INITRAMFS_COMPRESSION_NONE=y
51# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 65# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
52CONFIG_SYSCTL=y 66CONFIG_SYSCTL=y
67CONFIG_ANON_INODES=y
53CONFIG_EMBEDDED=y 68CONFIG_EMBEDDED=y
54CONFIG_UID16=y 69CONFIG_UID16=y
55# CONFIG_SYSCTL_SYSCALL is not set 70# CONFIG_SYSCTL_SYSCALL is not set
@@ -59,10 +74,8 @@ CONFIG_KALLSYMS=y
59CONFIG_PRINTK=y 74CONFIG_PRINTK=y
60CONFIG_BUG=y 75CONFIG_BUG=y
61CONFIG_ELF_CORE=y 76CONFIG_ELF_CORE=y
62CONFIG_COMPAT_BRK=y
63CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
64CONFIG_FUTEX=y 78CONFIG_FUTEX=y
65CONFIG_ANON_INODES=y
66CONFIG_EPOLL=y 79CONFIG_EPOLL=y
67CONFIG_SIGNALFD=y 80CONFIG_SIGNALFD=y
68CONFIG_TIMERFD=y 81CONFIG_TIMERFD=y
@@ -70,6 +83,7 @@ CONFIG_EVENTFD=y
70CONFIG_SHMEM=y 83CONFIG_SHMEM=y
71CONFIG_AIO=y 84CONFIG_AIO=y
72CONFIG_VM_EVENT_COUNTERS=y 85CONFIG_VM_EVENT_COUNTERS=y
86CONFIG_COMPAT_BRK=y
73CONFIG_SLAB=y 87CONFIG_SLAB=y
74# CONFIG_SLUB is not set 88# CONFIG_SLUB is not set
75# CONFIG_SLOB is not set 89# CONFIG_SLOB is not set
@@ -109,11 +123,6 @@ CONFIG_DEFAULT_AS=y
109# CONFIG_DEFAULT_CFQ is not set 123# CONFIG_DEFAULT_CFQ is not set
110# CONFIG_DEFAULT_NOOP is not set 124# CONFIG_DEFAULT_NOOP is not set
111CONFIG_DEFAULT_IOSCHED="anticipatory" 125CONFIG_DEFAULT_IOSCHED="anticipatory"
112CONFIG_CLASSIC_RCU=y
113# CONFIG_TREE_RCU is not set
114# CONFIG_PREEMPT_RCU is not set
115# CONFIG_TREE_RCU_TRACE is not set
116# CONFIG_PREEMPT_RCU_TRACE is not set
117# CONFIG_FREEZER is not set 126# CONFIG_FREEZER is not set
118 127
119# 128#
@@ -148,6 +157,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
148# CONFIG_CPU_SUBTYPE_SH7770 is not set 157# CONFIG_CPU_SUBTYPE_SH7770 is not set
149# CONFIG_CPU_SUBTYPE_SH7780 is not set 158# CONFIG_CPU_SUBTYPE_SH7780 is not set
150# CONFIG_CPU_SUBTYPE_SH7785 is not set 159# CONFIG_CPU_SUBTYPE_SH7785 is not set
160# CONFIG_CPU_SUBTYPE_SH7786 is not set
151# CONFIG_CPU_SUBTYPE_SHX3 is not set 161# CONFIG_CPU_SUBTYPE_SHX3 is not set
152# CONFIG_CPU_SUBTYPE_SH7343 is not set 162# CONFIG_CPU_SUBTYPE_SH7343 is not set
153# CONFIG_CPU_SUBTYPE_SH7722 is not set 163# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -189,11 +199,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
189CONFIG_ZONE_DMA_FLAG=0 199CONFIG_ZONE_DMA_FLAG=0
190CONFIG_NR_QUICK=2 200CONFIG_NR_QUICK=2
191CONFIG_UNEVICTABLE_LRU=y 201CONFIG_UNEVICTABLE_LRU=y
202CONFIG_HAVE_MLOCK=y
203CONFIG_HAVE_MLOCKED_PAGE_BIT=y
192 204
193# 205#
194# Cache configuration 206# Cache configuration
195# 207#
196# CONFIG_SH_DIRECT_MAPPED is not set
197CONFIG_CACHE_WRITEBACK=y 208CONFIG_CACHE_WRITEBACK=y
198# CONFIG_CACHE_WRITETHROUGH is not set 209# CONFIG_CACHE_WRITETHROUGH is not set
199# CONFIG_CACHE_OFF is not set 210# CONFIG_CACHE_OFF is not set
@@ -318,9 +329,13 @@ CONFIG_BLK_DEV_RAM_SIZE=1024
318# CONFIG_CDROM_PKTCDVD is not set 329# CONFIG_CDROM_PKTCDVD is not set
319# CONFIG_BLK_DEV_HD is not set 330# CONFIG_BLK_DEV_HD is not set
320CONFIG_MISC_DEVICES=y 331CONFIG_MISC_DEVICES=y
321# CONFIG_EEPROM_93CX6 is not set
322# CONFIG_ENCLOSURE_SERVICES is not set 332# CONFIG_ENCLOSURE_SERVICES is not set
323# CONFIG_C2PORT is not set 333# CONFIG_C2PORT is not set
334
335#
336# EEPROM support
337#
338# CONFIG_EEPROM_93CX6 is not set
324CONFIG_HAVE_IDE=y 339CONFIG_HAVE_IDE=y
325# CONFIG_IDE is not set 340# CONFIG_IDE is not set
326 341
@@ -372,6 +387,7 @@ CONFIG_LEGACY_PTYS=y
372CONFIG_LEGACY_PTY_COUNT=256 387CONFIG_LEGACY_PTY_COUNT=256
373# CONFIG_IPMI_HANDLER is not set 388# CONFIG_IPMI_HANDLER is not set
374CONFIG_HW_RANDOM=y 389CONFIG_HW_RANDOM=y
390# CONFIG_HW_RANDOM_TIMERIOMEM is not set
375# CONFIG_R3964 is not set 391# CONFIG_R3964 is not set
376# CONFIG_RAW_DRIVER is not set 392# CONFIG_RAW_DRIVER is not set
377# CONFIG_TCG_TPM is not set 393# CONFIG_TCG_TPM is not set
@@ -452,15 +468,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
452# 468#
453 469
454# 470#
455# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 471# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
456# 472#
457# CONFIG_USB_GADGET is not set 473# CONFIG_USB_GADGET is not set
474
475#
476# OTG and related infrastructure
477#
458# CONFIG_MMC is not set 478# CONFIG_MMC is not set
459# CONFIG_MEMSTICK is not set 479# CONFIG_MEMSTICK is not set
460# CONFIG_NEW_LEDS is not set 480# CONFIG_NEW_LEDS is not set
461# CONFIG_ACCESSIBILITY is not set 481# CONFIG_ACCESSIBILITY is not set
462# CONFIG_RTC_CLASS is not set 482# CONFIG_RTC_CLASS is not set
463# CONFIG_DMADEVICES is not set 483# CONFIG_DMADEVICES is not set
484# CONFIG_AUXDISPLAY is not set
464# CONFIG_UIO is not set 485# CONFIG_UIO is not set
465# CONFIG_STAGING is not set 486# CONFIG_STAGING is not set
466 487
@@ -475,6 +496,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
475# CONFIG_FS_POSIX_ACL is not set 496# CONFIG_FS_POSIX_ACL is not set
476CONFIG_FILE_LOCKING=y 497CONFIG_FILE_LOCKING=y
477# CONFIG_XFS_FS is not set 498# CONFIG_XFS_FS is not set
499# CONFIG_BTRFS_FS is not set
478CONFIG_DNOTIFY=y 500CONFIG_DNOTIFY=y
479CONFIG_INOTIFY=y 501CONFIG_INOTIFY=y
480CONFIG_INOTIFY_USER=y 502CONFIG_INOTIFY_USER=y
@@ -518,6 +540,7 @@ CONFIG_MISC_FILESYSTEMS=y
518# CONFIG_BFS_FS is not set 540# CONFIG_BFS_FS is not set
519# CONFIG_EFS_FS is not set 541# CONFIG_EFS_FS is not set
520CONFIG_CRAMFS=y 542CONFIG_CRAMFS=y
543# CONFIG_SQUASHFS is not set
521# CONFIG_VXFS_FS is not set 544# CONFIG_VXFS_FS is not set
522# CONFIG_MINIX_FS is not set 545# CONFIG_MINIX_FS is not set
523# CONFIG_OMFS_FS is not set 546# CONFIG_OMFS_FS is not set
@@ -558,7 +581,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
558# 581#
559# Tracers 582# Tracers
560# 583#
561# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
562# CONFIG_SAMPLES is not set 584# CONFIG_SAMPLES is not set
563CONFIG_HAVE_ARCH_KGDB=y 585CONFIG_HAVE_ARCH_KGDB=y
564# CONFIG_SH_STANDARD_BIOS is not set 586# CONFIG_SH_STANDARD_BIOS is not set
@@ -587,7 +609,7 @@ CONFIG_CRC32=y
587# CONFIG_CRC7 is not set 609# CONFIG_CRC7 is not set
588# CONFIG_LIBCRC32C is not set 610# CONFIG_LIBCRC32C is not set
589CONFIG_ZLIB_INFLATE=y 611CONFIG_ZLIB_INFLATE=y
590CONFIG_PLIST=y 612CONFIG_DECOMPRESS_GZIP=y
591CONFIG_HAS_IOMEM=y 613CONFIG_HAS_IOMEM=y
592CONFIG_HAS_IOPORT=y 614CONFIG_HAS_IOPORT=y
593CONFIG_HAS_DMA=y 615CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
index 01fc1defb33b..bbeb4c6ebb95 100644
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:17:19 2009 4# Thu Apr 2 19:24:55 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_PCI=y 21CONFIG_SYS_SUPPORTS_PCI=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -42,19 +43,33 @@ CONFIG_POSIX_MQUEUE=y
42# CONFIG_BSD_PROCESS_ACCT is not set 43# CONFIG_BSD_PROCESS_ACCT is not set
43# CONFIG_TASKSTATS is not set 44# CONFIG_TASKSTATS is not set
44# CONFIG_AUDIT is not set 45# CONFIG_AUDIT is not set
46
47#
48# RCU Subsystem
49#
50CONFIG_CLASSIC_RCU=y
51# CONFIG_TREE_RCU is not set
52# CONFIG_PREEMPT_RCU is not set
53# CONFIG_TREE_RCU_TRACE is not set
54# CONFIG_PREEMPT_RCU_TRACE is not set
45CONFIG_IKCONFIG=y 55CONFIG_IKCONFIG=y
46CONFIG_IKCONFIG_PROC=y 56CONFIG_IKCONFIG_PROC=y
47CONFIG_LOG_BUF_SHIFT=16 57CONFIG_LOG_BUF_SHIFT=16
48# CONFIG_CGROUPS is not set
49# CONFIG_GROUP_SCHED is not set 58# CONFIG_GROUP_SCHED is not set
59# CONFIG_CGROUPS is not set
50CONFIG_SYSFS_DEPRECATED=y 60CONFIG_SYSFS_DEPRECATED=y
51CONFIG_SYSFS_DEPRECATED_V2=y 61CONFIG_SYSFS_DEPRECATED_V2=y
52# CONFIG_RELAY is not set 62# CONFIG_RELAY is not set
53# CONFIG_NAMESPACES is not set 63# CONFIG_NAMESPACES is not set
54CONFIG_BLK_DEV_INITRD=y 64CONFIG_BLK_DEV_INITRD=y
55CONFIG_INITRAMFS_SOURCE="" 65CONFIG_INITRAMFS_SOURCE=""
66CONFIG_RD_GZIP=y
67# CONFIG_RD_BZIP2 is not set
68# CONFIG_RD_LZMA is not set
69CONFIG_INITRAMFS_COMPRESSION_NONE=y
56# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 70# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
57CONFIG_SYSCTL=y 71CONFIG_SYSCTL=y
72CONFIG_ANON_INODES=y
58CONFIG_EMBEDDED=y 73CONFIG_EMBEDDED=y
59CONFIG_UID16=y 74CONFIG_UID16=y
60# CONFIG_SYSCTL_SYSCALL is not set 75# CONFIG_SYSCTL_SYSCALL is not set
@@ -65,10 +80,8 @@ CONFIG_HOTPLUG=y
65CONFIG_PRINTK=y 80CONFIG_PRINTK=y
66CONFIG_BUG=y 81CONFIG_BUG=y
67CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
68CONFIG_COMPAT_BRK=y
69CONFIG_BASE_FULL=y 83CONFIG_BASE_FULL=y
70CONFIG_FUTEX=y 84CONFIG_FUTEX=y
71CONFIG_ANON_INODES=y
72CONFIG_EPOLL=y 85CONFIG_EPOLL=y
73CONFIG_SIGNALFD=y 86CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y 87CONFIG_TIMERFD=y
@@ -77,6 +90,7 @@ CONFIG_SHMEM=y
77CONFIG_AIO=y 90CONFIG_AIO=y
78CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
79CONFIG_PCI_QUIRKS=y 92CONFIG_PCI_QUIRKS=y
93CONFIG_COMPAT_BRK=y
80CONFIG_SLAB=y 94CONFIG_SLAB=y
81# CONFIG_SLUB is not set 95# CONFIG_SLUB is not set
82# CONFIG_SLOB is not set 96# CONFIG_SLOB is not set
@@ -116,11 +130,6 @@ CONFIG_DEFAULT_AS=y
116# CONFIG_DEFAULT_CFQ is not set 130# CONFIG_DEFAULT_CFQ is not set
117# CONFIG_DEFAULT_NOOP is not set 131# CONFIG_DEFAULT_NOOP is not set
118CONFIG_DEFAULT_IOSCHED="anticipatory" 132CONFIG_DEFAULT_IOSCHED="anticipatory"
119CONFIG_CLASSIC_RCU=y
120# CONFIG_TREE_RCU is not set
121# CONFIG_PREEMPT_RCU is not set
122# CONFIG_TREE_RCU_TRACE is not set
123# CONFIG_PREEMPT_RCU_TRACE is not set
124# CONFIG_FREEZER is not set 133# CONFIG_FREEZER is not set
125 134
126# 135#
@@ -155,6 +164,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
155# CONFIG_CPU_SUBTYPE_SH7770 is not set 164# CONFIG_CPU_SUBTYPE_SH7770 is not set
156# CONFIG_CPU_SUBTYPE_SH7780 is not set 165# CONFIG_CPU_SUBTYPE_SH7780 is not set
157# CONFIG_CPU_SUBTYPE_SH7785 is not set 166# CONFIG_CPU_SUBTYPE_SH7785 is not set
167# CONFIG_CPU_SUBTYPE_SH7786 is not set
158# CONFIG_CPU_SUBTYPE_SHX3 is not set 168# CONFIG_CPU_SUBTYPE_SHX3 is not set
159# CONFIG_CPU_SUBTYPE_SH7343 is not set 169# CONFIG_CPU_SUBTYPE_SH7343 is not set
160# CONFIG_CPU_SUBTYPE_SH7722 is not set 170# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -196,11 +206,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
196CONFIG_ZONE_DMA_FLAG=0 206CONFIG_ZONE_DMA_FLAG=0
197CONFIG_NR_QUICK=2 207CONFIG_NR_QUICK=2
198CONFIG_UNEVICTABLE_LRU=y 208CONFIG_UNEVICTABLE_LRU=y
209CONFIG_HAVE_MLOCK=y
210CONFIG_HAVE_MLOCKED_PAGE_BIT=y
199 211
200# 212#
201# Cache configuration 213# Cache configuration
202# 214#
203# CONFIG_SH_DIRECT_MAPPED is not set
204CONFIG_CACHE_WRITEBACK=y 215CONFIG_CACHE_WRITEBACK=y
205# CONFIG_CACHE_WRITETHROUGH is not set 216# CONFIG_CACHE_WRITETHROUGH is not set
206# CONFIG_CACHE_OFF is not set 217# CONFIG_CACHE_OFF is not set
@@ -248,6 +259,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
248# 259#
249CONFIG_SH_DMA_API=y 260CONFIG_SH_DMA_API=y
250CONFIG_SH_DMA=y 261CONFIG_SH_DMA=y
262CONFIG_SH_DMA_IRQ_MULTI=y
251CONFIG_NR_ONCHIP_DMA_CHANNELS=8 263CONFIG_NR_ONCHIP_DMA_CHANNELS=8
252# CONFIG_NR_DMA_CHANNELS_BOOL is not set 264# CONFIG_NR_DMA_CHANNELS_BOOL is not set
253 265
@@ -299,6 +311,8 @@ CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
299# CONFIG_ARCH_SUPPORTS_MSI is not set 311# CONFIG_ARCH_SUPPORTS_MSI is not set
300CONFIG_PCI_LEGACY=y 312CONFIG_PCI_LEGACY=y
301# CONFIG_PCI_DEBUG is not set 313# CONFIG_PCI_DEBUG is not set
314# CONFIG_PCI_STUB is not set
315# CONFIG_PCI_IOV is not set
302# CONFIG_PCCARD is not set 316# CONFIG_PCCARD is not set
303CONFIG_HOTPLUG_PCI=y 317CONFIG_HOTPLUG_PCI=y
304# CONFIG_HOTPLUG_PCI_FAKE is not set 318# CONFIG_HOTPLUG_PCI_FAKE is not set
@@ -323,7 +337,6 @@ CONFIG_NET=y
323# 337#
324# Networking options 338# Networking options
325# 339#
326CONFIG_COMPAT_NET_DEV_OPS=y
327CONFIG_PACKET=y 340CONFIG_PACKET=y
328CONFIG_PACKET_MMAP=y 341CONFIG_PACKET_MMAP=y
329CONFIG_UNIX=y 342CONFIG_UNIX=y
@@ -406,6 +419,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
406CONFIG_NETFILTER_XTABLES=m 419CONFIG_NETFILTER_XTABLES=m
407CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 420CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
408# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 421# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
422CONFIG_NETFILTER_XT_TARGET_HL=m
409CONFIG_NETFILTER_XT_TARGET_MARK=m 423CONFIG_NETFILTER_XT_TARGET_MARK=m
410# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 424# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
411CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 425CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -418,6 +432,7 @@ CONFIG_NETFILTER_XT_MATCH_DCCP=m
418# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 432# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
419CONFIG_NETFILTER_XT_MATCH_ESP=m 433CONFIG_NETFILTER_XT_MATCH_ESP=m
420# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 434# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
435CONFIG_NETFILTER_XT_MATCH_HL=m
421# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set 436# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
422CONFIG_NETFILTER_XT_MATCH_LENGTH=m 437CONFIG_NETFILTER_XT_MATCH_LENGTH=m
423CONFIG_NETFILTER_XT_MATCH_LIMIT=m 438CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -475,11 +490,11 @@ CONFIG_IP6_NF_MATCH_HL=m
475CONFIG_IP6_NF_MATCH_IPV6HEADER=m 490CONFIG_IP6_NF_MATCH_IPV6HEADER=m
476# CONFIG_IP6_NF_MATCH_MH is not set 491# CONFIG_IP6_NF_MATCH_MH is not set
477CONFIG_IP6_NF_MATCH_RT=m 492CONFIG_IP6_NF_MATCH_RT=m
493CONFIG_IP6_NF_TARGET_HL=m
478CONFIG_IP6_NF_TARGET_LOG=m 494CONFIG_IP6_NF_TARGET_LOG=m
479CONFIG_IP6_NF_FILTER=m 495CONFIG_IP6_NF_FILTER=m
480CONFIG_IP6_NF_TARGET_REJECT=m 496CONFIG_IP6_NF_TARGET_REJECT=m
481CONFIG_IP6_NF_MANGLE=m 497CONFIG_IP6_NF_MANGLE=m
482CONFIG_IP6_NF_TARGET_HL=m
483CONFIG_IP6_NF_RAW=m 498CONFIG_IP6_NF_RAW=m
484# CONFIG_BRIDGE_NF_EBTABLES is not set 499# CONFIG_BRIDGE_NF_EBTABLES is not set
485# CONFIG_IP_DCCP is not set 500# CONFIG_IP_DCCP is not set
@@ -500,6 +515,7 @@ CONFIG_LLC=y
500# CONFIG_LAPB is not set 515# CONFIG_LAPB is not set
501# CONFIG_ECONET is not set 516# CONFIG_ECONET is not set
502# CONFIG_WAN_ROUTER is not set 517# CONFIG_WAN_ROUTER is not set
518# CONFIG_PHONET is not set
503CONFIG_NET_SCHED=y 519CONFIG_NET_SCHED=y
504 520
505# 521#
@@ -565,7 +581,6 @@ CONFIG_NET_SCH_FIFO=y
565# CONFIG_IRDA is not set 581# CONFIG_IRDA is not set
566# CONFIG_BT is not set 582# CONFIG_BT is not set
567# CONFIG_AF_RXRPC is not set 583# CONFIG_AF_RXRPC is not set
568# CONFIG_PHONET is not set
569CONFIG_FIB_RULES=y 584CONFIG_FIB_RULES=y
570CONFIG_WIRELESS=y 585CONFIG_WIRELESS=y
571# CONFIG_CFG80211 is not set 586# CONFIG_CFG80211 is not set
@@ -574,6 +589,7 @@ CONFIG_WIRELESS_EXT=y
574CONFIG_WIRELESS_EXT_SYSFS=y 589CONFIG_WIRELESS_EXT_SYSFS=y
575# CONFIG_LIB80211 is not set 590# CONFIG_LIB80211 is not set
576# CONFIG_MAC80211 is not set 591# CONFIG_MAC80211 is not set
592# CONFIG_WIMAX is not set
577# CONFIG_RFKILL is not set 593# CONFIG_RFKILL is not set
578# CONFIG_NET_9P is not set 594# CONFIG_NET_9P is not set
579 595
@@ -599,6 +615,7 @@ CONFIG_MTD_DEBUG=y
599CONFIG_MTD_DEBUG_VERBOSE=0 615CONFIG_MTD_DEBUG_VERBOSE=0
600# CONFIG_MTD_CONCAT is not set 616# CONFIG_MTD_CONCAT is not set
601# CONFIG_MTD_PARTITIONS is not set 617# CONFIG_MTD_PARTITIONS is not set
618# CONFIG_MTD_TESTS is not set
602 619
603# 620#
604# User Modules And Translation Layers 621# User Modules And Translation Layers
@@ -675,6 +692,11 @@ CONFIG_MTD_NAND_IDS=m
675# CONFIG_MTD_ONENAND is not set 692# CONFIG_MTD_ONENAND is not set
676 693
677# 694#
695# LPDDR flash memory drivers
696#
697# CONFIG_MTD_LPDDR is not set
698
699#
678# UBI - Unsorted block images 700# UBI - Unsorted block images
679# 701#
680# CONFIG_MTD_UBI is not set 702# CONFIG_MTD_UBI is not set
@@ -698,12 +720,16 @@ CONFIG_ATA_OVER_ETH=m
698# CONFIG_BLK_DEV_HD is not set 720# CONFIG_BLK_DEV_HD is not set
699CONFIG_MISC_DEVICES=y 721CONFIG_MISC_DEVICES=y
700# CONFIG_PHANTOM is not set 722# CONFIG_PHANTOM is not set
701# CONFIG_EEPROM_93CX6 is not set
702# CONFIG_SGI_IOC4 is not set 723# CONFIG_SGI_IOC4 is not set
703# CONFIG_TIFM_CORE is not set 724# CONFIG_TIFM_CORE is not set
704# CONFIG_ENCLOSURE_SERVICES is not set 725# CONFIG_ENCLOSURE_SERVICES is not set
705# CONFIG_HP_ILO is not set 726# CONFIG_HP_ILO is not set
706# CONFIG_C2PORT is not set 727# CONFIG_C2PORT is not set
728
729#
730# EEPROM support
731#
732# CONFIG_EEPROM_93CX6 is not set
707CONFIG_HAVE_IDE=y 733CONFIG_HAVE_IDE=y
708# CONFIG_IDE is not set 734# CONFIG_IDE is not set
709 735
@@ -760,6 +786,7 @@ CONFIG_SCSI_LOWLEVEL=y
760# CONFIG_MEGARAID_NEWGEN is not set 786# CONFIG_MEGARAID_NEWGEN is not set
761# CONFIG_MEGARAID_LEGACY is not set 787# CONFIG_MEGARAID_LEGACY is not set
762# CONFIG_MEGARAID_SAS is not set 788# CONFIG_MEGARAID_SAS is not set
789# CONFIG_SCSI_MPT2SAS is not set
763# CONFIG_SCSI_HPTIOP is not set 790# CONFIG_SCSI_HPTIOP is not set
764# CONFIG_LIBFC is not set 791# CONFIG_LIBFC is not set
765# CONFIG_FCOE is not set 792# CONFIG_FCOE is not set
@@ -781,6 +808,7 @@ CONFIG_SCSI_LOWLEVEL=y
781# CONFIG_SCSI_DEBUG is not set 808# CONFIG_SCSI_DEBUG is not set
782# CONFIG_SCSI_SRP is not set 809# CONFIG_SCSI_SRP is not set
783# CONFIG_SCSI_DH is not set 810# CONFIG_SCSI_DH is not set
811# CONFIG_SCSI_OSD_INITIATOR is not set
784# CONFIG_ATA is not set 812# CONFIG_ATA is not set
785# CONFIG_MD is not set 813# CONFIG_MD is not set
786# CONFIG_FUSION is not set 814# CONFIG_FUSION is not set
@@ -796,6 +824,7 @@ CONFIG_SCSI_LOWLEVEL=y
796# CONFIG_IEEE1394 is not set 824# CONFIG_IEEE1394 is not set
797# CONFIG_I2O is not set 825# CONFIG_I2O is not set
798CONFIG_NETDEVICES=y 826CONFIG_NETDEVICES=y
827CONFIG_COMPAT_NET_DEV_OPS=y
799# CONFIG_IFB is not set 828# CONFIG_IFB is not set
800# CONFIG_DUMMY is not set 829# CONFIG_DUMMY is not set
801# CONFIG_BONDING is not set 830# CONFIG_BONDING is not set
@@ -832,8 +861,10 @@ CONFIG_MII=y
832# CONFIG_CASSINI is not set 861# CONFIG_CASSINI is not set
833# CONFIG_NET_VENDOR_3COM is not set 862# CONFIG_NET_VENDOR_3COM is not set
834# CONFIG_SMC91X is not set 863# CONFIG_SMC91X is not set
864# CONFIG_ETHOC is not set
835# CONFIG_SMC911X is not set 865# CONFIG_SMC911X is not set
836# CONFIG_SMSC911X is not set 866# CONFIG_SMSC911X is not set
867# CONFIG_DNET is not set
837# CONFIG_NET_TULIP is not set 868# CONFIG_NET_TULIP is not set
838# CONFIG_HP100 is not set 869# CONFIG_HP100 is not set
839# CONFIG_IBM_NEW_EMAC_ZMII is not set 870# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -888,6 +919,7 @@ CONFIG_NETDEV_1000=y
888# CONFIG_QLA3XXX is not set 919# CONFIG_QLA3XXX is not set
889# CONFIG_ATL1 is not set 920# CONFIG_ATL1 is not set
890# CONFIG_ATL1E is not set 921# CONFIG_ATL1E is not set
922# CONFIG_ATL1C is not set
891# CONFIG_JME is not set 923# CONFIG_JME is not set
892CONFIG_NETDEV_10000=y 924CONFIG_NETDEV_10000=y
893# CONFIG_CHELSIO_T1 is not set 925# CONFIG_CHELSIO_T1 is not set
@@ -906,6 +938,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
906# CONFIG_BNX2X is not set 938# CONFIG_BNX2X is not set
907# CONFIG_QLGE is not set 939# CONFIG_QLGE is not set
908# CONFIG_SFC is not set 940# CONFIG_SFC is not set
941# CONFIG_BE2NET is not set
909# CONFIG_TR is not set 942# CONFIG_TR is not set
910 943
911# 944#
@@ -913,7 +946,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
913# 946#
914# CONFIG_WLAN_PRE80211 is not set 947# CONFIG_WLAN_PRE80211 is not set
915# CONFIG_WLAN_80211 is not set 948# CONFIG_WLAN_80211 is not set
916# CONFIG_IWLWIFI_LEDS is not set 949
950#
951# Enable WiMAX (Networking options) to see the WiMAX drivers
952#
917 953
918# 954#
919# USB Network Adapters 955# USB Network Adapters
@@ -1025,6 +1061,7 @@ CONFIG_LEGACY_PTYS=y
1025CONFIG_LEGACY_PTY_COUNT=256 1061CONFIG_LEGACY_PTY_COUNT=256
1026# CONFIG_IPMI_HANDLER is not set 1062# CONFIG_IPMI_HANDLER is not set
1027CONFIG_HW_RANDOM=y 1063CONFIG_HW_RANDOM=y
1064# CONFIG_HW_RANDOM_TIMERIOMEM is not set
1028# CONFIG_R3964 is not set 1065# CONFIG_R3964 is not set
1029# CONFIG_APPLICOM is not set 1066# CONFIG_APPLICOM is not set
1030# CONFIG_RAW_DRIVER is not set 1067# CONFIG_RAW_DRIVER is not set
@@ -1174,6 +1211,7 @@ CONFIG_USB_MON=y
1174CONFIG_USB_EHCI_HCD=y 1211CONFIG_USB_EHCI_HCD=y
1175CONFIG_USB_EHCI_ROOT_HUB_TT=y 1212CONFIG_USB_EHCI_ROOT_HUB_TT=y
1176CONFIG_USB_EHCI_TT_NEWSCHED=y 1213CONFIG_USB_EHCI_TT_NEWSCHED=y
1214# CONFIG_USB_OXU210HP_HCD is not set
1177# CONFIG_USB_ISP116X_HCD is not set 1215# CONFIG_USB_ISP116X_HCD is not set
1178# CONFIG_USB_ISP1760_HCD is not set 1216# CONFIG_USB_ISP1760_HCD is not set
1179CONFIG_USB_OHCI_HCD=y 1217CONFIG_USB_OHCI_HCD=y
@@ -1195,18 +1233,17 @@ CONFIG_USB_PRINTER=m
1195# CONFIG_USB_TMC is not set 1233# CONFIG_USB_TMC is not set
1196 1234
1197# 1235#
1198# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 1236# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
1199# 1237#
1200 1238
1201# 1239#
1202# see USB_STORAGE Help for more information 1240# also be needed; see USB_STORAGE Help for more info
1203# 1241#
1204CONFIG_USB_STORAGE=y 1242CONFIG_USB_STORAGE=y
1205# CONFIG_USB_STORAGE_DEBUG is not set 1243# CONFIG_USB_STORAGE_DEBUG is not set
1206# CONFIG_USB_STORAGE_DATAFAB is not set 1244# CONFIG_USB_STORAGE_DATAFAB is not set
1207# CONFIG_USB_STORAGE_FREECOM is not set 1245# CONFIG_USB_STORAGE_FREECOM is not set
1208# CONFIG_USB_STORAGE_ISD200 is not set 1246# CONFIG_USB_STORAGE_ISD200 is not set
1209# CONFIG_USB_STORAGE_DPCM is not set
1210# CONFIG_USB_STORAGE_USBAT is not set 1247# CONFIG_USB_STORAGE_USBAT is not set
1211# CONFIG_USB_STORAGE_SDDR09 is not set 1248# CONFIG_USB_STORAGE_SDDR09 is not set
1212# CONFIG_USB_STORAGE_SDDR55 is not set 1249# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1235,7 +1272,7 @@ CONFIG_USB_SERIAL_ARK3116=m
1235# CONFIG_USB_SERIAL_CH341 is not set 1272# CONFIG_USB_SERIAL_CH341 is not set
1236# CONFIG_USB_SERIAL_WHITEHEAT is not set 1273# CONFIG_USB_SERIAL_WHITEHEAT is not set
1237# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 1274# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
1238# CONFIG_USB_SERIAL_CP2101 is not set 1275# CONFIG_USB_SERIAL_CP210X is not set
1239# CONFIG_USB_SERIAL_CYPRESS_M8 is not set 1276# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
1240# CONFIG_USB_SERIAL_EMPEG is not set 1277# CONFIG_USB_SERIAL_EMPEG is not set
1241# CONFIG_USB_SERIAL_FTDI_SIO is not set 1278# CONFIG_USB_SERIAL_FTDI_SIO is not set
@@ -1259,15 +1296,19 @@ CONFIG_USB_SERIAL_ARK3116=m
1259# CONFIG_USB_SERIAL_NAVMAN is not set 1296# CONFIG_USB_SERIAL_NAVMAN is not set
1260CONFIG_USB_SERIAL_PL2303=m 1297CONFIG_USB_SERIAL_PL2303=m
1261# CONFIG_USB_SERIAL_OTI6858 is not set 1298# CONFIG_USB_SERIAL_OTI6858 is not set
1299# CONFIG_USB_SERIAL_QUALCOMM is not set
1262# CONFIG_USB_SERIAL_SPCP8X5 is not set 1300# CONFIG_USB_SERIAL_SPCP8X5 is not set
1263# CONFIG_USB_SERIAL_HP4X is not set 1301# CONFIG_USB_SERIAL_HP4X is not set
1264# CONFIG_USB_SERIAL_SAFE is not set 1302# CONFIG_USB_SERIAL_SAFE is not set
1303# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
1265# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 1304# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1305# CONFIG_USB_SERIAL_SYMBOL is not set
1266# CONFIG_USB_SERIAL_TI is not set 1306# CONFIG_USB_SERIAL_TI is not set
1267# CONFIG_USB_SERIAL_CYBERJACK is not set 1307# CONFIG_USB_SERIAL_CYBERJACK is not set
1268# CONFIG_USB_SERIAL_XIRCOM is not set 1308# CONFIG_USB_SERIAL_XIRCOM is not set
1269# CONFIG_USB_SERIAL_OPTION is not set 1309# CONFIG_USB_SERIAL_OPTION is not set
1270# CONFIG_USB_SERIAL_OMNINET is not set 1310# CONFIG_USB_SERIAL_OMNINET is not set
1311# CONFIG_USB_SERIAL_OPTICON is not set
1271# CONFIG_USB_SERIAL_DEBUG is not set 1312# CONFIG_USB_SERIAL_DEBUG is not set
1272 1313
1273# 1314#
@@ -1284,7 +1325,6 @@ CONFIG_USB_SERIAL_PL2303=m
1284# CONFIG_USB_LED is not set 1325# CONFIG_USB_LED is not set
1285# CONFIG_USB_CYPRESS_CY7C63 is not set 1326# CONFIG_USB_CYPRESS_CY7C63 is not set
1286# CONFIG_USB_CYTHERM is not set 1327# CONFIG_USB_CYTHERM is not set
1287# CONFIG_USB_PHIDGET is not set
1288# CONFIG_USB_IDMOUSE is not set 1328# CONFIG_USB_IDMOUSE is not set
1289# CONFIG_USB_FTDI_ELAN is not set 1329# CONFIG_USB_FTDI_ELAN is not set
1290# CONFIG_USB_APPLEDISPLAY is not set 1330# CONFIG_USB_APPLEDISPLAY is not set
@@ -1296,6 +1336,11 @@ CONFIG_USB_SERIAL_PL2303=m
1296# CONFIG_USB_ISIGHTFW is not set 1336# CONFIG_USB_ISIGHTFW is not set
1297# CONFIG_USB_VST is not set 1337# CONFIG_USB_VST is not set
1298# CONFIG_USB_GADGET is not set 1338# CONFIG_USB_GADGET is not set
1339
1340#
1341# OTG and related infrastructure
1342#
1343# CONFIG_NOP_USB_XCEIV is not set
1299# CONFIG_UWB is not set 1344# CONFIG_UWB is not set
1300# CONFIG_MMC is not set 1345# CONFIG_MMC is not set
1301# CONFIG_MEMSTICK is not set 1346# CONFIG_MEMSTICK is not set
@@ -1337,6 +1382,7 @@ CONFIG_RTC_INTF_DEV=y
1337# 1382#
1338CONFIG_RTC_DRV_SH=m 1383CONFIG_RTC_DRV_SH=m
1339# CONFIG_DMADEVICES is not set 1384# CONFIG_DMADEVICES is not set
1385# CONFIG_AUXDISPLAY is not set
1340# CONFIG_UIO is not set 1386# CONFIG_UIO is not set
1341# CONFIG_STAGING is not set 1387# CONFIG_STAGING is not set
1342 1388
@@ -1363,6 +1409,7 @@ CONFIG_XFS_FS=m
1363# CONFIG_XFS_RT is not set 1409# CONFIG_XFS_RT is not set
1364# CONFIG_XFS_DEBUG is not set 1410# CONFIG_XFS_DEBUG is not set
1365# CONFIG_OCFS2_FS is not set 1411# CONFIG_OCFS2_FS is not set
1412# CONFIG_BTRFS_FS is not set
1366CONFIG_DNOTIFY=y 1413CONFIG_DNOTIFY=y
1367CONFIG_INOTIFY=y 1414CONFIG_INOTIFY=y
1368CONFIG_INOTIFY_USER=y 1415CONFIG_INOTIFY_USER=y
@@ -1413,6 +1460,7 @@ CONFIG_MISC_FILESYSTEMS=y
1413# CONFIG_EFS_FS is not set 1460# CONFIG_EFS_FS is not set
1414# CONFIG_JFFS2_FS is not set 1461# CONFIG_JFFS2_FS is not set
1415# CONFIG_CRAMFS is not set 1462# CONFIG_CRAMFS is not set
1463# CONFIG_SQUASHFS is not set
1416# CONFIG_VXFS_FS is not set 1464# CONFIG_VXFS_FS is not set
1417# CONFIG_MINIX_FS is not set 1465# CONFIG_MINIX_FS is not set
1418# CONFIG_OMFS_FS is not set 1466# CONFIG_OMFS_FS is not set
@@ -1436,7 +1484,6 @@ CONFIG_LOCKD_V4=y
1436CONFIG_EXPORTFS=y 1484CONFIG_EXPORTFS=y
1437CONFIG_NFS_COMMON=y 1485CONFIG_NFS_COMMON=y
1438CONFIG_SUNRPC=y 1486CONFIG_SUNRPC=y
1439# CONFIG_SUNRPC_REGISTER_V4 is not set
1440# CONFIG_RPCSEC_GSS_KRB5 is not set 1487# CONFIG_RPCSEC_GSS_KRB5 is not set
1441# CONFIG_RPCSEC_GSS_SPKM3 is not set 1488# CONFIG_RPCSEC_GSS_SPKM3 is not set
1442CONFIG_SMB_FS=m 1489CONFIG_SMB_FS=m
@@ -1559,6 +1606,7 @@ CONFIG_SCHED_DEBUG=y
1559# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1606# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1560# CONFIG_FAULT_INJECTION is not set 1607# CONFIG_FAULT_INJECTION is not set
1561# CONFIG_LATENCYTOP is not set 1608# CONFIG_LATENCYTOP is not set
1609# CONFIG_PAGE_POISONING is not set
1562CONFIG_HAVE_FUNCTION_TRACER=y 1610CONFIG_HAVE_FUNCTION_TRACER=y
1563CONFIG_HAVE_DYNAMIC_FTRACE=y 1611CONFIG_HAVE_DYNAMIC_FTRACE=y
1564CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1612CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -1573,7 +1621,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1573# CONFIG_BOOT_TRACER is not set 1621# CONFIG_BOOT_TRACER is not set
1574# CONFIG_TRACE_BRANCH_PROFILING is not set 1622# CONFIG_TRACE_BRANCH_PROFILING is not set
1575# CONFIG_STACK_TRACER is not set 1623# CONFIG_STACK_TRACER is not set
1576# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1577# CONFIG_SAMPLES is not set 1624# CONFIG_SAMPLES is not set
1578CONFIG_HAVE_ARCH_KGDB=y 1625CONFIG_HAVE_ARCH_KGDB=y
1579# CONFIG_KGDB is not set 1626# CONFIG_KGDB is not set
@@ -1610,10 +1657,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1610CONFIG_CRYPTO_HASH=y 1657CONFIG_CRYPTO_HASH=y
1611CONFIG_CRYPTO_HASH2=y 1658CONFIG_CRYPTO_HASH2=y
1612CONFIG_CRYPTO_RNG2=y 1659CONFIG_CRYPTO_RNG2=y
1660CONFIG_CRYPTO_PCOMP=y
1613CONFIG_CRYPTO_MANAGER=y 1661CONFIG_CRYPTO_MANAGER=y
1614CONFIG_CRYPTO_MANAGER2=y 1662CONFIG_CRYPTO_MANAGER2=y
1615# CONFIG_CRYPTO_GF128MUL is not set 1663# CONFIG_CRYPTO_GF128MUL is not set
1616CONFIG_CRYPTO_NULL=m 1664CONFIG_CRYPTO_NULL=m
1665CONFIG_CRYPTO_WORKQUEUE=y
1617# CONFIG_CRYPTO_CRYPTD is not set 1666# CONFIG_CRYPTO_CRYPTD is not set
1618CONFIG_CRYPTO_AUTHENC=y 1667CONFIG_CRYPTO_AUTHENC=y
1619# CONFIG_CRYPTO_TEST is not set 1668# CONFIG_CRYPTO_TEST is not set
@@ -1683,6 +1732,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1683# Compression 1732# Compression
1684# 1733#
1685CONFIG_CRYPTO_DEFLATE=y 1734CONFIG_CRYPTO_DEFLATE=y
1735# CONFIG_CRYPTO_ZLIB is not set
1686# CONFIG_CRYPTO_LZO is not set 1736# CONFIG_CRYPTO_LZO is not set
1687 1737
1688# 1738#
@@ -1706,11 +1756,12 @@ CONFIG_CRC32=y
1706CONFIG_LIBCRC32C=m 1756CONFIG_LIBCRC32C=m
1707CONFIG_ZLIB_INFLATE=y 1757CONFIG_ZLIB_INFLATE=y
1708CONFIG_ZLIB_DEFLATE=y 1758CONFIG_ZLIB_DEFLATE=y
1759CONFIG_DECOMPRESS_GZIP=y
1709CONFIG_TEXTSEARCH=y 1760CONFIG_TEXTSEARCH=y
1710CONFIG_TEXTSEARCH_KMP=m 1761CONFIG_TEXTSEARCH_KMP=m
1711CONFIG_TEXTSEARCH_BM=m 1762CONFIG_TEXTSEARCH_BM=m
1712CONFIG_TEXTSEARCH_FSM=m 1763CONFIG_TEXTSEARCH_FSM=m
1713CONFIG_PLIST=y
1714CONFIG_HAS_IOMEM=y 1764CONFIG_HAS_IOMEM=y
1715CONFIG_HAS_IOPORT=y 1765CONFIG_HAS_IOPORT=y
1716CONFIG_HAS_DMA=y 1766CONFIG_HAS_DMA=y
1767CONFIG_NLATTR=y
diff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig
index 27f968a959f8..34f5192a3241 100644
--- a/arch/sh/configs/ul2_defconfig
+++ b/arch/sh/configs/ul2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28 3# Linux kernel version: 2.6.29
4# Fri Jan 9 18:22:53 2009 4# Thu Apr 2 19:30:27 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -16,15 +16,17 @@ CONFIG_GENERIC_IRQ_PROBE=y
16# CONFIG_GENERIC_GPIO is not set 16# CONFIG_GENERIC_GPIO is not set
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19CONFIG_ARCH_SUSPEND_POSSIBLE=y
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_NUMA=y 21CONFIG_SYS_SUPPORTS_NUMA=y
22CONFIG_SYS_SUPPORTS_CMT=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 26# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 27# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 28CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 30CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 31
30# 32#
@@ -44,19 +46,33 @@ CONFIG_BSD_PROCESS_ACCT=y
44# CONFIG_BSD_PROCESS_ACCT_V3 is not set 46# CONFIG_BSD_PROCESS_ACCT_V3 is not set
45# CONFIG_TASKSTATS is not set 47# CONFIG_TASKSTATS is not set
46# CONFIG_AUDIT is not set 48# CONFIG_AUDIT is not set
49
50#
51# RCU Subsystem
52#
53CONFIG_CLASSIC_RCU=y
54# CONFIG_TREE_RCU is not set
55# CONFIG_PREEMPT_RCU is not set
56# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set
47CONFIG_IKCONFIG=y 58CONFIG_IKCONFIG=y
48CONFIG_IKCONFIG_PROC=y 59CONFIG_IKCONFIG_PROC=y
49CONFIG_LOG_BUF_SHIFT=14 60CONFIG_LOG_BUF_SHIFT=14
50# CONFIG_CGROUPS is not set
51# CONFIG_GROUP_SCHED is not set 61# CONFIG_GROUP_SCHED is not set
62# CONFIG_CGROUPS is not set
52CONFIG_SYSFS_DEPRECATED=y 63CONFIG_SYSFS_DEPRECATED=y
53CONFIG_SYSFS_DEPRECATED_V2=y 64CONFIG_SYSFS_DEPRECATED_V2=y
54# CONFIG_RELAY is not set 65# CONFIG_RELAY is not set
55# CONFIG_NAMESPACES is not set 66# CONFIG_NAMESPACES is not set
56CONFIG_BLK_DEV_INITRD=y 67CONFIG_BLK_DEV_INITRD=y
57CONFIG_INITRAMFS_SOURCE="" 68CONFIG_INITRAMFS_SOURCE=""
69CONFIG_RD_GZIP=y
70# CONFIG_RD_BZIP2 is not set
71# CONFIG_RD_LZMA is not set
72CONFIG_INITRAMFS_COMPRESSION_NONE=y
58CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
59CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
75CONFIG_ANON_INODES=y
60CONFIG_EMBEDDED=y 76CONFIG_EMBEDDED=y
61CONFIG_UID16=y 77CONFIG_UID16=y
62CONFIG_SYSCTL_SYSCALL=y 78CONFIG_SYSCTL_SYSCALL=y
@@ -66,10 +82,8 @@ CONFIG_HOTPLUG=y
66CONFIG_PRINTK=y 82CONFIG_PRINTK=y
67CONFIG_BUG=y 83CONFIG_BUG=y
68CONFIG_ELF_CORE=y 84CONFIG_ELF_CORE=y
69CONFIG_COMPAT_BRK=y
70CONFIG_BASE_FULL=y 85CONFIG_BASE_FULL=y
71CONFIG_FUTEX=y 86CONFIG_FUTEX=y
72CONFIG_ANON_INODES=y
73CONFIG_EPOLL=y 87CONFIG_EPOLL=y
74CONFIG_SIGNALFD=y 88CONFIG_SIGNALFD=y
75CONFIG_TIMERFD=y 89CONFIG_TIMERFD=y
@@ -78,6 +92,7 @@ CONFIG_SHMEM=y
78CONFIG_AIO=y 92CONFIG_AIO=y
79CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
80CONFIG_SLUB_DEBUG=y 94CONFIG_SLUB_DEBUG=y
95CONFIG_COMPAT_BRK=y
81# CONFIG_SLAB is not set 96# CONFIG_SLAB is not set
82CONFIG_SLUB=y 97CONFIG_SLUB=y
83# CONFIG_SLOB is not set 98# CONFIG_SLOB is not set
@@ -118,11 +133,6 @@ CONFIG_IOSCHED_NOOP=y
118# CONFIG_DEFAULT_CFQ is not set 133# CONFIG_DEFAULT_CFQ is not set
119CONFIG_DEFAULT_NOOP=y 134CONFIG_DEFAULT_NOOP=y
120CONFIG_DEFAULT_IOSCHED="noop" 135CONFIG_DEFAULT_IOSCHED="noop"
121CONFIG_CLASSIC_RCU=y
122# CONFIG_TREE_RCU is not set
123# CONFIG_PREEMPT_RCU is not set
124# CONFIG_TREE_RCU_TRACE is not set
125# CONFIG_PREEMPT_RCU_TRACE is not set
126# CONFIG_FREEZER is not set 136# CONFIG_FREEZER is not set
127 137
128# 138#
@@ -132,6 +142,7 @@ CONFIG_CPU_SH4=y
132CONFIG_CPU_SH4A=y 142CONFIG_CPU_SH4A=y
133CONFIG_CPU_SH4AL_DSP=y 143CONFIG_CPU_SH4AL_DSP=y
134CONFIG_CPU_SHX2=y 144CONFIG_CPU_SHX2=y
145CONFIG_ARCH_SHMOBILE=y
135# CONFIG_CPU_SUBTYPE_SH7619 is not set 146# CONFIG_CPU_SUBTYPE_SH7619 is not set
136# CONFIG_CPU_SUBTYPE_SH7201 is not set 147# CONFIG_CPU_SUBTYPE_SH7201 is not set
137# CONFIG_CPU_SUBTYPE_SH7203 is not set 148# CONFIG_CPU_SUBTYPE_SH7203 is not set
@@ -160,6 +171,7 @@ CONFIG_CPU_SHX2=y
160# CONFIG_CPU_SUBTYPE_SH7770 is not set 171# CONFIG_CPU_SUBTYPE_SH7770 is not set
161# CONFIG_CPU_SUBTYPE_SH7780 is not set 172# CONFIG_CPU_SUBTYPE_SH7780 is not set
162# CONFIG_CPU_SUBTYPE_SH7785 is not set 173# CONFIG_CPU_SUBTYPE_SH7785 is not set
174# CONFIG_CPU_SUBTYPE_SH7786 is not set
163# CONFIG_CPU_SUBTYPE_SHX3 is not set 175# CONFIG_CPU_SUBTYPE_SHX3 is not set
164# CONFIG_CPU_SUBTYPE_SH7343 is not set 176# CONFIG_CPU_SUBTYPE_SH7343 is not set
165# CONFIG_CPU_SUBTYPE_SH7722 is not set 177# CONFIG_CPU_SUBTYPE_SH7722 is not set
@@ -213,11 +225,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
213CONFIG_ZONE_DMA_FLAG=0 225CONFIG_ZONE_DMA_FLAG=0
214CONFIG_NR_QUICK=2 226CONFIG_NR_QUICK=2
215CONFIG_UNEVICTABLE_LRU=y 227CONFIG_UNEVICTABLE_LRU=y
228CONFIG_HAVE_MLOCK=y
229CONFIG_HAVE_MLOCKED_PAGE_BIT=y
216 230
217# 231#
218# Cache configuration 232# Cache configuration
219# 233#
220# CONFIG_SH_DIRECT_MAPPED is not set
221CONFIG_CACHE_WRITEBACK=y 234CONFIG_CACHE_WRITEBACK=y
222# CONFIG_CACHE_WRITETHROUGH is not set 235# CONFIG_CACHE_WRITETHROUGH is not set
223# CONFIG_CACHE_OFF is not set 236# CONFIG_CACHE_OFF is not set
@@ -243,6 +256,7 @@ CONFIG_CPU_HAS_DSP=y
243# Timer and clock configuration 256# Timer and clock configuration
244# 257#
245CONFIG_SH_TMU=y 258CONFIG_SH_TMU=y
259# CONFIG_SH_TIMER_CMT is not set
246CONFIG_SH_TIMER_IRQ=16 260CONFIG_SH_TIMER_IRQ=16
247CONFIG_SH_PCLK_FREQ=33333333 261CONFIG_SH_PCLK_FREQ=33333333
248CONFIG_TICK_ONESHOT=y 262CONFIG_TICK_ONESHOT=y
@@ -319,7 +333,6 @@ CONFIG_NET=y
319# 333#
320# Networking options 334# Networking options
321# 335#
322CONFIG_COMPAT_NET_DEV_OPS=y
323CONFIG_PACKET=y 336CONFIG_PACKET=y
324CONFIG_PACKET_MMAP=y 337CONFIG_PACKET_MMAP=y
325CONFIG_UNIX=y 338CONFIG_UNIX=y
@@ -374,6 +387,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
374# CONFIG_LAPB is not set 387# CONFIG_LAPB is not set
375# CONFIG_ECONET is not set 388# CONFIG_ECONET is not set
376# CONFIG_WAN_ROUTER is not set 389# CONFIG_WAN_ROUTER is not set
390# CONFIG_PHONET is not set
377# CONFIG_NET_SCHED is not set 391# CONFIG_NET_SCHED is not set
378# CONFIG_DCB is not set 392# CONFIG_DCB is not set
379 393
@@ -386,15 +400,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
386# CONFIG_IRDA is not set 400# CONFIG_IRDA is not set
387# CONFIG_BT is not set 401# CONFIG_BT is not set
388# CONFIG_AF_RXRPC is not set 402# CONFIG_AF_RXRPC is not set
389# CONFIG_PHONET is not set
390CONFIG_WIRELESS=y 403CONFIG_WIRELESS=y
391CONFIG_CFG80211=y 404CONFIG_CFG80211=y
392# CONFIG_CFG80211_REG_DEBUG is not set 405# CONFIG_CFG80211_REG_DEBUG is not set
393CONFIG_NL80211=y
394# CONFIG_WIRELESS_OLD_REGULATORY is not set 406# CONFIG_WIRELESS_OLD_REGULATORY is not set
395CONFIG_WIRELESS_EXT=y 407CONFIG_WIRELESS_EXT=y
396CONFIG_WIRELESS_EXT_SYSFS=y 408CONFIG_WIRELESS_EXT_SYSFS=y
397CONFIG_LIB80211=m 409CONFIG_LIB80211=m
410# CONFIG_LIB80211_DEBUG is not set
398CONFIG_MAC80211=y 411CONFIG_MAC80211=y
399 412
400# 413#
@@ -408,6 +421,7 @@ CONFIG_MAC80211_RC_DEFAULT="pid"
408# CONFIG_MAC80211_MESH is not set 421# CONFIG_MAC80211_MESH is not set
409# CONFIG_MAC80211_LEDS is not set 422# CONFIG_MAC80211_LEDS is not set
410# CONFIG_MAC80211_DEBUG_MENU is not set 423# CONFIG_MAC80211_DEBUG_MENU is not set
424# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 425# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 426# CONFIG_NET_9P is not set
413 427
@@ -430,6 +444,7 @@ CONFIG_MTD=y
430# CONFIG_MTD_DEBUG is not set 444# CONFIG_MTD_DEBUG is not set
431CONFIG_MTD_CONCAT=y 445CONFIG_MTD_CONCAT=y
432CONFIG_MTD_PARTITIONS=y 446CONFIG_MTD_PARTITIONS=y
447# CONFIG_MTD_TESTS is not set
433# CONFIG_MTD_REDBOOT_PARTS is not set 448# CONFIG_MTD_REDBOOT_PARTS is not set
434# CONFIG_MTD_CMDLINE_PARTS is not set 449# CONFIG_MTD_CMDLINE_PARTS is not set
435# CONFIG_MTD_AR7_PARTS is not set 450# CONFIG_MTD_AR7_PARTS is not set
@@ -497,6 +512,11 @@ CONFIG_MTD_RAM=y
497# CONFIG_MTD_ONENAND is not set 512# CONFIG_MTD_ONENAND is not set
498 513
499# 514#
515# LPDDR flash memory drivers
516#
517# CONFIG_MTD_LPDDR is not set
518
519#
500# UBI - Unsorted block images 520# UBI - Unsorted block images
501# 521#
502# CONFIG_MTD_UBI is not set 522# CONFIG_MTD_UBI is not set
@@ -514,9 +534,13 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
514# CONFIG_ATA_OVER_ETH is not set 534# CONFIG_ATA_OVER_ETH is not set
515# CONFIG_BLK_DEV_HD is not set 535# CONFIG_BLK_DEV_HD is not set
516CONFIG_MISC_DEVICES=y 536CONFIG_MISC_DEVICES=y
517# CONFIG_EEPROM_93CX6 is not set
518# CONFIG_ENCLOSURE_SERVICES is not set 537# CONFIG_ENCLOSURE_SERVICES is not set
519# CONFIG_C2PORT is not set 538# CONFIG_C2PORT is not set
539
540#
541# EEPROM support
542#
543# CONFIG_EEPROM_93CX6 is not set
520CONFIG_HAVE_IDE=y 544CONFIG_HAVE_IDE=y
521# CONFIG_IDE is not set 545# CONFIG_IDE is not set
522 546
@@ -562,6 +586,7 @@ CONFIG_SCSI_LOWLEVEL=y
562# CONFIG_LIBFC is not set 586# CONFIG_LIBFC is not set
563# CONFIG_SCSI_DEBUG is not set 587# CONFIG_SCSI_DEBUG is not set
564# CONFIG_SCSI_DH is not set 588# CONFIG_SCSI_DH is not set
589# CONFIG_SCSI_OSD_INITIATOR is not set
565CONFIG_ATA=y 590CONFIG_ATA=y
566# CONFIG_ATA_NONSTANDARD is not set 591# CONFIG_ATA_NONSTANDARD is not set
567CONFIG_SATA_PMP=y 592CONFIG_SATA_PMP=y
@@ -570,6 +595,7 @@ CONFIG_ATA_SFF=y
570CONFIG_PATA_PLATFORM=y 595CONFIG_PATA_PLATFORM=y
571# CONFIG_MD is not set 596# CONFIG_MD is not set
572CONFIG_NETDEVICES=y 597CONFIG_NETDEVICES=y
598CONFIG_COMPAT_NET_DEV_OPS=y
573# CONFIG_DUMMY is not set 599# CONFIG_DUMMY is not set
574# CONFIG_BONDING is not set 600# CONFIG_BONDING is not set
575# CONFIG_MACVLAN is not set 601# CONFIG_MACVLAN is not set
@@ -582,8 +608,10 @@ CONFIG_MII=y
582# CONFIG_AX88796 is not set 608# CONFIG_AX88796 is not set
583# CONFIG_STNIC is not set 609# CONFIG_STNIC is not set
584# CONFIG_SMC91X is not set 610# CONFIG_SMC91X is not set
611# CONFIG_ETHOC is not set
585# CONFIG_SMC911X is not set 612# CONFIG_SMC911X is not set
586# CONFIG_SMSC911X is not set 613# CONFIG_SMSC911X is not set
614# CONFIG_DNET is not set
587# CONFIG_IBM_NEW_EMAC_ZMII is not set 615# CONFIG_IBM_NEW_EMAC_ZMII is not set
588# CONFIG_IBM_NEW_EMAC_RGMII is not set 616# CONFIG_IBM_NEW_EMAC_RGMII is not set
589# CONFIG_IBM_NEW_EMAC_TAH is not set 617# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -605,12 +633,13 @@ CONFIG_LIBERTAS=m
605CONFIG_LIBERTAS_SDIO=m 633CONFIG_LIBERTAS_SDIO=m
606CONFIG_LIBERTAS_DEBUG=y 634CONFIG_LIBERTAS_DEBUG=y
607# CONFIG_LIBERTAS_THINFIRM is not set 635# CONFIG_LIBERTAS_THINFIRM is not set
636# CONFIG_AT76C50X_USB is not set
608# CONFIG_USB_ZD1201 is not set 637# CONFIG_USB_ZD1201 is not set
609# CONFIG_USB_NET_RNDIS_WLAN is not set 638# CONFIG_USB_NET_RNDIS_WLAN is not set
610# CONFIG_RTL8187 is not set 639# CONFIG_RTL8187 is not set
611# CONFIG_MAC80211_HWSIM is not set 640# CONFIG_MAC80211_HWSIM is not set
612# CONFIG_P54_COMMON is not set 641# CONFIG_P54_COMMON is not set
613# CONFIG_IWLWIFI_LEDS is not set 642# CONFIG_AR9170_USB is not set
614# CONFIG_HOSTAP is not set 643# CONFIG_HOSTAP is not set
615# CONFIG_B43 is not set 644# CONFIG_B43 is not set
616# CONFIG_B43LEGACY is not set 645# CONFIG_B43LEGACY is not set
@@ -618,6 +647,10 @@ CONFIG_LIBERTAS_DEBUG=y
618# CONFIG_RT2X00 is not set 647# CONFIG_RT2X00 is not set
619 648
620# 649#
650# Enable WiMAX (Networking options) to see the WiMAX drivers
651#
652
653#
621# USB Network Adapters 654# USB Network Adapters
622# 655#
623# CONFIG_USB_CATC is not set 656# CONFIG_USB_CATC is not set
@@ -794,7 +827,9 @@ CONFIG_USB_MON=y
794# USB Host Controller Drivers 827# USB Host Controller Drivers
795# 828#
796# CONFIG_USB_C67X00_HCD is not set 829# CONFIG_USB_C67X00_HCD is not set
830# CONFIG_USB_OXU210HP_HCD is not set
797# CONFIG_USB_ISP116X_HCD is not set 831# CONFIG_USB_ISP116X_HCD is not set
832# CONFIG_USB_ISP1760_HCD is not set
798# CONFIG_USB_SL811_HCD is not set 833# CONFIG_USB_SL811_HCD is not set
799CONFIG_USB_R8A66597_HCD=y 834CONFIG_USB_R8A66597_HCD=y
800# CONFIG_SUPERH_ON_CHIP_R8A66597 is not set 835# CONFIG_SUPERH_ON_CHIP_R8A66597 is not set
@@ -809,18 +844,17 @@ CONFIG_USB_R8A66597_HCD=y
809# CONFIG_USB_TMC is not set 844# CONFIG_USB_TMC is not set
810 845
811# 846#
812# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 847# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
813# 848#
814 849
815# 850#
816# see USB_STORAGE Help for more information 851# also be needed; see USB_STORAGE Help for more info
817# 852#
818CONFIG_USB_STORAGE=y 853CONFIG_USB_STORAGE=y
819# CONFIG_USB_STORAGE_DEBUG is not set 854# CONFIG_USB_STORAGE_DEBUG is not set
820# CONFIG_USB_STORAGE_DATAFAB is not set 855# CONFIG_USB_STORAGE_DATAFAB is not set
821# CONFIG_USB_STORAGE_FREECOM is not set 856# CONFIG_USB_STORAGE_FREECOM is not set
822# CONFIG_USB_STORAGE_ISD200 is not set 857# CONFIG_USB_STORAGE_ISD200 is not set
823# CONFIG_USB_STORAGE_DPCM is not set
824# CONFIG_USB_STORAGE_USBAT is not set 858# CONFIG_USB_STORAGE_USBAT is not set
825# CONFIG_USB_STORAGE_SDDR09 is not set 859# CONFIG_USB_STORAGE_SDDR09 is not set
826# CONFIG_USB_STORAGE_SDDR55 is not set 860# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -856,7 +890,6 @@ CONFIG_USB_STORAGE=y
856# CONFIG_USB_LED is not set 890# CONFIG_USB_LED is not set
857# CONFIG_USB_CYPRESS_CY7C63 is not set 891# CONFIG_USB_CYPRESS_CY7C63 is not set
858# CONFIG_USB_CYTHERM is not set 892# CONFIG_USB_CYTHERM is not set
859# CONFIG_USB_PHIDGET is not set
860# CONFIG_USB_IDMOUSE is not set 893# CONFIG_USB_IDMOUSE is not set
861# CONFIG_USB_FTDI_ELAN is not set 894# CONFIG_USB_FTDI_ELAN is not set
862# CONFIG_USB_APPLEDISPLAY is not set 895# CONFIG_USB_APPLEDISPLAY is not set
@@ -866,6 +899,11 @@ CONFIG_USB_STORAGE=y
866# CONFIG_USB_ISIGHTFW is not set 899# CONFIG_USB_ISIGHTFW is not set
867# CONFIG_USB_VST is not set 900# CONFIG_USB_VST is not set
868# CONFIG_USB_GADGET is not set 901# CONFIG_USB_GADGET is not set
902
903#
904# OTG and related infrastructure
905#
906# CONFIG_NOP_USB_XCEIV is not set
869CONFIG_MMC=y 907CONFIG_MMC=y
870# CONFIG_MMC_DEBUG is not set 908# CONFIG_MMC_DEBUG is not set
871# CONFIG_MMC_UNSAFE_RESUME is not set 909# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -887,6 +925,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
887# CONFIG_ACCESSIBILITY is not set 925# CONFIG_ACCESSIBILITY is not set
888# CONFIG_RTC_CLASS is not set 926# CONFIG_RTC_CLASS is not set
889# CONFIG_DMADEVICES is not set 927# CONFIG_DMADEVICES is not set
928# CONFIG_AUXDISPLAY is not set
890# CONFIG_UIO is not set 929# CONFIG_UIO is not set
891# CONFIG_STAGING is not set 930# CONFIG_STAGING is not set
892 931
@@ -909,6 +948,7 @@ CONFIG_FS_MBCACHE=y
909CONFIG_FILE_LOCKING=y 948CONFIG_FILE_LOCKING=y
910# CONFIG_XFS_FS is not set 949# CONFIG_XFS_FS is not set
911# CONFIG_OCFS2_FS is not set 950# CONFIG_OCFS2_FS is not set
951# CONFIG_BTRFS_FS is not set
912CONFIG_DNOTIFY=y 952CONFIG_DNOTIFY=y
913CONFIG_INOTIFY=y 953CONFIG_INOTIFY=y
914CONFIG_INOTIFY_USER=y 954CONFIG_INOTIFY_USER=y
@@ -956,6 +996,7 @@ CONFIG_MISC_FILESYSTEMS=y
956# CONFIG_EFS_FS is not set 996# CONFIG_EFS_FS is not set
957# CONFIG_JFFS2_FS is not set 997# CONFIG_JFFS2_FS is not set
958CONFIG_CRAMFS=y 998CONFIG_CRAMFS=y
999# CONFIG_SQUASHFS is not set
959# CONFIG_VXFS_FS is not set 1000# CONFIG_VXFS_FS is not set
960# CONFIG_MINIX_FS is not set 1001# CONFIG_MINIX_FS is not set
961# CONFIG_OMFS_FS is not set 1002# CONFIG_OMFS_FS is not set
@@ -976,7 +1017,6 @@ CONFIG_LOCKD=y
976CONFIG_EXPORTFS=y 1017CONFIG_EXPORTFS=y
977CONFIG_NFS_COMMON=y 1018CONFIG_NFS_COMMON=y
978CONFIG_SUNRPC=y 1019CONFIG_SUNRPC=y
979# CONFIG_SUNRPC_REGISTER_V4 is not set
980# CONFIG_RPCSEC_GSS_KRB5 is not set 1020# CONFIG_RPCSEC_GSS_KRB5 is not set
981# CONFIG_RPCSEC_GSS_SPKM3 is not set 1021# CONFIG_RPCSEC_GSS_SPKM3 is not set
982# CONFIG_SMB_FS is not set 1022# CONFIG_SMB_FS is not set
@@ -1059,7 +1099,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1059# 1099#
1060# Tracers 1100# Tracers
1061# 1101#
1062# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1063# CONFIG_SAMPLES is not set 1102# CONFIG_SAMPLES is not set
1064CONFIG_HAVE_ARCH_KGDB=y 1103CONFIG_HAVE_ARCH_KGDB=y
1065# CONFIG_SH_STANDARD_BIOS is not set 1104# CONFIG_SH_STANDARD_BIOS is not set
@@ -1087,10 +1126,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1087CONFIG_CRYPTO_HASH=y 1126CONFIG_CRYPTO_HASH=y
1088CONFIG_CRYPTO_HASH2=y 1127CONFIG_CRYPTO_HASH2=y
1089CONFIG_CRYPTO_RNG2=y 1128CONFIG_CRYPTO_RNG2=y
1129CONFIG_CRYPTO_PCOMP=y
1090CONFIG_CRYPTO_MANAGER=y 1130CONFIG_CRYPTO_MANAGER=y
1091CONFIG_CRYPTO_MANAGER2=y 1131CONFIG_CRYPTO_MANAGER2=y
1092# CONFIG_CRYPTO_GF128MUL is not set 1132# CONFIG_CRYPTO_GF128MUL is not set
1093# CONFIG_CRYPTO_NULL is not set 1133# CONFIG_CRYPTO_NULL is not set
1134CONFIG_CRYPTO_WORKQUEUE=y
1094# CONFIG_CRYPTO_CRYPTD is not set 1135# CONFIG_CRYPTO_CRYPTD is not set
1095# CONFIG_CRYPTO_AUTHENC is not set 1136# CONFIG_CRYPTO_AUTHENC is not set
1096# CONFIG_CRYPTO_TEST is not set 1137# CONFIG_CRYPTO_TEST is not set
@@ -1159,6 +1200,7 @@ CONFIG_CRYPTO_ARC4=y
1159# Compression 1200# Compression
1160# 1201#
1161# CONFIG_CRYPTO_DEFLATE is not set 1202# CONFIG_CRYPTO_DEFLATE is not set
1203# CONFIG_CRYPTO_ZLIB is not set
1162# CONFIG_CRYPTO_LZO is not set 1204# CONFIG_CRYPTO_LZO is not set
1163 1205
1164# 1206#
@@ -1180,7 +1222,8 @@ CONFIG_CRC32=y
1180# CONFIG_CRC7 is not set 1222# CONFIG_CRC7 is not set
1181# CONFIG_LIBCRC32C is not set 1223# CONFIG_LIBCRC32C is not set
1182CONFIG_ZLIB_INFLATE=y 1224CONFIG_ZLIB_INFLATE=y
1183CONFIG_PLIST=y 1225CONFIG_DECOMPRESS_GZIP=y
1184CONFIG_HAS_IOMEM=y 1226CONFIG_HAS_IOMEM=y
1185CONFIG_HAS_IOPORT=y 1227CONFIG_HAS_IOPORT=y
1186CONFIG_HAS_DMA=y 1228CONFIG_HAS_DMA=y
1229CONFIG_NLATTR=y
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index be726c7cdf91..d174b1a4d802 100644
--- a/arch/sh/configs/urquell_defconfig
+++ b/arch/sh/configs/urquell_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.29-rc4 3# Linux kernel version: 2.6.29
4# Thu Mar 5 17:28:13 2009 4# Thu Apr 2 19:33:39 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,7 +17,7 @@ CONFIG_GENERIC_GPIO=y
17CONFIG_GENERIC_TIME=y 17CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_NUMA=y 21CONFIG_SYS_SUPPORTS_NUMA=y
22CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
@@ -25,6 +25,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25# CONFIG_ARCH_HAS_ILOG2_U32 is not set 25# CONFIG_ARCH_HAS_ILOG2_U32 is not set
26# CONFIG_ARCH_HAS_ILOG2_U64 is not set 26# CONFIG_ARCH_HAS_ILOG2_U64 is not set
27CONFIG_ARCH_NO_VIRT_TO_BUS=y 27CONFIG_ARCH_NO_VIRT_TO_BUS=y
28CONFIG_ARCH_HAS_DEFAULT_IDLE=y
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 29CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
29 30
30# 31#
@@ -69,6 +70,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
69# CONFIG_BLK_DEV_INITRD is not set 70# CONFIG_BLK_DEV_INITRD is not set
70CONFIG_CC_OPTIMIZE_FOR_SIZE=y 71CONFIG_CC_OPTIMIZE_FOR_SIZE=y
71CONFIG_SYSCTL=y 72CONFIG_SYSCTL=y
73CONFIG_ANON_INODES=y
72CONFIG_EMBEDDED=y 74CONFIG_EMBEDDED=y
73CONFIG_UID16=y 75CONFIG_UID16=y
74CONFIG_SYSCTL_SYSCALL=y 76CONFIG_SYSCTL_SYSCALL=y
@@ -78,10 +80,8 @@ CONFIG_HOTPLUG=y
78CONFIG_PRINTK=y 80CONFIG_PRINTK=y
79CONFIG_BUG=y 81CONFIG_BUG=y
80CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
81CONFIG_COMPAT_BRK=y
82CONFIG_BASE_FULL=y 83CONFIG_BASE_FULL=y
83CONFIG_FUTEX=y 84CONFIG_FUTEX=y
84CONFIG_ANON_INODES=y
85CONFIG_EPOLL=y 85CONFIG_EPOLL=y
86CONFIG_SIGNALFD=y 86CONFIG_SIGNALFD=y
87CONFIG_TIMERFD=y 87CONFIG_TIMERFD=y
@@ -89,6 +89,7 @@ CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 89CONFIG_SHMEM=y
90CONFIG_AIO=y 90CONFIG_AIO=y
91CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_COMPAT_BRK=y
92CONFIG_SLAB=y 93CONFIG_SLAB=y
93# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
94# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
@@ -213,11 +214,12 @@ CONFIG_MIGRATION=y
213CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
214CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
215CONFIG_UNEVICTABLE_LRU=y 216CONFIG_UNEVICTABLE_LRU=y
217CONFIG_HAVE_MLOCK=y
218CONFIG_HAVE_MLOCKED_PAGE_BIT=y
216 219
217# 220#
218# Cache configuration 221# Cache configuration
219# 222#
220# CONFIG_SH_DIRECT_MAPPED is not set
221CONFIG_CACHE_WRITEBACK=y 223CONFIG_CACHE_WRITEBACK=y
222# CONFIG_CACHE_WRITETHROUGH is not set 224# CONFIG_CACHE_WRITETHROUGH is not set
223# CONFIG_CACHE_OFF is not set 225# CONFIG_CACHE_OFF is not set
@@ -231,6 +233,7 @@ CONFIG_SH_FPU=y
231CONFIG_SH_STORE_QUEUES=y 233CONFIG_SH_STORE_QUEUES=y
232CONFIG_CPU_HAS_INTEVT=y 234CONFIG_CPU_HAS_INTEVT=y
233CONFIG_CPU_HAS_SR_RB=y 235CONFIG_CPU_HAS_SR_RB=y
236CONFIG_CPU_HAS_PTEAEX=y
234CONFIG_CPU_HAS_FPU=y 237CONFIG_CPU_HAS_FPU=y
235 238
236# 239#
@@ -318,7 +321,6 @@ CONFIG_NET=y
318# 321#
319# Networking options 322# Networking options
320# 323#
321CONFIG_COMPAT_NET_DEV_OPS=y
322CONFIG_PACKET=y 324CONFIG_PACKET=y
323# CONFIG_PACKET_MMAP is not set 325# CONFIG_PACKET_MMAP is not set
324CONFIG_UNIX=y 326CONFIG_UNIX=y
@@ -378,6 +380,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_LAPB is not set 380# CONFIG_LAPB is not set
379# CONFIG_ECONET is not set 381# CONFIG_ECONET is not set
380# CONFIG_WAN_ROUTER is not set 382# CONFIG_WAN_ROUTER is not set
383# CONFIG_PHONET is not set
381# CONFIG_NET_SCHED is not set 384# CONFIG_NET_SCHED is not set
382# CONFIG_DCB is not set 385# CONFIG_DCB is not set
383 386
@@ -390,7 +393,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
390# CONFIG_IRDA is not set 393# CONFIG_IRDA is not set
391# CONFIG_BT is not set 394# CONFIG_BT is not set
392# CONFIG_AF_RXRPC is not set 395# CONFIG_AF_RXRPC is not set
393# CONFIG_PHONET is not set
394CONFIG_WIRELESS=y 396CONFIG_WIRELESS=y
395# CONFIG_CFG80211 is not set 397# CONFIG_CFG80211 is not set
396# CONFIG_WIRELESS_OLD_REGULATORY is not set 398# CONFIG_WIRELESS_OLD_REGULATORY is not set
@@ -491,7 +493,6 @@ CONFIG_MTD_PHYSMAP=y
491# LPDDR flash memory drivers 493# LPDDR flash memory drivers
492# 494#
493# CONFIG_MTD_LPDDR is not set 495# CONFIG_MTD_LPDDR is not set
494# CONFIG_MTD_QINFO_PROBE is not set
495 496
496# 497#
497# UBI - Unsorted block images 498# UBI - Unsorted block images
@@ -553,6 +554,7 @@ CONFIG_SCSI_WAIT_SCAN=m
553# CONFIG_SCSI_SRP_ATTRS is not set 554# CONFIG_SCSI_SRP_ATTRS is not set
554# CONFIG_SCSI_LOWLEVEL is not set 555# CONFIG_SCSI_LOWLEVEL is not set
555# CONFIG_SCSI_DH is not set 556# CONFIG_SCSI_DH is not set
557# CONFIG_SCSI_OSD_INITIATOR is not set
556CONFIG_ATA=y 558CONFIG_ATA=y
557# CONFIG_ATA_NONSTANDARD is not set 559# CONFIG_ATA_NONSTANDARD is not set
558CONFIG_SATA_PMP=y 560CONFIG_SATA_PMP=y
@@ -561,6 +563,7 @@ CONFIG_ATA_SFF=y
561# CONFIG_PATA_PLATFORM is not set 563# CONFIG_PATA_PLATFORM is not set
562# CONFIG_MD is not set 564# CONFIG_MD is not set
563CONFIG_NETDEVICES=y 565CONFIG_NETDEVICES=y
566CONFIG_COMPAT_NET_DEV_OPS=y
564# CONFIG_DUMMY is not set 567# CONFIG_DUMMY is not set
565# CONFIG_BONDING is not set 568# CONFIG_BONDING is not set
566# CONFIG_MACVLAN is not set 569# CONFIG_MACVLAN is not set
@@ -592,8 +595,10 @@ CONFIG_MII=y
592# CONFIG_AX88796 is not set 595# CONFIG_AX88796 is not set
593# CONFIG_STNIC is not set 596# CONFIG_STNIC is not set
594CONFIG_SMC91X=y 597CONFIG_SMC91X=y
598# CONFIG_ETHOC is not set
595# CONFIG_SMC911X is not set 599# CONFIG_SMC911X is not set
596# CONFIG_SMSC911X is not set 600# CONFIG_SMSC911X is not set
601# CONFIG_DNET is not set
597# CONFIG_IBM_NEW_EMAC_ZMII is not set 602# CONFIG_IBM_NEW_EMAC_ZMII is not set
598# CONFIG_IBM_NEW_EMAC_RGMII is not set 603# CONFIG_IBM_NEW_EMAC_RGMII is not set
599# CONFIG_IBM_NEW_EMAC_TAH is not set 604# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -610,7 +615,6 @@ CONFIG_SMC91X=y
610# 615#
611# CONFIG_WLAN_PRE80211 is not set 616# CONFIG_WLAN_PRE80211 is not set
612# CONFIG_WLAN_80211 is not set 617# CONFIG_WLAN_80211 is not set
613# CONFIG_IWLWIFI_LEDS is not set
614 618
615# 619#
616# Enable WiMAX (Networking options) to see the WiMAX drivers 620# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -705,6 +709,7 @@ CONFIG_LEGACY_PTYS=y
705CONFIG_LEGACY_PTY_COUNT=256 709CONFIG_LEGACY_PTY_COUNT=256
706# CONFIG_IPMI_HANDLER is not set 710# CONFIG_IPMI_HANDLER is not set
707CONFIG_HW_RANDOM=y 711CONFIG_HW_RANDOM=y
712# CONFIG_HW_RANDOM_TIMERIOMEM is not set
708# CONFIG_R3964 is not set 713# CONFIG_R3964 is not set
709# CONFIG_RAW_DRIVER is not set 714# CONFIG_RAW_DRIVER is not set
710# CONFIG_TCG_TPM is not set 715# CONFIG_TCG_TPM is not set
@@ -746,7 +751,6 @@ CONFIG_I2C_PCA_PLATFORM=y
746# CONFIG_SENSORS_PCF8574 is not set 751# CONFIG_SENSORS_PCF8574 is not set
747# CONFIG_PCF8575 is not set 752# CONFIG_PCF8575 is not set
748# CONFIG_SENSORS_PCA9539 is not set 753# CONFIG_SENSORS_PCA9539 is not set
749# CONFIG_SENSORS_PCF8591 is not set
750# CONFIG_SENSORS_MAX6875 is not set 754# CONFIG_SENSORS_MAX6875 is not set
751# CONFIG_SENSORS_TSL2550 is not set 755# CONFIG_SENSORS_TSL2550 is not set
752# CONFIG_I2C_DEBUG_CORE is not set 756# CONFIG_I2C_DEBUG_CORE is not set
@@ -855,6 +859,7 @@ CONFIG_FB_SM501=y
855# CONFIG_FB_VIRTUAL is not set 859# CONFIG_FB_VIRTUAL is not set
856# CONFIG_FB_METRONOME is not set 860# CONFIG_FB_METRONOME is not set
857# CONFIG_FB_MB862XX is not set 861# CONFIG_FB_MB862XX is not set
862# CONFIG_FB_BROADSHEET is not set
858# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 863# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
859 864
860# 865#
@@ -922,7 +927,7 @@ CONFIG_THRUSTMASTER_FF=m
922CONFIG_ZEROPLUS_FF=m 927CONFIG_ZEROPLUS_FF=m
923CONFIG_USB_SUPPORT=y 928CONFIG_USB_SUPPORT=y
924CONFIG_USB_ARCH_HAS_HCD=y 929CONFIG_USB_ARCH_HAS_HCD=y
925# CONFIG_USB_ARCH_HAS_OHCI is not set 930CONFIG_USB_ARCH_HAS_OHCI=y
926# CONFIG_USB_ARCH_HAS_EHCI is not set 931# CONFIG_USB_ARCH_HAS_EHCI is not set
927CONFIG_USB=y 932CONFIG_USB=y
928# CONFIG_USB_DEBUG is not set 933# CONFIG_USB_DEBUG is not set
@@ -947,6 +952,8 @@ CONFIG_USB_MON=y
947# CONFIG_USB_C67X00_HCD is not set 952# CONFIG_USB_C67X00_HCD is not set
948# CONFIG_USB_OXU210HP_HCD is not set 953# CONFIG_USB_OXU210HP_HCD is not set
949# CONFIG_USB_ISP116X_HCD is not set 954# CONFIG_USB_ISP116X_HCD is not set
955# CONFIG_USB_ISP1760_HCD is not set
956# CONFIG_USB_OHCI_HCD is not set
950# CONFIG_USB_SL811_HCD is not set 957# CONFIG_USB_SL811_HCD is not set
951# CONFIG_USB_R8A66597_HCD is not set 958# CONFIG_USB_R8A66597_HCD is not set
952# CONFIG_USB_HWA_HCD is not set 959# CONFIG_USB_HWA_HCD is not set
@@ -960,11 +967,11 @@ CONFIG_USB_MON=y
960# CONFIG_USB_TMC is not set 967# CONFIG_USB_TMC is not set
961 968
962# 969#
963# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; 970# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
964# 971#
965 972
966# 973#
967# see USB_STORAGE Help for more information 974# also be needed; see USB_STORAGE Help for more info
968# 975#
969CONFIG_USB_STORAGE=y 976CONFIG_USB_STORAGE=y
970# CONFIG_USB_STORAGE_DEBUG is not set 977# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1006,7 +1013,6 @@ CONFIG_USB_STORAGE=y
1006# CONFIG_USB_LED is not set 1013# CONFIG_USB_LED is not set
1007# CONFIG_USB_CYPRESS_CY7C63 is not set 1014# CONFIG_USB_CYPRESS_CY7C63 is not set
1008# CONFIG_USB_CYTHERM is not set 1015# CONFIG_USB_CYTHERM is not set
1009# CONFIG_USB_PHIDGET is not set
1010# CONFIG_USB_IDMOUSE is not set 1016# CONFIG_USB_IDMOUSE is not set
1011# CONFIG_USB_FTDI_ELAN is not set 1017# CONFIG_USB_FTDI_ELAN is not set
1012# CONFIG_USB_APPLEDISPLAY is not set 1018# CONFIG_USB_APPLEDISPLAY is not set
@@ -1022,12 +1028,14 @@ CONFIG_USB_STORAGE=y
1022# OTG and related infrastructure 1028# OTG and related infrastructure
1023# 1029#
1024# CONFIG_USB_GPIO_VBUS is not set 1030# CONFIG_USB_GPIO_VBUS is not set
1031# CONFIG_NOP_USB_XCEIV is not set
1025# CONFIG_MMC is not set 1032# CONFIG_MMC is not set
1026# CONFIG_MEMSTICK is not set 1033# CONFIG_MEMSTICK is not set
1027# CONFIG_NEW_LEDS is not set 1034# CONFIG_NEW_LEDS is not set
1028# CONFIG_ACCESSIBILITY is not set 1035# CONFIG_ACCESSIBILITY is not set
1029# CONFIG_RTC_CLASS is not set 1036# CONFIG_RTC_CLASS is not set
1030# CONFIG_DMADEVICES is not set 1037# CONFIG_DMADEVICES is not set
1038# CONFIG_AUXDISPLAY is not set
1031# CONFIG_UIO is not set 1039# CONFIG_UIO is not set
1032# CONFIG_STAGING is not set 1040# CONFIG_STAGING is not set
1033 1041
@@ -1125,7 +1133,6 @@ CONFIG_EXPORTFS=y
1125CONFIG_NFS_COMMON=y 1133CONFIG_NFS_COMMON=y
1126CONFIG_SUNRPC=y 1134CONFIG_SUNRPC=y
1127CONFIG_SUNRPC_GSS=y 1135CONFIG_SUNRPC_GSS=y
1128# CONFIG_SUNRPC_REGISTER_V4 is not set
1129CONFIG_RPCSEC_GSS_KRB5=y 1136CONFIG_RPCSEC_GSS_KRB5=y
1130# CONFIG_RPCSEC_GSS_SPKM3 is not set 1137# CONFIG_RPCSEC_GSS_SPKM3 is not set
1131# CONFIG_SMB_FS is not set 1138# CONFIG_SMB_FS is not set
@@ -1206,7 +1213,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1206# 1213#
1207# Tracers 1214# Tracers
1208# 1215#
1209# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1210# CONFIG_SAMPLES is not set 1216# CONFIG_SAMPLES is not set
1211CONFIG_HAVE_ARCH_KGDB=y 1217CONFIG_HAVE_ARCH_KGDB=y
1212# CONFIG_SH_STANDARD_BIOS is not set 1218# CONFIG_SH_STANDARD_BIOS is not set
@@ -1234,10 +1240,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
1234CONFIG_CRYPTO_HASH=y 1240CONFIG_CRYPTO_HASH=y
1235CONFIG_CRYPTO_HASH2=y 1241CONFIG_CRYPTO_HASH2=y
1236CONFIG_CRYPTO_RNG2=y 1242CONFIG_CRYPTO_RNG2=y
1243CONFIG_CRYPTO_PCOMP=y
1237CONFIG_CRYPTO_MANAGER=y 1244CONFIG_CRYPTO_MANAGER=y
1238CONFIG_CRYPTO_MANAGER2=y 1245CONFIG_CRYPTO_MANAGER2=y
1239# CONFIG_CRYPTO_GF128MUL is not set 1246# CONFIG_CRYPTO_GF128MUL is not set
1240# CONFIG_CRYPTO_NULL is not set 1247# CONFIG_CRYPTO_NULL is not set
1248CONFIG_CRYPTO_WORKQUEUE=y
1241# CONFIG_CRYPTO_CRYPTD is not set 1249# CONFIG_CRYPTO_CRYPTD is not set
1242# CONFIG_CRYPTO_AUTHENC is not set 1250# CONFIG_CRYPTO_AUTHENC is not set
1243# CONFIG_CRYPTO_TEST is not set 1251# CONFIG_CRYPTO_TEST is not set
@@ -1306,6 +1314,7 @@ CONFIG_CRYPTO_DES=y
1306# Compression 1314# Compression
1307# 1315#
1308# CONFIG_CRYPTO_DEFLATE is not set 1316# CONFIG_CRYPTO_DEFLATE is not set
1317# CONFIG_CRYPTO_ZLIB is not set
1309# CONFIG_CRYPTO_LZO is not set 1318# CONFIG_CRYPTO_LZO is not set
1310 1319
1311# 1320#
@@ -1326,7 +1335,7 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
1326CONFIG_CRC32=y 1335CONFIG_CRC32=y
1327# CONFIG_CRC7 is not set 1336# CONFIG_CRC7 is not set
1328# CONFIG_LIBCRC32C is not set 1337# CONFIG_LIBCRC32C is not set
1329CONFIG_PLIST=y
1330CONFIG_HAS_IOMEM=y 1338CONFIG_HAS_IOMEM=y
1331CONFIG_HAS_IOPORT=y 1339CONFIG_HAS_IOPORT=y
1332CONFIG_HAS_DMA=y 1340CONFIG_HAS_DMA=y
1341CONFIG_NLATTR=y
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index f13a05285a9d..666713ac5fcf 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -12,21 +12,25 @@ config SH_DMA
12config SH_DMA_IRQ_MULTI 12config SH_DMA_IRQ_MULTI
13 bool 13 bool
14 depends on SH_DMA 14 depends on SH_DMA
15 default y if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \ 15 default y if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \
16 CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || \ 16 CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \
17 CPU_SUBTYPE_SH7091 || CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7764 || \ 17 CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091 || \
18 CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 18 CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7764 || \
19 CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
19 20
20config NR_ONCHIP_DMA_CHANNELS 21config NR_ONCHIP_DMA_CHANNELS
21 int 22 int
22 depends on SH_DMA 23 depends on SH_DMA
23 default "4" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7750S 24 default "4" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \
24 default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7760 25 CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7091
25 default "12" if CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 26 default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || \
27 CPU_SUBTYPE_SH7760
28 default "12" if CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7780 || \
29 CPU_SUBTYPE_SH7785
26 default "6" 30 default "6"
27 help 31 help
28 This allows you to specify the number of channels that the on-chip 32 This allows you to specify the number of channels that the on-chip
29 DMAC supports. This will be 4 for SH7750/SH7751 and 8 for the 33 DMAC supports. This will be 4 for SH7091/SH7750/SH7751 and 8 for the
30 SH7750R/SH7751R. 34 SH7750R/SH7751R.
31 35
32config NR_DMA_CHANNELS_BOOL 36config NR_DMA_CHANNELS_BOOL
diff --git a/arch/sh/drivers/pci/ops-sh7785lcr.c b/arch/sh/drivers/pci/ops-sh7785lcr.c
index b3bd68702059..e8b7446a7c2b 100644
--- a/arch/sh/drivers/pci/ops-sh7785lcr.c
+++ b/arch/sh/drivers/pci/ops-sh7785lcr.c
@@ -48,13 +48,8 @@ EXPORT_SYMBOL(board_pci_channels);
48 48
49static struct sh4_pci_address_map sh7785_pci_map = { 49static struct sh4_pci_address_map sh7785_pci_map = {
50 .window0 = { 50 .window0 = {
51 .base = SH7780_CS2_BASE_ADDR, 51 .base = SH7780_CS0_BASE_ADDR,
52 .size = 0x04000000, 52 .size = 0x20000000,
53 },
54
55 .window1 = {
56 .base = SH7780_CS3_BASE_ADDR,
57 .size = 0x04000000,
58 }, 53 },
59 54
60 .flags = SH4_PCIC_NO_RESET, 55 .flags = SH4_PCIC_NO_RESET,
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index 773d575a04b9..bae6a2cf047d 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -120,19 +120,15 @@ int __init sh7780_pcic_init(struct sh4_pci_address_map *map)
120 120
121 /* Set IO and Mem windows to local address 121 /* Set IO and Mem windows to local address
122 * Make PCI and local address the same for easy 1 to 1 mapping 122 * Make PCI and local address the same for easy 1 to 1 mapping
123 * Window0 = map->window0.size @ non-cached area base = SDRAM
124 * Window1 = map->window1.size @ cached area base = SDRAM
125 */ 123 */
126 word = (CONFIG_MEMORY_SIZE - 0x00100000) | 0x00000001; 124 pci_write_reg(map->window0.size - 0xfffff, SH4_PCILSR0);
127 pci_write_reg(word, SH4_PCILSR0); 125 pci_write_reg(map->window1.size - 0xfffff, SH4_PCILSR1);
128 pci_write_reg(0x00000001, SH4_PCILSR1);
129 /* Set the values on window 0 PCI config registers */ 126 /* Set the values on window 0 PCI config registers */
130 word = CONFIG_MEMORY_START | (CONFIG_MEMORY_SIZE - 0x01000000); 127 pci_write_reg(map->window0.base, SH4_PCILAR0);
131 pci_write_reg(word, SH4_PCILAR0); 128 pci_write_reg(map->window0.base, SH7780_PCIMBAR0);
132 pci_write_reg(word, SH7780_PCIMBAR0);
133 /* Set the values on window 1 PCI config registers */ 129 /* Set the values on window 1 PCI config registers */
134 pci_write_reg(0x00000000, SH4_PCILAR1); 130 pci_write_reg(map->window1.base, SH4_PCILAR1);
135 pci_write_reg(0x00000000, SH7780_PCIMBAR1); 131 pci_write_reg(map->window1.base, SH7780_PCIMBAR1);
136 132
137 /* Map IO space into PCI IO window 133 /* Map IO space into PCI IO window
138 * The IO window is 64K-PCIBIOS_MIN_IO in size 134 * The IO window is 64K-PCIBIOS_MIN_IO in size
diff --git a/arch/sh/include/asm/mmu.h b/arch/sh/include/asm/mmu.h
index 6c43625bb1a5..f5963037c9d6 100644
--- a/arch/sh/include/asm/mmu.h
+++ b/arch/sh/include/asm/mmu.h
@@ -1,22 +1,6 @@
1#ifndef __MMU_H 1#ifndef __MMU_H
2#define __MMU_H 2#define __MMU_H
3 3
4/* Default "unsigned long" context */
5typedef unsigned long mm_context_id_t[NR_CPUS];
6
7typedef struct {
8#ifdef CONFIG_MMU
9 mm_context_id_t id;
10 void *vdso;
11#else
12 unsigned long end_brk;
13#endif
14#ifdef CONFIG_BINFMT_ELF_FDPIC
15 unsigned long exec_fdpic_loadmap;
16 unsigned long interp_fdpic_loadmap;
17#endif
18} mm_context_t;
19
20/* 4/*
21 * Privileged Space Mapping Buffer (PMB) definitions 5 * Privileged Space Mapping Buffer (PMB) definitions
22 */ 6 */
@@ -41,6 +25,24 @@ typedef struct {
41 25
42#define PMB_NO_ENTRY (-1) 26#define PMB_NO_ENTRY (-1)
43 27
28#ifndef __ASSEMBLY__
29
30/* Default "unsigned long" context */
31typedef unsigned long mm_context_id_t[NR_CPUS];
32
33typedef struct {
34#ifdef CONFIG_MMU
35 mm_context_id_t id;
36 void *vdso;
37#else
38 unsigned long end_brk;
39#endif
40#ifdef CONFIG_BINFMT_ELF_FDPIC
41 unsigned long exec_fdpic_loadmap;
42 unsigned long interp_fdpic_loadmap;
43#endif
44} mm_context_t;
45
44struct pmb_entry; 46struct pmb_entry;
45 47
46struct pmb_entry { 48struct pmb_entry {
@@ -70,6 +72,7 @@ void pmb_free(struct pmb_entry *pmbe);
70long pmb_remap(unsigned long virt, unsigned long phys, 72long pmb_remap(unsigned long virt, unsigned long phys,
71 unsigned long size, unsigned long flags); 73 unsigned long size, unsigned long flags);
72void pmb_unmap(unsigned long addr); 74void pmb_unmap(unsigned long addr);
75#endif /* __ASSEMBLY__ */
73 76
74#endif /* __MMU_H */ 77#endif /* __MMU_H */
75 78
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h
index efdd78a53b11..9a8714945dc9 100644
--- a/arch/sh/include/asm/processor_32.h
+++ b/arch/sh/include/asm/processor_32.h
@@ -58,6 +58,14 @@ asmlinkage void __init sh_cpu_init(void);
58#define SR_FD 0x00008000 58#define SR_FD 0x00008000
59 59
60/* 60/*
61 * DSP structure and data
62 */
63struct sh_dsp_struct {
64 unsigned long dsp_regs[14];
65 long status;
66};
67
68/*
61 * FPU structure and data 69 * FPU structure and data
62 */ 70 */
63 71
@@ -96,6 +104,11 @@ struct thread_struct {
96 104
97 /* floating point info */ 105 /* floating point info */
98 union sh_fpu_union fpu; 106 union sh_fpu_union fpu;
107
108#ifdef CONFIG_SH_DSP
109 /* Dsp status information */
110 struct sh_dsp_struct dsp_status;
111#endif
99}; 112};
100 113
101/* Count of active tasks with UBC settings */ 114/* Count of active tasks with UBC settings */
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h
index 81c6568fdb3e..d3f6caa936b0 100644
--- a/arch/sh/include/asm/ptrace.h
+++ b/arch/sh/include/asm/ptrace.h
@@ -119,16 +119,8 @@ struct task_struct;
119extern void user_enable_single_step(struct task_struct *); 119extern void user_enable_single_step(struct task_struct *);
120extern void user_disable_single_step(struct task_struct *); 120extern void user_disable_single_step(struct task_struct *);
121 121
122#ifdef CONFIG_SH_DSP
123#define task_pt_regs(task) \
124 ((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE \
125 - sizeof(struct pt_dspregs)) - 1)
126#define task_pt_dspregs(task) \
127 ((struct pt_dspregs *) (task_stack_page(task) + THREAD_SIZE) - 1)
128#else
129#define task_pt_regs(task) \ 122#define task_pt_regs(task) \
130 ((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE) - 1) 123 ((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE) - 1)
131#endif
132 124
133static inline unsigned long profile_pc(struct pt_regs *regs) 125static inline unsigned long profile_pc(struct pt_regs *regs)
134{ 126{
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
index c9ec6af8e745..a88895e6dcb0 100644
--- a/arch/sh/include/asm/system.h
+++ b/arch/sh/include/asm/system.h
@@ -153,6 +153,7 @@ extern unsigned long cached_to_uncached;
153extern struct dentry *sh_debugfs_root; 153extern struct dentry *sh_debugfs_root;
154 154
155void per_cpu_trap_init(void); 155void per_cpu_trap_init(void);
156void default_idle(void);
156 157
157asmlinkage void break_point_trap(void); 158asmlinkage void break_point_trap(void);
158 159
diff --git a/arch/sh/include/asm/system_32.h b/arch/sh/include/asm/system_32.h
index a726d5d07277..240b31e1142c 100644
--- a/arch/sh/include/asm/system_32.h
+++ b/arch/sh/include/asm/system_32.h
@@ -3,59 +3,135 @@
3 3
4#include <linux/types.h> 4#include <linux/types.h>
5 5
6#ifdef CONFIG_SH_DSP
7
8#define is_dsp_enabled(tsk) \
9 (!!(tsk->thread.dsp_status.status & SR_DSP))
10
11#define __restore_dsp(tsk) \
12do { \
13 register u32 *__ts2 __asm__ ("r2") = \
14 (u32 *)&tsk->thread.dsp_status; \
15 __asm__ __volatile__ ( \
16 ".balign 4\n\t" \
17 "movs.l @r2+, a1\n\t" \
18 "movs.l @r2+, a0g\n\t" \
19 "movs.l @r2+, a1g\n\t" \
20 "movs.l @r2+, m0\n\t" \
21 "movs.l @r2+, m1\n\t" \
22 "movs.l @r2+, a0\n\t" \
23 "movs.l @r2+, x0\n\t" \
24 "movs.l @r2+, x1\n\t" \
25 "movs.l @r2+, y0\n\t" \
26 "movs.l @r2+, y1\n\t" \
27 "lds.l @r2+, dsr\n\t" \
28 "ldc.l @r2+, rs\n\t" \
29 "ldc.l @r2+, re\n\t" \
30 "ldc.l @r2+, mod\n\t" \
31 : : "r" (__ts2)); \
32} while (0)
33
34
35#define __save_dsp(tsk) \
36do { \
37 register u32 *__ts2 __asm__ ("r2") = \
38 (u32 *)&tsk->thread.dsp_status + 14; \
39 \
40 __asm__ __volatile__ ( \
41 ".balign 4\n\t" \
42 "stc.l mod, @-r2\n\t" \
43 "stc.l re, @-r2\n\t" \
44 "stc.l rs, @-r2\n\t" \
45 "sts.l dsr, @-r2\n\t" \
46 "sts.l y1, @-r2\n\t" \
47 "sts.l y0, @-r2\n\t" \
48 "sts.l x1, @-r2\n\t" \
49 "sts.l x0, @-r2\n\t" \
50 "sts.l a0, @-r2\n\t" \
51 ".word 0xf653 ! movs.l a1, @-r2\n\t" \
52 ".word 0xf6f3 ! movs.l a0g, @-r2\n\t" \
53 ".word 0xf6d3 ! movs.l a1g, @-r2\n\t" \
54 ".word 0xf6c3 ! movs.l m0, @-r2\n\t" \
55 ".word 0xf6e3 ! movs.l m1, @-r2\n\t" \
56 : : "r" (__ts2)); \
57} while (0)
58
59#else
60
61#define is_dsp_enabled(tsk) (0)
62#define __save_dsp(tsk) do { } while (0)
63#define __restore_dsp(tsk) do { } while (0)
64#endif
65
6struct task_struct *__switch_to(struct task_struct *prev, 66struct task_struct *__switch_to(struct task_struct *prev,
7 struct task_struct *next); 67 struct task_struct *next);
8 68
9/* 69/*
10 * switch_to() should switch tasks to task nr n, first 70 * switch_to() should switch tasks to task nr n, first
11 */ 71 */
12#define switch_to(prev, next, last) \ 72#define switch_to(prev, next, last) \
13do { \ 73do { \
14 register u32 *__ts1 __asm__ ("r1") = (u32 *)&prev->thread.sp; \ 74 register u32 *__ts1 __asm__ ("r1"); \
15 register u32 *__ts2 __asm__ ("r2") = (u32 *)&prev->thread.pc; \ 75 register u32 *__ts2 __asm__ ("r2"); \
16 register u32 *__ts4 __asm__ ("r4") = (u32 *)prev; \ 76 register u32 *__ts4 __asm__ ("r4"); \
17 register u32 *__ts5 __asm__ ("r5") = (u32 *)next; \ 77 register u32 *__ts5 __asm__ ("r5"); \
18 register u32 *__ts6 __asm__ ("r6") = (u32 *)&next->thread.sp; \ 78 register u32 *__ts6 __asm__ ("r6"); \
19 register u32 __ts7 __asm__ ("r7") = next->thread.pc; \ 79 register u32 __ts7 __asm__ ("r7"); \
20 struct task_struct *__last; \ 80 struct task_struct *__last; \
21 \ 81 \
22 __asm__ __volatile__ ( \ 82 if (is_dsp_enabled(prev)) \
23 ".balign 4\n\t" \ 83 __save_dsp(prev); \
24 "stc.l gbr, @-r15\n\t" \ 84 \
25 "sts.l pr, @-r15\n\t" \ 85 __ts1 = (u32 *)&prev->thread.sp; \
26 "mov.l r8, @-r15\n\t" \ 86 __ts2 = (u32 *)&prev->thread.pc; \
27 "mov.l r9, @-r15\n\t" \ 87 __ts4 = (u32 *)prev; \
28 "mov.l r10, @-r15\n\t" \ 88 __ts5 = (u32 *)next; \
29 "mov.l r11, @-r15\n\t" \ 89 __ts6 = (u32 *)&next->thread.sp; \
30 "mov.l r12, @-r15\n\t" \ 90 __ts7 = next->thread.pc; \
31 "mov.l r13, @-r15\n\t" \ 91 \
32 "mov.l r14, @-r15\n\t" \ 92 __asm__ __volatile__ ( \
33 "mov.l r15, @r1\t! save SP\n\t" \ 93 ".balign 4\n\t" \
34 "mov.l @r6, r15\t! change to new stack\n\t" \ 94 "stc.l gbr, @-r15\n\t" \
35 "mova 1f, %0\n\t" \ 95 "sts.l pr, @-r15\n\t" \
36 "mov.l %0, @r2\t! save PC\n\t" \ 96 "mov.l r8, @-r15\n\t" \
37 "mov.l 2f, %0\n\t" \ 97 "mov.l r9, @-r15\n\t" \
38 "jmp @%0\t! call __switch_to\n\t" \ 98 "mov.l r10, @-r15\n\t" \
39 " lds r7, pr\t! with return to new PC\n\t" \ 99 "mov.l r11, @-r15\n\t" \
40 ".balign 4\n" \ 100 "mov.l r12, @-r15\n\t" \
41 "2:\n\t" \ 101 "mov.l r13, @-r15\n\t" \
42 ".long __switch_to\n" \ 102 "mov.l r14, @-r15\n\t" \
43 "1:\n\t" \ 103 "mov.l r15, @r1\t! save SP\n\t" \
44 "mov.l @r15+, r14\n\t" \ 104 "mov.l @r6, r15\t! change to new stack\n\t" \
45 "mov.l @r15+, r13\n\t" \ 105 "mova 1f, %0\n\t" \
46 "mov.l @r15+, r12\n\t" \ 106 "mov.l %0, @r2\t! save PC\n\t" \
47 "mov.l @r15+, r11\n\t" \ 107 "mov.l 2f, %0\n\t" \
48 "mov.l @r15+, r10\n\t" \ 108 "jmp @%0\t! call __switch_to\n\t" \
49 "mov.l @r15+, r9\n\t" \ 109 " lds r7, pr\t! with return to new PC\n\t" \
50 "mov.l @r15+, r8\n\t" \ 110 ".balign 4\n" \
51 "lds.l @r15+, pr\n\t" \ 111 "2:\n\t" \
52 "ldc.l @r15+, gbr\n\t" \ 112 ".long __switch_to\n" \
53 : "=z" (__last) \ 113 "1:\n\t" \
54 : "r" (__ts1), "r" (__ts2), "r" (__ts4), \ 114 "mov.l @r15+, r14\n\t" \
55 "r" (__ts5), "r" (__ts6), "r" (__ts7) \ 115 "mov.l @r15+, r13\n\t" \
56 : "r3", "t"); \ 116 "mov.l @r15+, r12\n\t" \
57 \ 117 "mov.l @r15+, r11\n\t" \
58 last = __last; \ 118 "mov.l @r15+, r10\n\t" \
119 "mov.l @r15+, r9\n\t" \
120 "mov.l @r15+, r8\n\t" \
121 "lds.l @r15+, pr\n\t" \
122 "ldc.l @r15+, gbr\n\t" \
123 : "=z" (__last) \
124 : "r" (__ts1), "r" (__ts2), "r" (__ts4), \
125 "r" (__ts5), "r" (__ts6), "r" (__ts7) \
126 : "r3", "t"); \
127 \
128 last = __last; \
129} while (0)
130
131#define finish_arch_switch(prev) \
132do { \
133 if (is_dsp_enabled(prev)) \
134 __restore_dsp(prev); \
59} while (0) 135} while (0)
60 136
61#define __uses_jump_to_uncached \ 137#define __uses_jump_to_uncached \
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7786.h b/arch/sh/include/cpu-sh4/cpu/sh7786.h
index 48688adc0c84..977862f9072a 100644
--- a/arch/sh/include/cpu-sh4/cpu/sh7786.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7786.h
@@ -51,142 +51,86 @@ enum {
51 GPIO_PJ7, GPIO_PJ6, GPIO_PJ5, GPIO_PJ4, 51 GPIO_PJ7, GPIO_PJ6, GPIO_PJ5, GPIO_PJ4,
52 GPIO_PJ3, GPIO_PJ2, GPIO_PJ1, GPIO_PJ0, 52 GPIO_PJ3, GPIO_PJ2, GPIO_PJ1, GPIO_PJ0,
53 53
54 GPIO_FN_CDE, 54 /* DU */
55 GPIO_FN_ETH_MAGIC, 55 GPIO_FN_DCLKIN, GPIO_FN_DCLKOUT, GPIO_FN_ODDF,
56 GPIO_FN_DISP, 56 GPIO_FN_VSYNC, GPIO_FN_HSYNC, GPIO_FN_CDE, GPIO_FN_DISP,
57 GPIO_FN_ETH_LINK, 57 GPIO_FN_DR0, GPIO_FN_DG0, GPIO_FN_DB0,
58 GPIO_FN_DR5, 58 GPIO_FN_DR1, GPIO_FN_DG1, GPIO_FN_DB1,
59 GPIO_FN_ETH_TX_ER, 59 GPIO_FN_DR2, GPIO_FN_DG2, GPIO_FN_DB2,
60 GPIO_FN_DR4, 60 GPIO_FN_DR3, GPIO_FN_DG3, GPIO_FN_DB3,
61 GPIO_FN_ETH_TX_EN, 61 GPIO_FN_DR4, GPIO_FN_DG4, GPIO_FN_DB4,
62 GPIO_FN_DR3, 62 GPIO_FN_DR5, GPIO_FN_DG5, GPIO_FN_DB5,
63 GPIO_FN_ETH_TXD3, 63
64 GPIO_FN_DR2, 64 /* Eth */
65 GPIO_FN_ETH_TXD2, 65 GPIO_FN_ETH_MAGIC, GPIO_FN_ETH_LINK, GPIO_FN_ETH_TX_ER,
66 GPIO_FN_DR1, 66 GPIO_FN_ETH_TX_EN, GPIO_FN_ETH_MDIO, GPIO_FN_ETH_RX_CLK,
67 GPIO_FN_ETH_TXD1, 67 GPIO_FN_ETH_MDC, GPIO_FN_ETH_COL, GPIO_FN_ETH_TX_CLK,
68 GPIO_FN_DR0, 68 GPIO_FN_ETH_CRS, GPIO_FN_ETH_RX_DV, GPIO_FN_ETH_RX_ER,
69 GPIO_FN_ETH_TXD0, 69 GPIO_FN_ETH_TXD3, GPIO_FN_ETH_TXD2, GPIO_FN_ETH_TXD1, GPIO_FN_ETH_TXD0,
70 GPIO_FN_VSYNC, 70 GPIO_FN_ETH_RXD3, GPIO_FN_ETH_RXD2, GPIO_FN_ETH_RXD1, GPIO_FN_ETH_RXD0,
71 GPIO_FN_HSPI_CLK, 71
72 GPIO_FN_ODDF, 72 /* HSPI */
73 GPIO_FN_HSPI_CS, 73 GPIO_FN_HSPI_CLK, GPIO_FN_HSPI_CS, GPIO_FN_HSPI_RX, GPIO_FN_HSPI_TX,
74 GPIO_FN_DG5, 74
75 GPIO_FN_ETH_MDIO, 75 /* SCIF0 */
76 GPIO_FN_DG4, 76 GPIO_FN_SCIF0_CTS, GPIO_FN_SCIF0_RTS, GPIO_FN_SCIF0_SCK,
77 GPIO_FN_ETH_RX_CLK, 77 GPIO_FN_SCIF0_RXD, GPIO_FN_SCIF0_TXD,
78 GPIO_FN_DG3, 78
79 GPIO_FN_ETH_MDC, 79 /* SCIF1 */
80 GPIO_FN_DG2, 80 GPIO_FN_SCIF1_SCK, GPIO_FN_SCIF1_RXD, GPIO_FN_SCIF1_TXD,
81 GPIO_FN_ETH_COL, 81
82 GPIO_FN_DG1, 82 /* SCIF3 */
83 GPIO_FN_ETH_TX_CLK, 83 GPIO_FN_SCIF3_SCK, GPIO_FN_SCIF3_RXD, GPIO_FN_SCIF3_TXD,
84 GPIO_FN_DG0, 84
85 GPIO_FN_ETH_CRS, 85 /* SCIF4 */
86 GPIO_FN_DCLKIN, 86 GPIO_FN_SCIF4_SCK, GPIO_FN_SCIF4_RXD, GPIO_FN_SCIF4_TXD,
87 GPIO_FN_HSPI_RX, 87
88 GPIO_FN_HSYNC, 88 /* SCIF5 */
89 GPIO_FN_HSPI_TX, 89 GPIO_FN_SCIF5_SCK, GPIO_FN_SCIF5_RXD, GPIO_FN_SCIF5_TXD,
90 GPIO_FN_DB5, 90
91 GPIO_FN_ETH_RXD3, 91 /* LBSC */
92 GPIO_FN_DB4, 92 GPIO_FN_BREQ, GPIO_FN_IOIS16, GPIO_FN_CE2B, GPIO_FN_CE2A, GPIO_FN_BACK,
93 GPIO_FN_ETH_RXD2, 93
94 GPIO_FN_DB3, 94 /* FLCTL */
95 GPIO_FN_ETH_RXD1, 95 GPIO_FN_FALE, GPIO_FN_FRB, GPIO_FN_FSTATUS,
96 GPIO_FN_DB2, 96 GPIO_FN_FSE, GPIO_FN_FCLE,
97 GPIO_FN_ETH_RXD0, 97
98 GPIO_FN_DB1, 98 /* DMAC */
99 GPIO_FN_ETH_RX_DV, 99 GPIO_FN_DACK0, GPIO_FN_DREQ0, GPIO_FN_DRAK0,
100 GPIO_FN_DB0, 100 GPIO_FN_DACK1, GPIO_FN_DREQ1, GPIO_FN_DRAK1,
101 GPIO_FN_ETH_RX_ER, 101 GPIO_FN_DACK2, GPIO_FN_DREQ2, GPIO_FN_DRAK2,
102 GPIO_FN_DCLKOUT, 102 GPIO_FN_DACK3, GPIO_FN_DREQ3, GPIO_FN_DRAK3,
103 GPIO_FN_SCIF1_SLK, 103
104 GPIO_FN_SCIF1_RXD, 104 /* USB */
105 GPIO_FN_SCIF1_TXD, 105 GPIO_FN_USB_OVC0, GPIO_FN_USB_PENC0,
106 GPIO_FN_DACK1, 106 GPIO_FN_USB_OVC1, GPIO_FN_USB_PENC1,
107 GPIO_FN_BACK, 107
108 GPIO_FN_FALE, 108 /* HAC */
109 GPIO_FN_DACK0,
110 GPIO_FN_FCLE,
111 GPIO_FN_DREQ1,
112 GPIO_FN_BREQ,
113 GPIO_FN_USB_OVC1,
114 GPIO_FN_DREQ0,
115 GPIO_FN_USB_OVC0,
116 GPIO_FN_USB_PENC1,
117 GPIO_FN_USB_PENC0,
118 GPIO_FN_HAC1_SDOUT,
119 GPIO_FN_SSI1_SDATA,
120 GPIO_FN_SDIF1CMD,
121 GPIO_FN_HAC1_SDIN,
122 GPIO_FN_SSI1_SCK,
123 GPIO_FN_SDIF1CD,
124 GPIO_FN_HAC1_SYNC,
125 GPIO_FN_SSI1_WS,
126 GPIO_FN_SDIF1WP,
127 GPIO_FN_HAC1_BITCLK,
128 GPIO_FN_SSI1_CLK,
129 GPIO_FN_SDIF1CLK,
130 GPIO_FN_HAC0_SDOUT,
131 GPIO_FN_SSI0_SDATA,
132 GPIO_FN_SDIF1D3,
133 GPIO_FN_HAC0_SDIN,
134 GPIO_FN_SSI0_SCK,
135 GPIO_FN_SDIF1D2,
136 GPIO_FN_HAC0_SYNC,
137 GPIO_FN_SSI0_WS,
138 GPIO_FN_SDIF1D1,
139 GPIO_FN_HAC0_BITCLK,
140 GPIO_FN_SSI0_CLK,
141 GPIO_FN_SDIF1D0,
142 GPIO_FN_SCIF3_SCK,
143 GPIO_FN_SSI2_SDATA,
144 GPIO_FN_SCIF3_RXD,
145 GPIO_FN_TCLK,
146 GPIO_FN_SSI2_SCK,
147 GPIO_FN_SCIF3_TXD,
148 GPIO_FN_HAC_RES, 109 GPIO_FN_HAC_RES,
149 GPIO_FN_SSI2_WS, 110 GPIO_FN_HAC0_SDOUT, GPIO_FN_HAC0_SDIN,
150 GPIO_FN_DACK3, 111 GPIO_FN_HAC0_SYNC, GPIO_FN_HAC0_BITCLK,
151 GPIO_FN_SDIF0CMD, 112 GPIO_FN_HAC1_SDOUT, GPIO_FN_HAC1_SDIN,
152 GPIO_FN_DACK2, 113 GPIO_FN_HAC1_SYNC, GPIO_FN_HAC1_BITCLK,
153 GPIO_FN_SDIF0CD, 114
154 GPIO_FN_DREQ3, 115 /* SSI */
155 GPIO_FN_SDIF0WP, 116 GPIO_FN_SSI0_SDATA, GPIO_FN_SSI0_SCK, GPIO_FN_SSI0_WS, GPIO_FN_SSI0_CLK,
156 GPIO_FN_SCIF0_CTS, 117 GPIO_FN_SSI1_SDATA, GPIO_FN_SSI1_SCK, GPIO_FN_SSI1_WS, GPIO_FN_SSI1_CLK,
157 GPIO_FN_DREQ2, 118 GPIO_FN_SSI2_SDATA, GPIO_FN_SSI2_SCK, GPIO_FN_SSI2_WS,
158 GPIO_FN_SDIF0CLK, 119 GPIO_FN_SSI3_SDATA, GPIO_FN_SSI3_SCK, GPIO_FN_SSI3_WS,
159 GPIO_FN_SCIF0_RTS, 120
160 GPIO_FN_IRL7, 121 /* SDIF1 */
161 GPIO_FN_SDIF0D3, 122 GPIO_FN_SDIF1CMD, GPIO_FN_SDIF1CD, GPIO_FN_SDIF1WP, GPIO_FN_SDIF1CLK,
162 GPIO_FN_SCIF0_SCK, 123 GPIO_FN_SDIF1D3, GPIO_FN_SDIF1D2, GPIO_FN_SDIF1D1, GPIO_FN_SDIF1D0,
163 GPIO_FN_IRL6, 124
164 GPIO_FN_SDIF0D2, 125 /* SDIF0 */
165 GPIO_FN_SCIF0_RXD, 126 GPIO_FN_SDIF0CMD, GPIO_FN_SDIF0CD, GPIO_FN_SDIF0WP, GPIO_FN_SDIF0CLK,
166 GPIO_FN_IRL5, 127 GPIO_FN_SDIF0D3, GPIO_FN_SDIF0D2, GPIO_FN_SDIF0D1, GPIO_FN_SDIF0D0,
167 GPIO_FN_SDIF0D1, 128
168 GPIO_FN_SCIF0_TXD, 129 /* TMU */
169 GPIO_FN_IRL4, 130 GPIO_FN_TCLK,
170 GPIO_FN_SDIF0D0, 131
171 GPIO_FN_SCIF5_SCK, 132 /* INTC */
172 GPIO_FN_FRB, 133 GPIO_FN_IRL7, GPIO_FN_IRL6, GPIO_FN_IRL5, GPIO_FN_IRL4,
173 GPIO_FN_SCIF5_RXD,
174 GPIO_FN_IOIS16,
175 GPIO_FN_SCIF5_TXD,
176 GPIO_FN_CE2B,
177 GPIO_FN_DRAK3,
178 GPIO_FN_CE2A,
179 GPIO_FN_SCIF4_SCK,
180 GPIO_FN_DRAK2,
181 GPIO_FN_SSI3_WS,
182 GPIO_FN_SCIF4_RXD,
183 GPIO_FN_DRAK1,
184 GPIO_FN_SSI3_SDATA,
185 GPIO_FN_FSTATUS,
186 GPIO_FN_SCIF4_TXD,
187 GPIO_FN_DRAK0,
188 GPIO_FN_SSI3_SCK,
189 GPIO_FN_FSE,
190}; 134};
191 135
192#endif /* __CPU_SH7786_H__ */ 136#endif /* __CPU_SH7786_H__ */
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index 55da0ff9848d..3cb531f233f2 100644
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -254,40 +254,6 @@ restore_all:
254 254
255 lds k2, pr ! restore pr 255 lds k2, pr ! restore pr
256 ! 256 !
257#ifdef CONFIG_SH_DSP
258 mov.l @r15+, k0 ! DSP mode marker
259 mov.l 5f, k1
260 cmp/eq k0, k1 ! Do we have a DSP stack frame?
261 bf skip_restore
262
263 stc sr, k0 ! Enable CPU DSP mode
264 or k1, k0 ! (within kernel it may be disabled)
265 ldc k0, sr
266 mov r2, k0 ! Backup r2
267
268 ! Restore DSP registers from stack
269 mov r15, r2
270 movs.l @r2+, a1
271 movs.l @r2+, a0g
272 movs.l @r2+, a1g
273 movs.l @r2+, m0
274 movs.l @r2+, m1
275 mov r2, r15
276
277 lds.l @r15+, a0
278 lds.l @r15+, x0
279 lds.l @r15+, x1
280 lds.l @r15+, y0
281 lds.l @r15+, y1
282 lds.l @r15+, dsr
283 ldc.l @r15+, rs
284 ldc.l @r15+, re
285 ldc.l @r15+, mod
286
287 mov k0, r2 ! Restore r2
288skip_restore:
289#endif
290 !
291 ! Calculate new SR value 257 ! Calculate new SR value
292 mov k3, k2 ! original SR value 258 mov k3, k2 ! original SR value
293 mov #0xf0, k1 259 mov #0xf0, k1
@@ -358,7 +324,7 @@ general_exception:
358 add k0, k4 324 add k0, k4
3590: 3250:
360 ! Setup stack and save DSP context (k0 contains original r15 on return) 326 ! Setup stack and save DSP context (k0 contains original r15 on return)
361 bsr prepare_stack_save_dsp 327 bsr prepare_stack
362 nop 328 nop
363 329
364 ! Save registers / Switch to bank 0 330 ! Save registers / Switch to bank 0
@@ -374,15 +340,14 @@ general_exception:
3741: .long EXPEVT 3401: .long EXPEVT
375#endif 341#endif
376 342
377! prepare_stack_save_dsp() 343! prepare_stack()
378! - roll back gRB 344! - roll back gRB
379! - switch to kernel stack 345! - switch to kernel stack
380! - save DSP
381! k0 returns original sp (after roll back) 346! k0 returns original sp (after roll back)
382! k1 trashed 347! k1 trashed
383! k2 trashed 348! k2 trashed
384 349
385prepare_stack_save_dsp: 350prepare_stack:
386#ifdef CONFIG_GUSA 351#ifdef CONFIG_GUSA
387 ! Check for roll back gRB (User and Kernel) 352 ! Check for roll back gRB (User and Kernel)
388 mov r15, k0 353 mov r15, k0
@@ -416,47 +381,9 @@ prepare_stack_save_dsp:
416 mov k1, r15 ! change to kernel stack 381 mov k1, r15 ! change to kernel stack
417 ! 382 !
4181: 3831:
419#ifdef CONFIG_SH_DSP
420 ! Save DSP context if needed
421 stc sr, k1
422 mov #0x10, k2
423 shll8 k2 ! DSP=1 (0x00001000)
424 tst k2, k1 ! Check if in DSP mode (passed in k2)
425 bt/s skip_save
426 mov #0, k1 ! Set marker for no stack frame
427
428 mov k2, k1 ! Save has-frame marker
429
430 ! Save DSP registers on stack
431 stc.l mod, @-r15
432 stc.l re, @-r15
433 stc.l rs, @-r15
434 sts.l dsr, @-r15
435 sts.l y1, @-r15
436 sts.l y0, @-r15
437 sts.l x1, @-r15
438 sts.l x0, @-r15
439 sts.l a0, @-r15
440
441 ! GAS is broken, does not generate correct "movs.l Ds,@-As" instr.
442
443 ! FIXME: Make sure that this is still the case with newer toolchains,
444 ! as we're not at all interested in supporting ancient toolchains at
445 ! this point. -- PFM.
446
447 mov r15, k2
448 .word 0xf653 ! movs.l a1, @-r2
449 .word 0xf6f3 ! movs.l a0g, @-r2
450 .word 0xf6d3 ! movs.l a1g, @-r2
451 .word 0xf6c3 ! movs.l m0, @-r2
452 .word 0xf6e3 ! movs.l m1, @-r2
453 mov k2, r15
454
455skip_save:
456 mov.l k1, @-r15 ! Push DSP mode marker onto stack
457#endif
458 rts 384 rts
459 nop 385 nop
386
460! 387!
461! 0x400: Instruction and Data TLB miss exception vector 388! 0x400: Instruction and Data TLB miss exception vector
462! 389!
@@ -468,7 +395,7 @@ handle_exception:
468 mova exception_data, k0 395 mova exception_data, k0
469 396
470 ! Setup stack and save DSP context (k0 contains original r15 on return) 397 ! Setup stack and save DSP context (k0 contains original r15 on return)
471 bsr prepare_stack_save_dsp 398 bsr prepare_stack
472 PREF(k0) 399 PREF(k0)
473 400
474 ! Save registers / Switch to bank 0 401 ! Save registers / Switch to bank 0
@@ -572,7 +499,7 @@ ENTRY(handle_interrupt)
572 mova exception_data, k0 499 mova exception_data, k0
573 500
574 ! Setup stack and save DSP context (k0 contains original r15 on return) 501 ! Setup stack and save DSP context (k0 contains original r15 on return)
575 bsr prepare_stack_save_dsp 502 bsr prepare_stack
576 PREF(k0) 503 PREF(k0)
577 504
578 ! Save registers / Switch to bank 0 505 ! Save registers / Switch to bank 0
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 3d3a3c4425a9..91e3677ae09d 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -199,11 +199,6 @@ int __init detect_cpu_and_cache_system(void)
199 break; 199 break;
200 } 200 }
201 201
202#ifdef CONFIG_SH_DIRECT_MAPPED
203 boot_cpu_data.icache.ways = 1;
204 boot_cpu_data.dcache.ways = 1;
205#endif
206
207#ifdef CONFIG_CPU_HAS_PTEA 202#ifdef CONFIG_CPU_HAS_PTEA
208 boot_cpu_data.flags |= CPU_HAS_PTEA; 203 boot_cpu_data.flags |= CPU_HAS_PTEA;
209#endif 204#endif
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c b/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
index 373b3447bfdf..4229e0724c89 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c
@@ -149,150 +149,44 @@ enum {
149 PINMUX_FUNCTION_END, 149 PINMUX_FUNCTION_END,
150 150
151 PINMUX_MARK_BEGIN, 151 PINMUX_MARK_BEGIN,
152 CDE_MARK, 152 DCLKIN_MARK, DCLKOUT_MARK, ODDF_MARK,
153 ETH_MAGIC_MARK, 153 VSYNC_MARK, HSYNC_MARK, CDE_MARK, DISP_MARK,
154 DISP_MARK, 154 DR0_MARK, DR1_MARK, DR2_MARK, DR3_MARK, DR4_MARK, DR5_MARK,
155 ETH_LINK_MARK, 155 DG0_MARK, DG1_MARK, DG2_MARK, DG3_MARK, DG4_MARK, DG5_MARK,
156 DR5_MARK, 156 DB0_MARK, DB1_MARK, DB2_MARK, DB3_MARK, DB4_MARK, DB5_MARK,
157 ETH_TX_ER_MARK, 157 ETH_MAGIC_MARK, ETH_LINK_MARK, ETH_TX_ER_MARK, ETH_TX_EN_MARK,
158 DR4_MARK, 158 ETH_MDIO_MARK, ETH_RX_CLK_MARK, ETH_MDC_MARK, ETH_COL_MARK,
159 ETH_TX_EN_MARK, 159 ETH_TX_CLK_MARK, ETH_CRS_MARK, ETH_RX_DV_MARK, ETH_RX_ER_MARK,
160 DR3_MARK, 160 ETH_TXD3_MARK, ETH_TXD2_MARK, ETH_TXD1_MARK, ETH_TXD0_MARK,
161 ETH_TXD3_MARK, 161 ETH_RXD3_MARK, ETH_RXD2_MARK, ETH_RXD1_MARK, ETH_RXD0_MARK,
162 DR2_MARK, 162 HSPI_CLK_MARK, HSPI_CS_MARK, HSPI_RX_MARK, HSPI_TX_MARK,
163 ETH_TXD2_MARK, 163 SCIF0_CTS_MARK, SCIF0_RTS_MARK,
164 DR1_MARK, 164 SCIF0_SCK_MARK, SCIF0_RXD_MARK, SCIF0_TXD_MARK,
165 ETH_TXD1_MARK, 165 SCIF1_SCK_MARK, SCIF1_RXD_MARK, SCIF1_TXD_MARK,
166 DR0_MARK, 166 SCIF3_SCK_MARK, SCIF3_RXD_MARK, SCIF3_TXD_MARK,
167 ETH_TXD0_MARK, 167 SCIF4_SCK_MARK, SCIF4_RXD_MARK, SCIF4_TXD_MARK,
168 168 SCIF5_SCK_MARK, SCIF5_RXD_MARK, SCIF5_TXD_MARK,
169 VSYNC_MARK, 169 BREQ_MARK, IOIS16_MARK, CE2B_MARK, CE2A_MARK, BACK_MARK,
170 HSPI_CLK_MARK, 170 FALE_MARK, FRB_MARK, FSTATUS_MARK,
171 ODDF_MARK, 171 FSE_MARK, FCLE_MARK,
172 HSPI_CS_MARK, 172 DACK0_MARK, DACK1_MARK, DACK2_MARK, DACK3_MARK,
173 DG5_MARK, 173 DREQ0_MARK, DREQ1_MARK, DREQ2_MARK, DREQ3_MARK,
174 ETH_MDIO_MARK, 174 DRAK0_MARK, DRAK1_MARK, DRAK2_MARK, DRAK3_MARK,
175 DG4_MARK, 175 USB_OVC1_MARK, USB_OVC0_MARK,
176 ETH_RX_CLK_MARK, 176 USB_PENC1_MARK, USB_PENC0_MARK,
177 DG3_MARK,
178 ETH_MDC_MARK,
179 DG2_MARK,
180 ETH_COL_MARK,
181 DG1_MARK,
182 ETH_TX_CLK_MARK,
183 DG0_MARK,
184 ETH_CRS_MARK,
185
186 DCLKIN_MARK,
187 HSPI_RX_MARK,
188 HSYNC_MARK,
189 HSPI_TX_MARK,
190 DB5_MARK,
191 ETH_RXD3_MARK,
192 DB4_MARK,
193 ETH_RXD2_MARK,
194 DB3_MARK,
195 ETH_RXD1_MARK,
196 DB2_MARK,
197 ETH_RXD0_MARK,
198 DB1_MARK,
199 ETH_RX_DV_MARK,
200 DB0_MARK,
201 ETH_RX_ER_MARK,
202
203 DCLKOUT_MARK,
204 SCIF1_SLK_MARK,
205 SCIF1_RXD_MARK,
206 SCIF1_TXD_MARK,
207 DACK1_MARK,
208 BACK_MARK,
209 FALE_MARK,
210 DACK0_MARK,
211 FCLE_MARK,
212 DREQ1_MARK,
213 BREQ_MARK,
214 USB_OVC1_MARK,
215 DREQ0_MARK,
216 USB_OVC0_MARK,
217
218 USB_PENC1_MARK,
219 USB_PENC0_MARK,
220
221 HAC1_SDOUT_MARK,
222 SSI1_SDATA_MARK,
223 SDIF1CMD_MARK,
224 HAC1_SDIN_MARK,
225 SSI1_SCK_MARK,
226 SDIF1CD_MARK,
227 HAC1_SYNC_MARK,
228 SSI1_WS_MARK,
229 SDIF1WP_MARK,
230 HAC1_BITCLK_MARK,
231 SSI1_CLK_MARK,
232 SDIF1CLK_MARK,
233 HAC0_SDOUT_MARK,
234 SSI0_SDATA_MARK,
235 SDIF1D3_MARK,
236 HAC0_SDIN_MARK,
237 SSI0_SCK_MARK,
238 SDIF1D2_MARK,
239 HAC0_SYNC_MARK,
240 SSI0_WS_MARK,
241 SDIF1D1_MARK,
242 HAC0_BITCLK_MARK,
243 SSI0_CLK_MARK,
244 SDIF1D0_MARK,
245
246 SCIF3_SCK_MARK,
247 SSI2_SDATA_MARK,
248 SCIF3_RXD_MARK,
249 TCLK_MARK,
250 SSI2_SCK_MARK,
251 SCIF3_TXD_MARK,
252 HAC_RES_MARK, 177 HAC_RES_MARK,
253 SSI2_WS_MARK, 178 HAC1_SDOUT_MARK, HAC1_SDIN_MARK, HAC1_SYNC_MARK, HAC1_BITCLK_MARK,
254 179 HAC0_SDOUT_MARK, HAC0_SDIN_MARK, HAC0_SYNC_MARK, HAC0_BITCLK_MARK,
255 DACK3_MARK, 180 SSI0_SDATA_MARK, SSI0_SCK_MARK, SSI0_WS_MARK, SSI0_CLK_MARK,
256 SDIF0CMD_MARK, 181 SSI1_SDATA_MARK, SSI1_SCK_MARK, SSI1_WS_MARK, SSI1_CLK_MARK,
257 DACK2_MARK, 182 SSI2_SDATA_MARK, SSI2_SCK_MARK, SSI2_WS_MARK,
258 SDIF0CD_MARK, 183 SSI3_SDATA_MARK, SSI3_SCK_MARK, SSI3_WS_MARK,
259 DREQ3_MARK, 184 SDIF1CMD_MARK, SDIF1CD_MARK, SDIF1WP_MARK, SDIF1CLK_MARK,
260 SDIF0WP_MARK, 185 SDIF1D3_MARK, SDIF1D2_MARK, SDIF1D1_MARK, SDIF1D0_MARK,
261 SCIF0_CTS_MARK, 186 SDIF0CMD_MARK, SDIF0CD_MARK, SDIF0WP_MARK, SDIF0CLK_MARK,
262 DREQ2_MARK, 187 SDIF0D3_MARK, SDIF0D2_MARK, SDIF0D1_MARK, SDIF0D0_MARK,
263 SDIF0CLK_MARK, 188 TCLK_MARK,
264 SCIF0_RTS_MARK, 189 IRL7_MARK, IRL6_MARK, IRL5_MARK, IRL4_MARK,
265 IRL7_MARK,
266 SDIF0D3_MARK,
267 SCIF0_SCK_MARK,
268 IRL6_MARK,
269 SDIF0D2_MARK,
270 SCIF0_RXD_MARK,
271 IRL5_MARK,
272 SDIF0D1_MARK,
273 SCIF0_TXD_MARK,
274 IRL4_MARK,
275 SDIF0D0_MARK,
276
277 SCIF5_SCK_MARK,
278 FRB_MARK,
279 SCIF5_RXD_MARK,
280 IOIS16_MARK,
281 SCIF5_TXD_MARK,
282 CE2B_MARK,
283 DRAK3_MARK,
284 CE2A_MARK,
285 SCIF4_SCK_MARK,
286 DRAK2_MARK,
287 SSI3_WS_MARK,
288 SCIF4_RXD_MARK,
289 DRAK1_MARK,
290 SSI3_SDATA_MARK,
291 FSTATUS_MARK,
292 SCIF4_TXD_MARK,
293 DRAK0_MARK,
294 SSI3_SCK_MARK,
295 FSE_MARK,
296 PINMUX_MARK_END, 190 PINMUX_MARK_END,
297}; 191};
298 192
@@ -377,7 +271,6 @@ static pinmux_enum_t pinmux_data[] = {
377 PINMUX_DATA(PJ1_DATA, PJ1_IN, PJ1_OUT, PJ1_IN_PU), 271 PINMUX_DATA(PJ1_DATA, PJ1_IN, PJ1_OUT, PJ1_IN_PU),
378 272
379 /* PA FN */ 273 /* PA FN */
380 PINMUX_MARK_BEGIN,
381 PINMUX_DATA(CDE_MARK, P1MSEL2_0, PA7_FN), 274 PINMUX_DATA(CDE_MARK, P1MSEL2_0, PA7_FN),
382 PINMUX_DATA(DISP_MARK, P1MSEL2_0, PA6_FN), 275 PINMUX_DATA(DISP_MARK, P1MSEL2_0, PA6_FN),
383 PINMUX_DATA(DR5_MARK, P1MSEL2_0, PA5_FN), 276 PINMUX_DATA(DR5_MARK, P1MSEL2_0, PA5_FN),
@@ -434,7 +327,7 @@ static pinmux_enum_t pinmux_data[] = {
434 327
435 /* PD FN */ 328 /* PD FN */
436 PINMUX_DATA(DCLKOUT_MARK, PD7_FN), 329 PINMUX_DATA(DCLKOUT_MARK, PD7_FN),
437 PINMUX_DATA(SCIF1_SLK_MARK, PD6_FN), 330 PINMUX_DATA(SCIF1_SCK_MARK, PD6_FN),
438 PINMUX_DATA(SCIF1_RXD_MARK, PD5_FN), 331 PINMUX_DATA(SCIF1_RXD_MARK, PD5_FN),
439 PINMUX_DATA(SCIF1_TXD_MARK, PD4_FN), 332 PINMUX_DATA(SCIF1_TXD_MARK, PD4_FN),
440 PINMUX_DATA(DACK1_MARK, P1MSEL13_1, P1MSEL12_0, PD3_FN), 333 PINMUX_DATA(DACK1_MARK, P1MSEL13_1, P1MSEL12_0, PD3_FN),
@@ -662,7 +555,7 @@ static struct pinmux_gpio pinmux_gpios[] = {
662 PINMUX_GPIO(GPIO_FN_DB0, DB0_MARK), 555 PINMUX_GPIO(GPIO_FN_DB0, DB0_MARK),
663 PINMUX_GPIO(GPIO_FN_ETH_RX_ER, ETH_RX_ER_MARK), 556 PINMUX_GPIO(GPIO_FN_ETH_RX_ER, ETH_RX_ER_MARK),
664 PINMUX_GPIO(GPIO_FN_DCLKOUT, DCLKOUT_MARK), 557 PINMUX_GPIO(GPIO_FN_DCLKOUT, DCLKOUT_MARK),
665 PINMUX_GPIO(GPIO_FN_SCIF1_SLK, SCIF1_SLK_MARK), 558 PINMUX_GPIO(GPIO_FN_SCIF1_SCK, SCIF1_SCK_MARK),
666 PINMUX_GPIO(GPIO_FN_SCIF1_RXD, SCIF1_RXD_MARK), 559 PINMUX_GPIO(GPIO_FN_SCIF1_RXD, SCIF1_RXD_MARK),
667 PINMUX_GPIO(GPIO_FN_SCIF1_TXD, SCIF1_TXD_MARK), 560 PINMUX_GPIO(GPIO_FN_SCIF1_TXD, SCIF1_TXD_MARK),
668 PINMUX_GPIO(GPIO_FN_DACK1, DACK1_MARK), 561 PINMUX_GPIO(GPIO_FN_DACK1, DACK1_MARK),
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index fe59ccfc1152..f35ed0348850 100644
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -38,7 +38,7 @@ static int __init hlt_setup(char *__unused)
38} 38}
39__setup("hlt", hlt_setup); 39__setup("hlt", hlt_setup);
40 40
41static void default_idle(void) 41void default_idle(void)
42{ 42{
43 if (!hlt_counter) { 43 if (!hlt_counter) {
44 clear_thread_flag(TIF_POLLING_NRFLAG); 44 clear_thread_flag(TIF_POLLING_NRFLAG);
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 39cd7f3aec7b..c22853b059ef 100644
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -14,6 +14,7 @@
14#include <linux/bitops.h> 14#include <linux/bitops.h>
15#include <linux/vmalloc.h> 15#include <linux/vmalloc.h>
16#include <linux/module.h> 16#include <linux/module.h>
17#include <linux/init.h>
17#include <asm/system.h> 18#include <asm/system.h>
18#include <asm/mmu_context.h> 19#include <asm/mmu_context.h>
19#include <asm/uaccess.h> 20#include <asm/uaccess.h>
@@ -32,6 +33,15 @@ EXPORT_SYMBOL_GPL(trapped_mem);
32#endif 33#endif
33static DEFINE_SPINLOCK(trapped_lock); 34static DEFINE_SPINLOCK(trapped_lock);
34 35
36static int trapped_io_disable __read_mostly;
37
38static int __init trapped_io_setup(char *__unused)
39{
40 trapped_io_disable = 1;
41 return 1;
42}
43__setup("noiotrap", trapped_io_setup);
44
35int register_trapped_io(struct trapped_io *tiop) 45int register_trapped_io(struct trapped_io *tiop)
36{ 46{
37 struct resource *res; 47 struct resource *res;
@@ -39,6 +49,9 @@ int register_trapped_io(struct trapped_io *tiop)
39 struct page *pages[TRAPPED_PAGES_MAX]; 49 struct page *pages[TRAPPED_PAGES_MAX];
40 int k, n; 50 int k, n;
41 51
52 if (unlikely(trapped_io_disable))
53 return 0;
54
42 /* structure must be page aligned */ 55 /* structure must be page aligned */
43 if ((unsigned long)tiop & (PAGE_SIZE - 1)) 56 if ((unsigned long)tiop & (PAGE_SIZE - 1))
44 goto bad; 57 goto bad;
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index 694bc15f84fd..6d94725d22f2 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -176,14 +176,26 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
176{ 176{
177 struct thread_info *ti = task_thread_info(p); 177 struct thread_info *ti = task_thread_info(p);
178 struct pt_regs *childregs; 178 struct pt_regs *childregs;
179#if defined(CONFIG_SH_FPU) 179#if defined(CONFIG_SH_FPU) || defined(CONFIG_SH_DSP)
180 struct task_struct *tsk = current; 180 struct task_struct *tsk = current;
181#endif
181 182
183#if defined(CONFIG_SH_FPU)
182 unlazy_fpu(tsk, regs); 184 unlazy_fpu(tsk, regs);
183 p->thread.fpu = tsk->thread.fpu; 185 p->thread.fpu = tsk->thread.fpu;
184 copy_to_stopped_child_used_math(p); 186 copy_to_stopped_child_used_math(p);
185#endif 187#endif
186 188
189#if defined(CONFIG_SH_DSP)
190 if (is_dsp_enabled(tsk)) {
191 /* We can use the __save_dsp or just copy the struct:
192 * __save_dsp(p);
193 * p->thread.dsp_status.status |= SR_DSP
194 */
195 p->thread.dsp_status = tsk->thread.dsp_status;
196 }
197#endif
198
187 childregs = task_pt_regs(p); 199 childregs = task_pt_regs(p);
188 *childregs = *regs; 200 *childregs = *regs;
189 201
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index 29ca09d24ef8..f7b22dd83b0c 100644
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -200,7 +200,8 @@ static int dspregs_get(struct task_struct *target,
200 unsigned int pos, unsigned int count, 200 unsigned int pos, unsigned int count,
201 void *kbuf, void __user *ubuf) 201 void *kbuf, void __user *ubuf)
202{ 202{
203 const struct pt_dspregs *regs = task_pt_dspregs(target); 203 const struct pt_dspregs *regs =
204 (struct pt_dspregs *)&target->thread.dsp_status.dsp_regs;
204 int ret; 205 int ret;
205 206
206 ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, regs, 207 ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, regs,
@@ -217,7 +218,8 @@ static int dspregs_set(struct task_struct *target,
217 unsigned int pos, unsigned int count, 218 unsigned int pos, unsigned int count,
218 const void *kbuf, const void __user *ubuf) 219 const void *kbuf, const void __user *ubuf)
219{ 220{
220 struct pt_dspregs *regs = task_pt_dspregs(target); 221 struct pt_dspregs *regs =
222 (struct pt_dspregs *)&target->thread.dsp_status.dsp_regs;
221 int ret; 223 int ret;
222 224
223 ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, regs, 225 ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, regs,
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 24c60251f680..04a6004fccc4 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -103,12 +103,11 @@ static int __init early_parse_mem(char *p)
103 size = memparse(p, &p); 103 size = memparse(p, &p);
104 104
105 if (size > __MEMORY_SIZE) { 105 if (size > __MEMORY_SIZE) {
106 static char msg[] __initdata = KERN_ERR 106 printk(KERN_ERR
107 "Using mem= to increase the size of kernel memory " 107 "Using mem= to increase the size of kernel memory "
108 "is not allowed.\n" 108 "is not allowed.\n"
109 " Recompile the kernel with the correct value for " 109 " Recompile the kernel with the correct value for "
110 "CONFIG_MEMORY_SIZE.\n"; 110 "CONFIG_MEMORY_SIZE.\n");
111 printk(msg);
112 return 0; 111 return 0;
113 } 112 }
114 113
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 60dcf87ed019..30ca9c51e52d 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -664,6 +664,8 @@ asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
664 if (is_dsp_inst(regs)) { 664 if (is_dsp_inst(regs)) {
665 /* Enable DSP mode, and restart instruction. */ 665 /* Enable DSP mode, and restart instruction. */
666 regs->sr |= SR_DSP; 666 regs->sr |= SR_DSP;
667 /* Save DSP mode */
668 tsk->thread.dsp_status.status |= SR_DSP;
667 return; 669 return;
668 } 670 }
669#endif 671#endif
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 10c24356d2d5..d4079cab2d58 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -251,18 +251,6 @@ config SH7705_CACHE_32KB
251 depends on CPU_SUBTYPE_SH7705 251 depends on CPU_SUBTYPE_SH7705
252 default y 252 default y
253 253
254config SH_DIRECT_MAPPED
255 bool "Use direct-mapped caching"
256 default n
257 help
258 Selecting this option will configure the caches to be direct-mapped,
259 even if the cache supports a 2 or 4-way mode. This is useful primarily
260 for debugging on platforms with 2 and 4-way caches (SH7750R/SH7751R,
261 SH4-202, SH4-501, etc.)
262
263 Turn this option off for platforms that do not have a direct-mapped
264 cache, and you have no need to run the caches in such a configuration.
265
266choice 254choice
267 prompt "Cache mode" 255 prompt "Cache mode"
268 default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5 256 default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5
diff --git a/arch/sparc/include/asm/mmzone.h b/arch/sparc/include/asm/mmzone.h
index ebf5986c12ed..e8c648741ed4 100644
--- a/arch/sparc/include/asm/mmzone.h
+++ b/arch/sparc/include/asm/mmzone.h
@@ -3,6 +3,8 @@
3 3
4#ifdef CONFIG_NEED_MULTIPLE_NODES 4#ifdef CONFIG_NEED_MULTIPLE_NODES
5 5
6#include <linux/cpumask.h>
7
6extern struct pglist_data *node_data[]; 8extern struct pglist_data *node_data[];
7 9
8#define NODE_DATA(nid) (node_data[nid]) 10#define NODE_DATA(nid) (node_data[nid])
diff --git a/arch/um/include/asm/ftrace.h b/arch/um/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/um/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5696cec7b4b0..5b2196ab8168 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -34,6 +34,8 @@ config X86
34 select HAVE_FUNCTION_TRACER 34 select HAVE_FUNCTION_TRACER
35 select HAVE_FUNCTION_GRAPH_TRACER 35 select HAVE_FUNCTION_GRAPH_TRACER
36 select HAVE_FUNCTION_TRACE_MCOUNT_TEST 36 select HAVE_FUNCTION_TRACE_MCOUNT_TEST
37 select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
38 select HAVE_FTRACE_SYSCALLS
37 select HAVE_KVM 39 select HAVE_KVM
38 select HAVE_ARCH_KGDB 40 select HAVE_ARCH_KGDB
39 select HAVE_ARCH_TRACEHOOK 41 select HAVE_ARCH_TRACEHOOK
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index b3894bf52fcd..e55dfc1ad453 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -126,6 +126,11 @@ void clflush_cache_range(void *addr, unsigned int size);
126#ifdef CONFIG_DEBUG_RODATA 126#ifdef CONFIG_DEBUG_RODATA
127void mark_rodata_ro(void); 127void mark_rodata_ro(void);
128extern const int rodata_test_data; 128extern const int rodata_test_data;
129void set_kernel_text_rw(void);
130void set_kernel_text_ro(void);
131#else
132static inline void set_kernel_text_rw(void) { }
133static inline void set_kernel_text_ro(void) { }
129#endif 134#endif
130 135
131#ifdef CONFIG_DEBUG_RODATA_TEST 136#ifdef CONFIG_DEBUG_RODATA_TEST
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index a7f3c75f8ad7..61c852fa346b 100644
--- a/arch/x86/include/asm/cpumask.h
+++ b/arch/x86/include/asm/cpumask.h
@@ -3,8 +3,6 @@
3#ifndef __ASSEMBLY__ 3#ifndef __ASSEMBLY__
4#include <linux/cpumask.h> 4#include <linux/cpumask.h>
5 5
6#ifdef CONFIG_X86_64
7
8extern cpumask_var_t cpu_callin_mask; 6extern cpumask_var_t cpu_callin_mask;
9extern cpumask_var_t cpu_callout_mask; 7extern cpumask_var_t cpu_callout_mask;
10extern cpumask_var_t cpu_initialized_mask; 8extern cpumask_var_t cpu_initialized_mask;
@@ -12,21 +10,5 @@ extern cpumask_var_t cpu_sibling_setup_mask;
12 10
13extern void setup_cpu_local_masks(void); 11extern void setup_cpu_local_masks(void);
14 12
15#else /* CONFIG_X86_32 */
16
17extern cpumask_t cpu_callin_map;
18extern cpumask_t cpu_callout_map;
19extern cpumask_t cpu_initialized;
20extern cpumask_t cpu_sibling_setup_map;
21
22#define cpu_callin_mask ((struct cpumask *)&cpu_callin_map)
23#define cpu_callout_mask ((struct cpumask *)&cpu_callout_map)
24#define cpu_initialized_mask ((struct cpumask *)&cpu_initialized)
25#define cpu_sibling_setup_mask ((struct cpumask *)&cpu_sibling_setup_map)
26
27static inline void setup_cpu_local_masks(void) { }
28
29#endif /* CONFIG_X86_32 */
30
31#endif /* __ASSEMBLY__ */ 13#endif /* __ASSEMBLY__ */
32#endif /* _ASM_X86_CPUMASK_H */ 14#endif /* _ASM_X86_CPUMASK_H */
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index 63a79c77d220..81937a5dc77c 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -111,6 +111,8 @@ enum fixed_addresses {
111#ifdef CONFIG_PARAVIRT 111#ifdef CONFIG_PARAVIRT
112 FIX_PARAVIRT_BOOTMAP, 112 FIX_PARAVIRT_BOOTMAP,
113#endif 113#endif
114 FIX_TEXT_POKE0, /* reserve 2 pages for text_poke() */
115 FIX_TEXT_POKE1,
114 __end_of_permanent_fixed_addresses, 116 __end_of_permanent_fixed_addresses,
115#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT 117#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
116 FIX_OHCI1394_BASE, 118 FIX_OHCI1394_BASE,
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index db24c2278be0..bd2c6511c887 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -28,6 +28,13 @@
28 28
29#endif 29#endif
30 30
31/* FIXME: I don't want to stay hardcoded */
32#ifdef CONFIG_X86_64
33# define FTRACE_SYSCALL_MAX 296
34#else
35# define FTRACE_SYSCALL_MAX 333
36#endif
37
31#ifdef CONFIG_FUNCTION_TRACER 38#ifdef CONFIG_FUNCTION_TRACER
32#define MCOUNT_ADDR ((long)(mcount)) 39#define MCOUNT_ADDR ((long)(mcount))
33#define MCOUNT_INSN_SIZE 5 /* sizeof mcount call */ 40#define MCOUNT_INSN_SIZE 5 /* sizeof mcount call */
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index e545ea01abcf..b51a1e8b0baf 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -140,11 +140,6 @@ static inline int __pcibus_to_node(const struct pci_bus *bus)
140 return sd->node; 140 return sd->node;
141} 141}
142 142
143static inline cpumask_t __pcibus_to_cpumask(struct pci_bus *bus)
144{
145 return node_to_cpumask(__pcibus_to_node(bus));
146}
147
148static inline const struct cpumask * 143static inline const struct cpumask *
149cpumask_of_pcibus(const struct pci_bus *bus) 144cpumask_of_pcibus(const struct pci_bus *bus)
150{ 145{
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index ae85a8d66a30..34c52370f2fe 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -94,7 +94,7 @@ struct cpuinfo_x86 {
94 unsigned long loops_per_jiffy; 94 unsigned long loops_per_jiffy;
95#ifdef CONFIG_SMP 95#ifdef CONFIG_SMP
96 /* cpus sharing the last level cache: */ 96 /* cpus sharing the last level cache: */
97 cpumask_t llc_shared_map; 97 cpumask_var_t llc_shared_map;
98#endif 98#endif
99 /* cpuid returned max cores value: */ 99 /* cpuid returned max cores value: */
100 u16 x86_max_cores; 100 u16 x86_max_cores;
@@ -736,6 +736,7 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
736extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx); 736extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
737 737
738extern void select_idle_routine(const struct cpuinfo_x86 *c); 738extern void select_idle_routine(const struct cpuinfo_x86 *c);
739extern void init_c1e_mask(void);
739 740
740extern unsigned long boot_option_idle_override; 741extern unsigned long boot_option_idle_override;
741extern unsigned long idle_halt; 742extern unsigned long idle_halt;
diff --git a/arch/x86/include/asm/ptrace-abi.h b/arch/x86/include/asm/ptrace-abi.h
index 8e0f8d199e05..86723035a515 100644
--- a/arch/x86/include/asm/ptrace-abi.h
+++ b/arch/x86/include/asm/ptrace-abi.h
@@ -80,8 +80,6 @@
80 80
81#define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */ 81#define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */
82 82
83#ifdef CONFIG_X86_PTRACE_BTS
84
85#ifndef __ASSEMBLY__ 83#ifndef __ASSEMBLY__
86#include <linux/types.h> 84#include <linux/types.h>
87 85
@@ -140,6 +138,5 @@ struct ptrace_bts_config {
140 BTS records are read from oldest to newest. 138 BTS records are read from oldest to newest.
141 Returns number of BTS records drained. 139 Returns number of BTS records drained.
142*/ 140*/
143#endif /* CONFIG_X86_PTRACE_BTS */
144 141
145#endif /* _ASM_X86_PTRACE_ABI_H */ 142#endif /* _ASM_X86_PTRACE_ABI_H */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 47d0e21f2b9e..19e0d88b966d 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -21,19 +21,19 @@
21extern int smp_num_siblings; 21extern int smp_num_siblings;
22extern unsigned int num_processors; 22extern unsigned int num_processors;
23 23
24DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); 24DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
25DECLARE_PER_CPU(cpumask_t, cpu_core_map); 25DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
26DECLARE_PER_CPU(u16, cpu_llc_id); 26DECLARE_PER_CPU(u16, cpu_llc_id);
27DECLARE_PER_CPU(int, cpu_number); 27DECLARE_PER_CPU(int, cpu_number);
28 28
29static inline struct cpumask *cpu_sibling_mask(int cpu) 29static inline struct cpumask *cpu_sibling_mask(int cpu)
30{ 30{
31 return &per_cpu(cpu_sibling_map, cpu); 31 return per_cpu(cpu_sibling_map, cpu);
32} 32}
33 33
34static inline struct cpumask *cpu_core_mask(int cpu) 34static inline struct cpumask *cpu_core_mask(int cpu)
35{ 35{
36 return &per_cpu(cpu_core_map, cpu); 36 return per_cpu(cpu_core_map, cpu);
37} 37}
38 38
39DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid); 39DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);
@@ -121,9 +121,10 @@ static inline void arch_send_call_function_single_ipi(int cpu)
121 smp_ops.send_call_func_single_ipi(cpu); 121 smp_ops.send_call_func_single_ipi(cpu);
122} 122}
123 123
124static inline void arch_send_call_function_ipi(cpumask_t mask) 124#define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask
125static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)
125{ 126{
126 smp_ops.send_call_func_ipi(&mask); 127 smp_ops.send_call_func_ipi(mask);
127} 128}
128 129
129void cpu_disable_common(void); 130void cpu_disable_common(void);
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index df9d5f78385e..8820a73ae090 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -94,6 +94,7 @@ struct thread_info {
94#define TIF_FORCED_TF 24 /* true if TF in eflags artificially */ 94#define TIF_FORCED_TF 24 /* true if TF in eflags artificially */
95#define TIF_DEBUGCTLMSR 25 /* uses thread_struct.debugctlmsr */ 95#define TIF_DEBUGCTLMSR 25 /* uses thread_struct.debugctlmsr */
96#define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */ 96#define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */
97#define TIF_SYSCALL_FTRACE 27 /* for ftrace syscall instrumentation */
97 98
98#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) 99#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
99#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) 100#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
@@ -115,15 +116,17 @@ struct thread_info {
115#define _TIF_FORCED_TF (1 << TIF_FORCED_TF) 116#define _TIF_FORCED_TF (1 << TIF_FORCED_TF)
116#define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR) 117#define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR)
117#define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) 118#define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR)
119#define _TIF_SYSCALL_FTRACE (1 << TIF_SYSCALL_FTRACE)
118 120
119/* work to do in syscall_trace_enter() */ 121/* work to do in syscall_trace_enter() */
120#define _TIF_WORK_SYSCALL_ENTRY \ 122#define _TIF_WORK_SYSCALL_ENTRY \
121 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | \ 123 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_FTRACE | \
122 _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP) 124 _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | _TIF_SINGLESTEP)
123 125
124/* work to do in syscall_trace_leave() */ 126/* work to do in syscall_trace_leave() */
125#define _TIF_WORK_SYSCALL_EXIT \ 127#define _TIF_WORK_SYSCALL_EXIT \
126 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP) 128 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
129 _TIF_SYSCALL_FTRACE)
127 130
128/* work to do on interrupt/exception return */ 131/* work to do on interrupt/exception return */
129#define _TIF_WORK_MASK \ 132#define _TIF_WORK_MASK \
@@ -132,7 +135,7 @@ struct thread_info {
132 _TIF_SINGLESTEP|_TIF_SECCOMP|_TIF_SYSCALL_EMU)) 135 _TIF_SINGLESTEP|_TIF_SECCOMP|_TIF_SYSCALL_EMU))
133 136
134/* work to do on any return to user space */ 137/* work to do on any return to user space */
135#define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) 138#define _TIF_ALLWORK_MASK ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_FTRACE)
136 139
137/* Only used for 64 bit */ 140/* Only used for 64 bit */
138#define _TIF_DO_NOTIFY_MASK \ 141#define _TIF_DO_NOTIFY_MASK \
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 744299c0b774..892b119dba6f 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -44,9 +44,6 @@
44 44
45#ifdef CONFIG_X86_32 45#ifdef CONFIG_X86_32
46 46
47/* Mappings between node number and cpus on that node. */
48extern cpumask_t node_to_cpumask_map[];
49
50/* Mappings between logical cpu number and node number */ 47/* Mappings between logical cpu number and node number */
51extern int cpu_to_node_map[]; 48extern int cpu_to_node_map[];
52 49
@@ -57,30 +54,8 @@ static inline int cpu_to_node(int cpu)
57} 54}
58#define early_cpu_to_node(cpu) cpu_to_node(cpu) 55#define early_cpu_to_node(cpu) cpu_to_node(cpu)
59 56
60/* Returns a bitmask of CPUs on Node 'node'.
61 *
62 * Side note: this function creates the returned cpumask on the stack
63 * so with a high NR_CPUS count, excessive stack space is used. The
64 * cpumask_of_node function should be used whenever possible.
65 */
66static inline cpumask_t node_to_cpumask(int node)
67{
68 return node_to_cpumask_map[node];
69}
70
71/* Returns a bitmask of CPUs on Node 'node'. */
72static inline const struct cpumask *cpumask_of_node(int node)
73{
74 return &node_to_cpumask_map[node];
75}
76
77static inline void setup_node_to_cpumask_map(void) { }
78
79#else /* CONFIG_X86_64 */ 57#else /* CONFIG_X86_64 */
80 58
81/* Mappings between node number and cpus on that node. */
82extern cpumask_t *node_to_cpumask_map;
83
84/* Mappings between logical cpu number and node number */ 59/* Mappings between logical cpu number and node number */
85DECLARE_EARLY_PER_CPU(int, x86_cpu_to_node_map); 60DECLARE_EARLY_PER_CPU(int, x86_cpu_to_node_map);
86 61
@@ -91,8 +66,6 @@ DECLARE_PER_CPU(int, node_number);
91#ifdef CONFIG_DEBUG_PER_CPU_MAPS 66#ifdef CONFIG_DEBUG_PER_CPU_MAPS
92extern int cpu_to_node(int cpu); 67extern int cpu_to_node(int cpu);
93extern int early_cpu_to_node(int cpu); 68extern int early_cpu_to_node(int cpu);
94extern const cpumask_t *cpumask_of_node(int node);
95extern cpumask_t node_to_cpumask(int node);
96 69
97#else /* !CONFIG_DEBUG_PER_CPU_MAPS */ 70#else /* !CONFIG_DEBUG_PER_CPU_MAPS */
98 71
@@ -108,42 +81,32 @@ static inline int early_cpu_to_node(int cpu)
108 return early_per_cpu(x86_cpu_to_node_map, cpu); 81 return early_per_cpu(x86_cpu_to_node_map, cpu);
109} 82}
110 83
111/* Returns a pointer to the cpumask of CPUs on Node 'node'. */ 84#endif /* !CONFIG_DEBUG_PER_CPU_MAPS */
112static inline const cpumask_t *cpumask_of_node(int node) 85
113{ 86#endif /* CONFIG_X86_64 */
114 return &node_to_cpumask_map[node];
115}
116 87
117/* Returns a bitmask of CPUs on Node 'node'. */ 88/* Mappings between node number and cpus on that node. */
118static inline cpumask_t node_to_cpumask(int node) 89extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];
90
91#ifdef CONFIG_DEBUG_PER_CPU_MAPS
92extern const struct cpumask *cpumask_of_node(int node);
93#else
94/* Returns a pointer to the cpumask of CPUs on Node 'node'. */
95static inline const struct cpumask *cpumask_of_node(int node)
119{ 96{
120 return node_to_cpumask_map[node]; 97 return node_to_cpumask_map[node];
121} 98}
122 99#endif
123#endif /* !CONFIG_DEBUG_PER_CPU_MAPS */
124 100
125extern void setup_node_to_cpumask_map(void); 101extern void setup_node_to_cpumask_map(void);
126 102
127/* 103/*
128 * Replace default node_to_cpumask_ptr with optimized version
129 * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"
130 */
131#define node_to_cpumask_ptr(v, node) \
132 const cpumask_t *v = cpumask_of_node(node)
133
134#define node_to_cpumask_ptr_next(v, node) \
135 v = cpumask_of_node(node)
136
137#endif /* CONFIG_X86_64 */
138
139/*
140 * Returns the number of the node containing Node 'node'. This 104 * Returns the number of the node containing Node 'node'. This
141 * architecture is flat, so it is a pretty simple function! 105 * architecture is flat, so it is a pretty simple function!
142 */ 106 */
143#define parent_node(node) (node) 107#define parent_node(node) (node)
144 108
145#define pcibus_to_node(bus) __pcibus_to_node(bus) 109#define pcibus_to_node(bus) __pcibus_to_node(bus)
146#define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus)
147 110
148#ifdef CONFIG_X86_32 111#ifdef CONFIG_X86_32
149extern unsigned long node_start_pfn[]; 112extern unsigned long node_start_pfn[];
@@ -209,40 +172,24 @@ static inline int early_cpu_to_node(int cpu)
209 return 0; 172 return 0;
210} 173}
211 174
212static inline const cpumask_t *cpumask_of_node(int node) 175static inline const struct cpumask *cpumask_of_node(int node)
213{
214 return &cpu_online_map;
215}
216static inline cpumask_t node_to_cpumask(int node)
217{ 176{
218 return cpu_online_map; 177 return cpu_online_mask;
219} 178}
220 179
221static inline void setup_node_to_cpumask_map(void) { } 180static inline void setup_node_to_cpumask_map(void) { }
222 181
223/*
224 * Replace default node_to_cpumask_ptr with optimized version
225 * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"
226 */
227#define node_to_cpumask_ptr(v, node) \
228 const cpumask_t *v = cpumask_of_node(node)
229
230#define node_to_cpumask_ptr_next(v, node) \
231 v = cpumask_of_node(node)
232#endif 182#endif
233 183
234#include <asm-generic/topology.h> 184#include <asm-generic/topology.h>
235 185
236extern cpumask_t cpu_coregroup_map(int cpu);
237extern const struct cpumask *cpu_coregroup_mask(int cpu); 186extern const struct cpumask *cpu_coregroup_mask(int cpu);
238 187
239#ifdef ENABLE_TOPO_DEFINES 188#ifdef ENABLE_TOPO_DEFINES
240#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id) 189#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id)
241#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id) 190#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
242#define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu)) 191#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
243#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu)) 192#define topology_thread_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))
244#define topology_core_cpumask(cpu) (&per_cpu(cpu_core_map, cpu))
245#define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu))
246 193
247/* indicates that pointers to the topology cpumask_t maps are valid */ 194/* indicates that pointers to the topology cpumask_t maps are valid */
248#define arch_provides_topology_pointers yes 195#define arch_provides_topology_pointers yes
@@ -256,7 +203,7 @@ struct pci_bus;
256void set_pci_bus_resources_arch_default(struct pci_bus *b); 203void set_pci_bus_resources_arch_default(struct pci_bus *b);
257 204
258#ifdef CONFIG_SMP 205#ifdef CONFIG_SMP
259#define mc_capable() (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids) 206#define mc_capable() (cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids)
260#define smt_capable() (smp_num_siblings > 1) 207#define smt_capable() (smp_num_siblings > 1)
261#endif 208#endif
262 209
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index c611ad64137f..145cce75cda7 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -66,7 +66,8 @@ obj-$(CONFIG_X86_MPPARSE) += mpparse.o
66obj-y += apic/ 66obj-y += apic/
67obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o 67obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o
68obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o 68obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
69obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o 69obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
70obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
70obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o 71obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o
71obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o 72obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o
72obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o 73obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 4c80f1557433..f57658702571 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -5,6 +5,7 @@
5#include <linux/kprobes.h> 5#include <linux/kprobes.h>
6#include <linux/mm.h> 6#include <linux/mm.h>
7#include <linux/vmalloc.h> 7#include <linux/vmalloc.h>
8#include <linux/memory.h>
8#include <asm/alternative.h> 9#include <asm/alternative.h>
9#include <asm/sections.h> 10#include <asm/sections.h>
10#include <asm/pgtable.h> 11#include <asm/pgtable.h>
@@ -12,7 +13,9 @@
12#include <asm/nmi.h> 13#include <asm/nmi.h>
13#include <asm/vsyscall.h> 14#include <asm/vsyscall.h>
14#include <asm/cacheflush.h> 15#include <asm/cacheflush.h>
16#include <asm/tlbflush.h>
15#include <asm/io.h> 17#include <asm/io.h>
18#include <asm/fixmap.h>
16 19
17#define MAX_PATCH_LEN (255-1) 20#define MAX_PATCH_LEN (255-1)
18 21
@@ -226,6 +229,7 @@ static void alternatives_smp_lock(u8 **start, u8 **end, u8 *text, u8 *text_end)
226{ 229{
227 u8 **ptr; 230 u8 **ptr;
228 231
232 mutex_lock(&text_mutex);
229 for (ptr = start; ptr < end; ptr++) { 233 for (ptr = start; ptr < end; ptr++) {
230 if (*ptr < text) 234 if (*ptr < text)
231 continue; 235 continue;
@@ -234,6 +238,7 @@ static void alternatives_smp_lock(u8 **start, u8 **end, u8 *text, u8 *text_end)
234 /* turn DS segment override prefix into lock prefix */ 238 /* turn DS segment override prefix into lock prefix */
235 text_poke(*ptr, ((unsigned char []){0xf0}), 1); 239 text_poke(*ptr, ((unsigned char []){0xf0}), 1);
236 }; 240 };
241 mutex_unlock(&text_mutex);
237} 242}
238 243
239static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end) 244static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end)
@@ -243,6 +248,7 @@ static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end
243 if (noreplace_smp) 248 if (noreplace_smp)
244 return; 249 return;
245 250
251 mutex_lock(&text_mutex);
246 for (ptr = start; ptr < end; ptr++) { 252 for (ptr = start; ptr < end; ptr++) {
247 if (*ptr < text) 253 if (*ptr < text)
248 continue; 254 continue;
@@ -251,6 +257,7 @@ static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end
251 /* turn lock prefix into DS segment override prefix */ 257 /* turn lock prefix into DS segment override prefix */
252 text_poke(*ptr, ((unsigned char []){0x3E}), 1); 258 text_poke(*ptr, ((unsigned char []){0x3E}), 1);
253 }; 259 };
260 mutex_unlock(&text_mutex);
254} 261}
255 262
256struct smp_alt_module { 263struct smp_alt_module {
@@ -500,15 +507,16 @@ void *text_poke_early(void *addr, const void *opcode, size_t len)
500 * It means the size must be writable atomically and the address must be aligned 507 * It means the size must be writable atomically and the address must be aligned
501 * in a way that permits an atomic write. It also makes sure we fit on a single 508 * in a way that permits an atomic write. It also makes sure we fit on a single
502 * page. 509 * page.
510 *
511 * Note: Must be called under text_mutex.
503 */ 512 */
504void *__kprobes text_poke(void *addr, const void *opcode, size_t len) 513void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
505{ 514{
515 unsigned long flags;
506 char *vaddr; 516 char *vaddr;
507 int nr_pages = 2;
508 struct page *pages[2]; 517 struct page *pages[2];
509 int i; 518 int i;
510 519
511 might_sleep();
512 if (!core_kernel_text((unsigned long)addr)) { 520 if (!core_kernel_text((unsigned long)addr)) {
513 pages[0] = vmalloc_to_page(addr); 521 pages[0] = vmalloc_to_page(addr);
514 pages[1] = vmalloc_to_page(addr + PAGE_SIZE); 522 pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
@@ -518,18 +526,21 @@ void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
518 pages[1] = virt_to_page(addr + PAGE_SIZE); 526 pages[1] = virt_to_page(addr + PAGE_SIZE);
519 } 527 }
520 BUG_ON(!pages[0]); 528 BUG_ON(!pages[0]);
521 if (!pages[1]) 529 local_irq_save(flags);
522 nr_pages = 1; 530 set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
523 vaddr = vmap(pages, nr_pages, VM_MAP, PAGE_KERNEL); 531 if (pages[1])
524 BUG_ON(!vaddr); 532 set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
525 local_irq_disable(); 533 vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
526 memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len); 534 memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
527 local_irq_enable(); 535 clear_fixmap(FIX_TEXT_POKE0);
528 vunmap(vaddr); 536 if (pages[1])
537 clear_fixmap(FIX_TEXT_POKE1);
538 local_flush_tlb();
529 sync_core(); 539 sync_core();
530 /* Could also do a CLFLUSH here to speed up CPU recovery; but 540 /* Could also do a CLFLUSH here to speed up CPU recovery; but
531 that causes hangs on some VIA CPUs. */ 541 that causes hangs on some VIA CPUs. */
532 for (i = 0; i < len; i++) 542 for (i = 0; i < len; i++)
533 BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]); 543 BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
544 local_irq_restore(flags);
534 return addr; 545 return addr;
535} 546}
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index d806ecaa948f..676cdac385c0 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -26,12 +26,12 @@ static int bigsmp_apic_id_registered(void)
26 return 1; 26 return 1;
27} 27}
28 28
29static const cpumask_t *bigsmp_target_cpus(void) 29static const struct cpumask *bigsmp_target_cpus(void)
30{ 30{
31#ifdef CONFIG_SMP 31#ifdef CONFIG_SMP
32 return &cpu_online_map; 32 return cpu_online_mask;
33#else 33#else
34 return &cpumask_of_cpu(0); 34 return cpumask_of(0);
35#endif 35#endif
36} 36}
37 37
@@ -118,9 +118,9 @@ static int bigsmp_check_phys_apicid_present(int boot_cpu_physical_apicid)
118} 118}
119 119
120/* As we are using single CPU as destination, pick only one CPU here */ 120/* As we are using single CPU as destination, pick only one CPU here */
121static unsigned int bigsmp_cpu_mask_to_apicid(const cpumask_t *cpumask) 121static unsigned int bigsmp_cpu_mask_to_apicid(const struct cpumask *cpumask)
122{ 122{
123 return bigsmp_cpu_to_logical_apicid(first_cpu(*cpumask)); 123 return bigsmp_cpu_to_logical_apicid(cpumask_first(cpumask));
124} 124}
125 125
126static unsigned int bigsmp_cpu_mask_to_apicid_and(const struct cpumask *cpumask, 126static unsigned int bigsmp_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
@@ -188,10 +188,10 @@ static const struct dmi_system_id bigsmp_dmi_table[] = {
188 { } /* NULL entry stops DMI scanning */ 188 { } /* NULL entry stops DMI scanning */
189}; 189};
190 190
191static void bigsmp_vector_allocation_domain(int cpu, cpumask_t *retmask) 191static void bigsmp_vector_allocation_domain(int cpu, struct cpumask *retmask)
192{ 192{
193 cpus_clear(*retmask); 193 cpumask_clear(retmask);
194 cpu_set(cpu, *retmask); 194 cpumask_set_cpu(cpu, retmask);
195} 195}
196 196
197static int probe_bigsmp(void) 197static int probe_bigsmp(void)
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 19588f2770ee..1c11b819f245 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -410,7 +410,7 @@ static void es7000_enable_apic_mode(void)
410 WARN(1, "Command failed, status = %x\n", mip_status); 410 WARN(1, "Command failed, status = %x\n", mip_status);
411} 411}
412 412
413static void es7000_vector_allocation_domain(int cpu, cpumask_t *retmask) 413static void es7000_vector_allocation_domain(int cpu, struct cpumask *retmask)
414{ 414{
415 /* Careful. Some cpus do not strictly honor the set of cpus 415 /* Careful. Some cpus do not strictly honor the set of cpus
416 * specified in the interrupt destination when using lowest 416 * specified in the interrupt destination when using lowest
@@ -420,7 +420,8 @@ static void es7000_vector_allocation_domain(int cpu, cpumask_t *retmask)
420 * deliver interrupts to the wrong hyperthread when only one 420 * deliver interrupts to the wrong hyperthread when only one
421 * hyperthread was specified in the interrupt desitination. 421 * hyperthread was specified in the interrupt desitination.
422 */ 422 */
423 *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; 423 cpumask_clear(retmask);
424 cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
424} 425}
425 426
426 427
@@ -455,14 +456,14 @@ static int es7000_apic_id_registered(void)
455 return 1; 456 return 1;
456} 457}
457 458
458static const cpumask_t *target_cpus_cluster(void) 459static const struct cpumask *target_cpus_cluster(void)
459{ 460{
460 return &CPU_MASK_ALL; 461 return cpu_all_mask;
461} 462}
462 463
463static const cpumask_t *es7000_target_cpus(void) 464static const struct cpumask *es7000_target_cpus(void)
464{ 465{
465 return &cpumask_of_cpu(smp_processor_id()); 466 return cpumask_of(smp_processor_id());
466} 467}
467 468
468static unsigned long 469static unsigned long
@@ -517,7 +518,7 @@ static void es7000_setup_apic_routing(void)
517 "Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", 518 "Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
518 (apic_version[apic] == 0x14) ? 519 (apic_version[apic] == 0x14) ?
519 "Physical Cluster" : "Logical Cluster", 520 "Physical Cluster" : "Logical Cluster",
520 nr_ioapics, cpus_addr(*es7000_target_cpus())[0]); 521 nr_ioapics, cpumask_bits(es7000_target_cpus())[0]);
521} 522}
522 523
523static int es7000_apicid_to_node(int logical_apicid) 524static int es7000_apicid_to_node(int logical_apicid)
@@ -572,7 +573,7 @@ static int es7000_check_phys_apicid_present(int cpu_physical_apicid)
572 return 1; 573 return 1;
573} 574}
574 575
575static unsigned int es7000_cpu_mask_to_apicid(const cpumask_t *cpumask) 576static unsigned int es7000_cpu_mask_to_apicid(const struct cpumask *cpumask)
576{ 577{
577 unsigned int round = 0; 578 unsigned int round = 0;
578 int cpu, uninitialized_var(apicid); 579 int cpu, uninitialized_var(apicid);
diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
index bdfad80c3cf1..d6bd62407152 100644
--- a/arch/x86/kernel/apic/nmi.c
+++ b/arch/x86/kernel/apic/nmi.c
@@ -39,7 +39,7 @@
39int unknown_nmi_panic; 39int unknown_nmi_panic;
40int nmi_watchdog_enabled; 40int nmi_watchdog_enabled;
41 41
42static cpumask_t backtrace_mask = CPU_MASK_NONE; 42static cpumask_var_t backtrace_mask;
43 43
44/* nmi_active: 44/* nmi_active:
45 * >0: the lapic NMI watchdog is active, but can be disabled 45 * >0: the lapic NMI watchdog is active, but can be disabled
@@ -138,6 +138,7 @@ int __init check_nmi_watchdog(void)
138 if (!prev_nmi_count) 138 if (!prev_nmi_count)
139 goto error; 139 goto error;
140 140
141 alloc_cpumask_var(&backtrace_mask, GFP_KERNEL);
141 printk(KERN_INFO "Testing NMI watchdog ... "); 142 printk(KERN_INFO "Testing NMI watchdog ... ");
142 143
143#ifdef CONFIG_SMP 144#ifdef CONFIG_SMP
@@ -413,14 +414,14 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
413 touched = 1; 414 touched = 1;
414 } 415 }
415 416
416 if (cpu_isset(cpu, backtrace_mask)) { 417 if (cpumask_test_cpu(cpu, backtrace_mask)) {
417 static DEFINE_SPINLOCK(lock); /* Serialise the printks */ 418 static DEFINE_SPINLOCK(lock); /* Serialise the printks */
418 419
419 spin_lock(&lock); 420 spin_lock(&lock);
420 printk(KERN_WARNING "NMI backtrace for cpu %d\n", cpu); 421 printk(KERN_WARNING "NMI backtrace for cpu %d\n", cpu);
421 dump_stack(); 422 dump_stack();
422 spin_unlock(&lock); 423 spin_unlock(&lock);
423 cpu_clear(cpu, backtrace_mask); 424 cpumask_clear_cpu(cpu, backtrace_mask);
424 } 425 }
425 426
426 /* Could check oops_in_progress here too, but it's safer not to */ 427 /* Could check oops_in_progress here too, but it's safer not to */
@@ -554,10 +555,10 @@ void __trigger_all_cpu_backtrace(void)
554{ 555{
555 int i; 556 int i;
556 557
557 backtrace_mask = cpu_online_map; 558 cpumask_copy(backtrace_mask, cpu_online_mask);
558 /* Wait for up to 10 seconds for all CPUs to do the backtrace */ 559 /* Wait for up to 10 seconds for all CPUs to do the backtrace */
559 for (i = 0; i < 10 * 1000; i++) { 560 for (i = 0; i < 10 * 1000; i++) {
560 if (cpus_empty(backtrace_mask)) 561 if (cpumask_empty(backtrace_mask))
561 break; 562 break;
562 mdelay(1); 563 mdelay(1);
563 } 564 }
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index ba2fc6465534..533e59c6fc82 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -334,9 +334,9 @@ static inline void numaq_smp_callin_clear_local_apic(void)
334 clear_local_APIC(); 334 clear_local_APIC();
335} 335}
336 336
337static inline const cpumask_t *numaq_target_cpus(void) 337static inline const struct cpumask *numaq_target_cpus(void)
338{ 338{
339 return &CPU_MASK_ALL; 339 return cpu_all_mask;
340} 340}
341 341
342static inline unsigned long 342static inline unsigned long
@@ -427,7 +427,7 @@ static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid)
427 * We use physical apicids here, not logical, so just return the default 427 * We use physical apicids here, not logical, so just return the default
428 * physical broadcast to stop people from breaking us 428 * physical broadcast to stop people from breaking us
429 */ 429 */
430static inline unsigned int numaq_cpu_mask_to_apicid(const cpumask_t *cpumask) 430static unsigned int numaq_cpu_mask_to_apicid(const struct cpumask *cpumask)
431{ 431{
432 return 0x0F; 432 return 0x0F;
433} 433}
@@ -462,7 +462,7 @@ static int probe_numaq(void)
462 return found_numaq; 462 return found_numaq;
463} 463}
464 464
465static void numaq_vector_allocation_domain(int cpu, cpumask_t *retmask) 465static void numaq_vector_allocation_domain(int cpu, struct cpumask *retmask)
466{ 466{
467 /* Careful. Some cpus do not strictly honor the set of cpus 467 /* Careful. Some cpus do not strictly honor the set of cpus
468 * specified in the interrupt destination when using lowest 468 * specified in the interrupt destination when using lowest
@@ -472,7 +472,8 @@ static void numaq_vector_allocation_domain(int cpu, cpumask_t *retmask)
472 * deliver interrupts to the wrong hyperthread when only one 472 * deliver interrupts to the wrong hyperthread when only one
473 * hyperthread was specified in the interrupt desitination. 473 * hyperthread was specified in the interrupt desitination.
474 */ 474 */
475 *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; 475 cpumask_clear(retmask);
476 cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
476} 477}
477 478
478static void numaq_setup_portio_remap(void) 479static void numaq_setup_portio_remap(void)
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 141c99a1c264..01eda2ac65e4 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -83,7 +83,8 @@ static void default_vector_allocation_domain(int cpu, struct cpumask *retmask)
83 * deliver interrupts to the wrong hyperthread when only one 83 * deliver interrupts to the wrong hyperthread when only one
84 * hyperthread was specified in the interrupt desitination. 84 * hyperthread was specified in the interrupt desitination.
85 */ 85 */
86 *retmask = (cpumask_t) { { [0] = APIC_ALL_CPUS } }; 86 cpumask_clear(retmask);
87 cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
87} 88}
88 89
89/* should be called last. */ 90/* should be called last. */
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index aac52fa873ff..9cfe1f415d81 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -53,23 +53,19 @@ static unsigned summit_get_apic_id(unsigned long x)
53 return (x >> 24) & 0xFF; 53 return (x >> 24) & 0xFF;
54} 54}
55 55
56static inline void summit_send_IPI_mask(const cpumask_t *mask, int vector) 56static inline void summit_send_IPI_mask(const struct cpumask *mask, int vector)
57{ 57{
58 default_send_IPI_mask_sequence_logical(mask, vector); 58 default_send_IPI_mask_sequence_logical(mask, vector);
59} 59}
60 60
61static void summit_send_IPI_allbutself(int vector) 61static void summit_send_IPI_allbutself(int vector)
62{ 62{
63 cpumask_t mask = cpu_online_map; 63 default_send_IPI_mask_allbutself_logical(cpu_online_mask, vector);
64 cpu_clear(smp_processor_id(), mask);
65
66 if (!cpus_empty(mask))
67 summit_send_IPI_mask(&mask, vector);
68} 64}
69 65
70static void summit_send_IPI_all(int vector) 66static void summit_send_IPI_all(int vector)
71{ 67{
72 summit_send_IPI_mask(&cpu_online_map, vector); 68 summit_send_IPI_mask(cpu_online_mask, vector);
73} 69}
74 70
75#include <asm/tsc.h> 71#include <asm/tsc.h>
@@ -186,13 +182,13 @@ static inline int is_WPEG(struct rio_detail *rio){
186 182
187#define SUMMIT_APIC_DFR_VALUE (APIC_DFR_CLUSTER) 183#define SUMMIT_APIC_DFR_VALUE (APIC_DFR_CLUSTER)
188 184
189static const cpumask_t *summit_target_cpus(void) 185static const struct cpumask *summit_target_cpus(void)
190{ 186{
191 /* CPU_MASK_ALL (0xff) has undefined behaviour with 187 /* CPU_MASK_ALL (0xff) has undefined behaviour with
192 * dest_LowestPrio mode logical clustered apic interrupt routing 188 * dest_LowestPrio mode logical clustered apic interrupt routing
193 * Just start on cpu 0. IRQ balancing will spread load 189 * Just start on cpu 0. IRQ balancing will spread load
194 */ 190 */
195 return &cpumask_of_cpu(0); 191 return cpumask_of(0);
196} 192}
197 193
198static unsigned long summit_check_apicid_used(physid_mask_t bitmap, int apicid) 194static unsigned long summit_check_apicid_used(physid_mask_t bitmap, int apicid)
@@ -289,7 +285,7 @@ static int summit_check_phys_apicid_present(int boot_cpu_physical_apicid)
289 return 1; 285 return 1;
290} 286}
291 287
292static unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask) 288static unsigned int summit_cpu_mask_to_apicid(const struct cpumask *cpumask)
293{ 289{
294 unsigned int round = 0; 290 unsigned int round = 0;
295 int cpu, apicid = 0; 291 int cpu, apicid = 0;
@@ -346,7 +342,7 @@ static int probe_summit(void)
346 return 0; 342 return 0;
347} 343}
348 344
349static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask) 345static void summit_vector_allocation_domain(int cpu, struct cpumask *retmask)
350{ 346{
351 /* Careful. Some cpus do not strictly honor the set of cpus 347 /* Careful. Some cpus do not strictly honor the set of cpus
352 * specified in the interrupt destination when using lowest 348 * specified in the interrupt destination when using lowest
@@ -356,7 +352,8 @@ static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask)
356 * deliver interrupts to the wrong hyperthread when only one 352 * deliver interrupts to the wrong hyperthread when only one
357 * hyperthread was specified in the interrupt desitination. 353 * hyperthread was specified in the interrupt desitination.
358 */ 354 */
359 *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; 355 cpumask_clear(retmask);
356 cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
360} 357}
361 358
362#ifdef CONFIG_X86_SUMMIT_NUMA 359#ifdef CONFIG_X86_SUMMIT_NUMA
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index ac7783a67432..49e0939bac42 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -466,7 +466,7 @@ static const lookup_t error_table[] = {
466 * @err: APM BIOS return code 466 * @err: APM BIOS return code
467 * 467 *
468 * Write a meaningful log entry to the kernel log in the event of 468 * Write a meaningful log entry to the kernel log in the event of
469 * an APM error. 469 * an APM error. Note that this also handles (negative) kernel errors.
470 */ 470 */
471 471
472static void apm_error(char *str, int err) 472static void apm_error(char *str, int err)
@@ -478,43 +478,14 @@ static void apm_error(char *str, int err)
478 break; 478 break;
479 if (i < ERROR_COUNT) 479 if (i < ERROR_COUNT)
480 printk(KERN_NOTICE "apm: %s: %s\n", str, error_table[i].msg); 480 printk(KERN_NOTICE "apm: %s: %s\n", str, error_table[i].msg);
481 else if (err < 0)
482 printk(KERN_NOTICE "apm: %s: linux error code %i\n", str, err);
481 else 483 else
482 printk(KERN_NOTICE "apm: %s: unknown error code %#2.2x\n", 484 printk(KERN_NOTICE "apm: %s: unknown error code %#2.2x\n",
483 str, err); 485 str, err);
484} 486}
485 487
486/* 488/*
487 * Lock APM functionality to physical CPU 0
488 */
489
490#ifdef CONFIG_SMP
491
492static cpumask_t apm_save_cpus(void)
493{
494 cpumask_t x = current->cpus_allowed;
495 /* Some bioses don't like being called from CPU != 0 */
496 set_cpus_allowed(current, cpumask_of_cpu(0));
497 BUG_ON(smp_processor_id() != 0);
498 return x;
499}
500
501static inline void apm_restore_cpus(cpumask_t mask)
502{
503 set_cpus_allowed(current, mask);
504}
505
506#else
507
508/*
509 * No CPU lockdown needed on a uniprocessor
510 */
511
512#define apm_save_cpus() (current->cpus_allowed)
513#define apm_restore_cpus(x) (void)(x)
514
515#endif
516
517/*
518 * These are the actual BIOS calls. Depending on APM_ZERO_SEGS and 489 * These are the actual BIOS calls. Depending on APM_ZERO_SEGS and
519 * apm_info.allow_ints, we are being really paranoid here! Not only 490 * apm_info.allow_ints, we are being really paranoid here! Not only
520 * are interrupts disabled, but all the segment registers (except SS) 491 * are interrupts disabled, but all the segment registers (except SS)
@@ -568,16 +539,23 @@ static inline void apm_irq_restore(unsigned long flags)
568# define APM_DO_RESTORE_SEGS 539# define APM_DO_RESTORE_SEGS
569#endif 540#endif
570 541
542struct apm_bios_call {
543 u32 func;
544 /* In and out */
545 u32 ebx;
546 u32 ecx;
547 /* Out only */
548 u32 eax;
549 u32 edx;
550 u32 esi;
551
552 /* Error: -ENOMEM, or bits 8-15 of eax */
553 int err;
554};
555
571/** 556/**
572 * apm_bios_call - Make an APM BIOS 32bit call 557 * __apm_bios_call - Make an APM BIOS 32bit call
573 * @func: APM function to execute 558 * @_call: pointer to struct apm_bios_call.
574 * @ebx_in: EBX register for call entry
575 * @ecx_in: ECX register for call entry
576 * @eax: EAX register return
577 * @ebx: EBX register return
578 * @ecx: ECX register return
579 * @edx: EDX register return
580 * @esi: ESI register return
581 * 559 *
582 * Make an APM call using the 32bit protected mode interface. The 560 * Make an APM call using the 32bit protected mode interface. The
583 * caller is responsible for knowing if APM BIOS is configured and 561 * caller is responsible for knowing if APM BIOS is configured and
@@ -586,80 +564,142 @@ static inline void apm_irq_restore(unsigned long flags)
586 * flag is loaded into AL. If there is an error, then the error 564 * flag is loaded into AL. If there is an error, then the error
587 * code is returned in AH (bits 8-15 of eax) and this function 565 * code is returned in AH (bits 8-15 of eax) and this function
588 * returns non-zero. 566 * returns non-zero.
567 *
568 * Note: this makes the call on the current CPU.
589 */ 569 */
590 570static long __apm_bios_call(void *_call)
591static u8 apm_bios_call(u32 func, u32 ebx_in, u32 ecx_in,
592 u32 *eax, u32 *ebx, u32 *ecx, u32 *edx, u32 *esi)
593{ 571{
594 APM_DECL_SEGS 572 APM_DECL_SEGS
595 unsigned long flags; 573 unsigned long flags;
596 cpumask_t cpus;
597 int cpu; 574 int cpu;
598 struct desc_struct save_desc_40; 575 struct desc_struct save_desc_40;
599 struct desc_struct *gdt; 576 struct desc_struct *gdt;
600 577 struct apm_bios_call *call = _call;
601 cpus = apm_save_cpus();
602 578
603 cpu = get_cpu(); 579 cpu = get_cpu();
580 BUG_ON(cpu != 0);
604 gdt = get_cpu_gdt_table(cpu); 581 gdt = get_cpu_gdt_table(cpu);
605 save_desc_40 = gdt[0x40 / 8]; 582 save_desc_40 = gdt[0x40 / 8];
606 gdt[0x40 / 8] = bad_bios_desc; 583 gdt[0x40 / 8] = bad_bios_desc;
607 584
608 apm_irq_save(flags); 585 apm_irq_save(flags);
609 APM_DO_SAVE_SEGS; 586 APM_DO_SAVE_SEGS;
610 apm_bios_call_asm(func, ebx_in, ecx_in, eax, ebx, ecx, edx, esi); 587 apm_bios_call_asm(call->func, call->ebx, call->ecx,
588 &call->eax, &call->ebx, &call->ecx, &call->edx,
589 &call->esi);
611 APM_DO_RESTORE_SEGS; 590 APM_DO_RESTORE_SEGS;
612 apm_irq_restore(flags); 591 apm_irq_restore(flags);
613 gdt[0x40 / 8] = save_desc_40; 592 gdt[0x40 / 8] = save_desc_40;
614 put_cpu(); 593 put_cpu();
615 apm_restore_cpus(cpus);
616 594
617 return *eax & 0xff; 595 return call->eax & 0xff;
596}
597
598/* Run __apm_bios_call or __apm_bios_call_simple on CPU 0 */
599static int on_cpu0(long (*fn)(void *), struct apm_bios_call *call)
600{
601 int ret;
602
603 /* Don't bother with work_on_cpu in the common case, so we don't
604 * have to worry about OOM or overhead. */
605 if (get_cpu() == 0) {
606 ret = fn(call);
607 put_cpu();
608 } else {
609 put_cpu();
610 ret = work_on_cpu(0, fn, call);
611 }
612
613 /* work_on_cpu can fail with -ENOMEM */
614 if (ret < 0)
615 call->err = ret;
616 else
617 call->err = (call->eax >> 8) & 0xff;
618
619 return ret;
618} 620}
619 621
620/** 622/**
621 * apm_bios_call_simple - make a simple APM BIOS 32bit call 623 * apm_bios_call - Make an APM BIOS 32bit call (on CPU 0)
622 * @func: APM function to invoke 624 * @call: the apm_bios_call registers.
623 * @ebx_in: EBX register value for BIOS call 625 *
624 * @ecx_in: ECX register value for BIOS call 626 * If there is an error, it is returned in @call.err.
625 * @eax: EAX register on return from the BIOS call 627 */
628static int apm_bios_call(struct apm_bios_call *call)
629{
630 return on_cpu0(__apm_bios_call, call);
631}
632
633/**
634 * __apm_bios_call_simple - Make an APM BIOS 32bit call (on CPU 0)
635 * @_call: pointer to struct apm_bios_call.
626 * 636 *
627 * Make a BIOS call that returns one value only, or just status. 637 * Make a BIOS call that returns one value only, or just status.
628 * If there is an error, then the error code is returned in AH 638 * If there is an error, then the error code is returned in AH
629 * (bits 8-15 of eax) and this function returns non-zero. This is 639 * (bits 8-15 of eax) and this function returns non-zero (it can
630 * used for simpler BIOS operations. This call may hold interrupts 640 * also return -ENOMEM). This is used for simpler BIOS operations.
631 * off for a long time on some laptops. 641 * This call may hold interrupts off for a long time on some laptops.
642 *
643 * Note: this makes the call on the current CPU.
632 */ 644 */
633 645static long __apm_bios_call_simple(void *_call)
634static u8 apm_bios_call_simple(u32 func, u32 ebx_in, u32 ecx_in, u32 *eax)
635{ 646{
636 u8 error; 647 u8 error;
637 APM_DECL_SEGS 648 APM_DECL_SEGS
638 unsigned long flags; 649 unsigned long flags;
639 cpumask_t cpus;
640 int cpu; 650 int cpu;
641 struct desc_struct save_desc_40; 651 struct desc_struct save_desc_40;
642 struct desc_struct *gdt; 652 struct desc_struct *gdt;
643 653 struct apm_bios_call *call = _call;
644 cpus = apm_save_cpus();
645 654
646 cpu = get_cpu(); 655 cpu = get_cpu();
656 BUG_ON(cpu != 0);
647 gdt = get_cpu_gdt_table(cpu); 657 gdt = get_cpu_gdt_table(cpu);
648 save_desc_40 = gdt[0x40 / 8]; 658 save_desc_40 = gdt[0x40 / 8];
649 gdt[0x40 / 8] = bad_bios_desc; 659 gdt[0x40 / 8] = bad_bios_desc;
650 660
651 apm_irq_save(flags); 661 apm_irq_save(flags);
652 APM_DO_SAVE_SEGS; 662 APM_DO_SAVE_SEGS;
653 error = apm_bios_call_simple_asm(func, ebx_in, ecx_in, eax); 663 error = apm_bios_call_simple_asm(call->func, call->ebx, call->ecx,
664 &call->eax);
654 APM_DO_RESTORE_SEGS; 665 APM_DO_RESTORE_SEGS;
655 apm_irq_restore(flags); 666 apm_irq_restore(flags);
656 gdt[0x40 / 8] = save_desc_40; 667 gdt[0x40 / 8] = save_desc_40;
657 put_cpu(); 668 put_cpu();
658 apm_restore_cpus(cpus);
659 return error; 669 return error;
660} 670}
661 671
662/** 672/**
673 * apm_bios_call_simple - make a simple APM BIOS 32bit call
674 * @func: APM function to invoke
675 * @ebx_in: EBX register value for BIOS call
676 * @ecx_in: ECX register value for BIOS call
677 * @eax: EAX register on return from the BIOS call
678 * @err: bits
679 *
680 * Make a BIOS call that returns one value only, or just status.
681 * If there is an error, then the error code is returned in @err
682 * and this function returns non-zero. This is used for simpler
683 * BIOS operations. This call may hold interrupts off for a long
684 * time on some laptops.
685 */
686static int apm_bios_call_simple(u32 func, u32 ebx_in, u32 ecx_in, u32 *eax,
687 int *err)
688{
689 struct apm_bios_call call;
690 int ret;
691
692 call.func = func;
693 call.ebx = ebx_in;
694 call.ecx = ecx_in;
695
696 ret = on_cpu0(__apm_bios_call_simple, &call);
697 *eax = call.eax;
698 *err = call.err;
699 return ret;
700}
701
702/**
663 * apm_driver_version - APM driver version 703 * apm_driver_version - APM driver version
664 * @val: loaded with the APM version on return 704 * @val: loaded with the APM version on return
665 * 705 *
@@ -678,9 +718,10 @@ static u8 apm_bios_call_simple(u32 func, u32 ebx_in, u32 ecx_in, u32 *eax)
678static int apm_driver_version(u_short *val) 718static int apm_driver_version(u_short *val)
679{ 719{
680 u32 eax; 720 u32 eax;
721 int err;
681 722
682 if (apm_bios_call_simple(APM_FUNC_VERSION, 0, *val, &eax)) 723 if (apm_bios_call_simple(APM_FUNC_VERSION, 0, *val, &eax, &err))
683 return (eax >> 8) & 0xff; 724 return err;
684 *val = eax; 725 *val = eax;
685 return APM_SUCCESS; 726 return APM_SUCCESS;
686} 727}
@@ -701,22 +742,21 @@ static int apm_driver_version(u_short *val)
701 * that APM 1.2 is in use. If no messges are pending the value 0x80 742 * that APM 1.2 is in use. If no messges are pending the value 0x80
702 * is returned (No power management events pending). 743 * is returned (No power management events pending).
703 */ 744 */
704
705static int apm_get_event(apm_event_t *event, apm_eventinfo_t *info) 745static int apm_get_event(apm_event_t *event, apm_eventinfo_t *info)
706{ 746{
707 u32 eax; 747 struct apm_bios_call call;
708 u32 ebx;
709 u32 ecx;
710 u32 dummy;
711 748
712 if (apm_bios_call(APM_FUNC_GET_EVENT, 0, 0, &eax, &ebx, &ecx, 749 call.func = APM_FUNC_GET_EVENT;
713 &dummy, &dummy)) 750 call.ebx = call.ecx = 0;
714 return (eax >> 8) & 0xff; 751
715 *event = ebx; 752 if (apm_bios_call(&call))
753 return call.err;
754
755 *event = call.ebx;
716 if (apm_info.connection_version < 0x0102) 756 if (apm_info.connection_version < 0x0102)
717 *info = ~0; /* indicate info not valid */ 757 *info = ~0; /* indicate info not valid */
718 else 758 else
719 *info = ecx; 759 *info = call.ecx;
720 return APM_SUCCESS; 760 return APM_SUCCESS;
721} 761}
722 762
@@ -737,9 +777,10 @@ static int apm_get_event(apm_event_t *event, apm_eventinfo_t *info)
737static int set_power_state(u_short what, u_short state) 777static int set_power_state(u_short what, u_short state)
738{ 778{
739 u32 eax; 779 u32 eax;
780 int err;
740 781
741 if (apm_bios_call_simple(APM_FUNC_SET_STATE, what, state, &eax)) 782 if (apm_bios_call_simple(APM_FUNC_SET_STATE, what, state, &eax, &err))
742 return (eax >> 8) & 0xff; 783 return err;
743 return APM_SUCCESS; 784 return APM_SUCCESS;
744} 785}
745 786
@@ -770,6 +811,7 @@ static int apm_do_idle(void)
770 u8 ret = 0; 811 u8 ret = 0;
771 int idled = 0; 812 int idled = 0;
772 int polling; 813 int polling;
814 int err;
773 815
774 polling = !!(current_thread_info()->status & TS_POLLING); 816 polling = !!(current_thread_info()->status & TS_POLLING);
775 if (polling) { 817 if (polling) {
@@ -782,7 +824,7 @@ static int apm_do_idle(void)
782 } 824 }
783 if (!need_resched()) { 825 if (!need_resched()) {
784 idled = 1; 826 idled = 1;
785 ret = apm_bios_call_simple(APM_FUNC_IDLE, 0, 0, &eax); 827 ret = apm_bios_call_simple(APM_FUNC_IDLE, 0, 0, &eax, &err);
786 } 828 }
787 if (polling) 829 if (polling)
788 current_thread_info()->status |= TS_POLLING; 830 current_thread_info()->status |= TS_POLLING;
@@ -797,8 +839,7 @@ static int apm_do_idle(void)
797 * Only report the failure the first 5 times. 839 * Only report the failure the first 5 times.
798 */ 840 */
799 if (++t < 5) { 841 if (++t < 5) {
800 printk(KERN_DEBUG "apm_do_idle failed (%d)\n", 842 printk(KERN_DEBUG "apm_do_idle failed (%d)\n", err);
801 (eax >> 8) & 0xff);
802 t = jiffies; 843 t = jiffies;
803 } 844 }
804 return -1; 845 return -1;
@@ -816,9 +857,10 @@ static int apm_do_idle(void)
816static void apm_do_busy(void) 857static void apm_do_busy(void)
817{ 858{
818 u32 dummy; 859 u32 dummy;
860 int err;
819 861
820 if (clock_slowed || ALWAYS_CALL_BUSY) { 862 if (clock_slowed || ALWAYS_CALL_BUSY) {
821 (void)apm_bios_call_simple(APM_FUNC_BUSY, 0, 0, &dummy); 863 (void)apm_bios_call_simple(APM_FUNC_BUSY, 0, 0, &dummy, &err);
822 clock_slowed = 0; 864 clock_slowed = 0;
823 } 865 }
824} 866}
@@ -937,7 +979,7 @@ static void apm_power_off(void)
937 979
938 /* Some bioses don't like being called from CPU != 0 */ 980 /* Some bioses don't like being called from CPU != 0 */
939 if (apm_info.realmode_power_off) { 981 if (apm_info.realmode_power_off) {
940 (void)apm_save_cpus(); 982 set_cpus_allowed_ptr(current, cpumask_of(0));
941 machine_real_restart(po_bios_call, sizeof(po_bios_call)); 983 machine_real_restart(po_bios_call, sizeof(po_bios_call));
942 } else { 984 } else {
943 (void)set_system_power_state(APM_STATE_OFF); 985 (void)set_system_power_state(APM_STATE_OFF);
@@ -956,12 +998,13 @@ static void apm_power_off(void)
956static int apm_enable_power_management(int enable) 998static int apm_enable_power_management(int enable)
957{ 999{
958 u32 eax; 1000 u32 eax;
1001 int err;
959 1002
960 if ((enable == 0) && (apm_info.bios.flags & APM_BIOS_DISENGAGED)) 1003 if ((enable == 0) && (apm_info.bios.flags & APM_BIOS_DISENGAGED))
961 return APM_NOT_ENGAGED; 1004 return APM_NOT_ENGAGED;
962 if (apm_bios_call_simple(APM_FUNC_ENABLE_PM, APM_DEVICE_BALL, 1005 if (apm_bios_call_simple(APM_FUNC_ENABLE_PM, APM_DEVICE_BALL,
963 enable, &eax)) 1006 enable, &eax, &err))
964 return (eax >> 8) & 0xff; 1007 return err;
965 if (enable) 1008 if (enable)
966 apm_info.bios.flags &= ~APM_BIOS_DISABLED; 1009 apm_info.bios.flags &= ~APM_BIOS_DISABLED;
967 else 1010 else
@@ -986,24 +1029,23 @@ static int apm_enable_power_management(int enable)
986 1029
987static int apm_get_power_status(u_short *status, u_short *bat, u_short *life) 1030static int apm_get_power_status(u_short *status, u_short *bat, u_short *life)
988{ 1031{
989 u32 eax; 1032 struct apm_bios_call call;
990 u32 ebx; 1033
991 u32 ecx; 1034 call.func = APM_FUNC_GET_STATUS;
992 u32 edx; 1035 call.ebx = APM_DEVICE_ALL;
993 u32 dummy; 1036 call.ecx = 0;
994 1037
995 if (apm_info.get_power_status_broken) 1038 if (apm_info.get_power_status_broken)
996 return APM_32_UNSUPPORTED; 1039 return APM_32_UNSUPPORTED;
997 if (apm_bios_call(APM_FUNC_GET_STATUS, APM_DEVICE_ALL, 0, 1040 if (apm_bios_call(&call))
998 &eax, &ebx, &ecx, &edx, &dummy)) 1041 return call.err;
999 return (eax >> 8) & 0xff; 1042 *status = call.ebx;
1000 *status = ebx; 1043 *bat = call.ecx;
1001 *bat = ecx;
1002 if (apm_info.get_power_status_swabinminutes) { 1044 if (apm_info.get_power_status_swabinminutes) {
1003 *life = swab16((u16)edx); 1045 *life = swab16((u16)call.edx);
1004 *life |= 0x8000; 1046 *life |= 0x8000;
1005 } else 1047 } else
1006 *life = edx; 1048 *life = call.edx;
1007 return APM_SUCCESS; 1049 return APM_SUCCESS;
1008} 1050}
1009 1051
@@ -1048,12 +1090,14 @@ static int apm_get_battery_status(u_short which, u_short *status,
1048static int apm_engage_power_management(u_short device, int enable) 1090static int apm_engage_power_management(u_short device, int enable)
1049{ 1091{
1050 u32 eax; 1092 u32 eax;
1093 int err;
1051 1094
1052 if ((enable == 0) && (device == APM_DEVICE_ALL) 1095 if ((enable == 0) && (device == APM_DEVICE_ALL)
1053 && (apm_info.bios.flags & APM_BIOS_DISABLED)) 1096 && (apm_info.bios.flags & APM_BIOS_DISABLED))
1054 return APM_DISABLED; 1097 return APM_DISABLED;
1055 if (apm_bios_call_simple(APM_FUNC_ENGAGE_PM, device, enable, &eax)) 1098 if (apm_bios_call_simple(APM_FUNC_ENGAGE_PM, device, enable,
1056 return (eax >> 8) & 0xff; 1099 &eax, &err))
1100 return err;
1057 if (device == APM_DEVICE_ALL) { 1101 if (device == APM_DEVICE_ALL) {
1058 if (enable) 1102 if (enable)
1059 apm_info.bios.flags &= ~APM_BIOS_DISENGAGED; 1103 apm_info.bios.flags &= ~APM_BIOS_DISENGAGED;
@@ -1689,16 +1733,14 @@ static int apm(void *unused)
1689 char *power_stat; 1733 char *power_stat;
1690 char *bat_stat; 1734 char *bat_stat;
1691 1735
1692#ifdef CONFIG_SMP
1693 /* 2002/08/01 - WT 1736 /* 2002/08/01 - WT
1694 * This is to avoid random crashes at boot time during initialization 1737 * This is to avoid random crashes at boot time during initialization
1695 * on SMP systems in case of "apm=power-off" mode. Seen on ASUS A7M266D. 1738 * on SMP systems in case of "apm=power-off" mode. Seen on ASUS A7M266D.
1696 * Some bioses don't like being called from CPU != 0. 1739 * Some bioses don't like being called from CPU != 0.
1697 * Method suggested by Ingo Molnar. 1740 * Method suggested by Ingo Molnar.
1698 */ 1741 */
1699 set_cpus_allowed(current, cpumask_of_cpu(0)); 1742 set_cpus_allowed_ptr(current, cpumask_of(0));
1700 BUG_ON(smp_processor_id() != 0); 1743 BUG_ON(smp_processor_id() != 0);
1701#endif
1702 1744
1703 if (apm_info.connection_version == 0) { 1745 if (apm_info.connection_version == 0) {
1704 apm_info.connection_version = apm_info.bios.version; 1746 apm_info.connection_version = apm_info.bios.version;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index e2962cc1e27b..c4f667896c28 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -41,8 +41,6 @@
41 41
42#include "cpu.h" 42#include "cpu.h"
43 43
44#ifdef CONFIG_X86_64
45
46/* all of these masks are initialized in setup_cpu_local_masks() */ 44/* all of these masks are initialized in setup_cpu_local_masks() */
47cpumask_var_t cpu_initialized_mask; 45cpumask_var_t cpu_initialized_mask;
48cpumask_var_t cpu_callout_mask; 46cpumask_var_t cpu_callout_mask;
@@ -60,16 +58,6 @@ void __init setup_cpu_local_masks(void)
60 alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask); 58 alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);
61} 59}
62 60
63#else /* CONFIG_X86_32 */
64
65cpumask_t cpu_sibling_setup_map;
66cpumask_t cpu_callout_map;
67cpumask_t cpu_initialized;
68cpumask_t cpu_callin_map;
69
70#endif /* CONFIG_X86_32 */
71
72
73static const struct cpu_dev *this_cpu __cpuinitdata; 61static const struct cpu_dev *this_cpu __cpuinitdata;
74 62
75DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { 63DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
@@ -859,6 +847,7 @@ static void vgetcpu_set_mode(void)
859void __init identify_boot_cpu(void) 847void __init identify_boot_cpu(void)
860{ 848{
861 identify_cpu(&boot_cpu_data); 849 identify_cpu(&boot_cpu_data);
850 init_c1e_mask();
862#ifdef CONFIG_X86_32 851#ifdef CONFIG_X86_32
863 sysenter_setup(); 852 sysenter_setup();
864 enable_sep_cpu(); 853 enable_sep_cpu();
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 022222c76e3b..19f6b9d27e83 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -33,7 +33,7 @@
33#include <linux/cpufreq.h> 33#include <linux/cpufreq.h>
34#include <linux/compiler.h> 34#include <linux/compiler.h>
35#include <linux/dmi.h> 35#include <linux/dmi.h>
36#include <linux/ftrace.h> 36#include <trace/power.h>
37 37
38#include <linux/acpi.h> 38#include <linux/acpi.h>
39#include <linux/io.h> 39#include <linux/io.h>
@@ -72,6 +72,8 @@ struct acpi_cpufreq_data {
72 72
73static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data); 73static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data);
74 74
75DEFINE_TRACE(power_mark);
76
75/* acpi_perf_data is a pointer to percpu data. */ 77/* acpi_perf_data is a pointer to percpu data. */
76static struct acpi_processor_performance *acpi_perf_data; 78static struct acpi_processor_performance *acpi_perf_data;
77 79
diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
index 41ed94915f97..6ac55bd341ae 100644
--- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
@@ -211,7 +211,7 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)
211 unsigned int i; 211 unsigned int i;
212 212
213#ifdef CONFIG_SMP 213#ifdef CONFIG_SMP
214 cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu)); 214 cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu));
215#endif 215#endif
216 216
217 /* Errata workaround */ 217 /* Errata workaround */
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index a15ac94e0b9b..4709ead2db52 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -54,7 +54,10 @@ static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data);
54static int cpu_family = CPU_OPTERON; 54static int cpu_family = CPU_OPTERON;
55 55
56#ifndef CONFIG_SMP 56#ifndef CONFIG_SMP
57DEFINE_PER_CPU(cpumask_t, cpu_core_map); 57static inline const struct cpumask *cpu_core_mask(int cpu)
58{
59 return cpumask_of(0);
60}
58#endif 61#endif
59 62
60/* Return a frequency in MHz, given an input fid */ 63/* Return a frequency in MHz, given an input fid */
@@ -699,7 +702,7 @@ static int fill_powernow_table(struct powernow_k8_data *data,
699 702
700 dprintk("cfid 0x%x, cvid 0x%x\n", data->currfid, data->currvid); 703 dprintk("cfid 0x%x, cvid 0x%x\n", data->currfid, data->currvid);
701 data->powernow_table = powernow_table; 704 data->powernow_table = powernow_table;
702 if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu) 705 if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)
703 print_basics(data); 706 print_basics(data);
704 707
705 for (j = 0; j < data->numps; j++) 708 for (j = 0; j < data->numps; j++)
@@ -862,7 +865,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
862 865
863 /* fill in data */ 866 /* fill in data */
864 data->numps = data->acpi_data.state_count; 867 data->numps = data->acpi_data.state_count;
865 if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu) 868 if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)
866 print_basics(data); 869 print_basics(data);
867 powernow_k8_acpi_pst_values(data, 0); 870 powernow_k8_acpi_pst_values(data, 0);
868 871
@@ -1300,7 +1303,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
1300 if (cpu_family == CPU_HW_PSTATE) 1303 if (cpu_family == CPU_HW_PSTATE)
1301 cpumask_copy(pol->cpus, cpumask_of(pol->cpu)); 1304 cpumask_copy(pol->cpus, cpumask_of(pol->cpu));
1302 else 1305 else
1303 cpumask_copy(pol->cpus, &per_cpu(cpu_core_map, pol->cpu)); 1306 cpumask_copy(pol->cpus, cpu_core_mask(pol->cpu));
1304 data->available_cores = pol->cpus; 1307 data->available_cores = pol->cpus;
1305 1308
1306 if (cpu_family == CPU_HW_PSTATE) 1309 if (cpu_family == CPU_HW_PSTATE)
@@ -1365,7 +1368,7 @@ static unsigned int powernowk8_get(unsigned int cpu)
1365 unsigned int khz = 0; 1368 unsigned int khz = 0;
1366 unsigned int first; 1369 unsigned int first;
1367 1370
1368 first = first_cpu(per_cpu(cpu_core_map, cpu)); 1371 first = cpumask_first(cpu_core_mask(cpu));
1369 data = per_cpu(powernow_data, first); 1372 data = per_cpu(powernow_data, first);
1370 1373
1371 if (!data) 1374 if (!data)
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
index 8bbb11adb315..016c1a4fa3fc 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
@@ -321,7 +321,7 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
321 321
322 /* only run on CPU to be set, or on its sibling */ 322 /* only run on CPU to be set, or on its sibling */
323#ifdef CONFIG_SMP 323#ifdef CONFIG_SMP
324 cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu)); 324 cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu));
325#endif 325#endif
326 326
327 cpus_allowed = current->cpus_allowed; 327 cpus_allowed = current->cpus_allowed;
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index c471eb1a389c..483eda96e102 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -159,7 +159,7 @@ struct _cpuid4_info_regs {
159 unsigned long can_disable; 159 unsigned long can_disable;
160}; 160};
161 161
162#ifdef CONFIG_PCI 162#if defined(CONFIG_PCI) && defined(CONFIG_SYSFS)
163static struct pci_device_id k8_nb_id[] = { 163static struct pci_device_id k8_nb_id[] = {
164 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) }, 164 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },
165 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) }, 165 { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },
@@ -324,15 +324,6 @@ __cpuinit cpuid4_cache_lookup_regs(int index,
324 return 0; 324 return 0;
325} 325}
326 326
327static int
328__cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)
329{
330 struct _cpuid4_info_regs *leaf_regs =
331 (struct _cpuid4_info_regs *)this_leaf;
332
333 return cpuid4_cache_lookup_regs(index, leaf_regs);
334}
335
336static int __cpuinit find_num_cache_leaves(void) 327static int __cpuinit find_num_cache_leaves(void)
337{ 328{
338 unsigned int eax, ebx, ecx, edx; 329 unsigned int eax, ebx, ecx, edx;
@@ -508,6 +499,8 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
508 return l2; 499 return l2;
509} 500}
510 501
502#ifdef CONFIG_SYSFS
503
511/* pointer to _cpuid4_info array (for each cache leaf) */ 504/* pointer to _cpuid4_info array (for each cache leaf) */
512static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info); 505static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);
513#define CPUID4_INFO_IDX(x, y) (&((per_cpu(cpuid4_info, x))[y])) 506#define CPUID4_INFO_IDX(x, y) (&((per_cpu(cpuid4_info, x))[y]))
@@ -571,6 +564,15 @@ static void __cpuinit free_cache_attributes(unsigned int cpu)
571 per_cpu(cpuid4_info, cpu) = NULL; 564 per_cpu(cpuid4_info, cpu) = NULL;
572} 565}
573 566
567static int
568__cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)
569{
570 struct _cpuid4_info_regs *leaf_regs =
571 (struct _cpuid4_info_regs *)this_leaf;
572
573 return cpuid4_cache_lookup_regs(index, leaf_regs);
574}
575
574static void __cpuinit get_cpu_leaves(void *_retval) 576static void __cpuinit get_cpu_leaves(void *_retval)
575{ 577{
576 int j, *retval = _retval, cpu = smp_processor_id(); 578 int j, *retval = _retval, cpu = smp_processor_id();
@@ -612,8 +614,6 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
612 return retval; 614 return retval;
613} 615}
614 616
615#ifdef CONFIG_SYSFS
616
617#include <linux/kobject.h> 617#include <linux/kobject.h>
618#include <linux/sysfs.h> 618#include <linux/sysfs.h>
619 619
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index ca14604611ec..863f89568b1a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -990,7 +990,7 @@ static struct sysdev_attribute *mce_attributes[] = {
990 NULL 990 NULL
991}; 991};
992 992
993static cpumask_t mce_device_initialized = CPU_MASK_NONE; 993static cpumask_var_t mce_device_initialized;
994 994
995/* Per cpu sysdev init. All of the cpus still share the same ctl bank */ 995/* Per cpu sysdev init. All of the cpus still share the same ctl bank */
996static __cpuinit int mce_create_device(unsigned int cpu) 996static __cpuinit int mce_create_device(unsigned int cpu)
@@ -1021,7 +1021,7 @@ static __cpuinit int mce_create_device(unsigned int cpu)
1021 if (err) 1021 if (err)
1022 goto error2; 1022 goto error2;
1023 } 1023 }
1024 cpu_set(cpu, mce_device_initialized); 1024 cpumask_set_cpu(cpu, mce_device_initialized);
1025 1025
1026 return 0; 1026 return 0;
1027error2: 1027error2:
@@ -1043,7 +1043,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu)
1043{ 1043{
1044 int i; 1044 int i;
1045 1045
1046 if (!cpu_isset(cpu, mce_device_initialized)) 1046 if (!cpumask_test_cpu(cpu, mce_device_initialized))
1047 return; 1047 return;
1048 1048
1049 for (i = 0; mce_attributes[i]; i++) 1049 for (i = 0; mce_attributes[i]; i++)
@@ -1053,7 +1053,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu)
1053 sysdev_remove_file(&per_cpu(device_mce, cpu), 1053 sysdev_remove_file(&per_cpu(device_mce, cpu),
1054 &bank_attrs[i]); 1054 &bank_attrs[i]);
1055 sysdev_unregister(&per_cpu(device_mce,cpu)); 1055 sysdev_unregister(&per_cpu(device_mce,cpu));
1056 cpu_clear(cpu, mce_device_initialized); 1056 cpumask_clear_cpu(cpu, mce_device_initialized);
1057} 1057}
1058 1058
1059/* Make sure there are no machine checks on offlined CPUs. */ 1059/* Make sure there are no machine checks on offlined CPUs. */
@@ -1162,6 +1162,8 @@ static __init int mce_init_device(void)
1162 if (!mce_available(&boot_cpu_data)) 1162 if (!mce_available(&boot_cpu_data))
1163 return -EIO; 1163 return -EIO;
1164 1164
1165 alloc_cpumask_var(&mce_device_initialized, GFP_KERNEL);
1166
1165 err = mce_init_banks(); 1167 err = mce_init_banks();
1166 if (err) 1168 if (err)
1167 return err; 1169 return err;
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
index 7d01be868870..56dde9c4bc96 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
@@ -485,7 +485,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
485 485
486#ifdef CONFIG_SMP 486#ifdef CONFIG_SMP
487 if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) { /* symlink */ 487 if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) { /* symlink */
488 i = cpumask_first(&per_cpu(cpu_core_map, cpu)); 488 i = cpumask_first(cpu_core_mask(cpu));
489 489
490 /* first core not up yet */ 490 /* first core not up yet */
491 if (cpu_data(i).cpu_core_id) 491 if (cpu_data(i).cpu_core_id)
@@ -505,7 +505,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
505 if (err) 505 if (err)
506 goto out; 506 goto out;
507 507
508 cpumask_copy(b->cpus, &per_cpu(cpu_core_map, cpu)); 508 cpumask_copy(b->cpus, cpu_core_mask(cpu));
509 per_cpu(threshold_banks, cpu)[bank] = b; 509 per_cpu(threshold_banks, cpu)[bank] = b;
510 goto out; 510 goto out;
511 } 511 }
@@ -529,7 +529,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
529#ifndef CONFIG_SMP 529#ifndef CONFIG_SMP
530 cpumask_setall(b->cpus); 530 cpumask_setall(b->cpus);
531#else 531#else
532 cpumask_copy(b->cpus, &per_cpu(cpu_core_map, cpu)); 532 cpumask_copy(b->cpus, cpu_core_mask(cpu));
533#endif 533#endif
534 534
535 per_cpu(threshold_banks, cpu)[bank] = b; 535 per_cpu(threshold_banks, cpu)[bank] = b;
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
index 57df3d383470..d6b72df89d69 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
@@ -249,7 +249,7 @@ void cmci_rediscover(int dying)
249 for_each_online_cpu (cpu) { 249 for_each_online_cpu (cpu) {
250 if (cpu == dying) 250 if (cpu == dying)
251 continue; 251 continue;
252 if (set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu))) 252 if (set_cpus_allowed_ptr(current, cpumask_of(cpu)))
253 continue; 253 continue;
254 /* Recheck banks in case CPUs don't all have the same */ 254 /* Recheck banks in case CPUs don't all have the same */
255 if (cmci_supported(&banks)) 255 if (cmci_supported(&banks))
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index d67e0e48bc2d..f93047fed791 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -14,7 +14,7 @@ static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
14 if (c->x86_max_cores * smp_num_siblings > 1) { 14 if (c->x86_max_cores * smp_num_siblings > 1) {
15 seq_printf(m, "physical id\t: %d\n", c->phys_proc_id); 15 seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
16 seq_printf(m, "siblings\t: %d\n", 16 seq_printf(m, "siblings\t: %d\n",
17 cpus_weight(per_cpu(cpu_core_map, cpu))); 17 cpumask_weight(cpu_sibling_mask(cpu)));
18 seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id); 18 seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
19 seq_printf(m, "cpu cores\t: %d\n", c->booted_cores); 19 seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
20 seq_printf(m, "apicid\t\t: %d\n", c->apicid); 20 seq_printf(m, "apicid\t\t: %d\n", c->apicid);
@@ -143,9 +143,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
143static void *c_start(struct seq_file *m, loff_t *pos) 143static void *c_start(struct seq_file *m, loff_t *pos)
144{ 144{
145 if (*pos == 0) /* just in case, cpu 0 is not the first */ 145 if (*pos == 0) /* just in case, cpu 0 is not the first */
146 *pos = first_cpu(cpu_online_map); 146 *pos = cpumask_first(cpu_online_mask);
147 else 147 else
148 *pos = next_cpu_nr(*pos - 1, cpu_online_map); 148 *pos = cpumask_next(*pos - 1, cpu_online_mask);
149 if ((*pos) < nr_cpu_ids) 149 if ((*pos) < nr_cpu_ids)
150 return &cpu_data(*pos); 150 return &cpu_data(*pos);
151 return NULL; 151 return NULL;
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index dd2130b0fb3e..95ea5fa7d444 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -15,6 +15,7 @@
15#include <linux/bug.h> 15#include <linux/bug.h>
16#include <linux/nmi.h> 16#include <linux/nmi.h>
17#include <linux/sysfs.h> 17#include <linux/sysfs.h>
18#include <linux/ftrace.h>
18 19
19#include <asm/stacktrace.h> 20#include <asm/stacktrace.h>
20 21
@@ -196,6 +197,11 @@ unsigned __kprobes long oops_begin(void)
196 int cpu; 197 int cpu;
197 unsigned long flags; 198 unsigned long flags;
198 199
200 /* notify the hw-branch tracer so it may disable tracing and
201 add the last trace to the trace buffer -
202 the earlier this happens, the more useful the trace. */
203 trace_hw_branch_oops();
204
199 oops_enter(); 205 oops_enter();
200 206
201 /* racy, but better than risking deadlock. */ 207 /* racy, but better than risking deadlock. */
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 76f7141e0f91..61df77532120 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -18,6 +18,7 @@
18#include <linux/init.h> 18#include <linux/init.h>
19#include <linux/list.h> 19#include <linux/list.h>
20 20
21#include <asm/cacheflush.h>
21#include <asm/ftrace.h> 22#include <asm/ftrace.h>
22#include <linux/ftrace.h> 23#include <linux/ftrace.h>
23#include <asm/nops.h> 24#include <asm/nops.h>
@@ -26,6 +27,18 @@
26 27
27#ifdef CONFIG_DYNAMIC_FTRACE 28#ifdef CONFIG_DYNAMIC_FTRACE
28 29
30int ftrace_arch_code_modify_prepare(void)
31{
32 set_kernel_text_rw();
33 return 0;
34}
35
36int ftrace_arch_code_modify_post_process(void)
37{
38 set_kernel_text_ro();
39 return 0;
40}
41
29union ftrace_code_union { 42union ftrace_code_union {
30 char code[MCOUNT_INSN_SIZE]; 43 char code[MCOUNT_INSN_SIZE];
31 struct { 44 struct {
@@ -66,11 +79,11 @@ static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
66 * 79 *
67 * 1) Put the instruction pointer into the IP buffer 80 * 1) Put the instruction pointer into the IP buffer
68 * and the new code into the "code" buffer. 81 * and the new code into the "code" buffer.
69 * 2) Set a flag that says we are modifying code 82 * 2) Wait for any running NMIs to finish and set a flag that says
70 * 3) Wait for any running NMIs to finish. 83 * we are modifying code, it is done in an atomic operation.
71 * 4) Write the code 84 * 3) Write the code
72 * 5) clear the flag. 85 * 4) clear the flag.
73 * 6) Wait for any running NMIs to finish. 86 * 5) Wait for any running NMIs to finish.
74 * 87 *
75 * If an NMI is executed, the first thing it does is to call 88 * If an NMI is executed, the first thing it does is to call
76 * "ftrace_nmi_enter". This will check if the flag is set to write 89 * "ftrace_nmi_enter". This will check if the flag is set to write
@@ -82,9 +95,9 @@ static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
82 * are the same as what exists. 95 * are the same as what exists.
83 */ 96 */
84 97
85static atomic_t in_nmi = ATOMIC_INIT(0); 98#define MOD_CODE_WRITE_FLAG (1 << 31) /* set when NMI should do the write */
99static atomic_t nmi_running = ATOMIC_INIT(0);
86static int mod_code_status; /* holds return value of text write */ 100static int mod_code_status; /* holds return value of text write */
87static int mod_code_write; /* set when NMI should do the write */
88static void *mod_code_ip; /* holds the IP to write to */ 101static void *mod_code_ip; /* holds the IP to write to */
89static void *mod_code_newcode; /* holds the text to write to the IP */ 102static void *mod_code_newcode; /* holds the text to write to the IP */
90 103
@@ -101,6 +114,20 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
101 return r; 114 return r;
102} 115}
103 116
117static void clear_mod_flag(void)
118{
119 int old = atomic_read(&nmi_running);
120
121 for (;;) {
122 int new = old & ~MOD_CODE_WRITE_FLAG;
123
124 if (old == new)
125 break;
126
127 old = atomic_cmpxchg(&nmi_running, old, new);
128 }
129}
130
104static void ftrace_mod_code(void) 131static void ftrace_mod_code(void)
105{ 132{
106 /* 133 /*
@@ -111,37 +138,52 @@ static void ftrace_mod_code(void)
111 */ 138 */
112 mod_code_status = probe_kernel_write(mod_code_ip, mod_code_newcode, 139 mod_code_status = probe_kernel_write(mod_code_ip, mod_code_newcode,
113 MCOUNT_INSN_SIZE); 140 MCOUNT_INSN_SIZE);
141
142 /* if we fail, then kill any new writers */
143 if (mod_code_status)
144 clear_mod_flag();
114} 145}
115 146
116void ftrace_nmi_enter(void) 147void ftrace_nmi_enter(void)
117{ 148{
118 atomic_inc(&in_nmi); 149 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
119 /* Must have in_nmi seen before reading write flag */ 150 smp_rmb();
120 smp_mb();
121 if (mod_code_write) {
122 ftrace_mod_code(); 151 ftrace_mod_code();
123 atomic_inc(&nmi_update_count); 152 atomic_inc(&nmi_update_count);
124 } 153 }
154 /* Must have previous changes seen before executions */
155 smp_mb();
125} 156}
126 157
127void ftrace_nmi_exit(void) 158void ftrace_nmi_exit(void)
128{ 159{
129 /* Finish all executions before clearing in_nmi */ 160 /* Finish all executions before clearing nmi_running */
130 smp_wmb(); 161 smp_mb();
131 atomic_dec(&in_nmi); 162 atomic_dec(&nmi_running);
163}
164
165static void wait_for_nmi_and_set_mod_flag(void)
166{
167 if (!atomic_cmpxchg(&nmi_running, 0, MOD_CODE_WRITE_FLAG))
168 return;
169
170 do {
171 cpu_relax();
172 } while (atomic_cmpxchg(&nmi_running, 0, MOD_CODE_WRITE_FLAG));
173
174 nmi_wait_count++;
132} 175}
133 176
134static void wait_for_nmi(void) 177static void wait_for_nmi(void)
135{ 178{
136 int waited = 0; 179 if (!atomic_read(&nmi_running))
180 return;
137 181
138 while (atomic_read(&in_nmi)) { 182 do {
139 waited = 1;
140 cpu_relax(); 183 cpu_relax();
141 } 184 } while (atomic_read(&nmi_running));
142 185
143 if (waited) 186 nmi_wait_count++;
144 nmi_wait_count++;
145} 187}
146 188
147static int 189static int
@@ -151,14 +193,9 @@ do_ftrace_mod_code(unsigned long ip, void *new_code)
151 mod_code_newcode = new_code; 193 mod_code_newcode = new_code;
152 194
153 /* The buffers need to be visible before we let NMIs write them */ 195 /* The buffers need to be visible before we let NMIs write them */
154 smp_wmb();
155
156 mod_code_write = 1;
157
158 /* Make sure write bit is visible before we wait on NMIs */
159 smp_mb(); 196 smp_mb();
160 197
161 wait_for_nmi(); 198 wait_for_nmi_and_set_mod_flag();
162 199
163 /* Make sure all running NMIs have finished before we write the code */ 200 /* Make sure all running NMIs have finished before we write the code */
164 smp_mb(); 201 smp_mb();
@@ -166,13 +203,9 @@ do_ftrace_mod_code(unsigned long ip, void *new_code)
166 ftrace_mod_code(); 203 ftrace_mod_code();
167 204
168 /* Make sure the write happens before clearing the bit */ 205 /* Make sure the write happens before clearing the bit */
169 smp_wmb();
170
171 mod_code_write = 0;
172
173 /* make sure NMIs see the cleared bit */
174 smp_mb(); 206 smp_mb();
175 207
208 clear_mod_flag();
176 wait_for_nmi(); 209 wait_for_nmi();
177 210
178 return mod_code_status; 211 return mod_code_status;
@@ -368,25 +401,6 @@ int ftrace_disable_ftrace_graph_caller(void)
368 return ftrace_mod_jmp(ip, old_offset, new_offset); 401 return ftrace_mod_jmp(ip, old_offset, new_offset);
369} 402}
370 403
371#else /* CONFIG_DYNAMIC_FTRACE */
372
373/*
374 * These functions are picked from those used on
375 * this page for dynamic ftrace. They have been
376 * simplified to ignore all traces in NMI context.
377 */
378static atomic_t in_nmi;
379
380void ftrace_nmi_enter(void)
381{
382 atomic_inc(&in_nmi);
383}
384
385void ftrace_nmi_exit(void)
386{
387 atomic_dec(&in_nmi);
388}
389
390#endif /* !CONFIG_DYNAMIC_FTRACE */ 404#endif /* !CONFIG_DYNAMIC_FTRACE */
391 405
392/* 406/*
@@ -396,14 +410,13 @@ void ftrace_nmi_exit(void)
396void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 410void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
397{ 411{
398 unsigned long old; 412 unsigned long old;
399 unsigned long long calltime;
400 int faulted; 413 int faulted;
401 struct ftrace_graph_ent trace; 414 struct ftrace_graph_ent trace;
402 unsigned long return_hooker = (unsigned long) 415 unsigned long return_hooker = (unsigned long)
403 &return_to_handler; 416 &return_to_handler;
404 417
405 /* Nmi's are currently unsupported */ 418 /* Nmi's are currently unsupported */
406 if (unlikely(atomic_read(&in_nmi))) 419 if (unlikely(in_nmi()))
407 return; 420 return;
408 421
409 if (unlikely(atomic_read(&current->tracing_graph_pause))) 422 if (unlikely(atomic_read(&current->tracing_graph_pause)))
@@ -439,17 +452,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
439 return; 452 return;
440 } 453 }
441 454
442 if (unlikely(!__kernel_text_address(old))) { 455 if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) {
443 ftrace_graph_stop();
444 *parent = old;
445 WARN_ON(1);
446 return;
447 }
448
449 calltime = cpu_clock(raw_smp_processor_id());
450
451 if (ftrace_push_return_trace(old, calltime,
452 self_addr, &trace.depth) == -EBUSY) {
453 *parent = old; 456 *parent = old;
454 return; 457 return;
455 } 458 }
@@ -463,3 +466,66 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
463 } 466 }
464} 467}
465#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ 468#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
469
470#ifdef CONFIG_FTRACE_SYSCALLS
471
472extern unsigned long __start_syscalls_metadata[];
473extern unsigned long __stop_syscalls_metadata[];
474extern unsigned long *sys_call_table;
475
476static struct syscall_metadata **syscalls_metadata;
477
478static struct syscall_metadata *find_syscall_meta(unsigned long *syscall)
479{
480 struct syscall_metadata *start;
481 struct syscall_metadata *stop;
482 char str[KSYM_SYMBOL_LEN];
483
484
485 start = (struct syscall_metadata *)__start_syscalls_metadata;
486 stop = (struct syscall_metadata *)__stop_syscalls_metadata;
487 kallsyms_lookup((unsigned long) syscall, NULL, NULL, NULL, str);
488
489 for ( ; start < stop; start++) {
490 if (start->name && !strcmp(start->name, str))
491 return start;
492 }
493 return NULL;
494}
495
496struct syscall_metadata *syscall_nr_to_meta(int nr)
497{
498 if (!syscalls_metadata || nr >= FTRACE_SYSCALL_MAX || nr < 0)
499 return NULL;
500
501 return syscalls_metadata[nr];
502}
503
504void arch_init_ftrace_syscalls(void)
505{
506 int i;
507 struct syscall_metadata *meta;
508 unsigned long **psys_syscall_table = &sys_call_table;
509 static atomic_t refs;
510
511 if (atomic_inc_return(&refs) != 1)
512 goto end;
513
514 syscalls_metadata = kzalloc(sizeof(*syscalls_metadata) *
515 FTRACE_SYSCALL_MAX, GFP_KERNEL);
516 if (!syscalls_metadata) {
517 WARN_ON(1);
518 return;
519 }
520
521 for (i = 0; i < FTRACE_SYSCALL_MAX; i++) {
522 meta = find_syscall_meta(psys_syscall_table[i]);
523 syscalls_metadata[i] = meta;
524 }
525 return;
526
527 /* Paranoid: avoid overflow */
528end:
529 atomic_dec(&refs);
530}
531#endif
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 55b94614e348..7b5169d2b000 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -638,13 +638,13 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
638#else 638#else
639 " pushf\n" 639 " pushf\n"
640 /* 640 /*
641 * Skip cs, ip, orig_ax. 641 * Skip cs, ip, orig_ax and gs.
642 * trampoline_handler() will plug in these values 642 * trampoline_handler() will plug in these values
643 */ 643 */
644 " subl $12, %esp\n" 644 " subl $16, %esp\n"
645 " pushl %fs\n" 645 " pushl %fs\n"
646 " pushl %ds\n"
647 " pushl %es\n" 646 " pushl %es\n"
647 " pushl %ds\n"
648 " pushl %eax\n" 648 " pushl %eax\n"
649 " pushl %ebp\n" 649 " pushl %ebp\n"
650 " pushl %edi\n" 650 " pushl %edi\n"
@@ -655,10 +655,10 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
655 " movl %esp, %eax\n" 655 " movl %esp, %eax\n"
656 " call trampoline_handler\n" 656 " call trampoline_handler\n"
657 /* Move flags to cs */ 657 /* Move flags to cs */
658 " movl 52(%esp), %edx\n" 658 " movl 56(%esp), %edx\n"
659 " movl %edx, 48(%esp)\n" 659 " movl %edx, 52(%esp)\n"
660 /* Replace saved flags with true return address. */ 660 /* Replace saved flags with true return address. */
661 " movl %eax, 52(%esp)\n" 661 " movl %eax, 56(%esp)\n"
662 " popl %ebx\n" 662 " popl %ebx\n"
663 " popl %ecx\n" 663 " popl %ecx\n"
664 " popl %edx\n" 664 " popl %edx\n"
@@ -666,8 +666,8 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
666 " popl %edi\n" 666 " popl %edi\n"
667 " popl %ebp\n" 667 " popl %ebp\n"
668 " popl %eax\n" 668 " popl %eax\n"
669 /* Skip ip, orig_ax, es, ds, fs */ 669 /* Skip ds, es, fs, gs, orig_ax and ip */
670 " addl $20, %esp\n" 670 " addl $24, %esp\n"
671 " popf\n" 671 " popf\n"
672#endif 672#endif
673 " ret\n"); 673 " ret\n");
@@ -691,6 +691,7 @@ static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
691 regs->cs = __KERNEL_CS; 691 regs->cs = __KERNEL_CS;
692#else 692#else
693 regs->cs = __KERNEL_CS | get_kernel_rpl(); 693 regs->cs = __KERNEL_CS | get_kernel_rpl();
694 regs->gs = 0;
694#endif 695#endif
695 regs->ip = trampoline_address; 696 regs->ip = trampoline_address;
696 regs->orig_ax = ~0UL; 697 regs->orig_ax = ~0UL;
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index c25fdb382292..453b5795a5c6 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -12,31 +12,30 @@
12 * 12 *
13 * Licensed under the terms of the GNU General Public 13 * Licensed under the terms of the GNU General Public
14 * License version 2. See file COPYING for details. 14 * License version 2. See file COPYING for details.
15*/ 15 */
16 16#include <linux/platform_device.h>
17#include <linux/capability.h> 17#include <linux/capability.h>
18#include <linux/kernel.h>
19#include <linux/init.h>
20#include <linux/sched.h>
21#include <linux/cpumask.h>
22#include <linux/module.h>
23#include <linux/slab.h>
24#include <linux/vmalloc.h>
25#include <linux/miscdevice.h> 18#include <linux/miscdevice.h>
19#include <linux/firmware.h>
26#include <linux/spinlock.h> 20#include <linux/spinlock.h>
27#include <linux/mm.h> 21#include <linux/cpumask.h>
28#include <linux/fs.h> 22#include <linux/pci_ids.h>
23#include <linux/uaccess.h>
24#include <linux/vmalloc.h>
25#include <linux/kernel.h>
26#include <linux/module.h>
29#include <linux/mutex.h> 27#include <linux/mutex.h>
28#include <linux/sched.h>
29#include <linux/init.h>
30#include <linux/slab.h>
30#include <linux/cpu.h> 31#include <linux/cpu.h>
31#include <linux/firmware.h>
32#include <linux/platform_device.h>
33#include <linux/pci.h> 32#include <linux/pci.h>
34#include <linux/pci_ids.h> 33#include <linux/fs.h>
35#include <linux/uaccess.h> 34#include <linux/mm.h>
36 35
37#include <asm/msr.h>
38#include <asm/processor.h>
39#include <asm/microcode.h> 36#include <asm/microcode.h>
37#include <asm/processor.h>
38#include <asm/msr.h>
40 39
41MODULE_DESCRIPTION("AMD Microcode Update Driver"); 40MODULE_DESCRIPTION("AMD Microcode Update Driver");
42MODULE_AUTHOR("Peter Oruba"); 41MODULE_AUTHOR("Peter Oruba");
@@ -72,8 +71,8 @@ struct microcode_header_amd {
72} __attribute__((packed)); 71} __attribute__((packed));
73 72
74struct microcode_amd { 73struct microcode_amd {
75 struct microcode_header_amd hdr; 74 struct microcode_header_amd hdr;
76 unsigned int mpb[0]; 75 unsigned int mpb[0];
77}; 76};
78 77
79#define UCODE_MAX_SIZE 2048 78#define UCODE_MAX_SIZE 2048
@@ -184,8 +183,8 @@ static int get_ucode_data(void *to, const u8 *from, size_t n)
184 return 0; 183 return 0;
185} 184}
186 185
187static void *get_next_ucode(const u8 *buf, unsigned int size, 186static void *
188 unsigned int *mc_size) 187get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
189{ 188{
190 unsigned int total_size; 189 unsigned int total_size;
191 u8 section_hdr[UCODE_CONTAINER_SECTION_HDR]; 190 u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
@@ -223,7 +222,6 @@ static void *get_next_ucode(const u8 *buf, unsigned int size,
223 return mc; 222 return mc;
224} 223}
225 224
226
227static int install_equiv_cpu_table(const u8 *buf) 225static int install_equiv_cpu_table(const u8 *buf)
228{ 226{
229 u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE]; 227 u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE];
@@ -372,4 +370,3 @@ struct microcode_ops * __init init_amd_microcode(void)
372{ 370{
373 return &microcode_amd_ops; 371 return &microcode_amd_ops;
374} 372}
375
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index c9b721ba968c..a0f3851ef310 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -70,67 +70,78 @@
70 * Fix sigmatch() macro to handle old CPUs with pf == 0. 70 * Fix sigmatch() macro to handle old CPUs with pf == 0.
71 * Thanks to Stuart Swales for pointing out this bug. 71 * Thanks to Stuart Swales for pointing out this bug.
72 */ 72 */
73#include <linux/platform_device.h>
73#include <linux/capability.h> 74#include <linux/capability.h>
74#include <linux/kernel.h> 75#include <linux/miscdevice.h>
75#include <linux/init.h> 76#include <linux/firmware.h>
76#include <linux/sched.h>
77#include <linux/smp_lock.h> 77#include <linux/smp_lock.h>
78#include <linux/spinlock.h>
78#include <linux/cpumask.h> 79#include <linux/cpumask.h>
79#include <linux/module.h> 80#include <linux/uaccess.h>
80#include <linux/slab.h>
81#include <linux/vmalloc.h> 81#include <linux/vmalloc.h>
82#include <linux/miscdevice.h> 82#include <linux/kernel.h>
83#include <linux/spinlock.h> 83#include <linux/module.h>
84#include <linux/mm.h>
85#include <linux/fs.h>
86#include <linux/mutex.h> 84#include <linux/mutex.h>
85#include <linux/sched.h>
86#include <linux/init.h>
87#include <linux/slab.h>
87#include <linux/cpu.h> 88#include <linux/cpu.h>
88#include <linux/firmware.h> 89#include <linux/fs.h>
89#include <linux/platform_device.h> 90#include <linux/mm.h>
90 91
91#include <asm/msr.h>
92#include <asm/uaccess.h>
93#include <asm/processor.h>
94#include <asm/microcode.h> 92#include <asm/microcode.h>
93#include <asm/processor.h>
94#include <asm/msr.h>
95 95
96MODULE_DESCRIPTION("Microcode Update Driver"); 96MODULE_DESCRIPTION("Microcode Update Driver");
97MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>"); 97MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
98MODULE_LICENSE("GPL"); 98MODULE_LICENSE("GPL");
99 99
100#define MICROCODE_VERSION "2.00" 100#define MICROCODE_VERSION "2.00"
101 101
102static struct microcode_ops *microcode_ops; 102static struct microcode_ops *microcode_ops;
103 103
104/* no concurrent ->write()s are allowed on /dev/cpu/microcode */ 104/* no concurrent ->write()s are allowed on /dev/cpu/microcode */
105static DEFINE_MUTEX(microcode_mutex); 105static DEFINE_MUTEX(microcode_mutex);
106 106
107struct ucode_cpu_info ucode_cpu_info[NR_CPUS]; 107struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
108EXPORT_SYMBOL_GPL(ucode_cpu_info); 108EXPORT_SYMBOL_GPL(ucode_cpu_info);
109 109
110#ifdef CONFIG_MICROCODE_OLD_INTERFACE 110#ifdef CONFIG_MICROCODE_OLD_INTERFACE
111struct update_for_cpu {
112 const void __user *buf;
113 size_t size;
114};
115
116static long update_for_cpu(void *_ufc)
117{
118 struct update_for_cpu *ufc = _ufc;
119 int error;
120
121 error = microcode_ops->request_microcode_user(smp_processor_id(),
122 ufc->buf, ufc->size);
123 if (error < 0)
124 return error;
125 if (!error)
126 microcode_ops->apply_microcode(smp_processor_id());
127 return error;
128}
129
111static int do_microcode_update(const void __user *buf, size_t size) 130static int do_microcode_update(const void __user *buf, size_t size)
112{ 131{
113 cpumask_t old;
114 int error = 0; 132 int error = 0;
115 int cpu; 133 int cpu;
116 134 struct update_for_cpu ufc = { .buf = buf, .size = size };
117 old = current->cpus_allowed;
118 135
119 for_each_online_cpu(cpu) { 136 for_each_online_cpu(cpu) {
120 struct ucode_cpu_info *uci = ucode_cpu_info + cpu; 137 struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
121 138
122 if (!uci->valid) 139 if (!uci->valid)
123 continue; 140 continue;
124 141 error = work_on_cpu(cpu, update_for_cpu, &ufc);
125 set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
126 error = microcode_ops->request_microcode_user(cpu, buf, size);
127 if (error < 0) 142 if (error < 0)
128 goto out; 143 break;
129 if (!error)
130 microcode_ops->apply_microcode(cpu);
131 } 144 }
132out:
133 set_cpus_allowed_ptr(current, &old);
134 return error; 145 return error;
135} 146}
136 147
@@ -198,18 +209,33 @@ static void microcode_dev_exit(void)
198 209
199MODULE_ALIAS_MISCDEV(MICROCODE_MINOR); 210MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
200#else 211#else
201#define microcode_dev_init() 0 212#define microcode_dev_init() 0
202#define microcode_dev_exit() do { } while (0) 213#define microcode_dev_exit() do { } while (0)
203#endif 214#endif
204 215
205/* fake device for request_firmware */ 216/* fake device for request_firmware */
206static struct platform_device *microcode_pdev; 217static struct platform_device *microcode_pdev;
218
219static long reload_for_cpu(void *unused)
220{
221 struct ucode_cpu_info *uci = ucode_cpu_info + smp_processor_id();
222 int err = 0;
223
224 mutex_lock(&microcode_mutex);
225 if (uci->valid) {
226 err = microcode_ops->request_microcode_fw(smp_processor_id(),
227 &microcode_pdev->dev);
228 if (!err)
229 microcode_ops->apply_microcode(smp_processor_id());
230 }
231 mutex_unlock(&microcode_mutex);
232 return err;
233}
207 234
208static ssize_t reload_store(struct sys_device *dev, 235static ssize_t reload_store(struct sys_device *dev,
209 struct sysdev_attribute *attr, 236 struct sysdev_attribute *attr,
210 const char *buf, size_t sz) 237 const char *buf, size_t sz)
211{ 238{
212 struct ucode_cpu_info *uci = ucode_cpu_info + dev->id;
213 char *end; 239 char *end;
214 unsigned long val = simple_strtoul(buf, &end, 0); 240 unsigned long val = simple_strtoul(buf, &end, 0);
215 int err = 0; 241 int err = 0;
@@ -218,21 +244,9 @@ static ssize_t reload_store(struct sys_device *dev,
218 if (end == buf) 244 if (end == buf)
219 return -EINVAL; 245 return -EINVAL;
220 if (val == 1) { 246 if (val == 1) {
221 cpumask_t old = current->cpus_allowed;
222
223 get_online_cpus(); 247 get_online_cpus();
224 if (cpu_online(cpu)) { 248 if (cpu_online(cpu))
225 set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu)); 249 err = work_on_cpu(cpu, reload_for_cpu, NULL);
226 mutex_lock(&microcode_mutex);
227 if (uci->valid) {
228 err = microcode_ops->request_microcode_fw(cpu,
229 &microcode_pdev->dev);
230 if (!err)
231 microcode_ops->apply_microcode(cpu);
232 }
233 mutex_unlock(&microcode_mutex);
234 set_cpus_allowed_ptr(current, &old);
235 }
236 put_online_cpus(); 250 put_online_cpus();
237 } 251 }
238 if (err) 252 if (err)
@@ -268,8 +282,8 @@ static struct attribute *mc_default_attrs[] = {
268}; 282};
269 283
270static struct attribute_group mc_attr_group = { 284static struct attribute_group mc_attr_group = {
271 .attrs = mc_default_attrs, 285 .attrs = mc_default_attrs,
272 .name = "microcode", 286 .name = "microcode",
273}; 287};
274 288
275static void __microcode_fini_cpu(int cpu) 289static void __microcode_fini_cpu(int cpu)
@@ -328,9 +342,9 @@ static int microcode_resume_cpu(int cpu)
328 return 0; 342 return 0;
329} 343}
330 344
331static void microcode_update_cpu(int cpu) 345static long microcode_update_cpu(void *unused)
332{ 346{
333 struct ucode_cpu_info *uci = ucode_cpu_info + cpu; 347 struct ucode_cpu_info *uci = ucode_cpu_info + smp_processor_id();
334 int err = 0; 348 int err = 0;
335 349
336 /* 350 /*
@@ -338,30 +352,27 @@ static void microcode_update_cpu(int cpu)
338 * otherwise just request a firmware: 352 * otherwise just request a firmware:
339 */ 353 */
340 if (uci->valid) { 354 if (uci->valid) {
341 err = microcode_resume_cpu(cpu); 355 err = microcode_resume_cpu(smp_processor_id());
342 } else { 356 } else {
343 collect_cpu_info(cpu); 357 collect_cpu_info(smp_processor_id());
344 if (uci->valid && system_state == SYSTEM_RUNNING) 358 if (uci->valid && system_state == SYSTEM_RUNNING)
345 err = microcode_ops->request_microcode_fw(cpu, 359 err = microcode_ops->request_microcode_fw(
360 smp_processor_id(),
346 &microcode_pdev->dev); 361 &microcode_pdev->dev);
347 } 362 }
348 if (!err) 363 if (!err)
349 microcode_ops->apply_microcode(cpu); 364 microcode_ops->apply_microcode(smp_processor_id());
365 return err;
350} 366}
351 367
352static void microcode_init_cpu(int cpu) 368static int microcode_init_cpu(int cpu)
353{ 369{
354 cpumask_t old = current->cpus_allowed; 370 int err;
355
356 set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
357 /* We should bind the task to the CPU */
358 BUG_ON(raw_smp_processor_id() != cpu);
359
360 mutex_lock(&microcode_mutex); 371 mutex_lock(&microcode_mutex);
361 microcode_update_cpu(cpu); 372 err = work_on_cpu(cpu, microcode_update_cpu, NULL);
362 mutex_unlock(&microcode_mutex); 373 mutex_unlock(&microcode_mutex);
363 374
364 set_cpus_allowed_ptr(current, &old); 375 return err;
365} 376}
366 377
367static int mc_sysdev_add(struct sys_device *sys_dev) 378static int mc_sysdev_add(struct sys_device *sys_dev)
@@ -379,8 +390,11 @@ static int mc_sysdev_add(struct sys_device *sys_dev)
379 if (err) 390 if (err)
380 return err; 391 return err;
381 392
382 microcode_init_cpu(cpu); 393 err = microcode_init_cpu(cpu);
383 return 0; 394 if (err)
395 sysfs_remove_group(&sys_dev->kobj, &mc_attr_group);
396
397 return err;
384} 398}
385 399
386static int mc_sysdev_remove(struct sys_device *sys_dev) 400static int mc_sysdev_remove(struct sys_device *sys_dev)
@@ -404,14 +418,14 @@ static int mc_sysdev_resume(struct sys_device *dev)
404 return 0; 418 return 0;
405 419
406 /* only CPU 0 will apply ucode here */ 420 /* only CPU 0 will apply ucode here */
407 microcode_update_cpu(0); 421 microcode_update_cpu(NULL);
408 return 0; 422 return 0;
409} 423}
410 424
411static struct sysdev_driver mc_sysdev_driver = { 425static struct sysdev_driver mc_sysdev_driver = {
412 .add = mc_sysdev_add, 426 .add = mc_sysdev_add,
413 .remove = mc_sysdev_remove, 427 .remove = mc_sysdev_remove,
414 .resume = mc_sysdev_resume, 428 .resume = mc_sysdev_resume,
415}; 429};
416 430
417static __cpuinit int 431static __cpuinit int
@@ -424,7 +438,9 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
424 switch (action) { 438 switch (action) {
425 case CPU_ONLINE: 439 case CPU_ONLINE:
426 case CPU_ONLINE_FROZEN: 440 case CPU_ONLINE_FROZEN:
427 microcode_init_cpu(cpu); 441 if (microcode_init_cpu(cpu))
442 printk(KERN_ERR "microcode: failed to init CPU%d\n",
443 cpu);
428 case CPU_DOWN_FAILED: 444 case CPU_DOWN_FAILED:
429 case CPU_DOWN_FAILED_FROZEN: 445 case CPU_DOWN_FAILED_FROZEN:
430 pr_debug("microcode: CPU%d added\n", cpu); 446 pr_debug("microcode: CPU%d added\n", cpu);
@@ -448,7 +464,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
448} 464}
449 465
450static struct notifier_block __refdata mc_cpu_notifier = { 466static struct notifier_block __refdata mc_cpu_notifier = {
451 .notifier_call = mc_cpu_callback, 467 .notifier_call = mc_cpu_callback,
452}; 468};
453 469
454static int __init microcode_init(void) 470static int __init microcode_init(void)
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
index 5e9f4fc51385..149b9ec7c1ab 100644
--- a/arch/x86/kernel/microcode_intel.c
+++ b/arch/x86/kernel/microcode_intel.c
@@ -70,28 +70,28 @@
70 * Fix sigmatch() macro to handle old CPUs with pf == 0. 70 * Fix sigmatch() macro to handle old CPUs with pf == 0.
71 * Thanks to Stuart Swales for pointing out this bug. 71 * Thanks to Stuart Swales for pointing out this bug.
72 */ 72 */
73#include <linux/platform_device.h>
73#include <linux/capability.h> 74#include <linux/capability.h>
74#include <linux/kernel.h> 75#include <linux/miscdevice.h>
75#include <linux/init.h> 76#include <linux/firmware.h>
76#include <linux/sched.h>
77#include <linux/smp_lock.h> 77#include <linux/smp_lock.h>
78#include <linux/spinlock.h>
78#include <linux/cpumask.h> 79#include <linux/cpumask.h>
79#include <linux/module.h> 80#include <linux/uaccess.h>
80#include <linux/slab.h>
81#include <linux/vmalloc.h> 81#include <linux/vmalloc.h>
82#include <linux/miscdevice.h> 82#include <linux/kernel.h>
83#include <linux/spinlock.h> 83#include <linux/module.h>
84#include <linux/mm.h>
85#include <linux/fs.h>
86#include <linux/mutex.h> 84#include <linux/mutex.h>
85#include <linux/sched.h>
86#include <linux/init.h>
87#include <linux/slab.h>
87#include <linux/cpu.h> 88#include <linux/cpu.h>
88#include <linux/firmware.h> 89#include <linux/fs.h>
89#include <linux/platform_device.h> 90#include <linux/mm.h>
90#include <linux/uaccess.h>
91 91
92#include <asm/msr.h>
93#include <asm/processor.h>
94#include <asm/microcode.h> 92#include <asm/microcode.h>
93#include <asm/processor.h>
94#include <asm/msr.h>
95 95
96MODULE_DESCRIPTION("Microcode Update Driver"); 96MODULE_DESCRIPTION("Microcode Update Driver");
97MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>"); 97MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
@@ -129,12 +129,13 @@ struct extended_sigtable {
129 struct extended_signature sigs[0]; 129 struct extended_signature sigs[0];
130}; 130};
131 131
132#define DEFAULT_UCODE_DATASIZE (2000) 132#define DEFAULT_UCODE_DATASIZE (2000)
133#define MC_HEADER_SIZE (sizeof(struct microcode_header_intel)) 133#define MC_HEADER_SIZE (sizeof(struct microcode_header_intel))
134#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE) 134#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
135#define EXT_HEADER_SIZE (sizeof(struct extended_sigtable)) 135#define EXT_HEADER_SIZE (sizeof(struct extended_sigtable))
136#define EXT_SIGNATURE_SIZE (sizeof(struct extended_signature)) 136#define EXT_SIGNATURE_SIZE (sizeof(struct extended_signature))
137#define DWSIZE (sizeof(u32)) 137#define DWSIZE (sizeof(u32))
138
138#define get_totalsize(mc) \ 139#define get_totalsize(mc) \
139 (((struct microcode_intel *)mc)->hdr.totalsize ? \ 140 (((struct microcode_intel *)mc)->hdr.totalsize ? \
140 ((struct microcode_intel *)mc)->hdr.totalsize : \ 141 ((struct microcode_intel *)mc)->hdr.totalsize : \
@@ -197,30 +198,31 @@ static inline int update_match_cpu(struct cpu_signature *csig, int sig, int pf)
197} 198}
198 199
199static inline int 200static inline int
200update_match_revision(struct microcode_header_intel *mc_header, int rev) 201update_match_revision(struct microcode_header_intel *mc_header, int rev)
201{ 202{
202 return (mc_header->rev <= rev) ? 0 : 1; 203 return (mc_header->rev <= rev) ? 0 : 1;
203} 204}
204 205
205static int microcode_sanity_check(void *mc) 206static int microcode_sanity_check(void *mc)
206{ 207{
208 unsigned long total_size, data_size, ext_table_size;
207 struct microcode_header_intel *mc_header = mc; 209 struct microcode_header_intel *mc_header = mc;
208 struct extended_sigtable *ext_header = NULL; 210 struct extended_sigtable *ext_header = NULL;
209 struct extended_signature *ext_sig;
210 unsigned long total_size, data_size, ext_table_size;
211 int sum, orig_sum, ext_sigcount = 0, i; 211 int sum, orig_sum, ext_sigcount = 0, i;
212 struct extended_signature *ext_sig;
212 213
213 total_size = get_totalsize(mc_header); 214 total_size = get_totalsize(mc_header);
214 data_size = get_datasize(mc_header); 215 data_size = get_datasize(mc_header);
216
215 if (data_size + MC_HEADER_SIZE > total_size) { 217 if (data_size + MC_HEADER_SIZE > total_size) {
216 printk(KERN_ERR "microcode: error! " 218 printk(KERN_ERR "microcode: error! "
217 "Bad data size in microcode data file\n"); 219 "Bad data size in microcode data file\n");
218 return -EINVAL; 220 return -EINVAL;
219 } 221 }
220 222
221 if (mc_header->ldrver != 1 || mc_header->hdrver != 1) { 223 if (mc_header->ldrver != 1 || mc_header->hdrver != 1) {
222 printk(KERN_ERR "microcode: error! " 224 printk(KERN_ERR "microcode: error! "
223 "Unknown microcode update format\n"); 225 "Unknown microcode update format\n");
224 return -EINVAL; 226 return -EINVAL;
225 } 227 }
226 ext_table_size = total_size - (MC_HEADER_SIZE + data_size); 228 ext_table_size = total_size - (MC_HEADER_SIZE + data_size);
@@ -318,11 +320,15 @@ get_matching_microcode(struct cpu_signature *cpu_sig, void *mc, int rev)
318 320
319static void apply_microcode(int cpu) 321static void apply_microcode(int cpu)
320{ 322{
323 struct microcode_intel *mc_intel;
324 struct ucode_cpu_info *uci;
321 unsigned long flags; 325 unsigned long flags;
322 unsigned int val[2]; 326 unsigned int val[2];
323 int cpu_num = raw_smp_processor_id(); 327 int cpu_num;
324 struct ucode_cpu_info *uci = ucode_cpu_info + cpu; 328
325 struct microcode_intel *mc_intel = uci->mc; 329 cpu_num = raw_smp_processor_id();
330 uci = ucode_cpu_info + cpu;
331 mc_intel = uci->mc;
326 332
327 /* We should bind the task to the CPU */ 333 /* We should bind the task to the CPU */
328 BUG_ON(cpu_num != cpu); 334 BUG_ON(cpu_num != cpu);
@@ -348,15 +354,17 @@ static void apply_microcode(int cpu)
348 spin_unlock_irqrestore(&microcode_update_lock, flags); 354 spin_unlock_irqrestore(&microcode_update_lock, flags);
349 if (val[1] != mc_intel->hdr.rev) { 355 if (val[1] != mc_intel->hdr.rev) {
350 printk(KERN_ERR "microcode: CPU%d update from revision " 356 printk(KERN_ERR "microcode: CPU%d update from revision "
351 "0x%x to 0x%x failed\n", cpu_num, uci->cpu_sig.rev, val[1]); 357 "0x%x to 0x%x failed\n",
358 cpu_num, uci->cpu_sig.rev, val[1]);
352 return; 359 return;
353 } 360 }
354 printk(KERN_INFO "microcode: CPU%d updated from revision " 361 printk(KERN_INFO "microcode: CPU%d updated from revision "
355 "0x%x to 0x%x, date = %04x-%02x-%02x \n", 362 "0x%x to 0x%x, date = %04x-%02x-%02x \n",
356 cpu_num, uci->cpu_sig.rev, val[1], 363 cpu_num, uci->cpu_sig.rev, val[1],
357 mc_intel->hdr.date & 0xffff, 364 mc_intel->hdr.date & 0xffff,
358 mc_intel->hdr.date >> 24, 365 mc_intel->hdr.date >> 24,
359 (mc_intel->hdr.date >> 16) & 0xff); 366 (mc_intel->hdr.date >> 16) & 0xff);
367
360 uci->cpu_sig.rev = val[1]; 368 uci->cpu_sig.rev = val[1];
361} 369}
362 370
@@ -404,18 +412,23 @@ static int generic_load_microcode(int cpu, void *data, size_t size,
404 leftover -= mc_size; 412 leftover -= mc_size;
405 } 413 }
406 414
407 if (new_mc) { 415 if (!new_mc)
408 if (!leftover) { 416 goto out;
409 if (uci->mc) 417
410 vfree(uci->mc); 418 if (leftover) {
411 uci->mc = (struct microcode_intel *)new_mc; 419 vfree(new_mc);
412 pr_debug("microcode: CPU%d found a matching microcode update with" 420 goto out;
413 " version 0x%x (current=0x%x)\n",
414 cpu, new_rev, uci->cpu_sig.rev);
415 } else
416 vfree(new_mc);
417 } 421 }
418 422
423 if (uci->mc)
424 vfree(uci->mc);
425 uci->mc = (struct microcode_intel *)new_mc;
426
427 pr_debug("microcode: CPU%d found a matching microcode update with"
428 " version 0x%x (current=0x%x)\n",
429 cpu, new_rev, uci->cpu_sig.rev);
430
431 out:
419 return (int)leftover; 432 return (int)leftover;
420} 433}
421 434
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 156f87582c6c..ca989158e847 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -8,7 +8,7 @@
8#include <linux/module.h> 8#include <linux/module.h>
9#include <linux/pm.h> 9#include <linux/pm.h>
10#include <linux/clockchips.h> 10#include <linux/clockchips.h>
11#include <linux/ftrace.h> 11#include <trace/power.h>
12#include <asm/system.h> 12#include <asm/system.h>
13#include <asm/apic.h> 13#include <asm/apic.h>
14#include <asm/idle.h> 14#include <asm/idle.h>
@@ -22,6 +22,9 @@ EXPORT_SYMBOL(idle_nomwait);
22 22
23struct kmem_cache *task_xstate_cachep; 23struct kmem_cache *task_xstate_cachep;
24 24
25DEFINE_TRACE(power_start);
26DEFINE_TRACE(power_end);
27
25int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) 28int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
26{ 29{
27 *dst = *src; 30 *dst = *src;
@@ -325,7 +328,7 @@ void stop_this_cpu(void *dummy)
325 /* 328 /*
326 * Remove this CPU: 329 * Remove this CPU:
327 */ 330 */
328 cpu_clear(smp_processor_id(), cpu_online_map); 331 set_cpu_online(smp_processor_id(), false);
329 disable_local_APIC(); 332 disable_local_APIC();
330 333
331 for (;;) { 334 for (;;) {
@@ -475,12 +478,13 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c)
475 return 1; 478 return 1;
476} 479}
477 480
478static cpumask_t c1e_mask = CPU_MASK_NONE; 481static cpumask_var_t c1e_mask;
479static int c1e_detected; 482static int c1e_detected;
480 483
481void c1e_remove_cpu(int cpu) 484void c1e_remove_cpu(int cpu)
482{ 485{
483 cpu_clear(cpu, c1e_mask); 486 if (c1e_mask != NULL)
487 cpumask_clear_cpu(cpu, c1e_mask);
484} 488}
485 489
486/* 490/*
@@ -509,8 +513,8 @@ static void c1e_idle(void)
509 if (c1e_detected) { 513 if (c1e_detected) {
510 int cpu = smp_processor_id(); 514 int cpu = smp_processor_id();
511 515
512 if (!cpu_isset(cpu, c1e_mask)) { 516 if (!cpumask_test_cpu(cpu, c1e_mask)) {
513 cpu_set(cpu, c1e_mask); 517 cpumask_set_cpu(cpu, c1e_mask);
514 /* 518 /*
515 * Force broadcast so ACPI can not interfere. Needs 519 * Force broadcast so ACPI can not interfere. Needs
516 * to run with interrupts enabled as it uses 520 * to run with interrupts enabled as it uses
@@ -562,6 +566,15 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
562 pm_idle = default_idle; 566 pm_idle = default_idle;
563} 567}
564 568
569void __init init_c1e_mask(void)
570{
571 /* If we're using c1e_idle, we need to allocate c1e_mask. */
572 if (pm_idle == c1e_idle) {
573 alloc_cpumask_var(&c1e_mask, GFP_KERNEL);
574 cpumask_clear(c1e_mask);
575 }
576}
577
565static int __init idle_setup(char *str) 578static int __init idle_setup(char *str)
566{ 579{
567 if (!str) 580 if (!str)
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index b7cc21bc6ae0..fe9345c967de 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -21,6 +21,7 @@
21#include <linux/audit.h> 21#include <linux/audit.h>
22#include <linux/seccomp.h> 22#include <linux/seccomp.h>
23#include <linux/signal.h> 23#include <linux/signal.h>
24#include <linux/ftrace.h>
24 25
25#include <asm/uaccess.h> 26#include <asm/uaccess.h>
26#include <asm/pgtable.h> 27#include <asm/pgtable.h>
@@ -1415,6 +1416,9 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)
1415 tracehook_report_syscall_entry(regs)) 1416 tracehook_report_syscall_entry(regs))
1416 ret = -1L; 1417 ret = -1L;
1417 1418
1419 if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
1420 ftrace_syscall_enter(regs);
1421
1418 if (unlikely(current->audit_context)) { 1422 if (unlikely(current->audit_context)) {
1419 if (IS_IA32) 1423 if (IS_IA32)
1420 audit_syscall_entry(AUDIT_ARCH_I386, 1424 audit_syscall_entry(AUDIT_ARCH_I386,
@@ -1438,6 +1442,9 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs)
1438 if (unlikely(current->audit_context)) 1442 if (unlikely(current->audit_context))
1439 audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); 1443 audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
1440 1444
1445 if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
1446 ftrace_syscall_exit(regs);
1447
1441 if (test_thread_flag(TIF_SYSCALL_TRACE)) 1448 if (test_thread_flag(TIF_SYSCALL_TRACE))
1442 tracehook_report_syscall_exit(regs, 0); 1449 tracehook_report_syscall_exit(regs, 0);
1443 1450
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index ef7d10170c30..58d24ef917d8 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -101,11 +101,11 @@ EXPORT_SYMBOL(smp_num_siblings);
101DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID; 101DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;
102 102
103/* representing HT siblings of each logical CPU */ 103/* representing HT siblings of each logical CPU */
104DEFINE_PER_CPU(cpumask_t, cpu_sibling_map); 104DEFINE_PER_CPU(cpumask_var_t, cpu_sibling_map);
105EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); 105EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
106 106
107/* representing HT and core siblings of each logical CPU */ 107/* representing HT and core siblings of each logical CPU */
108DEFINE_PER_CPU(cpumask_t, cpu_core_map); 108DEFINE_PER_CPU(cpumask_var_t, cpu_core_map);
109EXPORT_PER_CPU_SYMBOL(cpu_core_map); 109EXPORT_PER_CPU_SYMBOL(cpu_core_map);
110 110
111/* Per CPU bogomips and other parameters */ 111/* Per CPU bogomips and other parameters */
@@ -115,11 +115,6 @@ EXPORT_PER_CPU_SYMBOL(cpu_info);
115atomic_t init_deasserted; 115atomic_t init_deasserted;
116 116
117#if defined(CONFIG_NUMA) && defined(CONFIG_X86_32) 117#if defined(CONFIG_NUMA) && defined(CONFIG_X86_32)
118
119/* which logical CPUs are on which nodes */
120cpumask_t node_to_cpumask_map[MAX_NUMNODES] __read_mostly =
121 { [0 ... MAX_NUMNODES-1] = CPU_MASK_NONE };
122EXPORT_SYMBOL(node_to_cpumask_map);
123/* which node each logical CPU is on */ 118/* which node each logical CPU is on */
124int cpu_to_node_map[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = 0 }; 119int cpu_to_node_map[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = 0 };
125EXPORT_SYMBOL(cpu_to_node_map); 120EXPORT_SYMBOL(cpu_to_node_map);
@@ -128,7 +123,7 @@ EXPORT_SYMBOL(cpu_to_node_map);
128static void map_cpu_to_node(int cpu, int node) 123static void map_cpu_to_node(int cpu, int node)
129{ 124{
130 printk(KERN_INFO "Mapping cpu %d to node %d\n", cpu, node); 125 printk(KERN_INFO "Mapping cpu %d to node %d\n", cpu, node);
131 cpumask_set_cpu(cpu, &node_to_cpumask_map[node]); 126 cpumask_set_cpu(cpu, node_to_cpumask_map[node]);
132 cpu_to_node_map[cpu] = node; 127 cpu_to_node_map[cpu] = node;
133} 128}
134 129
@@ -139,7 +134,7 @@ static void unmap_cpu_to_node(int cpu)
139 134
140 printk(KERN_INFO "Unmapping cpu %d from all nodes\n", cpu); 135 printk(KERN_INFO "Unmapping cpu %d from all nodes\n", cpu);
141 for (node = 0; node < MAX_NUMNODES; node++) 136 for (node = 0; node < MAX_NUMNODES; node++)
142 cpumask_clear_cpu(cpu, &node_to_cpumask_map[node]); 137 cpumask_clear_cpu(cpu, node_to_cpumask_map[node]);
143 cpu_to_node_map[cpu] = 0; 138 cpu_to_node_map[cpu] = 0;
144} 139}
145#else /* !(CONFIG_NUMA && CONFIG_X86_32) */ 140#else /* !(CONFIG_NUMA && CONFIG_X86_32) */
@@ -301,7 +296,7 @@ notrace static void __cpuinit start_secondary(void *unused)
301 __flush_tlb_all(); 296 __flush_tlb_all();
302#endif 297#endif
303 298
304 /* This must be done before setting cpu_online_map */ 299 /* This must be done before setting cpu_online_mask */
305 set_cpu_sibling_map(raw_smp_processor_id()); 300 set_cpu_sibling_map(raw_smp_processor_id());
306 wmb(); 301 wmb();
307 302
@@ -334,6 +329,23 @@ notrace static void __cpuinit start_secondary(void *unused)
334 cpu_idle(); 329 cpu_idle();
335} 330}
336 331
332#ifdef CONFIG_CPUMASK_OFFSTACK
333/* In this case, llc_shared_map is a pointer to a cpumask. */
334static inline void copy_cpuinfo_x86(struct cpuinfo_x86 *dst,
335 const struct cpuinfo_x86 *src)
336{
337 struct cpumask *llc = dst->llc_shared_map;
338 *dst = *src;
339 dst->llc_shared_map = llc;
340}
341#else
342static inline void copy_cpuinfo_x86(struct cpuinfo_x86 *dst,
343 const struct cpuinfo_x86 *src)
344{
345 *dst = *src;
346}
347#endif /* CONFIG_CPUMASK_OFFSTACK */
348
337/* 349/*
338 * The bootstrap kernel entry code has set these up. Save them for 350 * The bootstrap kernel entry code has set these up. Save them for
339 * a given CPU 351 * a given CPU
@@ -343,7 +355,7 @@ void __cpuinit smp_store_cpu_info(int id)
343{ 355{
344 struct cpuinfo_x86 *c = &cpu_data(id); 356 struct cpuinfo_x86 *c = &cpu_data(id);
345 357
346 *c = boot_cpu_data; 358 copy_cpuinfo_x86(c, &boot_cpu_data);
347 c->cpu_index = id; 359 c->cpu_index = id;
348 if (id != 0) 360 if (id != 0)
349 identify_secondary_cpu(c); 361 identify_secondary_cpu(c);
@@ -367,15 +379,15 @@ void __cpuinit set_cpu_sibling_map(int cpu)
367 cpumask_set_cpu(cpu, cpu_sibling_mask(i)); 379 cpumask_set_cpu(cpu, cpu_sibling_mask(i));
368 cpumask_set_cpu(i, cpu_core_mask(cpu)); 380 cpumask_set_cpu(i, cpu_core_mask(cpu));
369 cpumask_set_cpu(cpu, cpu_core_mask(i)); 381 cpumask_set_cpu(cpu, cpu_core_mask(i));
370 cpumask_set_cpu(i, &c->llc_shared_map); 382 cpumask_set_cpu(i, c->llc_shared_map);
371 cpumask_set_cpu(cpu, &o->llc_shared_map); 383 cpumask_set_cpu(cpu, o->llc_shared_map);
372 } 384 }
373 } 385 }
374 } else { 386 } else {
375 cpumask_set_cpu(cpu, cpu_sibling_mask(cpu)); 387 cpumask_set_cpu(cpu, cpu_sibling_mask(cpu));
376 } 388 }
377 389
378 cpumask_set_cpu(cpu, &c->llc_shared_map); 390 cpumask_set_cpu(cpu, c->llc_shared_map);
379 391
380 if (current_cpu_data.x86_max_cores == 1) { 392 if (current_cpu_data.x86_max_cores == 1) {
381 cpumask_copy(cpu_core_mask(cpu), cpu_sibling_mask(cpu)); 393 cpumask_copy(cpu_core_mask(cpu), cpu_sibling_mask(cpu));
@@ -386,8 +398,8 @@ void __cpuinit set_cpu_sibling_map(int cpu)
386 for_each_cpu(i, cpu_sibling_setup_mask) { 398 for_each_cpu(i, cpu_sibling_setup_mask) {
387 if (per_cpu(cpu_llc_id, cpu) != BAD_APICID && 399 if (per_cpu(cpu_llc_id, cpu) != BAD_APICID &&
388 per_cpu(cpu_llc_id, cpu) == per_cpu(cpu_llc_id, i)) { 400 per_cpu(cpu_llc_id, cpu) == per_cpu(cpu_llc_id, i)) {
389 cpumask_set_cpu(i, &c->llc_shared_map); 401 cpumask_set_cpu(i, c->llc_shared_map);
390 cpumask_set_cpu(cpu, &cpu_data(i).llc_shared_map); 402 cpumask_set_cpu(cpu, cpu_data(i).llc_shared_map);
391 } 403 }
392 if (c->phys_proc_id == cpu_data(i).phys_proc_id) { 404 if (c->phys_proc_id == cpu_data(i).phys_proc_id) {
393 cpumask_set_cpu(i, cpu_core_mask(cpu)); 405 cpumask_set_cpu(i, cpu_core_mask(cpu));
@@ -425,12 +437,7 @@ const struct cpumask *cpu_coregroup_mask(int cpu)
425 if (sched_mc_power_savings || sched_smt_power_savings) 437 if (sched_mc_power_savings || sched_smt_power_savings)
426 return cpu_core_mask(cpu); 438 return cpu_core_mask(cpu);
427 else 439 else
428 return &c->llc_shared_map; 440 return c->llc_shared_map;
429}
430
431cpumask_t cpu_coregroup_map(int cpu)
432{
433 return *cpu_coregroup_mask(cpu);
434} 441}
435 442
436static void impress_friends(void) 443static void impress_friends(void)
@@ -897,9 +904,8 @@ int __cpuinit native_cpu_up(unsigned int cpu)
897 */ 904 */
898static __init void disable_smp(void) 905static __init void disable_smp(void)
899{ 906{
900 /* use the read/write pointers to the present and possible maps */ 907 init_cpu_present(cpumask_of(0));
901 cpumask_copy(&cpu_present_map, cpumask_of(0)); 908 init_cpu_possible(cpumask_of(0));
902 cpumask_copy(&cpu_possible_map, cpumask_of(0));
903 smpboot_clear_io_apic_irqs(); 909 smpboot_clear_io_apic_irqs();
904 910
905 if (smp_found_config) 911 if (smp_found_config)
@@ -1031,6 +1037,8 @@ static void __init smp_cpu_index_default(void)
1031 */ 1037 */
1032void __init native_smp_prepare_cpus(unsigned int max_cpus) 1038void __init native_smp_prepare_cpus(unsigned int max_cpus)
1033{ 1039{
1040 unsigned int i;
1041
1034 preempt_disable(); 1042 preempt_disable();
1035 smp_cpu_index_default(); 1043 smp_cpu_index_default();
1036 current_cpu_data = boot_cpu_data; 1044 current_cpu_data = boot_cpu_data;
@@ -1044,6 +1052,14 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
1044 boot_cpu_logical_apicid = logical_smp_processor_id(); 1052 boot_cpu_logical_apicid = logical_smp_processor_id();
1045#endif 1053#endif
1046 current_thread_info()->cpu = 0; /* needed? */ 1054 current_thread_info()->cpu = 0; /* needed? */
1055 for_each_possible_cpu(i) {
1056 alloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
1057 alloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
1058 alloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
1059 cpumask_clear(per_cpu(cpu_core_map, i));
1060 cpumask_clear(per_cpu(cpu_sibling_map, i));
1061 cpumask_clear(cpu_data(i).llc_shared_map);
1062 }
1047 set_cpu_sibling_map(0); 1063 set_cpu_sibling_map(0);
1048 1064
1049 enable_IR_x2apic(); 1065 enable_IR_x2apic();
@@ -1132,11 +1148,11 @@ early_param("possible_cpus", _setup_possible_cpus);
1132 1148
1133 1149
1134/* 1150/*
1135 * cpu_possible_map should be static, it cannot change as cpu's 1151 * cpu_possible_mask should be static, it cannot change as cpu's
1136 * are onlined, or offlined. The reason is per-cpu data-structures 1152 * are onlined, or offlined. The reason is per-cpu data-structures
1137 * are allocated by some modules at init time, and dont expect to 1153 * are allocated by some modules at init time, and dont expect to
1138 * do this dynamically on cpu arrival/departure. 1154 * do this dynamically on cpu arrival/departure.
1139 * cpu_present_map on the other hand can change dynamically. 1155 * cpu_present_mask on the other hand can change dynamically.
1140 * In case when cpu_hotplug is not compiled, then we resort to current 1156 * In case when cpu_hotplug is not compiled, then we resort to current
1141 * behaviour, which is cpu_possible == cpu_present. 1157 * behaviour, which is cpu_possible == cpu_present.
1142 * - Ashok Raj 1158 * - Ashok Raj
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c
index 79c073247284..deb5ebb32c3b 100644
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
@@ -275,6 +275,8 @@ const struct cpumask *uv_flush_send_and_wait(int cpu, int this_blade,
275 return NULL; 275 return NULL;
276} 276}
277 277
278static DEFINE_PER_CPU(cpumask_var_t, uv_flush_tlb_mask);
279
278/** 280/**
279 * uv_flush_tlb_others - globally purge translation cache of a virtual 281 * uv_flush_tlb_others - globally purge translation cache of a virtual
280 * address or all TLB's 282 * address or all TLB's
@@ -304,8 +306,7 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,
304 struct mm_struct *mm, 306 struct mm_struct *mm,
305 unsigned long va, unsigned int cpu) 307 unsigned long va, unsigned int cpu)
306{ 308{
307 static DEFINE_PER_CPU(cpumask_t, flush_tlb_mask); 309 struct cpumask *flush_mask = __get_cpu_var(uv_flush_tlb_mask);
308 struct cpumask *flush_mask = &__get_cpu_var(flush_tlb_mask);
309 int i; 310 int i;
310 int bit; 311 int bit;
311 int blade; 312 int blade;
@@ -755,6 +756,10 @@ static int __init uv_bau_init(void)
755 if (!is_uv_system()) 756 if (!is_uv_system())
756 return 0; 757 return 0;
757 758
759 for_each_possible_cpu(cur_cpu)
760 alloc_cpumask_var_node(&per_cpu(uv_flush_tlb_mask, cur_cpu),
761 GFP_KERNEL, cpu_to_node(cur_cpu));
762
758 uv_bau_retry_limit = 1; 763 uv_bau_retry_limit = 1;
759 uv_nshift = uv_hub_info->n_val; 764 uv_nshift = uv_hub_info->n_val;
760 uv_mmask = (1UL << uv_hub_info->n_val) - 1; 765 uv_mmask = (1UL << uv_hub_info->n_val) - 1;
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 0a303c3ed11f..a58504ea78cc 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -59,7 +59,8 @@ config KVM_AMD
59 59
60config KVM_TRACE 60config KVM_TRACE
61 bool "KVM trace support" 61 bool "KVM trace support"
62 depends on KVM && MARKERS && SYSFS 62 depends on KVM && SYSFS
63 select MARKERS
63 select RELAY 64 select RELAY
64 select DEBUG_FS 65 select DEBUG_FS
65 default n 66 default n
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 08537747cb58..fdd30d08ab52 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -14,7 +14,7 @@ obj-$(CONFIG_MMIOTRACE) += mmiotrace.o
14mmiotrace-y := kmmio.o pf_in.o mmio-mod.o 14mmiotrace-y := kmmio.o pf_in.o mmio-mod.o
15obj-$(CONFIG_MMIOTRACE_TEST) += testmmiotrace.o 15obj-$(CONFIG_MMIOTRACE_TEST) += testmmiotrace.o
16 16
17obj-$(CONFIG_NUMA) += numa_$(BITS).o 17obj-$(CONFIG_NUMA) += numa.o numa_$(BITS).o
18obj-$(CONFIG_K8_NUMA) += k8topology_64.o 18obj-$(CONFIG_K8_NUMA) += k8topology_64.o
19obj-$(CONFIG_ACPI_NUMA) += srat_$(BITS).o 19obj-$(CONFIG_ACPI_NUMA) += srat_$(BITS).o
20 20
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index db81e9a8556b..749559ed80f5 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -1054,17 +1054,47 @@ static noinline int do_test_wp_bit(void)
1054const int rodata_test_data = 0xC3; 1054const int rodata_test_data = 0xC3;
1055EXPORT_SYMBOL_GPL(rodata_test_data); 1055EXPORT_SYMBOL_GPL(rodata_test_data);
1056 1056
1057static int kernel_set_to_readonly;
1058
1059void set_kernel_text_rw(void)
1060{
1061 unsigned long start = PFN_ALIGN(_text);
1062 unsigned long size = PFN_ALIGN(_etext) - start;
1063
1064 if (!kernel_set_to_readonly)
1065 return;
1066
1067 pr_debug("Set kernel text: %lx - %lx for read write\n",
1068 start, start+size);
1069
1070 set_pages_rw(virt_to_page(start), size >> PAGE_SHIFT);
1071}
1072
1073void set_kernel_text_ro(void)
1074{
1075 unsigned long start = PFN_ALIGN(_text);
1076 unsigned long size = PFN_ALIGN(_etext) - start;
1077
1078 if (!kernel_set_to_readonly)
1079 return;
1080
1081 pr_debug("Set kernel text: %lx - %lx for read only\n",
1082 start, start+size);
1083
1084 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
1085}
1086
1057void mark_rodata_ro(void) 1087void mark_rodata_ro(void)
1058{ 1088{
1059 unsigned long start = PFN_ALIGN(_text); 1089 unsigned long start = PFN_ALIGN(_text);
1060 unsigned long size = PFN_ALIGN(_etext) - start; 1090 unsigned long size = PFN_ALIGN(_etext) - start;
1061 1091
1062#ifndef CONFIG_DYNAMIC_FTRACE
1063 /* Dynamic tracing modifies the kernel text section */
1064 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 1092 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
1065 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 1093 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
1066 size >> 10); 1094 size >> 10);
1067 1095
1096 kernel_set_to_readonly = 1;
1097
1068#ifdef CONFIG_CPA_DEBUG 1098#ifdef CONFIG_CPA_DEBUG
1069 printk(KERN_INFO "Testing CPA: Reverting %lx-%lx\n", 1099 printk(KERN_INFO "Testing CPA: Reverting %lx-%lx\n",
1070 start, start+size); 1100 start, start+size);
@@ -1073,7 +1103,6 @@ void mark_rodata_ro(void)
1073 printk(KERN_INFO "Testing CPA: write protecting again\n"); 1103 printk(KERN_INFO "Testing CPA: write protecting again\n");
1074 set_pages_ro(virt_to_page(start), size>>PAGE_SHIFT); 1104 set_pages_ro(virt_to_page(start), size>>PAGE_SHIFT);
1075#endif 1105#endif
1076#endif /* CONFIG_DYNAMIC_FTRACE */
1077 1106
1078 start += size; 1107 start += size;
1079 size = (unsigned long)__end_rodata - start; 1108 size = (unsigned long)__end_rodata - start;
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 54efa57d1c03..1753e8020df6 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -734,21 +734,48 @@ void __init mem_init(void)
734const int rodata_test_data = 0xC3; 734const int rodata_test_data = 0xC3;
735EXPORT_SYMBOL_GPL(rodata_test_data); 735EXPORT_SYMBOL_GPL(rodata_test_data);
736 736
737static int kernel_set_to_readonly;
738
739void set_kernel_text_rw(void)
740{
741 unsigned long start = PFN_ALIGN(_stext);
742 unsigned long end = PFN_ALIGN(__start_rodata);
743
744 if (!kernel_set_to_readonly)
745 return;
746
747 pr_debug("Set kernel text: %lx - %lx for read write\n",
748 start, end);
749
750 set_memory_rw(start, (end - start) >> PAGE_SHIFT);
751}
752
753void set_kernel_text_ro(void)
754{
755 unsigned long start = PFN_ALIGN(_stext);
756 unsigned long end = PFN_ALIGN(__start_rodata);
757
758 if (!kernel_set_to_readonly)
759 return;
760
761 pr_debug("Set kernel text: %lx - %lx for read only\n",
762 start, end);
763
764 set_memory_ro(start, (end - start) >> PAGE_SHIFT);
765}
766
737void mark_rodata_ro(void) 767void mark_rodata_ro(void)
738{ 768{
739 unsigned long start = PFN_ALIGN(_stext), end = PFN_ALIGN(__end_rodata); 769 unsigned long start = PFN_ALIGN(_stext), end = PFN_ALIGN(__end_rodata);
740 unsigned long rodata_start = 770 unsigned long rodata_start =
741 ((unsigned long)__start_rodata + PAGE_SIZE - 1) & PAGE_MASK; 771 ((unsigned long)__start_rodata + PAGE_SIZE - 1) & PAGE_MASK;
742 772
743#ifdef CONFIG_DYNAMIC_FTRACE
744 /* Dynamic tracing modifies the kernel text section */
745 start = rodata_start;
746#endif
747
748 printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n", 773 printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
749 (end - start) >> 10); 774 (end - start) >> 10);
750 set_memory_ro(start, (end - start) >> PAGE_SHIFT); 775 set_memory_ro(start, (end - start) >> PAGE_SHIFT);
751 776
777 kernel_set_to_readonly = 1;
778
752 /* 779 /*
753 * The rodata section (but not the kernel text!) should also be 780 * The rodata section (but not the kernel text!) should also be
754 * not-executable. 781 * not-executable.
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 2c4baa88f2cb..c9342ed8b402 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -378,27 +378,34 @@ static void clear_trace_list(void)
378} 378}
379 379
380#ifdef CONFIG_HOTPLUG_CPU 380#ifdef CONFIG_HOTPLUG_CPU
381static cpumask_t downed_cpus; 381static cpumask_var_t downed_cpus;
382 382
383static void enter_uniprocessor(void) 383static void enter_uniprocessor(void)
384{ 384{
385 int cpu; 385 int cpu;
386 int err; 386 int err;
387 387
388 if (downed_cpus == NULL &&
389 !alloc_cpumask_var(&downed_cpus, GFP_KERNEL)) {
390 pr_notice(NAME "Failed to allocate mask\n");
391 goto out;
392 }
393
388 get_online_cpus(); 394 get_online_cpus();
389 downed_cpus = cpu_online_map; 395 cpumask_copy(downed_cpus, cpu_online_mask);
390 cpu_clear(first_cpu(cpu_online_map), downed_cpus); 396 cpumask_clear_cpu(cpumask_first(cpu_online_mask), downed_cpus);
391 if (num_online_cpus() > 1) 397 if (num_online_cpus() > 1)
392 pr_notice(NAME "Disabling non-boot CPUs...\n"); 398 pr_notice(NAME "Disabling non-boot CPUs...\n");
393 put_online_cpus(); 399 put_online_cpus();
394 400
395 for_each_cpu_mask(cpu, downed_cpus) { 401 for_each_cpu(cpu, downed_cpus) {
396 err = cpu_down(cpu); 402 err = cpu_down(cpu);
397 if (!err) 403 if (!err)
398 pr_info(NAME "CPU%d is down.\n", cpu); 404 pr_info(NAME "CPU%d is down.\n", cpu);
399 else 405 else
400 pr_err(NAME "Error taking CPU%d down: %d\n", cpu, err); 406 pr_err(NAME "Error taking CPU%d down: %d\n", cpu, err);
401 } 407 }
408out:
402 if (num_online_cpus() > 1) 409 if (num_online_cpus() > 1)
403 pr_warning(NAME "multiple CPUs still online, " 410 pr_warning(NAME "multiple CPUs still online, "
404 "may miss events.\n"); 411 "may miss events.\n");
@@ -411,10 +418,10 @@ static void __ref leave_uniprocessor(void)
411 int cpu; 418 int cpu;
412 int err; 419 int err;
413 420
414 if (cpus_weight(downed_cpus) == 0) 421 if (downed_cpus == NULL || cpumask_weight(downed_cpus) == 0)
415 return; 422 return;
416 pr_notice(NAME "Re-enabling CPUs...\n"); 423 pr_notice(NAME "Re-enabling CPUs...\n");
417 for_each_cpu_mask(cpu, downed_cpus) { 424 for_each_cpu(cpu, downed_cpus) {
418 err = cpu_up(cpu); 425 err = cpu_up(cpu);
419 if (!err) 426 if (!err)
420 pr_info(NAME "enabled CPU%d.\n", cpu); 427 pr_info(NAME "enabled CPU%d.\n", cpu);
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
new file mode 100644
index 000000000000..550df481accd
--- /dev/null
+++ b/arch/x86/mm/numa.c
@@ -0,0 +1,67 @@
1/* Common code for 32 and 64-bit NUMA */
2#include <linux/topology.h>
3#include <linux/module.h>
4#include <linux/bootmem.h>
5
6#ifdef CONFIG_DEBUG_PER_CPU_MAPS
7# define DBG(x...) printk(KERN_DEBUG x)
8#else
9# define DBG(x...)
10#endif
11
12/*
13 * Which logical CPUs are on which nodes
14 */
15cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];
16EXPORT_SYMBOL(node_to_cpumask_map);
17
18/*
19 * Allocate node_to_cpumask_map based on number of available nodes
20 * Requires node_possible_map to be valid.
21 *
22 * Note: node_to_cpumask() is not valid until after this is done.
23 * (Use CONFIG_DEBUG_PER_CPU_MAPS to check this.)
24 */
25void __init setup_node_to_cpumask_map(void)
26{
27 unsigned int node, num = 0;
28
29 /* setup nr_node_ids if not done yet */
30 if (nr_node_ids == MAX_NUMNODES) {
31 for_each_node_mask(node, node_possible_map)
32 num = node;
33 nr_node_ids = num + 1;
34 }
35
36 /* allocate the map */
37 for (node = 0; node < nr_node_ids; node++)
38 alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);
39
40 /* cpumask_of_node() will now work */
41 pr_debug("Node to cpumask map for %d nodes\n", nr_node_ids);
42}
43
44#ifdef CONFIG_DEBUG_PER_CPU_MAPS
45/*
46 * Returns a pointer to the bitmask of CPUs on Node 'node'.
47 */
48const struct cpumask *cpumask_of_node(int node)
49{
50 if (node >= nr_node_ids) {
51 printk(KERN_WARNING
52 "cpumask_of_node(%d): node > nr_node_ids(%d)\n",
53 node, nr_node_ids);
54 dump_stack();
55 return cpu_none_mask;
56 }
57 if (node_to_cpumask_map[node] == NULL) {
58 printk(KERN_WARNING
59 "cpumask_of_node(%d): no node_to_cpumask_map!\n",
60 node);
61 dump_stack();
62 return cpu_online_mask;
63 }
64 return node_to_cpumask_map[node];
65}
66EXPORT_SYMBOL(cpumask_of_node);
67#endif
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 64c9cf043cdd..d73aaa892371 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -20,12 +20,6 @@
20#include <asm/acpi.h> 20#include <asm/acpi.h>
21#include <asm/k8.h> 21#include <asm/k8.h>
22 22
23#ifdef CONFIG_DEBUG_PER_CPU_MAPS
24# define DBG(x...) printk(KERN_DEBUG x)
25#else
26# define DBG(x...)
27#endif
28
29struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; 23struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
30EXPORT_SYMBOL(node_data); 24EXPORT_SYMBOL(node_data);
31 25
@@ -49,12 +43,6 @@ DEFINE_EARLY_PER_CPU(int, x86_cpu_to_node_map, NUMA_NO_NODE);
49EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map); 43EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map);
50 44
51/* 45/*
52 * Which logical CPUs are on which nodes
53 */
54cpumask_t *node_to_cpumask_map;
55EXPORT_SYMBOL(node_to_cpumask_map);
56
57/*
58 * Given a shift value, try to populate memnodemap[] 46 * Given a shift value, try to populate memnodemap[]
59 * Returns : 47 * Returns :
60 * 1 if OK 48 * 1 if OK
@@ -661,36 +649,6 @@ void __init init_cpu_to_node(void)
661#endif 649#endif
662 650
663 651
664/*
665 * Allocate node_to_cpumask_map based on number of available nodes
666 * Requires node_possible_map to be valid.
667 *
668 * Note: node_to_cpumask() is not valid until after this is done.
669 * (Use CONFIG_DEBUG_PER_CPU_MAPS to check this.)
670 */
671void __init setup_node_to_cpumask_map(void)
672{
673 unsigned int node, num = 0;
674 cpumask_t *map;
675
676 /* setup nr_node_ids if not done yet */
677 if (nr_node_ids == MAX_NUMNODES) {
678 for_each_node_mask(node, node_possible_map)
679 num = node;
680 nr_node_ids = num + 1;
681 }
682
683 /* allocate the map */
684 map = alloc_bootmem_low(nr_node_ids * sizeof(cpumask_t));
685 DBG("node_to_cpumask_map at %p for %d nodes\n", map, nr_node_ids);
686
687 pr_debug("Node to cpumask map at %p for %d nodes\n",
688 map, nr_node_ids);
689
690 /* node_to_cpumask() will now work */
691 node_to_cpumask_map = map;
692}
693
694void __cpuinit numa_set_node(int cpu, int node) 652void __cpuinit numa_set_node(int cpu, int node)
695{ 653{
696 int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map); 654 int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
@@ -723,12 +681,12 @@ void __cpuinit numa_clear_node(int cpu)
723 681
724void __cpuinit numa_add_cpu(int cpu) 682void __cpuinit numa_add_cpu(int cpu)
725{ 683{
726 cpu_set(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); 684 cpumask_set_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
727} 685}
728 686
729void __cpuinit numa_remove_cpu(int cpu) 687void __cpuinit numa_remove_cpu(int cpu)
730{ 688{
731 cpu_clear(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); 689 cpumask_clear_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
732} 690}
733 691
734#else /* CONFIG_DEBUG_PER_CPU_MAPS */ 692#else /* CONFIG_DEBUG_PER_CPU_MAPS */
@@ -739,20 +697,20 @@ void __cpuinit numa_remove_cpu(int cpu)
739static void __cpuinit numa_set_cpumask(int cpu, int enable) 697static void __cpuinit numa_set_cpumask(int cpu, int enable)
740{ 698{
741 int node = early_cpu_to_node(cpu); 699 int node = early_cpu_to_node(cpu);
742 cpumask_t *mask; 700 struct cpumask *mask;
743 char buf[64]; 701 char buf[64];
744 702
745 if (node_to_cpumask_map == NULL) { 703 mask = node_to_cpumask_map[node];
746 printk(KERN_ERR "node_to_cpumask_map NULL\n"); 704 if (mask == NULL) {
705 printk(KERN_ERR "node_to_cpumask_map[%i] NULL\n", node);
747 dump_stack(); 706 dump_stack();
748 return; 707 return;
749 } 708 }
750 709
751 mask = &node_to_cpumask_map[node];
752 if (enable) 710 if (enable)
753 cpu_set(cpu, *mask); 711 cpumask_set_cpu(cpu, mask);
754 else 712 else
755 cpu_clear(cpu, *mask); 713 cpumask_clear_cpu(cpu, mask);
756 714
757 cpulist_scnprintf(buf, sizeof(buf), mask); 715 cpulist_scnprintf(buf, sizeof(buf), mask);
758 printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", 716 printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n",
@@ -799,59 +757,6 @@ int early_cpu_to_node(int cpu)
799 return per_cpu(x86_cpu_to_node_map, cpu); 757 return per_cpu(x86_cpu_to_node_map, cpu);
800} 758}
801 759
802
803/* empty cpumask */
804static const cpumask_t cpu_mask_none;
805
806/*
807 * Returns a pointer to the bitmask of CPUs on Node 'node'.
808 */
809const cpumask_t *cpumask_of_node(int node)
810{
811 if (node_to_cpumask_map == NULL) {
812 printk(KERN_WARNING
813 "cpumask_of_node(%d): no node_to_cpumask_map!\n",
814 node);
815 dump_stack();
816 return (const cpumask_t *)&cpu_online_map;
817 }
818 if (node >= nr_node_ids) {
819 printk(KERN_WARNING
820 "cpumask_of_node(%d): node > nr_node_ids(%d)\n",
821 node, nr_node_ids);
822 dump_stack();
823 return &cpu_mask_none;
824 }
825 return &node_to_cpumask_map[node];
826}
827EXPORT_SYMBOL(cpumask_of_node);
828
829/*
830 * Returns a bitmask of CPUs on Node 'node'.
831 *
832 * Side note: this function creates the returned cpumask on the stack
833 * so with a high NR_CPUS count, excessive stack space is used. The
834 * node_to_cpumask_ptr function should be used whenever possible.
835 */
836cpumask_t node_to_cpumask(int node)
837{
838 if (node_to_cpumask_map == NULL) {
839 printk(KERN_WARNING
840 "node_to_cpumask(%d): no node_to_cpumask_map!\n", node);
841 dump_stack();
842 return cpu_online_map;
843 }
844 if (node >= nr_node_ids) {
845 printk(KERN_WARNING
846 "node_to_cpumask(%d): node > nr_node_ids(%d)\n",
847 node, nr_node_ids);
848 dump_stack();
849 return cpu_mask_none;
850 }
851 return node_to_cpumask_map[node];
852}
853EXPORT_SYMBOL(node_to_cpumask);
854
855/* 760/*
856 * --------- end of debug versions of the numa functions --------- 761 * --------- end of debug versions of the numa functions ---------
857 */ 762 */
diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
index 4c4a51c90bc2..819b131fd752 100644
--- a/arch/x86/oprofile/op_model_p4.c
+++ b/arch/x86/oprofile/op_model_p4.c
@@ -380,7 +380,7 @@ static unsigned int get_stagger(void)
380{ 380{
381#ifdef CONFIG_SMP 381#ifdef CONFIG_SMP
382 int cpu = smp_processor_id(); 382 int cpu = smp_processor_id();
383 return (cpu != first_cpu(per_cpu(cpu_sibling_map, cpu))); 383 return cpu != cpumask_first(__get_cpu_var(cpu_sibling_map));
384#endif 384#endif
385 return 0; 385 return 0;
386} 386}
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 8d470562ffc9..585a6e330837 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -158,7 +158,7 @@ static void __init xen_fill_possible_map(void)
158 rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL); 158 rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);
159 if (rc >= 0) { 159 if (rc >= 0) {
160 num_processors++; 160 num_processors++;
161 cpu_set(i, cpu_possible_map); 161 set_cpu_possible(i, true);
162 } 162 }
163 } 163 }
164} 164}
@@ -197,7 +197,7 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
197 while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) { 197 while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) {
198 for (cpu = nr_cpu_ids - 1; !cpu_possible(cpu); cpu--) 198 for (cpu = nr_cpu_ids - 1; !cpu_possible(cpu); cpu--)
199 continue; 199 continue;
200 cpu_clear(cpu, cpu_possible_map); 200 set_cpu_possible(cpu, false);
201 } 201 }
202 202
203 for_each_possible_cpu (cpu) { 203 for_each_possible_cpu (cpu) {
@@ -210,7 +210,7 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
210 if (IS_ERR(idle)) 210 if (IS_ERR(idle))
211 panic("failed fork for CPU %d", cpu); 211 panic("failed fork for CPU %d", cpu);
212 212
213 cpu_set(cpu, cpu_present_map); 213 set_cpu_present(cpu, true);
214 } 214 }
215} 215}
216 216
diff --git a/arch/xtensa/include/asm/ftrace.h b/arch/xtensa/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/xtensa/include/asm/ftrace.h
@@ -0,0 +1 @@
/* empty */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-23 17:10:44 -0500