aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ep93xx/core.c2
-rw-r--r--arch/arm/mach-realview/realview_eb.c2
-rw-r--r--arch/arm/mm/cache-l2x0.c12
-rw-r--r--arch/arm/vfp/vfpmodule.c1
-rw-r--r--arch/blackfin/mach-common/pm.c6
-rw-r--r--arch/h8300/Kconfig.debug2
-rw-r--r--arch/i386/boot/header.S2
-rw-r--r--arch/i386/boot/pm.c6
-rw-r--r--arch/i386/boot/video.c14
-rw-r--r--arch/i386/kernel/acpi/wakeup.S41
-rw-r--r--arch/i386/kernel/alternative.c6
-rw-r--r--arch/i386/kernel/cpu/intel_cacheinfo.c4
-rw-r--r--arch/i386/kernel/cpu/perfctr-watchdog.c28
-rw-r--r--arch/i386/kernel/nmi.c2
-rw-r--r--arch/i386/kernel/ptrace.c1
-rw-r--r--arch/i386/mach-generic/Makefile2
-rw-r--r--arch/i386/mach-voyager/Makefile2
-rw-r--r--arch/i386/mm/highmem.c7
-rw-r--r--arch/i386/pci/irq.c1
-rw-r--r--arch/i386/pci/pcbios.c2
-rw-r--r--arch/i386/xen/enlighten.c4
-rw-r--r--arch/ia64/hp/sim/hpsim_console.c16
-rw-r--r--arch/ia64/hp/sim/hpsim_setup.c9
-rw-r--r--arch/ia64/hp/sim/simeth.c12
-rw-r--r--arch/ia64/hp/sim/simscsi.c3
-rw-r--r--arch/ia64/kernel/irq_ia64.c28
-rw-r--r--arch/ia64/kernel/ptrace.c1
-rw-r--r--arch/ia64/kernel/setup.c13
-rw-r--r--arch/ia64/kernel/smpboot.c6
-rw-r--r--arch/ia64/mm/contig.c3
-rw-r--r--arch/ia64/mm/discontig.c3
-rw-r--r--arch/ia64/sn/kernel/huberror.c14
-rw-r--r--arch/ia64/sn/kernel/irq.c15
-rw-r--r--arch/ia64/sn/kernel/sn2/sn2_smp.c26
-rw-r--r--arch/ia64/sn/kernel/sn2/sn_hwperf.c3
-rw-r--r--arch/ia64/sn/pci/pcibr/pcibr_provider.c1
-rw-r--r--arch/ia64/sn/pci/tioca_provider.c2
-rw-r--r--arch/ia64/sn/pci/tioce_provider.c1
-rw-r--r--arch/m32r/Kconfig20
-rw-r--r--arch/m32r/Makefile3
-rw-r--r--arch/m32r/configs/m32104ut_defconfig (renamed from arch/m32r/m32104ut/defconfig.m32104ut)363
-rw-r--r--arch/m32r/configs/m32700ut.smp_defconfig (renamed from arch/m32r/m32700ut/defconfig.m32700ut.smp)349
-rw-r--r--arch/m32r/configs/m32700ut.up_defconfig (renamed from arch/m32r/m32700ut/defconfig.m32700ut.up)349
-rw-r--r--arch/m32r/configs/mappi.nommu_defconfig (renamed from arch/m32r/mappi/defconfig.nommu)294
-rw-r--r--arch/m32r/configs/mappi.smp_defconfig (renamed from arch/m32r/mappi/defconfig.smp)311
-rw-r--r--arch/m32r/configs/mappi.up_defconfig (renamed from arch/m32r/mappi/defconfig.up)311
-rw-r--r--arch/m32r/configs/mappi2.opsp_defconfig (renamed from arch/m32r/mappi2/defconfig.opsp)333
-rw-r--r--arch/m32r/configs/mappi2.vdec2_defconfig (renamed from arch/m32r/mappi2/defconfig.vdec2)333
-rw-r--r--arch/m32r/configs/mappi3.smp_defconfig (renamed from arch/m32r/mappi3/defconfig.smp)310
-rw-r--r--arch/m32r/configs/oaks32r_defconfig (renamed from arch/m32r/oaks32r/defconfig.nommu)290
-rw-r--r--arch/m32r/configs/opsput_defconfig (renamed from arch/m32r/opsput/defconfig.opsput)321
-rw-r--r--arch/m32r/configs/usrv_defconfig774
-rw-r--r--arch/m32r/defconfig349
-rw-r--r--arch/m32r/kernel/Makefile8
-rw-r--r--arch/m32r/kernel/entry.S569
-rw-r--r--arch/m32r/kernel/syscall_table.S286
-rw-r--r--arch/m32r/platforms/Makefile9
-rw-r--r--arch/m32r/platforms/m32104ut/Makefile1
-rw-r--r--arch/m32r/platforms/m32104ut/io.c (renamed from arch/m32r/kernel/io_m32104ut.c)2
-rw-r--r--arch/m32r/platforms/m32104ut/setup.c (renamed from arch/m32r/kernel/setup_m32104ut.c)2
-rw-r--r--arch/m32r/platforms/m32700ut/Makefile1
-rw-r--r--arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB (renamed from arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB)0
-rw-r--r--arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB (renamed from arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB)0
-rw-r--r--arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB (renamed from arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB)0
-rw-r--r--arch/m32r/platforms/m32700ut/io.c (renamed from arch/m32r/kernel/io_m32700ut.c)2
-rw-r--r--arch/m32r/platforms/m32700ut/setup.c (renamed from arch/m32r/kernel/setup_m32700ut.c)2
-rw-r--r--arch/m32r/platforms/mappi/Makefile1
-rw-r--r--arch/m32r/platforms/mappi/dot.gdbinit (renamed from arch/m32r/mappi/dot.gdbinit)0
-rw-r--r--arch/m32r/platforms/mappi/dot.gdbinit.nommu (renamed from arch/m32r/mappi/dot.gdbinit.nommu)0
-rw-r--r--arch/m32r/platforms/mappi/dot.gdbinit.smp (renamed from arch/m32r/mappi/dot.gdbinit.smp)0
-rw-r--r--arch/m32r/platforms/mappi/io.c (renamed from arch/m32r/kernel/io_mappi.c)2
-rw-r--r--arch/m32r/platforms/mappi/setup.c (renamed from arch/m32r/kernel/setup_mappi.c)2
-rw-r--r--arch/m32r/platforms/mappi2/Makefile1
-rw-r--r--arch/m32r/platforms/mappi2/dot.gdbinit.vdec2 (renamed from arch/m32r/mappi2/dot.gdbinit.vdec2)0
-rw-r--r--arch/m32r/platforms/mappi2/io.c (renamed from arch/m32r/kernel/io_mappi2.c)2
-rw-r--r--arch/m32r/platforms/mappi2/setup.c (renamed from arch/m32r/kernel/setup_mappi2.c)2
-rw-r--r--arch/m32r/platforms/mappi3/Makefile1
-rw-r--r--arch/m32r/platforms/mappi3/dot.gdbinit (renamed from arch/m32r/mappi3/dot.gdbinit)0
-rw-r--r--arch/m32r/platforms/mappi3/io.c (renamed from arch/m32r/kernel/io_mappi3.c)2
-rw-r--r--arch/m32r/platforms/mappi3/setup.c (renamed from arch/m32r/kernel/setup_mappi3.c)2
-rw-r--r--arch/m32r/platforms/oaks32r/Makefile1
-rw-r--r--arch/m32r/platforms/oaks32r/dot.gdbinit.nommu (renamed from arch/m32r/oaks32r/dot.gdbinit.nommu)0
-rw-r--r--arch/m32r/platforms/oaks32r/io.c (renamed from arch/m32r/kernel/io_oaks32r.c)2
-rw-r--r--arch/m32r/platforms/oaks32r/setup.c (renamed from arch/m32r/kernel/setup_oaks32r.c)2
-rw-r--r--arch/m32r/platforms/opsput/Makefile1
-rw-r--r--arch/m32r/platforms/opsput/dot.gdbinit (renamed from arch/m32r/opsput/dot.gdbinit)0
-rw-r--r--arch/m32r/platforms/opsput/io.c (renamed from arch/m32r/kernel/io_opsput.c)2
-rw-r--r--arch/m32r/platforms/opsput/setup.c (renamed from arch/m32r/kernel/setup_opsput.c)2
-rw-r--r--arch/m32r/platforms/usrv/Makefile1
-rw-r--r--arch/m32r/platforms/usrv/io.c (renamed from arch/m32r/kernel/io_usrv.c)4
-rw-r--r--arch/m32r/platforms/usrv/setup.c (renamed from arch/m32r/kernel/setup_usrv.c)5
-rw-r--r--arch/m68k/kernel/entry.S10
-rw-r--r--arch/m68k/kernel/ptrace.c1
-rw-r--r--arch/m68knommu/kernel/syscalltable.S10
-rw-r--r--arch/mips/Kconfig22
-rw-r--r--arch/mips/dec/setup.c2
-rw-r--r--arch/mips/kernel/cpu-bugs64.c4
-rw-r--r--arch/mips/kernel/cpu-probe.c9
-rw-r--r--arch/mips/kernel/i8259.c1
-rw-r--r--arch/mips/kernel/rtlx.c4
-rw-r--r--arch/mips/kernel/scall64-n32.S2
-rw-r--r--arch/mips/kernel/time.c1
-rw-r--r--arch/mips/mips-boards/malta/malta_int.c2
-rw-r--r--arch/mips/mm/dma-default.c2
-rw-r--r--arch/mips/mm/init.c5
-rw-r--r--arch/mips/mm/tlbex.c30
-rw-r--r--arch/mips/pci/pci.c1
-rw-r--r--arch/mips/sgi-ip22/ip22-platform.c4
-rw-r--r--arch/mips/sgi-ip22/ip22-time.c4
-rw-r--r--arch/mips/sibyte/Kconfig1
-rw-r--r--arch/mips/sibyte/bcm1480/irq.c8
-rw-r--r--arch/mips/sibyte/bcm1480/setup.c2
-rw-r--r--arch/powerpc/kernel/ibmebus.c30
-rw-r--r--arch/powerpc/kernel/legacy_serial.c2
-rw-r--r--arch/powerpc/kernel/time.c8
-rw-r--r--arch/powerpc/kernel/vdso.c12
-rw-r--r--arch/powerpc/platforms/85xx/mpc8544_ds.c2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_cds.c2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_mds.c2
-rw-r--r--arch/powerpc/platforms/86xx/mpc86xx_hpcn.c2
-rw-r--r--arch/powerpc/platforms/Kconfig1
-rw-r--r--arch/powerpc/platforms/cell/spu_base.c24
-rw-r--r--arch/powerpc/platforms/cell/spufs/sched.c4
-rw-r--r--arch/powerpc/platforms/ps3/platform.h1
-rw-r--r--arch/powerpc/platforms/ps3/repository.c29
-rw-r--r--arch/powerpc/platforms/ps3/spu.c2
-rw-r--r--arch/powerpc/sysdev/cpm2_common.c2
-rw-r--r--arch/ppc/kernel/head_8xx.S2
-rw-r--r--arch/sparc64/defconfig16
-rw-r--r--arch/sparc64/kernel/head.S35
-rw-r--r--arch/sparc64/kernel/mdesc.c6
-rw-r--r--arch/sparc64/kernel/pci.c13
-rw-r--r--arch/sparc64/kernel/prom.c6
-rw-r--r--arch/sparc64/kernel/trampoline.S33
-rw-r--r--arch/sparc64/prom/misc.c16
-rw-r--r--arch/um/include/kern_util.h2
-rw-r--r--arch/um/kernel/irq.c7
-rw-r--r--arch/um/os-Linux/file.c3
-rw-r--r--arch/um/os-Linux/signal.c4
-rw-r--r--arch/x86_64/Kconfig8
-rw-r--r--arch/x86_64/ia32/ia32entry.S18
-rw-r--r--arch/x86_64/kernel/acpi/wakeup.S47
-rw-r--r--arch/x86_64/kernel/process.c1
-rw-r--r--arch/x86_64/kernel/ptrace.c4
-rw-r--r--arch/x86_64/kernel/smp.c2
-rw-r--r--arch/x86_64/mm/fault.c7
-rw-r--r--arch/x86_64/vdso/vclock_gettime.c5
-rw-r--r--arch/xtensa/Makefile7
-rw-r--r--arch/xtensa/kernel/Makefile2
-rw-r--r--arch/xtensa/kernel/asm-offsets.c13
-rw-r--r--arch/xtensa/kernel/entry.S115
-rw-r--r--arch/xtensa/kernel/init_task.c38
-rw-r--r--arch/xtensa/kernel/io.c75
-rw-r--r--arch/xtensa/kernel/module.c195
-rw-r--r--arch/xtensa/kernel/pci.c69
-rw-r--r--arch/xtensa/kernel/process.c14
-rw-r--r--arch/xtensa/kernel/semaphore.c2
-rw-r--r--arch/xtensa/kernel/syscall.c5
-rw-r--r--arch/xtensa/kernel/time.c46
-rw-r--r--arch/xtensa/kernel/traps.c4
-rw-r--r--arch/xtensa/mm/Makefile6
-rw-r--r--arch/xtensa/mm/cache.c256
-rw-r--r--arch/xtensa/mm/fault.c6
-rw-r--r--arch/xtensa/mm/init.c252
-rw-r--r--arch/xtensa/mm/misc.S306
-rw-r--r--arch/xtensa/platform-iss/console.c1
166 files changed, 3906 insertions, 3919 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 851cc7158ca3..70b2c7801110 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -336,7 +336,7 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type)
336 if (line >= 0 && line < 16) { 336 if (line >= 0 && line < 16) {
337 gpio_line_config(line, GPIO_IN); 337 gpio_line_config(line, GPIO_IN);
338 } else { 338 } else {
339 gpio_line_config(EP93XX_GPIO_LINE_F(line), GPIO_IN); 339 gpio_line_config(EP93XX_GPIO_LINE_F(line-16), GPIO_IN);
340 } 340 }
341 341
342 port = line >> 3; 342 port = line >> 3;
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 3dba666151db..ecec2f85c4cd 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -165,7 +165,7 @@ static void __init gic_init_irq(void)
165#endif 165#endif
166 gic_dist_init(0, __io_address(REALVIEW_GIC_DIST_BASE), 29); 166 gic_dist_init(0, __io_address(REALVIEW_GIC_DIST_BASE), 29);
167 gic_cpu_init(0, __io_address(REALVIEW_GIC_CPU_BASE)); 167 gic_cpu_init(0, __io_address(REALVIEW_GIC_CPU_BASE));
168#ifdef CONFIG_REALVIEW_MPCORE 168#if defined(CONFIG_REALVIEW_MPCORE) && !defined(CONFIG_REALVIEW_MPCORE_REVB)
169 gic_dist_init(1, __io_address(REALVIEW_GIC1_DIST_BASE), 64); 169 gic_dist_init(1, __io_address(REALVIEW_GIC1_DIST_BASE), 64);
170 gic_cpu_init(1, __io_address(REALVIEW_GIC1_CPU_BASE)); 170 gic_cpu_init(1, __io_address(REALVIEW_GIC1_CPU_BASE));
171 gic_cascade_irq(1, IRQ_EB_IRQ1); 171 gic_cascade_irq(1, IRQ_EB_IRQ1);
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index b4e9b734e0bd..76b800a95191 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -57,7 +57,17 @@ static void l2x0_inv_range(unsigned long start, unsigned long end)
57{ 57{
58 unsigned long addr; 58 unsigned long addr;
59 59
60 start &= ~(CACHE_LINE_SIZE - 1); 60 if (start & (CACHE_LINE_SIZE - 1)) {
61 start &= ~(CACHE_LINE_SIZE - 1);
62 sync_writel(start, L2X0_CLEAN_INV_LINE_PA, 1);
63 start += CACHE_LINE_SIZE;
64 }
65
66 if (end & (CACHE_LINE_SIZE - 1)) {
67 end &= ~(CACHE_LINE_SIZE - 1);
68 sync_writel(end, L2X0_CLEAN_INV_LINE_PA, 1);
69 }
70
61 for (addr = start; addr < end; addr += CACHE_LINE_SIZE) 71 for (addr = start; addr < end; addr += CACHE_LINE_SIZE)
62 sync_writel(addr, L2X0_INV_LINE_PA, 1); 72 sync_writel(addr, L2X0_INV_LINE_PA, 1);
63 cache_sync(); 73 cache_sync();
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 04ddab2bd876..eea3f50743d5 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -323,6 +323,7 @@ static int __init vfp_init(void)
323 * we just need to read the VFPSID register. 323 * we just need to read the VFPSID register.
324 */ 324 */
325 vfp_vector = vfp_testing_entry; 325 vfp_vector = vfp_testing_entry;
326 barrier();
326 vfpsid = fmrx(FPSID); 327 vfpsid = fmrx(FPSID);
327 barrier(); 328 barrier();
328 vfp_vector = vfp_null_entry; 329 vfp_vector = vfp_null_entry;
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index 1772d8d2c1a7..b10302722202 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -158,10 +158,16 @@ static int bfin_pm_finish(suspend_state_t state)
158 return 0; 158 return 0;
159} 159}
160 160
161static int bfin_pm_valid(suspend_state_t state)
162{
163 return (state == PM_SUSPEND_STANDBY);
164}
165
161struct pm_ops bfin_pm_ops = { 166struct pm_ops bfin_pm_ops = {
162 .prepare = bfin_pm_prepare, 167 .prepare = bfin_pm_prepare,
163 .enter = bfin_pm_enter, 168 .enter = bfin_pm_enter,
164 .finish = bfin_pm_finish, 169 .finish = bfin_pm_finish,
170 .valid = bfin_pm_valid,
165}; 171};
166 172
167static int __init bfin_pm_init(void) 173static int __init bfin_pm_init(void)
diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug
index 554efe604a08..996d97e953b0 100644
--- a/arch/h8300/Kconfig.debug
+++ b/arch/h8300/Kconfig.debug
@@ -59,7 +59,7 @@ config BLKDEV_RESERVE
59 help 59 help
60 Reserved BLKDEV area. 60 Reserved BLKDEV area.
61 61
62config CONFIG_BLKDEV_RESERVE_ADDRESS 62config BLKDEV_RESERVE_ADDRESS
63 hex 'start address' 63 hex 'start address'
64 depends on BLKDEV_RESERVE 64 depends on BLKDEV_RESERVE
65 help 65 help
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
index 7f4a2c53bd76..f3140e596d40 100644
--- a/arch/i386/boot/header.S
+++ b/arch/i386/boot/header.S
@@ -275,7 +275,7 @@ die:
275 hlt 275 hlt
276 jmp die 276 jmp die
277 277
278 .size die, .-due 278 .size die, .-die
279 279
280 .section ".initdata", "a" 280 .section ".initdata", "a"
281setup_corrupt: 281setup_corrupt:
diff --git a/arch/i386/boot/pm.c b/arch/i386/boot/pm.c
index 6be9ca811d17..09fb342cc62e 100644
--- a/arch/i386/boot/pm.c
+++ b/arch/i386/boot/pm.c
@@ -122,7 +122,11 @@ static void setup_gdt(void)
122 /* DS: data, read/write, 4 GB, base 0 */ 122 /* DS: data, read/write, 4 GB, base 0 */
123 [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff), 123 [GDT_ENTRY_BOOT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff),
124 }; 124 };
125 struct gdt_ptr gdt; 125 /* Xen HVM incorrectly stores a pointer to the gdt_ptr, instead
126 of the gdt_ptr contents. Thus, make it static so it will
127 stay in memory, at least long enough that we switch to the
128 proper kernel GDT. */
129 static struct gdt_ptr gdt;
126 130
127 gdt.len = sizeof(boot_gdt)-1; 131 gdt.len = sizeof(boot_gdt)-1;
128 gdt.ptr = (u32)&boot_gdt + (ds() << 4); 132 gdt.ptr = (u32)&boot_gdt + (ds() << 4);
diff --git a/arch/i386/boot/video.c b/arch/i386/boot/video.c
index 693f20d3102e..e4ba897bf9a3 100644
--- a/arch/i386/boot/video.c
+++ b/arch/i386/boot/video.c
@@ -147,7 +147,7 @@ int mode_defined(u16 mode)
147} 147}
148 148
149/* Set mode (without recalc) */ 149/* Set mode (without recalc) */
150static int raw_set_mode(u16 mode) 150static int raw_set_mode(u16 mode, u16 *real_mode)
151{ 151{
152 int nmode, i; 152 int nmode, i;
153 struct card_info *card; 153 struct card_info *card;
@@ -165,8 +165,10 @@ static int raw_set_mode(u16 mode)
165 165
166 if ((mode == nmode && visible) || 166 if ((mode == nmode && visible) ||
167 mode == mi->mode || 167 mode == mi->mode ||
168 mode == (mi->y << 8)+mi->x) 168 mode == (mi->y << 8)+mi->x) {
169 *real_mode = mi->mode;
169 return card->set_mode(mi); 170 return card->set_mode(mi);
171 }
170 172
171 if (visible) 173 if (visible)
172 nmode++; 174 nmode++;
@@ -178,7 +180,7 @@ static int raw_set_mode(u16 mode)
178 if (mode >= card->xmode_first && 180 if (mode >= card->xmode_first &&
179 mode < card->xmode_first+card->xmode_n) { 181 mode < card->xmode_first+card->xmode_n) {
180 struct mode_info mix; 182 struct mode_info mix;
181 mix.mode = mode; 183 *real_mode = mix.mode = mode;
182 mix.x = mix.y = 0; 184 mix.x = mix.y = 0;
183 return card->set_mode(&mix); 185 return card->set_mode(&mix);
184 } 186 }
@@ -223,6 +225,7 @@ static void vga_recalc_vertical(void)
223static int set_mode(u16 mode) 225static int set_mode(u16 mode)
224{ 226{
225 int rv; 227 int rv;
228 u16 real_mode;
226 229
227 /* Very special mode numbers... */ 230 /* Very special mode numbers... */
228 if (mode == VIDEO_CURRENT_MODE) 231 if (mode == VIDEO_CURRENT_MODE)
@@ -232,13 +235,16 @@ static int set_mode(u16 mode)
232 else if (mode == EXTENDED_VGA) 235 else if (mode == EXTENDED_VGA)
233 mode = VIDEO_8POINT; 236 mode = VIDEO_8POINT;
234 237
235 rv = raw_set_mode(mode); 238 rv = raw_set_mode(mode, &real_mode);
236 if (rv) 239 if (rv)
237 return rv; 240 return rv;
238 241
239 if (mode & VIDEO_RECALC) 242 if (mode & VIDEO_RECALC)
240 vga_recalc_vertical(); 243 vga_recalc_vertical();
241 244
245 /* Save the canonical mode number for the kernel, not
246 an alias, size specification or menu position */
247 boot_params.hdr.vid_mode = real_mode;
242 return 0; 248 return 0;
243} 249}
244 250
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index ed0a0f2c1597..f22ba8534d26 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -151,51 +151,30 @@ bogus_real_magic:
151#define VIDEO_FIRST_V7 0x0900 151#define VIDEO_FIRST_V7 0x0900
152 152
153# Setting of user mode (AX=mode ID) => CF=success 153# Setting of user mode (AX=mode ID) => CF=success
154
155# For now, we only handle VESA modes (0x0200..0x03ff). To handle other
156# modes, we should probably compile in the video code from the boot
157# directory.
154mode_set: 158mode_set:
155 movw %ax, %bx 159 movw %ax, %bx
156#if 0 160 subb $VIDEO_FIRST_VESA>>8, %bh
157 cmpb $0xff, %ah 161 cmpb $2, %bh
158 jz setalias 162 jb check_vesa
159
160 testb $VIDEO_RECALC>>8, %ah
161 jnz _setrec
162
163 cmpb $VIDEO_FIRST_RESOLUTION>>8, %ah
164 jnc setres
165
166 cmpb $VIDEO_FIRST_SPECIAL>>8, %ah
167 jz setspc
168
169 cmpb $VIDEO_FIRST_V7>>8, %ah
170 jz setv7
171#endif
172
173 cmpb $VIDEO_FIRST_VESA>>8, %ah
174 jnc check_vesa
175#if 0
176 orb %ah, %ah
177 jz setmenu
178#endif
179
180 decb %ah
181# jz setbios Add bios modes later
182 163
183setbad: clc 164setbad:
165 clc
184 ret 166 ret
185 167
186check_vesa: 168check_vesa:
187 subb $VIDEO_FIRST_VESA>>8, %bh
188 orw $0x4000, %bx # Use linear frame buffer 169 orw $0x4000, %bx # Use linear frame buffer
189 movw $0x4f02, %ax # VESA BIOS mode set call 170 movw $0x4f02, %ax # VESA BIOS mode set call
190 int $0x10 171 int $0x10
191 cmpw $0x004f, %ax # AL=4f if implemented 172 cmpw $0x004f, %ax # AL=4f if implemented
192 jnz _setbad # AH=0 if OK 173 jnz setbad # AH=0 if OK
193 174
194 stc 175 stc
195 ret 176 ret
196 177
197_setbad: jmp setbad
198
199 .code32 178 .code32
200 ALIGN 179 ALIGN
201 180
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c
index 9f4ac8b02de4..bd72d94e713e 100644
--- a/arch/i386/kernel/alternative.c
+++ b/arch/i386/kernel/alternative.c
@@ -445,8 +445,6 @@ void __kprobes text_poke(void *addr, unsigned char *opcode, int len)
445{ 445{
446 memcpy(addr, opcode, len); 446 memcpy(addr, opcode, len);
447 sync_core(); 447 sync_core();
448 /* Not strictly needed, but can speed CPU recovery up. Ignore cross cacheline 448 /* Could also do a CLFLUSH here to speed up CPU recovery; but
449 case. */ 449 that causes hangs on some VIA CPUs. */
450 if (cpu_has_clflush)
451 asm("clflush (%0) " :: "r" (addr) : "memory");
452} 450}
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/i386/kernel/cpu/intel_cacheinfo.c
index d5a456d27d82..db6c25aa5776 100644
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -515,7 +515,7 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
515 515
516 cpuid4_info[cpu] = kzalloc( 516 cpuid4_info[cpu] = kzalloc(
517 sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL); 517 sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL);
518 if (unlikely(cpuid4_info[cpu] == NULL)) 518 if (cpuid4_info[cpu] == NULL)
519 return -ENOMEM; 519 return -ENOMEM;
520 520
521 oldmask = current->cpus_allowed; 521 oldmask = current->cpus_allowed;
@@ -748,6 +748,8 @@ static void __cpuinit cache_remove_dev(struct sys_device * sys_dev)
748 unsigned int cpu = sys_dev->id; 748 unsigned int cpu = sys_dev->id;
749 unsigned long i; 749 unsigned long i;
750 750
751 if (cpuid4_info[cpu] == NULL)
752 return;
751 for (i = 0; i < num_cache_leaves; i++) { 753 for (i = 0; i < num_cache_leaves; i++) {
752 cache_remove_shared_cpu_map(cpu, i); 754 cache_remove_shared_cpu_map(cpu, i);
753 kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj)); 755 kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj));
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c
index 4be488e73bee..93fecd4b03de 100644
--- a/arch/i386/kernel/cpu/perfctr-watchdog.c
+++ b/arch/i386/kernel/cpu/perfctr-watchdog.c
@@ -263,8 +263,8 @@ static int setup_k7_watchdog(unsigned nmi_hz)
263 unsigned int evntsel; 263 unsigned int evntsel;
264 struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); 264 struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
265 265
266 perfctr_msr = MSR_K7_PERFCTR0; 266 perfctr_msr = wd_ops->perfctr;
267 evntsel_msr = MSR_K7_EVNTSEL0; 267 evntsel_msr = wd_ops->evntsel;
268 268
269 wrmsrl(perfctr_msr, 0UL); 269 wrmsrl(perfctr_msr, 0UL);
270 270
@@ -343,8 +343,8 @@ static int setup_p6_watchdog(unsigned nmi_hz)
343 unsigned int evntsel; 343 unsigned int evntsel;
344 struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); 344 struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
345 345
346 perfctr_msr = MSR_P6_PERFCTR0; 346 perfctr_msr = wd_ops->perfctr;
347 evntsel_msr = MSR_P6_EVNTSEL0; 347 evntsel_msr = wd_ops->evntsel;
348 348
349 /* KVM doesn't implement this MSR */ 349 /* KVM doesn't implement this MSR */
350 if (wrmsr_safe(perfctr_msr, 0, 0) < 0) 350 if (wrmsr_safe(perfctr_msr, 0, 0) < 0)
@@ -569,8 +569,8 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz)
569 (ebx & ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT)) 569 (ebx & ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT))
570 return 0; 570 return 0;
571 571
572 perfctr_msr = MSR_ARCH_PERFMON_PERFCTR1; 572 perfctr_msr = wd_ops->perfctr;
573 evntsel_msr = MSR_ARCH_PERFMON_EVENTSEL1; 573 evntsel_msr = wd_ops->evntsel;
574 574
575 wrmsrl(perfctr_msr, 0UL); 575 wrmsrl(perfctr_msr, 0UL);
576 576
@@ -605,6 +605,16 @@ static struct wd_ops intel_arch_wd_ops = {
605 .evntsel = MSR_ARCH_PERFMON_EVENTSEL1, 605 .evntsel = MSR_ARCH_PERFMON_EVENTSEL1,
606}; 606};
607 607
608static struct wd_ops coreduo_wd_ops = {
609 .reserve = single_msr_reserve,
610 .unreserve = single_msr_unreserve,
611 .setup = setup_intel_arch_watchdog,
612 .rearm = p6_rearm,
613 .stop = single_msr_stop_watchdog,
614 .perfctr = MSR_ARCH_PERFMON_PERFCTR0,
615 .evntsel = MSR_ARCH_PERFMON_EVENTSEL0,
616};
617
608static void probe_nmi_watchdog(void) 618static void probe_nmi_watchdog(void)
609{ 619{
610 switch (boot_cpu_data.x86_vendor) { 620 switch (boot_cpu_data.x86_vendor) {
@@ -615,6 +625,12 @@ static void probe_nmi_watchdog(void)
615 wd_ops = &k7_wd_ops; 625 wd_ops = &k7_wd_ops;
616 break; 626 break;
617 case X86_VENDOR_INTEL: 627 case X86_VENDOR_INTEL:
628 /* Work around Core Duo (Yonah) errata AE49 where perfctr1
629 doesn't have a working enable bit. */
630 if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 14) {
631 wd_ops = &coreduo_wd_ops;
632 break;
633 }
618 if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) { 634 if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {
619 wd_ops = &intel_arch_wd_ops; 635 wd_ops = &intel_arch_wd_ops;
620 break; 636 break;
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 8c1c965eb2a8..c7227e2180f8 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -115,12 +115,12 @@ static int __init check_nmi_watchdog(void)
115 atomic_dec(&nmi_active); 115 atomic_dec(&nmi_active);
116 } 116 }
117 } 117 }
118 endflag = 1;
118 if (!atomic_read(&nmi_active)) { 119 if (!atomic_read(&nmi_active)) {
119 kfree(prev_nmi_count); 120 kfree(prev_nmi_count);
120 atomic_set(&nmi_active, -1); 121 atomic_set(&nmi_active, -1);
121 return -1; 122 return -1;
122 } 123 }
123 endflag = 1;
124 printk("OK.\n"); 124 printk("OK.\n");
125 125
126 /* now that we know it works we can reduce NMI frequency to 126 /* now that we know it works we can reduce NMI frequency to
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index 0c8f00e69c4d..7c1b92522e95 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -274,7 +274,6 @@ static void clear_singlestep(struct task_struct *child)
274void ptrace_disable(struct task_struct *child) 274void ptrace_disable(struct task_struct *child)
275{ 275{
276 clear_singlestep(child); 276 clear_singlestep(child);
277 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
278 clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); 277 clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
279} 278}
280 279
diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile
index 77fbc9f64fbc..6914485c0d85 100644
--- a/arch/i386/mach-generic/Makefile
+++ b/arch/i386/mach-generic/Makefile
@@ -2,6 +2,6 @@
2# Makefile for the generic architecture 2# Makefile for the generic architecture
3# 3#
4 4
5EXTRA_CFLAGS += -I../kernel 5EXTRA_CFLAGS := -Iarch/i386/kernel
6 6
7obj-y := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/ 7obj-y := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/
diff --git a/arch/i386/mach-voyager/Makefile b/arch/i386/mach-voyager/Makefile
index f24d29651318..33b74cf0dd22 100644
--- a/arch/i386/mach-voyager/Makefile
+++ b/arch/i386/mach-voyager/Makefile
@@ -2,7 +2,7 @@
2# Makefile for the linux kernel. 2# Makefile for the linux kernel.
3# 3#
4 4
5EXTRA_CFLAGS += -I../kernel 5EXTRA_CFLAGS := -Iarch/i386/kernel
6obj-y := setup.o voyager_basic.o voyager_thread.o 6obj-y := setup.o voyager_basic.o voyager_thread.o
7 7
8obj-$(CONFIG_SMP) += voyager_smp.o voyager_cat.o 8obj-$(CONFIG_SMP) += voyager_smp.o voyager_cat.o
diff --git a/arch/i386/mm/highmem.c b/arch/i386/mm/highmem.c
index ad8d86cc683e..1c3bf95f7356 100644
--- a/arch/i386/mm/highmem.c
+++ b/arch/i386/mm/highmem.c
@@ -34,17 +34,16 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
34 /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ 34 /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
35 pagefault_disable(); 35 pagefault_disable();
36 36
37 idx = type + KM_TYPE_NR*smp_processor_id();
38 BUG_ON(!pte_none(*(kmap_pte-idx)));
39
40 if (!PageHighMem(page)) 37 if (!PageHighMem(page))
41 return page_address(page); 38 return page_address(page);
42 39
40 idx = type + KM_TYPE_NR*smp_processor_id();
43 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 41 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
42 BUG_ON(!pte_none(*(kmap_pte-idx)));
44 set_pte(kmap_pte-idx, mk_pte(page, prot)); 43 set_pte(kmap_pte-idx, mk_pte(page, prot));
45 arch_flush_lazy_mmu_mode(); 44 arch_flush_lazy_mmu_mode();
46 45
47 return (void*) vaddr; 46 return (void *)vaddr;
48} 47}
49 48
50void *kmap_atomic(struct page *page, enum km_type type) 49void *kmap_atomic(struct page *page, enum km_type type)
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 665db063a40a..8434f2323b87 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -550,6 +550,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
550 case PCI_DEVICE_ID_INTEL_ICH9_3: 550 case PCI_DEVICE_ID_INTEL_ICH9_3:
551 case PCI_DEVICE_ID_INTEL_ICH9_4: 551 case PCI_DEVICE_ID_INTEL_ICH9_4:
552 case PCI_DEVICE_ID_INTEL_ICH9_5: 552 case PCI_DEVICE_ID_INTEL_ICH9_5:
553 case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
553 r->name = "PIIX/ICH"; 554 r->name = "PIIX/ICH";
554 r->get = pirq_piix_get; 555 r->get = pirq_piix_get;
555 r->set = pirq_piix_set; 556 r->set = pirq_piix_set;
diff --git a/arch/i386/pci/pcbios.c b/arch/i386/pci/pcbios.c
index 5f5193401bea..10ac8c316c46 100644
--- a/arch/i386/pci/pcbios.c
+++ b/arch/i386/pci/pcbios.c
@@ -412,7 +412,7 @@ struct irq_routing_options {
412 u16 segment; 412 u16 segment;
413} __attribute__((packed)); 413} __attribute__((packed));
414 414
415struct irq_routing_table * __devinit pcibios_get_irq_routing_table(void) 415struct irq_routing_table * pcibios_get_irq_routing_table(void)
416{ 416{
417 struct irq_routing_options opt; 417 struct irq_routing_options opt;
418 struct irq_routing_table *rt = NULL; 418 struct irq_routing_table *rt = NULL;
diff --git a/arch/i386/xen/enlighten.c b/arch/i386/xen/enlighten.c
index f0c37511d8da..f01bfcd4bdee 100644
--- a/arch/i386/xen/enlighten.c
+++ b/arch/i386/xen/enlighten.c
@@ -623,8 +623,8 @@ static unsigned long xen_read_cr2_direct(void)
623 623
624static void xen_write_cr4(unsigned long cr4) 624static void xen_write_cr4(unsigned long cr4)
625{ 625{
626 /* never allow TSC to be disabled */ 626 /* Just ignore cr4 changes; Xen doesn't allow us to do
627 native_write_cr4(cr4 & ~X86_CR4_TSD); 627 anything anyway. */
628} 628}
629 629
630static unsigned long xen_read_cr3(void) 630static unsigned long xen_read_cr3(void)
diff --git a/arch/ia64/hp/sim/hpsim_console.c b/arch/ia64/hp/sim/hpsim_console.c
index 6e149c8ab835..01663bc42b1a 100644
--- a/arch/ia64/hp/sim/hpsim_console.c
+++ b/arch/ia64/hp/sim/hpsim_console.c
@@ -21,6 +21,7 @@
21#include <asm/machvec.h> 21#include <asm/machvec.h>
22#include <asm/pgtable.h> 22#include <asm/pgtable.h>
23#include <asm/sal.h> 23#include <asm/sal.h>
24#include <asm/hpsim.h>
24 25
25#include "hpsim_ssc.h" 26#include "hpsim_ssc.h"
26 27
@@ -28,7 +29,7 @@ static int simcons_init (struct console *, char *);
28static void simcons_write (struct console *, const char *, unsigned); 29static void simcons_write (struct console *, const char *, unsigned);
29static struct tty_driver *simcons_console_device (struct console *, int *); 30static struct tty_driver *simcons_console_device (struct console *, int *);
30 31
31struct console hpsim_cons = { 32static struct console hpsim_cons = {
32 .name = "simcons", 33 .name = "simcons",
33 .write = simcons_write, 34 .write = simcons_write,
34 .device = simcons_console_device, 35 .device = simcons_console_device,
@@ -58,7 +59,18 @@ simcons_write (struct console *cons, const char *buf, unsigned count)
58 59
59static struct tty_driver *simcons_console_device (struct console *c, int *index) 60static struct tty_driver *simcons_console_device (struct console *c, int *index)
60{ 61{
61 extern struct tty_driver *hp_simserial_driver;
62 *index = c->index; 62 *index = c->index;
63 return hp_simserial_driver; 63 return hp_simserial_driver;
64} 64}
65
66int simcons_register(void)
67{
68 if (!ia64_platform_is("hpsim"))
69 return 1;
70
71 if (hpsim_cons.flags & CON_ENABLED)
72 return 1;
73
74 register_console(&hpsim_cons);
75 return 0;
76}
diff --git a/arch/ia64/hp/sim/hpsim_setup.c b/arch/ia64/hp/sim/hpsim_setup.c
index f2297192a582..f629e903ebc7 100644
--- a/arch/ia64/hp/sim/hpsim_setup.c
+++ b/arch/ia64/hp/sim/hpsim_setup.c
@@ -21,6 +21,7 @@
21#include <asm/machvec.h> 21#include <asm/machvec.h>
22#include <asm/pgtable.h> 22#include <asm/pgtable.h>
23#include <asm/sal.h> 23#include <asm/sal.h>
24#include <asm/hpsim.h>
24 25
25#include "hpsim_ssc.h" 26#include "hpsim_ssc.h"
26 27
@@ -41,11 +42,5 @@ hpsim_setup (char **cmdline_p)
41{ 42{
42 ROOT_DEV = Root_SDA1; /* default to first SCSI drive */ 43 ROOT_DEV = Root_SDA1; /* default to first SCSI drive */
43 44
44#ifdef CONFIG_HP_SIMSERIAL_CONSOLE 45 simcons_register();
45 {
46 extern struct console hpsim_cons;
47 if (ia64_platform_is("hpsim"))
48 register_console(&hpsim_cons);
49 }
50#endif
51} 46}
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index f26077a773d5..4017696ada63 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -22,6 +22,9 @@
22#include <linux/bitops.h> 22#include <linux/bitops.h>
23#include <asm/system.h> 23#include <asm/system.h>
24#include <asm/irq.h> 24#include <asm/irq.h>
25#include <asm/hpsim.h>
26
27#include "hpsim_ssc.h"
25 28
26#define SIMETH_RECV_MAX 10 29#define SIMETH_RECV_MAX 10
27 30
@@ -35,12 +38,6 @@
35#define SIMETH_FRAME_SIZE ETH_FRAME_LEN 38#define SIMETH_FRAME_SIZE ETH_FRAME_LEN
36 39
37 40
38#define SSC_NETDEV_PROBE 100
39#define SSC_NETDEV_SEND 101
40#define SSC_NETDEV_RECV 102
41#define SSC_NETDEV_ATTACH 103
42#define SSC_NETDEV_DETACH 104
43
44#define NETWORK_INTR 8 41#define NETWORK_INTR 8
45 42
46struct simeth_local { 43struct simeth_local {
@@ -124,9 +121,6 @@ simeth_probe (void)
124 return r; 121 return r;
125} 122}
126 123
127extern long ia64_ssc (long, long, long, long, int);
128extern void ia64_ssc_connect_irq (long intr, long irq);
129
130static inline int 124static inline int
131netdev_probe(char *name, unsigned char *ether) 125netdev_probe(char *name, unsigned char *ether)
132{ 126{
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index e62694f8ef75..4552a1cf5b33 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -14,6 +14,7 @@
14#include <linux/kernel.h> 14#include <linux/kernel.h>
15#include <linux/timer.h> 15#include <linux/timer.h>
16#include <asm/irq.h> 16#include <asm/irq.h>
17#include "hpsim_ssc.h"
17 18
18#include <scsi/scsi.h> 19#include <scsi/scsi.h>
19#include <scsi/scsi_cmnd.h> 20#include <scsi/scsi_cmnd.h>
@@ -59,8 +60,6 @@ struct disk_stat {
59 unsigned count; 60 unsigned count;
60}; 61};
61 62
62extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr);
63
64static int desc[16] = { 63static int desc[16] = {
65 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 64 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
66}; 65};
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index c47c8acc96e3..00a4599e5f47 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -82,7 +82,7 @@ struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = {
82}; 82};
83 83
84DEFINE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq) = { 84DEFINE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq) = {
85 [0 ... IA64_NUM_VECTORS - 1] = IA64_SPURIOUS_INT_VECTOR 85 [0 ... IA64_NUM_VECTORS - 1] = -1
86}; 86};
87 87
88static cpumask_t vector_table[IA64_NUM_VECTORS] = { 88static cpumask_t vector_table[IA64_NUM_VECTORS] = {
@@ -179,7 +179,7 @@ static void __clear_irq_vector(int irq)
179 domain = cfg->domain; 179 domain = cfg->domain;
180 cpus_and(mask, cfg->domain, cpu_online_map); 180 cpus_and(mask, cfg->domain, cpu_online_map);
181 for_each_cpu_mask(cpu, mask) 181 for_each_cpu_mask(cpu, mask)
182 per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR; 182 per_cpu(vector_irq, cpu)[vector] = -1;
183 cfg->vector = IRQ_VECTOR_UNASSIGNED; 183 cfg->vector = IRQ_VECTOR_UNASSIGNED;
184 cfg->domain = CPU_MASK_NONE; 184 cfg->domain = CPU_MASK_NONE;
185 irq_status[irq] = IRQ_UNUSED; 185 irq_status[irq] = IRQ_UNUSED;
@@ -249,7 +249,7 @@ void __setup_vector_irq(int cpu)
249 249
250 /* Clear vector_irq */ 250 /* Clear vector_irq */
251 for (vector = 0; vector < IA64_NUM_VECTORS; ++vector) 251 for (vector = 0; vector < IA64_NUM_VECTORS; ++vector)
252 per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR; 252 per_cpu(vector_irq, cpu)[vector] = -1;
253 /* Mark the inuse vectors */ 253 /* Mark the inuse vectors */
254 for (irq = 0; irq < NR_IRQS; ++irq) { 254 for (irq = 0; irq < NR_IRQS; ++irq) {
255 if (!cpu_isset(cpu, irq_cfg[irq].domain)) 255 if (!cpu_isset(cpu, irq_cfg[irq].domain))
@@ -432,10 +432,18 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
432 } else if (unlikely(IS_RESCHEDULE(vector))) 432 } else if (unlikely(IS_RESCHEDULE(vector)))
433 kstat_this_cpu.irqs[vector]++; 433 kstat_this_cpu.irqs[vector]++;
434 else { 434 else {
435 int irq = local_vector_to_irq(vector);
436
435 ia64_setreg(_IA64_REG_CR_TPR, vector); 437 ia64_setreg(_IA64_REG_CR_TPR, vector);
436 ia64_srlz_d(); 438 ia64_srlz_d();
437 439
438 generic_handle_irq(local_vector_to_irq(vector)); 440 if (unlikely(irq < 0)) {
441 printk(KERN_ERR "%s: Unexpected interrupt "
442 "vector %d on CPU %d is not mapped "
443 "to any IRQ!\n", __FUNCTION__, vector,
444 smp_processor_id());
445 } else
446 generic_handle_irq(irq);
439 447
440 /* 448 /*
441 * Disable interrupts and send EOI: 449 * Disable interrupts and send EOI:
@@ -483,6 +491,7 @@ void ia64_process_pending_intr(void)
483 kstat_this_cpu.irqs[vector]++; 491 kstat_this_cpu.irqs[vector]++;
484 else { 492 else {
485 struct pt_regs *old_regs = set_irq_regs(NULL); 493 struct pt_regs *old_regs = set_irq_regs(NULL);
494 int irq = local_vector_to_irq(vector);
486 495
487 ia64_setreg(_IA64_REG_CR_TPR, vector); 496 ia64_setreg(_IA64_REG_CR_TPR, vector);
488 ia64_srlz_d(); 497 ia64_srlz_d();
@@ -493,8 +502,15 @@ void ia64_process_pending_intr(void)
493 * it will work. I hope it works!. 502 * it will work. I hope it works!.
494 * Probably could shared code. 503 * Probably could shared code.
495 */ 504 */
496 vectors_in_migration[local_vector_to_irq(vector)]=0; 505 if (unlikely(irq < 0)) {
497 generic_handle_irq(local_vector_to_irq(vector)); 506 printk(KERN_ERR "%s: Unexpected interrupt "
507 "vector %d on CPU %d not being mapped "
508 "to any IRQ!!\n", __FUNCTION__, vector,
509 smp_processor_id());
510 } else {
511 vectors_in_migration[irq]=0;
512 generic_handle_irq(irq);
513 }
498 set_irq_regs(old_regs); 514 set_irq_regs(old_regs);
499 515
500 /* 516 /*
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 122444a97897..2e96f17b2f3b 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1577,7 +1577,6 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
1577 1577
1578 case PTRACE_DETACH: 1578 case PTRACE_DETACH:
1579 /* detach a process that was attached. */ 1579 /* detach a process that was attached. */
1580 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
1581 ret = ptrace_detach(child, data); 1580 ret = ptrace_detach(child, data);
1582 goto out_tsk; 1581 goto out_tsk;
1583 1582
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 407efea04bf5..9e392a30d197 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -60,6 +60,7 @@
60#include <asm/smp.h> 60#include <asm/smp.h>
61#include <asm/system.h> 61#include <asm/system.h>
62#include <asm/unistd.h> 62#include <asm/unistd.h>
63#include <asm/hpsim.h>
63 64
64#if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE) 65#if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
65# error "struct cpuinfo_ia64 too big!" 66# error "struct cpuinfo_ia64 too big!"
@@ -389,13 +390,8 @@ early_console_setup (char *cmdline)
389 if (!efi_setup_pcdp_console(cmdline)) 390 if (!efi_setup_pcdp_console(cmdline))
390 earlycons++; 391 earlycons++;
391#endif 392#endif
392#ifdef CONFIG_HP_SIMSERIAL_CONSOLE 393 if (!simcons_register())
393 {
394 extern struct console hpsim_cons;
395 register_console(&hpsim_cons);
396 earlycons++; 394 earlycons++;
397 }
398#endif
399 395
400 return (earlycons) ? 0 : -1; 396 return (earlycons) ? 0 : -1;
401} 397}
@@ -960,6 +956,11 @@ cpu_init (void)
960 956
961 /* clear TPR & XTP to enable all interrupt classes: */ 957 /* clear TPR & XTP to enable all interrupt classes: */
962 ia64_setreg(_IA64_REG_CR_TPR, 0); 958 ia64_setreg(_IA64_REG_CR_TPR, 0);
959
960 /* Clear any pending interrupts left by SAL/EFI */
961 while (ia64_get_ivr() != IA64_SPURIOUS_INT_VECTOR)
962 ia64_eoi();
963
963#ifdef CONFIG_SMP 964#ifdef CONFIG_SMP
964 normal_xtp(); 965 normal_xtp();
965#endif 966#endif
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 62209dcf06d3..308772f7cddc 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -58,6 +58,7 @@
58#include <asm/system.h> 58#include <asm/system.h>
59#include <asm/tlbflush.h> 59#include <asm/tlbflush.h>
60#include <asm/unistd.h> 60#include <asm/unistd.h>
61#include <asm/sn/arch.h>
61 62
62#define SMP_DEBUG 0 63#define SMP_DEBUG 0
63 64
@@ -730,6 +731,11 @@ int __cpu_disable(void)
730 return (-EBUSY); 731 return (-EBUSY);
731 } 732 }
732 733
734 if (ia64_platform_is("sn2")) {
735 if (!sn_cpu_disable_allowed(cpu))
736 return -EBUSY;
737 }
738
733 cpu_clear(cpu, cpu_online_map); 739 cpu_clear(cpu, cpu_online_map);
734 740
735 if (migrate_platform_irqs(cpu)) { 741 if (migrate_platform_irqs(cpu)) {
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 7ac8592a35b6..d3c538be466c 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -17,6 +17,7 @@
17#include <linux/bootmem.h> 17#include <linux/bootmem.h>
18#include <linux/efi.h> 18#include <linux/efi.h>
19#include <linux/mm.h> 19#include <linux/mm.h>
20#include <linux/nmi.h>
20#include <linux/swap.h> 21#include <linux/swap.h>
21 22
22#include <asm/meminit.h> 23#include <asm/meminit.h>
@@ -56,6 +57,8 @@ void show_mem(void)
56 present = pgdat->node_present_pages; 57 present = pgdat->node_present_pages;
57 for(i = 0; i < pgdat->node_spanned_pages; i++) { 58 for(i = 0; i < pgdat->node_spanned_pages; i++) {
58 struct page *page; 59 struct page *page;
60 if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
61 touch_nmi_watchdog();
59 if (pfn_valid(pgdat->node_start_pfn + i)) 62 if (pfn_valid(pgdat->node_start_pfn + i))
60 page = pfn_to_page(pgdat->node_start_pfn + i); 63 page = pfn_to_page(pgdat->node_start_pfn + i);
61 else { 64 else {
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 0dbf0e81f8c0..0d34585058c8 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -16,6 +16,7 @@
16 16
17#include <linux/kernel.h> 17#include <linux/kernel.h>
18#include <linux/mm.h> 18#include <linux/mm.h>
19#include <linux/nmi.h>
19#include <linux/swap.h> 20#include <linux/swap.h>
20#include <linux/bootmem.h> 21#include <linux/bootmem.h>
21#include <linux/acpi.h> 22#include <linux/acpi.h>
@@ -533,6 +534,8 @@ void show_mem(void)
533 present = pgdat->node_present_pages; 534 present = pgdat->node_present_pages;
534 for(i = 0; i < pgdat->node_spanned_pages; i++) { 535 for(i = 0; i < pgdat->node_spanned_pages; i++) {
535 struct page *page; 536 struct page *page;
537 if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
538 touch_nmi_watchdog();
536 if (pfn_valid(pgdat->node_start_pfn + i)) 539 if (pfn_valid(pgdat->node_start_pfn + i))
537 page = pfn_to_page(pgdat->node_start_pfn + i); 540 page = pfn_to_page(pgdat->node_start_pfn + i);
538 else { 541 else {
diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c
index 2c3f9dfca78b..b663168da55c 100644
--- a/arch/ia64/sn/kernel/huberror.c
+++ b/arch/ia64/sn/kernel/huberror.c
@@ -185,11 +185,14 @@ void hubiio_crb_error_handler(struct hubdev_info *hubdev_info)
185 */ 185 */
186void hub_error_init(struct hubdev_info *hubdev_info) 186void hub_error_init(struct hubdev_info *hubdev_info)
187{ 187{
188
188 if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED, 189 if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED,
189 "SN_hub_error", (void *)hubdev_info)) 190 "SN_hub_error", (void *)hubdev_info)) {
190 printk("hub_error_init: Failed to request_irq for 0x%p\n", 191 printk("hub_error_init: Failed to request_irq for 0x%p\n",
191 hubdev_info); 192 hubdev_info);
192 return; 193 return;
194 }
195 sn_set_err_irq_affinity(SGI_II_ERROR);
193} 196}
194 197
195 198
@@ -202,11 +205,14 @@ void hub_error_init(struct hubdev_info *hubdev_info)
202 */ 205 */
203void ice_error_init(struct hubdev_info *hubdev_info) 206void ice_error_init(struct hubdev_info *hubdev_info)
204{ 207{
208
205 if (request_irq 209 if (request_irq
206 (SGI_TIO_ERROR, (void *)hub_eint_handler, IRQF_SHARED, "SN_TIO_error", 210 (SGI_TIO_ERROR, (void *)hub_eint_handler, IRQF_SHARED, "SN_TIO_error",
207 (void *)hubdev_info)) 211 (void *)hubdev_info)) {
208 printk("ice_error_init: request_irq() error hubdev_info 0x%p\n", 212 printk("ice_error_init: request_irq() error hubdev_info 0x%p\n",
209 hubdev_info); 213 hubdev_info);
210 return; 214 return;
215 }
216 sn_set_err_irq_affinity(SGI_TIO_ERROR);
211} 217}
212 218
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 360047389449..0f9b12683bf3 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -19,6 +19,7 @@
19#include <asm/sn/pcidev.h> 19#include <asm/sn/pcidev.h>
20#include <asm/sn/shub_mmr.h> 20#include <asm/sn/shub_mmr.h>
21#include <asm/sn/sn_sal.h> 21#include <asm/sn/sn_sal.h>
22#include <asm/sn/sn_feature_sets.h>
22 23
23static void force_interrupt(int irq); 24static void force_interrupt(int irq);
24static void register_intr_pda(struct sn_irq_info *sn_irq_info); 25static void register_intr_pda(struct sn_irq_info *sn_irq_info);
@@ -233,6 +234,20 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)
233 (void)sn_retarget_vector(sn_irq_info, nasid, slice); 234 (void)sn_retarget_vector(sn_irq_info, nasid, slice);
234} 235}
235 236
237#ifdef CONFIG_SMP
238void sn_set_err_irq_affinity(unsigned int irq)
239{
240 /*
241 * On systems which support CPU disabling (SHub2), all error interrupts
242 * are targetted at the boot CPU.
243 */
244 if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT))
245 set_irq_affinity_info(irq, cpu_physical_id(0), 0);
246}
247#else
248void sn_set_err_irq_affinity(unsigned int irq) { }
249#endif
250
236static void 251static void
237sn_mask_irq(unsigned int irq) 252sn_mask_irq(unsigned int irq)
238{ 253{
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 033c8a9f000e..f3c69329e145 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -40,6 +40,7 @@
40#include <asm/sn/shub_mmr.h> 40#include <asm/sn/shub_mmr.h>
41#include <asm/sn/nodepda.h> 41#include <asm/sn/nodepda.h>
42#include <asm/sn/rw_mmr.h> 42#include <asm/sn/rw_mmr.h>
43#include <asm/sn/sn_feature_sets.h>
43 44
44DEFINE_PER_CPU(struct ptc_stats, ptcstats); 45DEFINE_PER_CPU(struct ptc_stats, ptcstats);
45DECLARE_PER_CPU(struct ptc_stats, ptcstats); 46DECLARE_PER_CPU(struct ptc_stats, ptcstats);
@@ -429,6 +430,31 @@ void sn2_send_IPI(int cpuid, int vector, int delivery_mode, int redirect)
429 sn_send_IPI_phys(nasid, physid, vector, delivery_mode); 430 sn_send_IPI_phys(nasid, physid, vector, delivery_mode);
430} 431}
431 432
433#ifdef CONFIG_HOTPLUG_CPU
434/**
435 * sn_cpu_disable_allowed - Determine if a CPU can be disabled.
436 * @cpu - CPU that is requested to be disabled.
437 *
438 * CPU disable is only allowed on SHub2 systems running with a PROM
439 * that supports CPU disable. It is not permitted to disable the boot processor.
440 */
441bool sn_cpu_disable_allowed(int cpu)
442{
443 if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT)) {
444 if (cpu != 0)
445 return true;
446 else
447 printk(KERN_WARNING
448 "Disabling the boot processor is not allowed.\n");
449
450 } else
451 printk(KERN_WARNING
452 "CPU disable is not supported on this system.\n");
453
454 return false;
455}
456#endif /* CONFIG_HOTPLUG_CPU */
457
432#ifdef CONFIG_PROC_FS 458#ifdef CONFIG_PROC_FS
433 459
434#define PTC_BASENAME "sgi_sn/ptc_statistics" 460#define PTC_BASENAME "sgi_sn/ptc_statistics"
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index df8d5bed6119..1a8e49607f11 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -66,7 +66,8 @@ static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret)
66 } 66 }
67 67
68 sz = sn_hwperf_obj_cnt * sizeof(struct sn_hwperf_object_info); 68 sz = sn_hwperf_obj_cnt * sizeof(struct sn_hwperf_object_info);
69 if ((objbuf = (struct sn_hwperf_object_info *) vmalloc(sz)) == NULL) { 69 objbuf = vmalloc(sz);
70 if (objbuf == NULL) {
70 printk("sn_hwperf_enum_objects: vmalloc(%d) failed\n", (int)sz); 71 printk("sn_hwperf_enum_objects: vmalloc(%d) failed\n", (int)sz);
71 e = -ENOMEM; 72 e = -ENOMEM;
72 goto out; 73 goto out;
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 42485ad50ceb..ab3eaf85fe4d 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -145,6 +145,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
145 printk(KERN_WARNING 145 printk(KERN_WARNING
146 "pcibr cannot allocate interrupt for error handler\n"); 146 "pcibr cannot allocate interrupt for error handler\n");
147 } 147 }
148 sn_set_err_irq_affinity(SGI_PCIASIC_ERROR);
148 149
149 /* 150 /*
150 * Update the Bridge with the "kernel" pagesize 151 * Update the Bridge with the "kernel" pagesize
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index d798dd4d0dc4..ef048a674772 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -654,6 +654,8 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
654 __FUNCTION__, SGI_TIOCA_ERROR, 654 __FUNCTION__, SGI_TIOCA_ERROR,
655 (int)tioca_common->ca_common.bs_persist_busnum); 655 (int)tioca_common->ca_common.bs_persist_busnum);
656 656
657 sn_set_err_irq_affinity(SGI_TIOCA_ERROR);
658
657 /* Setup locality information */ 659 /* Setup locality information */
658 controller->node = tioca_kern->ca_closest_node; 660 controller->node = tioca_kern->ca_closest_node;
659 return tioca_common; 661 return tioca_common;
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c
index 84b72b27e27f..cee9379d44e0 100644
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
@@ -1034,6 +1034,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
1034 tioce_common->ce_pcibus.bs_persist_segment, 1034 tioce_common->ce_pcibus.bs_persist_segment,
1035 tioce_common->ce_pcibus.bs_persist_busnum); 1035 tioce_common->ce_pcibus.bs_persist_busnum);
1036 1036
1037 sn_set_err_irq_affinity(SGI_PCIASIC_ERROR);
1037 return tioce_common; 1038 return tioce_common;
1038} 1039}
1039 1040
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 8ccf3e47bff8..bd5fe76401f1 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -57,9 +57,13 @@ config PLAT_MAPPI
57 57
58config PLAT_USRV 58config PLAT_USRV
59 bool "uServer" 59 bool "uServer"
60 select PLAT_HAS_INT1ICU
60 61
61config PLAT_M32700UT 62config PLAT_M32700UT
62 bool "M32700UT" 63 bool "M32700UT"
64 select PLAT_HAS_INT0ICU
65 select PLAT_HAS_INT1ICU
66 select PLAT_HAS_INT2ICU
63 help 67 help
64 The M3T-M32700UT is an evaluation board based on uT-Engine 68 The M3T-M32700UT is an evaluation board based on uT-Engine
65 specification. This board has an M32700 (Chaos) evaluation chip. 69 specification. This board has an M32700 (Chaos) evaluation chip.
@@ -68,6 +72,9 @@ config PLAT_M32700UT
68 72
69config PLAT_OPSPUT 73config PLAT_OPSPUT
70 bool "OPSPUT" 74 bool "OPSPUT"
75 select PLAT_HAS_INT0ICU
76 select PLAT_HAS_INT1ICU
77 select PLAT_HAS_INT2ICU
71 help 78 help
72 The OPSPUT is an evaluation board based on uT-Engine 79 The OPSPUT is an evaluation board based on uT-Engine
73 specification. This board has a OPSP-REP chip. 80 specification. This board has a OPSP-REP chip.
@@ -89,6 +96,7 @@ config PLAT_MAPPI3
89 96
90config PLAT_M32104UT 97config PLAT_M32104UT
91 bool "M32104UT" 98 bool "M32104UT"
99 select PLAT_HAS_INT1ICU
92 help 100 help
93 The M3T-M32104UT is an reference board based on uT-Engine 101 The M3T-M32104UT is an reference board based on uT-Engine
94 specification. This board has a M32104 chip. 102 specification. This board has a M32104 chip.
@@ -149,6 +157,18 @@ config ISA_DUAL_ISSUE
149 depends on CHIP_M32700 || CHIP_OPSP 157 depends on CHIP_M32700 || CHIP_OPSP
150 default y 158 default y
151 159
160config PLAT_HAS_INT0ICU
161 bool
162 default n
163
164config PLAT_HAS_INT1ICU
165 bool
166 default n
167
168config PLAT_HAS_INT2ICU
169 bool
170 default n
171
152config BUS_CLOCK 172config BUS_CLOCK
153 int "Bus Clock [Hz] (integer)" 173 int "Bus Clock [Hz] (integer)"
154 default "70000000" if PLAT_MAPPI 174 default "70000000" if PLAT_MAPPI
diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile
index cdf63b210c53..60e12f312654 100644
--- a/arch/m32r/Makefile
+++ b/arch/m32r/Makefile
@@ -36,7 +36,8 @@ LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
36libs-y += arch/m32r/lib/ $(LIBGCC) 36libs-y += arch/m32r/lib/ $(LIBGCC)
37core-y += arch/m32r/kernel/ \ 37core-y += arch/m32r/kernel/ \
38 arch/m32r/mm/ \ 38 arch/m32r/mm/ \
39 arch/m32r/boot/ 39 arch/m32r/boot/ \
40 arch/m32r/platforms/
40 41
41drivers-$(CONFIG_OPROFILE) += arch/m32r/oprofile/ 42drivers-$(CONFIG_OPROFILE) += arch/m32r/oprofile/
42 43
diff --git a/arch/m32r/m32104ut/defconfig.m32104ut b/arch/m32r/configs/m32104ut_defconfig
index 1f88f493a9e2..9b5af6cd2e0b 100644
--- a/arch/m32r/m32104ut/defconfig.m32104ut
+++ b/arch/m32r/configs/m32104ut_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Wed Dec 13 17:22:20 2006 4# Wed Aug 1 17:22:35 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -23,17 +26,18 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
23CONFIG_LOCALVERSION="" 26CONFIG_LOCALVERSION=""
24CONFIG_LOCALVERSION_AUTO=y 27CONFIG_LOCALVERSION_AUTO=y
25CONFIG_SYSVIPC=y 28CONFIG_SYSVIPC=y
26# CONFIG_IPC_NS is not set 29CONFIG_SYSVIPC_SYSCTL=y
27# CONFIG_POSIX_MQUEUE is not set 30# CONFIG_POSIX_MQUEUE is not set
28# CONFIG_BSD_PROCESS_ACCT is not set 31# CONFIG_BSD_PROCESS_ACCT is not set
29# CONFIG_TASKSTATS is not set 32# CONFIG_TASKSTATS is not set
30# CONFIG_UTS_NS is not set 33# CONFIG_USER_NS is not set
31# CONFIG_AUDIT is not set 34# CONFIG_AUDIT is not set
32CONFIG_IKCONFIG=y 35CONFIG_IKCONFIG=y
33CONFIG_IKCONFIG_PROC=y 36CONFIG_IKCONFIG_PROC=y
37CONFIG_LOG_BUF_SHIFT=14
34CONFIG_SYSFS_DEPRECATED=y 38CONFIG_SYSFS_DEPRECATED=y
35# CONFIG_RELAY is not set 39# CONFIG_RELAY is not set
36CONFIG_INITRAMFS_SOURCE="" 40# CONFIG_BLK_DEV_INITRD is not set
37CONFIG_CC_OPTIMIZE_FOR_SIZE=y 41CONFIG_CC_OPTIMIZE_FOR_SIZE=y
38CONFIG_SYSCTL=y 42CONFIG_SYSCTL=y
39# CONFIG_EMBEDDED is not set 43# CONFIG_EMBEDDED is not set
@@ -46,29 +50,29 @@ CONFIG_BUG=y
46CONFIG_ELF_CORE=y 50CONFIG_ELF_CORE=y
47CONFIG_BASE_FULL=y 51CONFIG_BASE_FULL=y
48CONFIG_FUTEX=y 52CONFIG_FUTEX=y
53CONFIG_ANON_INODES=y
49CONFIG_EPOLL=y 54CONFIG_EPOLL=y
50CONFIG_SLAB=y 55CONFIG_SIGNALFD=y
56CONFIG_TIMERFD=y
57CONFIG_EVENTFD=y
51CONFIG_VM_EVENT_COUNTERS=y 58CONFIG_VM_EVENT_COUNTERS=y
59CONFIG_SLAB=y
60# CONFIG_SLUB is not set
61# CONFIG_SLOB is not set
52CONFIG_RT_MUTEXES=y 62CONFIG_RT_MUTEXES=y
53CONFIG_TINY_SHMEM=y 63CONFIG_TINY_SHMEM=y
54CONFIG_BASE_SMALL=0 64CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
56
57#
58# Loadable module support
59#
60CONFIG_MODULES=y 65CONFIG_MODULES=y
61CONFIG_MODULE_UNLOAD=y 66CONFIG_MODULE_UNLOAD=y
62CONFIG_MODULE_FORCE_UNLOAD=y 67CONFIG_MODULE_FORCE_UNLOAD=y
63# CONFIG_MODVERSIONS is not set 68# CONFIG_MODVERSIONS is not set
64# CONFIG_MODULE_SRCVERSION_ALL is not set 69# CONFIG_MODULE_SRCVERSION_ALL is not set
65CONFIG_KMOD=y 70CONFIG_KMOD=y
66
67#
68# Block layer
69#
70CONFIG_BLOCK=y 71CONFIG_BLOCK=y
72# CONFIG_LBD is not set
71# CONFIG_BLK_DEV_IO_TRACE is not set 73# CONFIG_BLK_DEV_IO_TRACE is not set
74# CONFIG_LSF is not set
75# CONFIG_BLK_DEV_BSG is not set
72 76
73# 77#
74# IO Schedulers 78# IO Schedulers
@@ -117,13 +121,18 @@ CONFIG_NEED_MULTIPLE_NODES=y
117# CONFIG_SPARSEMEM_STATIC is not set 121# CONFIG_SPARSEMEM_STATIC is not set
118CONFIG_SPLIT_PTLOCK_CPUS=4 122CONFIG_SPLIT_PTLOCK_CPUS=4
119# CONFIG_RESOURCES_64BIT is not set 123# CONFIG_RESOURCES_64BIT is not set
124CONFIG_ZONE_DMA_FLAG=1
125CONFIG_VIRT_TO_BUS=y
120CONFIG_IRAM_START=0x00700000 126CONFIG_IRAM_START=0x00700000
121CONFIG_IRAM_SIZE=0x00010000 127CONFIG_IRAM_SIZE=0x00010000
122CONFIG_RWSEM_GENERIC_SPINLOCK=y 128CONFIG_RWSEM_GENERIC_SPINLOCK=y
123# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 129# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
130# CONFIG_ARCH_HAS_ILOG2_U32 is not set
131# CONFIG_ARCH_HAS_ILOG2_U64 is not set
124CONFIG_GENERIC_FIND_NEXT_BIT=y 132CONFIG_GENERIC_FIND_NEXT_BIT=y
125CONFIG_GENERIC_HWEIGHT=y 133CONFIG_GENERIC_HWEIGHT=y
126CONFIG_GENERIC_CALIBRATE_DELAY=y 134CONFIG_GENERIC_CALIBRATE_DELAY=y
135CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
127CONFIG_PREEMPT=y 136CONFIG_PREEMPT=y
128# CONFIG_SMP is not set 137# CONFIG_SMP is not set
129CONFIG_NODES_SHIFT=1 138CONFIG_NODES_SHIFT=1
@@ -131,6 +140,7 @@ CONFIG_NODES_SHIFT=1
131# 140#
132# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 141# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
133# 142#
143# CONFIG_ARCH_SUPPORTS_MSI is not set
134CONFIG_ISA=y 144CONFIG_ISA=y
135 145
136# 146#
@@ -139,10 +149,6 @@ CONFIG_ISA=y
139# CONFIG_PCCARD is not set 149# CONFIG_PCCARD is not set
140 150
141# 151#
142# PCI Hotplug Support
143#
144
145#
146# Executable file formats 152# Executable file formats
147# 153#
148# CONFIG_BINFMT_FLAT is not set 154# CONFIG_BINFMT_FLAT is not set
@@ -156,13 +162,13 @@ CONFIG_NET=y
156# 162#
157# Networking options 163# Networking options
158# 164#
159# CONFIG_NETDEBUG is not set
160CONFIG_PACKET=y 165CONFIG_PACKET=y
161# CONFIG_PACKET_MMAP is not set 166# CONFIG_PACKET_MMAP is not set
162CONFIG_UNIX=y 167CONFIG_UNIX=y
163CONFIG_XFRM=y 168CONFIG_XFRM=y
164# CONFIG_XFRM_USER is not set 169# CONFIG_XFRM_USER is not set
165# CONFIG_XFRM_SUB_POLICY is not set 170# CONFIG_XFRM_SUB_POLICY is not set
171# CONFIG_XFRM_MIGRATE is not set
166# CONFIG_NET_KEY is not set 172# CONFIG_NET_KEY is not set
167CONFIG_INET=y 173CONFIG_INET=y
168# CONFIG_IP_MULTICAST is not set 174# CONFIG_IP_MULTICAST is not set
@@ -187,10 +193,6 @@ CONFIG_INET_TCP_DIAG=y
187CONFIG_TCP_CONG_CUBIC=y 193CONFIG_TCP_CONG_CUBIC=y
188CONFIG_DEFAULT_TCP_CONG="cubic" 194CONFIG_DEFAULT_TCP_CONG="cubic"
189# CONFIG_TCP_MD5SIG is not set 195# CONFIG_TCP_MD5SIG is not set
190
191#
192# IP: Virtual Server Configuration
193#
194# CONFIG_IP_VS is not set 196# CONFIG_IP_VS is not set
195# CONFIG_IPV6 is not set 197# CONFIG_IPV6 is not set
196# CONFIG_INET6_XFRM_TUNNEL is not set 198# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -206,12 +208,15 @@ CONFIG_NETFILTER_NETLINK=m
206CONFIG_NETFILTER_NETLINK_QUEUE=m 208CONFIG_NETFILTER_NETLINK_QUEUE=m
207CONFIG_NETFILTER_NETLINK_LOG=m 209CONFIG_NETFILTER_NETLINK_LOG=m
208# CONFIG_NF_CONNTRACK_ENABLED is not set 210# CONFIG_NF_CONNTRACK_ENABLED is not set
211# CONFIG_NF_CONNTRACK is not set
209CONFIG_NETFILTER_XTABLES=m 212CONFIG_NETFILTER_XTABLES=m
210CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 213CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
211# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 214# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
212CONFIG_NETFILTER_XT_TARGET_MARK=m 215CONFIG_NETFILTER_XT_TARGET_MARK=m
213CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 216CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
214# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 217# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
218# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
219# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
215CONFIG_NETFILTER_XT_MATCH_COMMENT=m 220CONFIG_NETFILTER_XT_MATCH_COMMENT=m
216CONFIG_NETFILTER_XT_MATCH_DCCP=m 221CONFIG_NETFILTER_XT_MATCH_DCCP=m
217# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 222# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
@@ -229,6 +234,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
229# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 234# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
230CONFIG_NETFILTER_XT_MATCH_STRING=m 235CONFIG_NETFILTER_XT_MATCH_STRING=m
231CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 236CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
237# CONFIG_NETFILTER_XT_MATCH_U32 is not set
232# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 238# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
233 239
234# 240#
@@ -248,7 +254,6 @@ CONFIG_IP_NF_FILTER=m
248CONFIG_IP_NF_TARGET_REJECT=m 254CONFIG_IP_NF_TARGET_REJECT=m
249CONFIG_IP_NF_TARGET_LOG=m 255CONFIG_IP_NF_TARGET_LOG=m
250CONFIG_IP_NF_TARGET_ULOG=m 256CONFIG_IP_NF_TARGET_ULOG=m
251CONFIG_IP_NF_TARGET_TCPMSS=m
252CONFIG_IP_NF_MANGLE=m 257CONFIG_IP_NF_MANGLE=m
253CONFIG_IP_NF_TARGET_TOS=m 258CONFIG_IP_NF_TARGET_TOS=m
254CONFIG_IP_NF_TARGET_ECN=m 259CONFIG_IP_NF_TARGET_ECN=m
@@ -257,20 +262,8 @@ CONFIG_IP_NF_RAW=m
257CONFIG_IP_NF_ARPTABLES=m 262CONFIG_IP_NF_ARPTABLES=m
258CONFIG_IP_NF_ARPFILTER=m 263CONFIG_IP_NF_ARPFILTER=m
259CONFIG_IP_NF_ARP_MANGLE=m 264CONFIG_IP_NF_ARP_MANGLE=m
260
261#
262# DCCP Configuration (EXPERIMENTAL)
263#
264# CONFIG_IP_DCCP is not set 265# CONFIG_IP_DCCP is not set
265
266#
267# SCTP Configuration (EXPERIMENTAL)
268#
269# CONFIG_IP_SCTP is not set 266# CONFIG_IP_SCTP is not set
270
271#
272# TIPC Configuration (EXPERIMENTAL)
273#
274# CONFIG_TIPC is not set 267# CONFIG_TIPC is not set
275# CONFIG_ATM is not set 268# CONFIG_ATM is not set
276# CONFIG_BRIDGE is not set 269# CONFIG_BRIDGE is not set
@@ -297,7 +290,17 @@ CONFIG_NET_CLS_ROUTE=y
297# CONFIG_HAMRADIO is not set 290# CONFIG_HAMRADIO is not set
298# CONFIG_IRDA is not set 291# CONFIG_IRDA is not set
299# CONFIG_BT is not set 292# CONFIG_BT is not set
293# CONFIG_AF_RXRPC is not set
294
295#
296# Wireless
297#
298# CONFIG_CFG80211 is not set
299# CONFIG_WIRELESS_EXT is not set
300# CONFIG_MAC80211 is not set
300# CONFIG_IEEE80211 is not set 301# CONFIG_IEEE80211 is not set
302# CONFIG_RFKILL is not set
303# CONFIG_NET_9P is not set
301 304
302# 305#
303# Device Drivers 306# Device Drivers
@@ -310,28 +313,12 @@ CONFIG_STANDALONE=y
310CONFIG_PREVENT_FIRMWARE_BUILD=y 313CONFIG_PREVENT_FIRMWARE_BUILD=y
311# CONFIG_FW_LOADER is not set 314# CONFIG_FW_LOADER is not set
312# CONFIG_SYS_HYPERVISOR is not set 315# CONFIG_SYS_HYPERVISOR is not set
313
314#
315# Connector - unified userspace <-> kernelspace linker
316#
317# CONFIG_CONNECTOR is not set 316# CONFIG_CONNECTOR is not set
318
319#
320# Memory Technology Devices (MTD)
321#
322# CONFIG_MTD is not set 317# CONFIG_MTD is not set
323
324#
325# Parallel port support
326#
327CONFIG_PARPORT=m 318CONFIG_PARPORT=m
328# CONFIG_PARPORT_GSC is not set 319# CONFIG_PARPORT_GSC is not set
329# CONFIG_PARPORT_AX88796 is not set 320# CONFIG_PARPORT_AX88796 is not set
330CONFIG_PARPORT_1284=y 321CONFIG_PARPORT_1284=y
331
332#
333# Plug and Play support
334#
335CONFIG_PNP=y 322CONFIG_PNP=y
336# CONFIG_PNP_DEBUG is not set 323# CONFIG_PNP_DEBUG is not set
337 324
@@ -339,29 +326,19 @@ CONFIG_PNP=y
339# Protocols 326# Protocols
340# 327#
341CONFIG_ISAPNP=y 328CONFIG_ISAPNP=y
342 329# CONFIG_PNPACPI is not set
343# 330CONFIG_BLK_DEV=y
344# Block devices
345#
346# CONFIG_BLK_DEV_COW_COMMON is not set 331# CONFIG_BLK_DEV_COW_COMMON is not set
347CONFIG_BLK_DEV_LOOP=y 332CONFIG_BLK_DEV_LOOP=y
348# CONFIG_BLK_DEV_CRYPTOLOOP is not set 333# CONFIG_BLK_DEV_CRYPTOLOOP is not set
349CONFIG_BLK_DEV_NBD=m 334CONFIG_BLK_DEV_NBD=m
350# CONFIG_BLK_DEV_RAM is not set 335# CONFIG_BLK_DEV_RAM is not set
351# CONFIG_BLK_DEV_INITRD is not set
352CONFIG_CDROM_PKTCDVD=m 336CONFIG_CDROM_PKTCDVD=m
353CONFIG_CDROM_PKTCDVD_BUFFERS=8 337CONFIG_CDROM_PKTCDVD_BUFFERS=8
354CONFIG_CDROM_PKTCDVD_WCACHE=y 338CONFIG_CDROM_PKTCDVD_WCACHE=y
355# CONFIG_ATA_OVER_ETH is not set 339# CONFIG_ATA_OVER_ETH is not set
356 340CONFIG_MISC_DEVICES=y
357# 341# CONFIG_EEPROM_93CX6 is not set
358# Misc devices
359#
360# CONFIG_TIFM_CORE is not set
361
362#
363# ATA/ATAPI/MFM/RLL support
364#
365CONFIG_IDE=y 342CONFIG_IDE=y
366CONFIG_BLK_DEV_IDE=y 343CONFIG_BLK_DEV_IDE=y
367 344
@@ -376,16 +353,17 @@ CONFIG_BLK_DEV_IDECD=y
376# CONFIG_BLK_DEV_IDEFLOPPY is not set 353# CONFIG_BLK_DEV_IDEFLOPPY is not set
377# CONFIG_BLK_DEV_IDESCSI is not set 354# CONFIG_BLK_DEV_IDESCSI is not set
378# CONFIG_IDE_TASK_IOCTL is not set 355# CONFIG_IDE_TASK_IOCTL is not set
356CONFIG_IDE_PROC_FS=y
379 357
380# 358#
381# IDE chipset support/bugfixes 359# IDE chipset support/bugfixes
382# 360#
383CONFIG_IDE_GENERIC=y 361CONFIG_IDE_GENERIC=y
384# CONFIG_BLK_DEV_IDEPNP is not set 362# CONFIG_BLK_DEV_IDEPNP is not set
363# CONFIG_IDEPCI_PCIBUS_ORDER is not set
385# CONFIG_IDE_ARM is not set 364# CONFIG_IDE_ARM is not set
386# CONFIG_IDE_CHIPSETS is not set 365# CONFIG_IDE_CHIPSETS is not set
387# CONFIG_BLK_DEV_IDEDMA is not set 366# CONFIG_BLK_DEV_IDEDMA is not set
388# CONFIG_IDEDMA_AUTO is not set
389# CONFIG_BLK_DEV_HD is not set 367# CONFIG_BLK_DEV_HD is not set
390 368
391# 369#
@@ -393,6 +371,8 @@ CONFIG_IDE_GENERIC=y
393# 371#
394# CONFIG_RAID_ATTRS is not set 372# CONFIG_RAID_ATTRS is not set
395CONFIG_SCSI=y 373CONFIG_SCSI=y
374# CONFIG_SCSI_DMA is not set
375# CONFIG_SCSI_TGT is not set
396# CONFIG_SCSI_NETLINK is not set 376# CONFIG_SCSI_NETLINK is not set
397CONFIG_SCSI_PROC_FS=y 377CONFIG_SCSI_PROC_FS=y
398 378
@@ -413,6 +393,8 @@ CONFIG_CHR_DEV_SG=m
413CONFIG_SCSI_MULTI_LUN=y 393CONFIG_SCSI_MULTI_LUN=y
414CONFIG_SCSI_CONSTANTS=y 394CONFIG_SCSI_CONSTANTS=y
415# CONFIG_SCSI_LOGGING is not set 395# CONFIG_SCSI_LOGGING is not set
396# CONFIG_SCSI_SCAN_ASYNC is not set
397CONFIG_SCSI_WAIT_SCAN=m
416 398
417# 399#
418# SCSI Transports 400# SCSI Transports
@@ -420,12 +402,8 @@ CONFIG_SCSI_CONSTANTS=y
420CONFIG_SCSI_SPI_ATTRS=y 402CONFIG_SCSI_SPI_ATTRS=y
421# CONFIG_SCSI_FC_ATTRS is not set 403# CONFIG_SCSI_FC_ATTRS is not set
422# CONFIG_SCSI_ISCSI_ATTRS is not set 404# CONFIG_SCSI_ISCSI_ATTRS is not set
423# CONFIG_SCSI_SAS_ATTRS is not set
424# CONFIG_SCSI_SAS_LIBSAS is not set 405# CONFIG_SCSI_SAS_LIBSAS is not set
425 406CONFIG_SCSI_LOWLEVEL=y
426#
427# SCSI low-level drivers
428#
429# CONFIG_ISCSI_TCP is not set 407# CONFIG_ISCSI_TCP is not set
430# CONFIG_SCSI_AHA152X is not set 408# CONFIG_SCSI_AHA152X is not set
431# CONFIG_SCSI_AIC7XXX_OLD is not set 409# CONFIG_SCSI_AIC7XXX_OLD is not set
@@ -441,19 +419,6 @@ CONFIG_SCSI_SPI_ATTRS=y
441# CONFIG_SCSI_SYM53C416 is not set 419# CONFIG_SCSI_SYM53C416 is not set
442# CONFIG_SCSI_T128 is not set 420# CONFIG_SCSI_T128 is not set
443# CONFIG_SCSI_DEBUG is not set 421# CONFIG_SCSI_DEBUG is not set
444
445#
446# Serial ATA (prod) and Parallel ATA (experimental) drivers
447#
448
449#
450# Old CD-ROM drivers (not SCSI, not IDE)
451#
452# CONFIG_CD_NO_IDESCSI is not set
453
454#
455# Multi-device support (RAID and LVM)
456#
457CONFIG_MD=y 422CONFIG_MD=y
458CONFIG_BLK_DEV_MD=y 423CONFIG_BLK_DEV_MD=y
459# CONFIG_MD_LINEAR is not set 424# CONFIG_MD_LINEAR is not set
@@ -470,43 +435,17 @@ CONFIG_DM_SNAPSHOT=m
470# CONFIG_DM_MIRROR is not set 435# CONFIG_DM_MIRROR is not set
471# CONFIG_DM_ZERO is not set 436# CONFIG_DM_ZERO is not set
472# CONFIG_DM_MULTIPATH is not set 437# CONFIG_DM_MULTIPATH is not set
473 438# CONFIG_DM_DELAY is not set
474#
475# Fusion MPT device support
476#
477# CONFIG_FUSION is not set
478
479#
480# IEEE 1394 (FireWire) support
481#
482
483#
484# I2O device support
485#
486
487#
488# Network device support
489#
490CONFIG_NETDEVICES=y 439CONFIG_NETDEVICES=y
440# CONFIG_NETDEVICES_MULTIQUEUE is not set
491CONFIG_DUMMY=m 441CONFIG_DUMMY=m
492# CONFIG_BONDING is not set 442# CONFIG_BONDING is not set
443# CONFIG_MACVLAN is not set
493# CONFIG_EQUALIZER is not set 444# CONFIG_EQUALIZER is not set
494# CONFIG_TUN is not set 445# CONFIG_TUN is not set
495# CONFIG_NET_SB1000 is not set 446# CONFIG_NET_SB1000 is not set
496
497#
498# ARCnet devices
499#
500# CONFIG_ARCNET is not set 447# CONFIG_ARCNET is not set
501
502#
503# PHY device support
504#
505# CONFIG_PHYLIB is not set 448# CONFIG_PHYLIB is not set
506
507#
508# Ethernet (10 or 100Mbit)
509#
510CONFIG_NET_ETHERNET=y 449CONFIG_NET_ETHERNET=y
511CONFIG_MII=y 450CONFIG_MII=y
512CONFIG_NET_VENDOR_3COM=y 451CONFIG_NET_VENDOR_3COM=y
@@ -536,28 +475,15 @@ CONFIG_NET_PCI=y
536# CONFIG_APRICOT is not set 475# CONFIG_APRICOT is not set
537# CONFIG_CS89x0 is not set 476# CONFIG_CS89x0 is not set
538# CONFIG_NET_POCKET is not set 477# CONFIG_NET_POCKET is not set
539 478CONFIG_NETDEV_1000=y
540# 479CONFIG_NETDEV_10000=y
541# Ethernet (1000 Mbit)
542#
543
544#
545# Ethernet (10000 Mbit)
546#
547
548#
549# Token Ring devices
550#
551# CONFIG_TR is not set 480# CONFIG_TR is not set
552 481
553# 482#
554# Wireless LAN (non-hamradio) 483# Wireless LAN
555#
556# CONFIG_NET_RADIO is not set
557
558#
559# Wan interfaces
560# 484#
485# CONFIG_WLAN_PRE80211 is not set
486# CONFIG_WLAN_80211 is not set
561# CONFIG_WAN is not set 487# CONFIG_WAN is not set
562# CONFIG_PLIP is not set 488# CONFIG_PLIP is not set
563# CONFIG_PPP is not set 489# CONFIG_PPP is not set
@@ -566,15 +492,7 @@ CONFIG_NET_PCI=y
566# CONFIG_NETCONSOLE is not set 492# CONFIG_NETCONSOLE is not set
567# CONFIG_NETPOLL is not set 493# CONFIG_NETPOLL is not set
568# CONFIG_NET_POLL_CONTROLLER is not set 494# CONFIG_NET_POLL_CONTROLLER is not set
569
570#
571# ISDN subsystem
572#
573# CONFIG_ISDN is not set 495# CONFIG_ISDN is not set
574
575#
576# Telephony Support
577#
578# CONFIG_PHONE is not set 496# CONFIG_PHONE is not set
579 497
580# 498#
@@ -582,6 +500,7 @@ CONFIG_NET_PCI=y
582# 500#
583CONFIG_INPUT=y 501CONFIG_INPUT=y
584# CONFIG_INPUT_FF_MEMLESS is not set 502# CONFIG_INPUT_FF_MEMLESS is not set
503# CONFIG_INPUT_POLLDEV is not set
585 504
586# 505#
587# Userland interfaces 506# Userland interfaces
@@ -607,12 +526,19 @@ CONFIG_KEYBOARD_ATKBD=y
607# CONFIG_KEYBOARD_STOWAWAY is not set 526# CONFIG_KEYBOARD_STOWAWAY is not set
608CONFIG_INPUT_MOUSE=y 527CONFIG_INPUT_MOUSE=y
609CONFIG_MOUSE_PS2=y 528CONFIG_MOUSE_PS2=y
529CONFIG_MOUSE_PS2_ALPS=y
530CONFIG_MOUSE_PS2_LOGIPS2PP=y
531CONFIG_MOUSE_PS2_SYNAPTICS=y
532CONFIG_MOUSE_PS2_LIFEBOOK=y
533CONFIG_MOUSE_PS2_TRACKPOINT=y
534# CONFIG_MOUSE_PS2_TOUCHKIT is not set
610# CONFIG_MOUSE_SERIAL is not set 535# CONFIG_MOUSE_SERIAL is not set
611# CONFIG_MOUSE_INPORT is not set 536# CONFIG_MOUSE_INPORT is not set
612# CONFIG_MOUSE_LOGIBM is not set 537# CONFIG_MOUSE_LOGIBM is not set
613# CONFIG_MOUSE_PC110PAD is not set 538# CONFIG_MOUSE_PC110PAD is not set
614# CONFIG_MOUSE_VSXXXAA is not set 539# CONFIG_MOUSE_VSXXXAA is not set
615# CONFIG_INPUT_JOYSTICK is not set 540# CONFIG_INPUT_JOYSTICK is not set
541# CONFIG_INPUT_TABLET is not set
616# CONFIG_INPUT_TOUCHSCREEN is not set 542# CONFIG_INPUT_TOUCHSCREEN is not set
617# CONFIG_INPUT_MISC is not set 543# CONFIG_INPUT_MISC is not set
618 544
@@ -657,35 +583,17 @@ CONFIG_LEGACY_PTY_COUNT=256
657# CONFIG_PRINTER is not set 583# CONFIG_PRINTER is not set
658# CONFIG_PPDEV is not set 584# CONFIG_PPDEV is not set
659# CONFIG_TIPAR is not set 585# CONFIG_TIPAR is not set
660
661#
662# IPMI
663#
664# CONFIG_IPMI_HANDLER is not set 586# CONFIG_IPMI_HANDLER is not set
665
666#
667# Watchdog Cards
668#
669# CONFIG_WATCHDOG is not set 587# CONFIG_WATCHDOG is not set
670# CONFIG_HW_RANDOM is not set 588# CONFIG_HW_RANDOM is not set
671# CONFIG_RTC is not set 589# CONFIG_RTC is not set
672# CONFIG_DTLK is not set 590# CONFIG_DTLK is not set
673# CONFIG_R3964 is not set 591# CONFIG_R3964 is not set
674
675#
676# Ftape, the floppy tape device driver
677#
678# CONFIG_RAW_DRIVER is not set 592# CONFIG_RAW_DRIVER is not set
679
680#
681# TPM devices
682#
683# CONFIG_TCG_TPM is not set 593# CONFIG_TCG_TPM is not set
684 594CONFIG_DEVPORT=y
685#
686# I2C support
687#
688CONFIG_I2C=m 595CONFIG_I2C=m
596CONFIG_I2C_BOARDINFO=y
689CONFIG_I2C_CHARDEV=m 597CONFIG_I2C_CHARDEV=m
690 598
691# 599#
@@ -702,6 +610,8 @@ CONFIG_I2C_ELEKTOR=m
702# CONFIG_I2C_OCORES is not set 610# CONFIG_I2C_OCORES is not set
703# CONFIG_I2C_PARPORT is not set 611# CONFIG_I2C_PARPORT is not set
704# CONFIG_I2C_PARPORT_LIGHT is not set 612# CONFIG_I2C_PARPORT_LIGHT is not set
613# CONFIG_I2C_SIMTEC is not set
614# CONFIG_I2C_TAOS_EVM is not set
705# CONFIG_I2C_STUB is not set 615# CONFIG_I2C_STUB is not set
706# CONFIG_I2C_PCA_ISA is not set 616# CONFIG_I2C_PCA_ISA is not set
707 617
@@ -710,11 +620,13 @@ CONFIG_I2C_ELEKTOR=m
710# 620#
711# CONFIG_SENSORS_DS1337 is not set 621# CONFIG_SENSORS_DS1337 is not set
712# CONFIG_SENSORS_DS1374 is not set 622# CONFIG_SENSORS_DS1374 is not set
623# CONFIG_DS1682 is not set
713# CONFIG_SENSORS_EEPROM is not set 624# CONFIG_SENSORS_EEPROM is not set
714# CONFIG_SENSORS_PCF8574 is not set 625# CONFIG_SENSORS_PCF8574 is not set
715# CONFIG_SENSORS_PCA9539 is not set 626# CONFIG_SENSORS_PCA9539 is not set
716# CONFIG_SENSORS_PCF8591 is not set 627# CONFIG_SENSORS_PCF8591 is not set
717# CONFIG_SENSORS_MAX6875 is not set 628# CONFIG_SENSORS_MAX6875 is not set
629# CONFIG_SENSORS_TSL2550 is not set
718# CONFIG_I2C_DEBUG_CORE is not set 630# CONFIG_I2C_DEBUG_CORE is not set
719# CONFIG_I2C_DEBUG_ALGO is not set 631# CONFIG_I2C_DEBUG_ALGO is not set
720# CONFIG_I2C_DEBUG_BUS is not set 632# CONFIG_I2C_DEBUG_BUS is not set
@@ -725,21 +637,17 @@ CONFIG_I2C_ELEKTOR=m
725# 637#
726# CONFIG_SPI is not set 638# CONFIG_SPI is not set
727# CONFIG_SPI_MASTER is not set 639# CONFIG_SPI_MASTER is not set
728
729#
730# Dallas's 1-wire bus
731#
732# CONFIG_W1 is not set 640# CONFIG_W1 is not set
733 641# CONFIG_POWER_SUPPLY is not set
734#
735# Hardware Monitoring support
736#
737CONFIG_HWMON=y 642CONFIG_HWMON=y
738CONFIG_HWMON_VID=m 643CONFIG_HWMON_VID=m
739# CONFIG_SENSORS_ABITUGURU is not set 644# CONFIG_SENSORS_ABITUGURU is not set
645# CONFIG_SENSORS_ABITUGURU3 is not set
646# CONFIG_SENSORS_AD7418 is not set
740CONFIG_SENSORS_ADM1021=m 647CONFIG_SENSORS_ADM1021=m
741CONFIG_SENSORS_ADM1025=m 648CONFIG_SENSORS_ADM1025=m
742# CONFIG_SENSORS_ADM1026 is not set 649# CONFIG_SENSORS_ADM1026 is not set
650# CONFIG_SENSORS_ADM1029 is not set
743CONFIG_SENSORS_ADM1031=m 651CONFIG_SENSORS_ADM1031=m
744# CONFIG_SENSORS_ADM9240 is not set 652# CONFIG_SENSORS_ADM9240 is not set
745CONFIG_SENSORS_ASB100=m 653CONFIG_SENSORS_ASB100=m
@@ -761,8 +669,12 @@ CONFIG_SENSORS_LM85=m
761# CONFIG_SENSORS_LM87 is not set 669# CONFIG_SENSORS_LM87 is not set
762CONFIG_SENSORS_LM90=m 670CONFIG_SENSORS_LM90=m
763# CONFIG_SENSORS_LM92 is not set 671# CONFIG_SENSORS_LM92 is not set
672# CONFIG_SENSORS_LM93 is not set
764CONFIG_SENSORS_MAX1619=m 673CONFIG_SENSORS_MAX1619=m
674# CONFIG_SENSORS_MAX6650 is not set
765# CONFIG_SENSORS_PC87360 is not set 675# CONFIG_SENSORS_PC87360 is not set
676# CONFIG_SENSORS_PC87427 is not set
677# CONFIG_SENSORS_DME1737 is not set
766CONFIG_SENSORS_SMSC47M1=m 678CONFIG_SENSORS_SMSC47M1=m
767# CONFIG_SENSORS_SMSC47M192 is not set 679# CONFIG_SENSORS_SMSC47M192 is not set
768# CONFIG_SENSORS_SMSC47B397 is not set 680# CONFIG_SENSORS_SMSC47B397 is not set
@@ -770,29 +682,27 @@ CONFIG_SENSORS_SMSC47M1=m
770CONFIG_SENSORS_W83781D=m 682CONFIG_SENSORS_W83781D=m
771# CONFIG_SENSORS_W83791D is not set 683# CONFIG_SENSORS_W83791D is not set
772# CONFIG_SENSORS_W83792D is not set 684# CONFIG_SENSORS_W83792D is not set
685# CONFIG_SENSORS_W83793 is not set
773CONFIG_SENSORS_W83L785TS=m 686CONFIG_SENSORS_W83L785TS=m
774CONFIG_SENSORS_W83627HF=m 687CONFIG_SENSORS_W83627HF=m
775# CONFIG_SENSORS_W83627EHF is not set 688# CONFIG_SENSORS_W83627EHF is not set
776# CONFIG_HWMON_DEBUG_CHIP is not set 689# CONFIG_HWMON_DEBUG_CHIP is not set
777 690
778# 691#
692# Multifunction device drivers
693#
694# CONFIG_MFD_SM501 is not set
695
696#
779# Multimedia devices 697# Multimedia devices
780# 698#
781CONFIG_VIDEO_DEV=m 699CONFIG_VIDEO_DEV=m
782CONFIG_VIDEO_V4L1=y 700CONFIG_VIDEO_V4L1=y
783CONFIG_VIDEO_V4L1_COMPAT=y 701CONFIG_VIDEO_V4L1_COMPAT=y
784CONFIG_VIDEO_V4L2=y 702CONFIG_VIDEO_V4L2=y
785 703CONFIG_VIDEO_CAPTURE_DRIVERS=y
786#
787# Video Capture Adapters
788#
789
790#
791# Video Capture Adapters
792#
793# CONFIG_VIDEO_ADV_DEBUG is not set 704# CONFIG_VIDEO_ADV_DEBUG is not set
794CONFIG_VIDEO_HELPER_CHIPS_AUTO=y 705CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
795# CONFIG_VIDEO_VIVI is not set
796# CONFIG_VIDEO_PMS is not set 706# CONFIG_VIDEO_PMS is not set
797CONFIG_VIDEO_BWQCAM=m 707CONFIG_VIDEO_BWQCAM=m
798CONFIG_VIDEO_CQCAM=m 708CONFIG_VIDEO_CQCAM=m
@@ -801,11 +711,9 @@ CONFIG_VIDEO_CQCAM=m
801# CONFIG_VIDEO_SAA5246A is not set 711# CONFIG_VIDEO_SAA5246A is not set
802# CONFIG_VIDEO_SAA5249 is not set 712# CONFIG_VIDEO_SAA5249 is not set
803# CONFIG_TUNER_3036 is not set 713# CONFIG_TUNER_3036 is not set
714# CONFIG_TUNER_TEA5761 is not set
804# CONFIG_VIDEO_M32R_AR is not set 715# CONFIG_VIDEO_M32R_AR is not set
805 716CONFIG_RADIO_ADAPTERS=y
806#
807# Radio Adapters
808#
809# CONFIG_RADIO_CADET is not set 717# CONFIG_RADIO_CADET is not set
810# CONFIG_RADIO_RTRACK is not set 718# CONFIG_RADIO_RTRACK is not set
811# CONFIG_RADIO_RTRACK2 is not set 719# CONFIG_RADIO_RTRACK2 is not set
@@ -817,16 +725,20 @@ CONFIG_VIDEO_CQCAM=m
817# CONFIG_RADIO_TRUST is not set 725# CONFIG_RADIO_TRUST is not set
818# CONFIG_RADIO_TYPHOON is not set 726# CONFIG_RADIO_TYPHOON is not set
819# CONFIG_RADIO_ZOLTRIX is not set 727# CONFIG_RADIO_ZOLTRIX is not set
728# CONFIG_DVB_CORE is not set
729CONFIG_DAB=y
820 730
821# 731#
822# Digital Video Broadcasting Devices 732# Graphics support
823# 733#
824# CONFIG_DVB is not set 734# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
825 735
826# 736#
827# Graphics support 737# Display device support
828# 738#
829CONFIG_FIRMWARE_EDID=y 739# CONFIG_DISPLAY_SUPPORT is not set
740# CONFIG_VGASTATE is not set
741CONFIG_VIDEO_OUTPUT_CONTROL=m
830# CONFIG_FB is not set 742# CONFIG_FB is not set
831 743
832# 744#
@@ -836,16 +748,15 @@ CONFIG_VGA_CONSOLE=y
836# CONFIG_VGACON_SOFT_SCROLLBACK is not set 748# CONFIG_VGACON_SOFT_SCROLLBACK is not set
837# CONFIG_MDA_CONSOLE is not set 749# CONFIG_MDA_CONSOLE is not set
838CONFIG_DUMMY_CONSOLE=y 750CONFIG_DUMMY_CONSOLE=y
839# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
840 751
841# 752#
842# Sound 753# Sound
843# 754#
844# CONFIG_SOUND is not set 755# CONFIG_SOUND is not set
845 756CONFIG_HID_SUPPORT=y
846# 757CONFIG_HID=y
847# USB support 758CONFIG_HID_DEBUG=y
848# 759CONFIG_USB_SUPPORT=y
849# CONFIG_USB_ARCH_HAS_HCD is not set 760# CONFIG_USB_ARCH_HAS_HCD is not set
850# CONFIG_USB_ARCH_HAS_OHCI is not set 761# CONFIG_USB_ARCH_HAS_OHCI is not set
851# CONFIG_USB_ARCH_HAS_EHCI is not set 762# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -858,50 +769,19 @@ CONFIG_DUMMY_CONSOLE=y
858# USB Gadget Support 769# USB Gadget Support
859# 770#
860# CONFIG_USB_GADGET is not set 771# CONFIG_USB_GADGET is not set
861
862#
863# MMC/SD Card support
864#
865# CONFIG_MMC is not set 772# CONFIG_MMC is not set
866
867#
868# LED devices
869#
870# CONFIG_NEW_LEDS is not set 773# CONFIG_NEW_LEDS is not set
871 774
872# 775#
873# LED drivers
874#
875
876#
877# LED Triggers
878#
879
880#
881# InfiniBand support
882#
883
884#
885# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
886#
887
888#
889# Real Time Clock 776# Real Time Clock
890# 777#
891# CONFIG_RTC_CLASS is not set 778# CONFIG_RTC_CLASS is not set
779# CONFIG_AUXDISPLAY is not set
892 780
893# 781#
894# DMA Engine support 782# Userspace I/O
895#
896# CONFIG_DMA_ENGINE is not set
897
898#
899# DMA Clients
900#
901
902#
903# DMA Devices
904# 783#
784# CONFIG_UIO is not set
905 785
906# 786#
907# File systems 787# File systems
@@ -1000,6 +880,7 @@ CONFIG_LOCKD_V4=y
1000CONFIG_EXPORTFS=m 880CONFIG_EXPORTFS=m
1001CONFIG_NFS_COMMON=y 881CONFIG_NFS_COMMON=y
1002CONFIG_SUNRPC=y 882CONFIG_SUNRPC=y
883# CONFIG_SUNRPC_BIND34 is not set
1003# CONFIG_RPCSEC_GSS_KRB5 is not set 884# CONFIG_RPCSEC_GSS_KRB5 is not set
1004# CONFIG_RPCSEC_GSS_SPKM3 is not set 885# CONFIG_RPCSEC_GSS_SPKM3 is not set
1005# CONFIG_SMB_FS is not set 886# CONFIG_SMB_FS is not set
@@ -1007,7 +888,6 @@ CONFIG_SUNRPC=y
1007# CONFIG_NCP_FS is not set 888# CONFIG_NCP_FS is not set
1008# CONFIG_CODA_FS is not set 889# CONFIG_CODA_FS is not set
1009# CONFIG_AFS_FS is not set 890# CONFIG_AFS_FS is not set
1010# CONFIG_9P_FS is not set
1011 891
1012# 892#
1013# Partition Types 893# Partition Types
@@ -1060,6 +940,11 @@ CONFIG_NLS_ISO8859_1=y
1060# CONFIG_NLS_UTF8 is not set 940# CONFIG_NLS_UTF8 is not set
1061 941
1062# 942#
943# Distributed Lock Manager
944#
945# CONFIG_DLM is not set
946
947#
1063# Profiling support 948# Profiling support
1064# 949#
1065CONFIG_PROFILING=y 950CONFIG_PROFILING=y
@@ -1072,29 +957,24 @@ CONFIG_OPROFILE=m
1072CONFIG_ENABLE_MUST_CHECK=y 957CONFIG_ENABLE_MUST_CHECK=y
1073# CONFIG_MAGIC_SYSRQ is not set 958# CONFIG_MAGIC_SYSRQ is not set
1074# CONFIG_UNUSED_SYMBOLS is not set 959# CONFIG_UNUSED_SYMBOLS is not set
960# CONFIG_DEBUG_FS is not set
961# CONFIG_HEADERS_CHECK is not set
1075# CONFIG_DEBUG_KERNEL is not set 962# CONFIG_DEBUG_KERNEL is not set
1076CONFIG_LOG_BUF_SHIFT=14
1077CONFIG_DEBUG_BUGVERBOSE=y 963CONFIG_DEBUG_BUGVERBOSE=y
1078# CONFIG_DEBUG_FS is not set
1079# CONFIG_FRAME_POINTER is not set 964# CONFIG_FRAME_POINTER is not set
1080# CONFIG_UNWIND_INFO is not set
1081# CONFIG_HEADERS_CHECK is not set
1082 965
1083# 966#
1084# Security options 967# Security options
1085# 968#
1086# CONFIG_KEYS is not set 969# CONFIG_KEYS is not set
1087# CONFIG_SECURITY is not set 970# CONFIG_SECURITY is not set
1088
1089#
1090# Cryptographic options
1091#
1092CONFIG_CRYPTO=y 971CONFIG_CRYPTO=y
1093CONFIG_CRYPTO_ALGAPI=y 972CONFIG_CRYPTO_ALGAPI=y
1094CONFIG_CRYPTO_BLKCIPHER=m 973CONFIG_CRYPTO_BLKCIPHER=m
1095CONFIG_CRYPTO_HASH=y 974CONFIG_CRYPTO_HASH=y
1096CONFIG_CRYPTO_MANAGER=y 975CONFIG_CRYPTO_MANAGER=y
1097CONFIG_CRYPTO_HMAC=y 976CONFIG_CRYPTO_HMAC=y
977# CONFIG_CRYPTO_XCBC is not set
1098CONFIG_CRYPTO_NULL=m 978CONFIG_CRYPTO_NULL=m
1099CONFIG_CRYPTO_MD4=m 979CONFIG_CRYPTO_MD4=m
1100CONFIG_CRYPTO_MD5=m 980CONFIG_CRYPTO_MD5=m
@@ -1103,9 +983,14 @@ CONFIG_CRYPTO_SHA256=m
1103CONFIG_CRYPTO_SHA512=m 983CONFIG_CRYPTO_SHA512=m
1104CONFIG_CRYPTO_WP512=m 984CONFIG_CRYPTO_WP512=m
1105# CONFIG_CRYPTO_TGR192 is not set 985# CONFIG_CRYPTO_TGR192 is not set
986# CONFIG_CRYPTO_GF128MUL is not set
1106CONFIG_CRYPTO_ECB=m 987CONFIG_CRYPTO_ECB=m
1107CONFIG_CRYPTO_CBC=m 988CONFIG_CRYPTO_CBC=m
989CONFIG_CRYPTO_PCBC=m
990# CONFIG_CRYPTO_LRW is not set
991# CONFIG_CRYPTO_CRYPTD is not set
1108CONFIG_CRYPTO_DES=m 992CONFIG_CRYPTO_DES=m
993# CONFIG_CRYPTO_FCRYPT is not set
1109CONFIG_CRYPTO_BLOWFISH=m 994CONFIG_CRYPTO_BLOWFISH=m
1110CONFIG_CRYPTO_TWOFISH=m 995CONFIG_CRYPTO_TWOFISH=m
1111CONFIG_CRYPTO_TWOFISH_COMMON=m 996CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1120,21 +1005,23 @@ CONFIG_CRYPTO_AES=m
1120# CONFIG_CRYPTO_DEFLATE is not set 1005# CONFIG_CRYPTO_DEFLATE is not set
1121# CONFIG_CRYPTO_MICHAEL_MIC is not set 1006# CONFIG_CRYPTO_MICHAEL_MIC is not set
1122CONFIG_CRYPTO_CRC32C=m 1007CONFIG_CRYPTO_CRC32C=m
1008# CONFIG_CRYPTO_CAMELLIA is not set
1123# CONFIG_CRYPTO_TEST is not set 1009# CONFIG_CRYPTO_TEST is not set
1124 1010CONFIG_CRYPTO_HW=y
1125#
1126# Hardware crypto devices
1127#
1128 1011
1129# 1012#
1130# Library routines 1013# Library routines
1131# 1014#
1015CONFIG_BITREVERSE=y
1132CONFIG_CRC_CCITT=m 1016CONFIG_CRC_CCITT=m
1133CONFIG_CRC16=m 1017CONFIG_CRC16=m
1018# CONFIG_CRC_ITU_T is not set
1134CONFIG_CRC32=y 1019CONFIG_CRC32=y
1020# CONFIG_CRC7 is not set
1135CONFIG_LIBCRC32C=m 1021CONFIG_LIBCRC32C=m
1136CONFIG_TEXTSEARCH=y 1022CONFIG_TEXTSEARCH=y
1137CONFIG_TEXTSEARCH_KMP=m 1023CONFIG_TEXTSEARCH_KMP=m
1138CONFIG_TEXTSEARCH_BM=m 1024CONFIG_TEXTSEARCH_BM=m
1139CONFIG_TEXTSEARCH_FSM=m 1025CONFIG_TEXTSEARCH_FSM=m
1140CONFIG_PLIST=y 1026CONFIG_PLIST=y
1027CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.smp b/arch/m32r/configs/m32700ut.smp_defconfig
index 13579917afef..af3b98179113 100644
--- a/arch/m32r/m32700ut/defconfig.m32700ut.smp
+++ b/arch/m32r/configs/m32700ut.smp_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Tue Dec 12 17:52:38 2006 4# Wed Aug 1 17:22:35 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -23,19 +26,20 @@ CONFIG_LOCALVERSION=""
23CONFIG_LOCALVERSION_AUTO=y 26CONFIG_LOCALVERSION_AUTO=y
24CONFIG_SWAP=y 27CONFIG_SWAP=y
25CONFIG_SYSVIPC=y 28CONFIG_SYSVIPC=y
26# CONFIG_IPC_NS is not set 29CONFIG_SYSVIPC_SYSCTL=y
27# CONFIG_POSIX_MQUEUE is not set 30# CONFIG_POSIX_MQUEUE is not set
28CONFIG_BSD_PROCESS_ACCT=y 31CONFIG_BSD_PROCESS_ACCT=y
29# CONFIG_BSD_PROCESS_ACCT_V3 is not set 32# CONFIG_BSD_PROCESS_ACCT_V3 is not set
30# CONFIG_TASKSTATS is not set 33# CONFIG_TASKSTATS is not set
31# CONFIG_UTS_NS is not set 34# CONFIG_USER_NS is not set
32# CONFIG_AUDIT is not set 35# CONFIG_AUDIT is not set
33CONFIG_IKCONFIG=y 36CONFIG_IKCONFIG=y
34CONFIG_IKCONFIG_PROC=y 37CONFIG_IKCONFIG_PROC=y
38CONFIG_LOG_BUF_SHIFT=15
35# CONFIG_CPUSETS is not set 39# CONFIG_CPUSETS is not set
36CONFIG_SYSFS_DEPRECATED=y 40CONFIG_SYSFS_DEPRECATED=y
37# CONFIG_RELAY is not set 41# CONFIG_RELAY is not set
38CONFIG_INITRAMFS_SOURCE="" 42# CONFIG_BLK_DEV_INITRD is not set
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SYSCTL=y 44CONFIG_SYSCTL=y
41CONFIG_EMBEDDED=y 45CONFIG_EMBEDDED=y
@@ -47,17 +51,18 @@ CONFIG_BUG=y
47CONFIG_ELF_CORE=y 51CONFIG_ELF_CORE=y
48CONFIG_BASE_FULL=y 52CONFIG_BASE_FULL=y
49# CONFIG_FUTEX is not set 53# CONFIG_FUTEX is not set
54CONFIG_ANON_INODES=y
50# CONFIG_EPOLL is not set 55# CONFIG_EPOLL is not set
56CONFIG_SIGNALFD=y
57CONFIG_TIMERFD=y
58CONFIG_EVENTFD=y
51CONFIG_SHMEM=y 59CONFIG_SHMEM=y
52CONFIG_SLAB=y
53CONFIG_VM_EVENT_COUNTERS=y 60CONFIG_VM_EVENT_COUNTERS=y
61CONFIG_SLAB=y
62# CONFIG_SLUB is not set
63# CONFIG_SLOB is not set
54# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
55CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
56# CONFIG_SLOB is not set
57
58#
59# Loadable module support
60#
61CONFIG_MODULES=y 66CONFIG_MODULES=y
62CONFIG_MODULE_UNLOAD=y 67CONFIG_MODULE_UNLOAD=y
63# CONFIG_MODULE_FORCE_UNLOAD is not set 68# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -65,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y
65# CONFIG_MODULE_SRCVERSION_ALL is not set 70# CONFIG_MODULE_SRCVERSION_ALL is not set
66CONFIG_KMOD=y 71CONFIG_KMOD=y
67CONFIG_STOP_MACHINE=y 72CONFIG_STOP_MACHINE=y
68
69#
70# Block layer
71#
72CONFIG_BLOCK=y 73CONFIG_BLOCK=y
74# CONFIG_LBD is not set
73# CONFIG_BLK_DEV_IO_TRACE is not set 75# CONFIG_BLK_DEV_IO_TRACE is not set
76# CONFIG_LSF is not set
77# CONFIG_BLK_DEV_BSG is not set
74 78
75# 79#
76# IO Schedulers 80# IO Schedulers
@@ -123,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
123# CONFIG_SPARSEMEM_STATIC is not set 127# CONFIG_SPARSEMEM_STATIC is not set
124CONFIG_SPLIT_PTLOCK_CPUS=4 128CONFIG_SPLIT_PTLOCK_CPUS=4
125# CONFIG_RESOURCES_64BIT is not set 129# CONFIG_RESOURCES_64BIT is not set
130CONFIG_ZONE_DMA_FLAG=1
131CONFIG_BOUNCE=y
132CONFIG_VIRT_TO_BUS=y
126CONFIG_IRAM_START=0x00f00000 133CONFIG_IRAM_START=0x00f00000
127CONFIG_IRAM_SIZE=0x00080000 134CONFIG_IRAM_SIZE=0x00080000
128CONFIG_RWSEM_GENERIC_SPINLOCK=y 135CONFIG_RWSEM_GENERIC_SPINLOCK=y
129# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 136# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
137# CONFIG_ARCH_HAS_ILOG2_U32 is not set
138# CONFIG_ARCH_HAS_ILOG2_U64 is not set
130CONFIG_GENERIC_FIND_NEXT_BIT=y 139CONFIG_GENERIC_FIND_NEXT_BIT=y
131CONFIG_GENERIC_HWEIGHT=y 140CONFIG_GENERIC_HWEIGHT=y
132CONFIG_GENERIC_CALIBRATE_DELAY=y 141CONFIG_GENERIC_CALIBRATE_DELAY=y
142CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
133CONFIG_PREEMPT=y 143CONFIG_PREEMPT=y
134CONFIG_SMP=y 144CONFIG_SMP=y
135# CONFIG_CHIP_M32700_TS1 is not set 145# CONFIG_CHIP_M32700_TS1 is not set
@@ -139,6 +149,7 @@ CONFIG_NODES_SHIFT=1
139# 149#
140# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 150# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
141# 151#
152# CONFIG_ARCH_SUPPORTS_MSI is not set
142# CONFIG_ISA is not set 153# CONFIG_ISA is not set
143 154
144# 155#
@@ -147,10 +158,6 @@ CONFIG_NODES_SHIFT=1
147# CONFIG_PCCARD is not set 158# CONFIG_PCCARD is not set
148 159
149# 160#
150# PCI Hotplug Support
151#
152
153#
154# Executable file formats 161# Executable file formats
155# 162#
156CONFIG_BINFMT_ELF=y 163CONFIG_BINFMT_ELF=y
@@ -164,13 +171,13 @@ CONFIG_NET=y
164# 171#
165# Networking options 172# Networking options
166# 173#
167# CONFIG_NETDEBUG is not set
168CONFIG_PACKET=y 174CONFIG_PACKET=y
169# CONFIG_PACKET_MMAP is not set 175# CONFIG_PACKET_MMAP is not set
170CONFIG_UNIX=y 176CONFIG_UNIX=y
171CONFIG_XFRM=y 177CONFIG_XFRM=y
172# CONFIG_XFRM_USER is not set 178# CONFIG_XFRM_USER is not set
173# CONFIG_XFRM_SUB_POLICY is not set 179# CONFIG_XFRM_SUB_POLICY is not set
180# CONFIG_XFRM_MIGRATE is not set
174# CONFIG_NET_KEY is not set 181# CONFIG_NET_KEY is not set
175CONFIG_INET=y 182CONFIG_INET=y
176# CONFIG_IP_MULTICAST is not set 183# CONFIG_IP_MULTICAST is not set
@@ -203,20 +210,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
203# CONFIG_INET6_TUNNEL is not set 210# CONFIG_INET6_TUNNEL is not set
204# CONFIG_NETWORK_SECMARK is not set 211# CONFIG_NETWORK_SECMARK is not set
205# CONFIG_NETFILTER is not set 212# CONFIG_NETFILTER is not set
206
207#
208# DCCP Configuration (EXPERIMENTAL)
209#
210# CONFIG_IP_DCCP is not set 213# CONFIG_IP_DCCP is not set
211
212#
213# SCTP Configuration (EXPERIMENTAL)
214#
215# CONFIG_IP_SCTP is not set 214# CONFIG_IP_SCTP is not set
216
217#
218# TIPC Configuration (EXPERIMENTAL)
219#
220# CONFIG_TIPC is not set 215# CONFIG_TIPC is not set
221# CONFIG_ATM is not set 216# CONFIG_ATM is not set
222# CONFIG_BRIDGE is not set 217# CONFIG_BRIDGE is not set
@@ -242,7 +237,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
242# CONFIG_HAMRADIO is not set 237# CONFIG_HAMRADIO is not set
243# CONFIG_IRDA is not set 238# CONFIG_IRDA is not set
244# CONFIG_BT is not set 239# CONFIG_BT is not set
240# CONFIG_AF_RXRPC is not set
241
242#
243# Wireless
244#
245# CONFIG_CFG80211 is not set
246# CONFIG_WIRELESS_EXT is not set
247# CONFIG_MAC80211 is not set
245# CONFIG_IEEE80211 is not set 248# CONFIG_IEEE80211 is not set
249# CONFIG_RFKILL is not set
250# CONFIG_NET_9P is not set
246 251
247# 252#
248# Device Drivers 253# Device Drivers
@@ -255,15 +260,7 @@ CONFIG_STANDALONE=y
255CONFIG_PREVENT_FIRMWARE_BUILD=y 260CONFIG_PREVENT_FIRMWARE_BUILD=y
256CONFIG_FW_LOADER=y 261CONFIG_FW_LOADER=y
257# CONFIG_SYS_HYPERVISOR is not set 262# CONFIG_SYS_HYPERVISOR is not set
258
259#
260# Connector - unified userspace <-> kernelspace linker
261#
262# CONFIG_CONNECTOR is not set 263# CONFIG_CONNECTOR is not set
263
264#
265# Memory Technology Devices (MTD)
266#
267CONFIG_MTD=y 264CONFIG_MTD=y
268# CONFIG_MTD_DEBUG is not set 265# CONFIG_MTD_DEBUG is not set
269# CONFIG_MTD_CONCAT is not set 266# CONFIG_MTD_CONCAT is not set
@@ -278,6 +275,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
278# User Modules And Translation Layers 275# User Modules And Translation Layers
279# 276#
280# CONFIG_MTD_CHAR is not set 277# CONFIG_MTD_CHAR is not set
278CONFIG_MTD_BLKDEVS=y
281CONFIG_MTD_BLOCK=y 279CONFIG_MTD_BLOCK=y
282# CONFIG_FTL is not set 280# CONFIG_FTL is not set
283# CONFIG_NFTL is not set 281# CONFIG_NFTL is not set
@@ -314,7 +312,6 @@ CONFIG_MTD_CFI_UTIL=m
314# CONFIG_MTD_RAM is not set 312# CONFIG_MTD_RAM is not set
315# CONFIG_MTD_ROM is not set 313# CONFIG_MTD_ROM is not set
316# CONFIG_MTD_ABSENT is not set 314# CONFIG_MTD_ABSENT is not set
317# CONFIG_MTD_OBSOLETE_CHIPS is not set
318 315
319# 316#
320# Mapping drivers for chip access 317# Mapping drivers for chip access
@@ -337,29 +334,15 @@ CONFIG_MTD_CFI_UTIL=m
337# CONFIG_MTD_DOC2000 is not set 334# CONFIG_MTD_DOC2000 is not set
338# CONFIG_MTD_DOC2001 is not set 335# CONFIG_MTD_DOC2001 is not set
339# CONFIG_MTD_DOC2001PLUS is not set 336# CONFIG_MTD_DOC2001PLUS is not set
340
341#
342# NAND Flash Device Drivers
343#
344# CONFIG_MTD_NAND is not set 337# CONFIG_MTD_NAND is not set
345
346#
347# OneNAND Flash Device Drivers
348#
349# CONFIG_MTD_ONENAND is not set 338# CONFIG_MTD_ONENAND is not set
350 339
351# 340#
352# Parallel port support 341# UBI - Unsorted block images
353# 342#
343# CONFIG_MTD_UBI is not set
354# CONFIG_PARPORT is not set 344# CONFIG_PARPORT is not set
355 345CONFIG_BLK_DEV=y
356#
357# Plug and Play support
358#
359
360#
361# Block devices
362#
363# CONFIG_BLK_DEV_COW_COMMON is not set 346# CONFIG_BLK_DEV_COW_COMMON is not set
364CONFIG_BLK_DEV_LOOP=y 347CONFIG_BLK_DEV_LOOP=y
365# CONFIG_BLK_DEV_CRYPTOLOOP is not set 348# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -368,18 +351,10 @@ CONFIG_BLK_DEV_RAM=y
368CONFIG_BLK_DEV_RAM_COUNT=16 351CONFIG_BLK_DEV_RAM_COUNT=16
369CONFIG_BLK_DEV_RAM_SIZE=4096 352CONFIG_BLK_DEV_RAM_SIZE=4096
370CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 353CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
371# CONFIG_BLK_DEV_INITRD is not set
372# CONFIG_CDROM_PKTCDVD is not set 354# CONFIG_CDROM_PKTCDVD is not set
373CONFIG_ATA_OVER_ETH=m 355CONFIG_ATA_OVER_ETH=m
374 356CONFIG_MISC_DEVICES=y
375# 357# CONFIG_EEPROM_93CX6 is not set
376# Misc devices
377#
378# CONFIG_TIFM_CORE is not set
379
380#
381# ATA/ATAPI/MFM/RLL support
382#
383CONFIG_IDE=y 358CONFIG_IDE=y
384CONFIG_IDE_MAX_HWIFS=4 359CONFIG_IDE_MAX_HWIFS=4
385CONFIG_BLK_DEV_IDE=y 360CONFIG_BLK_DEV_IDE=y
@@ -395,14 +370,15 @@ CONFIG_BLK_DEV_IDECD=m
395# CONFIG_BLK_DEV_IDEFLOPPY is not set 370# CONFIG_BLK_DEV_IDEFLOPPY is not set
396# CONFIG_BLK_DEV_IDESCSI is not set 371# CONFIG_BLK_DEV_IDESCSI is not set
397# CONFIG_IDE_TASK_IOCTL is not set 372# CONFIG_IDE_TASK_IOCTL is not set
373CONFIG_IDE_PROC_FS=y
398 374
399# 375#
400# IDE chipset support/bugfixes 376# IDE chipset support/bugfixes
401# 377#
402CONFIG_IDE_GENERIC=y 378CONFIG_IDE_GENERIC=y
379# CONFIG_IDEPCI_PCIBUS_ORDER is not set
403# CONFIG_IDE_ARM is not set 380# CONFIG_IDE_ARM is not set
404# CONFIG_BLK_DEV_IDEDMA is not set 381# CONFIG_BLK_DEV_IDEDMA is not set
405# CONFIG_IDEDMA_AUTO is not set
406# CONFIG_BLK_DEV_HD is not set 382# CONFIG_BLK_DEV_HD is not set
407 383
408# 384#
@@ -410,6 +386,8 @@ CONFIG_IDE_GENERIC=y
410# 386#
411# CONFIG_RAID_ATTRS is not set 387# CONFIG_RAID_ATTRS is not set
412CONFIG_SCSI=m 388CONFIG_SCSI=m
389# CONFIG_SCSI_DMA is not set
390# CONFIG_SCSI_TGT is not set
413# CONFIG_SCSI_NETLINK is not set 391# CONFIG_SCSI_NETLINK is not set
414CONFIG_SCSI_PROC_FS=y 392CONFIG_SCSI_PROC_FS=y
415 393
@@ -430,6 +408,8 @@ CONFIG_CHR_DEV_SG=m
430CONFIG_SCSI_MULTI_LUN=y 408CONFIG_SCSI_MULTI_LUN=y
431# CONFIG_SCSI_CONSTANTS is not set 409# CONFIG_SCSI_CONSTANTS is not set
432# CONFIG_SCSI_LOGGING is not set 410# CONFIG_SCSI_LOGGING is not set
411# CONFIG_SCSI_SCAN_ASYNC is not set
412CONFIG_SCSI_WAIT_SCAN=m
433 413
434# 414#
435# SCSI Transports 415# SCSI Transports
@@ -437,79 +417,31 @@ CONFIG_SCSI_MULTI_LUN=y
437# CONFIG_SCSI_SPI_ATTRS is not set 417# CONFIG_SCSI_SPI_ATTRS is not set
438# CONFIG_SCSI_FC_ATTRS is not set 418# CONFIG_SCSI_FC_ATTRS is not set
439# CONFIG_SCSI_ISCSI_ATTRS is not set 419# CONFIG_SCSI_ISCSI_ATTRS is not set
440# CONFIG_SCSI_SAS_ATTRS is not set
441# CONFIG_SCSI_SAS_LIBSAS is not set 420# CONFIG_SCSI_SAS_LIBSAS is not set
442 421CONFIG_SCSI_LOWLEVEL=y
443#
444# SCSI low-level drivers
445#
446# CONFIG_ISCSI_TCP is not set 422# CONFIG_ISCSI_TCP is not set
447# CONFIG_SCSI_DEBUG is not set 423# CONFIG_SCSI_DEBUG is not set
448
449#
450# Serial ATA (prod) and Parallel ATA (experimental) drivers
451#
452
453#
454# Multi-device support (RAID and LVM)
455#
456# CONFIG_MD is not set 424# CONFIG_MD is not set
457
458#
459# Fusion MPT device support
460#
461# CONFIG_FUSION is not set
462
463#
464# IEEE 1394 (FireWire) support
465#
466
467#
468# I2O device support
469#
470
471#
472# Network device support
473#
474CONFIG_NETDEVICES=y 425CONFIG_NETDEVICES=y
426# CONFIG_NETDEVICES_MULTIQUEUE is not set
475# CONFIG_DUMMY is not set 427# CONFIG_DUMMY is not set
476# CONFIG_BONDING is not set 428# CONFIG_BONDING is not set
429# CONFIG_MACVLAN is not set
477# CONFIG_EQUALIZER is not set 430# CONFIG_EQUALIZER is not set
478# CONFIG_TUN is not set 431# CONFIG_TUN is not set
479
480#
481# PHY device support
482#
483# CONFIG_PHYLIB is not set 432# CONFIG_PHYLIB is not set
484
485#
486# Ethernet (10 or 100Mbit)
487#
488CONFIG_NET_ETHERNET=y 433CONFIG_NET_ETHERNET=y
489CONFIG_MII=y 434CONFIG_MII=y
490CONFIG_SMC91X=y 435CONFIG_SMC91X=y
491# CONFIG_NE2000 is not set 436# CONFIG_NE2000 is not set
437CONFIG_NETDEV_1000=y
438CONFIG_NETDEV_10000=y
492 439
493# 440#
494# Ethernet (1000 Mbit) 441# Wireless LAN
495#
496
497#
498# Ethernet (10000 Mbit)
499#
500
501#
502# Token Ring devices
503#
504
505#
506# Wireless LAN (non-hamradio)
507#
508# CONFIG_NET_RADIO is not set
509
510#
511# Wan interfaces
512# 442#
443# CONFIG_WLAN_PRE80211 is not set
444# CONFIG_WLAN_80211 is not set
513# CONFIG_WAN is not set 445# CONFIG_WAN is not set
514# CONFIG_PPP is not set 446# CONFIG_PPP is not set
515# CONFIG_SLIP is not set 447# CONFIG_SLIP is not set
@@ -517,15 +449,7 @@ CONFIG_SMC91X=y
517# CONFIG_NETCONSOLE is not set 449# CONFIG_NETCONSOLE is not set
518# CONFIG_NETPOLL is not set 450# CONFIG_NETPOLL is not set
519# CONFIG_NET_POLL_CONTROLLER is not set 451# CONFIG_NET_POLL_CONTROLLER is not set
520
521#
522# ISDN subsystem
523#
524# CONFIG_ISDN is not set 452# CONFIG_ISDN is not set
525
526#
527# Telephony Support
528#
529# CONFIG_PHONE is not set 453# CONFIG_PHONE is not set
530 454
531# 455#
@@ -533,6 +457,7 @@ CONFIG_SMC91X=y
533# 457#
534CONFIG_INPUT=y 458CONFIG_INPUT=y
535# CONFIG_INPUT_FF_MEMLESS is not set 459# CONFIG_INPUT_FF_MEMLESS is not set
460# CONFIG_INPUT_POLLDEV is not set
536 461
537# 462#
538# Userland interfaces 463# Userland interfaces
@@ -549,6 +474,7 @@ CONFIG_INPUT=y
549# CONFIG_INPUT_KEYBOARD is not set 474# CONFIG_INPUT_KEYBOARD is not set
550# CONFIG_INPUT_MOUSE is not set 475# CONFIG_INPUT_MOUSE is not set
551# CONFIG_INPUT_JOYSTICK is not set 476# CONFIG_INPUT_JOYSTICK is not set
477# CONFIG_INPUT_TABLET is not set
552# CONFIG_INPUT_TOUCHSCREEN is not set 478# CONFIG_INPUT_TOUCHSCREEN is not set
553# CONFIG_INPUT_MISC is not set 479# CONFIG_INPUT_MISC is not set
554 480
@@ -587,35 +513,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y
587CONFIG_UNIX98_PTYS=y 513CONFIG_UNIX98_PTYS=y
588CONFIG_LEGACY_PTYS=y 514CONFIG_LEGACY_PTYS=y
589CONFIG_LEGACY_PTY_COUNT=256 515CONFIG_LEGACY_PTY_COUNT=256
590
591#
592# IPMI
593#
594# CONFIG_IPMI_HANDLER is not set 516# CONFIG_IPMI_HANDLER is not set
595
596#
597# Watchdog Cards
598#
599# CONFIG_WATCHDOG is not set 517# CONFIG_WATCHDOG is not set
600CONFIG_HW_RANDOM=y 518CONFIG_HW_RANDOM=y
601# CONFIG_RTC is not set 519# CONFIG_RTC is not set
602CONFIG_DS1302=y 520CONFIG_DS1302=y
603# CONFIG_DTLK is not set
604# CONFIG_R3964 is not set 521# CONFIG_R3964 is not set
605
606#
607# Ftape, the floppy tape device driver
608#
609# CONFIG_RAW_DRIVER is not set 522# CONFIG_RAW_DRIVER is not set
610
611#
612# TPM devices
613#
614# CONFIG_TCG_TPM is not set 523# CONFIG_TCG_TPM is not set
615
616#
617# I2C support
618#
619# CONFIG_I2C is not set 524# CONFIG_I2C is not set
620 525
621# 526#
@@ -623,65 +528,76 @@ CONFIG_DS1302=y
623# 528#
624# CONFIG_SPI is not set 529# CONFIG_SPI is not set
625# CONFIG_SPI_MASTER is not set 530# CONFIG_SPI_MASTER is not set
626
627#
628# Dallas's 1-wire bus
629#
630# CONFIG_W1 is not set 531# CONFIG_W1 is not set
631 532# CONFIG_POWER_SUPPLY is not set
632#
633# Hardware Monitoring support
634#
635CONFIG_HWMON=y 533CONFIG_HWMON=y
636# CONFIG_HWMON_VID is not set 534# CONFIG_HWMON_VID is not set
637# CONFIG_SENSORS_ABITUGURU is not set 535# CONFIG_SENSORS_ABITUGURU is not set
536# CONFIG_SENSORS_ABITUGURU3 is not set
638# CONFIG_SENSORS_F71805F is not set 537# CONFIG_SENSORS_F71805F is not set
538# CONFIG_SENSORS_IT87 is not set
539# CONFIG_SENSORS_PC87360 is not set
540# CONFIG_SENSORS_PC87427 is not set
541# CONFIG_SENSORS_SMSC47M1 is not set
542# CONFIG_SENSORS_SMSC47B397 is not set
639# CONFIG_SENSORS_VT1211 is not set 543# CONFIG_SENSORS_VT1211 is not set
544# CONFIG_SENSORS_W83627HF is not set
545# CONFIG_SENSORS_W83627EHF is not set
640# CONFIG_HWMON_DEBUG_CHIP is not set 546# CONFIG_HWMON_DEBUG_CHIP is not set
641 547
642# 548#
549# Multifunction device drivers
550#
551# CONFIG_MFD_SM501 is not set
552
553#
643# Multimedia devices 554# Multimedia devices
644# 555#
645CONFIG_VIDEO_DEV=m 556CONFIG_VIDEO_DEV=m
646CONFIG_VIDEO_V4L1=y 557CONFIG_VIDEO_V4L1=y
647CONFIG_VIDEO_V4L1_COMPAT=y 558CONFIG_VIDEO_V4L1_COMPAT=y
648CONFIG_VIDEO_V4L2=y 559CONFIG_VIDEO_V4L2=y
649 560CONFIG_VIDEO_CAPTURE_DRIVERS=y
650#
651# Video Capture Adapters
652#
653
654#
655# Video Capture Adapters
656#
657# CONFIG_VIDEO_ADV_DEBUG is not set 561# CONFIG_VIDEO_ADV_DEBUG is not set
658CONFIG_VIDEO_HELPER_CHIPS_AUTO=y 562CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
659# CONFIG_VIDEO_VIVI is not set
660# CONFIG_VIDEO_CPIA is not set 563# CONFIG_VIDEO_CPIA is not set
661CONFIG_VIDEO_M32R_AR=m 564CONFIG_VIDEO_M32R_AR=m
662CONFIG_VIDEO_M32R_AR_M64278=m 565CONFIG_VIDEO_M32R_AR_M64278=m
566CONFIG_RADIO_ADAPTERS=y
567# CONFIG_DVB_CORE is not set
568CONFIG_DAB=y
663 569
664# 570#
665# Radio Adapters 571# Graphics support
666#
667
668#
669# Digital Video Broadcasting Devices
670# 572#
671# CONFIG_DVB is not set 573# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
672 574
673# 575#
674# Graphics support 576# Display device support
675# 577#
676CONFIG_FIRMWARE_EDID=y 578# CONFIG_DISPLAY_SUPPORT is not set
579# CONFIG_VGASTATE is not set
580CONFIG_VIDEO_OUTPUT_CONTROL=m
677CONFIG_FB=y 581CONFIG_FB=y
582CONFIG_FIRMWARE_EDID=y
583# CONFIG_FB_DDC is not set
678CONFIG_FB_CFB_FILLRECT=y 584CONFIG_FB_CFB_FILLRECT=y
679CONFIG_FB_CFB_COPYAREA=y 585CONFIG_FB_CFB_COPYAREA=y
680CONFIG_FB_CFB_IMAGEBLIT=y 586CONFIG_FB_CFB_IMAGEBLIT=y
587# CONFIG_FB_SYS_FILLRECT is not set
588# CONFIG_FB_SYS_COPYAREA is not set
589# CONFIG_FB_SYS_IMAGEBLIT is not set
590# CONFIG_FB_SYS_FOPS is not set
591CONFIG_FB_DEFERRED_IO=y
592# CONFIG_FB_SVGALIB is not set
681# CONFIG_FB_MACMODES is not set 593# CONFIG_FB_MACMODES is not set
682# CONFIG_FB_BACKLIGHT is not set 594# CONFIG_FB_BACKLIGHT is not set
683# CONFIG_FB_MODE_HELPERS is not set 595# CONFIG_FB_MODE_HELPERS is not set
684# CONFIG_FB_TILEBLITTING is not set 596# CONFIG_FB_TILEBLITTING is not set
597
598#
599# Frame buffer hardware drivers
600#
685CONFIG_FB_S1D13XXX=y 601CONFIG_FB_S1D13XXX=y
686# CONFIG_FB_VIRTUAL is not set 602# CONFIG_FB_VIRTUAL is not set
687 603
@@ -691,29 +607,25 @@ CONFIG_FB_S1D13XXX=y
691# CONFIG_VGA_CONSOLE is not set 607# CONFIG_VGA_CONSOLE is not set
692CONFIG_DUMMY_CONSOLE=y 608CONFIG_DUMMY_CONSOLE=y
693CONFIG_FRAMEBUFFER_CONSOLE=y 609CONFIG_FRAMEBUFFER_CONSOLE=y
610# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
694# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 611# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
695# CONFIG_FONTS is not set 612# CONFIG_FONTS is not set
696CONFIG_FONT_8x8=y 613CONFIG_FONT_8x8=y
697CONFIG_FONT_8x16=y 614CONFIG_FONT_8x16=y
698
699#
700# Logo configuration
701#
702CONFIG_LOGO=y 615CONFIG_LOGO=y
703CONFIG_LOGO_LINUX_MONO=y 616CONFIG_LOGO_LINUX_MONO=y
704CONFIG_LOGO_LINUX_VGA16=y 617CONFIG_LOGO_LINUX_VGA16=y
705CONFIG_LOGO_LINUX_CLUT224=y 618CONFIG_LOGO_LINUX_CLUT224=y
706CONFIG_LOGO_M32R_CLUT224=y 619CONFIG_LOGO_M32R_CLUT224=y
707# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
708 620
709# 621#
710# Sound 622# Sound
711# 623#
712# CONFIG_SOUND is not set 624# CONFIG_SOUND is not set
713 625CONFIG_HID_SUPPORT=y
714# 626CONFIG_HID=y
715# USB support 627# CONFIG_HID_DEBUG is not set
716# 628CONFIG_USB_SUPPORT=y
717# CONFIG_USB_ARCH_HAS_HCD is not set 629# CONFIG_USB_ARCH_HAS_HCD is not set
718# CONFIG_USB_ARCH_HAS_OHCI is not set 630# CONFIG_USB_ARCH_HAS_OHCI is not set
719# CONFIG_USB_ARCH_HAS_EHCI is not set 631# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -726,35 +638,20 @@ CONFIG_LOGO_M32R_CLUT224=y
726# USB Gadget Support 638# USB Gadget Support
727# 639#
728# CONFIG_USB_GADGET is not set 640# CONFIG_USB_GADGET is not set
729
730#
731# MMC/SD Card support
732#
733CONFIG_MMC=y 641CONFIG_MMC=y
734CONFIG_MMC_DEBUG=y 642CONFIG_MMC_DEBUG=y
735CONFIG_MMC_BLOCK=y 643# CONFIG_MMC_UNSAFE_RESUME is not set
736# CONFIG_MMC_TIFM_SD is not set
737
738#
739# LED devices
740#
741# CONFIG_NEW_LEDS is not set
742
743#
744# LED drivers
745#
746 644
747# 645#
748# LED Triggers 646# MMC/SD Card Drivers
749#
750
751#
752# InfiniBand support
753# 647#
648CONFIG_MMC_BLOCK=y
649CONFIG_MMC_BLOCK_BOUNCE=y
754 650
755# 651#
756# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 652# MMC/SD Host Controller Drivers
757# 653#
654# CONFIG_NEW_LEDS is not set
758 655
759# 656#
760# Real Time Clock 657# Real Time Clock
@@ -762,17 +659,9 @@ CONFIG_MMC_BLOCK=y
762# CONFIG_RTC_CLASS is not set 659# CONFIG_RTC_CLASS is not set
763 660
764# 661#
765# DMA Engine support 662# Userspace I/O
766#
767# CONFIG_DMA_ENGINE is not set
768
769#
770# DMA Clients
771#
772
773#
774# DMA Devices
775# 663#
664# CONFIG_UIO is not set
776 665
777# 666#
778# File systems 667# File systems
@@ -849,7 +738,6 @@ CONFIG_RAMFS=y
849# CONFIG_BEFS_FS is not set 738# CONFIG_BEFS_FS is not set
850# CONFIG_BFS_FS is not set 739# CONFIG_BFS_FS is not set
851# CONFIG_EFS_FS is not set 740# CONFIG_EFS_FS is not set
852# CONFIG_JFFS_FS is not set
853# CONFIG_JFFS2_FS is not set 741# CONFIG_JFFS2_FS is not set
854# CONFIG_CRAMFS is not set 742# CONFIG_CRAMFS is not set
855# CONFIG_VXFS_FS is not set 743# CONFIG_VXFS_FS is not set
@@ -872,6 +760,7 @@ CONFIG_LOCKD=y
872CONFIG_LOCKD_V4=y 760CONFIG_LOCKD_V4=y
873CONFIG_NFS_COMMON=y 761CONFIG_NFS_COMMON=y
874CONFIG_SUNRPC=y 762CONFIG_SUNRPC=y
763# CONFIG_SUNRPC_BIND34 is not set
875# CONFIG_RPCSEC_GSS_KRB5 is not set 764# CONFIG_RPCSEC_GSS_KRB5 is not set
876# CONFIG_RPCSEC_GSS_SPKM3 is not set 765# CONFIG_RPCSEC_GSS_SPKM3 is not set
877# CONFIG_SMB_FS is not set 766# CONFIG_SMB_FS is not set
@@ -879,7 +768,6 @@ CONFIG_SUNRPC=y
879# CONFIG_NCP_FS is not set 768# CONFIG_NCP_FS is not set
880# CONFIG_CODA_FS is not set 769# CONFIG_CODA_FS is not set
881# CONFIG_AFS_FS is not set 770# CONFIG_AFS_FS is not set
882# CONFIG_9P_FS is not set
883 771
884# 772#
885# Partition Types 773# Partition Types
@@ -932,6 +820,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
932# CONFIG_NLS_UTF8 is not set 820# CONFIG_NLS_UTF8 is not set
933 821
934# 822#
823# Distributed Lock Manager
824#
825# CONFIG_DLM is not set
826
827#
935# Profiling support 828# Profiling support
936# 829#
937CONFIG_PROFILING=y 830CONFIG_PROFILING=y
@@ -944,29 +837,27 @@ CONFIG_OPROFILE=y
944CONFIG_ENABLE_MUST_CHECK=y 837CONFIG_ENABLE_MUST_CHECK=y
945# CONFIG_MAGIC_SYSRQ is not set 838# CONFIG_MAGIC_SYSRQ is not set
946# CONFIG_UNUSED_SYMBOLS is not set 839# CONFIG_UNUSED_SYMBOLS is not set
840# CONFIG_DEBUG_FS is not set
841# CONFIG_HEADERS_CHECK is not set
947# CONFIG_DEBUG_KERNEL is not set 842# CONFIG_DEBUG_KERNEL is not set
948CONFIG_LOG_BUF_SHIFT=15
949# CONFIG_DEBUG_BUGVERBOSE is not set 843# CONFIG_DEBUG_BUGVERBOSE is not set
950# CONFIG_DEBUG_FS is not set
951# CONFIG_FRAME_POINTER is not set 844# CONFIG_FRAME_POINTER is not set
952# CONFIG_UNWIND_INFO is not set
953# CONFIG_HEADERS_CHECK is not set
954 845
955# 846#
956# Security options 847# Security options
957# 848#
958# CONFIG_KEYS is not set 849# CONFIG_KEYS is not set
959# CONFIG_SECURITY is not set 850# CONFIG_SECURITY is not set
960
961#
962# Cryptographic options
963#
964# CONFIG_CRYPTO is not set 851# CONFIG_CRYPTO is not set
965 852
966# 853#
967# Library routines 854# Library routines
968# 855#
856CONFIG_BITREVERSE=y
969# CONFIG_CRC_CCITT is not set 857# CONFIG_CRC_CCITT is not set
970# CONFIG_CRC16 is not set 858# CONFIG_CRC16 is not set
859# CONFIG_CRC_ITU_T is not set
971CONFIG_CRC32=y 860CONFIG_CRC32=y
861# CONFIG_CRC7 is not set
972# CONFIG_LIBCRC32C is not set 862# CONFIG_LIBCRC32C is not set
863CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.up b/arch/m32r/configs/m32700ut.up_defconfig
index 190f961d33e2..a31823ffe29e 100644
--- a/arch/m32r/m32700ut/defconfig.m32700ut.up
+++ b/arch/m32r/configs/m32700ut.up_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Tue Dec 12 12:07:08 2006 4# Wed Aug 1 17:22:35 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -24,18 +27,19 @@ CONFIG_LOCALVERSION=""
24CONFIG_LOCALVERSION_AUTO=y 27CONFIG_LOCALVERSION_AUTO=y
25CONFIG_SWAP=y 28CONFIG_SWAP=y
26CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
27# CONFIG_IPC_NS is not set 30CONFIG_SYSVIPC_SYSCTL=y
28# CONFIG_POSIX_MQUEUE is not set 31# CONFIG_POSIX_MQUEUE is not set
29CONFIG_BSD_PROCESS_ACCT=y 32CONFIG_BSD_PROCESS_ACCT=y
30# CONFIG_BSD_PROCESS_ACCT_V3 is not set 33# CONFIG_BSD_PROCESS_ACCT_V3 is not set
31# CONFIG_TASKSTATS is not set 34# CONFIG_TASKSTATS is not set
32# CONFIG_UTS_NS is not set 35# CONFIG_USER_NS is not set
33# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
34CONFIG_IKCONFIG=y 37CONFIG_IKCONFIG=y
35CONFIG_IKCONFIG_PROC=y 38CONFIG_IKCONFIG_PROC=y
39CONFIG_LOG_BUF_SHIFT=14
36CONFIG_SYSFS_DEPRECATED=y 40CONFIG_SYSFS_DEPRECATED=y
37# CONFIG_RELAY is not set 41# CONFIG_RELAY is not set
38CONFIG_INITRAMFS_SOURCE="" 42# CONFIG_BLK_DEV_INITRD is not set
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SYSCTL=y 44CONFIG_SYSCTL=y
41CONFIG_EMBEDDED=y 45CONFIG_EMBEDDED=y
@@ -47,29 +51,29 @@ CONFIG_BUG=y
47CONFIG_ELF_CORE=y 51CONFIG_ELF_CORE=y
48CONFIG_BASE_FULL=y 52CONFIG_BASE_FULL=y
49# CONFIG_FUTEX is not set 53# CONFIG_FUTEX is not set
54CONFIG_ANON_INODES=y
50# CONFIG_EPOLL is not set 55# CONFIG_EPOLL is not set
56CONFIG_SIGNALFD=y
57CONFIG_TIMERFD=y
58CONFIG_EVENTFD=y
51CONFIG_SHMEM=y 59CONFIG_SHMEM=y
52CONFIG_SLAB=y
53CONFIG_VM_EVENT_COUNTERS=y 60CONFIG_VM_EVENT_COUNTERS=y
61CONFIG_SLAB=y
62# CONFIG_SLUB is not set
63# CONFIG_SLOB is not set
54# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
55CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
56# CONFIG_SLOB is not set
57
58#
59# Loadable module support
60#
61CONFIG_MODULES=y 66CONFIG_MODULES=y
62CONFIG_MODULE_UNLOAD=y 67CONFIG_MODULE_UNLOAD=y
63# CONFIG_MODULE_FORCE_UNLOAD is not set 68# CONFIG_MODULE_FORCE_UNLOAD is not set
64# CONFIG_MODVERSIONS is not set 69# CONFIG_MODVERSIONS is not set
65# CONFIG_MODULE_SRCVERSION_ALL is not set 70# CONFIG_MODULE_SRCVERSION_ALL is not set
66CONFIG_KMOD=y 71CONFIG_KMOD=y
67
68#
69# Block layer
70#
71CONFIG_BLOCK=y 72CONFIG_BLOCK=y
73# CONFIG_LBD is not set
72# CONFIG_BLK_DEV_IO_TRACE is not set 74# CONFIG_BLK_DEV_IO_TRACE is not set
75# CONFIG_LSF is not set
76# CONFIG_BLK_DEV_BSG is not set
73 77
74# 78#
75# IO Schedulers 79# IO Schedulers
@@ -122,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
122# CONFIG_SPARSEMEM_STATIC is not set 126# CONFIG_SPARSEMEM_STATIC is not set
123CONFIG_SPLIT_PTLOCK_CPUS=4 127CONFIG_SPLIT_PTLOCK_CPUS=4
124# CONFIG_RESOURCES_64BIT is not set 128# CONFIG_RESOURCES_64BIT is not set
129CONFIG_ZONE_DMA_FLAG=1
130CONFIG_BOUNCE=y
131CONFIG_VIRT_TO_BUS=y
125CONFIG_IRAM_START=0x00f00000 132CONFIG_IRAM_START=0x00f00000
126CONFIG_IRAM_SIZE=0x00080000 133CONFIG_IRAM_SIZE=0x00080000
127CONFIG_RWSEM_GENERIC_SPINLOCK=y 134CONFIG_RWSEM_GENERIC_SPINLOCK=y
128# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 135# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
136# CONFIG_ARCH_HAS_ILOG2_U32 is not set
137# CONFIG_ARCH_HAS_ILOG2_U64 is not set
129CONFIG_GENERIC_FIND_NEXT_BIT=y 138CONFIG_GENERIC_FIND_NEXT_BIT=y
130CONFIG_GENERIC_HWEIGHT=y 139CONFIG_GENERIC_HWEIGHT=y
131CONFIG_GENERIC_CALIBRATE_DELAY=y 140CONFIG_GENERIC_CALIBRATE_DELAY=y
141CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
132CONFIG_PREEMPT=y 142CONFIG_PREEMPT=y
133# CONFIG_SMP is not set 143# CONFIG_SMP is not set
134CONFIG_NODES_SHIFT=1 144CONFIG_NODES_SHIFT=1
@@ -136,6 +146,7 @@ CONFIG_NODES_SHIFT=1
136# 146#
137# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 147# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
138# 148#
149# CONFIG_ARCH_SUPPORTS_MSI is not set
139# CONFIG_ISA is not set 150# CONFIG_ISA is not set
140 151
141# 152#
@@ -144,10 +155,6 @@ CONFIG_NODES_SHIFT=1
144# CONFIG_PCCARD is not set 155# CONFIG_PCCARD is not set
145 156
146# 157#
147# PCI Hotplug Support
148#
149
150#
151# Executable file formats 158# Executable file formats
152# 159#
153CONFIG_BINFMT_ELF=y 160CONFIG_BINFMT_ELF=y
@@ -161,13 +168,13 @@ CONFIG_NET=y
161# 168#
162# Networking options 169# Networking options
163# 170#
164# CONFIG_NETDEBUG is not set
165CONFIG_PACKET=y 171CONFIG_PACKET=y
166# CONFIG_PACKET_MMAP is not set 172# CONFIG_PACKET_MMAP is not set
167CONFIG_UNIX=y 173CONFIG_UNIX=y
168CONFIG_XFRM=y 174CONFIG_XFRM=y
169# CONFIG_XFRM_USER is not set 175# CONFIG_XFRM_USER is not set
170# CONFIG_XFRM_SUB_POLICY is not set 176# CONFIG_XFRM_SUB_POLICY is not set
177# CONFIG_XFRM_MIGRATE is not set
171# CONFIG_NET_KEY is not set 178# CONFIG_NET_KEY is not set
172CONFIG_INET=y 179CONFIG_INET=y
173# CONFIG_IP_MULTICAST is not set 180# CONFIG_IP_MULTICAST is not set
@@ -200,20 +207,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
200# CONFIG_INET6_TUNNEL is not set 207# CONFIG_INET6_TUNNEL is not set
201# CONFIG_NETWORK_SECMARK is not set 208# CONFIG_NETWORK_SECMARK is not set
202# CONFIG_NETFILTER is not set 209# CONFIG_NETFILTER is not set
203
204#
205# DCCP Configuration (EXPERIMENTAL)
206#
207# CONFIG_IP_DCCP is not set 210# CONFIG_IP_DCCP is not set
208
209#
210# SCTP Configuration (EXPERIMENTAL)
211#
212# CONFIG_IP_SCTP is not set 211# CONFIG_IP_SCTP is not set
213
214#
215# TIPC Configuration (EXPERIMENTAL)
216#
217# CONFIG_TIPC is not set 212# CONFIG_TIPC is not set
218# CONFIG_ATM is not set 213# CONFIG_ATM is not set
219# CONFIG_BRIDGE is not set 214# CONFIG_BRIDGE is not set
@@ -239,7 +234,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
239# CONFIG_HAMRADIO is not set 234# CONFIG_HAMRADIO is not set
240# CONFIG_IRDA is not set 235# CONFIG_IRDA is not set
241# CONFIG_BT is not set 236# CONFIG_BT is not set
237# CONFIG_AF_RXRPC is not set
238
239#
240# Wireless
241#
242# CONFIG_CFG80211 is not set
243# CONFIG_WIRELESS_EXT is not set
244# CONFIG_MAC80211 is not set
242# CONFIG_IEEE80211 is not set 245# CONFIG_IEEE80211 is not set
246# CONFIG_RFKILL is not set
247# CONFIG_NET_9P is not set
243 248
244# 249#
245# Device Drivers 250# Device Drivers
@@ -252,15 +257,7 @@ CONFIG_STANDALONE=y
252CONFIG_PREVENT_FIRMWARE_BUILD=y 257CONFIG_PREVENT_FIRMWARE_BUILD=y
253CONFIG_FW_LOADER=y 258CONFIG_FW_LOADER=y
254# CONFIG_SYS_HYPERVISOR is not set 259# CONFIG_SYS_HYPERVISOR is not set
255
256#
257# Connector - unified userspace <-> kernelspace linker
258#
259# CONFIG_CONNECTOR is not set 260# CONFIG_CONNECTOR is not set
260
261#
262# Memory Technology Devices (MTD)
263#
264CONFIG_MTD=y 261CONFIG_MTD=y
265# CONFIG_MTD_DEBUG is not set 262# CONFIG_MTD_DEBUG is not set
266# CONFIG_MTD_CONCAT is not set 263# CONFIG_MTD_CONCAT is not set
@@ -275,6 +272,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
275# User Modules And Translation Layers 272# User Modules And Translation Layers
276# 273#
277# CONFIG_MTD_CHAR is not set 274# CONFIG_MTD_CHAR is not set
275CONFIG_MTD_BLKDEVS=y
278CONFIG_MTD_BLOCK=y 276CONFIG_MTD_BLOCK=y
279# CONFIG_FTL is not set 277# CONFIG_FTL is not set
280# CONFIG_NFTL is not set 278# CONFIG_NFTL is not set
@@ -311,7 +309,6 @@ CONFIG_MTD_CFI_UTIL=m
311# CONFIG_MTD_RAM is not set 309# CONFIG_MTD_RAM is not set
312# CONFIG_MTD_ROM is not set 310# CONFIG_MTD_ROM is not set
313# CONFIG_MTD_ABSENT is not set 311# CONFIG_MTD_ABSENT is not set
314# CONFIG_MTD_OBSOLETE_CHIPS is not set
315 312
316# 313#
317# Mapping drivers for chip access 314# Mapping drivers for chip access
@@ -334,29 +331,15 @@ CONFIG_MTD_CFI_UTIL=m
334# CONFIG_MTD_DOC2000 is not set 331# CONFIG_MTD_DOC2000 is not set
335# CONFIG_MTD_DOC2001 is not set 332# CONFIG_MTD_DOC2001 is not set
336# CONFIG_MTD_DOC2001PLUS is not set 333# CONFIG_MTD_DOC2001PLUS is not set
337
338#
339# NAND Flash Device Drivers
340#
341# CONFIG_MTD_NAND is not set 334# CONFIG_MTD_NAND is not set
342
343#
344# OneNAND Flash Device Drivers
345#
346# CONFIG_MTD_ONENAND is not set 335# CONFIG_MTD_ONENAND is not set
347 336
348# 337#
349# Parallel port support 338# UBI - Unsorted block images
350# 339#
340# CONFIG_MTD_UBI is not set
351# CONFIG_PARPORT is not set 341# CONFIG_PARPORT is not set
352 342CONFIG_BLK_DEV=y
353#
354# Plug and Play support
355#
356
357#
358# Block devices
359#
360# CONFIG_BLK_DEV_COW_COMMON is not set 343# CONFIG_BLK_DEV_COW_COMMON is not set
361CONFIG_BLK_DEV_LOOP=y 344CONFIG_BLK_DEV_LOOP=y
362# CONFIG_BLK_DEV_CRYPTOLOOP is not set 345# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -365,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y
365CONFIG_BLK_DEV_RAM_COUNT=16 348CONFIG_BLK_DEV_RAM_COUNT=16
366CONFIG_BLK_DEV_RAM_SIZE=4096 349CONFIG_BLK_DEV_RAM_SIZE=4096
367CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 350CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
368# CONFIG_BLK_DEV_INITRD is not set
369# CONFIG_CDROM_PKTCDVD is not set 351# CONFIG_CDROM_PKTCDVD is not set
370CONFIG_ATA_OVER_ETH=m 352CONFIG_ATA_OVER_ETH=m
371 353CONFIG_MISC_DEVICES=y
372# 354# CONFIG_EEPROM_93CX6 is not set
373# Misc devices
374#
375# CONFIG_TIFM_CORE is not set
376
377#
378# ATA/ATAPI/MFM/RLL support
379#
380CONFIG_IDE=y 355CONFIG_IDE=y
381CONFIG_IDE_MAX_HWIFS=4 356CONFIG_IDE_MAX_HWIFS=4
382CONFIG_BLK_DEV_IDE=y 357CONFIG_BLK_DEV_IDE=y
@@ -392,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m
392# CONFIG_BLK_DEV_IDEFLOPPY is not set 367# CONFIG_BLK_DEV_IDEFLOPPY is not set
393# CONFIG_BLK_DEV_IDESCSI is not set 368# CONFIG_BLK_DEV_IDESCSI is not set
394# CONFIG_IDE_TASK_IOCTL is not set 369# CONFIG_IDE_TASK_IOCTL is not set
370CONFIG_IDE_PROC_FS=y
395 371
396# 372#
397# IDE chipset support/bugfixes 373# IDE chipset support/bugfixes
398# 374#
399CONFIG_IDE_GENERIC=y 375CONFIG_IDE_GENERIC=y
376# CONFIG_IDEPCI_PCIBUS_ORDER is not set
400# CONFIG_IDE_ARM is not set 377# CONFIG_IDE_ARM is not set
401# CONFIG_BLK_DEV_IDEDMA is not set 378# CONFIG_BLK_DEV_IDEDMA is not set
402# CONFIG_IDEDMA_AUTO is not set
403# CONFIG_BLK_DEV_HD is not set 379# CONFIG_BLK_DEV_HD is not set
404 380
405# 381#
@@ -407,6 +383,8 @@ CONFIG_IDE_GENERIC=y
407# 383#
408# CONFIG_RAID_ATTRS is not set 384# CONFIG_RAID_ATTRS is not set
409CONFIG_SCSI=m 385CONFIG_SCSI=m
386# CONFIG_SCSI_DMA is not set
387# CONFIG_SCSI_TGT is not set
410# CONFIG_SCSI_NETLINK is not set 388# CONFIG_SCSI_NETLINK is not set
411CONFIG_SCSI_PROC_FS=y 389CONFIG_SCSI_PROC_FS=y
412 390
@@ -427,6 +405,8 @@ CONFIG_CHR_DEV_SG=m
427CONFIG_SCSI_MULTI_LUN=y 405CONFIG_SCSI_MULTI_LUN=y
428# CONFIG_SCSI_CONSTANTS is not set 406# CONFIG_SCSI_CONSTANTS is not set
429# CONFIG_SCSI_LOGGING is not set 407# CONFIG_SCSI_LOGGING is not set
408# CONFIG_SCSI_SCAN_ASYNC is not set
409CONFIG_SCSI_WAIT_SCAN=m
430 410
431# 411#
432# SCSI Transports 412# SCSI Transports
@@ -434,79 +414,31 @@ CONFIG_SCSI_MULTI_LUN=y
434# CONFIG_SCSI_SPI_ATTRS is not set 414# CONFIG_SCSI_SPI_ATTRS is not set
435# CONFIG_SCSI_FC_ATTRS is not set 415# CONFIG_SCSI_FC_ATTRS is not set
436# CONFIG_SCSI_ISCSI_ATTRS is not set 416# CONFIG_SCSI_ISCSI_ATTRS is not set
437# CONFIG_SCSI_SAS_ATTRS is not set
438# CONFIG_SCSI_SAS_LIBSAS is not set 417# CONFIG_SCSI_SAS_LIBSAS is not set
439 418CONFIG_SCSI_LOWLEVEL=y
440#
441# SCSI low-level drivers
442#
443# CONFIG_ISCSI_TCP is not set 419# CONFIG_ISCSI_TCP is not set
444# CONFIG_SCSI_DEBUG is not set 420# CONFIG_SCSI_DEBUG is not set
445
446#
447# Serial ATA (prod) and Parallel ATA (experimental) drivers
448#
449
450#
451# Multi-device support (RAID and LVM)
452#
453# CONFIG_MD is not set 421# CONFIG_MD is not set
454
455#
456# Fusion MPT device support
457#
458# CONFIG_FUSION is not set
459
460#
461# IEEE 1394 (FireWire) support
462#
463
464#
465# I2O device support
466#
467
468#
469# Network device support
470#
471CONFIG_NETDEVICES=y 422CONFIG_NETDEVICES=y
423# CONFIG_NETDEVICES_MULTIQUEUE is not set
472# CONFIG_DUMMY is not set 424# CONFIG_DUMMY is not set
473# CONFIG_BONDING is not set 425# CONFIG_BONDING is not set
426# CONFIG_MACVLAN is not set
474# CONFIG_EQUALIZER is not set 427# CONFIG_EQUALIZER is not set
475# CONFIG_TUN is not set 428# CONFIG_TUN is not set
476
477#
478# PHY device support
479#
480# CONFIG_PHYLIB is not set 429# CONFIG_PHYLIB is not set
481
482#
483# Ethernet (10 or 100Mbit)
484#
485CONFIG_NET_ETHERNET=y 430CONFIG_NET_ETHERNET=y
486CONFIG_MII=y 431CONFIG_MII=y
487CONFIG_SMC91X=y 432CONFIG_SMC91X=y
488# CONFIG_NE2000 is not set 433# CONFIG_NE2000 is not set
434CONFIG_NETDEV_1000=y
435CONFIG_NETDEV_10000=y
489 436
490# 437#
491# Ethernet (1000 Mbit) 438# Wireless LAN
492#
493
494#
495# Ethernet (10000 Mbit)
496#
497
498#
499# Token Ring devices
500#
501
502#
503# Wireless LAN (non-hamradio)
504#
505# CONFIG_NET_RADIO is not set
506
507#
508# Wan interfaces
509# 439#
440# CONFIG_WLAN_PRE80211 is not set
441# CONFIG_WLAN_80211 is not set
510# CONFIG_WAN is not set 442# CONFIG_WAN is not set
511# CONFIG_PPP is not set 443# CONFIG_PPP is not set
512# CONFIG_SLIP is not set 444# CONFIG_SLIP is not set
@@ -514,15 +446,7 @@ CONFIG_SMC91X=y
514# CONFIG_NETCONSOLE is not set 446# CONFIG_NETCONSOLE is not set
515# CONFIG_NETPOLL is not set 447# CONFIG_NETPOLL is not set
516# CONFIG_NET_POLL_CONTROLLER is not set 448# CONFIG_NET_POLL_CONTROLLER is not set
517
518#
519# ISDN subsystem
520#
521# CONFIG_ISDN is not set 449# CONFIG_ISDN is not set
522
523#
524# Telephony Support
525#
526# CONFIG_PHONE is not set 450# CONFIG_PHONE is not set
527 451
528# 452#
@@ -530,6 +454,7 @@ CONFIG_SMC91X=y
530# 454#
531CONFIG_INPUT=y 455CONFIG_INPUT=y
532# CONFIG_INPUT_FF_MEMLESS is not set 456# CONFIG_INPUT_FF_MEMLESS is not set
457# CONFIG_INPUT_POLLDEV is not set
533 458
534# 459#
535# Userland interfaces 460# Userland interfaces
@@ -546,6 +471,7 @@ CONFIG_INPUT=y
546# CONFIG_INPUT_KEYBOARD is not set 471# CONFIG_INPUT_KEYBOARD is not set
547# CONFIG_INPUT_MOUSE is not set 472# CONFIG_INPUT_MOUSE is not set
548# CONFIG_INPUT_JOYSTICK is not set 473# CONFIG_INPUT_JOYSTICK is not set
474# CONFIG_INPUT_TABLET is not set
549# CONFIG_INPUT_TOUCHSCREEN is not set 475# CONFIG_INPUT_TOUCHSCREEN is not set
550# CONFIG_INPUT_MISC is not set 476# CONFIG_INPUT_MISC is not set
551 477
@@ -584,35 +510,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y
584CONFIG_UNIX98_PTYS=y 510CONFIG_UNIX98_PTYS=y
585CONFIG_LEGACY_PTYS=y 511CONFIG_LEGACY_PTYS=y
586CONFIG_LEGACY_PTY_COUNT=256 512CONFIG_LEGACY_PTY_COUNT=256
587
588#
589# IPMI
590#
591# CONFIG_IPMI_HANDLER is not set 513# CONFIG_IPMI_HANDLER is not set
592
593#
594# Watchdog Cards
595#
596# CONFIG_WATCHDOG is not set 514# CONFIG_WATCHDOG is not set
597CONFIG_HW_RANDOM=y 515CONFIG_HW_RANDOM=y
598# CONFIG_RTC is not set 516# CONFIG_RTC is not set
599CONFIG_DS1302=y 517CONFIG_DS1302=y
600# CONFIG_DTLK is not set
601# CONFIG_R3964 is not set 518# CONFIG_R3964 is not set
602
603#
604# Ftape, the floppy tape device driver
605#
606# CONFIG_RAW_DRIVER is not set 519# CONFIG_RAW_DRIVER is not set
607
608#
609# TPM devices
610#
611# CONFIG_TCG_TPM is not set 520# CONFIG_TCG_TPM is not set
612
613#
614# I2C support
615#
616# CONFIG_I2C is not set 521# CONFIG_I2C is not set
617 522
618# 523#
@@ -620,65 +525,76 @@ CONFIG_DS1302=y
620# 525#
621# CONFIG_SPI is not set 526# CONFIG_SPI is not set
622# CONFIG_SPI_MASTER is not set 527# CONFIG_SPI_MASTER is not set
623
624#
625# Dallas's 1-wire bus
626#
627# CONFIG_W1 is not set 528# CONFIG_W1 is not set
628 529# CONFIG_POWER_SUPPLY is not set
629#
630# Hardware Monitoring support
631#
632CONFIG_HWMON=y 530CONFIG_HWMON=y
633# CONFIG_HWMON_VID is not set 531# CONFIG_HWMON_VID is not set
634# CONFIG_SENSORS_ABITUGURU is not set 532# CONFIG_SENSORS_ABITUGURU is not set
533# CONFIG_SENSORS_ABITUGURU3 is not set
635# CONFIG_SENSORS_F71805F is not set 534# CONFIG_SENSORS_F71805F is not set
535# CONFIG_SENSORS_IT87 is not set
536# CONFIG_SENSORS_PC87360 is not set
537# CONFIG_SENSORS_PC87427 is not set
538# CONFIG_SENSORS_SMSC47M1 is not set
539# CONFIG_SENSORS_SMSC47B397 is not set
636# CONFIG_SENSORS_VT1211 is not set 540# CONFIG_SENSORS_VT1211 is not set
541# CONFIG_SENSORS_W83627HF is not set
542# CONFIG_SENSORS_W83627EHF is not set
637# CONFIG_HWMON_DEBUG_CHIP is not set 543# CONFIG_HWMON_DEBUG_CHIP is not set
638 544
639# 545#
546# Multifunction device drivers
547#
548# CONFIG_MFD_SM501 is not set
549
550#
640# Multimedia devices 551# Multimedia devices
641# 552#
642CONFIG_VIDEO_DEV=m 553CONFIG_VIDEO_DEV=m
643CONFIG_VIDEO_V4L1=y 554CONFIG_VIDEO_V4L1=y
644CONFIG_VIDEO_V4L1_COMPAT=y 555CONFIG_VIDEO_V4L1_COMPAT=y
645CONFIG_VIDEO_V4L2=y 556CONFIG_VIDEO_V4L2=y
646 557CONFIG_VIDEO_CAPTURE_DRIVERS=y
647#
648# Video Capture Adapters
649#
650
651#
652# Video Capture Adapters
653#
654# CONFIG_VIDEO_ADV_DEBUG is not set 558# CONFIG_VIDEO_ADV_DEBUG is not set
655CONFIG_VIDEO_HELPER_CHIPS_AUTO=y 559CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
656# CONFIG_VIDEO_VIVI is not set
657# CONFIG_VIDEO_CPIA is not set 560# CONFIG_VIDEO_CPIA is not set
658CONFIG_VIDEO_M32R_AR=m 561CONFIG_VIDEO_M32R_AR=m
659CONFIG_VIDEO_M32R_AR_M64278=m 562CONFIG_VIDEO_M32R_AR_M64278=m
563CONFIG_RADIO_ADAPTERS=y
564# CONFIG_DVB_CORE is not set
565CONFIG_DAB=y
660 566
661# 567#
662# Radio Adapters 568# Graphics support
663#
664
665#
666# Digital Video Broadcasting Devices
667# 569#
668# CONFIG_DVB is not set 570# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
669 571
670# 572#
671# Graphics support 573# Display device support
672# 574#
673CONFIG_FIRMWARE_EDID=y 575# CONFIG_DISPLAY_SUPPORT is not set
576# CONFIG_VGASTATE is not set
577CONFIG_VIDEO_OUTPUT_CONTROL=m
674CONFIG_FB=y 578CONFIG_FB=y
579CONFIG_FIRMWARE_EDID=y
580# CONFIG_FB_DDC is not set
675CONFIG_FB_CFB_FILLRECT=y 581CONFIG_FB_CFB_FILLRECT=y
676CONFIG_FB_CFB_COPYAREA=y 582CONFIG_FB_CFB_COPYAREA=y
677CONFIG_FB_CFB_IMAGEBLIT=y 583CONFIG_FB_CFB_IMAGEBLIT=y
584# CONFIG_FB_SYS_FILLRECT is not set
585# CONFIG_FB_SYS_COPYAREA is not set
586# CONFIG_FB_SYS_IMAGEBLIT is not set
587# CONFIG_FB_SYS_FOPS is not set
588CONFIG_FB_DEFERRED_IO=y
589# CONFIG_FB_SVGALIB is not set
678# CONFIG_FB_MACMODES is not set 590# CONFIG_FB_MACMODES is not set
679# CONFIG_FB_BACKLIGHT is not set 591# CONFIG_FB_BACKLIGHT is not set
680# CONFIG_FB_MODE_HELPERS is not set 592# CONFIG_FB_MODE_HELPERS is not set
681# CONFIG_FB_TILEBLITTING is not set 593# CONFIG_FB_TILEBLITTING is not set
594
595#
596# Frame buffer hardware drivers
597#
682CONFIG_FB_S1D13XXX=y 598CONFIG_FB_S1D13XXX=y
683# CONFIG_FB_VIRTUAL is not set 599# CONFIG_FB_VIRTUAL is not set
684 600
@@ -688,29 +604,25 @@ CONFIG_FB_S1D13XXX=y
688# CONFIG_VGA_CONSOLE is not set 604# CONFIG_VGA_CONSOLE is not set
689CONFIG_DUMMY_CONSOLE=y 605CONFIG_DUMMY_CONSOLE=y
690CONFIG_FRAMEBUFFER_CONSOLE=y 606CONFIG_FRAMEBUFFER_CONSOLE=y
607# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
691# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 608# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
692# CONFIG_FONTS is not set 609# CONFIG_FONTS is not set
693CONFIG_FONT_8x8=y 610CONFIG_FONT_8x8=y
694CONFIG_FONT_8x16=y 611CONFIG_FONT_8x16=y
695
696#
697# Logo configuration
698#
699CONFIG_LOGO=y 612CONFIG_LOGO=y
700CONFIG_LOGO_LINUX_MONO=y 613CONFIG_LOGO_LINUX_MONO=y
701CONFIG_LOGO_LINUX_VGA16=y 614CONFIG_LOGO_LINUX_VGA16=y
702CONFIG_LOGO_LINUX_CLUT224=y 615CONFIG_LOGO_LINUX_CLUT224=y
703CONFIG_LOGO_M32R_CLUT224=y 616CONFIG_LOGO_M32R_CLUT224=y
704# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
705 617
706# 618#
707# Sound 619# Sound
708# 620#
709# CONFIG_SOUND is not set 621# CONFIG_SOUND is not set
710 622CONFIG_HID_SUPPORT=y
711# 623CONFIG_HID=y
712# USB support 624# CONFIG_HID_DEBUG is not set
713# 625CONFIG_USB_SUPPORT=y
714# CONFIG_USB_ARCH_HAS_HCD is not set 626# CONFIG_USB_ARCH_HAS_HCD is not set
715# CONFIG_USB_ARCH_HAS_OHCI is not set 627# CONFIG_USB_ARCH_HAS_OHCI is not set
716# CONFIG_USB_ARCH_HAS_EHCI is not set 628# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -723,35 +635,20 @@ CONFIG_LOGO_M32R_CLUT224=y
723# USB Gadget Support 635# USB Gadget Support
724# 636#
725# CONFIG_USB_GADGET is not set 637# CONFIG_USB_GADGET is not set
726
727#
728# MMC/SD Card support
729#
730CONFIG_MMC=y 638CONFIG_MMC=y
731CONFIG_MMC_DEBUG=y 639CONFIG_MMC_DEBUG=y
732CONFIG_MMC_BLOCK=y 640# CONFIG_MMC_UNSAFE_RESUME is not set
733# CONFIG_MMC_TIFM_SD is not set
734
735#
736# LED devices
737#
738# CONFIG_NEW_LEDS is not set
739
740#
741# LED drivers
742#
743 641
744# 642#
745# LED Triggers 643# MMC/SD Card Drivers
746#
747
748#
749# InfiniBand support
750# 644#
645CONFIG_MMC_BLOCK=y
646CONFIG_MMC_BLOCK_BOUNCE=y
751 647
752# 648#
753# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 649# MMC/SD Host Controller Drivers
754# 650#
651# CONFIG_NEW_LEDS is not set
755 652
756# 653#
757# Real Time Clock 654# Real Time Clock
@@ -759,17 +656,9 @@ CONFIG_MMC_BLOCK=y
759# CONFIG_RTC_CLASS is not set 656# CONFIG_RTC_CLASS is not set
760 657
761# 658#
762# DMA Engine support 659# Userspace I/O
763#
764# CONFIG_DMA_ENGINE is not set
765
766#
767# DMA Clients
768#
769
770#
771# DMA Devices
772# 660#
661# CONFIG_UIO is not set
773 662
774# 663#
775# File systems 664# File systems
@@ -846,7 +735,6 @@ CONFIG_RAMFS=y
846# CONFIG_BEFS_FS is not set 735# CONFIG_BEFS_FS is not set
847# CONFIG_BFS_FS is not set 736# CONFIG_BFS_FS is not set
848# CONFIG_EFS_FS is not set 737# CONFIG_EFS_FS is not set
849# CONFIG_JFFS_FS is not set
850# CONFIG_JFFS2_FS is not set 738# CONFIG_JFFS2_FS is not set
851# CONFIG_CRAMFS is not set 739# CONFIG_CRAMFS is not set
852# CONFIG_VXFS_FS is not set 740# CONFIG_VXFS_FS is not set
@@ -869,6 +757,7 @@ CONFIG_LOCKD=y
869CONFIG_LOCKD_V4=y 757CONFIG_LOCKD_V4=y
870CONFIG_NFS_COMMON=y 758CONFIG_NFS_COMMON=y
871CONFIG_SUNRPC=y 759CONFIG_SUNRPC=y
760# CONFIG_SUNRPC_BIND34 is not set
872# CONFIG_RPCSEC_GSS_KRB5 is not set 761# CONFIG_RPCSEC_GSS_KRB5 is not set
873# CONFIG_RPCSEC_GSS_SPKM3 is not set 762# CONFIG_RPCSEC_GSS_SPKM3 is not set
874# CONFIG_SMB_FS is not set 763# CONFIG_SMB_FS is not set
@@ -876,7 +765,6 @@ CONFIG_SUNRPC=y
876# CONFIG_NCP_FS is not set 765# CONFIG_NCP_FS is not set
877# CONFIG_CODA_FS is not set 766# CONFIG_CODA_FS is not set
878# CONFIG_AFS_FS is not set 767# CONFIG_AFS_FS is not set
879# CONFIG_9P_FS is not set
880 768
881# 769#
882# Partition Types 770# Partition Types
@@ -929,6 +817,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
929# CONFIG_NLS_UTF8 is not set 817# CONFIG_NLS_UTF8 is not set
930 818
931# 819#
820# Distributed Lock Manager
821#
822# CONFIG_DLM is not set
823
824#
932# Profiling support 825# Profiling support
933# 826#
934CONFIG_PROFILING=y 827CONFIG_PROFILING=y
@@ -941,29 +834,27 @@ CONFIG_OPROFILE=y
941CONFIG_ENABLE_MUST_CHECK=y 834CONFIG_ENABLE_MUST_CHECK=y
942# CONFIG_MAGIC_SYSRQ is not set 835# CONFIG_MAGIC_SYSRQ is not set
943# CONFIG_UNUSED_SYMBOLS is not set 836# CONFIG_UNUSED_SYMBOLS is not set
837# CONFIG_DEBUG_FS is not set
838# CONFIG_HEADERS_CHECK is not set
944# CONFIG_DEBUG_KERNEL is not set 839# CONFIG_DEBUG_KERNEL is not set
945CONFIG_LOG_BUF_SHIFT=14
946# CONFIG_DEBUG_BUGVERBOSE is not set 840# CONFIG_DEBUG_BUGVERBOSE is not set
947# CONFIG_DEBUG_FS is not set
948# CONFIG_FRAME_POINTER is not set 841# CONFIG_FRAME_POINTER is not set
949# CONFIG_UNWIND_INFO is not set
950# CONFIG_HEADERS_CHECK is not set
951 842
952# 843#
953# Security options 844# Security options
954# 845#
955# CONFIG_KEYS is not set 846# CONFIG_KEYS is not set
956# CONFIG_SECURITY is not set 847# CONFIG_SECURITY is not set
957
958#
959# Cryptographic options
960#
961# CONFIG_CRYPTO is not set 848# CONFIG_CRYPTO is not set
962 849
963# 850#
964# Library routines 851# Library routines
965# 852#
853CONFIG_BITREVERSE=y
966# CONFIG_CRC_CCITT is not set 854# CONFIG_CRC_CCITT is not set
967# CONFIG_CRC16 is not set 855# CONFIG_CRC16 is not set
856# CONFIG_CRC_ITU_T is not set
968CONFIG_CRC32=y 857CONFIG_CRC32=y
858# CONFIG_CRC7 is not set
969# CONFIG_LIBCRC32C is not set 859# CONFIG_LIBCRC32C is not set
860CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi/defconfig.nommu b/arch/m32r/configs/mappi.nommu_defconfig
index fbf6c384c9d0..e3379de1f0c8 100644
--- a/arch/m32r/mappi/defconfig.nommu
+++ b/arch/m32r/configs/mappi.nommu_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Wed Dec 13 17:57:45 2006 4# Wed Aug 1 17:22:36 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -27,13 +30,14 @@ CONFIG_LOCALVERSION_AUTO=y
27CONFIG_BSD_PROCESS_ACCT=y 30CONFIG_BSD_PROCESS_ACCT=y
28# CONFIG_BSD_PROCESS_ACCT_V3 is not set 31# CONFIG_BSD_PROCESS_ACCT_V3 is not set
29# CONFIG_TASKSTATS is not set 32# CONFIG_TASKSTATS is not set
30# CONFIG_UTS_NS is not set 33# CONFIG_USER_NS is not set
31# CONFIG_AUDIT is not set 34# CONFIG_AUDIT is not set
32CONFIG_IKCONFIG=y 35CONFIG_IKCONFIG=y
33# CONFIG_IKCONFIG_PROC is not set 36# CONFIG_IKCONFIG_PROC is not set
37CONFIG_LOG_BUF_SHIFT=14
34CONFIG_SYSFS_DEPRECATED=y 38CONFIG_SYSFS_DEPRECATED=y
35# CONFIG_RELAY is not set 39# CONFIG_RELAY is not set
36CONFIG_INITRAMFS_SOURCE="" 40# CONFIG_BLK_DEV_INITRD is not set
37# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
38CONFIG_SYSCTL=y 42CONFIG_SYSCTL=y
39CONFIG_EMBEDDED=y 43CONFIG_EMBEDDED=y
@@ -45,28 +49,28 @@ CONFIG_BUG=y
45CONFIG_ELF_CORE=y 49CONFIG_ELF_CORE=y
46CONFIG_BASE_FULL=y 50CONFIG_BASE_FULL=y
47# CONFIG_FUTEX is not set 51# CONFIG_FUTEX is not set
52CONFIG_ANON_INODES=y
48# CONFIG_EPOLL is not set 53# CONFIG_EPOLL is not set
49CONFIG_SLAB=y 54CONFIG_SIGNALFD=y
55CONFIG_TIMERFD=y
56CONFIG_EVENTFD=y
50CONFIG_VM_EVENT_COUNTERS=y 57CONFIG_VM_EVENT_COUNTERS=y
58CONFIG_SLAB=y
59# CONFIG_SLUB is not set
60# CONFIG_SLOB is not set
51CONFIG_TINY_SHMEM=y 61CONFIG_TINY_SHMEM=y
52CONFIG_BASE_SMALL=0 62CONFIG_BASE_SMALL=0
53# CONFIG_SLOB is not set
54
55#
56# Loadable module support
57#
58CONFIG_MODULES=y 63CONFIG_MODULES=y
59CONFIG_MODULE_UNLOAD=y 64CONFIG_MODULE_UNLOAD=y
60# CONFIG_MODULE_FORCE_UNLOAD is not set 65# CONFIG_MODULE_FORCE_UNLOAD is not set
61# CONFIG_MODVERSIONS is not set 66# CONFIG_MODVERSIONS is not set
62# CONFIG_MODULE_SRCVERSION_ALL is not set 67# CONFIG_MODULE_SRCVERSION_ALL is not set
63CONFIG_KMOD=y 68CONFIG_KMOD=y
64
65#
66# Block layer
67#
68CONFIG_BLOCK=y 69CONFIG_BLOCK=y
70# CONFIG_LBD is not set
69# CONFIG_BLK_DEV_IO_TRACE is not set 71# CONFIG_BLK_DEV_IO_TRACE is not set
72# CONFIG_LSF is not set
73# CONFIG_BLK_DEV_BSG is not set
70 74
71# 75#
72# IO Schedulers 76# IO Schedulers
@@ -119,13 +123,18 @@ CONFIG_NEED_MULTIPLE_NODES=y
119# CONFIG_SPARSEMEM_STATIC is not set 123# CONFIG_SPARSEMEM_STATIC is not set
120CONFIG_SPLIT_PTLOCK_CPUS=4 124CONFIG_SPLIT_PTLOCK_CPUS=4
121# CONFIG_RESOURCES_64BIT is not set 125# CONFIG_RESOURCES_64BIT is not set
126CONFIG_ZONE_DMA_FLAG=1
127CONFIG_VIRT_TO_BUS=y
122CONFIG_IRAM_START=0x00f00000 128CONFIG_IRAM_START=0x00f00000
123CONFIG_IRAM_SIZE=0x00080000 129CONFIG_IRAM_SIZE=0x00080000
124CONFIG_RWSEM_GENERIC_SPINLOCK=y 130CONFIG_RWSEM_GENERIC_SPINLOCK=y
125# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 131# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
132# CONFIG_ARCH_HAS_ILOG2_U32 is not set
133# CONFIG_ARCH_HAS_ILOG2_U64 is not set
126CONFIG_GENERIC_FIND_NEXT_BIT=y 134CONFIG_GENERIC_FIND_NEXT_BIT=y
127CONFIG_GENERIC_HWEIGHT=y 135CONFIG_GENERIC_HWEIGHT=y
128CONFIG_GENERIC_CALIBRATE_DELAY=y 136CONFIG_GENERIC_CALIBRATE_DELAY=y
137CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
129CONFIG_PREEMPT=y 138CONFIG_PREEMPT=y
130# CONFIG_SMP is not set 139# CONFIG_SMP is not set
131CONFIG_NODES_SHIFT=1 140CONFIG_NODES_SHIFT=1
@@ -133,6 +142,7 @@ CONFIG_NODES_SHIFT=1
133# 142#
134# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 143# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
135# 144#
145# CONFIG_ARCH_SUPPORTS_MSI is not set
136# CONFIG_ISA is not set 146# CONFIG_ISA is not set
137 147
138# 148#
@@ -151,10 +161,6 @@ CONFIG_M32R_PCC=y
151CONFIG_PCCARD_NONSTATIC=y 161CONFIG_PCCARD_NONSTATIC=y
152 162
153# 163#
154# PCI Hotplug Support
155#
156
157#
158# Executable file formats 164# Executable file formats
159# 165#
160CONFIG_BINFMT_FLAT=y 166CONFIG_BINFMT_FLAT=y
@@ -170,13 +176,13 @@ CONFIG_NET=y
170# 176#
171# Networking options 177# Networking options
172# 178#
173# CONFIG_NETDEBUG is not set
174CONFIG_PACKET=y 179CONFIG_PACKET=y
175# CONFIG_PACKET_MMAP is not set 180# CONFIG_PACKET_MMAP is not set
176CONFIG_UNIX=y 181CONFIG_UNIX=y
177CONFIG_XFRM=y 182CONFIG_XFRM=y
178# CONFIG_XFRM_USER is not set 183# CONFIG_XFRM_USER is not set
179# CONFIG_XFRM_SUB_POLICY is not set 184# CONFIG_XFRM_SUB_POLICY is not set
185# CONFIG_XFRM_MIGRATE is not set
180# CONFIG_NET_KEY is not set 186# CONFIG_NET_KEY is not set
181CONFIG_INET=y 187CONFIG_INET=y
182# CONFIG_IP_MULTICAST is not set 188# CONFIG_IP_MULTICAST is not set
@@ -209,20 +215,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
209# CONFIG_INET6_TUNNEL is not set 215# CONFIG_INET6_TUNNEL is not set
210# CONFIG_NETWORK_SECMARK is not set 216# CONFIG_NETWORK_SECMARK is not set
211# CONFIG_NETFILTER is not set 217# CONFIG_NETFILTER is not set
212
213#
214# DCCP Configuration (EXPERIMENTAL)
215#
216# CONFIG_IP_DCCP is not set 218# CONFIG_IP_DCCP is not set
217
218#
219# SCTP Configuration (EXPERIMENTAL)
220#
221# CONFIG_IP_SCTP is not set 219# CONFIG_IP_SCTP is not set
222
223#
224# TIPC Configuration (EXPERIMENTAL)
225#
226# CONFIG_TIPC is not set 220# CONFIG_TIPC is not set
227# CONFIG_ATM is not set 221# CONFIG_ATM is not set
228# CONFIG_BRIDGE is not set 222# CONFIG_BRIDGE is not set
@@ -248,7 +242,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
248# CONFIG_HAMRADIO is not set 242# CONFIG_HAMRADIO is not set
249# CONFIG_IRDA is not set 243# CONFIG_IRDA is not set
250# CONFIG_BT is not set 244# CONFIG_BT is not set
245# CONFIG_AF_RXRPC is not set
246
247#
248# Wireless
249#
250# CONFIG_CFG80211 is not set
251# CONFIG_WIRELESS_EXT is not set
252# CONFIG_MAC80211 is not set
251# CONFIG_IEEE80211 is not set 253# CONFIG_IEEE80211 is not set
254# CONFIG_RFKILL is not set
255# CONFIG_NET_9P is not set
252 256
253# 257#
254# Device Drivers 258# Device Drivers
@@ -261,29 +265,10 @@ CONFIG_STANDALONE=y
261CONFIG_PREVENT_FIRMWARE_BUILD=y 265CONFIG_PREVENT_FIRMWARE_BUILD=y
262CONFIG_FW_LOADER=y 266CONFIG_FW_LOADER=y
263# CONFIG_SYS_HYPERVISOR is not set 267# CONFIG_SYS_HYPERVISOR is not set
264
265#
266# Connector - unified userspace <-> kernelspace linker
267#
268# CONFIG_CONNECTOR is not set 268# CONFIG_CONNECTOR is not set
269
270#
271# Memory Technology Devices (MTD)
272#
273# CONFIG_MTD is not set 269# CONFIG_MTD is not set
274
275#
276# Parallel port support
277#
278# CONFIG_PARPORT is not set 270# CONFIG_PARPORT is not set
279 271CONFIG_BLK_DEV=y
280#
281# Plug and Play support
282#
283
284#
285# Block devices
286#
287# CONFIG_BLK_DEV_COW_COMMON is not set 272# CONFIG_BLK_DEV_COW_COMMON is not set
288CONFIG_BLK_DEV_LOOP=y 273CONFIG_BLK_DEV_LOOP=y
289# CONFIG_BLK_DEV_CRYPTOLOOP is not set 274# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -292,18 +277,10 @@ CONFIG_BLK_DEV_RAM=y
292CONFIG_BLK_DEV_RAM_COUNT=16 277CONFIG_BLK_DEV_RAM_COUNT=16
293CONFIG_BLK_DEV_RAM_SIZE=4096 278CONFIG_BLK_DEV_RAM_SIZE=4096
294CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 279CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
295# CONFIG_BLK_DEV_INITRD is not set
296# CONFIG_CDROM_PKTCDVD is not set 280# CONFIG_CDROM_PKTCDVD is not set
297# CONFIG_ATA_OVER_ETH is not set 281# CONFIG_ATA_OVER_ETH is not set
298 282CONFIG_MISC_DEVICES=y
299# 283# CONFIG_EEPROM_93CX6 is not set
300# Misc devices
301#
302# CONFIG_TIFM_CORE is not set
303
304#
305# ATA/ATAPI/MFM/RLL support
306#
307# CONFIG_IDE is not set 284# CONFIG_IDE is not set
308 285
309# 286#
@@ -311,74 +288,26 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
311# 288#
312# CONFIG_RAID_ATTRS is not set 289# CONFIG_RAID_ATTRS is not set
313# CONFIG_SCSI is not set 290# CONFIG_SCSI is not set
291# CONFIG_SCSI_DMA is not set
314# CONFIG_SCSI_NETLINK is not set 292# CONFIG_SCSI_NETLINK is not set
315
316#
317# Serial ATA (prod) and Parallel ATA (experimental) drivers
318#
319
320#
321# Multi-device support (RAID and LVM)
322#
323# CONFIG_MD is not set 293# CONFIG_MD is not set
324
325#
326# Fusion MPT device support
327#
328# CONFIG_FUSION is not set
329
330#
331# IEEE 1394 (FireWire) support
332#
333
334#
335# I2O device support
336#
337
338#
339# Network device support
340#
341CONFIG_NETDEVICES=y 294CONFIG_NETDEVICES=y
295# CONFIG_NETDEVICES_MULTIQUEUE is not set
342# CONFIG_DUMMY is not set 296# CONFIG_DUMMY is not set
343# CONFIG_BONDING is not set 297# CONFIG_BONDING is not set
298# CONFIG_MACVLAN is not set
344# CONFIG_EQUALIZER is not set 299# CONFIG_EQUALIZER is not set
345# CONFIG_TUN is not set 300# CONFIG_TUN is not set
346
347#
348# PHY device support
349#
350
351#
352# Ethernet (10 or 100Mbit)
353#
354# CONFIG_NET_ETHERNET is not set 301# CONFIG_NET_ETHERNET is not set
355CONFIG_NE2000=y 302CONFIG_NETDEV_1000=y
356 303CONFIG_NETDEV_10000=y
357#
358# Ethernet (1000 Mbit)
359#
360
361#
362# Ethernet (10000 Mbit)
363#
364
365#
366# Token Ring devices
367#
368
369#
370# Wireless LAN (non-hamradio)
371#
372# CONFIG_NET_RADIO is not set
373 304
374# 305#
375# PCMCIA network device support 306# Wireless LAN
376# 307#
308# CONFIG_WLAN_PRE80211 is not set
309# CONFIG_WLAN_80211 is not set
377# CONFIG_NET_PCMCIA is not set 310# CONFIG_NET_PCMCIA is not set
378
379#
380# Wan interfaces
381#
382# CONFIG_WAN is not set 311# CONFIG_WAN is not set
383# CONFIG_PPP is not set 312# CONFIG_PPP is not set
384# CONFIG_SLIP is not set 313# CONFIG_SLIP is not set
@@ -386,15 +315,7 @@ CONFIG_NE2000=y
386# CONFIG_NETCONSOLE is not set 315# CONFIG_NETCONSOLE is not set
387# CONFIG_NETPOLL is not set 316# CONFIG_NETPOLL is not set
388# CONFIG_NET_POLL_CONTROLLER is not set 317# CONFIG_NET_POLL_CONTROLLER is not set
389
390#
391# ISDN subsystem
392#
393# CONFIG_ISDN is not set 318# CONFIG_ISDN is not set
394
395#
396# Telephony Support
397#
398# CONFIG_PHONE is not set 319# CONFIG_PHONE is not set
399 320
400# 321#
@@ -402,6 +323,7 @@ CONFIG_NE2000=y
402# 323#
403CONFIG_INPUT=y 324CONFIG_INPUT=y
404# CONFIG_INPUT_FF_MEMLESS is not set 325# CONFIG_INPUT_FF_MEMLESS is not set
326# CONFIG_INPUT_POLLDEV is not set
405 327
406# 328#
407# Userland interfaces 329# Userland interfaces
@@ -418,6 +340,7 @@ CONFIG_INPUT=y
418# CONFIG_INPUT_KEYBOARD is not set 340# CONFIG_INPUT_KEYBOARD is not set
419# CONFIG_INPUT_MOUSE is not set 341# CONFIG_INPUT_MOUSE is not set
420# CONFIG_INPUT_JOYSTICK is not set 342# CONFIG_INPUT_JOYSTICK is not set
343# CONFIG_INPUT_TABLET is not set
421# CONFIG_INPUT_TOUCHSCREEN is not set 344# CONFIG_INPUT_TOUCHSCREEN is not set
422# CONFIG_INPUT_MISC is not set 345# CONFIG_INPUT_MISC is not set
423 346
@@ -452,41 +375,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
452CONFIG_UNIX98_PTYS=y 375CONFIG_UNIX98_PTYS=y
453CONFIG_LEGACY_PTYS=y 376CONFIG_LEGACY_PTYS=y
454CONFIG_LEGACY_PTY_COUNT=256 377CONFIG_LEGACY_PTY_COUNT=256
455
456#
457# IPMI
458#
459# CONFIG_IPMI_HANDLER is not set 378# CONFIG_IPMI_HANDLER is not set
460
461#
462# Watchdog Cards
463#
464# CONFIG_WATCHDOG is not set 379# CONFIG_WATCHDOG is not set
465CONFIG_HW_RANDOM=y 380CONFIG_HW_RANDOM=y
466# CONFIG_RTC is not set 381# CONFIG_RTC is not set
467# CONFIG_DTLK is not set
468# CONFIG_R3964 is not set 382# CONFIG_R3964 is not set
469 383
470# 384#
471# Ftape, the floppy tape device driver
472#
473
474#
475# PCMCIA character devices 385# PCMCIA character devices
476# 386#
477# CONFIG_SYNCLINK_CS is not set 387# CONFIG_SYNCLINK_CS is not set
478# CONFIG_CARDMAN_4000 is not set 388# CONFIG_CARDMAN_4000 is not set
479# CONFIG_CARDMAN_4040 is not set 389# CONFIG_CARDMAN_4040 is not set
480# CONFIG_RAW_DRIVER is not set 390# CONFIG_RAW_DRIVER is not set
481
482#
483# TPM devices
484#
485# CONFIG_TCG_TPM is not set 391# CONFIG_TCG_TPM is not set
486
487#
488# I2C support
489#
490# CONFIG_I2C is not set 392# CONFIG_I2C is not set
491 393
492# 394#
@@ -494,47 +396,56 @@ CONFIG_HW_RANDOM=y
494# 396#
495# CONFIG_SPI is not set 397# CONFIG_SPI is not set
496# CONFIG_SPI_MASTER is not set 398# CONFIG_SPI_MASTER is not set
497
498#
499# Dallas's 1-wire bus
500#
501# CONFIG_W1 is not set 399# CONFIG_W1 is not set
502 400# CONFIG_POWER_SUPPLY is not set
503#
504# Hardware Monitoring support
505#
506CONFIG_HWMON=y 401CONFIG_HWMON=y
507# CONFIG_HWMON_VID is not set 402# CONFIG_HWMON_VID is not set
508# CONFIG_SENSORS_ABITUGURU is not set 403# CONFIG_SENSORS_ABITUGURU is not set
404# CONFIG_SENSORS_ABITUGURU3 is not set
509# CONFIG_SENSORS_F71805F is not set 405# CONFIG_SENSORS_F71805F is not set
406# CONFIG_SENSORS_IT87 is not set
407# CONFIG_SENSORS_PC87360 is not set
408# CONFIG_SENSORS_PC87427 is not set
409# CONFIG_SENSORS_SMSC47M1 is not set
410# CONFIG_SENSORS_SMSC47B397 is not set
510# CONFIG_SENSORS_VT1211 is not set 411# CONFIG_SENSORS_VT1211 is not set
412# CONFIG_SENSORS_W83627HF is not set
413# CONFIG_SENSORS_W83627EHF is not set
511# CONFIG_HWMON_DEBUG_CHIP is not set 414# CONFIG_HWMON_DEBUG_CHIP is not set
512 415
513# 416#
514# Multimedia devices 417# Multifunction device drivers
515# 418#
516# CONFIG_VIDEO_DEV is not set 419# CONFIG_MFD_SM501 is not set
517 420
518# 421#
519# Digital Video Broadcasting Devices 422# Multimedia devices
520# 423#
521# CONFIG_DVB is not set 424# CONFIG_VIDEO_DEV is not set
425# CONFIG_DVB_CORE is not set
426CONFIG_DAB=y
522 427
523# 428#
524# Graphics support 429# Graphics support
525# 430#
526CONFIG_FIRMWARE_EDID=y
527# CONFIG_FB is not set
528# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 431# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
529 432
530# 433#
531# Sound 434# Display device support
532# 435#
533# CONFIG_SOUND is not set 436# CONFIG_DISPLAY_SUPPORT is not set
437# CONFIG_VGASTATE is not set
438CONFIG_VIDEO_OUTPUT_CONTROL=m
439# CONFIG_FB is not set
534 440
535# 441#
536# USB support 442# Sound
537# 443#
444# CONFIG_SOUND is not set
445CONFIG_HID_SUPPORT=y
446CONFIG_HID=y
447# CONFIG_HID_DEBUG is not set
448CONFIG_USB_SUPPORT=y
538# CONFIG_USB_ARCH_HAS_HCD is not set 449# CONFIG_USB_ARCH_HAS_HCD is not set
539# CONFIG_USB_ARCH_HAS_OHCI is not set 450# CONFIG_USB_ARCH_HAS_OHCI is not set
540# CONFIG_USB_ARCH_HAS_EHCI is not set 451# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -547,50 +458,18 @@ CONFIG_FIRMWARE_EDID=y
547# USB Gadget Support 458# USB Gadget Support
548# 459#
549# CONFIG_USB_GADGET is not set 460# CONFIG_USB_GADGET is not set
550
551#
552# MMC/SD Card support
553#
554# CONFIG_MMC is not set 461# CONFIG_MMC is not set
555
556#
557# LED devices
558#
559# CONFIG_NEW_LEDS is not set 462# CONFIG_NEW_LEDS is not set
560 463
561# 464#
562# LED drivers
563#
564
565#
566# LED Triggers
567#
568
569#
570# InfiniBand support
571#
572
573#
574# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
575#
576
577#
578# Real Time Clock 465# Real Time Clock
579# 466#
580# CONFIG_RTC_CLASS is not set 467# CONFIG_RTC_CLASS is not set
581 468
582# 469#
583# DMA Engine support 470# Userspace I/O
584#
585# CONFIG_DMA_ENGINE is not set
586
587#
588# DMA Clients
589#
590
591#
592# DMA Devices
593# 471#
472# CONFIG_UIO is not set
594 473
595# 474#
596# File systems 475# File systems
@@ -676,6 +555,7 @@ CONFIG_LOCKD=y
676CONFIG_LOCKD_V4=y 555CONFIG_LOCKD_V4=y
677CONFIG_NFS_COMMON=y 556CONFIG_NFS_COMMON=y
678CONFIG_SUNRPC=y 557CONFIG_SUNRPC=y
558# CONFIG_SUNRPC_BIND34 is not set
679# CONFIG_RPCSEC_GSS_KRB5 is not set 559# CONFIG_RPCSEC_GSS_KRB5 is not set
680# CONFIG_RPCSEC_GSS_SPKM3 is not set 560# CONFIG_RPCSEC_GSS_SPKM3 is not set
681# CONFIG_SMB_FS is not set 561# CONFIG_SMB_FS is not set
@@ -683,7 +563,6 @@ CONFIG_SUNRPC=y
683# CONFIG_NCP_FS is not set 563# CONFIG_NCP_FS is not set
684# CONFIG_CODA_FS is not set 564# CONFIG_CODA_FS is not set
685# CONFIG_AFS_FS is not set 565# CONFIG_AFS_FS is not set
686# CONFIG_9P_FS is not set
687 566
688# 567#
689# Partition Types 568# Partition Types
@@ -736,6 +615,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
736# CONFIG_NLS_UTF8 is not set 615# CONFIG_NLS_UTF8 is not set
737 616
738# 617#
618# Distributed Lock Manager
619#
620# CONFIG_DLM is not set
621
622#
739# Profiling support 623# Profiling support
740# 624#
741# CONFIG_PROFILING is not set 625# CONFIG_PROFILING is not set
@@ -747,29 +631,27 @@ CONFIG_NLS_DEFAULT="iso8859-1"
747CONFIG_ENABLE_MUST_CHECK=y 631CONFIG_ENABLE_MUST_CHECK=y
748# CONFIG_MAGIC_SYSRQ is not set 632# CONFIG_MAGIC_SYSRQ is not set
749# CONFIG_UNUSED_SYMBOLS is not set 633# CONFIG_UNUSED_SYMBOLS is not set
634# CONFIG_DEBUG_FS is not set
635# CONFIG_HEADERS_CHECK is not set
750# CONFIG_DEBUG_KERNEL is not set 636# CONFIG_DEBUG_KERNEL is not set
751CONFIG_LOG_BUF_SHIFT=14
752# CONFIG_DEBUG_BUGVERBOSE is not set 637# CONFIG_DEBUG_BUGVERBOSE is not set
753# CONFIG_DEBUG_FS is not set
754# CONFIG_FRAME_POINTER is not set 638# CONFIG_FRAME_POINTER is not set
755# CONFIG_UNWIND_INFO is not set
756# CONFIG_HEADERS_CHECK is not set
757 639
758# 640#
759# Security options 641# Security options
760# 642#
761# CONFIG_KEYS is not set 643# CONFIG_KEYS is not set
762# CONFIG_SECURITY is not set 644# CONFIG_SECURITY is not set
763
764#
765# Cryptographic options
766#
767# CONFIG_CRYPTO is not set 645# CONFIG_CRYPTO is not set
768 646
769# 647#
770# Library routines 648# Library routines
771# 649#
650CONFIG_BITREVERSE=y
772# CONFIG_CRC_CCITT is not set 651# CONFIG_CRC_CCITT is not set
773# CONFIG_CRC16 is not set 652# CONFIG_CRC16 is not set
653# CONFIG_CRC_ITU_T is not set
774CONFIG_CRC32=y 654CONFIG_CRC32=y
655# CONFIG_CRC7 is not set
775# CONFIG_LIBCRC32C is not set 656# CONFIG_LIBCRC32C is not set
657CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi/defconfig.smp b/arch/m32r/configs/mappi.smp_defconfig
index 168669202b94..b86fb37fc6c3 100644
--- a/arch/m32r/mappi/defconfig.smp
+++ b/arch/m32r/configs/mappi.smp_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Wed Dec 13 17:50:59 2006 4# Wed Aug 1 17:22:35 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -23,17 +26,19 @@ CONFIG_LOCALVERSION=""
23CONFIG_LOCALVERSION_AUTO=y 26CONFIG_LOCALVERSION_AUTO=y
24CONFIG_SWAP=y 27CONFIG_SWAP=y
25CONFIG_SYSVIPC=y 28CONFIG_SYSVIPC=y
26# CONFIG_IPC_NS is not set 29CONFIG_SYSVIPC_SYSCTL=y
27# CONFIG_POSIX_MQUEUE is not set 30# CONFIG_POSIX_MQUEUE is not set
28# CONFIG_BSD_PROCESS_ACCT is not set 31# CONFIG_BSD_PROCESS_ACCT is not set
29# CONFIG_TASKSTATS is not set 32# CONFIG_TASKSTATS is not set
30# CONFIG_UTS_NS is not set 33# CONFIG_USER_NS is not set
31# CONFIG_AUDIT is not set 34# CONFIG_AUDIT is not set
32CONFIG_IKCONFIG=y 35CONFIG_IKCONFIG=y
33CONFIG_IKCONFIG_PROC=y 36CONFIG_IKCONFIG_PROC=y
37CONFIG_LOG_BUF_SHIFT=15
34# CONFIG_CPUSETS is not set 38# CONFIG_CPUSETS is not set
35CONFIG_SYSFS_DEPRECATED=y 39CONFIG_SYSFS_DEPRECATED=y
36# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
41CONFIG_BLK_DEV_INITRD=y
37CONFIG_INITRAMFS_SOURCE="" 42CONFIG_INITRAMFS_SOURCE=""
38# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
39CONFIG_SYSCTL=y 44CONFIG_SYSCTL=y
@@ -46,17 +51,18 @@ CONFIG_BUG=y
46CONFIG_ELF_CORE=y 51CONFIG_ELF_CORE=y
47CONFIG_BASE_FULL=y 52CONFIG_BASE_FULL=y
48# CONFIG_FUTEX is not set 53# CONFIG_FUTEX is not set
54CONFIG_ANON_INODES=y
49# CONFIG_EPOLL is not set 55# CONFIG_EPOLL is not set
56CONFIG_SIGNALFD=y
57CONFIG_TIMERFD=y
58CONFIG_EVENTFD=y
50CONFIG_SHMEM=y 59CONFIG_SHMEM=y
51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y 60CONFIG_VM_EVENT_COUNTERS=y
61CONFIG_SLAB=y
62# CONFIG_SLUB is not set
63# CONFIG_SLOB is not set
53# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
54CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
56
57#
58# Loadable module support
59#
60CONFIG_MODULES=y 66CONFIG_MODULES=y
61CONFIG_MODULE_UNLOAD=y 67CONFIG_MODULE_UNLOAD=y
62# CONFIG_MODULE_FORCE_UNLOAD is not set 68# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -64,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y
64# CONFIG_MODULE_SRCVERSION_ALL is not set 70# CONFIG_MODULE_SRCVERSION_ALL is not set
65CONFIG_KMOD=y 71CONFIG_KMOD=y
66CONFIG_STOP_MACHINE=y 72CONFIG_STOP_MACHINE=y
67
68#
69# Block layer
70#
71CONFIG_BLOCK=y 73CONFIG_BLOCK=y
74# CONFIG_LBD is not set
72# CONFIG_BLK_DEV_IO_TRACE is not set 75# CONFIG_BLK_DEV_IO_TRACE is not set
76# CONFIG_LSF is not set
77# CONFIG_BLK_DEV_BSG is not set
73 78
74# 79#
75# IO Schedulers 80# IO Schedulers
@@ -122,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
122# CONFIG_SPARSEMEM_STATIC is not set 127# CONFIG_SPARSEMEM_STATIC is not set
123CONFIG_SPLIT_PTLOCK_CPUS=4 128CONFIG_SPLIT_PTLOCK_CPUS=4
124# CONFIG_RESOURCES_64BIT is not set 129# CONFIG_RESOURCES_64BIT is not set
130CONFIG_ZONE_DMA_FLAG=1
131CONFIG_BOUNCE=y
132CONFIG_VIRT_TO_BUS=y
125CONFIG_IRAM_START=0x00f00000 133CONFIG_IRAM_START=0x00f00000
126CONFIG_IRAM_SIZE=0x00080000 134CONFIG_IRAM_SIZE=0x00080000
127CONFIG_RWSEM_GENERIC_SPINLOCK=y 135CONFIG_RWSEM_GENERIC_SPINLOCK=y
128# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 136# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
137# CONFIG_ARCH_HAS_ILOG2_U32 is not set
138# CONFIG_ARCH_HAS_ILOG2_U64 is not set
129CONFIG_GENERIC_FIND_NEXT_BIT=y 139CONFIG_GENERIC_FIND_NEXT_BIT=y
130CONFIG_GENERIC_HWEIGHT=y 140CONFIG_GENERIC_HWEIGHT=y
131CONFIG_GENERIC_CALIBRATE_DELAY=y 141CONFIG_GENERIC_CALIBRATE_DELAY=y
142CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
132CONFIG_PREEMPT=y 143CONFIG_PREEMPT=y
133CONFIG_SMP=y 144CONFIG_SMP=y
134CONFIG_CHIP_M32700_TS1=y 145CONFIG_CHIP_M32700_TS1=y
@@ -138,6 +149,7 @@ CONFIG_NODES_SHIFT=1
138# 149#
139# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 150# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
140# 151#
152# CONFIG_ARCH_SUPPORTS_MSI is not set
141# CONFIG_ISA is not set 153# CONFIG_ISA is not set
142 154
143# 155#
@@ -156,10 +168,6 @@ CONFIG_M32R_PCC=y
156CONFIG_PCCARD_NONSTATIC=y 168CONFIG_PCCARD_NONSTATIC=y
157 169
158# 170#
159# PCI Hotplug Support
160#
161
162#
163# Executable file formats 171# Executable file formats
164# 172#
165CONFIG_BINFMT_ELF=y 173CONFIG_BINFMT_ELF=y
@@ -173,12 +181,12 @@ CONFIG_NET=y
173# 181#
174# Networking options 182# Networking options
175# 183#
176# CONFIG_NETDEBUG is not set
177# CONFIG_PACKET is not set 184# CONFIG_PACKET is not set
178CONFIG_UNIX=y 185CONFIG_UNIX=y
179CONFIG_XFRM=y 186CONFIG_XFRM=y
180# CONFIG_XFRM_USER is not set 187# CONFIG_XFRM_USER is not set
181# CONFIG_XFRM_SUB_POLICY is not set 188# CONFIG_XFRM_SUB_POLICY is not set
189# CONFIG_XFRM_MIGRATE is not set
182# CONFIG_NET_KEY is not set 190# CONFIG_NET_KEY is not set
183CONFIG_INET=y 191CONFIG_INET=y
184# CONFIG_IP_MULTICAST is not set 192# CONFIG_IP_MULTICAST is not set
@@ -211,20 +219,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
211# CONFIG_INET6_TUNNEL is not set 219# CONFIG_INET6_TUNNEL is not set
212# CONFIG_NETWORK_SECMARK is not set 220# CONFIG_NETWORK_SECMARK is not set
213# CONFIG_NETFILTER is not set 221# CONFIG_NETFILTER is not set
214
215#
216# DCCP Configuration (EXPERIMENTAL)
217#
218# CONFIG_IP_DCCP is not set 222# CONFIG_IP_DCCP is not set
219
220#
221# SCTP Configuration (EXPERIMENTAL)
222#
223# CONFIG_IP_SCTP is not set 223# CONFIG_IP_SCTP is not set
224
225#
226# TIPC Configuration (EXPERIMENTAL)
227#
228# CONFIG_TIPC is not set 224# CONFIG_TIPC is not set
229# CONFIG_ATM is not set 225# CONFIG_ATM is not set
230# CONFIG_BRIDGE is not set 226# CONFIG_BRIDGE is not set
@@ -250,7 +246,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
250# CONFIG_HAMRADIO is not set 246# CONFIG_HAMRADIO is not set
251# CONFIG_IRDA is not set 247# CONFIG_IRDA is not set
252# CONFIG_BT is not set 248# CONFIG_BT is not set
249# CONFIG_AF_RXRPC is not set
250
251#
252# Wireless
253#
254# CONFIG_CFG80211 is not set
255# CONFIG_WIRELESS_EXT is not set
256# CONFIG_MAC80211 is not set
253# CONFIG_IEEE80211 is not set 257# CONFIG_IEEE80211 is not set
258# CONFIG_RFKILL is not set
259# CONFIG_NET_9P is not set
254 260
255# 261#
256# Device Drivers 262# Device Drivers
@@ -263,15 +269,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
263CONFIG_PREVENT_FIRMWARE_BUILD=y 269CONFIG_PREVENT_FIRMWARE_BUILD=y
264CONFIG_FW_LOADER=y 270CONFIG_FW_LOADER=y
265# CONFIG_SYS_HYPERVISOR is not set 271# CONFIG_SYS_HYPERVISOR is not set
266
267#
268# Connector - unified userspace <-> kernelspace linker
269#
270# CONFIG_CONNECTOR is not set 272# CONFIG_CONNECTOR is not set
271
272#
273# Memory Technology Devices (MTD)
274#
275CONFIG_MTD=y 273CONFIG_MTD=y
276# CONFIG_MTD_DEBUG is not set 274# CONFIG_MTD_DEBUG is not set
277# CONFIG_MTD_CONCAT is not set 275# CONFIG_MTD_CONCAT is not set
@@ -286,6 +284,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
286# User Modules And Translation Layers 284# User Modules And Translation Layers
287# 285#
288CONFIG_MTD_CHAR=y 286CONFIG_MTD_CHAR=y
287CONFIG_MTD_BLKDEVS=y
289CONFIG_MTD_BLOCK=y 288CONFIG_MTD_BLOCK=y
290# CONFIG_FTL is not set 289# CONFIG_FTL is not set
291# CONFIG_NFTL is not set 290# CONFIG_NFTL is not set
@@ -311,7 +310,6 @@ CONFIG_MTD_CFI_I2=y
311# CONFIG_MTD_RAM is not set 310# CONFIG_MTD_RAM is not set
312# CONFIG_MTD_ROM is not set 311# CONFIG_MTD_ROM is not set
313# CONFIG_MTD_ABSENT is not set 312# CONFIG_MTD_ABSENT is not set
314# CONFIG_MTD_OBSOLETE_CHIPS is not set
315 313
316# 314#
317# Mapping drivers for chip access 315# Mapping drivers for chip access
@@ -333,29 +331,15 @@ CONFIG_MTD_CFI_I2=y
333# CONFIG_MTD_DOC2000 is not set 331# CONFIG_MTD_DOC2000 is not set
334# CONFIG_MTD_DOC2001 is not set 332# CONFIG_MTD_DOC2001 is not set
335# CONFIG_MTD_DOC2001PLUS is not set 333# CONFIG_MTD_DOC2001PLUS is not set
336
337#
338# NAND Flash Device Drivers
339#
340# CONFIG_MTD_NAND is not set 334# CONFIG_MTD_NAND is not set
341
342#
343# OneNAND Flash Device Drivers
344#
345# CONFIG_MTD_ONENAND is not set 335# CONFIG_MTD_ONENAND is not set
346 336
347# 337#
348# Parallel port support 338# UBI - Unsorted block images
349# 339#
340# CONFIG_MTD_UBI is not set
350# CONFIG_PARPORT is not set 341# CONFIG_PARPORT is not set
351 342CONFIG_BLK_DEV=y
352#
353# Plug and Play support
354#
355
356#
357# Block devices
358#
359# CONFIG_BLK_DEV_COW_COMMON is not set 343# CONFIG_BLK_DEV_COW_COMMON is not set
360CONFIG_BLK_DEV_LOOP=y 344CONFIG_BLK_DEV_LOOP=y
361# CONFIG_BLK_DEV_CRYPTOLOOP is not set 345# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -364,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y
364CONFIG_BLK_DEV_RAM_COUNT=16 348CONFIG_BLK_DEV_RAM_COUNT=16
365CONFIG_BLK_DEV_RAM_SIZE=4096 349CONFIG_BLK_DEV_RAM_SIZE=4096
366CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 350CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
367CONFIG_BLK_DEV_INITRD=y
368# CONFIG_CDROM_PKTCDVD is not set 351# CONFIG_CDROM_PKTCDVD is not set
369# CONFIG_ATA_OVER_ETH is not set 352# CONFIG_ATA_OVER_ETH is not set
370 353CONFIG_MISC_DEVICES=y
371# 354# CONFIG_EEPROM_93CX6 is not set
372# Misc devices
373#
374# CONFIG_TIFM_CORE is not set
375
376#
377# ATA/ATAPI/MFM/RLL support
378#
379CONFIG_IDE=m 355CONFIG_IDE=m
380CONFIG_IDE_MAX_HWIFS=4 356CONFIG_IDE_MAX_HWIFS=4
381CONFIG_BLK_DEV_IDE=m 357CONFIG_BLK_DEV_IDE=m
@@ -391,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m
391# CONFIG_BLK_DEV_IDETAPE is not set 367# CONFIG_BLK_DEV_IDETAPE is not set
392# CONFIG_BLK_DEV_IDEFLOPPY is not set 368# CONFIG_BLK_DEV_IDEFLOPPY is not set
393# CONFIG_IDE_TASK_IOCTL is not set 369# CONFIG_IDE_TASK_IOCTL is not set
370CONFIG_IDE_PROC_FS=y
394 371
395# 372#
396# IDE chipset support/bugfixes 373# IDE chipset support/bugfixes
397# 374#
398CONFIG_IDE_GENERIC=m 375CONFIG_IDE_GENERIC=m
376# CONFIG_IDEPCI_PCIBUS_ORDER is not set
399# CONFIG_IDE_ARM is not set 377# CONFIG_IDE_ARM is not set
400# CONFIG_BLK_DEV_IDEDMA is not set 378# CONFIG_BLK_DEV_IDEDMA is not set
401# CONFIG_IDEDMA_AUTO is not set
402# CONFIG_BLK_DEV_HD is not set 379# CONFIG_BLK_DEV_HD is not set
403 380
404# 381#
@@ -406,74 +383,26 @@ CONFIG_IDE_GENERIC=m
406# 383#
407# CONFIG_RAID_ATTRS is not set 384# CONFIG_RAID_ATTRS is not set
408# CONFIG_SCSI is not set 385# CONFIG_SCSI is not set
386# CONFIG_SCSI_DMA is not set
409# CONFIG_SCSI_NETLINK is not set 387# CONFIG_SCSI_NETLINK is not set
410
411#
412# Serial ATA (prod) and Parallel ATA (experimental) drivers
413#
414
415#
416# Multi-device support (RAID and LVM)
417#
418# CONFIG_MD is not set 388# CONFIG_MD is not set
419
420#
421# Fusion MPT device support
422#
423# CONFIG_FUSION is not set
424
425#
426# IEEE 1394 (FireWire) support
427#
428
429#
430# I2O device support
431#
432
433#
434# Network device support
435#
436CONFIG_NETDEVICES=y 389CONFIG_NETDEVICES=y
390# CONFIG_NETDEVICES_MULTIQUEUE is not set
437# CONFIG_DUMMY is not set 391# CONFIG_DUMMY is not set
438# CONFIG_BONDING is not set 392# CONFIG_BONDING is not set
393# CONFIG_MACVLAN is not set
439# CONFIG_EQUALIZER is not set 394# CONFIG_EQUALIZER is not set
440# CONFIG_TUN is not set 395# CONFIG_TUN is not set
441
442#
443# PHY device support
444#
445
446#
447# Ethernet (10 or 100Mbit)
448#
449# CONFIG_NET_ETHERNET is not set 396# CONFIG_NET_ETHERNET is not set
450CONFIG_NE2000=y 397CONFIG_NETDEV_1000=y
451 398CONFIG_NETDEV_10000=y
452#
453# Ethernet (1000 Mbit)
454#
455
456#
457# Ethernet (10000 Mbit)
458#
459 399
460# 400#
461# Token Ring devices 401# Wireless LAN
462#
463
464#
465# Wireless LAN (non-hamradio)
466#
467# CONFIG_NET_RADIO is not set
468
469#
470# PCMCIA network device support
471# 402#
403# CONFIG_WLAN_PRE80211 is not set
404# CONFIG_WLAN_80211 is not set
472# CONFIG_NET_PCMCIA is not set 405# CONFIG_NET_PCMCIA is not set
473
474#
475# Wan interfaces
476#
477# CONFIG_WAN is not set 406# CONFIG_WAN is not set
478# CONFIG_PPP is not set 407# CONFIG_PPP is not set
479# CONFIG_SLIP is not set 408# CONFIG_SLIP is not set
@@ -481,15 +410,7 @@ CONFIG_NE2000=y
481# CONFIG_NETCONSOLE is not set 410# CONFIG_NETCONSOLE is not set
482# CONFIG_NETPOLL is not set 411# CONFIG_NETPOLL is not set
483# CONFIG_NET_POLL_CONTROLLER is not set 412# CONFIG_NET_POLL_CONTROLLER is not set
484
485#
486# ISDN subsystem
487#
488# CONFIG_ISDN is not set 413# CONFIG_ISDN is not set
489
490#
491# Telephony Support
492#
493# CONFIG_PHONE is not set 414# CONFIG_PHONE is not set
494 415
495# 416#
@@ -497,6 +418,7 @@ CONFIG_NE2000=y
497# 418#
498CONFIG_INPUT=y 419CONFIG_INPUT=y
499# CONFIG_INPUT_FF_MEMLESS is not set 420# CONFIG_INPUT_FF_MEMLESS is not set
421# CONFIG_INPUT_POLLDEV is not set
500 422
501# 423#
502# Userland interfaces 424# Userland interfaces
@@ -516,6 +438,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
516# CONFIG_INPUT_KEYBOARD is not set 438# CONFIG_INPUT_KEYBOARD is not set
517# CONFIG_INPUT_MOUSE is not set 439# CONFIG_INPUT_MOUSE is not set
518# CONFIG_INPUT_JOYSTICK is not set 440# CONFIG_INPUT_JOYSTICK is not set
441# CONFIG_INPUT_TABLET is not set
519# CONFIG_INPUT_TOUCHSCREEN is not set 442# CONFIG_INPUT_TOUCHSCREEN is not set
520# CONFIG_INPUT_MISC is not set 443# CONFIG_INPUT_MISC is not set
521 444
@@ -550,41 +473,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
550CONFIG_UNIX98_PTYS=y 473CONFIG_UNIX98_PTYS=y
551CONFIG_LEGACY_PTYS=y 474CONFIG_LEGACY_PTYS=y
552CONFIG_LEGACY_PTY_COUNT=256 475CONFIG_LEGACY_PTY_COUNT=256
553
554#
555# IPMI
556#
557# CONFIG_IPMI_HANDLER is not set 476# CONFIG_IPMI_HANDLER is not set
558
559#
560# Watchdog Cards
561#
562# CONFIG_WATCHDOG is not set 477# CONFIG_WATCHDOG is not set
563CONFIG_HW_RANDOM=y 478CONFIG_HW_RANDOM=y
564# CONFIG_RTC is not set 479# CONFIG_RTC is not set
565# CONFIG_DTLK is not set
566# CONFIG_R3964 is not set 480# CONFIG_R3964 is not set
567 481
568# 482#
569# Ftape, the floppy tape device driver
570#
571
572#
573# PCMCIA character devices 483# PCMCIA character devices
574# 484#
575# CONFIG_SYNCLINK_CS is not set 485# CONFIG_SYNCLINK_CS is not set
576# CONFIG_CARDMAN_4000 is not set 486# CONFIG_CARDMAN_4000 is not set
577# CONFIG_CARDMAN_4040 is not set 487# CONFIG_CARDMAN_4040 is not set
578# CONFIG_RAW_DRIVER is not set 488# CONFIG_RAW_DRIVER is not set
579
580#
581# TPM devices
582#
583# CONFIG_TCG_TPM is not set 489# CONFIG_TCG_TPM is not set
584
585#
586# I2C support
587#
588# CONFIG_I2C is not set 490# CONFIG_I2C is not set
589 491
590# 492#
@@ -592,47 +494,56 @@ CONFIG_HW_RANDOM=y
592# 494#
593# CONFIG_SPI is not set 495# CONFIG_SPI is not set
594# CONFIG_SPI_MASTER is not set 496# CONFIG_SPI_MASTER is not set
595
596#
597# Dallas's 1-wire bus
598#
599# CONFIG_W1 is not set 497# CONFIG_W1 is not set
600 498# CONFIG_POWER_SUPPLY is not set
601#
602# Hardware Monitoring support
603#
604CONFIG_HWMON=y 499CONFIG_HWMON=y
605# CONFIG_HWMON_VID is not set 500# CONFIG_HWMON_VID is not set
606# CONFIG_SENSORS_ABITUGURU is not set 501# CONFIG_SENSORS_ABITUGURU is not set
502# CONFIG_SENSORS_ABITUGURU3 is not set
607# CONFIG_SENSORS_F71805F is not set 503# CONFIG_SENSORS_F71805F is not set
504# CONFIG_SENSORS_IT87 is not set
505# CONFIG_SENSORS_PC87360 is not set
506# CONFIG_SENSORS_PC87427 is not set
507# CONFIG_SENSORS_SMSC47M1 is not set
508# CONFIG_SENSORS_SMSC47B397 is not set
608# CONFIG_SENSORS_VT1211 is not set 509# CONFIG_SENSORS_VT1211 is not set
510# CONFIG_SENSORS_W83627HF is not set
511# CONFIG_SENSORS_W83627EHF is not set
609# CONFIG_HWMON_DEBUG_CHIP is not set 512# CONFIG_HWMON_DEBUG_CHIP is not set
610 513
611# 514#
612# Multimedia devices 515# Multifunction device drivers
613# 516#
614# CONFIG_VIDEO_DEV is not set 517# CONFIG_MFD_SM501 is not set
615 518
616# 519#
617# Digital Video Broadcasting Devices 520# Multimedia devices
618# 521#
619# CONFIG_DVB is not set 522# CONFIG_VIDEO_DEV is not set
523# CONFIG_DVB_CORE is not set
524CONFIG_DAB=y
620 525
621# 526#
622# Graphics support 527# Graphics support
623# 528#
624CONFIG_FIRMWARE_EDID=y
625# CONFIG_FB is not set
626# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 529# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
627 530
628# 531#
629# Sound 532# Display device support
630# 533#
631# CONFIG_SOUND is not set 534# CONFIG_DISPLAY_SUPPORT is not set
535# CONFIG_VGASTATE is not set
536CONFIG_VIDEO_OUTPUT_CONTROL=m
537# CONFIG_FB is not set
632 538
633# 539#
634# USB support 540# Sound
635# 541#
542# CONFIG_SOUND is not set
543CONFIG_HID_SUPPORT=y
544CONFIG_HID=y
545# CONFIG_HID_DEBUG is not set
546CONFIG_USB_SUPPORT=y
636# CONFIG_USB_ARCH_HAS_HCD is not set 547# CONFIG_USB_ARCH_HAS_HCD is not set
637# CONFIG_USB_ARCH_HAS_OHCI is not set 548# CONFIG_USB_ARCH_HAS_OHCI is not set
638# CONFIG_USB_ARCH_HAS_EHCI is not set 549# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -645,50 +556,18 @@ CONFIG_FIRMWARE_EDID=y
645# USB Gadget Support 556# USB Gadget Support
646# 557#
647# CONFIG_USB_GADGET is not set 558# CONFIG_USB_GADGET is not set
648
649#
650# MMC/SD Card support
651#
652# CONFIG_MMC is not set 559# CONFIG_MMC is not set
653
654#
655# LED devices
656#
657# CONFIG_NEW_LEDS is not set 560# CONFIG_NEW_LEDS is not set
658 561
659# 562#
660# LED drivers
661#
662
663#
664# LED Triggers
665#
666
667#
668# InfiniBand support
669#
670
671#
672# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
673#
674
675#
676# Real Time Clock 563# Real Time Clock
677# 564#
678# CONFIG_RTC_CLASS is not set 565# CONFIG_RTC_CLASS is not set
679 566
680# 567#
681# DMA Engine support 568# Userspace I/O
682#
683# CONFIG_DMA_ENGINE is not set
684
685#
686# DMA Clients
687#
688
689#
690# DMA Devices
691# 569#
570# CONFIG_UIO is not set
692 571
693# 572#
694# File systems 573# File systems
@@ -761,9 +640,6 @@ CONFIG_RAMFS=y
761# CONFIG_BEFS_FS is not set 640# CONFIG_BEFS_FS is not set
762# CONFIG_BFS_FS is not set 641# CONFIG_BFS_FS is not set
763# CONFIG_EFS_FS is not set 642# CONFIG_EFS_FS is not set
764CONFIG_JFFS_FS=y
765CONFIG_JFFS_FS_VERBOSE=0
766CONFIG_JFFS_PROC_FS=y
767CONFIG_JFFS2_FS=y 643CONFIG_JFFS2_FS=y
768CONFIG_JFFS2_FS_DEBUG=0 644CONFIG_JFFS2_FS_DEBUG=0
769CONFIG_JFFS2_FS_WRITEBUFFER=y 645CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -794,6 +670,7 @@ CONFIG_LOCKD=y
794CONFIG_LOCKD_V4=y 670CONFIG_LOCKD_V4=y
795CONFIG_NFS_COMMON=y 671CONFIG_NFS_COMMON=y
796CONFIG_SUNRPC=y 672CONFIG_SUNRPC=y
673# CONFIG_SUNRPC_BIND34 is not set
797# CONFIG_RPCSEC_GSS_KRB5 is not set 674# CONFIG_RPCSEC_GSS_KRB5 is not set
798# CONFIG_RPCSEC_GSS_SPKM3 is not set 675# CONFIG_RPCSEC_GSS_SPKM3 is not set
799# CONFIG_SMB_FS is not set 676# CONFIG_SMB_FS is not set
@@ -801,7 +678,6 @@ CONFIG_SUNRPC=y
801# CONFIG_NCP_FS is not set 678# CONFIG_NCP_FS is not set
802# CONFIG_CODA_FS is not set 679# CONFIG_CODA_FS is not set
803# CONFIG_AFS_FS is not set 680# CONFIG_AFS_FS is not set
804# CONFIG_9P_FS is not set
805 681
806# 682#
807# Partition Types 683# Partition Types
@@ -854,6 +730,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
854# CONFIG_NLS_UTF8 is not set 730# CONFIG_NLS_UTF8 is not set
855 731
856# 732#
733# Distributed Lock Manager
734#
735# CONFIG_DLM is not set
736
737#
857# Profiling support 738# Profiling support
858# 739#
859# CONFIG_PROFILING is not set 740# CONFIG_PROFILING is not set
@@ -865,31 +746,29 @@ CONFIG_NLS_DEFAULT="iso8859-1"
865CONFIG_ENABLE_MUST_CHECK=y 746CONFIG_ENABLE_MUST_CHECK=y
866# CONFIG_MAGIC_SYSRQ is not set 747# CONFIG_MAGIC_SYSRQ is not set
867# CONFIG_UNUSED_SYMBOLS is not set 748# CONFIG_UNUSED_SYMBOLS is not set
749# CONFIG_DEBUG_FS is not set
750# CONFIG_HEADERS_CHECK is not set
868# CONFIG_DEBUG_KERNEL is not set 751# CONFIG_DEBUG_KERNEL is not set
869CONFIG_LOG_BUF_SHIFT=15
870# CONFIG_DEBUG_BUGVERBOSE is not set 752# CONFIG_DEBUG_BUGVERBOSE is not set
871# CONFIG_DEBUG_FS is not set
872# CONFIG_FRAME_POINTER is not set 753# CONFIG_FRAME_POINTER is not set
873# CONFIG_UNWIND_INFO is not set
874# CONFIG_HEADERS_CHECK is not set
875 754
876# 755#
877# Security options 756# Security options
878# 757#
879# CONFIG_KEYS is not set 758# CONFIG_KEYS is not set
880# CONFIG_SECURITY is not set 759# CONFIG_SECURITY is not set
881
882#
883# Cryptographic options
884#
885# CONFIG_CRYPTO is not set 760# CONFIG_CRYPTO is not set
886 761
887# 762#
888# Library routines 763# Library routines
889# 764#
765CONFIG_BITREVERSE=y
890# CONFIG_CRC_CCITT is not set 766# CONFIG_CRC_CCITT is not set
891# CONFIG_CRC16 is not set 767# CONFIG_CRC16 is not set
768# CONFIG_CRC_ITU_T is not set
892CONFIG_CRC32=y 769CONFIG_CRC32=y
770# CONFIG_CRC7 is not set
893# CONFIG_LIBCRC32C is not set 771# CONFIG_LIBCRC32C is not set
894CONFIG_ZLIB_INFLATE=y 772CONFIG_ZLIB_INFLATE=y
895CONFIG_ZLIB_DEFLATE=y 773CONFIG_ZLIB_DEFLATE=y
774CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi/defconfig.up b/arch/m32r/configs/mappi.up_defconfig
index 5ba00603c1a0..114a6c9b60ef 100644
--- a/arch/m32r/mappi/defconfig.up
+++ b/arch/m32r/configs/mappi.up_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Wed Dec 13 17:51:20 2006 4# Wed Aug 1 17:22:35 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -24,16 +27,18 @@ CONFIG_LOCALVERSION=""
24CONFIG_LOCALVERSION_AUTO=y 27CONFIG_LOCALVERSION_AUTO=y
25CONFIG_SWAP=y 28CONFIG_SWAP=y
26CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
27# CONFIG_IPC_NS is not set 30CONFIG_SYSVIPC_SYSCTL=y
28# CONFIG_POSIX_MQUEUE is not set 31# CONFIG_POSIX_MQUEUE is not set
29# CONFIG_BSD_PROCESS_ACCT is not set 32# CONFIG_BSD_PROCESS_ACCT is not set
30# CONFIG_TASKSTATS is not set 33# CONFIG_TASKSTATS is not set
31# CONFIG_UTS_NS is not set 34# CONFIG_USER_NS is not set
32# CONFIG_AUDIT is not set 35# CONFIG_AUDIT is not set
33CONFIG_IKCONFIG=y 36CONFIG_IKCONFIG=y
34CONFIG_IKCONFIG_PROC=y 37CONFIG_IKCONFIG_PROC=y
38CONFIG_LOG_BUF_SHIFT=14
35CONFIG_SYSFS_DEPRECATED=y 39CONFIG_SYSFS_DEPRECATED=y
36# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
41CONFIG_BLK_DEV_INITRD=y
37CONFIG_INITRAMFS_SOURCE="" 42CONFIG_INITRAMFS_SOURCE=""
38# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
39CONFIG_SYSCTL=y 44CONFIG_SYSCTL=y
@@ -46,29 +51,29 @@ CONFIG_BUG=y
46CONFIG_ELF_CORE=y 51CONFIG_ELF_CORE=y
47CONFIG_BASE_FULL=y 52CONFIG_BASE_FULL=y
48# CONFIG_FUTEX is not set 53# CONFIG_FUTEX is not set
54CONFIG_ANON_INODES=y
49# CONFIG_EPOLL is not set 55# CONFIG_EPOLL is not set
56CONFIG_SIGNALFD=y
57CONFIG_TIMERFD=y
58CONFIG_EVENTFD=y
50CONFIG_SHMEM=y 59CONFIG_SHMEM=y
51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y 60CONFIG_VM_EVENT_COUNTERS=y
61CONFIG_SLAB=y
62# CONFIG_SLUB is not set
63# CONFIG_SLOB is not set
53# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
54CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
56
57#
58# Loadable module support
59#
60CONFIG_MODULES=y 66CONFIG_MODULES=y
61CONFIG_MODULE_UNLOAD=y 67CONFIG_MODULE_UNLOAD=y
62# CONFIG_MODULE_FORCE_UNLOAD is not set 68# CONFIG_MODULE_FORCE_UNLOAD is not set
63# CONFIG_MODVERSIONS is not set 69# CONFIG_MODVERSIONS is not set
64# CONFIG_MODULE_SRCVERSION_ALL is not set 70# CONFIG_MODULE_SRCVERSION_ALL is not set
65CONFIG_KMOD=y 71CONFIG_KMOD=y
66
67#
68# Block layer
69#
70CONFIG_BLOCK=y 72CONFIG_BLOCK=y
73# CONFIG_LBD is not set
71# CONFIG_BLK_DEV_IO_TRACE is not set 74# CONFIG_BLK_DEV_IO_TRACE is not set
75# CONFIG_LSF is not set
76# CONFIG_BLK_DEV_BSG is not set
72 77
73# 78#
74# IO Schedulers 79# IO Schedulers
@@ -121,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
121# CONFIG_SPARSEMEM_STATIC is not set 126# CONFIG_SPARSEMEM_STATIC is not set
122CONFIG_SPLIT_PTLOCK_CPUS=4 127CONFIG_SPLIT_PTLOCK_CPUS=4
123# CONFIG_RESOURCES_64BIT is not set 128# CONFIG_RESOURCES_64BIT is not set
129CONFIG_ZONE_DMA_FLAG=1
130CONFIG_BOUNCE=y
131CONFIG_VIRT_TO_BUS=y
124CONFIG_IRAM_START=0x00f00000 132CONFIG_IRAM_START=0x00f00000
125CONFIG_IRAM_SIZE=0x00080000 133CONFIG_IRAM_SIZE=0x00080000
126CONFIG_RWSEM_GENERIC_SPINLOCK=y 134CONFIG_RWSEM_GENERIC_SPINLOCK=y
127# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 135# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
136# CONFIG_ARCH_HAS_ILOG2_U32 is not set
137# CONFIG_ARCH_HAS_ILOG2_U64 is not set
128CONFIG_GENERIC_FIND_NEXT_BIT=y 138CONFIG_GENERIC_FIND_NEXT_BIT=y
129CONFIG_GENERIC_HWEIGHT=y 139CONFIG_GENERIC_HWEIGHT=y
130CONFIG_GENERIC_CALIBRATE_DELAY=y 140CONFIG_GENERIC_CALIBRATE_DELAY=y
141CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
131CONFIG_PREEMPT=y 142CONFIG_PREEMPT=y
132# CONFIG_SMP is not set 143# CONFIG_SMP is not set
133CONFIG_NODES_SHIFT=1 144CONFIG_NODES_SHIFT=1
@@ -135,6 +146,7 @@ CONFIG_NODES_SHIFT=1
135# 146#
136# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 147# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
137# 148#
149# CONFIG_ARCH_SUPPORTS_MSI is not set
138# CONFIG_ISA is not set 150# CONFIG_ISA is not set
139 151
140# 152#
@@ -153,10 +165,6 @@ CONFIG_M32R_PCC=y
153CONFIG_PCCARD_NONSTATIC=y 165CONFIG_PCCARD_NONSTATIC=y
154 166
155# 167#
156# PCI Hotplug Support
157#
158
159#
160# Executable file formats 168# Executable file formats
161# 169#
162CONFIG_BINFMT_ELF=y 170CONFIG_BINFMT_ELF=y
@@ -170,12 +178,12 @@ CONFIG_NET=y
170# 178#
171# Networking options 179# Networking options
172# 180#
173# CONFIG_NETDEBUG is not set
174# CONFIG_PACKET is not set 181# CONFIG_PACKET is not set
175CONFIG_UNIX=y 182CONFIG_UNIX=y
176CONFIG_XFRM=y 183CONFIG_XFRM=y
177# CONFIG_XFRM_USER is not set 184# CONFIG_XFRM_USER is not set
178# CONFIG_XFRM_SUB_POLICY is not set 185# CONFIG_XFRM_SUB_POLICY is not set
186# CONFIG_XFRM_MIGRATE is not set
179# CONFIG_NET_KEY is not set 187# CONFIG_NET_KEY is not set
180CONFIG_INET=y 188CONFIG_INET=y
181# CONFIG_IP_MULTICAST is not set 189# CONFIG_IP_MULTICAST is not set
@@ -208,20 +216,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
208# CONFIG_INET6_TUNNEL is not set 216# CONFIG_INET6_TUNNEL is not set
209# CONFIG_NETWORK_SECMARK is not set 217# CONFIG_NETWORK_SECMARK is not set
210# CONFIG_NETFILTER is not set 218# CONFIG_NETFILTER is not set
211
212#
213# DCCP Configuration (EXPERIMENTAL)
214#
215# CONFIG_IP_DCCP is not set 219# CONFIG_IP_DCCP is not set
216
217#
218# SCTP Configuration (EXPERIMENTAL)
219#
220# CONFIG_IP_SCTP is not set 220# CONFIG_IP_SCTP is not set
221
222#
223# TIPC Configuration (EXPERIMENTAL)
224#
225# CONFIG_TIPC is not set 221# CONFIG_TIPC is not set
226# CONFIG_ATM is not set 222# CONFIG_ATM is not set
227# CONFIG_BRIDGE is not set 223# CONFIG_BRIDGE is not set
@@ -247,7 +243,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
247# CONFIG_HAMRADIO is not set 243# CONFIG_HAMRADIO is not set
248# CONFIG_IRDA is not set 244# CONFIG_IRDA is not set
249# CONFIG_BT is not set 245# CONFIG_BT is not set
246# CONFIG_AF_RXRPC is not set
247
248#
249# Wireless
250#
251# CONFIG_CFG80211 is not set
252# CONFIG_WIRELESS_EXT is not set
253# CONFIG_MAC80211 is not set
250# CONFIG_IEEE80211 is not set 254# CONFIG_IEEE80211 is not set
255# CONFIG_RFKILL is not set
256# CONFIG_NET_9P is not set
251 257
252# 258#
253# Device Drivers 259# Device Drivers
@@ -260,15 +266,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
260CONFIG_PREVENT_FIRMWARE_BUILD=y 266CONFIG_PREVENT_FIRMWARE_BUILD=y
261CONFIG_FW_LOADER=y 267CONFIG_FW_LOADER=y
262# CONFIG_SYS_HYPERVISOR is not set 268# CONFIG_SYS_HYPERVISOR is not set
263
264#
265# Connector - unified userspace <-> kernelspace linker
266#
267# CONFIG_CONNECTOR is not set 269# CONFIG_CONNECTOR is not set
268
269#
270# Memory Technology Devices (MTD)
271#
272CONFIG_MTD=y 270CONFIG_MTD=y
273# CONFIG_MTD_DEBUG is not set 271# CONFIG_MTD_DEBUG is not set
274# CONFIG_MTD_CONCAT is not set 272# CONFIG_MTD_CONCAT is not set
@@ -283,6 +281,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
283# User Modules And Translation Layers 281# User Modules And Translation Layers
284# 282#
285CONFIG_MTD_CHAR=y 283CONFIG_MTD_CHAR=y
284CONFIG_MTD_BLKDEVS=y
286CONFIG_MTD_BLOCK=y 285CONFIG_MTD_BLOCK=y
287# CONFIG_FTL is not set 286# CONFIG_FTL is not set
288# CONFIG_NFTL is not set 287# CONFIG_NFTL is not set
@@ -308,7 +307,6 @@ CONFIG_MTD_CFI_I2=y
308# CONFIG_MTD_RAM is not set 307# CONFIG_MTD_RAM is not set
309# CONFIG_MTD_ROM is not set 308# CONFIG_MTD_ROM is not set
310# CONFIG_MTD_ABSENT is not set 309# CONFIG_MTD_ABSENT is not set
311# CONFIG_MTD_OBSOLETE_CHIPS is not set
312 310
313# 311#
314# Mapping drivers for chip access 312# Mapping drivers for chip access
@@ -330,29 +328,15 @@ CONFIG_MTD_CFI_I2=y
330# CONFIG_MTD_DOC2000 is not set 328# CONFIG_MTD_DOC2000 is not set
331# CONFIG_MTD_DOC2001 is not set 329# CONFIG_MTD_DOC2001 is not set
332# CONFIG_MTD_DOC2001PLUS is not set 330# CONFIG_MTD_DOC2001PLUS is not set
333
334#
335# NAND Flash Device Drivers
336#
337# CONFIG_MTD_NAND is not set 331# CONFIG_MTD_NAND is not set
338
339#
340# OneNAND Flash Device Drivers
341#
342# CONFIG_MTD_ONENAND is not set 332# CONFIG_MTD_ONENAND is not set
343 333
344# 334#
345# Parallel port support 335# UBI - Unsorted block images
346# 336#
337# CONFIG_MTD_UBI is not set
347# CONFIG_PARPORT is not set 338# CONFIG_PARPORT is not set
348 339CONFIG_BLK_DEV=y
349#
350# Plug and Play support
351#
352
353#
354# Block devices
355#
356# CONFIG_BLK_DEV_COW_COMMON is not set 340# CONFIG_BLK_DEV_COW_COMMON is not set
357CONFIG_BLK_DEV_LOOP=y 341CONFIG_BLK_DEV_LOOP=y
358# CONFIG_BLK_DEV_CRYPTOLOOP is not set 342# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -361,18 +345,10 @@ CONFIG_BLK_DEV_RAM=y
361CONFIG_BLK_DEV_RAM_COUNT=16 345CONFIG_BLK_DEV_RAM_COUNT=16
362CONFIG_BLK_DEV_RAM_SIZE=4096 346CONFIG_BLK_DEV_RAM_SIZE=4096
363CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 347CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
364CONFIG_BLK_DEV_INITRD=y
365# CONFIG_CDROM_PKTCDVD is not set 348# CONFIG_CDROM_PKTCDVD is not set
366# CONFIG_ATA_OVER_ETH is not set 349# CONFIG_ATA_OVER_ETH is not set
367 350CONFIG_MISC_DEVICES=y
368# 351# CONFIG_EEPROM_93CX6 is not set
369# Misc devices
370#
371# CONFIG_TIFM_CORE is not set
372
373#
374# ATA/ATAPI/MFM/RLL support
375#
376CONFIG_IDE=m 352CONFIG_IDE=m
377CONFIG_IDE_MAX_HWIFS=4 353CONFIG_IDE_MAX_HWIFS=4
378CONFIG_BLK_DEV_IDE=m 354CONFIG_BLK_DEV_IDE=m
@@ -388,14 +364,15 @@ CONFIG_BLK_DEV_IDECD=m
388# CONFIG_BLK_DEV_IDETAPE is not set 364# CONFIG_BLK_DEV_IDETAPE is not set
389# CONFIG_BLK_DEV_IDEFLOPPY is not set 365# CONFIG_BLK_DEV_IDEFLOPPY is not set
390# CONFIG_IDE_TASK_IOCTL is not set 366# CONFIG_IDE_TASK_IOCTL is not set
367CONFIG_IDE_PROC_FS=y
391 368
392# 369#
393# IDE chipset support/bugfixes 370# IDE chipset support/bugfixes
394# 371#
395CONFIG_IDE_GENERIC=m 372CONFIG_IDE_GENERIC=m
373# CONFIG_IDEPCI_PCIBUS_ORDER is not set
396# CONFIG_IDE_ARM is not set 374# CONFIG_IDE_ARM is not set
397# CONFIG_BLK_DEV_IDEDMA is not set 375# CONFIG_BLK_DEV_IDEDMA is not set
398# CONFIG_IDEDMA_AUTO is not set
399# CONFIG_BLK_DEV_HD is not set 376# CONFIG_BLK_DEV_HD is not set
400 377
401# 378#
@@ -403,74 +380,26 @@ CONFIG_IDE_GENERIC=m
403# 380#
404# CONFIG_RAID_ATTRS is not set 381# CONFIG_RAID_ATTRS is not set
405# CONFIG_SCSI is not set 382# CONFIG_SCSI is not set
383# CONFIG_SCSI_DMA is not set
406# CONFIG_SCSI_NETLINK is not set 384# CONFIG_SCSI_NETLINK is not set
407
408#
409# Serial ATA (prod) and Parallel ATA (experimental) drivers
410#
411
412#
413# Multi-device support (RAID and LVM)
414#
415# CONFIG_MD is not set 385# CONFIG_MD is not set
416
417#
418# Fusion MPT device support
419#
420# CONFIG_FUSION is not set
421
422#
423# IEEE 1394 (FireWire) support
424#
425
426#
427# I2O device support
428#
429
430#
431# Network device support
432#
433CONFIG_NETDEVICES=y 386CONFIG_NETDEVICES=y
387# CONFIG_NETDEVICES_MULTIQUEUE is not set
434# CONFIG_DUMMY is not set 388# CONFIG_DUMMY is not set
435# CONFIG_BONDING is not set 389# CONFIG_BONDING is not set
390# CONFIG_MACVLAN is not set
436# CONFIG_EQUALIZER is not set 391# CONFIG_EQUALIZER is not set
437# CONFIG_TUN is not set 392# CONFIG_TUN is not set
438
439#
440# PHY device support
441#
442
443#
444# Ethernet (10 or 100Mbit)
445#
446# CONFIG_NET_ETHERNET is not set 393# CONFIG_NET_ETHERNET is not set
447CONFIG_NE2000=y 394CONFIG_NETDEV_1000=y
448 395CONFIG_NETDEV_10000=y
449#
450# Ethernet (1000 Mbit)
451#
452
453#
454# Ethernet (10000 Mbit)
455#
456 396
457# 397#
458# Token Ring devices 398# Wireless LAN
459#
460
461#
462# Wireless LAN (non-hamradio)
463#
464# CONFIG_NET_RADIO is not set
465
466#
467# PCMCIA network device support
468# 399#
400# CONFIG_WLAN_PRE80211 is not set
401# CONFIG_WLAN_80211 is not set
469# CONFIG_NET_PCMCIA is not set 402# CONFIG_NET_PCMCIA is not set
470
471#
472# Wan interfaces
473#
474# CONFIG_WAN is not set 403# CONFIG_WAN is not set
475# CONFIG_PPP is not set 404# CONFIG_PPP is not set
476# CONFIG_SLIP is not set 405# CONFIG_SLIP is not set
@@ -478,15 +407,7 @@ CONFIG_NE2000=y
478# CONFIG_NETCONSOLE is not set 407# CONFIG_NETCONSOLE is not set
479# CONFIG_NETPOLL is not set 408# CONFIG_NETPOLL is not set
480# CONFIG_NET_POLL_CONTROLLER is not set 409# CONFIG_NET_POLL_CONTROLLER is not set
481
482#
483# ISDN subsystem
484#
485# CONFIG_ISDN is not set 410# CONFIG_ISDN is not set
486
487#
488# Telephony Support
489#
490# CONFIG_PHONE is not set 411# CONFIG_PHONE is not set
491 412
492# 413#
@@ -494,6 +415,7 @@ CONFIG_NE2000=y
494# 415#
495CONFIG_INPUT=y 416CONFIG_INPUT=y
496# CONFIG_INPUT_FF_MEMLESS is not set 417# CONFIG_INPUT_FF_MEMLESS is not set
418# CONFIG_INPUT_POLLDEV is not set
497 419
498# 420#
499# Userland interfaces 421# Userland interfaces
@@ -513,6 +435,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
513# CONFIG_INPUT_KEYBOARD is not set 435# CONFIG_INPUT_KEYBOARD is not set
514# CONFIG_INPUT_MOUSE is not set 436# CONFIG_INPUT_MOUSE is not set
515# CONFIG_INPUT_JOYSTICK is not set 437# CONFIG_INPUT_JOYSTICK is not set
438# CONFIG_INPUT_TABLET is not set
516# CONFIG_INPUT_TOUCHSCREEN is not set 439# CONFIG_INPUT_TOUCHSCREEN is not set
517# CONFIG_INPUT_MISC is not set 440# CONFIG_INPUT_MISC is not set
518 441
@@ -547,41 +470,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
547CONFIG_UNIX98_PTYS=y 470CONFIG_UNIX98_PTYS=y
548CONFIG_LEGACY_PTYS=y 471CONFIG_LEGACY_PTYS=y
549CONFIG_LEGACY_PTY_COUNT=256 472CONFIG_LEGACY_PTY_COUNT=256
550
551#
552# IPMI
553#
554# CONFIG_IPMI_HANDLER is not set 473# CONFIG_IPMI_HANDLER is not set
555
556#
557# Watchdog Cards
558#
559# CONFIG_WATCHDOG is not set 474# CONFIG_WATCHDOG is not set
560CONFIG_HW_RANDOM=y 475CONFIG_HW_RANDOM=y
561# CONFIG_RTC is not set 476# CONFIG_RTC is not set
562# CONFIG_DTLK is not set
563# CONFIG_R3964 is not set 477# CONFIG_R3964 is not set
564 478
565# 479#
566# Ftape, the floppy tape device driver
567#
568
569#
570# PCMCIA character devices 480# PCMCIA character devices
571# 481#
572# CONFIG_SYNCLINK_CS is not set 482# CONFIG_SYNCLINK_CS is not set
573# CONFIG_CARDMAN_4000 is not set 483# CONFIG_CARDMAN_4000 is not set
574# CONFIG_CARDMAN_4040 is not set 484# CONFIG_CARDMAN_4040 is not set
575# CONFIG_RAW_DRIVER is not set 485# CONFIG_RAW_DRIVER is not set
576
577#
578# TPM devices
579#
580# CONFIG_TCG_TPM is not set 486# CONFIG_TCG_TPM is not set
581
582#
583# I2C support
584#
585# CONFIG_I2C is not set 487# CONFIG_I2C is not set
586 488
587# 489#
@@ -589,47 +491,56 @@ CONFIG_HW_RANDOM=y
589# 491#
590# CONFIG_SPI is not set 492# CONFIG_SPI is not set
591# CONFIG_SPI_MASTER is not set 493# CONFIG_SPI_MASTER is not set
592
593#
594# Dallas's 1-wire bus
595#
596# CONFIG_W1 is not set 494# CONFIG_W1 is not set
597 495# CONFIG_POWER_SUPPLY is not set
598#
599# Hardware Monitoring support
600#
601CONFIG_HWMON=y 496CONFIG_HWMON=y
602# CONFIG_HWMON_VID is not set 497# CONFIG_HWMON_VID is not set
603# CONFIG_SENSORS_ABITUGURU is not set 498# CONFIG_SENSORS_ABITUGURU is not set
499# CONFIG_SENSORS_ABITUGURU3 is not set
604# CONFIG_SENSORS_F71805F is not set 500# CONFIG_SENSORS_F71805F is not set
501# CONFIG_SENSORS_IT87 is not set
502# CONFIG_SENSORS_PC87360 is not set
503# CONFIG_SENSORS_PC87427 is not set
504# CONFIG_SENSORS_SMSC47M1 is not set
505# CONFIG_SENSORS_SMSC47B397 is not set
605# CONFIG_SENSORS_VT1211 is not set 506# CONFIG_SENSORS_VT1211 is not set
507# CONFIG_SENSORS_W83627HF is not set
508# CONFIG_SENSORS_W83627EHF is not set
606# CONFIG_HWMON_DEBUG_CHIP is not set 509# CONFIG_HWMON_DEBUG_CHIP is not set
607 510
608# 511#
609# Multimedia devices 512# Multifunction device drivers
610# 513#
611# CONFIG_VIDEO_DEV is not set 514# CONFIG_MFD_SM501 is not set
612 515
613# 516#
614# Digital Video Broadcasting Devices 517# Multimedia devices
615# 518#
616# CONFIG_DVB is not set 519# CONFIG_VIDEO_DEV is not set
520# CONFIG_DVB_CORE is not set
521CONFIG_DAB=y
617 522
618# 523#
619# Graphics support 524# Graphics support
620# 525#
621CONFIG_FIRMWARE_EDID=y
622# CONFIG_FB is not set
623# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 526# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
624 527
625# 528#
626# Sound 529# Display device support
627# 530#
628# CONFIG_SOUND is not set 531# CONFIG_DISPLAY_SUPPORT is not set
532# CONFIG_VGASTATE is not set
533CONFIG_VIDEO_OUTPUT_CONTROL=m
534# CONFIG_FB is not set
629 535
630# 536#
631# USB support 537# Sound
632# 538#
539# CONFIG_SOUND is not set
540CONFIG_HID_SUPPORT=y
541CONFIG_HID=y
542# CONFIG_HID_DEBUG is not set
543CONFIG_USB_SUPPORT=y
633# CONFIG_USB_ARCH_HAS_HCD is not set 544# CONFIG_USB_ARCH_HAS_HCD is not set
634# CONFIG_USB_ARCH_HAS_OHCI is not set 545# CONFIG_USB_ARCH_HAS_OHCI is not set
635# CONFIG_USB_ARCH_HAS_EHCI is not set 546# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -642,50 +553,18 @@ CONFIG_FIRMWARE_EDID=y
642# USB Gadget Support 553# USB Gadget Support
643# 554#
644# CONFIG_USB_GADGET is not set 555# CONFIG_USB_GADGET is not set
645
646#
647# MMC/SD Card support
648#
649# CONFIG_MMC is not set 556# CONFIG_MMC is not set
650
651#
652# LED devices
653#
654# CONFIG_NEW_LEDS is not set 557# CONFIG_NEW_LEDS is not set
655 558
656# 559#
657# LED drivers
658#
659
660#
661# LED Triggers
662#
663
664#
665# InfiniBand support
666#
667
668#
669# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
670#
671
672#
673# Real Time Clock 560# Real Time Clock
674# 561#
675# CONFIG_RTC_CLASS is not set 562# CONFIG_RTC_CLASS is not set
676 563
677# 564#
678# DMA Engine support 565# Userspace I/O
679#
680# CONFIG_DMA_ENGINE is not set
681
682#
683# DMA Clients
684#
685
686#
687# DMA Devices
688# 566#
567# CONFIG_UIO is not set
689 568
690# 569#
691# File systems 570# File systems
@@ -758,9 +637,6 @@ CONFIG_RAMFS=y
758# CONFIG_BEFS_FS is not set 637# CONFIG_BEFS_FS is not set
759# CONFIG_BFS_FS is not set 638# CONFIG_BFS_FS is not set
760# CONFIG_EFS_FS is not set 639# CONFIG_EFS_FS is not set
761CONFIG_JFFS_FS=y
762CONFIG_JFFS_FS_VERBOSE=0
763CONFIG_JFFS_PROC_FS=y
764CONFIG_JFFS2_FS=y 640CONFIG_JFFS2_FS=y
765CONFIG_JFFS2_FS_DEBUG=0 641CONFIG_JFFS2_FS_DEBUG=0
766CONFIG_JFFS2_FS_WRITEBUFFER=y 642CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -791,6 +667,7 @@ CONFIG_LOCKD=y
791CONFIG_LOCKD_V4=y 667CONFIG_LOCKD_V4=y
792CONFIG_NFS_COMMON=y 668CONFIG_NFS_COMMON=y
793CONFIG_SUNRPC=y 669CONFIG_SUNRPC=y
670# CONFIG_SUNRPC_BIND34 is not set
794# CONFIG_RPCSEC_GSS_KRB5 is not set 671# CONFIG_RPCSEC_GSS_KRB5 is not set
795# CONFIG_RPCSEC_GSS_SPKM3 is not set 672# CONFIG_RPCSEC_GSS_SPKM3 is not set
796# CONFIG_SMB_FS is not set 673# CONFIG_SMB_FS is not set
@@ -798,7 +675,6 @@ CONFIG_SUNRPC=y
798# CONFIG_NCP_FS is not set 675# CONFIG_NCP_FS is not set
799# CONFIG_CODA_FS is not set 676# CONFIG_CODA_FS is not set
800# CONFIG_AFS_FS is not set 677# CONFIG_AFS_FS is not set
801# CONFIG_9P_FS is not set
802 678
803# 679#
804# Partition Types 680# Partition Types
@@ -851,6 +727,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
851# CONFIG_NLS_UTF8 is not set 727# CONFIG_NLS_UTF8 is not set
852 728
853# 729#
730# Distributed Lock Manager
731#
732# CONFIG_DLM is not set
733
734#
854# Profiling support 735# Profiling support
855# 736#
856# CONFIG_PROFILING is not set 737# CONFIG_PROFILING is not set
@@ -862,31 +743,29 @@ CONFIG_NLS_DEFAULT="iso8859-1"
862CONFIG_ENABLE_MUST_CHECK=y 743CONFIG_ENABLE_MUST_CHECK=y
863# CONFIG_MAGIC_SYSRQ is not set 744# CONFIG_MAGIC_SYSRQ is not set
864# CONFIG_UNUSED_SYMBOLS is not set 745# CONFIG_UNUSED_SYMBOLS is not set
746# CONFIG_DEBUG_FS is not set
747# CONFIG_HEADERS_CHECK is not set
865# CONFIG_DEBUG_KERNEL is not set 748# CONFIG_DEBUG_KERNEL is not set
866CONFIG_LOG_BUF_SHIFT=14
867# CONFIG_DEBUG_BUGVERBOSE is not set 749# CONFIG_DEBUG_BUGVERBOSE is not set
868# CONFIG_DEBUG_FS is not set
869# CONFIG_FRAME_POINTER is not set 750# CONFIG_FRAME_POINTER is not set
870# CONFIG_UNWIND_INFO is not set
871# CONFIG_HEADERS_CHECK is not set
872 751
873# 752#
874# Security options 753# Security options
875# 754#
876# CONFIG_KEYS is not set 755# CONFIG_KEYS is not set
877# CONFIG_SECURITY is not set 756# CONFIG_SECURITY is not set
878
879#
880# Cryptographic options
881#
882# CONFIG_CRYPTO is not set 757# CONFIG_CRYPTO is not set
883 758
884# 759#
885# Library routines 760# Library routines
886# 761#
762CONFIG_BITREVERSE=y
887# CONFIG_CRC_CCITT is not set 763# CONFIG_CRC_CCITT is not set
888# CONFIG_CRC16 is not set 764# CONFIG_CRC16 is not set
765# CONFIG_CRC_ITU_T is not set
889CONFIG_CRC32=y 766CONFIG_CRC32=y
767# CONFIG_CRC7 is not set
890# CONFIG_LIBCRC32C is not set 768# CONFIG_LIBCRC32C is not set
891CONFIG_ZLIB_INFLATE=y 769CONFIG_ZLIB_INFLATE=y
892CONFIG_ZLIB_DEFLATE=y 770CONFIG_ZLIB_DEFLATE=y
771CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi2/defconfig.opsp b/arch/m32r/configs/mappi2.opsp_defconfig
index b379ae96e6a7..54bb6e25d39c 100644
--- a/arch/m32r/mappi2/defconfig.opsp
+++ b/arch/m32r/configs/mappi2.opsp_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Wed Dec 13 19:40:30 2006 4# Wed Aug 1 17:22:36 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -24,18 +27,19 @@ CONFIG_LOCALVERSION=""
24CONFIG_LOCALVERSION_AUTO=y 27CONFIG_LOCALVERSION_AUTO=y
25CONFIG_SWAP=y 28CONFIG_SWAP=y
26CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
27# CONFIG_IPC_NS is not set 30CONFIG_SYSVIPC_SYSCTL=y
28# CONFIG_POSIX_MQUEUE is not set 31# CONFIG_POSIX_MQUEUE is not set
29CONFIG_BSD_PROCESS_ACCT=y 32CONFIG_BSD_PROCESS_ACCT=y
30# CONFIG_BSD_PROCESS_ACCT_V3 is not set 33# CONFIG_BSD_PROCESS_ACCT_V3 is not set
31# CONFIG_TASKSTATS is not set 34# CONFIG_TASKSTATS is not set
32# CONFIG_UTS_NS is not set 35# CONFIG_USER_NS is not set
33# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
34CONFIG_IKCONFIG=y 37CONFIG_IKCONFIG=y
35# CONFIG_IKCONFIG_PROC is not set 38# CONFIG_IKCONFIG_PROC is not set
39CONFIG_LOG_BUF_SHIFT=14
36CONFIG_SYSFS_DEPRECATED=y 40CONFIG_SYSFS_DEPRECATED=y
37# CONFIG_RELAY is not set 41# CONFIG_RELAY is not set
38CONFIG_INITRAMFS_SOURCE="" 42# CONFIG_BLK_DEV_INITRD is not set
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SYSCTL=y 44CONFIG_SYSCTL=y
41CONFIG_EMBEDDED=y 45CONFIG_EMBEDDED=y
@@ -47,29 +51,29 @@ CONFIG_BUG=y
47CONFIG_ELF_CORE=y 51CONFIG_ELF_CORE=y
48CONFIG_BASE_FULL=y 52CONFIG_BASE_FULL=y
49# CONFIG_FUTEX is not set 53# CONFIG_FUTEX is not set
54CONFIG_ANON_INODES=y
50# CONFIG_EPOLL is not set 55# CONFIG_EPOLL is not set
56CONFIG_SIGNALFD=y
57CONFIG_TIMERFD=y
58CONFIG_EVENTFD=y
51CONFIG_SHMEM=y 59CONFIG_SHMEM=y
52CONFIG_SLAB=y
53CONFIG_VM_EVENT_COUNTERS=y 60CONFIG_VM_EVENT_COUNTERS=y
61CONFIG_SLAB=y
62# CONFIG_SLUB is not set
63# CONFIG_SLOB is not set
54# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
55CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
56# CONFIG_SLOB is not set
57
58#
59# Loadable module support
60#
61CONFIG_MODULES=y 66CONFIG_MODULES=y
62CONFIG_MODULE_UNLOAD=y 67CONFIG_MODULE_UNLOAD=y
63# CONFIG_MODULE_FORCE_UNLOAD is not set 68# CONFIG_MODULE_FORCE_UNLOAD is not set
64# CONFIG_MODVERSIONS is not set 69# CONFIG_MODVERSIONS is not set
65# CONFIG_MODULE_SRCVERSION_ALL is not set 70# CONFIG_MODULE_SRCVERSION_ALL is not set
66CONFIG_KMOD=y 71CONFIG_KMOD=y
67
68#
69# Block layer
70#
71CONFIG_BLOCK=y 72CONFIG_BLOCK=y
73# CONFIG_LBD is not set
72# CONFIG_BLK_DEV_IO_TRACE is not set 74# CONFIG_BLK_DEV_IO_TRACE is not set
75# CONFIG_LSF is not set
76# CONFIG_BLK_DEV_BSG is not set
73 77
74# 78#
75# IO Schedulers 79# IO Schedulers
@@ -122,13 +126,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
122# CONFIG_SPARSEMEM_STATIC is not set 126# CONFIG_SPARSEMEM_STATIC is not set
123CONFIG_SPLIT_PTLOCK_CPUS=4 127CONFIG_SPLIT_PTLOCK_CPUS=4
124# CONFIG_RESOURCES_64BIT is not set 128# CONFIG_RESOURCES_64BIT is not set
129CONFIG_ZONE_DMA_FLAG=1
130CONFIG_BOUNCE=y
131CONFIG_VIRT_TO_BUS=y
125CONFIG_IRAM_START=0x00f00000 132CONFIG_IRAM_START=0x00f00000
126CONFIG_IRAM_SIZE=0x00008000 133CONFIG_IRAM_SIZE=0x00008000
127CONFIG_RWSEM_GENERIC_SPINLOCK=y 134CONFIG_RWSEM_GENERIC_SPINLOCK=y
128# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 135# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
136# CONFIG_ARCH_HAS_ILOG2_U32 is not set
137# CONFIG_ARCH_HAS_ILOG2_U64 is not set
129CONFIG_GENERIC_FIND_NEXT_BIT=y 138CONFIG_GENERIC_FIND_NEXT_BIT=y
130CONFIG_GENERIC_HWEIGHT=y 139CONFIG_GENERIC_HWEIGHT=y
131CONFIG_GENERIC_CALIBRATE_DELAY=y 140CONFIG_GENERIC_CALIBRATE_DELAY=y
141CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
132CONFIG_PREEMPT=y 142CONFIG_PREEMPT=y
133# CONFIG_SMP is not set 143# CONFIG_SMP is not set
134CONFIG_NODES_SHIFT=1 144CONFIG_NODES_SHIFT=1
@@ -136,6 +146,7 @@ CONFIG_NODES_SHIFT=1
136# 146#
137# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 147# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
138# 148#
149# CONFIG_ARCH_SUPPORTS_MSI is not set
139# CONFIG_ISA is not set 150# CONFIG_ISA is not set
140 151
141# 152#
@@ -153,10 +164,6 @@ CONFIG_PCMCIA_IOCTL=y
153# CONFIG_M32R_CFC is not set 164# CONFIG_M32R_CFC is not set
154 165
155# 166#
156# PCI Hotplug Support
157#
158
159#
160# Executable file formats 167# Executable file formats
161# 168#
162CONFIG_BINFMT_ELF=y 169CONFIG_BINFMT_ELF=y
@@ -170,13 +177,13 @@ CONFIG_NET=y
170# 177#
171# Networking options 178# Networking options
172# 179#
173# CONFIG_NETDEBUG is not set
174CONFIG_PACKET=y 180CONFIG_PACKET=y
175# CONFIG_PACKET_MMAP is not set 181# CONFIG_PACKET_MMAP is not set
176CONFIG_UNIX=y 182CONFIG_UNIX=y
177CONFIG_XFRM=y 183CONFIG_XFRM=y
178# CONFIG_XFRM_USER is not set 184# CONFIG_XFRM_USER is not set
179# CONFIG_XFRM_SUB_POLICY is not set 185# CONFIG_XFRM_SUB_POLICY is not set
186# CONFIG_XFRM_MIGRATE is not set
180# CONFIG_NET_KEY is not set 187# CONFIG_NET_KEY is not set
181CONFIG_INET=y 188CONFIG_INET=y
182# CONFIG_IP_MULTICAST is not set 189# CONFIG_IP_MULTICAST is not set
@@ -209,20 +216,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
209# CONFIG_INET6_TUNNEL is not set 216# CONFIG_INET6_TUNNEL is not set
210# CONFIG_NETWORK_SECMARK is not set 217# CONFIG_NETWORK_SECMARK is not set
211# CONFIG_NETFILTER is not set 218# CONFIG_NETFILTER is not set
212
213#
214# DCCP Configuration (EXPERIMENTAL)
215#
216# CONFIG_IP_DCCP is not set 219# CONFIG_IP_DCCP is not set
217
218#
219# SCTP Configuration (EXPERIMENTAL)
220#
221# CONFIG_IP_SCTP is not set 220# CONFIG_IP_SCTP is not set
222
223#
224# TIPC Configuration (EXPERIMENTAL)
225#
226# CONFIG_TIPC is not set 221# CONFIG_TIPC is not set
227# CONFIG_ATM is not set 222# CONFIG_ATM is not set
228# CONFIG_BRIDGE is not set 223# CONFIG_BRIDGE is not set
@@ -248,7 +243,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
248# CONFIG_HAMRADIO is not set 243# CONFIG_HAMRADIO is not set
249# CONFIG_IRDA is not set 244# CONFIG_IRDA is not set
250# CONFIG_BT is not set 245# CONFIG_BT is not set
246# CONFIG_AF_RXRPC is not set
247
248#
249# Wireless
250#
251# CONFIG_CFG80211 is not set
252# CONFIG_WIRELESS_EXT is not set
253# CONFIG_MAC80211 is not set
251# CONFIG_IEEE80211 is not set 254# CONFIG_IEEE80211 is not set
255# CONFIG_RFKILL is not set
256# CONFIG_NET_9P is not set
252 257
253# 258#
254# Device Drivers 259# Device Drivers
@@ -261,29 +266,10 @@ CONFIG_STANDALONE=y
261CONFIG_PREVENT_FIRMWARE_BUILD=y 266CONFIG_PREVENT_FIRMWARE_BUILD=y
262CONFIG_FW_LOADER=y 267CONFIG_FW_LOADER=y
263# CONFIG_SYS_HYPERVISOR is not set 268# CONFIG_SYS_HYPERVISOR is not set
264
265#
266# Connector - unified userspace <-> kernelspace linker
267#
268# CONFIG_CONNECTOR is not set 269# CONFIG_CONNECTOR is not set
269
270#
271# Memory Technology Devices (MTD)
272#
273# CONFIG_MTD is not set 270# CONFIG_MTD is not set
274
275#
276# Parallel port support
277#
278# CONFIG_PARPORT is not set 271# CONFIG_PARPORT is not set
279 272CONFIG_BLK_DEV=y
280#
281# Plug and Play support
282#
283
284#
285# Block devices
286#
287# CONFIG_BLK_DEV_COW_COMMON is not set 273# CONFIG_BLK_DEV_COW_COMMON is not set
288CONFIG_BLK_DEV_LOOP=y 274CONFIG_BLK_DEV_LOOP=y
289# CONFIG_BLK_DEV_CRYPTOLOOP is not set 275# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -292,18 +278,10 @@ CONFIG_BLK_DEV_RAM=y
292CONFIG_BLK_DEV_RAM_COUNT=16 278CONFIG_BLK_DEV_RAM_COUNT=16
293CONFIG_BLK_DEV_RAM_SIZE=4096 279CONFIG_BLK_DEV_RAM_SIZE=4096
294CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 280CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
295# CONFIG_BLK_DEV_INITRD is not set
296# CONFIG_CDROM_PKTCDVD is not set 281# CONFIG_CDROM_PKTCDVD is not set
297# CONFIG_ATA_OVER_ETH is not set 282# CONFIG_ATA_OVER_ETH is not set
298 283CONFIG_MISC_DEVICES=y
299# 284# CONFIG_EEPROM_93CX6 is not set
300# Misc devices
301#
302# CONFIG_TIFM_CORE is not set
303
304#
305# ATA/ATAPI/MFM/RLL support
306#
307CONFIG_IDE=y 285CONFIG_IDE=y
308CONFIG_IDE_MAX_HWIFS=4 286CONFIG_IDE_MAX_HWIFS=4
309CONFIG_BLK_DEV_IDE=y 287CONFIG_BLK_DEV_IDE=y
@@ -320,14 +298,15 @@ CONFIG_BLK_DEV_IDECD=m
320# CONFIG_BLK_DEV_IDEFLOPPY is not set 298# CONFIG_BLK_DEV_IDEFLOPPY is not set
321# CONFIG_BLK_DEV_IDESCSI is not set 299# CONFIG_BLK_DEV_IDESCSI is not set
322# CONFIG_IDE_TASK_IOCTL is not set 300# CONFIG_IDE_TASK_IOCTL is not set
301CONFIG_IDE_PROC_FS=y
323 302
324# 303#
325# IDE chipset support/bugfixes 304# IDE chipset support/bugfixes
326# 305#
327CONFIG_IDE_GENERIC=y 306CONFIG_IDE_GENERIC=y
307# CONFIG_IDEPCI_PCIBUS_ORDER is not set
328# CONFIG_IDE_ARM is not set 308# CONFIG_IDE_ARM is not set
329# CONFIG_BLK_DEV_IDEDMA is not set 309# CONFIG_BLK_DEV_IDEDMA is not set
330# CONFIG_IDEDMA_AUTO is not set
331# CONFIG_BLK_DEV_HD is not set 310# CONFIG_BLK_DEV_HD is not set
332 311
333# 312#
@@ -335,6 +314,8 @@ CONFIG_IDE_GENERIC=y
335# 314#
336# CONFIG_RAID_ATTRS is not set 315# CONFIG_RAID_ATTRS is not set
337CONFIG_SCSI=m 316CONFIG_SCSI=m
317# CONFIG_SCSI_DMA is not set
318# CONFIG_SCSI_TGT is not set
338# CONFIG_SCSI_NETLINK is not set 319# CONFIG_SCSI_NETLINK is not set
339CONFIG_SCSI_PROC_FS=y 320CONFIG_SCSI_PROC_FS=y
340 321
@@ -355,6 +336,8 @@ CONFIG_CHR_DEV_SG=m
355CONFIG_SCSI_MULTI_LUN=y 336CONFIG_SCSI_MULTI_LUN=y
356# CONFIG_SCSI_CONSTANTS is not set 337# CONFIG_SCSI_CONSTANTS is not set
357# CONFIG_SCSI_LOGGING is not set 338# CONFIG_SCSI_LOGGING is not set
339# CONFIG_SCSI_SCAN_ASYNC is not set
340CONFIG_SCSI_WAIT_SCAN=m
358 341
359# 342#
360# SCSI Transports 343# SCSI Transports
@@ -362,93 +345,33 @@ CONFIG_SCSI_MULTI_LUN=y
362# CONFIG_SCSI_SPI_ATTRS is not set 345# CONFIG_SCSI_SPI_ATTRS is not set
363# CONFIG_SCSI_FC_ATTRS is not set 346# CONFIG_SCSI_FC_ATTRS is not set
364# CONFIG_SCSI_ISCSI_ATTRS is not set 347# CONFIG_SCSI_ISCSI_ATTRS is not set
365# CONFIG_SCSI_SAS_ATTRS is not set
366# CONFIG_SCSI_SAS_LIBSAS is not set 348# CONFIG_SCSI_SAS_LIBSAS is not set
367 349CONFIG_SCSI_LOWLEVEL=y
368#
369# SCSI low-level drivers
370#
371# CONFIG_ISCSI_TCP is not set 350# CONFIG_ISCSI_TCP is not set
372# CONFIG_SCSI_DEBUG is not set 351# CONFIG_SCSI_DEBUG is not set
373 352# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
374#
375# PCMCIA SCSI adapter support
376#
377# CONFIG_PCMCIA_AHA152X is not set
378# CONFIG_PCMCIA_FDOMAIN is not set
379# CONFIG_PCMCIA_NINJA_SCSI is not set
380# CONFIG_PCMCIA_QLOGIC is not set
381# CONFIG_PCMCIA_SYM53C500 is not set
382
383#
384# Serial ATA (prod) and Parallel ATA (experimental) drivers
385#
386
387#
388# Multi-device support (RAID and LVM)
389#
390# CONFIG_MD is not set 353# CONFIG_MD is not set
391
392#
393# Fusion MPT device support
394#
395# CONFIG_FUSION is not set
396
397#
398# IEEE 1394 (FireWire) support
399#
400
401#
402# I2O device support
403#
404
405#
406# Network device support
407#
408CONFIG_NETDEVICES=y 354CONFIG_NETDEVICES=y
355# CONFIG_NETDEVICES_MULTIQUEUE is not set
409# CONFIG_DUMMY is not set 356# CONFIG_DUMMY is not set
410# CONFIG_BONDING is not set 357# CONFIG_BONDING is not set
358# CONFIG_MACVLAN is not set
411# CONFIG_EQUALIZER is not set 359# CONFIG_EQUALIZER is not set
412# CONFIG_TUN is not set 360# CONFIG_TUN is not set
413
414#
415# PHY device support
416#
417# CONFIG_PHYLIB is not set 361# CONFIG_PHYLIB is not set
418
419#
420# Ethernet (10 or 100Mbit)
421#
422CONFIG_NET_ETHERNET=y 362CONFIG_NET_ETHERNET=y
423CONFIG_MII=y 363CONFIG_MII=y
424CONFIG_SMC91X=y 364CONFIG_SMC91X=y
425# CONFIG_NE2000 is not set 365# CONFIG_NE2000 is not set
366CONFIG_NETDEV_1000=y
367CONFIG_NETDEV_10000=y
426 368
427# 369#
428# Ethernet (1000 Mbit) 370# Wireless LAN
429#
430
431#
432# Ethernet (10000 Mbit)
433#
434
435#
436# Token Ring devices
437#
438
439#
440# Wireless LAN (non-hamradio)
441#
442# CONFIG_NET_RADIO is not set
443
444#
445# PCMCIA network device support
446# 371#
372# CONFIG_WLAN_PRE80211 is not set
373# CONFIG_WLAN_80211 is not set
447# CONFIG_NET_PCMCIA is not set 374# CONFIG_NET_PCMCIA is not set
448
449#
450# Wan interfaces
451#
452# CONFIG_WAN is not set 375# CONFIG_WAN is not set
453# CONFIG_PPP is not set 376# CONFIG_PPP is not set
454# CONFIG_SLIP is not set 377# CONFIG_SLIP is not set
@@ -456,15 +379,7 @@ CONFIG_SMC91X=y
456# CONFIG_NETCONSOLE is not set 379# CONFIG_NETCONSOLE is not set
457# CONFIG_NETPOLL is not set 380# CONFIG_NETPOLL is not set
458# CONFIG_NET_POLL_CONTROLLER is not set 381# CONFIG_NET_POLL_CONTROLLER is not set
459
460#
461# ISDN subsystem
462#
463# CONFIG_ISDN is not set 382# CONFIG_ISDN is not set
464
465#
466# Telephony Support
467#
468# CONFIG_PHONE is not set 383# CONFIG_PHONE is not set
469 384
470# 385#
@@ -472,6 +387,7 @@ CONFIG_SMC91X=y
472# 387#
473CONFIG_INPUT=y 388CONFIG_INPUT=y
474# CONFIG_INPUT_FF_MEMLESS is not set 389# CONFIG_INPUT_FF_MEMLESS is not set
390# CONFIG_INPUT_POLLDEV is not set
475 391
476# 392#
477# Userland interfaces 393# Userland interfaces
@@ -488,6 +404,7 @@ CONFIG_INPUT=y
488# CONFIG_INPUT_KEYBOARD is not set 404# CONFIG_INPUT_KEYBOARD is not set
489# CONFIG_INPUT_MOUSE is not set 405# CONFIG_INPUT_MOUSE is not set
490# CONFIG_INPUT_JOYSTICK is not set 406# CONFIG_INPUT_JOYSTICK is not set
407# CONFIG_INPUT_TABLET is not set
491# CONFIG_INPUT_TOUCHSCREEN is not set 408# CONFIG_INPUT_TOUCHSCREEN is not set
492# CONFIG_INPUT_MISC is not set 409# CONFIG_INPUT_MISC is not set
493 410
@@ -525,41 +442,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
525CONFIG_UNIX98_PTYS=y 442CONFIG_UNIX98_PTYS=y
526CONFIG_LEGACY_PTYS=y 443CONFIG_LEGACY_PTYS=y
527CONFIG_LEGACY_PTY_COUNT=256 444CONFIG_LEGACY_PTY_COUNT=256
528
529#
530# IPMI
531#
532# CONFIG_IPMI_HANDLER is not set 445# CONFIG_IPMI_HANDLER is not set
533
534#
535# Watchdog Cards
536#
537# CONFIG_WATCHDOG is not set 446# CONFIG_WATCHDOG is not set
538CONFIG_HW_RANDOM=y 447CONFIG_HW_RANDOM=y
539# CONFIG_RTC is not set 448# CONFIG_RTC is not set
540# CONFIG_DTLK is not set
541# CONFIG_R3964 is not set 449# CONFIG_R3964 is not set
542 450
543# 451#
544# Ftape, the floppy tape device driver
545#
546
547#
548# PCMCIA character devices 452# PCMCIA character devices
549# 453#
550# CONFIG_SYNCLINK_CS is not set 454# CONFIG_SYNCLINK_CS is not set
551# CONFIG_CARDMAN_4000 is not set 455# CONFIG_CARDMAN_4000 is not set
552# CONFIG_CARDMAN_4040 is not set 456# CONFIG_CARDMAN_4040 is not set
553# CONFIG_RAW_DRIVER is not set 457# CONFIG_RAW_DRIVER is not set
554
555#
556# TPM devices
557#
558# CONFIG_TCG_TPM is not set 458# CONFIG_TCG_TPM is not set
559
560#
561# I2C support
562#
563# CONFIG_I2C is not set 459# CONFIG_I2C is not set
564 460
565# 461#
@@ -567,56 +463,55 @@ CONFIG_HW_RANDOM=y
567# 463#
568# CONFIG_SPI is not set 464# CONFIG_SPI is not set
569# CONFIG_SPI_MASTER is not set 465# CONFIG_SPI_MASTER is not set
570
571#
572# Dallas's 1-wire bus
573#
574# CONFIG_W1 is not set 466# CONFIG_W1 is not set
575 467# CONFIG_POWER_SUPPLY is not set
576#
577# Hardware Monitoring support
578#
579CONFIG_HWMON=y 468CONFIG_HWMON=y
580# CONFIG_HWMON_VID is not set 469# CONFIG_HWMON_VID is not set
581# CONFIG_SENSORS_ABITUGURU is not set 470# CONFIG_SENSORS_ABITUGURU is not set
471# CONFIG_SENSORS_ABITUGURU3 is not set
582# CONFIG_SENSORS_F71805F is not set 472# CONFIG_SENSORS_F71805F is not set
473# CONFIG_SENSORS_IT87 is not set
474# CONFIG_SENSORS_PC87360 is not set
475# CONFIG_SENSORS_PC87427 is not set
476# CONFIG_SENSORS_SMSC47M1 is not set
477# CONFIG_SENSORS_SMSC47B397 is not set
583# CONFIG_SENSORS_VT1211 is not set 478# CONFIG_SENSORS_VT1211 is not set
479# CONFIG_SENSORS_W83627HF is not set
480# CONFIG_SENSORS_W83627EHF is not set
584# CONFIG_HWMON_DEBUG_CHIP is not set 481# CONFIG_HWMON_DEBUG_CHIP is not set
585 482
586# 483#
484# Multifunction device drivers
485#
486# CONFIG_MFD_SM501 is not set
487
488#
587# Multimedia devices 489# Multimedia devices
588# 490#
589CONFIG_VIDEO_DEV=y 491CONFIG_VIDEO_DEV=y
590CONFIG_VIDEO_V4L1=y 492CONFIG_VIDEO_V4L1=y
591CONFIG_VIDEO_V4L1_COMPAT=y 493CONFIG_VIDEO_V4L1_COMPAT=y
592CONFIG_VIDEO_V4L2=y 494CONFIG_VIDEO_V4L2=y
593 495CONFIG_VIDEO_CAPTURE_DRIVERS=y
594#
595# Video Capture Adapters
596#
597
598#
599# Video Capture Adapters
600#
601# CONFIG_VIDEO_ADV_DEBUG is not set 496# CONFIG_VIDEO_ADV_DEBUG is not set
602CONFIG_VIDEO_HELPER_CHIPS_AUTO=y 497CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
603# CONFIG_VIDEO_VIVI is not set
604# CONFIG_VIDEO_CPIA is not set 498# CONFIG_VIDEO_CPIA is not set
605# CONFIG_VIDEO_M32R_AR is not set 499# CONFIG_VIDEO_M32R_AR is not set
500CONFIG_RADIO_ADAPTERS=y
501# CONFIG_DVB_CORE is not set
502CONFIG_DAB=y
606 503
607# 504#
608# Radio Adapters 505# Graphics support
609#
610
611#
612# Digital Video Broadcasting Devices
613# 506#
614# CONFIG_DVB is not set 507# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
615 508
616# 509#
617# Graphics support 510# Display device support
618# 511#
619CONFIG_FIRMWARE_EDID=y 512# CONFIG_DISPLAY_SUPPORT is not set
513# CONFIG_VGASTATE is not set
514CONFIG_VIDEO_OUTPUT_CONTROL=m
620# CONFIG_FB is not set 515# CONFIG_FB is not set
621 516
622# 517#
@@ -624,16 +519,15 @@ CONFIG_FIRMWARE_EDID=y
624# 519#
625# CONFIG_VGA_CONSOLE is not set 520# CONFIG_VGA_CONSOLE is not set
626CONFIG_DUMMY_CONSOLE=y 521CONFIG_DUMMY_CONSOLE=y
627# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
628 522
629# 523#
630# Sound 524# Sound
631# 525#
632# CONFIG_SOUND is not set 526# CONFIG_SOUND is not set
633 527CONFIG_HID_SUPPORT=y
634# 528CONFIG_HID=y
635# USB support 529# CONFIG_HID_DEBUG is not set
636# 530CONFIG_USB_SUPPORT=y
637# CONFIG_USB_ARCH_HAS_HCD is not set 531# CONFIG_USB_ARCH_HAS_HCD is not set
638# CONFIG_USB_ARCH_HAS_OHCI is not set 532# CONFIG_USB_ARCH_HAS_OHCI is not set
639# CONFIG_USB_ARCH_HAS_EHCI is not set 533# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -646,50 +540,18 @@ CONFIG_DUMMY_CONSOLE=y
646# USB Gadget Support 540# USB Gadget Support
647# 541#
648# CONFIG_USB_GADGET is not set 542# CONFIG_USB_GADGET is not set
649
650#
651# MMC/SD Card support
652#
653# CONFIG_MMC is not set 543# CONFIG_MMC is not set
654
655#
656# LED devices
657#
658# CONFIG_NEW_LEDS is not set 544# CONFIG_NEW_LEDS is not set
659 545
660# 546#
661# LED drivers
662#
663
664#
665# LED Triggers
666#
667
668#
669# InfiniBand support
670#
671
672#
673# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
674#
675
676#
677# Real Time Clock 547# Real Time Clock
678# 548#
679# CONFIG_RTC_CLASS is not set 549# CONFIG_RTC_CLASS is not set
680 550
681# 551#
682# DMA Engine support 552# Userspace I/O
683#
684# CONFIG_DMA_ENGINE is not set
685
686#
687# DMA Clients
688#
689
690#
691# DMA Devices
692# 553#
554# CONFIG_UIO is not set
693 555
694# 556#
695# File systems 557# File systems
@@ -784,6 +646,7 @@ CONFIG_LOCKD=y
784CONFIG_LOCKD_V4=y 646CONFIG_LOCKD_V4=y
785CONFIG_NFS_COMMON=y 647CONFIG_NFS_COMMON=y
786CONFIG_SUNRPC=y 648CONFIG_SUNRPC=y
649# CONFIG_SUNRPC_BIND34 is not set
787# CONFIG_RPCSEC_GSS_KRB5 is not set 650# CONFIG_RPCSEC_GSS_KRB5 is not set
788# CONFIG_RPCSEC_GSS_SPKM3 is not set 651# CONFIG_RPCSEC_GSS_SPKM3 is not set
789# CONFIG_SMB_FS is not set 652# CONFIG_SMB_FS is not set
@@ -791,7 +654,6 @@ CONFIG_SUNRPC=y
791# CONFIG_NCP_FS is not set 654# CONFIG_NCP_FS is not set
792# CONFIG_CODA_FS is not set 655# CONFIG_CODA_FS is not set
793# CONFIG_AFS_FS is not set 656# CONFIG_AFS_FS is not set
794# CONFIG_9P_FS is not set
795 657
796# 658#
797# Partition Types 659# Partition Types
@@ -844,6 +706,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
844# CONFIG_NLS_UTF8 is not set 706# CONFIG_NLS_UTF8 is not set
845 707
846# 708#
709# Distributed Lock Manager
710#
711# CONFIG_DLM is not set
712
713#
847# Profiling support 714# Profiling support
848# 715#
849# CONFIG_PROFILING is not set 716# CONFIG_PROFILING is not set
@@ -855,29 +722,27 @@ CONFIG_NLS_DEFAULT="iso8859-1"
855CONFIG_ENABLE_MUST_CHECK=y 722CONFIG_ENABLE_MUST_CHECK=y
856# CONFIG_MAGIC_SYSRQ is not set 723# CONFIG_MAGIC_SYSRQ is not set
857# CONFIG_UNUSED_SYMBOLS is not set 724# CONFIG_UNUSED_SYMBOLS is not set
725# CONFIG_DEBUG_FS is not set
726# CONFIG_HEADERS_CHECK is not set
858# CONFIG_DEBUG_KERNEL is not set 727# CONFIG_DEBUG_KERNEL is not set
859CONFIG_LOG_BUF_SHIFT=14
860# CONFIG_DEBUG_BUGVERBOSE is not set 728# CONFIG_DEBUG_BUGVERBOSE is not set
861# CONFIG_DEBUG_FS is not set
862# CONFIG_FRAME_POINTER is not set 729# CONFIG_FRAME_POINTER is not set
863# CONFIG_UNWIND_INFO is not set
864# CONFIG_HEADERS_CHECK is not set
865 730
866# 731#
867# Security options 732# Security options
868# 733#
869# CONFIG_KEYS is not set 734# CONFIG_KEYS is not set
870# CONFIG_SECURITY is not set 735# CONFIG_SECURITY is not set
871
872#
873# Cryptographic options
874#
875# CONFIG_CRYPTO is not set 736# CONFIG_CRYPTO is not set
876 737
877# 738#
878# Library routines 739# Library routines
879# 740#
741CONFIG_BITREVERSE=y
880# CONFIG_CRC_CCITT is not set 742# CONFIG_CRC_CCITT is not set
881# CONFIG_CRC16 is not set 743# CONFIG_CRC16 is not set
744# CONFIG_CRC_ITU_T is not set
882CONFIG_CRC32=y 745CONFIG_CRC32=y
746# CONFIG_CRC7 is not set
883# CONFIG_LIBCRC32C is not set 747# CONFIG_LIBCRC32C is not set
748CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi2/defconfig.vdec2 b/arch/m32r/configs/mappi2.vdec2_defconfig
index fe5b2a63cd68..42247ae4fc58 100644
--- a/arch/m32r/mappi2/defconfig.vdec2
+++ b/arch/m32r/configs/mappi2.vdec2_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Wed Dec 13 19:31:44 2006 4# Wed Aug 1 17:22:36 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -24,18 +27,19 @@ CONFIG_LOCALVERSION=""
24CONFIG_LOCALVERSION_AUTO=y 27CONFIG_LOCALVERSION_AUTO=y
25CONFIG_SWAP=y 28CONFIG_SWAP=y
26CONFIG_SYSVIPC=y 29CONFIG_SYSVIPC=y
27# CONFIG_IPC_NS is not set 30CONFIG_SYSVIPC_SYSCTL=y
28# CONFIG_POSIX_MQUEUE is not set 31# CONFIG_POSIX_MQUEUE is not set
29CONFIG_BSD_PROCESS_ACCT=y 32CONFIG_BSD_PROCESS_ACCT=y
30# CONFIG_BSD_PROCESS_ACCT_V3 is not set 33# CONFIG_BSD_PROCESS_ACCT_V3 is not set
31# CONFIG_TASKSTATS is not set 34# CONFIG_TASKSTATS is not set
32# CONFIG_UTS_NS is not set 35# CONFIG_USER_NS is not set
33# CONFIG_AUDIT is not set 36# CONFIG_AUDIT is not set
34CONFIG_IKCONFIG=y 37CONFIG_IKCONFIG=y
35# CONFIG_IKCONFIG_PROC is not set 38# CONFIG_IKCONFIG_PROC is not set
39CONFIG_LOG_BUF_SHIFT=14
36CONFIG_SYSFS_DEPRECATED=y 40CONFIG_SYSFS_DEPRECATED=y
37# CONFIG_RELAY is not set 41# CONFIG_RELAY is not set
38CONFIG_INITRAMFS_SOURCE="" 42# CONFIG_BLK_DEV_INITRD is not set
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SYSCTL=y 44CONFIG_SYSCTL=y
41CONFIG_EMBEDDED=y 45CONFIG_EMBEDDED=y
@@ -47,29 +51,29 @@ CONFIG_BUG=y
47CONFIG_ELF_CORE=y 51CONFIG_ELF_CORE=y
48CONFIG_BASE_FULL=y 52CONFIG_BASE_FULL=y
49# CONFIG_FUTEX is not set 53# CONFIG_FUTEX is not set
54CONFIG_ANON_INODES=y
50# CONFIG_EPOLL is not set 55# CONFIG_EPOLL is not set
56CONFIG_SIGNALFD=y
57CONFIG_TIMERFD=y
58CONFIG_EVENTFD=y
51CONFIG_SHMEM=y 59CONFIG_SHMEM=y
52CONFIG_SLAB=y
53CONFIG_VM_EVENT_COUNTERS=y 60CONFIG_VM_EVENT_COUNTERS=y
61CONFIG_SLAB=y
62# CONFIG_SLUB is not set
63# CONFIG_SLOB is not set
54# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
55CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
56# CONFIG_SLOB is not set
57
58#
59# Loadable module support
60#
61CONFIG_MODULES=y 66CONFIG_MODULES=y
62CONFIG_MODULE_UNLOAD=y 67CONFIG_MODULE_UNLOAD=y
63# CONFIG_MODULE_FORCE_UNLOAD is not set 68# CONFIG_MODULE_FORCE_UNLOAD is not set
64# CONFIG_MODVERSIONS is not set 69# CONFIG_MODVERSIONS is not set
65# CONFIG_MODULE_SRCVERSION_ALL is not set 70# CONFIG_MODULE_SRCVERSION_ALL is not set
66CONFIG_KMOD=y 71CONFIG_KMOD=y
67
68#
69# Block layer
70#
71CONFIG_BLOCK=y 72CONFIG_BLOCK=y
73# CONFIG_LBD is not set
72# CONFIG_BLK_DEV_IO_TRACE is not set 74# CONFIG_BLK_DEV_IO_TRACE is not set
75# CONFIG_LSF is not set
76# CONFIG_BLK_DEV_BSG is not set
73 77
74# 78#
75# IO Schedulers 79# IO Schedulers
@@ -120,13 +124,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
120# CONFIG_SPARSEMEM_STATIC is not set 124# CONFIG_SPARSEMEM_STATIC is not set
121CONFIG_SPLIT_PTLOCK_CPUS=4 125CONFIG_SPLIT_PTLOCK_CPUS=4
122# CONFIG_RESOURCES_64BIT is not set 126# CONFIG_RESOURCES_64BIT is not set
127CONFIG_ZONE_DMA_FLAG=1
128CONFIG_BOUNCE=y
129CONFIG_VIRT_TO_BUS=y
123CONFIG_IRAM_START=0x00f00000 130CONFIG_IRAM_START=0x00f00000
124CONFIG_IRAM_SIZE=0x00008000 131CONFIG_IRAM_SIZE=0x00008000
125CONFIG_RWSEM_GENERIC_SPINLOCK=y 132CONFIG_RWSEM_GENERIC_SPINLOCK=y
126# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 133# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
134# CONFIG_ARCH_HAS_ILOG2_U32 is not set
135# CONFIG_ARCH_HAS_ILOG2_U64 is not set
127CONFIG_GENERIC_FIND_NEXT_BIT=y 136CONFIG_GENERIC_FIND_NEXT_BIT=y
128CONFIG_GENERIC_HWEIGHT=y 137CONFIG_GENERIC_HWEIGHT=y
129CONFIG_GENERIC_CALIBRATE_DELAY=y 138CONFIG_GENERIC_CALIBRATE_DELAY=y
139CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
130CONFIG_PREEMPT=y 140CONFIG_PREEMPT=y
131# CONFIG_SMP is not set 141# CONFIG_SMP is not set
132CONFIG_NODES_SHIFT=1 142CONFIG_NODES_SHIFT=1
@@ -134,6 +144,7 @@ CONFIG_NODES_SHIFT=1
134# 144#
135# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 145# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
136# 146#
147# CONFIG_ARCH_SUPPORTS_MSI is not set
137# CONFIG_ISA is not set 148# CONFIG_ISA is not set
138 149
139# 150#
@@ -151,10 +162,6 @@ CONFIG_PCMCIA_IOCTL=y
151# CONFIG_M32R_CFC is not set 162# CONFIG_M32R_CFC is not set
152 163
153# 164#
154# PCI Hotplug Support
155#
156
157#
158# Executable file formats 165# Executable file formats
159# 166#
160CONFIG_BINFMT_ELF=y 167CONFIG_BINFMT_ELF=y
@@ -168,13 +175,13 @@ CONFIG_NET=y
168# 175#
169# Networking options 176# Networking options
170# 177#
171# CONFIG_NETDEBUG is not set
172CONFIG_PACKET=y 178CONFIG_PACKET=y
173# CONFIG_PACKET_MMAP is not set 179# CONFIG_PACKET_MMAP is not set
174CONFIG_UNIX=y 180CONFIG_UNIX=y
175CONFIG_XFRM=y 181CONFIG_XFRM=y
176# CONFIG_XFRM_USER is not set 182# CONFIG_XFRM_USER is not set
177# CONFIG_XFRM_SUB_POLICY is not set 183# CONFIG_XFRM_SUB_POLICY is not set
184# CONFIG_XFRM_MIGRATE is not set
178# CONFIG_NET_KEY is not set 185# CONFIG_NET_KEY is not set
179CONFIG_INET=y 186CONFIG_INET=y
180# CONFIG_IP_MULTICAST is not set 187# CONFIG_IP_MULTICAST is not set
@@ -207,20 +214,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
207# CONFIG_INET6_TUNNEL is not set 214# CONFIG_INET6_TUNNEL is not set
208# CONFIG_NETWORK_SECMARK is not set 215# CONFIG_NETWORK_SECMARK is not set
209# CONFIG_NETFILTER is not set 216# CONFIG_NETFILTER is not set
210
211#
212# DCCP Configuration (EXPERIMENTAL)
213#
214# CONFIG_IP_DCCP is not set 217# CONFIG_IP_DCCP is not set
215
216#
217# SCTP Configuration (EXPERIMENTAL)
218#
219# CONFIG_IP_SCTP is not set 218# CONFIG_IP_SCTP is not set
220
221#
222# TIPC Configuration (EXPERIMENTAL)
223#
224# CONFIG_TIPC is not set 219# CONFIG_TIPC is not set
225# CONFIG_ATM is not set 220# CONFIG_ATM is not set
226# CONFIG_BRIDGE is not set 221# CONFIG_BRIDGE is not set
@@ -246,7 +241,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
246# CONFIG_HAMRADIO is not set 241# CONFIG_HAMRADIO is not set
247# CONFIG_IRDA is not set 242# CONFIG_IRDA is not set
248# CONFIG_BT is not set 243# CONFIG_BT is not set
244# CONFIG_AF_RXRPC is not set
245
246#
247# Wireless
248#
249# CONFIG_CFG80211 is not set
250# CONFIG_WIRELESS_EXT is not set
251# CONFIG_MAC80211 is not set
249# CONFIG_IEEE80211 is not set 252# CONFIG_IEEE80211 is not set
253# CONFIG_RFKILL is not set
254# CONFIG_NET_9P is not set
250 255
251# 256#
252# Device Drivers 257# Device Drivers
@@ -259,29 +264,10 @@ CONFIG_STANDALONE=y
259CONFIG_PREVENT_FIRMWARE_BUILD=y 264CONFIG_PREVENT_FIRMWARE_BUILD=y
260CONFIG_FW_LOADER=y 265CONFIG_FW_LOADER=y
261# CONFIG_SYS_HYPERVISOR is not set 266# CONFIG_SYS_HYPERVISOR is not set
262
263#
264# Connector - unified userspace <-> kernelspace linker
265#
266# CONFIG_CONNECTOR is not set 267# CONFIG_CONNECTOR is not set
267
268#
269# Memory Technology Devices (MTD)
270#
271# CONFIG_MTD is not set 268# CONFIG_MTD is not set
272
273#
274# Parallel port support
275#
276# CONFIG_PARPORT is not set 269# CONFIG_PARPORT is not set
277 270CONFIG_BLK_DEV=y
278#
279# Plug and Play support
280#
281
282#
283# Block devices
284#
285# CONFIG_BLK_DEV_COW_COMMON is not set 271# CONFIG_BLK_DEV_COW_COMMON is not set
286CONFIG_BLK_DEV_LOOP=y 272CONFIG_BLK_DEV_LOOP=y
287# CONFIG_BLK_DEV_CRYPTOLOOP is not set 273# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -290,18 +276,10 @@ CONFIG_BLK_DEV_RAM=y
290CONFIG_BLK_DEV_RAM_COUNT=16 276CONFIG_BLK_DEV_RAM_COUNT=16
291CONFIG_BLK_DEV_RAM_SIZE=4096 277CONFIG_BLK_DEV_RAM_SIZE=4096
292CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 278CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
293# CONFIG_BLK_DEV_INITRD is not set
294# CONFIG_CDROM_PKTCDVD is not set 279# CONFIG_CDROM_PKTCDVD is not set
295# CONFIG_ATA_OVER_ETH is not set 280# CONFIG_ATA_OVER_ETH is not set
296 281CONFIG_MISC_DEVICES=y
297# 282# CONFIG_EEPROM_93CX6 is not set
298# Misc devices
299#
300# CONFIG_TIFM_CORE is not set
301
302#
303# ATA/ATAPI/MFM/RLL support
304#
305CONFIG_IDE=y 283CONFIG_IDE=y
306CONFIG_IDE_MAX_HWIFS=4 284CONFIG_IDE_MAX_HWIFS=4
307CONFIG_BLK_DEV_IDE=y 285CONFIG_BLK_DEV_IDE=y
@@ -318,14 +296,15 @@ CONFIG_BLK_DEV_IDECD=m
318# CONFIG_BLK_DEV_IDEFLOPPY is not set 296# CONFIG_BLK_DEV_IDEFLOPPY is not set
319# CONFIG_BLK_DEV_IDESCSI is not set 297# CONFIG_BLK_DEV_IDESCSI is not set
320# CONFIG_IDE_TASK_IOCTL is not set 298# CONFIG_IDE_TASK_IOCTL is not set
299CONFIG_IDE_PROC_FS=y
321 300
322# 301#
323# IDE chipset support/bugfixes 302# IDE chipset support/bugfixes
324# 303#
325CONFIG_IDE_GENERIC=y 304CONFIG_IDE_GENERIC=y
305# CONFIG_IDEPCI_PCIBUS_ORDER is not set
326# CONFIG_IDE_ARM is not set 306# CONFIG_IDE_ARM is not set
327# CONFIG_BLK_DEV_IDEDMA is not set 307# CONFIG_BLK_DEV_IDEDMA is not set
328# CONFIG_IDEDMA_AUTO is not set
329# CONFIG_BLK_DEV_HD is not set 308# CONFIG_BLK_DEV_HD is not set
330 309
331# 310#
@@ -333,6 +312,8 @@ CONFIG_IDE_GENERIC=y
333# 312#
334# CONFIG_RAID_ATTRS is not set 313# CONFIG_RAID_ATTRS is not set
335CONFIG_SCSI=m 314CONFIG_SCSI=m
315# CONFIG_SCSI_DMA is not set
316# CONFIG_SCSI_TGT is not set
336# CONFIG_SCSI_NETLINK is not set 317# CONFIG_SCSI_NETLINK is not set
337CONFIG_SCSI_PROC_FS=y 318CONFIG_SCSI_PROC_FS=y
338 319
@@ -353,6 +334,8 @@ CONFIG_CHR_DEV_SG=m
353CONFIG_SCSI_MULTI_LUN=y 334CONFIG_SCSI_MULTI_LUN=y
354# CONFIG_SCSI_CONSTANTS is not set 335# CONFIG_SCSI_CONSTANTS is not set
355# CONFIG_SCSI_LOGGING is not set 336# CONFIG_SCSI_LOGGING is not set
337# CONFIG_SCSI_SCAN_ASYNC is not set
338CONFIG_SCSI_WAIT_SCAN=m
356 339
357# 340#
358# SCSI Transports 341# SCSI Transports
@@ -360,93 +343,33 @@ CONFIG_SCSI_MULTI_LUN=y
360# CONFIG_SCSI_SPI_ATTRS is not set 343# CONFIG_SCSI_SPI_ATTRS is not set
361# CONFIG_SCSI_FC_ATTRS is not set 344# CONFIG_SCSI_FC_ATTRS is not set
362# CONFIG_SCSI_ISCSI_ATTRS is not set 345# CONFIG_SCSI_ISCSI_ATTRS is not set
363# CONFIG_SCSI_SAS_ATTRS is not set
364# CONFIG_SCSI_SAS_LIBSAS is not set 346# CONFIG_SCSI_SAS_LIBSAS is not set
365 347CONFIG_SCSI_LOWLEVEL=y
366#
367# SCSI low-level drivers
368#
369# CONFIG_ISCSI_TCP is not set 348# CONFIG_ISCSI_TCP is not set
370# CONFIG_SCSI_DEBUG is not set 349# CONFIG_SCSI_DEBUG is not set
371 350# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
372#
373# PCMCIA SCSI adapter support
374#
375# CONFIG_PCMCIA_AHA152X is not set
376# CONFIG_PCMCIA_FDOMAIN is not set
377# CONFIG_PCMCIA_NINJA_SCSI is not set
378# CONFIG_PCMCIA_QLOGIC is not set
379# CONFIG_PCMCIA_SYM53C500 is not set
380
381#
382# Serial ATA (prod) and Parallel ATA (experimental) drivers
383#
384
385#
386# Multi-device support (RAID and LVM)
387#
388# CONFIG_MD is not set 351# CONFIG_MD is not set
389
390#
391# Fusion MPT device support
392#
393# CONFIG_FUSION is not set
394
395#
396# IEEE 1394 (FireWire) support
397#
398
399#
400# I2O device support
401#
402
403#
404# Network device support
405#
406CONFIG_NETDEVICES=y 352CONFIG_NETDEVICES=y
353# CONFIG_NETDEVICES_MULTIQUEUE is not set
407# CONFIG_DUMMY is not set 354# CONFIG_DUMMY is not set
408# CONFIG_BONDING is not set 355# CONFIG_BONDING is not set
356# CONFIG_MACVLAN is not set
409# CONFIG_EQUALIZER is not set 357# CONFIG_EQUALIZER is not set
410# CONFIG_TUN is not set 358# CONFIG_TUN is not set
411
412#
413# PHY device support
414#
415# CONFIG_PHYLIB is not set 359# CONFIG_PHYLIB is not set
416
417#
418# Ethernet (10 or 100Mbit)
419#
420CONFIG_NET_ETHERNET=y 360CONFIG_NET_ETHERNET=y
421CONFIG_MII=y 361CONFIG_MII=y
422CONFIG_SMC91X=y 362CONFIG_SMC91X=y
423# CONFIG_NE2000 is not set 363# CONFIG_NE2000 is not set
364CONFIG_NETDEV_1000=y
365CONFIG_NETDEV_10000=y
424 366
425# 367#
426# Ethernet (1000 Mbit) 368# Wireless LAN
427#
428
429#
430# Ethernet (10000 Mbit)
431#
432
433#
434# Token Ring devices
435#
436
437#
438# Wireless LAN (non-hamradio)
439#
440# CONFIG_NET_RADIO is not set
441
442#
443# PCMCIA network device support
444# 369#
370# CONFIG_WLAN_PRE80211 is not set
371# CONFIG_WLAN_80211 is not set
445# CONFIG_NET_PCMCIA is not set 372# CONFIG_NET_PCMCIA is not set
446
447#
448# Wan interfaces
449#
450# CONFIG_WAN is not set 373# CONFIG_WAN is not set
451# CONFIG_PPP is not set 374# CONFIG_PPP is not set
452# CONFIG_SLIP is not set 375# CONFIG_SLIP is not set
@@ -454,15 +377,7 @@ CONFIG_SMC91X=y
454# CONFIG_NETCONSOLE is not set 377# CONFIG_NETCONSOLE is not set
455# CONFIG_NETPOLL is not set 378# CONFIG_NETPOLL is not set
456# CONFIG_NET_POLL_CONTROLLER is not set 379# CONFIG_NET_POLL_CONTROLLER is not set
457
458#
459# ISDN subsystem
460#
461# CONFIG_ISDN is not set 380# CONFIG_ISDN is not set
462
463#
464# Telephony Support
465#
466# CONFIG_PHONE is not set 381# CONFIG_PHONE is not set
467 382
468# 383#
@@ -470,6 +385,7 @@ CONFIG_SMC91X=y
470# 385#
471CONFIG_INPUT=y 386CONFIG_INPUT=y
472# CONFIG_INPUT_FF_MEMLESS is not set 387# CONFIG_INPUT_FF_MEMLESS is not set
388# CONFIG_INPUT_POLLDEV is not set
473 389
474# 390#
475# Userland interfaces 391# Userland interfaces
@@ -486,6 +402,7 @@ CONFIG_INPUT=y
486# CONFIG_INPUT_KEYBOARD is not set 402# CONFIG_INPUT_KEYBOARD is not set
487# CONFIG_INPUT_MOUSE is not set 403# CONFIG_INPUT_MOUSE is not set
488# CONFIG_INPUT_JOYSTICK is not set 404# CONFIG_INPUT_JOYSTICK is not set
405# CONFIG_INPUT_TABLET is not set
489# CONFIG_INPUT_TOUCHSCREEN is not set 406# CONFIG_INPUT_TOUCHSCREEN is not set
490# CONFIG_INPUT_MISC is not set 407# CONFIG_INPUT_MISC is not set
491 408
@@ -523,41 +440,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
523CONFIG_UNIX98_PTYS=y 440CONFIG_UNIX98_PTYS=y
524CONFIG_LEGACY_PTYS=y 441CONFIG_LEGACY_PTYS=y
525CONFIG_LEGACY_PTY_COUNT=256 442CONFIG_LEGACY_PTY_COUNT=256
526
527#
528# IPMI
529#
530# CONFIG_IPMI_HANDLER is not set 443# CONFIG_IPMI_HANDLER is not set
531
532#
533# Watchdog Cards
534#
535# CONFIG_WATCHDOG is not set 444# CONFIG_WATCHDOG is not set
536CONFIG_HW_RANDOM=y 445CONFIG_HW_RANDOM=y
537# CONFIG_RTC is not set 446# CONFIG_RTC is not set
538# CONFIG_DTLK is not set
539# CONFIG_R3964 is not set 447# CONFIG_R3964 is not set
540 448
541# 449#
542# Ftape, the floppy tape device driver
543#
544
545#
546# PCMCIA character devices 450# PCMCIA character devices
547# 451#
548# CONFIG_SYNCLINK_CS is not set 452# CONFIG_SYNCLINK_CS is not set
549# CONFIG_CARDMAN_4000 is not set 453# CONFIG_CARDMAN_4000 is not set
550# CONFIG_CARDMAN_4040 is not set 454# CONFIG_CARDMAN_4040 is not set
551# CONFIG_RAW_DRIVER is not set 455# CONFIG_RAW_DRIVER is not set
552
553#
554# TPM devices
555#
556# CONFIG_TCG_TPM is not set 456# CONFIG_TCG_TPM is not set
557
558#
559# I2C support
560#
561# CONFIG_I2C is not set 457# CONFIG_I2C is not set
562 458
563# 459#
@@ -565,56 +461,55 @@ CONFIG_HW_RANDOM=y
565# 461#
566# CONFIG_SPI is not set 462# CONFIG_SPI is not set
567# CONFIG_SPI_MASTER is not set 463# CONFIG_SPI_MASTER is not set
568
569#
570# Dallas's 1-wire bus
571#
572# CONFIG_W1 is not set 464# CONFIG_W1 is not set
573 465# CONFIG_POWER_SUPPLY is not set
574#
575# Hardware Monitoring support
576#
577CONFIG_HWMON=y 466CONFIG_HWMON=y
578# CONFIG_HWMON_VID is not set 467# CONFIG_HWMON_VID is not set
579# CONFIG_SENSORS_ABITUGURU is not set 468# CONFIG_SENSORS_ABITUGURU is not set
469# CONFIG_SENSORS_ABITUGURU3 is not set
580# CONFIG_SENSORS_F71805F is not set 470# CONFIG_SENSORS_F71805F is not set
471# CONFIG_SENSORS_IT87 is not set
472# CONFIG_SENSORS_PC87360 is not set
473# CONFIG_SENSORS_PC87427 is not set
474# CONFIG_SENSORS_SMSC47M1 is not set
475# CONFIG_SENSORS_SMSC47B397 is not set
581# CONFIG_SENSORS_VT1211 is not set 476# CONFIG_SENSORS_VT1211 is not set
477# CONFIG_SENSORS_W83627HF is not set
478# CONFIG_SENSORS_W83627EHF is not set
582# CONFIG_HWMON_DEBUG_CHIP is not set 479# CONFIG_HWMON_DEBUG_CHIP is not set
583 480
584# 481#
482# Multifunction device drivers
483#
484# CONFIG_MFD_SM501 is not set
485
486#
585# Multimedia devices 487# Multimedia devices
586# 488#
587CONFIG_VIDEO_DEV=y 489CONFIG_VIDEO_DEV=y
588CONFIG_VIDEO_V4L1=y 490CONFIG_VIDEO_V4L1=y
589CONFIG_VIDEO_V4L1_COMPAT=y 491CONFIG_VIDEO_V4L1_COMPAT=y
590CONFIG_VIDEO_V4L2=y 492CONFIG_VIDEO_V4L2=y
591 493CONFIG_VIDEO_CAPTURE_DRIVERS=y
592#
593# Video Capture Adapters
594#
595
596#
597# Video Capture Adapters
598#
599# CONFIG_VIDEO_ADV_DEBUG is not set 494# CONFIG_VIDEO_ADV_DEBUG is not set
600CONFIG_VIDEO_HELPER_CHIPS_AUTO=y 495CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
601# CONFIG_VIDEO_VIVI is not set
602# CONFIG_VIDEO_CPIA is not set 496# CONFIG_VIDEO_CPIA is not set
603# CONFIG_VIDEO_M32R_AR is not set 497# CONFIG_VIDEO_M32R_AR is not set
498CONFIG_RADIO_ADAPTERS=y
499# CONFIG_DVB_CORE is not set
500CONFIG_DAB=y
604 501
605# 502#
606# Radio Adapters 503# Graphics support
607#
608
609#
610# Digital Video Broadcasting Devices
611# 504#
612# CONFIG_DVB is not set 505# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
613 506
614# 507#
615# Graphics support 508# Display device support
616# 509#
617CONFIG_FIRMWARE_EDID=y 510# CONFIG_DISPLAY_SUPPORT is not set
511# CONFIG_VGASTATE is not set
512CONFIG_VIDEO_OUTPUT_CONTROL=m
618# CONFIG_FB is not set 513# CONFIG_FB is not set
619 514
620# 515#
@@ -622,16 +517,15 @@ CONFIG_FIRMWARE_EDID=y
622# 517#
623# CONFIG_VGA_CONSOLE is not set 518# CONFIG_VGA_CONSOLE is not set
624CONFIG_DUMMY_CONSOLE=y 519CONFIG_DUMMY_CONSOLE=y
625# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
626 520
627# 521#
628# Sound 522# Sound
629# 523#
630# CONFIG_SOUND is not set 524# CONFIG_SOUND is not set
631 525CONFIG_HID_SUPPORT=y
632# 526CONFIG_HID=y
633# USB support 527# CONFIG_HID_DEBUG is not set
634# 528CONFIG_USB_SUPPORT=y
635# CONFIG_USB_ARCH_HAS_HCD is not set 529# CONFIG_USB_ARCH_HAS_HCD is not set
636# CONFIG_USB_ARCH_HAS_OHCI is not set 530# CONFIG_USB_ARCH_HAS_OHCI is not set
637# CONFIG_USB_ARCH_HAS_EHCI is not set 531# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -644,50 +538,18 @@ CONFIG_DUMMY_CONSOLE=y
644# USB Gadget Support 538# USB Gadget Support
645# 539#
646# CONFIG_USB_GADGET is not set 540# CONFIG_USB_GADGET is not set
647
648#
649# MMC/SD Card support
650#
651# CONFIG_MMC is not set 541# CONFIG_MMC is not set
652
653#
654# LED devices
655#
656# CONFIG_NEW_LEDS is not set 542# CONFIG_NEW_LEDS is not set
657 543
658# 544#
659# LED drivers
660#
661
662#
663# LED Triggers
664#
665
666#
667# InfiniBand support
668#
669
670#
671# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
672#
673
674#
675# Real Time Clock 545# Real Time Clock
676# 546#
677# CONFIG_RTC_CLASS is not set 547# CONFIG_RTC_CLASS is not set
678 548
679# 549#
680# DMA Engine support 550# Userspace I/O
681#
682# CONFIG_DMA_ENGINE is not set
683
684#
685# DMA Clients
686#
687
688#
689# DMA Devices
690# 551#
552# CONFIG_UIO is not set
691 553
692# 554#
693# File systems 555# File systems
@@ -782,6 +644,7 @@ CONFIG_LOCKD=y
782CONFIG_LOCKD_V4=y 644CONFIG_LOCKD_V4=y
783CONFIG_NFS_COMMON=y 645CONFIG_NFS_COMMON=y
784CONFIG_SUNRPC=y 646CONFIG_SUNRPC=y
647# CONFIG_SUNRPC_BIND34 is not set
785# CONFIG_RPCSEC_GSS_KRB5 is not set 648# CONFIG_RPCSEC_GSS_KRB5 is not set
786# CONFIG_RPCSEC_GSS_SPKM3 is not set 649# CONFIG_RPCSEC_GSS_SPKM3 is not set
787# CONFIG_SMB_FS is not set 650# CONFIG_SMB_FS is not set
@@ -789,7 +652,6 @@ CONFIG_SUNRPC=y
789# CONFIG_NCP_FS is not set 652# CONFIG_NCP_FS is not set
790# CONFIG_CODA_FS is not set 653# CONFIG_CODA_FS is not set
791# CONFIG_AFS_FS is not set 654# CONFIG_AFS_FS is not set
792# CONFIG_9P_FS is not set
793 655
794# 656#
795# Partition Types 657# Partition Types
@@ -842,6 +704,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
842# CONFIG_NLS_UTF8 is not set 704# CONFIG_NLS_UTF8 is not set
843 705
844# 706#
707# Distributed Lock Manager
708#
709# CONFIG_DLM is not set
710
711#
845# Profiling support 712# Profiling support
846# 713#
847# CONFIG_PROFILING is not set 714# CONFIG_PROFILING is not set
@@ -853,29 +720,27 @@ CONFIG_NLS_DEFAULT="iso8859-1"
853CONFIG_ENABLE_MUST_CHECK=y 720CONFIG_ENABLE_MUST_CHECK=y
854# CONFIG_MAGIC_SYSRQ is not set 721# CONFIG_MAGIC_SYSRQ is not set
855# CONFIG_UNUSED_SYMBOLS is not set 722# CONFIG_UNUSED_SYMBOLS is not set
723# CONFIG_DEBUG_FS is not set
724# CONFIG_HEADERS_CHECK is not set
856# CONFIG_DEBUG_KERNEL is not set 725# CONFIG_DEBUG_KERNEL is not set
857CONFIG_LOG_BUF_SHIFT=14
858# CONFIG_DEBUG_BUGVERBOSE is not set 726# CONFIG_DEBUG_BUGVERBOSE is not set
859# CONFIG_DEBUG_FS is not set
860# CONFIG_FRAME_POINTER is not set 727# CONFIG_FRAME_POINTER is not set
861# CONFIG_UNWIND_INFO is not set
862# CONFIG_HEADERS_CHECK is not set
863 728
864# 729#
865# Security options 730# Security options
866# 731#
867# CONFIG_KEYS is not set 732# CONFIG_KEYS is not set
868# CONFIG_SECURITY is not set 733# CONFIG_SECURITY is not set
869
870#
871# Cryptographic options
872#
873# CONFIG_CRYPTO is not set 734# CONFIG_CRYPTO is not set
874 735
875# 736#
876# Library routines 737# Library routines
877# 738#
739CONFIG_BITREVERSE=y
878# CONFIG_CRC_CCITT is not set 740# CONFIG_CRC_CCITT is not set
879# CONFIG_CRC16 is not set 741# CONFIG_CRC16 is not set
742# CONFIG_CRC_ITU_T is not set
880CONFIG_CRC32=y 743CONFIG_CRC32=y
744# CONFIG_CRC7 is not set
881# CONFIG_LIBCRC32C is not set 745# CONFIG_LIBCRC32C is not set
746CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/mappi3/defconfig.smp b/arch/m32r/configs/mappi3.smp_defconfig
index 2f352267a6d9..18c564f4ea97 100644
--- a/arch/m32r/mappi3/defconfig.smp
+++ b/arch/m32r/configs/mappi3.smp_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Mon Dec 11 19:57:33 2006 4# Wed Aug 1 17:22:36 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -23,17 +26,19 @@ CONFIG_LOCALVERSION=""
23CONFIG_LOCALVERSION_AUTO=y 26CONFIG_LOCALVERSION_AUTO=y
24CONFIG_SWAP=y 27CONFIG_SWAP=y
25CONFIG_SYSVIPC=y 28CONFIG_SYSVIPC=y
26# CONFIG_IPC_NS is not set 29CONFIG_SYSVIPC_SYSCTL=y
27# CONFIG_POSIX_MQUEUE is not set 30# CONFIG_POSIX_MQUEUE is not set
28# CONFIG_BSD_PROCESS_ACCT is not set 31# CONFIG_BSD_PROCESS_ACCT is not set
29# CONFIG_TASKSTATS is not set 32# CONFIG_TASKSTATS is not set
30# CONFIG_UTS_NS is not set 33# CONFIG_USER_NS is not set
31# CONFIG_AUDIT is not set 34# CONFIG_AUDIT is not set
32CONFIG_IKCONFIG=y 35CONFIG_IKCONFIG=y
33CONFIG_IKCONFIG_PROC=y 36CONFIG_IKCONFIG_PROC=y
37CONFIG_LOG_BUF_SHIFT=15
34# CONFIG_CPUSETS is not set 38# CONFIG_CPUSETS is not set
35CONFIG_SYSFS_DEPRECATED=y 39CONFIG_SYSFS_DEPRECATED=y
36# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
41CONFIG_BLK_DEV_INITRD=y
37CONFIG_INITRAMFS_SOURCE="" 42CONFIG_INITRAMFS_SOURCE=""
38# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
39CONFIG_SYSCTL=y 44CONFIG_SYSCTL=y
@@ -46,17 +51,18 @@ CONFIG_BUG=y
46CONFIG_ELF_CORE=y 51CONFIG_ELF_CORE=y
47CONFIG_BASE_FULL=y 52CONFIG_BASE_FULL=y
48# CONFIG_FUTEX is not set 53# CONFIG_FUTEX is not set
54CONFIG_ANON_INODES=y
49# CONFIG_EPOLL is not set 55# CONFIG_EPOLL is not set
56CONFIG_SIGNALFD=y
57CONFIG_TIMERFD=y
58CONFIG_EVENTFD=y
50CONFIG_SHMEM=y 59CONFIG_SHMEM=y
51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y 60CONFIG_VM_EVENT_COUNTERS=y
61CONFIG_SLAB=y
62# CONFIG_SLUB is not set
63# CONFIG_SLOB is not set
53# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
54CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
56
57#
58# Loadable module support
59#
60CONFIG_MODULES=y 66CONFIG_MODULES=y
61CONFIG_MODULE_UNLOAD=y 67CONFIG_MODULE_UNLOAD=y
62# CONFIG_MODULE_FORCE_UNLOAD is not set 68# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -64,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y
64# CONFIG_MODULE_SRCVERSION_ALL is not set 70# CONFIG_MODULE_SRCVERSION_ALL is not set
65CONFIG_KMOD=y 71CONFIG_KMOD=y
66CONFIG_STOP_MACHINE=y 72CONFIG_STOP_MACHINE=y
67
68#
69# Block layer
70#
71CONFIG_BLOCK=y 73CONFIG_BLOCK=y
74# CONFIG_LBD is not set
72# CONFIG_BLK_DEV_IO_TRACE is not set 75# CONFIG_BLK_DEV_IO_TRACE is not set
76# CONFIG_LSF is not set
77# CONFIG_BLK_DEV_BSG is not set
73 78
74# 79#
75# IO Schedulers 80# IO Schedulers
@@ -122,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
122# CONFIG_SPARSEMEM_STATIC is not set 127# CONFIG_SPARSEMEM_STATIC is not set
123CONFIG_SPLIT_PTLOCK_CPUS=4 128CONFIG_SPLIT_PTLOCK_CPUS=4
124# CONFIG_RESOURCES_64BIT is not set 129# CONFIG_RESOURCES_64BIT is not set
130CONFIG_ZONE_DMA_FLAG=1
131CONFIG_BOUNCE=y
132CONFIG_VIRT_TO_BUS=y
125CONFIG_IRAM_START=0x00f00000 133CONFIG_IRAM_START=0x00f00000
126CONFIG_IRAM_SIZE=0x00080000 134CONFIG_IRAM_SIZE=0x00080000
127CONFIG_RWSEM_GENERIC_SPINLOCK=y 135CONFIG_RWSEM_GENERIC_SPINLOCK=y
128# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 136# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
137# CONFIG_ARCH_HAS_ILOG2_U32 is not set
138# CONFIG_ARCH_HAS_ILOG2_U64 is not set
129CONFIG_GENERIC_FIND_NEXT_BIT=y 139CONFIG_GENERIC_FIND_NEXT_BIT=y
130CONFIG_GENERIC_HWEIGHT=y 140CONFIG_GENERIC_HWEIGHT=y
131CONFIG_GENERIC_CALIBRATE_DELAY=y 141CONFIG_GENERIC_CALIBRATE_DELAY=y
142CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
132CONFIG_PREEMPT=y 143CONFIG_PREEMPT=y
133CONFIG_SMP=y 144CONFIG_SMP=y
134# CONFIG_CHIP_M32700_TS1 is not set 145# CONFIG_CHIP_M32700_TS1 is not set
@@ -138,6 +149,7 @@ CONFIG_NODES_SHIFT=1
138# 149#
139# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 150# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
140# 151#
152# CONFIG_ARCH_SUPPORTS_MSI is not set
141# CONFIG_ISA is not set 153# CONFIG_ISA is not set
142 154
143# 155#
@@ -156,10 +168,6 @@ CONFIG_PCMCIA_IOCTL=y
156# CONFIG_M32R_CFC is not set 168# CONFIG_M32R_CFC is not set
157 169
158# 170#
159# PCI Hotplug Support
160#
161
162#
163# Executable file formats 171# Executable file formats
164# 172#
165CONFIG_BINFMT_ELF=y 173CONFIG_BINFMT_ELF=y
@@ -173,12 +181,12 @@ CONFIG_NET=y
173# 181#
174# Networking options 182# Networking options
175# 183#
176# CONFIG_NETDEBUG is not set
177# CONFIG_PACKET is not set 184# CONFIG_PACKET is not set
178CONFIG_UNIX=y 185CONFIG_UNIX=y
179CONFIG_XFRM=y 186CONFIG_XFRM=y
180# CONFIG_XFRM_USER is not set 187# CONFIG_XFRM_USER is not set
181# CONFIG_XFRM_SUB_POLICY is not set 188# CONFIG_XFRM_SUB_POLICY is not set
189# CONFIG_XFRM_MIGRATE is not set
182# CONFIG_NET_KEY is not set 190# CONFIG_NET_KEY is not set
183CONFIG_INET=y 191CONFIG_INET=y
184# CONFIG_IP_MULTICAST is not set 192# CONFIG_IP_MULTICAST is not set
@@ -211,20 +219,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
211# CONFIG_INET6_TUNNEL is not set 219# CONFIG_INET6_TUNNEL is not set
212# CONFIG_NETWORK_SECMARK is not set 220# CONFIG_NETWORK_SECMARK is not set
213# CONFIG_NETFILTER is not set 221# CONFIG_NETFILTER is not set
214
215#
216# DCCP Configuration (EXPERIMENTAL)
217#
218# CONFIG_IP_DCCP is not set 222# CONFIG_IP_DCCP is not set
219
220#
221# SCTP Configuration (EXPERIMENTAL)
222#
223# CONFIG_IP_SCTP is not set 223# CONFIG_IP_SCTP is not set
224
225#
226# TIPC Configuration (EXPERIMENTAL)
227#
228# CONFIG_TIPC is not set 224# CONFIG_TIPC is not set
229# CONFIG_ATM is not set 225# CONFIG_ATM is not set
230# CONFIG_BRIDGE is not set 226# CONFIG_BRIDGE is not set
@@ -250,7 +246,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
250# CONFIG_HAMRADIO is not set 246# CONFIG_HAMRADIO is not set
251# CONFIG_IRDA is not set 247# CONFIG_IRDA is not set
252# CONFIG_BT is not set 248# CONFIG_BT is not set
249# CONFIG_AF_RXRPC is not set
250
251#
252# Wireless
253#
254# CONFIG_CFG80211 is not set
255# CONFIG_WIRELESS_EXT is not set
256# CONFIG_MAC80211 is not set
253# CONFIG_IEEE80211 is not set 257# CONFIG_IEEE80211 is not set
258# CONFIG_RFKILL is not set
259# CONFIG_NET_9P is not set
254 260
255# 261#
256# Device Drivers 262# Device Drivers
@@ -263,15 +269,7 @@ CONFIG_STANDALONE=y
263CONFIG_PREVENT_FIRMWARE_BUILD=y 269CONFIG_PREVENT_FIRMWARE_BUILD=y
264CONFIG_FW_LOADER=y 270CONFIG_FW_LOADER=y
265# CONFIG_SYS_HYPERVISOR is not set 271# CONFIG_SYS_HYPERVISOR is not set
266
267#
268# Connector - unified userspace <-> kernelspace linker
269#
270# CONFIG_CONNECTOR is not set 272# CONFIG_CONNECTOR is not set
271
272#
273# Memory Technology Devices (MTD)
274#
275CONFIG_MTD=y 273CONFIG_MTD=y
276# CONFIG_MTD_DEBUG is not set 274# CONFIG_MTD_DEBUG is not set
277# CONFIG_MTD_CONCAT is not set 275# CONFIG_MTD_CONCAT is not set
@@ -286,6 +284,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
286# User Modules And Translation Layers 284# User Modules And Translation Layers
287# 285#
288CONFIG_MTD_CHAR=y 286CONFIG_MTD_CHAR=y
287CONFIG_MTD_BLKDEVS=y
289CONFIG_MTD_BLOCK=y 288CONFIG_MTD_BLOCK=y
290# CONFIG_FTL is not set 289# CONFIG_FTL is not set
291# CONFIG_NFTL is not set 290# CONFIG_NFTL is not set
@@ -311,7 +310,6 @@ CONFIG_MTD_CFI_I2=y
311# CONFIG_MTD_RAM is not set 310# CONFIG_MTD_RAM is not set
312# CONFIG_MTD_ROM is not set 311# CONFIG_MTD_ROM is not set
313# CONFIG_MTD_ABSENT is not set 312# CONFIG_MTD_ABSENT is not set
314# CONFIG_MTD_OBSOLETE_CHIPS is not set
315 313
316# 314#
317# Mapping drivers for chip access 315# Mapping drivers for chip access
@@ -333,29 +331,15 @@ CONFIG_MTD_CFI_I2=y
333# CONFIG_MTD_DOC2000 is not set 331# CONFIG_MTD_DOC2000 is not set
334# CONFIG_MTD_DOC2001 is not set 332# CONFIG_MTD_DOC2001 is not set
335# CONFIG_MTD_DOC2001PLUS is not set 333# CONFIG_MTD_DOC2001PLUS is not set
336
337#
338# NAND Flash Device Drivers
339#
340# CONFIG_MTD_NAND is not set 334# CONFIG_MTD_NAND is not set
341
342#
343# OneNAND Flash Device Drivers
344#
345# CONFIG_MTD_ONENAND is not set 335# CONFIG_MTD_ONENAND is not set
346 336
347# 337#
348# Parallel port support 338# UBI - Unsorted block images
349# 339#
340# CONFIG_MTD_UBI is not set
350# CONFIG_PARPORT is not set 341# CONFIG_PARPORT is not set
351 342CONFIG_BLK_DEV=y
352#
353# Plug and Play support
354#
355
356#
357# Block devices
358#
359# CONFIG_BLK_DEV_COW_COMMON is not set 343# CONFIG_BLK_DEV_COW_COMMON is not set
360CONFIG_BLK_DEV_LOOP=y 344CONFIG_BLK_DEV_LOOP=y
361# CONFIG_BLK_DEV_CRYPTOLOOP is not set 345# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -364,18 +348,10 @@ CONFIG_BLK_DEV_RAM=y
364CONFIG_BLK_DEV_RAM_COUNT=16 348CONFIG_BLK_DEV_RAM_COUNT=16
365CONFIG_BLK_DEV_RAM_SIZE=4096 349CONFIG_BLK_DEV_RAM_SIZE=4096
366CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 350CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
367CONFIG_BLK_DEV_INITRD=y
368# CONFIG_CDROM_PKTCDVD is not set 351# CONFIG_CDROM_PKTCDVD is not set
369# CONFIG_ATA_OVER_ETH is not set 352# CONFIG_ATA_OVER_ETH is not set
370 353CONFIG_MISC_DEVICES=y
371# 354# CONFIG_EEPROM_93CX6 is not set
372# Misc devices
373#
374# CONFIG_TIFM_CORE is not set
375
376#
377# ATA/ATAPI/MFM/RLL support
378#
379CONFIG_IDE=y 355CONFIG_IDE=y
380CONFIG_IDE_MAX_HWIFS=4 356CONFIG_IDE_MAX_HWIFS=4
381CONFIG_BLK_DEV_IDE=y 357CONFIG_BLK_DEV_IDE=y
@@ -391,14 +367,15 @@ CONFIG_BLK_DEV_IDECD=m
391# CONFIG_BLK_DEV_IDETAPE is not set 367# CONFIG_BLK_DEV_IDETAPE is not set
392# CONFIG_BLK_DEV_IDEFLOPPY is not set 368# CONFIG_BLK_DEV_IDEFLOPPY is not set
393# CONFIG_IDE_TASK_IOCTL is not set 369# CONFIG_IDE_TASK_IOCTL is not set
370CONFIG_IDE_PROC_FS=y
394 371
395# 372#
396# IDE chipset support/bugfixes 373# IDE chipset support/bugfixes
397# 374#
398CONFIG_IDE_GENERIC=y 375CONFIG_IDE_GENERIC=y
376# CONFIG_IDEPCI_PCIBUS_ORDER is not set
399# CONFIG_IDE_ARM is not set 377# CONFIG_IDE_ARM is not set
400# CONFIG_BLK_DEV_IDEDMA is not set 378# CONFIG_BLK_DEV_IDEDMA is not set
401# CONFIG_IDEDMA_AUTO is not set
402# CONFIG_BLK_DEV_HD is not set 379# CONFIG_BLK_DEV_HD is not set
403 380
404# 381#
@@ -406,77 +383,30 @@ CONFIG_IDE_GENERIC=y
406# 383#
407# CONFIG_RAID_ATTRS is not set 384# CONFIG_RAID_ATTRS is not set
408# CONFIG_SCSI is not set 385# CONFIG_SCSI is not set
386# CONFIG_SCSI_DMA is not set
409# CONFIG_SCSI_NETLINK is not set 387# CONFIG_SCSI_NETLINK is not set
410
411#
412# Serial ATA (prod) and Parallel ATA (experimental) drivers
413#
414
415#
416# Multi-device support (RAID and LVM)
417#
418# CONFIG_MD is not set 388# CONFIG_MD is not set
419
420#
421# Fusion MPT device support
422#
423# CONFIG_FUSION is not set
424
425#
426# IEEE 1394 (FireWire) support
427#
428
429#
430# I2O device support
431#
432
433#
434# Network device support
435#
436CONFIG_NETDEVICES=y 389CONFIG_NETDEVICES=y
390# CONFIG_NETDEVICES_MULTIQUEUE is not set
437# CONFIG_DUMMY is not set 391# CONFIG_DUMMY is not set
438# CONFIG_BONDING is not set 392# CONFIG_BONDING is not set
393# CONFIG_MACVLAN is not set
439# CONFIG_EQUALIZER is not set 394# CONFIG_EQUALIZER is not set
440# CONFIG_TUN is not set 395# CONFIG_TUN is not set
441
442#
443# PHY device support
444#
445# CONFIG_PHYLIB is not set 396# CONFIG_PHYLIB is not set
446
447#
448# Ethernet (10 or 100Mbit)
449#
450CONFIG_NET_ETHERNET=y 397CONFIG_NET_ETHERNET=y
451CONFIG_MII=y 398CONFIG_MII=y
452CONFIG_SMC91X=y 399CONFIG_SMC91X=y
453# CONFIG_NE2000 is not set 400# CONFIG_NE2000 is not set
401CONFIG_NETDEV_1000=y
402CONFIG_NETDEV_10000=y
454 403
455# 404#
456# Ethernet (1000 Mbit) 405# Wireless LAN
457#
458
459#
460# Ethernet (10000 Mbit)
461#
462
463#
464# Token Ring devices
465#
466
467#
468# Wireless LAN (non-hamradio)
469#
470# CONFIG_NET_RADIO is not set
471
472#
473# PCMCIA network device support
474# 406#
407# CONFIG_WLAN_PRE80211 is not set
408# CONFIG_WLAN_80211 is not set
475# CONFIG_NET_PCMCIA is not set 409# CONFIG_NET_PCMCIA is not set
476
477#
478# Wan interfaces
479#
480# CONFIG_WAN is not set 410# CONFIG_WAN is not set
481# CONFIG_PPP is not set 411# CONFIG_PPP is not set
482# CONFIG_SLIP is not set 412# CONFIG_SLIP is not set
@@ -484,15 +414,7 @@ CONFIG_SMC91X=y
484# CONFIG_NETCONSOLE is not set 414# CONFIG_NETCONSOLE is not set
485# CONFIG_NETPOLL is not set 415# CONFIG_NETPOLL is not set
486# CONFIG_NET_POLL_CONTROLLER is not set 416# CONFIG_NET_POLL_CONTROLLER is not set
487
488#
489# ISDN subsystem
490#
491# CONFIG_ISDN is not set 417# CONFIG_ISDN is not set
492
493#
494# Telephony Support
495#
496# CONFIG_PHONE is not set 418# CONFIG_PHONE is not set
497 419
498# 420#
@@ -500,6 +422,7 @@ CONFIG_SMC91X=y
500# 422#
501CONFIG_INPUT=y 423CONFIG_INPUT=y
502# CONFIG_INPUT_FF_MEMLESS is not set 424# CONFIG_INPUT_FF_MEMLESS is not set
425# CONFIG_INPUT_POLLDEV is not set
503 426
504# 427#
505# Userland interfaces 428# Userland interfaces
@@ -519,6 +442,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
519# CONFIG_INPUT_KEYBOARD is not set 442# CONFIG_INPUT_KEYBOARD is not set
520# CONFIG_INPUT_MOUSE is not set 443# CONFIG_INPUT_MOUSE is not set
521# CONFIG_INPUT_JOYSTICK is not set 444# CONFIG_INPUT_JOYSTICK is not set
445# CONFIG_INPUT_TABLET is not set
522# CONFIG_INPUT_TOUCHSCREEN is not set 446# CONFIG_INPUT_TOUCHSCREEN is not set
523# CONFIG_INPUT_MISC is not set 447# CONFIG_INPUT_MISC is not set
524 448
@@ -553,41 +477,20 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
553CONFIG_UNIX98_PTYS=y 477CONFIG_UNIX98_PTYS=y
554CONFIG_LEGACY_PTYS=y 478CONFIG_LEGACY_PTYS=y
555CONFIG_LEGACY_PTY_COUNT=256 479CONFIG_LEGACY_PTY_COUNT=256
556
557#
558# IPMI
559#
560# CONFIG_IPMI_HANDLER is not set 480# CONFIG_IPMI_HANDLER is not set
561
562#
563# Watchdog Cards
564#
565# CONFIG_WATCHDOG is not set 481# CONFIG_WATCHDOG is not set
566CONFIG_HW_RANDOM=y 482CONFIG_HW_RANDOM=y
567# CONFIG_RTC is not set 483# CONFIG_RTC is not set
568# CONFIG_DTLK is not set
569# CONFIG_R3964 is not set 484# CONFIG_R3964 is not set
570 485
571# 486#
572# Ftape, the floppy tape device driver
573#
574
575#
576# PCMCIA character devices 487# PCMCIA character devices
577# 488#
578# CONFIG_SYNCLINK_CS is not set 489# CONFIG_SYNCLINK_CS is not set
579# CONFIG_CARDMAN_4000 is not set 490# CONFIG_CARDMAN_4000 is not set
580# CONFIG_CARDMAN_4040 is not set 491# CONFIG_CARDMAN_4040 is not set
581# CONFIG_RAW_DRIVER is not set 492# CONFIG_RAW_DRIVER is not set
582
583#
584# TPM devices
585#
586# CONFIG_TCG_TPM is not set 493# CONFIG_TCG_TPM is not set
587
588#
589# I2C support
590#
591# CONFIG_I2C is not set 494# CONFIG_I2C is not set
592 495
593# 496#
@@ -595,47 +498,56 @@ CONFIG_HW_RANDOM=y
595# 498#
596# CONFIG_SPI is not set 499# CONFIG_SPI is not set
597# CONFIG_SPI_MASTER is not set 500# CONFIG_SPI_MASTER is not set
598
599#
600# Dallas's 1-wire bus
601#
602# CONFIG_W1 is not set 501# CONFIG_W1 is not set
603 502# CONFIG_POWER_SUPPLY is not set
604#
605# Hardware Monitoring support
606#
607CONFIG_HWMON=y 503CONFIG_HWMON=y
608# CONFIG_HWMON_VID is not set 504# CONFIG_HWMON_VID is not set
609# CONFIG_SENSORS_ABITUGURU is not set 505# CONFIG_SENSORS_ABITUGURU is not set
506# CONFIG_SENSORS_ABITUGURU3 is not set
610# CONFIG_SENSORS_F71805F is not set 507# CONFIG_SENSORS_F71805F is not set
508# CONFIG_SENSORS_IT87 is not set
509# CONFIG_SENSORS_PC87360 is not set
510# CONFIG_SENSORS_PC87427 is not set
511# CONFIG_SENSORS_SMSC47M1 is not set
512# CONFIG_SENSORS_SMSC47B397 is not set
611# CONFIG_SENSORS_VT1211 is not set 513# CONFIG_SENSORS_VT1211 is not set
514# CONFIG_SENSORS_W83627HF is not set
515# CONFIG_SENSORS_W83627EHF is not set
612# CONFIG_HWMON_DEBUG_CHIP is not set 516# CONFIG_HWMON_DEBUG_CHIP is not set
613 517
614# 518#
615# Multimedia devices 519# Multifunction device drivers
616# 520#
617# CONFIG_VIDEO_DEV is not set 521# CONFIG_MFD_SM501 is not set
618 522
619# 523#
620# Digital Video Broadcasting Devices 524# Multimedia devices
621# 525#
622# CONFIG_DVB is not set 526# CONFIG_VIDEO_DEV is not set
527# CONFIG_DVB_CORE is not set
528CONFIG_DAB=y
623 529
624# 530#
625# Graphics support 531# Graphics support
626# 532#
627CONFIG_FIRMWARE_EDID=y
628# CONFIG_FB is not set
629# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 533# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
630 534
631# 535#
632# Sound 536# Display device support
633# 537#
634# CONFIG_SOUND is not set 538# CONFIG_DISPLAY_SUPPORT is not set
539# CONFIG_VGASTATE is not set
540CONFIG_VIDEO_OUTPUT_CONTROL=m
541# CONFIG_FB is not set
635 542
636# 543#
637# USB support 544# Sound
638# 545#
546# CONFIG_SOUND is not set
547CONFIG_HID_SUPPORT=y
548CONFIG_HID=y
549# CONFIG_HID_DEBUG is not set
550CONFIG_USB_SUPPORT=y
639# CONFIG_USB_ARCH_HAS_HCD is not set 551# CONFIG_USB_ARCH_HAS_HCD is not set
640# CONFIG_USB_ARCH_HAS_OHCI is not set 552# CONFIG_USB_ARCH_HAS_OHCI is not set
641# CONFIG_USB_ARCH_HAS_EHCI is not set 553# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -648,50 +560,18 @@ CONFIG_FIRMWARE_EDID=y
648# USB Gadget Support 560# USB Gadget Support
649# 561#
650# CONFIG_USB_GADGET is not set 562# CONFIG_USB_GADGET is not set
651
652#
653# MMC/SD Card support
654#
655# CONFIG_MMC is not set 563# CONFIG_MMC is not set
656
657#
658# LED devices
659#
660# CONFIG_NEW_LEDS is not set 564# CONFIG_NEW_LEDS is not set
661 565
662# 566#
663# LED drivers
664#
665
666#
667# LED Triggers
668#
669
670#
671# InfiniBand support
672#
673
674#
675# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
676#
677
678#
679# Real Time Clock 567# Real Time Clock
680# 568#
681# CONFIG_RTC_CLASS is not set 569# CONFIG_RTC_CLASS is not set
682 570
683# 571#
684# DMA Engine support 572# Userspace I/O
685#
686# CONFIG_DMA_ENGINE is not set
687
688#
689# DMA Clients
690#
691
692#
693# DMA Devices
694# 573#
574# CONFIG_UIO is not set
695 575
696# 576#
697# File systems 577# File systems
@@ -764,9 +644,6 @@ CONFIG_RAMFS=y
764# CONFIG_BEFS_FS is not set 644# CONFIG_BEFS_FS is not set
765# CONFIG_BFS_FS is not set 645# CONFIG_BFS_FS is not set
766# CONFIG_EFS_FS is not set 646# CONFIG_EFS_FS is not set
767CONFIG_JFFS_FS=y
768CONFIG_JFFS_FS_VERBOSE=0
769CONFIG_JFFS_PROC_FS=y
770CONFIG_JFFS2_FS=y 647CONFIG_JFFS2_FS=y
771CONFIG_JFFS2_FS_DEBUG=0 648CONFIG_JFFS2_FS_DEBUG=0
772CONFIG_JFFS2_FS_WRITEBUFFER=y 649CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -797,6 +674,7 @@ CONFIG_LOCKD=y
797CONFIG_LOCKD_V4=y 674CONFIG_LOCKD_V4=y
798CONFIG_NFS_COMMON=y 675CONFIG_NFS_COMMON=y
799CONFIG_SUNRPC=y 676CONFIG_SUNRPC=y
677# CONFIG_SUNRPC_BIND34 is not set
800# CONFIG_RPCSEC_GSS_KRB5 is not set 678# CONFIG_RPCSEC_GSS_KRB5 is not set
801# CONFIG_RPCSEC_GSS_SPKM3 is not set 679# CONFIG_RPCSEC_GSS_SPKM3 is not set
802# CONFIG_SMB_FS is not set 680# CONFIG_SMB_FS is not set
@@ -804,7 +682,6 @@ CONFIG_SUNRPC=y
804# CONFIG_NCP_FS is not set 682# CONFIG_NCP_FS is not set
805# CONFIG_CODA_FS is not set 683# CONFIG_CODA_FS is not set
806# CONFIG_AFS_FS is not set 684# CONFIG_AFS_FS is not set
807# CONFIG_9P_FS is not set
808 685
809# 686#
810# Partition Types 687# Partition Types
@@ -857,6 +734,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
857# CONFIG_NLS_UTF8 is not set 734# CONFIG_NLS_UTF8 is not set
858 735
859# 736#
737# Distributed Lock Manager
738#
739# CONFIG_DLM is not set
740
741#
860# Profiling support 742# Profiling support
861# 743#
862# CONFIG_PROFILING is not set 744# CONFIG_PROFILING is not set
@@ -868,31 +750,29 @@ CONFIG_NLS_DEFAULT="iso8859-1"
868CONFIG_ENABLE_MUST_CHECK=y 750CONFIG_ENABLE_MUST_CHECK=y
869# CONFIG_MAGIC_SYSRQ is not set 751# CONFIG_MAGIC_SYSRQ is not set
870# CONFIG_UNUSED_SYMBOLS is not set 752# CONFIG_UNUSED_SYMBOLS is not set
753# CONFIG_DEBUG_FS is not set
754# CONFIG_HEADERS_CHECK is not set
871# CONFIG_DEBUG_KERNEL is not set 755# CONFIG_DEBUG_KERNEL is not set
872CONFIG_LOG_BUF_SHIFT=15
873# CONFIG_DEBUG_BUGVERBOSE is not set 756# CONFIG_DEBUG_BUGVERBOSE is not set
874# CONFIG_DEBUG_FS is not set
875# CONFIG_FRAME_POINTER is not set 757# CONFIG_FRAME_POINTER is not set
876# CONFIG_UNWIND_INFO is not set
877# CONFIG_HEADERS_CHECK is not set
878 758
879# 759#
880# Security options 760# Security options
881# 761#
882# CONFIG_KEYS is not set 762# CONFIG_KEYS is not set
883# CONFIG_SECURITY is not set 763# CONFIG_SECURITY is not set
884
885#
886# Cryptographic options
887#
888# CONFIG_CRYPTO is not set 764# CONFIG_CRYPTO is not set
889 765
890# 766#
891# Library routines 767# Library routines
892# 768#
769CONFIG_BITREVERSE=y
893# CONFIG_CRC_CCITT is not set 770# CONFIG_CRC_CCITT is not set
894# CONFIG_CRC16 is not set 771# CONFIG_CRC16 is not set
772# CONFIG_CRC_ITU_T is not set
895CONFIG_CRC32=y 773CONFIG_CRC32=y
774# CONFIG_CRC7 is not set
896# CONFIG_LIBCRC32C is not set 775# CONFIG_LIBCRC32C is not set
897CONFIG_ZLIB_INFLATE=y 776CONFIG_ZLIB_INFLATE=y
898CONFIG_ZLIB_DEFLATE=y 777CONFIG_ZLIB_DEFLATE=y
778CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/oaks32r/defconfig.nommu b/arch/m32r/configs/oaks32r_defconfig
index aaa00828e0d3..cc0f99a59298 100644
--- a/arch/m32r/oaks32r/defconfig.nommu
+++ b/arch/m32r/configs/oaks32r_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Tue Dec 12 12:09:17 2006 4# Wed Aug 1 17:22:36 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -27,12 +30,13 @@ CONFIG_LOCALVERSION_AUTO=y
27CONFIG_BSD_PROCESS_ACCT=y 30CONFIG_BSD_PROCESS_ACCT=y
28# CONFIG_BSD_PROCESS_ACCT_V3 is not set 31# CONFIG_BSD_PROCESS_ACCT_V3 is not set
29# CONFIG_TASKSTATS is not set 32# CONFIG_TASKSTATS is not set
30# CONFIG_UTS_NS is not set 33# CONFIG_USER_NS is not set
31# CONFIG_AUDIT is not set 34# CONFIG_AUDIT is not set
32# CONFIG_IKCONFIG is not set 35# CONFIG_IKCONFIG is not set
36CONFIG_LOG_BUF_SHIFT=14
33CONFIG_SYSFS_DEPRECATED=y 37CONFIG_SYSFS_DEPRECATED=y
34# CONFIG_RELAY is not set 38# CONFIG_RELAY is not set
35CONFIG_INITRAMFS_SOURCE="" 39# CONFIG_BLK_DEV_INITRD is not set
36# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
37CONFIG_SYSCTL=y 41CONFIG_SYSCTL=y
38CONFIG_EMBEDDED=y 42CONFIG_EMBEDDED=y
@@ -44,28 +48,28 @@ CONFIG_BUG=y
44CONFIG_ELF_CORE=y 48CONFIG_ELF_CORE=y
45CONFIG_BASE_FULL=y 49CONFIG_BASE_FULL=y
46# CONFIG_FUTEX is not set 50# CONFIG_FUTEX is not set
51CONFIG_ANON_INODES=y
47# CONFIG_EPOLL is not set 52# CONFIG_EPOLL is not set
48CONFIG_SLAB=y 53CONFIG_SIGNALFD=y
54CONFIG_TIMERFD=y
55CONFIG_EVENTFD=y
49CONFIG_VM_EVENT_COUNTERS=y 56CONFIG_VM_EVENT_COUNTERS=y
57CONFIG_SLAB=y
58# CONFIG_SLUB is not set
59# CONFIG_SLOB is not set
50CONFIG_TINY_SHMEM=y 60CONFIG_TINY_SHMEM=y
51CONFIG_BASE_SMALL=0 61CONFIG_BASE_SMALL=0
52# CONFIG_SLOB is not set
53
54#
55# Loadable module support
56#
57CONFIG_MODULES=y 62CONFIG_MODULES=y
58CONFIG_MODULE_UNLOAD=y 63CONFIG_MODULE_UNLOAD=y
59# CONFIG_MODULE_FORCE_UNLOAD is not set 64# CONFIG_MODULE_FORCE_UNLOAD is not set
60# CONFIG_MODVERSIONS is not set 65# CONFIG_MODVERSIONS is not set
61# CONFIG_MODULE_SRCVERSION_ALL is not set 66# CONFIG_MODULE_SRCVERSION_ALL is not set
62CONFIG_KMOD=y 67CONFIG_KMOD=y
63
64#
65# Block layer
66#
67CONFIG_BLOCK=y 68CONFIG_BLOCK=y
69# CONFIG_LBD is not set
68# CONFIG_BLK_DEV_IO_TRACE is not set 70# CONFIG_BLK_DEV_IO_TRACE is not set
71# CONFIG_LSF is not set
72# CONFIG_BLK_DEV_BSG is not set
69 73
70# 74#
71# IO Schedulers 75# IO Schedulers
@@ -114,13 +118,18 @@ CONFIG_NEED_MULTIPLE_NODES=y
114# CONFIG_SPARSEMEM_STATIC is not set 118# CONFIG_SPARSEMEM_STATIC is not set
115CONFIG_SPLIT_PTLOCK_CPUS=4 119CONFIG_SPLIT_PTLOCK_CPUS=4
116# CONFIG_RESOURCES_64BIT is not set 120# CONFIG_RESOURCES_64BIT is not set
121CONFIG_ZONE_DMA_FLAG=1
122CONFIG_VIRT_TO_BUS=y
117CONFIG_IRAM_START=0x00f00000 123CONFIG_IRAM_START=0x00f00000
118CONFIG_IRAM_SIZE=0x00010000 124CONFIG_IRAM_SIZE=0x00010000
119CONFIG_RWSEM_GENERIC_SPINLOCK=y 125CONFIG_RWSEM_GENERIC_SPINLOCK=y
120# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 126# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
127# CONFIG_ARCH_HAS_ILOG2_U32 is not set
128# CONFIG_ARCH_HAS_ILOG2_U64 is not set
121CONFIG_GENERIC_FIND_NEXT_BIT=y 129CONFIG_GENERIC_FIND_NEXT_BIT=y
122CONFIG_GENERIC_HWEIGHT=y 130CONFIG_GENERIC_HWEIGHT=y
123CONFIG_GENERIC_CALIBRATE_DELAY=y 131CONFIG_GENERIC_CALIBRATE_DELAY=y
132CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
124CONFIG_PREEMPT=y 133CONFIG_PREEMPT=y
125# CONFIG_SMP is not set 134# CONFIG_SMP is not set
126CONFIG_NODES_SHIFT=1 135CONFIG_NODES_SHIFT=1
@@ -128,6 +137,7 @@ CONFIG_NODES_SHIFT=1
128# 137#
129# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 138# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
130# 139#
140# CONFIG_ARCH_SUPPORTS_MSI is not set
131# CONFIG_ISA is not set 141# CONFIG_ISA is not set
132 142
133# 143#
@@ -136,10 +146,6 @@ CONFIG_NODES_SHIFT=1
136# CONFIG_PCCARD is not set 146# CONFIG_PCCARD is not set
137 147
138# 148#
139# PCI Hotplug Support
140#
141
142#
143# Executable file formats 149# Executable file formats
144# 150#
145CONFIG_BINFMT_FLAT=y 151CONFIG_BINFMT_FLAT=y
@@ -155,13 +161,13 @@ CONFIG_NET=y
155# 161#
156# Networking options 162# Networking options
157# 163#
158# CONFIG_NETDEBUG is not set
159CONFIG_PACKET=y 164CONFIG_PACKET=y
160# CONFIG_PACKET_MMAP is not set 165# CONFIG_PACKET_MMAP is not set
161CONFIG_UNIX=y 166CONFIG_UNIX=y
162CONFIG_XFRM=y 167CONFIG_XFRM=y
163# CONFIG_XFRM_USER is not set 168# CONFIG_XFRM_USER is not set
164# CONFIG_XFRM_SUB_POLICY is not set 169# CONFIG_XFRM_SUB_POLICY is not set
170# CONFIG_XFRM_MIGRATE is not set
165# CONFIG_NET_KEY is not set 171# CONFIG_NET_KEY is not set
166CONFIG_INET=y 172CONFIG_INET=y
167# CONFIG_IP_MULTICAST is not set 173# CONFIG_IP_MULTICAST is not set
@@ -194,20 +200,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
194# CONFIG_INET6_TUNNEL is not set 200# CONFIG_INET6_TUNNEL is not set
195# CONFIG_NETWORK_SECMARK is not set 201# CONFIG_NETWORK_SECMARK is not set
196# CONFIG_NETFILTER is not set 202# CONFIG_NETFILTER is not set
197
198#
199# DCCP Configuration (EXPERIMENTAL)
200#
201# CONFIG_IP_DCCP is not set 203# CONFIG_IP_DCCP is not set
202
203#
204# SCTP Configuration (EXPERIMENTAL)
205#
206# CONFIG_IP_SCTP is not set 204# CONFIG_IP_SCTP is not set
207
208#
209# TIPC Configuration (EXPERIMENTAL)
210#
211# CONFIG_TIPC is not set 205# CONFIG_TIPC is not set
212# CONFIG_ATM is not set 206# CONFIG_ATM is not set
213# CONFIG_BRIDGE is not set 207# CONFIG_BRIDGE is not set
@@ -233,7 +227,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
233# CONFIG_HAMRADIO is not set 227# CONFIG_HAMRADIO is not set
234# CONFIG_IRDA is not set 228# CONFIG_IRDA is not set
235# CONFIG_BT is not set 229# CONFIG_BT is not set
230# CONFIG_AF_RXRPC is not set
231
232#
233# Wireless
234#
235# CONFIG_CFG80211 is not set
236# CONFIG_WIRELESS_EXT is not set
237# CONFIG_MAC80211 is not set
236# CONFIG_IEEE80211 is not set 238# CONFIG_IEEE80211 is not set
239# CONFIG_RFKILL is not set
240# CONFIG_NET_9P is not set
237 241
238# 242#
239# Device Drivers 243# Device Drivers
@@ -246,29 +250,10 @@ CONFIG_STANDALONE=y
246CONFIG_PREVENT_FIRMWARE_BUILD=y 250CONFIG_PREVENT_FIRMWARE_BUILD=y
247# CONFIG_FW_LOADER is not set 251# CONFIG_FW_LOADER is not set
248# CONFIG_SYS_HYPERVISOR is not set 252# CONFIG_SYS_HYPERVISOR is not set
249
250#
251# Connector - unified userspace <-> kernelspace linker
252#
253# CONFIG_CONNECTOR is not set 253# CONFIG_CONNECTOR is not set
254
255#
256# Memory Technology Devices (MTD)
257#
258# CONFIG_MTD is not set 254# CONFIG_MTD is not set
259
260#
261# Parallel port support
262#
263# CONFIG_PARPORT is not set 255# CONFIG_PARPORT is not set
264 256CONFIG_BLK_DEV=y
265#
266# Plug and Play support
267#
268
269#
270# Block devices
271#
272# CONFIG_BLK_DEV_COW_COMMON is not set 257# CONFIG_BLK_DEV_COW_COMMON is not set
273CONFIG_BLK_DEV_LOOP=y 258CONFIG_BLK_DEV_LOOP=y
274# CONFIG_BLK_DEV_CRYPTOLOOP is not set 259# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -277,18 +262,10 @@ CONFIG_BLK_DEV_RAM=y
277CONFIG_BLK_DEV_RAM_COUNT=16 262CONFIG_BLK_DEV_RAM_COUNT=16
278CONFIG_BLK_DEV_RAM_SIZE=4096 263CONFIG_BLK_DEV_RAM_SIZE=4096
279CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 264CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
280# CONFIG_BLK_DEV_INITRD is not set
281# CONFIG_CDROM_PKTCDVD is not set 265# CONFIG_CDROM_PKTCDVD is not set
282# CONFIG_ATA_OVER_ETH is not set 266# CONFIG_ATA_OVER_ETH is not set
283 267CONFIG_MISC_DEVICES=y
284# 268# CONFIG_EEPROM_93CX6 is not set
285# Misc devices
286#
287# CONFIG_TIFM_CORE is not set
288
289#
290# ATA/ATAPI/MFM/RLL support
291#
292# CONFIG_IDE is not set 269# CONFIG_IDE is not set
293 270
294# 271#
@@ -296,69 +273,25 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
296# 273#
297# CONFIG_RAID_ATTRS is not set 274# CONFIG_RAID_ATTRS is not set
298# CONFIG_SCSI is not set 275# CONFIG_SCSI is not set
276# CONFIG_SCSI_DMA is not set
299# CONFIG_SCSI_NETLINK is not set 277# CONFIG_SCSI_NETLINK is not set
300
301#
302# Serial ATA (prod) and Parallel ATA (experimental) drivers
303#
304
305#
306# Multi-device support (RAID and LVM)
307#
308# CONFIG_MD is not set 278# CONFIG_MD is not set
309
310#
311# Fusion MPT device support
312#
313# CONFIG_FUSION is not set
314
315#
316# IEEE 1394 (FireWire) support
317#
318
319#
320# I2O device support
321#
322
323#
324# Network device support
325#
326CONFIG_NETDEVICES=y 279CONFIG_NETDEVICES=y
280# CONFIG_NETDEVICES_MULTIQUEUE is not set
327# CONFIG_DUMMY is not set 281# CONFIG_DUMMY is not set
328# CONFIG_BONDING is not set 282# CONFIG_BONDING is not set
283# CONFIG_MACVLAN is not set
329# CONFIG_EQUALIZER is not set 284# CONFIG_EQUALIZER is not set
330# CONFIG_TUN is not set 285# CONFIG_TUN is not set
331
332#
333# PHY device support
334#
335
336#
337# Ethernet (10 or 100Mbit)
338#
339# CONFIG_NET_ETHERNET is not set 286# CONFIG_NET_ETHERNET is not set
340CONFIG_NE2000=y 287CONFIG_NETDEV_1000=y
341 288CONFIG_NETDEV_10000=y
342#
343# Ethernet (1000 Mbit)
344#
345
346#
347# Ethernet (10000 Mbit)
348#
349 289
350# 290#
351# Token Ring devices 291# Wireless LAN
352#
353
354#
355# Wireless LAN (non-hamradio)
356#
357# CONFIG_NET_RADIO is not set
358
359#
360# Wan interfaces
361# 292#
293# CONFIG_WLAN_PRE80211 is not set
294# CONFIG_WLAN_80211 is not set
362# CONFIG_WAN is not set 295# CONFIG_WAN is not set
363# CONFIG_PPP is not set 296# CONFIG_PPP is not set
364# CONFIG_SLIP is not set 297# CONFIG_SLIP is not set
@@ -366,15 +299,7 @@ CONFIG_NE2000=y
366# CONFIG_NETCONSOLE is not set 299# CONFIG_NETCONSOLE is not set
367# CONFIG_NETPOLL is not set 300# CONFIG_NETPOLL is not set
368# CONFIG_NET_POLL_CONTROLLER is not set 301# CONFIG_NET_POLL_CONTROLLER is not set
369
370#
371# ISDN subsystem
372#
373# CONFIG_ISDN is not set 302# CONFIG_ISDN is not set
374
375#
376# Telephony Support
377#
378# CONFIG_PHONE is not set 303# CONFIG_PHONE is not set
379 304
380# 305#
@@ -382,6 +307,7 @@ CONFIG_NE2000=y
382# 307#
383CONFIG_INPUT=y 308CONFIG_INPUT=y
384# CONFIG_INPUT_FF_MEMLESS is not set 309# CONFIG_INPUT_FF_MEMLESS is not set
310# CONFIG_INPUT_POLLDEV is not set
385 311
386# 312#
387# Userland interfaces 313# Userland interfaces
@@ -398,6 +324,7 @@ CONFIG_INPUT=y
398# CONFIG_INPUT_KEYBOARD is not set 324# CONFIG_INPUT_KEYBOARD is not set
399# CONFIG_INPUT_MOUSE is not set 325# CONFIG_INPUT_MOUSE is not set
400# CONFIG_INPUT_JOYSTICK is not set 326# CONFIG_INPUT_JOYSTICK is not set
327# CONFIG_INPUT_TABLET is not set
401# CONFIG_INPUT_TOUCHSCREEN is not set 328# CONFIG_INPUT_TOUCHSCREEN is not set
402# CONFIG_INPUT_MISC is not set 329# CONFIG_INPUT_MISC is not set
403 330
@@ -432,34 +359,13 @@ CONFIG_SERIAL_M32R_SIO_CONSOLE=y
432CONFIG_UNIX98_PTYS=y 359CONFIG_UNIX98_PTYS=y
433CONFIG_LEGACY_PTYS=y 360CONFIG_LEGACY_PTYS=y
434CONFIG_LEGACY_PTY_COUNT=256 361CONFIG_LEGACY_PTY_COUNT=256
435
436#
437# IPMI
438#
439# CONFIG_IPMI_HANDLER is not set 362# CONFIG_IPMI_HANDLER is not set
440
441#
442# Watchdog Cards
443#
444# CONFIG_WATCHDOG is not set 363# CONFIG_WATCHDOG is not set
445CONFIG_HW_RANDOM=y 364CONFIG_HW_RANDOM=y
446# CONFIG_RTC is not set 365# CONFIG_RTC is not set
447# CONFIG_DTLK is not set
448# CONFIG_R3964 is not set 366# CONFIG_R3964 is not set
449
450#
451# Ftape, the floppy tape device driver
452#
453# CONFIG_RAW_DRIVER is not set 367# CONFIG_RAW_DRIVER is not set
454
455#
456# TPM devices
457#
458# CONFIG_TCG_TPM is not set 368# CONFIG_TCG_TPM is not set
459
460#
461# I2C support
462#
463# CONFIG_I2C is not set 369# CONFIG_I2C is not set
464 370
465# 371#
@@ -467,47 +373,56 @@ CONFIG_HW_RANDOM=y
467# 373#
468# CONFIG_SPI is not set 374# CONFIG_SPI is not set
469# CONFIG_SPI_MASTER is not set 375# CONFIG_SPI_MASTER is not set
470
471#
472# Dallas's 1-wire bus
473#
474# CONFIG_W1 is not set 376# CONFIG_W1 is not set
475 377# CONFIG_POWER_SUPPLY is not set
476#
477# Hardware Monitoring support
478#
479CONFIG_HWMON=y 378CONFIG_HWMON=y
480# CONFIG_HWMON_VID is not set 379# CONFIG_HWMON_VID is not set
481# CONFIG_SENSORS_ABITUGURU is not set 380# CONFIG_SENSORS_ABITUGURU is not set
381# CONFIG_SENSORS_ABITUGURU3 is not set
482# CONFIG_SENSORS_F71805F is not set 382# CONFIG_SENSORS_F71805F is not set
383# CONFIG_SENSORS_IT87 is not set
384# CONFIG_SENSORS_PC87360 is not set
385# CONFIG_SENSORS_PC87427 is not set
386# CONFIG_SENSORS_SMSC47M1 is not set
387# CONFIG_SENSORS_SMSC47B397 is not set
483# CONFIG_SENSORS_VT1211 is not set 388# CONFIG_SENSORS_VT1211 is not set
389# CONFIG_SENSORS_W83627HF is not set
390# CONFIG_SENSORS_W83627EHF is not set
484# CONFIG_HWMON_DEBUG_CHIP is not set 391# CONFIG_HWMON_DEBUG_CHIP is not set
485 392
486# 393#
487# Multimedia devices 394# Multifunction device drivers
488# 395#
489# CONFIG_VIDEO_DEV is not set 396# CONFIG_MFD_SM501 is not set
490 397
491# 398#
492# Digital Video Broadcasting Devices 399# Multimedia devices
493# 400#
494# CONFIG_DVB is not set 401# CONFIG_VIDEO_DEV is not set
402# CONFIG_DVB_CORE is not set
403CONFIG_DAB=y
495 404
496# 405#
497# Graphics support 406# Graphics support
498# 407#
499CONFIG_FIRMWARE_EDID=y
500# CONFIG_FB is not set
501# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 408# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
502 409
503# 410#
504# Sound 411# Display device support
505# 412#
506# CONFIG_SOUND is not set 413# CONFIG_DISPLAY_SUPPORT is not set
414# CONFIG_VGASTATE is not set
415CONFIG_VIDEO_OUTPUT_CONTROL=m
416# CONFIG_FB is not set
507 417
508# 418#
509# USB support 419# Sound
510# 420#
421# CONFIG_SOUND is not set
422CONFIG_HID_SUPPORT=y
423CONFIG_HID=y
424# CONFIG_HID_DEBUG is not set
425CONFIG_USB_SUPPORT=y
511# CONFIG_USB_ARCH_HAS_HCD is not set 426# CONFIG_USB_ARCH_HAS_HCD is not set
512# CONFIG_USB_ARCH_HAS_OHCI is not set 427# CONFIG_USB_ARCH_HAS_OHCI is not set
513# CONFIG_USB_ARCH_HAS_EHCI is not set 428# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -520,50 +435,18 @@ CONFIG_FIRMWARE_EDID=y
520# USB Gadget Support 435# USB Gadget Support
521# 436#
522# CONFIG_USB_GADGET is not set 437# CONFIG_USB_GADGET is not set
523
524#
525# MMC/SD Card support
526#
527# CONFIG_MMC is not set 438# CONFIG_MMC is not set
528
529#
530# LED devices
531#
532# CONFIG_NEW_LEDS is not set 439# CONFIG_NEW_LEDS is not set
533 440
534# 441#
535# LED drivers
536#
537
538#
539# LED Triggers
540#
541
542#
543# InfiniBand support
544#
545
546#
547# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
548#
549
550#
551# Real Time Clock 442# Real Time Clock
552# 443#
553# CONFIG_RTC_CLASS is not set 444# CONFIG_RTC_CLASS is not set
554 445
555# 446#
556# DMA Engine support 447# Userspace I/O
557#
558# CONFIG_DMA_ENGINE is not set
559
560#
561# DMA Clients
562#
563
564#
565# DMA Devices
566# 448#
449# CONFIG_UIO is not set
567 450
568# 451#
569# File systems 452# File systems
@@ -643,6 +526,7 @@ CONFIG_LOCKD=y
643CONFIG_LOCKD_V4=y 526CONFIG_LOCKD_V4=y
644CONFIG_NFS_COMMON=y 527CONFIG_NFS_COMMON=y
645CONFIG_SUNRPC=y 528CONFIG_SUNRPC=y
529# CONFIG_SUNRPC_BIND34 is not set
646# CONFIG_RPCSEC_GSS_KRB5 is not set 530# CONFIG_RPCSEC_GSS_KRB5 is not set
647# CONFIG_RPCSEC_GSS_SPKM3 is not set 531# CONFIG_RPCSEC_GSS_SPKM3 is not set
648# CONFIG_SMB_FS is not set 532# CONFIG_SMB_FS is not set
@@ -650,7 +534,6 @@ CONFIG_SUNRPC=y
650# CONFIG_NCP_FS is not set 534# CONFIG_NCP_FS is not set
651# CONFIG_CODA_FS is not set 535# CONFIG_CODA_FS is not set
652# CONFIG_AFS_FS is not set 536# CONFIG_AFS_FS is not set
653# CONFIG_9P_FS is not set
654 537
655# 538#
656# Partition Types 539# Partition Types
@@ -703,6 +586,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
703# CONFIG_NLS_UTF8 is not set 586# CONFIG_NLS_UTF8 is not set
704 587
705# 588#
589# Distributed Lock Manager
590#
591# CONFIG_DLM is not set
592
593#
706# Profiling support 594# Profiling support
707# 595#
708# CONFIG_PROFILING is not set 596# CONFIG_PROFILING is not set
@@ -714,29 +602,27 @@ CONFIG_NLS_DEFAULT="iso8859-1"
714CONFIG_ENABLE_MUST_CHECK=y 602CONFIG_ENABLE_MUST_CHECK=y
715# CONFIG_MAGIC_SYSRQ is not set 603# CONFIG_MAGIC_SYSRQ is not set
716# CONFIG_UNUSED_SYMBOLS is not set 604# CONFIG_UNUSED_SYMBOLS is not set
605# CONFIG_DEBUG_FS is not set
606# CONFIG_HEADERS_CHECK is not set
717# CONFIG_DEBUG_KERNEL is not set 607# CONFIG_DEBUG_KERNEL is not set
718CONFIG_LOG_BUF_SHIFT=14
719# CONFIG_DEBUG_BUGVERBOSE is not set 608# CONFIG_DEBUG_BUGVERBOSE is not set
720# CONFIG_DEBUG_FS is not set
721# CONFIG_FRAME_POINTER is not set 609# CONFIG_FRAME_POINTER is not set
722# CONFIG_UNWIND_INFO is not set
723# CONFIG_HEADERS_CHECK is not set
724 610
725# 611#
726# Security options 612# Security options
727# 613#
728# CONFIG_KEYS is not set 614# CONFIG_KEYS is not set
729# CONFIG_SECURITY is not set 615# CONFIG_SECURITY is not set
730
731#
732# Cryptographic options
733#
734# CONFIG_CRYPTO is not set 616# CONFIG_CRYPTO is not set
735 617
736# 618#
737# Library routines 619# Library routines
738# 620#
621CONFIG_BITREVERSE=y
739# CONFIG_CRC_CCITT is not set 622# CONFIG_CRC_CCITT is not set
740# CONFIG_CRC16 is not set 623# CONFIG_CRC16 is not set
624# CONFIG_CRC_ITU_T is not set
741CONFIG_CRC32=y 625CONFIG_CRC32=y
626# CONFIG_CRC7 is not set
742# CONFIG_LIBCRC32C is not set 627# CONFIG_LIBCRC32C is not set
628CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/opsput/defconfig.opsput b/arch/m32r/configs/opsput_defconfig
index 461f95e72d17..39f5c1a5064b 100644
--- a/arch/m32r/opsput/defconfig.opsput
+++ b/arch/m32r/configs/opsput_defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Wed Dec 13 18:34:36 2006 4# Wed Aug 1 17:22:37 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -23,18 +26,19 @@ CONFIG_LOCALVERSION=""
23CONFIG_LOCALVERSION_AUTO=y 26CONFIG_LOCALVERSION_AUTO=y
24CONFIG_SWAP=y 27CONFIG_SWAP=y
25CONFIG_SYSVIPC=y 28CONFIG_SYSVIPC=y
26# CONFIG_IPC_NS is not set 29CONFIG_SYSVIPC_SYSCTL=y
27# CONFIG_POSIX_MQUEUE is not set 30# CONFIG_POSIX_MQUEUE is not set
28CONFIG_BSD_PROCESS_ACCT=y 31CONFIG_BSD_PROCESS_ACCT=y
29# CONFIG_BSD_PROCESS_ACCT_V3 is not set 32# CONFIG_BSD_PROCESS_ACCT_V3 is not set
30# CONFIG_TASKSTATS is not set 33# CONFIG_TASKSTATS is not set
31# CONFIG_UTS_NS is not set 34# CONFIG_USER_NS is not set
32# CONFIG_AUDIT is not set 35# CONFIG_AUDIT is not set
33CONFIG_IKCONFIG=y 36CONFIG_IKCONFIG=y
34# CONFIG_IKCONFIG_PROC is not set 37# CONFIG_IKCONFIG_PROC is not set
38CONFIG_LOG_BUF_SHIFT=14
35CONFIG_SYSFS_DEPRECATED=y 39CONFIG_SYSFS_DEPRECATED=y
36# CONFIG_RELAY is not set 40# CONFIG_RELAY is not set
37CONFIG_INITRAMFS_SOURCE="" 41# CONFIG_BLK_DEV_INITRD is not set
38# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 42# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
39CONFIG_SYSCTL=y 43CONFIG_SYSCTL=y
40CONFIG_EMBEDDED=y 44CONFIG_EMBEDDED=y
@@ -46,29 +50,29 @@ CONFIG_BUG=y
46CONFIG_ELF_CORE=y 50CONFIG_ELF_CORE=y
47CONFIG_BASE_FULL=y 51CONFIG_BASE_FULL=y
48# CONFIG_FUTEX is not set 52# CONFIG_FUTEX is not set
53CONFIG_ANON_INODES=y
49# CONFIG_EPOLL is not set 54# CONFIG_EPOLL is not set
55CONFIG_SIGNALFD=y
56CONFIG_TIMERFD=y
57CONFIG_EVENTFD=y
50CONFIG_SHMEM=y 58CONFIG_SHMEM=y
51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y 59CONFIG_VM_EVENT_COUNTERS=y
60CONFIG_SLAB=y
61# CONFIG_SLUB is not set
62# CONFIG_SLOB is not set
53# CONFIG_TINY_SHMEM is not set 63# CONFIG_TINY_SHMEM is not set
54CONFIG_BASE_SMALL=0 64CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
56
57#
58# Loadable module support
59#
60CONFIG_MODULES=y 65CONFIG_MODULES=y
61CONFIG_MODULE_UNLOAD=y 66CONFIG_MODULE_UNLOAD=y
62# CONFIG_MODULE_FORCE_UNLOAD is not set 67# CONFIG_MODULE_FORCE_UNLOAD is not set
63# CONFIG_MODVERSIONS is not set 68# CONFIG_MODVERSIONS is not set
64# CONFIG_MODULE_SRCVERSION_ALL is not set 69# CONFIG_MODULE_SRCVERSION_ALL is not set
65CONFIG_KMOD=y 70CONFIG_KMOD=y
66
67#
68# Block layer
69#
70CONFIG_BLOCK=y 71CONFIG_BLOCK=y
72# CONFIG_LBD is not set
71# CONFIG_BLK_DEV_IO_TRACE is not set 73# CONFIG_BLK_DEV_IO_TRACE is not set
74# CONFIG_LSF is not set
75# CONFIG_BLK_DEV_BSG is not set
72 76
73# 77#
74# IO Schedulers 78# IO Schedulers
@@ -121,13 +125,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
121# CONFIG_SPARSEMEM_STATIC is not set 125# CONFIG_SPARSEMEM_STATIC is not set
122CONFIG_SPLIT_PTLOCK_CPUS=4 126CONFIG_SPLIT_PTLOCK_CPUS=4
123# CONFIG_RESOURCES_64BIT is not set 127# CONFIG_RESOURCES_64BIT is not set
128CONFIG_ZONE_DMA_FLAG=1
129CONFIG_BOUNCE=y
130CONFIG_VIRT_TO_BUS=y
124CONFIG_IRAM_START=0x00f00000 131CONFIG_IRAM_START=0x00f00000
125CONFIG_IRAM_SIZE=0x00010000 132CONFIG_IRAM_SIZE=0x00010000
126CONFIG_RWSEM_GENERIC_SPINLOCK=y 133CONFIG_RWSEM_GENERIC_SPINLOCK=y
127# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 134# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
135# CONFIG_ARCH_HAS_ILOG2_U32 is not set
136# CONFIG_ARCH_HAS_ILOG2_U64 is not set
128CONFIG_GENERIC_FIND_NEXT_BIT=y 137CONFIG_GENERIC_FIND_NEXT_BIT=y
129CONFIG_GENERIC_HWEIGHT=y 138CONFIG_GENERIC_HWEIGHT=y
130CONFIG_GENERIC_CALIBRATE_DELAY=y 139CONFIG_GENERIC_CALIBRATE_DELAY=y
140CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
131# CONFIG_PREEMPT is not set 141# CONFIG_PREEMPT is not set
132# CONFIG_SMP is not set 142# CONFIG_SMP is not set
133CONFIG_NODES_SHIFT=1 143CONFIG_NODES_SHIFT=1
@@ -135,6 +145,7 @@ CONFIG_NODES_SHIFT=1
135# 145#
136# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 146# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
137# 147#
148# CONFIG_ARCH_SUPPORTS_MSI is not set
138# CONFIG_ISA is not set 149# CONFIG_ISA is not set
139 150
140# 151#
@@ -154,10 +165,6 @@ CONFIG_M32R_CFC_NUM=1
154CONFIG_PCCARD_NONSTATIC=y 165CONFIG_PCCARD_NONSTATIC=y
155 166
156# 167#
157# PCI Hotplug Support
158#
159
160#
161# Executable file formats 168# Executable file formats
162# 169#
163CONFIG_BINFMT_ELF=y 170CONFIG_BINFMT_ELF=y
@@ -171,13 +178,13 @@ CONFIG_NET=y
171# 178#
172# Networking options 179# Networking options
173# 180#
174# CONFIG_NETDEBUG is not set
175CONFIG_PACKET=y 181CONFIG_PACKET=y
176# CONFIG_PACKET_MMAP is not set 182# CONFIG_PACKET_MMAP is not set
177CONFIG_UNIX=y 183CONFIG_UNIX=y
178CONFIG_XFRM=y 184CONFIG_XFRM=y
179# CONFIG_XFRM_USER is not set 185# CONFIG_XFRM_USER is not set
180# CONFIG_XFRM_SUB_POLICY is not set 186# CONFIG_XFRM_SUB_POLICY is not set
187# CONFIG_XFRM_MIGRATE is not set
181# CONFIG_NET_KEY is not set 188# CONFIG_NET_KEY is not set
182CONFIG_INET=y 189CONFIG_INET=y
183# CONFIG_IP_MULTICAST is not set 190# CONFIG_IP_MULTICAST is not set
@@ -210,20 +217,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
210# CONFIG_INET6_TUNNEL is not set 217# CONFIG_INET6_TUNNEL is not set
211# CONFIG_NETWORK_SECMARK is not set 218# CONFIG_NETWORK_SECMARK is not set
212# CONFIG_NETFILTER is not set 219# CONFIG_NETFILTER is not set
213
214#
215# DCCP Configuration (EXPERIMENTAL)
216#
217# CONFIG_IP_DCCP is not set 220# CONFIG_IP_DCCP is not set
218
219#
220# SCTP Configuration (EXPERIMENTAL)
221#
222# CONFIG_IP_SCTP is not set 221# CONFIG_IP_SCTP is not set
223
224#
225# TIPC Configuration (EXPERIMENTAL)
226#
227# CONFIG_TIPC is not set 222# CONFIG_TIPC is not set
228# CONFIG_ATM is not set 223# CONFIG_ATM is not set
229# CONFIG_BRIDGE is not set 224# CONFIG_BRIDGE is not set
@@ -249,7 +244,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
249# CONFIG_HAMRADIO is not set 244# CONFIG_HAMRADIO is not set
250# CONFIG_IRDA is not set 245# CONFIG_IRDA is not set
251# CONFIG_BT is not set 246# CONFIG_BT is not set
247# CONFIG_AF_RXRPC is not set
248
249#
250# Wireless
251#
252# CONFIG_CFG80211 is not set
253# CONFIG_WIRELESS_EXT is not set
254# CONFIG_MAC80211 is not set
252# CONFIG_IEEE80211 is not set 255# CONFIG_IEEE80211 is not set
256# CONFIG_RFKILL is not set
257# CONFIG_NET_9P is not set
253 258
254# 259#
255# Device Drivers 260# Device Drivers
@@ -262,30 +267,12 @@ CONFIG_STANDALONE=y
262CONFIG_PREVENT_FIRMWARE_BUILD=y 267CONFIG_PREVENT_FIRMWARE_BUILD=y
263CONFIG_FW_LOADER=y 268CONFIG_FW_LOADER=y
264# CONFIG_DEBUG_DRIVER is not set 269# CONFIG_DEBUG_DRIVER is not set
270# CONFIG_DEBUG_DEVRES is not set
265# CONFIG_SYS_HYPERVISOR is not set 271# CONFIG_SYS_HYPERVISOR is not set
266
267#
268# Connector - unified userspace <-> kernelspace linker
269#
270# CONFIG_CONNECTOR is not set 272# CONFIG_CONNECTOR is not set
271
272#
273# Memory Technology Devices (MTD)
274#
275# CONFIG_MTD is not set 273# CONFIG_MTD is not set
276
277#
278# Parallel port support
279#
280# CONFIG_PARPORT is not set 274# CONFIG_PARPORT is not set
281 275CONFIG_BLK_DEV=y
282#
283# Plug and Play support
284#
285
286#
287# Block devices
288#
289# CONFIG_BLK_DEV_COW_COMMON is not set 276# CONFIG_BLK_DEV_COW_COMMON is not set
290CONFIG_BLK_DEV_LOOP=y 277CONFIG_BLK_DEV_LOOP=y
291# CONFIG_BLK_DEV_CRYPTOLOOP is not set 278# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -294,18 +281,10 @@ CONFIG_BLK_DEV_RAM=y
294CONFIG_BLK_DEV_RAM_COUNT=16 281CONFIG_BLK_DEV_RAM_COUNT=16
295CONFIG_BLK_DEV_RAM_SIZE=4096 282CONFIG_BLK_DEV_RAM_SIZE=4096
296CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 283CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
297# CONFIG_BLK_DEV_INITRD is not set
298# CONFIG_CDROM_PKTCDVD is not set 284# CONFIG_CDROM_PKTCDVD is not set
299# CONFIG_ATA_OVER_ETH is not set 285# CONFIG_ATA_OVER_ETH is not set
300 286CONFIG_MISC_DEVICES=y
301# 287# CONFIG_EEPROM_93CX6 is not set
302# Misc devices
303#
304# CONFIG_TIFM_CORE is not set
305
306#
307# ATA/ATAPI/MFM/RLL support
308#
309# CONFIG_IDE is not set 288# CONFIG_IDE is not set
310 289
311# 290#
@@ -313,6 +292,8 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
313# 292#
314# CONFIG_RAID_ATTRS is not set 293# CONFIG_RAID_ATTRS is not set
315CONFIG_SCSI=m 294CONFIG_SCSI=m
295# CONFIG_SCSI_DMA is not set
296# CONFIG_SCSI_TGT is not set
316# CONFIG_SCSI_NETLINK is not set 297# CONFIG_SCSI_NETLINK is not set
317CONFIG_SCSI_PROC_FS=y 298CONFIG_SCSI_PROC_FS=y
318 299
@@ -333,6 +314,8 @@ CONFIG_CHR_DEV_SG=m
333CONFIG_SCSI_MULTI_LUN=y 314CONFIG_SCSI_MULTI_LUN=y
334# CONFIG_SCSI_CONSTANTS is not set 315# CONFIG_SCSI_CONSTANTS is not set
335# CONFIG_SCSI_LOGGING is not set 316# CONFIG_SCSI_LOGGING is not set
317# CONFIG_SCSI_SCAN_ASYNC is not set
318CONFIG_SCSI_WAIT_SCAN=m
336 319
337# 320#
338# SCSI Transports 321# SCSI Transports
@@ -340,93 +323,33 @@ CONFIG_SCSI_MULTI_LUN=y
340# CONFIG_SCSI_SPI_ATTRS is not set 323# CONFIG_SCSI_SPI_ATTRS is not set
341# CONFIG_SCSI_FC_ATTRS is not set 324# CONFIG_SCSI_FC_ATTRS is not set
342# CONFIG_SCSI_ISCSI_ATTRS is not set 325# CONFIG_SCSI_ISCSI_ATTRS is not set
343# CONFIG_SCSI_SAS_ATTRS is not set
344# CONFIG_SCSI_SAS_LIBSAS is not set 326# CONFIG_SCSI_SAS_LIBSAS is not set
345 327CONFIG_SCSI_LOWLEVEL=y
346#
347# SCSI low-level drivers
348#
349# CONFIG_ISCSI_TCP is not set 328# CONFIG_ISCSI_TCP is not set
350# CONFIG_SCSI_DEBUG is not set 329# CONFIG_SCSI_DEBUG is not set
351 330# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
352#
353# PCMCIA SCSI adapter support
354#
355# CONFIG_PCMCIA_AHA152X is not set
356# CONFIG_PCMCIA_FDOMAIN is not set
357# CONFIG_PCMCIA_NINJA_SCSI is not set
358# CONFIG_PCMCIA_QLOGIC is not set
359# CONFIG_PCMCIA_SYM53C500 is not set
360
361#
362# Serial ATA (prod) and Parallel ATA (experimental) drivers
363#
364
365#
366# Multi-device support (RAID and LVM)
367#
368# CONFIG_MD is not set 331# CONFIG_MD is not set
369
370#
371# Fusion MPT device support
372#
373# CONFIG_FUSION is not set
374
375#
376# IEEE 1394 (FireWire) support
377#
378
379#
380# I2O device support
381#
382
383#
384# Network device support
385#
386CONFIG_NETDEVICES=y 332CONFIG_NETDEVICES=y
333# CONFIG_NETDEVICES_MULTIQUEUE is not set
387# CONFIG_DUMMY is not set 334# CONFIG_DUMMY is not set
388# CONFIG_BONDING is not set 335# CONFIG_BONDING is not set
336# CONFIG_MACVLAN is not set
389# CONFIG_EQUALIZER is not set 337# CONFIG_EQUALIZER is not set
390# CONFIG_TUN is not set 338# CONFIG_TUN is not set
391
392#
393# PHY device support
394#
395# CONFIG_PHYLIB is not set 339# CONFIG_PHYLIB is not set
396
397#
398# Ethernet (10 or 100Mbit)
399#
400CONFIG_NET_ETHERNET=y 340CONFIG_NET_ETHERNET=y
401CONFIG_MII=y 341CONFIG_MII=y
402CONFIG_SMC91X=y 342CONFIG_SMC91X=y
403# CONFIG_NE2000 is not set 343# CONFIG_NE2000 is not set
344CONFIG_NETDEV_1000=y
345CONFIG_NETDEV_10000=y
404 346
405# 347#
406# Ethernet (1000 Mbit) 348# Wireless LAN
407#
408
409#
410# Ethernet (10000 Mbit)
411#
412
413#
414# Token Ring devices
415#
416
417#
418# Wireless LAN (non-hamradio)
419#
420# CONFIG_NET_RADIO is not set
421
422#
423# PCMCIA network device support
424# 349#
350# CONFIG_WLAN_PRE80211 is not set
351# CONFIG_WLAN_80211 is not set
425# CONFIG_NET_PCMCIA is not set 352# CONFIG_NET_PCMCIA is not set
426
427#
428# Wan interfaces
429#
430# CONFIG_WAN is not set 353# CONFIG_WAN is not set
431# CONFIG_PPP is not set 354# CONFIG_PPP is not set
432# CONFIG_SLIP is not set 355# CONFIG_SLIP is not set
@@ -434,15 +357,7 @@ CONFIG_SMC91X=y
434# CONFIG_NETCONSOLE is not set 357# CONFIG_NETCONSOLE is not set
435# CONFIG_NETPOLL is not set 358# CONFIG_NETPOLL is not set
436# CONFIG_NET_POLL_CONTROLLER is not set 359# CONFIG_NET_POLL_CONTROLLER is not set
437
438#
439# ISDN subsystem
440#
441# CONFIG_ISDN is not set 360# CONFIG_ISDN is not set
442
443#
444# Telephony Support
445#
446# CONFIG_PHONE is not set 361# CONFIG_PHONE is not set
447 362
448# 363#
@@ -450,6 +365,7 @@ CONFIG_SMC91X=y
450# 365#
451CONFIG_INPUT=y 366CONFIG_INPUT=y
452# CONFIG_INPUT_FF_MEMLESS is not set 367# CONFIG_INPUT_FF_MEMLESS is not set
368# CONFIG_INPUT_POLLDEV is not set
453 369
454# 370#
455# Userland interfaces 371# Userland interfaces
@@ -466,6 +382,7 @@ CONFIG_INPUT=y
466# CONFIG_INPUT_KEYBOARD is not set 382# CONFIG_INPUT_KEYBOARD is not set
467# CONFIG_INPUT_MOUSE is not set 383# CONFIG_INPUT_MOUSE is not set
468# CONFIG_INPUT_JOYSTICK is not set 384# CONFIG_INPUT_JOYSTICK is not set
385# CONFIG_INPUT_TABLET is not set
469# CONFIG_INPUT_TOUCHSCREEN is not set 386# CONFIG_INPUT_TOUCHSCREEN is not set
470# CONFIG_INPUT_MISC is not set 387# CONFIG_INPUT_MISC is not set
471 388
@@ -501,42 +418,21 @@ CONFIG_SERIAL_M32R_PLDSIO=y
501CONFIG_UNIX98_PTYS=y 418CONFIG_UNIX98_PTYS=y
502CONFIG_LEGACY_PTYS=y 419CONFIG_LEGACY_PTYS=y
503CONFIG_LEGACY_PTY_COUNT=256 420CONFIG_LEGACY_PTY_COUNT=256
504
505#
506# IPMI
507#
508# CONFIG_IPMI_HANDLER is not set 421# CONFIG_IPMI_HANDLER is not set
509
510#
511# Watchdog Cards
512#
513# CONFIG_WATCHDOG is not set 422# CONFIG_WATCHDOG is not set
514CONFIG_HW_RANDOM=y 423CONFIG_HW_RANDOM=y
515# CONFIG_RTC is not set 424# CONFIG_RTC is not set
516CONFIG_DS1302=y 425CONFIG_DS1302=y
517# CONFIG_DTLK is not set
518# CONFIG_R3964 is not set 426# CONFIG_R3964 is not set
519 427
520# 428#
521# Ftape, the floppy tape device driver
522#
523
524#
525# PCMCIA character devices 429# PCMCIA character devices
526# 430#
527# CONFIG_SYNCLINK_CS is not set 431# CONFIG_SYNCLINK_CS is not set
528# CONFIG_CARDMAN_4000 is not set 432# CONFIG_CARDMAN_4000 is not set
529# CONFIG_CARDMAN_4040 is not set 433# CONFIG_CARDMAN_4040 is not set
530# CONFIG_RAW_DRIVER is not set 434# CONFIG_RAW_DRIVER is not set
531
532#
533# TPM devices
534#
535# CONFIG_TCG_TPM is not set 435# CONFIG_TCG_TPM is not set
536
537#
538# I2C support
539#
540# CONFIG_I2C is not set 436# CONFIG_I2C is not set
541 437
542# 438#
@@ -544,47 +440,56 @@ CONFIG_DS1302=y
544# 440#
545# CONFIG_SPI is not set 441# CONFIG_SPI is not set
546# CONFIG_SPI_MASTER is not set 442# CONFIG_SPI_MASTER is not set
547
548#
549# Dallas's 1-wire bus
550#
551# CONFIG_W1 is not set 443# CONFIG_W1 is not set
552 444# CONFIG_POWER_SUPPLY is not set
553#
554# Hardware Monitoring support
555#
556CONFIG_HWMON=y 445CONFIG_HWMON=y
557# CONFIG_HWMON_VID is not set 446# CONFIG_HWMON_VID is not set
558# CONFIG_SENSORS_ABITUGURU is not set 447# CONFIG_SENSORS_ABITUGURU is not set
448# CONFIG_SENSORS_ABITUGURU3 is not set
559# CONFIG_SENSORS_F71805F is not set 449# CONFIG_SENSORS_F71805F is not set
450# CONFIG_SENSORS_IT87 is not set
451# CONFIG_SENSORS_PC87360 is not set
452# CONFIG_SENSORS_PC87427 is not set
453# CONFIG_SENSORS_SMSC47M1 is not set
454# CONFIG_SENSORS_SMSC47B397 is not set
560# CONFIG_SENSORS_VT1211 is not set 455# CONFIG_SENSORS_VT1211 is not set
456# CONFIG_SENSORS_W83627HF is not set
457# CONFIG_SENSORS_W83627EHF is not set
561# CONFIG_HWMON_DEBUG_CHIP is not set 458# CONFIG_HWMON_DEBUG_CHIP is not set
562 459
563# 460#
564# Multimedia devices 461# Multifunction device drivers
565# 462#
566# CONFIG_VIDEO_DEV is not set 463# CONFIG_MFD_SM501 is not set
567 464
568# 465#
569# Digital Video Broadcasting Devices 466# Multimedia devices
570# 467#
571# CONFIG_DVB is not set 468# CONFIG_VIDEO_DEV is not set
469# CONFIG_DVB_CORE is not set
470CONFIG_DAB=y
572 471
573# 472#
574# Graphics support 473# Graphics support
575# 474#
576CONFIG_FIRMWARE_EDID=y
577# CONFIG_FB is not set
578# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 475# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
579 476
580# 477#
581# Sound 478# Display device support
582# 479#
583# CONFIG_SOUND is not set 480# CONFIG_DISPLAY_SUPPORT is not set
481# CONFIG_VGASTATE is not set
482CONFIG_VIDEO_OUTPUT_CONTROL=m
483# CONFIG_FB is not set
584 484
585# 485#
586# USB support 486# Sound
587# 487#
488# CONFIG_SOUND is not set
489CONFIG_HID_SUPPORT=y
490CONFIG_HID=y
491# CONFIG_HID_DEBUG is not set
492CONFIG_USB_SUPPORT=y
588# CONFIG_USB_ARCH_HAS_HCD is not set 493# CONFIG_USB_ARCH_HAS_HCD is not set
589# CONFIG_USB_ARCH_HAS_OHCI is not set 494# CONFIG_USB_ARCH_HAS_OHCI is not set
590# CONFIG_USB_ARCH_HAS_EHCI is not set 495# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -597,50 +502,18 @@ CONFIG_FIRMWARE_EDID=y
597# USB Gadget Support 502# USB Gadget Support
598# 503#
599# CONFIG_USB_GADGET is not set 504# CONFIG_USB_GADGET is not set
600
601#
602# MMC/SD Card support
603#
604# CONFIG_MMC is not set 505# CONFIG_MMC is not set
605
606#
607# LED devices
608#
609# CONFIG_NEW_LEDS is not set 506# CONFIG_NEW_LEDS is not set
610 507
611# 508#
612# LED drivers
613#
614
615#
616# LED Triggers
617#
618
619#
620# InfiniBand support
621#
622
623#
624# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
625#
626
627#
628# Real Time Clock 509# Real Time Clock
629# 510#
630# CONFIG_RTC_CLASS is not set 511# CONFIG_RTC_CLASS is not set
631 512
632# 513#
633# DMA Engine support 514# Userspace I/O
634#
635# CONFIG_DMA_ENGINE is not set
636
637#
638# DMA Clients
639#
640
641#
642# DMA Devices
643# 515#
516# CONFIG_UIO is not set
644 517
645# 518#
646# File systems 519# File systems
@@ -735,6 +608,7 @@ CONFIG_LOCKD=y
735CONFIG_LOCKD_V4=y 608CONFIG_LOCKD_V4=y
736CONFIG_NFS_COMMON=y 609CONFIG_NFS_COMMON=y
737CONFIG_SUNRPC=y 610CONFIG_SUNRPC=y
611# CONFIG_SUNRPC_BIND34 is not set
738# CONFIG_RPCSEC_GSS_KRB5 is not set 612# CONFIG_RPCSEC_GSS_KRB5 is not set
739# CONFIG_RPCSEC_GSS_SPKM3 is not set 613# CONFIG_RPCSEC_GSS_SPKM3 is not set
740# CONFIG_SMB_FS is not set 614# CONFIG_SMB_FS is not set
@@ -742,7 +616,6 @@ CONFIG_SUNRPC=y
742# CONFIG_NCP_FS is not set 616# CONFIG_NCP_FS is not set
743# CONFIG_CODA_FS is not set 617# CONFIG_CODA_FS is not set
744# CONFIG_AFS_FS is not set 618# CONFIG_AFS_FS is not set
745# CONFIG_9P_FS is not set
746 619
747# 620#
748# Partition Types 621# Partition Types
@@ -795,6 +668,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
795# CONFIG_NLS_UTF8 is not set 668# CONFIG_NLS_UTF8 is not set
796 669
797# 670#
671# Distributed Lock Manager
672#
673# CONFIG_DLM is not set
674
675#
798# Profiling support 676# Profiling support
799# 677#
800# CONFIG_PROFILING is not set 678# CONFIG_PROFILING is not set
@@ -806,27 +684,28 @@ CONFIG_NLS_DEFAULT="iso8859-1"
806CONFIG_ENABLE_MUST_CHECK=y 684CONFIG_ENABLE_MUST_CHECK=y
807# CONFIG_MAGIC_SYSRQ is not set 685# CONFIG_MAGIC_SYSRQ is not set
808# CONFIG_UNUSED_SYMBOLS is not set 686# CONFIG_UNUSED_SYMBOLS is not set
687# CONFIG_DEBUG_FS is not set
688# CONFIG_HEADERS_CHECK is not set
809CONFIG_DEBUG_KERNEL=y 689CONFIG_DEBUG_KERNEL=y
810CONFIG_LOG_BUF_SHIFT=14 690# CONFIG_DEBUG_SHIRQ is not set
811CONFIG_DETECT_SOFTLOCKUP=y 691CONFIG_DETECT_SOFTLOCKUP=y
692CONFIG_SCHED_DEBUG=y
812# CONFIG_SCHEDSTATS is not set 693# CONFIG_SCHEDSTATS is not set
694# CONFIG_TIMER_STATS is not set
813# CONFIG_DEBUG_SLAB is not set 695# CONFIG_DEBUG_SLAB is not set
814# CONFIG_DEBUG_SPINLOCK is not set 696# CONFIG_DEBUG_SPINLOCK is not set
815# CONFIG_DEBUG_MUTEXES is not set 697# CONFIG_DEBUG_MUTEXES is not set
816# CONFIG_DEBUG_RWSEMS is not set
817# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 698# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
818# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 699# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
819# CONFIG_DEBUG_KOBJECT is not set 700# CONFIG_DEBUG_KOBJECT is not set
820# CONFIG_DEBUG_BUGVERBOSE is not set 701# CONFIG_DEBUG_BUGVERBOSE is not set
821CONFIG_DEBUG_INFO=y 702CONFIG_DEBUG_INFO=y
822# CONFIG_DEBUG_FS is not set
823# CONFIG_DEBUG_VM is not set 703# CONFIG_DEBUG_VM is not set
824# CONFIG_DEBUG_LIST is not set 704# CONFIG_DEBUG_LIST is not set
825# CONFIG_FRAME_POINTER is not set 705# CONFIG_FRAME_POINTER is not set
826# CONFIG_UNWIND_INFO is not set
827CONFIG_FORCED_INLINING=y 706CONFIG_FORCED_INLINING=y
828# CONFIG_HEADERS_CHECK is not set
829# CONFIG_RCU_TORTURE_TEST is not set 707# CONFIG_RCU_TORTURE_TEST is not set
708# CONFIG_FAULT_INJECTION is not set
830# CONFIG_DEBUG_STACKOVERFLOW is not set 709# CONFIG_DEBUG_STACKOVERFLOW is not set
831# CONFIG_DEBUG_STACK_USAGE is not set 710# CONFIG_DEBUG_STACK_USAGE is not set
832 711
@@ -835,16 +714,16 @@ CONFIG_FORCED_INLINING=y
835# 714#
836# CONFIG_KEYS is not set 715# CONFIG_KEYS is not set
837# CONFIG_SECURITY is not set 716# CONFIG_SECURITY is not set
838
839#
840# Cryptographic options
841#
842# CONFIG_CRYPTO is not set 717# CONFIG_CRYPTO is not set
843 718
844# 719#
845# Library routines 720# Library routines
846# 721#
722CONFIG_BITREVERSE=y
847# CONFIG_CRC_CCITT is not set 723# CONFIG_CRC_CCITT is not set
848# CONFIG_CRC16 is not set 724# CONFIG_CRC16 is not set
725# CONFIG_CRC_ITU_T is not set
849CONFIG_CRC32=y 726CONFIG_CRC32=y
727# CONFIG_CRC7 is not set
850# CONFIG_LIBCRC32C is not set 728# CONFIG_LIBCRC32C is not set
729CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/configs/usrv_defconfig b/arch/m32r/configs/usrv_defconfig
new file mode 100644
index 000000000000..62e813e30ce7
--- /dev/null
+++ b/arch/m32r/configs/usrv_defconfig
@@ -0,0 +1,774 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.23-rc1
4# Wed Aug 1 17:22:37 2007
5#
6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
9CONFIG_GENERIC_HARDIRQS=y
10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
14
15#
16# Code maturity level options
17#
18CONFIG_EXPERIMENTAL=y
19CONFIG_LOCK_KERNEL=y
20CONFIG_INIT_ENV_ARG_LIMIT=32
21
22#
23# General setup
24#
25CONFIG_LOCALVERSION=""
26CONFIG_LOCALVERSION_AUTO=y
27CONFIG_SWAP=y
28CONFIG_SYSVIPC=y
29CONFIG_SYSVIPC_SYSCTL=y
30CONFIG_POSIX_MQUEUE=y
31CONFIG_BSD_PROCESS_ACCT=y
32# CONFIG_BSD_PROCESS_ACCT_V3 is not set
33# CONFIG_TASKSTATS is not set
34# CONFIG_USER_NS is not set
35# CONFIG_AUDIT is not set
36# CONFIG_IKCONFIG is not set
37CONFIG_LOG_BUF_SHIFT=15
38# CONFIG_CPUSETS is not set
39CONFIG_SYSFS_DEPRECATED=y
40# CONFIG_RELAY is not set
41CONFIG_BLK_DEV_INITRD=y
42CONFIG_INITRAMFS_SOURCE=""
43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
44CONFIG_SYSCTL=y
45CONFIG_EMBEDDED=y
46CONFIG_SYSCTL_SYSCALL=y
47CONFIG_KALLSYMS=y
48# CONFIG_KALLSYMS_ALL is not set
49CONFIG_KALLSYMS_EXTRA_PASS=y
50CONFIG_HOTPLUG=y
51CONFIG_PRINTK=y
52CONFIG_BUG=y
53CONFIG_ELF_CORE=y
54CONFIG_BASE_FULL=y
55CONFIG_FUTEX=y
56CONFIG_ANON_INODES=y
57CONFIG_EPOLL=y
58CONFIG_SIGNALFD=y
59CONFIG_TIMERFD=y
60CONFIG_EVENTFD=y
61CONFIG_SHMEM=y
62CONFIG_VM_EVENT_COUNTERS=y
63CONFIG_SLAB=y
64# CONFIG_SLUB is not set
65# CONFIG_SLOB is not set
66CONFIG_RT_MUTEXES=y
67# CONFIG_TINY_SHMEM is not set
68CONFIG_BASE_SMALL=0
69CONFIG_MODULES=y
70CONFIG_MODULE_UNLOAD=y
71# CONFIG_MODULE_FORCE_UNLOAD is not set
72# CONFIG_MODVERSIONS is not set
73# CONFIG_MODULE_SRCVERSION_ALL is not set
74CONFIG_KMOD=y
75CONFIG_STOP_MACHINE=y
76CONFIG_BLOCK=y
77# CONFIG_LBD is not set
78# CONFIG_BLK_DEV_IO_TRACE is not set
79# CONFIG_LSF is not set
80# CONFIG_BLK_DEV_BSG is not set
81
82#
83# IO Schedulers
84#
85CONFIG_IOSCHED_NOOP=y
86# CONFIG_IOSCHED_AS is not set
87# CONFIG_IOSCHED_DEADLINE is not set
88# CONFIG_IOSCHED_CFQ is not set
89# CONFIG_DEFAULT_AS is not set
90# CONFIG_DEFAULT_DEADLINE is not set
91# CONFIG_DEFAULT_CFQ is not set
92CONFIG_DEFAULT_NOOP=y
93CONFIG_DEFAULT_IOSCHED="noop"
94
95#
96# Processor type and features
97#
98# CONFIG_PLAT_MAPPI is not set
99CONFIG_PLAT_USRV=y
100# CONFIG_PLAT_M32700UT is not set
101# CONFIG_PLAT_OPSPUT is not set
102# CONFIG_PLAT_OAKS32R is not set
103# CONFIG_PLAT_MAPPI2 is not set
104# CONFIG_PLAT_MAPPI3 is not set
105# CONFIG_PLAT_M32104UT is not set
106CONFIG_CHIP_M32700=y
107# CONFIG_CHIP_M32102 is not set
108# CONFIG_CHIP_M32104 is not set
109# CONFIG_CHIP_VDEC2 is not set
110# CONFIG_CHIP_OPSP is not set
111CONFIG_MMU=y
112CONFIG_TLB_ENTRIES=32
113CONFIG_ISA_M32R2=y
114CONFIG_ISA_DSP_LEVEL2=y
115CONFIG_ISA_DUAL_ISSUE=y
116CONFIG_BUS_CLOCK=50000000
117CONFIG_TIMER_DIVIDE=128
118# CONFIG_CPU_LITTLE_ENDIAN is not set
119CONFIG_MEMORY_START=0x08000000
120CONFIG_MEMORY_SIZE=0x02000000
121CONFIG_NOHIGHMEM=y
122# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
123CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y
125# CONFIG_DISCONTIGMEM_MANUAL is not set
126# CONFIG_SPARSEMEM_MANUAL is not set
127CONFIG_FLATMEM=y
128CONFIG_FLAT_NODE_MEM_MAP=y
129# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4
131# CONFIG_RESOURCES_64BIT is not set
132CONFIG_ZONE_DMA_FLAG=1
133CONFIG_BOUNCE=y
134CONFIG_VIRT_TO_BUS=y
135CONFIG_RWSEM_GENERIC_SPINLOCK=y
136# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
137# CONFIG_ARCH_HAS_ILOG2_U32 is not set
138# CONFIG_ARCH_HAS_ILOG2_U64 is not set
139CONFIG_GENERIC_FIND_NEXT_BIT=y
140CONFIG_GENERIC_HWEIGHT=y
141CONFIG_GENERIC_CALIBRATE_DELAY=y
142CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
143# CONFIG_PREEMPT is not set
144CONFIG_SMP=y
145# CONFIG_CHIP_M32700_TS1 is not set
146CONFIG_NR_CPUS=2
147
148#
149# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
150#
151# CONFIG_ARCH_SUPPORTS_MSI is not set
152# CONFIG_ISA is not set
153
154#
155# PCCARD (PCMCIA/CardBus) support
156#
157CONFIG_PCCARD=y
158# CONFIG_PCMCIA_DEBUG is not set
159CONFIG_PCMCIA=y
160CONFIG_PCMCIA_LOAD_CIS=y
161CONFIG_PCMCIA_IOCTL=y
162
163#
164# PC-card bridges
165#
166# CONFIG_M32R_PCC is not set
167CONFIG_M32R_CFC=y
168CONFIG_M32R_CFC_NUM=2
169CONFIG_PCCARD_NONSTATIC=y
170
171#
172# Executable file formats
173#
174CONFIG_BINFMT_ELF=y
175# CONFIG_BINFMT_MISC is not set
176
177#
178# Networking
179#
180CONFIG_NET=y
181
182#
183# Networking options
184#
185CONFIG_PACKET=y
186# CONFIG_PACKET_MMAP is not set
187CONFIG_UNIX=y
188CONFIG_XFRM=y
189CONFIG_XFRM_USER=y
190# CONFIG_XFRM_SUB_POLICY is not set
191# CONFIG_XFRM_MIGRATE is not set
192# CONFIG_NET_KEY is not set
193CONFIG_INET=y
194CONFIG_IP_MULTICAST=y
195# CONFIG_IP_ADVANCED_ROUTER is not set
196CONFIG_IP_FIB_HASH=y
197CONFIG_IP_PNP=y
198# CONFIG_IP_PNP_DHCP is not set
199# CONFIG_IP_PNP_BOOTP is not set
200# CONFIG_IP_PNP_RARP is not set
201# CONFIG_NET_IPIP is not set
202# CONFIG_NET_IPGRE is not set
203# CONFIG_IP_MROUTE is not set
204# CONFIG_ARPD is not set
205# CONFIG_SYN_COOKIES is not set
206CONFIG_INET_AH=y
207CONFIG_INET_ESP=y
208CONFIG_INET_IPCOMP=y
209CONFIG_INET_XFRM_TUNNEL=y
210CONFIG_INET_TUNNEL=y
211CONFIG_INET_XFRM_MODE_TRANSPORT=y
212CONFIG_INET_XFRM_MODE_TUNNEL=y
213CONFIG_INET_XFRM_MODE_BEET=y
214CONFIG_INET_DIAG=y
215CONFIG_INET_TCP_DIAG=y
216# CONFIG_TCP_CONG_ADVANCED is not set
217CONFIG_TCP_CONG_CUBIC=y
218CONFIG_DEFAULT_TCP_CONG="cubic"
219# CONFIG_TCP_MD5SIG is not set
220# CONFIG_IPV6 is not set
221# CONFIG_INET6_XFRM_TUNNEL is not set
222# CONFIG_INET6_TUNNEL is not set
223# CONFIG_NETWORK_SECMARK is not set
224# CONFIG_NETFILTER is not set
225# CONFIG_IP_DCCP is not set
226# CONFIG_IP_SCTP is not set
227# CONFIG_TIPC is not set
228# CONFIG_ATM is not set
229# CONFIG_BRIDGE is not set
230# CONFIG_VLAN_8021Q is not set
231# CONFIG_DECNET is not set
232# CONFIG_LLC2 is not set
233# CONFIG_IPX is not set
234# CONFIG_ATALK is not set
235# CONFIG_X25 is not set
236# CONFIG_LAPB is not set
237# CONFIG_ECONET is not set
238# CONFIG_WAN_ROUTER is not set
239
240#
241# QoS and/or fair queueing
242#
243# CONFIG_NET_SCHED is not set
244
245#
246# Network testing
247#
248# CONFIG_NET_PKTGEN is not set
249# CONFIG_HAMRADIO is not set
250# CONFIG_IRDA is not set
251# CONFIG_BT is not set
252# CONFIG_AF_RXRPC is not set
253
254#
255# Wireless
256#
257# CONFIG_CFG80211 is not set
258CONFIG_WIRELESS_EXT=y
259# CONFIG_MAC80211 is not set
260CONFIG_IEEE80211=y
261CONFIG_IEEE80211_DEBUG=y
262CONFIG_IEEE80211_CRYPT_WEP=y
263CONFIG_IEEE80211_CRYPT_CCMP=y
264CONFIG_IEEE80211_CRYPT_TKIP=y
265# CONFIG_IEEE80211_SOFTMAC is not set
266# CONFIG_RFKILL is not set
267# CONFIG_NET_9P is not set
268
269#
270# Device Drivers
271#
272
273#
274# Generic Driver Options
275#
276CONFIG_STANDALONE=y
277CONFIG_PREVENT_FIRMWARE_BUILD=y
278CONFIG_FW_LOADER=y
279# CONFIG_DEBUG_DRIVER is not set
280# CONFIG_DEBUG_DEVRES is not set
281# CONFIG_SYS_HYPERVISOR is not set
282# CONFIG_CONNECTOR is not set
283CONFIG_MTD=y
284# CONFIG_MTD_DEBUG is not set
285CONFIG_MTD_CONCAT=y
286CONFIG_MTD_PARTITIONS=y
287# CONFIG_MTD_REDBOOT_PARTS is not set
288# CONFIG_MTD_CMDLINE_PARTS is not set
289
290#
291# User Modules And Translation Layers
292#
293CONFIG_MTD_CHAR=y
294CONFIG_MTD_BLKDEVS=y
295CONFIG_MTD_BLOCK=y
296# CONFIG_FTL is not set
297# CONFIG_NFTL is not set
298# CONFIG_INFTL is not set
299# CONFIG_RFD_FTL is not set
300# CONFIG_SSFDC is not set
301
302#
303# RAM/ROM/Flash chip drivers
304#
305CONFIG_MTD_CFI=y
306# CONFIG_MTD_JEDECPROBE is not set
307CONFIG_MTD_GEN_PROBE=y
308CONFIG_MTD_CFI_ADV_OPTIONS=y
309# CONFIG_MTD_CFI_NOSWAP is not set
310CONFIG_MTD_CFI_BE_BYTE_SWAP=y
311# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
312CONFIG_MTD_CFI_GEOMETRY=y
313# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
314CONFIG_MTD_MAP_BANK_WIDTH_2=y
315# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
316# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
317# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
318# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
319CONFIG_MTD_CFI_I1=y
320# CONFIG_MTD_CFI_I2 is not set
321# CONFIG_MTD_CFI_I4 is not set
322# CONFIG_MTD_CFI_I8 is not set
323# CONFIG_MTD_OTP is not set
324# CONFIG_MTD_CFI_INTELEXT is not set
325CONFIG_MTD_CFI_AMDSTD=y
326# CONFIG_MTD_CFI_STAA is not set
327CONFIG_MTD_CFI_UTIL=y
328CONFIG_MTD_RAM=y
329CONFIG_MTD_ROM=y
330# CONFIG_MTD_ABSENT is not set
331
332#
333# Mapping drivers for chip access
334#
335# CONFIG_MTD_COMPLEX_MAPPINGS is not set
336# CONFIG_MTD_PHYSMAP is not set
337# CONFIG_MTD_PLATRAM is not set
338
339#
340# Self-contained MTD device drivers
341#
342# CONFIG_MTD_SLRAM is not set
343# CONFIG_MTD_PHRAM is not set
344# CONFIG_MTD_MTDRAM is not set
345# CONFIG_MTD_BLOCK2MTD is not set
346
347#
348# Disk-On-Chip Device Drivers
349#
350# CONFIG_MTD_DOC2000 is not set
351# CONFIG_MTD_DOC2001 is not set
352# CONFIG_MTD_DOC2001PLUS is not set
353# CONFIG_MTD_NAND is not set
354# CONFIG_MTD_ONENAND is not set
355
356#
357# UBI - Unsorted block images
358#
359# CONFIG_MTD_UBI is not set
360# CONFIG_PARPORT is not set
361CONFIG_BLK_DEV=y
362# CONFIG_BLK_DEV_COW_COMMON is not set
363CONFIG_BLK_DEV_LOOP=y
364# CONFIG_BLK_DEV_CRYPTOLOOP is not set
365# CONFIG_BLK_DEV_NBD is not set
366CONFIG_BLK_DEV_RAM=y
367CONFIG_BLK_DEV_RAM_COUNT=16
368CONFIG_BLK_DEV_RAM_SIZE=4096
369CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
370# CONFIG_CDROM_PKTCDVD is not set
371# CONFIG_ATA_OVER_ETH is not set
372CONFIG_MISC_DEVICES=y
373# CONFIG_EEPROM_93CX6 is not set
374CONFIG_IDE=y
375CONFIG_IDE_MAX_HWIFS=4
376CONFIG_BLK_DEV_IDE=y
377
378#
379# Please see Documentation/ide.txt for help/info on IDE drives
380#
381# CONFIG_BLK_DEV_IDE_SATA is not set
382CONFIG_BLK_DEV_IDEDISK=y
383# CONFIG_IDEDISK_MULTI_MODE is not set
384CONFIG_BLK_DEV_IDECS=y
385# CONFIG_BLK_DEV_IDECD is not set
386# CONFIG_BLK_DEV_IDETAPE is not set
387# CONFIG_BLK_DEV_IDEFLOPPY is not set
388# CONFIG_IDE_TASK_IOCTL is not set
389CONFIG_IDE_PROC_FS=y
390
391#
392# IDE chipset support/bugfixes
393#
394# CONFIG_IDE_GENERIC is not set
395# CONFIG_IDEPCI_PCIBUS_ORDER is not set
396# CONFIG_IDE_ARM is not set
397# CONFIG_BLK_DEV_IDEDMA is not set
398# CONFIG_BLK_DEV_HD is not set
399
400#
401# SCSI device support
402#
403# CONFIG_RAID_ATTRS is not set
404# CONFIG_SCSI is not set
405# CONFIG_SCSI_DMA is not set
406# CONFIG_SCSI_NETLINK is not set
407# CONFIG_MD is not set
408CONFIG_NETDEVICES=y
409# CONFIG_NETDEVICES_MULTIQUEUE is not set
410# CONFIG_DUMMY is not set
411# CONFIG_BONDING is not set
412# CONFIG_MACVLAN is not set
413# CONFIG_EQUALIZER is not set
414# CONFIG_TUN is not set
415# CONFIG_NET_ETHERNET is not set
416CONFIG_NETDEV_1000=y
417CONFIG_NETDEV_10000=y
418
419#
420# Wireless LAN
421#
422# CONFIG_WLAN_PRE80211 is not set
423# CONFIG_WLAN_80211 is not set
424CONFIG_NET_PCMCIA=y
425# CONFIG_PCMCIA_3C589 is not set
426# CONFIG_PCMCIA_3C574 is not set
427# CONFIG_PCMCIA_FMVJ18X is not set
428CONFIG_PCMCIA_PCNET=y
429# CONFIG_PCMCIA_NMCLAN is not set
430# CONFIG_PCMCIA_SMC91C92 is not set
431# CONFIG_PCMCIA_XIRC2PS is not set
432# CONFIG_PCMCIA_AXNET is not set
433# CONFIG_WAN is not set
434# CONFIG_PPP is not set
435# CONFIG_SLIP is not set
436# CONFIG_SHAPER is not set
437# CONFIG_NETCONSOLE is not set
438# CONFIG_NETPOLL is not set
439# CONFIG_NET_POLL_CONTROLLER is not set
440# CONFIG_ISDN is not set
441# CONFIG_PHONE is not set
442
443#
444# Input device support
445#
446# CONFIG_INPUT is not set
447
448#
449# Hardware I/O ports
450#
451# CONFIG_SERIO is not set
452# CONFIG_GAMEPORT is not set
453
454#
455# Character devices
456#
457# CONFIG_VT is not set
458# CONFIG_SERIAL_NONSTANDARD is not set
459
460#
461# Serial drivers
462#
463CONFIG_SERIAL_8250=y
464CONFIG_SERIAL_8250_CONSOLE=y
465# CONFIG_SERIAL_8250_CS is not set
466CONFIG_SERIAL_8250_NR_UARTS=4
467CONFIG_SERIAL_8250_RUNTIME_UARTS=4
468# CONFIG_SERIAL_8250_EXTENDED is not set
469
470#
471# Non-8250 serial port support
472#
473CONFIG_SERIAL_CORE=y
474CONFIG_SERIAL_CORE_CONSOLE=y
475# CONFIG_SERIAL_M32R_SIO is not set
476CONFIG_UNIX98_PTYS=y
477CONFIG_LEGACY_PTYS=y
478CONFIG_LEGACY_PTY_COUNT=256
479# CONFIG_IPMI_HANDLER is not set
480# CONFIG_WATCHDOG is not set
481CONFIG_HW_RANDOM=m
482# CONFIG_RTC is not set
483# CONFIG_R3964 is not set
484
485#
486# PCMCIA character devices
487#
488# CONFIG_SYNCLINK_CS is not set
489# CONFIG_CARDMAN_4000 is not set
490# CONFIG_CARDMAN_4040 is not set
491# CONFIG_RAW_DRIVER is not set
492# CONFIG_TCG_TPM is not set
493# CONFIG_I2C is not set
494
495#
496# SPI support
497#
498# CONFIG_SPI is not set
499# CONFIG_SPI_MASTER is not set
500# CONFIG_W1 is not set
501# CONFIG_POWER_SUPPLY is not set
502# CONFIG_HWMON is not set
503
504#
505# Multifunction device drivers
506#
507# CONFIG_MFD_SM501 is not set
508
509#
510# Multimedia devices
511#
512# CONFIG_VIDEO_DEV is not set
513# CONFIG_DVB_CORE is not set
514CONFIG_DAB=y
515
516#
517# Graphics support
518#
519# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
520
521#
522# Display device support
523#
524# CONFIG_DISPLAY_SUPPORT is not set
525# CONFIG_VGASTATE is not set
526CONFIG_VIDEO_OUTPUT_CONTROL=m
527# CONFIG_FB is not set
528
529#
530# Sound
531#
532# CONFIG_SOUND is not set
533CONFIG_USB_SUPPORT=y
534# CONFIG_USB_ARCH_HAS_HCD is not set
535# CONFIG_USB_ARCH_HAS_OHCI is not set
536# CONFIG_USB_ARCH_HAS_EHCI is not set
537
538#
539# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
540#
541
542#
543# USB Gadget Support
544#
545# CONFIG_USB_GADGET is not set
546# CONFIG_MMC is not set
547# CONFIG_NEW_LEDS is not set
548
549#
550# Real Time Clock
551#
552# CONFIG_RTC_CLASS is not set
553
554#
555# Userspace I/O
556#
557# CONFIG_UIO is not set
558
559#
560# File systems
561#
562CONFIG_EXT2_FS=y
563# CONFIG_EXT2_FS_XATTR is not set
564# CONFIG_EXT2_FS_XIP is not set
565CONFIG_EXT3_FS=y
566# CONFIG_EXT3_FS_XATTR is not set
567# CONFIG_EXT4DEV_FS is not set
568CONFIG_JBD=y
569# CONFIG_JBD_DEBUG is not set
570# CONFIG_REISERFS_FS is not set
571# CONFIG_JFS_FS is not set
572# CONFIG_FS_POSIX_ACL is not set
573# CONFIG_XFS_FS is not set
574# CONFIG_GFS2_FS is not set
575# CONFIG_OCFS2_FS is not set
576# CONFIG_MINIX_FS is not set
577# CONFIG_ROMFS_FS is not set
578CONFIG_INOTIFY=y
579CONFIG_INOTIFY_USER=y
580# CONFIG_QUOTA is not set
581CONFIG_DNOTIFY=y
582# CONFIG_AUTOFS_FS is not set
583# CONFIG_AUTOFS4_FS is not set
584# CONFIG_FUSE_FS is not set
585
586#
587# CD-ROM/DVD Filesystems
588#
589# CONFIG_ISO9660_FS is not set
590# CONFIG_UDF_FS is not set
591
592#
593# DOS/FAT/NT Filesystems
594#
595# CONFIG_MSDOS_FS is not set
596# CONFIG_VFAT_FS is not set
597# CONFIG_NTFS_FS is not set
598
599#
600# Pseudo filesystems
601#
602CONFIG_PROC_FS=y
603CONFIG_PROC_KCORE=y
604CONFIG_PROC_SYSCTL=y
605CONFIG_SYSFS=y
606CONFIG_TMPFS=y
607# CONFIG_TMPFS_POSIX_ACL is not set
608# CONFIG_HUGETLB_PAGE is not set
609CONFIG_RAMFS=y
610# CONFIG_CONFIGFS_FS is not set
611
612#
613# Miscellaneous filesystems
614#
615# CONFIG_ADFS_FS is not set
616# CONFIG_AFFS_FS is not set
617# CONFIG_HFS_FS is not set
618# CONFIG_HFSPLUS_FS is not set
619# CONFIG_BEFS_FS is not set
620# CONFIG_BFS_FS is not set
621# CONFIG_EFS_FS is not set
622CONFIG_JFFS2_FS=y
623CONFIG_JFFS2_FS_DEBUG=0
624CONFIG_JFFS2_FS_WRITEBUFFER=y
625# CONFIG_JFFS2_SUMMARY is not set
626# CONFIG_JFFS2_FS_XATTR is not set
627# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
628CONFIG_JFFS2_ZLIB=y
629CONFIG_JFFS2_RTIME=y
630# CONFIG_JFFS2_RUBIN is not set
631CONFIG_CRAMFS=y
632# CONFIG_VXFS_FS is not set
633# CONFIG_HPFS_FS is not set
634# CONFIG_QNX4FS_FS is not set
635# CONFIG_SYSV_FS is not set
636# CONFIG_UFS_FS is not set
637
638#
639# Network File Systems
640#
641CONFIG_NFS_FS=y
642CONFIG_NFS_V3=y
643# CONFIG_NFS_V3_ACL is not set
644# CONFIG_NFS_V4 is not set
645# CONFIG_NFS_DIRECTIO is not set
646# CONFIG_NFSD is not set
647CONFIG_ROOT_NFS=y
648CONFIG_LOCKD=y
649CONFIG_LOCKD_V4=y
650CONFIG_NFS_COMMON=y
651CONFIG_SUNRPC=y
652# CONFIG_SUNRPC_BIND34 is not set
653# CONFIG_RPCSEC_GSS_KRB5 is not set
654# CONFIG_RPCSEC_GSS_SPKM3 is not set
655# CONFIG_SMB_FS is not set
656# CONFIG_CIFS is not set
657# CONFIG_NCP_FS is not set
658# CONFIG_CODA_FS is not set
659# CONFIG_AFS_FS is not set
660
661#
662# Partition Types
663#
664# CONFIG_PARTITION_ADVANCED is not set
665CONFIG_MSDOS_PARTITION=y
666
667#
668# Native Language Support
669#
670# CONFIG_NLS is not set
671
672#
673# Distributed Lock Manager
674#
675# CONFIG_DLM is not set
676
677#
678# Profiling support
679#
680# CONFIG_PROFILING is not set
681
682#
683# Kernel hacking
684#
685# CONFIG_PRINTK_TIME is not set
686CONFIG_ENABLE_MUST_CHECK=y
687# CONFIG_MAGIC_SYSRQ is not set
688# CONFIG_UNUSED_SYMBOLS is not set
689# CONFIG_DEBUG_FS is not set
690# CONFIG_HEADERS_CHECK is not set
691CONFIG_DEBUG_KERNEL=y
692# CONFIG_DEBUG_SHIRQ is not set
693CONFIG_DETECT_SOFTLOCKUP=y
694CONFIG_SCHED_DEBUG=y
695# CONFIG_SCHEDSTATS is not set
696# CONFIG_TIMER_STATS is not set
697# CONFIG_DEBUG_SLAB is not set
698# CONFIG_DEBUG_RT_MUTEXES is not set
699# CONFIG_RT_MUTEX_TESTER is not set
700# CONFIG_DEBUG_SPINLOCK is not set
701# CONFIG_DEBUG_MUTEXES is not set
702# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
703# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
704# CONFIG_DEBUG_KOBJECT is not set
705CONFIG_DEBUG_BUGVERBOSE=y
706CONFIG_DEBUG_INFO=y
707# CONFIG_DEBUG_VM is not set
708# CONFIG_DEBUG_LIST is not set
709CONFIG_FRAME_POINTER=y
710CONFIG_FORCED_INLINING=y
711# CONFIG_RCU_TORTURE_TEST is not set
712# CONFIG_FAULT_INJECTION is not set
713# CONFIG_DEBUG_STACKOVERFLOW is not set
714# CONFIG_DEBUG_STACK_USAGE is not set
715
716#
717# Security options
718#
719# CONFIG_KEYS is not set
720# CONFIG_SECURITY is not set
721CONFIG_CRYPTO=y
722CONFIG_CRYPTO_ALGAPI=y
723CONFIG_CRYPTO_BLKCIPHER=y
724CONFIG_CRYPTO_HASH=y
725CONFIG_CRYPTO_MANAGER=y
726CONFIG_CRYPTO_HMAC=y
727# CONFIG_CRYPTO_XCBC is not set
728# CONFIG_CRYPTO_NULL is not set
729# CONFIG_CRYPTO_MD4 is not set
730CONFIG_CRYPTO_MD5=y
731CONFIG_CRYPTO_SHA1=y
732# CONFIG_CRYPTO_SHA256 is not set
733# CONFIG_CRYPTO_SHA512 is not set
734# CONFIG_CRYPTO_WP512 is not set
735# CONFIG_CRYPTO_TGR192 is not set
736# CONFIG_CRYPTO_GF128MUL is not set
737CONFIG_CRYPTO_ECB=y
738CONFIG_CRYPTO_CBC=y
739CONFIG_CRYPTO_PCBC=m
740# CONFIG_CRYPTO_LRW is not set
741# CONFIG_CRYPTO_CRYPTD is not set
742CONFIG_CRYPTO_DES=y
743# CONFIG_CRYPTO_FCRYPT is not set
744# CONFIG_CRYPTO_BLOWFISH is not set
745# CONFIG_CRYPTO_TWOFISH is not set
746# CONFIG_CRYPTO_SERPENT is not set
747CONFIG_CRYPTO_AES=y
748# CONFIG_CRYPTO_CAST5 is not set
749# CONFIG_CRYPTO_CAST6 is not set
750# CONFIG_CRYPTO_TEA is not set
751CONFIG_CRYPTO_ARC4=y
752# CONFIG_CRYPTO_KHAZAD is not set
753# CONFIG_CRYPTO_ANUBIS is not set
754CONFIG_CRYPTO_DEFLATE=y
755CONFIG_CRYPTO_MICHAEL_MIC=y
756# CONFIG_CRYPTO_CRC32C is not set
757# CONFIG_CRYPTO_CAMELLIA is not set
758# CONFIG_CRYPTO_TEST is not set
759CONFIG_CRYPTO_HW=y
760
761#
762# Library routines
763#
764CONFIG_BITREVERSE=y
765# CONFIG_CRC_CCITT is not set
766# CONFIG_CRC16 is not set
767# CONFIG_CRC_ITU_T is not set
768CONFIG_CRC32=y
769# CONFIG_CRC7 is not set
770# CONFIG_LIBCRC32C is not set
771CONFIG_ZLIB_INFLATE=y
772CONFIG_ZLIB_DEFLATE=y
773CONFIG_PLIST=y
774CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/defconfig b/arch/m32r/defconfig
index 13579917afef..af3b98179113 100644
--- a/arch/m32r/defconfig
+++ b/arch/m32r/defconfig
@@ -1,12 +1,15 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.23-rc1
4# Tue Dec 12 17:52:38 2006 4# Wed Aug 1 17:22:35 2007
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7CONFIG_GENERIC_ISA_DMA=y 7CONFIG_GENERIC_ISA_DMA=y
8CONFIG_ZONE_DMA=y
8CONFIG_GENERIC_HARDIRQS=y 9CONFIG_GENERIC_HARDIRQS=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
11CONFIG_NO_IOPORT=y
12CONFIG_NO_DMA=y
10CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 13CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 14
12# 15#
@@ -23,19 +26,20 @@ CONFIG_LOCALVERSION=""
23CONFIG_LOCALVERSION_AUTO=y 26CONFIG_LOCALVERSION_AUTO=y
24CONFIG_SWAP=y 27CONFIG_SWAP=y
25CONFIG_SYSVIPC=y 28CONFIG_SYSVIPC=y
26# CONFIG_IPC_NS is not set 29CONFIG_SYSVIPC_SYSCTL=y
27# CONFIG_POSIX_MQUEUE is not set 30# CONFIG_POSIX_MQUEUE is not set
28CONFIG_BSD_PROCESS_ACCT=y 31CONFIG_BSD_PROCESS_ACCT=y
29# CONFIG_BSD_PROCESS_ACCT_V3 is not set 32# CONFIG_BSD_PROCESS_ACCT_V3 is not set
30# CONFIG_TASKSTATS is not set 33# CONFIG_TASKSTATS is not set
31# CONFIG_UTS_NS is not set 34# CONFIG_USER_NS is not set
32# CONFIG_AUDIT is not set 35# CONFIG_AUDIT is not set
33CONFIG_IKCONFIG=y 36CONFIG_IKCONFIG=y
34CONFIG_IKCONFIG_PROC=y 37CONFIG_IKCONFIG_PROC=y
38CONFIG_LOG_BUF_SHIFT=15
35# CONFIG_CPUSETS is not set 39# CONFIG_CPUSETS is not set
36CONFIG_SYSFS_DEPRECATED=y 40CONFIG_SYSFS_DEPRECATED=y
37# CONFIG_RELAY is not set 41# CONFIG_RELAY is not set
38CONFIG_INITRAMFS_SOURCE="" 42# CONFIG_BLK_DEV_INITRD is not set
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SYSCTL=y 44CONFIG_SYSCTL=y
41CONFIG_EMBEDDED=y 45CONFIG_EMBEDDED=y
@@ -47,17 +51,18 @@ CONFIG_BUG=y
47CONFIG_ELF_CORE=y 51CONFIG_ELF_CORE=y
48CONFIG_BASE_FULL=y 52CONFIG_BASE_FULL=y
49# CONFIG_FUTEX is not set 53# CONFIG_FUTEX is not set
54CONFIG_ANON_INODES=y
50# CONFIG_EPOLL is not set 55# CONFIG_EPOLL is not set
56CONFIG_SIGNALFD=y
57CONFIG_TIMERFD=y
58CONFIG_EVENTFD=y
51CONFIG_SHMEM=y 59CONFIG_SHMEM=y
52CONFIG_SLAB=y
53CONFIG_VM_EVENT_COUNTERS=y 60CONFIG_VM_EVENT_COUNTERS=y
61CONFIG_SLAB=y
62# CONFIG_SLUB is not set
63# CONFIG_SLOB is not set
54# CONFIG_TINY_SHMEM is not set 64# CONFIG_TINY_SHMEM is not set
55CONFIG_BASE_SMALL=0 65CONFIG_BASE_SMALL=0
56# CONFIG_SLOB is not set
57
58#
59# Loadable module support
60#
61CONFIG_MODULES=y 66CONFIG_MODULES=y
62CONFIG_MODULE_UNLOAD=y 67CONFIG_MODULE_UNLOAD=y
63# CONFIG_MODULE_FORCE_UNLOAD is not set 68# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -65,12 +70,11 @@ CONFIG_MODULE_UNLOAD=y
65# CONFIG_MODULE_SRCVERSION_ALL is not set 70# CONFIG_MODULE_SRCVERSION_ALL is not set
66CONFIG_KMOD=y 71CONFIG_KMOD=y
67CONFIG_STOP_MACHINE=y 72CONFIG_STOP_MACHINE=y
68
69#
70# Block layer
71#
72CONFIG_BLOCK=y 73CONFIG_BLOCK=y
74# CONFIG_LBD is not set
73# CONFIG_BLK_DEV_IO_TRACE is not set 75# CONFIG_BLK_DEV_IO_TRACE is not set
76# CONFIG_LSF is not set
77# CONFIG_BLK_DEV_BSG is not set
74 78
75# 79#
76# IO Schedulers 80# IO Schedulers
@@ -123,13 +127,19 @@ CONFIG_NEED_MULTIPLE_NODES=y
123# CONFIG_SPARSEMEM_STATIC is not set 127# CONFIG_SPARSEMEM_STATIC is not set
124CONFIG_SPLIT_PTLOCK_CPUS=4 128CONFIG_SPLIT_PTLOCK_CPUS=4
125# CONFIG_RESOURCES_64BIT is not set 129# CONFIG_RESOURCES_64BIT is not set
130CONFIG_ZONE_DMA_FLAG=1
131CONFIG_BOUNCE=y
132CONFIG_VIRT_TO_BUS=y
126CONFIG_IRAM_START=0x00f00000 133CONFIG_IRAM_START=0x00f00000
127CONFIG_IRAM_SIZE=0x00080000 134CONFIG_IRAM_SIZE=0x00080000
128CONFIG_RWSEM_GENERIC_SPINLOCK=y 135CONFIG_RWSEM_GENERIC_SPINLOCK=y
129# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 136# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
137# CONFIG_ARCH_HAS_ILOG2_U32 is not set
138# CONFIG_ARCH_HAS_ILOG2_U64 is not set
130CONFIG_GENERIC_FIND_NEXT_BIT=y 139CONFIG_GENERIC_FIND_NEXT_BIT=y
131CONFIG_GENERIC_HWEIGHT=y 140CONFIG_GENERIC_HWEIGHT=y
132CONFIG_GENERIC_CALIBRATE_DELAY=y 141CONFIG_GENERIC_CALIBRATE_DELAY=y
142CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
133CONFIG_PREEMPT=y 143CONFIG_PREEMPT=y
134CONFIG_SMP=y 144CONFIG_SMP=y
135# CONFIG_CHIP_M32700_TS1 is not set 145# CONFIG_CHIP_M32700_TS1 is not set
@@ -139,6 +149,7 @@ CONFIG_NODES_SHIFT=1
139# 149#
140# Bus options (PCI, PCMCIA, EISA, MCA, ISA) 150# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
141# 151#
152# CONFIG_ARCH_SUPPORTS_MSI is not set
142# CONFIG_ISA is not set 153# CONFIG_ISA is not set
143 154
144# 155#
@@ -147,10 +158,6 @@ CONFIG_NODES_SHIFT=1
147# CONFIG_PCCARD is not set 158# CONFIG_PCCARD is not set
148 159
149# 160#
150# PCI Hotplug Support
151#
152
153#
154# Executable file formats 161# Executable file formats
155# 162#
156CONFIG_BINFMT_ELF=y 163CONFIG_BINFMT_ELF=y
@@ -164,13 +171,13 @@ CONFIG_NET=y
164# 171#
165# Networking options 172# Networking options
166# 173#
167# CONFIG_NETDEBUG is not set
168CONFIG_PACKET=y 174CONFIG_PACKET=y
169# CONFIG_PACKET_MMAP is not set 175# CONFIG_PACKET_MMAP is not set
170CONFIG_UNIX=y 176CONFIG_UNIX=y
171CONFIG_XFRM=y 177CONFIG_XFRM=y
172# CONFIG_XFRM_USER is not set 178# CONFIG_XFRM_USER is not set
173# CONFIG_XFRM_SUB_POLICY is not set 179# CONFIG_XFRM_SUB_POLICY is not set
180# CONFIG_XFRM_MIGRATE is not set
174# CONFIG_NET_KEY is not set 181# CONFIG_NET_KEY is not set
175CONFIG_INET=y 182CONFIG_INET=y
176# CONFIG_IP_MULTICAST is not set 183# CONFIG_IP_MULTICAST is not set
@@ -203,20 +210,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
203# CONFIG_INET6_TUNNEL is not set 210# CONFIG_INET6_TUNNEL is not set
204# CONFIG_NETWORK_SECMARK is not set 211# CONFIG_NETWORK_SECMARK is not set
205# CONFIG_NETFILTER is not set 212# CONFIG_NETFILTER is not set
206
207#
208# DCCP Configuration (EXPERIMENTAL)
209#
210# CONFIG_IP_DCCP is not set 213# CONFIG_IP_DCCP is not set
211
212#
213# SCTP Configuration (EXPERIMENTAL)
214#
215# CONFIG_IP_SCTP is not set 214# CONFIG_IP_SCTP is not set
216
217#
218# TIPC Configuration (EXPERIMENTAL)
219#
220# CONFIG_TIPC is not set 215# CONFIG_TIPC is not set
221# CONFIG_ATM is not set 216# CONFIG_ATM is not set
222# CONFIG_BRIDGE is not set 217# CONFIG_BRIDGE is not set
@@ -242,7 +237,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
242# CONFIG_HAMRADIO is not set 237# CONFIG_HAMRADIO is not set
243# CONFIG_IRDA is not set 238# CONFIG_IRDA is not set
244# CONFIG_BT is not set 239# CONFIG_BT is not set
240# CONFIG_AF_RXRPC is not set
241
242#
243# Wireless
244#
245# CONFIG_CFG80211 is not set
246# CONFIG_WIRELESS_EXT is not set
247# CONFIG_MAC80211 is not set
245# CONFIG_IEEE80211 is not set 248# CONFIG_IEEE80211 is not set
249# CONFIG_RFKILL is not set
250# CONFIG_NET_9P is not set
246 251
247# 252#
248# Device Drivers 253# Device Drivers
@@ -255,15 +260,7 @@ CONFIG_STANDALONE=y
255CONFIG_PREVENT_FIRMWARE_BUILD=y 260CONFIG_PREVENT_FIRMWARE_BUILD=y
256CONFIG_FW_LOADER=y 261CONFIG_FW_LOADER=y
257# CONFIG_SYS_HYPERVISOR is not set 262# CONFIG_SYS_HYPERVISOR is not set
258
259#
260# Connector - unified userspace <-> kernelspace linker
261#
262# CONFIG_CONNECTOR is not set 263# CONFIG_CONNECTOR is not set
263
264#
265# Memory Technology Devices (MTD)
266#
267CONFIG_MTD=y 264CONFIG_MTD=y
268# CONFIG_MTD_DEBUG is not set 265# CONFIG_MTD_DEBUG is not set
269# CONFIG_MTD_CONCAT is not set 266# CONFIG_MTD_CONCAT is not set
@@ -278,6 +275,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
278# User Modules And Translation Layers 275# User Modules And Translation Layers
279# 276#
280# CONFIG_MTD_CHAR is not set 277# CONFIG_MTD_CHAR is not set
278CONFIG_MTD_BLKDEVS=y
281CONFIG_MTD_BLOCK=y 279CONFIG_MTD_BLOCK=y
282# CONFIG_FTL is not set 280# CONFIG_FTL is not set
283# CONFIG_NFTL is not set 281# CONFIG_NFTL is not set
@@ -314,7 +312,6 @@ CONFIG_MTD_CFI_UTIL=m
314# CONFIG_MTD_RAM is not set 312# CONFIG_MTD_RAM is not set
315# CONFIG_MTD_ROM is not set 313# CONFIG_MTD_ROM is not set
316# CONFIG_MTD_ABSENT is not set 314# CONFIG_MTD_ABSENT is not set
317# CONFIG_MTD_OBSOLETE_CHIPS is not set
318 315
319# 316#
320# Mapping drivers for chip access 317# Mapping drivers for chip access
@@ -337,29 +334,15 @@ CONFIG_MTD_CFI_UTIL=m
337# CONFIG_MTD_DOC2000 is not set 334# CONFIG_MTD_DOC2000 is not set
338# CONFIG_MTD_DOC2001 is not set 335# CONFIG_MTD_DOC2001 is not set
339# CONFIG_MTD_DOC2001PLUS is not set 336# CONFIG_MTD_DOC2001PLUS is not set
340
341#
342# NAND Flash Device Drivers
343#
344# CONFIG_MTD_NAND is not set 337# CONFIG_MTD_NAND is not set
345
346#
347# OneNAND Flash Device Drivers
348#
349# CONFIG_MTD_ONENAND is not set 338# CONFIG_MTD_ONENAND is not set
350 339
351# 340#
352# Parallel port support 341# UBI - Unsorted block images
353# 342#
343# CONFIG_MTD_UBI is not set
354# CONFIG_PARPORT is not set 344# CONFIG_PARPORT is not set
355 345CONFIG_BLK_DEV=y
356#
357# Plug and Play support
358#
359
360#
361# Block devices
362#
363# CONFIG_BLK_DEV_COW_COMMON is not set 346# CONFIG_BLK_DEV_COW_COMMON is not set
364CONFIG_BLK_DEV_LOOP=y 347CONFIG_BLK_DEV_LOOP=y
365# CONFIG_BLK_DEV_CRYPTOLOOP is not set 348# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -368,18 +351,10 @@ CONFIG_BLK_DEV_RAM=y
368CONFIG_BLK_DEV_RAM_COUNT=16 351CONFIG_BLK_DEV_RAM_COUNT=16
369CONFIG_BLK_DEV_RAM_SIZE=4096 352CONFIG_BLK_DEV_RAM_SIZE=4096
370CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 353CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
371# CONFIG_BLK_DEV_INITRD is not set
372# CONFIG_CDROM_PKTCDVD is not set 354# CONFIG_CDROM_PKTCDVD is not set
373CONFIG_ATA_OVER_ETH=m 355CONFIG_ATA_OVER_ETH=m
374 356CONFIG_MISC_DEVICES=y
375# 357# CONFIG_EEPROM_93CX6 is not set
376# Misc devices
377#
378# CONFIG_TIFM_CORE is not set
379
380#
381# ATA/ATAPI/MFM/RLL support
382#
383CONFIG_IDE=y 358CONFIG_IDE=y
384CONFIG_IDE_MAX_HWIFS=4 359CONFIG_IDE_MAX_HWIFS=4
385CONFIG_BLK_DEV_IDE=y 360CONFIG_BLK_DEV_IDE=y
@@ -395,14 +370,15 @@ CONFIG_BLK_DEV_IDECD=m
395# CONFIG_BLK_DEV_IDEFLOPPY is not set 370# CONFIG_BLK_DEV_IDEFLOPPY is not set
396# CONFIG_BLK_DEV_IDESCSI is not set 371# CONFIG_BLK_DEV_IDESCSI is not set
397# CONFIG_IDE_TASK_IOCTL is not set 372# CONFIG_IDE_TASK_IOCTL is not set
373CONFIG_IDE_PROC_FS=y
398 374
399# 375#
400# IDE chipset support/bugfixes 376# IDE chipset support/bugfixes
401# 377#
402CONFIG_IDE_GENERIC=y 378CONFIG_IDE_GENERIC=y
379# CONFIG_IDEPCI_PCIBUS_ORDER is not set
403# CONFIG_IDE_ARM is not set 380# CONFIG_IDE_ARM is not set
404# CONFIG_BLK_DEV_IDEDMA is not set 381# CONFIG_BLK_DEV_IDEDMA is not set
405# CONFIG_IDEDMA_AUTO is not set
406# CONFIG_BLK_DEV_HD is not set 382# CONFIG_BLK_DEV_HD is not set
407 383
408# 384#
@@ -410,6 +386,8 @@ CONFIG_IDE_GENERIC=y
410# 386#
411# CONFIG_RAID_ATTRS is not set 387# CONFIG_RAID_ATTRS is not set
412CONFIG_SCSI=m 388CONFIG_SCSI=m
389# CONFIG_SCSI_DMA is not set
390# CONFIG_SCSI_TGT is not set
413# CONFIG_SCSI_NETLINK is not set 391# CONFIG_SCSI_NETLINK is not set
414CONFIG_SCSI_PROC_FS=y 392CONFIG_SCSI_PROC_FS=y
415 393
@@ -430,6 +408,8 @@ CONFIG_CHR_DEV_SG=m
430CONFIG_SCSI_MULTI_LUN=y 408CONFIG_SCSI_MULTI_LUN=y
431# CONFIG_SCSI_CONSTANTS is not set 409# CONFIG_SCSI_CONSTANTS is not set
432# CONFIG_SCSI_LOGGING is not set 410# CONFIG_SCSI_LOGGING is not set
411# CONFIG_SCSI_SCAN_ASYNC is not set
412CONFIG_SCSI_WAIT_SCAN=m
433 413
434# 414#
435# SCSI Transports 415# SCSI Transports
@@ -437,79 +417,31 @@ CONFIG_SCSI_MULTI_LUN=y
437# CONFIG_SCSI_SPI_ATTRS is not set 417# CONFIG_SCSI_SPI_ATTRS is not set
438# CONFIG_SCSI_FC_ATTRS is not set 418# CONFIG_SCSI_FC_ATTRS is not set
439# CONFIG_SCSI_ISCSI_ATTRS is not set 419# CONFIG_SCSI_ISCSI_ATTRS is not set
440# CONFIG_SCSI_SAS_ATTRS is not set
441# CONFIG_SCSI_SAS_LIBSAS is not set 420# CONFIG_SCSI_SAS_LIBSAS is not set
442 421CONFIG_SCSI_LOWLEVEL=y
443#
444# SCSI low-level drivers
445#
446# CONFIG_ISCSI_TCP is not set 422# CONFIG_ISCSI_TCP is not set
447# CONFIG_SCSI_DEBUG is not set 423# CONFIG_SCSI_DEBUG is not set
448
449#
450# Serial ATA (prod) and Parallel ATA (experimental) drivers
451#
452
453#
454# Multi-device support (RAID and LVM)
455#
456# CONFIG_MD is not set 424# CONFIG_MD is not set
457
458#
459# Fusion MPT device support
460#
461# CONFIG_FUSION is not set
462
463#
464# IEEE 1394 (FireWire) support
465#
466
467#
468# I2O device support
469#
470
471#
472# Network device support
473#
474CONFIG_NETDEVICES=y 425CONFIG_NETDEVICES=y
426# CONFIG_NETDEVICES_MULTIQUEUE is not set
475# CONFIG_DUMMY is not set 427# CONFIG_DUMMY is not set
476# CONFIG_BONDING is not set 428# CONFIG_BONDING is not set
429# CONFIG_MACVLAN is not set
477# CONFIG_EQUALIZER is not set 430# CONFIG_EQUALIZER is not set
478# CONFIG_TUN is not set 431# CONFIG_TUN is not set
479
480#
481# PHY device support
482#
483# CONFIG_PHYLIB is not set 432# CONFIG_PHYLIB is not set
484
485#
486# Ethernet (10 or 100Mbit)
487#
488CONFIG_NET_ETHERNET=y 433CONFIG_NET_ETHERNET=y
489CONFIG_MII=y 434CONFIG_MII=y
490CONFIG_SMC91X=y 435CONFIG_SMC91X=y
491# CONFIG_NE2000 is not set 436# CONFIG_NE2000 is not set
437CONFIG_NETDEV_1000=y
438CONFIG_NETDEV_10000=y
492 439
493# 440#
494# Ethernet (1000 Mbit) 441# Wireless LAN
495#
496
497#
498# Ethernet (10000 Mbit)
499#
500
501#
502# Token Ring devices
503#
504
505#
506# Wireless LAN (non-hamradio)
507#
508# CONFIG_NET_RADIO is not set
509
510#
511# Wan interfaces
512# 442#
443# CONFIG_WLAN_PRE80211 is not set
444# CONFIG_WLAN_80211 is not set
513# CONFIG_WAN is not set 445# CONFIG_WAN is not set
514# CONFIG_PPP is not set 446# CONFIG_PPP is not set
515# CONFIG_SLIP is not set 447# CONFIG_SLIP is not set
@@ -517,15 +449,7 @@ CONFIG_SMC91X=y
517# CONFIG_NETCONSOLE is not set 449# CONFIG_NETCONSOLE is not set
518# CONFIG_NETPOLL is not set 450# CONFIG_NETPOLL is not set
519# CONFIG_NET_POLL_CONTROLLER is not set 451# CONFIG_NET_POLL_CONTROLLER is not set
520
521#
522# ISDN subsystem
523#
524# CONFIG_ISDN is not set 452# CONFIG_ISDN is not set
525
526#
527# Telephony Support
528#
529# CONFIG_PHONE is not set 453# CONFIG_PHONE is not set
530 454
531# 455#
@@ -533,6 +457,7 @@ CONFIG_SMC91X=y
533# 457#
534CONFIG_INPUT=y 458CONFIG_INPUT=y
535# CONFIG_INPUT_FF_MEMLESS is not set 459# CONFIG_INPUT_FF_MEMLESS is not set
460# CONFIG_INPUT_POLLDEV is not set
536 461
537# 462#
538# Userland interfaces 463# Userland interfaces
@@ -549,6 +474,7 @@ CONFIG_INPUT=y
549# CONFIG_INPUT_KEYBOARD is not set 474# CONFIG_INPUT_KEYBOARD is not set
550# CONFIG_INPUT_MOUSE is not set 475# CONFIG_INPUT_MOUSE is not set
551# CONFIG_INPUT_JOYSTICK is not set 476# CONFIG_INPUT_JOYSTICK is not set
477# CONFIG_INPUT_TABLET is not set
552# CONFIG_INPUT_TOUCHSCREEN is not set 478# CONFIG_INPUT_TOUCHSCREEN is not set
553# CONFIG_INPUT_MISC is not set 479# CONFIG_INPUT_MISC is not set
554 480
@@ -587,35 +513,14 @@ CONFIG_SERIAL_M32R_PLDSIO=y
587CONFIG_UNIX98_PTYS=y 513CONFIG_UNIX98_PTYS=y
588CONFIG_LEGACY_PTYS=y 514CONFIG_LEGACY_PTYS=y
589CONFIG_LEGACY_PTY_COUNT=256 515CONFIG_LEGACY_PTY_COUNT=256
590
591#
592# IPMI
593#
594# CONFIG_IPMI_HANDLER is not set 516# CONFIG_IPMI_HANDLER is not set
595
596#
597# Watchdog Cards
598#
599# CONFIG_WATCHDOG is not set 517# CONFIG_WATCHDOG is not set
600CONFIG_HW_RANDOM=y 518CONFIG_HW_RANDOM=y
601# CONFIG_RTC is not set 519# CONFIG_RTC is not set
602CONFIG_DS1302=y 520CONFIG_DS1302=y
603# CONFIG_DTLK is not set
604# CONFIG_R3964 is not set 521# CONFIG_R3964 is not set
605
606#
607# Ftape, the floppy tape device driver
608#
609# CONFIG_RAW_DRIVER is not set 522# CONFIG_RAW_DRIVER is not set
610
611#
612# TPM devices
613#
614# CONFIG_TCG_TPM is not set 523# CONFIG_TCG_TPM is not set
615
616#
617# I2C support
618#
619# CONFIG_I2C is not set 524# CONFIG_I2C is not set
620 525
621# 526#
@@ -623,65 +528,76 @@ CONFIG_DS1302=y
623# 528#
624# CONFIG_SPI is not set 529# CONFIG_SPI is not set
625# CONFIG_SPI_MASTER is not set 530# CONFIG_SPI_MASTER is not set
626
627#
628# Dallas's 1-wire bus
629#
630# CONFIG_W1 is not set 531# CONFIG_W1 is not set
631 532# CONFIG_POWER_SUPPLY is not set
632#
633# Hardware Monitoring support
634#
635CONFIG_HWMON=y 533CONFIG_HWMON=y
636# CONFIG_HWMON_VID is not set 534# CONFIG_HWMON_VID is not set
637# CONFIG_SENSORS_ABITUGURU is not set 535# CONFIG_SENSORS_ABITUGURU is not set
536# CONFIG_SENSORS_ABITUGURU3 is not set
638# CONFIG_SENSORS_F71805F is not set 537# CONFIG_SENSORS_F71805F is not set
538# CONFIG_SENSORS_IT87 is not set
539# CONFIG_SENSORS_PC87360 is not set
540# CONFIG_SENSORS_PC87427 is not set
541# CONFIG_SENSORS_SMSC47M1 is not set
542# CONFIG_SENSORS_SMSC47B397 is not set
639# CONFIG_SENSORS_VT1211 is not set 543# CONFIG_SENSORS_VT1211 is not set
544# CONFIG_SENSORS_W83627HF is not set
545# CONFIG_SENSORS_W83627EHF is not set
640# CONFIG_HWMON_DEBUG_CHIP is not set 546# CONFIG_HWMON_DEBUG_CHIP is not set
641 547
642# 548#
549# Multifunction device drivers
550#
551# CONFIG_MFD_SM501 is not set
552
553#
643# Multimedia devices 554# Multimedia devices
644# 555#
645CONFIG_VIDEO_DEV=m 556CONFIG_VIDEO_DEV=m
646CONFIG_VIDEO_V4L1=y 557CONFIG_VIDEO_V4L1=y
647CONFIG_VIDEO_V4L1_COMPAT=y 558CONFIG_VIDEO_V4L1_COMPAT=y
648CONFIG_VIDEO_V4L2=y 559CONFIG_VIDEO_V4L2=y
649 560CONFIG_VIDEO_CAPTURE_DRIVERS=y
650#
651# Video Capture Adapters
652#
653
654#
655# Video Capture Adapters
656#
657# CONFIG_VIDEO_ADV_DEBUG is not set 561# CONFIG_VIDEO_ADV_DEBUG is not set
658CONFIG_VIDEO_HELPER_CHIPS_AUTO=y 562CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
659# CONFIG_VIDEO_VIVI is not set
660# CONFIG_VIDEO_CPIA is not set 563# CONFIG_VIDEO_CPIA is not set
661CONFIG_VIDEO_M32R_AR=m 564CONFIG_VIDEO_M32R_AR=m
662CONFIG_VIDEO_M32R_AR_M64278=m 565CONFIG_VIDEO_M32R_AR_M64278=m
566CONFIG_RADIO_ADAPTERS=y
567# CONFIG_DVB_CORE is not set
568CONFIG_DAB=y
663 569
664# 570#
665# Radio Adapters 571# Graphics support
666#
667
668#
669# Digital Video Broadcasting Devices
670# 572#
671# CONFIG_DVB is not set 573# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
672 574
673# 575#
674# Graphics support 576# Display device support
675# 577#
676CONFIG_FIRMWARE_EDID=y 578# CONFIG_DISPLAY_SUPPORT is not set
579# CONFIG_VGASTATE is not set
580CONFIG_VIDEO_OUTPUT_CONTROL=m
677CONFIG_FB=y 581CONFIG_FB=y
582CONFIG_FIRMWARE_EDID=y
583# CONFIG_FB_DDC is not set
678CONFIG_FB_CFB_FILLRECT=y 584CONFIG_FB_CFB_FILLRECT=y
679CONFIG_FB_CFB_COPYAREA=y 585CONFIG_FB_CFB_COPYAREA=y
680CONFIG_FB_CFB_IMAGEBLIT=y 586CONFIG_FB_CFB_IMAGEBLIT=y
587# CONFIG_FB_SYS_FILLRECT is not set
588# CONFIG_FB_SYS_COPYAREA is not set
589# CONFIG_FB_SYS_IMAGEBLIT is not set
590# CONFIG_FB_SYS_FOPS is not set
591CONFIG_FB_DEFERRED_IO=y
592# CONFIG_FB_SVGALIB is not set
681# CONFIG_FB_MACMODES is not set 593# CONFIG_FB_MACMODES is not set
682# CONFIG_FB_BACKLIGHT is not set 594# CONFIG_FB_BACKLIGHT is not set
683# CONFIG_FB_MODE_HELPERS is not set 595# CONFIG_FB_MODE_HELPERS is not set
684# CONFIG_FB_TILEBLITTING is not set 596# CONFIG_FB_TILEBLITTING is not set
597
598#
599# Frame buffer hardware drivers
600#
685CONFIG_FB_S1D13XXX=y 601CONFIG_FB_S1D13XXX=y
686# CONFIG_FB_VIRTUAL is not set 602# CONFIG_FB_VIRTUAL is not set
687 603
@@ -691,29 +607,25 @@ CONFIG_FB_S1D13XXX=y
691# CONFIG_VGA_CONSOLE is not set 607# CONFIG_VGA_CONSOLE is not set
692CONFIG_DUMMY_CONSOLE=y 608CONFIG_DUMMY_CONSOLE=y
693CONFIG_FRAMEBUFFER_CONSOLE=y 609CONFIG_FRAMEBUFFER_CONSOLE=y
610# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
694# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 611# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
695# CONFIG_FONTS is not set 612# CONFIG_FONTS is not set
696CONFIG_FONT_8x8=y 613CONFIG_FONT_8x8=y
697CONFIG_FONT_8x16=y 614CONFIG_FONT_8x16=y
698
699#
700# Logo configuration
701#
702CONFIG_LOGO=y 615CONFIG_LOGO=y
703CONFIG_LOGO_LINUX_MONO=y 616CONFIG_LOGO_LINUX_MONO=y
704CONFIG_LOGO_LINUX_VGA16=y 617CONFIG_LOGO_LINUX_VGA16=y
705CONFIG_LOGO_LINUX_CLUT224=y 618CONFIG_LOGO_LINUX_CLUT224=y
706CONFIG_LOGO_M32R_CLUT224=y 619CONFIG_LOGO_M32R_CLUT224=y
707# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
708 620
709# 621#
710# Sound 622# Sound
711# 623#
712# CONFIG_SOUND is not set 624# CONFIG_SOUND is not set
713 625CONFIG_HID_SUPPORT=y
714# 626CONFIG_HID=y
715# USB support 627# CONFIG_HID_DEBUG is not set
716# 628CONFIG_USB_SUPPORT=y
717# CONFIG_USB_ARCH_HAS_HCD is not set 629# CONFIG_USB_ARCH_HAS_HCD is not set
718# CONFIG_USB_ARCH_HAS_OHCI is not set 630# CONFIG_USB_ARCH_HAS_OHCI is not set
719# CONFIG_USB_ARCH_HAS_EHCI is not set 631# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -726,35 +638,20 @@ CONFIG_LOGO_M32R_CLUT224=y
726# USB Gadget Support 638# USB Gadget Support
727# 639#
728# CONFIG_USB_GADGET is not set 640# CONFIG_USB_GADGET is not set
729
730#
731# MMC/SD Card support
732#
733CONFIG_MMC=y 641CONFIG_MMC=y
734CONFIG_MMC_DEBUG=y 642CONFIG_MMC_DEBUG=y
735CONFIG_MMC_BLOCK=y 643# CONFIG_MMC_UNSAFE_RESUME is not set
736# CONFIG_MMC_TIFM_SD is not set
737
738#
739# LED devices
740#
741# CONFIG_NEW_LEDS is not set
742
743#
744# LED drivers
745#
746 644
747# 645#
748# LED Triggers 646# MMC/SD Card Drivers
749#
750
751#
752# InfiniBand support
753# 647#
648CONFIG_MMC_BLOCK=y
649CONFIG_MMC_BLOCK_BOUNCE=y
754 650
755# 651#
756# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 652# MMC/SD Host Controller Drivers
757# 653#
654# CONFIG_NEW_LEDS is not set
758 655
759# 656#
760# Real Time Clock 657# Real Time Clock
@@ -762,17 +659,9 @@ CONFIG_MMC_BLOCK=y
762# CONFIG_RTC_CLASS is not set 659# CONFIG_RTC_CLASS is not set
763 660
764# 661#
765# DMA Engine support 662# Userspace I/O
766#
767# CONFIG_DMA_ENGINE is not set
768
769#
770# DMA Clients
771#
772
773#
774# DMA Devices
775# 663#
664# CONFIG_UIO is not set
776 665
777# 666#
778# File systems 667# File systems
@@ -849,7 +738,6 @@ CONFIG_RAMFS=y
849# CONFIG_BEFS_FS is not set 738# CONFIG_BEFS_FS is not set
850# CONFIG_BFS_FS is not set 739# CONFIG_BFS_FS is not set
851# CONFIG_EFS_FS is not set 740# CONFIG_EFS_FS is not set
852# CONFIG_JFFS_FS is not set
853# CONFIG_JFFS2_FS is not set 741# CONFIG_JFFS2_FS is not set
854# CONFIG_CRAMFS is not set 742# CONFIG_CRAMFS is not set
855# CONFIG_VXFS_FS is not set 743# CONFIG_VXFS_FS is not set
@@ -872,6 +760,7 @@ CONFIG_LOCKD=y
872CONFIG_LOCKD_V4=y 760CONFIG_LOCKD_V4=y
873CONFIG_NFS_COMMON=y 761CONFIG_NFS_COMMON=y
874CONFIG_SUNRPC=y 762CONFIG_SUNRPC=y
763# CONFIG_SUNRPC_BIND34 is not set
875# CONFIG_RPCSEC_GSS_KRB5 is not set 764# CONFIG_RPCSEC_GSS_KRB5 is not set
876# CONFIG_RPCSEC_GSS_SPKM3 is not set 765# CONFIG_RPCSEC_GSS_SPKM3 is not set
877# CONFIG_SMB_FS is not set 766# CONFIG_SMB_FS is not set
@@ -879,7 +768,6 @@ CONFIG_SUNRPC=y
879# CONFIG_NCP_FS is not set 768# CONFIG_NCP_FS is not set
880# CONFIG_CODA_FS is not set 769# CONFIG_CODA_FS is not set
881# CONFIG_AFS_FS is not set 770# CONFIG_AFS_FS is not set
882# CONFIG_9P_FS is not set
883 771
884# 772#
885# Partition Types 773# Partition Types
@@ -932,6 +820,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
932# CONFIG_NLS_UTF8 is not set 820# CONFIG_NLS_UTF8 is not set
933 821
934# 822#
823# Distributed Lock Manager
824#
825# CONFIG_DLM is not set
826
827#
935# Profiling support 828# Profiling support
936# 829#
937CONFIG_PROFILING=y 830CONFIG_PROFILING=y
@@ -944,29 +837,27 @@ CONFIG_OPROFILE=y
944CONFIG_ENABLE_MUST_CHECK=y 837CONFIG_ENABLE_MUST_CHECK=y
945# CONFIG_MAGIC_SYSRQ is not set 838# CONFIG_MAGIC_SYSRQ is not set
946# CONFIG_UNUSED_SYMBOLS is not set 839# CONFIG_UNUSED_SYMBOLS is not set
840# CONFIG_DEBUG_FS is not set
841# CONFIG_HEADERS_CHECK is not set
947# CONFIG_DEBUG_KERNEL is not set 842# CONFIG_DEBUG_KERNEL is not set
948CONFIG_LOG_BUF_SHIFT=15
949# CONFIG_DEBUG_BUGVERBOSE is not set 843# CONFIG_DEBUG_BUGVERBOSE is not set
950# CONFIG_DEBUG_FS is not set
951# CONFIG_FRAME_POINTER is not set 844# CONFIG_FRAME_POINTER is not set
952# CONFIG_UNWIND_INFO is not set
953# CONFIG_HEADERS_CHECK is not set
954 845
955# 846#
956# Security options 847# Security options
957# 848#
958# CONFIG_KEYS is not set 849# CONFIG_KEYS is not set
959# CONFIG_SECURITY is not set 850# CONFIG_SECURITY is not set
960
961#
962# Cryptographic options
963#
964# CONFIG_CRYPTO is not set 851# CONFIG_CRYPTO is not set
965 852
966# 853#
967# Library routines 854# Library routines
968# 855#
856CONFIG_BITREVERSE=y
969# CONFIG_CRC_CCITT is not set 857# CONFIG_CRC_CCITT is not set
970# CONFIG_CRC16 is not set 858# CONFIG_CRC16 is not set
859# CONFIG_CRC_ITU_T is not set
971CONFIG_CRC32=y 860CONFIG_CRC32=y
861# CONFIG_CRC7 is not set
972# CONFIG_LIBCRC32C is not set 862# CONFIG_LIBCRC32C is not set
863CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/kernel/Makefile b/arch/m32r/kernel/Makefile
index 5a2fa886906f..e97e26e87c9e 100644
--- a/arch/m32r/kernel/Makefile
+++ b/arch/m32r/kernel/Makefile
@@ -8,14 +8,6 @@ obj-y := process.o entry.o traps.o align.o irq.o setup.o time.o \
8 m32r_ksyms.o sys_m32r.o semaphore.o signal.o ptrace.o 8 m32r_ksyms.o sys_m32r.o semaphore.o signal.o ptrace.o
9 9
10obj-$(CONFIG_SMP) += smp.o smpboot.o 10obj-$(CONFIG_SMP) += smp.o smpboot.o
11obj-$(CONFIG_PLAT_MAPPI) += setup_mappi.o io_mappi.o
12obj-$(CONFIG_PLAT_MAPPI2) += setup_mappi2.o io_mappi2.o
13obj-$(CONFIG_PLAT_MAPPI3) += setup_mappi3.o io_mappi3.o
14obj-$(CONFIG_PLAT_USRV) += setup_usrv.o io_usrv.o
15obj-$(CONFIG_PLAT_M32700UT) += setup_m32700ut.o io_m32700ut.o
16obj-$(CONFIG_PLAT_OPSPUT) += setup_opsput.o io_opsput.o
17obj-$(CONFIG_MODULES) += module.o 11obj-$(CONFIG_MODULES) += module.o
18obj-$(CONFIG_PLAT_OAKS32R) += setup_oaks32r.o io_oaks32r.o
19obj-$(CONFIG_PLAT_M32104UT) += setup_m32104ut.o io_m32104ut.o
20 12
21EXTRA_AFLAGS := -traditional 13EXTRA_AFLAGS := -traditional
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index a2c472c0549f..d4eaa2fd1818 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -109,15 +109,10 @@
109#define SP(reg) @(0x68,reg) 109#define SP(reg) @(0x68,reg)
110#define ORIG_R0(reg) @(0x6C,reg) 110#define ORIG_R0(reg) @(0x6C,reg)
111 111
112CF_MASK = 0x00000001 112#define nr_syscalls ((syscall_table_size)/4)
113TF_MASK = 0x00000100
114IF_MASK = 0x00000200
115DF_MASK = 0x00000400
116NT_MASK = 0x00004000
117VM_MASK = 0x00020000
118 113
119#ifdef CONFIG_PREEMPT 114#ifdef CONFIG_PREEMPT
120#define preempt_stop(x) CLI(x) 115#define preempt_stop(x) DISABLE_INTERRUPTS(x)
121#else 116#else
122#define preempt_stop(x) 117#define preempt_stop(x)
123#define resume_kernel restore_all 118#define resume_kernel restore_all
@@ -149,7 +144,7 @@ ret_from_intr:
149#endif 144#endif
150 beqz r4, resume_kernel 145 beqz r4, resume_kernel
151ENTRY(resume_userspace) 146ENTRY(resume_userspace)
152 CLI(r4) ; make sure we don't miss an interrupt 147 DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt
153 ; setting need_resched or sigpending 148 ; setting need_resched or sigpending
154 ; between sampling and the iret 149 ; between sampling and the iret
155 GET_THREAD_INFO(r8) 150 GET_THREAD_INFO(r8)
@@ -173,11 +168,11 @@ need_resched:
173 beqz r4, restore_all 168 beqz r4, restore_all
174 LDIMM (r4, PREEMPT_ACTIVE) 169 LDIMM (r4, PREEMPT_ACTIVE)
175 st r4, @(TI_PRE_COUNT, r8) 170 st r4, @(TI_PRE_COUNT, r8)
176 STI(r4) 171 ENABLE_INTERRUPTS(r4)
177 bl schedule 172 bl schedule
178 ldi r4, #0 173 ldi r4, #0
179 st r4, @(TI_PRE_COUNT, r8) 174 st r4, @(TI_PRE_COUNT, r8)
180 CLI(r4) 175 DISABLE_INTERRUPTS(r4)
181 bra need_resched 176 bra need_resched
182#endif 177#endif
183 178
@@ -185,7 +180,7 @@ need_resched:
185ENTRY(system_call) 180ENTRY(system_call)
186 SWITCH_TO_KERNEL_STACK 181 SWITCH_TO_KERNEL_STACK
187 SAVE_ALL 182 SAVE_ALL
188 STI(r4) ; Enable interrupt 183 ENABLE_INTERRUPTS(r4) ; Enable interrupt
189 st sp, PTREGS(sp) ; implicit pt_regs parameter 184 st sp, PTREGS(sp) ; implicit pt_regs parameter
190 cmpui r7, #NR_syscalls 185 cmpui r7, #NR_syscalls
191 bnc syscall_badsys 186 bnc syscall_badsys
@@ -203,7 +198,7 @@ syscall_call:
203 jl r7 ; execute system call 198 jl r7 ; execute system call
204 st r0, R0(sp) ; save the return value 199 st r0, R0(sp) ; save the return value
205syscall_exit: 200syscall_exit:
206 CLI(r4) ; make sure we don't miss an interrupt 201 DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt
207 ; setting need_resched or sigpending 202 ; setting need_resched or sigpending
208 ; between sampling and the iret 203 ; between sampling and the iret
209 ld r9, @(TI_FLAGS, r8) 204 ld r9, @(TI_FLAGS, r8)
@@ -220,7 +215,7 @@ work_pending:
220 beqz r4, work_notifysig 215 beqz r4, work_notifysig
221work_resched: 216work_resched:
222 bl schedule 217 bl schedule
223 CLI(r4) ; make sure we don't miss an interrupt 218 DISABLE_INTERRUPTS(r4) ; make sure we don't miss an interrupt
224 ; setting need_resched or sigpending 219 ; setting need_resched or sigpending
225 ; between sampling and the iret 220 ; between sampling and the iret
226 ld r9, @(TI_FLAGS, r8) 221 ld r9, @(TI_FLAGS, r8)
@@ -262,7 +257,7 @@ syscall_exit_work:
262 ld r9, @(TI_FLAGS, r8) 257 ld r9, @(TI_FLAGS, r8)
263 and3 r4, r9, #_TIF_SYSCALL_TRACE 258 and3 r4, r9, #_TIF_SYSCALL_TRACE
264 beqz r4, work_pending 259 beqz r4, work_pending
265 STI(r4) ; could let do_syscall_trace() call 260 ENABLE_INTERRUPTS(r4) ; could let do_syscall_trace() call
266 ; schedule() instead 261 ; schedule() instead
267 bl do_syscall_trace 262 bl do_syscall_trace
268 bra resume_userspace 263 bra resume_userspace
@@ -290,16 +285,12 @@ syscall_badsys:
290 */ 285 */
291ENTRY(ei_handler) 286ENTRY(ei_handler)
292#if defined(CONFIG_CHIP_M32700) 287#if defined(CONFIG_CHIP_M32700)
293 SWITCH_TO_KERNEL_STACK
294 ; WORKAROUND: force to clear SM bit and use the kernel stack (SPI). 288 ; WORKAROUND: force to clear SM bit and use the kernel stack (SPI).
289 SWITCH_TO_KERNEL_STACK
295#endif 290#endif
296 SAVE_ALL 291 SAVE_ALL
297 mv r1, sp ; arg1(regs) 292 mv r1, sp ; arg1(regs)
298#if defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \ 293 ; get ICU status
299 || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \
300 || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104)
301
302; GET_ICU_STATUS;
303 seth r0, #shigh(M32R_ICU_ISTS_ADDR) 294 seth r0, #shigh(M32R_ICU_ISTS_ADDR)
304 ld r0, @(low(M32R_ICU_ISTS_ADDR),r0) 295 ld r0, @(low(M32R_ICU_ISTS_ADDR),r0)
305 push r0 296 push r0
@@ -314,10 +305,15 @@ ENTRY(ei_handler)
314 ;; IRQ exist check 305 ;; IRQ exist check
315#if defined(CONFIG_CHIP_M32700) 306#if defined(CONFIG_CHIP_M32700)
316 /* WORKAROUND: IMASK bug M32700-TS1, TS2 chip. */ 307 /* WORKAROUND: IMASK bug M32700-TS1, TS2 chip. */
317 beqz r0, 3f ; if (!irq_num) goto exit 308 bnez r0, 0f
318#else 309 ld24 r14, #0x00070000
310 seth r0, #shigh(M32R_ICU_IMASK_ADDR)
311 st r14, @(low(M32R_ICU_IMASK_ADDR),r0)
312 bra 1f
313 .fillinsn
3140:
315#endif /* CONFIG_CHIP_M32700 */
319 beqz r0, 1f ; if (!irq_num) goto exit 316 beqz r0, 1f ; if (!irq_num) goto exit
320#endif /* WORKAROUND */
321 ;; IPI check 317 ;; IPI check
322 cmpi r0, #(M32R_IRQ_IPI0<<2) ; ISN < IPI0 check 318 cmpi r0, #(M32R_IRQ_IPI0<<2) ; ISN < IPI0 check
323 bc 2f 319 bc 2f
@@ -332,220 +328,56 @@ ENTRY(ei_handler)
332 .fillinsn 328 .fillinsn
3331: 3291:
334 addi sp, #4 330 addi sp, #4
335 bra ret_to_intr 331 bra restore_all
336#if defined(CONFIG_CHIP_M32700)
337 /* WORKAROUND: IMASK bug M32700-TS1, TS2 chip. */
338 .fillinsn
3393:
340 ld24 r14, #0x00070000
341 seth r0, #shigh(M32R_ICU_IMASK_ADDR)
342 st r14, @(low(M32R_ICU_IMASK_ADDR), r0)
343 addi sp, #4
344 bra ret_to_intr
345#endif /* WORKAROUND */
346 ;; do_IRQ
347 .fillinsn 332 .fillinsn
3482: 3332:
349 srli r0, #2 334 srli r0, #2
350#if defined(CONFIG_PLAT_USRV) 335#else /* not CONFIG_SMP */
351 add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt
352 bnez r2, 9f
353 ; read ICU status register of PLD
354 seth r0, #high(PLD_ICUISTS)
355 or3 r0, r0, #low(PLD_ICUISTS)
356 lduh r0, @r0
357 slli r0, #21
358 srli r0, #27 ; ISN
359 addi r0, #(M32700UT_PLD_IRQ_BASE)
360 .fillinsn
3619:
362#elif defined(CONFIG_PLAT_M32700UT)
363 add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt
364 bnez r2, check_int0
365 ; read ICU status register of PLD
366 seth r0, #high(PLD_ICUISTS)
367 or3 r0, r0, #low(PLD_ICUISTS)
368 lduh r0, @r0
369 slli r0, #21
370 srli r0, #27 ; ISN
371 addi r0, #(M32700UT_PLD_IRQ_BASE)
372 bra check_end
373 .fillinsn
374check_int0:
375 add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt
376 bnez r2, check_int2
377 ; read ICU status of LAN-board
378 seth r0, #high(M32700UT_LAN_ICUISTS)
379 or3 r0, r0, #low(M32700UT_LAN_ICUISTS)
380 lduh r0, @r0
381 slli r0, #21
382 srli r0, #27 ; ISN
383 add3 r0, r0, #(M32700UT_LAN_PLD_IRQ_BASE)
384 bra check_end
385 .fillinsn
386check_int2:
387 add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt
388 bnez r2, check_end
389 ; read ICU status of LCD-board
390 seth r0, #high(M32700UT_LCD_ICUISTS)
391 or3 r0, r0, #low(M32700UT_LCD_ICUISTS)
392 lduh r0, @r0
393 slli r0, #21
394 srli r0, #27 ; ISN
395 add3 r0, r0, #(M32700UT_LCD_PLD_IRQ_BASE)
396 bra check_end
397 .fillinsn
398check_end:
399#elif defined(CONFIG_PLAT_OPSPUT)
400 add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt
401 bnez r2, check_int0
402 ; read ICU status register of PLD
403 seth r0, #high(PLD_ICUISTS)
404 or3 r0, r0, #low(PLD_ICUISTS)
405 lduh r0, @r0
406 slli r0, #21
407 srli r0, #27 ; ISN
408 addi r0, #(OPSPUT_PLD_IRQ_BASE)
409 bra check_end
410 .fillinsn
411check_int0:
412 add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt
413 bnez r2, check_int2
414 ; read ICU status of LAN-board
415 seth r0, #high(OPSPUT_LAN_ICUISTS)
416 or3 r0, r0, #low(OPSPUT_LAN_ICUISTS)
417 lduh r0, @r0
418 slli r0, #21
419 srli r0, #27 ; ISN
420 add3 r0, r0, #(OPSPUT_LAN_PLD_IRQ_BASE)
421 bra check_end
422 .fillinsn
423check_int2:
424 add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt
425 bnez r2, check_end
426 ; read ICU status of LCD-board
427 seth r0, #high(OPSPUT_LCD_ICUISTS)
428 or3 r0, r0, #low(OPSPUT_LCD_ICUISTS)
429 lduh r0, @r0
430 slli r0, #21
431 srli r0, #27 ; ISN
432 add3 r0, r0, #(OPSPUT_LCD_PLD_IRQ_BASE)
433 bra check_end
434 .fillinsn
435check_end:
436#endif /* CONFIG_PLAT_OPSPUT */
437 bl do_IRQ ; r0(irq), r1(regs)
438#else /* not CONFIG_SMP */
439 srli r0, #22 ; r0(irq) 336 srli r0, #22 ; r0(irq)
440#if defined(CONFIG_PLAT_USRV) 337#endif /* not CONFIG_SMP */
338
339#if defined(CONFIG_PLAT_HAS_INT1ICU)
441 add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt 340 add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt
442 bnez r2, 1f 341 bnez r2, 3f
443 ; read ICU status register of PLD 342 seth r0, #shigh(M32R_INT1ICU_ISTS)
444 seth r0, #high(PLD_ICUISTS) 343 lduh r0, @(low(M32R_INT1ICU_ISTS),r0) ; bit10-6 : ISN
445 or3 r0, r0, #low(PLD_ICUISTS)
446 lduh r0, @r0
447 slli r0, #21 344 slli r0, #21
448 srli r0, #27 ; ISN 345 srli r0, #27 ; ISN
449 addi r0, #(M32700UT_PLD_IRQ_BASE) 346 addi r0, #(M32R_INT1ICU_IRQ_BASE)
450 .fillinsn
4511:
452#elif defined(CONFIG_PLAT_M32700UT)
453 add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt
454 bnez r2, check_int0
455 ; read ICU status register of PLD
456 seth r0, #high(PLD_ICUISTS)
457 or3 r0, r0, #low(PLD_ICUISTS)
458 lduh r0, @r0
459 slli r0, #21
460 srli r0, #27 ; ISN
461 addi r0, #(M32700UT_PLD_IRQ_BASE)
462 bra check_end
463 .fillinsn
464check_int0:
465 add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt
466 bnez r2, check_int2
467 ; read ICU status of LAN-board
468 seth r0, #high(M32700UT_LAN_ICUISTS)
469 or3 r0, r0, #low(M32700UT_LAN_ICUISTS)
470 lduh r0, @r0
471 slli r0, #21
472 srli r0, #27 ; ISN
473 add3 r0, r0, #(M32700UT_LAN_PLD_IRQ_BASE)
474 bra check_end
475 .fillinsn
476check_int2:
477 add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt
478 bnez r2, check_end
479 ; read ICU status of LCD-board
480 seth r0, #high(M32700UT_LCD_ICUISTS)
481 or3 r0, r0, #low(M32700UT_LCD_ICUISTS)
482 lduh r0, @r0
483 slli r0, #21
484 srli r0, #27 ; ISN
485 add3 r0, r0, #(M32700UT_LCD_PLD_IRQ_BASE)
486 bra check_end
487 .fillinsn
488check_end:
489#elif defined(CONFIG_PLAT_OPSPUT)
490 add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt
491 bnez r2, check_int0
492 ; read ICU status register of PLD
493 seth r0, #high(PLD_ICUISTS)
494 or3 r0, r0, #low(PLD_ICUISTS)
495 lduh r0, @r0
496 slli r0, #21
497 srli r0, #27 ; ISN
498 addi r0, #(OPSPUT_PLD_IRQ_BASE)
499 bra check_end
500 .fillinsn
501check_int0:
502 add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt
503 bnez r2, check_int2
504 ; read ICU status of LAN-board
505 seth r0, #high(OPSPUT_LAN_ICUISTS)
506 or3 r0, r0, #low(OPSPUT_LAN_ICUISTS)
507 lduh r0, @r0
508 slli r0, #21
509 srli r0, #27 ; ISN
510 add3 r0, r0, #(OPSPUT_LAN_PLD_IRQ_BASE)
511 bra check_end 347 bra check_end
512 .fillinsn 348 .fillinsn
513check_int2: 3493:
514 add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt 350#endif /* CONFIG_PLAT_HAS_INT1ICU */
515 bnez r2, check_end 351#if defined(CONFIG_PLAT_HAS_INT0ICU)
516 ; read ICU status of LCD-board 352 add3 r2, r0, #-(M32R_IRQ_INT0) ; INT0# interrupt
517 seth r0, #high(OPSPUT_LCD_ICUISTS) 353 bnez r2, 4f
518 or3 r0, r0, #low(OPSPUT_LCD_ICUISTS) 354 seth r0, #shigh(M32R_INT0ICU_ISTS)
519 lduh r0, @r0 355 lduh r0, @(low(M32R_INT0ICU_ISTS),r0) ; bit10-6 : ISN
520 slli r0, #21 356 slli r0, #21
521 srli r0, #27 ; ISN 357 srli r0, #27 ; ISN
522 add3 r0, r0, #(OPSPUT_LCD_PLD_IRQ_BASE) 358 add3 r0, r0, #(M32R_INT0ICU_IRQ_BASE)
523 bra check_end 359 bra check_end
524 .fillinsn 360 .fillinsn
525check_end: 3614:
526#elif defined(CONFIG_PLAT_M32104UT) 362#endif /* CONFIG_PLAT_HAS_INT0ICU */
527 add3 r2, r0, #-(M32R_IRQ_INT1) ; INT1# interrupt 363#if defined(CONFIG_PLAT_HAS_INT2ICU)
528 bnez r2, check_end 364 add3 r2, r0, #-(M32R_IRQ_INT2) ; INT2# interrupt
529 ; read ICU status register of PLD 365 bnez r2, 5f
530 seth r0, #high(PLD_ICUISTS) 366 seth r0, #shigh(M32R_INT2ICU_ISTS)
531 or3 r0, r0, #low(PLD_ICUISTS) 367 lduh r0, @(low(M32R_INT2ICU_ISTS),r0) ; bit10-6 : ISN
532 lduh r0, @r0
533 slli r0, #21 368 slli r0, #21
534 srli r0, #27 ; ISN 369 srli r0, #27 ; ISN
535 addi r0, #(M32104UT_PLD_IRQ_BASE) 370 add3 r0, r0, #(M32R_INT2ICU_IRQ_BASE)
536 bra check_end 371 ; bra check_end
537 .fillinsn 372 .fillinsn
3735:
374#endif /* CONFIG_PLAT_HAS_INT2ICU */
375
538check_end: 376check_end:
539#endif /* CONFIG_PLAT_M32104UT */
540 bl do_IRQ 377 bl do_IRQ
541#endif /* CONFIG_SMP */
542 pop r14 378 pop r14
543 seth r0, #shigh(M32R_ICU_IMASK_ADDR) 379 seth r0, #shigh(M32R_ICU_IMASK_ADDR)
544 st r14, @(low(M32R_ICU_IMASK_ADDR),r0) 380 st r14, @(low(M32R_ICU_IMASK_ADDR),r0)
545#else
546#error no chip configuration
547#endif
548ret_to_intr:
549 bra ret_from_intr 381 bra ret_from_intr
550 382
551/* 383/*
@@ -631,7 +463,7 @@ inst:
631 463
632 464
633ENTRY(alignment_check) 465ENTRY(alignment_check)
634/* void alignment_check(int error_code) */ 466 /* void alignment_check(int error_code) */
635 SWITCH_TO_KERNEL_STACK 467 SWITCH_TO_KERNEL_STACK
636 SAVE_ALL 468 SAVE_ALL
637 ldi r1, #0x30 ; error_code 469 ldi r1, #0x30 ; error_code
@@ -641,7 +473,7 @@ error_code:
641 bra ret_from_exception 473 bra ret_from_exception
642 474
643ENTRY(rie_handler) 475ENTRY(rie_handler)
644/* void rie_handler(int error_code) */ 476 /* void rie_handler(int error_code) */
645 SWITCH_TO_KERNEL_STACK 477 SWITCH_TO_KERNEL_STACK
646 SAVE_ALL 478 SAVE_ALL
647 ldi r1, #0x20 ; error_code 479 ldi r1, #0x20 ; error_code
@@ -650,7 +482,7 @@ ENTRY(rie_handler)
650 bra error_code 482 bra error_code
651 483
652ENTRY(pie_handler) 484ENTRY(pie_handler)
653/* void pie_handler(int error_code) */ 485 /* void pie_handler(int error_code) */
654 SWITCH_TO_KERNEL_STACK 486 SWITCH_TO_KERNEL_STACK
655 SAVE_ALL 487 SAVE_ALL
656 ldi r1, #0 ; error_code ; FIXME 488 ldi r1, #0 ; error_code ; FIXME
@@ -659,8 +491,8 @@ ENTRY(pie_handler)
659 bra error_code 491 bra error_code
660 492
661ENTRY(debug_trap) 493ENTRY(debug_trap)
662 .global withdraw_debug_trap
663 /* void debug_trap(void) */ 494 /* void debug_trap(void) */
495 .global withdraw_debug_trap
664 SWITCH_TO_KERNEL_STACK 496 SWITCH_TO_KERNEL_STACK
665 SAVE_ALL 497 SAVE_ALL
666 mv r0, sp ; pt_regs 498 mv r0, sp ; pt_regs
@@ -679,11 +511,9 @@ ENTRY(ill_trap)
679 bl do_ill_trap 511 bl do_ill_trap
680 bra error_code 512 bra error_code
681 513
682
683/* Cache flushing handler */
684ENTRY(cache_flushing_handler) 514ENTRY(cache_flushing_handler)
685 .global _flush_cache_all
686 /* void _flush_cache_all(void); */ 515 /* void _flush_cache_all(void); */
516 .global _flush_cache_all
687 SWITCH_TO_KERNEL_STACK 517 SWITCH_TO_KERNEL_STACK
688 push r0 518 push r0
689 push r1 519 push r1
@@ -706,292 +536,7 @@ ENTRY(cache_flushing_handler)
706 pop r0 536 pop r0
707 rte 537 rte
708 538
709.data 539 .section .rodata,"a"
710ENTRY(sys_call_table) 540#include "syscall_table.S"
711 .long sys_restart_syscall /* 0 - old "setup()" system call*/
712 .long sys_exit
713 .long sys_fork
714 .long sys_read
715 .long sys_write
716 .long sys_open /* 5 */
717 .long sys_close
718 .long sys_waitpid
719 .long sys_creat
720 .long sys_link
721 .long sys_unlink /* 10 */
722 .long sys_execve
723 .long sys_chdir
724 .long sys_time
725 .long sys_mknod
726 .long sys_chmod /* 15 */
727 .long sys_ni_syscall /* lchown16 syscall holder */
728 .long sys_ni_syscall /* old break syscall holder */
729 .long sys_ni_syscall /* old stat syscall holder */
730 .long sys_lseek
731 .long sys_getpid /* 20 */
732 .long sys_mount
733 .long sys_oldumount
734 .long sys_ni_syscall /* setuid16 syscall holder */
735 .long sys_ni_syscall /* getuid16 syscall holder */
736 .long sys_stime /* 25 */
737 .long sys_ptrace
738 .long sys_alarm
739 .long sys_ni_syscall /* old fstat syscall holder */
740 .long sys_pause
741 .long sys_utime /* 30 */
742 .long sys_ni_syscall /* old stty syscall holder */
743 .long sys_cachectl /* for M32R */ /* old gtty syscall holder */
744 .long sys_access
745 .long sys_ni_syscall /* nice syscall holder */
746 .long sys_ni_syscall /* 35 - old ftime syscall holder */
747 .long sys_sync
748 .long sys_kill
749 .long sys_rename
750 .long sys_mkdir
751 .long sys_rmdir /* 40 */
752 .long sys_dup
753 .long sys_pipe
754 .long sys_times
755 .long sys_ni_syscall /* old prof syscall holder */
756 .long sys_brk /* 45 */
757 .long sys_ni_syscall /* setgid16 syscall holder */
758 .long sys_getgid /* will be unused */
759 .long sys_ni_syscall /* signal syscall holder */
760 .long sys_ni_syscall /* geteuid16 syscall holder */
761 .long sys_ni_syscall /* 50 - getegid16 syscall holder */
762 .long sys_acct
763 .long sys_umount /* recycled never used phys() */
764 .long sys_ni_syscall /* old lock syscall holder */
765 .long sys_ioctl
766 .long sys_fcntl /* 55 - will be unused */
767 .long sys_ni_syscall /* mpx syscall holder */
768 .long sys_setpgid
769 .long sys_ni_syscall /* old ulimit syscall holder */
770 .long sys_ni_syscall /* sys_olduname */
771 .long sys_umask /* 60 */
772 .long sys_chroot
773 .long sys_ustat
774 .long sys_dup2
775 .long sys_getppid
776 .long sys_getpgrp /* 65 */
777 .long sys_setsid
778 .long sys_ni_syscall /* sigaction syscall holder */
779 .long sys_ni_syscall /* sgetmask syscall holder */
780 .long sys_ni_syscall /* ssetmask syscall holder */
781 .long sys_ni_syscall /* 70 - setreuid16 syscall holder */
782 .long sys_ni_syscall /* setregid16 syscall holder */
783 .long sys_ni_syscall /* sigsuspend syscall holder */
784 .long sys_ni_syscall /* sigpending syscall holder */
785 .long sys_sethostname
786 .long sys_setrlimit /* 75 */
787 .long sys_getrlimit/*will be unused*/
788 .long sys_getrusage
789 .long sys_gettimeofday
790 .long sys_settimeofday
791 .long sys_ni_syscall /* 80 - getgroups16 syscall holder */
792 .long sys_ni_syscall /* setgroups16 syscall holder */
793 .long sys_ni_syscall /* sys_oldselect */
794 .long sys_symlink
795 .long sys_ni_syscall /* old lstat syscall holder */
796 .long sys_readlink /* 85 */
797 .long sys_uselib
798 .long sys_swapon
799 .long sys_reboot
800 .long sys_ni_syscall /* readdir syscall holder */
801 .long sys_ni_syscall /* 90 - old_mmap syscall holder */
802 .long sys_munmap
803 .long sys_truncate
804 .long sys_ftruncate
805 .long sys_fchmod
806 .long sys_ni_syscall /* 95 - fchwon16 syscall holder */
807 .long sys_getpriority
808 .long sys_setpriority
809 .long sys_ni_syscall /* old profil syscall holder */
810 .long sys_statfs
811 .long sys_fstatfs /* 100 */
812 .long sys_ni_syscall /* ioperm syscall holder */
813 .long sys_socketcall
814 .long sys_syslog
815 .long sys_setitimer
816 .long sys_getitimer /* 105 */
817 .long sys_newstat
818 .long sys_newlstat
819 .long sys_newfstat
820 .long sys_ni_syscall /* old uname syscall holder */
821 .long sys_ni_syscall /* 110 - iopl syscall holder */
822 .long sys_vhangup
823 .long sys_ni_syscall /* idle syscall holder */
824 .long sys_ni_syscall /* vm86old syscall holder */
825 .long sys_wait4
826 .long sys_swapoff /* 115 */
827 .long sys_sysinfo
828 .long sys_ipc
829 .long sys_fsync
830 .long sys_ni_syscall /* sigreturn syscall holder */
831 .long sys_clone /* 120 */
832 .long sys_setdomainname
833 .long sys_newuname
834 .long sys_ni_syscall /* modify_ldt syscall holder */
835 .long sys_adjtimex
836 .long sys_mprotect /* 125 */
837 .long sys_ni_syscall /* sigprocmask syscall holder */
838 .long sys_ni_syscall /* create_module syscall holder */
839 .long sys_init_module
840 .long sys_delete_module
841 .long sys_ni_syscall /* 130 - get_kernel_syms */
842 .long sys_quotactl
843 .long sys_getpgid
844 .long sys_fchdir
845 .long sys_bdflush
846 .long sys_sysfs /* 135 */
847 .long sys_personality
848 .long sys_ni_syscall /* afs_syscall syscall holder */
849 .long sys_ni_syscall /* setfsuid16 syscall holder */
850 .long sys_ni_syscall /* setfsgid16 syscall holder */
851 .long sys_llseek /* 140 */
852 .long sys_getdents
853 .long sys_select
854 .long sys_flock
855 .long sys_msync
856 .long sys_readv /* 145 */
857 .long sys_writev
858 .long sys_getsid
859 .long sys_fdatasync
860 .long sys_sysctl
861 .long sys_mlock /* 150 */
862 .long sys_munlock
863 .long sys_mlockall
864 .long sys_munlockall
865 .long sys_sched_setparam
866 .long sys_sched_getparam /* 155 */
867 .long sys_sched_setscheduler
868 .long sys_sched_getscheduler
869 .long sys_sched_yield
870 .long sys_sched_get_priority_max
871 .long sys_sched_get_priority_min /* 160 */
872 .long sys_sched_rr_get_interval
873 .long sys_nanosleep
874 .long sys_mremap
875 .long sys_ni_syscall /* setresuid16 syscall holder */
876 .long sys_ni_syscall /* 165 - getresuid16 syscall holder */
877 .long sys_tas /* vm86 syscall holder */
878 .long sys_ni_syscall /* query_module syscall holder */
879 .long sys_poll
880 .long sys_nfsservctl
881 .long sys_setresgid /* 170 */
882 .long sys_getresgid
883 .long sys_prctl
884 .long sys_rt_sigreturn
885 .long sys_rt_sigaction
886 .long sys_rt_sigprocmask /* 175 */
887 .long sys_rt_sigpending
888 .long sys_rt_sigtimedwait
889 .long sys_rt_sigqueueinfo
890 .long sys_rt_sigsuspend
891 .long sys_pread64 /* 180 */
892 .long sys_pwrite64
893 .long sys_ni_syscall /* chown16 syscall holder */
894 .long sys_getcwd
895 .long sys_capget
896 .long sys_capset /* 185 */
897 .long sys_sigaltstack
898 .long sys_sendfile
899 .long sys_ni_syscall /* streams1 */
900 .long sys_ni_syscall /* streams2 */
901 .long sys_vfork /* 190 */
902 .long sys_getrlimit
903 .long sys_mmap2
904 .long sys_truncate64
905 .long sys_ftruncate64
906 .long sys_stat64 /* 195 */
907 .long sys_lstat64
908 .long sys_fstat64
909 .long sys_lchown
910 .long sys_getuid
911 .long sys_getgid /* 200 */
912 .long sys_geteuid
913 .long sys_getegid
914 .long sys_setreuid
915 .long sys_setregid
916 .long sys_getgroups /* 205 */
917 .long sys_setgroups
918 .long sys_fchown
919 .long sys_setresuid
920 .long sys_getresuid
921 .long sys_setresgid /* 210 */
922 .long sys_getresgid
923 .long sys_chown
924 .long sys_setuid
925 .long sys_setgid
926 .long sys_setfsuid /* 215 */
927 .long sys_setfsgid
928 .long sys_pivot_root
929 .long sys_mincore
930 .long sys_madvise
931 .long sys_getdents64 /* 220 */
932 .long sys_fcntl64
933 .long sys_ni_syscall /* reserved for TUX */
934 .long sys_ni_syscall /* Reserved for Security */
935 .long sys_gettid
936 .long sys_readahead /* 225 */
937 .long sys_setxattr
938 .long sys_lsetxattr
939 .long sys_fsetxattr
940 .long sys_getxattr
941 .long sys_lgetxattr /* 230 */
942 .long sys_fgetxattr
943 .long sys_listxattr
944 .long sys_llistxattr
945 .long sys_flistxattr
946 .long sys_removexattr /* 235 */
947 .long sys_lremovexattr
948 .long sys_fremovexattr
949 .long sys_tkill
950 .long sys_sendfile64
951 .long sys_futex /* 240 */
952 .long sys_sched_setaffinity
953 .long sys_sched_getaffinity
954 .long sys_ni_syscall /* reserved for "set_thread_area" system call */
955 .long sys_ni_syscall /* reserved for "get_thread_area" system call */
956 .long sys_io_setup /* 245 */
957 .long sys_io_destroy
958 .long sys_io_getevents
959 .long sys_io_submit
960 .long sys_io_cancel
961 .long sys_fadvise64 /* 250 */
962 .long sys_ni_syscall
963 .long sys_exit_group
964 .long sys_lookup_dcookie
965 .long sys_epoll_create
966 .long sys_epoll_ctl /* 255 */
967 .long sys_epoll_wait
968 .long sys_remap_file_pages
969 .long sys_set_tid_address
970 .long sys_timer_create
971 .long sys_timer_settime /* 260 */
972 .long sys_timer_gettime
973 .long sys_timer_getoverrun
974 .long sys_timer_delete
975 .long sys_clock_settime
976 .long sys_clock_gettime /* 265 */
977 .long sys_clock_getres
978 .long sys_clock_nanosleep
979 .long sys_statfs64
980 .long sys_fstatfs64
981 .long sys_tgkill /* 270 */
982 .long sys_utimes
983 .long sys_fadvise64_64
984 .long sys_ni_syscall /* Reserved for sys_vserver */
985 .long sys_ni_syscall /* Reserved for sys_mbind */
986 .long sys_ni_syscall /* Reserved for sys_get_mempolicy */
987 .long sys_ni_syscall /* Reserved for sys_set_mempolicy */
988 .long sys_mq_open
989 .long sys_mq_unlink
990 .long sys_mq_timedsend
991 .long sys_mq_timedreceive /* 280 */
992 .long sys_mq_notify
993 .long sys_mq_getsetattr
994 .long sys_ni_syscall /* reserved for kexec */
995 .long sys_waitid
996 541
997syscall_table_size=(.-sys_call_table) 542syscall_table_size=(.-sys_call_table)
diff --git a/arch/m32r/kernel/syscall_table.S b/arch/m32r/kernel/syscall_table.S
new file mode 100644
index 000000000000..751ac2a3d120
--- /dev/null
+++ b/arch/m32r/kernel/syscall_table.S
@@ -0,0 +1,286 @@
1ENTRY(sys_call_table)
2 .long sys_restart_syscall /* 0 - old "setup()" system call*/
3 .long sys_exit
4 .long sys_fork
5 .long sys_read
6 .long sys_write
7 .long sys_open /* 5 */
8 .long sys_close
9 .long sys_waitpid
10 .long sys_creat
11 .long sys_link
12 .long sys_unlink /* 10 */
13 .long sys_execve
14 .long sys_chdir
15 .long sys_time
16 .long sys_mknod
17 .long sys_chmod /* 15 */
18 .long sys_ni_syscall /* lchown16 syscall holder */
19 .long sys_ni_syscall /* old break syscall holder */
20 .long sys_ni_syscall /* old stat syscall holder */
21 .long sys_lseek
22 .long sys_getpid /* 20 */
23 .long sys_mount
24 .long sys_oldumount
25 .long sys_ni_syscall /* setuid16 syscall holder */
26 .long sys_ni_syscall /* getuid16 syscall holder */
27 .long sys_stime /* 25 */
28 .long sys_ptrace
29 .long sys_alarm
30 .long sys_ni_syscall /* old fstat syscall holder */
31 .long sys_pause
32 .long sys_utime /* 30 */
33 .long sys_ni_syscall /* old stty syscall holder */
34 .long sys_cachectl /* for M32R */ /* old gtty syscall holder */
35 .long sys_access
36 .long sys_ni_syscall /* nice syscall holder */
37 .long sys_ni_syscall /* 35 - old ftime syscall holder */
38 .long sys_sync
39 .long sys_kill
40 .long sys_rename
41 .long sys_mkdir
42 .long sys_rmdir /* 40 */
43 .long sys_dup
44 .long sys_pipe
45 .long sys_times
46 .long sys_ni_syscall /* old prof syscall holder */
47 .long sys_brk /* 45 */
48 .long sys_ni_syscall /* setgid16 syscall holder */
49 .long sys_getgid /* will be unused */
50 .long sys_ni_syscall /* signal syscall holder */
51 .long sys_ni_syscall /* geteuid16 syscall holder */
52 .long sys_ni_syscall /* 50 - getegid16 syscall holder */
53 .long sys_acct
54 .long sys_umount /* recycled never used phys() */
55 .long sys_ni_syscall /* old lock syscall holder */
56 .long sys_ioctl
57 .long sys_fcntl /* 55 - will be unused */
58 .long sys_ni_syscall /* mpx syscall holder */
59 .long sys_setpgid
60 .long sys_ni_syscall /* old ulimit syscall holder */
61 .long sys_ni_syscall /* sys_olduname */
62 .long sys_umask /* 60 */
63 .long sys_chroot
64 .long sys_ustat
65 .long sys_dup2
66 .long sys_getppid
67 .long sys_getpgrp /* 65 */
68 .long sys_setsid
69 .long sys_ni_syscall /* sigaction syscall holder */
70 .long sys_ni_syscall /* sgetmask syscall holder */
71 .long sys_ni_syscall /* ssetmask syscall holder */
72 .long sys_ni_syscall /* 70 - setreuid16 syscall holder */
73 .long sys_ni_syscall /* setregid16 syscall holder */
74 .long sys_ni_syscall /* sigsuspend syscall holder */
75 .long sys_ni_syscall /* sigpending syscall holder */
76 .long sys_sethostname
77 .long sys_setrlimit /* 75 */
78 .long sys_getrlimit/*will be unused*/
79 .long sys_getrusage
80 .long sys_gettimeofday
81 .long sys_settimeofday
82 .long sys_ni_syscall /* 80 - getgroups16 syscall holder */
83 .long sys_ni_syscall /* setgroups16 syscall holder */
84 .long sys_ni_syscall /* sys_oldselect */
85 .long sys_symlink
86 .long sys_ni_syscall /* old lstat syscall holder */
87 .long sys_readlink /* 85 */
88 .long sys_uselib
89 .long sys_swapon
90 .long sys_reboot
91 .long sys_ni_syscall /* readdir syscall holder */
92 .long sys_ni_syscall /* 90 - old_mmap syscall holder */
93 .long sys_munmap
94 .long sys_truncate
95 .long sys_ftruncate
96 .long sys_fchmod
97 .long sys_ni_syscall /* 95 - fchwon16 syscall holder */
98 .long sys_getpriority
99 .long sys_setpriority
100 .long sys_ni_syscall /* old profil syscall holder */
101 .long sys_statfs
102 .long sys_fstatfs /* 100 */
103 .long sys_ni_syscall /* ioperm syscall holder */
104 .long sys_socketcall
105 .long sys_syslog
106 .long sys_setitimer
107 .long sys_getitimer /* 105 */
108 .long sys_newstat
109 .long sys_newlstat
110 .long sys_newfstat
111 .long sys_ni_syscall /* old uname syscall holder */
112 .long sys_ni_syscall /* 110 - iopl syscall holder */
113 .long sys_vhangup
114 .long sys_ni_syscall /* idle syscall holder */
115 .long sys_ni_syscall /* vm86old syscall holder */
116 .long sys_wait4
117 .long sys_swapoff /* 115 */
118 .long sys_sysinfo
119 .long sys_ipc
120 .long sys_fsync
121 .long sys_ni_syscall /* sigreturn syscall holder */
122 .long sys_clone /* 120 */
123 .long sys_setdomainname
124 .long sys_newuname
125 .long sys_ni_syscall /* modify_ldt syscall holder */
126 .long sys_adjtimex
127 .long sys_mprotect /* 125 */
128 .long sys_ni_syscall /* sigprocmask syscall holder */
129 .long sys_ni_syscall /* create_module syscall holder */
130 .long sys_init_module
131 .long sys_delete_module
132 .long sys_ni_syscall /* 130 - get_kernel_syms */
133 .long sys_quotactl
134 .long sys_getpgid
135 .long sys_fchdir
136 .long sys_bdflush
137 .long sys_sysfs /* 135 */
138 .long sys_personality
139 .long sys_ni_syscall /* afs_syscall syscall holder */
140 .long sys_ni_syscall /* setfsuid16 syscall holder */
141 .long sys_ni_syscall /* setfsgid16 syscall holder */
142 .long sys_llseek /* 140 */
143 .long sys_getdents
144 .long sys_select
145 .long sys_flock
146 .long sys_msync
147 .long sys_readv /* 145 */
148 .long sys_writev
149 .long sys_getsid
150 .long sys_fdatasync
151 .long sys_sysctl
152 .long sys_mlock /* 150 */
153 .long sys_munlock
154 .long sys_mlockall
155 .long sys_munlockall
156 .long sys_sched_setparam
157 .long sys_sched_getparam /* 155 */
158 .long sys_sched_setscheduler
159 .long sys_sched_getscheduler
160 .long sys_sched_yield
161 .long sys_sched_get_priority_max
162 .long sys_sched_get_priority_min /* 160 */
163 .long sys_sched_rr_get_interval
164 .long sys_nanosleep
165 .long sys_mremap
166 .long sys_ni_syscall /* setresuid16 syscall holder */
167 .long sys_ni_syscall /* 165 - getresuid16 syscall holder */
168 .long sys_tas /* vm86 syscall holder */
169 .long sys_ni_syscall /* query_module syscall holder */
170 .long sys_poll
171 .long sys_nfsservctl
172 .long sys_setresgid /* 170 */
173 .long sys_getresgid
174 .long sys_prctl
175 .long sys_rt_sigreturn
176 .long sys_rt_sigaction
177 .long sys_rt_sigprocmask /* 175 */
178 .long sys_rt_sigpending
179 .long sys_rt_sigtimedwait
180 .long sys_rt_sigqueueinfo
181 .long sys_rt_sigsuspend
182 .long sys_pread64 /* 180 */
183 .long sys_pwrite64
184 .long sys_ni_syscall /* chown16 syscall holder */
185 .long sys_getcwd
186 .long sys_capget
187 .long sys_capset /* 185 */
188 .long sys_sigaltstack
189 .long sys_sendfile
190 .long sys_ni_syscall /* streams1 */
191 .long sys_ni_syscall /* streams2 */
192 .long sys_vfork /* 190 */
193 .long sys_getrlimit
194 .long sys_mmap2
195 .long sys_truncate64
196 .long sys_ftruncate64
197 .long sys_stat64 /* 195 */
198 .long sys_lstat64
199 .long sys_fstat64
200 .long sys_lchown
201 .long sys_getuid
202 .long sys_getgid /* 200 */
203 .long sys_geteuid
204 .long sys_getegid
205 .long sys_setreuid
206 .long sys_setregid
207 .long sys_getgroups /* 205 */
208 .long sys_setgroups
209 .long sys_fchown
210 .long sys_setresuid
211 .long sys_getresuid
212 .long sys_setresgid /* 210 */
213 .long sys_getresgid
214 .long sys_chown
215 .long sys_setuid
216 .long sys_setgid
217 .long sys_setfsuid /* 215 */
218 .long sys_setfsgid
219 .long sys_pivot_root
220 .long sys_mincore
221 .long sys_madvise
222 .long sys_getdents64 /* 220 */
223 .long sys_fcntl64
224 .long sys_ni_syscall /* reserved for TUX */
225 .long sys_ni_syscall /* Reserved for Security */
226 .long sys_gettid
227 .long sys_readahead /* 225 */
228 .long sys_setxattr
229 .long sys_lsetxattr
230 .long sys_fsetxattr
231 .long sys_getxattr
232 .long sys_lgetxattr /* 230 */
233 .long sys_fgetxattr
234 .long sys_listxattr
235 .long sys_llistxattr
236 .long sys_flistxattr
237 .long sys_removexattr /* 235 */
238 .long sys_lremovexattr
239 .long sys_fremovexattr
240 .long sys_tkill
241 .long sys_sendfile64
242 .long sys_futex /* 240 */
243 .long sys_sched_setaffinity
244 .long sys_sched_getaffinity
245 .long sys_ni_syscall /* reserved for "set_thread_area" system call */
246 .long sys_ni_syscall /* reserved for "get_thread_area" system call */
247 .long sys_io_setup /* 245 */
248 .long sys_io_destroy
249 .long sys_io_getevents
250 .long sys_io_submit
251 .long sys_io_cancel
252 .long sys_fadvise64 /* 250 */
253 .long sys_ni_syscall
254 .long sys_exit_group
255 .long sys_lookup_dcookie
256 .long sys_epoll_create
257 .long sys_epoll_ctl /* 255 */
258 .long sys_epoll_wait
259 .long sys_remap_file_pages
260 .long sys_set_tid_address
261 .long sys_timer_create
262 .long sys_timer_settime /* 260 */
263 .long sys_timer_gettime
264 .long sys_timer_getoverrun
265 .long sys_timer_delete
266 .long sys_clock_settime
267 .long sys_clock_gettime /* 265 */
268 .long sys_clock_getres
269 .long sys_clock_nanosleep
270 .long sys_statfs64
271 .long sys_fstatfs64
272 .long sys_tgkill /* 270 */
273 .long sys_utimes
274 .long sys_fadvise64_64
275 .long sys_ni_syscall /* Reserved for sys_vserver */
276 .long sys_ni_syscall /* Reserved for sys_mbind */
277 .long sys_ni_syscall /* Reserved for sys_get_mempolicy */
278 .long sys_ni_syscall /* Reserved for sys_set_mempolicy */
279 .long sys_mq_open
280 .long sys_mq_unlink
281 .long sys_mq_timedsend
282 .long sys_mq_timedreceive /* 280 */
283 .long sys_mq_notify
284 .long sys_mq_getsetattr
285 .long sys_ni_syscall /* reserved for kexec */
286 .long sys_waitid
diff --git a/arch/m32r/platforms/Makefile b/arch/m32r/platforms/Makefile
new file mode 100644
index 000000000000..da03e1a8fe91
--- /dev/null
+++ b/arch/m32r/platforms/Makefile
@@ -0,0 +1,9 @@
1# arch/m32r/platforms/Makefile
2obj-$(CONFIG_PLAT_M32104UT) += m32104ut/
3obj-$(CONFIG_PLAT_M32700UT) += m32700ut/
4obj-$(CONFIG_PLAT_MAPPI) += mappi/
5obj-$(CONFIG_PLAT_MAPPI2) += mappi2/
6obj-$(CONFIG_PLAT_MAPPI3) += mappi3/
7obj-$(CONFIG_PLAT_OAKS32R) += oaks32r/
8obj-$(CONFIG_PLAT_OPSPUT) += opsput/
9obj-$(CONFIG_PLAT_USRV) += usrv/
diff --git a/arch/m32r/platforms/m32104ut/Makefile b/arch/m32r/platforms/m32104ut/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/m32104ut/Makefile
@@ -0,0 +1 @@
obj-y := setup.o io.o
diff --git a/arch/m32r/kernel/io_m32104ut.c b/arch/m32r/platforms/m32104ut/io.c
index 2189eca30b56..e5d8be6fbb2d 100644
--- a/arch/m32r/kernel/io_m32104ut.c
+++ b/arch/m32r/platforms/m32104ut/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/io_m32104ut.c 2 * linux/arch/m32r/platforms/m32104ut/io.c
3 * 3 *
4 * Typical I/O routines for M32104UT board. 4 * Typical I/O routines for M32104UT board.
5 * 5 *
diff --git a/arch/m32r/kernel/setup_m32104ut.c b/arch/m32r/platforms/m32104ut/setup.c
index 1692b321f476..98138b4e9220 100644
--- a/arch/m32r/kernel/setup_m32104ut.c
+++ b/arch/m32r/platforms/m32104ut/setup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/setup_m32104ut.c 2 * linux/arch/m32r/platforms/m32104ut/setup.c
3 * 3 *
4 * Setup routines for M32104UT Board 4 * Setup routines for M32104UT Board
5 * 5 *
diff --git a/arch/m32r/platforms/m32700ut/Makefile b/arch/m32r/platforms/m32700ut/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/m32700ut/Makefile
@@ -0,0 +1 @@
obj-y := setup.o io.o
diff --git a/arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB
index 525dab46982b..525dab46982b 100644
--- a/arch/m32r/m32700ut/dot.gdbinit_200MHz_16MB
+++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_200MHz_16MB
diff --git a/arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB
index aa503657a49b..aa503657a49b 100644
--- a/arch/m32r/m32700ut/dot.gdbinit_300MHz_32MB
+++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_300MHz_32MB
diff --git a/arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB b/arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB
index adc608aab2fe..adc608aab2fe 100644
--- a/arch/m32r/m32700ut/dot.gdbinit_400MHz_32MB
+++ b/arch/m32r/platforms/m32700ut/dot.gdbinit_400MHz_32MB
diff --git a/arch/m32r/kernel/io_m32700ut.c b/arch/m32r/platforms/m32700ut/io.c
index 5898f4031a0c..6862586e58db 100644
--- a/arch/m32r/kernel/io_m32700ut.c
+++ b/arch/m32r/platforms/m32700ut/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/io_m32700ut.c 2 * linux/arch/m32r/platforms/m32700ut/io.c
3 * 3 *
4 * Typical I/O routines for M32700UT board. 4 * Typical I/O routines for M32700UT board.
5 * 5 *
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/platforms/m32700ut/setup.c
index 7efc145c74c2..77b0ae9379e9 100644
--- a/arch/m32r/kernel/setup_m32700ut.c
+++ b/arch/m32r/platforms/m32700ut/setup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/setup_m32700ut.c 2 * linux/arch/m32r/platforms/m32700ut/setup.c
3 * 3 *
4 * Setup routines for Renesas M32700UT Board 4 * Setup routines for Renesas M32700UT Board
5 * 5 *
diff --git a/arch/m32r/platforms/mappi/Makefile b/arch/m32r/platforms/mappi/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/mappi/Makefile
@@ -0,0 +1 @@
obj-y := setup.o io.o
diff --git a/arch/m32r/mappi/dot.gdbinit b/arch/m32r/platforms/mappi/dot.gdbinit
index 7a1d293863eb..7a1d293863eb 100644
--- a/arch/m32r/mappi/dot.gdbinit
+++ b/arch/m32r/platforms/mappi/dot.gdbinit
diff --git a/arch/m32r/mappi/dot.gdbinit.nommu b/arch/m32r/platforms/mappi/dot.gdbinit.nommu
index 297536cf67cf..297536cf67cf 100644
--- a/arch/m32r/mappi/dot.gdbinit.nommu
+++ b/arch/m32r/platforms/mappi/dot.gdbinit.nommu
diff --git a/arch/m32r/mappi/dot.gdbinit.smp b/arch/m32r/platforms/mappi/dot.gdbinit.smp
index 171489a440d9..171489a440d9 100644
--- a/arch/m32r/mappi/dot.gdbinit.smp
+++ b/arch/m32r/platforms/mappi/dot.gdbinit.smp
diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/platforms/mappi/io.c
index 31396789ab1b..ac1c396d477d 100644
--- a/arch/m32r/kernel/io_mappi.c
+++ b/arch/m32r/platforms/mappi/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/io_mappi.c 2 * linux/arch/m32r/platforms/mappi/io.c
3 * 3 *
4 * Typical I/O routines for Mappi board. 4 * Typical I/O routines for Mappi board.
5 * 5 *
diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/platforms/mappi/setup.c
index fe73c9ec611f..3ec087ff2214 100644
--- a/arch/m32r/kernel/setup_mappi.c
+++ b/arch/m32r/platforms/mappi/setup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/setup_mappi.c 2 * linux/arch/m32r/platforms/mappi/setup.c
3 * 3 *
4 * Setup routines for Renesas MAPPI Board 4 * Setup routines for Renesas MAPPI Board
5 * 5 *
diff --git a/arch/m32r/platforms/mappi2/Makefile b/arch/m32r/platforms/mappi2/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/mappi2/Makefile
@@ -0,0 +1 @@
obj-y := setup.o io.o
diff --git a/arch/m32r/mappi2/dot.gdbinit.vdec2 b/arch/m32r/platforms/mappi2/dot.gdbinit.vdec2
index 797a830bd4b7..797a830bd4b7 100644
--- a/arch/m32r/mappi2/dot.gdbinit.vdec2
+++ b/arch/m32r/platforms/mappi2/dot.gdbinit.vdec2
diff --git a/arch/m32r/kernel/io_mappi2.c b/arch/m32r/platforms/mappi2/io.c
index ecc6aa88f9ac..da58960b3f8a 100644
--- a/arch/m32r/kernel/io_mappi2.c
+++ b/arch/m32r/platforms/mappi2/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/io_mappi2.c 2 * linux/arch/m32r/platforms/mappi2/io.c
3 * 3 *
4 * Typical I/O routines for Mappi2 board. 4 * Typical I/O routines for Mappi2 board.
5 * 5 *
diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/platforms/mappi2/setup.c
index 55abb2102750..d87969c6356e 100644
--- a/arch/m32r/kernel/setup_mappi2.c
+++ b/arch/m32r/platforms/mappi2/setup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/setup_mappi2.c 2 * linux/arch/m32r/platforms/mappi2/setup.c
3 * 3 *
4 * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board 4 * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board
5 * 5 *
diff --git a/arch/m32r/platforms/mappi3/Makefile b/arch/m32r/platforms/mappi3/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/mappi3/Makefile
@@ -0,0 +1 @@
obj-y := setup.o io.o
diff --git a/arch/m32r/mappi3/dot.gdbinit b/arch/m32r/platforms/mappi3/dot.gdbinit
index 89c22184e139..89c22184e139 100644
--- a/arch/m32r/mappi3/dot.gdbinit
+++ b/arch/m32r/platforms/mappi3/dot.gdbinit
diff --git a/arch/m32r/kernel/io_mappi3.c b/arch/m32r/platforms/mappi3/io.c
index a13b5f6b07e9..1bc3f90fdc53 100644
--- a/arch/m32r/kernel/io_mappi3.c
+++ b/arch/m32r/platforms/mappi3/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/io_mappi3.c 2 * linux/arch/m32r/platforms/mappi3/io.c
3 * 3 *
4 * Typical I/O routines for Mappi3 board. 4 * Typical I/O routines for Mappi3 board.
5 * 5 *
diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/platforms/mappi3/setup.c
index 93dc010c7fc3..785b4bd6d9fd 100644
--- a/arch/m32r/kernel/setup_mappi3.c
+++ b/arch/m32r/platforms/mappi3/setup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/setup_mappi3.c 2 * linux/arch/m32r/platforms/mappi3/setup.c
3 * 3 *
4 * Setup routines for Renesas MAPPI-III(M3A-2170) Board 4 * Setup routines for Renesas MAPPI-III(M3A-2170) Board
5 * 5 *
diff --git a/arch/m32r/platforms/oaks32r/Makefile b/arch/m32r/platforms/oaks32r/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/oaks32r/Makefile
@@ -0,0 +1 @@
obj-y := setup.o io.o
diff --git a/arch/m32r/oaks32r/dot.gdbinit.nommu b/arch/m32r/platforms/oaks32r/dot.gdbinit.nommu
index d481d972b802..d481d972b802 100644
--- a/arch/m32r/oaks32r/dot.gdbinit.nommu
+++ b/arch/m32r/platforms/oaks32r/dot.gdbinit.nommu
diff --git a/arch/m32r/kernel/io_oaks32r.c b/arch/m32r/platforms/oaks32r/io.c
index 068bf47060f8..364a3b2e8907 100644
--- a/arch/m32r/kernel/io_oaks32r.c
+++ b/arch/m32r/platforms/oaks32r/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/io_oaks32r.c 2 * linux/arch/m32r/platforms/oaks32r/io.c
3 * 3 *
4 * Typical I/O routines for OAKS32R board. 4 * Typical I/O routines for OAKS32R board.
5 * 5 *
diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/platforms/oaks32r/setup.c
index cd62598e3cea..6faa5db68e95 100644
--- a/arch/m32r/kernel/setup_oaks32r.c
+++ b/arch/m32r/platforms/oaks32r/setup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/setup_oaks32r.c 2 * linux/arch/m32r/platforms/oaks32r/setup.c
3 * 3 *
4 * Setup routines for OAKS32R Board 4 * Setup routines for OAKS32R Board
5 * 5 *
diff --git a/arch/m32r/platforms/opsput/Makefile b/arch/m32r/platforms/opsput/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/opsput/Makefile
@@ -0,0 +1 @@
obj-y := setup.o io.o
diff --git a/arch/m32r/opsput/dot.gdbinit b/arch/m32r/platforms/opsput/dot.gdbinit
index b7e6c6640857..b7e6c6640857 100644
--- a/arch/m32r/opsput/dot.gdbinit
+++ b/arch/m32r/platforms/opsput/dot.gdbinit
diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/platforms/opsput/io.c
index 3cbb1f717e50..379efb77123d 100644
--- a/arch/m32r/kernel/io_opsput.c
+++ b/arch/m32r/platforms/opsput/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/io_opsput.c 2 * linux/arch/m32r/platforms/opsput/io.c
3 * 3 *
4 * Typical I/O routines for OPSPUT board. 4 * Typical I/O routines for OPSPUT board.
5 * 5 *
diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/platforms/opsput/setup.c
index 62d6b71de45f..fab13fd85422 100644
--- a/arch/m32r/kernel/setup_opsput.c
+++ b/arch/m32r/platforms/opsput/setup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/setup_opsput.c 2 * linux/arch/m32r/platforms/opsput/setup.c
3 * 3 *
4 * Setup routines for Renesas OPSPUT Board 4 * Setup routines for Renesas OPSPUT Board
5 * 5 *
diff --git a/arch/m32r/platforms/usrv/Makefile b/arch/m32r/platforms/usrv/Makefile
new file mode 100644
index 000000000000..0de59084f21c
--- /dev/null
+++ b/arch/m32r/platforms/usrv/Makefile
@@ -0,0 +1 @@
obj-y := setup.o io.o
diff --git a/arch/m32r/kernel/io_usrv.c b/arch/m32r/platforms/usrv/io.c
index a8c0e2eceb4d..f5e50d37badb 100644
--- a/arch/m32r/kernel/io_usrv.c
+++ b/arch/m32r/platforms/usrv/io.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/io_usrv.c 2 * linux/arch/m32r/platforms/usrv/io.c
3 * 3 *
4 * Typical I/O routines for uServer board. 4 * Typical I/O routines for uServer board.
5 * 5 *
@@ -17,7 +17,7 @@
17#include <asm/io.h> 17#include <asm/io.h>
18 18
19#include <linux/types.h> 19#include <linux/types.h>
20#include "../drivers/m32r_cfc.h" 20#include "../../../../drivers/pcmcia/m32r_cfc.h"
21 21
22extern void pcc_ioread_byte(int, unsigned long, void *, size_t, size_t, int); 22extern void pcc_ioread_byte(int, unsigned long, void *, size_t, size_t, int);
23extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int); 23extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int);
diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/platforms/usrv/setup.c
index f5b4b5ac31e7..89588d649eb7 100644
--- a/arch/m32r/kernel/setup_usrv.c
+++ b/arch/m32r/platforms/usrv/setup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/m32r/kernel/setup_usrv.c 2 * linux/arch/m32r/platforms/usrv/setup.c
3 * 3 *
4 * Setup routines for MITSUBISHI uServer 4 * Setup routines for MITSUBISHI uServer
5 * 5 *
@@ -198,7 +198,7 @@ void __init init_IRQ(void)
198#endif /* CONFIG_SERIAL_M32R_SIO */ 198#endif /* CONFIG_SERIAL_M32R_SIO */
199 199
200 /* INT#67-#71: CFC#0 IREQ on PLD */ 200 /* INT#67-#71: CFC#0 IREQ on PLD */
201 for (i = 0 ; i < CONFIG_CFC_NUM ; i++ ) { 201 for (i = 0 ; i < CONFIG_M32R_CFC_NUM ; i++ ) {
202 irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED; 202 irq_desc[PLD_IRQ_CF0 + i].status = IRQ_DISABLED;
203 irq_desc[PLD_IRQ_CF0 + i].chip = &m32700ut_pld_irq_type; 203 irq_desc[PLD_IRQ_CF0 + i].chip = &m32700ut_pld_irq_type;
204 irq_desc[PLD_IRQ_CF0 + i].action = 0; 204 irq_desc[PLD_IRQ_CF0 + i].action = 0;
@@ -246,4 +246,3 @@ void __init init_IRQ(void)
246 icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD11; 246 icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD11;
247 enable_mappi_irq(M32R_IRQ_INT1); 247 enable_mappi_irq(M32R_IRQ_INT1);
248} 248}
249
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index e162ee685d20..918f5dbeaef6 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -735,4 +735,14 @@ sys_call_table:
735 .long sys_tee 735 .long sys_tee
736 .long sys_vmsplice 736 .long sys_vmsplice
737 .long sys_move_pages /* 310 */ 737 .long sys_move_pages /* 310 */
738 .long sys_sched_setaffinity
739 .long sys_sched_getaffinity
740 .long sys_kexec_load
741 .long sys_getcpu
742 .long sys_epoll_pwait /* 315 */
743 .long sys_utimensat
744 .long sys_signalfd
745 .long sys_timerfd
746 .long sys_eventfd
747 .long sys_fallocate /* 320 */
738 748
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c
index 2cf0690b7882..e792d3cba4c7 100644
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
@@ -116,7 +116,6 @@ static inline void singlestep_disable(struct task_struct *child)
116void ptrace_disable(struct task_struct *child) 116void ptrace_disable(struct task_struct *child)
117{ 117{
118 singlestep_disable(child); 118 singlestep_disable(child);
119 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
120} 119}
121 120
122long arch_ptrace(struct task_struct *child, long request, long addr, long data) 121long arch_ptrace(struct task_struct *child, long request, long addr, long data)
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S
index 4603f4f3c935..9620093514bc 100644
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
@@ -329,6 +329,16 @@ ENTRY(sys_call_table)
329 .long sys_tee 329 .long sys_tee
330 .long sys_vmsplice 330 .long sys_vmsplice
331 .long sys_move_pages /* 310 */ 331 .long sys_move_pages /* 310 */
332 .long sys_sched_setaffinity
333 .long sys_sched_getaffinity
334 .long sys_kexec_load
335 .long sys_getcpu
336 .long sys_epoll_pwait /* 315 */
337 .long sys_utimensat
338 .long sys_signalfd
339 .long sys_timerfd
340 .long sys_eventfd
341 .long sys_fallocate /* 320 */
332 342
333 .rept NR_syscalls-(.-sys_call_table)/4 343 .rept NR_syscalls-(.-sys_call_table)/4
334 .long sys_ni_syscall 344 .long sys_ni_syscall
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 04797b289c21..3b807b4bc7cd 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -80,10 +80,10 @@ config MACH_DECSTATION
80 If you have one of the following DECstation Models you definitely 80 If you have one of the following DECstation Models you definitely
81 want to choose R4xx0 for the CPU Type: 81 want to choose R4xx0 for the CPU Type:
82 82
83 DECstation 5000/50 83 DECstation 5000/50
84 DECstation 5000/150 84 DECstation 5000/150
85 DECstation 5000/260 85 DECstation 5000/260
86 DECsystem 5900/260 86 DECsystem 5900/260
87 87
88 otherwise choose R3000. 88 otherwise choose R3000.
89 89
@@ -818,20 +818,6 @@ config EMMA2RH
818config SERIAL_RM9000 818config SERIAL_RM9000
819 bool 819 bool
820 820
821#
822# Unfortunately not all GT64120 systems run the chip at the same clock.
823# As the user for the clock rate and try to minimize the available options.
824#
825choice
826 prompt "Galileo Chip Clock"
827 depends on MOMENCO_OCELOT
828 default SYSCLK_100 if MOMENCO_OCELOT
829
830config SYSCLK_100
831 bool "100" if MOMENCO_OCELOT
832
833endchoice
834
835config ARC32 821config ARC32
836 bool 822 bool
837 823
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index b8a5e75ba0ab..3e634f2f5443 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(dec_kn_slot_size);
55 55
56int dec_tc_bus; 56int dec_tc_bus;
57 57
58spinlock_t ioasic_ssr_lock; 58DEFINE_SPINLOCK(ioasic_ssr_lock);
59 59
60volatile u32 *ioasic_base; 60volatile u32 *ioasic_base;
61 61
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index ac04f0adc408..6648fde20b96 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2003, 2004 Maciej W. Rozycki 2 * Copyright (C) 2003, 2004, 2007 Maciej W. Rozycki
3 * 3 *
4 * This program is free software; you can redistribute it and/or 4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License 5 * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@ static inline void align_mod(const int align, const int mod)
29 ".endr\n\t" 29 ".endr\n\t"
30 ".set pop" 30 ".set pop"
31 : 31 :
32 : "rn" (align), "rn" (mod)); 32 : GCC_IMM_ASM (align), GCC_IMM_ASM (mod));
33} 33}
34 34
35static inline void mult_sh_align_mod(long *v1, long *v2, long *w, 35static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 06448a9656dc..3e004161ebd5 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -199,7 +199,14 @@ static inline void check_wait(void)
199 if ((c->processor_id & 0xff) <= 0x64) 199 if ((c->processor_id & 0xff) <= 0x64)
200 break; 200 break;
201 201
202 cpu_wait = r4k_wait; 202 /*
203 * Another rev is incremeting c0_count at a reduced clock
204 * rate while in WAIT mode. So we basically have the choice
205 * between using the cp0 timer as clocksource or avoiding
206 * the WAIT instruction. Until more details are known,
207 * disable the use of WAIT for 20Kc entirely.
208 cpu_wait = r4k_wait;
209 */
203 break; 210 break;
204 case CPU_RM9000: 211 case CPU_RM9000:
205 if ((c->processor_id & 0x00ff) >= 0x40) 212 if ((c->processor_id & 0x00ff) >= 0x40)
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 2345160e63fc..b6c30800c667 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -36,6 +36,7 @@ void mask_and_ack_8259A(unsigned int);
36static struct irq_chip i8259A_chip = { 36static struct irq_chip i8259A_chip = {
37 .name = "XT-PIC", 37 .name = "XT-PIC",
38 .mask = disable_8259A_irq, 38 .mask = disable_8259A_irq,
39 .disable = disable_8259A_irq,
39 .unmask = enable_8259A_irq, 40 .unmask = enable_8259A_irq,
40 .mask_ack = mask_and_ack_8259A, 41 .mask_ack = mask_and_ack_8259A,
41}; 42};
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index aab89e97abb5..1ba00c15505b 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -56,8 +56,6 @@ static struct chan_waitqueues {
56 struct mutex mutex; 56 struct mutex mutex;
57} channel_wqs[RTLX_CHANNELS]; 57} channel_wqs[RTLX_CHANNELS];
58 58
59static struct irqaction irq;
60static int irq_num;
61static struct vpe_notifications notify; 59static struct vpe_notifications notify;
62static int sp_stopping = 0; 60static int sp_stopping = 0;
63 61
@@ -111,7 +109,7 @@ static void __used dump_rtlx(void)
111static int rtlx_init(struct rtlx_info *rtlxi) 109static int rtlx_init(struct rtlx_info *rtlxi)
112{ 110{
113 if (rtlxi->id != RTLX_ID) { 111 if (rtlxi->id != RTLX_ID) {
114 printk(KERN_ERR "no valid RTLX id at 0x%p 0x%x\n", rtlxi, rtlxi->id); 112 printk(KERN_ERR "no valid RTLX id at 0x%p 0x%lx\n", rtlxi, rtlxi->id);
115 return -ENOEXEC; 113 return -ENOEXEC;
116 } 114 }
117 115
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 53d7a977193c..118be24224f2 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -375,7 +375,7 @@ EXPORT(sysn32_call_table)
375 PTR sys_mkdirat 375 PTR sys_mkdirat
376 PTR sys_mknodat 376 PTR sys_mknodat
377 PTR sys_fchownat 377 PTR sys_fchownat
378 PTR sys_futimesat /* 6255 */ 378 PTR compat_sys_futimesat /* 6255 */
379 PTR sys_newfstatat 379 PTR sys_newfstatat
380 PTR sys_unlinkat 380 PTR sys_unlinkat
381 PTR sys_renameat 381 PTR sys_renameat
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index d48d1d5bea0a..9a5596bf8571 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -16,6 +16,7 @@
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/sched.h> 17#include <linux/sched.h>
18#include <linux/param.h> 18#include <linux/param.h>
19#include <linux/profile.h>
19#include <linux/time.h> 20#include <linux/time.h>
20#include <linux/timex.h> 21#include <linux/timex.h>
21#include <linux/smp.h> 22#include <linux/smp.h>
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c
index 97aeb8c4e601..b73f21823c5e 100644
--- a/arch/mips/mips-boards/malta/malta_int.c
+++ b/arch/mips/mips-boards/malta/malta_int.c
@@ -256,7 +256,7 @@ asmlinkage void plat_irq_dispatch(void)
256 256
257 if (irq == MIPSCPU_INT_I8259A) 257 if (irq == MIPSCPU_INT_I8259A)
258 malta_hw0_irqdispatch(); 258 malta_hw0_irqdispatch();
259 else if (irq > 0) 259 else if (irq >= 0)
260 do_IRQ(MIPS_CPU_IRQ_BASE + irq); 260 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
261 else 261 else
262 spurious_interrupt(); 262 spurious_interrupt();
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 76903c727647..f60b3dc0fc62 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -35,7 +35,7 @@ static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
35static inline int cpu_is_noncoherent_r10000(struct device *dev) 35static inline int cpu_is_noncoherent_r10000(struct device *dev)
36{ 36{
37 return !plat_device_is_coherent(dev) && 37 return !plat_device_is_coherent(dev) &&
38 (current_cpu_data.cputype == CPU_R10000 && 38 (current_cpu_data.cputype == CPU_R10000 ||
39 current_cpu_data.cputype == CPU_R12000); 39 current_cpu_data.cputype == CPU_R12000);
40} 40}
41 41
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 09d91505b90c..5240432e6d1d 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -8,6 +8,7 @@
8 * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com 8 * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
9 * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. 9 * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
10 */ 10 */
11#include <linux/bug.h>
11#include <linux/init.h> 12#include <linux/init.h>
12#include <linux/module.h> 13#include <linux/module.h>
13#include <linux/signal.h> 14#include <linux/signal.h>
@@ -132,6 +133,8 @@ void *kmap_coherent(struct page *page, unsigned long addr)
132 pte_t pte; 133 pte_t pte;
133 int tlbidx; 134 int tlbidx;
134 135
136 BUG_ON(Page_dcache_dirty(page));
137
135 inc_preempt_count(); 138 inc_preempt_count();
136 idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); 139 idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1);
137#ifdef CONFIG_MIPS_MT_SMTC 140#ifdef CONFIG_MIPS_MT_SMTC
@@ -208,7 +211,7 @@ void copy_user_highpage(struct page *to, struct page *from,
208 void *vfrom, *vto; 211 void *vfrom, *vto;
209 212
210 vto = kmap_atomic(to, KM_USER1); 213 vto = kmap_atomic(to, KM_USER1);
211 if (cpu_has_dc_aliases) { 214 if (cpu_has_dc_aliases && !Page_dcache_dirty(from)) {
212 vfrom = kmap_coherent(from, vaddr); 215 vfrom = kmap_coherent(from, vaddr);
213 copy_page(vto, vfrom); 216 copy_page(vto, vfrom);
214 kunmap_coherent(); 217 kunmap_coherent();
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 4ec0964b8394..6c425b052442 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -58,6 +58,21 @@ static __init int __maybe_unused r10000_llsc_war(void)
58} 58}
59 59
60/* 60/*
61 * Found by experiment: At least some revisions of the 4kc throw under
62 * some circumstances a machine check exception, triggered by invalid
63 * values in the index register. Delaying the tlbp instruction until
64 * after the next branch, plus adding an additional nop in front of
65 * tlbwi/tlbwr avoids the invalid index register values. Nobody knows
66 * why; it's not an issue caused by the core RTL.
67 *
68 */
69static __init int __attribute__((unused)) m4kc_tlbp_war(void)
70{
71 return (current_cpu_data.processor_id & 0xffff00) ==
72 (PRID_COMP_MIPS | PRID_IMP_4KC);
73}
74
75/*
61 * A little micro-assembler, intended for TLB refill handler 76 * A little micro-assembler, intended for TLB refill handler
62 * synthesizing. It is intentionally kept simple, does only support 77 * synthesizing. It is intentionally kept simple, does only support
63 * a subset of instructions, and does not try to hide pipeline effects 78 * a subset of instructions, and does not try to hide pipeline effects
@@ -78,7 +93,7 @@ enum fields
78 SET = 0x200 93 SET = 0x200
79}; 94};
80 95
81#define OP_MASK 0x2f 96#define OP_MASK 0x3f
82#define OP_SH 26 97#define OP_SH 26
83#define RS_MASK 0x1f 98#define RS_MASK 0x1f
84#define RS_SH 21 99#define RS_SH 21
@@ -92,7 +107,7 @@ enum fields
92#define IMM_SH 0 107#define IMM_SH 0
93#define JIMM_MASK 0x3ffffff 108#define JIMM_MASK 0x3ffffff
94#define JIMM_SH 0 109#define JIMM_SH 0
95#define FUNC_MASK 0x2f 110#define FUNC_MASK 0x3f
96#define FUNC_SH 0 111#define FUNC_SH 0
97#define SET_MASK 0x7 112#define SET_MASK 0x7
98#define SET_SH 0 113#define SET_SH 0
@@ -894,6 +909,8 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
894 case CPU_20KC: 909 case CPU_20KC:
895 case CPU_25KF: 910 case CPU_25KF:
896 case CPU_LOONGSON2: 911 case CPU_LOONGSON2:
912 if (m4kc_tlbp_war())
913 i_nop(p);
897 tlbw(p); 914 tlbw(p);
898 break; 915 break;
899 916
@@ -1705,7 +1722,8 @@ build_r4000_tlbchange_handler_head(u32 **p, struct label **l,
1705 l_smp_pgtable_change(l, *p); 1722 l_smp_pgtable_change(l, *p);
1706# endif 1723# endif
1707 iPTE_LW(p, l, pte, ptr); /* get even pte */ 1724 iPTE_LW(p, l, pte, ptr); /* get even pte */
1708 build_tlb_probe_entry(p); 1725 if (!m4kc_tlbp_war())
1726 build_tlb_probe_entry(p);
1709} 1727}
1710 1728
1711static void __init 1729static void __init
@@ -1747,6 +1765,8 @@ static void __init build_r4000_tlb_load_handler(void)
1747 1765
1748 build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1); 1766 build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1);
1749 build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl); 1767 build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl);
1768 if (m4kc_tlbp_war())
1769 build_tlb_probe_entry(&p);
1750 build_make_valid(&p, &r, K0, K1); 1770 build_make_valid(&p, &r, K0, K1);
1751 build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1); 1771 build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1);
1752 1772
@@ -1781,6 +1801,8 @@ static void __init build_r4000_tlb_store_handler(void)
1781 1801
1782 build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1); 1802 build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1);
1783 build_pte_writable(&p, &l, &r, K0, K1, label_nopage_tlbs); 1803 build_pte_writable(&p, &l, &r, K0, K1, label_nopage_tlbs);
1804 if (m4kc_tlbp_war())
1805 build_tlb_probe_entry(&p);
1784 build_make_write(&p, &r, K0, K1); 1806 build_make_write(&p, &r, K0, K1);
1785 build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1); 1807 build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1);
1786 1808
@@ -1815,6 +1837,8 @@ static void __init build_r4000_tlb_modify_handler(void)
1815 1837
1816 build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1); 1838 build_r4000_tlbchange_handler_head(&p, &l, &r, K0, K1);
1817 build_pte_modifiable(&p, &l, &r, K0, K1, label_nopage_tlbm); 1839 build_pte_modifiable(&p, &l, &r, K0, K1, label_nopage_tlbm);
1840 if (m4kc_tlbp_war())
1841 build_tlb_probe_entry(&p);
1818 /* Present and writable bits set, set accessed and dirty bits. */ 1842 /* Present and writable bits set, set accessed and dirty bits. */
1819 build_make_write(&p, &r, K0, K1); 1843 build_make_write(&p, &r, K0, K1);
1820 build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1); 1844 build_r4000_tlbchange_handler_tail(&p, &l, &r, K0, K1);
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 6c5c684d1422..589b745d822a 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -141,6 +141,7 @@ static int __init pcibios_init(void)
141 141
142 bus = pci_scan_bus(next_busno, hose->pci_ops, hose); 142 bus = pci_scan_bus(next_busno, hose->pci_ops, hose);
143 hose->bus = bus; 143 hose->bus = bus;
144 need_domain_info = need_domain_info || hose->index;
144 hose->need_domain_info = need_domain_info; 145 hose->need_domain_info = need_domain_info;
145 if (bus) { 146 if (bus) {
146 next_busno = bus->subordinate + 1; 147 next_busno = bus->subordinate + 1;
diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
index 78b608d2d4e1..28ffec8e5d1a 100644
--- a/arch/mips/sgi-ip22/ip22-platform.c
+++ b/arch/mips/sgi-ip22/ip22-platform.c
@@ -150,8 +150,8 @@ static int __init sgiseeq_devinit(void)
150 return res; 150 return res;
151 151
152 /* Second HPC is missing? */ 152 /* Second HPC is missing? */
153 if (ip22_is_fullhouse() || 153 if (!ip22_is_fullhouse() ||
154 !get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1])) 154 get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
155 return 0; 155 return 0;
156 156
157 sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 | SGIMC_GIOPAR_EXP164 | 157 sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 | SGIMC_GIOPAR_EXP164 |
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index 8e88a442b22a..de3d01823ad5 100644
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -114,8 +114,8 @@ static unsigned long dosample(void)
114 } while (msb); 114 } while (msb);
115 115
116 /* Stop the counter. */ 116 /* Stop the counter. */
117 writeb(sgint->tcword, (SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL | 117 writeb(SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL | SGINT_TCWORD_MSWST,
118 SGINT_TCWORD_MSWST)); 118 &sgint->tcword);
119 /* 119 /*
120 * Return the difference, this is how far the r4k counter increments 120 * Return the difference, this is how far the r4k counter increments
121 * for every 1/HZ seconds. We round off the nearest 1 MHz of master 121 * for every 1/HZ seconds. We round off the nearest 1 MHz of master
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
index e6b003ec6716..fdd7bd98fb44 100644
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
@@ -48,7 +48,6 @@ config SIBYTE_BCM1x55
48 48
49config SIBYTE_SB1xxx_SOC 49config SIBYTE_SB1xxx_SOC
50 bool 50 bool
51 depends on EXPERIMENTAL
52 select DMA_COHERENT 51 select DMA_COHERENT
53 select SIBYTE_CFE 52 select SIBYTE_CFE
54 select SWAP_IO_SPACE 53 select SWAP_IO_SPACE
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 79ae6ef979bb..e729b5f30264 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -100,8 +100,8 @@ DEFINE_SPINLOCK(bcm1480_imr_lock);
100 100
101void bcm1480_mask_irq(int cpu, int irq) 101void bcm1480_mask_irq(int cpu, int irq)
102{ 102{
103 unsigned long flags; 103 unsigned long flags, hl_spacing;
104 u64 cur_ints,hl_spacing; 104 u64 cur_ints;
105 105
106 spin_lock_irqsave(&bcm1480_imr_lock, flags); 106 spin_lock_irqsave(&bcm1480_imr_lock, flags);
107 hl_spacing = 0; 107 hl_spacing = 0;
@@ -117,8 +117,8 @@ void bcm1480_mask_irq(int cpu, int irq)
117 117
118void bcm1480_unmask_irq(int cpu, int irq) 118void bcm1480_unmask_irq(int cpu, int irq)
119{ 119{
120 unsigned long flags; 120 unsigned long flags, hl_spacing;
121 u64 cur_ints,hl_spacing; 121 u64 cur_ints;
122 122
123 spin_lock_irqsave(&bcm1480_imr_lock, flags); 123 spin_lock_irqsave(&bcm1480_imr_lock, flags);
124 hl_spacing = 0; 124 hl_spacing = 0;
diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c
index bb28f28e8042..7e1aa348b8e0 100644
--- a/arch/mips/sibyte/bcm1480/setup.c
+++ b/arch/mips/sibyte/bcm1480/setup.c
@@ -15,6 +15,7 @@
15 * along with this program; if not, write to the Free Software 15 * along with this program; if not, write to the Free Software
16 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 16 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17 */ 17 */
18#include <linux/init.h>
18#include <linux/kernel.h> 19#include <linux/kernel.h>
19#include <linux/module.h> 20#include <linux/module.h>
20#include <linux/reboot.h> 21#include <linux/reboot.h>
@@ -35,6 +36,7 @@ unsigned int soc_type;
35EXPORT_SYMBOL(soc_type); 36EXPORT_SYMBOL(soc_type);
36unsigned int periph_rev; 37unsigned int periph_rev;
37unsigned int zbbus_mhz; 38unsigned int zbbus_mhz;
39EXPORT_SYMBOL(zbbus_mhz);
38 40
39static unsigned int part_type; 41static unsigned int part_type;
40 42
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 9a8c9af43b22..d6a38cd5018e 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -188,33 +188,21 @@ static struct ibmebus_dev* __devinit ibmebus_register_device_node(
188 struct device_node *dn) 188 struct device_node *dn)
189{ 189{
190 struct ibmebus_dev *dev; 190 struct ibmebus_dev *dev;
191 const char *loc_code; 191 int i, len, bus_len;
192 int length;
193
194 loc_code = of_get_property(dn, "ibm,loc-code", NULL);
195 if (!loc_code) {
196 printk(KERN_WARNING "%s: node %s missing 'ibm,loc-code'\n",
197 __FUNCTION__, dn->name ? dn->name : "<unknown>");
198 return ERR_PTR(-EINVAL);
199 }
200
201 if (strlen(loc_code) == 0) {
202 printk(KERN_WARNING "%s: 'ibm,loc-code' is invalid\n",
203 __FUNCTION__);
204 return ERR_PTR(-EINVAL);
205 }
206 192
207 dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL); 193 dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL);
208 if (!dev) { 194 if (!dev)
209 return ERR_PTR(-ENOMEM); 195 return ERR_PTR(-ENOMEM);
210 }
211 196
212 dev->ofdev.node = of_node_get(dn); 197 dev->ofdev.node = of_node_get(dn);
213 198
214 length = strlen(loc_code); 199 len = strlen(dn->full_name + 1);
215 memcpy(dev->ofdev.dev.bus_id, loc_code 200 bus_len = min(len, BUS_ID_SIZE - 1);
216 + (length - min(length, BUS_ID_SIZE - 1)), 201 memcpy(dev->ofdev.dev.bus_id, dn->full_name + 1
217 min(length, BUS_ID_SIZE - 1)); 202 + (len - bus_len), bus_len);
203 for (i = 0; i < bus_len; i++)
204 if (dev->ofdev.dev.bus_id[i] == '/')
205 dev->ofdev.dev.bus_id[i] = '_';
218 206
219 /* Register with generic device framework. */ 207 /* Register with generic device framework. */
220 if (ibmebus_register_device_common(dev, dn->name) != 0) { 208 if (ibmebus_register_device_common(dev, dn->name) != 0) {
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index cea8045ba40b..90fa11c72e1c 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -493,7 +493,7 @@ static int __init serial_dev_init(void)
493 493
494 return platform_device_register(&serial_device); 494 return platform_device_register(&serial_device);
495} 495}
496arch_initcall(serial_dev_init); 496device_initcall(serial_dev_init);
497 497
498 498
499/* 499/*
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 727a6699f2f4..c627cf86d1e3 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -239,7 +239,7 @@ static void snapshot_tb_and_purr(void *data)
239 struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data); 239 struct cpu_purr_data *p = &__get_cpu_var(cpu_purr_data);
240 240
241 local_irq_save(flags); 241 local_irq_save(flags);
242 p->tb = mftb(); 242 p->tb = get_tb_or_rtc();
243 p->purr = mfspr(SPRN_PURR); 243 p->purr = mfspr(SPRN_PURR);
244 wmb(); 244 wmb();
245 p->initialized = 1; 245 p->initialized = 1;
@@ -317,7 +317,7 @@ static void snapshot_purr(void)
317 */ 317 */
318void snapshot_timebase(void) 318void snapshot_timebase(void)
319{ 319{
320 __get_cpu_var(last_jiffy) = get_tb(); 320 __get_cpu_var(last_jiffy) = get_tb_or_rtc();
321 snapshot_purr(); 321 snapshot_purr();
322} 322}
323 323
@@ -684,6 +684,8 @@ void timer_interrupt(struct pt_regs * regs)
684 684
685 write_seqlock(&xtime_lock); 685 write_seqlock(&xtime_lock);
686 tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy; 686 tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy;
687 if (__USE_RTC() && tb_next_jiffy >= 1000000000)
688 tb_next_jiffy -= 1000000000;
687 if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) { 689 if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) {
688 tb_last_jiffy = tb_next_jiffy; 690 tb_last_jiffy = tb_next_jiffy;
689 do_timer(1); 691 do_timer(1);
@@ -977,7 +979,7 @@ void __init time_init(void)
977 tb_to_ns_scale = scale; 979 tb_to_ns_scale = scale;
978 tb_to_ns_shift = shift; 980 tb_to_ns_shift = shift;
979 /* Save the current timebase to pretty up CONFIG_PRINTK_TIME */ 981 /* Save the current timebase to pretty up CONFIG_PRINTK_TIME */
980 boot_tb = get_tb(); 982 boot_tb = get_tb_or_rtc();
981 983
982 tm = get_boot_time(); 984 tm = get_boot_time();
983 985
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index cef01e4e8989..213fa31ac537 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -98,6 +98,18 @@ static struct vdso_patch_def vdso_patches[] = {
98 CPU_FTR_USE_TB, 0, 98 CPU_FTR_USE_TB, 0,
99 "__kernel_gettimeofday", NULL 99 "__kernel_gettimeofday", NULL
100 }, 100 },
101 {
102 CPU_FTR_USE_TB, 0,
103 "__kernel_clock_gettime", NULL
104 },
105 {
106 CPU_FTR_USE_TB, 0,
107 "__kernel_clock_getres", NULL
108 },
109 {
110 CPU_FTR_USE_TB, 0,
111 "__kernel_get_tbfreq", NULL
112 },
101}; 113};
102 114
103/* 115/*
diff --git a/arch/powerpc/platforms/85xx/mpc8544_ds.c b/arch/powerpc/platforms/85xx/mpc8544_ds.c
index 0f834d8be444..48983bc56d46 100644
--- a/arch/powerpc/platforms/85xx/mpc8544_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8544_ds.c
@@ -178,7 +178,9 @@ define_machine(mpc8544_ds) {
178 .probe = mpc8544_ds_probe, 178 .probe = mpc8544_ds_probe,
179 .setup_arch = mpc8544_ds_setup_arch, 179 .setup_arch = mpc8544_ds_setup_arch,
180 .init_IRQ = mpc8544_ds_pic_init, 180 .init_IRQ = mpc8544_ds_pic_init,
181#ifdef CONFIG_PCI
181 .pcibios_fixup_bus = fsl_pcibios_fixup_bus, 182 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
183#endif
182 .get_irq = mpic_get_irq, 184 .get_irq = mpic_get_irq,
183 .restart = mpc85xx_restart, 185 .restart = mpc85xx_restart,
184 .calibrate_decr = generic_calibrate_decr, 186 .calibrate_decr = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 6a171e9abf7d..2d4cb7847604 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -351,10 +351,10 @@ define_machine(mpc85xx_cds) {
351 .get_irq = mpic_get_irq, 351 .get_irq = mpic_get_irq,
352#ifdef CONFIG_PCI 352#ifdef CONFIG_PCI
353 .restart = mpc85xx_cds_restart, 353 .restart = mpc85xx_cds_restart,
354 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
354#else 355#else
355 .restart = mpc85xx_restart, 356 .restart = mpc85xx_restart,
356#endif 357#endif
357 .calibrate_decr = generic_calibrate_decr, 358 .calibrate_decr = generic_calibrate_decr,
358 .progress = udbg_progress, 359 .progress = udbg_progress,
359 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
360}; 360};
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index be25ecd911ba..7ca7e676f1c4 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -207,5 +207,7 @@ define_machine(mpc85xx_mds) {
207 .restart = mpc85xx_restart, 207 .restart = mpc85xx_restart,
208 .calibrate_decr = generic_calibrate_decr, 208 .calibrate_decr = generic_calibrate_decr,
209 .progress = udbg_progress, 209 .progress = udbg_progress,
210#ifdef CONFIG_PCI
210 .pcibios_fixup_bus = fsl_pcibios_fixup_bus, 211 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
212#endif
211}; 213};
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 56b27caf7a27..47aafa76c933 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -250,5 +250,7 @@ define_machine(mpc86xx_hpcn) {
250 .time_init = mpc86xx_time_init, 250 .time_init = mpc86xx_time_init,
251 .calibrate_decr = generic_calibrate_decr, 251 .calibrate_decr = generic_calibrate_decr,
252 .progress = udbg_progress, 252 .progress = udbg_progress,
253#ifdef CONFIG_PCI
253 .pcibios_fixup_bus = fsl_pcibios_fixup_bus, 254 .pcibios_fixup_bus = fsl_pcibios_fixup_bus,
255#endif
254}; 256};
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index cfc249741592..19d4628edf79 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -285,6 +285,7 @@ config AXON_RAM
285config FSL_ULI1575 285config FSL_ULI1575
286 bool 286 bool
287 default n 287 default n
288 select GENERIC_ISA_DMA
288 help 289 help
289 Supports for the ULI1575 PCIe south bridge that exists on some 290 Supports for the ULI1575 PCIe south bridge that exists on some
290 Freescale reference boards. The boards all use the ULI in pretty 291 Freescale reference boards. The boards all use the ULI in pretty
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 095a30304c56..106d2921e2d9 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -236,27 +236,34 @@ static irqreturn_t
236spu_irq_class_0(int irq, void *data) 236spu_irq_class_0(int irq, void *data)
237{ 237{
238 struct spu *spu; 238 struct spu *spu;
239 unsigned long stat, mask;
239 240
240 spu = data; 241 spu = data;
241 spu->class_0_pending = 1; 242
243 mask = spu_int_mask_get(spu, 0);
244 stat = spu_int_stat_get(spu, 0);
245 stat &= mask;
246
247 spin_lock(&spu->register_lock);
248 spu->class_0_pending |= stat;
249 spin_unlock(&spu->register_lock);
250
242 spu->stop_callback(spu); 251 spu->stop_callback(spu);
243 252
253 spu_int_stat_clear(spu, 0, stat);
254
244 return IRQ_HANDLED; 255 return IRQ_HANDLED;
245} 256}
246 257
247int 258int
248spu_irq_class_0_bottom(struct spu *spu) 259spu_irq_class_0_bottom(struct spu *spu)
249{ 260{
250 unsigned long stat, mask;
251 unsigned long flags; 261 unsigned long flags;
252 262 unsigned long stat;
253 spu->class_0_pending = 0;
254 263
255 spin_lock_irqsave(&spu->register_lock, flags); 264 spin_lock_irqsave(&spu->register_lock, flags);
256 mask = spu_int_mask_get(spu, 0); 265 stat = spu->class_0_pending;
257 stat = spu_int_stat_get(spu, 0); 266 spu->class_0_pending = 0;
258
259 stat &= mask;
260 267
261 if (stat & 1) /* invalid DMA alignment */ 268 if (stat & 1) /* invalid DMA alignment */
262 __spu_trap_dma_align(spu); 269 __spu_trap_dma_align(spu);
@@ -267,7 +274,6 @@ spu_irq_class_0_bottom(struct spu *spu)
267 if (stat & 4) /* error on SPU */ 274 if (stat & 4) /* error on SPU */
268 __spu_trap_error(spu); 275 __spu_trap_error(spu);
269 276
270 spu_int_stat_clear(spu, 0, stat);
271 spin_unlock_irqrestore(&spu->register_lock, flags); 277 spin_unlock_irqrestore(&spu->register_lock, flags);
272 278
273 return (stat & 0x7) ? -EIO : 0; 279 return (stat & 0x7) ? -EIO : 0;
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index c784edd40ea7..5bebe7fbe056 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -579,7 +579,7 @@ static struct spu *find_victim(struct spu_context *ctx)
579 list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) { 579 list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) {
580 struct spu_context *tmp = spu->ctx; 580 struct spu_context *tmp = spu->ctx;
581 581
582 if (tmp->prio > ctx->prio && 582 if (tmp && tmp->prio > ctx->prio &&
583 (!victim || tmp->prio > victim->prio)) 583 (!victim || tmp->prio > victim->prio))
584 victim = spu->ctx; 584 victim = spu->ctx;
585 } 585 }
@@ -611,9 +611,9 @@ static struct spu *find_victim(struct spu_context *ctx)
611 611
612 mutex_lock(&cbe_spu_info[node].list_mutex); 612 mutex_lock(&cbe_spu_info[node].list_mutex);
613 cbe_spu_info[node].nr_active--; 613 cbe_spu_info[node].nr_active--;
614 spu_unbind_context(spu, victim);
614 mutex_unlock(&cbe_spu_info[node].list_mutex); 615 mutex_unlock(&cbe_spu_info[node].list_mutex);
615 616
616 spu_unbind_context(spu, victim);
617 victim->stats.invol_ctx_switch++; 617 victim->stats.invol_ctx_switch++;
618 spu->stats.invol_ctx_switch++; 618 spu->stats.invol_ctx_switch++;
619 mutex_unlock(&victim->state_mutex); 619 mutex_unlock(&victim->state_mutex);
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 87d52060fec0..2eb8f92704b4 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -83,6 +83,7 @@ enum ps3_dev_type {
83 PS3_DEV_TYPE_STOR_ROM = TYPE_ROM, /* 5 */ 83 PS3_DEV_TYPE_STOR_ROM = TYPE_ROM, /* 5 */
84 PS3_DEV_TYPE_SB_GPIO = 6, 84 PS3_DEV_TYPE_SB_GPIO = 6,
85 PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC, /* 14 */ 85 PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC, /* 14 */
86 PS3_DEV_TYPE_STOR_DUMMY = 32,
86 PS3_DEV_TYPE_NOACCESS = 255, 87 PS3_DEV_TYPE_NOACCESS = 255,
87}; 88};
88 89
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 8cc37cfea0f2..1c94824f7b63 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -349,6 +349,35 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
349 return result; 349 return result;
350 } 350 }
351 351
352 if (tmp.bus_type == PS3_BUS_TYPE_STORAGE) {
353 /*
354 * A storage device may show up in the repository before the
355 * hypervisor has finished probing its type and regions
356 */
357 unsigned int num_regions;
358
359 if (tmp.dev_type == PS3_DEV_TYPE_STOR_DUMMY) {
360 pr_debug("%s:%u storage device not ready\n", __func__,
361 __LINE__);
362 return -ENODEV;
363 }
364
365 result = ps3_repository_read_stor_dev_num_regions(tmp.bus_index,
366 tmp.dev_index,
367 &num_regions);
368 if (result) {
369 pr_debug("%s:%d read_stor_dev_num_regions failed\n",
370 __func__, __LINE__);
371 return result;
372 }
373
374 if (!num_regions) {
375 pr_debug("%s:%u storage device has no regions yet\n",
376 __func__, __LINE__);
377 return -ENODEV;
378 }
379 }
380
352 result = ps3_repository_read_dev_id(tmp.bus_index, tmp.dev_index, 381 result = ps3_repository_read_dev_id(tmp.bus_index, tmp.dev_index,
353 &tmp.dev_id); 382 &tmp.dev_id);
354 383
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index ac2a4b8a4c14..d1630a074acf 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -505,6 +505,8 @@ static void mfc_sr1_set(struct spu *spu, u64 sr1)
505 static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK 505 static const u64 allowed = ~(MFC_STATE1_LOCAL_STORAGE_DECODE_MASK
506 | MFC_STATE1_PROBLEM_STATE_MASK); 506 | MFC_STATE1_PROBLEM_STATE_MASK);
507 507
508 sr1 |= MFC_STATE1_MASTER_RUN_CONTROL_MASK;
509
508 BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed)); 510 BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed));
509 511
510 spu_pdata(spu)->cache.sr1 = sr1; 512 spu_pdata(spu)->cache.sr1 = sr1;
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c
index 924412974795..c827715a5090 100644
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2_common.c
@@ -102,7 +102,7 @@ cpm_setbrg(uint brg, uint rate)
102 brg -= 4; 102 brg -= 4;
103 } 103 }
104 bp += brg; 104 bp += brg;
105 *bp = ((BRG_UART_CLK / rate) << 1) | CPM_BRG_EN; 105 out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
106 106
107 cpm2_unmap(bp); 107 cpm2_unmap(bp);
108} 108}
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index 944c35c24278..eb8d26f87362 100644
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -495,9 +495,7 @@ LoadLargeDTLB:
495 lwz r11, 4(r0) 495 lwz r11, 4(r0)
496 496
497 lwz r12, 16(r0) 497 lwz r12, 16(r0)
498#ifdef CONFIG_8xx_CPU6
499 lwz r3, 8(r0) 498 lwz r3, 8(r0)
500#endif
501 rfi 499 rfi
502 500
503/* This is the data TLB error on the MPC8xx. This could be due to 501/* This is the data TLB error on the MPC8xx. This could be due to
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 68338a601f70..7d07297db878 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.23-rc1 3# Linux kernel version: 2.6.23-rc6
4# Sun Jul 22 19:24:37 2007 4# Sun Sep 16 09:52:11 2007
5# 5#
6CONFIG_SPARC=y 6CONFIG_SPARC=y
7CONFIG_SPARC64=y 7CONFIG_SPARC64=y
@@ -32,15 +32,11 @@ CONFIG_HZ=100
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33 33
34# 34#
35# Code maturity level options 35# General setup
36# 36#
37CONFIG_EXPERIMENTAL=y 37CONFIG_EXPERIMENTAL=y
38CONFIG_BROKEN_ON_SMP=y 38CONFIG_BROKEN_ON_SMP=y
39CONFIG_INIT_ENV_ARG_LIMIT=32 39CONFIG_INIT_ENV_ARG_LIMIT=32
40
41#
42# General setup
43#
44CONFIG_LOCALVERSION="" 40CONFIG_LOCALVERSION=""
45# CONFIG_LOCALVERSION_AUTO is not set 41# CONFIG_LOCALVERSION_AUTO is not set
46CONFIG_SWAP=y 42CONFIG_SWAP=y
@@ -555,6 +551,7 @@ CONFIG_E1000_NAPI=y
555# CONFIG_SIS190 is not set 551# CONFIG_SIS190 is not set
556# CONFIG_SKGE is not set 552# CONFIG_SKGE is not set
557# CONFIG_SKY2 is not set 553# CONFIG_SKY2 is not set
554# CONFIG_SK98LIN is not set
558# CONFIG_VIA_VELOCITY is not set 555# CONFIG_VIA_VELOCITY is not set
559CONFIG_TIGON3=m 556CONFIG_TIGON3=m
560CONFIG_BNX2=m 557CONFIG_BNX2=m
@@ -809,6 +806,7 @@ CONFIG_HWMON=y
809# CONFIG_SENSORS_SMSC47M1 is not set 806# CONFIG_SENSORS_SMSC47M1 is not set
810# CONFIG_SENSORS_SMSC47M192 is not set 807# CONFIG_SENSORS_SMSC47M192 is not set
811# CONFIG_SENSORS_SMSC47B397 is not set 808# CONFIG_SENSORS_SMSC47B397 is not set
809# CONFIG_SENSORS_THMC50 is not set
812# CONFIG_SENSORS_VIA686A is not set 810# CONFIG_SENSORS_VIA686A is not set
813# CONFIG_SENSORS_VT1211 is not set 811# CONFIG_SENSORS_VT1211 is not set
814# CONFIG_SENSORS_VT8231 is not set 812# CONFIG_SENSORS_VT8231 is not set
@@ -1162,10 +1160,6 @@ CONFIG_USB_STORAGE=m
1162# CONFIG_MMC is not set 1160# CONFIG_MMC is not set
1163# CONFIG_NEW_LEDS is not set 1161# CONFIG_NEW_LEDS is not set
1164# CONFIG_INFINIBAND is not set 1162# CONFIG_INFINIBAND is not set
1165
1166#
1167# Real Time Clock
1168#
1169# CONFIG_RTC_CLASS is not set 1163# CONFIG_RTC_CLASS is not set
1170 1164
1171# 1165#
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 63144ad476f6..c4147ad8677b 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -98,7 +98,7 @@ sparc64_boot:
98 .globl prom_boot_mapped_pc, prom_boot_mapping_mode 98 .globl prom_boot_mapped_pc, prom_boot_mapping_mode
99 .globl prom_boot_mapping_phys_high, prom_boot_mapping_phys_low 99 .globl prom_boot_mapping_phys_high, prom_boot_mapping_phys_low
100 .globl prom_compatible_name, prom_cpu_path, prom_cpu_compatible 100 .globl prom_compatible_name, prom_cpu_path, prom_cpu_compatible
101 .globl is_sun4v, sun4v_chip_type 101 .globl is_sun4v, sun4v_chip_type, prom_set_trap_table_name
102prom_peer_name: 102prom_peer_name:
103 .asciz "peer" 103 .asciz "peer"
104prom_compatible_name: 104prom_compatible_name:
@@ -121,6 +121,8 @@ prom_map_name:
121 .asciz "map" 121 .asciz "map"
122prom_unmap_name: 122prom_unmap_name:
123 .asciz "unmap" 123 .asciz "unmap"
124prom_set_trap_table_name:
125 .asciz "SUNW,set-trap-table"
124prom_sun4v_name: 126prom_sun4v_name:
125 .asciz "sun4v" 127 .asciz "sun4v"
126prom_niagara_prefix: 128prom_niagara_prefix:
@@ -691,15 +693,38 @@ setup_trap_table:
691 sethi %hi(kern_base), %g3 693 sethi %hi(kern_base), %g3
692 ldx [%g3 + %lo(kern_base)], %g3 694 ldx [%g3 + %lo(kern_base)], %g3
693 add %g2, %g3, %o1 695 add %g2, %g3, %o1
696 sethi %hi(sparc64_ttable_tl0), %o0
694 697
695 call prom_set_trap_table_sun4v 698 set prom_set_trap_table_name, %g2
696 sethi %hi(sparc64_ttable_tl0), %o0 699 stx %g2, [%sp + 2047 + 128 + 0x00]
700 mov 2, %g2
701 stx %g2, [%sp + 2047 + 128 + 0x08]
702 mov 0, %g2
703 stx %g2, [%sp + 2047 + 128 + 0x10]
704 stx %o0, [%sp + 2047 + 128 + 0x18]
705 stx %o1, [%sp + 2047 + 128 + 0x20]
706 sethi %hi(p1275buf), %g2
707 or %g2, %lo(p1275buf), %g2
708 ldx [%g2 + 0x08], %o1
709 call %o1
710 add %sp, (2047 + 128), %o0
697 711
698 ba,pt %xcc, 2f 712 ba,pt %xcc, 2f
699 nop 713 nop
700 714
7011: call prom_set_trap_table 7151: sethi %hi(sparc64_ttable_tl0), %o0
702 sethi %hi(sparc64_ttable_tl0), %o0 716 set prom_set_trap_table_name, %g2
717 stx %g2, [%sp + 2047 + 128 + 0x00]
718 mov 1, %g2
719 stx %g2, [%sp + 2047 + 128 + 0x08]
720 mov 0, %g2
721 stx %g2, [%sp + 2047 + 128 + 0x10]
722 stx %o0, [%sp + 2047 + 128 + 0x18]
723 sethi %hi(p1275buf), %g2
724 or %g2, %lo(p1275buf), %g2
725 ldx [%g2 + 0x08], %o1
726 call %o1
727 add %sp, (2047 + 128), %o0
703 728
704 /* Start using proper page size encodings in ctx register. */ 729 /* Start using proper page size encodings in ctx register. */
7052: sethi %hi(sparc64_kern_pri_context), %g3 7302: sethi %hi(sparc64_kern_pri_context), %g3
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c
index 9f22e4ff6015..856659bb1311 100644
--- a/arch/sparc64/kernel/mdesc.c
+++ b/arch/sparc64/kernel/mdesc.c
@@ -777,8 +777,12 @@ void __devinit mdesc_fill_in_cpu_data(cpumask_t mask)
777 cpuid = *id; 777 cpuid = *id;
778 778
779#ifdef CONFIG_SMP 779#ifdef CONFIG_SMP
780 if (cpuid >= NR_CPUS) 780 if (cpuid >= NR_CPUS) {
781 printk(KERN_WARNING "Ignoring CPU %d which is "
782 ">= NR_CPUS (%d)\n",
783 cpuid, NR_CPUS);
781 continue; 784 continue;
785 }
782 if (!cpu_isset(cpuid, mask)) 786 if (!cpu_isset(cpuid, mask))
783 continue; 787 continue;
784#else 788#else
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 139b4cff8019..e8dac81d8a0d 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -744,7 +744,7 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
744{ 744{
745 struct device_node *child; 745 struct device_node *child;
746 const u32 *reg; 746 const u32 *reg;
747 int reglen, devfn; 747 int reglen, devfn, prev_devfn;
748 struct pci_dev *dev; 748 struct pci_dev *dev;
749 749
750 if (ofpci_verbose) 750 if (ofpci_verbose)
@@ -752,14 +752,25 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
752 node->full_name, bus->number); 752 node->full_name, bus->number);
753 753
754 child = NULL; 754 child = NULL;
755 prev_devfn = -1;
755 while ((child = of_get_next_child(node, child)) != NULL) { 756 while ((child = of_get_next_child(node, child)) != NULL) {
756 if (ofpci_verbose) 757 if (ofpci_verbose)
757 printk(" * %s\n", child->full_name); 758 printk(" * %s\n", child->full_name);
758 reg = of_get_property(child, "reg", &reglen); 759 reg = of_get_property(child, "reg", &reglen);
759 if (reg == NULL || reglen < 20) 760 if (reg == NULL || reglen < 20)
760 continue; 761 continue;
762
761 devfn = (reg[0] >> 8) & 0xff; 763 devfn = (reg[0] >> 8) & 0xff;
762 764
765 /* This is a workaround for some device trees
766 * which list PCI devices twice. On the V100
767 * for example, device number 3 is listed twice.
768 * Once as "pm" and once again as "lomp".
769 */
770 if (devfn == prev_devfn)
771 continue;
772 prev_devfn = devfn;
773
763 /* create a new pci_dev for this device */ 774 /* create a new pci_dev for this device */
764 dev = of_create_pci_dev(pbm, child, bus, devfn, 0); 775 dev = of_create_pci_dev(pbm, child, bus, devfn, 0);
765 if (!dev) 776 if (!dev)
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index d1a78c976cef..0614dff63d7c 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1583,8 +1583,12 @@ static void __init of_fill_in_cpu_data(void)
1583 ncpus_probed++; 1583 ncpus_probed++;
1584 1584
1585#ifdef CONFIG_SMP 1585#ifdef CONFIG_SMP
1586 if (cpuid >= NR_CPUS) 1586 if (cpuid >= NR_CPUS) {
1587 printk(KERN_WARNING "Ignoring CPU %d which is "
1588 ">= NR_CPUS (%d)\n",
1589 cpuid, NR_CPUS);
1587 continue; 1590 continue;
1591 }
1588#else 1592#else
1589 /* On uniprocessor we only want the values for the 1593 /* On uniprocessor we only want the values for the
1590 * real physical cpu the kernel booted onto, however 1594 * real physical cpu the kernel booted onto, however
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 9533a25ce5d2..04e81dda13d0 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -345,7 +345,7 @@ after_lock_tlb:
345 sethi %hi(tramp_stack), %g1 345 sethi %hi(tramp_stack), %g1
346 or %g1, %lo(tramp_stack), %g1 346 or %g1, %lo(tramp_stack), %g1
347 add %g1, TRAMP_STACK_SIZE, %g1 347 add %g1, TRAMP_STACK_SIZE, %g1
348 sub %g1, STACKFRAME_SZ + STACK_BIAS, %sp 348 sub %g1, STACKFRAME_SZ + STACK_BIAS + 256, %sp
349 mov 0, %fp 349 mov 0, %fp
350 350
351 /* Put garbage in these registers to trap any access to them. */ 351 /* Put garbage in these registers to trap any access to them. */
@@ -411,15 +411,38 @@ after_lock_tlb:
411 sethi %hi(kern_base), %g3 411 sethi %hi(kern_base), %g3
412 ldx [%g3 + %lo(kern_base)], %g3 412 ldx [%g3 + %lo(kern_base)], %g3
413 add %g2, %g3, %o1 413 add %g2, %g3, %o1
414 sethi %hi(sparc64_ttable_tl0), %o0
414 415
415 call prom_set_trap_table_sun4v 416 set prom_set_trap_table_name, %g2
416 sethi %hi(sparc64_ttable_tl0), %o0 417 stx %g2, [%sp + 2047 + 128 + 0x00]
418 mov 2, %g2
419 stx %g2, [%sp + 2047 + 128 + 0x08]
420 mov 0, %g2
421 stx %g2, [%sp + 2047 + 128 + 0x10]
422 stx %o0, [%sp + 2047 + 128 + 0x18]
423 stx %o1, [%sp + 2047 + 128 + 0x20]
424 sethi %hi(p1275buf), %g2
425 or %g2, %lo(p1275buf), %g2
426 ldx [%g2 + 0x08], %o1
427 call %o1
428 add %sp, (2047 + 128), %o0
417 429
418 ba,pt %xcc, 2f 430 ba,pt %xcc, 2f
419 nop 431 nop
420 432
4211: call prom_set_trap_table 4331: sethi %hi(sparc64_ttable_tl0), %o0
422 sethi %hi(sparc64_ttable_tl0), %o0 434 set prom_set_trap_table_name, %g2
435 stx %g2, [%sp + 2047 + 128 + 0x00]
436 mov 1, %g2
437 stx %g2, [%sp + 2047 + 128 + 0x08]
438 mov 0, %g2
439 stx %g2, [%sp + 2047 + 128 + 0x10]
440 stx %o0, [%sp + 2047 + 128 + 0x18]
441 sethi %hi(p1275buf), %g2
442 or %g2, %lo(p1275buf), %g2
443 ldx [%g2 + 0x08], %o1
444 call %o1
445 add %sp, (2047 + 128), %o0
423 446
4242: ldx [%l0], %g6 4472: ldx [%l0], %g6
425 ldx [%g6 + TI_TASK], %g4 448 ldx [%g6 + TI_TASK], %g4
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c
index 68c83ad04ad9..bbec7522826c 100644
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
@@ -143,22 +143,6 @@ unsigned char prom_get_idprom(char *idbuf, int num_bytes)
143 return 0xff; 143 return 0xff;
144} 144}
145 145
146/* Install Linux trap table so PROM uses that instead of its own. */
147void prom_set_trap_table(unsigned long tba)
148{
149 p1275_cmd("SUNW,set-trap-table",
150 (P1275_ARG(0, P1275_ARG_IN_64B) |
151 P1275_INOUT(1, 0)), tba);
152}
153
154void prom_set_trap_table_sun4v(unsigned long tba, unsigned long mmfsa)
155{
156 p1275_cmd("SUNW,set-trap-table",
157 (P1275_ARG(0, P1275_ARG_IN_64B) |
158 P1275_ARG(1, P1275_ARG_IN_64B) |
159 P1275_INOUT(2, 0)), tba, mmfsa);
160}
161
162int prom_get_mmu_ihandle(void) 146int prom_get_mmu_ihandle(void)
163{ 147{
164 int node, ret; 148 int node, ret;
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index 8d7f7c1cb9c6..6c2be26f1d7d 100644
--- a/arch/um/include/kern_util.h
+++ b/arch/um/include/kern_util.h
@@ -117,7 +117,7 @@ extern void sigio_handler(int sig, union uml_pt_regs *regs);
117 117
118extern void copy_sc(union uml_pt_regs *regs, void *from); 118extern void copy_sc(union uml_pt_regs *regs, void *from);
119 119
120unsigned long to_irq_stack(int sig, unsigned long *mask_out); 120extern unsigned long to_irq_stack(unsigned long *mask_out);
121unsigned long from_irq_stack(int nested); 121unsigned long from_irq_stack(int nested);
122 122
123#endif 123#endif
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 9870febdbead..cf0dd9cf8c43 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -518,13 +518,13 @@ int init_aio_irq(int irq, char *name, irq_handler_t handler)
518 518
519static unsigned long pending_mask; 519static unsigned long pending_mask;
520 520
521unsigned long to_irq_stack(int sig, unsigned long *mask_out) 521unsigned long to_irq_stack(unsigned long *mask_out)
522{ 522{
523 struct thread_info *ti; 523 struct thread_info *ti;
524 unsigned long mask, old; 524 unsigned long mask, old;
525 int nested; 525 int nested;
526 526
527 mask = xchg(&pending_mask, 1 << sig); 527 mask = xchg(&pending_mask, *mask_out);
528 if(mask != 0){ 528 if(mask != 0){
529 /* If any interrupts come in at this point, we want to 529 /* If any interrupts come in at this point, we want to
530 * make sure that their bits aren't lost by our 530 * make sure that their bits aren't lost by our
@@ -534,7 +534,7 @@ unsigned long to_irq_stack(int sig, unsigned long *mask_out)
534 * and pending_mask contains a bit for each interrupt 534 * and pending_mask contains a bit for each interrupt
535 * that came in. 535 * that came in.
536 */ 536 */
537 old = 1 << sig; 537 old = *mask_out;
538 do { 538 do {
539 old |= mask; 539 old |= mask;
540 mask = xchg(&pending_mask, old); 540 mask = xchg(&pending_mask, old);
@@ -550,6 +550,7 @@ unsigned long to_irq_stack(int sig, unsigned long *mask_out)
550 550
551 task = cpu_tasks[ti->cpu].task; 551 task = cpu_tasks[ti->cpu].task;
552 tti = task_thread_info(task); 552 tti = task_thread_info(task);
553
553 *ti = *tti; 554 *ti = *tti;
554 ti->real_thread = tti; 555 ti->real_thread = tti;
555 task->stack = ti; 556 task->stack = ti;
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 6f92f732d253..c3ecc2a84e0c 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -320,7 +320,8 @@ int os_file_size(char *file, unsigned long long *size_out)
320 } 320 }
321 321
322 if(S_ISBLK(buf.ust_mode)){ 322 if(S_ISBLK(buf.ust_mode)){
323 int fd, blocks; 323 int fd;
324 long blocks;
324 325
325 fd = os_open_file(file, of_read(OPENFLAGS()), 0); 326 fd = os_open_file(file, of_read(OPENFLAGS()), 0);
326 if(fd < 0){ 327 if(fd < 0){
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 18e5c8b67eb8..b98f7ea2d2f6 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -119,7 +119,7 @@ void (*handlers[_NSIG])(int sig, struct sigcontext *sc);
119 119
120void handle_signal(int sig, struct sigcontext *sc) 120void handle_signal(int sig, struct sigcontext *sc)
121{ 121{
122 unsigned long pending = 0; 122 unsigned long pending = 1UL << sig;
123 123
124 do { 124 do {
125 int nested, bail; 125 int nested, bail;
@@ -134,7 +134,7 @@ void handle_signal(int sig, struct sigcontext *sc)
134 * have to return, and the upper handler will deal 134 * have to return, and the upper handler will deal
135 * with this interrupt. 135 * with this interrupt.
136 */ 136 */
137 bail = to_irq_stack(sig, &pending); 137 bail = to_irq_stack(&pending);
138 if(bail) 138 if(bail)
139 return; 139 return;
140 140
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index ffa036406289..b4d9089a6a06 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -60,14 +60,6 @@ config ZONE_DMA
60 bool 60 bool
61 default y 61 default y
62 62
63config QUICKLIST
64 bool
65 default y
66
67config NR_QUICK
68 int
69 default 2
70
71config ISA 63config ISA
72 bool 64 bool
73 65
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 938278697e20..18b231810908 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -38,6 +38,18 @@
38 movq %rax,R8(%rsp) 38 movq %rax,R8(%rsp)
39 .endm 39 .endm
40 40
41 .macro LOAD_ARGS32 offset
42 movl \offset(%rsp),%r11d
43 movl \offset+8(%rsp),%r10d
44 movl \offset+16(%rsp),%r9d
45 movl \offset+24(%rsp),%r8d
46 movl \offset+40(%rsp),%ecx
47 movl \offset+48(%rsp),%edx
48 movl \offset+56(%rsp),%esi
49 movl \offset+64(%rsp),%edi
50 movl \offset+72(%rsp),%eax
51 .endm
52
41 .macro CFI_STARTPROC32 simple 53 .macro CFI_STARTPROC32 simple
42 CFI_STARTPROC \simple 54 CFI_STARTPROC \simple
43 CFI_UNDEFINED r8 55 CFI_UNDEFINED r8
@@ -152,7 +164,7 @@ sysenter_tracesys:
152 movq $-ENOSYS,RAX(%rsp) /* really needed? */ 164 movq $-ENOSYS,RAX(%rsp) /* really needed? */
153 movq %rsp,%rdi /* &pt_regs -> arg1 */ 165 movq %rsp,%rdi /* &pt_regs -> arg1 */
154 call syscall_trace_enter 166 call syscall_trace_enter
155 LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */ 167 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
156 RESTORE_REST 168 RESTORE_REST
157 movl %ebp, %ebp 169 movl %ebp, %ebp
158 /* no need to do an access_ok check here because rbp has been 170 /* no need to do an access_ok check here because rbp has been
@@ -255,7 +267,7 @@ cstar_tracesys:
255 movq $-ENOSYS,RAX(%rsp) /* really needed? */ 267 movq $-ENOSYS,RAX(%rsp) /* really needed? */
256 movq %rsp,%rdi /* &pt_regs -> arg1 */ 268 movq %rsp,%rdi /* &pt_regs -> arg1 */
257 call syscall_trace_enter 269 call syscall_trace_enter
258 LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */ 270 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
259 RESTORE_REST 271 RESTORE_REST
260 movl RSP-ARGOFFSET(%rsp), %r8d 272 movl RSP-ARGOFFSET(%rsp), %r8d
261 /* no need to do an access_ok check here because r8 has been 273 /* no need to do an access_ok check here because r8 has been
@@ -334,7 +346,7 @@ ia32_tracesys:
334 movq $-ENOSYS,RAX(%rsp) /* really needed? */ 346 movq $-ENOSYS,RAX(%rsp) /* really needed? */
335 movq %rsp,%rdi /* &pt_regs -> arg1 */ 347 movq %rsp,%rdi /* &pt_regs -> arg1 */
336 call syscall_trace_enter 348 call syscall_trace_enter
337 LOAD_ARGS ARGOFFSET /* reload args from stack in case ptrace changed it */ 349 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
338 RESTORE_REST 350 RESTORE_REST
339 jmp ia32_do_syscall 351 jmp ia32_do_syscall
340END(ia32_syscall) 352END(ia32_syscall)
diff --git a/arch/x86_64/kernel/acpi/wakeup.S b/arch/x86_64/kernel/acpi/wakeup.S
index 13f1480cbec9..a06f2bcabef9 100644
--- a/arch/x86_64/kernel/acpi/wakeup.S
+++ b/arch/x86_64/kernel/acpi/wakeup.S
@@ -81,7 +81,7 @@ wakeup_code:
81 testl $2, realmode_flags - wakeup_code 81 testl $2, realmode_flags - wakeup_code
82 jz 1f 82 jz 1f
83 mov video_mode - wakeup_code, %ax 83 mov video_mode - wakeup_code, %ax
84 call mode_seta 84 call mode_set
851: 851:
86 86
87 movw $0xb800, %ax 87 movw $0xb800, %ax
@@ -291,52 +291,31 @@ no_longmode:
291#define VIDEO_FIRST_V7 0x0900 291#define VIDEO_FIRST_V7 0x0900
292 292
293# Setting of user mode (AX=mode ID) => CF=success 293# Setting of user mode (AX=mode ID) => CF=success
294
295# For now, we only handle VESA modes (0x0200..0x03ff). To handle other
296# modes, we should probably compile in the video code from the boot
297# directory.
294.code16 298.code16
295mode_seta: 299mode_set:
296 movw %ax, %bx 300 movw %ax, %bx
297#if 0 301 subb $VIDEO_FIRST_VESA>>8, %bh
298 cmpb $0xff, %ah 302 cmpb $2, %bh
299 jz setalias 303 jb check_vesa
300
301 testb $VIDEO_RECALC>>8, %ah
302 jnz _setrec
303
304 cmpb $VIDEO_FIRST_RESOLUTION>>8, %ah
305 jnc setres
306
307 cmpb $VIDEO_FIRST_SPECIAL>>8, %ah
308 jz setspc
309
310 cmpb $VIDEO_FIRST_V7>>8, %ah
311 jz setv7
312#endif
313
314 cmpb $VIDEO_FIRST_VESA>>8, %ah
315 jnc check_vesaa
316#if 0
317 orb %ah, %ah
318 jz setmenu
319#endif
320
321 decb %ah
322# jz setbios Add bios modes later
323 304
324setbada: clc 305setbad:
306 clc
325 ret 307 ret
326 308
327check_vesaa: 309check_vesa:
328 subb $VIDEO_FIRST_VESA>>8, %bh
329 orw $0x4000, %bx # Use linear frame buffer 310 orw $0x4000, %bx # Use linear frame buffer
330 movw $0x4f02, %ax # VESA BIOS mode set call 311 movw $0x4f02, %ax # VESA BIOS mode set call
331 int $0x10 312 int $0x10
332 cmpw $0x004f, %ax # AL=4f if implemented 313 cmpw $0x004f, %ax # AL=4f if implemented
333 jnz _setbada # AH=0 if OK 314 jnz setbad # AH=0 if OK
334 315
335 stc 316 stc
336 ret 317 ret
337 318
338_setbada: jmp setbada
339
340wakeup_stack_begin: # Stack grows down 319wakeup_stack_begin: # Stack grows down
341 320
342.org 0xff0 321.org 0xff0
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 2842f50cbe3f..98956555450b 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -208,7 +208,6 @@ void cpu_idle (void)
208 if (__get_cpu_var(cpu_idle_state)) 208 if (__get_cpu_var(cpu_idle_state))
209 __get_cpu_var(cpu_idle_state) = 0; 209 __get_cpu_var(cpu_idle_state) = 0;
210 210
211 check_pgt_cache();
212 rmb(); 211 rmb();
213 idle = pm_idle; 212 idle = pm_idle;
214 if (!idle) 213 if (!idle)
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index e83cc67155ac..eea3702427b4 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -232,10 +232,6 @@ static int putreg(struct task_struct *child,
232{ 232{
233 unsigned long tmp; 233 unsigned long tmp;
234 234
235 /* Some code in the 64bit emulation may not be 64bit clean.
236 Don't take any chances. */
237 if (test_tsk_thread_flag(child, TIF_IA32))
238 value &= 0xffffffff;
239 switch (regno) { 235 switch (regno) {
240 case offsetof(struct user_regs_struct,fs): 236 case offsetof(struct user_regs_struct,fs):
241 if (value && (value & 3) != 3) 237 if (value && (value & 3) != 3)
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 673a300b5944..df4a82812adb 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -241,7 +241,7 @@ void flush_tlb_mm (struct mm_struct * mm)
241 } 241 }
242 if (!cpus_empty(cpu_mask)) 242 if (!cpus_empty(cpu_mask))
243 flush_tlb_others(cpu_mask, mm, FLUSH_ALL); 243 flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
244 check_pgt_cache(); 244
245 preempt_enable(); 245 preempt_enable();
246} 246}
247EXPORT_SYMBOL(flush_tlb_mm); 247EXPORT_SYMBOL(flush_tlb_mm);
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 327c9f2fa626..54816adb8e93 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -374,6 +374,13 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
374 if (unlikely(in_atomic() || !mm)) 374 if (unlikely(in_atomic() || !mm))
375 goto bad_area_nosemaphore; 375 goto bad_area_nosemaphore;
376 376
377 /*
378 * User-mode registers count as a user access even for any
379 * potential system fault or CPU buglet.
380 */
381 if (user_mode_vm(regs))
382 error_code |= PF_USER;
383
377 again: 384 again:
378 /* When running in the kernel we expect faults to occur only to 385 /* When running in the kernel we expect faults to occur only to
379 * addresses in user space. All other faults represent errors in the 386 * addresses in user space. All other faults represent errors in the
diff --git a/arch/x86_64/vdso/vclock_gettime.c b/arch/x86_64/vdso/vclock_gettime.c
index 17f6a00de712..5b54cdfb2b07 100644
--- a/arch/x86_64/vdso/vclock_gettime.c
+++ b/arch/x86_64/vdso/vclock_gettime.c
@@ -34,10 +34,11 @@ static long vdso_fallback_gettime(long clock, struct timespec *ts)
34 34
35static inline long vgetns(void) 35static inline long vgetns(void)
36{ 36{
37 long v;
37 cycles_t (*vread)(void); 38 cycles_t (*vread)(void);
38 vread = gtod->clock.vread; 39 vread = gtod->clock.vread;
39 return ((vread() - gtod->clock.cycle_last) * gtod->clock.mult) >> 40 v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
40 gtod->clock.shift; 41 return (v * gtod->clock.mult) >> gtod->clock.shift;
41} 42}
42 43
43static noinline int do_realtime(struct timespec *ts) 44static noinline int do_realtime(struct timespec *ts)
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 95f836db38fa..acf05be24929 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -27,7 +27,12 @@ platform-$(CONFIG_XTENSA_PLATFORM_ISS) := iss
27PLATFORM = $(platform-y) 27PLATFORM = $(platform-y)
28export PLATFORM 28export PLATFORM
29 29
30CFLAGS += -pipe -mlongcalls 30# temporarily until string.h is fixed
31cflags-y += -ffreestanding
32
33cflags-y += -pipe -mlongcalls
34
35CFLAGS += $(cflags-y)
31 36
32KBUILD_DEFCONFIG := iss_defconfig 37KBUILD_DEFCONFIG := iss_defconfig
33 38
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index 71f733c4f66d..f582d6a24ec2 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := head.o vmlinux.lds
7 7
8obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o \ 8obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o \
9 setup.o signal.o syscall.o time.o traps.o vectors.o platform.o \ 9 setup.o signal.o syscall.o time.o traps.o vectors.o platform.o \
10 pci-dma.o 10 pci-dma.o init_task.o io.o
11 11
12## windowspill.o 12## windowspill.o
13 13
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index d0323cd6a2ea..d5ffe7b6443e 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -18,12 +18,13 @@
18#include <linux/stddef.h> 18#include <linux/stddef.h>
19#include <linux/thread_info.h> 19#include <linux/thread_info.h>
20#include <linux/ptrace.h> 20#include <linux/ptrace.h>
21#include <linux/mm.h>
22
21#include <asm/ptrace.h> 23#include <asm/ptrace.h>
22#include <asm/processor.h> 24#include <asm/processor.h>
23#include <asm/uaccess.h> 25#include <asm/uaccess.h>
24 26
25#define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val)) 27#define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
26#define BLANK() asm volatile("\n->" : : )
27 28
28int main(void) 29int main(void)
29{ 30{
@@ -63,7 +64,6 @@ int main(void)
63 DEFINE(PT_SIZE, sizeof(struct pt_regs)); 64 DEFINE(PT_SIZE, sizeof(struct pt_regs));
64 DEFINE(PT_AREG_END, offsetof (struct pt_regs, areg[XCHAL_NUM_AREGS])); 65 DEFINE(PT_AREG_END, offsetof (struct pt_regs, areg[XCHAL_NUM_AREGS]));
65 DEFINE(PT_USER_SIZE, offsetof(struct pt_regs, areg[XCHAL_NUM_AREGS])); 66 DEFINE(PT_USER_SIZE, offsetof(struct pt_regs, areg[XCHAL_NUM_AREGS]));
66 BLANK();
67 67
68 /* struct task_struct */ 68 /* struct task_struct */
69 DEFINE(TASK_PTRACE, offsetof (struct task_struct, ptrace)); 69 DEFINE(TASK_PTRACE, offsetof (struct task_struct, ptrace));
@@ -73,27 +73,26 @@ int main(void)
73 DEFINE(TASK_THREAD, offsetof (struct task_struct, thread)); 73 DEFINE(TASK_THREAD, offsetof (struct task_struct, thread));
74 DEFINE(TASK_THREAD_INFO, offsetof (struct task_struct, stack)); 74 DEFINE(TASK_THREAD_INFO, offsetof (struct task_struct, stack));
75 DEFINE(TASK_STRUCT_SIZE, sizeof (struct task_struct)); 75 DEFINE(TASK_STRUCT_SIZE, sizeof (struct task_struct));
76 BLANK();
77 76
78 /* struct thread_info (offset from start_struct) */ 77 /* struct thread_info (offset from start_struct) */
79 DEFINE(THREAD_RA, offsetof (struct task_struct, thread.ra)); 78 DEFINE(THREAD_RA, offsetof (struct task_struct, thread.ra));
80 DEFINE(THREAD_SP, offsetof (struct task_struct, thread.sp)); 79 DEFINE(THREAD_SP, offsetof (struct task_struct, thread.sp));
81 DEFINE(THREAD_CP_SAVE, offsetof (struct task_struct, thread.cp_save)); 80 DEFINE(THREAD_CP_SAVE, offsetof (struct task_struct, thread.cp_save));
82 DEFINE(THREAD_CURRENT_DS, offsetof (struct task_struct, thread.current_ds)); 81 DEFINE(THREAD_CURRENT_DS, offsetof (struct task_struct, thread.current_ds));
83 BLANK();
84 82
85 /* struct mm_struct */ 83 /* struct mm_struct */
86 DEFINE(MM_USERS, offsetof(struct mm_struct, mm_users)); 84 DEFINE(MM_USERS, offsetof(struct mm_struct, mm_users));
87 DEFINE(MM_PGD, offsetof (struct mm_struct, pgd)); 85 DEFINE(MM_PGD, offsetof (struct mm_struct, pgd));
88 DEFINE(MM_CONTEXT, offsetof (struct mm_struct, context)); 86 DEFINE(MM_CONTEXT, offsetof (struct mm_struct, context));
89 BLANK(); 87
90 DEFINE(PT_SINGLESTEP_BIT, PT_SINGLESTEP_BIT); 88 /* struct page */
89 DEFINE(PAGE_FLAGS, offsetof(struct page, flags));
91 90
92 /* constants */ 91 /* constants */
93 DEFINE(_CLONE_VM, CLONE_VM); 92 DEFINE(_CLONE_VM, CLONE_VM);
94 DEFINE(_CLONE_UNTRACED, CLONE_UNTRACED); 93 DEFINE(_CLONE_UNTRACED, CLONE_UNTRACED);
94 DEFINE(PG_ARCH_1, PG_arch_1);
95 95
96 return 0; 96 return 0;
97} 97}
98 98
99
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 8dc7a2c26ff9..91a689eca43d 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -7,7 +7,7 @@
7 * License. See the file "COPYING" in the main directory of this archive 7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details. 8 * for more details.
9 * 9 *
10 * Copyright (C) 2004-2005 by Tensilica Inc. 10 * Copyright (C) 2004-2007 by Tensilica Inc.
11 * 11 *
12 * Chris Zankel <chris@zankel.net> 12 * Chris Zankel <chris@zankel.net>
13 * 13 *
@@ -169,7 +169,7 @@ _user_exception:
169 * We have to save all registers up to the first '1' from 169 * We have to save all registers up to the first '1' from
170 * the right, except the current frame (bit 0). 170 * the right, except the current frame (bit 0).
171 * Assume a2 is: 001001000110001 171 * Assume a2 is: 001001000110001
172 * All regiser frames starting from the top fiel to the marked '1' 172 * All register frames starting from the top field to the marked '1'
173 * must be saved. 173 * must be saved.
174 */ 174 */
175 175
@@ -1572,10 +1572,12 @@ ENTRY(fast_second_level_miss)
1572 l32i a0, a1, TASK_MM # tsk->mm 1572 l32i a0, a1, TASK_MM # tsk->mm
1573 beqz a0, 9f 1573 beqz a0, 9f
1574 1574
15758: rsr a1, EXCVADDR # fault address 1575
1576 _PGD_OFFSET(a0, a1, a1) 1576 /* We deliberately destroy a3 that holds the exception table. */
1577
15788: rsr a3, EXCVADDR # fault address
1579 _PGD_OFFSET(a0, a3, a1)
1577 l32i a0, a0, 0 # read pmdval 1580 l32i a0, a0, 0 # read pmdval
1578 //beqi a0, _PAGE_USER, 2f
1579 beqz a0, 2f 1581 beqz a0, 2f
1580 1582
1581 /* Read ptevaddr and convert to top of page-table page. 1583 /* Read ptevaddr and convert to top of page-table page.
@@ -1588,7 +1590,7 @@ ENTRY(fast_second_level_miss)
1588 * The messy computation for 'pteval' above really simplifies 1590 * The messy computation for 'pteval' above really simplifies
1589 * into the following: 1591 * into the following:
1590 * 1592 *
1591 * pteval = ((pmdval - PAGE_OFFSET) & PAGE_MASK) | PAGE_KERNEL 1593 * pteval = ((pmdval - PAGE_OFFSET) & PAGE_MASK) | PAGE_DIRECTORY
1592 */ 1594 */
1593 1595
1594 movi a1, -PAGE_OFFSET 1596 movi a1, -PAGE_OFFSET
@@ -1596,20 +1598,34 @@ ENTRY(fast_second_level_miss)
1596 extui a1, a0, 0, PAGE_SHIFT # ... & PAGE_MASK 1598 extui a1, a0, 0, PAGE_SHIFT # ... & PAGE_MASK
1597 xor a0, a0, a1 1599 xor a0, a0, a1
1598 1600
1599 1601 movi a1, _PAGE_DIRECTORY
1600 movi a1, PAGE_DIRECTORY
1601 or a0, a0, a1 # ... | PAGE_DIRECTORY 1602 or a0, a0, a1 # ... | PAGE_DIRECTORY
1602 1603
1604 /*
1605 * We utilize all three wired-ways (7-9) to hold pmd translations.
1606 * Memory regions are mapped to the DTLBs according to bits 28 and 29.
1607 * This allows to map the three most common regions to three different
1608 * DTLBs:
1609 * 0,1 -> way 7 program (0040.0000) and virtual (c000.0000)
1610 * 2 -> way 8 shared libaries (2000.0000)
1611 * 3 -> way 0 stack (3000.0000)
1612 */
1613
1614 extui a3, a3, 28, 2 # addr. bit 28 and 29 0,1,2,3
1603 rsr a1, PTEVADDR 1615 rsr a1, PTEVADDR
1616 addx2 a3, a3, a3 # -> 0,3,6,9
1604 srli a1, a1, PAGE_SHIFT 1617 srli a1, a1, PAGE_SHIFT
1618 extui a3, a3, 2, 2 # -> 0,0,1,2
1605 slli a1, a1, PAGE_SHIFT # ptevaddr & PAGE_MASK 1619 slli a1, a1, PAGE_SHIFT # ptevaddr & PAGE_MASK
1606 addi a1, a1, DTLB_WAY_PGD # ... + way_number 1620 addi a3, a3, DTLB_WAY_PGD
1621 add a1, a1, a3 # ... + way_number
1607 1622
1608 wdtlb a0, a1 16233: wdtlb a0, a1
1609 dsync 1624 dsync
1610 1625
1611 /* Exit critical section. */ 1626 /* Exit critical section. */
1612 1627
16284: movi a3, exc_table # restore a3
1613 movi a0, 0 1629 movi a0, 0
1614 s32i a0, a3, EXC_TABLE_FIXUP 1630 s32i a0, a3, EXC_TABLE_FIXUP
1615 1631
@@ -1636,8 +1652,76 @@ ENTRY(fast_second_level_miss)
16369: l32i a0, a1, TASK_ACTIVE_MM # unlikely case mm == 0 16529: l32i a0, a1, TASK_ACTIVE_MM # unlikely case mm == 0
1637 j 8b 1653 j 8b
1638 1654
1655#if (DCACHE_WAY_SIZE > PAGE_SIZE)
1656
16572: /* Special case for cache aliasing.
1658 * We (should) only get here if a clear_user_page, copy_user_page
1659 * or the aliased cache flush functions got preemptively interrupted
1660 * by another task. Re-establish temporary mapping to the
1661 * TLBTEMP_BASE areas.
1662 */
1663
1664 /* We shouldn't be in a double exception */
1665
1666 l32i a0, a2, PT_DEPC
1667 bgeui a0, VALID_DOUBLE_EXCEPTION_ADDRESS, 2f
1668
1669 /* Make sure the exception originated in the special functions */
1670
1671 movi a0, __tlbtemp_mapping_start
1672 rsr a3, EPC_1
1673 bltu a3, a0, 2f
1674 movi a0, __tlbtemp_mapping_end
1675 bgeu a3, a0, 2f
1676
1677 /* Check if excvaddr was in one of the TLBTEMP_BASE areas. */
1678
1679 movi a3, TLBTEMP_BASE_1
1680 rsr a0, EXCVADDR
1681 bltu a0, a3, 2f
1682
1683 addi a1, a0, -(2 << (DCACHE_ALIAS_ORDER + PAGE_SHIFT))
1684 bgeu a1, a3, 2f
1685
1686 /* Check if we have to restore an ITLB mapping. */
1687
1688 movi a1, __tlbtemp_mapping_itlb
1689 rsr a3, EPC_1
1690 sub a3, a3, a1
1691
1692 /* Calculate VPN */
1693
1694 movi a1, PAGE_MASK
1695 and a1, a1, a0
1696
1697 /* Jump for ITLB entry */
1698
1699 bgez a3, 1f
1700
1701 /* We can use up to two TLBTEMP areas, one for src and one for dst. */
1702
1703 extui a3, a0, PAGE_SHIFT + DCACHE_ALIAS_ORDER, 1
1704 add a1, a3, a1
1705
1706 /* PPN is in a6 for the first TLBTEMP area and in a7 for the second. */
1707
1708 mov a0, a6
1709 movnez a0, a7, a3
1710 j 3b
1711
1712 /* ITLB entry. We only use dst in a6. */
1713
17141: witlb a6, a1
1715 isync
1716 j 4b
1717
1718
1719#endif // DCACHE_WAY_SIZE > PAGE_SIZE
1720
1721
16392: /* Invalid PGD, default exception handling */ 17222: /* Invalid PGD, default exception handling */
1640 1723
1724 movi a3, exc_table
1641 rsr a1, DEPC 1725 rsr a1, DEPC
1642 xsr a3, EXCSAVE_1 1726 xsr a3, EXCSAVE_1
1643 s32i a1, a2, PT_AREG2 1727 s32i a1, a2, PT_AREG2
@@ -1682,15 +1766,15 @@ ENTRY(fast_store_prohibited)
16828: rsr a1, EXCVADDR # fault address 17668: rsr a1, EXCVADDR # fault address
1683 _PGD_OFFSET(a0, a1, a4) 1767 _PGD_OFFSET(a0, a1, a4)
1684 l32i a0, a0, 0 1768 l32i a0, a0, 0
1685 //beqi a0, _PAGE_USER, 2f # FIXME use _PAGE_INVALID
1686 beqz a0, 2f 1769 beqz a0, 2f
1687 1770
1771 /* Note that we assume _PAGE_WRITABLE_BIT is only set if pte is valid.*/
1772
1688 _PTE_OFFSET(a0, a1, a4) 1773 _PTE_OFFSET(a0, a1, a4)
1689 l32i a4, a0, 0 # read pteval 1774 l32i a4, a0, 0 # read pteval
1690 movi a1, _PAGE_VALID | _PAGE_RW 1775 bbci.l a4, _PAGE_WRITABLE_BIT, 2f
1691 bnall a4, a1, 2f
1692 1776
1693 movi a1, _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_WRENABLE 1777 movi a1, _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_HW_WRITE
1694 or a4, a4, a1 1778 or a4, a4, a1
1695 rsr a1, EXCVADDR 1779 rsr a1, EXCVADDR
1696 s32i a4, a0, 0 1780 s32i a4, a0, 0
@@ -1700,10 +1784,7 @@ ENTRY(fast_store_prohibited)
1700 dhwb a0, 0 1784 dhwb a0, 0
1701#endif 1785#endif
1702 pdtlb a0, a1 1786 pdtlb a0, a1
1703 beqz a0, 1f
1704 idtlb a0 // FIXME do we need this?
1705 wdtlb a4, a0 1787 wdtlb a4, a0
17061:
1707 1788
1708 /* Exit critical section. */ 1789 /* Exit critical section. */
1709 1790
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c
new file mode 100644
index 000000000000..021b4f46ff94
--- /dev/null
+++ b/arch/xtensa/kernel/init_task.c
@@ -0,0 +1,38 @@
1/*
2 * arch/xtensa/kernel/init_task.c
3 *
4 * Xtensa Processor version.
5 *
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details.
9 *
10 * Copyright (C) 2007 Tensilica Inc.
11 *
12 * Chris Zankel <chris@zankel.net>
13 */
14
15#include <linux/mm.h>
16#include <linux/fs.h>
17#include <linux/init.h>
18#include <linux/init_task.h>
19#include <linux/module.h>
20#include <linux/mqueue.h>
21
22#include <asm/uaccess.h>
23
24static struct fs_struct init_fs = INIT_FS;
25static struct files_struct init_files = INIT_FILES;
26static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
27static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
28struct mm_struct init_mm = INIT_MM(init_mm);
29
30EXPORT_SYMBOL(init_mm);
31
32union thread_union init_thread_union
33 __attribute__((__section__(".data.init_task"))) =
34{ INIT_THREAD_INFO(init_task) };
35
36struct task_struct init_task = INIT_TASK(init_task);
37
38EXPORT_SYMBOL(init_task);
diff --git a/arch/xtensa/kernel/io.c b/arch/xtensa/kernel/io.c
new file mode 100644
index 000000000000..5b65269b1d2f
--- /dev/null
+++ b/arch/xtensa/kernel/io.c
@@ -0,0 +1,75 @@
1/*
2 * arch/xtensa/io.c
3 *
4 * IO primitives
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License as published by the
8 * Free Software Foundation; either version 2 of the License, or (at your
9 * option) any later version.
10 *
11 * Copied from sparc.
12 *
13 * Chris Zankel <chris@zankel.net>
14 *
15 */
16
17#include <asm/io.h>
18#include <asm/byteorder.h>
19
20void outsb(unsigned long addr, const void *src, unsigned long count) {
21 while (count) {
22 count -= 1;
23 writeb(*(const char *)src, addr);
24 src += 1;
25 addr += 1;
26 }
27}
28
29void outsw(unsigned long addr, const void *src, unsigned long count) {
30 while (count) {
31 count -= 2;
32 writew(*(const short *)src, addr);
33 src += 2;
34 addr += 2;
35 }
36}
37
38void outsl(unsigned long addr, const void *src, unsigned long count) {
39 while (count) {
40 count -= 4;
41 writel(*(const long *)src, addr);
42 src += 4;
43 addr += 4;
44 }
45}
46
47void insb(unsigned long addr, void *dst, unsigned long count) {
48 while (count) {
49 count -= 1;
50 *(unsigned char *)dst = readb(addr);
51 dst += 1;
52 addr += 1;
53 }
54}
55
56void insw(unsigned long addr, void *dst, unsigned long count) {
57 while (count) {
58 count -= 2;
59 *(unsigned short *)dst = readw(addr);
60 dst += 2;
61 addr += 2;
62 }
63}
64
65void insl(unsigned long addr, void *dst, unsigned long count) {
66 while (count) {
67 count -= 4;
68 /*
69 * XXX I am sure we are in for an unaligned trap here.
70 */
71 *(unsigned long *)dst = readl(addr);
72 dst += 4;
73 addr += 4;
74 }
75}
diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c
index 2ea1755a0858..ddf14dcf2ad9 100644
--- a/arch/xtensa/kernel/module.c
+++ b/arch/xtensa/kernel/module.c
@@ -7,7 +7,7 @@
7 * License. See the file "COPYING" in the main directory of this archive 7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details. 8 * for more details.
9 * 9 *
10 * Copyright (C) 2001 - 2005 Tensilica Inc. 10 * Copyright (C) 2001 - 2006 Tensilica Inc.
11 * 11 *
12 * Chris Zankel <chris@zankel.net> 12 * Chris Zankel <chris@zankel.net>
13 * 13 *
@@ -22,57 +22,216 @@
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/cache.h> 23#include <linux/cache.h>
24 24
25LIST_HEAD(module_buf_list); 25#undef DEBUG_RELOCATE
26 26
27void *module_alloc(unsigned long size) 27void *module_alloc(unsigned long size)
28{ 28{
29 panic("module_alloc not implemented"); 29 if (size == 0)
30 return NULL;
31 return vmalloc(size);
30} 32}
31 33
32void module_free(struct module *mod, void *module_region) 34void module_free(struct module *mod, void *module_region)
33{ 35{
34 panic("module_free not implemented"); 36 vfree(module_region);
37 /* FIXME: If module_region == mod->init_region, trim exception
38 table entries. */
35} 39}
36 40
37int module_frob_arch_sections(Elf32_Ehdr *hdr, 41int module_frob_arch_sections(Elf32_Ehdr *hdr,
38 Elf32_Shdr *sechdrs, 42 Elf32_Shdr *sechdrs,
39 char *secstrings, 43 char *secstrings,
40 struct module *me) 44 struct module *mod)
41{ 45{
42 panic("module_frob_arch_sections not implemented"); 46 return 0;
47}
48
49static int
50decode_calln_opcode (unsigned char *location)
51{
52#ifdef __XTENSA_EB__
53 return (location[0] & 0xf0) == 0x50;
54#endif
55#ifdef __XTENSA_EL__
56 return (location[0] & 0xf) == 0x5;
57#endif
58}
59
60static int
61decode_l32r_opcode (unsigned char *location)
62{
63#ifdef __XTENSA_EB__
64 return (location[0] & 0xf0) == 0x10;
65#endif
66#ifdef __XTENSA_EL__
67 return (location[0] & 0xf) == 0x1;
68#endif
43} 69}
44 70
45int apply_relocate(Elf32_Shdr *sechdrs, 71int apply_relocate(Elf32_Shdr *sechdrs,
46 const char *strtab, 72 const char *strtab,
47 unsigned int symindex, 73 unsigned int symindex,
48 unsigned int relsec, 74 unsigned int relsec,
49 struct module *module) 75 struct module *mod)
50{ 76{
51 panic ("apply_relocate not implemented"); 77 printk(KERN_ERR "module %s: REL RELOCATION unsupported\n",
78 mod->name);
79 return -ENOEXEC;
80
52} 81}
53 82
54int apply_relocate_add(Elf32_Shdr *sechdrs, 83int apply_relocate_add(Elf32_Shdr *sechdrs,
55 const char *strtab, 84 const char *strtab,
56 unsigned int symindex, 85 unsigned int symindex,
57 unsigned int relsec, 86 unsigned int relsec,
58 struct module *module) 87 struct module *mod)
59{ 88{
60 panic("apply_relocate_add not implemented"); 89 unsigned int i;
90 Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr;
91 Elf32_Sym *sym;
92 unsigned char *location;
93 uint32_t value;
94
95#ifdef DEBUG_RELOCATE
96 printk("Applying relocate section %u to %u\n", relsec,
97 sechdrs[relsec].sh_info);
98#endif
99 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {
100 location = (char *)sechdrs[sechdrs[relsec].sh_info].sh_addr
101 + rela[i].r_offset;
102 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
103 + ELF32_R_SYM(rela[i].r_info);
104 value = sym->st_value + rela[i].r_addend;
105
106 switch (ELF32_R_TYPE(rela[i].r_info)) {
107 case R_XTENSA_NONE:
108 case R_XTENSA_DIFF8:
109 case R_XTENSA_DIFF16:
110 case R_XTENSA_DIFF32:
111 case R_XTENSA_ASM_EXPAND:
112 break;
113
114 case R_XTENSA_32:
115 case R_XTENSA_PLT:
116 *(uint32_t *)location += value;
117 break;
118
119 case R_XTENSA_SLOT0_OP:
120 if (decode_calln_opcode(location)) {
121 value -= ((unsigned long)location & -4) + 4;
122 if ((value & 3) != 0 ||
123 ((value + (1 << 19)) >> 20) != 0) {
124 printk("%s: relocation out of range, "
125 "section %d reloc %d "
126 "sym '%s'\n",
127 mod->name, relsec, i,
128 strtab + sym->st_name);
129 return -ENOEXEC;
130 }
131 value = (signed int)value >> 2;
132#ifdef __XTENSA_EB__
133 location[0] = ((location[0] & ~0x3) |
134 ((value >> 16) & 0x3));
135 location[1] = (value >> 8) & 0xff;
136 location[2] = value & 0xff;
137#endif
138#ifdef __XTENSA_EL__
139 location[0] = ((location[0] & ~0xc0) |
140 ((value << 6) & 0xc0));
141 location[1] = (value >> 2) & 0xff;
142 location[2] = (value >> 10) & 0xff;
143#endif
144 } else if (decode_l32r_opcode(location)) {
145 value -= (((unsigned long)location + 3) & -4);
146 if ((value & 3) != 0 ||
147 (signed int)value >> 18 != -1) {
148 printk("%s: relocation out of range, "
149 "section %d reloc %d "
150 "sym '%s'\n",
151 mod->name, relsec, i,
152 strtab + sym->st_name);
153 return -ENOEXEC;
154 }
155 value = (signed int)value >> 2;
156
157#ifdef __XTENSA_EB__
158 location[1] = (value >> 8) & 0xff;
159 location[2] = value & 0xff;
160#endif
161#ifdef __XTENSA_EL__
162 location[1] = value & 0xff;
163 location[2] = (value >> 8) & 0xff;
164#endif
165 }
166 /* FIXME: Ignore any other opcodes. The Xtensa
167 assembler currently assumes that the linker will
168 always do relaxation and so all PC-relative
169 operands need relocations. (The assembler also
170 writes out the tentative PC-relative values,
171 assuming no link-time relaxation, so it is usually
172 safe to ignore the relocations.) If the
173 assembler's "--no-link-relax" flag can be made to
174 work, and if all kernel modules can be assembled
175 with that flag, then unexpected relocations could
176 be detected here. */
177 break;
178
179 case R_XTENSA_SLOT1_OP:
180 case R_XTENSA_SLOT2_OP:
181 case R_XTENSA_SLOT3_OP:
182 case R_XTENSA_SLOT4_OP:
183 case R_XTENSA_SLOT5_OP:
184 case R_XTENSA_SLOT6_OP:
185 case R_XTENSA_SLOT7_OP:
186 case R_XTENSA_SLOT8_OP:
187 case R_XTENSA_SLOT9_OP:
188 case R_XTENSA_SLOT10_OP:
189 case R_XTENSA_SLOT11_OP:
190 case R_XTENSA_SLOT12_OP:
191 case R_XTENSA_SLOT13_OP:
192 case R_XTENSA_SLOT14_OP:
193 printk("%s: unexpected FLIX relocation: %u\n",
194 mod->name,
195 ELF32_R_TYPE(rela[i].r_info));
196 return -ENOEXEC;
197
198 case R_XTENSA_SLOT0_ALT:
199 case R_XTENSA_SLOT1_ALT:
200 case R_XTENSA_SLOT2_ALT:
201 case R_XTENSA_SLOT3_ALT:
202 case R_XTENSA_SLOT4_ALT:
203 case R_XTENSA_SLOT5_ALT:
204 case R_XTENSA_SLOT6_ALT:
205 case R_XTENSA_SLOT7_ALT:
206 case R_XTENSA_SLOT8_ALT:
207 case R_XTENSA_SLOT9_ALT:
208 case R_XTENSA_SLOT10_ALT:
209 case R_XTENSA_SLOT11_ALT:
210 case R_XTENSA_SLOT12_ALT:
211 case R_XTENSA_SLOT13_ALT:
212 case R_XTENSA_SLOT14_ALT:
213 printk("%s: unexpected ALT relocation: %u\n",
214 mod->name,
215 ELF32_R_TYPE(rela[i].r_info));
216 return -ENOEXEC;
217
218 default:
219 printk("%s: unexpected relocation: %u\n",
220 mod->name,
221 ELF32_R_TYPE(rela[i].r_info));
222 return -ENOEXEC;
223 }
224 }
225 return 0;
61} 226}
62 227
63int module_finalize(const Elf_Ehdr *hdr, 228int module_finalize(const Elf_Ehdr *hdr,
64 const Elf_Shdr *sechdrs, 229 const Elf_Shdr *sechdrs,
65 struct module *me) 230 struct module *mod)
66{ 231{
67 panic ("module_finalize not implemented"); 232 return 0;
68} 233}
69 234
70void module_arch_cleanup(struct module *mod) 235void module_arch_cleanup(struct module *mod)
71{ 236{
72 panic("module_arch_cleanup not implemented");
73}
74
75struct bug_entry *module_find_bug(unsigned long bugaddr)
76{
77 panic("module_find_bug not implemented");
78} 237}
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 77deae5290f0..b7c073484e01 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -394,72 +394,3 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
394 394
395 return ret; 395 return ret;
396} 396}
397
398/*
399 * This probably belongs here rather than ioport.c because
400 * we do not want this crud linked into SBus kernels.
401 * Also, think for a moment about likes of floppy.c that
402 * include architecture specific parts. They may want to redefine ins/outs.
403 *
404 * We do not use horrible macros here because we want to
405 * advance pointer by sizeof(size).
406 */
407void outsb(unsigned long addr, const void *src, unsigned long count) {
408 while (count) {
409 count -= 1;
410 writeb(*(const char *)src, addr);
411 src += 1;
412 addr += 1;
413 }
414}
415
416void outsw(unsigned long addr, const void *src, unsigned long count) {
417 while (count) {
418 count -= 2;
419 writew(*(const short *)src, addr);
420 src += 2;
421 addr += 2;
422 }
423}
424
425void outsl(unsigned long addr, const void *src, unsigned long count) {
426 while (count) {
427 count -= 4;
428 writel(*(const long *)src, addr);
429 src += 4;
430 addr += 4;
431 }
432}
433
434void insb(unsigned long addr, void *dst, unsigned long count) {
435 while (count) {
436 count -= 1;
437 *(unsigned char *)dst = readb(addr);
438 dst += 1;
439 addr += 1;
440 }
441}
442
443void insw(unsigned long addr, void *dst, unsigned long count) {
444 while (count) {
445 count -= 2;
446 *(unsigned short *)dst = readw(addr);
447 dst += 2;
448 addr += 2;
449 }
450}
451
452void insl(unsigned long addr, void *dst, unsigned long count) {
453 while (count) {
454 count -= 4;
455 /*
456 * XXX I am sure we are in for an unaligned trap here.
457 */
458 *(unsigned long *)dst = readl(addr);
459 dst += 4;
460 addr += 4;
461 }
462}
463
464
465
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index dd498f1604e1..f53d7bd9dfb2 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -46,20 +46,6 @@
46 46
47extern void ret_from_fork(void); 47extern void ret_from_fork(void);
48 48
49static struct fs_struct init_fs = INIT_FS;
50static struct files_struct init_files = INIT_FILES;
51static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
52static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
53struct mm_struct init_mm = INIT_MM(init_mm);
54EXPORT_SYMBOL(init_mm);
55
56union thread_union init_thread_union
57 __attribute__((__section__(".data.init_task"))) =
58{ INIT_THREAD_INFO(init_task) };
59
60struct task_struct init_task = INIT_TASK(init_task);
61EXPORT_SYMBOL(init_task);
62
63struct task_struct *current_set[NR_CPUS] = {&init_task, }; 49struct task_struct *current_set[NR_CPUS] = {&init_task, };
64 50
65void (*pm_power_off)(void) = NULL; 51void (*pm_power_off)(void) = NULL;
diff --git a/arch/xtensa/kernel/semaphore.c b/arch/xtensa/kernel/semaphore.c
index d40f4b1b75ac..995c6410ae10 100644
--- a/arch/xtensa/kernel/semaphore.c
+++ b/arch/xtensa/kernel/semaphore.c
@@ -100,7 +100,7 @@ static __inline__ int waking_non_zero_trylock(struct semaphore *sem)
100 return ret; 100 return ret;
101} 101}
102 102
103spinlock_t semaphore_wake_lock; 103DEFINE_SPINLOCK(semaphore_wake_lock);
104 104
105/* 105/*
106 * Semaphores are implemented using a two-way counter: 106 * Semaphores are implemented using a two-way counter:
diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index fe3834bc1dbf..f3e16efcd47a 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -93,3 +93,8 @@ asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg)
93 return (long)ret; 93 return (long)ret;
94} 94}
95 95
96asmlinkage long xtensa_fadvise64_64(int fd, int advice, unsigned long long offset, unsigned long long len)
97{
98 return sys_fadvise64_64(fd, offset, len, advice);
99}
100
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 22949be4a5d8..60d29fe0b1bd 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -32,12 +32,20 @@ EXPORT_SYMBOL(rtc_lock);
32 32
33#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT 33#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
34unsigned long ccount_per_jiffy; /* per 1/HZ */ 34unsigned long ccount_per_jiffy; /* per 1/HZ */
35unsigned long ccount_nsec; /* nsec per ccount increment */ 35unsigned long nsec_per_ccount; /* nsec per ccount increment */
36#endif 36#endif
37 37
38unsigned int last_ccount_stamp;
39static long last_rtc_update = 0; 38static long last_rtc_update = 0;
40 39
40/*
41 * Scheduler clock - returns current tim in nanosec units.
42 */
43
44unsigned long long sched_clock(void)
45{
46 return (unsigned long long)jiffies * (1000000000 / HZ);
47}
48
41static irqreturn_t timer_interrupt(int irq, void *dev_id); 49static irqreturn_t timer_interrupt(int irq, void *dev_id);
42static struct irqaction timer_irqaction = { 50static struct irqaction timer_irqaction = {
43 .handler = timer_interrupt, 51 .handler = timer_interrupt,
@@ -69,7 +77,6 @@ void __init time_init(void)
69 77
70 xtime.tv_nsec = 0; 78 xtime.tv_nsec = 0;
71 last_rtc_update = xtime.tv_sec = sec_n; 79 last_rtc_update = xtime.tv_sec = sec_n;
72 last_ccount_stamp = get_ccount();
73 80
74 set_normalized_timespec(&wall_to_monotonic, 81 set_normalized_timespec(&wall_to_monotonic,
75 -xtime.tv_sec, -xtime.tv_nsec); 82 -xtime.tv_sec, -xtime.tv_nsec);
@@ -85,7 +92,7 @@ int do_settimeofday(struct timespec *tv)
85{ 92{
86 time_t wtm_sec, sec = tv->tv_sec; 93 time_t wtm_sec, sec = tv->tv_sec;
87 long wtm_nsec, nsec = tv->tv_nsec; 94 long wtm_nsec, nsec = tv->tv_nsec;
88 unsigned long ccount; 95 unsigned long delta;
89 96
90 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC) 97 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
91 return -EINVAL; 98 return -EINVAL;
@@ -97,8 +104,10 @@ int do_settimeofday(struct timespec *tv)
97 * wall time. Discover what correction gettimeofday() would have 104 * wall time. Discover what correction gettimeofday() would have
98 * made, and then undo it! 105 * made, and then undo it!
99 */ 106 */
100 ccount = get_ccount(); 107
101 nsec -= (ccount - last_ccount_stamp) * CCOUNT_NSEC; 108 delta = CCOUNT_PER_JIFFY;
109 delta += get_ccount() - get_linux_timer();
110 nsec -= delta * NSEC_PER_CCOUNT;
102 111
103 wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec); 112 wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
104 wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec); 113 wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
@@ -117,17 +126,21 @@ EXPORT_SYMBOL(do_settimeofday);
117void do_gettimeofday(struct timeval *tv) 126void do_gettimeofday(struct timeval *tv)
118{ 127{
119 unsigned long flags; 128 unsigned long flags;
120 unsigned long sec, usec, delta, seq; 129 unsigned long volatile sec, usec, delta, seq;
121 130
122 do { 131 do {
123 seq = read_seqbegin_irqsave(&xtime_lock, flags); 132 seq = read_seqbegin_irqsave(&xtime_lock, flags);
124 133
125 delta = get_ccount() - last_ccount_stamp;
126 sec = xtime.tv_sec; 134 sec = xtime.tv_sec;
127 usec = (xtime.tv_nsec / NSEC_PER_USEC); 135 usec = (xtime.tv_nsec / NSEC_PER_USEC);
136
137 delta = get_linux_timer() - get_ccount();
138
128 } while (read_seqretry_irqrestore(&xtime_lock, seq, flags)); 139 } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
129 140
130 usec += (delta * CCOUNT_NSEC) / NSEC_PER_USEC; 141 usec += (((unsigned long) CCOUNT_PER_JIFFY - delta)
142 * (unsigned long) NSEC_PER_CCOUNT) / NSEC_PER_USEC;
143
131 for (; usec >= 1000000; sec++, usec -= 1000000) 144 for (; usec >= 1000000; sec++, usec -= 1000000)
132 ; 145 ;
133 146
@@ -158,9 +171,12 @@ again:
158 171
159 write_seqlock(&xtime_lock); 172 write_seqlock(&xtime_lock);
160 173
161 last_ccount_stamp = next; 174 do_timer(1); /* Linux handler in kernel/timer.c */
175
176 /* Note that writing CCOMPARE clears the interrupt. */
177
162 next += CCOUNT_PER_JIFFY; 178 next += CCOUNT_PER_JIFFY;
163 do_timer (1); /* Linux handler in kernel/timer.c */ 179 set_linux_timer(next);
164 180
165 if (ntp_synced() && 181 if (ntp_synced() &&
166 xtime.tv_sec - last_rtc_update >= 659 && 182 xtime.tv_sec - last_rtc_update >= 659 &&
@@ -175,19 +191,15 @@ again:
175 write_sequnlock(&xtime_lock); 191 write_sequnlock(&xtime_lock);
176 } 192 }
177 193
178 /* NOTE: writing CCOMPAREn clears the interrupt. */ 194 /* Allow platform to do something useful (Wdog). */
179 195
180 set_linux_timer (next); 196 platform_heartbeat();
181 197
182 /* Make sure we didn't miss any tick... */ 198 /* Make sure we didn't miss any tick... */
183 199
184 if ((signed long)(get_ccount() - next) > 0) 200 if ((signed long)(get_ccount() - next) > 0)
185 goto again; 201 goto again;
186 202
187 /* Allow platform to do something useful (Wdog). */
188
189 platform_heartbeat();
190
191 return IRQ_HANDLED; 203 return IRQ_HANDLED;
192} 204}
193 205
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index c5e62f9d9f50..8be99c777d9d 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -83,7 +83,7 @@ typedef struct {
83 void* handler; 83 void* handler;
84} dispatch_init_table_t; 84} dispatch_init_table_t;
85 85
86dispatch_init_table_t __init dispatch_init_table[] = { 86static dispatch_init_table_t __initdata dispatch_init_table[] = {
87 87
88{ EXCCAUSE_ILLEGAL_INSTRUCTION, 0, do_illegal_instruction}, 88{ EXCCAUSE_ILLEGAL_INSTRUCTION, 0, do_illegal_instruction},
89{ EXCCAUSE_SYSTEM_CALL, KRNL, fast_syscall_kernel }, 89{ EXCCAUSE_SYSTEM_CALL, KRNL, fast_syscall_kernel },
@@ -305,7 +305,7 @@ do_debug(struct pt_regs *regs)
305 305
306#define set_handler(idx,handler) (exc_table[idx] = (unsigned long) (handler)) 306#define set_handler(idx,handler) (exc_table[idx] = (unsigned long) (handler))
307 307
308void trap_init(void) 308void __init trap_init(void)
309{ 309{
310 int i; 310 int i;
311 311
diff --git a/arch/xtensa/mm/Makefile b/arch/xtensa/mm/Makefile
index a5aed5932d7b..10aec22a8f98 100644
--- a/arch/xtensa/mm/Makefile
+++ b/arch/xtensa/mm/Makefile
@@ -5,9 +5,5 @@
5# removes any old dependencies. DON'T put your own dependencies here 5# removes any old dependencies. DON'T put your own dependencies here
6# unless it's something special (ie not a .c file). 6# unless it's something special (ie not a .c file).
7# 7#
8# Note 2! The CFLAGS definition is now in the main makefile...
9 8
10obj-y := init.o fault.o tlb.o misc.o 9obj-y := init.o fault.o tlb.o misc.o cache.o
11obj-m :=
12obj-n :=
13obj- :=
diff --git a/arch/xtensa/mm/cache.c b/arch/xtensa/mm/cache.c
new file mode 100644
index 000000000000..9a1fa9478ae7
--- /dev/null
+++ b/arch/xtensa/mm/cache.c
@@ -0,0 +1,256 @@
1/*
2 * arch/xtensa/mm/cache.c
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 2001-2006 Tensilica Inc.
9 *
10 * Chris Zankel <chris@zankel.net>
11 * Joe Taylor
12 * Marc Gauthier
13 *
14 */
15
16#include <linux/init.h>
17#include <linux/signal.h>
18#include <linux/sched.h>
19#include <linux/kernel.h>
20#include <linux/errno.h>
21#include <linux/string.h>
22#include <linux/types.h>
23#include <linux/ptrace.h>
24#include <linux/bootmem.h>
25#include <linux/swap.h>
26#include <linux/pagemap.h>
27
28#include <asm/pgtable.h>
29#include <asm/bootparam.h>
30#include <asm/mmu_context.h>
31#include <asm/tlb.h>
32#include <asm/tlbflush.h>
33#include <asm/page.h>
34#include <asm/pgalloc.h>
35#include <asm/pgtable.h>
36
37//#define printd(x...) printk(x)
38#define printd(x...) do { } while(0)
39
40/*
41 * Note:
42 * The kernel provides one architecture bit PG_arch_1 in the page flags that
43 * can be used for cache coherency.
44 *
45 * I$-D$ coherency.
46 *
47 * The Xtensa architecture doesn't keep the instruction cache coherent with
48 * the data cache. We use the architecture bit to indicate if the caches
49 * are coherent. The kernel clears this bit whenever a page is added to the
50 * page cache. At that time, the caches might not be in sync. We, therefore,
51 * define this flag as 'clean' if set.
52 *
53 * D-cache aliasing.
54 *
55 * With cache aliasing, we have to always flush the cache when pages are
56 * unmapped (see tlb_start_vma(). So, we use this flag to indicate a dirty
57 * page.
58 *
59 *
60 *
61 */
62
63#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
64
65/*
66 * Any time the kernel writes to a user page cache page, or it is about to
67 * read from a page cache page this routine is called.
68 *
69 */
70
71void flush_dcache_page(struct page *page)
72{
73 struct address_space *mapping = page_mapping(page);
74
75 /*
76 * If we have a mapping but the page is not mapped to user-space
77 * yet, we simply mark this page dirty and defer flushing the
78 * caches until update_mmu().
79 */
80
81 if (mapping && !mapping_mapped(mapping)) {
82 if (!test_bit(PG_arch_1, &page->flags))
83 set_bit(PG_arch_1, &page->flags);
84 return;
85
86 } else {
87
88 unsigned long phys = page_to_phys(page);
89 unsigned long temp = page->index << PAGE_SHIFT;
90 unsigned long alias = !(DCACHE_ALIAS_EQ(temp, phys));
91 unsigned long virt;
92
93 /*
94 * Flush the page in kernel space and user space.
95 * Note that we can omit that step if aliasing is not
96 * an issue, but we do have to synchronize I$ and D$
97 * if we have a mapping.
98 */
99
100 if (!alias && !mapping)
101 return;
102
103 __flush_invalidate_dcache_page((long)page_address(page));
104
105 virt = TLBTEMP_BASE_1 + (temp & DCACHE_ALIAS_MASK);
106
107 if (alias)
108 __flush_invalidate_dcache_page_alias(virt, phys);
109
110 if (mapping)
111 __invalidate_icache_page_alias(virt, phys);
112 }
113
114 /* There shouldn't be an entry in the cache for this page anymore. */
115}
116
117
118/*
119 * For now, flush the whole cache. FIXME??
120 */
121
122void flush_cache_range(struct vm_area_struct* vma,
123 unsigned long start, unsigned long end)
124{
125 __flush_invalidate_dcache_all();
126 __invalidate_icache_all();
127}
128
129/*
130 * Remove any entry in the cache for this page.
131 *
132 * Note that this function is only called for user pages, so use the
133 * alias versions of the cache flush functions.
134 */
135
136void flush_cache_page(struct vm_area_struct* vma, unsigned long address,
137 unsigned long pfn)
138{
139 /* Note that we have to use the 'alias' address to avoid multi-hit */
140
141 unsigned long phys = page_to_phys(pfn_to_page(pfn));
142 unsigned long virt = TLBTEMP_BASE_1 + (address & DCACHE_ALIAS_MASK);
143
144 __flush_invalidate_dcache_page_alias(virt, phys);
145 __invalidate_icache_page_alias(virt, phys);
146}
147
148#endif
149
150void
151update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t pte)
152{
153 unsigned long pfn = pte_pfn(pte);
154 struct page *page;
155
156 if (!pfn_valid(pfn))
157 return;
158
159 page = pfn_to_page(pfn);
160
161 /* Invalidate old entry in TLBs */
162
163 invalidate_itlb_mapping(addr);
164 invalidate_dtlb_mapping(addr);
165
166#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
167
168 if (!PageReserved(page) && test_bit(PG_arch_1, &page->flags)) {
169
170 unsigned long vaddr = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK);
171 unsigned long paddr = (unsigned long) page_address(page);
172 unsigned long phys = page_to_phys(page);
173
174 __flush_invalidate_dcache_page(paddr);
175
176 __flush_invalidate_dcache_page_alias(vaddr, phys);
177 __invalidate_icache_page_alias(vaddr, phys);
178
179 clear_bit(PG_arch_1, &page->flags);
180 }
181#else
182 if (!PageReserved(page) && !test_bit(PG_arch_1, &page->flags)
183 && (vma->vm_flags & VM_EXEC) != 0) {
184 unsigned long vaddr = addr & PAGE_MASK;
185 __flush_dcache_page(vaddr);
186 __invalidate_icache_page(vaddr);
187 set_bit(PG_arch_1, &page->flags);
188 }
189#endif
190}
191
192/*
193 * access_process_vm() has called get_user_pages(), which has done a
194 * flush_dcache_page() on the page.
195 */
196
197#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
198
199void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
200 unsigned long vaddr, void *dst, const void *src,
201 unsigned long len)
202{
203 unsigned long phys = page_to_phys(page);
204 unsigned long alias = !(DCACHE_ALIAS_EQ(vaddr, phys));
205
206 /* Flush and invalidate user page if aliased. */
207
208 if (alias) {
209 unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
210 __flush_invalidate_dcache_page_alias(temp, phys);
211 }
212
213 /* Copy data */
214
215 memcpy(dst, src, len);
216
217 /*
218 * Flush and invalidate kernel page if aliased and synchronize
219 * data and instruction caches for executable pages.
220 */
221
222 if (alias) {
223 unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
224
225 __flush_invalidate_dcache_range((unsigned long) dst, len);
226 if ((vma->vm_flags & VM_EXEC) != 0) {
227 __invalidate_icache_page_alias(temp, phys);
228 }
229
230 } else if ((vma->vm_flags & VM_EXEC) != 0) {
231 __flush_dcache_range((unsigned long)dst,len);
232 __invalidate_icache_range((unsigned long) dst, len);
233 }
234}
235
236extern void copy_from_user_page(struct vm_area_struct *vma, struct page *page,
237 unsigned long vaddr, void *dst, const void *src,
238 unsigned long len)
239{
240 unsigned long phys = page_to_phys(page);
241 unsigned long alias = !(DCACHE_ALIAS_EQ(vaddr, phys));
242
243 /*
244 * Flush user page if aliased.
245 * (Note: a simply flush would be sufficient)
246 */
247
248 if (alias) {
249 unsigned long temp = TLBTEMP_BASE_1 + (vaddr & DCACHE_ALIAS_MASK);
250 __flush_invalidate_dcache_page_alias(temp, phys);
251 }
252
253 memcpy(dst, src, len);
254}
255
256#endif
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 16004067add3..45d28f217c03 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -24,6 +24,8 @@
24unsigned long asid_cache = ASID_USER_FIRST; 24unsigned long asid_cache = ASID_USER_FIRST;
25void bad_page_fault(struct pt_regs*, unsigned long, int); 25void bad_page_fault(struct pt_regs*, unsigned long, int);
26 26
27#undef DEBUG_PAGE_FAULT
28
27/* 29/*
28 * This routine handles page faults. It determines the address, 30 * This routine handles page faults. It determines the address,
29 * and the problem, and then passes it off to one of the appropriate 31 * and the problem, and then passes it off to one of the appropriate
@@ -64,7 +66,7 @@ void do_page_fault(struct pt_regs *regs)
64 exccause == EXCCAUSE_ITLB_MISS || 66 exccause == EXCCAUSE_ITLB_MISS ||
65 exccause == EXCCAUSE_FETCH_CACHE_ATTRIBUTE) ? 1 : 0; 67 exccause == EXCCAUSE_FETCH_CACHE_ATTRIBUTE) ? 1 : 0;
66 68
67#if 0 69#ifdef DEBUG_PAGE_FAULT
68 printk("[%s:%d:%08x:%d:%08x:%s%s]\n", current->comm, current->pid, 70 printk("[%s:%d:%08x:%d:%08x:%s%s]\n", current->comm, current->pid,
69 address, exccause, regs->pc, is_write? "w":"", is_exec? "x":""); 71 address, exccause, regs->pc, is_write? "w":"", is_exec? "x":"");
70#endif 72#endif
@@ -219,7 +221,7 @@ bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
219 221
220 /* Are we prepared to handle this kernel fault? */ 222 /* Are we prepared to handle this kernel fault? */
221 if ((entry = search_exception_tables(regs->pc)) != NULL) { 223 if ((entry = search_exception_tables(regs->pc)) != NULL) {
222#if 1 224#ifdef DEBUG_PAGE_FAULT
223 printk(KERN_DEBUG "%s: Exception at pc=%#010lx (%lx)\n", 225 printk(KERN_DEBUG "%s: Exception at pc=%#010lx (%lx)\n",
224 current->comm, regs->pc, entry->fixup); 226 current->comm, regs->pc, entry->fixup);
225#endif 227#endif
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 8415c76f11c2..b3086f34a8e7 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -15,40 +15,24 @@
15 * Kevin Chea 15 * Kevin Chea
16 */ 16 */
17 17
18#include <linux/init.h>
19#include <linux/signal.h>
20#include <linux/sched.h>
21#include <linux/kernel.h> 18#include <linux/kernel.h>
22#include <linux/errno.h> 19#include <linux/errno.h>
23#include <linux/string.h>
24#include <linux/types.h>
25#include <linux/ptrace.h>
26#include <linux/bootmem.h> 20#include <linux/bootmem.h>
27#include <linux/swap.h> 21#include <linux/swap.h>
22#include <linux/mman.h>
23#include <linux/nodemask.h>
24#include <linux/mm.h>
25#include <linux/slab.h>
28 26
29#include <asm/pgtable.h> 27#include <asm/pgtable.h>
30#include <asm/bootparam.h> 28#include <asm/bootparam.h>
31#include <asm/mmu_context.h> 29#include <asm/mmu_context.h>
32#include <asm/tlb.h> 30#include <asm/tlb.h>
33#include <asm/tlbflush.h>
34#include <asm/page.h> 31#include <asm/page.h>
35#include <asm/pgalloc.h> 32#include <asm/pgalloc.h>
36#include <asm/pgtable.h>
37
38 33
39#define DEBUG 0
40 34
41DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); 35DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
42//static DEFINE_SPINLOCK(tlb_lock);
43
44/*
45 * This flag is used to indicate that the page was mapped and modified in
46 * kernel space, so the cache is probably dirty at that address.
47 * If cache aliasing is enabled and the page color mismatches, update_mmu_cache
48 * synchronizes the caches if this bit is set.
49 */
50
51#define PG_cache_clean PG_arch_1
52 36
53/* References to section boundaries */ 37/* References to section boundaries */
54 38
@@ -323,228 +307,22 @@ void show_mem(void)
323 printk("%d free pages\n", free); 307 printk("%d free pages\n", free);
324} 308}
325 309
326/* ------------------------------------------------------------------------- */ 310struct kmem_cache *pgtable_cache __read_mostly;
327
328#if (DCACHE_WAY_SIZE > PAGE_SIZE)
329
330/*
331 * With cache aliasing, the page color of the page in kernel space and user
332 * space might mismatch. We temporarily map the page to a different virtual
333 * address with the same color and clear the page there.
334 */
335
336void clear_user_page(void *kaddr, unsigned long vaddr, struct page* page)
337{
338
339 /* There shouldn't be any entries for this page. */
340
341 __flush_invalidate_dcache_page_phys(__pa(page_address(page)));
342
343 if (!PAGE_COLOR_EQ(vaddr, kaddr)) {
344 unsigned long v, p;
345
346 /* Temporarily map page to DTLB_WAY_DCACHE_ALIAS0. */
347
348 spin_lock(&tlb_lock);
349
350 p = (unsigned long)pte_val((mk_pte(page,PAGE_KERNEL)));
351 kaddr = (void*)PAGE_COLOR_MAP0(vaddr);
352 v = (unsigned long)kaddr | DTLB_WAY_DCACHE_ALIAS0;
353 __asm__ __volatile__("wdtlb %0,%1; dsync" : :"a" (p), "a" (v));
354
355 clear_page(kaddr);
356
357 spin_unlock(&tlb_lock);
358 } else {
359 clear_page(kaddr);
360 }
361
362 /* We need to make sure that i$ and d$ are coherent. */
363
364 clear_bit(PG_cache_clean, &page->flags);
365}
366
367/*
368 * With cache aliasing, we have to make sure that the page color of the page
369 * in kernel space matches that of the virtual user address before we read
370 * the page. If the page color differ, we create a temporary DTLB entry with
371 * the corrent page color and use this 'temporary' address as the source.
372 * We then use the same approach as in clear_user_page and copy the data
373 * to the kernel space and clear the PG_cache_clean bit to synchronize caches
374 * later.
375 *
376 * Note:
377 * Instead of using another 'way' for the temporary DTLB entry, we could
378 * probably use the same entry that points to the kernel address (after
379 * saving the original value and restoring it when we are done).
380 */
381 311
382void copy_user_page(void* to, void* from, unsigned long vaddr, 312static void pgd_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
383 struct page* to_page)
384{ 313{
385 /* There shouldn't be any entries for the new page. */ 314 pte_t* ptep = (pte_t*)addr;
386 315 int i;
387 __flush_invalidate_dcache_page_phys(__pa(page_address(to_page)));
388
389 spin_lock(&tlb_lock);
390
391 if (!PAGE_COLOR_EQ(vaddr, from)) {
392 unsigned long v, p, t;
393
394 __asm__ __volatile__ ("pdtlb %1,%2; rdtlb1 %0,%1"
395 : "=a"(p), "=a"(t) : "a"(from));
396 from = (void*)PAGE_COLOR_MAP0(vaddr);
397 v = (unsigned long)from | DTLB_WAY_DCACHE_ALIAS0;
398 __asm__ __volatile__ ("wdtlb %0,%1; dsync" ::"a" (p), "a" (v));
399 }
400
401 if (!PAGE_COLOR_EQ(vaddr, to)) {
402 unsigned long v, p;
403
404 p = (unsigned long)pte_val((mk_pte(to_page,PAGE_KERNEL)));
405 to = (void*)PAGE_COLOR_MAP1(vaddr);
406 v = (unsigned long)to | DTLB_WAY_DCACHE_ALIAS1;
407 __asm__ __volatile__ ("wdtlb %0,%1; dsync" ::"a" (p), "a" (v));
408 }
409 copy_page(to, from);
410
411 spin_unlock(&tlb_lock);
412
413 /* We need to make sure that i$ and d$ are coherent. */
414
415 clear_bit(PG_cache_clean, &to_page->flags);
416}
417
418
419
420/*
421 * Any time the kernel writes to a user page cache page, or it is about to
422 * read from a page cache page this routine is called.
423 *
424 * Note:
425 * The kernel currently only provides one architecture bit in the page
426 * flags that we use for I$/D$ coherency. Maybe, in future, we can
427 * use a sepearte bit for deferred dcache aliasing:
428 * If the page is not mapped yet, we only need to set a flag,
429 * if mapped, we need to invalidate the page.
430 */
431// FIXME: we probably need this for WB caches not only for Page Coloring..
432
433void flush_dcache_page(struct page *page)
434{
435 unsigned long addr = __pa(page_address(page));
436 struct address_space *mapping = page_mapping(page);
437
438 __flush_invalidate_dcache_page_phys(addr);
439
440 if (!test_bit(PG_cache_clean, &page->flags))
441 return;
442
443 /* If this page hasn't been mapped, yet, handle I$/D$ coherency later.*/
444#if 0
445 if (mapping && !mapping_mapped(mapping))
446 clear_bit(PG_cache_clean, &page->flags);
447 else
448#endif
449 __invalidate_icache_page_phys(addr);
450}
451
452void flush_cache_range(struct vm_area_struct* vma, unsigned long s,
453 unsigned long e)
454{
455 __flush_invalidate_cache_all();
456}
457
458void flush_cache_page(struct vm_area_struct* vma, unsigned long address,
459 unsigned long pfn)
460{
461 struct page *page = pfn_to_page(pfn);
462
463 /* Remove any entry for the old mapping. */
464
465 if (current->active_mm == vma->vm_mm) {
466 unsigned long addr = __pa(page_address(page));
467 __flush_invalidate_dcache_page_phys(addr);
468 if ((vma->vm_flags & VM_EXEC) != 0)
469 __invalidate_icache_page_phys(addr);
470 } else {
471 BUG();
472 }
473}
474
475#endif /* (DCACHE_WAY_SIZE > PAGE_SIZE) */
476
477
478pte_t* pte_alloc_one_kernel (struct mm_struct* mm, unsigned long addr)
479{
480 pte_t* pte = (pte_t*)__get_free_pages(GFP_KERNEL|__GFP_REPEAT, 0);
481 if (likely(pte)) {
482 pte_t* ptep = (pte_t*)(pte_val(*pte) + PAGE_OFFSET);
483 int i;
484 for (i = 0; i < 1024; i++, ptep++)
485 pte_clear(mm, addr, ptep);
486 }
487 return pte;
488}
489
490struct page* pte_alloc_one(struct mm_struct *mm, unsigned long addr)
491{
492 struct page *page;
493
494 page = alloc_pages(GFP_KERNEL | __GFP_REPEAT, 0);
495
496 if (likely(page)) {
497 pte_t* ptep = kmap_atomic(page, KM_USER0);
498 int i;
499 316
500 for (i = 0; i < 1024; i++, ptep++) 317 for (i = 0; i < 1024; i++, ptep++)
501 pte_clear(mm, addr, ptep); 318 pte_clear(NULL, 0, ptep);
502 319
503 kunmap_atomic(ptep, KM_USER0);
504 }
505 return page;
506} 320}
507 321
508 322void __init pgtable_cache_init(void)
509/*
510 * Handle D$/I$ coherency.
511 *
512 * Note:
513 * We only have one architecture bit for the page flags, so we cannot handle
514 * cache aliasing, yet.
515 */
516
517void
518update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t pte)
519{ 323{
520 unsigned long pfn = pte_pfn(pte); 324 pgtable_cache = kmem_cache_create("pgd",
521 struct page *page; 325 PAGE_SIZE, PAGE_SIZE,
522 unsigned long vaddr = addr & PAGE_MASK; 326 SLAB_HWCACHE_ALIGN,
523 327 pgd_ctor);
524 if (!pfn_valid(pfn))
525 return;
526
527 page = pfn_to_page(pfn);
528
529 invalidate_itlb_mapping(addr);
530 invalidate_dtlb_mapping(addr);
531
532 /* We have a new mapping. Use it. */
533
534 write_dtlb_entry(pte, dtlb_probe(addr));
535
536 /* If the processor can execute from this page, synchronize D$/I$. */
537
538 if ((vma->vm_flags & VM_EXEC) != 0) {
539
540 write_itlb_entry(pte, itlb_probe(addr));
541
542 /* Synchronize caches, if not clean. */
543
544 if (!test_and_set_bit(PG_cache_clean, &page->flags)) {
545 __flush_dcache_page(vaddr);
546 __invalidate_icache_page(vaddr);
547 }
548 }
549} 328}
550
diff --git a/arch/xtensa/mm/misc.S b/arch/xtensa/mm/misc.S
index ae085332c607..e1f880368e32 100644
--- a/arch/xtensa/mm/misc.S
+++ b/arch/xtensa/mm/misc.S
@@ -7,29 +7,33 @@
7 * License. See the file "COPYING" in the main directory of this archive 7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details. 8 * for more details.
9 * 9 *
10 * Copyright (C) 2001 - 2005 Tensilica Inc. 10 * Copyright (C) 2001 - 2007 Tensilica Inc.
11 * 11 *
12 * Chris Zankel <chris@zankel.net> 12 * Chris Zankel <chris@zankel.net>
13 */ 13 */
14 14
15/* Note: we might want to implement some of the loops as zero-overhead-loops,
16 * where applicable and if supported by the processor.
17 */
18 15
19#include <linux/linkage.h> 16#include <linux/linkage.h>
20#include <asm/page.h> 17#include <asm/page.h>
21#include <asm/pgtable.h> 18#include <asm/pgtable.h>
22#include <asm/asmmacro.h> 19#include <asm/asmmacro.h>
23#include <asm/cacheasm.h> 20#include <asm/cacheasm.h>
21#include <asm/tlbflush.h>
22
24 23
25/* clear_page (page) */ 24/*
25 * clear_page and clear_user_page are the same for non-cache-aliased configs.
26 *
27 * clear_page (unsigned long page)
28 * a2
29 */
26 30
27ENTRY(clear_page) 31ENTRY(clear_page)
28 entry a1, 16 32 entry a1, 16
29 addi a4, a2, PAGE_SIZE
30 movi a3, 0
31 33
321: s32i a3, a2, 0 34 movi a3, 0
35 __loopi a2, a7, PAGE_SIZE, 32
36 s32i a3, a2, 0
33 s32i a3, a2, 4 37 s32i a3, a2, 4
34 s32i a3, a2, 8 38 s32i a3, a2, 8
35 s32i a3, a2, 12 39 s32i a3, a2, 12
@@ -37,42 +41,277 @@ ENTRY(clear_page)
37 s32i a3, a2, 20 41 s32i a3, a2, 20
38 s32i a3, a2, 24 42 s32i a3, a2, 24
39 s32i a3, a2, 28 43 s32i a3, a2, 28
40 addi a2, a2, 32 44 __endla a2, a7, 32
41 blt a2, a4, 1b
42 45
43 retw 46 retw
44 47
45/* 48/*
49 * copy_page and copy_user_page are the same for non-cache-aliased configs.
50 *
46 * copy_page (void *to, void *from) 51 * copy_page (void *to, void *from)
47 * a2 a3 52 * a2 a3
48 */ 53 */
49 54
50ENTRY(copy_page) 55ENTRY(copy_page)
51 entry a1, 16 56 entry a1, 16
52 addi a4, a2, PAGE_SIZE
53
541: l32i a5, a3, 0
55 l32i a6, a3, 4
56 l32i a7, a3, 8
57 s32i a5, a2, 0
58 s32i a6, a2, 4
59 s32i a7, a2, 8
60 l32i a5, a3, 12
61 l32i a6, a3, 16
62 l32i a7, a3, 20
63 s32i a5, a2, 12
64 s32i a6, a2, 16
65 s32i a7, a2, 20
66 l32i a5, a3, 24
67 l32i a6, a3, 28
68 s32i a5, a2, 24
69 s32i a6, a2, 28
70 addi a2, a2, 32
71 addi a3, a3, 32
72 blt a2, a4, 1b
73 57
58 __loopi a2, a4, PAGE_SIZE, 32
59
60 l32i a8, a3, 0
61 l32i a9, a3, 4
62 s32i a8, a2, 0
63 s32i a9, a2, 4
64
65 l32i a8, a3, 8
66 l32i a9, a3, 12
67 s32i a8, a2, 8
68 s32i a9, a2, 12
69
70 l32i a8, a3, 16
71 l32i a9, a3, 20
72 s32i a8, a2, 16
73 s32i a9, a2, 20
74
75 l32i a8, a3, 24
76 l32i a9, a3, 28
77 s32i a8, a2, 24
78 s32i a9, a2, 28
79
80 addi a2, a2, 32
81 addi a3, a3, 32
82
83 __endl a2, a4
84
85 retw
86
87/*
88 * If we have to deal with cache aliasing, we use temporary memory mappings
89 * to ensure that the source and destination pages have the same color as
90 * the virtual address. We use way 0 and 1 for temporary mappings in such cases.
91 *
92 * The temporary DTLB entries shouldn't be flushed by interrupts, but are
93 * flushed by preemptive task switches. Special code in the
94 * fast_second_level_miss handler re-established the temporary mapping.
95 * It requires that the PPNs for the destination and source addresses are
96 * in a6, and a7, respectively.
97 */
98
99/* TLB miss exceptions are treated special in the following region */
100
101ENTRY(__tlbtemp_mapping_start)
102
103#if (DCACHE_WAY_SIZE > PAGE_SIZE)
104
105/*
106 * clear_user_page (void *addr, unsigned long vaddr, struct page *page)
107 * a2 a3 a4
108 */
109
110ENTRY(clear_user_page)
111 entry a1, 32
112
113 /* Mark page dirty and determine alias. */
114
115 movi a7, (1 << PG_ARCH_1)
116 l32i a5, a4, PAGE_FLAGS
117 xor a6, a2, a3
118 extui a3, a3, PAGE_SHIFT, DCACHE_ALIAS_ORDER
119 extui a6, a6, PAGE_SHIFT, DCACHE_ALIAS_ORDER
120 or a5, a5, a7
121 slli a3, a3, PAGE_SHIFT
122 s32i a5, a4, PAGE_FLAGS
123
124 /* Skip setting up a temporary DTLB if not aliased. */
125
126 beqz a6, 1f
127
128 /* Invalidate kernel page. */
129
130 mov a10, a2
131 call8 __invalidate_dcache_page
132
133 /* Setup a temporary DTLB with the color of the VPN */
134
135 movi a4, -PAGE_OFFSET + (PAGE_KERNEL | _PAGE_HW_WRITE)
136 movi a5, TLBTEMP_BASE_1 # virt
137 add a6, a2, a4 # ppn
138 add a2, a5, a3 # add 'color'
139
140 wdtlb a6, a2
141 dsync
142
1431: movi a3, 0
144 __loopi a2, a7, PAGE_SIZE, 32
145 s32i a3, a2, 0
146 s32i a3, a2, 4
147 s32i a3, a2, 8
148 s32i a3, a2, 12
149 s32i a3, a2, 16
150 s32i a3, a2, 20
151 s32i a3, a2, 24
152 s32i a3, a2, 28
153 __endla a2, a7, 32
154
155 bnez a6, 1f
156 retw
157
158 /* We need to invalidate the temporary idtlb entry, if any. */
159
1601: addi a2, a2, -PAGE_SIZE
161 idtlb a2
162 dsync
163
164 retw
165
166/*
167 * copy_page_user (void *to, void *from, unsigned long vaddr, struct page *page)
168 * a2 a3 a4 a5
169 */
170
171ENTRY(copy_user_page)
172
173 entry a1, 32
174
175 /* Mark page dirty and determine alias for destination. */
176
177 movi a8, (1 << PG_ARCH_1)
178 l32i a9, a5, PAGE_FLAGS
179 xor a6, a2, a4
180 xor a7, a3, a4
181 extui a4, a4, PAGE_SHIFT, DCACHE_ALIAS_ORDER
182 extui a6, a6, PAGE_SHIFT, DCACHE_ALIAS_ORDER
183 extui a7, a7, PAGE_SHIFT, DCACHE_ALIAS_ORDER
184 or a9, a9, a8
185 slli a4, a4, PAGE_SHIFT
186 s32i a9, a5, PAGE_FLAGS
187 movi a5, -PAGE_OFFSET + (PAGE_KERNEL | _PAGE_HW_WRITE)
188
189 beqz a6, 1f
190
191 /* Invalidate dcache */
192
193 mov a10, a2
194 call8 __invalidate_dcache_page
195
196 /* Setup a temporary DTLB with a matching color. */
197
198 movi a8, TLBTEMP_BASE_1 # base
199 add a6, a2, a5 # ppn
200 add a2, a8, a4 # add 'color'
201
202 wdtlb a6, a2
203 dsync
204
205 /* Skip setting up a temporary DTLB for destination if not aliased. */
206
2071: beqz a7, 1f
208
209 /* Setup a temporary DTLB with a matching color. */
210
211 movi a8, TLBTEMP_BASE_2 # base
212 add a7, a3, a5 # ppn
213 add a3, a8, a4
214 addi a8, a3, 1 # way1
215
216 wdtlb a7, a8
217 dsync
218
2191: __loopi a2, a4, PAGE_SIZE, 32
220
221 l32i a8, a3, 0
222 l32i a9, a3, 4
223 s32i a8, a2, 0
224 s32i a9, a2, 4
225
226 l32i a8, a3, 8
227 l32i a9, a3, 12
228 s32i a8, a2, 8
229 s32i a9, a2, 12
230
231 l32i a8, a3, 16
232 l32i a9, a3, 20
233 s32i a8, a2, 16
234 s32i a9, a2, 20
235
236 l32i a8, a3, 24
237 l32i a9, a3, 28
238 s32i a8, a2, 24
239 s32i a9, a2, 28
240
241 addi a2, a2, 32
242 addi a3, a3, 32
243
244 __endl a2, a4
245
246 /* We need to invalidate any temporary mapping! */
247
248 bnez a6, 1f
249 bnez a7, 2f
250 retw
251
2521: addi a2, a2, -PAGE_SIZE
253 idtlb a2
254 dsync
255 bnez a7, 2f
256 retw
257
2582: addi a3, a3, -PAGE_SIZE+1
259 idtlb a3
260 dsync
261
262 retw
263
264#endif
265
266#if (DCACHE_WAY_SIZE > PAGE_SIZE)
267
268/*
269 * void __flush_invalidate_dcache_page_alias (addr, phys)
270 * a2 a3
271 */
272
273ENTRY(__flush_invalidate_dcache_page_alias)
274 entry sp, 16
275
276 movi a7, 0 # required for exception handler
277 addi a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE)
278 mov a4, a2
279 wdtlb a6, a2
280 dsync
281
282 ___flush_invalidate_dcache_page a2 a3
283
284 idtlb a4
285 dsync
286
287 retw
288
289#endif
290
291ENTRY(__tlbtemp_mapping_itlb)
292
293#if (ICACHE_WAY_SIZE > PAGE_SIZE)
294
295ENTRY(__invalidate_icache_page_alias)
296 entry sp, 16
297
298 addi a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE)
299 mov a4, a2
300 witlb a6, a2
301 isync
302
303 ___invalidate_icache_page a2 a3
304
305 iitlb a4
306 isync
74 retw 307 retw
75 308
309#endif
310
311/* End of special treatment in tlb miss exception */
312
313ENTRY(__tlbtemp_mapping_end)
314
76/* 315/*
77 * void __invalidate_icache_page(ulong start) 316 * void __invalidate_icache_page(ulong start)
78 */ 317 */
@@ -121,8 +360,6 @@ ENTRY(__flush_dcache_page)
121 dsync 360 dsync
122 retw 361 retw
123 362
124
125
126/* 363/*
127 * void __invalidate_icache_range(ulong start, ulong size) 364 * void __invalidate_icache_range(ulong start, ulong size)
128 */ 365 */
@@ -168,7 +405,6 @@ ENTRY(__invalidate_dcache_range)
168 405
169 ___invalidate_dcache_range a2 a3 a4 406 ___invalidate_dcache_range a2 a3 a4
170 407
171
172 retw 408 retw
173 409
174/* 410/*
diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c
index 2f4f20ffe666..854677d0c3f6 100644
--- a/arch/xtensa/platform-iss/console.c
+++ b/arch/xtensa/platform-iss/console.c
@@ -20,7 +20,6 @@
20#include <linux/param.h> 20#include <linux/param.h>
21#include <linux/serial.h> 21#include <linux/serial.h>
22#include <linux/serialP.h> 22#include <linux/serialP.h>
23#include <linux/console.h>
24 23
25#include <asm/uaccess.h> 24#include <asm/uaccess.h>
26#include <asm/irq.h> 25#include <asm/irq.h>
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-11 20:22:38 -0500