aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic>2005-04-18 21:55:09 -0400
committerJames Bottomley <jejb@titanic>2005-04-18 21:55:09 -0400
commitc0698f2f6e4839ce9463ce731c892993215ea067 (patch)
treeb05fc8a950ace937460212e996441e4c05a227f6
parentcb624029cab62e5415287d15b2ec907b8f322ff5 (diff)
parent7f907d7486f2519c2ff1493bfbcdc36dcacd85b7 (diff)
fully merge up to scsi-misc-2.6
Diffstat
-rw-r--r--arch/arm/kernel/process.c15
-rw-r--r--arch/arm/kernel/traps.c8
-rw-r--r--arch/arm/lib/bitops.h33
-rw-r--r--arch/arm/lib/changebit.S11
-rw-r--r--arch/arm/lib/clearbit.S13
-rw-r--r--arch/arm/lib/setbit.S11
-rw-r--r--arch/arm/lib/testchangebit.S15
-rw-r--r--arch/arm/lib/testclearbit.S15
-rw-r--r--arch/arm/lib/testsetbit.S15
-rw-r--r--arch/arm/mach-footbridge/dc21285-timer.c4
-rw-r--r--arch/arm/mach-sa1100/h3600.c2
-rw-r--r--arch/i386/kernel/acpi/boot.c2
-rw-r--r--arch/m68k/configs/amiga_defconfig104
-rw-r--r--arch/m68k/configs/apollo_defconfig78
-rw-r--r--arch/m68k/configs/atari_defconfig90
-rw-r--r--arch/m68k/configs/bvme6000_defconfig78
-rw-r--r--arch/m68k/configs/hp300_defconfig78
-rw-r--r--arch/m68k/configs/mac_defconfig87
-rw-r--r--arch/m68k/configs/mvme147_defconfig85
-rw-r--r--arch/m68k/configs/mvme16x_defconfig85
-rw-r--r--arch/m68k/configs/q40_defconfig88
-rw-r--r--arch/m68k/configs/sun3_defconfig85
-rw-r--r--arch/m68k/configs/sun3x_defconfig85
-rw-r--r--arch/m68k/defconfig67
-rw-r--r--arch/sparc/kernel/ptrace.c12
-rw-r--r--arch/sparc64/kernel/ptrace.c101
-rw-r--r--arch/sparc64/kernel/signal32.c5
-rw-r--r--arch/sparc64/kernel/sys_sparc32.c68
-rw-r--r--arch/sparc64/kernel/systbls.S14
-rw-r--r--arch/sparc64/mm/init.c19
-rw-r--r--fs/char_dev.c3
-rw-r--r--fs/compat.c74
-rw-r--r--include/asm-arm/arch-ebsa285/debug-macro.S7
-rw-r--r--include/asm-arm/arch-rpc/debug-macro.S5
-rw-r--r--include/asm-arm/ptrace.h5
-rw-r--r--include/asm-arm/system.h3
-rw-r--r--include/asm-sparc/unistd.h6
-rw-r--r--include/asm-sparc64/cacheflush.h22
-rw-r--r--include/asm-sparc64/compat.h40
-rw-r--r--include/asm-sparc64/stat.h49
-rw-r--r--include/asm-sparc64/unistd.h6
-rw-r--r--kernel/auditsc.c28
-rw-r--r--kernel/sched.c6
-rw-r--r--security/selinux/avc.c34
44 files changed, 1097 insertions, 564 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index dbd8ca89b385..26eacd3e5def 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -168,12 +168,11 @@ void machine_restart(char * __unused)
168 168
169EXPORT_SYMBOL(machine_restart); 169EXPORT_SYMBOL(machine_restart);
170 170
171void show_regs(struct pt_regs * regs) 171void __show_regs(struct pt_regs *regs)
172{ 172{
173 unsigned long flags; 173 unsigned long flags = condition_codes(regs);
174
175 flags = condition_codes(regs);
176 174
175 printk("CPU: %d\n", smp_processor_id());
177 print_symbol("PC is at %s\n", instruction_pointer(regs)); 176 print_symbol("PC is at %s\n", instruction_pointer(regs));
178 print_symbol("LR is at %s\n", regs->ARM_lr); 177 print_symbol("LR is at %s\n", regs->ARM_lr);
179 printk("pc : [<%08lx>] lr : [<%08lx>] %s\n" 178 printk("pc : [<%08lx>] lr : [<%08lx>] %s\n"
@@ -213,6 +212,14 @@ void show_regs(struct pt_regs * regs)
213 } 212 }
214} 213}
215 214
215void show_regs(struct pt_regs * regs)
216{
217 printk("\n");
218 printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
219 __show_regs(regs);
220 __backtrace();
221}
222
216void show_fpregs(struct user_fp *regs) 223void show_fpregs(struct user_fp *regs)
217{ 224{
218 int i; 225 int i;
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 93dc4646cd7f..6e31718f6008 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -31,9 +31,6 @@
31 31
32#include "ptrace.h" 32#include "ptrace.h"
33 33
34extern void c_backtrace (unsigned long fp, int pmode);
35extern void show_pte(struct mm_struct *mm, unsigned long addr);
36
37const char *processor_modes[]= 34const char *processor_modes[]=
38{ "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" , 35{ "USER_26", "FIQ_26" , "IRQ_26" , "SVC_26" , "UK4_26" , "UK5_26" , "UK6_26" , "UK7_26" ,
39 "UK8_26" , "UK9_26" , "UK10_26", "UK11_26", "UK12_26", "UK13_26", "UK14_26", "UK15_26", 36 "UK8_26" , "UK9_26" , "UK10_26", "UK11_26", "UK12_26", "UK13_26", "UK14_26", "UK15_26",
@@ -216,8 +213,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
216 213
217 printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter); 214 printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter);
218 print_modules(); 215 print_modules();
219 printk("CPU: %d\n", smp_processor_id()); 216 __show_regs(regs);
220 show_regs(regs);
221 printk("Process %s (pid: %d, stack limit = 0x%p)\n", 217 printk("Process %s (pid: %d, stack limit = 0x%p)\n",
222 tsk->comm, tsk->pid, tsk->thread_info + 1); 218 tsk->comm, tsk->pid, tsk->thread_info + 1);
223 219
@@ -482,7 +478,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
482 current->pid, current->comm, no); 478 current->pid, current->comm, no);
483 dump_instr(regs); 479 dump_instr(regs);
484 if (user_mode(regs)) { 480 if (user_mode(regs)) {
485 show_regs(regs); 481 __show_regs(regs);
486 c_backtrace(regs->ARM_fp, processor_mode(regs)); 482 c_backtrace(regs->ARM_fp, processor_mode(regs));
487 } 483 }
488 } 484 }
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
new file mode 100644
index 000000000000..4a83ab6cd565
--- /dev/null
+++ b/arch/arm/lib/bitops.h
@@ -0,0 +1,33 @@
1 .macro bitop, instr
2 and r2, r0, #7
3 mov r3, #1
4 mov r3, r3, lsl r2
5 save_and_disable_irqs ip, r2
6 ldrb r2, [r1, r0, lsr #3]
7 \instr r2, r2, r3
8 strb r2, [r1, r0, lsr #3]
9 restore_irqs ip
10 mov pc, lr
11 .endm
12
13/**
14 * testop - implement a test_and_xxx_bit operation.
15 * @instr: operational instruction
16 * @store: store instruction
17 *
18 * Note: we can trivially conditionalise the store instruction
19 * to avoid dirting the data cache.
20 */
21 .macro testop, instr, store
22 add r1, r1, r0, lsr #3
23 and r3, r0, #7
24 mov r0, #1
25 save_and_disable_irqs ip, r2
26 ldrb r2, [r1]
27 tst r2, r0, lsl r3
28 \instr r2, r2, r0, lsl r3
29 \store r2, [r1]
30 restore_irqs ip
31 moveq r0, #0
32 mov pc, lr
33 .endm
diff --git a/arch/arm/lib/changebit.S b/arch/arm/lib/changebit.S
index 3af45cab70e1..389567c24090 100644
--- a/arch/arm/lib/changebit.S
+++ b/arch/arm/lib/changebit.S
@@ -9,6 +9,7 @@
9 */ 9 */
10#include <linux/linkage.h> 10#include <linux/linkage.h>
11#include <asm/assembler.h> 11#include <asm/assembler.h>
12#include "bitops.h"
12 .text 13 .text
13 14
14/* Purpose : Function to change a bit 15/* Purpose : Function to change a bit
@@ -17,12 +18,4 @@
17ENTRY(_change_bit_be) 18ENTRY(_change_bit_be)
18 eor r0, r0, #0x18 @ big endian byte ordering 19 eor r0, r0, #0x18 @ big endian byte ordering
19ENTRY(_change_bit_le) 20ENTRY(_change_bit_le)
20 and r2, r0, #7 21 bitop eor
21 mov r3, #1
22 mov r3, r3, lsl r2
23 save_and_disable_irqs ip, r2
24 ldrb r2, [r1, r0, lsr #3]
25 eor r2, r2, r3
26 strb r2, [r1, r0, lsr #3]
27 restore_irqs ip
28 RETINSTR(mov,pc,lr)
diff --git a/arch/arm/lib/clearbit.S b/arch/arm/lib/clearbit.S
index 069a2ce413f0..347516533025 100644
--- a/arch/arm/lib/clearbit.S
+++ b/arch/arm/lib/clearbit.S
@@ -9,6 +9,7 @@
9 */ 9 */
10#include <linux/linkage.h> 10#include <linux/linkage.h>
11#include <asm/assembler.h> 11#include <asm/assembler.h>
12#include "bitops.h"
12 .text 13 .text
13 14
14/* 15/*
@@ -18,14 +19,4 @@
18ENTRY(_clear_bit_be) 19ENTRY(_clear_bit_be)
19 eor r0, r0, #0x18 @ big endian byte ordering 20 eor r0, r0, #0x18 @ big endian byte ordering
20ENTRY(_clear_bit_le) 21ENTRY(_clear_bit_le)
21 and r2, r0, #7 22 bitop bic
22 mov r3, #1
23 mov r3, r3, lsl r2
24 save_and_disable_irqs ip, r2
25 ldrb r2, [r1, r0, lsr #3]
26 bic r2, r2, r3
27 strb r2, [r1, r0, lsr #3]
28 restore_irqs ip
29 RETINSTR(mov,pc,lr)
30
31
diff --git a/arch/arm/lib/setbit.S b/arch/arm/lib/setbit.S
index 8f337df5d99b..83bc23d5b037 100644
--- a/arch/arm/lib/setbit.S
+++ b/arch/arm/lib/setbit.S
@@ -9,6 +9,7 @@
9 */ 9 */
10#include <linux/linkage.h> 10#include <linux/linkage.h>
11#include <asm/assembler.h> 11#include <asm/assembler.h>
12#include "bitops.h"
12 .text 13 .text
13 14
14/* 15/*
@@ -18,12 +19,4 @@
18ENTRY(_set_bit_be) 19ENTRY(_set_bit_be)
19 eor r0, r0, #0x18 @ big endian byte ordering 20 eor r0, r0, #0x18 @ big endian byte ordering
20ENTRY(_set_bit_le) 21ENTRY(_set_bit_le)
21 and r2, r0, #7 22 bitop orr
22 mov r3, #1
23 mov r3, r3, lsl r2
24 save_and_disable_irqs ip, r2
25 ldrb r2, [r1, r0, lsr #3]
26 orr r2, r2, r3
27 strb r2, [r1, r0, lsr #3]
28 restore_irqs ip
29 RETINSTR(mov,pc,lr)
diff --git a/arch/arm/lib/testchangebit.S b/arch/arm/lib/testchangebit.S
index 4aba4676b984..b25dcd2be53e 100644
--- a/arch/arm/lib/testchangebit.S
+++ b/arch/arm/lib/testchangebit.S
@@ -9,21 +9,10 @@
9 */ 9 */
10#include <linux/linkage.h> 10#include <linux/linkage.h>
11#include <asm/assembler.h> 11#include <asm/assembler.h>
12#include "bitops.h"
12 .text 13 .text
13 14
14ENTRY(_test_and_change_bit_be) 15ENTRY(_test_and_change_bit_be)
15 eor r0, r0, #0x18 @ big endian byte ordering 16 eor r0, r0, #0x18 @ big endian byte ordering
16ENTRY(_test_and_change_bit_le) 17ENTRY(_test_and_change_bit_le)
17 add r1, r1, r0, lsr #3 18 testop eor, strb
18 and r3, r0, #7
19 mov r0, #1
20 save_and_disable_irqs ip, r2
21 ldrb r2, [r1]
22 tst r2, r0, lsl r3
23 eor r2, r2, r0, lsl r3
24 strb r2, [r1]
25 restore_irqs ip
26 moveq r0, #0
27 RETINSTR(mov,pc,lr)
28
29
diff --git a/arch/arm/lib/testclearbit.S b/arch/arm/lib/testclearbit.S
index e07c5bd24307..2dcc4b16b68e 100644
--- a/arch/arm/lib/testclearbit.S
+++ b/arch/arm/lib/testclearbit.S
@@ -9,21 +9,10 @@
9 */ 9 */
10#include <linux/linkage.h> 10#include <linux/linkage.h>
11#include <asm/assembler.h> 11#include <asm/assembler.h>
12#include "bitops.h"
12 .text 13 .text
13 14
14ENTRY(_test_and_clear_bit_be) 15ENTRY(_test_and_clear_bit_be)
15 eor r0, r0, #0x18 @ big endian byte ordering 16 eor r0, r0, #0x18 @ big endian byte ordering
16ENTRY(_test_and_clear_bit_le) 17ENTRY(_test_and_clear_bit_le)
17 add r1, r1, r0, lsr #3 @ Get byte offset 18 testop bicne, strneb
18 and r3, r0, #7 @ Get bit offset
19 mov r0, #1
20 save_and_disable_irqs ip, r2
21 ldrb r2, [r1]
22 tst r2, r0, lsl r3
23 bic r2, r2, r0, lsl r3
24 strb r2, [r1]
25 restore_irqs ip
26 moveq r0, #0
27 RETINSTR(mov,pc,lr)
28
29
diff --git a/arch/arm/lib/testsetbit.S b/arch/arm/lib/testsetbit.S
index a570fc74cddd..9011c969761a 100644
--- a/arch/arm/lib/testsetbit.S
+++ b/arch/arm/lib/testsetbit.S
@@ -9,21 +9,10 @@
9 */ 9 */
10#include <linux/linkage.h> 10#include <linux/linkage.h>
11#include <asm/assembler.h> 11#include <asm/assembler.h>
12#include "bitops.h"
12 .text 13 .text
13 14
14ENTRY(_test_and_set_bit_be) 15ENTRY(_test_and_set_bit_be)
15 eor r0, r0, #0x18 @ big endian byte ordering 16 eor r0, r0, #0x18 @ big endian byte ordering
16ENTRY(_test_and_set_bit_le) 17ENTRY(_test_and_set_bit_le)
17 add r1, r1, r0, lsr #3 @ Get byte offset 18 testop orreq, streqb
18 and r3, r0, #7 @ Get bit offset
19 mov r0, #1
20 save_and_disable_irqs ip, r2
21 ldrb r2, [r1]
22 tst r2, r0, lsl r3
23 orr r2, r2, r0, lsl r3
24 strb r2, [r1]
25 restore_irqs ip
26 moveq r0, #0
27 RETINSTR(mov,pc,lr)
28
29
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c
index 580e1d4bce08..da5b9b7623ca 100644
--- a/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/arch/arm/mach-footbridge/dc21285-timer.c
@@ -51,8 +51,6 @@ static struct irqaction footbridge_timer_irq = {
51 */ 51 */
52static void __init footbridge_timer_init(void) 52static void __init footbridge_timer_init(void)
53{ 53{
54 isa_rtc_init();
55
56 timer1_latch = (mem_fclk_21285 + 8 * HZ) / (16 * HZ); 54 timer1_latch = (mem_fclk_21285 + 8 * HZ) / (16 * HZ);
57 55
58 *CSR_TIMER1_CLR = 0; 56 *CSR_TIMER1_CLR = 0;
@@ -60,6 +58,8 @@ static void __init footbridge_timer_init(void)
60 *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD | TIMER_CNTL_DIV16; 58 *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD | TIMER_CNTL_DIV16;
61 59
62 setup_irq(IRQ_TIMER1, &footbridge_timer_irq); 60 setup_irq(IRQ_TIMER1, &footbridge_timer_irq);
61
62 isa_rtc_init();
63} 63}
64 64
65struct sys_timer footbridge_timer = { 65struct sys_timer footbridge_timer = {
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 9788d3aefa73..84c86543501a 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -130,7 +130,7 @@ static int h3600_irda_set_power(struct device *dev, unsigned int state)
130 return 0; 130 return 0;
131} 131}
132 132
133static void h3600_irda_set_speed(struct device *dev, int speed) 133static void h3600_irda_set_speed(struct device *dev, unsigned int speed)
134{ 134{
135 if (speed < 4000000) { 135 if (speed < 4000000) {
136 clr_h3600_egpio(IPAQ_EGPIO_IR_FSEL); 136 clr_h3600_egpio(IPAQ_EGPIO_IR_FSEL);
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 040451e90a04..53eb5cfd5b63 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -608,9 +608,11 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
608 acpi_fadt.sci_int = fadt->sci_int; 608 acpi_fadt.sci_int = fadt->sci_int;
609#endif 609#endif
610 610
611#ifdef CONFIG_ACPI_BUS
611 /* initialize rev and apic_phys_dest_mode for x86_64 genapic */ 612 /* initialize rev and apic_phys_dest_mode for x86_64 genapic */
612 acpi_fadt.revision = fadt->revision; 613 acpi_fadt.revision = fadt->revision;
613 acpi_fadt.force_apic_physical_destination_mode = fadt->force_apic_physical_destination_mode; 614 acpi_fadt.force_apic_physical_destination_mode = fadt->force_apic_physical_destination_mode;
615#endif
614 616
615#ifdef CONFIG_X86_PM_TIMER 617#ifdef CONFIG_X86_PM_TIMER
616 /* detect the location of the ACPI PM Timer */ 618 /* detect the location of the ACPI PM Timer */
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index c1b23336450b..7dbf997ff205 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:22:54 2004 4# Tue Apr 5 14:05:59 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -104,6 +106,7 @@ CONFIG_ZORRO_NAMES=y
104# 106#
105CONFIG_STANDALONE=y 107CONFIG_STANDALONE=y
106CONFIG_PREVENT_FIRMWARE_BUILD=y 108CONFIG_PREVENT_FIRMWARE_BUILD=y
109CONFIG_FW_LOADER=m
107# CONFIG_DEBUG_DRIVER is not set 110# CONFIG_DEBUG_DRIVER is not set
108 111
109# 112#
@@ -116,9 +119,10 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
116# 119#
117CONFIG_PARPORT=m 120CONFIG_PARPORT=m
118# CONFIG_PARPORT_PC is not set 121# CONFIG_PARPORT_PC is not set
122CONFIG_PARPORT_NOT_PC=y
119CONFIG_PARPORT_AMIGA=m 123CONFIG_PARPORT_AMIGA=m
120CONFIG_PARPORT_MFC3=m 124CONFIG_PARPORT_MFC3=m
121# CONFIG_PARPORT_OTHER is not set 125# CONFIG_PARPORT_GSC is not set
122CONFIG_PARPORT_1284=y 126CONFIG_PARPORT_1284=y
123 127
124# 128#
@@ -133,6 +137,7 @@ CONFIG_AMIGA_FLOPPY=y
133CONFIG_AMIGA_Z2RAM=y 137CONFIG_AMIGA_Z2RAM=y
134# CONFIG_BLK_DEV_XD is not set 138# CONFIG_BLK_DEV_XD is not set
135# CONFIG_PARIDE is not set 139# CONFIG_PARIDE is not set
140# CONFIG_BLK_DEV_COW_COMMON is not set
136CONFIG_BLK_DEV_LOOP=y 141CONFIG_BLK_DEV_LOOP=y
137CONFIG_BLK_DEV_CRYPTOLOOP=m 142CONFIG_BLK_DEV_CRYPTOLOOP=m
138CONFIG_BLK_DEV_NBD=m 143CONFIG_BLK_DEV_NBD=m
@@ -152,6 +157,7 @@ CONFIG_IOSCHED_NOOP=y
152CONFIG_IOSCHED_AS=y 157CONFIG_IOSCHED_AS=y
153CONFIG_IOSCHED_DEADLINE=y 158CONFIG_IOSCHED_DEADLINE=y
154CONFIG_IOSCHED_CFQ=y 159CONFIG_IOSCHED_CFQ=y
160CONFIG_ATA_OVER_ETH=m
155 161
156# 162#
157# ATA/ATAPI/MFM/RLL support 163# ATA/ATAPI/MFM/RLL support
@@ -212,6 +218,7 @@ CONFIG_SCSI_CONSTANTS=y
212# 218#
213# CONFIG_SCSI_SPI_ATTRS is not set 219# CONFIG_SCSI_SPI_ATTRS is not set
214# CONFIG_SCSI_FC_ATTRS is not set 220# CONFIG_SCSI_FC_ATTRS is not set
221# CONFIG_SCSI_ISCSI_ATTRS is not set
215 222
216# 223#
217# SCSI low-level drivers 224# SCSI low-level drivers
@@ -225,7 +232,6 @@ CONFIG_SCSI_CONSTANTS=y
225# CONFIG_SCSI_BUSLOGIC is not set 232# CONFIG_SCSI_BUSLOGIC is not set
226# CONFIG_SCSI_DTC3280 is not set 233# CONFIG_SCSI_DTC3280 is not set
227# CONFIG_SCSI_EATA is not set 234# CONFIG_SCSI_EATA is not set
228# CONFIG_SCSI_EATA_PIO is not set
229# CONFIG_SCSI_FUTURE_DOMAIN is not set 235# CONFIG_SCSI_FUTURE_DOMAIN is not set
230# CONFIG_SCSI_GDTH is not set 236# CONFIG_SCSI_GDTH is not set
231# CONFIG_SCSI_GENERIC_NCR5380 is not set 237# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -273,6 +279,8 @@ CONFIG_DM_CRYPT=m
273CONFIG_DM_SNAPSHOT=m 279CONFIG_DM_SNAPSHOT=m
274CONFIG_DM_MIRROR=m 280CONFIG_DM_MIRROR=m
275CONFIG_DM_ZERO=m 281CONFIG_DM_ZERO=m
282CONFIG_DM_MULTIPATH=m
283CONFIG_DM_MULTIPATH_EMC=m
276 284
277# 285#
278# Fusion MPT device support 286# Fusion MPT device support
@@ -296,7 +304,6 @@ CONFIG_NET=y
296# 304#
297CONFIG_PACKET=y 305CONFIG_PACKET=y
298# CONFIG_PACKET_MMAP is not set 306# CONFIG_PACKET_MMAP is not set
299CONFIG_NETLINK_DEV=y
300CONFIG_UNIX=y 307CONFIG_UNIX=y
301CONFIG_NET_KEY=y 308CONFIG_NET_KEY=y
302CONFIG_INET=y 309CONFIG_INET=y
@@ -394,11 +401,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
394CONFIG_IP_NF_ARPTABLES=m 401CONFIG_IP_NF_ARPTABLES=m
395CONFIG_IP_NF_ARPFILTER=m 402CONFIG_IP_NF_ARPFILTER=m
396CONFIG_IP_NF_ARP_MANGLE=m 403CONFIG_IP_NF_ARP_MANGLE=m
397CONFIG_IP_NF_COMPAT_IPCHAINS=m
398CONFIG_IP_NF_COMPAT_IPFWADM=m
399 404
400# 405#
401# IPv6: Netfilter Configuration 406# IPv6: Netfilter Configuration (EXPERIMENTAL)
402# 407#
403CONFIG_IP6_NF_QUEUE=m 408CONFIG_IP6_NF_QUEUE=m
404CONFIG_IP6_NF_IPTABLES=m 409CONFIG_IP6_NF_IPTABLES=m
@@ -470,7 +475,6 @@ CONFIG_DUMMY=m
470# CONFIG_BONDING is not set 475# CONFIG_BONDING is not set
471CONFIG_EQUALIZER=m 476CONFIG_EQUALIZER=m
472# CONFIG_TUN is not set 477# CONFIG_TUN is not set
473# CONFIG_ETHERTAP is not set
474 478
475# 479#
476# ARCnet devices 480# ARCnet devices
@@ -564,17 +568,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
564# CONFIG_INPUT_EVBUG is not set 568# CONFIG_INPUT_EVBUG is not set
565 569
566# 570#
567# Input I/O drivers
568#
569# CONFIG_GAMEPORT is not set
570CONFIG_SOUND_GAMEPORT=y
571CONFIG_SERIO=m
572CONFIG_SERIO_SERPORT=m
573# CONFIG_SERIO_CT82C710 is not set
574# CONFIG_SERIO_PARKBD is not set
575# CONFIG_SERIO_RAW is not set
576
577#
578# Input Device Drivers 571# Input Device Drivers
579# 572#
580CONFIG_INPUT_KEYBOARD=y 573CONFIG_INPUT_KEYBOARD=y
@@ -593,21 +586,43 @@ CONFIG_INPUT_MOUSE=y
593CONFIG_MOUSE_AMIGA=y 586CONFIG_MOUSE_AMIGA=y
594# CONFIG_MOUSE_VSXXXAA is not set 587# CONFIG_MOUSE_VSXXXAA is not set
595CONFIG_INPUT_JOYSTICK=y 588CONFIG_INPUT_JOYSTICK=y
589# CONFIG_JOYSTICK_ANALOG is not set
590# CONFIG_JOYSTICK_A3D is not set
591# CONFIG_JOYSTICK_ADI is not set
592# CONFIG_JOYSTICK_COBRA is not set
593# CONFIG_JOYSTICK_GF2K is not set
594# CONFIG_JOYSTICK_GRIP is not set
595# CONFIG_JOYSTICK_GRIP_MP is not set
596# CONFIG_JOYSTICK_GUILLEMOT is not set
597# CONFIG_JOYSTICK_INTERACT is not set
598# CONFIG_JOYSTICK_SIDEWINDER is not set
599# CONFIG_JOYSTICK_TMDC is not set
596# CONFIG_JOYSTICK_IFORCE is not set 600# CONFIG_JOYSTICK_IFORCE is not set
597# CONFIG_JOYSTICK_WARRIOR is not set 601# CONFIG_JOYSTICK_WARRIOR is not set
598# CONFIG_JOYSTICK_MAGELLAN is not set 602# CONFIG_JOYSTICK_MAGELLAN is not set
599# CONFIG_JOYSTICK_SPACEORB is not set 603# CONFIG_JOYSTICK_SPACEORB is not set
600# CONFIG_JOYSTICK_SPACEBALL is not set 604# CONFIG_JOYSTICK_SPACEBALL is not set
601# CONFIG_JOYSTICK_STINGER is not set 605# CONFIG_JOYSTICK_STINGER is not set
602# CONFIG_JOYSTICK_TWIDDLER is not set 606# CONFIG_JOYSTICK_TWIDJOY is not set
603# CONFIG_JOYSTICK_DB9 is not set 607# CONFIG_JOYSTICK_DB9 is not set
604# CONFIG_JOYSTICK_GAMECON is not set 608# CONFIG_JOYSTICK_GAMECON is not set
605# CONFIG_JOYSTICK_TURBOGRAFX is not set 609# CONFIG_JOYSTICK_TURBOGRAFX is not set
606CONFIG_JOYSTICK_AMIGA=m 610CONFIG_JOYSTICK_AMIGA=m
611# CONFIG_JOYSTICK_JOYDUMP is not set
607# CONFIG_INPUT_TOUCHSCREEN is not set 612# CONFIG_INPUT_TOUCHSCREEN is not set
608# CONFIG_INPUT_MISC is not set 613# CONFIG_INPUT_MISC is not set
609 614
610# 615#
616# Hardware I/O ports
617#
618CONFIG_SERIO=m
619CONFIG_SERIO_SERPORT=m
620# CONFIG_SERIO_PARKBD is not set
621# CONFIG_SERIO_RAW is not set
622# CONFIG_GAMEPORT is not set
623CONFIG_SOUND_GAMEPORT=y
624
625#
611# Character devices 626# Character devices
612# 627#
613CONFIG_VT=y 628CONFIG_VT=y
@@ -653,6 +668,10 @@ CONFIG_GEN_RTC_X=y
653# CONFIG_RAW_DRIVER is not set 668# CONFIG_RAW_DRIVER is not set
654 669
655# 670#
671# TPM devices
672#
673
674#
656# I2C support 675# I2C support
657# 676#
658# CONFIG_I2C is not set 677# CONFIG_I2C is not set
@@ -680,6 +699,11 @@ CONFIG_GEN_RTC_X=y
680# Graphics support 699# Graphics support
681# 700#
682CONFIG_FB=y 701CONFIG_FB=y
702CONFIG_FB_CFB_FILLRECT=y
703CONFIG_FB_CFB_COPYAREA=y
704CONFIG_FB_CFB_IMAGEBLIT=y
705CONFIG_FB_SOFT_CURSOR=y
706# CONFIG_FB_MACMODES is not set
683CONFIG_FB_MODE_HELPERS=y 707CONFIG_FB_MODE_HELPERS=y
684# CONFIG_FB_TILEBLITTING is not set 708# CONFIG_FB_TILEBLITTING is not set
685CONFIG_FB_CIRRUS=m 709CONFIG_FB_CIRRUS=m
@@ -688,6 +712,7 @@ CONFIG_FB_AMIGA_OCS=y
688CONFIG_FB_AMIGA_ECS=y 712CONFIG_FB_AMIGA_ECS=y
689CONFIG_FB_AMIGA_AGA=y 713CONFIG_FB_AMIGA_AGA=y
690CONFIG_FB_FM2=y 714CONFIG_FB_FM2=y
715# CONFIG_FB_S1D13XXX is not set
691# CONFIG_FB_VIRTUAL is not set 716# CONFIG_FB_VIRTUAL is not set
692 717
693# 718#
@@ -707,6 +732,7 @@ CONFIG_LOGO=y
707CONFIG_LOGO_LINUX_MONO=y 732CONFIG_LOGO_LINUX_MONO=y
708CONFIG_LOGO_LINUX_VGA16=y 733CONFIG_LOGO_LINUX_VGA16=y
709CONFIG_LOGO_LINUX_CLUT224=y 734CONFIG_LOGO_LINUX_CLUT224=y
735# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
710 736
711# 737#
712# Sound 738# Sound
@@ -722,10 +748,6 @@ CONFIG_DMASOUND=m
722# CONFIG_USB_ARCH_HAS_OHCI is not set 748# CONFIG_USB_ARCH_HAS_OHCI is not set
723 749
724# 750#
725# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
726#
727
728#
729# USB Gadget Support 751# USB Gadget Support
730# 752#
731# CONFIG_USB_GADGET is not set 753# CONFIG_USB_GADGET is not set
@@ -736,6 +758,11 @@ CONFIG_DMASOUND=m
736# CONFIG_MMC is not set 758# CONFIG_MMC is not set
737 759
738# 760#
761# InfiniBand support
762#
763# CONFIG_INFINIBAND is not set
764
765#
739# Character devices 766# Character devices
740# 767#
741CONFIG_AMIGA_BUILTIN_SERIAL=y 768CONFIG_AMIGA_BUILTIN_SERIAL=y
@@ -758,10 +785,16 @@ CONFIG_REISERFS_FS=m
758# CONFIG_REISERFS_FS_XATTR is not set 785# CONFIG_REISERFS_FS_XATTR is not set
759CONFIG_JFS_FS=m 786CONFIG_JFS_FS=m
760# CONFIG_JFS_POSIX_ACL is not set 787# CONFIG_JFS_POSIX_ACL is not set
788# CONFIG_JFS_SECURITY is not set
761# CONFIG_JFS_DEBUG is not set 789# CONFIG_JFS_DEBUG is not set
762# CONFIG_JFS_STATISTICS is not set 790# CONFIG_JFS_STATISTICS is not set
763CONFIG_FS_POSIX_ACL=y 791CONFIG_FS_POSIX_ACL=y
792
793#
794# XFS support
795#
764CONFIG_XFS_FS=m 796CONFIG_XFS_FS=m
797CONFIG_XFS_EXPORT=y
765# CONFIG_XFS_RT is not set 798# CONFIG_XFS_RT is not set
766# CONFIG_XFS_QUOTA is not set 799# CONFIG_XFS_QUOTA is not set
767# CONFIG_XFS_SECURITY is not set 800# CONFIG_XFS_SECURITY is not set
@@ -916,13 +949,19 @@ CONFIG_NLS_UTF8=m
916# 949#
917# Kernel hacking 950# Kernel hacking
918# 951#
952# CONFIG_PRINTK_TIME is not set
919CONFIG_DEBUG_KERNEL=y 953CONFIG_DEBUG_KERNEL=y
920CONFIG_MAGIC_SYSRQ=y 954CONFIG_MAGIC_SYSRQ=y
955CONFIG_LOG_BUF_SHIFT=16
921# CONFIG_SCHEDSTATS is not set 956# CONFIG_SCHEDSTATS is not set
922# CONFIG_DEBUG_SLAB is not set 957# CONFIG_DEBUG_SLAB is not set
958# CONFIG_DEBUG_SPINLOCK is not set
959# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
923# CONFIG_DEBUG_KOBJECT is not set 960# CONFIG_DEBUG_KOBJECT is not set
924# CONFIG_DEBUG_BUGVERBOSE is not set 961CONFIG_DEBUG_BUGVERBOSE=y
925# CONFIG_DEBUG_INFO is not set 962# CONFIG_DEBUG_INFO is not set
963# CONFIG_DEBUG_FS is not set
964# CONFIG_FRAME_POINTER is not set
926 965
927# 966#
928# Security options 967# Security options
@@ -941,7 +980,8 @@ CONFIG_CRYPTO_MD5=m
941CONFIG_CRYPTO_SHA1=m 980CONFIG_CRYPTO_SHA1=m
942CONFIG_CRYPTO_SHA256=m 981CONFIG_CRYPTO_SHA256=m
943CONFIG_CRYPTO_SHA512=m 982CONFIG_CRYPTO_SHA512=m
944# CONFIG_CRYPTO_WP512 is not set 983CONFIG_CRYPTO_WP512=m
984CONFIG_CRYPTO_TGR192=m
945CONFIG_CRYPTO_DES=m 985CONFIG_CRYPTO_DES=m
946CONFIG_CRYPTO_BLOWFISH=m 986CONFIG_CRYPTO_BLOWFISH=m
947CONFIG_CRYPTO_TWOFISH=m 987CONFIG_CRYPTO_TWOFISH=m
@@ -959,6 +999,10 @@ CONFIG_CRYPTO_CRC32C=m
959CONFIG_CRYPTO_TEST=m 999CONFIG_CRYPTO_TEST=m
960 1000
961# 1001#
1002# Hardware crypto devices
1003#
1004
1005#
962# Library routines 1006# Library routines
963# 1007#
964CONFIG_CRC_CCITT=m 1008CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 648361b544c0..505a2968e604 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:22:58 2004 4# Tue Apr 5 14:06:00 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -99,6 +101,7 @@ CONFIG_PROC_HARDWARE=y
99# 101#
100CONFIG_STANDALONE=y 102CONFIG_STANDALONE=y
101CONFIG_PREVENT_FIRMWARE_BUILD=y 103CONFIG_PREVENT_FIRMWARE_BUILD=y
104CONFIG_FW_LOADER=m
102# CONFIG_DEBUG_DRIVER is not set 105# CONFIG_DEBUG_DRIVER is not set
103 106
104# 107#
@@ -118,6 +121,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
118# 121#
119# Block devices 122# Block devices
120# 123#
124# CONFIG_BLK_DEV_COW_COMMON is not set
121CONFIG_BLK_DEV_LOOP=y 125CONFIG_BLK_DEV_LOOP=y
122CONFIG_BLK_DEV_CRYPTOLOOP=m 126CONFIG_BLK_DEV_CRYPTOLOOP=m
123CONFIG_BLK_DEV_NBD=m 127CONFIG_BLK_DEV_NBD=m
@@ -137,6 +141,7 @@ CONFIG_IOSCHED_NOOP=y
137CONFIG_IOSCHED_AS=y 141CONFIG_IOSCHED_AS=y
138CONFIG_IOSCHED_DEADLINE=y 142CONFIG_IOSCHED_DEADLINE=y
139CONFIG_IOSCHED_CFQ=y 143CONFIG_IOSCHED_CFQ=y
144CONFIG_ATA_OVER_ETH=m
140 145
141# 146#
142# ATA/ATAPI/MFM/RLL support 147# ATA/ATAPI/MFM/RLL support
@@ -171,6 +176,7 @@ CONFIG_SCSI_CONSTANTS=y
171# 176#
172# CONFIG_SCSI_SPI_ATTRS is not set 177# CONFIG_SCSI_SPI_ATTRS is not set
173# CONFIG_SCSI_FC_ATTRS is not set 178# CONFIG_SCSI_FC_ATTRS is not set
179# CONFIG_SCSI_ISCSI_ATTRS is not set
174 180
175# 181#
176# SCSI low-level drivers 182# SCSI low-level drivers
@@ -196,6 +202,8 @@ CONFIG_DM_CRYPT=m
196CONFIG_DM_SNAPSHOT=m 202CONFIG_DM_SNAPSHOT=m
197CONFIG_DM_MIRROR=m 203CONFIG_DM_MIRROR=m
198CONFIG_DM_ZERO=m 204CONFIG_DM_ZERO=m
205CONFIG_DM_MULTIPATH=m
206CONFIG_DM_MULTIPATH_EMC=m
199 207
200# 208#
201# Fusion MPT device support 209# Fusion MPT device support
@@ -219,7 +227,6 @@ CONFIG_NET=y
219# 227#
220CONFIG_PACKET=y 228CONFIG_PACKET=y
221# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
222CONFIG_NETLINK_DEV=y
223CONFIG_UNIX=y 230CONFIG_UNIX=y
224CONFIG_NET_KEY=y 231CONFIG_NET_KEY=y
225CONFIG_INET=y 232CONFIG_INET=y
@@ -320,11 +327,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
320CONFIG_IP_NF_ARPTABLES=m 327CONFIG_IP_NF_ARPTABLES=m
321CONFIG_IP_NF_ARPFILTER=m 328CONFIG_IP_NF_ARPFILTER=m
322CONFIG_IP_NF_ARP_MANGLE=m 329CONFIG_IP_NF_ARP_MANGLE=m
323CONFIG_IP_NF_COMPAT_IPCHAINS=m
324CONFIG_IP_NF_COMPAT_IPFWADM=m
325 330
326# 331#
327# IPv6: Netfilter Configuration 332# IPv6: Netfilter Configuration (EXPERIMENTAL)
328# 333#
329CONFIG_IP6_NF_QUEUE=m 334CONFIG_IP6_NF_QUEUE=m
330CONFIG_IP6_NF_IPTABLES=m 335CONFIG_IP6_NF_IPTABLES=m
@@ -396,7 +401,6 @@ CONFIG_DUMMY=m
396# CONFIG_BONDING is not set 401# CONFIG_BONDING is not set
397CONFIG_EQUALIZER=m 402CONFIG_EQUALIZER=m
398# CONFIG_TUN is not set 403# CONFIG_TUN is not set
399# CONFIG_ETHERTAP is not set
400 404
401# 405#
402# Ethernet (10 or 100Mbit) 406# Ethernet (10 or 100Mbit)
@@ -469,16 +473,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
469# CONFIG_INPUT_EVBUG is not set 473# CONFIG_INPUT_EVBUG is not set
470 474
471# 475#
472# Input I/O drivers
473#
474# CONFIG_GAMEPORT is not set
475CONFIG_SOUND_GAMEPORT=y
476CONFIG_SERIO=m
477CONFIG_SERIO_SERPORT=m
478# CONFIG_SERIO_CT82C710 is not set
479# CONFIG_SERIO_RAW is not set
480
481#
482# Input Device Drivers 476# Input Device Drivers
483# 477#
484CONFIG_INPUT_KEYBOARD=y 478CONFIG_INPUT_KEYBOARD=y
@@ -496,6 +490,16 @@ CONFIG_MOUSE_SERIAL=m
496# CONFIG_INPUT_MISC is not set 490# CONFIG_INPUT_MISC is not set
497 491
498# 492#
493# Hardware I/O ports
494#
495CONFIG_SERIO=m
496CONFIG_SERIO_SERPORT=m
497CONFIG_SERIO_LIBPS2=m
498# CONFIG_SERIO_RAW is not set
499# CONFIG_GAMEPORT is not set
500CONFIG_SOUND_GAMEPORT=y
501
502#
499# Character devices 503# Character devices
500# 504#
501CONFIG_VT=y 505CONFIG_VT=y
@@ -536,6 +540,10 @@ CONFIG_GEN_RTC_X=y
536# CONFIG_RAW_DRIVER is not set 540# CONFIG_RAW_DRIVER is not set
537 541
538# 542#
543# TPM devices
544#
545
546#
539# I2C support 547# I2C support
540# 548#
541# CONFIG_I2C is not set 549# CONFIG_I2C is not set
@@ -581,10 +589,6 @@ CONFIG_DUMMY_CONSOLE=y
581# CONFIG_USB_ARCH_HAS_OHCI is not set 589# CONFIG_USB_ARCH_HAS_OHCI is not set
582 590
583# 591#
584# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
585#
586
587#
588# USB Gadget Support 592# USB Gadget Support
589# 593#
590# CONFIG_USB_GADGET is not set 594# CONFIG_USB_GADGET is not set
@@ -595,6 +599,11 @@ CONFIG_DUMMY_CONSOLE=y
595# CONFIG_MMC is not set 599# CONFIG_MMC is not set
596 600
597# 601#
602# InfiniBand support
603#
604# CONFIG_INFINIBAND is not set
605
606#
598# Character devices 607# Character devices
599# 608#
600CONFIG_DN_SERIAL=y 609CONFIG_DN_SERIAL=y
@@ -615,10 +624,16 @@ CONFIG_REISERFS_FS=m
615# CONFIG_REISERFS_FS_XATTR is not set 624# CONFIG_REISERFS_FS_XATTR is not set
616CONFIG_JFS_FS=m 625CONFIG_JFS_FS=m
617# CONFIG_JFS_POSIX_ACL is not set 626# CONFIG_JFS_POSIX_ACL is not set
627# CONFIG_JFS_SECURITY is not set
618# CONFIG_JFS_DEBUG is not set 628# CONFIG_JFS_DEBUG is not set
619# CONFIG_JFS_STATISTICS is not set 629# CONFIG_JFS_STATISTICS is not set
620CONFIG_FS_POSIX_ACL=y 630CONFIG_FS_POSIX_ACL=y
631
632#
633# XFS support
634#
621CONFIG_XFS_FS=m 635CONFIG_XFS_FS=m
636CONFIG_XFS_EXPORT=y
622# CONFIG_XFS_RT is not set 637# CONFIG_XFS_RT is not set
623# CONFIG_XFS_QUOTA is not set 638# CONFIG_XFS_QUOTA is not set
624# CONFIG_XFS_SECURITY is not set 639# CONFIG_XFS_SECURITY is not set
@@ -773,13 +788,19 @@ CONFIG_NLS_UTF8=m
773# 788#
774# Kernel hacking 789# Kernel hacking
775# 790#
791# CONFIG_PRINTK_TIME is not set
776CONFIG_DEBUG_KERNEL=y 792CONFIG_DEBUG_KERNEL=y
777CONFIG_MAGIC_SYSRQ=y 793CONFIG_MAGIC_SYSRQ=y
794CONFIG_LOG_BUF_SHIFT=16
778# CONFIG_SCHEDSTATS is not set 795# CONFIG_SCHEDSTATS is not set
779# CONFIG_DEBUG_SLAB is not set 796# CONFIG_DEBUG_SLAB is not set
797# CONFIG_DEBUG_SPINLOCK is not set
798# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
780# CONFIG_DEBUG_KOBJECT is not set 799# CONFIG_DEBUG_KOBJECT is not set
781# CONFIG_DEBUG_BUGVERBOSE is not set 800CONFIG_DEBUG_BUGVERBOSE=y
782# CONFIG_DEBUG_INFO is not set 801# CONFIG_DEBUG_INFO is not set
802# CONFIG_DEBUG_FS is not set
803# CONFIG_FRAME_POINTER is not set
783 804
784# 805#
785# Security options 806# Security options
@@ -798,7 +819,8 @@ CONFIG_CRYPTO_MD5=y
798CONFIG_CRYPTO_SHA1=m 819CONFIG_CRYPTO_SHA1=m
799CONFIG_CRYPTO_SHA256=m 820CONFIG_CRYPTO_SHA256=m
800CONFIG_CRYPTO_SHA512=m 821CONFIG_CRYPTO_SHA512=m
801# CONFIG_CRYPTO_WP512 is not set 822CONFIG_CRYPTO_WP512=m
823CONFIG_CRYPTO_TGR192=m
802CONFIG_CRYPTO_DES=y 824CONFIG_CRYPTO_DES=y
803CONFIG_CRYPTO_BLOWFISH=m 825CONFIG_CRYPTO_BLOWFISH=m
804CONFIG_CRYPTO_TWOFISH=m 826CONFIG_CRYPTO_TWOFISH=m
@@ -816,6 +838,10 @@ CONFIG_CRYPTO_CRC32C=m
816CONFIG_CRYPTO_TEST=m 838CONFIG_CRYPTO_TEST=m
817 839
818# 840#
841# Hardware crypto devices
842#
843
844#
819# Library routines 845# Library routines
820# 846#
821CONFIG_CRC_CCITT=m 847CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 1fb25c0b3e95..617aa73c3250 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:23:11 2004 4# Tue Apr 5 14:06:18 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -100,6 +102,7 @@ CONFIG_PROC_HARDWARE=y
100# 102#
101CONFIG_STANDALONE=y 103CONFIG_STANDALONE=y
102CONFIG_PREVENT_FIRMWARE_BUILD=y 104CONFIG_PREVENT_FIRMWARE_BUILD=y
105CONFIG_FW_LOADER=m
103# CONFIG_DEBUG_DRIVER is not set 106# CONFIG_DEBUG_DRIVER is not set
104 107
105# 108#
@@ -112,8 +115,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
112# 115#
113CONFIG_PARPORT=m 116CONFIG_PARPORT=m
114# CONFIG_PARPORT_PC is not set 117# CONFIG_PARPORT_PC is not set
118CONFIG_PARPORT_NOT_PC=y
115CONFIG_PARPORT_ATARI=m 119CONFIG_PARPORT_ATARI=m
116# CONFIG_PARPORT_OTHER is not set 120# CONFIG_PARPORT_GSC is not set
117CONFIG_PARPORT_1284=y 121CONFIG_PARPORT_1284=y
118 122
119# 123#
@@ -125,6 +129,7 @@ CONFIG_PARPORT_1284=y
125# 129#
126CONFIG_ATARI_FLOPPY=y 130CONFIG_ATARI_FLOPPY=y
127# CONFIG_PARIDE is not set 131# CONFIG_PARIDE is not set
132# CONFIG_BLK_DEV_COW_COMMON is not set
128CONFIG_BLK_DEV_LOOP=y 133CONFIG_BLK_DEV_LOOP=y
129CONFIG_BLK_DEV_CRYPTOLOOP=m 134CONFIG_BLK_DEV_CRYPTOLOOP=m
130CONFIG_BLK_DEV_NBD=m 135CONFIG_BLK_DEV_NBD=m
@@ -144,6 +149,7 @@ CONFIG_IOSCHED_NOOP=y
144CONFIG_IOSCHED_AS=y 149CONFIG_IOSCHED_AS=y
145CONFIG_IOSCHED_DEADLINE=y 150CONFIG_IOSCHED_DEADLINE=y
146CONFIG_IOSCHED_CFQ=y 151CONFIG_IOSCHED_CFQ=y
152CONFIG_ATA_OVER_ETH=m
147 153
148# 154#
149# ATA/ATAPI/MFM/RLL support 155# ATA/ATAPI/MFM/RLL support
@@ -201,6 +207,7 @@ CONFIG_SCSI_CONSTANTS=y
201# 207#
202# CONFIG_SCSI_SPI_ATTRS is not set 208# CONFIG_SCSI_SPI_ATTRS is not set
203# CONFIG_SCSI_FC_ATTRS is not set 209# CONFIG_SCSI_FC_ATTRS is not set
210# CONFIG_SCSI_ISCSI_ATTRS is not set
204 211
205# 212#
206# SCSI low-level drivers 213# SCSI low-level drivers
@@ -228,6 +235,8 @@ CONFIG_DM_CRYPT=m
228CONFIG_DM_SNAPSHOT=m 235CONFIG_DM_SNAPSHOT=m
229CONFIG_DM_MIRROR=m 236CONFIG_DM_MIRROR=m
230CONFIG_DM_ZERO=m 237CONFIG_DM_ZERO=m
238CONFIG_DM_MULTIPATH=m
239CONFIG_DM_MULTIPATH_EMC=m
231 240
232# 241#
233# Fusion MPT device support 242# Fusion MPT device support
@@ -251,7 +260,6 @@ CONFIG_NET=y
251# 260#
252CONFIG_PACKET=y 261CONFIG_PACKET=y
253# CONFIG_PACKET_MMAP is not set 262# CONFIG_PACKET_MMAP is not set
254CONFIG_NETLINK_DEV=y
255CONFIG_UNIX=y 263CONFIG_UNIX=y
256CONFIG_NET_KEY=y 264CONFIG_NET_KEY=y
257CONFIG_INET=y 265CONFIG_INET=y
@@ -349,11 +357,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
349CONFIG_IP_NF_ARPTABLES=m 357CONFIG_IP_NF_ARPTABLES=m
350CONFIG_IP_NF_ARPFILTER=m 358CONFIG_IP_NF_ARPFILTER=m
351CONFIG_IP_NF_ARP_MANGLE=m 359CONFIG_IP_NF_ARP_MANGLE=m
352CONFIG_IP_NF_COMPAT_IPCHAINS=m
353CONFIG_IP_NF_COMPAT_IPFWADM=m
354 360
355# 361#
356# IPv6: Netfilter Configuration 362# IPv6: Netfilter Configuration (EXPERIMENTAL)
357# 363#
358CONFIG_IP6_NF_QUEUE=m 364CONFIG_IP6_NF_QUEUE=m
359CONFIG_IP6_NF_IPTABLES=m 365CONFIG_IP6_NF_IPTABLES=m
@@ -425,7 +431,6 @@ CONFIG_DUMMY=m
425# CONFIG_BONDING is not set 431# CONFIG_BONDING is not set
426CONFIG_EQUALIZER=m 432CONFIG_EQUALIZER=m
427# CONFIG_TUN is not set 433# CONFIG_TUN is not set
428# CONFIG_ETHERTAP is not set
429 434
430# 435#
431# Ethernet (10 or 100Mbit) 436# Ethernet (10 or 100Mbit)
@@ -499,17 +504,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
499# CONFIG_INPUT_EVBUG is not set 504# CONFIG_INPUT_EVBUG is not set
500 505
501# 506#
502# Input I/O drivers
503#
504# CONFIG_GAMEPORT is not set
505CONFIG_SOUND_GAMEPORT=y
506CONFIG_SERIO=y
507CONFIG_SERIO_SERPORT=y
508# CONFIG_SERIO_CT82C710 is not set
509# CONFIG_SERIO_PARKBD is not set
510# CONFIG_SERIO_RAW is not set
511
512#
513# Input Device Drivers 507# Input Device Drivers
514# 508#
515CONFIG_INPUT_KEYBOARD=y 509CONFIG_INPUT_KEYBOARD=y
@@ -529,6 +523,17 @@ CONFIG_INPUT_M68K_BEEP=m
529CONFIG_INPUT_UINPUT=m 523CONFIG_INPUT_UINPUT=m
530 524
531# 525#
526# Hardware I/O ports
527#
528CONFIG_SERIO=y
529CONFIG_SERIO_SERPORT=y
530# CONFIG_SERIO_PARKBD is not set
531CONFIG_SERIO_LIBPS2=y
532# CONFIG_SERIO_RAW is not set
533# CONFIG_GAMEPORT is not set
534CONFIG_SOUND_GAMEPORT=y
535
536#
532# Character devices 537# Character devices
533# 538#
534CONFIG_VT=y 539CONFIG_VT=y
@@ -574,6 +579,10 @@ CONFIG_GEN_RTC_X=y
574# CONFIG_RAW_DRIVER is not set 579# CONFIG_RAW_DRIVER is not set
575 580
576# 581#
582# TPM devices
583#
584
585#
577# I2C support 586# I2C support
578# 587#
579# CONFIG_I2C is not set 588# CONFIG_I2C is not set
@@ -601,9 +610,15 @@ CONFIG_GEN_RTC_X=y
601# Graphics support 610# Graphics support
602# 611#
603CONFIG_FB=y 612CONFIG_FB=y
613# CONFIG_FB_CFB_FILLRECT is not set
614# CONFIG_FB_CFB_COPYAREA is not set
615# CONFIG_FB_CFB_IMAGEBLIT is not set
616# CONFIG_FB_SOFT_CURSOR is not set
617# CONFIG_FB_MACMODES is not set
604CONFIG_FB_MODE_HELPERS=y 618CONFIG_FB_MODE_HELPERS=y
605# CONFIG_FB_TILEBLITTING is not set 619# CONFIG_FB_TILEBLITTING is not set
606# CONFIG_FB_ATY is not set 620# CONFIG_FB_ATY is not set
621# CONFIG_FB_S1D13XXX is not set
607# CONFIG_FB_VIRTUAL is not set 622# CONFIG_FB_VIRTUAL is not set
608 623
609# 624#
@@ -619,6 +634,7 @@ CONFIG_FONT_8x16=y
619# Logo configuration 634# Logo configuration
620# 635#
621# CONFIG_LOGO is not set 636# CONFIG_LOGO is not set
637# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
622 638
623# 639#
624# Sound 640# Sound
@@ -634,10 +650,6 @@ CONFIG_DMASOUND=m
634# CONFIG_USB_ARCH_HAS_OHCI is not set 650# CONFIG_USB_ARCH_HAS_OHCI is not set
635 651
636# 652#
637# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
638#
639
640#
641# USB Gadget Support 653# USB Gadget Support
642# 654#
643# CONFIG_USB_GADGET is not set 655# CONFIG_USB_GADGET is not set
@@ -648,6 +660,11 @@ CONFIG_DMASOUND=m
648# CONFIG_MMC is not set 660# CONFIG_MMC is not set
649 661
650# 662#
663# InfiniBand support
664#
665# CONFIG_INFINIBAND is not set
666
667#
651# Character devices 668# Character devices
652# 669#
653CONFIG_ATARI_MFPSER=m 670CONFIG_ATARI_MFPSER=m
@@ -672,9 +689,15 @@ CONFIG_REISERFS_PROC_INFO=y
672# CONFIG_REISERFS_FS_XATTR is not set 689# CONFIG_REISERFS_FS_XATTR is not set
673CONFIG_JFS_FS=m 690CONFIG_JFS_FS=m
674# CONFIG_JFS_POSIX_ACL is not set 691# CONFIG_JFS_POSIX_ACL is not set
692# CONFIG_JFS_SECURITY is not set
675# CONFIG_JFS_DEBUG is not set 693# CONFIG_JFS_DEBUG is not set
676# CONFIG_JFS_STATISTICS is not set 694# CONFIG_JFS_STATISTICS is not set
695
696#
697# XFS support
698#
677CONFIG_XFS_FS=m 699CONFIG_XFS_FS=m
700CONFIG_XFS_EXPORT=y
678# CONFIG_XFS_RT is not set 701# CONFIG_XFS_RT is not set
679# CONFIG_XFS_QUOTA is not set 702# CONFIG_XFS_QUOTA is not set
680# CONFIG_XFS_SECURITY is not set 703# CONFIG_XFS_SECURITY is not set
@@ -828,13 +851,19 @@ CONFIG_NLS_UTF8=m
828# 851#
829# Kernel hacking 852# Kernel hacking
830# 853#
854# CONFIG_PRINTK_TIME is not set
831CONFIG_DEBUG_KERNEL=y 855CONFIG_DEBUG_KERNEL=y
832CONFIG_MAGIC_SYSRQ=y 856CONFIG_MAGIC_SYSRQ=y
857CONFIG_LOG_BUF_SHIFT=16
833# CONFIG_SCHEDSTATS is not set 858# CONFIG_SCHEDSTATS is not set
834# CONFIG_DEBUG_SLAB is not set 859# CONFIG_DEBUG_SLAB is not set
860# CONFIG_DEBUG_SPINLOCK is not set
861# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
835# CONFIG_DEBUG_KOBJECT is not set 862# CONFIG_DEBUG_KOBJECT is not set
836# CONFIG_DEBUG_BUGVERBOSE is not set 863CONFIG_DEBUG_BUGVERBOSE=y
837# CONFIG_DEBUG_INFO is not set 864# CONFIG_DEBUG_INFO is not set
865# CONFIG_DEBUG_FS is not set
866# CONFIG_FRAME_POINTER is not set
838 867
839# 868#
840# Security options 869# Security options
@@ -853,7 +882,8 @@ CONFIG_CRYPTO_MD5=m
853CONFIG_CRYPTO_SHA1=m 882CONFIG_CRYPTO_SHA1=m
854CONFIG_CRYPTO_SHA256=m 883CONFIG_CRYPTO_SHA256=m
855CONFIG_CRYPTO_SHA512=m 884CONFIG_CRYPTO_SHA512=m
856# CONFIG_CRYPTO_WP512 is not set 885CONFIG_CRYPTO_WP512=m
886CONFIG_CRYPTO_TGR192=m
857CONFIG_CRYPTO_DES=m 887CONFIG_CRYPTO_DES=m
858CONFIG_CRYPTO_BLOWFISH=m 888CONFIG_CRYPTO_BLOWFISH=m
859CONFIG_CRYPTO_TWOFISH=m 889CONFIG_CRYPTO_TWOFISH=m
@@ -871,6 +901,10 @@ CONFIG_CRYPTO_CRC32C=m
871CONFIG_CRYPTO_TEST=m 901CONFIG_CRYPTO_TEST=m
872 902
873# 903#
904# Hardware crypto devices
905#
906
907#
874# Library routines 908# Library routines
875# 909#
876CONFIG_CRC_CCITT=m 910CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index f1f2cf027100..b501db51d9ec 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:23:15 2004 4# Tue Apr 5 14:06:19 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -99,6 +101,7 @@ CONFIG_PROC_HARDWARE=y
99# 101#
100CONFIG_STANDALONE=y 102CONFIG_STANDALONE=y
101CONFIG_PREVENT_FIRMWARE_BUILD=y 103CONFIG_PREVENT_FIRMWARE_BUILD=y
104CONFIG_FW_LOADER=m
102# CONFIG_DEBUG_DRIVER is not set 105# CONFIG_DEBUG_DRIVER is not set
103 106
104# 107#
@@ -118,6 +121,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
118# 121#
119# Block devices 122# Block devices
120# 123#
124# CONFIG_BLK_DEV_COW_COMMON is not set
121CONFIG_BLK_DEV_LOOP=y 125CONFIG_BLK_DEV_LOOP=y
122CONFIG_BLK_DEV_CRYPTOLOOP=m 126CONFIG_BLK_DEV_CRYPTOLOOP=m
123CONFIG_BLK_DEV_NBD=m 127CONFIG_BLK_DEV_NBD=m
@@ -137,6 +141,7 @@ CONFIG_IOSCHED_NOOP=y
137CONFIG_IOSCHED_AS=y 141CONFIG_IOSCHED_AS=y
138CONFIG_IOSCHED_DEADLINE=y 142CONFIG_IOSCHED_DEADLINE=y
139CONFIG_IOSCHED_CFQ=y 143CONFIG_IOSCHED_CFQ=y
144CONFIG_ATA_OVER_ETH=m
140 145
141# 146#
142# ATA/ATAPI/MFM/RLL support 147# ATA/ATAPI/MFM/RLL support
@@ -171,6 +176,7 @@ CONFIG_SCSI_CONSTANTS=y
171# 176#
172# CONFIG_SCSI_SPI_ATTRS is not set 177# CONFIG_SCSI_SPI_ATTRS is not set
173# CONFIG_SCSI_FC_ATTRS is not set 178# CONFIG_SCSI_FC_ATTRS is not set
179# CONFIG_SCSI_ISCSI_ATTRS is not set
174 180
175# 181#
176# SCSI low-level drivers 182# SCSI low-level drivers
@@ -196,6 +202,8 @@ CONFIG_DM_CRYPT=m
196CONFIG_DM_SNAPSHOT=m 202CONFIG_DM_SNAPSHOT=m
197CONFIG_DM_MIRROR=m 203CONFIG_DM_MIRROR=m
198CONFIG_DM_ZERO=m 204CONFIG_DM_ZERO=m
205CONFIG_DM_MULTIPATH=m
206CONFIG_DM_MULTIPATH_EMC=m
199 207
200# 208#
201# Fusion MPT device support 209# Fusion MPT device support
@@ -219,7 +227,6 @@ CONFIG_NET=y
219# 227#
220CONFIG_PACKET=y 228CONFIG_PACKET=y
221# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
222CONFIG_NETLINK_DEV=y
223CONFIG_UNIX=y 230CONFIG_UNIX=y
224CONFIG_NET_KEY=y 231CONFIG_NET_KEY=y
225CONFIG_INET=y 232CONFIG_INET=y
@@ -320,11 +327,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
320CONFIG_IP_NF_ARPTABLES=m 327CONFIG_IP_NF_ARPTABLES=m
321CONFIG_IP_NF_ARPFILTER=m 328CONFIG_IP_NF_ARPFILTER=m
322CONFIG_IP_NF_ARP_MANGLE=m 329CONFIG_IP_NF_ARP_MANGLE=m
323CONFIG_IP_NF_COMPAT_IPCHAINS=m
324CONFIG_IP_NF_COMPAT_IPFWADM=m
325 330
326# 331#
327# IPv6: Netfilter Configuration 332# IPv6: Netfilter Configuration (EXPERIMENTAL)
328# 333#
329CONFIG_IP6_NF_QUEUE=m 334CONFIG_IP6_NF_QUEUE=m
330CONFIG_IP6_NF_IPTABLES=m 335CONFIG_IP6_NF_IPTABLES=m
@@ -395,7 +400,6 @@ CONFIG_DUMMY=m
395# CONFIG_BONDING is not set 400# CONFIG_BONDING is not set
396CONFIG_EQUALIZER=m 401CONFIG_EQUALIZER=m
397# CONFIG_TUN is not set 402# CONFIG_TUN is not set
398# CONFIG_ETHERTAP is not set
399 403
400# 404#
401# Ethernet (10 or 100Mbit) 405# Ethernet (10 or 100Mbit)
@@ -468,16 +472,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
468# CONFIG_INPUT_EVBUG is not set 472# CONFIG_INPUT_EVBUG is not set
469 473
470# 474#
471# Input I/O drivers
472#
473# CONFIG_GAMEPORT is not set
474CONFIG_SOUND_GAMEPORT=y
475CONFIG_SERIO=m
476CONFIG_SERIO_SERPORT=m
477# CONFIG_SERIO_CT82C710 is not set
478# CONFIG_SERIO_RAW is not set
479
480#
481# Input Device Drivers 475# Input Device Drivers
482# 476#
483CONFIG_INPUT_KEYBOARD=y 477CONFIG_INPUT_KEYBOARD=y
@@ -495,6 +489,16 @@ CONFIG_MOUSE_SERIAL=m
495# CONFIG_INPUT_MISC is not set 489# CONFIG_INPUT_MISC is not set
496 490
497# 491#
492# Hardware I/O ports
493#
494CONFIG_SERIO=m
495CONFIG_SERIO_SERPORT=m
496CONFIG_SERIO_LIBPS2=m
497# CONFIG_SERIO_RAW is not set
498# CONFIG_GAMEPORT is not set
499CONFIG_SOUND_GAMEPORT=y
500
501#
498# Character devices 502# Character devices
499# 503#
500CONFIG_VT=y 504CONFIG_VT=y
@@ -535,6 +539,10 @@ CONFIG_GEN_RTC_X=y
535# CONFIG_RAW_DRIVER is not set 539# CONFIG_RAW_DRIVER is not set
536 540
537# 541#
542# TPM devices
543#
544
545#
538# I2C support 546# I2C support
539# 547#
540# CONFIG_I2C is not set 548# CONFIG_I2C is not set
@@ -580,10 +588,6 @@ CONFIG_DUMMY_CONSOLE=y
580# CONFIG_USB_ARCH_HAS_OHCI is not set 588# CONFIG_USB_ARCH_HAS_OHCI is not set
581 589
582# 590#
583# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
584#
585
586#
587# USB Gadget Support 591# USB Gadget Support
588# 592#
589# CONFIG_USB_GADGET is not set 593# CONFIG_USB_GADGET is not set
@@ -594,6 +598,11 @@ CONFIG_DUMMY_CONSOLE=y
594# CONFIG_MMC is not set 598# CONFIG_MMC is not set
595 599
596# 600#
601# InfiniBand support
602#
603# CONFIG_INFINIBAND is not set
604
605#
597# Character devices 606# Character devices
598# 607#
599CONFIG_BVME6000_SCC=y 608CONFIG_BVME6000_SCC=y
@@ -614,10 +623,16 @@ CONFIG_REISERFS_FS=m
614# CONFIG_REISERFS_FS_XATTR is not set 623# CONFIG_REISERFS_FS_XATTR is not set
615CONFIG_JFS_FS=m 624CONFIG_JFS_FS=m
616# CONFIG_JFS_POSIX_ACL is not set 625# CONFIG_JFS_POSIX_ACL is not set
626# CONFIG_JFS_SECURITY is not set
617# CONFIG_JFS_DEBUG is not set 627# CONFIG_JFS_DEBUG is not set
618# CONFIG_JFS_STATISTICS is not set 628# CONFIG_JFS_STATISTICS is not set
619CONFIG_FS_POSIX_ACL=y 629CONFIG_FS_POSIX_ACL=y
630
631#
632# XFS support
633#
620CONFIG_XFS_FS=m 634CONFIG_XFS_FS=m
635CONFIG_XFS_EXPORT=y
621# CONFIG_XFS_RT is not set 636# CONFIG_XFS_RT is not set
622# CONFIG_XFS_QUOTA is not set 637# CONFIG_XFS_QUOTA is not set
623# CONFIG_XFS_SECURITY is not set 638# CONFIG_XFS_SECURITY is not set
@@ -772,13 +787,19 @@ CONFIG_NLS_UTF8=m
772# 787#
773# Kernel hacking 788# Kernel hacking
774# 789#
790# CONFIG_PRINTK_TIME is not set
775CONFIG_DEBUG_KERNEL=y 791CONFIG_DEBUG_KERNEL=y
776CONFIG_MAGIC_SYSRQ=y 792CONFIG_MAGIC_SYSRQ=y
793CONFIG_LOG_BUF_SHIFT=16
777# CONFIG_SCHEDSTATS is not set 794# CONFIG_SCHEDSTATS is not set
778# CONFIG_DEBUG_SLAB is not set 795# CONFIG_DEBUG_SLAB is not set
796# CONFIG_DEBUG_SPINLOCK is not set
797# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
779# CONFIG_DEBUG_KOBJECT is not set 798# CONFIG_DEBUG_KOBJECT is not set
780# CONFIG_DEBUG_BUGVERBOSE is not set 799CONFIG_DEBUG_BUGVERBOSE=y
781# CONFIG_DEBUG_INFO is not set 800# CONFIG_DEBUG_INFO is not set
801# CONFIG_DEBUG_FS is not set
802# CONFIG_FRAME_POINTER is not set
782 803
783# 804#
784# Security options 805# Security options
@@ -797,7 +818,8 @@ CONFIG_CRYPTO_MD5=y
797CONFIG_CRYPTO_SHA1=m 818CONFIG_CRYPTO_SHA1=m
798CONFIG_CRYPTO_SHA256=m 819CONFIG_CRYPTO_SHA256=m
799CONFIG_CRYPTO_SHA512=m 820CONFIG_CRYPTO_SHA512=m
800# CONFIG_CRYPTO_WP512 is not set 821CONFIG_CRYPTO_WP512=m
822CONFIG_CRYPTO_TGR192=m
801CONFIG_CRYPTO_DES=y 823CONFIG_CRYPTO_DES=y
802CONFIG_CRYPTO_BLOWFISH=m 824CONFIG_CRYPTO_BLOWFISH=m
803CONFIG_CRYPTO_TWOFISH=m 825CONFIG_CRYPTO_TWOFISH=m
@@ -815,6 +837,10 @@ CONFIG_CRYPTO_CRC32C=m
815CONFIG_CRYPTO_TEST=m 837CONFIG_CRYPTO_TEST=m
816 838
817# 839#
840# Hardware crypto devices
841#
842
843#
818# Library routines 844# Library routines
819# 845#
820CONFIG_CRC_CCITT=m 846CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 53dde43ddfcb..2bf6cef4f2b2 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:23:40 2004 4# Tue Apr 5 14:06:21 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -100,6 +102,7 @@ CONFIG_PROC_HARDWARE=y
100# 102#
101CONFIG_STANDALONE=y 103CONFIG_STANDALONE=y
102CONFIG_PREVENT_FIRMWARE_BUILD=y 104CONFIG_PREVENT_FIRMWARE_BUILD=y
105CONFIG_FW_LOADER=m
103# CONFIG_DEBUG_DRIVER is not set 106# CONFIG_DEBUG_DRIVER is not set
104 107
105# 108#
@@ -119,6 +122,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
119# 122#
120# Block devices 123# Block devices
121# 124#
125# CONFIG_BLK_DEV_COW_COMMON is not set
122CONFIG_BLK_DEV_LOOP=y 126CONFIG_BLK_DEV_LOOP=y
123CONFIG_BLK_DEV_CRYPTOLOOP=m 127CONFIG_BLK_DEV_CRYPTOLOOP=m
124CONFIG_BLK_DEV_NBD=m 128CONFIG_BLK_DEV_NBD=m
@@ -138,6 +142,7 @@ CONFIG_IOSCHED_NOOP=y
138CONFIG_IOSCHED_AS=y 142CONFIG_IOSCHED_AS=y
139CONFIG_IOSCHED_DEADLINE=y 143CONFIG_IOSCHED_DEADLINE=y
140CONFIG_IOSCHED_CFQ=y 144CONFIG_IOSCHED_CFQ=y
145CONFIG_ATA_OVER_ETH=m
141 146
142# 147#
143# ATA/ATAPI/MFM/RLL support 148# ATA/ATAPI/MFM/RLL support
@@ -172,6 +177,7 @@ CONFIG_SCSI_CONSTANTS=y
172# 177#
173# CONFIG_SCSI_SPI_ATTRS is not set 178# CONFIG_SCSI_SPI_ATTRS is not set
174# CONFIG_SCSI_FC_ATTRS is not set 179# CONFIG_SCSI_FC_ATTRS is not set
180# CONFIG_SCSI_ISCSI_ATTRS is not set
175 181
176# 182#
177# SCSI low-level drivers 183# SCSI low-level drivers
@@ -197,6 +203,8 @@ CONFIG_DM_CRYPT=m
197CONFIG_DM_SNAPSHOT=m 203CONFIG_DM_SNAPSHOT=m
198CONFIG_DM_MIRROR=m 204CONFIG_DM_MIRROR=m
199CONFIG_DM_ZERO=m 205CONFIG_DM_ZERO=m
206CONFIG_DM_MULTIPATH=m
207CONFIG_DM_MULTIPATH_EMC=m
200 208
201# 209#
202# Fusion MPT device support 210# Fusion MPT device support
@@ -220,7 +228,6 @@ CONFIG_NET=y
220# 228#
221CONFIG_PACKET=y 229CONFIG_PACKET=y
222# CONFIG_PACKET_MMAP is not set 230# CONFIG_PACKET_MMAP is not set
223CONFIG_NETLINK_DEV=y
224CONFIG_UNIX=y 231CONFIG_UNIX=y
225CONFIG_NET_KEY=y 232CONFIG_NET_KEY=y
226CONFIG_INET=y 233CONFIG_INET=y
@@ -321,11 +328,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
321CONFIG_IP_NF_ARPTABLES=m 328CONFIG_IP_NF_ARPTABLES=m
322CONFIG_IP_NF_ARPFILTER=m 329CONFIG_IP_NF_ARPFILTER=m
323CONFIG_IP_NF_ARP_MANGLE=m 330CONFIG_IP_NF_ARP_MANGLE=m
324CONFIG_IP_NF_COMPAT_IPCHAINS=m
325CONFIG_IP_NF_COMPAT_IPFWADM=m
326 331
327# 332#
328# IPv6: Netfilter Configuration 333# IPv6: Netfilter Configuration (EXPERIMENTAL)
329# 334#
330CONFIG_IP6_NF_QUEUE=m 335CONFIG_IP6_NF_QUEUE=m
331CONFIG_IP6_NF_IPTABLES=m 336CONFIG_IP6_NF_IPTABLES=m
@@ -397,7 +402,6 @@ CONFIG_DUMMY=m
397# CONFIG_BONDING is not set 402# CONFIG_BONDING is not set
398CONFIG_EQUALIZER=m 403CONFIG_EQUALIZER=m
399# CONFIG_TUN is not set 404# CONFIG_TUN is not set
400# CONFIG_ETHERTAP is not set
401 405
402# 406#
403# Ethernet (10 or 100Mbit) 407# Ethernet (10 or 100Mbit)
@@ -470,16 +474,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
470# CONFIG_INPUT_EVBUG is not set 474# CONFIG_INPUT_EVBUG is not set
471 475
472# 476#
473# Input I/O drivers
474#
475# CONFIG_GAMEPORT is not set
476CONFIG_SOUND_GAMEPORT=y
477CONFIG_SERIO=m
478CONFIG_SERIO_SERPORT=m
479# CONFIG_SERIO_CT82C710 is not set
480# CONFIG_SERIO_RAW is not set
481
482#
483# Input Device Drivers 477# Input Device Drivers
484# 478#
485CONFIG_INPUT_KEYBOARD=y 479CONFIG_INPUT_KEYBOARD=y
@@ -497,6 +491,16 @@ CONFIG_MOUSE_SERIAL=m
497# CONFIG_INPUT_MISC is not set 491# CONFIG_INPUT_MISC is not set
498 492
499# 493#
494# Hardware I/O ports
495#
496CONFIG_SERIO=m
497CONFIG_SERIO_SERPORT=m
498CONFIG_SERIO_LIBPS2=m
499# CONFIG_SERIO_RAW is not set
500# CONFIG_GAMEPORT is not set
501CONFIG_SOUND_GAMEPORT=y
502
503#
500# Character devices 504# Character devices
501# 505#
502CONFIG_VT=y 506CONFIG_VT=y
@@ -537,6 +541,10 @@ CONFIG_GEN_RTC_X=y
537# CONFIG_RAW_DRIVER is not set 541# CONFIG_RAW_DRIVER is not set
538 542
539# 543#
544# TPM devices
545#
546
547#
540# I2C support 548# I2C support
541# 549#
542# CONFIG_I2C is not set 550# CONFIG_I2C is not set
@@ -582,10 +590,6 @@ CONFIG_DUMMY_CONSOLE=y
582# CONFIG_USB_ARCH_HAS_OHCI is not set 590# CONFIG_USB_ARCH_HAS_OHCI is not set
583 591
584# 592#
585# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
586#
587
588#
589# USB Gadget Support 593# USB Gadget Support
590# 594#
591# CONFIG_USB_GADGET is not set 595# CONFIG_USB_GADGET is not set
@@ -596,6 +600,11 @@ CONFIG_DUMMY_CONSOLE=y
596# CONFIG_MMC is not set 600# CONFIG_MMC is not set
597 601
598# 602#
603# InfiniBand support
604#
605# CONFIG_INFINIBAND is not set
606
607#
599# Character devices 608# Character devices
600# 609#
601 610
@@ -614,10 +623,16 @@ CONFIG_REISERFS_FS=m
614# CONFIG_REISERFS_FS_XATTR is not set 623# CONFIG_REISERFS_FS_XATTR is not set
615CONFIG_JFS_FS=m 624CONFIG_JFS_FS=m
616# CONFIG_JFS_POSIX_ACL is not set 625# CONFIG_JFS_POSIX_ACL is not set
626# CONFIG_JFS_SECURITY is not set
617# CONFIG_JFS_DEBUG is not set 627# CONFIG_JFS_DEBUG is not set
618# CONFIG_JFS_STATISTICS is not set 628# CONFIG_JFS_STATISTICS is not set
619CONFIG_FS_POSIX_ACL=y 629CONFIG_FS_POSIX_ACL=y
630
631#
632# XFS support
633#
620CONFIG_XFS_FS=m 634CONFIG_XFS_FS=m
635CONFIG_XFS_EXPORT=y
621# CONFIG_XFS_RT is not set 636# CONFIG_XFS_RT is not set
622# CONFIG_XFS_QUOTA is not set 637# CONFIG_XFS_QUOTA is not set
623# CONFIG_XFS_SECURITY is not set 638# CONFIG_XFS_SECURITY is not set
@@ -772,13 +787,19 @@ CONFIG_NLS_UTF8=m
772# 787#
773# Kernel hacking 788# Kernel hacking
774# 789#
790# CONFIG_PRINTK_TIME is not set
775CONFIG_DEBUG_KERNEL=y 791CONFIG_DEBUG_KERNEL=y
776CONFIG_MAGIC_SYSRQ=y 792CONFIG_MAGIC_SYSRQ=y
793CONFIG_LOG_BUF_SHIFT=16
777# CONFIG_SCHEDSTATS is not set 794# CONFIG_SCHEDSTATS is not set
778# CONFIG_DEBUG_SLAB is not set 795# CONFIG_DEBUG_SLAB is not set
796# CONFIG_DEBUG_SPINLOCK is not set
797# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
779# CONFIG_DEBUG_KOBJECT is not set 798# CONFIG_DEBUG_KOBJECT is not set
780# CONFIG_DEBUG_BUGVERBOSE is not set 799CONFIG_DEBUG_BUGVERBOSE=y
781# CONFIG_DEBUG_INFO is not set 800# CONFIG_DEBUG_INFO is not set
801# CONFIG_DEBUG_FS is not set
802# CONFIG_FRAME_POINTER is not set
782 803
783# 804#
784# Security options 805# Security options
@@ -797,7 +818,8 @@ CONFIG_CRYPTO_MD5=y
797CONFIG_CRYPTO_SHA1=m 818CONFIG_CRYPTO_SHA1=m
798CONFIG_CRYPTO_SHA256=m 819CONFIG_CRYPTO_SHA256=m
799CONFIG_CRYPTO_SHA512=m 820CONFIG_CRYPTO_SHA512=m
800# CONFIG_CRYPTO_WP512 is not set 821CONFIG_CRYPTO_WP512=m
822CONFIG_CRYPTO_TGR192=m
801CONFIG_CRYPTO_DES=y 823CONFIG_CRYPTO_DES=y
802CONFIG_CRYPTO_BLOWFISH=m 824CONFIG_CRYPTO_BLOWFISH=m
803CONFIG_CRYPTO_TWOFISH=m 825CONFIG_CRYPTO_TWOFISH=m
@@ -815,6 +837,10 @@ CONFIG_CRYPTO_CRC32C=m
815CONFIG_CRYPTO_TEST=m 837CONFIG_CRYPTO_TEST=m
816 838
817# 839#
840# Hardware crypto devices
841#
842
843#
818# Library routines 844# Library routines
819# 845#
820CONFIG_CRC_CCITT=m 846CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 2452dac8db9d..7074f856820c 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:23:44 2004 4# Tue Apr 5 14:06:24 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -101,6 +103,7 @@ CONFIG_PROC_HARDWARE=y
101# 103#
102CONFIG_STANDALONE=y 104CONFIG_STANDALONE=y
103CONFIG_PREVENT_FIRMWARE_BUILD=y 105CONFIG_PREVENT_FIRMWARE_BUILD=y
106CONFIG_FW_LOADER=m
104# CONFIG_DEBUG_DRIVER is not set 107# CONFIG_DEBUG_DRIVER is not set
105 108
106# 109#
@@ -120,6 +123,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
120# 123#
121# Block devices 124# Block devices
122# 125#
126# CONFIG_BLK_DEV_COW_COMMON is not set
123CONFIG_BLK_DEV_LOOP=y 127CONFIG_BLK_DEV_LOOP=y
124CONFIG_BLK_DEV_CRYPTOLOOP=m 128CONFIG_BLK_DEV_CRYPTOLOOP=m
125CONFIG_BLK_DEV_NBD=m 129CONFIG_BLK_DEV_NBD=m
@@ -139,6 +143,7 @@ CONFIG_IOSCHED_NOOP=y
139CONFIG_IOSCHED_AS=y 143CONFIG_IOSCHED_AS=y
140CONFIG_IOSCHED_DEADLINE=y 144CONFIG_IOSCHED_DEADLINE=y
141CONFIG_IOSCHED_CFQ=y 145CONFIG_IOSCHED_CFQ=y
146CONFIG_ATA_OVER_ETH=m
142 147
143# 148#
144# ATA/ATAPI/MFM/RLL support 149# ATA/ATAPI/MFM/RLL support
@@ -196,6 +201,7 @@ CONFIG_SCSI_CONSTANTS=y
196# 201#
197# CONFIG_SCSI_SPI_ATTRS is not set 202# CONFIG_SCSI_SPI_ATTRS is not set
198# CONFIG_SCSI_FC_ATTRS is not set 203# CONFIG_SCSI_FC_ATTRS is not set
204# CONFIG_SCSI_ISCSI_ATTRS is not set
199 205
200# 206#
201# SCSI low-level drivers 207# SCSI low-level drivers
@@ -223,6 +229,8 @@ CONFIG_DM_CRYPT=m
223CONFIG_DM_SNAPSHOT=m 229CONFIG_DM_SNAPSHOT=m
224CONFIG_DM_MIRROR=m 230CONFIG_DM_MIRROR=m
225CONFIG_DM_ZERO=m 231CONFIG_DM_ZERO=m
232CONFIG_DM_MULTIPATH=m
233CONFIG_DM_MULTIPATH_EMC=m
226 234
227# 235#
228# Fusion MPT device support 236# Fusion MPT device support
@@ -258,7 +266,6 @@ CONFIG_NET=y
258# 266#
259CONFIG_PACKET=y 267CONFIG_PACKET=y
260# CONFIG_PACKET_MMAP is not set 268# CONFIG_PACKET_MMAP is not set
261CONFIG_NETLINK_DEV=y
262CONFIG_UNIX=y 269CONFIG_UNIX=y
263CONFIG_NET_KEY=y 270CONFIG_NET_KEY=y
264CONFIG_INET=y 271CONFIG_INET=y
@@ -356,11 +363,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
356CONFIG_IP_NF_ARPTABLES=m 363CONFIG_IP_NF_ARPTABLES=m
357CONFIG_IP_NF_ARPFILTER=m 364CONFIG_IP_NF_ARPFILTER=m
358CONFIG_IP_NF_ARP_MANGLE=m 365CONFIG_IP_NF_ARP_MANGLE=m
359CONFIG_IP_NF_COMPAT_IPCHAINS=m
360CONFIG_IP_NF_COMPAT_IPFWADM=m
361 366
362# 367#
363# IPv6: Netfilter Configuration 368# IPv6: Netfilter Configuration (EXPERIMENTAL)
364# 369#
365CONFIG_IP6_NF_QUEUE=m 370CONFIG_IP6_NF_QUEUE=m
366CONFIG_IP6_NF_IPTABLES=m 371CONFIG_IP6_NF_IPTABLES=m
@@ -435,7 +440,6 @@ CONFIG_DUMMY=m
435# CONFIG_BONDING is not set 440# CONFIG_BONDING is not set
436CONFIG_EQUALIZER=m 441CONFIG_EQUALIZER=m
437# CONFIG_TUN is not set 442# CONFIG_TUN is not set
438# CONFIG_ETHERTAP is not set
439 443
440# 444#
441# Ethernet (10 or 100Mbit) 445# Ethernet (10 or 100Mbit)
@@ -512,16 +516,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
512# CONFIG_INPUT_EVBUG is not set 516# CONFIG_INPUT_EVBUG is not set
513 517
514# 518#
515# Input I/O drivers
516#
517# CONFIG_GAMEPORT is not set
518CONFIG_SOUND_GAMEPORT=y
519CONFIG_SERIO=m
520CONFIG_SERIO_SERPORT=m
521# CONFIG_SERIO_CT82C710 is not set
522# CONFIG_SERIO_RAW is not set
523
524#
525# Input Device Drivers 519# Input Device Drivers
526# 520#
527CONFIG_INPUT_KEYBOARD=y 521CONFIG_INPUT_KEYBOARD=y
@@ -539,6 +533,16 @@ CONFIG_MOUSE_SERIAL=m
539# CONFIG_INPUT_MISC is not set 533# CONFIG_INPUT_MISC is not set
540 534
541# 535#
536# Hardware I/O ports
537#
538CONFIG_SERIO=m
539CONFIG_SERIO_SERPORT=m
540CONFIG_SERIO_LIBPS2=m
541# CONFIG_SERIO_RAW is not set
542# CONFIG_GAMEPORT is not set
543CONFIG_SOUND_GAMEPORT=y
544
545#
542# Character devices 546# Character devices
543# 547#
544CONFIG_VT=y 548CONFIG_VT=y
@@ -579,6 +583,10 @@ CONFIG_GEN_RTC_X=y
579# CONFIG_RAW_DRIVER is not set 583# CONFIG_RAW_DRIVER is not set
580 584
581# 585#
586# TPM devices
587#
588
589#
582# I2C support 590# I2C support
583# 591#
584# CONFIG_I2C is not set 592# CONFIG_I2C is not set
@@ -606,10 +614,16 @@ CONFIG_GEN_RTC_X=y
606# Graphics support 614# Graphics support
607# 615#
608CONFIG_FB=y 616CONFIG_FB=y
617CONFIG_FB_CFB_FILLRECT=y
618CONFIG_FB_CFB_COPYAREA=y
619CONFIG_FB_CFB_IMAGEBLIT=y
620CONFIG_FB_SOFT_CURSOR=y
621CONFIG_FB_MACMODES=y
609CONFIG_FB_MODE_HELPERS=y 622CONFIG_FB_MODE_HELPERS=y
610# CONFIG_FB_TILEBLITTING is not set 623# CONFIG_FB_TILEBLITTING is not set
611CONFIG_FB_VALKYRIE=y 624CONFIG_FB_VALKYRIE=y
612CONFIG_FB_MAC=y 625CONFIG_FB_MAC=y
626# CONFIG_FB_S1D13XXX is not set
613# CONFIG_FB_VIRTUAL is not set 627# CONFIG_FB_VIRTUAL is not set
614 628
615# 629#
@@ -630,6 +644,7 @@ CONFIG_LOGO_LINUX_MONO=y
630CONFIG_LOGO_LINUX_VGA16=y 644CONFIG_LOGO_LINUX_VGA16=y
631CONFIG_LOGO_LINUX_CLUT224=y 645CONFIG_LOGO_LINUX_CLUT224=y
632CONFIG_LOGO_MAC_CLUT224=y 646CONFIG_LOGO_MAC_CLUT224=y
647# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
633 648
634# 649#
635# Sound 650# Sound
@@ -643,10 +658,6 @@ CONFIG_LOGO_MAC_CLUT224=y
643# CONFIG_USB_ARCH_HAS_OHCI is not set 658# CONFIG_USB_ARCH_HAS_OHCI is not set
644 659
645# 660#
646# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
647#
648
649#
650# USB Gadget Support 661# USB Gadget Support
651# 662#
652# CONFIG_USB_GADGET is not set 663# CONFIG_USB_GADGET is not set
@@ -657,6 +668,11 @@ CONFIG_LOGO_MAC_CLUT224=y
657# CONFIG_MMC is not set 668# CONFIG_MMC is not set
658 669
659# 670#
671# InfiniBand support
672#
673# CONFIG_INFINIBAND is not set
674
675#
660# Character devices 676# Character devices
661# 677#
662CONFIG_MAC_SCC=y 678CONFIG_MAC_SCC=y
@@ -679,10 +695,16 @@ CONFIG_REISERFS_FS=m
679# CONFIG_REISERFS_FS_XATTR is not set 695# CONFIG_REISERFS_FS_XATTR is not set
680CONFIG_JFS_FS=m 696CONFIG_JFS_FS=m
681# CONFIG_JFS_POSIX_ACL is not set 697# CONFIG_JFS_POSIX_ACL is not set
698# CONFIG_JFS_SECURITY is not set
682# CONFIG_JFS_DEBUG is not set 699# CONFIG_JFS_DEBUG is not set
683# CONFIG_JFS_STATISTICS is not set 700# CONFIG_JFS_STATISTICS is not set
684CONFIG_FS_POSIX_ACL=y 701CONFIG_FS_POSIX_ACL=y
702
703#
704# XFS support
705#
685CONFIG_XFS_FS=m 706CONFIG_XFS_FS=m
707CONFIG_XFS_EXPORT=y
686# CONFIG_XFS_RT is not set 708# CONFIG_XFS_RT is not set
687# CONFIG_XFS_QUOTA is not set 709# CONFIG_XFS_QUOTA is not set
688# CONFIG_XFS_SECURITY is not set 710# CONFIG_XFS_SECURITY is not set
@@ -846,18 +868,24 @@ CONFIG_NLS_ISO8859_14=m
846CONFIG_NLS_ISO8859_15=m 868CONFIG_NLS_ISO8859_15=m
847CONFIG_NLS_KOI8_R=m 869CONFIG_NLS_KOI8_R=m
848CONFIG_NLS_KOI8_U=m 870CONFIG_NLS_KOI8_U=m
849CONFIG_NLS_UTF8=m 871CONFIG_NLS_UTF8=y
850 872
851# 873#
852# Kernel hacking 874# Kernel hacking
853# 875#
876# CONFIG_PRINTK_TIME is not set
854CONFIG_DEBUG_KERNEL=y 877CONFIG_DEBUG_KERNEL=y
855CONFIG_MAGIC_SYSRQ=y 878CONFIG_MAGIC_SYSRQ=y
879CONFIG_LOG_BUF_SHIFT=16
856# CONFIG_SCHEDSTATS is not set 880# CONFIG_SCHEDSTATS is not set
857# CONFIG_DEBUG_SLAB is not set 881# CONFIG_DEBUG_SLAB is not set
882# CONFIG_DEBUG_SPINLOCK is not set
883# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
858# CONFIG_DEBUG_KOBJECT is not set 884# CONFIG_DEBUG_KOBJECT is not set
859# CONFIG_DEBUG_BUGVERBOSE is not set 885CONFIG_DEBUG_BUGVERBOSE=y
860# CONFIG_DEBUG_INFO is not set 886# CONFIG_DEBUG_INFO is not set
887# CONFIG_DEBUG_FS is not set
888# CONFIG_FRAME_POINTER is not set
861 889
862# 890#
863# Security options 891# Security options
@@ -876,7 +904,8 @@ CONFIG_CRYPTO_MD5=y
876CONFIG_CRYPTO_SHA1=m 904CONFIG_CRYPTO_SHA1=m
877CONFIG_CRYPTO_SHA256=m 905CONFIG_CRYPTO_SHA256=m
878CONFIG_CRYPTO_SHA512=m 906CONFIG_CRYPTO_SHA512=m
879# CONFIG_CRYPTO_WP512 is not set 907CONFIG_CRYPTO_WP512=m
908CONFIG_CRYPTO_TGR192=m
880CONFIG_CRYPTO_DES=m 909CONFIG_CRYPTO_DES=m
881CONFIG_CRYPTO_BLOWFISH=m 910CONFIG_CRYPTO_BLOWFISH=m
882CONFIG_CRYPTO_TWOFISH=m 911CONFIG_CRYPTO_TWOFISH=m
@@ -894,6 +923,10 @@ CONFIG_CRYPTO_CRC32C=m
894CONFIG_CRYPTO_TEST=m 923CONFIG_CRYPTO_TEST=m
895 924
896# 925#
926# Hardware crypto devices
927#
928
929#
897# Library routines 930# Library routines
898# 931#
899CONFIG_CRC_CCITT=m 932CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index ea38e87a6051..61f09bc4846a 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:23:49 2004 4# Tue Apr 5 14:06:28 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -99,6 +101,7 @@ CONFIG_PROC_HARDWARE=y
99# 101#
100CONFIG_STANDALONE=y 102CONFIG_STANDALONE=y
101CONFIG_PREVENT_FIRMWARE_BUILD=y 103CONFIG_PREVENT_FIRMWARE_BUILD=y
104CONFIG_FW_LOADER=m
102# CONFIG_DEBUG_DRIVER is not set 105# CONFIG_DEBUG_DRIVER is not set
103 106
104# 107#
@@ -118,6 +121,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
118# 121#
119# Block devices 122# Block devices
120# 123#
124# CONFIG_BLK_DEV_COW_COMMON is not set
121CONFIG_BLK_DEV_LOOP=y 125CONFIG_BLK_DEV_LOOP=y
122CONFIG_BLK_DEV_CRYPTOLOOP=m 126CONFIG_BLK_DEV_CRYPTOLOOP=m
123CONFIG_BLK_DEV_NBD=m 127CONFIG_BLK_DEV_NBD=m
@@ -137,6 +141,7 @@ CONFIG_IOSCHED_NOOP=y
137CONFIG_IOSCHED_AS=y 141CONFIG_IOSCHED_AS=y
138CONFIG_IOSCHED_DEADLINE=y 142CONFIG_IOSCHED_DEADLINE=y
139CONFIG_IOSCHED_CFQ=y 143CONFIG_IOSCHED_CFQ=y
144CONFIG_ATA_OVER_ETH=m
140 145
141# 146#
142# ATA/ATAPI/MFM/RLL support 147# ATA/ATAPI/MFM/RLL support
@@ -171,6 +176,7 @@ CONFIG_SCSI_CONSTANTS=y
171# 176#
172# CONFIG_SCSI_SPI_ATTRS is not set 177# CONFIG_SCSI_SPI_ATTRS is not set
173# CONFIG_SCSI_FC_ATTRS is not set 178# CONFIG_SCSI_FC_ATTRS is not set
179# CONFIG_SCSI_ISCSI_ATTRS is not set
174 180
175# 181#
176# SCSI low-level drivers 182# SCSI low-level drivers
@@ -197,6 +203,8 @@ CONFIG_DM_CRYPT=m
197CONFIG_DM_SNAPSHOT=m 203CONFIG_DM_SNAPSHOT=m
198CONFIG_DM_MIRROR=m 204CONFIG_DM_MIRROR=m
199CONFIG_DM_ZERO=m 205CONFIG_DM_ZERO=m
206CONFIG_DM_MULTIPATH=m
207CONFIG_DM_MULTIPATH_EMC=m
200 208
201# 209#
202# Fusion MPT device support 210# Fusion MPT device support
@@ -220,7 +228,6 @@ CONFIG_NET=y
220# 228#
221CONFIG_PACKET=y 229CONFIG_PACKET=y
222# CONFIG_PACKET_MMAP is not set 230# CONFIG_PACKET_MMAP is not set
223CONFIG_NETLINK_DEV=y
224CONFIG_UNIX=y 231CONFIG_UNIX=y
225CONFIG_NET_KEY=y 232CONFIG_NET_KEY=y
226CONFIG_INET=y 233CONFIG_INET=y
@@ -321,11 +328,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
321CONFIG_IP_NF_ARPTABLES=m 328CONFIG_IP_NF_ARPTABLES=m
322CONFIG_IP_NF_ARPFILTER=m 329CONFIG_IP_NF_ARPFILTER=m
323CONFIG_IP_NF_ARP_MANGLE=m 330CONFIG_IP_NF_ARP_MANGLE=m
324CONFIG_IP_NF_COMPAT_IPCHAINS=m
325CONFIG_IP_NF_COMPAT_IPFWADM=m
326 331
327# 332#
328# IPv6: Netfilter Configuration 333# IPv6: Netfilter Configuration (EXPERIMENTAL)
329# 334#
330CONFIG_IP6_NF_QUEUE=m 335CONFIG_IP6_NF_QUEUE=m
331CONFIG_IP6_NF_IPTABLES=m 336CONFIG_IP6_NF_IPTABLES=m
@@ -397,7 +402,6 @@ CONFIG_DUMMY=m
397# CONFIG_BONDING is not set 402# CONFIG_BONDING is not set
398CONFIG_EQUALIZER=m 403CONFIG_EQUALIZER=m
399# CONFIG_TUN is not set 404# CONFIG_TUN is not set
400# CONFIG_ETHERTAP is not set
401 405
402# 406#
403# Ethernet (10 or 100Mbit) 407# Ethernet (10 or 100Mbit)
@@ -470,16 +474,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
470# CONFIG_INPUT_EVBUG is not set 474# CONFIG_INPUT_EVBUG is not set
471 475
472# 476#
473# Input I/O drivers
474#
475# CONFIG_GAMEPORT is not set
476CONFIG_SOUND_GAMEPORT=y
477CONFIG_SERIO=m
478CONFIG_SERIO_SERPORT=m
479# CONFIG_SERIO_CT82C710 is not set
480# CONFIG_SERIO_RAW is not set
481
482#
483# Input Device Drivers 477# Input Device Drivers
484# 478#
485CONFIG_INPUT_KEYBOARD=y 479CONFIG_INPUT_KEYBOARD=y
@@ -497,6 +491,16 @@ CONFIG_MOUSE_SERIAL=m
497# CONFIG_INPUT_MISC is not set 491# CONFIG_INPUT_MISC is not set
498 492
499# 493#
494# Hardware I/O ports
495#
496CONFIG_SERIO=m
497CONFIG_SERIO_SERPORT=m
498CONFIG_SERIO_LIBPS2=m
499# CONFIG_SERIO_RAW is not set
500# CONFIG_GAMEPORT is not set
501CONFIG_SOUND_GAMEPORT=y
502
503#
500# Character devices 504# Character devices
501# 505#
502CONFIG_VT=y 506CONFIG_VT=y
@@ -537,6 +541,10 @@ CONFIG_GEN_RTC_X=y
537# CONFIG_RAW_DRIVER is not set 541# CONFIG_RAW_DRIVER is not set
538 542
539# 543#
544# TPM devices
545#
546
547#
540# I2C support 548# I2C support
541# 549#
542# CONFIG_I2C is not set 550# CONFIG_I2C is not set
@@ -564,8 +572,14 @@ CONFIG_GEN_RTC_X=y
564# Graphics support 572# Graphics support
565# 573#
566CONFIG_FB=y 574CONFIG_FB=y
575# CONFIG_FB_CFB_FILLRECT is not set
576# CONFIG_FB_CFB_COPYAREA is not set
577# CONFIG_FB_CFB_IMAGEBLIT is not set
578# CONFIG_FB_SOFT_CURSOR is not set
579# CONFIG_FB_MACMODES is not set
567CONFIG_FB_MODE_HELPERS=y 580CONFIG_FB_MODE_HELPERS=y
568# CONFIG_FB_TILEBLITTING is not set 581# CONFIG_FB_TILEBLITTING is not set
582# CONFIG_FB_S1D13XXX is not set
569# CONFIG_FB_VIRTUAL is not set 583# CONFIG_FB_VIRTUAL is not set
570 584
571# 585#
@@ -584,6 +598,7 @@ CONFIG_LOGO=y
584CONFIG_LOGO_LINUX_MONO=y 598CONFIG_LOGO_LINUX_MONO=y
585CONFIG_LOGO_LINUX_VGA16=y 599CONFIG_LOGO_LINUX_VGA16=y
586CONFIG_LOGO_LINUX_CLUT224=y 600CONFIG_LOGO_LINUX_CLUT224=y
601# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
587 602
588# 603#
589# Sound 604# Sound
@@ -597,10 +612,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
597# CONFIG_USB_ARCH_HAS_OHCI is not set 612# CONFIG_USB_ARCH_HAS_OHCI is not set
598 613
599# 614#
600# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
601#
602
603#
604# USB Gadget Support 615# USB Gadget Support
605# 616#
606# CONFIG_USB_GADGET is not set 617# CONFIG_USB_GADGET is not set
@@ -611,6 +622,11 @@ CONFIG_LOGO_LINUX_CLUT224=y
611# CONFIG_MMC is not set 622# CONFIG_MMC is not set
612 623
613# 624#
625# InfiniBand support
626#
627# CONFIG_INFINIBAND is not set
628
629#
614# Character devices 630# Character devices
615# 631#
616CONFIG_MVME147_SCC=y 632CONFIG_MVME147_SCC=y
@@ -631,10 +647,16 @@ CONFIG_REISERFS_FS=m
631# CONFIG_REISERFS_FS_XATTR is not set 647# CONFIG_REISERFS_FS_XATTR is not set
632CONFIG_JFS_FS=m 648CONFIG_JFS_FS=m
633# CONFIG_JFS_POSIX_ACL is not set 649# CONFIG_JFS_POSIX_ACL is not set
650# CONFIG_JFS_SECURITY is not set
634# CONFIG_JFS_DEBUG is not set 651# CONFIG_JFS_DEBUG is not set
635# CONFIG_JFS_STATISTICS is not set 652# CONFIG_JFS_STATISTICS is not set
636CONFIG_FS_POSIX_ACL=y 653CONFIG_FS_POSIX_ACL=y
654
655#
656# XFS support
657#
637CONFIG_XFS_FS=m 658CONFIG_XFS_FS=m
659CONFIG_XFS_EXPORT=y
638# CONFIG_XFS_RT is not set 660# CONFIG_XFS_RT is not set
639# CONFIG_XFS_QUOTA is not set 661# CONFIG_XFS_QUOTA is not set
640# CONFIG_XFS_SECURITY is not set 662# CONFIG_XFS_SECURITY is not set
@@ -791,13 +813,19 @@ CONFIG_NLS_UTF8=m
791# 813#
792# Kernel hacking 814# Kernel hacking
793# 815#
816# CONFIG_PRINTK_TIME is not set
794CONFIG_DEBUG_KERNEL=y 817CONFIG_DEBUG_KERNEL=y
795CONFIG_MAGIC_SYSRQ=y 818CONFIG_MAGIC_SYSRQ=y
819CONFIG_LOG_BUF_SHIFT=16
796# CONFIG_SCHEDSTATS is not set 820# CONFIG_SCHEDSTATS is not set
797# CONFIG_DEBUG_SLAB is not set 821# CONFIG_DEBUG_SLAB is not set
822# CONFIG_DEBUG_SPINLOCK is not set
823# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
798# CONFIG_DEBUG_KOBJECT is not set 824# CONFIG_DEBUG_KOBJECT is not set
799# CONFIG_DEBUG_BUGVERBOSE is not set 825CONFIG_DEBUG_BUGVERBOSE=y
800# CONFIG_DEBUG_INFO is not set 826# CONFIG_DEBUG_INFO is not set
827# CONFIG_DEBUG_FS is not set
828# CONFIG_FRAME_POINTER is not set
801 829
802# 830#
803# Security options 831# Security options
@@ -816,7 +844,8 @@ CONFIG_CRYPTO_MD5=y
816CONFIG_CRYPTO_SHA1=m 844CONFIG_CRYPTO_SHA1=m
817CONFIG_CRYPTO_SHA256=m 845CONFIG_CRYPTO_SHA256=m
818CONFIG_CRYPTO_SHA512=m 846CONFIG_CRYPTO_SHA512=m
819# CONFIG_CRYPTO_WP512 is not set 847CONFIG_CRYPTO_WP512=m
848CONFIG_CRYPTO_TGR192=m
820CONFIG_CRYPTO_DES=y 849CONFIG_CRYPTO_DES=y
821CONFIG_CRYPTO_BLOWFISH=m 850CONFIG_CRYPTO_BLOWFISH=m
822CONFIG_CRYPTO_TWOFISH=m 851CONFIG_CRYPTO_TWOFISH=m
@@ -834,6 +863,10 @@ CONFIG_CRYPTO_CRC32C=m
834CONFIG_CRYPTO_TEST=m 863CONFIG_CRYPTO_TEST=m
835 864
836# 865#
866# Hardware crypto devices
867#
868
869#
837# Library routines 870# Library routines
838# 871#
839CONFIG_CRC_CCITT=m 872CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index f931a64939d6..69c01004ec41 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:23:53 2004 4# Tue Apr 5 14:06:31 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -99,6 +101,7 @@ CONFIG_PROC_HARDWARE=y
99# 101#
100CONFIG_STANDALONE=y 102CONFIG_STANDALONE=y
101CONFIG_PREVENT_FIRMWARE_BUILD=y 103CONFIG_PREVENT_FIRMWARE_BUILD=y
104CONFIG_FW_LOADER=m
102# CONFIG_DEBUG_DRIVER is not set 105# CONFIG_DEBUG_DRIVER is not set
103 106
104# 107#
@@ -118,6 +121,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
118# 121#
119# Block devices 122# Block devices
120# 123#
124# CONFIG_BLK_DEV_COW_COMMON is not set
121CONFIG_BLK_DEV_LOOP=y 125CONFIG_BLK_DEV_LOOP=y
122CONFIG_BLK_DEV_CRYPTOLOOP=m 126CONFIG_BLK_DEV_CRYPTOLOOP=m
123CONFIG_BLK_DEV_NBD=m 127CONFIG_BLK_DEV_NBD=m
@@ -137,6 +141,7 @@ CONFIG_IOSCHED_NOOP=y
137CONFIG_IOSCHED_AS=y 141CONFIG_IOSCHED_AS=y
138CONFIG_IOSCHED_DEADLINE=y 142CONFIG_IOSCHED_DEADLINE=y
139CONFIG_IOSCHED_CFQ=y 143CONFIG_IOSCHED_CFQ=y
144CONFIG_ATA_OVER_ETH=m
140 145
141# 146#
142# ATA/ATAPI/MFM/RLL support 147# ATA/ATAPI/MFM/RLL support
@@ -171,6 +176,7 @@ CONFIG_SCSI_CONSTANTS=y
171# 176#
172# CONFIG_SCSI_SPI_ATTRS is not set 177# CONFIG_SCSI_SPI_ATTRS is not set
173# CONFIG_SCSI_FC_ATTRS is not set 178# CONFIG_SCSI_FC_ATTRS is not set
179# CONFIG_SCSI_ISCSI_ATTRS is not set
174 180
175# 181#
176# SCSI low-level drivers 182# SCSI low-level drivers
@@ -196,6 +202,8 @@ CONFIG_DM_CRYPT=m
196CONFIG_DM_SNAPSHOT=m 202CONFIG_DM_SNAPSHOT=m
197CONFIG_DM_MIRROR=m 203CONFIG_DM_MIRROR=m
198CONFIG_DM_ZERO=m 204CONFIG_DM_ZERO=m
205CONFIG_DM_MULTIPATH=m
206CONFIG_DM_MULTIPATH_EMC=m
199 207
200# 208#
201# Fusion MPT device support 209# Fusion MPT device support
@@ -219,7 +227,6 @@ CONFIG_NET=y
219# 227#
220CONFIG_PACKET=y 228CONFIG_PACKET=y
221# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
222CONFIG_NETLINK_DEV=y
223CONFIG_UNIX=y 230CONFIG_UNIX=y
224CONFIG_NET_KEY=y 231CONFIG_NET_KEY=y
225CONFIG_INET=y 232CONFIG_INET=y
@@ -320,11 +327,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
320CONFIG_IP_NF_ARPTABLES=m 327CONFIG_IP_NF_ARPTABLES=m
321CONFIG_IP_NF_ARPFILTER=m 328CONFIG_IP_NF_ARPFILTER=m
322CONFIG_IP_NF_ARP_MANGLE=m 329CONFIG_IP_NF_ARP_MANGLE=m
323CONFIG_IP_NF_COMPAT_IPCHAINS=m
324CONFIG_IP_NF_COMPAT_IPFWADM=m
325 330
326# 331#
327# IPv6: Netfilter Configuration 332# IPv6: Netfilter Configuration (EXPERIMENTAL)
328# 333#
329CONFIG_IP6_NF_QUEUE=m 334CONFIG_IP6_NF_QUEUE=m
330CONFIG_IP6_NF_IPTABLES=m 335CONFIG_IP6_NF_IPTABLES=m
@@ -396,7 +401,6 @@ CONFIG_DUMMY=m
396# CONFIG_BONDING is not set 401# CONFIG_BONDING is not set
397CONFIG_EQUALIZER=m 402CONFIG_EQUALIZER=m
398# CONFIG_TUN is not set 403# CONFIG_TUN is not set
399# CONFIG_ETHERTAP is not set
400 404
401# 405#
402# Ethernet (10 or 100Mbit) 406# Ethernet (10 or 100Mbit)
@@ -469,16 +473,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
469# CONFIG_INPUT_EVBUG is not set 473# CONFIG_INPUT_EVBUG is not set
470 474
471# 475#
472# Input I/O drivers
473#
474# CONFIG_GAMEPORT is not set
475CONFIG_SOUND_GAMEPORT=y
476CONFIG_SERIO=m
477CONFIG_SERIO_SERPORT=m
478# CONFIG_SERIO_CT82C710 is not set
479# CONFIG_SERIO_RAW is not set
480
481#
482# Input Device Drivers 476# Input Device Drivers
483# 477#
484CONFIG_INPUT_KEYBOARD=y 478CONFIG_INPUT_KEYBOARD=y
@@ -496,6 +490,16 @@ CONFIG_MOUSE_SERIAL=m
496# CONFIG_INPUT_MISC is not set 490# CONFIG_INPUT_MISC is not set
497 491
498# 492#
493# Hardware I/O ports
494#
495CONFIG_SERIO=m
496CONFIG_SERIO_SERPORT=m
497CONFIG_SERIO_LIBPS2=m
498# CONFIG_SERIO_RAW is not set
499# CONFIG_GAMEPORT is not set
500CONFIG_SOUND_GAMEPORT=y
501
502#
499# Character devices 503# Character devices
500# 504#
501CONFIG_VT=y 505CONFIG_VT=y
@@ -536,6 +540,10 @@ CONFIG_GEN_RTC_X=y
536# CONFIG_RAW_DRIVER is not set 540# CONFIG_RAW_DRIVER is not set
537 541
538# 542#
543# TPM devices
544#
545
546#
539# I2C support 547# I2C support
540# 548#
541# CONFIG_I2C is not set 549# CONFIG_I2C is not set
@@ -563,8 +571,14 @@ CONFIG_GEN_RTC_X=y
563# Graphics support 571# Graphics support
564# 572#
565CONFIG_FB=y 573CONFIG_FB=y
574# CONFIG_FB_CFB_FILLRECT is not set
575# CONFIG_FB_CFB_COPYAREA is not set
576# CONFIG_FB_CFB_IMAGEBLIT is not set
577# CONFIG_FB_SOFT_CURSOR is not set
578# CONFIG_FB_MACMODES is not set
566CONFIG_FB_MODE_HELPERS=y 579CONFIG_FB_MODE_HELPERS=y
567# CONFIG_FB_TILEBLITTING is not set 580# CONFIG_FB_TILEBLITTING is not set
581# CONFIG_FB_S1D13XXX is not set
568# CONFIG_FB_VIRTUAL is not set 582# CONFIG_FB_VIRTUAL is not set
569 583
570# 584#
@@ -583,6 +597,7 @@ CONFIG_LOGO=y
583CONFIG_LOGO_LINUX_MONO=y 597CONFIG_LOGO_LINUX_MONO=y
584CONFIG_LOGO_LINUX_VGA16=y 598CONFIG_LOGO_LINUX_VGA16=y
585CONFIG_LOGO_LINUX_CLUT224=y 599CONFIG_LOGO_LINUX_CLUT224=y
600# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
586 601
587# 602#
588# Sound 603# Sound
@@ -596,10 +611,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
596# CONFIG_USB_ARCH_HAS_OHCI is not set 611# CONFIG_USB_ARCH_HAS_OHCI is not set
597 612
598# 613#
599# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
600#
601
602#
603# USB Gadget Support 614# USB Gadget Support
604# 615#
605# CONFIG_USB_GADGET is not set 616# CONFIG_USB_GADGET is not set
@@ -610,6 +621,11 @@ CONFIG_LOGO_LINUX_CLUT224=y
610# CONFIG_MMC is not set 621# CONFIG_MMC is not set
611 622
612# 623#
624# InfiniBand support
625#
626# CONFIG_INFINIBAND is not set
627
628#
613# Character devices 629# Character devices
614# 630#
615CONFIG_MVME162_SCC=y 631CONFIG_MVME162_SCC=y
@@ -630,10 +646,16 @@ CONFIG_REISERFS_FS=m
630# CONFIG_REISERFS_FS_XATTR is not set 646# CONFIG_REISERFS_FS_XATTR is not set
631CONFIG_JFS_FS=m 647CONFIG_JFS_FS=m
632# CONFIG_JFS_POSIX_ACL is not set 648# CONFIG_JFS_POSIX_ACL is not set
649# CONFIG_JFS_SECURITY is not set
633# CONFIG_JFS_DEBUG is not set 650# CONFIG_JFS_DEBUG is not set
634# CONFIG_JFS_STATISTICS is not set 651# CONFIG_JFS_STATISTICS is not set
635CONFIG_FS_POSIX_ACL=y 652CONFIG_FS_POSIX_ACL=y
653
654#
655# XFS support
656#
636CONFIG_XFS_FS=m 657CONFIG_XFS_FS=m
658CONFIG_XFS_EXPORT=y
637# CONFIG_XFS_RT is not set 659# CONFIG_XFS_RT is not set
638# CONFIG_XFS_QUOTA is not set 660# CONFIG_XFS_QUOTA is not set
639# CONFIG_XFS_SECURITY is not set 661# CONFIG_XFS_SECURITY is not set
@@ -790,13 +812,19 @@ CONFIG_NLS_UTF8=m
790# 812#
791# Kernel hacking 813# Kernel hacking
792# 814#
815# CONFIG_PRINTK_TIME is not set
793CONFIG_DEBUG_KERNEL=y 816CONFIG_DEBUG_KERNEL=y
794CONFIG_MAGIC_SYSRQ=y 817CONFIG_MAGIC_SYSRQ=y
818CONFIG_LOG_BUF_SHIFT=16
795# CONFIG_SCHEDSTATS is not set 819# CONFIG_SCHEDSTATS is not set
796# CONFIG_DEBUG_SLAB is not set 820# CONFIG_DEBUG_SLAB is not set
821# CONFIG_DEBUG_SPINLOCK is not set
822# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
797# CONFIG_DEBUG_KOBJECT is not set 823# CONFIG_DEBUG_KOBJECT is not set
798# CONFIG_DEBUG_BUGVERBOSE is not set 824CONFIG_DEBUG_BUGVERBOSE=y
799# CONFIG_DEBUG_INFO is not set 825# CONFIG_DEBUG_INFO is not set
826# CONFIG_DEBUG_FS is not set
827# CONFIG_FRAME_POINTER is not set
800 828
801# 829#
802# Security options 830# Security options
@@ -815,7 +843,8 @@ CONFIG_CRYPTO_MD5=y
815CONFIG_CRYPTO_SHA1=m 843CONFIG_CRYPTO_SHA1=m
816CONFIG_CRYPTO_SHA256=m 844CONFIG_CRYPTO_SHA256=m
817CONFIG_CRYPTO_SHA512=m 845CONFIG_CRYPTO_SHA512=m
818# CONFIG_CRYPTO_WP512 is not set 846CONFIG_CRYPTO_WP512=m
847CONFIG_CRYPTO_TGR192=m
819CONFIG_CRYPTO_DES=y 848CONFIG_CRYPTO_DES=y
820CONFIG_CRYPTO_BLOWFISH=m 849CONFIG_CRYPTO_BLOWFISH=m
821CONFIG_CRYPTO_TWOFISH=m 850CONFIG_CRYPTO_TWOFISH=m
@@ -833,6 +862,10 @@ CONFIG_CRYPTO_CRC32C=m
833CONFIG_CRYPTO_TEST=m 862CONFIG_CRYPTO_TEST=m
834 863
835# 864#
865# Hardware crypto devices
866#
867
868#
836# Library routines 869# Library routines
837# 870#
838CONFIG_CRC_CCITT=m 871CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 713020cd6f2e..550ec26006c1 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:23:57 2004 4# Tue Apr 5 14:06:34 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -101,6 +103,7 @@ CONFIG_GENERIC_ISA_DMA=y
101# 103#
102CONFIG_STANDALONE=y 104CONFIG_STANDALONE=y
103CONFIG_PREVENT_FIRMWARE_BUILD=y 105CONFIG_PREVENT_FIRMWARE_BUILD=y
106CONFIG_FW_LOADER=m
104# CONFIG_DEBUG_DRIVER is not set 107# CONFIG_DEBUG_DRIVER is not set
105 108
106# 109#
@@ -123,6 +126,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
123# 126#
124# CONFIG_BLK_DEV_FD is not set 127# CONFIG_BLK_DEV_FD is not set
125# CONFIG_BLK_DEV_XD is not set 128# CONFIG_BLK_DEV_XD is not set
129# CONFIG_BLK_DEV_COW_COMMON is not set
126CONFIG_BLK_DEV_LOOP=y 130CONFIG_BLK_DEV_LOOP=y
127CONFIG_BLK_DEV_CRYPTOLOOP=m 131CONFIG_BLK_DEV_CRYPTOLOOP=m
128CONFIG_BLK_DEV_NBD=m 132CONFIG_BLK_DEV_NBD=m
@@ -142,6 +146,7 @@ CONFIG_IOSCHED_NOOP=y
142CONFIG_IOSCHED_AS=y 146CONFIG_IOSCHED_AS=y
143CONFIG_IOSCHED_DEADLINE=y 147CONFIG_IOSCHED_DEADLINE=y
144CONFIG_IOSCHED_CFQ=y 148CONFIG_IOSCHED_CFQ=y
149CONFIG_ATA_OVER_ETH=m
145 150
146# 151#
147# ATA/ATAPI/MFM/RLL support 152# ATA/ATAPI/MFM/RLL support
@@ -200,6 +205,7 @@ CONFIG_SCSI_CONSTANTS=y
200# 205#
201# CONFIG_SCSI_SPI_ATTRS is not set 206# CONFIG_SCSI_SPI_ATTRS is not set
202# CONFIG_SCSI_FC_ATTRS is not set 207# CONFIG_SCSI_FC_ATTRS is not set
208# CONFIG_SCSI_ISCSI_ATTRS is not set
203 209
204# 210#
205# SCSI low-level drivers 211# SCSI low-level drivers
@@ -213,7 +219,6 @@ CONFIG_SCSI_CONSTANTS=y
213# CONFIG_SCSI_BUSLOGIC is not set 219# CONFIG_SCSI_BUSLOGIC is not set
214# CONFIG_SCSI_DTC3280 is not set 220# CONFIG_SCSI_DTC3280 is not set
215# CONFIG_SCSI_EATA is not set 221# CONFIG_SCSI_EATA is not set
216# CONFIG_SCSI_EATA_PIO is not set
217# CONFIG_SCSI_FUTURE_DOMAIN is not set 222# CONFIG_SCSI_FUTURE_DOMAIN is not set
218# CONFIG_SCSI_GDTH is not set 223# CONFIG_SCSI_GDTH is not set
219# CONFIG_SCSI_GENERIC_NCR5380 is not set 224# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -250,6 +255,8 @@ CONFIG_DM_CRYPT=m
250CONFIG_DM_SNAPSHOT=m 255CONFIG_DM_SNAPSHOT=m
251CONFIG_DM_MIRROR=m 256CONFIG_DM_MIRROR=m
252CONFIG_DM_ZERO=m 257CONFIG_DM_ZERO=m
258CONFIG_DM_MULTIPATH=m
259CONFIG_DM_MULTIPATH_EMC=m
253 260
254# 261#
255# Fusion MPT device support 262# Fusion MPT device support
@@ -273,7 +280,6 @@ CONFIG_NET=y
273# 280#
274CONFIG_PACKET=y 281CONFIG_PACKET=y
275# CONFIG_PACKET_MMAP is not set 282# CONFIG_PACKET_MMAP is not set
276CONFIG_NETLINK_DEV=y
277CONFIG_UNIX=y 283CONFIG_UNIX=y
278CONFIG_NET_KEY=y 284CONFIG_NET_KEY=y
279CONFIG_INET=y 285CONFIG_INET=y
@@ -374,11 +380,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
374CONFIG_IP_NF_ARPTABLES=m 380CONFIG_IP_NF_ARPTABLES=m
375CONFIG_IP_NF_ARPFILTER=m 381CONFIG_IP_NF_ARPFILTER=m
376CONFIG_IP_NF_ARP_MANGLE=m 382CONFIG_IP_NF_ARP_MANGLE=m
377CONFIG_IP_NF_COMPAT_IPCHAINS=m
378CONFIG_IP_NF_COMPAT_IPFWADM=m
379 383
380# 384#
381# IPv6: Netfilter Configuration 385# IPv6: Netfilter Configuration (EXPERIMENTAL)
382# 386#
383CONFIG_IP6_NF_QUEUE=m 387CONFIG_IP6_NF_QUEUE=m
384CONFIG_IP6_NF_IPTABLES=m 388CONFIG_IP6_NF_IPTABLES=m
@@ -450,7 +454,6 @@ CONFIG_DUMMY=m
450# CONFIG_BONDING is not set 454# CONFIG_BONDING is not set
451CONFIG_EQUALIZER=m 455CONFIG_EQUALIZER=m
452# CONFIG_TUN is not set 456# CONFIG_TUN is not set
453# CONFIG_ETHERTAP is not set
454 457
455# 458#
456# ARCnet devices 459# ARCnet devices
@@ -539,17 +542,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
539# CONFIG_INPUT_EVBUG is not set 542# CONFIG_INPUT_EVBUG is not set
540 543
541# 544#
542# Input I/O drivers
543#
544# CONFIG_GAMEPORT is not set
545CONFIG_SOUND_GAMEPORT=y
546CONFIG_SERIO=m
547CONFIG_SERIO_SERPORT=m
548# CONFIG_SERIO_CT82C710 is not set
549CONFIG_SERIO_Q40KBD=m
550# CONFIG_SERIO_RAW is not set
551
552#
553# Input Device Drivers 545# Input Device Drivers
554# 546#
555CONFIG_INPUT_KEYBOARD=y 547CONFIG_INPUT_KEYBOARD=y
@@ -570,6 +562,17 @@ CONFIG_MOUSE_SERIAL=m
570# CONFIG_INPUT_MISC is not set 562# CONFIG_INPUT_MISC is not set
571 563
572# 564#
565# Hardware I/O ports
566#
567CONFIG_SERIO=m
568CONFIG_SERIO_SERPORT=m
569CONFIG_SERIO_Q40KBD=m
570CONFIG_SERIO_LIBPS2=m
571# CONFIG_SERIO_RAW is not set
572# CONFIG_GAMEPORT is not set
573CONFIG_SOUND_GAMEPORT=y
574
575#
573# Character devices 576# Character devices
574# 577#
575CONFIG_VT=y 578CONFIG_VT=y
@@ -610,6 +613,10 @@ CONFIG_GEN_RTC_X=y
610# CONFIG_RAW_DRIVER is not set 613# CONFIG_RAW_DRIVER is not set
611 614
612# 615#
616# TPM devices
617#
618
619#
613# I2C support 620# I2C support
614# 621#
615# CONFIG_I2C is not set 622# CONFIG_I2C is not set
@@ -637,9 +644,15 @@ CONFIG_GEN_RTC_X=y
637# Graphics support 644# Graphics support
638# 645#
639CONFIG_FB=y 646CONFIG_FB=y
647CONFIG_FB_CFB_FILLRECT=y
648CONFIG_FB_CFB_COPYAREA=y
649CONFIG_FB_CFB_IMAGEBLIT=y
650CONFIG_FB_SOFT_CURSOR=y
651# CONFIG_FB_MACMODES is not set
640CONFIG_FB_MODE_HELPERS=y 652CONFIG_FB_MODE_HELPERS=y
641# CONFIG_FB_TILEBLITTING is not set 653# CONFIG_FB_TILEBLITTING is not set
642CONFIG_FB_Q40=y 654CONFIG_FB_Q40=y
655# CONFIG_FB_S1D13XXX is not set
643# CONFIG_FB_VIRTUAL is not set 656# CONFIG_FB_VIRTUAL is not set
644 657
645# 658#
@@ -658,6 +671,7 @@ CONFIG_LOGO=y
658CONFIG_LOGO_LINUX_MONO=y 671CONFIG_LOGO_LINUX_MONO=y
659CONFIG_LOGO_LINUX_VGA16=y 672CONFIG_LOGO_LINUX_VGA16=y
660CONFIG_LOGO_LINUX_CLUT224=y 673CONFIG_LOGO_LINUX_CLUT224=y
674# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
661 675
662# 676#
663# Sound 677# Sound
@@ -673,10 +687,6 @@ CONFIG_DMASOUND=y
673# CONFIG_USB_ARCH_HAS_OHCI is not set 687# CONFIG_USB_ARCH_HAS_OHCI is not set
674 688
675# 689#
676# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
677#
678
679#
680# USB Gadget Support 690# USB Gadget Support
681# 691#
682# CONFIG_USB_GADGET is not set 692# CONFIG_USB_GADGET is not set
@@ -687,6 +697,11 @@ CONFIG_DMASOUND=y
687# CONFIG_MMC is not set 697# CONFIG_MMC is not set
688 698
689# 699#
700# InfiniBand support
701#
702# CONFIG_INFINIBAND is not set
703
704#
690# Character devices 705# Character devices
691# 706#
692 707
@@ -705,10 +720,16 @@ CONFIG_REISERFS_FS=m
705# CONFIG_REISERFS_FS_XATTR is not set 720# CONFIG_REISERFS_FS_XATTR is not set
706CONFIG_JFS_FS=m 721CONFIG_JFS_FS=m
707# CONFIG_JFS_POSIX_ACL is not set 722# CONFIG_JFS_POSIX_ACL is not set
723# CONFIG_JFS_SECURITY is not set
708# CONFIG_JFS_DEBUG is not set 724# CONFIG_JFS_DEBUG is not set
709# CONFIG_JFS_STATISTICS is not set 725# CONFIG_JFS_STATISTICS is not set
710CONFIG_FS_POSIX_ACL=y 726CONFIG_FS_POSIX_ACL=y
727
728#
729# XFS support
730#
711CONFIG_XFS_FS=m 731CONFIG_XFS_FS=m
732CONFIG_XFS_EXPORT=y
712# CONFIG_XFS_RT is not set 733# CONFIG_XFS_RT is not set
713# CONFIG_XFS_QUOTA is not set 734# CONFIG_XFS_QUOTA is not set
714# CONFIG_XFS_SECURITY is not set 735# CONFIG_XFS_SECURITY is not set
@@ -863,13 +884,19 @@ CONFIG_NLS_UTF8=m
863# 884#
864# Kernel hacking 885# Kernel hacking
865# 886#
887# CONFIG_PRINTK_TIME is not set
866CONFIG_DEBUG_KERNEL=y 888CONFIG_DEBUG_KERNEL=y
867CONFIG_MAGIC_SYSRQ=y 889CONFIG_MAGIC_SYSRQ=y
890CONFIG_LOG_BUF_SHIFT=16
868# CONFIG_SCHEDSTATS is not set 891# CONFIG_SCHEDSTATS is not set
869# CONFIG_DEBUG_SLAB is not set 892# CONFIG_DEBUG_SLAB is not set
893# CONFIG_DEBUG_SPINLOCK is not set
894# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
870# CONFIG_DEBUG_KOBJECT is not set 895# CONFIG_DEBUG_KOBJECT is not set
871# CONFIG_DEBUG_BUGVERBOSE is not set 896CONFIG_DEBUG_BUGVERBOSE=y
872# CONFIG_DEBUG_INFO is not set 897# CONFIG_DEBUG_INFO is not set
898# CONFIG_DEBUG_FS is not set
899# CONFIG_FRAME_POINTER is not set
873 900
874# 901#
875# Security options 902# Security options
@@ -888,7 +915,8 @@ CONFIG_CRYPTO_MD5=y
888CONFIG_CRYPTO_SHA1=m 915CONFIG_CRYPTO_SHA1=m
889CONFIG_CRYPTO_SHA256=m 916CONFIG_CRYPTO_SHA256=m
890CONFIG_CRYPTO_SHA512=m 917CONFIG_CRYPTO_SHA512=m
891# CONFIG_CRYPTO_WP512 is not set 918CONFIG_CRYPTO_WP512=m
919CONFIG_CRYPTO_TGR192=m
892CONFIG_CRYPTO_DES=y 920CONFIG_CRYPTO_DES=y
893CONFIG_CRYPTO_BLOWFISH=m 921CONFIG_CRYPTO_BLOWFISH=m
894CONFIG_CRYPTO_TWOFISH=m 922CONFIG_CRYPTO_TWOFISH=m
@@ -906,6 +934,10 @@ CONFIG_CRYPTO_CRC32C=m
906CONFIG_CRYPTO_TEST=m 934CONFIG_CRYPTO_TEST=m
907 935
908# 936#
937# Hardware crypto devices
938#
939
940#
909# Library routines 941# Library routines
910# 942#
911CONFIG_CRC_CCITT=m 943CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 33c4db63b72c..5b5a619645aa 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:24:01 2004 4# Tue Apr 5 14:06:37 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -87,6 +89,7 @@ CONFIG_PROC_HARDWARE=y
87# 89#
88CONFIG_STANDALONE=y 90CONFIG_STANDALONE=y
89CONFIG_PREVENT_FIRMWARE_BUILD=y 91CONFIG_PREVENT_FIRMWARE_BUILD=y
92CONFIG_FW_LOADER=m
90# CONFIG_DEBUG_DRIVER is not set 93# CONFIG_DEBUG_DRIVER is not set
91 94
92# 95#
@@ -106,6 +109,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
106# 109#
107# Block devices 110# Block devices
108# 111#
112# CONFIG_BLK_DEV_COW_COMMON is not set
109CONFIG_BLK_DEV_LOOP=y 113CONFIG_BLK_DEV_LOOP=y
110CONFIG_BLK_DEV_CRYPTOLOOP=m 114CONFIG_BLK_DEV_CRYPTOLOOP=m
111CONFIG_BLK_DEV_NBD=m 115CONFIG_BLK_DEV_NBD=m
@@ -125,6 +129,7 @@ CONFIG_IOSCHED_NOOP=y
125CONFIG_IOSCHED_AS=y 129CONFIG_IOSCHED_AS=y
126CONFIG_IOSCHED_DEADLINE=y 130CONFIG_IOSCHED_DEADLINE=y
127CONFIG_IOSCHED_CFQ=y 131CONFIG_IOSCHED_CFQ=y
132CONFIG_ATA_OVER_ETH=m
128 133
129# 134#
130# ATA/ATAPI/MFM/RLL support 135# ATA/ATAPI/MFM/RLL support
@@ -159,6 +164,7 @@ CONFIG_SCSI_CONSTANTS=y
159# 164#
160# CONFIG_SCSI_SPI_ATTRS is not set 165# CONFIG_SCSI_SPI_ATTRS is not set
161# CONFIG_SCSI_FC_ATTRS is not set 166# CONFIG_SCSI_FC_ATTRS is not set
167# CONFIG_SCSI_ISCSI_ATTRS is not set
162 168
163# 169#
164# SCSI low-level drivers 170# SCSI low-level drivers
@@ -185,6 +191,8 @@ CONFIG_DM_CRYPT=m
185CONFIG_DM_SNAPSHOT=m 191CONFIG_DM_SNAPSHOT=m
186CONFIG_DM_MIRROR=m 192CONFIG_DM_MIRROR=m
187CONFIG_DM_ZERO=m 193CONFIG_DM_ZERO=m
194CONFIG_DM_MULTIPATH=m
195CONFIG_DM_MULTIPATH_EMC=m
188 196
189# 197#
190# Fusion MPT device support 198# Fusion MPT device support
@@ -208,7 +216,6 @@ CONFIG_NET=y
208# 216#
209CONFIG_PACKET=y 217CONFIG_PACKET=y
210# CONFIG_PACKET_MMAP is not set 218# CONFIG_PACKET_MMAP is not set
211CONFIG_NETLINK_DEV=y
212CONFIG_UNIX=y 219CONFIG_UNIX=y
213CONFIG_NET_KEY=y 220CONFIG_NET_KEY=y
214CONFIG_INET=y 221CONFIG_INET=y
@@ -309,11 +316,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
309CONFIG_IP_NF_ARPTABLES=m 316CONFIG_IP_NF_ARPTABLES=m
310CONFIG_IP_NF_ARPFILTER=m 317CONFIG_IP_NF_ARPFILTER=m
311CONFIG_IP_NF_ARP_MANGLE=m 318CONFIG_IP_NF_ARP_MANGLE=m
312CONFIG_IP_NF_COMPAT_IPCHAINS=m
313CONFIG_IP_NF_COMPAT_IPFWADM=m
314 319
315# 320#
316# IPv6: Netfilter Configuration 321# IPv6: Netfilter Configuration (EXPERIMENTAL)
317# 322#
318CONFIG_IP6_NF_QUEUE=m 323CONFIG_IP6_NF_QUEUE=m
319CONFIG_IP6_NF_IPTABLES=m 324CONFIG_IP6_NF_IPTABLES=m
@@ -385,7 +390,6 @@ CONFIG_DUMMY=m
385# CONFIG_BONDING is not set 390# CONFIG_BONDING is not set
386CONFIG_EQUALIZER=m 391CONFIG_EQUALIZER=m
387# CONFIG_TUN is not set 392# CONFIG_TUN is not set
388# CONFIG_ETHERTAP is not set
389 393
390# 394#
391# Ethernet (10 or 100Mbit) 395# Ethernet (10 or 100Mbit)
@@ -459,16 +463,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
459# CONFIG_INPUT_EVBUG is not set 463# CONFIG_INPUT_EVBUG is not set
460 464
461# 465#
462# Input I/O drivers
463#
464# CONFIG_GAMEPORT is not set
465CONFIG_SOUND_GAMEPORT=y
466CONFIG_SERIO=y
467CONFIG_SERIO_SERPORT=m
468# CONFIG_SERIO_CT82C710 is not set
469# CONFIG_SERIO_RAW is not set
470
471#
472# Input Device Drivers 466# Input Device Drivers
473# 467#
474CONFIG_INPUT_KEYBOARD=y 468CONFIG_INPUT_KEYBOARD=y
@@ -486,6 +480,16 @@ CONFIG_MOUSE_SERIAL=m
486# CONFIG_INPUT_MISC is not set 480# CONFIG_INPUT_MISC is not set
487 481
488# 482#
483# Hardware I/O ports
484#
485CONFIG_SERIO=y
486CONFIG_SERIO_SERPORT=m
487CONFIG_SERIO_LIBPS2=m
488# CONFIG_SERIO_RAW is not set
489# CONFIG_GAMEPORT is not set
490CONFIG_SOUND_GAMEPORT=y
491
492#
489# Character devices 493# Character devices
490# 494#
491CONFIG_VT=y 495CONFIG_VT=y
@@ -526,6 +530,10 @@ CONFIG_GEN_RTC_X=y
526# CONFIG_RAW_DRIVER is not set 530# CONFIG_RAW_DRIVER is not set
527 531
528# 532#
533# TPM devices
534#
535
536#
529# I2C support 537# I2C support
530# 538#
531# CONFIG_I2C is not set 539# CONFIG_I2C is not set
@@ -553,8 +561,14 @@ CONFIG_GEN_RTC_X=y
553# Graphics support 561# Graphics support
554# 562#
555CONFIG_FB=y 563CONFIG_FB=y
564# CONFIG_FB_CFB_FILLRECT is not set
565# CONFIG_FB_CFB_COPYAREA is not set
566# CONFIG_FB_CFB_IMAGEBLIT is not set
567# CONFIG_FB_SOFT_CURSOR is not set
568# CONFIG_FB_MACMODES is not set
556CONFIG_FB_MODE_HELPERS=y 569CONFIG_FB_MODE_HELPERS=y
557# CONFIG_FB_TILEBLITTING is not set 570# CONFIG_FB_TILEBLITTING is not set
571# CONFIG_FB_S1D13XXX is not set
558# CONFIG_FB_VIRTUAL is not set 572# CONFIG_FB_VIRTUAL is not set
559 573
560# 574#
@@ -573,6 +587,7 @@ CONFIG_LOGO=y
573CONFIG_LOGO_LINUX_MONO=y 587CONFIG_LOGO_LINUX_MONO=y
574CONFIG_LOGO_LINUX_VGA16=y 588CONFIG_LOGO_LINUX_VGA16=y
575CONFIG_LOGO_LINUX_CLUT224=y 589CONFIG_LOGO_LINUX_CLUT224=y
590# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
576 591
577# 592#
578# Sound 593# Sound
@@ -586,10 +601,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
586# CONFIG_USB_ARCH_HAS_OHCI is not set 601# CONFIG_USB_ARCH_HAS_OHCI is not set
587 602
588# 603#
589# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
590#
591
592#
593# USB Gadget Support 604# USB Gadget Support
594# 605#
595# CONFIG_USB_GADGET is not set 606# CONFIG_USB_GADGET is not set
@@ -600,6 +611,11 @@ CONFIG_LOGO_LINUX_CLUT224=y
600# CONFIG_MMC is not set 611# CONFIG_MMC is not set
601 612
602# 613#
614# InfiniBand support
615#
616# CONFIG_INFINIBAND is not set
617
618#
603# Character devices 619# Character devices
604# 620#
605 621
@@ -618,10 +634,16 @@ CONFIG_REISERFS_FS=m
618# CONFIG_REISERFS_FS_XATTR is not set 634# CONFIG_REISERFS_FS_XATTR is not set
619CONFIG_JFS_FS=m 635CONFIG_JFS_FS=m
620# CONFIG_JFS_POSIX_ACL is not set 636# CONFIG_JFS_POSIX_ACL is not set
637# CONFIG_JFS_SECURITY is not set
621# CONFIG_JFS_DEBUG is not set 638# CONFIG_JFS_DEBUG is not set
622# CONFIG_JFS_STATISTICS is not set 639# CONFIG_JFS_STATISTICS is not set
623CONFIG_FS_POSIX_ACL=y 640CONFIG_FS_POSIX_ACL=y
641
642#
643# XFS support
644#
624CONFIG_XFS_FS=m 645CONFIG_XFS_FS=m
646CONFIG_XFS_EXPORT=y
625# CONFIG_XFS_RT is not set 647# CONFIG_XFS_RT is not set
626# CONFIG_XFS_QUOTA is not set 648# CONFIG_XFS_QUOTA is not set
627# CONFIG_XFS_SECURITY is not set 649# CONFIG_XFS_SECURITY is not set
@@ -779,13 +801,19 @@ CONFIG_NLS_UTF8=m
779# 801#
780# Kernel hacking 802# Kernel hacking
781# 803#
804# CONFIG_PRINTK_TIME is not set
782CONFIG_DEBUG_KERNEL=y 805CONFIG_DEBUG_KERNEL=y
783CONFIG_MAGIC_SYSRQ=y 806CONFIG_MAGIC_SYSRQ=y
807CONFIG_LOG_BUF_SHIFT=16
784# CONFIG_SCHEDSTATS is not set 808# CONFIG_SCHEDSTATS is not set
785# CONFIG_DEBUG_SLAB is not set 809# CONFIG_DEBUG_SLAB is not set
810# CONFIG_DEBUG_SPINLOCK is not set
811# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
786# CONFIG_DEBUG_KOBJECT is not set 812# CONFIG_DEBUG_KOBJECT is not set
787# CONFIG_DEBUG_BUGVERBOSE is not set 813CONFIG_DEBUG_BUGVERBOSE=y
788# CONFIG_DEBUG_INFO is not set 814# CONFIG_DEBUG_INFO is not set
815# CONFIG_DEBUG_FS is not set
816# CONFIG_FRAME_POINTER is not set
789 817
790# 818#
791# Security options 819# Security options
@@ -804,7 +832,8 @@ CONFIG_CRYPTO_MD5=y
804CONFIG_CRYPTO_SHA1=m 832CONFIG_CRYPTO_SHA1=m
805CONFIG_CRYPTO_SHA256=m 833CONFIG_CRYPTO_SHA256=m
806CONFIG_CRYPTO_SHA512=m 834CONFIG_CRYPTO_SHA512=m
807# CONFIG_CRYPTO_WP512 is not set 835CONFIG_CRYPTO_WP512=m
836CONFIG_CRYPTO_TGR192=m
808CONFIG_CRYPTO_DES=y 837CONFIG_CRYPTO_DES=y
809CONFIG_CRYPTO_BLOWFISH=m 838CONFIG_CRYPTO_BLOWFISH=m
810CONFIG_CRYPTO_TWOFISH=m 839CONFIG_CRYPTO_TWOFISH=m
@@ -822,6 +851,10 @@ CONFIG_CRYPTO_CRC32C=m
822CONFIG_CRYPTO_TEST=m 851CONFIG_CRYPTO_TEST=m
823 852
824# 853#
854# Hardware crypto devices
855#
856
857#
825# Library routines 858# Library routines
826# 859#
827CONFIG_CRC_CCITT=m 860CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index fe008c9b10c1..704e42344cba 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:24:05 2004 4# Tue Apr 5 14:06:40 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -26,23 +28,23 @@ CONFIG_BSD_PROCESS_ACCT=y
26# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
27CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
28CONFIG_AUDIT=y 30CONFIG_AUDIT=y
29CONFIG_LOG_BUF_SHIFT=16 31CONFIG_HOTPLUG=y
30# CONFIG_HOTPLUG is not set
31CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
33# CONFIG_EMBEDDED is not set 34# CONFIG_EMBEDDED is not set
34CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y 39CONFIG_FUTEX=y
38CONFIG_EPOLL=y 40CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y 41CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0 42CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0 43CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 44CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 45CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
46 48
47# 49#
48# Loadable module support 50# Loadable module support
@@ -98,6 +100,7 @@ CONFIG_PROC_HARDWARE=y
98# 100#
99CONFIG_STANDALONE=y 101CONFIG_STANDALONE=y
100CONFIG_PREVENT_FIRMWARE_BUILD=y 102CONFIG_PREVENT_FIRMWARE_BUILD=y
103CONFIG_FW_LOADER=m
101# CONFIG_DEBUG_DRIVER is not set 104# CONFIG_DEBUG_DRIVER is not set
102 105
103# 106#
@@ -117,6 +120,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
117# 120#
118# Block devices 121# Block devices
119# 122#
123# CONFIG_BLK_DEV_COW_COMMON is not set
120CONFIG_BLK_DEV_LOOP=y 124CONFIG_BLK_DEV_LOOP=y
121CONFIG_BLK_DEV_CRYPTOLOOP=m 125CONFIG_BLK_DEV_CRYPTOLOOP=m
122CONFIG_BLK_DEV_NBD=m 126CONFIG_BLK_DEV_NBD=m
@@ -136,6 +140,7 @@ CONFIG_IOSCHED_NOOP=y
136CONFIG_IOSCHED_AS=y 140CONFIG_IOSCHED_AS=y
137CONFIG_IOSCHED_DEADLINE=y 141CONFIG_IOSCHED_DEADLINE=y
138CONFIG_IOSCHED_CFQ=y 142CONFIG_IOSCHED_CFQ=y
143CONFIG_ATA_OVER_ETH=m
139 144
140# 145#
141# ATA/ATAPI/MFM/RLL support 146# ATA/ATAPI/MFM/RLL support
@@ -170,6 +175,7 @@ CONFIG_SCSI_CONSTANTS=y
170# 175#
171# CONFIG_SCSI_SPI_ATTRS is not set 176# CONFIG_SCSI_SPI_ATTRS is not set
172# CONFIG_SCSI_FC_ATTRS is not set 177# CONFIG_SCSI_FC_ATTRS is not set
178# CONFIG_SCSI_ISCSI_ATTRS is not set
173 179
174# 180#
175# SCSI low-level drivers 181# SCSI low-level drivers
@@ -196,6 +202,8 @@ CONFIG_DM_CRYPT=m
196CONFIG_DM_SNAPSHOT=m 202CONFIG_DM_SNAPSHOT=m
197CONFIG_DM_MIRROR=m 203CONFIG_DM_MIRROR=m
198CONFIG_DM_ZERO=m 204CONFIG_DM_ZERO=m
205CONFIG_DM_MULTIPATH=m
206CONFIG_DM_MULTIPATH_EMC=m
199 207
200# 208#
201# Fusion MPT device support 209# Fusion MPT device support
@@ -219,7 +227,6 @@ CONFIG_NET=y
219# 227#
220CONFIG_PACKET=y 228CONFIG_PACKET=y
221# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
222CONFIG_NETLINK_DEV=y
223CONFIG_UNIX=y 230CONFIG_UNIX=y
224CONFIG_NET_KEY=y 231CONFIG_NET_KEY=y
225CONFIG_INET=y 232CONFIG_INET=y
@@ -320,11 +327,9 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
320CONFIG_IP_NF_ARPTABLES=m 327CONFIG_IP_NF_ARPTABLES=m
321CONFIG_IP_NF_ARPFILTER=m 328CONFIG_IP_NF_ARPFILTER=m
322CONFIG_IP_NF_ARP_MANGLE=m 329CONFIG_IP_NF_ARP_MANGLE=m
323CONFIG_IP_NF_COMPAT_IPCHAINS=m
324CONFIG_IP_NF_COMPAT_IPFWADM=m
325 330
326# 331#
327# IPv6: Netfilter Configuration 332# IPv6: Netfilter Configuration (EXPERIMENTAL)
328# 333#
329CONFIG_IP6_NF_QUEUE=m 334CONFIG_IP6_NF_QUEUE=m
330CONFIG_IP6_NF_IPTABLES=m 335CONFIG_IP6_NF_IPTABLES=m
@@ -396,7 +401,6 @@ CONFIG_DUMMY=m
396# CONFIG_BONDING is not set 401# CONFIG_BONDING is not set
397CONFIG_EQUALIZER=m 402CONFIG_EQUALIZER=m
398# CONFIG_TUN is not set 403# CONFIG_TUN is not set
399# CONFIG_ETHERTAP is not set
400 404
401# 405#
402# Ethernet (10 or 100Mbit) 406# Ethernet (10 or 100Mbit)
@@ -469,16 +473,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
469# CONFIG_INPUT_EVBUG is not set 473# CONFIG_INPUT_EVBUG is not set
470 474
471# 475#
472# Input I/O drivers
473#
474# CONFIG_GAMEPORT is not set
475CONFIG_SOUND_GAMEPORT=y
476CONFIG_SERIO=y
477CONFIG_SERIO_SERPORT=m
478# CONFIG_SERIO_CT82C710 is not set
479# CONFIG_SERIO_RAW is not set
480
481#
482# Input Device Drivers 476# Input Device Drivers
483# 477#
484CONFIG_INPUT_KEYBOARD=y 478CONFIG_INPUT_KEYBOARD=y
@@ -496,6 +490,16 @@ CONFIG_MOUSE_SERIAL=m
496# CONFIG_INPUT_MISC is not set 490# CONFIG_INPUT_MISC is not set
497 491
498# 492#
493# Hardware I/O ports
494#
495CONFIG_SERIO=y
496CONFIG_SERIO_SERPORT=m
497CONFIG_SERIO_LIBPS2=m
498# CONFIG_SERIO_RAW is not set
499# CONFIG_GAMEPORT is not set
500CONFIG_SOUND_GAMEPORT=y
501
502#
499# Character devices 503# Character devices
500# 504#
501CONFIG_VT=y 505CONFIG_VT=y
@@ -536,6 +540,10 @@ CONFIG_GEN_RTC_X=y
536# CONFIG_RAW_DRIVER is not set 540# CONFIG_RAW_DRIVER is not set
537 541
538# 542#
543# TPM devices
544#
545
546#
539# I2C support 547# I2C support
540# 548#
541# CONFIG_I2C is not set 549# CONFIG_I2C is not set
@@ -563,8 +571,14 @@ CONFIG_GEN_RTC_X=y
563# Graphics support 571# Graphics support
564# 572#
565CONFIG_FB=y 573CONFIG_FB=y
574# CONFIG_FB_CFB_FILLRECT is not set
575# CONFIG_FB_CFB_COPYAREA is not set
576# CONFIG_FB_CFB_IMAGEBLIT is not set
577# CONFIG_FB_SOFT_CURSOR is not set
578# CONFIG_FB_MACMODES is not set
566CONFIG_FB_MODE_HELPERS=y 579CONFIG_FB_MODE_HELPERS=y
567# CONFIG_FB_TILEBLITTING is not set 580# CONFIG_FB_TILEBLITTING is not set
581# CONFIG_FB_S1D13XXX is not set
568# CONFIG_FB_VIRTUAL is not set 582# CONFIG_FB_VIRTUAL is not set
569 583
570# 584#
@@ -583,6 +597,7 @@ CONFIG_LOGO=y
583CONFIG_LOGO_LINUX_MONO=y 597CONFIG_LOGO_LINUX_MONO=y
584CONFIG_LOGO_LINUX_VGA16=y 598CONFIG_LOGO_LINUX_VGA16=y
585CONFIG_LOGO_LINUX_CLUT224=y 599CONFIG_LOGO_LINUX_CLUT224=y
600# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
586 601
587# 602#
588# Sound 603# Sound
@@ -596,10 +611,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
596# CONFIG_USB_ARCH_HAS_OHCI is not set 611# CONFIG_USB_ARCH_HAS_OHCI is not set
597 612
598# 613#
599# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
600#
601
602#
603# USB Gadget Support 614# USB Gadget Support
604# 615#
605# CONFIG_USB_GADGET is not set 616# CONFIG_USB_GADGET is not set
@@ -610,6 +621,11 @@ CONFIG_LOGO_LINUX_CLUT224=y
610# CONFIG_MMC is not set 621# CONFIG_MMC is not set
611 622
612# 623#
624# InfiniBand support
625#
626# CONFIG_INFINIBAND is not set
627
628#
613# Character devices 629# Character devices
614# 630#
615 631
@@ -628,10 +644,16 @@ CONFIG_REISERFS_FS=m
628# CONFIG_REISERFS_FS_XATTR is not set 644# CONFIG_REISERFS_FS_XATTR is not set
629CONFIG_JFS_FS=m 645CONFIG_JFS_FS=m
630# CONFIG_JFS_POSIX_ACL is not set 646# CONFIG_JFS_POSIX_ACL is not set
647# CONFIG_JFS_SECURITY is not set
631# CONFIG_JFS_DEBUG is not set 648# CONFIG_JFS_DEBUG is not set
632# CONFIG_JFS_STATISTICS is not set 649# CONFIG_JFS_STATISTICS is not set
633CONFIG_FS_POSIX_ACL=y 650CONFIG_FS_POSIX_ACL=y
651
652#
653# XFS support
654#
634CONFIG_XFS_FS=m 655CONFIG_XFS_FS=m
656CONFIG_XFS_EXPORT=y
635# CONFIG_XFS_RT is not set 657# CONFIG_XFS_RT is not set
636# CONFIG_XFS_QUOTA is not set 658# CONFIG_XFS_QUOTA is not set
637# CONFIG_XFS_SECURITY is not set 659# CONFIG_XFS_SECURITY is not set
@@ -789,13 +811,19 @@ CONFIG_NLS_UTF8=m
789# 811#
790# Kernel hacking 812# Kernel hacking
791# 813#
814# CONFIG_PRINTK_TIME is not set
792CONFIG_DEBUG_KERNEL=y 815CONFIG_DEBUG_KERNEL=y
793CONFIG_MAGIC_SYSRQ=y 816CONFIG_MAGIC_SYSRQ=y
817CONFIG_LOG_BUF_SHIFT=16
794# CONFIG_SCHEDSTATS is not set 818# CONFIG_SCHEDSTATS is not set
795# CONFIG_DEBUG_SLAB is not set 819# CONFIG_DEBUG_SLAB is not set
820# CONFIG_DEBUG_SPINLOCK is not set
821# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
796# CONFIG_DEBUG_KOBJECT is not set 822# CONFIG_DEBUG_KOBJECT is not set
797# CONFIG_DEBUG_BUGVERBOSE is not set 823CONFIG_DEBUG_BUGVERBOSE=y
798# CONFIG_DEBUG_INFO is not set 824# CONFIG_DEBUG_INFO is not set
825# CONFIG_DEBUG_FS is not set
826# CONFIG_FRAME_POINTER is not set
799 827
800# 828#
801# Security options 829# Security options
@@ -814,7 +842,8 @@ CONFIG_CRYPTO_MD5=y
814CONFIG_CRYPTO_SHA1=m 842CONFIG_CRYPTO_SHA1=m
815CONFIG_CRYPTO_SHA256=m 843CONFIG_CRYPTO_SHA256=m
816CONFIG_CRYPTO_SHA512=m 844CONFIG_CRYPTO_SHA512=m
817# CONFIG_CRYPTO_WP512 is not set 845CONFIG_CRYPTO_WP512=m
846CONFIG_CRYPTO_TGR192=m
818CONFIG_CRYPTO_DES=y 847CONFIG_CRYPTO_DES=y
819CONFIG_CRYPTO_BLOWFISH=m 848CONFIG_CRYPTO_BLOWFISH=m
820CONFIG_CRYPTO_TWOFISH=m 849CONFIG_CRYPTO_TWOFISH=m
@@ -832,6 +861,10 @@ CONFIG_CRYPTO_CRC32C=m
832CONFIG_CRYPTO_TEST=m 861CONFIG_CRYPTO_TEST=m
833 862
834# 863#
864# Hardware crypto devices
865#
866
867#
835# Library routines 868# Library routines
836# 869#
837CONFIG_CRC_CCITT=m 870CONFIG_CRC_CCITT=m
diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig
index 78f57d398340..5b2296ecba82 100644
--- a/arch/m68k/defconfig
+++ b/arch/m68k/defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-m68k 3# Linux kernel version: 2.6.12-rc2-m68k
4# Sun Dec 26 11:23:36 2004 4# Tue Apr 5 14:05:31 2005
5# 5#
6CONFIG_M68K=y 6CONFIG_M68K=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
10 11
11# 12#
12# Code maturity level options 13# Code maturity level options
@@ -14,6 +15,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
14CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
15CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
16CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
17 19
18# 20#
19# General setup 21# General setup
@@ -25,22 +27,22 @@ CONFIG_SYSVIPC=y
25# CONFIG_BSD_PROCESS_ACCT is not set 27# CONFIG_BSD_PROCESS_ACCT is not set
26CONFIG_SYSCTL=y 28CONFIG_SYSCTL=y
27# CONFIG_AUDIT is not set 29# CONFIG_AUDIT is not set
28CONFIG_LOG_BUF_SHIFT=14
29# CONFIG_HOTPLUG is not set 30# CONFIG_HOTPLUG is not set
30CONFIG_KOBJECT_UEVENT=y 31CONFIG_KOBJECT_UEVENT=y
31# CONFIG_IKCONFIG is not set 32# CONFIG_IKCONFIG is not set
32# CONFIG_EMBEDDED is not set 33# CONFIG_EMBEDDED is not set
33CONFIG_KALLSYMS=y 34CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set 35# CONFIG_KALLSYMS_EXTRA_PASS is not set
36CONFIG_BASE_FULL=y
35CONFIG_FUTEX=y 37CONFIG_FUTEX=y
36CONFIG_EPOLL=y 38CONFIG_EPOLL=y
37# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
38CONFIG_SHMEM=y 39CONFIG_SHMEM=y
39CONFIG_CC_ALIGN_FUNCTIONS=0 40CONFIG_CC_ALIGN_FUNCTIONS=0
40CONFIG_CC_ALIGN_LABELS=0 41CONFIG_CC_ALIGN_LABELS=0
41CONFIG_CC_ALIGN_LOOPS=0 42CONFIG_CC_ALIGN_LOOPS=0
42CONFIG_CC_ALIGN_JUMPS=0 43CONFIG_CC_ALIGN_JUMPS=0
43# CONFIG_TINY_SHMEM is not set 44# CONFIG_TINY_SHMEM is not set
45CONFIG_BASE_SMALL=0
44 46
45# 47#
46# Loadable module support 48# Loadable module support
@@ -92,6 +94,7 @@ CONFIG_PROC_HARDWARE=y
92# 94#
93CONFIG_STANDALONE=y 95CONFIG_STANDALONE=y
94CONFIG_PREVENT_FIRMWARE_BUILD=y 96CONFIG_PREVENT_FIRMWARE_BUILD=y
97# CONFIG_FW_LOADER is not set
95 98
96# 99#
97# Memory Technology Devices (MTD) 100# Memory Technology Devices (MTD)
@@ -112,6 +115,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
112# 115#
113CONFIG_AMIGA_FLOPPY=y 116CONFIG_AMIGA_FLOPPY=y
114# CONFIG_AMIGA_Z2RAM is not set 117# CONFIG_AMIGA_Z2RAM is not set
118# CONFIG_BLK_DEV_COW_COMMON is not set
115# CONFIG_BLK_DEV_LOOP is not set 119# CONFIG_BLK_DEV_LOOP is not set
116# CONFIG_BLK_DEV_NBD is not set 120# CONFIG_BLK_DEV_NBD is not set
117CONFIG_BLK_DEV_RAM=y 121CONFIG_BLK_DEV_RAM=y
@@ -130,6 +134,7 @@ CONFIG_IOSCHED_NOOP=y
130CONFIG_IOSCHED_AS=y 134CONFIG_IOSCHED_AS=y
131CONFIG_IOSCHED_DEADLINE=y 135CONFIG_IOSCHED_DEADLINE=y
132CONFIG_IOSCHED_CFQ=y 136CONFIG_IOSCHED_CFQ=y
137# CONFIG_ATA_OVER_ETH is not set
133 138
134# 139#
135# ATA/ATAPI/MFM/RLL support 140# ATA/ATAPI/MFM/RLL support
@@ -164,6 +169,7 @@ CONFIG_SCSI_CONSTANTS=y
164# 169#
165# CONFIG_SCSI_SPI_ATTRS is not set 170# CONFIG_SCSI_SPI_ATTRS is not set
166# CONFIG_SCSI_FC_ATTRS is not set 171# CONFIG_SCSI_FC_ATTRS is not set
172# CONFIG_SCSI_ISCSI_ATTRS is not set
167 173
168# 174#
169# SCSI low-level drivers 175# SCSI low-level drivers
@@ -207,7 +213,6 @@ CONFIG_NET=y
207# 213#
208CONFIG_PACKET=y 214CONFIG_PACKET=y
209# CONFIG_PACKET_MMAP is not set 215# CONFIG_PACKET_MMAP is not set
210# CONFIG_NETLINK_DEV is not set
211CONFIG_UNIX=y 216CONFIG_UNIX=y
212# CONFIG_NET_KEY is not set 217# CONFIG_NET_KEY is not set
213CONFIG_INET=y 218CONFIG_INET=y
@@ -324,16 +329,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
324# CONFIG_INPUT_EVBUG is not set 329# CONFIG_INPUT_EVBUG is not set
325 330
326# 331#
327# Input I/O drivers
328#
329# CONFIG_GAMEPORT is not set
330CONFIG_SOUND_GAMEPORT=y
331CONFIG_SERIO=y
332CONFIG_SERIO_SERPORT=y
333# CONFIG_SERIO_CT82C710 is not set
334# CONFIG_SERIO_RAW is not set
335
336#
337# Input Device Drivers 332# Input Device Drivers
338# 333#
339CONFIG_INPUT_KEYBOARD=y 334CONFIG_INPUT_KEYBOARD=y
@@ -353,6 +348,16 @@ CONFIG_MOUSE_PS2=y
353# CONFIG_INPUT_MISC is not set 348# CONFIG_INPUT_MISC is not set
354 349
355# 350#
351# Hardware I/O ports
352#
353CONFIG_SERIO=y
354CONFIG_SERIO_SERPORT=y
355CONFIG_SERIO_LIBPS2=y
356# CONFIG_SERIO_RAW is not set
357# CONFIG_GAMEPORT is not set
358CONFIG_SOUND_GAMEPORT=y
359
360#
356# Character devices 361# Character devices
357# 362#
358CONFIG_VT=y 363CONFIG_VT=y
@@ -393,6 +398,10 @@ CONFIG_LEGACY_PTY_COUNT=256
393# CONFIG_RAW_DRIVER is not set 398# CONFIG_RAW_DRIVER is not set
394 399
395# 400#
401# TPM devices
402#
403
404#
396# I2C support 405# I2C support
397# 406#
398# CONFIG_I2C is not set 407# CONFIG_I2C is not set
@@ -420,6 +429,11 @@ CONFIG_LEGACY_PTY_COUNT=256
420# Graphics support 429# Graphics support
421# 430#
422CONFIG_FB=y 431CONFIG_FB=y
432# CONFIG_FB_CFB_FILLRECT is not set
433# CONFIG_FB_CFB_COPYAREA is not set
434# CONFIG_FB_CFB_IMAGEBLIT is not set
435CONFIG_FB_SOFT_CURSOR=y
436# CONFIG_FB_MACMODES is not set
423CONFIG_FB_MODE_HELPERS=y 437CONFIG_FB_MODE_HELPERS=y
424# CONFIG_FB_TILEBLITTING is not set 438# CONFIG_FB_TILEBLITTING is not set
425# CONFIG_FB_CIRRUS is not set 439# CONFIG_FB_CIRRUS is not set
@@ -428,6 +442,7 @@ CONFIG_FB_AMIGA_OCS=y
428CONFIG_FB_AMIGA_ECS=y 442CONFIG_FB_AMIGA_ECS=y
429CONFIG_FB_AMIGA_AGA=y 443CONFIG_FB_AMIGA_AGA=y
430# CONFIG_FB_FM2 is not set 444# CONFIG_FB_FM2 is not set
445# CONFIG_FB_S1D13XXX is not set
431# CONFIG_FB_VIRTUAL is not set 446# CONFIG_FB_VIRTUAL is not set
432 447
433# 448#
@@ -440,6 +455,7 @@ CONFIG_DUMMY_CONSOLE=y
440# Logo configuration 455# Logo configuration
441# 456#
442# CONFIG_LOGO is not set 457# CONFIG_LOGO is not set
458# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
443 459
444# 460#
445# Sound 461# Sound
@@ -453,10 +469,6 @@ CONFIG_DUMMY_CONSOLE=y
453# CONFIG_USB_ARCH_HAS_OHCI is not set 469# CONFIG_USB_ARCH_HAS_OHCI is not set
454 470
455# 471#
456# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
457#
458
459#
460# USB Gadget Support 472# USB Gadget Support
461# 473#
462# CONFIG_USB_GADGET is not set 474# CONFIG_USB_GADGET is not set
@@ -467,6 +479,11 @@ CONFIG_DUMMY_CONSOLE=y
467# CONFIG_MMC is not set 479# CONFIG_MMC is not set
468 480
469# 481#
482# InfiniBand support
483#
484# CONFIG_INFINIBAND is not set
485
486#
470# Character devices 487# Character devices
471# 488#
472CONFIG_AMIGA_BUILTIN_SERIAL=y 489CONFIG_AMIGA_BUILTIN_SERIAL=y
@@ -483,6 +500,10 @@ CONFIG_EXT2_FS=y
483# CONFIG_JBD is not set 500# CONFIG_JBD is not set
484# CONFIG_REISERFS_FS is not set 501# CONFIG_REISERFS_FS is not set
485# CONFIG_JFS_FS is not set 502# CONFIG_JFS_FS is not set
503
504#
505# XFS support
506#
486# CONFIG_XFS_FS is not set 507# CONFIG_XFS_FS is not set
487CONFIG_MINIX_FS=y 508CONFIG_MINIX_FS=y
488# CONFIG_ROMFS_FS is not set 509# CONFIG_ROMFS_FS is not set
@@ -544,7 +565,6 @@ CONFIG_NFS_FS=y
544# CONFIG_NFS_DIRECTIO is not set 565# CONFIG_NFS_DIRECTIO is not set
545# CONFIG_NFSD is not set 566# CONFIG_NFSD is not set
546CONFIG_LOCKD=y 567CONFIG_LOCKD=y
547# CONFIG_EXPORTFS is not set
548CONFIG_SUNRPC=y 568CONFIG_SUNRPC=y
549# CONFIG_RPCSEC_GSS_KRB5 is not set 569# CONFIG_RPCSEC_GSS_KRB5 is not set
550# CONFIG_RPCSEC_GSS_SPKM3 is not set 570# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -608,7 +628,10 @@ CONFIG_NLS_CODEPAGE_437=y
608# 628#
609# Kernel hacking 629# Kernel hacking
610# 630#
631# CONFIG_PRINTK_TIME is not set
611# CONFIG_DEBUG_KERNEL is not set 632# CONFIG_DEBUG_KERNEL is not set
633CONFIG_LOG_BUF_SHIFT=14
634CONFIG_DEBUG_BUGVERBOSE=y
612 635
613# 636#
614# Security options 637# Security options
@@ -622,6 +645,10 @@ CONFIG_NLS_CODEPAGE_437=y
622# CONFIG_CRYPTO is not set 645# CONFIG_CRYPTO is not set
623 646
624# 647#
648# Hardware crypto devices
649#
650
651#
625# Library routines 652# Library routines
626# 653#
627# CONFIG_CRC_CCITT is not set 654# CONFIG_CRC_CCITT is not set
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index fc4ad69357b8..c4f93bd2daf2 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -530,18 +530,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
530 pt_error_return(regs, EIO); 530 pt_error_return(regs, EIO);
531 goto out_tsk; 531 goto out_tsk;
532 } 532 }
533 if (addr != 1) {
534 if (addr & 3) {
535 pt_error_return(regs, EINVAL);
536 goto out_tsk;
537 }
538#ifdef DEBUG_PTRACE
539 printk ("Original: %08lx %08lx\n", child->thread.kregs->pc, child->thread.kregs->npc);
540 printk ("Continuing with %08lx %08lx\n", addr, addr+4);
541#endif
542 child->thread.kregs->pc = addr;
543 child->thread.kregs->npc = addr + 4;
544 }
545 533
546 if (request == PTRACE_SYSCALL) 534 if (request == PTRACE_SYSCALL)
547 set_tsk_thread_flag(child, TIF_SYSCALL_TRACE); 535 set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 1722dc51b0d8..5f080cf04b33 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -103,6 +103,55 @@ void ptrace_disable(struct task_struct *child)
103 /* nothing to do */ 103 /* nothing to do */
104} 104}
105 105
106/* To get the necessary page struct, access_process_vm() first calls
107 * get_user_pages(). This has done a flush_dcache_page() on the
108 * accessed page. Then our caller (copy_{to,from}_user_page()) did
109 * to memcpy to read/write the data from that page.
110 *
111 * Now, the only thing we have to do is:
112 * 1) flush the D-cache if it's possible than an illegal alias
113 * has been created
114 * 2) flush the I-cache if this is pre-cheetah and we did a write
115 */
116void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
117 unsigned long uaddr, void *kaddr,
118 unsigned long len, int write)
119{
120 BUG_ON(len > PAGE_SIZE);
121
122#ifdef DCACHE_ALIASING_POSSIBLE
123 /* If bit 13 of the kernel address we used to access the
124 * user page is the same as the virtual address that page
125 * is mapped to in the user's address space, we can skip the
126 * D-cache flush.
127 */
128 if ((uaddr ^ kaddr) & (1UL << 13)) {
129 unsigned long start = __pa(kaddr);
130 unsigned long end = start + len;
131
132 if (tlb_type == spitfire) {
133 for (; start < end; start += 32)
134 spitfire_put_dcache_tag(va & 0x3fe0, 0x0);
135 } else {
136 for (; start < end; start += 32)
137 __asm__ __volatile__(
138 "stxa %%g0, [%0] %1\n\t"
139 "membar #Sync"
140 : /* no outputs */
141 : "r" (va),
142 "i" (ASI_DCACHE_INVALIDATE));
143 }
144 }
145#endif
146 if (write && tlb_type == spitfire) {
147 unsigned long start = (unsigned long) kaddr;
148 unsigned long end = start + len;
149
150 for (; start < end; start += 32)
151 flushi(start);
152 }
153}
154
106asmlinkage void do_ptrace(struct pt_regs *regs) 155asmlinkage void do_ptrace(struct pt_regs *regs)
107{ 156{
108 int request = regs->u_regs[UREG_I0]; 157 int request = regs->u_regs[UREG_I0];
@@ -227,7 +276,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
227 pt_error_return(regs, -res); 276 pt_error_return(regs, -res);
228 else 277 else
229 pt_os_succ_return(regs, tmp64, (void __user *) data); 278 pt_os_succ_return(regs, tmp64, (void __user *) data);
230 goto flush_and_out; 279 goto out_tsk;
231 } 280 }
232 281
233 case PTRACE_POKETEXT: /* write the word at location addr. */ 282 case PTRACE_POKETEXT: /* write the word at location addr. */
@@ -253,7 +302,7 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
253 pt_error_return(regs, -res); 302 pt_error_return(regs, -res);
254 else 303 else
255 pt_succ_return(regs, res); 304 pt_succ_return(regs, res);
256 goto flush_and_out; 305 goto out_tsk;
257 } 306 }
258 307
259 case PTRACE_GETREGS: { 308 case PTRACE_GETREGS: {
@@ -485,12 +534,12 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
485 (char __user *)addr2, data); 534 (char __user *)addr2, data);
486 if (res == data) { 535 if (res == data) {
487 pt_succ_return(regs, 0); 536 pt_succ_return(regs, 0);
488 goto flush_and_out; 537 goto out_tsk;
489 } 538 }
490 if (res >= 0) 539 if (res >= 0)
491 res = -EIO; 540 res = -EIO;
492 pt_error_return(regs, -res); 541 pt_error_return(regs, -res);
493 goto flush_and_out; 542 goto out_tsk;
494 } 543 }
495 544
496 case PTRACE_WRITETEXT: 545 case PTRACE_WRITETEXT:
@@ -499,12 +548,12 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
499 addr, data); 548 addr, data);
500 if (res == data) { 549 if (res == data) {
501 pt_succ_return(regs, 0); 550 pt_succ_return(regs, 0);
502 goto flush_and_out; 551 goto out_tsk;
503 } 552 }
504 if (res >= 0) 553 if (res >= 0)
505 res = -EIO; 554 res = -EIO;
506 pt_error_return(regs, -res); 555 pt_error_return(regs, -res);
507 goto flush_and_out; 556 goto out_tsk;
508 } 557 }
509 case PTRACE_SYSCALL: /* continue and stop at (return from) syscall */ 558 case PTRACE_SYSCALL: /* continue and stop at (return from) syscall */
510 addr = 1; 559 addr = 1;
@@ -514,25 +563,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
514 pt_error_return(regs, EIO); 563 pt_error_return(regs, EIO);
515 goto out_tsk; 564 goto out_tsk;
516 } 565 }
517 if (addr != 1) {
518 unsigned long pc_mask = ~0UL;
519
520 if ((child->thread_info->flags & _TIF_32BIT) != 0)
521 pc_mask = 0xffffffff;
522
523 if (addr & 3) {
524 pt_error_return(regs, EINVAL);
525 goto out_tsk;
526 }
527#ifdef DEBUG_PTRACE
528 printk ("Original: %016lx %016lx\n",
529 child->thread_info->kregs->tpc,
530 child->thread_info->kregs->tnpc);
531 printk ("Continuing with %016lx %016lx\n", addr, addr+4);
532#endif
533 child->thread_info->kregs->tpc = (addr & pc_mask);
534 child->thread_info->kregs->tnpc = ((addr + 4) & pc_mask);
535 }
536 566
537 if (request == PTRACE_SYSCALL) { 567 if (request == PTRACE_SYSCALL) {
538 set_tsk_thread_flag(child, TIF_SYSCALL_TRACE); 568 set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
@@ -590,27 +620,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
590 goto out_tsk; 620 goto out_tsk;
591 } 621 }
592 } 622 }
593flush_and_out:
594 {
595 unsigned long va;
596
597 if (tlb_type == cheetah || tlb_type == cheetah_plus) {
598 for (va = 0; va < (1 << 16); va += (1 << 5))
599 spitfire_put_dcache_tag(va, 0x0);
600 /* No need to mess with I-cache on Cheetah. */
601 } else {
602 for (va = 0; va < L1DCACHE_SIZE; va += 32)
603 spitfire_put_dcache_tag(va, 0x0);
604 if (request == PTRACE_PEEKTEXT ||
605 request == PTRACE_POKETEXT ||
606 request == PTRACE_READTEXT ||
607 request == PTRACE_WRITETEXT) {
608 for (va = 0; va < (PAGE_SIZE << 1); va += 32)
609 spitfire_put_icache_tag(va, 0x0);
610 __asm__ __volatile__("flush %g6");
611 }
612 }
613 }
614out_tsk: 623out_tsk:
615 if (child) 624 if (child)
616 put_task_struct(child); 625 put_task_struct(child);
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 859255cf6762..9a375e975cff 100644
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -192,10 +192,13 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
192 err |= __put_user(from->si_uid, &to->si_uid); 192 err |= __put_user(from->si_uid, &to->si_uid);
193 break; 193 break;
194 case __SI_FAULT >> 16: 194 case __SI_FAULT >> 16:
195 case __SI_POLL >> 16:
196 err |= __put_user(from->si_trapno, &to->si_trapno); 195 err |= __put_user(from->si_trapno, &to->si_trapno);
197 err |= __put_user((unsigned long)from->si_addr, &to->si_addr); 196 err |= __put_user((unsigned long)from->si_addr, &to->si_addr);
198 break; 197 break;
198 case __SI_POLL >> 16:
199 err |= __put_user(from->si_band, &to->si_band);
200 err |= __put_user(from->si_fd, &to->si_fd);
201 break;
199 case __SI_RT >> 16: /* This is not generated by the kernel as of now. */ 202 case __SI_RT >> 16: /* This is not generated by the kernel as of now. */
200 case __SI_MESGQ >> 16: 203 case __SI_MESGQ >> 16:
201 err |= __put_user(from->si_pid, &to->si_pid); 204 err |= __put_user(from->si_pid, &to->si_pid);
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 567c91c77b20..1d3aa588df8a 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -352,11 +352,11 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
352 err |= put_user(old_encode_dev(stat->rdev), &statbuf->st_rdev); 352 err |= put_user(old_encode_dev(stat->rdev), &statbuf->st_rdev);
353 err |= put_user(stat->size, &statbuf->st_size); 353 err |= put_user(stat->size, &statbuf->st_size);
354 err |= put_user(stat->atime.tv_sec, &statbuf->st_atime); 354 err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);
355 err |= put_user(0, &statbuf->__unused1); 355 err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);
356 err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime); 356 err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
357 err |= put_user(0, &statbuf->__unused2); 357 err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);
358 err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime); 358 err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
359 err |= put_user(0, &statbuf->__unused3); 359 err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);
360 err |= put_user(stat->blksize, &statbuf->st_blksize); 360 err |= put_user(stat->blksize, &statbuf->st_blksize);
361 err |= put_user(stat->blocks, &statbuf->st_blocks); 361 err |= put_user(stat->blocks, &statbuf->st_blocks);
362 err |= put_user(0, &statbuf->__unused4[0]); 362 err |= put_user(0, &statbuf->__unused4[0]);
@@ -365,6 +365,68 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
365 return err; 365 return err;
366} 366}
367 367
368int cp_compat_stat64(struct kstat *stat, struct compat_stat64 __user *statbuf)
369{
370 int err;
371
372 err = put_user(huge_encode_dev(stat->dev), &statbuf->st_dev);
373 err |= put_user(stat->ino, &statbuf->st_ino);
374 err |= put_user(stat->mode, &statbuf->st_mode);
375 err |= put_user(stat->nlink, &statbuf->st_nlink);
376 err |= put_user(stat->uid, &statbuf->st_uid);
377 err |= put_user(stat->gid, &statbuf->st_gid);
378 err |= put_user(huge_encode_dev(stat->rdev), &statbuf->st_rdev);
379 err |= put_user(0, (unsigned long __user *) &statbuf->__pad3[0]);
380 err |= put_user(stat->size, &statbuf->st_size);
381 err |= put_user(stat->blksize, &statbuf->st_blksize);
382 err |= put_user(0, (unsigned int __user *) &statbuf->__pad4[0]);
383 err |= put_user(0, (unsigned int __user *) &statbuf->__pad4[4]);
384 err |= put_user(stat->blocks, &statbuf->st_blocks);
385 err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);
386 err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);
387 err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
388 err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);
389 err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
390 err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);
391 err |= put_user(0, &statbuf->__unused4);
392 err |= put_user(0, &statbuf->__unused5);
393
394 return err;
395}
396
397asmlinkage long compat_sys_stat64(char __user * filename,
398 struct compat_stat64 __user *statbuf)
399{
400 struct kstat stat;
401 int error = vfs_stat(filename, &stat);
402
403 if (!error)
404 error = cp_compat_stat64(&stat, statbuf);
405 return error;
406}
407
408asmlinkage long compat_sys_lstat64(char __user * filename,
409 struct compat_stat64 __user *statbuf)
410{
411 struct kstat stat;
412 int error = vfs_lstat(filename, &stat);
413
414 if (!error)
415 error = cp_compat_stat64(&stat, statbuf);
416 return error;
417}
418
419asmlinkage long compat_sys_fstat64(unsigned int fd,
420 struct compat_stat64 __user * statbuf)
421{
422 struct kstat stat;
423 int error = vfs_fstat(fd, &stat);
424
425 if (!error)
426 error = cp_compat_stat64(&stat, statbuf);
427 return error;
428}
429
368asmlinkage long compat_sys_sysfs(int option, u32 arg1, u32 arg2) 430asmlinkage long compat_sys_sysfs(int option, u32 arg1, u32 arg2)
369{ 431{
370 return sys_sysfs(option, arg1, arg2); 432 return sys_sysfs(option, arg1, arg2);
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index 48170f77fff1..a5e36a4c8924 100644
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@ -32,7 +32,7 @@ sys_call_table32:
32 .word sys32_umount, sys32_setgid16, sys32_getgid16, sys32_signal, sys32_geteuid16 32 .word sys32_umount, sys32_setgid16, sys32_getgid16, sys32_signal, sys32_geteuid16
33/*50*/ .word sys32_getegid16, sys_acct, sys_nis_syscall, sys_getgid, compat_sys_ioctl 33/*50*/ .word sys32_getegid16, sys_acct, sys_nis_syscall, sys_getgid, compat_sys_ioctl
34 .word sys32_reboot, sys32_mmap2, sys_symlink, sys32_readlink, sys32_execve 34 .word sys32_reboot, sys32_mmap2, sys_symlink, sys32_readlink, sys32_execve
35/*60*/ .word sys32_umask, sys_chroot, compat_sys_newfstat, sys_fstat64, sys_getpagesize 35/*60*/ .word sys32_umask, sys_chroot, compat_sys_newfstat, compat_sys_fstat64, sys_getpagesize
36 .word sys32_msync, sys_vfork, sys32_pread64, sys32_pwrite64, sys_geteuid 36 .word sys32_msync, sys_vfork, sys32_pread64, sys32_pwrite64, sys_geteuid
37/*70*/ .word sys_getegid, sys_mmap, sys_setreuid, sys_munmap, sys_mprotect 37/*70*/ .word sys_getegid, sys_mmap, sys_setreuid, sys_munmap, sys_mprotect
38 .word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys32_getgroups16 38 .word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys32_getgroups16
@@ -46,8 +46,8 @@ sys_call_table32:
46 .word sys32_getgroups, sys32_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd 46 .word sys32_getgroups, sys32_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd
47/*120*/ .word compat_sys_readv, compat_sys_writev, sys32_settimeofday, sys32_fchown16, sys_fchmod 47/*120*/ .word compat_sys_readv, compat_sys_writev, sys32_settimeofday, sys32_fchown16, sys_fchmod
48 .word sys_nis_syscall, sys32_setreuid16, sys32_setregid16, sys_rename, sys_truncate 48 .word sys_nis_syscall, sys32_setreuid16, sys32_setregid16, sys_rename, sys_truncate
49/*130*/ .word sys_ftruncate, sys_flock, sys_lstat64, sys_nis_syscall, sys_nis_syscall 49/*130*/ .word sys_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall
50 .word sys_nis_syscall, sys32_mkdir, sys_rmdir, sys32_utimes, sys_stat64 50 .word sys_nis_syscall, sys32_mkdir, sys_rmdir, sys32_utimes, compat_sys_stat64
51/*140*/ .word sys32_sendfile64, sys_nis_syscall, sys32_futex, sys_gettid, compat_sys_getrlimit 51/*140*/ .word sys32_sendfile64, sys_nis_syscall, sys32_futex, sys_gettid, compat_sys_getrlimit
52 .word compat_sys_setrlimit, sys_pivot_root, sys32_prctl, sys_pciconfig_read, sys_pciconfig_write 52 .word compat_sys_setrlimit, sys_pivot_root, sys32_prctl, sys_pciconfig_read, sys_pciconfig_write
53/*150*/ .word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_getdents64 53/*150*/ .word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_getdents64
@@ -75,7 +75,7 @@ sys_call_table32:
75/*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun 75/*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun
76 .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy 76 .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
77/*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink 77/*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink
78 .word sys_mq_timedsend, sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid 78 .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
79/*280*/ .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl 79/*280*/ .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl
80 80
81#endif /* CONFIG_COMPAT */ 81#endif /* CONFIG_COMPAT */
@@ -98,7 +98,7 @@ sys_call_table:
98 .word sys_umount, sys_setgid, sys_getgid, sys_signal, sys_geteuid 98 .word sys_umount, sys_setgid, sys_getgid, sys_signal, sys_geteuid
99/*50*/ .word sys_getegid, sys_acct, sys_memory_ordering, sys_nis_syscall, sys_ioctl 99/*50*/ .word sys_getegid, sys_acct, sys_memory_ordering, sys_nis_syscall, sys_ioctl
100 .word sys_reboot, sys_nis_syscall, sys_symlink, sys_readlink, sys_execve 100 .word sys_reboot, sys_nis_syscall, sys_symlink, sys_readlink, sys_execve
101/*60*/ .word sys_umask, sys_chroot, sys_newfstat, sys_nis_syscall, sys_getpagesize 101/*60*/ .word sys_umask, sys_chroot, sys_newfstat, sys_stat64, sys_getpagesize
102 .word sys_msync, sys_vfork, sys_pread64, sys_pwrite64, sys_nis_syscall 102 .word sys_msync, sys_vfork, sys_pread64, sys_pwrite64, sys_nis_syscall
103/*70*/ .word sys_nis_syscall, sys_mmap, sys_nis_syscall, sys64_munmap, sys_mprotect 103/*70*/ .word sys_nis_syscall, sys_mmap, sys_nis_syscall, sys64_munmap, sys_mprotect
104 .word sys_madvise, sys_vhangup, sys_nis_syscall, sys_mincore, sys_getgroups 104 .word sys_madvise, sys_vhangup, sys_nis_syscall, sys_mincore, sys_getgroups
@@ -112,8 +112,8 @@ sys_call_table:
112 .word sys_nis_syscall, sys_gettimeofday, sys_getrusage, sys_getsockopt, sys_getcwd 112 .word sys_nis_syscall, sys_gettimeofday, sys_getrusage, sys_getsockopt, sys_getcwd
113/*120*/ .word sys_readv, sys_writev, sys_settimeofday, sys_fchown, sys_fchmod 113/*120*/ .word sys_readv, sys_writev, sys_settimeofday, sys_fchown, sys_fchmod
114 .word sys_recvfrom, sys_setreuid, sys_setregid, sys_rename, sys_truncate 114 .word sys_recvfrom, sys_setreuid, sys_setregid, sys_rename, sys_truncate
115/*130*/ .word sys_ftruncate, sys_flock, sys_nis_syscall, sys_sendto, sys_shutdown 115/*130*/ .word sys_ftruncate, sys_flock, sys_lstat64, sys_sendto, sys_shutdown
116 .word sys_socketpair, sys_mkdir, sys_rmdir, sys_utimes, sys_nis_syscall 116 .word sys_socketpair, sys_mkdir, sys_rmdir, sys_utimes, sys_stat64
117/*140*/ .word sys_sendfile64, sys_getpeername, sys_futex, sys_gettid, sys_getrlimit 117/*140*/ .word sys_sendfile64, sys_getpeername, sys_futex, sys_gettid, sys_getrlimit
118 .word sys_setrlimit, sys_pivot_root, sys_prctl, sys_pciconfig_read, sys_pciconfig_write 118 .word sys_setrlimit, sys_pivot_root, sys_prctl, sys_pciconfig_read, sys_pciconfig_write
119/*150*/ .word sys_getsockname, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_getdents64 119/*150*/ .word sys_getsockname, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_getdents64
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 89022ccaa75b..db6fa77b4dab 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -201,13 +201,24 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t p
201 201
202void flush_dcache_page(struct page *page) 202void flush_dcache_page(struct page *page)
203{ 203{
204 struct address_space *mapping = page_mapping(page); 204 struct address_space *mapping;
205 int dirty = test_bit(PG_dcache_dirty, &page->flags); 205 int this_cpu;
206 int dirty_cpu = dcache_dirty_cpu(page);
207 int this_cpu = get_cpu();
208 206
207 /* Do not bother with the expensive D-cache flush if it
208 * is merely the zero page. The 'bigcore' testcase in GDB
209 * causes this case to run millions of times.
210 */
211 if (page == ZERO_PAGE(0))
212 return;
213
214 this_cpu = get_cpu();
215
216 mapping = page_mapping(page);
209 if (mapping && !mapping_mapped(mapping)) { 217 if (mapping && !mapping_mapped(mapping)) {
218 int dirty = test_bit(PG_dcache_dirty, &page->flags);
210 if (dirty) { 219 if (dirty) {
220 int dirty_cpu = dcache_dirty_cpu(page);
221
211 if (dirty_cpu == this_cpu) 222 if (dirty_cpu == this_cpu)
212 goto out; 223 goto out;
213 smp_flush_dcache_page_impl(page, dirty_cpu); 224 smp_flush_dcache_page_impl(page, dirty_cpu);
diff --git a/fs/char_dev.c b/fs/char_dev.c
index 7357a9127df1..a745b1d9e545 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -26,8 +26,7 @@
26 26
27static struct kobj_map *cdev_map; 27static struct kobj_map *cdev_map;
28 28
29/* degrade to linked list for small systems */ 29#define MAX_PROBE_HASH 255 /* random */
30#define MAX_PROBE_HASH (CONFIG_BASE_SMALL ? 1 : 255)
31 30
32static DECLARE_MUTEX(chrdevs_lock); 31static DECLARE_MUTEX(chrdevs_lock);
33 32
diff --git a/fs/compat.c b/fs/compat.c
index a912bdf691cf..67c0b94d1148 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -31,6 +31,7 @@
31#include <linux/smb.h> 31#include <linux/smb.h>
32#include <linux/smb_mount.h> 32#include <linux/smb_mount.h>
33#include <linux/ncp_mount.h> 33#include <linux/ncp_mount.h>
34#include <linux/nfs4_mount.h>
34#include <linux/smp_lock.h> 35#include <linux/smp_lock.h>
35#include <linux/syscalls.h> 36#include <linux/syscalls.h>
36#include <linux/ctype.h> 37#include <linux/ctype.h>
@@ -806,10 +807,79 @@ static void *do_smb_super_data_conv(void *raw_data)
806 return raw_data; 807 return raw_data;
807} 808}
808 809
810struct compat_nfs_string {
811 compat_uint_t len;
812 compat_uptr_t __user data;
813};
814
815static inline void compat_nfs_string(struct nfs_string *dst,
816 struct compat_nfs_string *src)
817{
818 dst->data = compat_ptr(src->data);
819 dst->len = src->len;
820}
821
822struct compat_nfs4_mount_data_v1 {
823 compat_int_t version;
824 compat_int_t flags;
825 compat_int_t rsize;
826 compat_int_t wsize;
827 compat_int_t timeo;
828 compat_int_t retrans;
829 compat_int_t acregmin;
830 compat_int_t acregmax;
831 compat_int_t acdirmin;
832 compat_int_t acdirmax;
833 struct compat_nfs_string client_addr;
834 struct compat_nfs_string mnt_path;
835 struct compat_nfs_string hostname;
836 compat_uint_t host_addrlen;
837 compat_uptr_t __user host_addr;
838 compat_int_t proto;
839 compat_int_t auth_flavourlen;
840 compat_uptr_t __user auth_flavours;
841};
842
843static int do_nfs4_super_data_conv(void *raw_data)
844{
845 int version = *(compat_uint_t *) raw_data;
846
847 if (version == 1) {
848 struct compat_nfs4_mount_data_v1 *raw = raw_data;
849 struct nfs4_mount_data *real = raw_data;
850
851 /* copy the fields backwards */
852 real->auth_flavours = compat_ptr(raw->auth_flavours);
853 real->auth_flavourlen = raw->auth_flavourlen;
854 real->proto = raw->proto;
855 real->host_addr = compat_ptr(raw->host_addr);
856 real->host_addrlen = raw->host_addrlen;
857 compat_nfs_string(&real->hostname, &raw->hostname);
858 compat_nfs_string(&real->mnt_path, &raw->mnt_path);
859 compat_nfs_string(&real->client_addr, &raw->client_addr);
860 real->acdirmax = raw->acdirmax;
861 real->acdirmin = raw->acdirmin;
862 real->acregmax = raw->acregmax;
863 real->acregmin = raw->acregmin;
864 real->retrans = raw->retrans;
865 real->timeo = raw->timeo;
866 real->wsize = raw->wsize;
867 real->rsize = raw->rsize;
868 real->flags = raw->flags;
869 real->version = raw->version;
870 }
871 else {
872 return -EINVAL;
873 }
874
875 return 0;
876}
877
809extern int copy_mount_options (const void __user *, unsigned long *); 878extern int copy_mount_options (const void __user *, unsigned long *);
810 879
811#define SMBFS_NAME "smbfs" 880#define SMBFS_NAME "smbfs"
812#define NCPFS_NAME "ncpfs" 881#define NCPFS_NAME "ncpfs"
882#define NFS4_NAME "nfs4"
813 883
814asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name, 884asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name,
815 char __user * type, unsigned long flags, 885 char __user * type, unsigned long flags,
@@ -845,6 +915,9 @@ asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name,
845 do_smb_super_data_conv((void *)data_page); 915 do_smb_super_data_conv((void *)data_page);
846 } else if (!strcmp((char *)type_page, NCPFS_NAME)) { 916 } else if (!strcmp((char *)type_page, NCPFS_NAME)) {
847 do_ncp_super_data_conv((void *)data_page); 917 do_ncp_super_data_conv((void *)data_page);
918 } else if (!strcmp((char *)type_page, NFS4_NAME)) {
919 if (do_nfs4_super_data_conv((void *) data_page))
920 goto out4;
848 } 921 }
849 } 922 }
850 923
@@ -853,6 +926,7 @@ asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name,
853 flags, (void*)data_page); 926 flags, (void*)data_page);
854 unlock_kernel(); 927 unlock_kernel();
855 928
929 out4:
856 free_page(data_page); 930 free_page(data_page);
857 out3: 931 out3:
858 free_page(dev_page); 932 free_page(dev_page);
diff --git a/include/asm-arm/arch-ebsa285/debug-macro.S b/include/asm-arm/arch-ebsa285/debug-macro.S
index 237853db6e2f..97d15fc629af 100644
--- a/include/asm-arm/arch-ebsa285/debug-macro.S
+++ b/include/asm-arm/arch-ebsa285/debug-macro.S
@@ -45,9 +45,12 @@
45 .equ dc21285_low, ARMCSR_BASE & 0x00ffffff 45 .equ dc21285_low, ARMCSR_BASE & 0x00ffffff
46 46
47 .macro addruart,rx 47 .macro addruart,rx
48 mov \rx, #dc21285_high 48 mrc p15, 0, \rx, c1, c0
49 tst \rx, #1 @ MMU enabled?
50 moveq \rx, #0x42000000
51 movne \rx, #dc21285_high
49 .if dc21285_low 52 .if dc21285_low
50 orr \rx, \rx, #dc21285_low 53 orrne \rx, \rx, #dc21285_low
51 .endif 54 .endif
52 .endm 55 .endm
53 56
diff --git a/include/asm-arm/arch-rpc/debug-macro.S b/include/asm-arm/arch-rpc/debug-macro.S
index 0711828164cd..456d3d754c3d 100644
--- a/include/asm-arm/arch-rpc/debug-macro.S
+++ b/include/asm-arm/arch-rpc/debug-macro.S
@@ -12,7 +12,10 @@
12*/ 12*/
13 13
14 .macro addruart,rx 14 .macro addruart,rx
15 mov \rx, #0xe0000000 15 mrc p15, 0, \rx, c1, c0
16 tst \rx, #1 @ MMU enabled?
17 moveq \rx, #0x03000000
18 movne \rx, #0xe0000000
16 orr \rx, \rx, #0x00010000 19 orr \rx, \rx, #0x00010000
17 orr \rx, \rx, #0x00000fe0 20 orr \rx, \rx, #0x00000fe0
18 .endm 21 .endm
diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
index 604e3a186cf9..4377e22b7e1a 100644
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
@@ -142,11 +142,8 @@ extern unsigned long profile_pc(struct pt_regs *regs);
142#endif 142#endif
143 143
144#ifdef __KERNEL__ 144#ifdef __KERNEL__
145extern void show_regs(struct pt_regs *); 145#define predicate(x) ((x) & 0xf0000000)
146
147#define predicate(x) (x & 0xf0000000)
148#define PREDICATE_ALWAYS 0xe0000000 146#define PREDICATE_ALWAYS 0xe0000000
149
150#endif 147#endif
151 148
152#endif /* __ASSEMBLY__ */ 149#endif /* __ASSEMBLY__ */
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index b5731290b4e5..b13a8da4847b 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -99,6 +99,9 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
99#define tas(ptr) (xchg((ptr),1)) 99#define tas(ptr) (xchg((ptr),1))
100 100
101extern asmlinkage void __backtrace(void); 101extern asmlinkage void __backtrace(void);
102extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
103extern void show_pte(struct mm_struct *mm, unsigned long addr);
104extern void __show_regs(struct pt_regs *);
102 105
103extern int cpu_architecture(void); 106extern int cpu_architecture(void);
104 107
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index d1f63caaa326..846708403900 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -79,7 +79,7 @@
79#define __NR_umask 60 /* Common */ 79#define __NR_umask 60 /* Common */
80#define __NR_chroot 61 /* Common */ 80#define __NR_chroot 61 /* Common */
81#define __NR_fstat 62 /* Common */ 81#define __NR_fstat 62 /* Common */
82#define __NR_fstat64 63 /* Linux sparc32 Specific */ 82#define __NR_fstat64 63 /* Linux Specific */
83#define __NR_getpagesize 64 /* Common */ 83#define __NR_getpagesize 64 /* Common */
84#define __NR_msync 65 /* Common in newer 1.3.x revs... */ 84#define __NR_msync 65 /* Common in newer 1.3.x revs... */
85#define __NR_vfork 66 /* Common */ 85#define __NR_vfork 66 /* Common */
@@ -148,14 +148,14 @@
148#define __NR_truncate 129 /* Common */ 148#define __NR_truncate 129 /* Common */
149#define __NR_ftruncate 130 /* Common */ 149#define __NR_ftruncate 130 /* Common */
150#define __NR_flock 131 /* Common */ 150#define __NR_flock 131 /* Common */
151#define __NR_lstat64 132 /* Linux sparc32 Specific */ 151#define __NR_lstat64 132 /* Linux Specific */
152#define __NR_sendto 133 /* Common */ 152#define __NR_sendto 133 /* Common */
153#define __NR_shutdown 134 /* Common */ 153#define __NR_shutdown 134 /* Common */
154#define __NR_socketpair 135 /* Common */ 154#define __NR_socketpair 135 /* Common */
155#define __NR_mkdir 136 /* Common */ 155#define __NR_mkdir 136 /* Common */
156#define __NR_rmdir 137 /* Common */ 156#define __NR_rmdir 137 /* Common */
157#define __NR_utimes 138 /* SunOS Specific */ 157#define __NR_utimes 138 /* SunOS Specific */
158#define __NR_stat64 139 /* Linux sparc32 Specific */ 158#define __NR_stat64 139 /* Linux Specific */
159#define __NR_sendfile64 140 /* adjtime under SunOS */ 159#define __NR_sendfile64 140 /* adjtime under SunOS */
160#define __NR_getpeername 141 /* Common */ 160#define __NR_getpeername 141 /* Common */
161#define __NR_futex 142 /* gethostid under SunOS */ 161#define __NR_futex 142 /* gethostid under SunOS */
diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h
index 86f02937ff1b..51b26e81d828 100644
--- a/include/asm-sparc64/cacheflush.h
+++ b/include/asm-sparc64/cacheflush.h
@@ -49,16 +49,22 @@ extern void flush_dcache_page(struct page *page);
49#define flush_icache_page(vma, pg) do { } while(0) 49#define flush_icache_page(vma, pg) do { } while(0)
50#define flush_icache_user_range(vma,pg,adr,len) do { } while (0) 50#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
51 51
52#define copy_to_user_page(vma, page, vaddr, dst, src, len) \ 52extern void flush_ptrace_access(struct vm_area_struct *, struct page *,
53 do { \ 53 unsigned long uaddr, void *kaddr,
54 flush_cache_page(vma, vaddr, page_to_pfn(page));\ 54 unsigned long len, int write);
55 memcpy(dst, src, len); \ 55
56#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
57 do { \
58 flush_cache_page(vma, vaddr, page_to_pfn(page)); \
59 memcpy(dst, src, len); \
60 flush_ptrace_access(vma, page, vaddr, src, len, 0); \
56 } while (0) 61 } while (0)
57 62
58#define copy_from_user_page(vma, page, vaddr, dst, src, len) \ 63#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
59 do { \ 64 do { \
60 flush_cache_page(vma, vaddr, page_to_pfn(page));\ 65 flush_cache_page(vma, vaddr, page_to_pfn(page)); \
61 memcpy(dst, src, len); \ 66 memcpy(dst, src, len); \
67 flush_ptrace_access(vma, page, vaddr, dst, len, 1); \
62 } while (0) 68 } while (0)
63 69
64#define flush_dcache_mmap_lock(mapping) do { } while (0) 70#define flush_dcache_mmap_lock(mapping) do { } while (0)
diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
index 2950279dd776..22f58055b8ab 100644
--- a/include/asm-sparc64/compat.h
+++ b/include/asm-sparc64/compat.h
@@ -51,16 +51,50 @@ struct compat_stat {
51 compat_dev_t st_rdev; 51 compat_dev_t st_rdev;
52 compat_off_t st_size; 52 compat_off_t st_size;
53 compat_time_t st_atime; 53 compat_time_t st_atime;
54 u32 __unused1; 54 compat_ulong_t st_atime_nsec;
55 compat_time_t st_mtime; 55 compat_time_t st_mtime;
56 u32 __unused2; 56 compat_ulong_t st_mtime_nsec;
57 compat_time_t st_ctime; 57 compat_time_t st_ctime;
58 u32 __unused3; 58 compat_ulong_t st_ctime_nsec;
59 compat_off_t st_blksize; 59 compat_off_t st_blksize;
60 compat_off_t st_blocks; 60 compat_off_t st_blocks;
61 u32 __unused4[2]; 61 u32 __unused4[2];
62}; 62};
63 63
64struct compat_stat64 {
65 unsigned long long st_dev;
66
67 unsigned long long st_ino;
68
69 unsigned int st_mode;
70 unsigned int st_nlink;
71
72 unsigned int st_uid;
73 unsigned int st_gid;
74
75 unsigned long long st_rdev;
76
77 unsigned char __pad3[8];
78
79 long long st_size;
80 unsigned int st_blksize;
81
82 unsigned char __pad4[8];
83 unsigned int st_blocks;
84
85 unsigned int st_atime;
86 unsigned int st_atime_nsec;
87
88 unsigned int st_mtime;
89 unsigned int st_mtime_nsec;
90
91 unsigned int st_ctime;
92 unsigned int st_ctime_nsec;
93
94 unsigned int __unused4;
95 unsigned int __unused5;
96};
97
64struct compat_flock { 98struct compat_flock {
65 short l_type; 99 short l_type;
66 short l_whence; 100 short l_whence;
diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h
index 48e06618a5a4..128c27e57f0b 100644
--- a/include/asm-sparc64/stat.h
+++ b/include/asm-sparc64/stat.h
@@ -21,43 +21,28 @@ struct stat {
21 unsigned long __unused4[2]; 21 unsigned long __unused4[2];
22}; 22};
23 23
24#ifdef __KERNEL__
25/* This is sparc32 stat64 structure. */
26
27struct stat64 { 24struct stat64 {
28 unsigned long long st_dev; 25 unsigned long st_dev;
29 26 unsigned long st_ino;
30 unsigned long long st_ino; 27 unsigned long st_nlink;
31 28
32 unsigned int st_mode; 29 unsigned int st_mode;
33 unsigned int st_nlink;
34
35 unsigned int st_uid; 30 unsigned int st_uid;
36 unsigned int st_gid; 31 unsigned int st_gid;
37 32 unsigned int __pad0;
38 unsigned long long st_rdev; 33
39 34 unsigned long st_rdev;
40 unsigned char __pad3[8]; 35 long st_size;
41 36 long st_blksize;
42 long long st_size; 37 long st_blocks;
43 unsigned int st_blksize; 38
44 39 unsigned long st_atime;
45 unsigned char __pad4[8]; 40 unsigned long st_atime_nsec;
46 unsigned int st_blocks; 41 unsigned long st_mtime;
47 42 unsigned long st_mtime_nsec;
48 unsigned int st_atime; 43 unsigned long st_ctime;
49 unsigned int st_atime_nsec; 44 unsigned long st_ctime_nsec;
50 45 long __unused[3];
51 unsigned int st_mtime;
52 unsigned int st_mtime_nsec;
53
54 unsigned int st_ctime;
55 unsigned int st_ctime_nsec;
56
57 unsigned int __unused4;
58 unsigned int __unused5;
59}; 46};
60 47
61#endif 48#endif
62
63#endif
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index 3c00065eea80..5b8dcf5786a5 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -79,7 +79,7 @@
79#define __NR_umask 60 /* Common */ 79#define __NR_umask 60 /* Common */
80#define __NR_chroot 61 /* Common */ 80#define __NR_chroot 61 /* Common */
81#define __NR_fstat 62 /* Common */ 81#define __NR_fstat 62 /* Common */
82/* #define __NR_fstat64 63 Linux sparc32 Specific */ 82#define __NR_fstat64 63 /* Linux Specific */
83#define __NR_getpagesize 64 /* Common */ 83#define __NR_getpagesize 64 /* Common */
84#define __NR_msync 65 /* Common in newer 1.3.x revs... */ 84#define __NR_msync 65 /* Common in newer 1.3.x revs... */
85#define __NR_vfork 66 /* Common */ 85#define __NR_vfork 66 /* Common */
@@ -148,14 +148,14 @@
148#define __NR_truncate 129 /* Common */ 148#define __NR_truncate 129 /* Common */
149#define __NR_ftruncate 130 /* Common */ 149#define __NR_ftruncate 130 /* Common */
150#define __NR_flock 131 /* Common */ 150#define __NR_flock 131 /* Common */
151/* #define __NR_lstat64 132 Linux sparc32 Specific */ 151#define __NR_lstat64 132 /* Linux Specific */
152#define __NR_sendto 133 /* Common */ 152#define __NR_sendto 133 /* Common */
153#define __NR_shutdown 134 /* Common */ 153#define __NR_shutdown 134 /* Common */
154#define __NR_socketpair 135 /* Common */ 154#define __NR_socketpair 135 /* Common */
155#define __NR_mkdir 136 /* Common */ 155#define __NR_mkdir 136 /* Common */
156#define __NR_rmdir 137 /* Common */ 156#define __NR_rmdir 137 /* Common */
157#define __NR_utimes 138 /* SunOS Specific */ 157#define __NR_utimes 138 /* SunOS Specific */
158/* #define __NR_stat64 139 Linux sparc32 Specific */ 158#define __NR_stat64 139 /* Linux Specific */
159#define __NR_sendfile64 140 /* adjtime under SunOS */ 159#define __NR_sendfile64 140 /* adjtime under SunOS */
160#define __NR_getpeername 141 /* Common */ 160#define __NR_getpeername 141 /* Common */
161#define __NR_futex 142 /* gethostid under SunOS */ 161#define __NR_futex 142 /* gethostid under SunOS */
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 8c454852d6a5..6f1931381bc9 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -610,6 +610,33 @@ static inline void audit_free_context(struct audit_context *context)
610 printk(KERN_ERR "audit: freed %d contexts\n", count); 610 printk(KERN_ERR "audit: freed %d contexts\n", count);
611} 611}
612 612
613static void audit_log_task_info(struct audit_buffer *ab)
614{
615 char name[sizeof(current->comm)];
616 struct mm_struct *mm = current->mm;
617 struct vm_area_struct *vma;
618
619 get_task_comm(name, current);
620 audit_log_format(ab, " comm=%s", name);
621
622 if (!mm)
623 return;
624
625 down_read(&mm->mmap_sem);
626 vma = mm->mmap;
627 while (vma) {
628 if ((vma->vm_flags & VM_EXECUTABLE) &&
629 vma->vm_file) {
630 audit_log_d_path(ab, "exe=",
631 vma->vm_file->f_dentry,
632 vma->vm_file->f_vfsmnt);
633 break;
634 }
635 vma = vma->vm_next;
636 }
637 up_read(&mm->mmap_sem);
638}
639
613static void audit_log_exit(struct audit_context *context) 640static void audit_log_exit(struct audit_context *context)
614{ 641{
615 int i; 642 int i;
@@ -639,6 +666,7 @@ static void audit_log_exit(struct audit_context *context)
639 context->gid, 666 context->gid,
640 context->euid, context->suid, context->fsuid, 667 context->euid, context->suid, context->fsuid,
641 context->egid, context->sgid, context->fsgid); 668 context->egid, context->sgid, context->fsgid);
669 audit_log_task_info(ab);
642 audit_log_end(ab); 670 audit_log_end(ab);
643 while (context->aux) { 671 while (context->aux) {
644 struct audit_aux_data *aux; 672 struct audit_aux_data *aux;
diff --git a/kernel/sched.c b/kernel/sched.c
index f69c4a5361e3..9bb7489ee645 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2648,9 +2648,9 @@ need_resched_nonpreemptible:
2648 2648
2649 schedstat_inc(rq, sched_cnt); 2649 schedstat_inc(rq, sched_cnt);
2650 now = sched_clock(); 2650 now = sched_clock();
2651 if (likely((long long)now - prev->timestamp < NS_MAX_SLEEP_AVG)) { 2651 if (likely((long long)(now - prev->timestamp) < NS_MAX_SLEEP_AVG)) {
2652 run_time = now - prev->timestamp; 2652 run_time = now - prev->timestamp;
2653 if (unlikely((long long)now - prev->timestamp < 0)) 2653 if (unlikely((long long)(now - prev->timestamp) < 0))
2654 run_time = 0; 2654 run_time = 0;
2655 } else 2655 } else
2656 run_time = NS_MAX_SLEEP_AVG; 2656 run_time = NS_MAX_SLEEP_AVG;
@@ -2728,7 +2728,7 @@ go_idle:
2728 2728
2729 if (!rt_task(next) && next->activated > 0) { 2729 if (!rt_task(next) && next->activated > 0) {
2730 unsigned long long delta = now - next->timestamp; 2730 unsigned long long delta = now - next->timestamp;
2731 if (unlikely((long long)now - next->timestamp < 0)) 2731 if (unlikely((long long)(now - next->timestamp) < 0))
2732 delta = 0; 2732 delta = 0;
2733 2733
2734 if (next->activated == 1) 2734 if (next->activated == 1)
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index fe6285e5c68f..85a6f66a873f 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -532,7 +532,6 @@ void avc_audit(u32 ssid, u32 tsid,
532 u16 tclass, u32 requested, 532 u16 tclass, u32 requested,
533 struct av_decision *avd, int result, struct avc_audit_data *a) 533 struct av_decision *avd, int result, struct avc_audit_data *a)
534{ 534{
535 struct task_struct *tsk = current;
536 struct inode *inode = NULL; 535 struct inode *inode = NULL;
537 u32 denied, audited; 536 u32 denied, audited;
538 struct audit_buffer *ab; 537 struct audit_buffer *ab;
@@ -556,39 +555,6 @@ void avc_audit(u32 ssid, u32 tsid,
556 audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); 555 audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted");
557 avc_dump_av(ab, tclass,audited); 556 avc_dump_av(ab, tclass,audited);
558 audit_log_format(ab, " for "); 557 audit_log_format(ab, " for ");
559 if (a && a->tsk)
560 tsk = a->tsk;
561 if (tsk && tsk->pid) {
562 struct mm_struct *mm;
563 struct vm_area_struct *vma;
564 audit_log_format(ab, " pid=%d", tsk->pid);
565 if (tsk == current)
566 mm = current->mm;
567 else
568 mm = get_task_mm(tsk);
569 if (mm) {
570 if (down_read_trylock(&mm->mmap_sem)) {
571 vma = mm->mmap;
572 while (vma) {
573 if ((vma->vm_flags & VM_EXECUTABLE) &&
574 vma->vm_file) {
575 audit_log_d_path(ab, "exe=",
576 vma->vm_file->f_dentry,
577 vma->vm_file->f_vfsmnt);
578 break;
579 }
580 vma = vma->vm_next;
581 }
582 up_read(&mm->mmap_sem);
583 } else {
584 audit_log_format(ab, " comm=%s", tsk->comm);
585 }
586 if (tsk != current)
587 mmput(mm);
588 } else {
589 audit_log_format(ab, " comm=%s", tsk->comm);
590 }
591 }
592 if (a) { 558 if (a) {
593 switch (a->type) { 559 switch (a->type) {
594 case AVC_AUDIT_DATA_IPC: 560 case AVC_AUDIT_DATA_IPC:
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-19 10:45:45 -0500