aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-12 13:50:03 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-12 13:50:03 -0400
commite049d1ca3094f3d1d94617f456a9961202f96e3a (patch)
treea30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/ia64
parentedfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff)
parent80584ff3b99c36ead7e130e453b3a48b18072d18 (diff)
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/Kconfig1
-rw-r--r--arch/ia64/configs/tiger_defconfig263
-rw-r--r--arch/ia64/configs/zx1_defconfig344
-rw-r--r--arch/ia64/defconfig321
-rw-r--r--arch/ia64/kernel/asm-offsets.c1
-rw-r--r--arch/ia64/kernel/crash.c12
-rw-r--r--arch/ia64/kernel/efi.c12
-rw-r--r--arch/ia64/kernel/fsys.S105
-rw-r--r--arch/ia64/kernel/iosapic.c8
-rw-r--r--arch/ia64/kernel/mca.c8
-rw-r--r--arch/ia64/kernel/mca_drv.c65
-rw-r--r--arch/ia64/kernel/msi_ia64.c6
-rw-r--r--arch/ia64/kernel/ptrace.c1
-rw-r--r--arch/ia64/kernel/setup.c26
-rw-r--r--arch/ia64/kernel/smpboot.c17
-rw-r--r--arch/ia64/mm/contig.c30
-rw-r--r--arch/ia64/mm/discontig.c4
-rw-r--r--arch/ia64/mm/init.c18
-rw-r--r--arch/ia64/pci/pci.c7
-rw-r--r--arch/ia64/sn/kernel/bte_error.c6
-rw-r--r--arch/ia64/sn/kernel/io_acpi_init.c44
-rw-r--r--arch/ia64/sn/kernel/io_init.c12
-rw-r--r--arch/ia64/sn/kernel/irq.c14
-rw-r--r--arch/ia64/sn/kernel/setup.c8
-rw-r--r--arch/ia64/sn/pci/pcibr/pcibr_dma.c8
25 files changed, 1016 insertions, 325 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index d51f0f11f7f9..e19185d26554 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -13,6 +13,7 @@ config IA64
13 bool 13 bool
14 select PCI if (!IA64_HP_SIM) 14 select PCI if (!IA64_HP_SIM)
15 select ACPI if (!IA64_HP_SIM) 15 select ACPI if (!IA64_HP_SIM)
16 select PM if (!IA64_HP_SIM)
16 default y 17 default y
17 help 18 help
18 The Itanium Processor Family is Intel's 64-bit successor to 19 The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 9d1cffb57cde..a1446931b401 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -1,8 +1,9 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc5 3# Linux kernel version: 2.6.21-rc3
4# Mon Feb 27 15:49:18 2006 4# Thu Mar 8 11:07:09 2007
5# 5#
6CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
6 7
7# 8#
8# Code maturity level options 9# Code maturity level options
@@ -18,16 +19,24 @@ CONFIG_LOCALVERSION=""
18CONFIG_LOCALVERSION_AUTO=y 19CONFIG_LOCALVERSION_AUTO=y
19CONFIG_SWAP=y 20CONFIG_SWAP=y
20CONFIG_SYSVIPC=y 21CONFIG_SYSVIPC=y
22# CONFIG_IPC_NS is not set
23CONFIG_SYSVIPC_SYSCTL=y
21CONFIG_POSIX_MQUEUE=y 24CONFIG_POSIX_MQUEUE=y
22# CONFIG_BSD_PROCESS_ACCT is not set 25# CONFIG_BSD_PROCESS_ACCT is not set
23CONFIG_SYSCTL=y 26# CONFIG_TASKSTATS is not set
27# CONFIG_UTS_NS is not set
24# CONFIG_AUDIT is not set 28# CONFIG_AUDIT is not set
25CONFIG_IKCONFIG=y 29CONFIG_IKCONFIG=y
26CONFIG_IKCONFIG_PROC=y 30CONFIG_IKCONFIG_PROC=y
27# CONFIG_CPUSETS is not set 31# CONFIG_CPUSETS is not set
32CONFIG_SYSFS_DEPRECATED=y
33# CONFIG_RELAY is not set
34CONFIG_BLK_DEV_INITRD=y
28CONFIG_INITRAMFS_SOURCE="" 35CONFIG_INITRAMFS_SOURCE=""
29CONFIG_CC_OPTIMIZE_FOR_SIZE=y 36CONFIG_CC_OPTIMIZE_FOR_SIZE=y
37CONFIG_SYSCTL=y
30# CONFIG_EMBEDDED is not set 38# CONFIG_EMBEDDED is not set
39CONFIG_SYSCTL_SYSCALL=y
31CONFIG_KALLSYMS=y 40CONFIG_KALLSYMS=y
32CONFIG_KALLSYMS_ALL=y 41CONFIG_KALLSYMS_ALL=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set 42# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -39,11 +48,9 @@ CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 48CONFIG_FUTEX=y
40CONFIG_EPOLL=y 49CONFIG_EPOLL=y
41CONFIG_SHMEM=y 50CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46CONFIG_SLAB=y 51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y
53CONFIG_RT_MUTEXES=y
47# CONFIG_TINY_SHMEM is not set 54# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0 55CONFIG_BASE_SMALL=0
49# CONFIG_SLOB is not set 56# CONFIG_SLOB is not set
@@ -54,7 +61,6 @@ CONFIG_BASE_SMALL=0
54CONFIG_MODULES=y 61CONFIG_MODULES=y
55CONFIG_MODULE_UNLOAD=y 62CONFIG_MODULE_UNLOAD=y
56# CONFIG_MODULE_FORCE_UNLOAD is not set 63# CONFIG_MODULE_FORCE_UNLOAD is not set
57CONFIG_OBSOLETE_MODPARM=y
58CONFIG_MODVERSIONS=y 64CONFIG_MODVERSIONS=y
59CONFIG_MODULE_SRCVERSION_ALL=y 65CONFIG_MODULE_SRCVERSION_ALL=y
60CONFIG_KMOD=y 66CONFIG_KMOD=y
@@ -63,6 +69,8 @@ CONFIG_STOP_MACHINE=y
63# 69#
64# Block layer 70# Block layer
65# 71#
72CONFIG_BLOCK=y
73# CONFIG_BLK_DEV_IO_TRACE is not set
66 74
67# 75#
68# IO Schedulers 76# IO Schedulers
@@ -82,15 +90,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
82# 90#
83CONFIG_IA64=y 91CONFIG_IA64=y
84CONFIG_64BIT=y 92CONFIG_64BIT=y
93CONFIG_ZONE_DMA=y
85CONFIG_MMU=y 94CONFIG_MMU=y
86CONFIG_SWIOTLB=y 95CONFIG_SWIOTLB=y
87CONFIG_RWSEM_XCHGADD_ALGORITHM=y 96CONFIG_RWSEM_XCHGADD_ALGORITHM=y
97# CONFIG_ARCH_HAS_ILOG2_U32 is not set
98# CONFIG_ARCH_HAS_ILOG2_U64 is not set
99CONFIG_GENERIC_FIND_NEXT_BIT=y
88CONFIG_GENERIC_CALIBRATE_DELAY=y 100CONFIG_GENERIC_CALIBRATE_DELAY=y
89CONFIG_TIME_INTERPOLATION=y 101CONFIG_TIME_INTERPOLATION=y
102CONFIG_DMI=y
90CONFIG_EFI=y 103CONFIG_EFI=y
91CONFIG_GENERIC_IOMAP=y 104CONFIG_GENERIC_IOMAP=y
92CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 105CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
93CONFIG_DMA_IS_DMA32=y 106CONFIG_AUDIT_ARCH=y
94# CONFIG_IA64_GENERIC is not set 107# CONFIG_IA64_GENERIC is not set
95CONFIG_IA64_DIG=y 108CONFIG_IA64_DIG=y
96# CONFIG_IA64_HP_ZX1 is not set 109# CONFIG_IA64_HP_ZX1 is not set
@@ -107,6 +120,7 @@ CONFIG_PGTABLE_3=y
107# CONFIG_PGTABLE_4 is not set 120# CONFIG_PGTABLE_4 is not set
108# CONFIG_HZ_100 is not set 121# CONFIG_HZ_100 is not set
109CONFIG_HZ_250=y 122CONFIG_HZ_250=y
123# CONFIG_HZ_300 is not set
110# CONFIG_HZ_1000 is not set 124# CONFIG_HZ_1000 is not set
111CONFIG_HZ=250 125CONFIG_HZ=250
112CONFIG_IA64_L1_CACHE_SHIFT=7 126CONFIG_IA64_L1_CACHE_SHIFT=7
@@ -116,9 +130,10 @@ CONFIG_FORCE_MAX_ZONEORDER=17
116CONFIG_SMP=y 130CONFIG_SMP=y
117CONFIG_NR_CPUS=16 131CONFIG_NR_CPUS=16
118CONFIG_HOTPLUG_CPU=y 132CONFIG_HOTPLUG_CPU=y
133CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
134# CONFIG_SCHED_SMT is not set
119CONFIG_PERMIT_BSP_REMOVE=y 135CONFIG_PERMIT_BSP_REMOVE=y
120CONFIG_FORCE_CPEI_RETARGET=y 136CONFIG_FORCE_CPEI_RETARGET=y
121# CONFIG_SCHED_SMT is not set
122# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
123CONFIG_SELECT_MEMORY_MODEL=y 138CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y 139CONFIG_FLATMEM_MANUAL=y
@@ -128,10 +143,13 @@ CONFIG_FLATMEM=y
128CONFIG_FLAT_NODE_MEM_MAP=y 143CONFIG_FLAT_NODE_MEM_MAP=y
129# CONFIG_SPARSEMEM_STATIC is not set 144# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4 145CONFIG_SPLIT_PTLOCK_CPUS=4
146CONFIG_RESOURCES_64BIT=y
147CONFIG_ZONE_DMA_FLAG=1
131CONFIG_ARCH_SELECT_MEMORY_MODEL=y 148CONFIG_ARCH_SELECT_MEMORY_MODEL=y
132CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 149CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
133CONFIG_ARCH_FLATMEM_ENABLE=y 150CONFIG_ARCH_FLATMEM_ENABLE=y
134CONFIG_ARCH_SPARSEMEM_ENABLE=y 151CONFIG_ARCH_SPARSEMEM_ENABLE=y
152CONFIG_ARCH_POPULATES_NODE_MAP=y
135CONFIG_VIRTUAL_MEM_MAP=y 153CONFIG_VIRTUAL_MEM_MAP=y
136CONFIG_HOLES_IN_ZONE=y 154CONFIG_HOLES_IN_ZONE=y
137CONFIG_IA32_SUPPORT=y 155CONFIG_IA32_SUPPORT=y
@@ -139,6 +157,9 @@ CONFIG_COMPAT=y
139CONFIG_IA64_MCA_RECOVERY=y 157CONFIG_IA64_MCA_RECOVERY=y
140CONFIG_PERFMON=y 158CONFIG_PERFMON=y
141CONFIG_IA64_PALINFO=y 159CONFIG_IA64_PALINFO=y
160# CONFIG_IA64_ESI is not set
161CONFIG_KEXEC=y
162# CONFIG_CRASH_DUMP is not set
142 163
143# 164#
144# Firmware Drivers 165# Firmware Drivers
@@ -154,13 +175,16 @@ CONFIG_BINFMT_MISC=m
154CONFIG_PM=y 175CONFIG_PM=y
155CONFIG_PM_LEGACY=y 176CONFIG_PM_LEGACY=y
156# CONFIG_PM_DEBUG is not set 177# CONFIG_PM_DEBUG is not set
178# CONFIG_PM_SYSFS_DEPRECATED is not set
157 179
158# 180#
159# ACPI (Advanced Configuration and Power Interface) Support 181# ACPI (Advanced Configuration and Power Interface) Support
160# 182#
161CONFIG_ACPI=y 183CONFIG_ACPI=y
184CONFIG_ACPI_PROCFS=y
162CONFIG_ACPI_BUTTON=m 185CONFIG_ACPI_BUTTON=m
163CONFIG_ACPI_FAN=m 186CONFIG_ACPI_FAN=m
187# CONFIG_ACPI_DOCK is not set
164CONFIG_ACPI_PROCESSOR=m 188CONFIG_ACPI_PROCESSOR=m
165CONFIG_ACPI_HOTPLUG_CPU=y 189CONFIG_ACPI_HOTPLUG_CPU=y
166CONFIG_ACPI_THERMAL=m 190CONFIG_ACPI_THERMAL=m
@@ -181,8 +205,8 @@ CONFIG_ACPI_CONTAINER=m
181# 205#
182CONFIG_PCI=y 206CONFIG_PCI=y
183CONFIG_PCI_DOMAINS=y 207CONFIG_PCI_DOMAINS=y
208# CONFIG_PCIEPORTBUS is not set
184# CONFIG_PCI_MSI is not set 209# CONFIG_PCI_MSI is not set
185CONFIG_PCI_LEGACY_PROC=y
186# CONFIG_PCI_DEBUG is not set 210# CONFIG_PCI_DEBUG is not set
187 211
188# 212#
@@ -212,6 +236,10 @@ CONFIG_NET=y
212CONFIG_PACKET=y 236CONFIG_PACKET=y
213# CONFIG_PACKET_MMAP is not set 237# CONFIG_PACKET_MMAP is not set
214CONFIG_UNIX=y 238CONFIG_UNIX=y
239CONFIG_XFRM=y
240# CONFIG_XFRM_USER is not set
241# CONFIG_XFRM_SUB_POLICY is not set
242# CONFIG_XFRM_MIGRATE is not set
215# CONFIG_NET_KEY is not set 243# CONFIG_NET_KEY is not set
216CONFIG_INET=y 244CONFIG_INET=y
217CONFIG_IP_MULTICAST=y 245CONFIG_IP_MULTICAST=y
@@ -226,12 +254,21 @@ CONFIG_SYN_COOKIES=y
226# CONFIG_INET_AH is not set 254# CONFIG_INET_AH is not set
227# CONFIG_INET_ESP is not set 255# CONFIG_INET_ESP is not set
228# CONFIG_INET_IPCOMP is not set 256# CONFIG_INET_IPCOMP is not set
257# CONFIG_INET_XFRM_TUNNEL is not set
229# CONFIG_INET_TUNNEL is not set 258# CONFIG_INET_TUNNEL is not set
259CONFIG_INET_XFRM_MODE_TRANSPORT=y
260CONFIG_INET_XFRM_MODE_TUNNEL=y
261CONFIG_INET_XFRM_MODE_BEET=y
230CONFIG_INET_DIAG=y 262CONFIG_INET_DIAG=y
231CONFIG_INET_TCP_DIAG=y 263CONFIG_INET_TCP_DIAG=y
232# CONFIG_TCP_CONG_ADVANCED is not set 264# CONFIG_TCP_CONG_ADVANCED is not set
233CONFIG_TCP_CONG_BIC=y 265CONFIG_TCP_CONG_CUBIC=y
266CONFIG_DEFAULT_TCP_CONG="cubic"
267# CONFIG_TCP_MD5SIG is not set
234# CONFIG_IPV6 is not set 268# CONFIG_IPV6 is not set
269# CONFIG_INET6_XFRM_TUNNEL is not set
270# CONFIG_INET6_TUNNEL is not set
271# CONFIG_NETWORK_SECMARK is not set
235# CONFIG_NETFILTER is not set 272# CONFIG_NETFILTER is not set
236 273
237# 274#
@@ -257,7 +294,6 @@ CONFIG_TCP_CONG_BIC=y
257# CONFIG_ATALK is not set 294# CONFIG_ATALK is not set
258# CONFIG_X25 is not set 295# CONFIG_X25 is not set
259# CONFIG_LAPB is not set 296# CONFIG_LAPB is not set
260# CONFIG_NET_DIVERT is not set
261# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
262# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
263 299
@@ -286,6 +322,8 @@ CONFIG_STANDALONE=y
286CONFIG_PREVENT_FIRMWARE_BUILD=y 322CONFIG_PREVENT_FIRMWARE_BUILD=y
287CONFIG_FW_LOADER=m 323CONFIG_FW_LOADER=m
288# CONFIG_DEBUG_DRIVER is not set 324# CONFIG_DEBUG_DRIVER is not set
325# CONFIG_DEBUG_DEVRES is not set
326# CONFIG_SYS_HYPERVISOR is not set
289 327
290# 328#
291# Connector - unified userspace <-> kernelspace linker 329# Connector - unified userspace <-> kernelspace linker
@@ -329,11 +367,17 @@ CONFIG_BLK_DEV_NBD=m
329CONFIG_BLK_DEV_RAM=y 367CONFIG_BLK_DEV_RAM=y
330CONFIG_BLK_DEV_RAM_COUNT=16 368CONFIG_BLK_DEV_RAM_COUNT=16
331CONFIG_BLK_DEV_RAM_SIZE=4096 369CONFIG_BLK_DEV_RAM_SIZE=4096
332CONFIG_BLK_DEV_INITRD=y 370CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
333# CONFIG_CDROM_PKTCDVD is not set 371# CONFIG_CDROM_PKTCDVD is not set
334# CONFIG_ATA_OVER_ETH is not set 372# CONFIG_ATA_OVER_ETH is not set
335 373
336# 374#
375# Misc devices
376#
377# CONFIG_SGI_IOC4 is not set
378# CONFIG_TIFM_CORE is not set
379
380#
337# ATA/ATAPI/MFM/RLL support 381# ATA/ATAPI/MFM/RLL support
338# 382#
339CONFIG_IDE=y 383CONFIG_IDE=y
@@ -350,6 +394,7 @@ CONFIG_BLK_DEV_IDECD=y
350# CONFIG_BLK_DEV_IDETAPE is not set 394# CONFIG_BLK_DEV_IDETAPE is not set
351CONFIG_BLK_DEV_IDEFLOPPY=y 395CONFIG_BLK_DEV_IDEFLOPPY=y
352CONFIG_BLK_DEV_IDESCSI=m 396CONFIG_BLK_DEV_IDESCSI=m
397# CONFIG_BLK_DEV_IDEACPI is not set
353# CONFIG_IDE_TASK_IOCTL is not set 398# CONFIG_IDE_TASK_IOCTL is not set
354 399
355# 400#
@@ -376,8 +421,10 @@ CONFIG_BLK_DEV_CMD64X=y
376# CONFIG_BLK_DEV_CS5530 is not set 421# CONFIG_BLK_DEV_CS5530 is not set
377# CONFIG_BLK_DEV_HPT34X is not set 422# CONFIG_BLK_DEV_HPT34X is not set
378# CONFIG_BLK_DEV_HPT366 is not set 423# CONFIG_BLK_DEV_HPT366 is not set
424# CONFIG_BLK_DEV_JMICRON is not set
379# CONFIG_BLK_DEV_SC1200 is not set 425# CONFIG_BLK_DEV_SC1200 is not set
380CONFIG_BLK_DEV_PIIX=y 426CONFIG_BLK_DEV_PIIX=y
427# CONFIG_BLK_DEV_IT8213 is not set
381# CONFIG_BLK_DEV_IT821X is not set 428# CONFIG_BLK_DEV_IT821X is not set
382# CONFIG_BLK_DEV_NS87415 is not set 429# CONFIG_BLK_DEV_NS87415 is not set
383# CONFIG_BLK_DEV_PDC202XX_OLD is not set 430# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -387,6 +434,7 @@ CONFIG_BLK_DEV_PIIX=y
387# CONFIG_BLK_DEV_SLC90E66 is not set 434# CONFIG_BLK_DEV_SLC90E66 is not set
388# CONFIG_BLK_DEV_TRM290 is not set 435# CONFIG_BLK_DEV_TRM290 is not set
389# CONFIG_BLK_DEV_VIA82CXXX is not set 436# CONFIG_BLK_DEV_VIA82CXXX is not set
437# CONFIG_BLK_DEV_TC86C001 is not set
390# CONFIG_IDE_ARM is not set 438# CONFIG_IDE_ARM is not set
391CONFIG_BLK_DEV_IDEDMA=y 439CONFIG_BLK_DEV_IDEDMA=y
392# CONFIG_IDEDMA_IVB is not set 440# CONFIG_IDEDMA_IVB is not set
@@ -398,6 +446,8 @@ CONFIG_IDEDMA_AUTO=y
398# 446#
399# CONFIG_RAID_ATTRS is not set 447# CONFIG_RAID_ATTRS is not set
400CONFIG_SCSI=y 448CONFIG_SCSI=y
449# CONFIG_SCSI_TGT is not set
450CONFIG_SCSI_NETLINK=y
401CONFIG_SCSI_PROC_FS=y 451CONFIG_SCSI_PROC_FS=y
402 452
403# 453#
@@ -417,14 +467,16 @@ CONFIG_CHR_DEV_SG=m
417# CONFIG_SCSI_MULTI_LUN is not set 467# CONFIG_SCSI_MULTI_LUN is not set
418# CONFIG_SCSI_CONSTANTS is not set 468# CONFIG_SCSI_CONSTANTS is not set
419# CONFIG_SCSI_LOGGING is not set 469# CONFIG_SCSI_LOGGING is not set
470# CONFIG_SCSI_SCAN_ASYNC is not set
420 471
421# 472#
422# SCSI Transport Attributes 473# SCSI Transports
423# 474#
424CONFIG_SCSI_SPI_ATTRS=y 475CONFIG_SCSI_SPI_ATTRS=y
425CONFIG_SCSI_FC_ATTRS=y 476CONFIG_SCSI_FC_ATTRS=y
426# CONFIG_SCSI_ISCSI_ATTRS is not set 477# CONFIG_SCSI_ISCSI_ATTRS is not set
427# CONFIG_SCSI_SAS_ATTRS is not set 478# CONFIG_SCSI_SAS_ATTRS is not set
479# CONFIG_SCSI_SAS_LIBSAS is not set
428 480
429# 481#
430# SCSI low-level drivers 482# SCSI low-level drivers
@@ -437,29 +489,36 @@ CONFIG_SCSI_FC_ATTRS=y
437# CONFIG_SCSI_AIC7XXX is not set 489# CONFIG_SCSI_AIC7XXX is not set
438# CONFIG_SCSI_AIC7XXX_OLD is not set 490# CONFIG_SCSI_AIC7XXX_OLD is not set
439# CONFIG_SCSI_AIC79XX is not set 491# CONFIG_SCSI_AIC79XX is not set
492# CONFIG_SCSI_AIC94XX is not set
493# CONFIG_SCSI_ARCMSR is not set
440# CONFIG_MEGARAID_NEWGEN is not set 494# CONFIG_MEGARAID_NEWGEN is not set
441# CONFIG_MEGARAID_LEGACY is not set 495# CONFIG_MEGARAID_LEGACY is not set
442# CONFIG_MEGARAID_SAS is not set 496# CONFIG_MEGARAID_SAS is not set
443# CONFIG_SCSI_SATA is not set 497# CONFIG_SCSI_HPTIOP is not set
444# CONFIG_SCSI_DMX3191D is not set 498# CONFIG_SCSI_DMX3191D is not set
445# CONFIG_SCSI_FUTURE_DOMAIN is not set 499# CONFIG_SCSI_FUTURE_DOMAIN is not set
446# CONFIG_SCSI_IPS is not set 500# CONFIG_SCSI_IPS is not set
447# CONFIG_SCSI_INITIO is not set 501# CONFIG_SCSI_INITIO is not set
448# CONFIG_SCSI_INIA100 is not set 502# CONFIG_SCSI_INIA100 is not set
503# CONFIG_SCSI_STEX is not set
449CONFIG_SCSI_SYM53C8XX_2=y 504CONFIG_SCSI_SYM53C8XX_2=y
450CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 505CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
451CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 506CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
452CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 507CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
453# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 508CONFIG_SCSI_SYM53C8XX_MMIO=y
454# CONFIG_SCSI_IPR is not set
455CONFIG_SCSI_QLOGIC_FC=y
456# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
457CONFIG_SCSI_QLOGIC_1280=y 509CONFIG_SCSI_QLOGIC_1280=y
458# CONFIG_SCSI_QLA_FC is not set 510# CONFIG_SCSI_QLA_FC is not set
511# CONFIG_SCSI_QLA_ISCSI is not set
459# CONFIG_SCSI_LPFC is not set 512# CONFIG_SCSI_LPFC is not set
460# CONFIG_SCSI_DC395x is not set 513# CONFIG_SCSI_DC395x is not set
461# CONFIG_SCSI_DC390T is not set 514# CONFIG_SCSI_DC390T is not set
462# CONFIG_SCSI_DEBUG is not set 515# CONFIG_SCSI_DEBUG is not set
516# CONFIG_SCSI_SRP is not set
517
518#
519# Serial ATA (prod) and Parallel ATA (experimental) drivers
520#
521# CONFIG_ATA is not set
463 522
464# 523#
465# Multi-device support (RAID and LVM) 524# Multi-device support (RAID and LVM)
@@ -470,11 +529,11 @@ CONFIG_MD_LINEAR=m
470CONFIG_MD_RAID0=m 529CONFIG_MD_RAID0=m
471CONFIG_MD_RAID1=m 530CONFIG_MD_RAID1=m
472# CONFIG_MD_RAID10 is not set 531# CONFIG_MD_RAID10 is not set
473CONFIG_MD_RAID5=m 532# CONFIG_MD_RAID456 is not set
474CONFIG_MD_RAID6=m
475CONFIG_MD_MULTIPATH=m 533CONFIG_MD_MULTIPATH=m
476# CONFIG_MD_FAULTY is not set 534# CONFIG_MD_FAULTY is not set
477CONFIG_BLK_DEV_DM=m 535CONFIG_BLK_DEV_DM=m
536# CONFIG_DM_DEBUG is not set
478CONFIG_DM_CRYPT=m 537CONFIG_DM_CRYPT=m
479CONFIG_DM_SNAPSHOT=m 538CONFIG_DM_SNAPSHOT=m
480CONFIG_DM_MIRROR=m 539CONFIG_DM_MIRROR=m
@@ -563,6 +622,7 @@ CONFIG_E100=m
563# CONFIG_EPIC100 is not set 622# CONFIG_EPIC100 is not set
564# CONFIG_SUNDANCE is not set 623# CONFIG_SUNDANCE is not set
565# CONFIG_VIA_RHINE is not set 624# CONFIG_VIA_RHINE is not set
625# CONFIG_SC92031 is not set
566 626
567# 627#
568# Ethernet (1000 Mbit) 628# Ethernet (1000 Mbit)
@@ -583,13 +643,18 @@ CONFIG_E1000=y
583# CONFIG_VIA_VELOCITY is not set 643# CONFIG_VIA_VELOCITY is not set
584CONFIG_TIGON3=y 644CONFIG_TIGON3=y
585# CONFIG_BNX2 is not set 645# CONFIG_BNX2 is not set
646# CONFIG_QLA3XXX is not set
647# CONFIG_ATL1 is not set
586 648
587# 649#
588# Ethernet (10000 Mbit) 650# Ethernet (10000 Mbit)
589# 651#
590# CONFIG_CHELSIO_T1 is not set 652# CONFIG_CHELSIO_T1 is not set
653# CONFIG_CHELSIO_T3 is not set
591# CONFIG_IXGB is not set 654# CONFIG_IXGB is not set
592# CONFIG_S2IO is not set 655# CONFIG_S2IO is not set
656# CONFIG_MYRI10GE is not set
657# CONFIG_NETXEN_NIC is not set
593 658
594# 659#
595# Token Ring devices 660# Token Ring devices
@@ -631,6 +696,7 @@ CONFIG_NET_POLL_CONTROLLER=y
631# Input device support 696# Input device support
632# 697#
633CONFIG_INPUT=y 698CONFIG_INPUT=y
699# CONFIG_INPUT_FF_MEMLESS is not set
634 700
635# 701#
636# Userland interfaces 702# Userland interfaces
@@ -653,6 +719,7 @@ CONFIG_KEYBOARD_ATKBD=y
653# CONFIG_KEYBOARD_LKKBD is not set 719# CONFIG_KEYBOARD_LKKBD is not set
654# CONFIG_KEYBOARD_XTKBD is not set 720# CONFIG_KEYBOARD_XTKBD is not set
655# CONFIG_KEYBOARD_NEWTON is not set 721# CONFIG_KEYBOARD_NEWTON is not set
722# CONFIG_KEYBOARD_STOWAWAY is not set
656CONFIG_INPUT_MOUSE=y 723CONFIG_INPUT_MOUSE=y
657CONFIG_MOUSE_PS2=y 724CONFIG_MOUSE_PS2=y
658# CONFIG_MOUSE_SERIAL is not set 725# CONFIG_MOUSE_SERIAL is not set
@@ -682,6 +749,7 @@ CONFIG_GAMEPORT=m
682CONFIG_VT=y 749CONFIG_VT=y
683CONFIG_VT_CONSOLE=y 750CONFIG_VT_CONSOLE=y
684CONFIG_HW_CONSOLE=y 751CONFIG_HW_CONSOLE=y
752# CONFIG_VT_HW_CONSOLE_BINDING is not set
685CONFIG_SERIAL_NONSTANDARD=y 753CONFIG_SERIAL_NONSTANDARD=y
686# CONFIG_COMPUTONE is not set 754# CONFIG_COMPUTONE is not set
687# CONFIG_ROCKETPORT is not set 755# CONFIG_ROCKETPORT is not set
@@ -689,12 +757,14 @@ CONFIG_SERIAL_NONSTANDARD=y
689# CONFIG_DIGIEPCA is not set 757# CONFIG_DIGIEPCA is not set
690# CONFIG_MOXA_INTELLIO is not set 758# CONFIG_MOXA_INTELLIO is not set
691# CONFIG_MOXA_SMARTIO is not set 759# CONFIG_MOXA_SMARTIO is not set
760# CONFIG_MOXA_SMARTIO_NEW is not set
692# CONFIG_ISI is not set 761# CONFIG_ISI is not set
693# CONFIG_SYNCLINKMP is not set 762# CONFIG_SYNCLINKMP is not set
694# CONFIG_SYNCLINK_GT is not set 763# CONFIG_SYNCLINK_GT is not set
695# CONFIG_N_HDLC is not set 764# CONFIG_N_HDLC is not set
696# CONFIG_SPECIALIX is not set 765# CONFIG_SPECIALIX is not set
697# CONFIG_SX is not set 766# CONFIG_SX is not set
767# CONFIG_RIO is not set
698# CONFIG_STALDRV is not set 768# CONFIG_STALDRV is not set
699 769
700# 770#
@@ -702,7 +772,8 @@ CONFIG_SERIAL_NONSTANDARD=y
702# 772#
703CONFIG_SERIAL_8250=y 773CONFIG_SERIAL_8250=y
704CONFIG_SERIAL_8250_CONSOLE=y 774CONFIG_SERIAL_8250_CONSOLE=y
705CONFIG_SERIAL_8250_ACPI=y 775CONFIG_SERIAL_8250_PCI=y
776CONFIG_SERIAL_8250_PNP=y
706CONFIG_SERIAL_8250_NR_UARTS=6 777CONFIG_SERIAL_8250_NR_UARTS=6
707CONFIG_SERIAL_8250_RUNTIME_UARTS=4 778CONFIG_SERIAL_8250_RUNTIME_UARTS=4
708CONFIG_SERIAL_8250_EXTENDED=y 779CONFIG_SERIAL_8250_EXTENDED=y
@@ -734,10 +805,6 @@ CONFIG_EFI_RTC=y
734# CONFIG_DTLK is not set 805# CONFIG_DTLK is not set
735# CONFIG_R3964 is not set 806# CONFIG_R3964 is not set
736# CONFIG_APPLICOM is not set 807# CONFIG_APPLICOM is not set
737
738#
739# Ftape, the floppy tape device driver
740#
741CONFIG_AGP=m 808CONFIG_AGP=m
742CONFIG_AGP_I460=m 809CONFIG_AGP_I460=m
743CONFIG_DRM=m 810CONFIG_DRM=m
@@ -759,7 +826,6 @@ CONFIG_HPET_MMAP=y
759# TPM devices 826# TPM devices
760# 827#
761# CONFIG_TCG_TPM is not set 828# CONFIG_TCG_TPM is not set
762# CONFIG_TELCLOCK is not set
763 829
764# 830#
765# I2C support 831# I2C support
@@ -782,16 +848,16 @@ CONFIG_HPET_MMAP=y
782# 848#
783CONFIG_HWMON=y 849CONFIG_HWMON=y
784# CONFIG_HWMON_VID is not set 850# CONFIG_HWMON_VID is not set
851# CONFIG_SENSORS_ABITUGURU is not set
785# CONFIG_SENSORS_F71805F is not set 852# CONFIG_SENSORS_F71805F is not set
853# CONFIG_SENSORS_PC87427 is not set
854# CONFIG_SENSORS_VT1211 is not set
786# CONFIG_HWMON_DEBUG_CHIP is not set 855# CONFIG_HWMON_DEBUG_CHIP is not set
787 856
788# 857#
789# Misc devices 858# Multifunction device drivers
790#
791
792#
793# Multimedia Capabilities Port drivers
794# 859#
860# CONFIG_MFD_SM501 is not set
795 861
796# 862#
797# Multimedia devices 863# Multimedia devices
@@ -802,16 +868,19 @@ CONFIG_HWMON=y
802# Digital Video Broadcasting Devices 868# Digital Video Broadcasting Devices
803# 869#
804# CONFIG_DVB is not set 870# CONFIG_DVB is not set
871# CONFIG_USB_DABUSB is not set
805 872
806# 873#
807# Graphics support 874# Graphics support
808# 875#
876# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
809# CONFIG_FB is not set 877# CONFIG_FB is not set
810 878
811# 879#
812# Console display driver support 880# Console display driver support
813# 881#
814CONFIG_VGA_CONSOLE=y 882CONFIG_VGA_CONSOLE=y
883# CONFIG_VGACON_SOFT_SCROLLBACK is not set
815CONFIG_DUMMY_CONSOLE=y 884CONFIG_DUMMY_CONSOLE=y
816 885
817# 886#
@@ -820,10 +889,17 @@ CONFIG_DUMMY_CONSOLE=y
820# CONFIG_SOUND is not set 889# CONFIG_SOUND is not set
821 890
822# 891#
892# HID Devices
893#
894CONFIG_HID=y
895# CONFIG_HID_DEBUG is not set
896
897#
823# USB support 898# USB support
824# 899#
825CONFIG_USB_ARCH_HAS_HCD=y 900CONFIG_USB_ARCH_HAS_HCD=y
826CONFIG_USB_ARCH_HAS_OHCI=y 901CONFIG_USB_ARCH_HAS_OHCI=y
902CONFIG_USB_ARCH_HAS_EHCI=y
827CONFIG_USB=y 903CONFIG_USB=y
828# CONFIG_USB_DEBUG is not set 904# CONFIG_USB_DEBUG is not set
829 905
@@ -831,7 +907,6 @@ CONFIG_USB=y
831# Miscellaneous USB options 907# Miscellaneous USB options
832# 908#
833CONFIG_USB_DEVICEFS=y 909CONFIG_USB_DEVICEFS=y
834# CONFIG_USB_BANDWIDTH is not set
835# CONFIG_USB_DYNAMIC_MINORS is not set 910# CONFIG_USB_DYNAMIC_MINORS is not set
836# CONFIG_USB_SUSPEND is not set 911# CONFIG_USB_SUSPEND is not set
837# CONFIG_USB_OTG is not set 912# CONFIG_USB_OTG is not set
@@ -842,9 +917,12 @@ CONFIG_USB_DEVICEFS=y
842CONFIG_USB_EHCI_HCD=m 917CONFIG_USB_EHCI_HCD=m
843# CONFIG_USB_EHCI_SPLIT_ISO is not set 918# CONFIG_USB_EHCI_SPLIT_ISO is not set
844# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 919# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
920# CONFIG_USB_EHCI_TT_NEWSCHED is not set
921# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
845# CONFIG_USB_ISP116X_HCD is not set 922# CONFIG_USB_ISP116X_HCD is not set
846CONFIG_USB_OHCI_HCD=m 923CONFIG_USB_OHCI_HCD=m
847# CONFIG_USB_OHCI_BIG_ENDIAN is not set 924# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
925# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
848CONFIG_USB_OHCI_LITTLE_ENDIAN=y 926CONFIG_USB_OHCI_LITTLE_ENDIAN=y
849CONFIG_USB_UHCI_HCD=y 927CONFIG_USB_UHCI_HCD=y
850# CONFIG_USB_SL811_HCD is not set 928# CONFIG_USB_SL811_HCD is not set
@@ -873,13 +951,13 @@ CONFIG_USB_STORAGE=m
873# CONFIG_USB_STORAGE_SDDR55 is not set 951# CONFIG_USB_STORAGE_SDDR55 is not set
874# CONFIG_USB_STORAGE_JUMPSHOT is not set 952# CONFIG_USB_STORAGE_JUMPSHOT is not set
875# CONFIG_USB_STORAGE_ALAUDA is not set 953# CONFIG_USB_STORAGE_ALAUDA is not set
954# CONFIG_USB_STORAGE_KARMA is not set
876# CONFIG_USB_LIBUSUAL is not set 955# CONFIG_USB_LIBUSUAL is not set
877 956
878# 957#
879# USB Input Devices 958# USB Input Devices
880# 959#
881CONFIG_USB_HID=y 960CONFIG_USB_HID=y
882CONFIG_USB_HIDINPUT=y
883# CONFIG_USB_HIDINPUT_POWERBOOK is not set 961# CONFIG_USB_HIDINPUT_POWERBOOK is not set
884# CONFIG_HID_FF is not set 962# CONFIG_HID_FF is not set
885# CONFIG_USB_HIDDEV is not set 963# CONFIG_USB_HIDDEV is not set
@@ -888,15 +966,14 @@ CONFIG_USB_HIDINPUT=y
888# CONFIG_USB_ACECAD is not set 966# CONFIG_USB_ACECAD is not set
889# CONFIG_USB_KBTAB is not set 967# CONFIG_USB_KBTAB is not set
890# CONFIG_USB_POWERMATE is not set 968# CONFIG_USB_POWERMATE is not set
891# CONFIG_USB_MTOUCH is not set 969# CONFIG_USB_TOUCHSCREEN is not set
892# CONFIG_USB_ITMTOUCH is not set
893# CONFIG_USB_EGALAX is not set
894# CONFIG_USB_YEALINK is not set 970# CONFIG_USB_YEALINK is not set
895# CONFIG_USB_XPAD is not set 971# CONFIG_USB_XPAD is not set
896# CONFIG_USB_ATI_REMOTE is not set 972# CONFIG_USB_ATI_REMOTE is not set
897# CONFIG_USB_ATI_REMOTE2 is not set 973# CONFIG_USB_ATI_REMOTE2 is not set
898# CONFIG_USB_KEYSPAN_REMOTE is not set 974# CONFIG_USB_KEYSPAN_REMOTE is not set
899# CONFIG_USB_APPLETOUCH is not set 975# CONFIG_USB_APPLETOUCH is not set
976# CONFIG_USB_GTCO is not set
900 977
901# 978#
902# USB Imaging devices 979# USB Imaging devices
@@ -905,21 +982,13 @@ CONFIG_USB_HIDINPUT=y
905# CONFIG_USB_MICROTEK is not set 982# CONFIG_USB_MICROTEK is not set
906 983
907# 984#
908# USB Multimedia devices
909#
910# CONFIG_USB_DABUSB is not set
911
912#
913# Video4Linux support is needed for USB Multimedia device support
914#
915
916#
917# USB Network Adapters 985# USB Network Adapters
918# 986#
919# CONFIG_USB_CATC is not set 987# CONFIG_USB_CATC is not set
920# CONFIG_USB_KAWETH is not set 988# CONFIG_USB_KAWETH is not set
921# CONFIG_USB_PEGASUS is not set 989# CONFIG_USB_PEGASUS is not set
922# CONFIG_USB_RTL8150 is not set 990# CONFIG_USB_RTL8150 is not set
991# CONFIG_USB_USBNET_MII is not set
923# CONFIG_USB_USBNET is not set 992# CONFIG_USB_USBNET is not set
924# CONFIG_USB_MON is not set 993# CONFIG_USB_MON is not set
925 994
@@ -937,17 +1006,23 @@ CONFIG_USB_HIDINPUT=y
937# 1006#
938# CONFIG_USB_EMI62 is not set 1007# CONFIG_USB_EMI62 is not set
939# CONFIG_USB_EMI26 is not set 1008# CONFIG_USB_EMI26 is not set
1009# CONFIG_USB_ADUTUX is not set
940# CONFIG_USB_AUERSWALD is not set 1010# CONFIG_USB_AUERSWALD is not set
941# CONFIG_USB_RIO500 is not set 1011# CONFIG_USB_RIO500 is not set
942# CONFIG_USB_LEGOTOWER is not set 1012# CONFIG_USB_LEGOTOWER is not set
943# CONFIG_USB_LCD is not set 1013# CONFIG_USB_LCD is not set
1014# CONFIG_USB_BERRY_CHARGE is not set
944# CONFIG_USB_LED is not set 1015# CONFIG_USB_LED is not set
1016# CONFIG_USB_CYPRESS_CY7C63 is not set
945# CONFIG_USB_CYTHERM is not set 1017# CONFIG_USB_CYTHERM is not set
946# CONFIG_USB_PHIDGETKIT is not set 1018# CONFIG_USB_PHIDGET is not set
947# CONFIG_USB_PHIDGETSERVO is not set
948# CONFIG_USB_IDMOUSE is not set 1019# CONFIG_USB_IDMOUSE is not set
1020# CONFIG_USB_FTDI_ELAN is not set
1021# CONFIG_USB_APPLEDISPLAY is not set
949# CONFIG_USB_SISUSBVGA is not set 1022# CONFIG_USB_SISUSBVGA is not set
950# CONFIG_USB_LD is not set 1023# CONFIG_USB_LD is not set
1024# CONFIG_USB_TRANCEVIBRATOR is not set
1025# CONFIG_USB_IOWARRIOR is not set
951# CONFIG_USB_TEST is not set 1026# CONFIG_USB_TEST is not set
952 1027
953# 1028#
@@ -965,15 +1040,55 @@ CONFIG_USB_HIDINPUT=y
965# CONFIG_MMC is not set 1040# CONFIG_MMC is not set
966 1041
967# 1042#
1043# LED devices
1044#
1045# CONFIG_NEW_LEDS is not set
1046
1047#
1048# LED drivers
1049#
1050
1051#
1052# LED Triggers
1053#
1054
1055#
968# InfiniBand support 1056# InfiniBand support
969# 1057#
970# CONFIG_INFINIBAND is not set 1058# CONFIG_INFINIBAND is not set
971 1059
972# 1060#
973# EDAC - error detection and reporting (RAS) 1061# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1062#
1063
1064#
1065# Real Time Clock
1066#
1067# CONFIG_RTC_CLASS is not set
1068
1069#
1070# DMA Engine support
1071#
1072# CONFIG_DMA_ENGINE is not set
1073
1074#
1075# DMA Clients
974# 1076#
975 1077
976# 1078#
1079# DMA Devices
1080#
1081
1082#
1083# Auxiliary Display support
1084#
1085
1086#
1087# Virtualization
1088#
1089# CONFIG_MSPEC is not set
1090
1091#
977# File systems 1092# File systems
978# 1093#
979CONFIG_EXT2_FS=y 1094CONFIG_EXT2_FS=y
@@ -985,6 +1100,7 @@ CONFIG_EXT3_FS=y
985CONFIG_EXT3_FS_XATTR=y 1100CONFIG_EXT3_FS_XATTR=y
986CONFIG_EXT3_FS_POSIX_ACL=y 1101CONFIG_EXT3_FS_POSIX_ACL=y
987CONFIG_EXT3_FS_SECURITY=y 1102CONFIG_EXT3_FS_SECURITY=y
1103# CONFIG_EXT4DEV_FS is not set
988CONFIG_JBD=y 1104CONFIG_JBD=y
989# CONFIG_JBD_DEBUG is not set 1105# CONFIG_JBD_DEBUG is not set
990CONFIG_FS_MBCACHE=y 1106CONFIG_FS_MBCACHE=y
@@ -997,15 +1113,16 @@ CONFIG_REISERFS_FS_SECURITY=y
997# CONFIG_JFS_FS is not set 1113# CONFIG_JFS_FS is not set
998CONFIG_FS_POSIX_ACL=y 1114CONFIG_FS_POSIX_ACL=y
999CONFIG_XFS_FS=y 1115CONFIG_XFS_FS=y
1000CONFIG_XFS_EXPORT=y
1001# CONFIG_XFS_QUOTA is not set 1116# CONFIG_XFS_QUOTA is not set
1002# CONFIG_XFS_SECURITY is not set 1117# CONFIG_XFS_SECURITY is not set
1003# CONFIG_XFS_POSIX_ACL is not set 1118# CONFIG_XFS_POSIX_ACL is not set
1004# CONFIG_XFS_RT is not set 1119# CONFIG_XFS_RT is not set
1120# CONFIG_GFS2_FS is not set
1005# CONFIG_OCFS2_FS is not set 1121# CONFIG_OCFS2_FS is not set
1006# CONFIG_MINIX_FS is not set 1122# CONFIG_MINIX_FS is not set
1007# CONFIG_ROMFS_FS is not set 1123# CONFIG_ROMFS_FS is not set
1008CONFIG_INOTIFY=y 1124CONFIG_INOTIFY=y
1125CONFIG_INOTIFY_USER=y
1009# CONFIG_QUOTA is not set 1126# CONFIG_QUOTA is not set
1010CONFIG_DNOTIFY=y 1127CONFIG_DNOTIFY=y
1011CONFIG_AUTOFS_FS=y 1128CONFIG_AUTOFS_FS=y
@@ -1038,12 +1155,13 @@ CONFIG_NTFS_FS=m
1038# 1155#
1039CONFIG_PROC_FS=y 1156CONFIG_PROC_FS=y
1040CONFIG_PROC_KCORE=y 1157CONFIG_PROC_KCORE=y
1158CONFIG_PROC_SYSCTL=y
1041CONFIG_SYSFS=y 1159CONFIG_SYSFS=y
1042CONFIG_TMPFS=y 1160CONFIG_TMPFS=y
1161# CONFIG_TMPFS_POSIX_ACL is not set
1043CONFIG_HUGETLBFS=y 1162CONFIG_HUGETLBFS=y
1044CONFIG_HUGETLB_PAGE=y 1163CONFIG_HUGETLB_PAGE=y
1045CONFIG_RAMFS=y 1164CONFIG_RAMFS=y
1046# CONFIG_RELAYFS_FS is not set
1047# CONFIG_CONFIGFS_FS is not set 1165# CONFIG_CONFIGFS_FS is not set
1048 1166
1049# 1167#
@@ -1078,7 +1196,7 @@ CONFIG_NFSD_V4=y
1078CONFIG_NFSD_TCP=y 1196CONFIG_NFSD_TCP=y
1079CONFIG_LOCKD=m 1197CONFIG_LOCKD=m
1080CONFIG_LOCKD_V4=y 1198CONFIG_LOCKD_V4=y
1081CONFIG_EXPORTFS=y 1199CONFIG_EXPORTFS=m
1082CONFIG_NFS_COMMON=y 1200CONFIG_NFS_COMMON=y
1083CONFIG_SUNRPC=m 1201CONFIG_SUNRPC=m
1084CONFIG_SUNRPC_GSS=m 1202CONFIG_SUNRPC_GSS=m
@@ -1089,7 +1207,9 @@ CONFIG_SMB_NLS_DEFAULT=y
1089CONFIG_SMB_NLS_REMOTE="cp437" 1207CONFIG_SMB_NLS_REMOTE="cp437"
1090CONFIG_CIFS=m 1208CONFIG_CIFS=m
1091# CONFIG_CIFS_STATS is not set 1209# CONFIG_CIFS_STATS is not set
1210# CONFIG_CIFS_WEAK_PW_HASH is not set
1092# CONFIG_CIFS_XATTR is not set 1211# CONFIG_CIFS_XATTR is not set
1212# CONFIG_CIFS_DEBUG2 is not set
1093# CONFIG_CIFS_EXPERIMENTAL is not set 1213# CONFIG_CIFS_EXPERIMENTAL is not set
1094# CONFIG_NCP_FS is not set 1214# CONFIG_NCP_FS is not set
1095# CONFIG_CODA_FS is not set 1215# CONFIG_CODA_FS is not set
@@ -1162,15 +1282,25 @@ CONFIG_NLS_KOI8_U=m
1162CONFIG_NLS_UTF8=m 1282CONFIG_NLS_UTF8=m
1163 1283
1164# 1284#
1285# Distributed Lock Manager
1286#
1287# CONFIG_DLM is not set
1288
1289#
1165# Library routines 1290# Library routines
1166# 1291#
1292CONFIG_BITREVERSE=y
1167# CONFIG_CRC_CCITT is not set 1293# CONFIG_CRC_CCITT is not set
1168# CONFIG_CRC16 is not set 1294# CONFIG_CRC16 is not set
1169CONFIG_CRC32=y 1295CONFIG_CRC32=y
1170# CONFIG_LIBCRC32C is not set 1296# CONFIG_LIBCRC32C is not set
1297CONFIG_PLIST=y
1298CONFIG_HAS_IOMEM=y
1299CONFIG_HAS_IOPORT=y
1171CONFIG_GENERIC_HARDIRQS=y 1300CONFIG_GENERIC_HARDIRQS=y
1172CONFIG_GENERIC_IRQ_PROBE=y 1301CONFIG_GENERIC_IRQ_PROBE=y
1173CONFIG_GENERIC_PENDING_IRQ=y 1302CONFIG_GENERIC_PENDING_IRQ=y
1303CONFIG_IRQ_PER_CPU=y
1174 1304
1175# 1305#
1176# Instrumentation Support 1306# Instrumentation Support
@@ -1182,21 +1312,31 @@ CONFIG_GENERIC_PENDING_IRQ=y
1182# Kernel hacking 1312# Kernel hacking
1183# 1313#
1184# CONFIG_PRINTK_TIME is not set 1314# CONFIG_PRINTK_TIME is not set
1315CONFIG_ENABLE_MUST_CHECK=y
1185CONFIG_MAGIC_SYSRQ=y 1316CONFIG_MAGIC_SYSRQ=y
1317# CONFIG_UNUSED_SYMBOLS is not set
1318# CONFIG_DEBUG_FS is not set
1319# CONFIG_HEADERS_CHECK is not set
1186CONFIG_DEBUG_KERNEL=y 1320CONFIG_DEBUG_KERNEL=y
1321# CONFIG_DEBUG_SHIRQ is not set
1187CONFIG_LOG_BUF_SHIFT=20 1322CONFIG_LOG_BUF_SHIFT=20
1188CONFIG_DETECT_SOFTLOCKUP=y 1323CONFIG_DETECT_SOFTLOCKUP=y
1189# CONFIG_SCHEDSTATS is not set 1324# CONFIG_SCHEDSTATS is not set
1325# CONFIG_TIMER_STATS is not set
1190# CONFIG_DEBUG_SLAB is not set 1326# CONFIG_DEBUG_SLAB is not set
1191CONFIG_DEBUG_MUTEXES=y 1327# CONFIG_DEBUG_RT_MUTEXES is not set
1328# CONFIG_RT_MUTEX_TESTER is not set
1192# CONFIG_DEBUG_SPINLOCK is not set 1329# CONFIG_DEBUG_SPINLOCK is not set
1330CONFIG_DEBUG_MUTEXES=y
1193# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1331# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1332# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1194# CONFIG_DEBUG_KOBJECT is not set 1333# CONFIG_DEBUG_KOBJECT is not set
1195# CONFIG_DEBUG_INFO is not set 1334# CONFIG_DEBUG_INFO is not set
1196# CONFIG_DEBUG_FS is not set
1197# CONFIG_DEBUG_VM is not set 1335# CONFIG_DEBUG_VM is not set
1336# CONFIG_DEBUG_LIST is not set
1198CONFIG_FORCED_INLINING=y 1337CONFIG_FORCED_INLINING=y
1199# CONFIG_RCU_TORTURE_TEST is not set 1338# CONFIG_RCU_TORTURE_TEST is not set
1339# CONFIG_FAULT_INJECTION is not set
1200CONFIG_IA64_GRANULE_16MB=y 1340CONFIG_IA64_GRANULE_16MB=y
1201# CONFIG_IA64_GRANULE_64MB is not set 1341# CONFIG_IA64_GRANULE_64MB is not set
1202# CONFIG_IA64_PRINT_HAZARDS is not set 1342# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1215,7 +1355,11 @@ CONFIG_SYSVIPC_COMPAT=y
1215# Cryptographic options 1355# Cryptographic options
1216# 1356#
1217CONFIG_CRYPTO=y 1357CONFIG_CRYPTO=y
1358CONFIG_CRYPTO_ALGAPI=y
1359CONFIG_CRYPTO_BLKCIPHER=m
1360CONFIG_CRYPTO_MANAGER=m
1218# CONFIG_CRYPTO_HMAC is not set 1361# CONFIG_CRYPTO_HMAC is not set
1362# CONFIG_CRYPTO_XCBC is not set
1219# CONFIG_CRYPTO_NULL is not set 1363# CONFIG_CRYPTO_NULL is not set
1220# CONFIG_CRYPTO_MD4 is not set 1364# CONFIG_CRYPTO_MD4 is not set
1221CONFIG_CRYPTO_MD5=y 1365CONFIG_CRYPTO_MD5=y
@@ -1224,7 +1368,13 @@ CONFIG_CRYPTO_MD5=y
1224# CONFIG_CRYPTO_SHA512 is not set 1368# CONFIG_CRYPTO_SHA512 is not set
1225# CONFIG_CRYPTO_WP512 is not set 1369# CONFIG_CRYPTO_WP512 is not set
1226# CONFIG_CRYPTO_TGR192 is not set 1370# CONFIG_CRYPTO_TGR192 is not set
1371# CONFIG_CRYPTO_GF128MUL is not set
1372CONFIG_CRYPTO_ECB=m
1373CONFIG_CRYPTO_CBC=m
1374CONFIG_CRYPTO_PCBC=m
1375# CONFIG_CRYPTO_LRW is not set
1227CONFIG_CRYPTO_DES=m 1376CONFIG_CRYPTO_DES=m
1377# CONFIG_CRYPTO_FCRYPT is not set
1228# CONFIG_CRYPTO_BLOWFISH is not set 1378# CONFIG_CRYPTO_BLOWFISH is not set
1229# CONFIG_CRYPTO_TWOFISH is not set 1379# CONFIG_CRYPTO_TWOFISH is not set
1230# CONFIG_CRYPTO_SERPENT is not set 1380# CONFIG_CRYPTO_SERPENT is not set
@@ -1238,6 +1388,7 @@ CONFIG_CRYPTO_DES=m
1238# CONFIG_CRYPTO_DEFLATE is not set 1388# CONFIG_CRYPTO_DEFLATE is not set
1239# CONFIG_CRYPTO_MICHAEL_MIC is not set 1389# CONFIG_CRYPTO_MICHAEL_MIC is not set
1240# CONFIG_CRYPTO_CRC32C is not set 1390# CONFIG_CRYPTO_CRC32C is not set
1391# CONFIG_CRYPTO_CAMELLIA is not set
1241# CONFIG_CRYPTO_TEST is not set 1392# CONFIG_CRYPTO_TEST is not set
1242 1393
1243# 1394#
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 949dc4670a0c..1c7955c16358 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -1,8 +1,9 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc5 3# Linux kernel version: 2.6.21-rc3
4# Mon Feb 27 15:55:36 2006 4# Thu Mar 8 11:04:20 2007
5# 5#
6CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
6 7
7# 8#
8# Code maturity level options 9# Code maturity level options
@@ -18,16 +19,24 @@ CONFIG_LOCALVERSION=""
18CONFIG_LOCALVERSION_AUTO=y 19CONFIG_LOCALVERSION_AUTO=y
19CONFIG_SWAP=y 20CONFIG_SWAP=y
20CONFIG_SYSVIPC=y 21CONFIG_SYSVIPC=y
22# CONFIG_IPC_NS is not set
23CONFIG_SYSVIPC_SYSCTL=y
21# CONFIG_POSIX_MQUEUE is not set 24# CONFIG_POSIX_MQUEUE is not set
22CONFIG_BSD_PROCESS_ACCT=y 25CONFIG_BSD_PROCESS_ACCT=y
23# CONFIG_BSD_PROCESS_ACCT_V3 is not set 26# CONFIG_BSD_PROCESS_ACCT_V3 is not set
24CONFIG_SYSCTL=y 27# CONFIG_TASKSTATS is not set
28# CONFIG_UTS_NS is not set
25# CONFIG_AUDIT is not set 29# CONFIG_AUDIT is not set
26# CONFIG_IKCONFIG is not set 30# CONFIG_IKCONFIG is not set
27# CONFIG_CPUSETS is not set 31# CONFIG_CPUSETS is not set
32CONFIG_SYSFS_DEPRECATED=y
33# CONFIG_RELAY is not set
34CONFIG_BLK_DEV_INITRD=y
28CONFIG_INITRAMFS_SOURCE="" 35CONFIG_INITRAMFS_SOURCE=""
29CONFIG_CC_OPTIMIZE_FOR_SIZE=y 36CONFIG_CC_OPTIMIZE_FOR_SIZE=y
37CONFIG_SYSCTL=y
30# CONFIG_EMBEDDED is not set 38# CONFIG_EMBEDDED is not set
39CONFIG_SYSCTL_SYSCALL=y
31CONFIG_KALLSYMS=y 40CONFIG_KALLSYMS=y
32# CONFIG_KALLSYMS_ALL is not set 41# CONFIG_KALLSYMS_ALL is not set
33# CONFIG_KALLSYMS_EXTRA_PASS is not set 42# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -39,11 +48,9 @@ CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 48CONFIG_FUTEX=y
40CONFIG_EPOLL=y 49CONFIG_EPOLL=y
41CONFIG_SHMEM=y 50CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46CONFIG_SLAB=y 51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y
53CONFIG_RT_MUTEXES=y
47# CONFIG_TINY_SHMEM is not set 54# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0 55CONFIG_BASE_SMALL=0
49# CONFIG_SLOB is not set 56# CONFIG_SLOB is not set
@@ -53,14 +60,16 @@ CONFIG_BASE_SMALL=0
53# 60#
54CONFIG_MODULES=y 61CONFIG_MODULES=y
55# CONFIG_MODULE_UNLOAD is not set 62# CONFIG_MODULE_UNLOAD is not set
56CONFIG_OBSOLETE_MODPARM=y
57# CONFIG_MODVERSIONS is not set 63# CONFIG_MODVERSIONS is not set
58# CONFIG_MODULE_SRCVERSION_ALL is not set 64# CONFIG_MODULE_SRCVERSION_ALL is not set
59# CONFIG_KMOD is not set 65# CONFIG_KMOD is not set
66CONFIG_STOP_MACHINE=y
60 67
61# 68#
62# Block layer 69# Block layer
63# 70#
71CONFIG_BLOCK=y
72# CONFIG_BLK_DEV_IO_TRACE is not set
64 73
65# 74#
66# IO Schedulers 75# IO Schedulers
@@ -80,15 +89,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
80# 89#
81CONFIG_IA64=y 90CONFIG_IA64=y
82CONFIG_64BIT=y 91CONFIG_64BIT=y
92CONFIG_ZONE_DMA=y
83CONFIG_MMU=y 93CONFIG_MMU=y
84CONFIG_SWIOTLB=y
85CONFIG_RWSEM_XCHGADD_ALGORITHM=y 94CONFIG_RWSEM_XCHGADD_ALGORITHM=y
95# CONFIG_ARCH_HAS_ILOG2_U32 is not set
96# CONFIG_ARCH_HAS_ILOG2_U64 is not set
97CONFIG_GENERIC_FIND_NEXT_BIT=y
86CONFIG_GENERIC_CALIBRATE_DELAY=y 98CONFIG_GENERIC_CALIBRATE_DELAY=y
87CONFIG_TIME_INTERPOLATION=y 99CONFIG_TIME_INTERPOLATION=y
100CONFIG_DMI=y
88CONFIG_EFI=y 101CONFIG_EFI=y
89CONFIG_GENERIC_IOMAP=y 102CONFIG_GENERIC_IOMAP=y
90CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 103CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
91CONFIG_DMA_IS_DMA32=y 104CONFIG_AUDIT_ARCH=y
92# CONFIG_IA64_GENERIC is not set 105# CONFIG_IA64_GENERIC is not set
93# CONFIG_IA64_DIG is not set 106# CONFIG_IA64_DIG is not set
94CONFIG_IA64_HP_ZX1=y 107CONFIG_IA64_HP_ZX1=y
@@ -105,6 +118,7 @@ CONFIG_PGTABLE_3=y
105# CONFIG_PGTABLE_4 is not set 118# CONFIG_PGTABLE_4 is not set
106# CONFIG_HZ_100 is not set 119# CONFIG_HZ_100 is not set
107CONFIG_HZ_250=y 120CONFIG_HZ_250=y
121# CONFIG_HZ_300 is not set
108# CONFIG_HZ_1000 is not set 122# CONFIG_HZ_1000 is not set
109CONFIG_HZ=250 123CONFIG_HZ=250
110CONFIG_IA64_L1_CACHE_SHIFT=7 124CONFIG_IA64_L1_CACHE_SHIFT=7
@@ -113,8 +127,10 @@ CONFIG_IOSAPIC=y
113CONFIG_FORCE_MAX_ZONEORDER=17 127CONFIG_FORCE_MAX_ZONEORDER=17
114CONFIG_SMP=y 128CONFIG_SMP=y
115CONFIG_NR_CPUS=16 129CONFIG_NR_CPUS=16
116# CONFIG_HOTPLUG_CPU is not set 130CONFIG_HOTPLUG_CPU=y
131CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
117# CONFIG_SCHED_SMT is not set 132# CONFIG_SCHED_SMT is not set
133# CONFIG_PERMIT_BSP_REMOVE is not set
118# CONFIG_PREEMPT is not set 134# CONFIG_PREEMPT is not set
119CONFIG_SELECT_MEMORY_MODEL=y 135CONFIG_SELECT_MEMORY_MODEL=y
120CONFIG_FLATMEM_MANUAL=y 136CONFIG_FLATMEM_MANUAL=y
@@ -124,11 +140,14 @@ CONFIG_FLATMEM=y
124CONFIG_FLAT_NODE_MEM_MAP=y 140CONFIG_FLAT_NODE_MEM_MAP=y
125# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
126CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
143CONFIG_RESOURCES_64BIT=y
144CONFIG_ZONE_DMA_FLAG=1
127CONFIG_ARCH_SELECT_MEMORY_MODEL=y 145CONFIG_ARCH_SELECT_MEMORY_MODEL=y
128CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 146CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
129CONFIG_ARCH_FLATMEM_ENABLE=y 147CONFIG_ARCH_FLATMEM_ENABLE=y
130CONFIG_ARCH_SPARSEMEM_ENABLE=y 148CONFIG_ARCH_SPARSEMEM_ENABLE=y
131CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y 149CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
150CONFIG_ARCH_POPULATES_NODE_MAP=y
132CONFIG_VIRTUAL_MEM_MAP=y 151CONFIG_VIRTUAL_MEM_MAP=y
133CONFIG_HOLES_IN_ZONE=y 152CONFIG_HOLES_IN_ZONE=y
134CONFIG_IA32_SUPPORT=y 153CONFIG_IA32_SUPPORT=y
@@ -136,6 +155,9 @@ CONFIG_COMPAT=y
136CONFIG_IA64_MCA_RECOVERY=y 155CONFIG_IA64_MCA_RECOVERY=y
137CONFIG_PERFMON=y 156CONFIG_PERFMON=y
138CONFIG_IA64_PALINFO=y 157CONFIG_IA64_PALINFO=y
158# CONFIG_IA64_ESI is not set
159# CONFIG_KEXEC is not set
160CONFIG_CRASH_DUMP=y
139 161
140# 162#
141# Firmware Drivers 163# Firmware Drivers
@@ -151,21 +173,25 @@ CONFIG_BINFMT_MISC=y
151CONFIG_PM=y 173CONFIG_PM=y
152CONFIG_PM_LEGACY=y 174CONFIG_PM_LEGACY=y
153# CONFIG_PM_DEBUG is not set 175# CONFIG_PM_DEBUG is not set
176# CONFIG_PM_SYSFS_DEPRECATED is not set
154 177
155# 178#
156# ACPI (Advanced Configuration and Power Interface) Support 179# ACPI (Advanced Configuration and Power Interface) Support
157# 180#
158CONFIG_ACPI=y 181CONFIG_ACPI=y
182CONFIG_ACPI_PROCFS=y
159CONFIG_ACPI_BUTTON=y 183CONFIG_ACPI_BUTTON=y
160CONFIG_ACPI_FAN=y 184CONFIG_ACPI_FAN=y
185# CONFIG_ACPI_DOCK is not set
161CONFIG_ACPI_PROCESSOR=y 186CONFIG_ACPI_PROCESSOR=y
187CONFIG_ACPI_HOTPLUG_CPU=y
162CONFIG_ACPI_THERMAL=y 188CONFIG_ACPI_THERMAL=y
163CONFIG_ACPI_BLACKLIST_YEAR=0 189CONFIG_ACPI_BLACKLIST_YEAR=0
164# CONFIG_ACPI_DEBUG is not set 190# CONFIG_ACPI_DEBUG is not set
165CONFIG_ACPI_EC=y 191CONFIG_ACPI_EC=y
166CONFIG_ACPI_POWER=y 192CONFIG_ACPI_POWER=y
167CONFIG_ACPI_SYSTEM=y 193CONFIG_ACPI_SYSTEM=y
168# CONFIG_ACPI_CONTAINER is not set 194CONFIG_ACPI_CONTAINER=y
169 195
170# 196#
171# CPU Frequency scaling 197# CPU Frequency scaling
@@ -177,8 +203,8 @@ CONFIG_ACPI_SYSTEM=y
177# 203#
178CONFIG_PCI=y 204CONFIG_PCI=y
179CONFIG_PCI_DOMAINS=y 205CONFIG_PCI_DOMAINS=y
206# CONFIG_PCIEPORTBUS is not set
180# CONFIG_PCI_MSI is not set 207# CONFIG_PCI_MSI is not set
181CONFIG_PCI_LEGACY_PROC=y
182# CONFIG_PCI_DEBUG is not set 208# CONFIG_PCI_DEBUG is not set
183 209
184# 210#
@@ -208,6 +234,10 @@ CONFIG_NET=y
208CONFIG_PACKET=y 234CONFIG_PACKET=y
209# CONFIG_PACKET_MMAP is not set 235# CONFIG_PACKET_MMAP is not set
210CONFIG_UNIX=y 236CONFIG_UNIX=y
237CONFIG_XFRM=y
238# CONFIG_XFRM_USER is not set
239# CONFIG_XFRM_SUB_POLICY is not set
240# CONFIG_XFRM_MIGRATE is not set
211# CONFIG_NET_KEY is not set 241# CONFIG_NET_KEY is not set
212CONFIG_INET=y 242CONFIG_INET=y
213CONFIG_IP_MULTICAST=y 243CONFIG_IP_MULTICAST=y
@@ -222,17 +252,26 @@ CONFIG_IP_FIB_HASH=y
222# CONFIG_INET_AH is not set 252# CONFIG_INET_AH is not set
223# CONFIG_INET_ESP is not set 253# CONFIG_INET_ESP is not set
224# CONFIG_INET_IPCOMP is not set 254# CONFIG_INET_IPCOMP is not set
255# CONFIG_INET_XFRM_TUNNEL is not set
225# CONFIG_INET_TUNNEL is not set 256# CONFIG_INET_TUNNEL is not set
257CONFIG_INET_XFRM_MODE_TRANSPORT=y
258CONFIG_INET_XFRM_MODE_TUNNEL=y
259CONFIG_INET_XFRM_MODE_BEET=y
226CONFIG_INET_DIAG=y 260CONFIG_INET_DIAG=y
227CONFIG_INET_TCP_DIAG=y 261CONFIG_INET_TCP_DIAG=y
228# CONFIG_TCP_CONG_ADVANCED is not set 262# CONFIG_TCP_CONG_ADVANCED is not set
229CONFIG_TCP_CONG_BIC=y 263CONFIG_TCP_CONG_CUBIC=y
264CONFIG_DEFAULT_TCP_CONG="cubic"
265# CONFIG_TCP_MD5SIG is not set
230 266
231# 267#
232# IP: Virtual Server Configuration 268# IP: Virtual Server Configuration
233# 269#
234# CONFIG_IP_VS is not set 270# CONFIG_IP_VS is not set
235# CONFIG_IPV6 is not set 271# CONFIG_IPV6 is not set
272# CONFIG_INET6_XFRM_TUNNEL is not set
273# CONFIG_INET6_TUNNEL is not set
274# CONFIG_NETWORK_SECMARK is not set
236CONFIG_NETFILTER=y 275CONFIG_NETFILTER=y
237# CONFIG_NETFILTER_DEBUG is not set 276# CONFIG_NETFILTER_DEBUG is not set
238 277
@@ -240,14 +279,15 @@ CONFIG_NETFILTER=y
240# Core Netfilter Configuration 279# Core Netfilter Configuration
241# 280#
242# CONFIG_NETFILTER_NETLINK is not set 281# CONFIG_NETFILTER_NETLINK is not set
243# CONFIG_NF_CONNTRACK is not set 282# CONFIG_NF_CONNTRACK_ENABLED is not set
244# CONFIG_NETFILTER_XTABLES is not set 283# CONFIG_NETFILTER_XTABLES is not set
245 284
246# 285#
247# IP: Netfilter Configuration 286# IP: Netfilter Configuration
248# 287#
249# CONFIG_IP_NF_CONNTRACK is not set
250# CONFIG_IP_NF_QUEUE is not set 288# CONFIG_IP_NF_QUEUE is not set
289# CONFIG_IP_NF_IPTABLES is not set
290# CONFIG_IP_NF_ARPTABLES is not set
251 291
252# 292#
253# DCCP Configuration (EXPERIMENTAL) 293# DCCP Configuration (EXPERIMENTAL)
@@ -272,7 +312,6 @@ CONFIG_NETFILTER=y
272# CONFIG_ATALK is not set 312# CONFIG_ATALK is not set
273# CONFIG_X25 is not set 313# CONFIG_X25 is not set
274# CONFIG_LAPB is not set 314# CONFIG_LAPB is not set
275# CONFIG_NET_DIVERT is not set
276# CONFIG_ECONET is not set 315# CONFIG_ECONET is not set
277# CONFIG_WAN_ROUTER is not set 316# CONFIG_WAN_ROUTER is not set
278 317
@@ -285,6 +324,7 @@ CONFIG_NETFILTER=y
285# Network testing 324# Network testing
286# 325#
287# CONFIG_NET_PKTGEN is not set 326# CONFIG_NET_PKTGEN is not set
327# CONFIG_NET_TCPPROBE is not set
288# CONFIG_HAMRADIO is not set 328# CONFIG_HAMRADIO is not set
289# CONFIG_IRDA is not set 329# CONFIG_IRDA is not set
290# CONFIG_BT is not set 330# CONFIG_BT is not set
@@ -301,6 +341,8 @@ CONFIG_STANDALONE=y
301CONFIG_PREVENT_FIRMWARE_BUILD=y 341CONFIG_PREVENT_FIRMWARE_BUILD=y
302# CONFIG_FW_LOADER is not set 342# CONFIG_FW_LOADER is not set
303# CONFIG_DEBUG_DRIVER is not set 343# CONFIG_DEBUG_DRIVER is not set
344# CONFIG_DEBUG_DEVRES is not set
345# CONFIG_SYS_HYPERVISOR is not set
304 346
305# 347#
306# Connector - unified userspace <-> kernelspace linker 348# Connector - unified userspace <-> kernelspace linker
@@ -344,11 +386,17 @@ CONFIG_BLK_DEV_LOOP=y
344CONFIG_BLK_DEV_RAM=y 386CONFIG_BLK_DEV_RAM=y
345CONFIG_BLK_DEV_RAM_COUNT=16 387CONFIG_BLK_DEV_RAM_COUNT=16
346CONFIG_BLK_DEV_RAM_SIZE=4096 388CONFIG_BLK_DEV_RAM_SIZE=4096
347CONFIG_BLK_DEV_INITRD=y 389CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
348# CONFIG_CDROM_PKTCDVD is not set 390# CONFIG_CDROM_PKTCDVD is not set
349# CONFIG_ATA_OVER_ETH is not set 391# CONFIG_ATA_OVER_ETH is not set
350 392
351# 393#
394# Misc devices
395#
396# CONFIG_SGI_IOC4 is not set
397# CONFIG_TIFM_CORE is not set
398
399#
352# ATA/ATAPI/MFM/RLL support 400# ATA/ATAPI/MFM/RLL support
353# 401#
354CONFIG_IDE=y 402CONFIG_IDE=y
@@ -365,6 +413,7 @@ CONFIG_BLK_DEV_IDECD=y
365# CONFIG_BLK_DEV_IDETAPE is not set 413# CONFIG_BLK_DEV_IDETAPE is not set
366# CONFIG_BLK_DEV_IDEFLOPPY is not set 414# CONFIG_BLK_DEV_IDEFLOPPY is not set
367# CONFIG_BLK_DEV_IDESCSI is not set 415# CONFIG_BLK_DEV_IDESCSI is not set
416# CONFIG_BLK_DEV_IDEACPI is not set
368# CONFIG_IDE_TASK_IOCTL is not set 417# CONFIG_IDE_TASK_IOCTL is not set
369 418
370# 419#
@@ -390,8 +439,10 @@ CONFIG_BLK_DEV_CMD64X=y
390# CONFIG_BLK_DEV_CS5530 is not set 439# CONFIG_BLK_DEV_CS5530 is not set
391# CONFIG_BLK_DEV_HPT34X is not set 440# CONFIG_BLK_DEV_HPT34X is not set
392# CONFIG_BLK_DEV_HPT366 is not set 441# CONFIG_BLK_DEV_HPT366 is not set
442# CONFIG_BLK_DEV_JMICRON is not set
393# CONFIG_BLK_DEV_SC1200 is not set 443# CONFIG_BLK_DEV_SC1200 is not set
394# CONFIG_BLK_DEV_PIIX is not set 444# CONFIG_BLK_DEV_PIIX is not set
445# CONFIG_BLK_DEV_IT8213 is not set
395# CONFIG_BLK_DEV_IT821X is not set 446# CONFIG_BLK_DEV_IT821X is not set
396# CONFIG_BLK_DEV_NS87415 is not set 447# CONFIG_BLK_DEV_NS87415 is not set
397# CONFIG_BLK_DEV_PDC202XX_OLD is not set 448# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -401,6 +452,7 @@ CONFIG_BLK_DEV_CMD64X=y
401# CONFIG_BLK_DEV_SLC90E66 is not set 452# CONFIG_BLK_DEV_SLC90E66 is not set
402# CONFIG_BLK_DEV_TRM290 is not set 453# CONFIG_BLK_DEV_TRM290 is not set
403# CONFIG_BLK_DEV_VIA82CXXX is not set 454# CONFIG_BLK_DEV_VIA82CXXX is not set
455# CONFIG_BLK_DEV_TC86C001 is not set
404# CONFIG_IDE_ARM is not set 456# CONFIG_IDE_ARM is not set
405CONFIG_BLK_DEV_IDEDMA=y 457CONFIG_BLK_DEV_IDEDMA=y
406# CONFIG_IDEDMA_IVB is not set 458# CONFIG_IDEDMA_IVB is not set
@@ -412,6 +464,8 @@ CONFIG_BLK_DEV_IDEDMA=y
412# 464#
413# CONFIG_RAID_ATTRS is not set 465# CONFIG_RAID_ATTRS is not set
414CONFIG_SCSI=y 466CONFIG_SCSI=y
467# CONFIG_SCSI_TGT is not set
468CONFIG_SCSI_NETLINK=y
415CONFIG_SCSI_PROC_FS=y 469CONFIG_SCSI_PROC_FS=y
416 470
417# 471#
@@ -431,14 +485,16 @@ CONFIG_CHR_DEV_SG=y
431CONFIG_SCSI_MULTI_LUN=y 485CONFIG_SCSI_MULTI_LUN=y
432CONFIG_SCSI_CONSTANTS=y 486CONFIG_SCSI_CONSTANTS=y
433CONFIG_SCSI_LOGGING=y 487CONFIG_SCSI_LOGGING=y
488# CONFIG_SCSI_SCAN_ASYNC is not set
434 489
435# 490#
436# SCSI Transport Attributes 491# SCSI Transports
437# 492#
438CONFIG_SCSI_SPI_ATTRS=y 493CONFIG_SCSI_SPI_ATTRS=y
439CONFIG_SCSI_FC_ATTRS=y 494CONFIG_SCSI_FC_ATTRS=y
440# CONFIG_SCSI_ISCSI_ATTRS is not set 495# CONFIG_SCSI_ISCSI_ATTRS is not set
441# CONFIG_SCSI_SAS_ATTRS is not set 496# CONFIG_SCSI_SAS_ATTRS is not set
497# CONFIG_SCSI_SAS_LIBSAS is not set
442 498
443# 499#
444# SCSI low-level drivers 500# SCSI low-level drivers
@@ -451,28 +507,36 @@ CONFIG_SCSI_FC_ATTRS=y
451# CONFIG_SCSI_AIC7XXX is not set 507# CONFIG_SCSI_AIC7XXX is not set
452# CONFIG_SCSI_AIC7XXX_OLD is not set 508# CONFIG_SCSI_AIC7XXX_OLD is not set
453# CONFIG_SCSI_AIC79XX is not set 509# CONFIG_SCSI_AIC79XX is not set
510# CONFIG_SCSI_AIC94XX is not set
511# CONFIG_SCSI_ARCMSR is not set
454# CONFIG_MEGARAID_NEWGEN is not set 512# CONFIG_MEGARAID_NEWGEN is not set
455# CONFIG_MEGARAID_LEGACY is not set 513# CONFIG_MEGARAID_LEGACY is not set
456# CONFIG_MEGARAID_SAS is not set 514# CONFIG_MEGARAID_SAS is not set
457# CONFIG_SCSI_SATA is not set 515# CONFIG_SCSI_HPTIOP is not set
458# CONFIG_SCSI_DMX3191D is not set 516# CONFIG_SCSI_DMX3191D is not set
459# CONFIG_SCSI_FUTURE_DOMAIN is not set 517# CONFIG_SCSI_FUTURE_DOMAIN is not set
460# CONFIG_SCSI_IPS is not set 518# CONFIG_SCSI_IPS is not set
461# CONFIG_SCSI_INITIO is not set 519# CONFIG_SCSI_INITIO is not set
462# CONFIG_SCSI_INIA100 is not set 520# CONFIG_SCSI_INIA100 is not set
521# CONFIG_SCSI_STEX is not set
463CONFIG_SCSI_SYM53C8XX_2=y 522CONFIG_SCSI_SYM53C8XX_2=y
464CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 523CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
465CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 524CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
466CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 525CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
467# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 526CONFIG_SCSI_SYM53C8XX_MMIO=y
468# CONFIG_SCSI_IPR is not set
469# CONFIG_SCSI_QLOGIC_FC is not set
470CONFIG_SCSI_QLOGIC_1280=y 527CONFIG_SCSI_QLOGIC_1280=y
471# CONFIG_SCSI_QLA_FC is not set 528# CONFIG_SCSI_QLA_FC is not set
529# CONFIG_SCSI_QLA_ISCSI is not set
472# CONFIG_SCSI_LPFC is not set 530# CONFIG_SCSI_LPFC is not set
473# CONFIG_SCSI_DC395x is not set 531# CONFIG_SCSI_DC395x is not set
474# CONFIG_SCSI_DC390T is not set 532# CONFIG_SCSI_DC390T is not set
475# CONFIG_SCSI_DEBUG is not set 533# CONFIG_SCSI_DEBUG is not set
534# CONFIG_SCSI_SRP is not set
535
536#
537# Serial ATA (prod) and Parallel ATA (experimental) drivers
538#
539# CONFIG_ATA is not set
476 540
477# 541#
478# Multi-device support (RAID and LVM) 542# Multi-device support (RAID and LVM)
@@ -562,6 +626,7 @@ CONFIG_E100=y
562# CONFIG_EPIC100 is not set 626# CONFIG_EPIC100 is not set
563# CONFIG_SUNDANCE is not set 627# CONFIG_SUNDANCE is not set
564# CONFIG_VIA_RHINE is not set 628# CONFIG_VIA_RHINE is not set
629# CONFIG_SC92031 is not set
565 630
566# 631#
567# Ethernet (1000 Mbit) 632# Ethernet (1000 Mbit)
@@ -582,13 +647,18 @@ CONFIG_E1000=y
582# CONFIG_VIA_VELOCITY is not set 647# CONFIG_VIA_VELOCITY is not set
583CONFIG_TIGON3=y 648CONFIG_TIGON3=y
584# CONFIG_BNX2 is not set 649# CONFIG_BNX2 is not set
650# CONFIG_QLA3XXX is not set
651# CONFIG_ATL1 is not set
585 652
586# 653#
587# Ethernet (10000 Mbit) 654# Ethernet (10000 Mbit)
588# 655#
589# CONFIG_CHELSIO_T1 is not set 656# CONFIG_CHELSIO_T1 is not set
657# CONFIG_CHELSIO_T3 is not set
590# CONFIG_IXGB is not set 658# CONFIG_IXGB is not set
591# CONFIG_S2IO is not set 659# CONFIG_S2IO is not set
660# CONFIG_MYRI10GE is not set
661# CONFIG_NETXEN_NIC is not set
592 662
593# 663#
594# Token Ring devices 664# Token Ring devices
@@ -628,6 +698,7 @@ CONFIG_TIGON3=y
628# Input device support 698# Input device support
629# 699#
630CONFIG_INPUT=y 700CONFIG_INPUT=y
701# CONFIG_INPUT_FF_MEMLESS is not set
631 702
632# 703#
633# Userland interfaces 704# Userland interfaces
@@ -666,6 +737,7 @@ CONFIG_SERIO=y
666CONFIG_VT=y 737CONFIG_VT=y
667CONFIG_VT_CONSOLE=y 738CONFIG_VT_CONSOLE=y
668CONFIG_HW_CONSOLE=y 739CONFIG_HW_CONSOLE=y
740# CONFIG_VT_HW_CONSOLE_BINDING is not set
669# CONFIG_SERIAL_NONSTANDARD is not set 741# CONFIG_SERIAL_NONSTANDARD is not set
670 742
671# 743#
@@ -673,7 +745,8 @@ CONFIG_HW_CONSOLE=y
673# 745#
674CONFIG_SERIAL_8250=y 746CONFIG_SERIAL_8250=y
675CONFIG_SERIAL_8250_CONSOLE=y 747CONFIG_SERIAL_8250_CONSOLE=y
676CONFIG_SERIAL_8250_ACPI=y 748CONFIG_SERIAL_8250_PCI=y
749CONFIG_SERIAL_8250_PNP=y
677CONFIG_SERIAL_8250_NR_UARTS=8 750CONFIG_SERIAL_8250_NR_UARTS=8
678CONFIG_SERIAL_8250_RUNTIME_UARTS=4 751CONFIG_SERIAL_8250_RUNTIME_UARTS=4
679CONFIG_SERIAL_8250_EXTENDED=y 752CONFIG_SERIAL_8250_EXTENDED=y
@@ -705,10 +778,6 @@ CONFIG_EFI_RTC=y
705# CONFIG_DTLK is not set 778# CONFIG_DTLK is not set
706# CONFIG_R3964 is not set 779# CONFIG_R3964 is not set
707# CONFIG_APPLICOM is not set 780# CONFIG_APPLICOM is not set
708
709#
710# Ftape, the floppy tape device driver
711#
712CONFIG_AGP=y 781CONFIG_AGP=y
713CONFIG_AGP_HP_ZX1=y 782CONFIG_AGP_HP_ZX1=y
714CONFIG_DRM=y 783CONFIG_DRM=y
@@ -727,7 +796,6 @@ CONFIG_DRM_RADEON=y
727# TPM devices 796# TPM devices
728# 797#
729# CONFIG_TCG_TPM is not set 798# CONFIG_TCG_TPM is not set
730# CONFIG_TELCLOCK is not set
731 799
732# 800#
733# I2C support 801# I2C support
@@ -754,10 +822,11 @@ CONFIG_I2C_ALGOPCF=y
754# CONFIG_I2C_I810 is not set 822# CONFIG_I2C_I810 is not set
755# CONFIG_I2C_PIIX4 is not set 823# CONFIG_I2C_PIIX4 is not set
756# CONFIG_I2C_NFORCE2 is not set 824# CONFIG_I2C_NFORCE2 is not set
825# CONFIG_I2C_OCORES is not set
757# CONFIG_I2C_PARPORT_LIGHT is not set 826# CONFIG_I2C_PARPORT_LIGHT is not set
827# CONFIG_I2C_PASEMI is not set
758# CONFIG_I2C_PROSAVAGE is not set 828# CONFIG_I2C_PROSAVAGE is not set
759# CONFIG_I2C_SAVAGE4 is not set 829# CONFIG_I2C_SAVAGE4 is not set
760# CONFIG_SCx200_ACB is not set
761# CONFIG_I2C_SIS5595 is not set 830# CONFIG_I2C_SIS5595 is not set
762# CONFIG_I2C_SIS630 is not set 831# CONFIG_I2C_SIS630 is not set
763# CONFIG_I2C_SIS96X is not set 832# CONFIG_I2C_SIS96X is not set
@@ -776,9 +845,7 @@ CONFIG_I2C_ALGOPCF=y
776# CONFIG_SENSORS_PCF8574 is not set 845# CONFIG_SENSORS_PCF8574 is not set
777# CONFIG_SENSORS_PCA9539 is not set 846# CONFIG_SENSORS_PCA9539 is not set
778# CONFIG_SENSORS_PCF8591 is not set 847# CONFIG_SENSORS_PCF8591 is not set
779# CONFIG_SENSORS_RTC8564 is not set
780# CONFIG_SENSORS_MAX6875 is not set 848# CONFIG_SENSORS_MAX6875 is not set
781# CONFIG_RTC_X1205_I2C is not set
782# CONFIG_I2C_DEBUG_CORE is not set 849# CONFIG_I2C_DEBUG_CORE is not set
783# CONFIG_I2C_DEBUG_ALGO is not set 850# CONFIG_I2C_DEBUG_ALGO is not set
784# CONFIG_I2C_DEBUG_BUS is not set 851# CONFIG_I2C_DEBUG_BUS is not set
@@ -802,28 +869,31 @@ CONFIG_I2C_ALGOPCF=y
802# CONFIG_HWMON_VID is not set 869# CONFIG_HWMON_VID is not set
803 870
804# 871#
805# Misc devices 872# Multifunction device drivers
806#
807
808#
809# Multimedia Capabilities Port drivers
810# 873#
874# CONFIG_MFD_SM501 is not set
811 875
812# 876#
813# Multimedia devices 877# Multimedia devices
814# 878#
815CONFIG_VIDEO_DEV=y 879CONFIG_VIDEO_DEV=y
880CONFIG_VIDEO_V4L1=y
881CONFIG_VIDEO_V4L1_COMPAT=y
882CONFIG_VIDEO_V4L2=y
816 883
817# 884#
818# Video For Linux 885# Video Capture Adapters
819# 886#
820 887
821# 888#
822# Video Adapters 889# Video Capture Adapters
823# 890#
824# CONFIG_VIDEO_ADV_DEBUG is not set 891# CONFIG_VIDEO_ADV_DEBUG is not set
892CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
893# CONFIG_VIDEO_VIVI is not set
825# CONFIG_VIDEO_BT848 is not set 894# CONFIG_VIDEO_BT848 is not set
826# CONFIG_VIDEO_CPIA is not set 895# CONFIG_VIDEO_CPIA is not set
896# CONFIG_VIDEO_CPIA2 is not set
827# CONFIG_VIDEO_SAA5246A is not set 897# CONFIG_VIDEO_SAA5246A is not set
828# CONFIG_VIDEO_SAA5249 is not set 898# CONFIG_VIDEO_SAA5249 is not set
829# CONFIG_TUNER_3036 is not set 899# CONFIG_TUNER_3036 is not set
@@ -835,10 +905,27 @@ CONFIG_VIDEO_DEV=y
835# CONFIG_VIDEO_HEXIUM_ORION is not set 905# CONFIG_VIDEO_HEXIUM_ORION is not set
836# CONFIG_VIDEO_HEXIUM_GEMINI is not set 906# CONFIG_VIDEO_HEXIUM_GEMINI is not set
837# CONFIG_VIDEO_CX88 is not set 907# CONFIG_VIDEO_CX88 is not set
908# CONFIG_VIDEO_CAFE_CCIC is not set
909
910#
911# V4L USB devices
912#
913# CONFIG_VIDEO_PVRUSB2 is not set
838# CONFIG_VIDEO_EM28XX is not set 914# CONFIG_VIDEO_EM28XX is not set
915# CONFIG_VIDEO_USBVISION is not set
916# CONFIG_USB_VICAM is not set
917# CONFIG_USB_IBMCAM is not set
918# CONFIG_USB_KONICAWC is not set
919# CONFIG_USB_QUICKCAM_MESSENGER is not set
920# CONFIG_USB_ET61X251 is not set
839# CONFIG_VIDEO_OVCAMCHIP is not set 921# CONFIG_VIDEO_OVCAMCHIP is not set
840# CONFIG_VIDEO_AUDIO_DECODER is not set 922# CONFIG_USB_W9968CF is not set
841# CONFIG_VIDEO_DECODER is not set 923# CONFIG_USB_OV511 is not set
924# CONFIG_USB_SE401 is not set
925# CONFIG_USB_SN9C102 is not set
926# CONFIG_USB_STV680 is not set
927# CONFIG_USB_ZC0301 is not set
928# CONFIG_USB_PWC is not set
842 929
843# 930#
844# Radio Adapters 931# Radio Adapters
@@ -846,22 +933,35 @@ CONFIG_VIDEO_DEV=y
846# CONFIG_RADIO_GEMTEK_PCI is not set 933# CONFIG_RADIO_GEMTEK_PCI is not set
847# CONFIG_RADIO_MAXIRADIO is not set 934# CONFIG_RADIO_MAXIRADIO is not set
848# CONFIG_RADIO_MAESTRO is not set 935# CONFIG_RADIO_MAESTRO is not set
936# CONFIG_USB_DSBR is not set
849 937
850# 938#
851# Digital Video Broadcasting Devices 939# Digital Video Broadcasting Devices
852# 940#
853# CONFIG_DVB is not set 941# CONFIG_DVB is not set
942# CONFIG_USB_DABUSB is not set
854 943
855# 944#
856# Graphics support 945# Graphics support
857# 946#
947CONFIG_BACKLIGHT_LCD_SUPPORT=y
948CONFIG_BACKLIGHT_CLASS_DEVICE=y
949CONFIG_LCD_CLASS_DEVICE=m
858CONFIG_FB=y 950CONFIG_FB=y
951# CONFIG_FIRMWARE_EDID is not set
952CONFIG_FB_DDC=y
859CONFIG_FB_CFB_FILLRECT=y 953CONFIG_FB_CFB_FILLRECT=y
860CONFIG_FB_CFB_COPYAREA=y 954CONFIG_FB_CFB_COPYAREA=y
861CONFIG_FB_CFB_IMAGEBLIT=y 955CONFIG_FB_CFB_IMAGEBLIT=y
956# CONFIG_FB_SVGALIB is not set
862# CONFIG_FB_MACMODES is not set 957# CONFIG_FB_MACMODES is not set
958CONFIG_FB_BACKLIGHT=y
863CONFIG_FB_MODE_HELPERS=y 959CONFIG_FB_MODE_HELPERS=y
864# CONFIG_FB_TILEBLITTING is not set 960# CONFIG_FB_TILEBLITTING is not set
961
962#
963# Frambuffer hardware drivers
964#
865# CONFIG_FB_CIRRUS is not set 965# CONFIG_FB_CIRRUS is not set
866# CONFIG_FB_PM2 is not set 966# CONFIG_FB_PM2 is not set
867# CONFIG_FB_CYBER2000 is not set 967# CONFIG_FB_CYBER2000 is not set
@@ -871,12 +971,13 @@ CONFIG_FB_MODE_HELPERS=y
871# CONFIG_FB_NVIDIA is not set 971# CONFIG_FB_NVIDIA is not set
872# CONFIG_FB_RIVA is not set 972# CONFIG_FB_RIVA is not set
873# CONFIG_FB_MATROX is not set 973# CONFIG_FB_MATROX is not set
874# CONFIG_FB_RADEON_OLD is not set
875CONFIG_FB_RADEON=y 974CONFIG_FB_RADEON=y
876CONFIG_FB_RADEON_I2C=y 975CONFIG_FB_RADEON_I2C=y
976CONFIG_FB_RADEON_BACKLIGHT=y
877CONFIG_FB_RADEON_DEBUG=y 977CONFIG_FB_RADEON_DEBUG=y
878# CONFIG_FB_ATY128 is not set 978# CONFIG_FB_ATY128 is not set
879# CONFIG_FB_ATY is not set 979# CONFIG_FB_ATY is not set
980# CONFIG_FB_S3 is not set
880# CONFIG_FB_SAVAGE is not set 981# CONFIG_FB_SAVAGE is not set
881# CONFIG_FB_SIS is not set 982# CONFIG_FB_SIS is not set
882# CONFIG_FB_NEOMAGIC is not set 983# CONFIG_FB_NEOMAGIC is not set
@@ -890,6 +991,7 @@ CONFIG_FB_RADEON_DEBUG=y
890# Console display driver support 991# Console display driver support
891# 992#
892CONFIG_VGA_CONSOLE=y 993CONFIG_VGA_CONSOLE=y
994# CONFIG_VGACON_SOFT_SCROLLBACK is not set
893CONFIG_DUMMY_CONSOLE=y 995CONFIG_DUMMY_CONSOLE=y
894CONFIG_FRAMEBUFFER_CONSOLE=y 996CONFIG_FRAMEBUFFER_CONSOLE=y
895# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 997# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
@@ -904,7 +1006,6 @@ CONFIG_LOGO=y
904# CONFIG_LOGO_LINUX_MONO is not set 1006# CONFIG_LOGO_LINUX_MONO is not set
905# CONFIG_LOGO_LINUX_VGA16 is not set 1007# CONFIG_LOGO_LINUX_VGA16 is not set
906CONFIG_LOGO_LINUX_CLUT224=y 1008CONFIG_LOGO_LINUX_CLUT224=y
907# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
908 1009
909# 1010#
910# Sound 1011# Sound
@@ -924,9 +1025,11 @@ CONFIG_SND_SEQUENCER=y
924CONFIG_SND_OSSEMUL=y 1025CONFIG_SND_OSSEMUL=y
925CONFIG_SND_MIXER_OSS=y 1026CONFIG_SND_MIXER_OSS=y
926CONFIG_SND_PCM_OSS=y 1027CONFIG_SND_PCM_OSS=y
1028CONFIG_SND_PCM_OSS_PLUGINS=y
927CONFIG_SND_SEQUENCER_OSS=y 1029CONFIG_SND_SEQUENCER_OSS=y
928# CONFIG_SND_DYNAMIC_MINORS is not set 1030# CONFIG_SND_DYNAMIC_MINORS is not set
929CONFIG_SND_SUPPORT_OLD_API=y 1031CONFIG_SND_SUPPORT_OLD_API=y
1032CONFIG_SND_VERBOSE_PROCFS=y
930# CONFIG_SND_VERBOSE_PRINTK is not set 1033# CONFIG_SND_VERBOSE_PRINTK is not set
931# CONFIG_SND_DEBUG is not set 1034# CONFIG_SND_DEBUG is not set
932 1035
@@ -936,7 +1039,6 @@ CONFIG_SND_SUPPORT_OLD_API=y
936CONFIG_SND_MPU401_UART=y 1039CONFIG_SND_MPU401_UART=y
937CONFIG_SND_OPL3_LIB=y 1040CONFIG_SND_OPL3_LIB=y
938CONFIG_SND_AC97_CODEC=y 1041CONFIG_SND_AC97_CODEC=y
939CONFIG_SND_AC97_BUS=y
940# CONFIG_SND_DUMMY is not set 1042# CONFIG_SND_DUMMY is not set
941# CONFIG_SND_VIRMIDI is not set 1043# CONFIG_SND_VIRMIDI is not set
942# CONFIG_SND_MTPAV is not set 1044# CONFIG_SND_MTPAV is not set
@@ -947,6 +1049,7 @@ CONFIG_SND_AC97_BUS=y
947# PCI devices 1049# PCI devices
948# 1050#
949# CONFIG_SND_AD1889 is not set 1051# CONFIG_SND_AD1889 is not set
1052# CONFIG_SND_ALS300 is not set
950# CONFIG_SND_ALI5451 is not set 1053# CONFIG_SND_ALI5451 is not set
951# CONFIG_SND_ATIIXP is not set 1054# CONFIG_SND_ATIIXP is not set
952# CONFIG_SND_ATIIXP_MODEM is not set 1055# CONFIG_SND_ATIIXP_MODEM is not set
@@ -959,6 +1062,18 @@ CONFIG_SND_AC97_BUS=y
959# CONFIG_SND_CMIPCI is not set 1062# CONFIG_SND_CMIPCI is not set
960# CONFIG_SND_CS4281 is not set 1063# CONFIG_SND_CS4281 is not set
961# CONFIG_SND_CS46XX is not set 1064# CONFIG_SND_CS46XX is not set
1065# CONFIG_SND_DARLA20 is not set
1066# CONFIG_SND_GINA20 is not set
1067# CONFIG_SND_LAYLA20 is not set
1068# CONFIG_SND_DARLA24 is not set
1069# CONFIG_SND_GINA24 is not set
1070# CONFIG_SND_LAYLA24 is not set
1071# CONFIG_SND_MONA is not set
1072# CONFIG_SND_MIA is not set
1073# CONFIG_SND_ECHO3G is not set
1074# CONFIG_SND_INDIGO is not set
1075# CONFIG_SND_INDIGOIO is not set
1076# CONFIG_SND_INDIGODJ is not set
962# CONFIG_SND_EMU10K1 is not set 1077# CONFIG_SND_EMU10K1 is not set
963# CONFIG_SND_EMU10K1X is not set 1078# CONFIG_SND_EMU10K1X is not set
964# CONFIG_SND_ENS1370 is not set 1079# CONFIG_SND_ENS1370 is not set
@@ -966,7 +1081,7 @@ CONFIG_SND_AC97_BUS=y
966# CONFIG_SND_ES1938 is not set 1081# CONFIG_SND_ES1938 is not set
967# CONFIG_SND_ES1968 is not set 1082# CONFIG_SND_ES1968 is not set
968CONFIG_SND_FM801=y 1083CONFIG_SND_FM801=y
969CONFIG_SND_FM801_TEA575X=y 1084# CONFIG_SND_FM801_TEA575X_BOOL is not set
970# CONFIG_SND_HDA_INTEL is not set 1085# CONFIG_SND_HDA_INTEL is not set
971# CONFIG_SND_HDSP is not set 1086# CONFIG_SND_HDSP is not set
972# CONFIG_SND_HDSPM is not set 1087# CONFIG_SND_HDSPM is not set
@@ -979,6 +1094,7 @@ CONFIG_SND_FM801_TEA575X=y
979# CONFIG_SND_MIXART is not set 1094# CONFIG_SND_MIXART is not set
980# CONFIG_SND_NM256 is not set 1095# CONFIG_SND_NM256 is not set
981# CONFIG_SND_PCXHR is not set 1096# CONFIG_SND_PCXHR is not set
1097# CONFIG_SND_RIPTIDE is not set
982# CONFIG_SND_RME32 is not set 1098# CONFIG_SND_RME32 is not set
983# CONFIG_SND_RME96 is not set 1099# CONFIG_SND_RME96 is not set
984# CONFIG_SND_RME9652 is not set 1100# CONFIG_SND_RME9652 is not set
@@ -988,6 +1104,7 @@ CONFIG_SND_FM801_TEA575X=y
988# CONFIG_SND_VIA82XX_MODEM is not set 1104# CONFIG_SND_VIA82XX_MODEM is not set
989# CONFIG_SND_VX222 is not set 1105# CONFIG_SND_VX222 is not set
990# CONFIG_SND_YMFPCI is not set 1106# CONFIG_SND_YMFPCI is not set
1107# CONFIG_SND_AC97_POWER_SAVE is not set
991 1108
992# 1109#
993# USB devices 1110# USB devices
@@ -995,15 +1112,28 @@ CONFIG_SND_FM801_TEA575X=y
995# CONFIG_SND_USB_AUDIO is not set 1112# CONFIG_SND_USB_AUDIO is not set
996 1113
997# 1114#
1115# SoC audio support
1116#
1117# CONFIG_SND_SOC is not set
1118
1119#
998# Open Sound System 1120# Open Sound System
999# 1121#
1000# CONFIG_SOUND_PRIME is not set 1122# CONFIG_SOUND_PRIME is not set
1123CONFIG_AC97_BUS=y
1124
1125#
1126# HID Devices
1127#
1128CONFIG_HID=y
1129# CONFIG_HID_DEBUG is not set
1001 1130
1002# 1131#
1003# USB support 1132# USB support
1004# 1133#
1005CONFIG_USB_ARCH_HAS_HCD=y 1134CONFIG_USB_ARCH_HAS_HCD=y
1006CONFIG_USB_ARCH_HAS_OHCI=y 1135CONFIG_USB_ARCH_HAS_OHCI=y
1136CONFIG_USB_ARCH_HAS_EHCI=y
1007CONFIG_USB=y 1137CONFIG_USB=y
1008# CONFIG_USB_DEBUG is not set 1138# CONFIG_USB_DEBUG is not set
1009 1139
@@ -1011,7 +1141,6 @@ CONFIG_USB=y
1011# Miscellaneous USB options 1141# Miscellaneous USB options
1012# 1142#
1013# CONFIG_USB_DEVICEFS is not set 1143# CONFIG_USB_DEVICEFS is not set
1014CONFIG_USB_BANDWIDTH=y
1015# CONFIG_USB_DYNAMIC_MINORS is not set 1144# CONFIG_USB_DYNAMIC_MINORS is not set
1016# CONFIG_USB_SUSPEND is not set 1145# CONFIG_USB_SUSPEND is not set
1017# CONFIG_USB_OTG is not set 1146# CONFIG_USB_OTG is not set
@@ -1022,9 +1151,12 @@ CONFIG_USB_BANDWIDTH=y
1022CONFIG_USB_EHCI_HCD=y 1151CONFIG_USB_EHCI_HCD=y
1023# CONFIG_USB_EHCI_SPLIT_ISO is not set 1152# CONFIG_USB_EHCI_SPLIT_ISO is not set
1024# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1153# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1154# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1155# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1025# CONFIG_USB_ISP116X_HCD is not set 1156# CONFIG_USB_ISP116X_HCD is not set
1026CONFIG_USB_OHCI_HCD=y 1157CONFIG_USB_OHCI_HCD=y
1027# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1158# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1159# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1028CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1160CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1029CONFIG_USB_UHCI_HCD=y 1161CONFIG_USB_UHCI_HCD=y
1030# CONFIG_USB_SL811_HCD is not set 1162# CONFIG_USB_SL811_HCD is not set
@@ -1032,7 +1164,6 @@ CONFIG_USB_UHCI_HCD=y
1032# 1164#
1033# USB Device Class drivers 1165# USB Device Class drivers
1034# 1166#
1035# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1036# CONFIG_USB_ACM is not set 1167# CONFIG_USB_ACM is not set
1037# CONFIG_USB_PRINTER is not set 1168# CONFIG_USB_PRINTER is not set
1038 1169
@@ -1054,13 +1185,13 @@ CONFIG_USB_STORAGE=y
1054# CONFIG_USB_STORAGE_SDDR55 is not set 1185# CONFIG_USB_STORAGE_SDDR55 is not set
1055# CONFIG_USB_STORAGE_JUMPSHOT is not set 1186# CONFIG_USB_STORAGE_JUMPSHOT is not set
1056# CONFIG_USB_STORAGE_ALAUDA is not set 1187# CONFIG_USB_STORAGE_ALAUDA is not set
1188# CONFIG_USB_STORAGE_KARMA is not set
1057# CONFIG_USB_LIBUSUAL is not set 1189# CONFIG_USB_LIBUSUAL is not set
1058 1190
1059# 1191#
1060# USB Input Devices 1192# USB Input Devices
1061# 1193#
1062CONFIG_USB_HID=y 1194CONFIG_USB_HID=y
1063CONFIG_USB_HIDINPUT=y
1064# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1195# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1065# CONFIG_HID_FF is not set 1196# CONFIG_HID_FF is not set
1066CONFIG_USB_HIDDEV=y 1197CONFIG_USB_HIDDEV=y
@@ -1069,15 +1200,14 @@ CONFIG_USB_HIDDEV=y
1069# CONFIG_USB_ACECAD is not set 1200# CONFIG_USB_ACECAD is not set
1070# CONFIG_USB_KBTAB is not set 1201# CONFIG_USB_KBTAB is not set
1071# CONFIG_USB_POWERMATE is not set 1202# CONFIG_USB_POWERMATE is not set
1072# CONFIG_USB_MTOUCH is not set 1203# CONFIG_USB_TOUCHSCREEN is not set
1073# CONFIG_USB_ITMTOUCH is not set
1074# CONFIG_USB_EGALAX is not set
1075# CONFIG_USB_YEALINK is not set 1204# CONFIG_USB_YEALINK is not set
1076# CONFIG_USB_XPAD is not set 1205# CONFIG_USB_XPAD is not set
1077# CONFIG_USB_ATI_REMOTE is not set 1206# CONFIG_USB_ATI_REMOTE is not set
1078# CONFIG_USB_ATI_REMOTE2 is not set 1207# CONFIG_USB_ATI_REMOTE2 is not set
1079# CONFIG_USB_KEYSPAN_REMOTE is not set 1208# CONFIG_USB_KEYSPAN_REMOTE is not set
1080# CONFIG_USB_APPLETOUCH is not set 1209# CONFIG_USB_APPLETOUCH is not set
1210# CONFIG_USB_GTCO is not set
1081 1211
1082# 1212#
1083# USB Imaging devices 1213# USB Imaging devices
@@ -1086,27 +1216,13 @@ CONFIG_USB_HIDDEV=y
1086# CONFIG_USB_MICROTEK is not set 1216# CONFIG_USB_MICROTEK is not set
1087 1217
1088# 1218#
1089# USB Multimedia devices
1090#
1091# CONFIG_USB_DABUSB is not set
1092# CONFIG_USB_VICAM is not set
1093# CONFIG_USB_DSBR is not set
1094# CONFIG_USB_ET61X251 is not set
1095# CONFIG_USB_IBMCAM is not set
1096# CONFIG_USB_KONICAWC is not set
1097# CONFIG_USB_OV511 is not set
1098# CONFIG_USB_SE401 is not set
1099# CONFIG_USB_SN9C102 is not set
1100# CONFIG_USB_STV680 is not set
1101# CONFIG_USB_PWC is not set
1102
1103#
1104# USB Network Adapters 1219# USB Network Adapters
1105# 1220#
1106# CONFIG_USB_CATC is not set 1221# CONFIG_USB_CATC is not set
1107# CONFIG_USB_KAWETH is not set 1222# CONFIG_USB_KAWETH is not set
1108# CONFIG_USB_PEGASUS is not set 1223# CONFIG_USB_PEGASUS is not set
1109# CONFIG_USB_RTL8150 is not set 1224# CONFIG_USB_RTL8150 is not set
1225# CONFIG_USB_USBNET_MII is not set
1110# CONFIG_USB_USBNET is not set 1226# CONFIG_USB_USBNET is not set
1111CONFIG_USB_MON=y 1227CONFIG_USB_MON=y
1112 1228
@@ -1124,17 +1240,23 @@ CONFIG_USB_MON=y
1124# 1240#
1125# CONFIG_USB_EMI62 is not set 1241# CONFIG_USB_EMI62 is not set
1126# CONFIG_USB_EMI26 is not set 1242# CONFIG_USB_EMI26 is not set
1243# CONFIG_USB_ADUTUX is not set
1127# CONFIG_USB_AUERSWALD is not set 1244# CONFIG_USB_AUERSWALD is not set
1128# CONFIG_USB_RIO500 is not set 1245# CONFIG_USB_RIO500 is not set
1129# CONFIG_USB_LEGOTOWER is not set 1246# CONFIG_USB_LEGOTOWER is not set
1130# CONFIG_USB_LCD is not set 1247# CONFIG_USB_LCD is not set
1248# CONFIG_USB_BERRY_CHARGE is not set
1131# CONFIG_USB_LED is not set 1249# CONFIG_USB_LED is not set
1250# CONFIG_USB_CYPRESS_CY7C63 is not set
1132# CONFIG_USB_CYTHERM is not set 1251# CONFIG_USB_CYTHERM is not set
1133# CONFIG_USB_PHIDGETKIT is not set 1252# CONFIG_USB_PHIDGET is not set
1134# CONFIG_USB_PHIDGETSERVO is not set
1135# CONFIG_USB_IDMOUSE is not set 1253# CONFIG_USB_IDMOUSE is not set
1254# CONFIG_USB_FTDI_ELAN is not set
1255# CONFIG_USB_APPLEDISPLAY is not set
1136# CONFIG_USB_SISUSBVGA is not set 1256# CONFIG_USB_SISUSBVGA is not set
1137# CONFIG_USB_LD is not set 1257# CONFIG_USB_LD is not set
1258# CONFIG_USB_TRANCEVIBRATOR is not set
1259# CONFIG_USB_IOWARRIOR is not set
1138 1260
1139# 1261#
1140# USB DSL modem support 1262# USB DSL modem support
@@ -1151,13 +1273,53 @@ CONFIG_USB_MON=y
1151# CONFIG_MMC is not set 1273# CONFIG_MMC is not set
1152 1274
1153# 1275#
1276# LED devices
1277#
1278# CONFIG_NEW_LEDS is not set
1279
1280#
1281# LED drivers
1282#
1283
1284#
1285# LED Triggers
1286#
1287
1288#
1154# InfiniBand support 1289# InfiniBand support
1155# 1290#
1156# CONFIG_INFINIBAND is not set 1291# CONFIG_INFINIBAND is not set
1157 1292
1158# 1293#
1159# EDAC - error detection and reporting (RAS) 1294# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1295#
1296
1297#
1298# Real Time Clock
1160# 1299#
1300# CONFIG_RTC_CLASS is not set
1301
1302#
1303# DMA Engine support
1304#
1305# CONFIG_DMA_ENGINE is not set
1306
1307#
1308# DMA Clients
1309#
1310
1311#
1312# DMA Devices
1313#
1314
1315#
1316# Auxiliary Display support
1317#
1318
1319#
1320# Virtualization
1321#
1322# CONFIG_MSPEC is not set
1161 1323
1162# 1324#
1163# File systems 1325# File systems
@@ -1171,6 +1333,7 @@ CONFIG_EXT3_FS=y
1171CONFIG_EXT3_FS_XATTR=y 1333CONFIG_EXT3_FS_XATTR=y
1172# CONFIG_EXT3_FS_POSIX_ACL is not set 1334# CONFIG_EXT3_FS_POSIX_ACL is not set
1173# CONFIG_EXT3_FS_SECURITY is not set 1335# CONFIG_EXT3_FS_SECURITY is not set
1336# CONFIG_EXT4DEV_FS is not set
1174CONFIG_JBD=y 1337CONFIG_JBD=y
1175# CONFIG_JBD_DEBUG is not set 1338# CONFIG_JBD_DEBUG is not set
1176CONFIG_FS_MBCACHE=y 1339CONFIG_FS_MBCACHE=y
@@ -1178,6 +1341,7 @@ CONFIG_FS_MBCACHE=y
1178# CONFIG_JFS_FS is not set 1341# CONFIG_JFS_FS is not set
1179# CONFIG_FS_POSIX_ACL is not set 1342# CONFIG_FS_POSIX_ACL is not set
1180# CONFIG_XFS_FS is not set 1343# CONFIG_XFS_FS is not set
1344# CONFIG_GFS2_FS is not set
1181# CONFIG_OCFS2_FS is not set 1345# CONFIG_OCFS2_FS is not set
1182# CONFIG_MINIX_FS is not set 1346# CONFIG_MINIX_FS is not set
1183# CONFIG_ROMFS_FS is not set 1347# CONFIG_ROMFS_FS is not set
@@ -1212,12 +1376,14 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1212# 1376#
1213CONFIG_PROC_FS=y 1377CONFIG_PROC_FS=y
1214CONFIG_PROC_KCORE=y 1378CONFIG_PROC_KCORE=y
1379CONFIG_PROC_VMCORE=y
1380CONFIG_PROC_SYSCTL=y
1215CONFIG_SYSFS=y 1381CONFIG_SYSFS=y
1216CONFIG_TMPFS=y 1382CONFIG_TMPFS=y
1383# CONFIG_TMPFS_POSIX_ACL is not set
1217CONFIG_HUGETLBFS=y 1384CONFIG_HUGETLBFS=y
1218CONFIG_HUGETLB_PAGE=y 1385CONFIG_HUGETLB_PAGE=y
1219CONFIG_RAMFS=y 1386CONFIG_RAMFS=y
1220# CONFIG_RELAYFS_FS is not set
1221# CONFIG_CONFIGFS_FS is not set 1387# CONFIG_CONFIGFS_FS is not set
1222 1388
1223# 1389#
@@ -1331,15 +1497,25 @@ CONFIG_NLS_KOI8_U=y
1331CONFIG_NLS_UTF8=y 1497CONFIG_NLS_UTF8=y
1332 1498
1333# 1499#
1500# Distributed Lock Manager
1501#
1502# CONFIG_DLM is not set
1503
1504#
1334# Library routines 1505# Library routines
1335# 1506#
1507CONFIG_BITREVERSE=y
1336# CONFIG_CRC_CCITT is not set 1508# CONFIG_CRC_CCITT is not set
1337# CONFIG_CRC16 is not set 1509# CONFIG_CRC16 is not set
1338CONFIG_CRC32=y 1510CONFIG_CRC32=y
1339# CONFIG_LIBCRC32C is not set 1511# CONFIG_LIBCRC32C is not set
1512CONFIG_PLIST=y
1513CONFIG_HAS_IOMEM=y
1514CONFIG_HAS_IOPORT=y
1340CONFIG_GENERIC_HARDIRQS=y 1515CONFIG_GENERIC_HARDIRQS=y
1341CONFIG_GENERIC_IRQ_PROBE=y 1516CONFIG_GENERIC_IRQ_PROBE=y
1342CONFIG_GENERIC_PENDING_IRQ=y 1517CONFIG_GENERIC_PENDING_IRQ=y
1518CONFIG_IRQ_PER_CPU=y
1343 1519
1344# 1520#
1345# Instrumentation Support 1521# Instrumentation Support
@@ -1351,21 +1527,32 @@ CONFIG_KPROBES=y
1351# Kernel hacking 1527# Kernel hacking
1352# 1528#
1353# CONFIG_PRINTK_TIME is not set 1529# CONFIG_PRINTK_TIME is not set
1530CONFIG_ENABLE_MUST_CHECK=y
1354CONFIG_MAGIC_SYSRQ=y 1531CONFIG_MAGIC_SYSRQ=y
1532# CONFIG_UNUSED_SYMBOLS is not set
1533# CONFIG_DEBUG_FS is not set
1534# CONFIG_HEADERS_CHECK is not set
1355CONFIG_DEBUG_KERNEL=y 1535CONFIG_DEBUG_KERNEL=y
1536# CONFIG_DEBUG_SHIRQ is not set
1356CONFIG_LOG_BUF_SHIFT=17 1537CONFIG_LOG_BUF_SHIFT=17
1357CONFIG_DETECT_SOFTLOCKUP=y 1538CONFIG_DETECT_SOFTLOCKUP=y
1358# CONFIG_SCHEDSTATS is not set 1539# CONFIG_SCHEDSTATS is not set
1540# CONFIG_TIMER_STATS is not set
1359# CONFIG_DEBUG_SLAB is not set 1541# CONFIG_DEBUG_SLAB is not set
1360CONFIG_DEBUG_MUTEXES=y 1542# CONFIG_DEBUG_RT_MUTEXES is not set
1543# CONFIG_RT_MUTEX_TESTER is not set
1361# CONFIG_DEBUG_SPINLOCK is not set 1544# CONFIG_DEBUG_SPINLOCK is not set
1545CONFIG_DEBUG_MUTEXES=y
1362# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1546# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1547# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1363# CONFIG_DEBUG_KOBJECT is not set 1548# CONFIG_DEBUG_KOBJECT is not set
1364# CONFIG_DEBUG_INFO is not set 1549# CONFIG_DEBUG_INFO is not set
1365# CONFIG_DEBUG_FS is not set
1366# CONFIG_DEBUG_VM is not set 1550# CONFIG_DEBUG_VM is not set
1551# CONFIG_DEBUG_LIST is not set
1367CONFIG_FORCED_INLINING=y 1552CONFIG_FORCED_INLINING=y
1368# CONFIG_RCU_TORTURE_TEST is not set 1553# CONFIG_RCU_TORTURE_TEST is not set
1554# CONFIG_LKDTM is not set
1555# CONFIG_FAULT_INJECTION is not set
1369CONFIG_IA64_GRANULE_16MB=y 1556CONFIG_IA64_GRANULE_16MB=y
1370# CONFIG_IA64_GRANULE_64MB is not set 1557# CONFIG_IA64_GRANULE_64MB is not set
1371CONFIG_IA64_PRINT_HAZARDS=y 1558CONFIG_IA64_PRINT_HAZARDS=y
@@ -1384,7 +1571,11 @@ CONFIG_SYSVIPC_COMPAT=y
1384# Cryptographic options 1571# Cryptographic options
1385# 1572#
1386CONFIG_CRYPTO=y 1573CONFIG_CRYPTO=y
1574CONFIG_CRYPTO_ALGAPI=y
1575CONFIG_CRYPTO_BLKCIPHER=y
1576CONFIG_CRYPTO_MANAGER=y
1387# CONFIG_CRYPTO_HMAC is not set 1577# CONFIG_CRYPTO_HMAC is not set
1578# CONFIG_CRYPTO_XCBC is not set
1388# CONFIG_CRYPTO_NULL is not set 1579# CONFIG_CRYPTO_NULL is not set
1389# CONFIG_CRYPTO_MD4 is not set 1580# CONFIG_CRYPTO_MD4 is not set
1390CONFIG_CRYPTO_MD5=y 1581CONFIG_CRYPTO_MD5=y
@@ -1393,7 +1584,13 @@ CONFIG_CRYPTO_MD5=y
1393# CONFIG_CRYPTO_SHA512 is not set 1584# CONFIG_CRYPTO_SHA512 is not set
1394# CONFIG_CRYPTO_WP512 is not set 1585# CONFIG_CRYPTO_WP512 is not set
1395# CONFIG_CRYPTO_TGR192 is not set 1586# CONFIG_CRYPTO_TGR192 is not set
1587# CONFIG_CRYPTO_GF128MUL is not set
1588CONFIG_CRYPTO_ECB=m
1589CONFIG_CRYPTO_CBC=y
1590CONFIG_CRYPTO_PCBC=m
1591# CONFIG_CRYPTO_LRW is not set
1396CONFIG_CRYPTO_DES=y 1592CONFIG_CRYPTO_DES=y
1593# CONFIG_CRYPTO_FCRYPT is not set
1397# CONFIG_CRYPTO_BLOWFISH is not set 1594# CONFIG_CRYPTO_BLOWFISH is not set
1398# CONFIG_CRYPTO_TWOFISH is not set 1595# CONFIG_CRYPTO_TWOFISH is not set
1399# CONFIG_CRYPTO_SERPENT is not set 1596# CONFIG_CRYPTO_SERPENT is not set
@@ -1407,6 +1604,7 @@ CONFIG_CRYPTO_DES=y
1407# CONFIG_CRYPTO_DEFLATE is not set 1604# CONFIG_CRYPTO_DEFLATE is not set
1408# CONFIG_CRYPTO_MICHAEL_MIC is not set 1605# CONFIG_CRYPTO_MICHAEL_MIC is not set
1409# CONFIG_CRYPTO_CRC32C is not set 1606# CONFIG_CRYPTO_CRC32C is not set
1607# CONFIG_CRYPTO_CAMELLIA is not set
1410# CONFIG_CRYPTO_TEST is not set 1608# CONFIG_CRYPTO_TEST is not set
1411 1609
1412# 1610#
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 9001b3fbaa32..153bfdc0182d 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -1,8 +1,9 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc5 3# Linux kernel version: 2.6.21-rc3
4# Mon Feb 27 16:02:28 2006 4# Thu Mar 8 11:01:03 2007
5# 5#
6CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
6 7
7# 8#
8# Code maturity level options 9# Code maturity level options
@@ -18,16 +19,24 @@ CONFIG_LOCALVERSION=""
18CONFIG_LOCALVERSION_AUTO=y 19CONFIG_LOCALVERSION_AUTO=y
19CONFIG_SWAP=y 20CONFIG_SWAP=y
20CONFIG_SYSVIPC=y 21CONFIG_SYSVIPC=y
22# CONFIG_IPC_NS is not set
23CONFIG_SYSVIPC_SYSCTL=y
21CONFIG_POSIX_MQUEUE=y 24CONFIG_POSIX_MQUEUE=y
22# CONFIG_BSD_PROCESS_ACCT is not set 25# CONFIG_BSD_PROCESS_ACCT is not set
23CONFIG_SYSCTL=y 26# CONFIG_TASKSTATS is not set
27# CONFIG_UTS_NS is not set
24# CONFIG_AUDIT is not set 28# CONFIG_AUDIT is not set
25CONFIG_IKCONFIG=y 29CONFIG_IKCONFIG=y
26CONFIG_IKCONFIG_PROC=y 30CONFIG_IKCONFIG_PROC=y
27# CONFIG_CPUSETS is not set 31# CONFIG_CPUSETS is not set
32CONFIG_SYSFS_DEPRECATED=y
33# CONFIG_RELAY is not set
34CONFIG_BLK_DEV_INITRD=y
28CONFIG_INITRAMFS_SOURCE="" 35CONFIG_INITRAMFS_SOURCE=""
29CONFIG_CC_OPTIMIZE_FOR_SIZE=y 36CONFIG_CC_OPTIMIZE_FOR_SIZE=y
37CONFIG_SYSCTL=y
30# CONFIG_EMBEDDED is not set 38# CONFIG_EMBEDDED is not set
39CONFIG_SYSCTL_SYSCALL=y
31CONFIG_KALLSYMS=y 40CONFIG_KALLSYMS=y
32CONFIG_KALLSYMS_ALL=y 41CONFIG_KALLSYMS_ALL=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set 42# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -39,11 +48,9 @@ CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 48CONFIG_FUTEX=y
40CONFIG_EPOLL=y 49CONFIG_EPOLL=y
41CONFIG_SHMEM=y 50CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46CONFIG_SLAB=y 51CONFIG_SLAB=y
52CONFIG_VM_EVENT_COUNTERS=y
53CONFIG_RT_MUTEXES=y
47# CONFIG_TINY_SHMEM is not set 54# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0 55CONFIG_BASE_SMALL=0
49# CONFIG_SLOB is not set 56# CONFIG_SLOB is not set
@@ -54,7 +61,6 @@ CONFIG_BASE_SMALL=0
54CONFIG_MODULES=y 61CONFIG_MODULES=y
55CONFIG_MODULE_UNLOAD=y 62CONFIG_MODULE_UNLOAD=y
56# CONFIG_MODULE_FORCE_UNLOAD is not set 63# CONFIG_MODULE_FORCE_UNLOAD is not set
57CONFIG_OBSOLETE_MODPARM=y
58CONFIG_MODVERSIONS=y 64CONFIG_MODVERSIONS=y
59# CONFIG_MODULE_SRCVERSION_ALL is not set 65# CONFIG_MODULE_SRCVERSION_ALL is not set
60CONFIG_KMOD=y 66CONFIG_KMOD=y
@@ -63,6 +69,8 @@ CONFIG_STOP_MACHINE=y
63# 69#
64# Block layer 70# Block layer
65# 71#
72CONFIG_BLOCK=y
73# CONFIG_BLK_DEV_IO_TRACE is not set
66 74
67# 75#
68# IO Schedulers 76# IO Schedulers
@@ -82,15 +90,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
82# 90#
83CONFIG_IA64=y 91CONFIG_IA64=y
84CONFIG_64BIT=y 92CONFIG_64BIT=y
93CONFIG_ZONE_DMA=y
85CONFIG_MMU=y 94CONFIG_MMU=y
86CONFIG_SWIOTLB=y 95CONFIG_SWIOTLB=y
87CONFIG_RWSEM_XCHGADD_ALGORITHM=y 96CONFIG_RWSEM_XCHGADD_ALGORITHM=y
97# CONFIG_ARCH_HAS_ILOG2_U32 is not set
98# CONFIG_ARCH_HAS_ILOG2_U64 is not set
99CONFIG_GENERIC_FIND_NEXT_BIT=y
88CONFIG_GENERIC_CALIBRATE_DELAY=y 100CONFIG_GENERIC_CALIBRATE_DELAY=y
89CONFIG_TIME_INTERPOLATION=y 101CONFIG_TIME_INTERPOLATION=y
102CONFIG_DMI=y
90CONFIG_EFI=y 103CONFIG_EFI=y
91CONFIG_GENERIC_IOMAP=y 104CONFIG_GENERIC_IOMAP=y
92CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 105CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
93CONFIG_DMA_IS_DMA32=y 106CONFIG_AUDIT_ARCH=y
94CONFIG_IA64_GENERIC=y 107CONFIG_IA64_GENERIC=y
95# CONFIG_IA64_DIG is not set 108# CONFIG_IA64_DIG is not set
96# CONFIG_IA64_HP_ZX1 is not set 109# CONFIG_IA64_HP_ZX1 is not set
@@ -107,6 +120,7 @@ CONFIG_PGTABLE_3=y
107# CONFIG_PGTABLE_4 is not set 120# CONFIG_PGTABLE_4 is not set
108# CONFIG_HZ_100 is not set 121# CONFIG_HZ_100 is not set
109CONFIG_HZ_250=y 122CONFIG_HZ_250=y
123# CONFIG_HZ_300 is not set
110# CONFIG_HZ_1000 is not set 124# CONFIG_HZ_1000 is not set
111CONFIG_HZ=250 125CONFIG_HZ=250
112CONFIG_IA64_L1_CACHE_SHIFT=7 126CONFIG_IA64_L1_CACHE_SHIFT=7
@@ -116,9 +130,10 @@ CONFIG_IOSAPIC=y
116CONFIG_FORCE_MAX_ZONEORDER=17 130CONFIG_FORCE_MAX_ZONEORDER=17
117CONFIG_SMP=y 131CONFIG_SMP=y
118CONFIG_NR_CPUS=512 132CONFIG_NR_CPUS=512
119CONFIG_IA64_NR_NODES=256
120CONFIG_HOTPLUG_CPU=y 133CONFIG_HOTPLUG_CPU=y
134CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
121# CONFIG_SCHED_SMT is not set 135# CONFIG_SCHED_SMT is not set
136# CONFIG_PERMIT_BSP_REMOVE is not set
122# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
123CONFIG_SELECT_MEMORY_MODEL=y 138CONFIG_SELECT_MEMORY_MODEL=y
124# CONFIG_FLATMEM_MANUAL is not set 139# CONFIG_FLATMEM_MANUAL is not set
@@ -130,21 +145,34 @@ CONFIG_NEED_MULTIPLE_NODES=y
130# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
132CONFIG_MIGRATION=y 147CONFIG_MIGRATION=y
148CONFIG_RESOURCES_64BIT=y
149CONFIG_ZONE_DMA_FLAG=1
133CONFIG_ARCH_SELECT_MEMORY_MODEL=y 150CONFIG_ARCH_SELECT_MEMORY_MODEL=y
134CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 151CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
135CONFIG_ARCH_FLATMEM_ENABLE=y 152CONFIG_ARCH_FLATMEM_ENABLE=y
136CONFIG_ARCH_SPARSEMEM_ENABLE=y 153CONFIG_ARCH_SPARSEMEM_ENABLE=y
137CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y 154CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
138CONFIG_NUMA=y 155CONFIG_NUMA=y
156CONFIG_NODES_SHIFT=10
157CONFIG_ARCH_POPULATES_NODE_MAP=y
139CONFIG_VIRTUAL_MEM_MAP=y 158CONFIG_VIRTUAL_MEM_MAP=y
140CONFIG_HOLES_IN_ZONE=y 159CONFIG_HOLES_IN_ZONE=y
141CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y 160CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
161CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y
142CONFIG_IA32_SUPPORT=y 162CONFIG_IA32_SUPPORT=y
143CONFIG_COMPAT=y 163CONFIG_COMPAT=y
144CONFIG_IA64_MCA_RECOVERY=y 164CONFIG_IA64_MCA_RECOVERY=y
145CONFIG_PERFMON=y 165CONFIG_PERFMON=y
146CONFIG_IA64_PALINFO=y 166CONFIG_IA64_PALINFO=y
147CONFIG_SGI_SN=y 167CONFIG_SGI_SN=y
168# CONFIG_IA64_ESI is not set
169
170#
171# SN Devices
172#
173CONFIG_SGI_IOC3=m
174CONFIG_KEXEC=y
175CONFIG_CRASH_DUMP=y
148 176
149# 177#
150# Firmware Drivers 178# Firmware Drivers
@@ -160,13 +188,16 @@ CONFIG_BINFMT_MISC=m
160CONFIG_PM=y 188CONFIG_PM=y
161CONFIG_PM_LEGACY=y 189CONFIG_PM_LEGACY=y
162# CONFIG_PM_DEBUG is not set 190# CONFIG_PM_DEBUG is not set
191# CONFIG_PM_SYSFS_DEPRECATED is not set
163 192
164# 193#
165# ACPI (Advanced Configuration and Power Interface) Support 194# ACPI (Advanced Configuration and Power Interface) Support
166# 195#
167CONFIG_ACPI=y 196CONFIG_ACPI=y
197CONFIG_ACPI_PROCFS=y
168CONFIG_ACPI_BUTTON=m 198CONFIG_ACPI_BUTTON=m
169CONFIG_ACPI_FAN=m 199CONFIG_ACPI_FAN=m
200# CONFIG_ACPI_DOCK is not set
170CONFIG_ACPI_PROCESSOR=m 201CONFIG_ACPI_PROCESSOR=m
171CONFIG_ACPI_HOTPLUG_CPU=y 202CONFIG_ACPI_HOTPLUG_CPU=y
172CONFIG_ACPI_THERMAL=m 203CONFIG_ACPI_THERMAL=m
@@ -188,8 +219,8 @@ CONFIG_ACPI_CONTAINER=m
188# 219#
189CONFIG_PCI=y 220CONFIG_PCI=y
190CONFIG_PCI_DOMAINS=y 221CONFIG_PCI_DOMAINS=y
222# CONFIG_PCIEPORTBUS is not set
191# CONFIG_PCI_MSI is not set 223# CONFIG_PCI_MSI is not set
192CONFIG_PCI_LEGACY_PROC=y
193# CONFIG_PCI_DEBUG is not set 224# CONFIG_PCI_DEBUG is not set
194 225
195# 226#
@@ -220,6 +251,10 @@ CONFIG_NET=y
220CONFIG_PACKET=y 251CONFIG_PACKET=y
221# CONFIG_PACKET_MMAP is not set 252# CONFIG_PACKET_MMAP is not set
222CONFIG_UNIX=y 253CONFIG_UNIX=y
254CONFIG_XFRM=y
255# CONFIG_XFRM_USER is not set
256# CONFIG_XFRM_SUB_POLICY is not set
257# CONFIG_XFRM_MIGRATE is not set
223# CONFIG_NET_KEY is not set 258# CONFIG_NET_KEY is not set
224CONFIG_INET=y 259CONFIG_INET=y
225CONFIG_IP_MULTICAST=y 260CONFIG_IP_MULTICAST=y
@@ -234,12 +269,21 @@ CONFIG_SYN_COOKIES=y
234# CONFIG_INET_AH is not set 269# CONFIG_INET_AH is not set
235# CONFIG_INET_ESP is not set 270# CONFIG_INET_ESP is not set
236# CONFIG_INET_IPCOMP is not set 271# CONFIG_INET_IPCOMP is not set
272# CONFIG_INET_XFRM_TUNNEL is not set
237# CONFIG_INET_TUNNEL is not set 273# CONFIG_INET_TUNNEL is not set
274CONFIG_INET_XFRM_MODE_TRANSPORT=y
275CONFIG_INET_XFRM_MODE_TUNNEL=y
276CONFIG_INET_XFRM_MODE_BEET=y
238CONFIG_INET_DIAG=y 277CONFIG_INET_DIAG=y
239CONFIG_INET_TCP_DIAG=y 278CONFIG_INET_TCP_DIAG=y
240# CONFIG_TCP_CONG_ADVANCED is not set 279# CONFIG_TCP_CONG_ADVANCED is not set
241CONFIG_TCP_CONG_BIC=y 280CONFIG_TCP_CONG_CUBIC=y
281CONFIG_DEFAULT_TCP_CONG="cubic"
282# CONFIG_TCP_MD5SIG is not set
242# CONFIG_IPV6 is not set 283# CONFIG_IPV6 is not set
284# CONFIG_INET6_XFRM_TUNNEL is not set
285# CONFIG_INET6_TUNNEL is not set
286# CONFIG_NETWORK_SECMARK is not set
243# CONFIG_NETFILTER is not set 287# CONFIG_NETFILTER is not set
244 288
245# 289#
@@ -265,7 +309,6 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_ATALK is not set 309# CONFIG_ATALK is not set
266# CONFIG_X25 is not set 310# CONFIG_X25 is not set
267# CONFIG_LAPB is not set 311# CONFIG_LAPB is not set
268# CONFIG_NET_DIVERT is not set
269# CONFIG_ECONET is not set 312# CONFIG_ECONET is not set
270# CONFIG_WAN_ROUTER is not set 313# CONFIG_WAN_ROUTER is not set
271 314
@@ -294,6 +337,8 @@ CONFIG_STANDALONE=y
294CONFIG_PREVENT_FIRMWARE_BUILD=y 337CONFIG_PREVENT_FIRMWARE_BUILD=y
295CONFIG_FW_LOADER=m 338CONFIG_FW_LOADER=m
296# CONFIG_DEBUG_DRIVER is not set 339# CONFIG_DEBUG_DRIVER is not set
340# CONFIG_DEBUG_DEVRES is not set
341# CONFIG_SYS_HYPERVISOR is not set
297 342
298# 343#
299# Connector - unified userspace <-> kernelspace linker 344# Connector - unified userspace <-> kernelspace linker
@@ -337,11 +382,17 @@ CONFIG_BLK_DEV_NBD=m
337CONFIG_BLK_DEV_RAM=y 382CONFIG_BLK_DEV_RAM=y
338CONFIG_BLK_DEV_RAM_COUNT=16 383CONFIG_BLK_DEV_RAM_COUNT=16
339CONFIG_BLK_DEV_RAM_SIZE=4096 384CONFIG_BLK_DEV_RAM_SIZE=4096
340CONFIG_BLK_DEV_INITRD=y 385CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
341# CONFIG_CDROM_PKTCDVD is not set 386# CONFIG_CDROM_PKTCDVD is not set
342# CONFIG_ATA_OVER_ETH is not set 387# CONFIG_ATA_OVER_ETH is not set
343 388
344# 389#
390# Misc devices
391#
392CONFIG_SGI_IOC4=y
393# CONFIG_TIFM_CORE is not set
394
395#
345# ATA/ATAPI/MFM/RLL support 396# ATA/ATAPI/MFM/RLL support
346# 397#
347CONFIG_IDE=y 398CONFIG_IDE=y
@@ -358,6 +409,7 @@ CONFIG_BLK_DEV_IDECD=y
358# CONFIG_BLK_DEV_IDETAPE is not set 409# CONFIG_BLK_DEV_IDETAPE is not set
359CONFIG_BLK_DEV_IDEFLOPPY=y 410CONFIG_BLK_DEV_IDEFLOPPY=y
360CONFIG_BLK_DEV_IDESCSI=m 411CONFIG_BLK_DEV_IDESCSI=m
412# CONFIG_BLK_DEV_IDEACPI is not set
361# CONFIG_IDE_TASK_IOCTL is not set 413# CONFIG_IDE_TASK_IOCTL is not set
362 414
363# 415#
@@ -384,8 +436,10 @@ CONFIG_BLK_DEV_CMD64X=y
384# CONFIG_BLK_DEV_CS5530 is not set 436# CONFIG_BLK_DEV_CS5530 is not set
385# CONFIG_BLK_DEV_HPT34X is not set 437# CONFIG_BLK_DEV_HPT34X is not set
386# CONFIG_BLK_DEV_HPT366 is not set 438# CONFIG_BLK_DEV_HPT366 is not set
439# CONFIG_BLK_DEV_JMICRON is not set
387# CONFIG_BLK_DEV_SC1200 is not set 440# CONFIG_BLK_DEV_SC1200 is not set
388CONFIG_BLK_DEV_PIIX=y 441CONFIG_BLK_DEV_PIIX=y
442# CONFIG_BLK_DEV_IT8213 is not set
389# CONFIG_BLK_DEV_IT821X is not set 443# CONFIG_BLK_DEV_IT821X is not set
390# CONFIG_BLK_DEV_NS87415 is not set 444# CONFIG_BLK_DEV_NS87415 is not set
391# CONFIG_BLK_DEV_PDC202XX_OLD is not set 445# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -396,6 +450,7 @@ CONFIG_BLK_DEV_SGIIOC4=y
396# CONFIG_BLK_DEV_SLC90E66 is not set 450# CONFIG_BLK_DEV_SLC90E66 is not set
397# CONFIG_BLK_DEV_TRM290 is not set 451# CONFIG_BLK_DEV_TRM290 is not set
398# CONFIG_BLK_DEV_VIA82CXXX is not set 452# CONFIG_BLK_DEV_VIA82CXXX is not set
453# CONFIG_BLK_DEV_TC86C001 is not set
399# CONFIG_IDE_ARM is not set 454# CONFIG_IDE_ARM is not set
400CONFIG_BLK_DEV_IDEDMA=y 455CONFIG_BLK_DEV_IDEDMA=y
401# CONFIG_IDEDMA_IVB is not set 456# CONFIG_IDEDMA_IVB is not set
@@ -407,6 +462,8 @@ CONFIG_IDEDMA_AUTO=y
407# 462#
408# CONFIG_RAID_ATTRS is not set 463# CONFIG_RAID_ATTRS is not set
409CONFIG_SCSI=y 464CONFIG_SCSI=y
465# CONFIG_SCSI_TGT is not set
466CONFIG_SCSI_NETLINK=y
410CONFIG_SCSI_PROC_FS=y 467CONFIG_SCSI_PROC_FS=y
411 468
412# 469#
@@ -426,14 +483,16 @@ CONFIG_CHR_DEV_SG=m
426# CONFIG_SCSI_MULTI_LUN is not set 483# CONFIG_SCSI_MULTI_LUN is not set
427# CONFIG_SCSI_CONSTANTS is not set 484# CONFIG_SCSI_CONSTANTS is not set
428# CONFIG_SCSI_LOGGING is not set 485# CONFIG_SCSI_LOGGING is not set
486# CONFIG_SCSI_SCAN_ASYNC is not set
429 487
430# 488#
431# SCSI Transport Attributes 489# SCSI Transports
432# 490#
433CONFIG_SCSI_SPI_ATTRS=y 491CONFIG_SCSI_SPI_ATTRS=y
434CONFIG_SCSI_FC_ATTRS=y 492CONFIG_SCSI_FC_ATTRS=y
435# CONFIG_SCSI_ISCSI_ATTRS is not set 493# CONFIG_SCSI_ISCSI_ATTRS is not set
436# CONFIG_SCSI_SAS_ATTRS is not set 494# CONFIG_SCSI_SAS_ATTRS is not set
495# CONFIG_SCSI_SAS_LIBSAS is not set
437 496
438# 497#
439# SCSI low-level drivers 498# SCSI low-level drivers
@@ -446,43 +505,36 @@ CONFIG_SCSI_FC_ATTRS=y
446# CONFIG_SCSI_AIC7XXX is not set 505# CONFIG_SCSI_AIC7XXX is not set
447# CONFIG_SCSI_AIC7XXX_OLD is not set 506# CONFIG_SCSI_AIC7XXX_OLD is not set
448# CONFIG_SCSI_AIC79XX is not set 507# CONFIG_SCSI_AIC79XX is not set
508# CONFIG_SCSI_AIC94XX is not set
509# CONFIG_SCSI_ARCMSR is not set
449# CONFIG_MEGARAID_NEWGEN is not set 510# CONFIG_MEGARAID_NEWGEN is not set
450# CONFIG_MEGARAID_LEGACY is not set 511# CONFIG_MEGARAID_LEGACY is not set
451# CONFIG_MEGARAID_SAS is not set 512# CONFIG_MEGARAID_SAS is not set
452CONFIG_SCSI_SATA=y 513# CONFIG_SCSI_HPTIOP is not set
453# CONFIG_SCSI_SATA_AHCI is not set
454# CONFIG_SCSI_SATA_SVW is not set
455# CONFIG_SCSI_ATA_PIIX is not set
456# CONFIG_SCSI_SATA_MV is not set
457# CONFIG_SCSI_SATA_NV is not set
458# CONFIG_SCSI_PDC_ADMA is not set
459# CONFIG_SCSI_SATA_QSTOR is not set
460# CONFIG_SCSI_SATA_PROMISE is not set
461# CONFIG_SCSI_SATA_SX4 is not set
462# CONFIG_SCSI_SATA_SIL is not set
463# CONFIG_SCSI_SATA_SIL24 is not set
464# CONFIG_SCSI_SATA_SIS is not set
465# CONFIG_SCSI_SATA_ULI is not set
466# CONFIG_SCSI_SATA_VIA is not set
467CONFIG_SCSI_SATA_VITESSE=y
468# CONFIG_SCSI_DMX3191D is not set 514# CONFIG_SCSI_DMX3191D is not set
469# CONFIG_SCSI_FUTURE_DOMAIN is not set 515# CONFIG_SCSI_FUTURE_DOMAIN is not set
470# CONFIG_SCSI_IPS is not set 516# CONFIG_SCSI_IPS is not set
471# CONFIG_SCSI_INITIO is not set 517# CONFIG_SCSI_INITIO is not set
472# CONFIG_SCSI_INIA100 is not set 518# CONFIG_SCSI_INIA100 is not set
519# CONFIG_SCSI_STEX is not set
473CONFIG_SCSI_SYM53C8XX_2=y 520CONFIG_SCSI_SYM53C8XX_2=y
474CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 521CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
475CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 522CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
476CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 523CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
477# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 524CONFIG_SCSI_SYM53C8XX_MMIO=y
478# CONFIG_SCSI_IPR is not set
479# CONFIG_SCSI_QLOGIC_FC is not set
480CONFIG_SCSI_QLOGIC_1280=y 525CONFIG_SCSI_QLOGIC_1280=y
481# CONFIG_SCSI_QLA_FC is not set 526# CONFIG_SCSI_QLA_FC is not set
527# CONFIG_SCSI_QLA_ISCSI is not set
482# CONFIG_SCSI_LPFC is not set 528# CONFIG_SCSI_LPFC is not set
483# CONFIG_SCSI_DC395x is not set 529# CONFIG_SCSI_DC395x is not set
484# CONFIG_SCSI_DC390T is not set 530# CONFIG_SCSI_DC390T is not set
485# CONFIG_SCSI_DEBUG is not set 531# CONFIG_SCSI_DEBUG is not set
532# CONFIG_SCSI_SRP is not set
533
534#
535# Serial ATA (prod) and Parallel ATA (experimental) drivers
536#
537# CONFIG_ATA is not set
486 538
487# 539#
488# Multi-device support (RAID and LVM) 540# Multi-device support (RAID and LVM)
@@ -493,11 +545,11 @@ CONFIG_MD_LINEAR=m
493CONFIG_MD_RAID0=m 545CONFIG_MD_RAID0=m
494CONFIG_MD_RAID1=m 546CONFIG_MD_RAID1=m
495# CONFIG_MD_RAID10 is not set 547# CONFIG_MD_RAID10 is not set
496CONFIG_MD_RAID5=m 548# CONFIG_MD_RAID456 is not set
497CONFIG_MD_RAID6=m
498CONFIG_MD_MULTIPATH=m 549CONFIG_MD_MULTIPATH=m
499# CONFIG_MD_FAULTY is not set 550# CONFIG_MD_FAULTY is not set
500CONFIG_BLK_DEV_DM=m 551CONFIG_BLK_DEV_DM=m
552# CONFIG_DM_DEBUG is not set
501CONFIG_DM_CRYPT=m 553CONFIG_DM_CRYPT=m
502CONFIG_DM_SNAPSHOT=m 554CONFIG_DM_SNAPSHOT=m
503CONFIG_DM_MIRROR=m 555CONFIG_DM_MIRROR=m
@@ -587,6 +639,7 @@ CONFIG_E100=m
587# CONFIG_EPIC100 is not set 639# CONFIG_EPIC100 is not set
588# CONFIG_SUNDANCE is not set 640# CONFIG_SUNDANCE is not set
589# CONFIG_VIA_RHINE is not set 641# CONFIG_VIA_RHINE is not set
642# CONFIG_SC92031 is not set
590 643
591# 644#
592# Ethernet (1000 Mbit) 645# Ethernet (1000 Mbit)
@@ -607,13 +660,18 @@ CONFIG_E1000=y
607# CONFIG_VIA_VELOCITY is not set 660# CONFIG_VIA_VELOCITY is not set
608CONFIG_TIGON3=y 661CONFIG_TIGON3=y
609# CONFIG_BNX2 is not set 662# CONFIG_BNX2 is not set
663# CONFIG_QLA3XXX is not set
664# CONFIG_ATL1 is not set
610 665
611# 666#
612# Ethernet (10000 Mbit) 667# Ethernet (10000 Mbit)
613# 668#
614# CONFIG_CHELSIO_T1 is not set 669# CONFIG_CHELSIO_T1 is not set
670# CONFIG_CHELSIO_T3 is not set
615# CONFIG_IXGB is not set 671# CONFIG_IXGB is not set
616# CONFIG_S2IO is not set 672# CONFIG_S2IO is not set
673# CONFIG_MYRI10GE is not set
674# CONFIG_NETXEN_NIC is not set
617 675
618# 676#
619# Token Ring devices 677# Token Ring devices
@@ -655,6 +713,7 @@ CONFIG_NET_POLL_CONTROLLER=y
655# Input device support 713# Input device support
656# 714#
657CONFIG_INPUT=y 715CONFIG_INPUT=y
716# CONFIG_INPUT_FF_MEMLESS is not set
658 717
659# 718#
660# Userland interfaces 719# Userland interfaces
@@ -677,6 +736,7 @@ CONFIG_KEYBOARD_ATKBD=y
677# CONFIG_KEYBOARD_LKKBD is not set 736# CONFIG_KEYBOARD_LKKBD is not set
678# CONFIG_KEYBOARD_XTKBD is not set 737# CONFIG_KEYBOARD_XTKBD is not set
679# CONFIG_KEYBOARD_NEWTON is not set 738# CONFIG_KEYBOARD_NEWTON is not set
739# CONFIG_KEYBOARD_STOWAWAY is not set
680CONFIG_INPUT_MOUSE=y 740CONFIG_INPUT_MOUSE=y
681CONFIG_MOUSE_PS2=y 741CONFIG_MOUSE_PS2=y
682# CONFIG_MOUSE_SERIAL is not set 742# CONFIG_MOUSE_SERIAL is not set
@@ -706,6 +766,7 @@ CONFIG_GAMEPORT=m
706CONFIG_VT=y 766CONFIG_VT=y
707CONFIG_VT_CONSOLE=y 767CONFIG_VT_CONSOLE=y
708CONFIG_HW_CONSOLE=y 768CONFIG_HW_CONSOLE=y
769# CONFIG_VT_HW_CONSOLE_BINDING is not set
709CONFIG_SERIAL_NONSTANDARD=y 770CONFIG_SERIAL_NONSTANDARD=y
710# CONFIG_COMPUTONE is not set 771# CONFIG_COMPUTONE is not set
711# CONFIG_ROCKETPORT is not set 772# CONFIG_ROCKETPORT is not set
@@ -713,12 +774,14 @@ CONFIG_SERIAL_NONSTANDARD=y
713# CONFIG_DIGIEPCA is not set 774# CONFIG_DIGIEPCA is not set
714# CONFIG_MOXA_INTELLIO is not set 775# CONFIG_MOXA_INTELLIO is not set
715# CONFIG_MOXA_SMARTIO is not set 776# CONFIG_MOXA_SMARTIO is not set
777# CONFIG_MOXA_SMARTIO_NEW is not set
716# CONFIG_ISI is not set 778# CONFIG_ISI is not set
717# CONFIG_SYNCLINKMP is not set 779# CONFIG_SYNCLINKMP is not set
718# CONFIG_SYNCLINK_GT is not set 780# CONFIG_SYNCLINK_GT is not set
719# CONFIG_N_HDLC is not set 781# CONFIG_N_HDLC is not set
720# CONFIG_SPECIALIX is not set 782# CONFIG_SPECIALIX is not set
721# CONFIG_SX is not set 783# CONFIG_SX is not set
784# CONFIG_RIO is not set
722# CONFIG_STALDRV is not set 785# CONFIG_STALDRV is not set
723CONFIG_SGI_SNSC=y 786CONFIG_SGI_SNSC=y
724CONFIG_SGI_TIOCX=y 787CONFIG_SGI_TIOCX=y
@@ -729,7 +792,8 @@ CONFIG_SGI_MBCS=m
729# 792#
730CONFIG_SERIAL_8250=y 793CONFIG_SERIAL_8250=y
731CONFIG_SERIAL_8250_CONSOLE=y 794CONFIG_SERIAL_8250_CONSOLE=y
732CONFIG_SERIAL_8250_ACPI=y 795CONFIG_SERIAL_8250_PCI=y
796CONFIG_SERIAL_8250_PNP=y
733CONFIG_SERIAL_8250_NR_UARTS=6 797CONFIG_SERIAL_8250_NR_UARTS=6
734CONFIG_SERIAL_8250_RUNTIME_UARTS=4 798CONFIG_SERIAL_8250_RUNTIME_UARTS=4
735CONFIG_SERIAL_8250_EXTENDED=y 799CONFIG_SERIAL_8250_EXTENDED=y
@@ -764,10 +828,6 @@ CONFIG_EFI_RTC=y
764# CONFIG_DTLK is not set 828# CONFIG_DTLK is not set
765# CONFIG_R3964 is not set 829# CONFIG_R3964 is not set
766# CONFIG_APPLICOM is not set 830# CONFIG_APPLICOM is not set
767
768#
769# Ftape, the floppy tape device driver
770#
771CONFIG_AGP=m 831CONFIG_AGP=m
772CONFIG_AGP_I460=m 832CONFIG_AGP_I460=m
773CONFIG_AGP_HP_ZX1=m 833CONFIG_AGP_HP_ZX1=m
@@ -792,7 +852,6 @@ CONFIG_MMTIMER=y
792# TPM devices 852# TPM devices
793# 853#
794# CONFIG_TCG_TPM is not set 854# CONFIG_TCG_TPM is not set
795# CONFIG_TELCLOCK is not set
796 855
797# 856#
798# I2C support 857# I2C support
@@ -815,16 +874,16 @@ CONFIG_MMTIMER=y
815# 874#
816CONFIG_HWMON=y 875CONFIG_HWMON=y
817# CONFIG_HWMON_VID is not set 876# CONFIG_HWMON_VID is not set
877# CONFIG_SENSORS_ABITUGURU is not set
818# CONFIG_SENSORS_F71805F is not set 878# CONFIG_SENSORS_F71805F is not set
879# CONFIG_SENSORS_PC87427 is not set
880# CONFIG_SENSORS_VT1211 is not set
819# CONFIG_HWMON_DEBUG_CHIP is not set 881# CONFIG_HWMON_DEBUG_CHIP is not set
820 882
821# 883#
822# Misc devices 884# Multifunction device drivers
823#
824
825#
826# Multimedia Capabilities Port drivers
827# 885#
886# CONFIG_MFD_SM501 is not set
828 887
829# 888#
830# Multimedia devices 889# Multimedia devices
@@ -835,16 +894,19 @@ CONFIG_HWMON=y
835# Digital Video Broadcasting Devices 894# Digital Video Broadcasting Devices
836# 895#
837# CONFIG_DVB is not set 896# CONFIG_DVB is not set
897# CONFIG_USB_DABUSB is not set
838 898
839# 899#
840# Graphics support 900# Graphics support
841# 901#
902# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
842# CONFIG_FB is not set 903# CONFIG_FB is not set
843 904
844# 905#
845# Console display driver support 906# Console display driver support
846# 907#
847CONFIG_VGA_CONSOLE=y 908CONFIG_VGA_CONSOLE=y
909# CONFIG_VGACON_SOFT_SCROLLBACK is not set
848CONFIG_DUMMY_CONSOLE=y 910CONFIG_DUMMY_CONSOLE=y
849 911
850# 912#
@@ -865,9 +927,11 @@ CONFIG_SND_SEQ_DUMMY=m
865CONFIG_SND_OSSEMUL=y 927CONFIG_SND_OSSEMUL=y
866CONFIG_SND_MIXER_OSS=m 928CONFIG_SND_MIXER_OSS=m
867CONFIG_SND_PCM_OSS=m 929CONFIG_SND_PCM_OSS=m
930CONFIG_SND_PCM_OSS_PLUGINS=y
868CONFIG_SND_SEQUENCER_OSS=y 931CONFIG_SND_SEQUENCER_OSS=y
869# CONFIG_SND_DYNAMIC_MINORS is not set 932# CONFIG_SND_DYNAMIC_MINORS is not set
870CONFIG_SND_SUPPORT_OLD_API=y 933CONFIG_SND_SUPPORT_OLD_API=y
934CONFIG_SND_VERBOSE_PROCFS=y
871CONFIG_SND_VERBOSE_PRINTK=y 935CONFIG_SND_VERBOSE_PRINTK=y
872# CONFIG_SND_DEBUG is not set 936# CONFIG_SND_DEBUG is not set
873 937
@@ -877,7 +941,6 @@ CONFIG_SND_VERBOSE_PRINTK=y
877CONFIG_SND_MPU401_UART=m 941CONFIG_SND_MPU401_UART=m
878CONFIG_SND_OPL3_LIB=m 942CONFIG_SND_OPL3_LIB=m
879CONFIG_SND_AC97_CODEC=m 943CONFIG_SND_AC97_CODEC=m
880CONFIG_SND_AC97_BUS=m
881CONFIG_SND_DUMMY=m 944CONFIG_SND_DUMMY=m
882CONFIG_SND_VIRMIDI=m 945CONFIG_SND_VIRMIDI=m
883CONFIG_SND_MTPAV=m 946CONFIG_SND_MTPAV=m
@@ -888,6 +951,7 @@ CONFIG_SND_MPU401=m
888# PCI devices 951# PCI devices
889# 952#
890# CONFIG_SND_AD1889 is not set 953# CONFIG_SND_AD1889 is not set
954# CONFIG_SND_ALS300 is not set
891# CONFIG_SND_ALI5451 is not set 955# CONFIG_SND_ALI5451 is not set
892# CONFIG_SND_ATIIXP is not set 956# CONFIG_SND_ATIIXP is not set
893# CONFIG_SND_ATIIXP_MODEM is not set 957# CONFIG_SND_ATIIXP_MODEM is not set
@@ -901,6 +965,18 @@ CONFIG_SND_MPU401=m
901CONFIG_SND_CS4281=m 965CONFIG_SND_CS4281=m
902CONFIG_SND_CS46XX=m 966CONFIG_SND_CS46XX=m
903CONFIG_SND_CS46XX_NEW_DSP=y 967CONFIG_SND_CS46XX_NEW_DSP=y
968# CONFIG_SND_DARLA20 is not set
969# CONFIG_SND_GINA20 is not set
970# CONFIG_SND_LAYLA20 is not set
971# CONFIG_SND_DARLA24 is not set
972# CONFIG_SND_GINA24 is not set
973# CONFIG_SND_LAYLA24 is not set
974# CONFIG_SND_MONA is not set
975# CONFIG_SND_MIA is not set
976# CONFIG_SND_ECHO3G is not set
977# CONFIG_SND_INDIGO is not set
978# CONFIG_SND_INDIGOIO is not set
979# CONFIG_SND_INDIGODJ is not set
904CONFIG_SND_EMU10K1=m 980CONFIG_SND_EMU10K1=m
905# CONFIG_SND_EMU10K1X is not set 981# CONFIG_SND_EMU10K1X is not set
906# CONFIG_SND_ENS1370 is not set 982# CONFIG_SND_ENS1370 is not set
@@ -908,7 +984,7 @@ CONFIG_SND_EMU10K1=m
908# CONFIG_SND_ES1938 is not set 984# CONFIG_SND_ES1938 is not set
909# CONFIG_SND_ES1968 is not set 985# CONFIG_SND_ES1968 is not set
910CONFIG_SND_FM801=m 986CONFIG_SND_FM801=m
911# CONFIG_SND_FM801_TEA575X is not set 987# CONFIG_SND_FM801_TEA575X_BOOL is not set
912# CONFIG_SND_HDA_INTEL is not set 988# CONFIG_SND_HDA_INTEL is not set
913# CONFIG_SND_HDSP is not set 989# CONFIG_SND_HDSP is not set
914# CONFIG_SND_HDSPM is not set 990# CONFIG_SND_HDSPM is not set
@@ -921,6 +997,7 @@ CONFIG_SND_FM801=m
921# CONFIG_SND_MIXART is not set 997# CONFIG_SND_MIXART is not set
922# CONFIG_SND_NM256 is not set 998# CONFIG_SND_NM256 is not set
923# CONFIG_SND_PCXHR is not set 999# CONFIG_SND_PCXHR is not set
1000# CONFIG_SND_RIPTIDE is not set
924# CONFIG_SND_RME32 is not set 1001# CONFIG_SND_RME32 is not set
925# CONFIG_SND_RME96 is not set 1002# CONFIG_SND_RME96 is not set
926# CONFIG_SND_RME9652 is not set 1003# CONFIG_SND_RME9652 is not set
@@ -930,6 +1007,7 @@ CONFIG_SND_FM801=m
930# CONFIG_SND_VIA82XX_MODEM is not set 1007# CONFIG_SND_VIA82XX_MODEM is not set
931# CONFIG_SND_VX222 is not set 1008# CONFIG_SND_VX222 is not set
932# CONFIG_SND_YMFPCI is not set 1009# CONFIG_SND_YMFPCI is not set
1010# CONFIG_SND_AC97_POWER_SAVE is not set
933 1011
934# 1012#
935# USB devices 1013# USB devices
@@ -937,15 +1015,28 @@ CONFIG_SND_FM801=m
937# CONFIG_SND_USB_AUDIO is not set 1015# CONFIG_SND_USB_AUDIO is not set
938 1016
939# 1017#
1018# SoC audio support
1019#
1020# CONFIG_SND_SOC is not set
1021
1022#
940# Open Sound System 1023# Open Sound System
941# 1024#
942# CONFIG_SOUND_PRIME is not set 1025# CONFIG_SOUND_PRIME is not set
1026CONFIG_AC97_BUS=m
1027
1028#
1029# HID Devices
1030#
1031CONFIG_HID=y
1032# CONFIG_HID_DEBUG is not set
943 1033
944# 1034#
945# USB support 1035# USB support
946# 1036#
947CONFIG_USB_ARCH_HAS_HCD=y 1037CONFIG_USB_ARCH_HAS_HCD=y
948CONFIG_USB_ARCH_HAS_OHCI=y 1038CONFIG_USB_ARCH_HAS_OHCI=y
1039CONFIG_USB_ARCH_HAS_EHCI=y
949CONFIG_USB=m 1040CONFIG_USB=m
950# CONFIG_USB_DEBUG is not set 1041# CONFIG_USB_DEBUG is not set
951 1042
@@ -953,7 +1044,6 @@ CONFIG_USB=m
953# Miscellaneous USB options 1044# Miscellaneous USB options
954# 1045#
955CONFIG_USB_DEVICEFS=y 1046CONFIG_USB_DEVICEFS=y
956# CONFIG_USB_BANDWIDTH is not set
957# CONFIG_USB_DYNAMIC_MINORS is not set 1047# CONFIG_USB_DYNAMIC_MINORS is not set
958# CONFIG_USB_SUSPEND is not set 1048# CONFIG_USB_SUSPEND is not set
959# CONFIG_USB_OTG is not set 1049# CONFIG_USB_OTG is not set
@@ -964,9 +1054,12 @@ CONFIG_USB_DEVICEFS=y
964CONFIG_USB_EHCI_HCD=m 1054CONFIG_USB_EHCI_HCD=m
965# CONFIG_USB_EHCI_SPLIT_ISO is not set 1055# CONFIG_USB_EHCI_SPLIT_ISO is not set
966# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1056# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1057# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1058# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
967# CONFIG_USB_ISP116X_HCD is not set 1059# CONFIG_USB_ISP116X_HCD is not set
968CONFIG_USB_OHCI_HCD=m 1060CONFIG_USB_OHCI_HCD=m
969# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1061# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1062# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
970CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1063CONFIG_USB_OHCI_LITTLE_ENDIAN=y
971CONFIG_USB_UHCI_HCD=m 1064CONFIG_USB_UHCI_HCD=m
972# CONFIG_USB_SL811_HCD is not set 1065# CONFIG_USB_SL811_HCD is not set
@@ -974,7 +1067,6 @@ CONFIG_USB_UHCI_HCD=m
974# 1067#
975# USB Device Class drivers 1068# USB Device Class drivers
976# 1069#
977# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
978# CONFIG_USB_ACM is not set 1070# CONFIG_USB_ACM is not set
979# CONFIG_USB_PRINTER is not set 1071# CONFIG_USB_PRINTER is not set
980 1072
@@ -996,13 +1088,13 @@ CONFIG_USB_STORAGE=m
996# CONFIG_USB_STORAGE_SDDR55 is not set 1088# CONFIG_USB_STORAGE_SDDR55 is not set
997# CONFIG_USB_STORAGE_JUMPSHOT is not set 1089# CONFIG_USB_STORAGE_JUMPSHOT is not set
998# CONFIG_USB_STORAGE_ALAUDA is not set 1090# CONFIG_USB_STORAGE_ALAUDA is not set
1091# CONFIG_USB_STORAGE_KARMA is not set
999# CONFIG_USB_LIBUSUAL is not set 1092# CONFIG_USB_LIBUSUAL is not set
1000 1093
1001# 1094#
1002# USB Input Devices 1095# USB Input Devices
1003# 1096#
1004CONFIG_USB_HID=m 1097CONFIG_USB_HID=m
1005CONFIG_USB_HIDINPUT=y
1006# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1098# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1007# CONFIG_HID_FF is not set 1099# CONFIG_HID_FF is not set
1008# CONFIG_USB_HIDDEV is not set 1100# CONFIG_USB_HIDDEV is not set
@@ -1017,15 +1109,14 @@ CONFIG_USB_HIDINPUT=y
1017# CONFIG_USB_ACECAD is not set 1109# CONFIG_USB_ACECAD is not set
1018# CONFIG_USB_KBTAB is not set 1110# CONFIG_USB_KBTAB is not set
1019# CONFIG_USB_POWERMATE is not set 1111# CONFIG_USB_POWERMATE is not set
1020# CONFIG_USB_MTOUCH is not set 1112# CONFIG_USB_TOUCHSCREEN is not set
1021# CONFIG_USB_ITMTOUCH is not set
1022# CONFIG_USB_EGALAX is not set
1023# CONFIG_USB_YEALINK is not set 1113# CONFIG_USB_YEALINK is not set
1024# CONFIG_USB_XPAD is not set 1114# CONFIG_USB_XPAD is not set
1025# CONFIG_USB_ATI_REMOTE is not set 1115# CONFIG_USB_ATI_REMOTE is not set
1026# CONFIG_USB_ATI_REMOTE2 is not set 1116# CONFIG_USB_ATI_REMOTE2 is not set
1027# CONFIG_USB_KEYSPAN_REMOTE is not set 1117# CONFIG_USB_KEYSPAN_REMOTE is not set
1028# CONFIG_USB_APPLETOUCH is not set 1118# CONFIG_USB_APPLETOUCH is not set
1119# CONFIG_USB_GTCO is not set
1029 1120
1030# 1121#
1031# USB Imaging devices 1122# USB Imaging devices
@@ -1034,21 +1125,13 @@ CONFIG_USB_HIDINPUT=y
1034# CONFIG_USB_MICROTEK is not set 1125# CONFIG_USB_MICROTEK is not set
1035 1126
1036# 1127#
1037# USB Multimedia devices
1038#
1039# CONFIG_USB_DABUSB is not set
1040
1041#
1042# Video4Linux support is needed for USB Multimedia device support
1043#
1044
1045#
1046# USB Network Adapters 1128# USB Network Adapters
1047# 1129#
1048# CONFIG_USB_CATC is not set 1130# CONFIG_USB_CATC is not set
1049# CONFIG_USB_KAWETH is not set 1131# CONFIG_USB_KAWETH is not set
1050# CONFIG_USB_PEGASUS is not set 1132# CONFIG_USB_PEGASUS is not set
1051# CONFIG_USB_RTL8150 is not set 1133# CONFIG_USB_RTL8150 is not set
1134# CONFIG_USB_USBNET_MII is not set
1052# CONFIG_USB_USBNET is not set 1135# CONFIG_USB_USBNET is not set
1053CONFIG_USB_MON=y 1136CONFIG_USB_MON=y
1054 1137
@@ -1066,17 +1149,23 @@ CONFIG_USB_MON=y
1066# 1149#
1067# CONFIG_USB_EMI62 is not set 1150# CONFIG_USB_EMI62 is not set
1068# CONFIG_USB_EMI26 is not set 1151# CONFIG_USB_EMI26 is not set
1152# CONFIG_USB_ADUTUX is not set
1069# CONFIG_USB_AUERSWALD is not set 1153# CONFIG_USB_AUERSWALD is not set
1070# CONFIG_USB_RIO500 is not set 1154# CONFIG_USB_RIO500 is not set
1071# CONFIG_USB_LEGOTOWER is not set 1155# CONFIG_USB_LEGOTOWER is not set
1072# CONFIG_USB_LCD is not set 1156# CONFIG_USB_LCD is not set
1157# CONFIG_USB_BERRY_CHARGE is not set
1073# CONFIG_USB_LED is not set 1158# CONFIG_USB_LED is not set
1159# CONFIG_USB_CYPRESS_CY7C63 is not set
1074# CONFIG_USB_CYTHERM is not set 1160# CONFIG_USB_CYTHERM is not set
1075# CONFIG_USB_PHIDGETKIT is not set 1161# CONFIG_USB_PHIDGET is not set
1076# CONFIG_USB_PHIDGETSERVO is not set
1077# CONFIG_USB_IDMOUSE is not set 1162# CONFIG_USB_IDMOUSE is not set
1163# CONFIG_USB_FTDI_ELAN is not set
1164# CONFIG_USB_APPLEDISPLAY is not set
1078# CONFIG_USB_SISUSBVGA is not set 1165# CONFIG_USB_SISUSBVGA is not set
1079# CONFIG_USB_LD is not set 1166# CONFIG_USB_LD is not set
1167# CONFIG_USB_TRANCEVIBRATOR is not set
1168# CONFIG_USB_IOWARRIOR is not set
1080# CONFIG_USB_TEST is not set 1169# CONFIG_USB_TEST is not set
1081 1170
1082# 1171#
@@ -1094,26 +1183,65 @@ CONFIG_USB_MON=y
1094# CONFIG_MMC is not set 1183# CONFIG_MMC is not set
1095 1184
1096# 1185#
1186# LED devices
1187#
1188# CONFIG_NEW_LEDS is not set
1189
1190#
1191# LED drivers
1192#
1193
1194#
1195# LED Triggers
1196#
1197
1198#
1097# InfiniBand support 1199# InfiniBand support
1098# 1200#
1099CONFIG_INFINIBAND=m 1201CONFIG_INFINIBAND=m
1100# CONFIG_INFINIBAND_USER_MAD is not set 1202# CONFIG_INFINIBAND_USER_MAD is not set
1101# CONFIG_INFINIBAND_USER_ACCESS is not set 1203# CONFIG_INFINIBAND_USER_ACCESS is not set
1204CONFIG_INFINIBAND_ADDR_TRANS=y
1102CONFIG_INFINIBAND_MTHCA=m 1205CONFIG_INFINIBAND_MTHCA=m
1103# CONFIG_INFINIBAND_MTHCA_DEBUG is not set 1206CONFIG_INFINIBAND_MTHCA_DEBUG=y
1207# CONFIG_INFINIBAND_AMSO1100 is not set
1104CONFIG_INFINIBAND_IPOIB=m 1208CONFIG_INFINIBAND_IPOIB=m
1105# CONFIG_INFINIBAND_IPOIB_DEBUG is not set 1209# CONFIG_INFINIBAND_IPOIB_CM is not set
1210CONFIG_INFINIBAND_IPOIB_DEBUG=y
1211# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1106# CONFIG_INFINIBAND_SRP is not set 1212# CONFIG_INFINIBAND_SRP is not set
1213# CONFIG_INFINIBAND_ISER is not set
1107 1214
1108# 1215#
1109# SN Devices 1216# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1217#
1218
1219#
1220# Real Time Clock
1221#
1222# CONFIG_RTC_CLASS is not set
1223
1224#
1225# DMA Engine support
1226#
1227# CONFIG_DMA_ENGINE is not set
1228
1229#
1230# DMA Clients
1231#
1232
1233#
1234# DMA Devices
1235#
1236
1237#
1238# Auxiliary Display support
1110# 1239#
1111CONFIG_SGI_IOC4=y
1112CONFIG_SGI_IOC3=m
1113 1240
1114# 1241#
1115# EDAC - error detection and reporting (RAS) 1242# Virtualization
1116# 1243#
1244# CONFIG_MSPEC is not set
1117 1245
1118# 1246#
1119# File systems 1247# File systems
@@ -1127,6 +1255,7 @@ CONFIG_EXT3_FS=y
1127CONFIG_EXT3_FS_XATTR=y 1255CONFIG_EXT3_FS_XATTR=y
1128CONFIG_EXT3_FS_POSIX_ACL=y 1256CONFIG_EXT3_FS_POSIX_ACL=y
1129CONFIG_EXT3_FS_SECURITY=y 1257CONFIG_EXT3_FS_SECURITY=y
1258# CONFIG_EXT4DEV_FS is not set
1130CONFIG_JBD=y 1259CONFIG_JBD=y
1131# CONFIG_JBD_DEBUG is not set 1260# CONFIG_JBD_DEBUG is not set
1132CONFIG_FS_MBCACHE=y 1261CONFIG_FS_MBCACHE=y
@@ -1139,15 +1268,16 @@ CONFIG_REISERFS_FS_SECURITY=y
1139# CONFIG_JFS_FS is not set 1268# CONFIG_JFS_FS is not set
1140CONFIG_FS_POSIX_ACL=y 1269CONFIG_FS_POSIX_ACL=y
1141CONFIG_XFS_FS=y 1270CONFIG_XFS_FS=y
1142CONFIG_XFS_EXPORT=y
1143# CONFIG_XFS_QUOTA is not set 1271# CONFIG_XFS_QUOTA is not set
1144# CONFIG_XFS_SECURITY is not set 1272# CONFIG_XFS_SECURITY is not set
1145# CONFIG_XFS_POSIX_ACL is not set 1273# CONFIG_XFS_POSIX_ACL is not set
1146# CONFIG_XFS_RT is not set 1274# CONFIG_XFS_RT is not set
1275# CONFIG_GFS2_FS is not set
1147# CONFIG_OCFS2_FS is not set 1276# CONFIG_OCFS2_FS is not set
1148# CONFIG_MINIX_FS is not set 1277# CONFIG_MINIX_FS is not set
1149# CONFIG_ROMFS_FS is not set 1278# CONFIG_ROMFS_FS is not set
1150CONFIG_INOTIFY=y 1279CONFIG_INOTIFY=y
1280CONFIG_INOTIFY_USER=y
1151# CONFIG_QUOTA is not set 1281# CONFIG_QUOTA is not set
1152CONFIG_DNOTIFY=y 1282CONFIG_DNOTIFY=y
1153CONFIG_AUTOFS_FS=y 1283CONFIG_AUTOFS_FS=y
@@ -1180,12 +1310,14 @@ CONFIG_NTFS_FS=m
1180# 1310#
1181CONFIG_PROC_FS=y 1311CONFIG_PROC_FS=y
1182CONFIG_PROC_KCORE=y 1312CONFIG_PROC_KCORE=y
1313CONFIG_PROC_VMCORE=y
1314CONFIG_PROC_SYSCTL=y
1183CONFIG_SYSFS=y 1315CONFIG_SYSFS=y
1184CONFIG_TMPFS=y 1316CONFIG_TMPFS=y
1317# CONFIG_TMPFS_POSIX_ACL is not set
1185CONFIG_HUGETLBFS=y 1318CONFIG_HUGETLBFS=y
1186CONFIG_HUGETLB_PAGE=y 1319CONFIG_HUGETLB_PAGE=y
1187CONFIG_RAMFS=y 1320CONFIG_RAMFS=y
1188# CONFIG_RELAYFS_FS is not set
1189# CONFIG_CONFIGFS_FS is not set 1321# CONFIG_CONFIGFS_FS is not set
1190 1322
1191# 1323#
@@ -1220,7 +1352,7 @@ CONFIG_NFSD_V4=y
1220CONFIG_NFSD_TCP=y 1352CONFIG_NFSD_TCP=y
1221CONFIG_LOCKD=m 1353CONFIG_LOCKD=m
1222CONFIG_LOCKD_V4=y 1354CONFIG_LOCKD_V4=y
1223CONFIG_EXPORTFS=y 1355CONFIG_EXPORTFS=m
1224CONFIG_NFS_COMMON=y 1356CONFIG_NFS_COMMON=y
1225CONFIG_SUNRPC=m 1357CONFIG_SUNRPC=m
1226CONFIG_SUNRPC_GSS=m 1358CONFIG_SUNRPC_GSS=m
@@ -1231,7 +1363,9 @@ CONFIG_SMB_NLS_DEFAULT=y
1231CONFIG_SMB_NLS_REMOTE="cp437" 1363CONFIG_SMB_NLS_REMOTE="cp437"
1232CONFIG_CIFS=m 1364CONFIG_CIFS=m
1233# CONFIG_CIFS_STATS is not set 1365# CONFIG_CIFS_STATS is not set
1366# CONFIG_CIFS_WEAK_PW_HASH is not set
1234# CONFIG_CIFS_XATTR is not set 1367# CONFIG_CIFS_XATTR is not set
1368# CONFIG_CIFS_DEBUG2 is not set
1235# CONFIG_CIFS_EXPERIMENTAL is not set 1369# CONFIG_CIFS_EXPERIMENTAL is not set
1236# CONFIG_NCP_FS is not set 1370# CONFIG_NCP_FS is not set
1237# CONFIG_CODA_FS is not set 1371# CONFIG_CODA_FS is not set
@@ -1304,15 +1438,25 @@ CONFIG_NLS_KOI8_U=m
1304CONFIG_NLS_UTF8=m 1438CONFIG_NLS_UTF8=m
1305 1439
1306# 1440#
1441# Distributed Lock Manager
1442#
1443# CONFIG_DLM is not set
1444
1445#
1307# Library routines 1446# Library routines
1308# 1447#
1448CONFIG_BITREVERSE=y
1309# CONFIG_CRC_CCITT is not set 1449# CONFIG_CRC_CCITT is not set
1310# CONFIG_CRC16 is not set 1450# CONFIG_CRC16 is not set
1311CONFIG_CRC32=y 1451CONFIG_CRC32=y
1312# CONFIG_LIBCRC32C is not set 1452# CONFIG_LIBCRC32C is not set
1453CONFIG_PLIST=y
1454CONFIG_HAS_IOMEM=y
1455CONFIG_HAS_IOPORT=y
1313CONFIG_GENERIC_HARDIRQS=y 1456CONFIG_GENERIC_HARDIRQS=y
1314CONFIG_GENERIC_IRQ_PROBE=y 1457CONFIG_GENERIC_IRQ_PROBE=y
1315CONFIG_GENERIC_PENDING_IRQ=y 1458CONFIG_GENERIC_PENDING_IRQ=y
1459CONFIG_IRQ_PER_CPU=y
1316 1460
1317# 1461#
1318# HP Simulator drivers 1462# HP Simulator drivers
@@ -1331,21 +1475,31 @@ CONFIG_GENERIC_PENDING_IRQ=y
1331# Kernel hacking 1475# Kernel hacking
1332# 1476#
1333# CONFIG_PRINTK_TIME is not set 1477# CONFIG_PRINTK_TIME is not set
1478CONFIG_ENABLE_MUST_CHECK=y
1334CONFIG_MAGIC_SYSRQ=y 1479CONFIG_MAGIC_SYSRQ=y
1480# CONFIG_UNUSED_SYMBOLS is not set
1481# CONFIG_DEBUG_FS is not set
1482# CONFIG_HEADERS_CHECK is not set
1335CONFIG_DEBUG_KERNEL=y 1483CONFIG_DEBUG_KERNEL=y
1484# CONFIG_DEBUG_SHIRQ is not set
1336CONFIG_LOG_BUF_SHIFT=20 1485CONFIG_LOG_BUF_SHIFT=20
1337CONFIG_DETECT_SOFTLOCKUP=y 1486CONFIG_DETECT_SOFTLOCKUP=y
1338# CONFIG_SCHEDSTATS is not set 1487# CONFIG_SCHEDSTATS is not set
1488# CONFIG_TIMER_STATS is not set
1339# CONFIG_DEBUG_SLAB is not set 1489# CONFIG_DEBUG_SLAB is not set
1340CONFIG_DEBUG_MUTEXES=y 1490# CONFIG_DEBUG_RT_MUTEXES is not set
1491# CONFIG_RT_MUTEX_TESTER is not set
1341# CONFIG_DEBUG_SPINLOCK is not set 1492# CONFIG_DEBUG_SPINLOCK is not set
1493CONFIG_DEBUG_MUTEXES=y
1342# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1494# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1495# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1343# CONFIG_DEBUG_KOBJECT is not set 1496# CONFIG_DEBUG_KOBJECT is not set
1344# CONFIG_DEBUG_INFO is not set 1497# CONFIG_DEBUG_INFO is not set
1345# CONFIG_DEBUG_FS is not set
1346# CONFIG_DEBUG_VM is not set 1498# CONFIG_DEBUG_VM is not set
1499# CONFIG_DEBUG_LIST is not set
1347CONFIG_FORCED_INLINING=y 1500CONFIG_FORCED_INLINING=y
1348# CONFIG_RCU_TORTURE_TEST is not set 1501# CONFIG_RCU_TORTURE_TEST is not set
1502# CONFIG_FAULT_INJECTION is not set
1349CONFIG_IA64_GRANULE_16MB=y 1503CONFIG_IA64_GRANULE_16MB=y
1350# CONFIG_IA64_GRANULE_64MB is not set 1504# CONFIG_IA64_GRANULE_64MB is not set
1351# CONFIG_IA64_PRINT_HAZARDS is not set 1505# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1364,7 +1518,11 @@ CONFIG_SYSVIPC_COMPAT=y
1364# Cryptographic options 1518# Cryptographic options
1365# 1519#
1366CONFIG_CRYPTO=y 1520CONFIG_CRYPTO=y
1521CONFIG_CRYPTO_ALGAPI=y
1522CONFIG_CRYPTO_BLKCIPHER=m
1523CONFIG_CRYPTO_MANAGER=m
1367# CONFIG_CRYPTO_HMAC is not set 1524# CONFIG_CRYPTO_HMAC is not set
1525# CONFIG_CRYPTO_XCBC is not set
1368# CONFIG_CRYPTO_NULL is not set 1526# CONFIG_CRYPTO_NULL is not set
1369# CONFIG_CRYPTO_MD4 is not set 1527# CONFIG_CRYPTO_MD4 is not set
1370CONFIG_CRYPTO_MD5=y 1528CONFIG_CRYPTO_MD5=y
@@ -1373,7 +1531,13 @@ CONFIG_CRYPTO_MD5=y
1373# CONFIG_CRYPTO_SHA512 is not set 1531# CONFIG_CRYPTO_SHA512 is not set
1374# CONFIG_CRYPTO_WP512 is not set 1532# CONFIG_CRYPTO_WP512 is not set
1375# CONFIG_CRYPTO_TGR192 is not set 1533# CONFIG_CRYPTO_TGR192 is not set
1534# CONFIG_CRYPTO_GF128MUL is not set
1535CONFIG_CRYPTO_ECB=m
1536CONFIG_CRYPTO_CBC=m
1537CONFIG_CRYPTO_PCBC=m
1538# CONFIG_CRYPTO_LRW is not set
1376CONFIG_CRYPTO_DES=m 1539CONFIG_CRYPTO_DES=m
1540# CONFIG_CRYPTO_FCRYPT is not set
1377# CONFIG_CRYPTO_BLOWFISH is not set 1541# CONFIG_CRYPTO_BLOWFISH is not set
1378# CONFIG_CRYPTO_TWOFISH is not set 1542# CONFIG_CRYPTO_TWOFISH is not set
1379# CONFIG_CRYPTO_SERPENT is not set 1543# CONFIG_CRYPTO_SERPENT is not set
@@ -1387,6 +1551,7 @@ CONFIG_CRYPTO_DES=m
1387# CONFIG_CRYPTO_DEFLATE is not set 1551# CONFIG_CRYPTO_DEFLATE is not set
1388# CONFIG_CRYPTO_MICHAEL_MIC is not set 1552# CONFIG_CRYPTO_MICHAEL_MIC is not set
1389# CONFIG_CRYPTO_CRC32C is not set 1553# CONFIG_CRYPTO_CRC32C is not set
1554# CONFIG_CRYPTO_CAMELLIA is not set
1390# CONFIG_CRYPTO_TEST is not set 1555# CONFIG_CRYPTO_TEST is not set
1391 1556
1392# 1557#
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index 75a2a2c12258..2236fabbb3c6 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -35,6 +35,7 @@ void foo(void)
35 BLANK(); 35 BLANK();
36 36
37 DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); 37 DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
38 DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
38 DEFINE(TI_PRE_COUNT, offsetof(struct thread_info, preempt_count)); 39 DEFINE(TI_PRE_COUNT, offsetof(struct thread_info, preempt_count));
39 40
40 BLANK(); 41 BLANK();
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index 5cdd2f5fa064..80a94e707827 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -21,9 +21,9 @@
21#include <asm/mca.h> 21#include <asm/mca.h>
22 22
23int kdump_status[NR_CPUS]; 23int kdump_status[NR_CPUS];
24atomic_t kdump_cpu_freezed; 24static atomic_t kdump_cpu_frozen;
25atomic_t kdump_in_progress; 25atomic_t kdump_in_progress;
26int kdump_on_init = 1; 26static int kdump_on_init = 1;
27 27
28static inline Elf64_Word 28static inline Elf64_Word
29*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data, 29*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data,
@@ -86,7 +86,7 @@ kdump_wait_cpu_freeze(void)
86 int cpu_num = num_online_cpus() - 1; 86 int cpu_num = num_online_cpus() - 1;
87 int timeout = 1000; 87 int timeout = 1000;
88 while(timeout-- > 0) { 88 while(timeout-- > 0) {
89 if (atomic_read(&kdump_cpu_freezed) == cpu_num) 89 if (atomic_read(&kdump_cpu_frozen) == cpu_num)
90 return 0; 90 return 0;
91 udelay(1000); 91 udelay(1000);
92 } 92 }
@@ -108,8 +108,8 @@ machine_crash_shutdown(struct pt_regs *pt)
108 kexec_disable_iosapic(); 108 kexec_disable_iosapic();
109#ifdef CONFIG_SMP 109#ifdef CONFIG_SMP
110 kdump_smp_send_stop(); 110 kdump_smp_send_stop();
111 /* not all cpu response to IPI, send INIT to freeze them */
111 if (kdump_wait_cpu_freeze() && kdump_on_init) { 112 if (kdump_wait_cpu_freeze() && kdump_on_init) {
112 //not all cpu response to IPI, send INIT to freeze them
113 kdump_smp_send_init(); 113 kdump_smp_send_init();
114 } 114 }
115#endif 115#endif
@@ -136,7 +136,7 @@ kdump_cpu_freeze(struct unw_frame_info *info, void *arg)
136 cpuid = smp_processor_id(); 136 cpuid = smp_processor_id();
137 crash_save_this_cpu(); 137 crash_save_this_cpu();
138 current->thread.ksp = (__u64)info->sw - 16; 138 current->thread.ksp = (__u64)info->sw - 16;
139 atomic_inc(&kdump_cpu_freezed); 139 atomic_inc(&kdump_cpu_frozen);
140 kdump_status[cpuid] = 1; 140 kdump_status[cpuid] = 1;
141 mb(); 141 mb();
142#ifdef CONFIG_HOTPLUG_CPU 142#ifdef CONFIG_HOTPLUG_CPU
@@ -164,7 +164,7 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
164 164
165 nd = (struct ia64_mca_notify_die *)args->err; 165 nd = (struct ia64_mca_notify_die *)args->err;
166 /* Reason code 1 means machine check rendezous*/ 166 /* Reason code 1 means machine check rendezous*/
167 if ((val == DIE_INIT_MONARCH_ENTER || DIE_INIT_SLAVE_ENTER) && 167 if ((val == DIE_INIT_MONARCH_ENTER || val == DIE_INIT_SLAVE_ENTER) &&
168 nd->sos->rv_rc == 1) 168 nd->sos->rv_rc == 1)
169 return NOTIFY_DONE; 169 return NOTIFY_DONE;
170 170
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 4061593e5b17..f45f91d38cab 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -971,6 +971,11 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
971 if (!is_memory_available(md)) 971 if (!is_memory_available(md))
972 continue; 972 continue;
973 973
974#ifdef CONFIG_CRASH_DUMP
975 /* saved_max_pfn should ignore max_addr= command line arg */
976 if (saved_max_pfn < (efi_md_end(md) >> PAGE_SHIFT))
977 saved_max_pfn = (efi_md_end(md) >> PAGE_SHIFT);
978#endif
974 /* 979 /*
975 * Round ends inward to granule boundaries 980 * Round ends inward to granule boundaries
976 * Give trimmings to uncached allocator 981 * Give trimmings to uncached allocator
@@ -1010,11 +1015,6 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
1010 } else 1015 } else
1011 ae = efi_md_end(md); 1016 ae = efi_md_end(md);
1012 1017
1013#ifdef CONFIG_CRASH_DUMP
1014 /* saved_max_pfn should ignore max_addr= command line arg */
1015 if (saved_max_pfn < (ae >> PAGE_SHIFT))
1016 saved_max_pfn = (ae >> PAGE_SHIFT);
1017#endif
1018 /* keep within max_addr= and min_addr= command line arg */ 1018 /* keep within max_addr= and min_addr= command line arg */
1019 as = max(as, min_addr); 1019 as = max(as, min_addr);
1020 ae = min(ae, max_addr); 1020 ae = min(ae, max_addr);
@@ -1142,7 +1142,7 @@ efi_initialize_iomem_resources(struct resource *code_resource,
1142/* find a block of memory aligned to 64M exclude reserved regions 1142/* find a block of memory aligned to 64M exclude reserved regions
1143 rsvd_regions are sorted 1143 rsvd_regions are sorted
1144 */ 1144 */
1145unsigned long 1145unsigned long __init
1146kdump_find_rsvd_region (unsigned long size, 1146kdump_find_rsvd_region (unsigned long size,
1147 struct rsvd_region *r, int n) 1147 struct rsvd_region *r, int n)
1148{ 1148{
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index 7a05b1cb2ad5..8589e84a27c6 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -10,6 +10,8 @@
10 * probably broke it along the way... ;-) 10 * probably broke it along the way... ;-)
11 * 13-Jul-04 clameter Implement fsys_clock_gettime and revise fsys_gettimeofday to make 11 * 13-Jul-04 clameter Implement fsys_clock_gettime and revise fsys_gettimeofday to make
12 * it capable of using memory based clocks without falling back to C code. 12 * it capable of using memory based clocks without falling back to C code.
13 * 08-Feb-07 Fenghua Yu Implement fsys_getcpu.
14 *
13 */ 15 */
14 16
15#include <asm/asmmacro.h> 17#include <asm/asmmacro.h>
@@ -505,6 +507,59 @@ EX(.fail_efault, (p15) st8 [r34]=r3)
505#endif 507#endif
506END(fsys_rt_sigprocmask) 508END(fsys_rt_sigprocmask)
507 509
510/*
511 * fsys_getcpu doesn't use the third parameter in this implementation. It reads
512 * current_thread_info()->cpu and corresponding node in cpu_to_node_map.
513 */
514ENTRY(fsys_getcpu)
515 .prologue
516 .altrp b6
517 .body
518 ;;
519 add r2=TI_FLAGS+IA64_TASK_SIZE,r16
520 tnat.nz p6,p0 = r32 // guard against NaT argument
521 add r3=TI_CPU+IA64_TASK_SIZE,r16
522 ;;
523 ld4 r3=[r3] // M r3 = thread_info->cpu
524 ld4 r2=[r2] // M r2 = thread_info->flags
525(p6) br.cond.spnt.few .fail_einval // B
526 ;;
527 tnat.nz p7,p0 = r33 // I guard against NaT argument
528(p7) br.cond.spnt.few .fail_einval // B
529#ifdef CONFIG_NUMA
530 movl r17=cpu_to_node_map
531 ;;
532EX(.fail_efault, probe.w.fault r32, 3) // M This takes 5 cycles
533EX(.fail_efault, probe.w.fault r33, 3) // M This takes 5 cycles
534 shladd r18=r3,1,r17
535 ;;
536 ld2 r20=[r18] // r20 = cpu_to_node_map[cpu]
537 and r2 = TIF_ALLWORK_MASK,r2
538 ;;
539 cmp.ne p8,p0=0,r2
540(p8) br.spnt.many fsys_fallback_syscall
541 ;;
542 ;;
543EX(.fail_efault, st4 [r32] = r3)
544EX(.fail_efault, st2 [r33] = r20)
545 mov r8=0
546 ;;
547#else
548EX(.fail_efault, probe.w.fault r32, 3) // M This takes 5 cycles
549EX(.fail_efault, probe.w.fault r33, 3) // M This takes 5 cycles
550 and r2 = TIF_ALLWORK_MASK,r2
551 ;;
552 cmp.ne p8,p0=0,r2
553(p8) br.spnt.many fsys_fallback_syscall
554 ;;
555EX(.fail_efault, st4 [r32] = r3)
556EX(.fail_efault, st2 [r33] = r0)
557 mov r8=0
558 ;;
559#endif
560 FSYS_RETURN
561END(fsys_getcpu)
562
508ENTRY(fsys_fallback_syscall) 563ENTRY(fsys_fallback_syscall)
509 .prologue 564 .prologue
510 .altrp b6 565 .altrp b6
@@ -878,6 +933,56 @@ fsyscall_table:
878 data8 0 // timer_delete 933 data8 0 // timer_delete
879 data8 0 // clock_settime 934 data8 0 // clock_settime
880 data8 fsys_clock_gettime // clock_gettime 935 data8 fsys_clock_gettime // clock_gettime
936 data8 0 // clock_getres // 1255
937 data8 0 // clock_nanosleep
938 data8 0 // fstatfs64
939 data8 0 // statfs64
940 data8 0 // mbind
941 data8 0 // get_mempolicy // 1260
942 data8 0 // set_mempolicy
943 data8 0 // mq_open
944 data8 0 // mq_unlink
945 data8 0 // mq_timedsend
946 data8 0 // mq_timedreceive // 1265
947 data8 0 // mq_notify
948 data8 0 // mq_getsetattr
949 data8 0 // kexec_load
950 data8 0 // vserver
951 data8 0 // waitid // 1270
952 data8 0 // add_key
953 data8 0 // request_key
954 data8 0 // keyctl
955 data8 0 // ioprio_set
956 data8 0 // ioprio_get // 1275
957 data8 0 // move_pages
958 data8 0 // inotify_init
959 data8 0 // inotify_add_watch
960 data8 0 // inotify_rm_watch
961 data8 0 // migrate_pages // 1280
962 data8 0 // openat
963 data8 0 // mkdirat
964 data8 0 // mknodat
965 data8 0 // fchownat
966 data8 0 // futimesat // 1285
967 data8 0 // newfstatat
968 data8 0 // unlinkat
969 data8 0 // renameat
970 data8 0 // linkat
971 data8 0 // symlinkat // 1290
972 data8 0 // readlinkat
973 data8 0 // fchmodat
974 data8 0 // faccessat
975 data8 0
976 data8 0 // 1295
977 data8 0 // unshare
978 data8 0 // splice
979 data8 0 // set_robust_list
980 data8 0 // get_robust_list
981 data8 0 // sync_file_range // 1300
982 data8 0 // tee
983 data8 0 // vmsplice
984 data8 0
985 data8 fsys_getcpu // getcpu // 1304
881 986
882 // fill in zeros for the remaining entries 987 // fill in zeros for the remaining entries
883 .zero: 988 .zero:
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index d6aab40c6416..dcfbf3e7a9ef 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -446,7 +446,7 @@ iosapic_end_level_irq (unsigned int irq)
446#define iosapic_disable_level_irq mask_irq 446#define iosapic_disable_level_irq mask_irq
447#define iosapic_ack_level_irq nop 447#define iosapic_ack_level_irq nop
448 448
449struct hw_interrupt_type irq_type_iosapic_level = { 449struct irq_chip irq_type_iosapic_level = {
450 .name = "IO-SAPIC-level", 450 .name = "IO-SAPIC-level",
451 .startup = iosapic_startup_level_irq, 451 .startup = iosapic_startup_level_irq,
452 .shutdown = iosapic_shutdown_level_irq, 452 .shutdown = iosapic_shutdown_level_irq,
@@ -454,6 +454,8 @@ struct hw_interrupt_type irq_type_iosapic_level = {
454 .disable = iosapic_disable_level_irq, 454 .disable = iosapic_disable_level_irq,
455 .ack = iosapic_ack_level_irq, 455 .ack = iosapic_ack_level_irq,
456 .end = iosapic_end_level_irq, 456 .end = iosapic_end_level_irq,
457 .mask = mask_irq,
458 .unmask = unmask_irq,
457 .set_affinity = iosapic_set_affinity 459 .set_affinity = iosapic_set_affinity
458}; 460};
459 461
@@ -493,7 +495,7 @@ iosapic_ack_edge_irq (unsigned int irq)
493#define iosapic_disable_edge_irq nop 495#define iosapic_disable_edge_irq nop
494#define iosapic_end_edge_irq nop 496#define iosapic_end_edge_irq nop
495 497
496struct hw_interrupt_type irq_type_iosapic_edge = { 498struct irq_chip irq_type_iosapic_edge = {
497 .name = "IO-SAPIC-edge", 499 .name = "IO-SAPIC-edge",
498 .startup = iosapic_startup_edge_irq, 500 .startup = iosapic_startup_edge_irq,
499 .shutdown = iosapic_disable_edge_irq, 501 .shutdown = iosapic_disable_edge_irq,
@@ -501,6 +503,8 @@ struct hw_interrupt_type irq_type_iosapic_edge = {
501 .disable = iosapic_disable_edge_irq, 503 .disable = iosapic_disable_edge_irq,
502 .ack = iosapic_ack_edge_irq, 504 .ack = iosapic_ack_edge_irq,
503 .end = iosapic_end_edge_irq, 505 .end = iosapic_end_edge_irq,
506 .mask = mask_irq,
507 .unmask = unmask_irq,
504 .set_affinity = iosapic_set_affinity 508 .set_affinity = iosapic_set_affinity
505}; 509};
506 510
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index a76add3e76a2..491687f84fb5 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1192,8 +1192,6 @@ void
1192ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw, 1192ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
1193 struct ia64_sal_os_state *sos) 1193 struct ia64_sal_os_state *sos)
1194{ 1194{
1195 pal_processor_state_info_t *psp = (pal_processor_state_info_t *)
1196 &sos->proc_state_param;
1197 int recover, cpu = smp_processor_id(); 1195 int recover, cpu = smp_processor_id();
1198 struct task_struct *previous_current; 1196 struct task_struct *previous_current;
1199 struct ia64_mca_notify_die nd = 1197 struct ia64_mca_notify_die nd =
@@ -1223,10 +1221,8 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
1223 /* Get the MCA error record and log it */ 1221 /* Get the MCA error record and log it */
1224 ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA); 1222 ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA);
1225 1223
1226 /* TLB error is only exist in this SAL error record */ 1224 /* MCA error recovery */
1227 recover = (psp->tc && !(psp->cc || psp->bc || psp->rc || psp->uc)) 1225 recover = (ia64_mca_ucmc_extension
1228 /* other error recovery */
1229 || (ia64_mca_ucmc_extension
1230 && ia64_mca_ucmc_extension( 1226 && ia64_mca_ucmc_extension(
1231 IA64_LOG_CURR_BUFFER(SAL_INFO_TYPE_MCA), 1227 IA64_LOG_CURR_BUFFER(SAL_INFO_TYPE_MCA),
1232 sos)); 1228 sos));
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index afc1403799c9..832cf1e647e8 100644
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -602,11 +602,40 @@ recover_from_platform_error(slidx_table_t *slidx, peidx_table_t *peidx,
602 default: 602 default:
603 break; 603 break;
604 } 604 }
605 } else if (psp->cc && !psp->bc) { /* Cache error */
606 status = recover_from_read_error(slidx, peidx, pbci, sos);
605 } 607 }
606 608
607 return status; 609 return status;
608} 610}
609 611
612/*
613 * recover_from_tlb_check
614 * @peidx: pointer of index of processor error section
615 *
616 * Return value:
617 * 1 on Success / 0 on Failure
618 */
619static int
620recover_from_tlb_check(peidx_table_t *peidx)
621{
622 sal_log_mod_error_info_t *smei;
623 pal_tlb_check_info_t *ptci;
624
625 smei = (sal_log_mod_error_info_t *)peidx_tlb_check(peidx, 0);
626 ptci = (pal_tlb_check_info_t *)&(smei->check_info);
627
628 /*
629 * Look for signature of a duplicate TLB DTC entry, which is
630 * a SW bug and always fatal.
631 */
632 if (ptci->op == PAL_TLB_CHECK_OP_PURGE
633 && !(ptci->itr || ptci->dtc || ptci->itc))
634 return fatal_mca("Duplicate TLB entry");
635
636 return mca_recovered("TLB check recovered");
637}
638
610/** 639/**
611 * recover_from_processor_error 640 * recover_from_processor_error
612 * @platform: whether there are some platform error section or not 641 * @platform: whether there are some platform error section or not
@@ -618,13 +647,6 @@ recover_from_platform_error(slidx_table_t *slidx, peidx_table_t *peidx,
618 * Return value: 647 * Return value:
619 * 1 on Success / 0 on Failure 648 * 1 on Success / 0 on Failure
620 */ 649 */
621/*
622 * Later we try to recover when below all conditions are satisfied.
623 * 1. Only one processor error section is exist.
624 * 2. BUS_CHECK is exist and the others are not exist.(Except TLB_CHECK)
625 * 3. The entry of BUS_CHECK_INFO is 1.
626 * 4. "External bus error" flag is set and the others are not set.
627 */
628 650
629static int 651static int
630recover_from_processor_error(int platform, slidx_table_t *slidx, 652recover_from_processor_error(int platform, slidx_table_t *slidx,
@@ -652,38 +674,39 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
652 return fatal_mca("error not contained"); 674 return fatal_mca("error not contained");
653 675
654 /* 676 /*
677 * Look for recoverable TLB check
678 */
679 if (psp->tc && !(psp->cc || psp->bc || psp->rc || psp->uc))
680 return recover_from_tlb_check(peidx);
681
682 /*
655 * The cache check and bus check bits have four possible states 683 * The cache check and bus check bits have four possible states
656 * cc bc 684 * cc bc
657 * 0 0 Weird record, not recovered
658 * 1 0 Cache error, not recovered
659 * 0 1 I/O error, attempt recovery
660 * 1 1 Memory error, attempt recovery 685 * 1 1 Memory error, attempt recovery
686 * 1 0 Cache error, attempt recovery
687 * 0 1 I/O error, attempt recovery
688 * 0 0 Other error type, not recovered
661 */ 689 */
662 if (psp->bc == 0 || pbci == NULL) 690 if (psp->cc == 0 && (psp->bc == 0 || pbci == NULL))
663 return fatal_mca("No bus check"); 691 return fatal_mca("No cache or bus check");
664 692
665 /* 693 /*
666 * Sorry, we cannot handle so many. 694 * Cannot handle more than one bus check.
667 */ 695 */
668 if (peidx_bus_check_num(peidx) > 1) 696 if (peidx_bus_check_num(peidx) > 1)
669 return fatal_mca("Too many bus checks"); 697 return fatal_mca("Too many bus checks");
670 /* 698
671 * Well, here is only one bus error.
672 */
673 if (pbci->ib) 699 if (pbci->ib)
674 return fatal_mca("Internal Bus error"); 700 return fatal_mca("Internal Bus error");
675 if (pbci->cc)
676 return fatal_mca("Cache-cache error");
677 if (pbci->eb && pbci->bsi > 0) 701 if (pbci->eb && pbci->bsi > 0)
678 return fatal_mca("External bus check fatal status"); 702 return fatal_mca("External bus check fatal status");
679 703
680 /* 704 /*
681 * This is a local MCA and estimated as recoverble external bus error. 705 * This is a local MCA and estimated as a recoverble error.
682 * (e.g. a load from poisoned memory)
683 * This means "there are some platform errors".
684 */ 706 */
685 if (platform) 707 if (platform)
686 return recover_from_platform_error(slidx, peidx, pbci, sos); 708 return recover_from_platform_error(slidx, peidx, pbci, sos);
709
687 /* 710 /*
688 * On account of strange SAL error record, we cannot recover. 711 * On account of strange SAL error record, we cannot recover.
689 */ 712 */
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index e7220900ea14..c81080df70df 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -68,7 +68,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
68{ 68{
69 struct msi_msg msg; 69 struct msi_msg msg;
70 unsigned long dest_phys_id; 70 unsigned long dest_phys_id;
71 unsigned int irq, vector; 71 int irq, vector;
72 72
73 irq = create_irq(); 73 irq = create_irq();
74 if (irq < 0) 74 if (irq < 0)
@@ -76,7 +76,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
76 76
77 set_irq_msi(irq, desc); 77 set_irq_msi(irq, desc);
78 dest_phys_id = cpu_physical_id(first_cpu(cpu_online_map)); 78 dest_phys_id = cpu_physical_id(first_cpu(cpu_online_map));
79 vector = irq; 79 vector = irq_to_vector(irq);
80 80
81 msg.address_hi = 0; 81 msg.address_hi = 0;
82 msg.address_lo = 82 msg.address_lo =
@@ -110,7 +110,7 @@ static void ia64_ack_msi_irq(unsigned int irq)
110 110
111static int ia64_msi_retrigger_irq(unsigned int irq) 111static int ia64_msi_retrigger_irq(unsigned int irq)
112{ 112{
113 unsigned int vector = irq; 113 unsigned int vector = irq_to_vector(irq);
114 ia64_resend_irq(vector); 114 ia64_resend_irq(vector);
115 115
116 return 1; 116 return 1;
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 3f8918782e0c..00f803246948 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1573,6 +1573,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
1573 1573
1574 case PTRACE_DETACH: 1574 case PTRACE_DETACH:
1575 /* detach a process that was attached. */ 1575 /* detach a process that was attached. */
1576 clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
1576 ret = ptrace_detach(child, data); 1577 ret = ptrace_detach(child, data);
1577 goto out_tsk; 1578 goto out_tsk;
1578 1579
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 7d6fe65c93f4..dc7dd7648ec5 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -91,8 +91,6 @@ static struct resource code_resource = {
91 .name = "Kernel code", 91 .name = "Kernel code",
92 .flags = IORESOURCE_BUSY | IORESOURCE_MEM 92 .flags = IORESOURCE_BUSY | IORESOURCE_MEM
93}; 93};
94extern void efi_initialize_iomem_resources(struct resource *,
95 struct resource *);
96extern char _text[], _end[], _etext[]; 94extern char _text[], _end[], _etext[];
97 95
98unsigned long ia64_max_cacheline_size; 96unsigned long ia64_max_cacheline_size;
@@ -642,7 +640,7 @@ show_cpuinfo (struct seq_file *m, void *v)
642 "features : %s\n" 640 "features : %s\n"
643 "cpu number : %lu\n" 641 "cpu number : %lu\n"
644 "cpu regs : %u\n" 642 "cpu regs : %u\n"
645 "cpu MHz : %lu.%06lu\n" 643 "cpu MHz : %lu.%03lu\n"
646 "itc MHz : %lu.%06lu\n" 644 "itc MHz : %lu.%06lu\n"
647 "BogoMIPS : %lu.%02lu\n", 645 "BogoMIPS : %lu.%02lu\n",
648 cpunum, c->vendor, c->family, c->model, 646 cpunum, c->vendor, c->family, c->model,
@@ -694,12 +692,15 @@ struct seq_operations cpuinfo_op = {
694 .show = show_cpuinfo 692 .show = show_cpuinfo
695}; 693};
696 694
697static char brandname[128]; 695#define MAX_BRANDS 8
696static char brandname[MAX_BRANDS][128];
698 697
699static char * __cpuinit 698static char * __cpuinit
700get_model_name(__u8 family, __u8 model) 699get_model_name(__u8 family, __u8 model)
701{ 700{
701 static int overflow;
702 char brand[128]; 702 char brand[128];
703 int i;
703 704
704 memcpy(brand, "Unknown", 8); 705 memcpy(brand, "Unknown", 8);
705 if (ia64_pal_get_brand_info(brand)) { 706 if (ia64_pal_get_brand_info(brand)) {
@@ -711,12 +712,17 @@ get_model_name(__u8 family, __u8 model)
711 case 2: memcpy(brand, "Madison up to 9M cache", 23); break; 712 case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
712 } 713 }
713 } 714 }
714 if (brandname[0] == '\0') 715 for (i = 0; i < MAX_BRANDS; i++)
715 return strcpy(brandname, brand); 716 if (strcmp(brandname[i], brand) == 0)
716 else if (strcmp(brandname, brand) == 0) 717 return brandname[i];
717 return brandname; 718 for (i = 0; i < MAX_BRANDS; i++)
718 else 719 if (brandname[i][0] == '\0')
719 return kstrdup(brand, GFP_KERNEL); 720 return strcpy(brandname[i], brand);
721 if (overflow++ == 0)
722 printk(KERN_ERR
723 "%s: Table overflow. Some processor model information will be missing\n",
724 __FUNCTION__);
725 return "Unknown";
720} 726}
721 727
722static void __cpuinit 728static void __cpuinit
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index b21ddecea943..ff7df439da6d 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -375,6 +375,7 @@ static void __devinit
375smp_callin (void) 375smp_callin (void)
376{ 376{
377 int cpuid, phys_id, itc_master; 377 int cpuid, phys_id, itc_master;
378 struct cpuinfo_ia64 *last_cpuinfo, *this_cpuinfo;
378 extern void ia64_init_itm(void); 379 extern void ia64_init_itm(void);
379 extern volatile int time_keeper_id; 380 extern volatile int time_keeper_id;
380 381
@@ -424,7 +425,21 @@ smp_callin (void)
424 * Get our bogomips. 425 * Get our bogomips.
425 */ 426 */
426 ia64_init_itm(); 427 ia64_init_itm();
427 calibrate_delay(); 428
429 /*
430 * Delay calibration can be skipped if new processor is identical to the
431 * previous processor.
432 */
433 last_cpuinfo = cpu_data(cpuid - 1);
434 this_cpuinfo = local_cpu_data;
435 if (last_cpuinfo->itc_freq != this_cpuinfo->itc_freq ||
436 last_cpuinfo->proc_freq != this_cpuinfo->proc_freq ||
437 last_cpuinfo->features != this_cpuinfo->features ||
438 last_cpuinfo->revision != this_cpuinfo->revision ||
439 last_cpuinfo->family != this_cpuinfo->family ||
440 last_cpuinfo->archrev != this_cpuinfo->archrev ||
441 last_cpuinfo->model != this_cpuinfo->model)
442 calibrate_delay();
428 local_cpu_data->loops_per_jiffy = loops_per_jiffy; 443 local_cpu_data->loops_per_jiffy = loops_per_jiffy;
429 444
430#ifdef CONFIG_IA32_SUPPORT 445#ifdef CONFIG_IA32_SUPPORT
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index fb0f4698f5d0..44ce5ed9444c 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -97,26 +97,6 @@ void show_mem(void)
97unsigned long bootmap_start; 97unsigned long bootmap_start;
98 98
99/** 99/**
100 * find_max_pfn - adjust the maximum page number callback
101 * @start: start of range
102 * @end: end of range
103 * @arg: address of pointer to global max_pfn variable
104 *
105 * Passed as a callback function to efi_memmap_walk() to determine the highest
106 * available page frame number in the system.
107 */
108int
109find_max_pfn (unsigned long start, unsigned long end, void *arg)
110{
111 unsigned long *max_pfnp = arg, pfn;
112
113 pfn = (PAGE_ALIGN(end - 1) - PAGE_OFFSET) >> PAGE_SHIFT;
114 if (pfn > *max_pfnp)
115 *max_pfnp = pfn;
116 return 0;
117}
118
119/**
120 * find_bootmap_location - callback to find a memory area for the bootmap 100 * find_bootmap_location - callback to find a memory area for the bootmap
121 * @start: start of region 101 * @start: start of region
122 * @end: end of region 102 * @end: end of region
@@ -177,9 +157,10 @@ find_memory (void)
177 reserve_memory(); 157 reserve_memory();
178 158
179 /* first find highest page frame number */ 159 /* first find highest page frame number */
180 max_pfn = 0; 160 min_low_pfn = ~0UL;
181 efi_memmap_walk(find_max_pfn, &max_pfn); 161 max_low_pfn = 0;
182 162 efi_memmap_walk(find_max_min_low_pfn, NULL);
163 max_pfn = max_low_pfn;
183 /* how many bytes to cover all the pages */ 164 /* how many bytes to cover all the pages */
184 bootmap_size = bootmem_bootmap_pages(max_pfn) << PAGE_SHIFT; 165 bootmap_size = bootmem_bootmap_pages(max_pfn) << PAGE_SHIFT;
185 166
@@ -189,7 +170,8 @@ find_memory (void)
189 if (bootmap_start == ~0UL) 170 if (bootmap_start == ~0UL)
190 panic("Cannot find %ld bytes for bootmap\n", bootmap_size); 171 panic("Cannot find %ld bytes for bootmap\n", bootmap_size);
191 172
192 bootmap_size = init_bootmem(bootmap_start >> PAGE_SHIFT, max_pfn); 173 bootmap_size = init_bootmem_node(NODE_DATA(0),
174 (bootmap_start >> PAGE_SHIFT), 0, max_pfn);
193 175
194 /* Free all available memory, then mark bootmem-map as being in use. */ 176 /* Free all available memory, then mark bootmem-map as being in use. */
195 efi_memmap_walk(filter_rsvd_memory, free_bootmem); 177 efi_memmap_walk(filter_rsvd_memory, free_bootmem);
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 11a2d8825d89..872da7a2accd 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -88,9 +88,6 @@ static int __init build_node_maps(unsigned long start, unsigned long len,
88 bdp->node_low_pfn = max(epfn, bdp->node_low_pfn); 88 bdp->node_low_pfn = max(epfn, bdp->node_low_pfn);
89 } 89 }
90 90
91 min_low_pfn = min(min_low_pfn, bdp->node_boot_start>>PAGE_SHIFT);
92 max_low_pfn = max(max_low_pfn, bdp->node_low_pfn);
93
94 return 0; 91 return 0;
95} 92}
96 93
@@ -438,6 +435,7 @@ void __init find_memory(void)
438 /* These actually end up getting called by call_pernode_memory() */ 435 /* These actually end up getting called by call_pernode_memory() */
439 efi_memmap_walk(filter_rsvd_memory, build_node_maps); 436 efi_memmap_walk(filter_rsvd_memory, build_node_maps);
440 efi_memmap_walk(filter_rsvd_memory, find_pernode_space); 437 efi_memmap_walk(filter_rsvd_memory, find_pernode_space);
438 efi_memmap_walk(find_max_min_low_pfn, NULL);
441 439
442 for_each_online_node(node) 440 for_each_online_node(node)
443 if (mem_data[node].bootmem_data.node_low_pfn) { 441 if (mem_data[node].bootmem_data.node_low_pfn) {
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index f225dd72968b..4f36987eea72 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -155,7 +155,7 @@ ia64_set_rbs_bot (void)
155 155
156 if (stack_size > MAX_USER_STACK_SIZE) 156 if (stack_size > MAX_USER_STACK_SIZE)
157 stack_size = MAX_USER_STACK_SIZE; 157 stack_size = MAX_USER_STACK_SIZE;
158 current->thread.rbs_bot = STACK_TOP - stack_size; 158 current->thread.rbs_bot = PAGE_ALIGN(current->mm->start_stack - stack_size);
159} 159}
160 160
161/* 161/*
@@ -648,6 +648,22 @@ count_reserved_pages (u64 start, u64 end, void *arg)
648 return 0; 648 return 0;
649} 649}
650 650
651int
652find_max_min_low_pfn (unsigned long start, unsigned long end, void *arg)
653{
654 unsigned long pfn_start, pfn_end;
655#ifdef CONFIG_FLATMEM
656 pfn_start = (PAGE_ALIGN(__pa(start))) >> PAGE_SHIFT;
657 pfn_end = (PAGE_ALIGN(__pa(end - 1))) >> PAGE_SHIFT;
658#else
659 pfn_start = GRANULEROUNDDOWN(__pa(start)) >> PAGE_SHIFT;
660 pfn_end = GRANULEROUNDUP(__pa(end - 1)) >> PAGE_SHIFT;
661#endif
662 min_low_pfn = min(min_low_pfn, pfn_start);
663 max_low_pfn = max(max_low_pfn, pfn_end);
664 return 0;
665}
666
651/* 667/*
652 * Boot command-line option "nolwsys" can be used to disable the use of any light-weight 668 * Boot command-line option "nolwsys" can be used to disable the use of any light-weight
653 * system call handler. When this option is in effect, all fsyscalls will end up bubbling 669 * system call handler. When this option is in effect, all fsyscalls will end up bubbling
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 474d179966dc..0e83f3b419b5 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -557,14 +557,17 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
557 if (ret < 0) 557 if (ret < 0)
558 return ret; 558 return ret;
559 559
560 return acpi_pci_irq_enable(dev); 560 if (!dev->msi_enabled)
561 return acpi_pci_irq_enable(dev);
562 return 0;
561} 563}
562 564
563void 565void
564pcibios_disable_device (struct pci_dev *dev) 566pcibios_disable_device (struct pci_dev *dev)
565{ 567{
566 BUG_ON(atomic_read(&dev->enable_cnt)); 568 BUG_ON(atomic_read(&dev->enable_cnt));
567 acpi_pci_irq_disable(dev); 569 if (!dev->msi_enabled)
570 acpi_pci_irq_disable(dev);
568} 571}
569 572
570void 573void
diff --git a/arch/ia64/sn/kernel/bte_error.c b/arch/ia64/sn/kernel/bte_error.c
index f1ec1370b3e3..b6fcf8164f2b 100644
--- a/arch/ia64/sn/kernel/bte_error.c
+++ b/arch/ia64/sn/kernel/bte_error.c
@@ -78,7 +78,7 @@ int shub1_bte_error_handler(unsigned long _nodepda)
78 * There are errors which still need to be cleaned up by 78 * There are errors which still need to be cleaned up by
79 * hubiio_crb_error_handler 79 * hubiio_crb_error_handler
80 */ 80 */
81 mod_timer(recovery_timer, HZ * 5); 81 mod_timer(recovery_timer, jiffies + (HZ * 5));
82 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda, 82 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
83 smp_processor_id())); 83 smp_processor_id()));
84 return 1; 84 return 1;
@@ -95,7 +95,7 @@ int shub1_bte_error_handler(unsigned long _nodepda)
95 icrbd.ii_icrb0_d_regval = 95 icrbd.ii_icrb0_d_regval =
96 REMOTE_HUB_L(nasid, IIO_ICRB_D(i)); 96 REMOTE_HUB_L(nasid, IIO_ICRB_D(i));
97 if (icrbd.d_bteop) { 97 if (icrbd.d_bteop) {
98 mod_timer(recovery_timer, HZ * 5); 98 mod_timer(recovery_timer, jiffies + (HZ * 5));
99 BTE_PRINTK(("eh:%p:%d Valid %d, Giving up\n", 99 BTE_PRINTK(("eh:%p:%d Valid %d, Giving up\n",
100 err_nodepda, smp_processor_id(), 100 err_nodepda, smp_processor_id(),
101 i)); 101 i));
@@ -150,7 +150,7 @@ int shub2_bte_error_handler(unsigned long _nodepda)
150 status = BTE_LNSTAT_LOAD(bte); 150 status = BTE_LNSTAT_LOAD(bte);
151 if ((status & IBLS_ERROR) || !(status & IBLS_BUSY)) 151 if ((status & IBLS_ERROR) || !(status & IBLS_BUSY))
152 continue; 152 continue;
153 mod_timer(recovery_timer, HZ * 5); 153 mod_timer(recovery_timer, jiffies + (HZ * 5));
154 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda, 154 BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda,
155 smp_processor_id())); 155 smp_processor_id()));
156 return 1; 156 return 1;
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
index 8c331ca6e5c9..c6216f454ffb 100644
--- a/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -53,12 +53,15 @@ sal_ioif_init(u64 *result)
53} 53}
54 54
55/* 55/*
56 * sn_hubdev_add - The 'add' function of the acpi_sn_hubdev_driver. 56 * sn_acpi_hubdev_init() - This function is called by acpi_ns_get_device_callback()
57 * Called for every "SGIHUB" or "SGITIO" device defined 57 * for all SGIHUB and SGITIO acpi devices defined in the
58 * in the ACPI namespace. 58 * DSDT. It obtains the hubdev_info pointer from the
59 * ACPI vendor resource, which the PROM setup, and sets up the
60 * hubdev_info in the pda.
59 */ 61 */
60static int __init 62
61sn_hubdev_add(struct acpi_device *device) 63static acpi_status __init
64sn_acpi_hubdev_init(acpi_handle handle, u32 depth, void *context, void **ret)
62{ 65{
63 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; 66 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
64 u64 addr; 67 u64 addr;
@@ -67,18 +70,19 @@ sn_hubdev_add(struct acpi_device *device)
67 int i; 70 int i;
68 u64 nasid; 71 u64 nasid;
69 struct acpi_resource *resource; 72 struct acpi_resource *resource;
70 int ret = 0;
71 acpi_status status; 73 acpi_status status;
72 struct acpi_resource_vendor_typed *vendor; 74 struct acpi_resource_vendor_typed *vendor;
73 extern void sn_common_hubdev_init(struct hubdev_info *); 75 extern void sn_common_hubdev_init(struct hubdev_info *);
74 76
75 status = acpi_get_vendor_resource(device->handle, METHOD_NAME__CRS, 77 status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
76 &sn_uuid, &buffer); 78 &sn_uuid, &buffer);
77 if (ACPI_FAILURE(status)) { 79 if (ACPI_FAILURE(status)) {
78 printk(KERN_ERR 80 printk(KERN_ERR
79 "sn_hubdev_add: acpi_get_vendor_resource() failed: %d\n", 81 "sn_acpi_hubdev_init: acpi_get_vendor_resource() "
80 status); 82 "(0x%x) failed for: ", status);
81 return 1; 83 acpi_ns_print_node_pathname(handle, NULL);
84 printk("\n");
85 return AE_OK; /* Continue walking namespace */
82 } 86 }
83 87
84 resource = buffer.pointer; 88 resource = buffer.pointer;
@@ -86,9 +90,10 @@ sn_hubdev_add(struct acpi_device *device)
86 if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) != 90 if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
87 sizeof(struct hubdev_info *)) { 91 sizeof(struct hubdev_info *)) {
88 printk(KERN_ERR 92 printk(KERN_ERR
89 "sn_hubdev_add: Invalid vendor data length: %d\n", 93 "sn_acpi_hubdev_init: Invalid vendor data length: %d for: ",
90 vendor->byte_length); 94 vendor->byte_length);
91 ret = 1; 95 acpi_ns_print_node_pathname(handle, NULL);
96 printk("\n");
92 goto exit; 97 goto exit;
93 } 98 }
94 99
@@ -103,7 +108,7 @@ sn_hubdev_add(struct acpi_device *device)
103 108
104exit: 109exit:
105 kfree(buffer.pointer); 110 kfree(buffer.pointer);
106 return ret; 111 return AE_OK; /* Continue walking namespace */
107} 112}
108 113
109/* 114/*
@@ -441,14 +446,6 @@ sn_acpi_slot_fixup(struct pci_dev *dev)
441 446
442EXPORT_SYMBOL(sn_acpi_slot_fixup); 447EXPORT_SYMBOL(sn_acpi_slot_fixup);
443 448
444static struct acpi_driver acpi_sn_hubdev_driver = {
445 .name = "SGI HUBDEV Driver",
446 .ids = "SGIHUB,SGITIO",
447 .ops = {
448 .add = sn_hubdev_add,
449 },
450};
451
452 449
453/* 450/*
454 * sn_acpi_bus_fixup - Perform SN specific setup of software structs 451 * sn_acpi_bus_fixup - Perform SN specific setup of software structs
@@ -492,7 +489,10 @@ sn_io_acpi_init(void)
492 /* SN Altix does not follow the IOSAPIC IRQ routing model */ 489 /* SN Altix does not follow the IOSAPIC IRQ routing model */
493 acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; 490 acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
494 491
495 acpi_bus_register_driver(&acpi_sn_hubdev_driver); 492 /* Setup hubdev_info for all SGIHUB/SGITIO devices */
493 acpi_get_devices("SGIHUB", sn_acpi_hubdev_init, NULL, NULL);
494 acpi_get_devices("SGITIO", sn_acpi_hubdev_init, NULL, NULL);
495
496 status = sal_ioif_init(&result); 496 status = sal_ioif_init(&result);
497 if (status || result) 497 if (status || result)
498 panic("sal_ioif_init failed: [%lx] %s\n", 498 panic("sal_ioif_init failed: [%lx] %s\n",
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 600be3ebae05..6b10e5d28488 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -247,10 +247,18 @@ sn_io_slot_fixup(struct pci_dev *dev)
247 addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET; 247 addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET;
248 dev->resource[idx].start = addr; 248 dev->resource[idx].start = addr;
249 dev->resource[idx].end = addr + size; 249 dev->resource[idx].end = addr + size;
250
251 /*
252 * if it's already in the device structure, remove it before
253 * inserting
254 */
255 if (dev->resource[idx].parent && dev->resource[idx].parent->child)
256 release_resource(&dev->resource[idx]);
257
250 if (dev->resource[idx].flags & IORESOURCE_IO) 258 if (dev->resource[idx].flags & IORESOURCE_IO)
251 dev->resource[idx].parent = &ioport_resource; 259 insert_resource(&ioport_resource, &dev->resource[idx]);
252 else 260 else
253 dev->resource[idx].parent = &iomem_resource; 261 insert_resource(&iomem_resource, &dev->resource[idx]);
254 /* If ROM, mark as shadowed in PROM */ 262 /* If ROM, mark as shadowed in PROM */
255 if (idx == PCI_ROM_RESOURCE) 263 if (idx == PCI_ROM_RESOURCE)
256 dev->resource[idx].flags |= IORESOURCE_ROM_BIOS_COPY; 264 dev->resource[idx].flags |= IORESOURCE_ROM_BIOS_COPY;
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 8c5bee01eaa2..8d2a1bfbfe7c 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -205,7 +205,17 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)
205 (void)sn_retarget_vector(sn_irq_info, nasid, slice); 205 (void)sn_retarget_vector(sn_irq_info, nasid, slice);
206} 206}
207 207
208struct hw_interrupt_type irq_type_sn = { 208static void
209sn_mask_irq(unsigned int irq)
210{
211}
212
213static void
214sn_unmask_irq(unsigned int irq)
215{
216}
217
218struct irq_chip irq_type_sn = {
209 .name = "SN hub", 219 .name = "SN hub",
210 .startup = sn_startup_irq, 220 .startup = sn_startup_irq,
211 .shutdown = sn_shutdown_irq, 221 .shutdown = sn_shutdown_irq,
@@ -213,6 +223,8 @@ struct hw_interrupt_type irq_type_sn = {
213 .disable = sn_disable_irq, 223 .disable = sn_disable_irq,
214 .ack = sn_ack_irq, 224 .ack = sn_ack_irq,
215 .end = sn_end_irq, 225 .end = sn_end_irq,
226 .mask = sn_mask_irq,
227 .unmask = sn_unmask_irq,
216 .set_affinity = sn_set_affinity_irq 228 .set_affinity = sn_set_affinity_irq
217}; 229};
218 230
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 8571e52c2efd..a9bed5ca2ed8 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -348,8 +348,7 @@ sn_scan_pcdp(void)
348 continue; /* not PCI interconnect */ 348 continue; /* not PCI interconnect */
349 349
350 if (if_pci.translation & PCDP_PCI_TRANS_IOPORT) 350 if (if_pci.translation & PCDP_PCI_TRANS_IOPORT)
351 vga_console_iobase = 351 vga_console_iobase = if_pci.ioport_tra;
352 if_pci.ioport_tra | __IA64_UNCACHED_OFFSET;
353 352
354 if (if_pci.translation & PCDP_PCI_TRANS_MMIO) 353 if (if_pci.translation & PCDP_PCI_TRANS_MMIO)
355 vga_console_membase = 354 vga_console_membase =
@@ -397,6 +396,8 @@ void __init sn_setup(char **cmdline_p)
397 ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE); 396 ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE);
398 ia64_sn_set_os_feature(OSF_ACPI_ENABLE); 397 ia64_sn_set_os_feature(OSF_ACPI_ENABLE);
399 398
399 /* Load the new DSDT and SSDT tables into the global table list. */
400 acpi_table_init();
400 401
401#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) 402#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
402 /* 403 /*
@@ -427,7 +428,8 @@ void __init sn_setup(char **cmdline_p)
427 * bus containing the VGA console. 428 * bus containing the VGA console.
428 */ 429 */
429 if (vga_console_iobase) { 430 if (vga_console_iobase) {
430 io_space[0].mmio_base = vga_console_iobase; 431 io_space[0].mmio_base =
432 (unsigned long) ioremap(vga_console_iobase, 0);
431 io_space[0].sparse = 0; 433 io_space[0].sparse = 0;
432 } 434 }
433 435
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
index 1ee977fb6ebb..95af40cb22f2 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -96,10 +96,14 @@ pcibr_dmamap_ate32(struct pcidev_info *info,
96 } 96 }
97 97
98 /* 98 /*
99 * If we're mapping for MSI, set the MSI bit in the ATE 99 * If we're mapping for MSI, set the MSI bit in the ATE. If it's a
100 * TIOCP based pci bus, we also need to set the PIO bit in the ATE.
100 */ 101 */
101 if (dma_flags & SN_DMA_MSI) 102 if (dma_flags & SN_DMA_MSI) {
102 ate |= PCI32_ATE_MSI; 103 ate |= PCI32_ATE_MSI;
104 if (IS_TIOCP_SOFT(pcibus_info))
105 ate |= PCI32_ATE_PIO;
106 }
103 107
104 ate_write(pcibus_info, ate_index, ate_count, ate); 108 ate_write(pcibus_info, ate_index, ate_count, ate);
105 109
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-27 06:04:41 -0500