aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/kernel/calls.S6
-rw-r--r--arch/arm/mach-s3c2410/s3c2410.c4
-rw-r--r--arch/arm/mm/Kconfig2
-rw-r--r--arch/arm/mm/proc-v6.S2
-rw-r--r--arch/arm/nwfpe/softfloat.c34
-rw-r--r--arch/ia64/Kconfig11
-rw-r--r--arch/ia64/configs/sn2_defconfig262
-rw-r--r--arch/ia64/configs/tiger_defconfig149
-rw-r--r--arch/ia64/configs/zx1_defconfig226
-rw-r--r--arch/ia64/kernel/perfmon.c1
-rw-r--r--arch/ia64/kernel/salinfo.c3
-rw-r--r--arch/ia64/sn/kernel/io_init.c1
-rw-r--r--drivers/serial/sn_console.c1
-rw-r--r--fs/nfsd/nfssvc.c1
-rw-r--r--include/asm-arm/unistd.h5
-rw-r--r--include/asm-ia64/iosapic.h4
-rw-r--r--kernel/signal.c2
-rw-r--r--lib/zlib_inflate/inftrees.c2
18 files changed, 383 insertions, 333 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index e5d370c235d7..2b6b4c786e65 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -327,6 +327,12 @@ __syscall_start:
327/* 310 */ .long sys_request_key 327/* 310 */ .long sys_request_key
328 .long sys_keyctl 328 .long sys_keyctl
329 .long sys_semtimedop 329 .long sys_semtimedop
330/* vserver */ .long sys_ni_syscall
331 .long sys_ioprio_set
332/* 315 */ .long sys_ioprio_get
333 .long sys_inotify_init
334 .long sys_inotify_add_watch
335 .long sys_inotify_rm_watch
330__syscall_end: 336__syscall_end:
331 337
332 .rept NR_syscalls - (__syscall_end - __syscall_start) / 4 338 .rept NR_syscalls - (__syscall_end - __syscall_start) / 4
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index ff2f25409e44..0b88993dfd27 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -18,6 +18,7 @@
18 * 28-Sep-2004 BJD Updates for new serial port bits 18 * 28-Sep-2004 BJD Updates for new serial port bits
19 * 04-Nov-2004 BJD Updated UART configuration process 19 * 04-Nov-2004 BJD Updated UART configuration process
20 * 10-Jan-2005 BJD Removed s3c2410_clock_tick_rate 20 * 10-Jan-2005 BJD Removed s3c2410_clock_tick_rate
21 * 13-Aug-2005 DA Removed UART from initial I/O mappings
21*/ 22*/
22 23
23#include <linux/kernel.h> 24#include <linux/kernel.h>
@@ -49,10 +50,9 @@ static struct map_desc s3c2410_iodesc[] __initdata = {
49 IODESC_ENT(USBHOST), 50 IODESC_ENT(USBHOST),
50 IODESC_ENT(CLKPWR), 51 IODESC_ENT(CLKPWR),
51 IODESC_ENT(LCD), 52 IODESC_ENT(LCD),
52 IODESC_ENT(UART),
53 IODESC_ENT(TIMER), 53 IODESC_ENT(TIMER),
54 IODESC_ENT(ADC), 54 IODESC_ENT(ADC),
55 IODESC_ENT(WATCHDOG) 55 IODESC_ENT(WATCHDOG),
56}; 56};
57 57
58static struct resource s3c_uart0_resource[] = { 58static struct resource s3c_uart0_resource[] = {
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index afbbeb6f4658..db5e47dfc303 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -384,7 +384,7 @@ config CPU_DCACHE_DISABLE
384 384
385config CPU_DCACHE_WRITETHROUGH 385config CPU_DCACHE_WRITETHROUGH
386 bool "Force write through D-cache" 386 bool "Force write through D-cache"
387 depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020) && !CPU_DISABLE_DCACHE 387 depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020) && !CPU_DCACHE_DISABLE
388 default y if CPU_ARM925T 388 default y if CPU_ARM925T
389 help 389 help
390 Say Y here to use the data cache in writethrough mode. Unless you 390 Say Y here to use the data cache in writethrough mode. Unless you
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 3429ddcf65d1..139a38670c5d 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -105,7 +105,7 @@ ENTRY(cpu_v6_dcache_clean_area)
105ENTRY(cpu_v6_switch_mm) 105ENTRY(cpu_v6_switch_mm)
106 mov r2, #0 106 mov r2, #0
107 ldr r1, [r1, #MM_CONTEXT_ID] @ get mm->context.id 107 ldr r1, [r1, #MM_CONTEXT_ID] @ get mm->context.id
108 mcr p15, 0, r2, c7, c5, 6 @ flush BTAC/BTB 108 mcr p15, 0, r2, c7, c5, 6 @ flush BTAC/BTB
109 mcr p15, 0, r2, c7, c10, 4 @ drain write buffer 109 mcr p15, 0, r2, c7, c10, 4 @ drain write buffer
110 mcr p15, 0, r0, c2, c0, 0 @ set TTB 0 110 mcr p15, 0, r0, c2, c0, 0 @ set TTB 0
111 mcr p15, 0, r1, c13, c0, 1 @ set context ID 111 mcr p15, 0, r1, c13, c0, 1 @ set context ID
diff --git a/arch/arm/nwfpe/softfloat.c b/arch/arm/nwfpe/softfloat.c
index 8b75a6e7cb3a..f9f049132a17 100644
--- a/arch/arm/nwfpe/softfloat.c
+++ b/arch/arm/nwfpe/softfloat.c
@@ -1602,9 +1602,7 @@ flag float32_le_quiet( float32 a, float32 b )
1602 if ( ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) ) 1602 if ( ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
1603 || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) ) 1603 || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
1604 ) { 1604 ) {
1605 if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) { 1605 /* Do nothing, even if NaN as we're quiet */
1606 float_raise( float_flag_invalid );
1607 }
1608 return 0; 1606 return 0;
1609 } 1607 }
1610 aSign = extractFloat32Sign( a ); 1608 aSign = extractFloat32Sign( a );
@@ -1629,9 +1627,7 @@ flag float32_lt_quiet( float32 a, float32 b )
1629 if ( ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) ) 1627 if ( ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
1630 || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) ) 1628 || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
1631 ) { 1629 ) {
1632 if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) { 1630 /* Do nothing, even if NaN as we're quiet */
1633 float_raise( float_flag_invalid );
1634 }
1635 return 0; 1631 return 0;
1636 } 1632 }
1637 aSign = extractFloat32Sign( a ); 1633 aSign = extractFloat32Sign( a );
@@ -2493,9 +2489,7 @@ flag float64_le_quiet( float64 a, float64 b )
2493 if ( ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) ) 2489 if ( ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
2494 || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) ) 2490 || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
2495 ) { 2491 ) {
2496 if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) { 2492 /* Do nothing, even if NaN as we're quiet */
2497 float_raise( float_flag_invalid );
2498 }
2499 return 0; 2493 return 0;
2500 } 2494 }
2501 aSign = extractFloat64Sign( a ); 2495 aSign = extractFloat64Sign( a );
@@ -2520,9 +2514,7 @@ flag float64_lt_quiet( float64 a, float64 b )
2520 if ( ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) ) 2514 if ( ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
2521 || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) ) 2515 || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
2522 ) { 2516 ) {
2523 if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) { 2517 /* Do nothing, even if NaN as we're quiet */
2524 float_raise( float_flag_invalid );
2525 }
2526 return 0; 2518 return 0;
2527 } 2519 }
2528 aSign = extractFloat64Sign( a ); 2520 aSign = extractFloat64Sign( a );
@@ -3256,7 +3248,7 @@ flag floatx80_eq( floatx80 a, floatx80 b )
3256 ) { 3248 ) {
3257 if ( floatx80_is_signaling_nan( a ) 3249 if ( floatx80_is_signaling_nan( a )
3258 || floatx80_is_signaling_nan( b ) ) { 3250 || floatx80_is_signaling_nan( b ) ) {
3259 roundData->exception |= float_flag_invalid; 3251 float_raise( float_flag_invalid );
3260 } 3252 }
3261 return 0; 3253 return 0;
3262 } 3254 }
@@ -3286,7 +3278,7 @@ flag floatx80_le( floatx80 a, floatx80 b )
3286 || ( ( extractFloatx80Exp( b ) == 0x7FFF ) 3278 || ( ( extractFloatx80Exp( b ) == 0x7FFF )
3287 && (bits64) ( extractFloatx80Frac( b )<<1 ) ) 3279 && (bits64) ( extractFloatx80Frac( b )<<1 ) )
3288 ) { 3280 ) {
3289 roundData->exception |= float_flag_invalid; 3281 float_raise( float_flag_invalid );
3290 return 0; 3282 return 0;
3291 } 3283 }
3292 aSign = extractFloatx80Sign( a ); 3284 aSign = extractFloatx80Sign( a );
@@ -3320,7 +3312,7 @@ flag floatx80_lt( floatx80 a, floatx80 b )
3320 || ( ( extractFloatx80Exp( b ) == 0x7FFF ) 3312 || ( ( extractFloatx80Exp( b ) == 0x7FFF )
3321 && (bits64) ( extractFloatx80Frac( b )<<1 ) ) 3313 && (bits64) ( extractFloatx80Frac( b )<<1 ) )
3322 ) { 3314 ) {
3323 roundData->exception |= float_flag_invalid; 3315 float_raise( float_flag_invalid );
3324 return 0; 3316 return 0;
3325 } 3317 }
3326 aSign = extractFloatx80Sign( a ); 3318 aSign = extractFloatx80Sign( a );
@@ -3353,7 +3345,7 @@ flag floatx80_eq_signaling( floatx80 a, floatx80 b )
3353 || ( ( extractFloatx80Exp( b ) == 0x7FFF ) 3345 || ( ( extractFloatx80Exp( b ) == 0x7FFF )
3354 && (bits64) ( extractFloatx80Frac( b )<<1 ) ) 3346 && (bits64) ( extractFloatx80Frac( b )<<1 ) )
3355 ) { 3347 ) {
3356 roundData->exception |= float_flag_invalid; 3348 float_raise( float_flag_invalid );
3357 return 0; 3349 return 0;
3358 } 3350 }
3359 return 3351 return
@@ -3382,10 +3374,7 @@ flag floatx80_le_quiet( floatx80 a, floatx80 b )
3382 || ( ( extractFloatx80Exp( b ) == 0x7FFF ) 3374 || ( ( extractFloatx80Exp( b ) == 0x7FFF )
3383 && (bits64) ( extractFloatx80Frac( b )<<1 ) ) 3375 && (bits64) ( extractFloatx80Frac( b )<<1 ) )
3384 ) { 3376 ) {
3385 if ( floatx80_is_signaling_nan( a ) 3377 /* Do nothing, even if NaN as we're quiet */
3386 || floatx80_is_signaling_nan( b ) ) {
3387 roundData->exception |= float_flag_invalid;
3388 }
3389 return 0; 3378 return 0;
3390 } 3379 }
3391 aSign = extractFloatx80Sign( a ); 3380 aSign = extractFloatx80Sign( a );
@@ -3419,10 +3408,7 @@ flag floatx80_lt_quiet( floatx80 a, floatx80 b )
3419 || ( ( extractFloatx80Exp( b ) == 0x7FFF ) 3408 || ( ( extractFloatx80Exp( b ) == 0x7FFF )
3420 && (bits64) ( extractFloatx80Frac( b )<<1 ) ) 3409 && (bits64) ( extractFloatx80Frac( b )<<1 ) )
3421 ) { 3410 ) {
3422 if ( floatx80_is_signaling_nan( a ) 3411 /* Do nothing, even if NaN as we're quiet */
3423 || floatx80_is_signaling_nan( b ) ) {
3424 roundData->exception |= float_flag_invalid;
3425 }
3426 return 0; 3412 return 0;
3427 } 3413 }
3428 aSign = extractFloatx80Sign( a ); 3414 aSign = extractFloatx80Sign( a );
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index cbb3e0cef93a..80988136f26d 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -392,15 +392,8 @@ menu "Bus options (PCI, PCMCIA)"
392config PCI 392config PCI
393 bool "PCI support" 393 bool "PCI support"
394 help 394 help
395 Find out whether you have a PCI motherboard. PCI is the name of a 395 Real IA-64 machines all have PCI/PCI-X/PCI Express busses. Say Y
396 bus system, i.e. the way the CPU talks to the other stuff inside 396 here unless you are using a simulator without PCI support.
397 your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
398 VESA. If you have PCI, say Y, otherwise N.
399
400 The PCI-HOWTO, available from
401 <http://www.tldp.org/docs.html#howto>, contains valuable
402 information about which PCI hardware does work under Linux and which
403 doesn't.
404 397
405config PCI_DOMAINS 398config PCI_DOMAINS
406 bool 399 bool
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index 04d0b00a2b8c..dccf35c60b94 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10 3# Linux kernel version: 2.6.13-rc6
4# Mon Jan 10 13:57:35 2005 4# Tue Aug 16 14:40:41 2005
5# 5#
6 6
7# 7#
@@ -10,6 +10,7 @@
10CONFIG_EXPERIMENTAL=y 10CONFIG_EXPERIMENTAL=y
11CONFIG_CLEAN_COMPILE=y 11CONFIG_CLEAN_COMPILE=y
12CONFIG_LOCK_KERNEL=y 12CONFIG_LOCK_KERNEL=y
13CONFIG_INIT_ENV_ARG_LIMIT=32
13 14
14# 15#
15# General setup 16# General setup
@@ -21,24 +22,26 @@ CONFIG_POSIX_MQUEUE=y
21# CONFIG_BSD_PROCESS_ACCT is not set 22# CONFIG_BSD_PROCESS_ACCT is not set
22CONFIG_SYSCTL=y 23CONFIG_SYSCTL=y
23# CONFIG_AUDIT is not set 24# CONFIG_AUDIT is not set
24CONFIG_LOG_BUF_SHIFT=20
25CONFIG_HOTPLUG=y 25CONFIG_HOTPLUG=y
26CONFIG_KOBJECT_UEVENT=y 26CONFIG_KOBJECT_UEVENT=y
27# CONFIG_IKCONFIG is not set 27# CONFIG_IKCONFIG is not set
28CONFIG_CPUSETS=y
28# CONFIG_EMBEDDED is not set 29# CONFIG_EMBEDDED is not set
29CONFIG_KALLSYMS=y 30CONFIG_KALLSYMS=y
30CONFIG_KALLSYMS_ALL=y 31CONFIG_KALLSYMS_ALL=y
31# CONFIG_KALLSYMS_EXTRA_PASS is not set 32# CONFIG_KALLSYMS_EXTRA_PASS is not set
33CONFIG_PRINTK=y
34CONFIG_BUG=y
35CONFIG_BASE_FULL=y
32CONFIG_FUTEX=y 36CONFIG_FUTEX=y
33CONFIG_EPOLL=y 37CONFIG_EPOLL=y
34CONFIG_CPUSETS=y
35# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
36CONFIG_SHMEM=y 38CONFIG_SHMEM=y
37CONFIG_CC_ALIGN_FUNCTIONS=0 39CONFIG_CC_ALIGN_FUNCTIONS=0
38CONFIG_CC_ALIGN_LABELS=0 40CONFIG_CC_ALIGN_LABELS=0
39CONFIG_CC_ALIGN_LOOPS=0 41CONFIG_CC_ALIGN_LOOPS=0
40CONFIG_CC_ALIGN_JUMPS=0 42CONFIG_CC_ALIGN_JUMPS=0
41# CONFIG_TINY_SHMEM is not set 43# CONFIG_TINY_SHMEM is not set
44CONFIG_BASE_SMALL=0
42 45
43# 46#
44# Loadable module support 47# Loadable module support
@@ -63,9 +66,12 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
63CONFIG_TIME_INTERPOLATION=y 66CONFIG_TIME_INTERPOLATION=y
64CONFIG_EFI=y 67CONFIG_EFI=y
65CONFIG_GENERIC_IOMAP=y 68CONFIG_GENERIC_IOMAP=y
69CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
70CONFIG_IA64_UNCACHED_ALLOCATOR=y
66# CONFIG_IA64_GENERIC is not set 71# CONFIG_IA64_GENERIC is not set
67# CONFIG_IA64_DIG is not set 72# CONFIG_IA64_DIG is not set
68# CONFIG_IA64_HP_ZX1 is not set 73# CONFIG_IA64_HP_ZX1 is not set
74# CONFIG_IA64_HP_ZX1_SWIOTLB is not set
69CONFIG_IA64_SGI_SN2=y 75CONFIG_IA64_SGI_SN2=y
70# CONFIG_IA64_HP_SIM is not set 76# CONFIG_IA64_HP_SIM is not set
71# CONFIG_ITANIUM is not set 77# CONFIG_ITANIUM is not set
@@ -74,6 +80,10 @@ CONFIG_MCKINLEY=y
74# CONFIG_IA64_PAGE_SIZE_8KB is not set 80# CONFIG_IA64_PAGE_SIZE_8KB is not set
75CONFIG_IA64_PAGE_SIZE_16KB=y 81CONFIG_IA64_PAGE_SIZE_16KB=y
76# CONFIG_IA64_PAGE_SIZE_64KB is not set 82# CONFIG_IA64_PAGE_SIZE_64KB is not set
83# CONFIG_HZ_100 is not set
84CONFIG_HZ_250=y
85# CONFIG_HZ_1000 is not set
86CONFIG_HZ=250
77CONFIG_IA64_L1_CACHE_SHIFT=7 87CONFIG_IA64_L1_CACHE_SHIFT=7
78CONFIG_NUMA=y 88CONFIG_NUMA=y
79CONFIG_VIRTUAL_MEM_MAP=y 89CONFIG_VIRTUAL_MEM_MAP=y
@@ -81,11 +91,20 @@ CONFIG_HOLES_IN_ZONE=y
81CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 91CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
82# CONFIG_IA64_CYCLONE is not set 92# CONFIG_IA64_CYCLONE is not set
83CONFIG_IOSAPIC=y 93CONFIG_IOSAPIC=y
94CONFIG_IA64_SGI_SN_XP=m
84CONFIG_FORCE_MAX_ZONEORDER=18 95CONFIG_FORCE_MAX_ZONEORDER=18
85CONFIG_SMP=y 96CONFIG_SMP=y
86CONFIG_NR_CPUS=512 97CONFIG_NR_CPUS=512
87# CONFIG_HOTPLUG_CPU is not set 98# CONFIG_HOTPLUG_CPU is not set
99CONFIG_SCHED_SMT=y
88CONFIG_PREEMPT=y 100CONFIG_PREEMPT=y
101CONFIG_SELECT_MEMORY_MODEL=y
102# CONFIG_FLATMEM_MANUAL is not set
103CONFIG_DISCONTIGMEM_MANUAL=y
104# CONFIG_SPARSEMEM_MANUAL is not set
105CONFIG_DISCONTIGMEM=y
106CONFIG_FLAT_NODE_MEM_MAP=y
107CONFIG_NEED_MULTIPLE_NODES=y
89CONFIG_HAVE_DEC_LOCK=y 108CONFIG_HAVE_DEC_LOCK=y
90CONFIG_IA32_SUPPORT=y 109CONFIG_IA32_SUPPORT=y
91CONFIG_COMPAT=y 110CONFIG_COMPAT=y
@@ -105,6 +124,7 @@ CONFIG_BINFMT_ELF=y
105# 124#
106# Power management and ACPI 125# Power management and ACPI
107# 126#
127CONFIG_PM=y
108CONFIG_ACPI=y 128CONFIG_ACPI=y
109 129
110# 130#
@@ -114,6 +134,7 @@ CONFIG_ACPI_BOOT=y
114CONFIG_ACPI_INTERPRETER=y 134CONFIG_ACPI_INTERPRETER=y
115# CONFIG_ACPI_BUTTON is not set 135# CONFIG_ACPI_BUTTON is not set
116CONFIG_ACPI_VIDEO=m 136CONFIG_ACPI_VIDEO=m
137CONFIG_ACPI_HOTKEY=m
117# CONFIG_ACPI_FAN is not set 138# CONFIG_ACPI_FAN is not set
118# CONFIG_ACPI_PROCESSOR is not set 139# CONFIG_ACPI_PROCESSOR is not set
119CONFIG_ACPI_NUMA=y 140CONFIG_ACPI_NUMA=y
@@ -133,6 +154,7 @@ CONFIG_PCI_DOMAINS=y
133# CONFIG_PCI_MSI is not set 154# CONFIG_PCI_MSI is not set
134CONFIG_PCI_LEGACY_PROC=y 155CONFIG_PCI_LEGACY_PROC=y
135CONFIG_PCI_NAMES=y 156CONFIG_PCI_NAMES=y
157# CONFIG_PCI_DEBUG is not set
136 158
137# 159#
138# PCI Hotplug Support 160# PCI Hotplug Support
@@ -141,7 +163,6 @@ CONFIG_HOTPLUG_PCI=y
141# CONFIG_HOTPLUG_PCI_FAKE is not set 163# CONFIG_HOTPLUG_PCI_FAKE is not set
142# CONFIG_HOTPLUG_PCI_ACPI is not set 164# CONFIG_HOTPLUG_PCI_ACPI is not set
143# CONFIG_HOTPLUG_PCI_CPCI is not set 165# CONFIG_HOTPLUG_PCI_CPCI is not set
144# CONFIG_HOTPLUG_PCI_PCIE is not set
145# CONFIG_HOTPLUG_PCI_SHPC is not set 166# CONFIG_HOTPLUG_PCI_SHPC is not set
146CONFIG_HOTPLUG_PCI_SGI=y 167CONFIG_HOTPLUG_PCI_SGI=y
147 168
@@ -151,8 +172,70 @@ CONFIG_HOTPLUG_PCI_SGI=y
151# CONFIG_PCCARD is not set 172# CONFIG_PCCARD is not set
152 173
153# 174#
154# PC-card bridges 175# Networking
176#
177CONFIG_NET=y
178
179#
180# Networking options
181#
182CONFIG_PACKET=y
183CONFIG_PACKET_MMAP=y
184CONFIG_UNIX=y
185# CONFIG_NET_KEY is not set
186CONFIG_INET=y
187CONFIG_IP_MULTICAST=y
188# CONFIG_IP_ADVANCED_ROUTER is not set
189CONFIG_IP_FIB_HASH=y
190# CONFIG_IP_PNP is not set
191# CONFIG_NET_IPIP is not set
192# CONFIG_NET_IPGRE is not set
193# CONFIG_IP_MROUTE is not set
194# CONFIG_ARPD is not set
195CONFIG_SYN_COOKIES=y
196# CONFIG_INET_AH is not set
197# CONFIG_INET_ESP is not set
198# CONFIG_INET_IPCOMP is not set
199# CONFIG_INET_TUNNEL is not set
200CONFIG_IP_TCPDIAG=y
201# CONFIG_IP_TCPDIAG_IPV6 is not set
202# CONFIG_TCP_CONG_ADVANCED is not set
203CONFIG_TCP_CONG_BIC=y
204CONFIG_IPV6=m
205# CONFIG_IPV6_PRIVACY is not set
206# CONFIG_INET6_AH is not set
207# CONFIG_INET6_ESP is not set
208# CONFIG_INET6_IPCOMP is not set
209# CONFIG_INET6_TUNNEL is not set
210# CONFIG_IPV6_TUNNEL is not set
211# CONFIG_NETFILTER is not set
212
213#
214# SCTP Configuration (EXPERIMENTAL)
215#
216# CONFIG_IP_SCTP is not set
217# CONFIG_ATM is not set
218# CONFIG_BRIDGE is not set
219# CONFIG_VLAN_8021Q is not set
220# CONFIG_DECNET is not set
221# CONFIG_LLC2 is not set
222# CONFIG_IPX is not set
223# CONFIG_ATALK is not set
224# CONFIG_X25 is not set
225# CONFIG_LAPB is not set
226# CONFIG_NET_DIVERT is not set
227# CONFIG_ECONET is not set
228# CONFIG_WAN_ROUTER is not set
229# CONFIG_NET_SCHED is not set
230# CONFIG_NET_CLS_ROUTE is not set
231
232#
233# Network testing
155# 234#
235# CONFIG_NET_PKTGEN is not set
236# CONFIG_HAMRADIO is not set
237# CONFIG_IRDA is not set
238# CONFIG_BT is not set
156 239
157# 240#
158# Device Drivers 241# Device Drivers
@@ -163,7 +246,7 @@ CONFIG_HOTPLUG_PCI_SGI=y
163# 246#
164CONFIG_STANDALONE=y 247CONFIG_STANDALONE=y
165CONFIG_PREVENT_FIRMWARE_BUILD=y 248CONFIG_PREVENT_FIRMWARE_BUILD=y
166CONFIG_FW_LOADER=m 249CONFIG_FW_LOADER=y
167# CONFIG_DEBUG_DRIVER is not set 250# CONFIG_DEBUG_DRIVER is not set
168 251
169# 252#
@@ -188,6 +271,7 @@ CONFIG_FW_LOADER=m
188# CONFIG_BLK_CPQ_CISS_DA is not set 271# CONFIG_BLK_CPQ_CISS_DA is not set
189# CONFIG_BLK_DEV_DAC960 is not set 272# CONFIG_BLK_DEV_DAC960 is not set
190# CONFIG_BLK_DEV_UMEM is not set 273# CONFIG_BLK_DEV_UMEM is not set
274# CONFIG_BLK_DEV_COW_COMMON is not set
191CONFIG_BLK_DEV_LOOP=y 275CONFIG_BLK_DEV_LOOP=y
192CONFIG_BLK_DEV_CRYPTOLOOP=m 276CONFIG_BLK_DEV_CRYPTOLOOP=m
193CONFIG_BLK_DEV_NBD=m 277CONFIG_BLK_DEV_NBD=m
@@ -252,6 +336,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
252# CONFIG_BLK_DEV_HPT366 is not set 336# CONFIG_BLK_DEV_HPT366 is not set
253# CONFIG_BLK_DEV_SC1200 is not set 337# CONFIG_BLK_DEV_SC1200 is not set
254# CONFIG_BLK_DEV_PIIX is not set 338# CONFIG_BLK_DEV_PIIX is not set
339# CONFIG_BLK_DEV_IT821X is not set
255# CONFIG_BLK_DEV_NS87415 is not set 340# CONFIG_BLK_DEV_NS87415 is not set
256# CONFIG_BLK_DEV_PDC202XX_OLD is not set 341# CONFIG_BLK_DEV_PDC202XX_OLD is not set
257# CONFIG_BLK_DEV_PDC202XX_NEW is not set 342# CONFIG_BLK_DEV_PDC202XX_NEW is not set
@@ -282,6 +367,7 @@ CONFIG_CHR_DEV_ST=m
282CONFIG_BLK_DEV_SR=m 367CONFIG_BLK_DEV_SR=m
283# CONFIG_BLK_DEV_SR_VENDOR is not set 368# CONFIG_BLK_DEV_SR_VENDOR is not set
284CONFIG_CHR_DEV_SG=m 369CONFIG_CHR_DEV_SG=m
370CONFIG_CHR_DEV_SCH=m
285 371
286# 372#
287# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 373# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -315,24 +401,20 @@ CONFIG_SCSI_SATA=y
315# CONFIG_SCSI_ATA_PIIX is not set 401# CONFIG_SCSI_ATA_PIIX is not set
316# CONFIG_SCSI_SATA_NV is not set 402# CONFIG_SCSI_SATA_NV is not set
317# CONFIG_SCSI_SATA_PROMISE is not set 403# CONFIG_SCSI_SATA_PROMISE is not set
404# CONFIG_SCSI_SATA_QSTOR is not set
318# CONFIG_SCSI_SATA_SX4 is not set 405# CONFIG_SCSI_SATA_SX4 is not set
319# CONFIG_SCSI_SATA_SIL is not set 406# CONFIG_SCSI_SATA_SIL is not set
320# CONFIG_SCSI_SATA_SIS is not set 407# CONFIG_SCSI_SATA_SIS is not set
321# CONFIG_SCSI_SATA_ULI is not set 408# CONFIG_SCSI_SATA_ULI is not set
322# CONFIG_SCSI_SATA_VIA is not set 409# CONFIG_SCSI_SATA_VIA is not set
323CONFIG_SCSI_SATA_VITESSE=y 410CONFIG_SCSI_SATA_VITESSE=y
324# CONFIG_SCSI_BUSLOGIC is not set
325# CONFIG_SCSI_DMX3191D is not set 411# CONFIG_SCSI_DMX3191D is not set
326# CONFIG_SCSI_EATA is not set
327# CONFIG_SCSI_EATA_PIO is not set
328# CONFIG_SCSI_FUTURE_DOMAIN is not set 412# CONFIG_SCSI_FUTURE_DOMAIN is not set
329# CONFIG_SCSI_GDTH is not set
330# CONFIG_SCSI_IPS is not set 413# CONFIG_SCSI_IPS is not set
331# CONFIG_SCSI_INITIO is not set 414# CONFIG_SCSI_INITIO is not set
332# CONFIG_SCSI_INIA100 is not set 415# CONFIG_SCSI_INIA100 is not set
333# CONFIG_SCSI_SYM53C8XX_2 is not set 416# CONFIG_SCSI_SYM53C8XX_2 is not set
334# CONFIG_SCSI_IPR is not set 417# CONFIG_SCSI_IPR is not set
335# CONFIG_SCSI_QLOGIC_ISP is not set
336# CONFIG_SCSI_QLOGIC_FC is not set 418# CONFIG_SCSI_QLOGIC_FC is not set
337CONFIG_SCSI_QLOGIC_1280=y 419CONFIG_SCSI_QLOGIC_1280=y
338# CONFIG_SCSI_QLOGIC_1280_1040 is not set 420# CONFIG_SCSI_QLOGIC_1280_1040 is not set
@@ -342,6 +424,8 @@ CONFIG_SCSI_QLA22XX=y
342CONFIG_SCSI_QLA2300=y 424CONFIG_SCSI_QLA2300=y
343CONFIG_SCSI_QLA2322=y 425CONFIG_SCSI_QLA2322=y
344# CONFIG_SCSI_QLA6312 is not set 426# CONFIG_SCSI_QLA6312 is not set
427# CONFIG_SCSI_QLA24XX is not set
428# CONFIG_SCSI_LPFC is not set
345# CONFIG_SCSI_DC395x is not set 429# CONFIG_SCSI_DC395x is not set
346# CONFIG_SCSI_DC390T is not set 430# CONFIG_SCSI_DC390T is not set
347# CONFIG_SCSI_DEBUG is not set 431# CONFIG_SCSI_DEBUG is not set
@@ -364,11 +448,15 @@ CONFIG_DM_CRYPT=m
364CONFIG_DM_SNAPSHOT=m 448CONFIG_DM_SNAPSHOT=m
365CONFIG_DM_MIRROR=m 449CONFIG_DM_MIRROR=m
366CONFIG_DM_ZERO=m 450CONFIG_DM_ZERO=m
451CONFIG_DM_MULTIPATH=m
452CONFIG_DM_MULTIPATH_EMC=m
367 453
368# 454#
369# Fusion MPT device support 455# Fusion MPT device support
370# 456#
371CONFIG_FUSION=y 457CONFIG_FUSION=y
458CONFIG_FUSION_SPI=y
459CONFIG_FUSION_FC=y
372CONFIG_FUSION_MAX_SGE=128 460CONFIG_FUSION_MAX_SGE=128
373CONFIG_FUSION_CTL=m 461CONFIG_FUSION_CTL=m
374 462
@@ -383,82 +471,13 @@ CONFIG_FUSION_CTL=m
383# CONFIG_I2O is not set 471# CONFIG_I2O is not set
384 472
385# 473#
386# Networking support 474# Network device support
387#
388CONFIG_NET=y
389
390#
391# Networking options
392#
393CONFIG_PACKET=y
394CONFIG_PACKET_MMAP=y
395CONFIG_NETLINK_DEV=y
396CONFIG_UNIX=y
397# CONFIG_NET_KEY is not set
398CONFIG_INET=y
399CONFIG_IP_MULTICAST=y
400# CONFIG_IP_ADVANCED_ROUTER is not set
401# CONFIG_IP_PNP is not set
402# CONFIG_NET_IPIP is not set
403# CONFIG_NET_IPGRE is not set
404# CONFIG_IP_MROUTE is not set
405# CONFIG_ARPD is not set
406CONFIG_SYN_COOKIES=y
407# CONFIG_INET_AH is not set
408# CONFIG_INET_ESP is not set
409# CONFIG_INET_IPCOMP is not set
410# CONFIG_INET_TUNNEL is not set
411CONFIG_IP_TCPDIAG=y
412# CONFIG_IP_TCPDIAG_IPV6 is not set
413CONFIG_IPV6=m
414# CONFIG_IPV6_PRIVACY is not set
415# CONFIG_INET6_AH is not set
416# CONFIG_INET6_ESP is not set
417# CONFIG_INET6_IPCOMP is not set
418# CONFIG_INET6_TUNNEL is not set
419# CONFIG_IPV6_TUNNEL is not set
420# CONFIG_NETFILTER is not set
421
422#
423# SCTP Configuration (EXPERIMENTAL)
424#
425# CONFIG_IP_SCTP is not set
426# CONFIG_ATM is not set
427# CONFIG_BRIDGE is not set
428# CONFIG_VLAN_8021Q is not set
429# CONFIG_DECNET is not set
430# CONFIG_LLC2 is not set
431# CONFIG_IPX is not set
432# CONFIG_ATALK is not set
433# CONFIG_X25 is not set
434# CONFIG_LAPB is not set
435# CONFIG_NET_DIVERT is not set
436# CONFIG_ECONET is not set
437# CONFIG_WAN_ROUTER is not set
438
439#
440# QoS and/or fair queueing
441#
442# CONFIG_NET_SCHED is not set
443# CONFIG_NET_CLS_ROUTE is not set
444
445#
446# Network testing
447# 475#
448# CONFIG_NET_PKTGEN is not set
449CONFIG_NETPOLL=y
450# CONFIG_NETPOLL_RX is not set
451# CONFIG_NETPOLL_TRAP is not set
452CONFIG_NET_POLL_CONTROLLER=y
453# CONFIG_HAMRADIO is not set
454# CONFIG_IRDA is not set
455# CONFIG_BT is not set
456CONFIG_NETDEVICES=y 476CONFIG_NETDEVICES=y
457# CONFIG_DUMMY is not set 477# CONFIG_DUMMY is not set
458# CONFIG_BONDING is not set 478# CONFIG_BONDING is not set
459# CONFIG_EQUALIZER is not set 479# CONFIG_EQUALIZER is not set
460# CONFIG_TUN is not set 480# CONFIG_TUN is not set
461# CONFIG_ETHERTAP is not set
462 481
463# 482#
464# ARCnet devices 483# ARCnet devices
@@ -480,8 +499,10 @@ CONFIG_NETDEVICES=y
480# CONFIG_HAMACHI is not set 499# CONFIG_HAMACHI is not set
481# CONFIG_YELLOWFIN is not set 500# CONFIG_YELLOWFIN is not set
482# CONFIG_R8169 is not set 501# CONFIG_R8169 is not set
502# CONFIG_SKGE is not set
483# CONFIG_SK98LIN is not set 503# CONFIG_SK98LIN is not set
484CONFIG_TIGON3=y 504CONFIG_TIGON3=y
505# CONFIG_BNX2 is not set
485 506
486# 507#
487# Ethernet (10000 Mbit) 508# Ethernet (10000 Mbit)
@@ -512,6 +533,10 @@ CONFIG_S2IO=m
512# CONFIG_NET_FC is not set 533# CONFIG_NET_FC is not set
513# CONFIG_SHAPER is not set 534# CONFIG_SHAPER is not set
514CONFIG_NETCONSOLE=y 535CONFIG_NETCONSOLE=y
536CONFIG_NETPOLL=y
537# CONFIG_NETPOLL_RX is not set
538# CONFIG_NETPOLL_TRAP is not set
539CONFIG_NET_POLL_CONTROLLER=y
515 540
516# 541#
517# ISDN subsystem 542# ISDN subsystem
@@ -541,14 +566,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
541# CONFIG_INPUT_EVBUG is not set 566# CONFIG_INPUT_EVBUG is not set
542 567
543# 568#
544# Input I/O drivers
545#
546# CONFIG_GAMEPORT is not set
547CONFIG_SOUND_GAMEPORT=y
548# CONFIG_SERIO is not set
549# CONFIG_SERIO_I8042 is not set
550
551#
552# Input Device Drivers 569# Input Device Drivers
553# 570#
554# CONFIG_INPUT_KEYBOARD is not set 571# CONFIG_INPUT_KEYBOARD is not set
@@ -558,6 +575,12 @@ CONFIG_SOUND_GAMEPORT=y
558# CONFIG_INPUT_MISC is not set 575# CONFIG_INPUT_MISC is not set
559 576
560# 577#
578# Hardware I/O ports
579#
580# CONFIG_SERIO is not set
581# CONFIG_GAMEPORT is not set
582
583#
561# Character devices 584# Character devices
562# 585#
563CONFIG_VT=y 586CONFIG_VT=y
@@ -568,9 +591,10 @@ CONFIG_SERIAL_NONSTANDARD=y
568# CONFIG_CYCLADES is not set 591# CONFIG_CYCLADES is not set
569# CONFIG_MOXA_SMARTIO is not set 592# CONFIG_MOXA_SMARTIO is not set
570# CONFIG_ISI is not set 593# CONFIG_ISI is not set
571# CONFIG_SYNCLINK is not set
572# CONFIG_SYNCLINKMP is not set 594# CONFIG_SYNCLINKMP is not set
573# CONFIG_N_HDLC is not set 595# CONFIG_N_HDLC is not set
596# CONFIG_SPECIALIX is not set
597# CONFIG_SX is not set
574# CONFIG_STALDRV is not set 598# CONFIG_STALDRV is not set
575CONFIG_SGI_SNSC=y 599CONFIG_SGI_SNSC=y
576CONFIG_SGI_TIOCX=y 600CONFIG_SGI_TIOCX=y
@@ -587,6 +611,7 @@ CONFIG_SGI_MBCS=m
587CONFIG_SERIAL_CORE=y 611CONFIG_SERIAL_CORE=y
588CONFIG_SERIAL_CORE_CONSOLE=y 612CONFIG_SERIAL_CORE_CONSOLE=y
589CONFIG_SERIAL_SGI_L1_CONSOLE=y 613CONFIG_SERIAL_SGI_L1_CONSOLE=y
614# CONFIG_SERIAL_JSM is not set
590CONFIG_SERIAL_SGI_IOC4=y 615CONFIG_SERIAL_SGI_IOC4=y
591CONFIG_UNIX98_PTYS=y 616CONFIG_UNIX98_PTYS=y
592CONFIG_LEGACY_PTYS=y 617CONFIG_LEGACY_PTYS=y
@@ -615,12 +640,19 @@ CONFIG_EFI_RTC=y
615CONFIG_RAW_DRIVER=m 640CONFIG_RAW_DRIVER=m
616# CONFIG_HPET is not set 641# CONFIG_HPET is not set
617CONFIG_MAX_RAW_DEVS=256 642CONFIG_MAX_RAW_DEVS=256
643# CONFIG_HANGCHECK_TIMER is not set
618CONFIG_MMTIMER=y 644CONFIG_MMTIMER=y
619 645
620# 646#
647# TPM devices
648#
649# CONFIG_TCG_TPM is not set
650
651#
621# I2C support 652# I2C support
622# 653#
623# CONFIG_I2C is not set 654# CONFIG_I2C is not set
655# CONFIG_I2C_SENSOR is not set
624 656
625# 657#
626# Dallas's 1-wire bus 658# Dallas's 1-wire bus
@@ -628,6 +660,11 @@ CONFIG_MMTIMER=y
628# CONFIG_W1 is not set 660# CONFIG_W1 is not set
629 661
630# 662#
663# Hardware Monitoring support
664#
665# CONFIG_HWMON is not set
666
667#
631# Misc devices 668# Misc devices
632# 669#
633 670
@@ -660,6 +697,8 @@ CONFIG_DUMMY_CONSOLE=y
660# 697#
661# USB support 698# USB support
662# 699#
700CONFIG_USB_ARCH_HAS_HCD=y
701CONFIG_USB_ARCH_HAS_OHCI=y
663CONFIG_USB=m 702CONFIG_USB=m
664# CONFIG_USB_DEBUG is not set 703# CONFIG_USB_DEBUG is not set
665 704
@@ -669,9 +708,8 @@ CONFIG_USB=m
669# CONFIG_USB_DEVICEFS is not set 708# CONFIG_USB_DEVICEFS is not set
670# CONFIG_USB_BANDWIDTH is not set 709# CONFIG_USB_BANDWIDTH is not set
671# CONFIG_USB_DYNAMIC_MINORS is not set 710# CONFIG_USB_DYNAMIC_MINORS is not set
711# CONFIG_USB_SUSPEND is not set
672# CONFIG_USB_OTG is not set 712# CONFIG_USB_OTG is not set
673CONFIG_USB_ARCH_HAS_HCD=y
674CONFIG_USB_ARCH_HAS_OHCI=y
675 713
676# 714#
677# USB Host Controller Drivers 715# USB Host Controller Drivers
@@ -679,7 +717,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
679CONFIG_USB_EHCI_HCD=m 717CONFIG_USB_EHCI_HCD=m
680# CONFIG_USB_EHCI_SPLIT_ISO is not set 718# CONFIG_USB_EHCI_SPLIT_ISO is not set
681# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 719# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
720# CONFIG_USB_ISP116X_HCD is not set
682CONFIG_USB_OHCI_HCD=m 721CONFIG_USB_OHCI_HCD=m
722# CONFIG_USB_OHCI_BIG_ENDIAN is not set
723CONFIG_USB_OHCI_LITTLE_ENDIAN=y
683CONFIG_USB_UHCI_HCD=m 724CONFIG_USB_UHCI_HCD=m
684# CONFIG_USB_SL811_HCD is not set 725# CONFIG_USB_SL811_HCD is not set
685 726
@@ -710,12 +751,15 @@ CONFIG_USB_HIDINPUT=y
710# CONFIG_USB_MOUSE is not set 751# CONFIG_USB_MOUSE is not set
711# CONFIG_USB_AIPTEK is not set 752# CONFIG_USB_AIPTEK is not set
712# CONFIG_USB_WACOM is not set 753# CONFIG_USB_WACOM is not set
754# CONFIG_USB_ACECAD is not set
713# CONFIG_USB_KBTAB is not set 755# CONFIG_USB_KBTAB is not set
714# CONFIG_USB_POWERMATE is not set 756# CONFIG_USB_POWERMATE is not set
715# CONFIG_USB_MTOUCH is not set 757# CONFIG_USB_MTOUCH is not set
758# CONFIG_USB_ITMTOUCH is not set
716# CONFIG_USB_EGALAX is not set 759# CONFIG_USB_EGALAX is not set
717# CONFIG_USB_XPAD is not set 760# CONFIG_USB_XPAD is not set
718# CONFIG_USB_ATI_REMOTE is not set 761# CONFIG_USB_ATI_REMOTE is not set
762# CONFIG_USB_KEYSPAN_REMOTE is not set
719 763
720# 764#
721# USB Imaging devices 765# USB Imaging devices
@@ -740,6 +784,7 @@ CONFIG_USB_HIDINPUT=y
740# CONFIG_USB_PEGASUS is not set 784# CONFIG_USB_PEGASUS is not set
741# CONFIG_USB_RTL8150 is not set 785# CONFIG_USB_RTL8150 is not set
742# CONFIG_USB_USBNET is not set 786# CONFIG_USB_USBNET is not set
787CONFIG_USB_MON=y
743 788
744# 789#
745# USB port drivers 790# USB port drivers
@@ -763,9 +808,12 @@ CONFIG_USB_HIDINPUT=y
763# CONFIG_USB_CYTHERM is not set 808# CONFIG_USB_CYTHERM is not set
764# CONFIG_USB_PHIDGETKIT is not set 809# CONFIG_USB_PHIDGETKIT is not set
765# CONFIG_USB_PHIDGETSERVO is not set 810# CONFIG_USB_PHIDGETSERVO is not set
811# CONFIG_USB_IDMOUSE is not set
812# CONFIG_USB_SISUSBVGA is not set
813# CONFIG_USB_LD is not set
766 814
767# 815#
768# USB ATM/DSL drivers 816# USB DSL modem support
769# 817#
770 818
771# 819#
@@ -782,6 +830,7 @@ CONFIG_USB_HIDINPUT=y
782# InfiniBand support 830# InfiniBand support
783# 831#
784CONFIG_INFINIBAND=m 832CONFIG_INFINIBAND=m
833CONFIG_INFINIBAND_USER_VERBS=m
785CONFIG_INFINIBAND_MTHCA=m 834CONFIG_INFINIBAND_MTHCA=m
786# CONFIG_INFINIBAND_MTHCA_DEBUG is not set 835# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
787CONFIG_INFINIBAND_IPOIB=m 836CONFIG_INFINIBAND_IPOIB=m
@@ -799,6 +848,7 @@ CONFIG_EXT2_FS=y
799CONFIG_EXT2_FS_XATTR=y 848CONFIG_EXT2_FS_XATTR=y
800CONFIG_EXT2_FS_POSIX_ACL=y 849CONFIG_EXT2_FS_POSIX_ACL=y
801CONFIG_EXT2_FS_SECURITY=y 850CONFIG_EXT2_FS_SECURITY=y
851# CONFIG_EXT2_FS_XIP is not set
802CONFIG_EXT3_FS=y 852CONFIG_EXT3_FS=y
803CONFIG_EXT3_FS_XATTR=y 853CONFIG_EXT3_FS_XATTR=y
804CONFIG_EXT3_FS_POSIX_ACL=y 854CONFIG_EXT3_FS_POSIX_ACL=y
@@ -814,13 +864,19 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
814CONFIG_REISERFS_FS_SECURITY=y 864CONFIG_REISERFS_FS_SECURITY=y
815# CONFIG_JFS_FS is not set 865# CONFIG_JFS_FS is not set
816CONFIG_FS_POSIX_ACL=y 866CONFIG_FS_POSIX_ACL=y
867
868#
869# XFS support
870#
817CONFIG_XFS_FS=y 871CONFIG_XFS_FS=y
872CONFIG_XFS_EXPORT=y
818CONFIG_XFS_RT=y 873CONFIG_XFS_RT=y
819CONFIG_XFS_QUOTA=y 874CONFIG_XFS_QUOTA=y
820# CONFIG_XFS_SECURITY is not set 875# CONFIG_XFS_SECURITY is not set
821CONFIG_XFS_POSIX_ACL=y 876CONFIG_XFS_POSIX_ACL=y
822# CONFIG_MINIX_FS is not set 877# CONFIG_MINIX_FS is not set
823# CONFIG_ROMFS_FS is not set 878# CONFIG_ROMFS_FS is not set
879CONFIG_INOTIFY=y
824CONFIG_QUOTA=y 880CONFIG_QUOTA=y
825# CONFIG_QFMT_V1 is not set 881# CONFIG_QFMT_V1 is not set
826# CONFIG_QFMT_V2 is not set 882# CONFIG_QFMT_V2 is not set
@@ -854,7 +910,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
854CONFIG_PROC_FS=y 910CONFIG_PROC_FS=y
855CONFIG_PROC_KCORE=y 911CONFIG_PROC_KCORE=y
856CONFIG_SYSFS=y 912CONFIG_SYSFS=y
857# CONFIG_DEVFS_FS is not set
858# CONFIG_DEVPTS_FS_XATTR is not set 913# CONFIG_DEVPTS_FS_XATTR is not set
859CONFIG_TMPFS=y 914CONFIG_TMPFS=y
860CONFIG_TMPFS_XATTR=y 915CONFIG_TMPFS_XATTR=y
@@ -885,15 +940,18 @@ CONFIG_RAMFS=y
885# 940#
886CONFIG_NFS_FS=m 941CONFIG_NFS_FS=m
887CONFIG_NFS_V3=y 942CONFIG_NFS_V3=y
943# CONFIG_NFS_V3_ACL is not set
888CONFIG_NFS_V4=y 944CONFIG_NFS_V4=y
889CONFIG_NFS_DIRECTIO=y 945CONFIG_NFS_DIRECTIO=y
890CONFIG_NFSD=m 946CONFIG_NFSD=m
891CONFIG_NFSD_V3=y 947CONFIG_NFSD_V3=y
948# CONFIG_NFSD_V3_ACL is not set
892CONFIG_NFSD_V4=y 949CONFIG_NFSD_V4=y
893CONFIG_NFSD_TCP=y 950CONFIG_NFSD_TCP=y
894CONFIG_LOCKD=m 951CONFIG_LOCKD=m
895CONFIG_LOCKD_V4=y 952CONFIG_LOCKD_V4=y
896CONFIG_EXPORTFS=m 953CONFIG_EXPORTFS=y
954CONFIG_NFS_COMMON=y
897CONFIG_SUNRPC=m 955CONFIG_SUNRPC=m
898CONFIG_SUNRPC_GSS=m 956CONFIG_SUNRPC_GSS=m
899CONFIG_RPCSEC_GSS_KRB5=m 957CONFIG_RPCSEC_GSS_KRB5=m
@@ -980,6 +1038,9 @@ CONFIG_CRC32=y
980# CONFIG_LIBCRC32C is not set 1038# CONFIG_LIBCRC32C is not set
981CONFIG_ZLIB_INFLATE=m 1039CONFIG_ZLIB_INFLATE=m
982CONFIG_ZLIB_DEFLATE=m 1040CONFIG_ZLIB_DEFLATE=m
1041CONFIG_GENERIC_ALLOCATOR=y
1042CONFIG_GENERIC_HARDIRQS=y
1043CONFIG_GENERIC_IRQ_PROBE=y
983 1044
984# 1045#
985# Profiling support 1046# Profiling support
@@ -989,15 +1050,19 @@ CONFIG_ZLIB_DEFLATE=m
989# 1050#
990# Kernel hacking 1051# Kernel hacking
991# 1052#
1053# CONFIG_PRINTK_TIME is not set
992CONFIG_DEBUG_KERNEL=y 1054CONFIG_DEBUG_KERNEL=y
993CONFIG_MAGIC_SYSRQ=y 1055CONFIG_MAGIC_SYSRQ=y
1056CONFIG_LOG_BUF_SHIFT=20
994# CONFIG_SCHEDSTATS is not set 1057# CONFIG_SCHEDSTATS is not set
995# CONFIG_DEBUG_SLAB is not set 1058# CONFIG_DEBUG_SLAB is not set
1059CONFIG_DEBUG_PREEMPT=y
996# CONFIG_DEBUG_SPINLOCK is not set 1060# CONFIG_DEBUG_SPINLOCK is not set
997# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1061# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
998# CONFIG_DEBUG_KOBJECT is not set 1062# CONFIG_DEBUG_KOBJECT is not set
999CONFIG_DEBUG_INFO=y 1063CONFIG_DEBUG_INFO=y
1000# CONFIG_DEBUG_FS is not set 1064# CONFIG_DEBUG_FS is not set
1065# CONFIG_KPROBES is not set
1001CONFIG_IA64_GRANULE_16MB=y 1066CONFIG_IA64_GRANULE_16MB=y
1002# CONFIG_IA64_GRANULE_64MB is not set 1067# CONFIG_IA64_GRANULE_64MB is not set
1003# CONFIG_IA64_PRINT_HAZARDS is not set 1068# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1019,11 +1084,12 @@ CONFIG_CRYPTO=y
1019CONFIG_CRYPTO_HMAC=y 1084CONFIG_CRYPTO_HMAC=y
1020# CONFIG_CRYPTO_NULL is not set 1085# CONFIG_CRYPTO_NULL is not set
1021# CONFIG_CRYPTO_MD4 is not set 1086# CONFIG_CRYPTO_MD4 is not set
1022CONFIG_CRYPTO_MD5=m 1087CONFIG_CRYPTO_MD5=y
1023CONFIG_CRYPTO_SHA1=m 1088CONFIG_CRYPTO_SHA1=m
1024# CONFIG_CRYPTO_SHA256 is not set 1089# CONFIG_CRYPTO_SHA256 is not set
1025# CONFIG_CRYPTO_SHA512 is not set 1090# CONFIG_CRYPTO_SHA512 is not set
1026# CONFIG_CRYPTO_WP512 is not set 1091# CONFIG_CRYPTO_WP512 is not set
1092# CONFIG_CRYPTO_TGR192 is not set
1027CONFIG_CRYPTO_DES=m 1093CONFIG_CRYPTO_DES=m
1028# CONFIG_CRYPTO_BLOWFISH is not set 1094# CONFIG_CRYPTO_BLOWFISH is not set
1029# CONFIG_CRYPTO_TWOFISH is not set 1095# CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 73454eee26f1..c853cfcd2d11 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.13-rc1-20050629 3# Linux kernel version: 2.6.13-rc6-tiger-smp
4# Wed Jun 29 15:28:12 2005 4# Wed Aug 17 10:19:51 2005
5# 5#
6 6
7# 7#
@@ -132,6 +132,7 @@ CONFIG_ACPI_BOOT=y
132CONFIG_ACPI_INTERPRETER=y 132CONFIG_ACPI_INTERPRETER=y
133CONFIG_ACPI_BUTTON=m 133CONFIG_ACPI_BUTTON=m
134# CONFIG_ACPI_VIDEO is not set 134# CONFIG_ACPI_VIDEO is not set
135# CONFIG_ACPI_HOTKEY is not set
135CONFIG_ACPI_FAN=m 136CONFIG_ACPI_FAN=m
136CONFIG_ACPI_PROCESSOR=m 137CONFIG_ACPI_PROCESSOR=m
137# CONFIG_ACPI_HOTPLUG_CPU is not set 138# CONFIG_ACPI_HOTPLUG_CPU is not set
@@ -170,6 +171,66 @@ CONFIG_HOTPLUG_PCI_ACPI=m
170# CONFIG_PCCARD is not set 171# CONFIG_PCCARD is not set
171 172
172# 173#
174# Networking
175#
176CONFIG_NET=y
177
178#
179# Networking options
180#
181CONFIG_PACKET=y
182# CONFIG_PACKET_MMAP is not set
183CONFIG_UNIX=y
184# CONFIG_NET_KEY is not set
185CONFIG_INET=y
186CONFIG_IP_MULTICAST=y
187# CONFIG_IP_ADVANCED_ROUTER is not set
188CONFIG_IP_FIB_HASH=y
189# CONFIG_IP_PNP is not set
190# CONFIG_NET_IPIP is not set
191# CONFIG_NET_IPGRE is not set
192# CONFIG_IP_MROUTE is not set
193CONFIG_ARPD=y
194CONFIG_SYN_COOKIES=y
195# CONFIG_INET_AH is not set
196# CONFIG_INET_ESP is not set
197# CONFIG_INET_IPCOMP is not set
198# CONFIG_INET_TUNNEL is not set
199CONFIG_IP_TCPDIAG=y
200# CONFIG_IP_TCPDIAG_IPV6 is not set
201# CONFIG_TCP_CONG_ADVANCED is not set
202CONFIG_TCP_CONG_BIC=y
203# CONFIG_IPV6 is not set
204# CONFIG_NETFILTER is not set
205
206#
207# SCTP Configuration (EXPERIMENTAL)
208#
209# CONFIG_IP_SCTP is not set
210# CONFIG_ATM is not set
211# CONFIG_BRIDGE is not set
212# CONFIG_VLAN_8021Q is not set
213# CONFIG_DECNET is not set
214# CONFIG_LLC2 is not set
215# CONFIG_IPX is not set
216# CONFIG_ATALK is not set
217# CONFIG_X25 is not set
218# CONFIG_LAPB is not set
219# CONFIG_NET_DIVERT is not set
220# CONFIG_ECONET is not set
221# CONFIG_WAN_ROUTER is not set
222# CONFIG_NET_SCHED is not set
223# CONFIG_NET_CLS_ROUTE is not set
224
225#
226# Network testing
227#
228# CONFIG_NET_PKTGEN is not set
229# CONFIG_HAMRADIO is not set
230# CONFIG_IRDA is not set
231# CONFIG_BT is not set
232
233#
173# Device Drivers 234# Device Drivers
174# 235#
175 236
@@ -178,7 +239,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m
178# 239#
179CONFIG_STANDALONE=y 240CONFIG_STANDALONE=y
180CONFIG_PREVENT_FIRMWARE_BUILD=y 241CONFIG_PREVENT_FIRMWARE_BUILD=y
181# CONFIG_FW_LOADER is not set 242CONFIG_FW_LOADER=m
182# CONFIG_DEBUG_DRIVER is not set 243# CONFIG_DEBUG_DRIVER is not set
183 244
184# 245#
@@ -348,6 +409,7 @@ CONFIG_SCSI_QLA22XX=m
348CONFIG_SCSI_QLA2300=m 409CONFIG_SCSI_QLA2300=m
349CONFIG_SCSI_QLA2322=m 410CONFIG_SCSI_QLA2322=m
350# CONFIG_SCSI_QLA6312 is not set 411# CONFIG_SCSI_QLA6312 is not set
412# CONFIG_SCSI_QLA24XX is not set
351# CONFIG_SCSI_LPFC is not set 413# CONFIG_SCSI_LPFC is not set
352# CONFIG_SCSI_DC395x is not set 414# CONFIG_SCSI_DC395x is not set
353# CONFIG_SCSI_DC390T is not set 415# CONFIG_SCSI_DC390T is not set
@@ -393,72 +455,8 @@ CONFIG_FUSION_CTL=y
393# CONFIG_I2O is not set 455# CONFIG_I2O is not set
394 456
395# 457#
396# Networking support 458# Network device support
397#
398CONFIG_NET=y
399
400#
401# Networking options
402# 459#
403CONFIG_PACKET=y
404# CONFIG_PACKET_MMAP is not set
405CONFIG_UNIX=y
406# CONFIG_NET_KEY is not set
407CONFIG_INET=y
408CONFIG_IP_MULTICAST=y
409# CONFIG_IP_ADVANCED_ROUTER is not set
410CONFIG_IP_FIB_HASH=y
411# CONFIG_IP_PNP is not set
412# CONFIG_NET_IPIP is not set
413# CONFIG_NET_IPGRE is not set
414# CONFIG_IP_MROUTE is not set
415CONFIG_ARPD=y
416CONFIG_SYN_COOKIES=y
417# CONFIG_INET_AH is not set
418# CONFIG_INET_ESP is not set
419# CONFIG_INET_IPCOMP is not set
420# CONFIG_INET_TUNNEL is not set
421CONFIG_IP_TCPDIAG=y
422# CONFIG_IP_TCPDIAG_IPV6 is not set
423# CONFIG_TCP_CONG_ADVANCED is not set
424CONFIG_TCP_CONG_BIC=y
425# CONFIG_IPV6 is not set
426# CONFIG_NETFILTER is not set
427
428#
429# SCTP Configuration (EXPERIMENTAL)
430#
431# CONFIG_IP_SCTP is not set
432# CONFIG_ATM is not set
433# CONFIG_BRIDGE is not set
434# CONFIG_VLAN_8021Q is not set
435# CONFIG_DECNET is not set
436# CONFIG_LLC2 is not set
437# CONFIG_IPX is not set
438# CONFIG_ATALK is not set
439# CONFIG_X25 is not set
440# CONFIG_LAPB is not set
441# CONFIG_NET_DIVERT is not set
442# CONFIG_ECONET is not set
443# CONFIG_WAN_ROUTER is not set
444
445#
446# QoS and/or fair queueing
447#
448# CONFIG_NET_SCHED is not set
449# CONFIG_NET_CLS_ROUTE is not set
450
451#
452# Network testing
453#
454# CONFIG_NET_PKTGEN is not set
455CONFIG_NETPOLL=y
456# CONFIG_NETPOLL_RX is not set
457# CONFIG_NETPOLL_TRAP is not set
458CONFIG_NET_POLL_CONTROLLER=y
459# CONFIG_HAMRADIO is not set
460# CONFIG_IRDA is not set
461# CONFIG_BT is not set
462CONFIG_NETDEVICES=y 460CONFIG_NETDEVICES=y
463CONFIG_DUMMY=m 461CONFIG_DUMMY=m
464# CONFIG_BONDING is not set 462# CONFIG_BONDING is not set
@@ -555,6 +553,10 @@ CONFIG_TIGON3=y
555# CONFIG_NET_FC is not set 553# CONFIG_NET_FC is not set
556# CONFIG_SHAPER is not set 554# CONFIG_SHAPER is not set
557CONFIG_NETCONSOLE=y 555CONFIG_NETCONSOLE=y
556CONFIG_NETPOLL=y
557# CONFIG_NETPOLL_RX is not set
558# CONFIG_NETPOLL_TRAP is not set
559CONFIG_NET_POLL_CONTROLLER=y
558 560
559# 561#
560# ISDN subsystem 562# ISDN subsystem
@@ -680,6 +682,7 @@ CONFIG_DRM_R128=m
680CONFIG_DRM_RADEON=m 682CONFIG_DRM_RADEON=m
681CONFIG_DRM_MGA=m 683CONFIG_DRM_MGA=m
682CONFIG_DRM_SIS=m 684CONFIG_DRM_SIS=m
685# CONFIG_DRM_VIA is not set
683CONFIG_RAW_DRIVER=m 686CONFIG_RAW_DRIVER=m
684CONFIG_HPET=y 687CONFIG_HPET=y
685# CONFIG_HPET_RTC_IRQ is not set 688# CONFIG_HPET_RTC_IRQ is not set
@@ -696,6 +699,7 @@ CONFIG_MAX_RAW_DEVS=256
696# I2C support 699# I2C support
697# 700#
698# CONFIG_I2C is not set 701# CONFIG_I2C is not set
702# CONFIG_I2C_SENSOR is not set
699 703
700# 704#
701# Dallas's 1-wire bus 705# Dallas's 1-wire bus
@@ -703,6 +707,12 @@ CONFIG_MAX_RAW_DEVS=256
703# CONFIG_W1 is not set 707# CONFIG_W1 is not set
704 708
705# 709#
710# Hardware Monitoring support
711#
712CONFIG_HWMON=y
713# CONFIG_HWMON_DEBUG_CHIP is not set
714
715#
706# Misc devices 716# Misc devices
707# 717#
708 718
@@ -800,6 +810,7 @@ CONFIG_USB_HIDINPUT=y
800# CONFIG_USB_EGALAX is not set 810# CONFIG_USB_EGALAX is not set
801# CONFIG_USB_XPAD is not set 811# CONFIG_USB_XPAD is not set
802# CONFIG_USB_ATI_REMOTE is not set 812# CONFIG_USB_ATI_REMOTE is not set
813# CONFIG_USB_KEYSPAN_REMOTE is not set
803 814
804# 815#
805# USB Imaging devices 816# USB Imaging devices
@@ -850,6 +861,7 @@ CONFIG_USB_HIDINPUT=y
850# CONFIG_USB_PHIDGETSERVO is not set 861# CONFIG_USB_PHIDGETSERVO is not set
851# CONFIG_USB_IDMOUSE is not set 862# CONFIG_USB_IDMOUSE is not set
852# CONFIG_USB_SISUSBVGA is not set 863# CONFIG_USB_SISUSBVGA is not set
864# CONFIG_USB_LD is not set
853# CONFIG_USB_TEST is not set 865# CONFIG_USB_TEST is not set
854 866
855# 867#
@@ -910,6 +922,7 @@ CONFIG_XFS_EXPORT=y
910# CONFIG_XFS_POSIX_ACL is not set 922# CONFIG_XFS_POSIX_ACL is not set
911# CONFIG_MINIX_FS is not set 923# CONFIG_MINIX_FS is not set
912# CONFIG_ROMFS_FS is not set 924# CONFIG_ROMFS_FS is not set
925CONFIG_INOTIFY=y
913# CONFIG_QUOTA is not set 926# CONFIG_QUOTA is not set
914CONFIG_DNOTIFY=y 927CONFIG_DNOTIFY=y
915CONFIG_AUTOFS_FS=y 928CONFIG_AUTOFS_FS=y
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index b7755e4436d2..88e8867fa8e8 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.13-rc1-20050629 3# Linux kernel version: 2.6.13-rc6
4# Wed Jun 29 15:31:11 2005 4# Wed Aug 17 10:02:43 2005
5# 5#
6 6
7# 7#
@@ -132,6 +132,7 @@ CONFIG_ACPI_BOOT=y
132CONFIG_ACPI_INTERPRETER=y 132CONFIG_ACPI_INTERPRETER=y
133CONFIG_ACPI_BUTTON=y 133CONFIG_ACPI_BUTTON=y
134CONFIG_ACPI_VIDEO=m 134CONFIG_ACPI_VIDEO=m
135CONFIG_ACPI_HOTKEY=m
135CONFIG_ACPI_FAN=y 136CONFIG_ACPI_FAN=y
136CONFIG_ACPI_PROCESSOR=y 137CONFIG_ACPI_PROCESSOR=y
137CONFIG_ACPI_THERMAL=y 138CONFIG_ACPI_THERMAL=y
@@ -169,6 +170,83 @@ CONFIG_HOTPLUG_PCI_ACPI=y
169# CONFIG_PCCARD is not set 170# CONFIG_PCCARD is not set
170 171
171# 172#
173# Networking
174#
175CONFIG_NET=y
176
177#
178# Networking options
179#
180CONFIG_PACKET=y
181# CONFIG_PACKET_MMAP is not set
182CONFIG_UNIX=y
183# CONFIG_NET_KEY is not set
184CONFIG_INET=y
185CONFIG_IP_MULTICAST=y
186# CONFIG_IP_ADVANCED_ROUTER is not set
187CONFIG_IP_FIB_HASH=y
188# CONFIG_IP_PNP is not set
189# CONFIG_NET_IPIP is not set
190# CONFIG_NET_IPGRE is not set
191# CONFIG_IP_MROUTE is not set
192# CONFIG_ARPD is not set
193# CONFIG_SYN_COOKIES is not set
194# CONFIG_INET_AH is not set
195# CONFIG_INET_ESP is not set
196# CONFIG_INET_IPCOMP is not set
197# CONFIG_INET_TUNNEL is not set
198# CONFIG_IP_TCPDIAG is not set
199# CONFIG_IP_TCPDIAG_IPV6 is not set
200# CONFIG_TCP_CONG_ADVANCED is not set
201CONFIG_TCP_CONG_BIC=y
202
203#
204# IP: Virtual Server Configuration
205#
206# CONFIG_IP_VS is not set
207# CONFIG_IPV6 is not set
208CONFIG_NETFILTER=y
209# CONFIG_NETFILTER_DEBUG is not set
210
211#
212# IP: Netfilter Configuration
213#
214# CONFIG_IP_NF_CONNTRACK is not set
215# CONFIG_IP_NF_CONNTRACK_MARK is not set
216# CONFIG_IP_NF_QUEUE is not set
217# CONFIG_IP_NF_IPTABLES is not set
218CONFIG_IP_NF_ARPTABLES=y
219# CONFIG_IP_NF_ARPFILTER is not set
220# CONFIG_IP_NF_ARP_MANGLE is not set
221
222#
223# SCTP Configuration (EXPERIMENTAL)
224#
225# CONFIG_IP_SCTP is not set
226# CONFIG_ATM is not set
227# CONFIG_BRIDGE is not set
228# CONFIG_VLAN_8021Q is not set
229# CONFIG_DECNET is not set
230# CONFIG_LLC2 is not set
231# CONFIG_IPX is not set
232# CONFIG_ATALK is not set
233# CONFIG_X25 is not set
234# CONFIG_LAPB is not set
235# CONFIG_NET_DIVERT is not set
236# CONFIG_ECONET is not set
237# CONFIG_WAN_ROUTER is not set
238# CONFIG_NET_SCHED is not set
239# CONFIG_NET_CLS_ROUTE is not set
240
241#
242# Network testing
243#
244# CONFIG_NET_PKTGEN is not set
245# CONFIG_HAMRADIO is not set
246# CONFIG_IRDA is not set
247# CONFIG_BT is not set
248
249#
172# Device Drivers 250# Device Drivers
173# 251#
174 252
@@ -349,6 +427,7 @@ CONFIG_SCSI_QLA2XXX=y
349# CONFIG_SCSI_QLA2300 is not set 427# CONFIG_SCSI_QLA2300 is not set
350# CONFIG_SCSI_QLA2322 is not set 428# CONFIG_SCSI_QLA2322 is not set
351# CONFIG_SCSI_QLA6312 is not set 429# CONFIG_SCSI_QLA6312 is not set
430# CONFIG_SCSI_QLA24XX is not set
352# CONFIG_SCSI_LPFC is not set 431# CONFIG_SCSI_LPFC is not set
353# CONFIG_SCSI_DC395x is not set 432# CONFIG_SCSI_DC395x is not set
354# CONFIG_SCSI_DC390T is not set 433# CONFIG_SCSI_DC390T is not set
@@ -362,9 +441,11 @@ CONFIG_SCSI_QLA2XXX=y
362# 441#
363# Fusion MPT device support 442# Fusion MPT device support
364# 443#
365# CONFIG_FUSION is not set 444CONFIG_FUSION=y
366# CONFIG_FUSION_SPI is not set 445CONFIG_FUSION_SPI=y
367# CONFIG_FUSION_FC is not set 446CONFIG_FUSION_FC=y
447CONFIG_FUSION_MAX_SGE=128
448CONFIG_FUSION_CTL=m
368 449
369# 450#
370# IEEE 1394 (FireWire) support 451# IEEE 1394 (FireWire) support
@@ -377,87 +458,8 @@ CONFIG_SCSI_QLA2XXX=y
377# CONFIG_I2O is not set 458# CONFIG_I2O is not set
378 459
379# 460#
380# Networking support 461# Network device support
381#
382CONFIG_NET=y
383
384#
385# Networking options
386#
387CONFIG_PACKET=y
388# CONFIG_PACKET_MMAP is not set
389CONFIG_UNIX=y
390# CONFIG_NET_KEY is not set
391CONFIG_INET=y
392CONFIG_IP_MULTICAST=y
393# CONFIG_IP_ADVANCED_ROUTER is not set
394CONFIG_IP_FIB_HASH=y
395# CONFIG_IP_PNP is not set
396# CONFIG_NET_IPIP is not set
397# CONFIG_NET_IPGRE is not set
398# CONFIG_IP_MROUTE is not set
399# CONFIG_ARPD is not set
400# CONFIG_SYN_COOKIES is not set
401# CONFIG_INET_AH is not set
402# CONFIG_INET_ESP is not set
403# CONFIG_INET_IPCOMP is not set
404# CONFIG_INET_TUNNEL is not set
405# CONFIG_IP_TCPDIAG is not set
406# CONFIG_IP_TCPDIAG_IPV6 is not set
407# CONFIG_TCP_CONG_ADVANCED is not set
408CONFIG_TCP_CONG_BIC=y
409
410#
411# IP: Virtual Server Configuration
412#
413# CONFIG_IP_VS is not set
414# CONFIG_IPV6 is not set
415CONFIG_NETFILTER=y
416# CONFIG_NETFILTER_DEBUG is not set
417
418#
419# IP: Netfilter Configuration
420# 462#
421# CONFIG_IP_NF_CONNTRACK is not set
422# CONFIG_IP_NF_CONNTRACK_MARK is not set
423# CONFIG_IP_NF_QUEUE is not set
424# CONFIG_IP_NF_IPTABLES is not set
425CONFIG_IP_NF_ARPTABLES=y
426# CONFIG_IP_NF_ARPFILTER is not set
427# CONFIG_IP_NF_ARP_MANGLE is not set
428
429#
430# SCTP Configuration (EXPERIMENTAL)
431#
432# CONFIG_IP_SCTP is not set
433# CONFIG_ATM is not set
434# CONFIG_BRIDGE is not set
435# CONFIG_VLAN_8021Q is not set
436# CONFIG_DECNET is not set
437# CONFIG_LLC2 is not set
438# CONFIG_IPX is not set
439# CONFIG_ATALK is not set
440# CONFIG_X25 is not set
441# CONFIG_LAPB is not set
442# CONFIG_NET_DIVERT is not set
443# CONFIG_ECONET is not set
444# CONFIG_WAN_ROUTER is not set
445
446#
447# QoS and/or fair queueing
448#
449# CONFIG_NET_SCHED is not set
450# CONFIG_NET_CLS_ROUTE is not set
451
452#
453# Network testing
454#
455# CONFIG_NET_PKTGEN is not set
456# CONFIG_NETPOLL is not set
457# CONFIG_NET_POLL_CONTROLLER is not set
458# CONFIG_HAMRADIO is not set
459# CONFIG_IRDA is not set
460# CONFIG_BT is not set
461CONFIG_NETDEVICES=y 463CONFIG_NETDEVICES=y
462CONFIG_DUMMY=y 464CONFIG_DUMMY=y
463# CONFIG_BONDING is not set 465# CONFIG_BONDING is not set
@@ -555,6 +557,8 @@ CONFIG_TIGON3=y
555# CONFIG_NET_FC is not set 557# CONFIG_NET_FC is not set
556# CONFIG_SHAPER is not set 558# CONFIG_SHAPER is not set
557# CONFIG_NETCONSOLE is not set 559# CONFIG_NETCONSOLE is not set
560# CONFIG_NETPOLL is not set
561# CONFIG_NET_POLL_CONTROLLER is not set
558 562
559# 563#
560# ISDN subsystem 564# ISDN subsystem
@@ -659,6 +663,7 @@ CONFIG_DRM=y
659CONFIG_DRM_RADEON=y 663CONFIG_DRM_RADEON=y
660# CONFIG_DRM_MGA is not set 664# CONFIG_DRM_MGA is not set
661# CONFIG_DRM_SIS is not set 665# CONFIG_DRM_SIS is not set
666# CONFIG_DRM_VIA is not set
662# CONFIG_RAW_DRIVER is not set 667# CONFIG_RAW_DRIVER is not set
663# CONFIG_HPET is not set 668# CONFIG_HPET is not set
664# CONFIG_HANGCHECK_TIMER is not set 669# CONFIG_HANGCHECK_TIMER is not set
@@ -706,47 +711,10 @@ CONFIG_I2C_ALGOPCF=y
706# CONFIG_I2C_VIAPRO is not set 711# CONFIG_I2C_VIAPRO is not set
707# CONFIG_I2C_VOODOO3 is not set 712# CONFIG_I2C_VOODOO3 is not set
708# CONFIG_I2C_PCA_ISA is not set 713# CONFIG_I2C_PCA_ISA is not set
714# CONFIG_I2C_SENSOR is not set
709 715
710# 716#
711# Hardware Sensors Chip support 717# Miscellaneous I2C Chip support
712#
713# CONFIG_I2C_SENSOR is not set
714# CONFIG_SENSORS_ADM1021 is not set
715# CONFIG_SENSORS_ADM1025 is not set
716# CONFIG_SENSORS_ADM1026 is not set
717# CONFIG_SENSORS_ADM1031 is not set
718# CONFIG_SENSORS_ADM9240 is not set
719# CONFIG_SENSORS_ASB100 is not set
720# CONFIG_SENSORS_ATXP1 is not set
721# CONFIG_SENSORS_DS1621 is not set
722# CONFIG_SENSORS_FSCHER is not set
723# CONFIG_SENSORS_FSCPOS is not set
724# CONFIG_SENSORS_GL518SM is not set
725# CONFIG_SENSORS_GL520SM is not set
726# CONFIG_SENSORS_IT87 is not set
727# CONFIG_SENSORS_LM63 is not set
728# CONFIG_SENSORS_LM75 is not set
729# CONFIG_SENSORS_LM77 is not set
730# CONFIG_SENSORS_LM78 is not set
731# CONFIG_SENSORS_LM80 is not set
732# CONFIG_SENSORS_LM83 is not set
733# CONFIG_SENSORS_LM85 is not set
734# CONFIG_SENSORS_LM87 is not set
735# CONFIG_SENSORS_LM90 is not set
736# CONFIG_SENSORS_LM92 is not set
737# CONFIG_SENSORS_MAX1619 is not set
738# CONFIG_SENSORS_PC87360 is not set
739# CONFIG_SENSORS_SMSC47B397 is not set
740# CONFIG_SENSORS_SIS5595 is not set
741# CONFIG_SENSORS_SMSC47M1 is not set
742# CONFIG_SENSORS_VIA686A is not set
743# CONFIG_SENSORS_W83781D is not set
744# CONFIG_SENSORS_W83L785TS is not set
745# CONFIG_SENSORS_W83627HF is not set
746# CONFIG_SENSORS_W83627EHF is not set
747
748#
749# Other I2C Chip support
750# 718#
751# CONFIG_SENSORS_DS1337 is not set 719# CONFIG_SENSORS_DS1337 is not set
752# CONFIG_SENSORS_DS1374 is not set 720# CONFIG_SENSORS_DS1374 is not set
@@ -767,6 +735,11 @@ CONFIG_I2C_ALGOPCF=y
767# CONFIG_W1 is not set 735# CONFIG_W1 is not set
768 736
769# 737#
738# Hardware Monitoring support
739#
740# CONFIG_HWMON is not set
741
742#
770# Misc devices 743# Misc devices
771# 744#
772 745
@@ -782,7 +755,6 @@ CONFIG_VIDEO_DEV=y
782# 755#
783# Video Adapters 756# Video Adapters
784# 757#
785# CONFIG_TUNER_MULTI_I2C is not set
786# CONFIG_VIDEO_BT848 is not set 758# CONFIG_VIDEO_BT848 is not set
787# CONFIG_VIDEO_CPIA is not set 759# CONFIG_VIDEO_CPIA is not set
788# CONFIG_VIDEO_SAA5246A is not set 760# CONFIG_VIDEO_SAA5246A is not set
@@ -1025,6 +997,7 @@ CONFIG_USB_HIDDEV=y
1025# CONFIG_USB_EGALAX is not set 997# CONFIG_USB_EGALAX is not set
1026# CONFIG_USB_XPAD is not set 998# CONFIG_USB_XPAD is not set
1027# CONFIG_USB_ATI_REMOTE is not set 999# CONFIG_USB_ATI_REMOTE is not set
1000# CONFIG_USB_KEYSPAN_REMOTE is not set
1028 1001
1029# 1002#
1030# USB Imaging devices 1003# USB Imaging devices
@@ -1080,6 +1053,7 @@ CONFIG_USB_MON=y
1080# CONFIG_USB_PHIDGETSERVO is not set 1053# CONFIG_USB_PHIDGETSERVO is not set
1081# CONFIG_USB_IDMOUSE is not set 1054# CONFIG_USB_IDMOUSE is not set
1082# CONFIG_USB_SISUSBVGA is not set 1055# CONFIG_USB_SISUSBVGA is not set
1056# CONFIG_USB_LD is not set
1083 1057
1084# 1058#
1085# USB DSL modem support 1059# USB DSL modem support
@@ -1121,6 +1095,7 @@ CONFIG_JBD=y
1121CONFIG_FS_MBCACHE=y 1095CONFIG_FS_MBCACHE=y
1122# CONFIG_REISERFS_FS is not set 1096# CONFIG_REISERFS_FS is not set
1123# CONFIG_JFS_FS is not set 1097# CONFIG_JFS_FS is not set
1098# CONFIG_FS_POSIX_ACL is not set
1124 1099
1125# 1100#
1126# XFS support 1101# XFS support
@@ -1128,6 +1103,7 @@ CONFIG_FS_MBCACHE=y
1128# CONFIG_XFS_FS is not set 1103# CONFIG_XFS_FS is not set
1129# CONFIG_MINIX_FS is not set 1104# CONFIG_MINIX_FS is not set
1130# CONFIG_ROMFS_FS is not set 1105# CONFIG_ROMFS_FS is not set
1106# CONFIG_INOTIFY is not set
1131# CONFIG_QUOTA is not set 1107# CONFIG_QUOTA is not set
1132CONFIG_DNOTIFY=y 1108CONFIG_DNOTIFY=y
1133CONFIG_AUTOFS_FS=y 1109CONFIG_AUTOFS_FS=y
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index b8ebb8e427ef..f1201ac8a116 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -4312,6 +4312,7 @@ pfm_context_load(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs)
4312 DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n", 4312 DPRINT(("before cmpxchg() old_ctx=%p new_ctx=%p\n",
4313 thread->pfm_context, ctx)); 4313 thread->pfm_context, ctx));
4314 4314
4315 ret = -EBUSY;
4315 old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *)); 4316 old = ia64_cmpxchg(acq, &thread->pfm_context, NULL, ctx, sizeof(pfm_context_t *));
4316 if (old != NULL) { 4317 if (old != NULL) {
4317 DPRINT(("load_pid [%d] already has a context\n", req->load_pid)); 4318 DPRINT(("load_pid [%d] already has a context\n", req->load_pid));
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index d227fabecd02..6f0cc7a6634e 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -143,7 +143,8 @@ struct salinfo_data {
143 143
144static struct salinfo_data salinfo_data[ARRAY_SIZE(salinfo_log_name)]; 144static struct salinfo_data salinfo_data[ARRAY_SIZE(salinfo_log_name)];
145 145
146static spinlock_t data_lock, data_saved_lock; 146static DEFINE_SPINLOCK(data_lock);
147static DEFINE_SPINLOCK(data_saved_lock);
147 148
148/** salinfo_platform_oemdata - optional callback to decode oemdata from an error 149/** salinfo_platform_oemdata - optional callback to decode oemdata from an error
149 * record. 150 * record.
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index a6649baf629a..37e10e010a2f 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -203,6 +203,7 @@ static void sn_fixup_ionodes(void)
203 continue; 203 continue;
204 } 204 }
205 205
206 spin_lock_init(&sn_flush_device_list->sfdl_flush_lock);
206 hubdev->hdi_flush_nasid_list.widget_p[widget] = 207 hubdev->hdi_flush_nasid_list.widget_p[widget] =
207 sn_flush_device_list; 208 sn_flush_device_list;
208 } 209 }
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 840815fde49b..12d1f14e78ce 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -1093,6 +1093,7 @@ int __init sn_serial_console_early_setup(void)
1093 return -1; 1093 return -1;
1094 1094
1095 sal_console_port.sc_ops = &poll_ops; 1095 sal_console_port.sc_ops = &poll_ops;
1096 spin_lock_init(&sal_console_port.sc_port.lock);
1096 early_sn_setup(); /* Find SAL entry points */ 1097 early_sn_setup(); /* Find SAL entry points */
1097 register_console(&sal_console_early); 1098 register_console(&sal_console_early);
1098 1099
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 07b9a065e9da..1697539a7171 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -287,6 +287,7 @@ out:
287 svc_exit_thread(rqstp); 287 svc_exit_thread(rqstp);
288 288
289 /* Release module */ 289 /* Release module */
290 unlock_kernel();
290 module_put_and_exit(0); 291 module_put_and_exit(0);
291} 292}
292 293
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index ace27480886e..abb36e54c966 100644
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -350,6 +350,11 @@
350#endif 350#endif
351 351
352#define __NR_vserver (__NR_SYSCALL_BASE+313) 352#define __NR_vserver (__NR_SYSCALL_BASE+313)
353#define __NR_ioprio_set (__NR_SYSCALL_BASE+314)
354#define __NR_ioprio_get (__NR_SYSCALL_BASE+315)
355#define __NR_inotify_init (__NR_SYSCALL_BASE+316)
356#define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317)
357#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318)
353 358
354/* 359/*
355 * The following SWIs are ARM private. 360 * The following SWIs are ARM private.
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h
index 1093f35b3b90..a429fe225b07 100644
--- a/include/asm-ia64/iosapic.h
+++ b/include/asm-ia64/iosapic.h
@@ -75,6 +75,8 @@ extern int __devinit iosapic_init (unsigned long address,
75 unsigned int gsi_base); 75 unsigned int gsi_base);
76#ifdef CONFIG_HOTPLUG 76#ifdef CONFIG_HOTPLUG
77extern int iosapic_remove (unsigned int gsi_base); 77extern int iosapic_remove (unsigned int gsi_base);
78#else
79#define iosapic_remove(gsi_base) (-EINVAL)
78#endif /* CONFIG_HOTPLUG */ 80#endif /* CONFIG_HOTPLUG */
79extern int gsi_to_vector (unsigned int gsi); 81extern int gsi_to_vector (unsigned int gsi);
80extern int gsi_to_irq (unsigned int gsi); 82extern int gsi_to_irq (unsigned int gsi);
@@ -102,9 +104,7 @@ extern void __devinit map_iosapic_to_node (unsigned int, int);
102#else 104#else
103#define iosapic_system_init(pcat_compat) do { } while (0) 105#define iosapic_system_init(pcat_compat) do { } while (0)
104#define iosapic_init(address,gsi_base) (-EINVAL) 106#define iosapic_init(address,gsi_base) (-EINVAL)
105#ifdef CONFIG_HOTPLUG
106#define iosapic_remove(gsi_base) (-ENODEV) 107#define iosapic_remove(gsi_base) (-ENODEV)
107#endif /* CONFIG_HOTPLUG */
108#define iosapic_register_intr(gsi,polarity,trigger) (gsi) 108#define iosapic_register_intr(gsi,polarity,trigger) (gsi)
109#define iosapic_unregister_intr(irq) do { } while (0) 109#define iosapic_unregister_intr(irq) do { } while (0)
110#define iosapic_override_isa_irq(isa_irq,gsi,polarity,trigger) do { } while (0) 110#define iosapic_override_isa_irq(isa_irq,gsi,polarity,trigger) do { } while (0)
diff --git a/kernel/signal.c b/kernel/signal.c
index ca1186eef938..d282fea81138 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -692,7 +692,7 @@ static void handle_stop_signal(int sig, struct task_struct *p)
692{ 692{
693 struct task_struct *t; 693 struct task_struct *t;
694 694
695 if (p->flags & SIGNAL_GROUP_EXIT) 695 if (p->signal->flags & SIGNAL_GROUP_EXIT)
696 /* 696 /*
697 * The process is in the middle of dying already. 697 * The process is in the middle of dying already.
698 */ 698 */
diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c
index c5f66fbb0dd0..874950ec4858 100644
--- a/lib/zlib_inflate/inftrees.c
+++ b/lib/zlib_inflate/inftrees.c
@@ -141,7 +141,7 @@ static int huft_build(
141 { 141 {
142 *t = NULL; 142 *t = NULL;
143 *m = 0; 143 *m = 0;
144 return Z_DATA_ERROR; 144 return Z_OK;
145 } 145 }
146 146
147 147
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-01 07:30:34 -0500