diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/configs/tiger_defconfig | 320 | ||||
-rw-r--r-- | arch/ia64/defconfig | 336 | ||||
-rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 67 | ||||
-rw-r--r-- | arch/ia64/kernel/entry.S | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/iosapic.c | 652 | ||||
-rw-r--r-- | arch/ia64/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/irq_ia64.c | 317 | ||||
-rw-r--r-- | arch/ia64/kernel/kprobes.c | 7 | ||||
-rw-r--r-- | arch/ia64/kernel/msi_ia64.c | 23 | ||||
-rw-r--r-- | arch/ia64/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 4 | ||||
-rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 1 | ||||
-rw-r--r-- | arch/ia64/mm/fault.c | 26 |
13 files changed, 854 insertions, 905 deletions
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index e208747d5de4..3dbb3987df27 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.21-rc3 | 3 | # Linux kernel version: 2.6.22 |
4 | # Thu Mar 8 11:07:09 2007 | 4 | # Thu Jul 19 13:54:47 2007 |
5 | # | 5 | # |
6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
7 | 7 | ||
@@ -19,15 +19,15 @@ CONFIG_LOCALVERSION="" | |||
19 | CONFIG_LOCALVERSION_AUTO=y | 19 | CONFIG_LOCALVERSION_AUTO=y |
20 | CONFIG_SWAP=y | 20 | CONFIG_SWAP=y |
21 | CONFIG_SYSVIPC=y | 21 | CONFIG_SYSVIPC=y |
22 | # CONFIG_IPC_NS is not set | ||
23 | CONFIG_SYSVIPC_SYSCTL=y | 22 | CONFIG_SYSVIPC_SYSCTL=y |
24 | CONFIG_POSIX_MQUEUE=y | 23 | CONFIG_POSIX_MQUEUE=y |
25 | # CONFIG_BSD_PROCESS_ACCT is not set | 24 | # CONFIG_BSD_PROCESS_ACCT is not set |
26 | # CONFIG_TASKSTATS is not set | 25 | # CONFIG_TASKSTATS is not set |
27 | # CONFIG_UTS_NS is not set | 26 | # CONFIG_USER_NS is not set |
28 | # CONFIG_AUDIT is not set | 27 | # CONFIG_AUDIT is not set |
29 | CONFIG_IKCONFIG=y | 28 | CONFIG_IKCONFIG=y |
30 | CONFIG_IKCONFIG_PROC=y | 29 | CONFIG_IKCONFIG_PROC=y |
30 | CONFIG_LOG_BUF_SHIFT=20 | ||
31 | # CONFIG_CPUSETS is not set | 31 | # CONFIG_CPUSETS is not set |
32 | CONFIG_SYSFS_DEPRECATED=y | 32 | CONFIG_SYSFS_DEPRECATED=y |
33 | # CONFIG_RELAY is not set | 33 | # CONFIG_RELAY is not set |
@@ -46,18 +46,19 @@ CONFIG_BUG=y | |||
46 | CONFIG_ELF_CORE=y | 46 | CONFIG_ELF_CORE=y |
47 | CONFIG_BASE_FULL=y | 47 | CONFIG_BASE_FULL=y |
48 | CONFIG_FUTEX=y | 48 | CONFIG_FUTEX=y |
49 | CONFIG_ANON_INODES=y | ||
49 | CONFIG_EPOLL=y | 50 | CONFIG_EPOLL=y |
51 | CONFIG_SIGNALFD=y | ||
52 | CONFIG_TIMERFD=y | ||
53 | CONFIG_EVENTFD=y | ||
50 | CONFIG_SHMEM=y | 54 | CONFIG_SHMEM=y |
51 | CONFIG_SLAB=y | ||
52 | CONFIG_VM_EVENT_COUNTERS=y | 55 | CONFIG_VM_EVENT_COUNTERS=y |
56 | CONFIG_SLAB=y | ||
57 | # CONFIG_SLUB is not set | ||
58 | # CONFIG_SLOB is not set | ||
53 | CONFIG_RT_MUTEXES=y | 59 | CONFIG_RT_MUTEXES=y |
54 | # CONFIG_TINY_SHMEM is not set | 60 | # CONFIG_TINY_SHMEM is not set |
55 | CONFIG_BASE_SMALL=0 | 61 | CONFIG_BASE_SMALL=0 |
56 | # CONFIG_SLOB is not set | ||
57 | |||
58 | # | ||
59 | # Loadable module support | ||
60 | # | ||
61 | CONFIG_MODULES=y | 62 | CONFIG_MODULES=y |
62 | CONFIG_MODULE_UNLOAD=y | 63 | CONFIG_MODULE_UNLOAD=y |
63 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 64 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
@@ -65,12 +66,9 @@ CONFIG_MODVERSIONS=y | |||
65 | CONFIG_MODULE_SRCVERSION_ALL=y | 66 | CONFIG_MODULE_SRCVERSION_ALL=y |
66 | CONFIG_KMOD=y | 67 | CONFIG_KMOD=y |
67 | CONFIG_STOP_MACHINE=y | 68 | CONFIG_STOP_MACHINE=y |
68 | |||
69 | # | ||
70 | # Block layer | ||
71 | # | ||
72 | CONFIG_BLOCK=y | 69 | CONFIG_BLOCK=y |
73 | # CONFIG_BLK_DEV_IO_TRACE is not set | 70 | # CONFIG_BLK_DEV_IO_TRACE is not set |
71 | # CONFIG_BLK_DEV_BSG is not set | ||
74 | 72 | ||
75 | # | 73 | # |
76 | # IO Schedulers | 74 | # IO Schedulers |
@@ -91,6 +89,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
91 | CONFIG_IA64=y | 89 | CONFIG_IA64=y |
92 | CONFIG_64BIT=y | 90 | CONFIG_64BIT=y |
93 | CONFIG_ZONE_DMA=y | 91 | CONFIG_ZONE_DMA=y |
92 | CONFIG_QUICKLIST=y | ||
94 | CONFIG_MMU=y | 93 | CONFIG_MMU=y |
95 | CONFIG_SWIOTLB=y | 94 | CONFIG_SWIOTLB=y |
96 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 95 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
@@ -114,8 +113,8 @@ CONFIG_IA64_DIG=y | |||
114 | CONFIG_MCKINLEY=y | 113 | CONFIG_MCKINLEY=y |
115 | # CONFIG_IA64_PAGE_SIZE_4KB is not set | 114 | # CONFIG_IA64_PAGE_SIZE_4KB is not set |
116 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 115 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
117 | CONFIG_IA64_PAGE_SIZE_16KB=y | 116 | # CONFIG_IA64_PAGE_SIZE_16KB is not set |
118 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 117 | CONFIG_IA64_PAGE_SIZE_64KB=y |
119 | CONFIG_PGTABLE_3=y | 118 | CONFIG_PGTABLE_3=y |
120 | # CONFIG_PGTABLE_4 is not set | 119 | # CONFIG_PGTABLE_4 is not set |
121 | # CONFIG_HZ_100 is not set | 120 | # CONFIG_HZ_100 is not set |
@@ -145,6 +144,9 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
145 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 144 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
146 | CONFIG_RESOURCES_64BIT=y | 145 | CONFIG_RESOURCES_64BIT=y |
147 | CONFIG_ZONE_DMA_FLAG=1 | 146 | CONFIG_ZONE_DMA_FLAG=1 |
147 | CONFIG_BOUNCE=y | ||
148 | CONFIG_NR_QUICK=1 | ||
149 | CONFIG_VIRT_TO_BUS=y | ||
148 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 150 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
149 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 151 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
150 | CONFIG_ARCH_FLATMEM_ENABLE=y | 152 | CONFIG_ARCH_FLATMEM_ENABLE=y |
@@ -152,11 +154,11 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y | |||
152 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 154 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
153 | CONFIG_VIRTUAL_MEM_MAP=y | 155 | CONFIG_VIRTUAL_MEM_MAP=y |
154 | CONFIG_HOLES_IN_ZONE=y | 156 | CONFIG_HOLES_IN_ZONE=y |
155 | CONFIG_IA32_SUPPORT=y | 157 | # CONFIG_IA32_SUPPORT is not set |
156 | CONFIG_COMPAT=y | ||
157 | CONFIG_IA64_MCA_RECOVERY=y | 158 | CONFIG_IA64_MCA_RECOVERY=y |
158 | CONFIG_PERFMON=y | 159 | CONFIG_PERFMON=y |
159 | CONFIG_IA64_PALINFO=y | 160 | CONFIG_IA64_PALINFO=y |
161 | # CONFIG_IA64_MC_ERR_INJECT is not set | ||
160 | # CONFIG_IA64_ESI is not set | 162 | # CONFIG_IA64_ESI is not set |
161 | CONFIG_KEXEC=y | 163 | CONFIG_KEXEC=y |
162 | # CONFIG_CRASH_DUMP is not set | 164 | # CONFIG_CRASH_DUMP is not set |
@@ -166,6 +168,7 @@ CONFIG_KEXEC=y | |||
166 | # | 168 | # |
167 | CONFIG_EFI_VARS=y | 169 | CONFIG_EFI_VARS=y |
168 | CONFIG_EFI_PCDP=y | 170 | CONFIG_EFI_PCDP=y |
171 | CONFIG_DMIID=y | ||
169 | CONFIG_BINFMT_ELF=y | 172 | CONFIG_BINFMT_ELF=y |
170 | CONFIG_BINFMT_MISC=m | 173 | CONFIG_BINFMT_MISC=m |
171 | 174 | ||
@@ -175,7 +178,6 @@ CONFIG_BINFMT_MISC=m | |||
175 | CONFIG_PM=y | 178 | CONFIG_PM=y |
176 | CONFIG_PM_LEGACY=y | 179 | CONFIG_PM_LEGACY=y |
177 | # CONFIG_PM_DEBUG is not set | 180 | # CONFIG_PM_DEBUG is not set |
178 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
179 | 181 | ||
180 | # | 182 | # |
181 | # ACPI (Advanced Configuration and Power Interface) Support | 183 | # ACPI (Advanced Configuration and Power Interface) Support |
@@ -205,13 +207,11 @@ CONFIG_ACPI_CONTAINER=m | |||
205 | # | 207 | # |
206 | CONFIG_PCI=y | 208 | CONFIG_PCI=y |
207 | CONFIG_PCI_DOMAINS=y | 209 | CONFIG_PCI_DOMAINS=y |
210 | CONFIG_PCI_SYSCALL=y | ||
208 | # CONFIG_PCIEPORTBUS is not set | 211 | # CONFIG_PCIEPORTBUS is not set |
212 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
209 | # CONFIG_PCI_MSI is not set | 213 | # CONFIG_PCI_MSI is not set |
210 | # CONFIG_PCI_DEBUG is not set | 214 | # CONFIG_PCI_DEBUG is not set |
211 | |||
212 | # | ||
213 | # PCI Hotplug Support | ||
214 | # | ||
215 | CONFIG_HOTPLUG_PCI=m | 215 | CONFIG_HOTPLUG_PCI=m |
216 | # CONFIG_HOTPLUG_PCI_FAKE is not set | 216 | # CONFIG_HOTPLUG_PCI_FAKE is not set |
217 | CONFIG_HOTPLUG_PCI_ACPI=m | 217 | CONFIG_HOTPLUG_PCI_ACPI=m |
@@ -232,7 +232,6 @@ CONFIG_NET=y | |||
232 | # | 232 | # |
233 | # Networking options | 233 | # Networking options |
234 | # | 234 | # |
235 | # CONFIG_NETDEBUG is not set | ||
236 | CONFIG_PACKET=y | 235 | CONFIG_PACKET=y |
237 | # CONFIG_PACKET_MMAP is not set | 236 | # CONFIG_PACKET_MMAP is not set |
238 | CONFIG_UNIX=y | 237 | CONFIG_UNIX=y |
@@ -270,20 +269,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
270 | # CONFIG_INET6_TUNNEL is not set | 269 | # CONFIG_INET6_TUNNEL is not set |
271 | # CONFIG_NETWORK_SECMARK is not set | 270 | # CONFIG_NETWORK_SECMARK is not set |
272 | # CONFIG_NETFILTER is not set | 271 | # CONFIG_NETFILTER is not set |
273 | |||
274 | # | ||
275 | # DCCP Configuration (EXPERIMENTAL) | ||
276 | # | ||
277 | # CONFIG_IP_DCCP is not set | 272 | # CONFIG_IP_DCCP is not set |
278 | |||
279 | # | ||
280 | # SCTP Configuration (EXPERIMENTAL) | ||
281 | # | ||
282 | # CONFIG_IP_SCTP is not set | 273 | # CONFIG_IP_SCTP is not set |
283 | |||
284 | # | ||
285 | # TIPC Configuration (EXPERIMENTAL) | ||
286 | # | ||
287 | # CONFIG_TIPC is not set | 274 | # CONFIG_TIPC is not set |
288 | # CONFIG_ATM is not set | 275 | # CONFIG_ATM is not set |
289 | # CONFIG_BRIDGE is not set | 276 | # CONFIG_BRIDGE is not set |
@@ -309,7 +296,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
309 | # CONFIG_HAMRADIO is not set | 296 | # CONFIG_HAMRADIO is not set |
310 | # CONFIG_IRDA is not set | 297 | # CONFIG_IRDA is not set |
311 | # CONFIG_BT is not set | 298 | # CONFIG_BT is not set |
299 | # CONFIG_AF_RXRPC is not set | ||
300 | |||
301 | # | ||
302 | # Wireless | ||
303 | # | ||
304 | # CONFIG_CFG80211 is not set | ||
305 | # CONFIG_WIRELESS_EXT is not set | ||
306 | # CONFIG_MAC80211 is not set | ||
312 | # CONFIG_IEEE80211 is not set | 307 | # CONFIG_IEEE80211 is not set |
308 | # CONFIG_RFKILL is not set | ||
309 | # CONFIG_NET_9P is not set | ||
313 | 310 | ||
314 | # | 311 | # |
315 | # Device Drivers | 312 | # Device Drivers |
@@ -324,25 +321,9 @@ CONFIG_FW_LOADER=m | |||
324 | # CONFIG_DEBUG_DRIVER is not set | 321 | # CONFIG_DEBUG_DRIVER is not set |
325 | # CONFIG_DEBUG_DEVRES is not set | 322 | # CONFIG_DEBUG_DEVRES is not set |
326 | # CONFIG_SYS_HYPERVISOR is not set | 323 | # CONFIG_SYS_HYPERVISOR is not set |
327 | |||
328 | # | ||
329 | # Connector - unified userspace <-> kernelspace linker | ||
330 | # | ||
331 | # CONFIG_CONNECTOR is not set | 324 | # CONFIG_CONNECTOR is not set |
332 | |||
333 | # | ||
334 | # Memory Technology Devices (MTD) | ||
335 | # | ||
336 | # CONFIG_MTD is not set | 325 | # CONFIG_MTD is not set |
337 | |||
338 | # | ||
339 | # Parallel port support | ||
340 | # | ||
341 | # CONFIG_PARPORT is not set | 326 | # CONFIG_PARPORT is not set |
342 | |||
343 | # | ||
344 | # Plug and Play support | ||
345 | # | ||
346 | CONFIG_PNP=y | 327 | CONFIG_PNP=y |
347 | # CONFIG_PNP_DEBUG is not set | 328 | # CONFIG_PNP_DEBUG is not set |
348 | 329 | ||
@@ -350,10 +331,7 @@ CONFIG_PNP=y | |||
350 | # Protocols | 331 | # Protocols |
351 | # | 332 | # |
352 | CONFIG_PNPACPI=y | 333 | CONFIG_PNPACPI=y |
353 | 334 | CONFIG_BLK_DEV=y | |
354 | # | ||
355 | # Block devices | ||
356 | # | ||
357 | # CONFIG_BLK_CPQ_DA is not set | 335 | # CONFIG_BLK_CPQ_DA is not set |
358 | # CONFIG_BLK_CPQ_CISS_DA is not set | 336 | # CONFIG_BLK_CPQ_CISS_DA is not set |
359 | # CONFIG_BLK_DEV_DAC960 is not set | 337 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -370,16 +348,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
370 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 348 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
371 | # CONFIG_CDROM_PKTCDVD is not set | 349 | # CONFIG_CDROM_PKTCDVD is not set |
372 | # CONFIG_ATA_OVER_ETH is not set | 350 | # CONFIG_ATA_OVER_ETH is not set |
373 | 351 | CONFIG_MISC_DEVICES=y | |
374 | # | 352 | # CONFIG_PHANTOM is not set |
375 | # Misc devices | 353 | # CONFIG_EEPROM_93CX6 is not set |
376 | # | ||
377 | # CONFIG_SGI_IOC4 is not set | 354 | # CONFIG_SGI_IOC4 is not set |
378 | # CONFIG_TIFM_CORE is not set | 355 | # CONFIG_TIFM_CORE is not set |
379 | |||
380 | # | ||
381 | # ATA/ATAPI/MFM/RLL support | ||
382 | # | ||
383 | CONFIG_IDE=y | 356 | CONFIG_IDE=y |
384 | CONFIG_IDE_MAX_HWIFS=4 | 357 | CONFIG_IDE_MAX_HWIFS=4 |
385 | CONFIG_BLK_DEV_IDE=y | 358 | CONFIG_BLK_DEV_IDE=y |
@@ -396,6 +369,7 @@ CONFIG_BLK_DEV_IDEFLOPPY=y | |||
396 | CONFIG_BLK_DEV_IDESCSI=m | 369 | CONFIG_BLK_DEV_IDESCSI=m |
397 | # CONFIG_BLK_DEV_IDEACPI is not set | 370 | # CONFIG_BLK_DEV_IDEACPI is not set |
398 | # CONFIG_IDE_TASK_IOCTL is not set | 371 | # CONFIG_IDE_TASK_IOCTL is not set |
372 | CONFIG_IDE_PROC_FS=y | ||
399 | 373 | ||
400 | # | 374 | # |
401 | # IDE chipset support/bugfixes | 375 | # IDE chipset support/bugfixes |
@@ -404,12 +378,12 @@ CONFIG_BLK_DEV_IDESCSI=m | |||
404 | # CONFIG_BLK_DEV_IDEPNP is not set | 378 | # CONFIG_BLK_DEV_IDEPNP is not set |
405 | CONFIG_BLK_DEV_IDEPCI=y | 379 | CONFIG_BLK_DEV_IDEPCI=y |
406 | # CONFIG_IDEPCI_SHARE_IRQ is not set | 380 | # CONFIG_IDEPCI_SHARE_IRQ is not set |
381 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
407 | # CONFIG_BLK_DEV_OFFBOARD is not set | 382 | # CONFIG_BLK_DEV_OFFBOARD is not set |
408 | CONFIG_BLK_DEV_GENERIC=y | 383 | CONFIG_BLK_DEV_GENERIC=y |
409 | # CONFIG_BLK_DEV_OPTI621 is not set | 384 | # CONFIG_BLK_DEV_OPTI621 is not set |
410 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 385 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
411 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 386 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
412 | CONFIG_IDEDMA_PCI_AUTO=y | ||
413 | # CONFIG_IDEDMA_ONLYDISK is not set | 387 | # CONFIG_IDEDMA_ONLYDISK is not set |
414 | # CONFIG_BLK_DEV_AEC62XX is not set | 388 | # CONFIG_BLK_DEV_AEC62XX is not set |
415 | # CONFIG_BLK_DEV_ALI15X3 is not set | 389 | # CONFIG_BLK_DEV_ALI15X3 is not set |
@@ -438,7 +412,6 @@ CONFIG_BLK_DEV_PIIX=y | |||
438 | # CONFIG_IDE_ARM is not set | 412 | # CONFIG_IDE_ARM is not set |
439 | CONFIG_BLK_DEV_IDEDMA=y | 413 | CONFIG_BLK_DEV_IDEDMA=y |
440 | # CONFIG_IDEDMA_IVB is not set | 414 | # CONFIG_IDEDMA_IVB is not set |
441 | CONFIG_IDEDMA_AUTO=y | ||
442 | # CONFIG_BLK_DEV_HD is not set | 415 | # CONFIG_BLK_DEV_HD is not set |
443 | 416 | ||
444 | # | 417 | # |
@@ -446,6 +419,7 @@ CONFIG_IDEDMA_AUTO=y | |||
446 | # | 419 | # |
447 | # CONFIG_RAID_ATTRS is not set | 420 | # CONFIG_RAID_ATTRS is not set |
448 | CONFIG_SCSI=y | 421 | CONFIG_SCSI=y |
422 | CONFIG_SCSI_DMA=y | ||
449 | # CONFIG_SCSI_TGT is not set | 423 | # CONFIG_SCSI_TGT is not set |
450 | CONFIG_SCSI_NETLINK=y | 424 | CONFIG_SCSI_NETLINK=y |
451 | CONFIG_SCSI_PROC_FS=y | 425 | CONFIG_SCSI_PROC_FS=y |
@@ -468,6 +442,7 @@ CONFIG_CHR_DEV_SG=m | |||
468 | # CONFIG_SCSI_CONSTANTS is not set | 442 | # CONFIG_SCSI_CONSTANTS is not set |
469 | # CONFIG_SCSI_LOGGING is not set | 443 | # CONFIG_SCSI_LOGGING is not set |
470 | # CONFIG_SCSI_SCAN_ASYNC is not set | 444 | # CONFIG_SCSI_SCAN_ASYNC is not set |
445 | CONFIG_SCSI_WAIT_SCAN=m | ||
471 | 446 | ||
472 | # | 447 | # |
473 | # SCSI Transports | 448 | # SCSI Transports |
@@ -514,15 +489,7 @@ CONFIG_SCSI_QLOGIC_1280=y | |||
514 | # CONFIG_SCSI_DC390T is not set | 489 | # CONFIG_SCSI_DC390T is not set |
515 | # CONFIG_SCSI_DEBUG is not set | 490 | # CONFIG_SCSI_DEBUG is not set |
516 | # CONFIG_SCSI_SRP is not set | 491 | # CONFIG_SCSI_SRP is not set |
517 | |||
518 | # | ||
519 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
520 | # | ||
521 | # CONFIG_ATA is not set | 492 | # CONFIG_ATA is not set |
522 | |||
523 | # | ||
524 | # Multi-device support (RAID and LVM) | ||
525 | # | ||
526 | CONFIG_MD=y | 493 | CONFIG_MD=y |
527 | CONFIG_BLK_DEV_MD=m | 494 | CONFIG_BLK_DEV_MD=m |
528 | CONFIG_MD_LINEAR=m | 495 | CONFIG_MD_LINEAR=m |
@@ -539,6 +506,7 @@ CONFIG_DM_SNAPSHOT=m | |||
539 | CONFIG_DM_MIRROR=m | 506 | CONFIG_DM_MIRROR=m |
540 | CONFIG_DM_ZERO=m | 507 | CONFIG_DM_ZERO=m |
541 | # CONFIG_DM_MULTIPATH is not set | 508 | # CONFIG_DM_MULTIPATH is not set |
509 | # CONFIG_DM_DELAY is not set | ||
542 | 510 | ||
543 | # | 511 | # |
544 | # Fusion MPT device support | 512 | # Fusion MPT device support |
@@ -553,46 +521,25 @@ CONFIG_FUSION_CTL=y | |||
553 | # | 521 | # |
554 | # IEEE 1394 (FireWire) support | 522 | # IEEE 1394 (FireWire) support |
555 | # | 523 | # |
524 | # CONFIG_FIREWIRE is not set | ||
556 | # CONFIG_IEEE1394 is not set | 525 | # CONFIG_IEEE1394 is not set |
557 | |||
558 | # | ||
559 | # I2O device support | ||
560 | # | ||
561 | # CONFIG_I2O is not set | 526 | # CONFIG_I2O is not set |
562 | |||
563 | # | ||
564 | # Network device support | ||
565 | # | ||
566 | CONFIG_NETDEVICES=y | 527 | CONFIG_NETDEVICES=y |
528 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
567 | CONFIG_DUMMY=m | 529 | CONFIG_DUMMY=m |
568 | # CONFIG_BONDING is not set | 530 | # CONFIG_BONDING is not set |
531 | # CONFIG_MACVLAN is not set | ||
569 | # CONFIG_EQUALIZER is not set | 532 | # CONFIG_EQUALIZER is not set |
570 | # CONFIG_TUN is not set | 533 | # CONFIG_TUN is not set |
571 | # CONFIG_NET_SB1000 is not set | 534 | # CONFIG_NET_SB1000 is not set |
572 | |||
573 | # | ||
574 | # ARCnet devices | ||
575 | # | ||
576 | # CONFIG_ARCNET is not set | 535 | # CONFIG_ARCNET is not set |
577 | |||
578 | # | ||
579 | # PHY device support | ||
580 | # | ||
581 | # CONFIG_PHYLIB is not set | 536 | # CONFIG_PHYLIB is not set |
582 | |||
583 | # | ||
584 | # Ethernet (10 or 100Mbit) | ||
585 | # | ||
586 | CONFIG_NET_ETHERNET=y | 537 | CONFIG_NET_ETHERNET=y |
587 | CONFIG_MII=m | 538 | CONFIG_MII=m |
588 | # CONFIG_HAPPYMEAL is not set | 539 | # CONFIG_HAPPYMEAL is not set |
589 | # CONFIG_SUNGEM is not set | 540 | # CONFIG_SUNGEM is not set |
590 | # CONFIG_CASSINI is not set | 541 | # CONFIG_CASSINI is not set |
591 | # CONFIG_NET_VENDOR_3COM is not set | 542 | # CONFIG_NET_VENDOR_3COM is not set |
592 | |||
593 | # | ||
594 | # Tulip family network device support | ||
595 | # | ||
596 | CONFIG_NET_TULIP=y | 543 | CONFIG_NET_TULIP=y |
597 | # CONFIG_DE2104X is not set | 544 | # CONFIG_DE2104X is not set |
598 | CONFIG_TULIP=m | 545 | CONFIG_TULIP=m |
@@ -623,10 +570,7 @@ CONFIG_E100=m | |||
623 | # CONFIG_SUNDANCE is not set | 570 | # CONFIG_SUNDANCE is not set |
624 | # CONFIG_VIA_RHINE is not set | 571 | # CONFIG_VIA_RHINE is not set |
625 | # CONFIG_SC92031 is not set | 572 | # CONFIG_SC92031 is not set |
626 | 573 | CONFIG_NETDEV_1000=y | |
627 | # | ||
628 | # Ethernet (1000 Mbit) | ||
629 | # | ||
630 | # CONFIG_ACENIC is not set | 574 | # CONFIG_ACENIC is not set |
631 | # CONFIG_DL2K is not set | 575 | # CONFIG_DL2K is not set |
632 | CONFIG_E1000=y | 576 | CONFIG_E1000=y |
@@ -639,36 +583,36 @@ CONFIG_E1000=y | |||
639 | # CONFIG_SIS190 is not set | 583 | # CONFIG_SIS190 is not set |
640 | # CONFIG_SKGE is not set | 584 | # CONFIG_SKGE is not set |
641 | # CONFIG_SKY2 is not set | 585 | # CONFIG_SKY2 is not set |
642 | # CONFIG_SK98LIN is not set | ||
643 | # CONFIG_VIA_VELOCITY is not set | 586 | # CONFIG_VIA_VELOCITY is not set |
644 | CONFIG_TIGON3=y | 587 | CONFIG_TIGON3=y |
645 | # CONFIG_BNX2 is not set | 588 | # CONFIG_BNX2 is not set |
646 | # CONFIG_QLA3XXX is not set | 589 | # CONFIG_QLA3XXX is not set |
647 | # CONFIG_ATL1 is not set | 590 | # CONFIG_ATL1 is not set |
648 | 591 | CONFIG_NETDEV_10000=y | |
649 | # | ||
650 | # Ethernet (10000 Mbit) | ||
651 | # | ||
652 | # CONFIG_CHELSIO_T1 is not set | 592 | # CONFIG_CHELSIO_T1 is not set |
653 | # CONFIG_CHELSIO_T3 is not set | 593 | # CONFIG_CHELSIO_T3 is not set |
654 | # CONFIG_IXGB is not set | 594 | # CONFIG_IXGB is not set |
655 | # CONFIG_S2IO is not set | 595 | # CONFIG_S2IO is not set |
656 | # CONFIG_MYRI10GE is not set | 596 | # CONFIG_MYRI10GE is not set |
657 | # CONFIG_NETXEN_NIC is not set | 597 | # CONFIG_NETXEN_NIC is not set |
658 | 598 | # CONFIG_MLX4_CORE is not set | |
659 | # | ||
660 | # Token Ring devices | ||
661 | # | ||
662 | # CONFIG_TR is not set | 599 | # CONFIG_TR is not set |
663 | 600 | ||
664 | # | 601 | # |
665 | # Wireless LAN (non-hamradio) | 602 | # Wireless LAN |
666 | # | 603 | # |
667 | # CONFIG_NET_RADIO is not set | 604 | # CONFIG_WLAN_PRE80211 is not set |
605 | # CONFIG_WLAN_80211 is not set | ||
668 | 606 | ||
669 | # | 607 | # |
670 | # Wan interfaces | 608 | # USB Network Adapters |
671 | # | 609 | # |
610 | # CONFIG_USB_CATC is not set | ||
611 | # CONFIG_USB_KAWETH is not set | ||
612 | # CONFIG_USB_PEGASUS is not set | ||
613 | # CONFIG_USB_RTL8150 is not set | ||
614 | # CONFIG_USB_USBNET_MII is not set | ||
615 | # CONFIG_USB_USBNET is not set | ||
672 | # CONFIG_WAN is not set | 616 | # CONFIG_WAN is not set |
673 | # CONFIG_FDDI is not set | 617 | # CONFIG_FDDI is not set |
674 | # CONFIG_HIPPI is not set | 618 | # CONFIG_HIPPI is not set |
@@ -678,18 +622,9 @@ CONFIG_TIGON3=y | |||
678 | # CONFIG_SHAPER is not set | 622 | # CONFIG_SHAPER is not set |
679 | CONFIG_NETCONSOLE=y | 623 | CONFIG_NETCONSOLE=y |
680 | CONFIG_NETPOLL=y | 624 | CONFIG_NETPOLL=y |
681 | # CONFIG_NETPOLL_RX is not set | ||
682 | # CONFIG_NETPOLL_TRAP is not set | 625 | # CONFIG_NETPOLL_TRAP is not set |
683 | CONFIG_NET_POLL_CONTROLLER=y | 626 | CONFIG_NET_POLL_CONTROLLER=y |
684 | |||
685 | # | ||
686 | # ISDN subsystem | ||
687 | # | ||
688 | # CONFIG_ISDN is not set | 627 | # CONFIG_ISDN is not set |
689 | |||
690 | # | ||
691 | # Telephony Support | ||
692 | # | ||
693 | # CONFIG_PHONE is not set | 628 | # CONFIG_PHONE is not set |
694 | 629 | ||
695 | # | 630 | # |
@@ -697,6 +632,7 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
697 | # | 632 | # |
698 | CONFIG_INPUT=y | 633 | CONFIG_INPUT=y |
699 | # CONFIG_INPUT_FF_MEMLESS is not set | 634 | # CONFIG_INPUT_FF_MEMLESS is not set |
635 | # CONFIG_INPUT_POLLDEV is not set | ||
700 | 636 | ||
701 | # | 637 | # |
702 | # Userland interfaces | 638 | # Userland interfaces |
@@ -722,9 +658,17 @@ CONFIG_KEYBOARD_ATKBD=y | |||
722 | # CONFIG_KEYBOARD_STOWAWAY is not set | 658 | # CONFIG_KEYBOARD_STOWAWAY is not set |
723 | CONFIG_INPUT_MOUSE=y | 659 | CONFIG_INPUT_MOUSE=y |
724 | CONFIG_MOUSE_PS2=y | 660 | CONFIG_MOUSE_PS2=y |
661 | CONFIG_MOUSE_PS2_ALPS=y | ||
662 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
663 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
664 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
665 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
666 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
725 | # CONFIG_MOUSE_SERIAL is not set | 667 | # CONFIG_MOUSE_SERIAL is not set |
668 | # CONFIG_MOUSE_APPLETOUCH is not set | ||
726 | # CONFIG_MOUSE_VSXXXAA is not set | 669 | # CONFIG_MOUSE_VSXXXAA is not set |
727 | # CONFIG_INPUT_JOYSTICK is not set | 670 | # CONFIG_INPUT_JOYSTICK is not set |
671 | # CONFIG_INPUT_TABLET is not set | ||
728 | # CONFIG_INPUT_TOUCHSCREEN is not set | 672 | # CONFIG_INPUT_TOUCHSCREEN is not set |
729 | # CONFIG_INPUT_MISC is not set | 673 | # CONFIG_INPUT_MISC is not set |
730 | 674 | ||
@@ -790,19 +734,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
790 | CONFIG_UNIX98_PTYS=y | 734 | CONFIG_UNIX98_PTYS=y |
791 | CONFIG_LEGACY_PTYS=y | 735 | CONFIG_LEGACY_PTYS=y |
792 | CONFIG_LEGACY_PTY_COUNT=256 | 736 | CONFIG_LEGACY_PTY_COUNT=256 |
793 | |||
794 | # | ||
795 | # IPMI | ||
796 | # | ||
797 | # CONFIG_IPMI_HANDLER is not set | 737 | # CONFIG_IPMI_HANDLER is not set |
798 | |||
799 | # | ||
800 | # Watchdog Cards | ||
801 | # | ||
802 | # CONFIG_WATCHDOG is not set | 738 | # CONFIG_WATCHDOG is not set |
803 | # CONFIG_HW_RANDOM is not set | 739 | # CONFIG_HW_RANDOM is not set |
804 | CONFIG_EFI_RTC=y | 740 | CONFIG_EFI_RTC=y |
805 | # CONFIG_DTLK is not set | ||
806 | # CONFIG_R3964 is not set | 741 | # CONFIG_R3964 is not set |
807 | # CONFIG_APPLICOM is not set | 742 | # CONFIG_APPLICOM is not set |
808 | CONFIG_AGP=m | 743 | CONFIG_AGP=m |
@@ -821,15 +756,8 @@ CONFIG_HPET=y | |||
821 | # CONFIG_HPET_RTC_IRQ is not set | 756 | # CONFIG_HPET_RTC_IRQ is not set |
822 | CONFIG_HPET_MMAP=y | 757 | CONFIG_HPET_MMAP=y |
823 | # CONFIG_HANGCHECK_TIMER is not set | 758 | # CONFIG_HANGCHECK_TIMER is not set |
824 | |||
825 | # | ||
826 | # TPM devices | ||
827 | # | ||
828 | # CONFIG_TCG_TPM is not set | 759 | # CONFIG_TCG_TPM is not set |
829 | 760 | CONFIG_DEVPORT=y | |
830 | # | ||
831 | # I2C support | ||
832 | # | ||
833 | # CONFIG_I2C is not set | 761 | # CONFIG_I2C is not set |
834 | 762 | ||
835 | # | 763 | # |
@@ -837,21 +765,17 @@ CONFIG_HPET_MMAP=y | |||
837 | # | 765 | # |
838 | # CONFIG_SPI is not set | 766 | # CONFIG_SPI is not set |
839 | # CONFIG_SPI_MASTER is not set | 767 | # CONFIG_SPI_MASTER is not set |
840 | |||
841 | # | ||
842 | # Dallas's 1-wire bus | ||
843 | # | ||
844 | # CONFIG_W1 is not set | 768 | # CONFIG_W1 is not set |
845 | 769 | # CONFIG_POWER_SUPPLY is not set | |
846 | # | ||
847 | # Hardware Monitoring support | ||
848 | # | ||
849 | CONFIG_HWMON=y | 770 | CONFIG_HWMON=y |
850 | # CONFIG_HWMON_VID is not set | 771 | # CONFIG_HWMON_VID is not set |
851 | # CONFIG_SENSORS_ABITUGURU is not set | 772 | # CONFIG_SENSORS_ABITUGURU is not set |
852 | # CONFIG_SENSORS_F71805F is not set | 773 | # CONFIG_SENSORS_F71805F is not set |
853 | # CONFIG_SENSORS_PC87427 is not set | 774 | # CONFIG_SENSORS_PC87427 is not set |
775 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
776 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
854 | # CONFIG_SENSORS_VT1211 is not set | 777 | # CONFIG_SENSORS_VT1211 is not set |
778 | # CONFIG_SENSORS_W83627HF is not set | ||
855 | # CONFIG_HWMON_DEBUG_CHIP is not set | 779 | # CONFIG_HWMON_DEBUG_CHIP is not set |
856 | 780 | ||
857 | # | 781 | # |
@@ -863,17 +787,20 @@ CONFIG_HWMON=y | |||
863 | # Multimedia devices | 787 | # Multimedia devices |
864 | # | 788 | # |
865 | # CONFIG_VIDEO_DEV is not set | 789 | # CONFIG_VIDEO_DEV is not set |
866 | 790 | # CONFIG_DVB_CORE is not set | |
867 | # | 791 | CONFIG_DAB=y |
868 | # Digital Video Broadcasting Devices | ||
869 | # | ||
870 | # CONFIG_DVB is not set | ||
871 | # CONFIG_USB_DABUSB is not set | 792 | # CONFIG_USB_DABUSB is not set |
872 | 793 | ||
873 | # | 794 | # |
874 | # Graphics support | 795 | # Graphics support |
875 | # | 796 | # |
876 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 797 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
798 | |||
799 | # | ||
800 | # Display device support | ||
801 | # | ||
802 | # CONFIG_DISPLAY_SUPPORT is not set | ||
803 | # CONFIG_VGASTATE is not set | ||
877 | # CONFIG_FB is not set | 804 | # CONFIG_FB is not set |
878 | 805 | ||
879 | # | 806 | # |
@@ -887,16 +814,18 @@ CONFIG_DUMMY_CONSOLE=y | |||
887 | # Sound | 814 | # Sound |
888 | # | 815 | # |
889 | # CONFIG_SOUND is not set | 816 | # CONFIG_SOUND is not set |
890 | 817 | CONFIG_HID_SUPPORT=y | |
891 | # | ||
892 | # HID Devices | ||
893 | # | ||
894 | CONFIG_HID=y | 818 | CONFIG_HID=y |
895 | # CONFIG_HID_DEBUG is not set | 819 | # CONFIG_HID_DEBUG is not set |
896 | 820 | ||
897 | # | 821 | # |
898 | # USB support | 822 | # USB Input Devices |
899 | # | 823 | # |
824 | CONFIG_USB_HID=y | ||
825 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
826 | # CONFIG_HID_FF is not set | ||
827 | # CONFIG_USB_HIDDEV is not set | ||
828 | CONFIG_USB_SUPPORT=y | ||
900 | CONFIG_USB_ARCH_HAS_HCD=y | 829 | CONFIG_USB_ARCH_HAS_HCD=y |
901 | CONFIG_USB_ARCH_HAS_OHCI=y | 830 | CONFIG_USB_ARCH_HAS_OHCI=y |
902 | CONFIG_USB_ARCH_HAS_EHCI=y | 831 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -907,8 +836,10 @@ CONFIG_USB=y | |||
907 | # Miscellaneous USB options | 836 | # Miscellaneous USB options |
908 | # | 837 | # |
909 | CONFIG_USB_DEVICEFS=y | 838 | CONFIG_USB_DEVICEFS=y |
839 | CONFIG_USB_DEVICE_CLASS=y | ||
910 | # CONFIG_USB_DYNAMIC_MINORS is not set | 840 | # CONFIG_USB_DYNAMIC_MINORS is not set |
911 | # CONFIG_USB_SUSPEND is not set | 841 | # CONFIG_USB_SUSPEND is not set |
842 | # CONFIG_USB_PERSIST is not set | ||
912 | # CONFIG_USB_OTG is not set | 843 | # CONFIG_USB_OTG is not set |
913 | 844 | ||
914 | # | 845 | # |
@@ -918,7 +849,6 @@ CONFIG_USB_EHCI_HCD=m | |||
918 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 849 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
919 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 850 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
920 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 851 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
921 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
922 | # CONFIG_USB_ISP116X_HCD is not set | 852 | # CONFIG_USB_ISP116X_HCD is not set |
923 | CONFIG_USB_OHCI_HCD=m | 853 | CONFIG_USB_OHCI_HCD=m |
924 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 854 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -926,6 +856,7 @@ CONFIG_USB_OHCI_HCD=m | |||
926 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 856 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
927 | CONFIG_USB_UHCI_HCD=y | 857 | CONFIG_USB_UHCI_HCD=y |
928 | # CONFIG_USB_SL811_HCD is not set | 858 | # CONFIG_USB_SL811_HCD is not set |
859 | # CONFIG_USB_R8A66597_HCD is not set | ||
929 | 860 | ||
930 | # | 861 | # |
931 | # USB Device Class drivers | 862 | # USB Device Class drivers |
@@ -955,41 +886,10 @@ CONFIG_USB_STORAGE=m | |||
955 | # CONFIG_USB_LIBUSUAL is not set | 886 | # CONFIG_USB_LIBUSUAL is not set |
956 | 887 | ||
957 | # | 888 | # |
958 | # USB Input Devices | ||
959 | # | ||
960 | CONFIG_USB_HID=y | ||
961 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
962 | # CONFIG_HID_FF is not set | ||
963 | # CONFIG_USB_HIDDEV is not set | ||
964 | # CONFIG_USB_AIPTEK is not set | ||
965 | # CONFIG_USB_WACOM is not set | ||
966 | # CONFIG_USB_ACECAD is not set | ||
967 | # CONFIG_USB_KBTAB is not set | ||
968 | # CONFIG_USB_POWERMATE is not set | ||
969 | # CONFIG_USB_TOUCHSCREEN is not set | ||
970 | # CONFIG_USB_YEALINK is not set | ||
971 | # CONFIG_USB_XPAD is not set | ||
972 | # CONFIG_USB_ATI_REMOTE is not set | ||
973 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
974 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
975 | # CONFIG_USB_APPLETOUCH is not set | ||
976 | # CONFIG_USB_GTCO is not set | ||
977 | |||
978 | # | ||
979 | # USB Imaging devices | 889 | # USB Imaging devices |
980 | # | 890 | # |
981 | # CONFIG_USB_MDC800 is not set | 891 | # CONFIG_USB_MDC800 is not set |
982 | # CONFIG_USB_MICROTEK is not set | 892 | # CONFIG_USB_MICROTEK is not set |
983 | |||
984 | # | ||
985 | # USB Network Adapters | ||
986 | # | ||
987 | # CONFIG_USB_CATC is not set | ||
988 | # CONFIG_USB_KAWETH is not set | ||
989 | # CONFIG_USB_PEGASUS is not set | ||
990 | # CONFIG_USB_RTL8150 is not set | ||
991 | # CONFIG_USB_USBNET_MII is not set | ||
992 | # CONFIG_USB_USBNET is not set | ||
993 | # CONFIG_USB_MON is not set | 893 | # CONFIG_USB_MON is not set |
994 | 894 | ||
995 | # | 895 | # |
@@ -1033,10 +933,6 @@ CONFIG_USB_HID=y | |||
1033 | # USB Gadget Support | 933 | # USB Gadget Support |
1034 | # | 934 | # |
1035 | # CONFIG_USB_GADGET is not set | 935 | # CONFIG_USB_GADGET is not set |
1036 | |||
1037 | # | ||
1038 | # MMC/SD Card support | ||
1039 | # | ||
1040 | # CONFIG_MMC is not set | 936 | # CONFIG_MMC is not set |
1041 | 937 | ||
1042 | # | 938 | # |
@@ -1051,17 +947,9 @@ CONFIG_USB_HID=y | |||
1051 | # | 947 | # |
1052 | # LED Triggers | 948 | # LED Triggers |
1053 | # | 949 | # |
1054 | |||
1055 | # | ||
1056 | # InfiniBand support | ||
1057 | # | ||
1058 | # CONFIG_INFINIBAND is not set | 950 | # CONFIG_INFINIBAND is not set |
1059 | 951 | ||
1060 | # | 952 | # |
1061 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
1062 | # | ||
1063 | |||
1064 | # | ||
1065 | # Real Time Clock | 953 | # Real Time Clock |
1066 | # | 954 | # |
1067 | # CONFIG_RTC_CLASS is not set | 955 | # CONFIG_RTC_CLASS is not set |
@@ -1080,12 +968,9 @@ CONFIG_USB_HID=y | |||
1080 | # | 968 | # |
1081 | 969 | ||
1082 | # | 970 | # |
1083 | # Auxiliary Display support | 971 | # Userspace I/O |
1084 | # | ||
1085 | |||
1086 | # | ||
1087 | # Virtualization | ||
1088 | # | 972 | # |
973 | # CONFIG_UIO is not set | ||
1089 | # CONFIG_MSPEC is not set | 974 | # CONFIG_MSPEC is not set |
1090 | 975 | ||
1091 | # | 976 | # |
@@ -1200,7 +1085,8 @@ CONFIG_EXPORTFS=m | |||
1200 | CONFIG_NFS_COMMON=y | 1085 | CONFIG_NFS_COMMON=y |
1201 | CONFIG_SUNRPC=m | 1086 | CONFIG_SUNRPC=m |
1202 | CONFIG_SUNRPC_GSS=m | 1087 | CONFIG_SUNRPC_GSS=m |
1203 | CONFIG_RPCSEC_GSS_KRB5=m | 1088 | # CONFIG_SUNRPC_BIND34 is not set |
1089 | CONFIG_RPCSEC_GSS_KRB5=y | ||
1204 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1090 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1205 | CONFIG_SMB_FS=m | 1091 | CONFIG_SMB_FS=m |
1206 | CONFIG_SMB_NLS_DEFAULT=y | 1092 | CONFIG_SMB_NLS_DEFAULT=y |
@@ -1214,7 +1100,6 @@ CONFIG_CIFS=m | |||
1214 | # CONFIG_NCP_FS is not set | 1100 | # CONFIG_NCP_FS is not set |
1215 | # CONFIG_CODA_FS is not set | 1101 | # CONFIG_CODA_FS is not set |
1216 | # CONFIG_AFS_FS is not set | 1102 | # CONFIG_AFS_FS is not set |
1217 | # CONFIG_9P_FS is not set | ||
1218 | 1103 | ||
1219 | # | 1104 | # |
1220 | # Partition Types | 1105 | # Partition Types |
@@ -1236,6 +1121,7 @@ CONFIG_SGI_PARTITION=y | |||
1236 | # CONFIG_SUN_PARTITION is not set | 1121 | # CONFIG_SUN_PARTITION is not set |
1237 | # CONFIG_KARMA_PARTITION is not set | 1122 | # CONFIG_KARMA_PARTITION is not set |
1238 | CONFIG_EFI_PARTITION=y | 1123 | CONFIG_EFI_PARTITION=y |
1124 | # CONFIG_SYSV68_PARTITION is not set | ||
1239 | 1125 | ||
1240 | # | 1126 | # |
1241 | # Native Language Support | 1127 | # Native Language Support |
@@ -1292,11 +1178,14 @@ CONFIG_NLS_UTF8=m | |||
1292 | CONFIG_BITREVERSE=y | 1178 | CONFIG_BITREVERSE=y |
1293 | # CONFIG_CRC_CCITT is not set | 1179 | # CONFIG_CRC_CCITT is not set |
1294 | # CONFIG_CRC16 is not set | 1180 | # CONFIG_CRC16 is not set |
1181 | # CONFIG_CRC_ITU_T is not set | ||
1295 | CONFIG_CRC32=y | 1182 | CONFIG_CRC32=y |
1183 | # CONFIG_CRC7 is not set | ||
1296 | # CONFIG_LIBCRC32C is not set | 1184 | # CONFIG_LIBCRC32C is not set |
1297 | CONFIG_PLIST=y | 1185 | CONFIG_PLIST=y |
1298 | CONFIG_HAS_IOMEM=y | 1186 | CONFIG_HAS_IOMEM=y |
1299 | CONFIG_HAS_IOPORT=y | 1187 | CONFIG_HAS_IOPORT=y |
1188 | CONFIG_HAS_DMA=y | ||
1300 | CONFIG_GENERIC_HARDIRQS=y | 1189 | CONFIG_GENERIC_HARDIRQS=y |
1301 | CONFIG_GENERIC_IRQ_PROBE=y | 1190 | CONFIG_GENERIC_IRQ_PROBE=y |
1302 | CONFIG_GENERIC_PENDING_IRQ=y | 1191 | CONFIG_GENERIC_PENDING_IRQ=y |
@@ -1319,8 +1208,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1319 | # CONFIG_HEADERS_CHECK is not set | 1208 | # CONFIG_HEADERS_CHECK is not set |
1320 | CONFIG_DEBUG_KERNEL=y | 1209 | CONFIG_DEBUG_KERNEL=y |
1321 | # CONFIG_DEBUG_SHIRQ is not set | 1210 | # CONFIG_DEBUG_SHIRQ is not set |
1322 | CONFIG_LOG_BUF_SHIFT=20 | ||
1323 | CONFIG_DETECT_SOFTLOCKUP=y | 1211 | CONFIG_DETECT_SOFTLOCKUP=y |
1212 | CONFIG_SCHED_DEBUG=y | ||
1324 | # CONFIG_SCHEDSTATS is not set | 1213 | # CONFIG_SCHEDSTATS is not set |
1325 | # CONFIG_TIMER_STATS is not set | 1214 | # CONFIG_TIMER_STATS is not set |
1326 | # CONFIG_DEBUG_SLAB is not set | 1215 | # CONFIG_DEBUG_SLAB is not set |
@@ -1343,17 +1232,12 @@ CONFIG_IA64_GRANULE_16MB=y | |||
1343 | # CONFIG_DISABLE_VHPT is not set | 1232 | # CONFIG_DISABLE_VHPT is not set |
1344 | # CONFIG_IA64_DEBUG_CMPXCHG is not set | 1233 | # CONFIG_IA64_DEBUG_CMPXCHG is not set |
1345 | # CONFIG_IA64_DEBUG_IRQ is not set | 1234 | # CONFIG_IA64_DEBUG_IRQ is not set |
1346 | CONFIG_SYSVIPC_COMPAT=y | ||
1347 | 1235 | ||
1348 | # | 1236 | # |
1349 | # Security options | 1237 | # Security options |
1350 | # | 1238 | # |
1351 | # CONFIG_KEYS is not set | 1239 | # CONFIG_KEYS is not set |
1352 | # CONFIG_SECURITY is not set | 1240 | # CONFIG_SECURITY is not set |
1353 | |||
1354 | # | ||
1355 | # Cryptographic options | ||
1356 | # | ||
1357 | CONFIG_CRYPTO=y | 1241 | CONFIG_CRYPTO=y |
1358 | CONFIG_CRYPTO_ALGAPI=y | 1242 | CONFIG_CRYPTO_ALGAPI=y |
1359 | CONFIG_CRYPTO_BLKCIPHER=m | 1243 | CONFIG_CRYPTO_BLKCIPHER=m |
@@ -1373,6 +1257,7 @@ CONFIG_CRYPTO_ECB=m | |||
1373 | CONFIG_CRYPTO_CBC=m | 1257 | CONFIG_CRYPTO_CBC=m |
1374 | CONFIG_CRYPTO_PCBC=m | 1258 | CONFIG_CRYPTO_PCBC=m |
1375 | # CONFIG_CRYPTO_LRW is not set | 1259 | # CONFIG_CRYPTO_LRW is not set |
1260 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1376 | CONFIG_CRYPTO_DES=m | 1261 | CONFIG_CRYPTO_DES=m |
1377 | # CONFIG_CRYPTO_FCRYPT is not set | 1262 | # CONFIG_CRYPTO_FCRYPT is not set |
1378 | # CONFIG_CRYPTO_BLOWFISH is not set | 1263 | # CONFIG_CRYPTO_BLOWFISH is not set |
@@ -1390,7 +1275,4 @@ CONFIG_CRYPTO_DES=m | |||
1390 | # CONFIG_CRYPTO_CRC32C is not set | 1275 | # CONFIG_CRYPTO_CRC32C is not set |
1391 | # CONFIG_CRYPTO_CAMELLIA is not set | 1276 | # CONFIG_CRYPTO_CAMELLIA is not set |
1392 | # CONFIG_CRYPTO_TEST is not set | 1277 | # CONFIG_CRYPTO_TEST is not set |
1393 | 1278 | CONFIG_CRYPTO_HW=y | |
1394 | # | ||
1395 | # Hardware crypto devices | ||
1396 | # | ||
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 461f8ee738fb..03172dc8c403 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.21-rc3 | 3 | # Linux kernel version: 2.6.22 |
4 | # Thu Mar 8 11:01:03 2007 | 4 | # Thu Jul 19 13:55:32 2007 |
5 | # | 5 | # |
6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
7 | 7 | ||
@@ -19,15 +19,15 @@ CONFIG_LOCALVERSION="" | |||
19 | CONFIG_LOCALVERSION_AUTO=y | 19 | CONFIG_LOCALVERSION_AUTO=y |
20 | CONFIG_SWAP=y | 20 | CONFIG_SWAP=y |
21 | CONFIG_SYSVIPC=y | 21 | CONFIG_SYSVIPC=y |
22 | # CONFIG_IPC_NS is not set | ||
23 | CONFIG_SYSVIPC_SYSCTL=y | 22 | CONFIG_SYSVIPC_SYSCTL=y |
24 | CONFIG_POSIX_MQUEUE=y | 23 | CONFIG_POSIX_MQUEUE=y |
25 | # CONFIG_BSD_PROCESS_ACCT is not set | 24 | # CONFIG_BSD_PROCESS_ACCT is not set |
26 | # CONFIG_TASKSTATS is not set | 25 | # CONFIG_TASKSTATS is not set |
27 | # CONFIG_UTS_NS is not set | 26 | # CONFIG_USER_NS is not set |
28 | # CONFIG_AUDIT is not set | 27 | # CONFIG_AUDIT is not set |
29 | CONFIG_IKCONFIG=y | 28 | CONFIG_IKCONFIG=y |
30 | CONFIG_IKCONFIG_PROC=y | 29 | CONFIG_IKCONFIG_PROC=y |
30 | CONFIG_LOG_BUF_SHIFT=20 | ||
31 | # CONFIG_CPUSETS is not set | 31 | # CONFIG_CPUSETS is not set |
32 | CONFIG_SYSFS_DEPRECATED=y | 32 | CONFIG_SYSFS_DEPRECATED=y |
33 | # CONFIG_RELAY is not set | 33 | # CONFIG_RELAY is not set |
@@ -46,18 +46,19 @@ CONFIG_BUG=y | |||
46 | CONFIG_ELF_CORE=y | 46 | CONFIG_ELF_CORE=y |
47 | CONFIG_BASE_FULL=y | 47 | CONFIG_BASE_FULL=y |
48 | CONFIG_FUTEX=y | 48 | CONFIG_FUTEX=y |
49 | CONFIG_ANON_INODES=y | ||
49 | CONFIG_EPOLL=y | 50 | CONFIG_EPOLL=y |
51 | CONFIG_SIGNALFD=y | ||
52 | CONFIG_TIMERFD=y | ||
53 | CONFIG_EVENTFD=y | ||
50 | CONFIG_SHMEM=y | 54 | CONFIG_SHMEM=y |
51 | CONFIG_SLAB=y | ||
52 | CONFIG_VM_EVENT_COUNTERS=y | 55 | CONFIG_VM_EVENT_COUNTERS=y |
56 | CONFIG_SLAB=y | ||
57 | # CONFIG_SLUB is not set | ||
58 | # CONFIG_SLOB is not set | ||
53 | CONFIG_RT_MUTEXES=y | 59 | CONFIG_RT_MUTEXES=y |
54 | # CONFIG_TINY_SHMEM is not set | 60 | # CONFIG_TINY_SHMEM is not set |
55 | CONFIG_BASE_SMALL=0 | 61 | CONFIG_BASE_SMALL=0 |
56 | # CONFIG_SLOB is not set | ||
57 | |||
58 | # | ||
59 | # Loadable module support | ||
60 | # | ||
61 | CONFIG_MODULES=y | 62 | CONFIG_MODULES=y |
62 | CONFIG_MODULE_UNLOAD=y | 63 | CONFIG_MODULE_UNLOAD=y |
63 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 64 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
@@ -65,12 +66,9 @@ CONFIG_MODVERSIONS=y | |||
65 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 66 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
66 | CONFIG_KMOD=y | 67 | CONFIG_KMOD=y |
67 | CONFIG_STOP_MACHINE=y | 68 | CONFIG_STOP_MACHINE=y |
68 | |||
69 | # | ||
70 | # Block layer | ||
71 | # | ||
72 | CONFIG_BLOCK=y | 69 | CONFIG_BLOCK=y |
73 | # CONFIG_BLK_DEV_IO_TRACE is not set | 70 | # CONFIG_BLK_DEV_IO_TRACE is not set |
71 | # CONFIG_BLK_DEV_BSG is not set | ||
74 | 72 | ||
75 | # | 73 | # |
76 | # IO Schedulers | 74 | # IO Schedulers |
@@ -91,6 +89,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
91 | CONFIG_IA64=y | 89 | CONFIG_IA64=y |
92 | CONFIG_64BIT=y | 90 | CONFIG_64BIT=y |
93 | CONFIG_ZONE_DMA=y | 91 | CONFIG_ZONE_DMA=y |
92 | CONFIG_QUICKLIST=y | ||
94 | CONFIG_MMU=y | 93 | CONFIG_MMU=y |
95 | CONFIG_SWIOTLB=y | 94 | CONFIG_SWIOTLB=y |
96 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 95 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
@@ -114,8 +113,8 @@ CONFIG_IA64_GENERIC=y | |||
114 | CONFIG_MCKINLEY=y | 113 | CONFIG_MCKINLEY=y |
115 | # CONFIG_IA64_PAGE_SIZE_4KB is not set | 114 | # CONFIG_IA64_PAGE_SIZE_4KB is not set |
116 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 115 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
117 | CONFIG_IA64_PAGE_SIZE_16KB=y | 116 | # CONFIG_IA64_PAGE_SIZE_16KB is not set |
118 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 117 | CONFIG_IA64_PAGE_SIZE_64KB=y |
119 | CONFIG_PGTABLE_3=y | 118 | CONFIG_PGTABLE_3=y |
120 | # CONFIG_PGTABLE_4 is not set | 119 | # CONFIG_PGTABLE_4 is not set |
121 | # CONFIG_HZ_100 is not set | 120 | # CONFIG_HZ_100 is not set |
@@ -147,6 +146,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
147 | CONFIG_MIGRATION=y | 146 | CONFIG_MIGRATION=y |
148 | CONFIG_RESOURCES_64BIT=y | 147 | CONFIG_RESOURCES_64BIT=y |
149 | CONFIG_ZONE_DMA_FLAG=1 | 148 | CONFIG_ZONE_DMA_FLAG=1 |
149 | CONFIG_BOUNCE=y | ||
150 | CONFIG_NR_QUICK=1 | ||
151 | CONFIG_VIRT_TO_BUS=y | ||
150 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 152 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
151 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 153 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
152 | CONFIG_ARCH_FLATMEM_ENABLE=y | 154 | CONFIG_ARCH_FLATMEM_ENABLE=y |
@@ -164,7 +166,7 @@ CONFIG_COMPAT=y | |||
164 | CONFIG_IA64_MCA_RECOVERY=y | 166 | CONFIG_IA64_MCA_RECOVERY=y |
165 | CONFIG_PERFMON=y | 167 | CONFIG_PERFMON=y |
166 | CONFIG_IA64_PALINFO=y | 168 | CONFIG_IA64_PALINFO=y |
167 | # CONFIG_MC_ERR_INJECT is not set | 169 | # CONFIG_IA64_MC_ERR_INJECT is not set |
168 | CONFIG_SGI_SN=y | 170 | CONFIG_SGI_SN=y |
169 | # CONFIG_IA64_ESI is not set | 171 | # CONFIG_IA64_ESI is not set |
170 | 172 | ||
@@ -180,6 +182,7 @@ CONFIG_CRASH_DUMP=y | |||
180 | # | 182 | # |
181 | CONFIG_EFI_VARS=y | 183 | CONFIG_EFI_VARS=y |
182 | CONFIG_EFI_PCDP=y | 184 | CONFIG_EFI_PCDP=y |
185 | CONFIG_DMIID=y | ||
183 | CONFIG_BINFMT_ELF=y | 186 | CONFIG_BINFMT_ELF=y |
184 | CONFIG_BINFMT_MISC=m | 187 | CONFIG_BINFMT_MISC=m |
185 | 188 | ||
@@ -189,7 +192,6 @@ CONFIG_BINFMT_MISC=m | |||
189 | CONFIG_PM=y | 192 | CONFIG_PM=y |
190 | CONFIG_PM_LEGACY=y | 193 | CONFIG_PM_LEGACY=y |
191 | # CONFIG_PM_DEBUG is not set | 194 | # CONFIG_PM_DEBUG is not set |
192 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
193 | 195 | ||
194 | # | 196 | # |
195 | # ACPI (Advanced Configuration and Power Interface) Support | 197 | # ACPI (Advanced Configuration and Power Interface) Support |
@@ -220,13 +222,11 @@ CONFIG_ACPI_CONTAINER=m | |||
220 | # | 222 | # |
221 | CONFIG_PCI=y | 223 | CONFIG_PCI=y |
222 | CONFIG_PCI_DOMAINS=y | 224 | CONFIG_PCI_DOMAINS=y |
225 | CONFIG_PCI_SYSCALL=y | ||
223 | # CONFIG_PCIEPORTBUS is not set | 226 | # CONFIG_PCIEPORTBUS is not set |
227 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
224 | # CONFIG_PCI_MSI is not set | 228 | # CONFIG_PCI_MSI is not set |
225 | # CONFIG_PCI_DEBUG is not set | 229 | # CONFIG_PCI_DEBUG is not set |
226 | |||
227 | # | ||
228 | # PCI Hotplug Support | ||
229 | # | ||
230 | CONFIG_HOTPLUG_PCI=m | 230 | CONFIG_HOTPLUG_PCI=m |
231 | # CONFIG_HOTPLUG_PCI_FAKE is not set | 231 | # CONFIG_HOTPLUG_PCI_FAKE is not set |
232 | CONFIG_HOTPLUG_PCI_ACPI=m | 232 | CONFIG_HOTPLUG_PCI_ACPI=m |
@@ -248,7 +248,6 @@ CONFIG_NET=y | |||
248 | # | 248 | # |
249 | # Networking options | 249 | # Networking options |
250 | # | 250 | # |
251 | # CONFIG_NETDEBUG is not set | ||
252 | CONFIG_PACKET=y | 251 | CONFIG_PACKET=y |
253 | # CONFIG_PACKET_MMAP is not set | 252 | # CONFIG_PACKET_MMAP is not set |
254 | CONFIG_UNIX=y | 253 | CONFIG_UNIX=y |
@@ -286,20 +285,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
286 | # CONFIG_INET6_TUNNEL is not set | 285 | # CONFIG_INET6_TUNNEL is not set |
287 | # CONFIG_NETWORK_SECMARK is not set | 286 | # CONFIG_NETWORK_SECMARK is not set |
288 | # CONFIG_NETFILTER is not set | 287 | # CONFIG_NETFILTER is not set |
289 | |||
290 | # | ||
291 | # DCCP Configuration (EXPERIMENTAL) | ||
292 | # | ||
293 | # CONFIG_IP_DCCP is not set | 288 | # CONFIG_IP_DCCP is not set |
294 | |||
295 | # | ||
296 | # SCTP Configuration (EXPERIMENTAL) | ||
297 | # | ||
298 | # CONFIG_IP_SCTP is not set | 289 | # CONFIG_IP_SCTP is not set |
299 | |||
300 | # | ||
301 | # TIPC Configuration (EXPERIMENTAL) | ||
302 | # | ||
303 | # CONFIG_TIPC is not set | 290 | # CONFIG_TIPC is not set |
304 | # CONFIG_ATM is not set | 291 | # CONFIG_ATM is not set |
305 | # CONFIG_BRIDGE is not set | 292 | # CONFIG_BRIDGE is not set |
@@ -325,7 +312,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
325 | # CONFIG_HAMRADIO is not set | 312 | # CONFIG_HAMRADIO is not set |
326 | # CONFIG_IRDA is not set | 313 | # CONFIG_IRDA is not set |
327 | # CONFIG_BT is not set | 314 | # CONFIG_BT is not set |
315 | # CONFIG_AF_RXRPC is not set | ||
316 | |||
317 | # | ||
318 | # Wireless | ||
319 | # | ||
320 | # CONFIG_CFG80211 is not set | ||
321 | # CONFIG_WIRELESS_EXT is not set | ||
322 | # CONFIG_MAC80211 is not set | ||
328 | # CONFIG_IEEE80211 is not set | 323 | # CONFIG_IEEE80211 is not set |
324 | # CONFIG_RFKILL is not set | ||
325 | # CONFIG_NET_9P is not set | ||
329 | 326 | ||
330 | # | 327 | # |
331 | # Device Drivers | 328 | # Device Drivers |
@@ -340,25 +337,9 @@ CONFIG_FW_LOADER=m | |||
340 | # CONFIG_DEBUG_DRIVER is not set | 337 | # CONFIG_DEBUG_DRIVER is not set |
341 | # CONFIG_DEBUG_DEVRES is not set | 338 | # CONFIG_DEBUG_DEVRES is not set |
342 | # CONFIG_SYS_HYPERVISOR is not set | 339 | # CONFIG_SYS_HYPERVISOR is not set |
343 | |||
344 | # | ||
345 | # Connector - unified userspace <-> kernelspace linker | ||
346 | # | ||
347 | # CONFIG_CONNECTOR is not set | 340 | # CONFIG_CONNECTOR is not set |
348 | |||
349 | # | ||
350 | # Memory Technology Devices (MTD) | ||
351 | # | ||
352 | # CONFIG_MTD is not set | 341 | # CONFIG_MTD is not set |
353 | |||
354 | # | ||
355 | # Parallel port support | ||
356 | # | ||
357 | # CONFIG_PARPORT is not set | 342 | # CONFIG_PARPORT is not set |
358 | |||
359 | # | ||
360 | # Plug and Play support | ||
361 | # | ||
362 | CONFIG_PNP=y | 343 | CONFIG_PNP=y |
363 | # CONFIG_PNP_DEBUG is not set | 344 | # CONFIG_PNP_DEBUG is not set |
364 | 345 | ||
@@ -366,10 +347,7 @@ CONFIG_PNP=y | |||
366 | # Protocols | 347 | # Protocols |
367 | # | 348 | # |
368 | CONFIG_PNPACPI=y | 349 | CONFIG_PNPACPI=y |
369 | 350 | CONFIG_BLK_DEV=y | |
370 | # | ||
371 | # Block devices | ||
372 | # | ||
373 | # CONFIG_BLK_CPQ_DA is not set | 351 | # CONFIG_BLK_CPQ_DA is not set |
374 | # CONFIG_BLK_CPQ_CISS_DA is not set | 352 | # CONFIG_BLK_CPQ_CISS_DA is not set |
375 | # CONFIG_BLK_DEV_DAC960 is not set | 353 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -386,16 +364,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
386 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 364 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
387 | # CONFIG_CDROM_PKTCDVD is not set | 365 | # CONFIG_CDROM_PKTCDVD is not set |
388 | # CONFIG_ATA_OVER_ETH is not set | 366 | # CONFIG_ATA_OVER_ETH is not set |
389 | 367 | CONFIG_MISC_DEVICES=y | |
390 | # | 368 | # CONFIG_PHANTOM is not set |
391 | # Misc devices | 369 | # CONFIG_EEPROM_93CX6 is not set |
392 | # | ||
393 | CONFIG_SGI_IOC4=y | 370 | CONFIG_SGI_IOC4=y |
394 | # CONFIG_TIFM_CORE is not set | 371 | # CONFIG_TIFM_CORE is not set |
395 | |||
396 | # | ||
397 | # ATA/ATAPI/MFM/RLL support | ||
398 | # | ||
399 | CONFIG_IDE=y | 372 | CONFIG_IDE=y |
400 | CONFIG_IDE_MAX_HWIFS=4 | 373 | CONFIG_IDE_MAX_HWIFS=4 |
401 | CONFIG_BLK_DEV_IDE=y | 374 | CONFIG_BLK_DEV_IDE=y |
@@ -412,6 +385,7 @@ CONFIG_BLK_DEV_IDEFLOPPY=y | |||
412 | CONFIG_BLK_DEV_IDESCSI=m | 385 | CONFIG_BLK_DEV_IDESCSI=m |
413 | # CONFIG_BLK_DEV_IDEACPI is not set | 386 | # CONFIG_BLK_DEV_IDEACPI is not set |
414 | # CONFIG_IDE_TASK_IOCTL is not set | 387 | # CONFIG_IDE_TASK_IOCTL is not set |
388 | CONFIG_IDE_PROC_FS=y | ||
415 | 389 | ||
416 | # | 390 | # |
417 | # IDE chipset support/bugfixes | 391 | # IDE chipset support/bugfixes |
@@ -420,12 +394,12 @@ CONFIG_BLK_DEV_IDESCSI=m | |||
420 | # CONFIG_BLK_DEV_IDEPNP is not set | 394 | # CONFIG_BLK_DEV_IDEPNP is not set |
421 | CONFIG_BLK_DEV_IDEPCI=y | 395 | CONFIG_BLK_DEV_IDEPCI=y |
422 | CONFIG_IDEPCI_SHARE_IRQ=y | 396 | CONFIG_IDEPCI_SHARE_IRQ=y |
397 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
423 | # CONFIG_BLK_DEV_OFFBOARD is not set | 398 | # CONFIG_BLK_DEV_OFFBOARD is not set |
424 | CONFIG_BLK_DEV_GENERIC=y | 399 | CONFIG_BLK_DEV_GENERIC=y |
425 | # CONFIG_BLK_DEV_OPTI621 is not set | 400 | # CONFIG_BLK_DEV_OPTI621 is not set |
426 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 401 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
427 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 402 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
428 | CONFIG_IDEDMA_PCI_AUTO=y | ||
429 | # CONFIG_IDEDMA_ONLYDISK is not set | 403 | # CONFIG_IDEDMA_ONLYDISK is not set |
430 | # CONFIG_BLK_DEV_AEC62XX is not set | 404 | # CONFIG_BLK_DEV_AEC62XX is not set |
431 | # CONFIG_BLK_DEV_ALI15X3 is not set | 405 | # CONFIG_BLK_DEV_ALI15X3 is not set |
@@ -455,7 +429,6 @@ CONFIG_BLK_DEV_SGIIOC4=y | |||
455 | # CONFIG_IDE_ARM is not set | 429 | # CONFIG_IDE_ARM is not set |
456 | CONFIG_BLK_DEV_IDEDMA=y | 430 | CONFIG_BLK_DEV_IDEDMA=y |
457 | # CONFIG_IDEDMA_IVB is not set | 431 | # CONFIG_IDEDMA_IVB is not set |
458 | CONFIG_IDEDMA_AUTO=y | ||
459 | # CONFIG_BLK_DEV_HD is not set | 432 | # CONFIG_BLK_DEV_HD is not set |
460 | 433 | ||
461 | # | 434 | # |
@@ -463,6 +436,7 @@ CONFIG_IDEDMA_AUTO=y | |||
463 | # | 436 | # |
464 | # CONFIG_RAID_ATTRS is not set | 437 | # CONFIG_RAID_ATTRS is not set |
465 | CONFIG_SCSI=y | 438 | CONFIG_SCSI=y |
439 | CONFIG_SCSI_DMA=y | ||
466 | # CONFIG_SCSI_TGT is not set | 440 | # CONFIG_SCSI_TGT is not set |
467 | CONFIG_SCSI_NETLINK=y | 441 | CONFIG_SCSI_NETLINK=y |
468 | CONFIG_SCSI_PROC_FS=y | 442 | CONFIG_SCSI_PROC_FS=y |
@@ -485,6 +459,7 @@ CONFIG_CHR_DEV_SG=m | |||
485 | # CONFIG_SCSI_CONSTANTS is not set | 459 | # CONFIG_SCSI_CONSTANTS is not set |
486 | # CONFIG_SCSI_LOGGING is not set | 460 | # CONFIG_SCSI_LOGGING is not set |
487 | # CONFIG_SCSI_SCAN_ASYNC is not set | 461 | # CONFIG_SCSI_SCAN_ASYNC is not set |
462 | CONFIG_SCSI_WAIT_SCAN=m | ||
488 | 463 | ||
489 | # | 464 | # |
490 | # SCSI Transports | 465 | # SCSI Transports |
@@ -492,7 +467,7 @@ CONFIG_CHR_DEV_SG=m | |||
492 | CONFIG_SCSI_SPI_ATTRS=y | 467 | CONFIG_SCSI_SPI_ATTRS=y |
493 | CONFIG_SCSI_FC_ATTRS=y | 468 | CONFIG_SCSI_FC_ATTRS=y |
494 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 469 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
495 | # CONFIG_SCSI_SAS_ATTRS is not set | 470 | CONFIG_SCSI_SAS_ATTRS=y |
496 | # CONFIG_SCSI_SAS_LIBSAS is not set | 471 | # CONFIG_SCSI_SAS_LIBSAS is not set |
497 | 472 | ||
498 | # | 473 | # |
@@ -531,15 +506,7 @@ CONFIG_SCSI_QLOGIC_1280=y | |||
531 | # CONFIG_SCSI_DC390T is not set | 506 | # CONFIG_SCSI_DC390T is not set |
532 | # CONFIG_SCSI_DEBUG is not set | 507 | # CONFIG_SCSI_DEBUG is not set |
533 | # CONFIG_SCSI_SRP is not set | 508 | # CONFIG_SCSI_SRP is not set |
534 | |||
535 | # | ||
536 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
537 | # | ||
538 | # CONFIG_ATA is not set | 509 | # CONFIG_ATA is not set |
539 | |||
540 | # | ||
541 | # Multi-device support (RAID and LVM) | ||
542 | # | ||
543 | CONFIG_MD=y | 510 | CONFIG_MD=y |
544 | CONFIG_BLK_DEV_MD=m | 511 | CONFIG_BLK_DEV_MD=m |
545 | CONFIG_MD_LINEAR=m | 512 | CONFIG_MD_LINEAR=m |
@@ -557,6 +524,8 @@ CONFIG_DM_MIRROR=m | |||
557 | CONFIG_DM_ZERO=m | 524 | CONFIG_DM_ZERO=m |
558 | CONFIG_DM_MULTIPATH=m | 525 | CONFIG_DM_MULTIPATH=m |
559 | # CONFIG_DM_MULTIPATH_EMC is not set | 526 | # CONFIG_DM_MULTIPATH_EMC is not set |
527 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
528 | # CONFIG_DM_DELAY is not set | ||
560 | 529 | ||
561 | # | 530 | # |
562 | # Fusion MPT device support | 531 | # Fusion MPT device support |
@@ -564,53 +533,32 @@ CONFIG_DM_MULTIPATH=m | |||
564 | CONFIG_FUSION=y | 533 | CONFIG_FUSION=y |
565 | CONFIG_FUSION_SPI=y | 534 | CONFIG_FUSION_SPI=y |
566 | CONFIG_FUSION_FC=m | 535 | CONFIG_FUSION_FC=m |
567 | # CONFIG_FUSION_SAS is not set | 536 | CONFIG_FUSION_SAS=y |
568 | CONFIG_FUSION_MAX_SGE=128 | 537 | CONFIG_FUSION_MAX_SGE=128 |
569 | # CONFIG_FUSION_CTL is not set | 538 | # CONFIG_FUSION_CTL is not set |
570 | 539 | ||
571 | # | 540 | # |
572 | # IEEE 1394 (FireWire) support | 541 | # IEEE 1394 (FireWire) support |
573 | # | 542 | # |
543 | # CONFIG_FIREWIRE is not set | ||
574 | # CONFIG_IEEE1394 is not set | 544 | # CONFIG_IEEE1394 is not set |
575 | |||
576 | # | ||
577 | # I2O device support | ||
578 | # | ||
579 | # CONFIG_I2O is not set | 545 | # CONFIG_I2O is not set |
580 | |||
581 | # | ||
582 | # Network device support | ||
583 | # | ||
584 | CONFIG_NETDEVICES=y | 546 | CONFIG_NETDEVICES=y |
547 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
585 | CONFIG_DUMMY=m | 548 | CONFIG_DUMMY=m |
586 | # CONFIG_BONDING is not set | 549 | # CONFIG_BONDING is not set |
550 | # CONFIG_MACVLAN is not set | ||
587 | # CONFIG_EQUALIZER is not set | 551 | # CONFIG_EQUALIZER is not set |
588 | # CONFIG_TUN is not set | 552 | # CONFIG_TUN is not set |
589 | # CONFIG_NET_SB1000 is not set | 553 | # CONFIG_NET_SB1000 is not set |
590 | |||
591 | # | ||
592 | # ARCnet devices | ||
593 | # | ||
594 | # CONFIG_ARCNET is not set | 554 | # CONFIG_ARCNET is not set |
595 | |||
596 | # | ||
597 | # PHY device support | ||
598 | # | ||
599 | # CONFIG_PHYLIB is not set | 555 | # CONFIG_PHYLIB is not set |
600 | |||
601 | # | ||
602 | # Ethernet (10 or 100Mbit) | ||
603 | # | ||
604 | CONFIG_NET_ETHERNET=y | 556 | CONFIG_NET_ETHERNET=y |
605 | CONFIG_MII=m | 557 | CONFIG_MII=m |
606 | # CONFIG_HAPPYMEAL is not set | 558 | # CONFIG_HAPPYMEAL is not set |
607 | # CONFIG_SUNGEM is not set | 559 | # CONFIG_SUNGEM is not set |
608 | # CONFIG_CASSINI is not set | 560 | # CONFIG_CASSINI is not set |
609 | # CONFIG_NET_VENDOR_3COM is not set | 561 | # CONFIG_NET_VENDOR_3COM is not set |
610 | |||
611 | # | ||
612 | # Tulip family network device support | ||
613 | # | ||
614 | CONFIG_NET_TULIP=y | 562 | CONFIG_NET_TULIP=y |
615 | # CONFIG_DE2104X is not set | 563 | # CONFIG_DE2104X is not set |
616 | CONFIG_TULIP=m | 564 | CONFIG_TULIP=m |
@@ -641,10 +589,7 @@ CONFIG_E100=m | |||
641 | # CONFIG_SUNDANCE is not set | 589 | # CONFIG_SUNDANCE is not set |
642 | # CONFIG_VIA_RHINE is not set | 590 | # CONFIG_VIA_RHINE is not set |
643 | # CONFIG_SC92031 is not set | 591 | # CONFIG_SC92031 is not set |
644 | 592 | CONFIG_NETDEV_1000=y | |
645 | # | ||
646 | # Ethernet (1000 Mbit) | ||
647 | # | ||
648 | # CONFIG_ACENIC is not set | 593 | # CONFIG_ACENIC is not set |
649 | # CONFIG_DL2K is not set | 594 | # CONFIG_DL2K is not set |
650 | CONFIG_E1000=y | 595 | CONFIG_E1000=y |
@@ -657,36 +602,36 @@ CONFIG_E1000=y | |||
657 | # CONFIG_SIS190 is not set | 602 | # CONFIG_SIS190 is not set |
658 | # CONFIG_SKGE is not set | 603 | # CONFIG_SKGE is not set |
659 | # CONFIG_SKY2 is not set | 604 | # CONFIG_SKY2 is not set |
660 | # CONFIG_SK98LIN is not set | ||
661 | # CONFIG_VIA_VELOCITY is not set | 605 | # CONFIG_VIA_VELOCITY is not set |
662 | CONFIG_TIGON3=y | 606 | CONFIG_TIGON3=y |
663 | # CONFIG_BNX2 is not set | 607 | # CONFIG_BNX2 is not set |
664 | # CONFIG_QLA3XXX is not set | 608 | # CONFIG_QLA3XXX is not set |
665 | # CONFIG_ATL1 is not set | 609 | # CONFIG_ATL1 is not set |
666 | 610 | CONFIG_NETDEV_10000=y | |
667 | # | ||
668 | # Ethernet (10000 Mbit) | ||
669 | # | ||
670 | # CONFIG_CHELSIO_T1 is not set | 611 | # CONFIG_CHELSIO_T1 is not set |
671 | # CONFIG_CHELSIO_T3 is not set | 612 | # CONFIG_CHELSIO_T3 is not set |
672 | # CONFIG_IXGB is not set | 613 | # CONFIG_IXGB is not set |
673 | # CONFIG_S2IO is not set | 614 | # CONFIG_S2IO is not set |
674 | # CONFIG_MYRI10GE is not set | 615 | # CONFIG_MYRI10GE is not set |
675 | # CONFIG_NETXEN_NIC is not set | 616 | # CONFIG_NETXEN_NIC is not set |
676 | 617 | # CONFIG_MLX4_CORE is not set | |
677 | # | ||
678 | # Token Ring devices | ||
679 | # | ||
680 | # CONFIG_TR is not set | 618 | # CONFIG_TR is not set |
681 | 619 | ||
682 | # | 620 | # |
683 | # Wireless LAN (non-hamradio) | 621 | # Wireless LAN |
684 | # | 622 | # |
685 | # CONFIG_NET_RADIO is not set | 623 | # CONFIG_WLAN_PRE80211 is not set |
624 | # CONFIG_WLAN_80211 is not set | ||
686 | 625 | ||
687 | # | 626 | # |
688 | # Wan interfaces | 627 | # USB Network Adapters |
689 | # | 628 | # |
629 | # CONFIG_USB_CATC is not set | ||
630 | # CONFIG_USB_KAWETH is not set | ||
631 | # CONFIG_USB_PEGASUS is not set | ||
632 | # CONFIG_USB_RTL8150 is not set | ||
633 | # CONFIG_USB_USBNET_MII is not set | ||
634 | # CONFIG_USB_USBNET is not set | ||
690 | # CONFIG_WAN is not set | 635 | # CONFIG_WAN is not set |
691 | # CONFIG_FDDI is not set | 636 | # CONFIG_FDDI is not set |
692 | # CONFIG_HIPPI is not set | 637 | # CONFIG_HIPPI is not set |
@@ -696,18 +641,9 @@ CONFIG_TIGON3=y | |||
696 | # CONFIG_SHAPER is not set | 641 | # CONFIG_SHAPER is not set |
697 | CONFIG_NETCONSOLE=y | 642 | CONFIG_NETCONSOLE=y |
698 | CONFIG_NETPOLL=y | 643 | CONFIG_NETPOLL=y |
699 | # CONFIG_NETPOLL_RX is not set | ||
700 | # CONFIG_NETPOLL_TRAP is not set | 644 | # CONFIG_NETPOLL_TRAP is not set |
701 | CONFIG_NET_POLL_CONTROLLER=y | 645 | CONFIG_NET_POLL_CONTROLLER=y |
702 | |||
703 | # | ||
704 | # ISDN subsystem | ||
705 | # | ||
706 | # CONFIG_ISDN is not set | 646 | # CONFIG_ISDN is not set |
707 | |||
708 | # | ||
709 | # Telephony Support | ||
710 | # | ||
711 | # CONFIG_PHONE is not set | 647 | # CONFIG_PHONE is not set |
712 | 648 | ||
713 | # | 649 | # |
@@ -715,6 +651,7 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
715 | # | 651 | # |
716 | CONFIG_INPUT=y | 652 | CONFIG_INPUT=y |
717 | # CONFIG_INPUT_FF_MEMLESS is not set | 653 | # CONFIG_INPUT_FF_MEMLESS is not set |
654 | # CONFIG_INPUT_POLLDEV is not set | ||
718 | 655 | ||
719 | # | 656 | # |
720 | # Userland interfaces | 657 | # Userland interfaces |
@@ -740,9 +677,17 @@ CONFIG_KEYBOARD_ATKBD=y | |||
740 | # CONFIG_KEYBOARD_STOWAWAY is not set | 677 | # CONFIG_KEYBOARD_STOWAWAY is not set |
741 | CONFIG_INPUT_MOUSE=y | 678 | CONFIG_INPUT_MOUSE=y |
742 | CONFIG_MOUSE_PS2=y | 679 | CONFIG_MOUSE_PS2=y |
680 | CONFIG_MOUSE_PS2_ALPS=y | ||
681 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
682 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
683 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
684 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
685 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
743 | # CONFIG_MOUSE_SERIAL is not set | 686 | # CONFIG_MOUSE_SERIAL is not set |
687 | # CONFIG_MOUSE_APPLETOUCH is not set | ||
744 | # CONFIG_MOUSE_VSXXXAA is not set | 688 | # CONFIG_MOUSE_VSXXXAA is not set |
745 | # CONFIG_INPUT_JOYSTICK is not set | 689 | # CONFIG_INPUT_JOYSTICK is not set |
690 | # CONFIG_INPUT_TABLET is not set | ||
746 | # CONFIG_INPUT_TOUCHSCREEN is not set | 691 | # CONFIG_INPUT_TOUCHSCREEN is not set |
747 | # CONFIG_INPUT_MISC is not set | 692 | # CONFIG_INPUT_MISC is not set |
748 | 693 | ||
@@ -814,19 +759,10 @@ CONFIG_SERIAL_SGI_IOC4=y | |||
814 | CONFIG_UNIX98_PTYS=y | 759 | CONFIG_UNIX98_PTYS=y |
815 | CONFIG_LEGACY_PTYS=y | 760 | CONFIG_LEGACY_PTYS=y |
816 | CONFIG_LEGACY_PTY_COUNT=256 | 761 | CONFIG_LEGACY_PTY_COUNT=256 |
817 | |||
818 | # | ||
819 | # IPMI | ||
820 | # | ||
821 | # CONFIG_IPMI_HANDLER is not set | 762 | # CONFIG_IPMI_HANDLER is not set |
822 | |||
823 | # | ||
824 | # Watchdog Cards | ||
825 | # | ||
826 | # CONFIG_WATCHDOG is not set | 763 | # CONFIG_WATCHDOG is not set |
827 | # CONFIG_HW_RANDOM is not set | 764 | # CONFIG_HW_RANDOM is not set |
828 | CONFIG_EFI_RTC=y | 765 | CONFIG_EFI_RTC=y |
829 | # CONFIG_DTLK is not set | ||
830 | # CONFIG_R3964 is not set | 766 | # CONFIG_R3964 is not set |
831 | # CONFIG_APPLICOM is not set | 767 | # CONFIG_APPLICOM is not set |
832 | CONFIG_AGP=m | 768 | CONFIG_AGP=m |
@@ -848,15 +784,8 @@ CONFIG_HPET=y | |||
848 | CONFIG_HPET_MMAP=y | 784 | CONFIG_HPET_MMAP=y |
849 | # CONFIG_HANGCHECK_TIMER is not set | 785 | # CONFIG_HANGCHECK_TIMER is not set |
850 | CONFIG_MMTIMER=y | 786 | CONFIG_MMTIMER=y |
851 | |||
852 | # | ||
853 | # TPM devices | ||
854 | # | ||
855 | # CONFIG_TCG_TPM is not set | 787 | # CONFIG_TCG_TPM is not set |
856 | 788 | CONFIG_DEVPORT=y | |
857 | # | ||
858 | # I2C support | ||
859 | # | ||
860 | # CONFIG_I2C is not set | 789 | # CONFIG_I2C is not set |
861 | 790 | ||
862 | # | 791 | # |
@@ -864,21 +793,17 @@ CONFIG_MMTIMER=y | |||
864 | # | 793 | # |
865 | # CONFIG_SPI is not set | 794 | # CONFIG_SPI is not set |
866 | # CONFIG_SPI_MASTER is not set | 795 | # CONFIG_SPI_MASTER is not set |
867 | |||
868 | # | ||
869 | # Dallas's 1-wire bus | ||
870 | # | ||
871 | # CONFIG_W1 is not set | 796 | # CONFIG_W1 is not set |
872 | 797 | # CONFIG_POWER_SUPPLY is not set | |
873 | # | ||
874 | # Hardware Monitoring support | ||
875 | # | ||
876 | CONFIG_HWMON=y | 798 | CONFIG_HWMON=y |
877 | # CONFIG_HWMON_VID is not set | 799 | # CONFIG_HWMON_VID is not set |
878 | # CONFIG_SENSORS_ABITUGURU is not set | 800 | # CONFIG_SENSORS_ABITUGURU is not set |
879 | # CONFIG_SENSORS_F71805F is not set | 801 | # CONFIG_SENSORS_F71805F is not set |
880 | # CONFIG_SENSORS_PC87427 is not set | 802 | # CONFIG_SENSORS_PC87427 is not set |
803 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
804 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
881 | # CONFIG_SENSORS_VT1211 is not set | 805 | # CONFIG_SENSORS_VT1211 is not set |
806 | # CONFIG_SENSORS_W83627HF is not set | ||
882 | # CONFIG_HWMON_DEBUG_CHIP is not set | 807 | # CONFIG_HWMON_DEBUG_CHIP is not set |
883 | 808 | ||
884 | # | 809 | # |
@@ -890,17 +815,20 @@ CONFIG_HWMON=y | |||
890 | # Multimedia devices | 815 | # Multimedia devices |
891 | # | 816 | # |
892 | # CONFIG_VIDEO_DEV is not set | 817 | # CONFIG_VIDEO_DEV is not set |
893 | 818 | # CONFIG_DVB_CORE is not set | |
894 | # | 819 | CONFIG_DAB=y |
895 | # Digital Video Broadcasting Devices | ||
896 | # | ||
897 | # CONFIG_DVB is not set | ||
898 | # CONFIG_USB_DABUSB is not set | 820 | # CONFIG_USB_DABUSB is not set |
899 | 821 | ||
900 | # | 822 | # |
901 | # Graphics support | 823 | # Graphics support |
902 | # | 824 | # |
903 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 825 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
826 | |||
827 | # | ||
828 | # Display device support | ||
829 | # | ||
830 | # CONFIG_DISPLAY_SUPPORT is not set | ||
831 | # CONFIG_VGASTATE is not set | ||
904 | # CONFIG_FB is not set | 832 | # CONFIG_FB is not set |
905 | 833 | ||
906 | # | 834 | # |
@@ -1014,9 +942,10 @@ CONFIG_SND_FM801=m | |||
1014 | # USB devices | 942 | # USB devices |
1015 | # | 943 | # |
1016 | # CONFIG_SND_USB_AUDIO is not set | 944 | # CONFIG_SND_USB_AUDIO is not set |
945 | # CONFIG_SND_USB_CAIAQ is not set | ||
1017 | 946 | ||
1018 | # | 947 | # |
1019 | # SoC audio support | 948 | # System on Chip audio support |
1020 | # | 949 | # |
1021 | # CONFIG_SND_SOC is not set | 950 | # CONFIG_SND_SOC is not set |
1022 | 951 | ||
@@ -1025,16 +954,24 @@ CONFIG_SND_FM801=m | |||
1025 | # | 954 | # |
1026 | # CONFIG_SOUND_PRIME is not set | 955 | # CONFIG_SOUND_PRIME is not set |
1027 | CONFIG_AC97_BUS=m | 956 | CONFIG_AC97_BUS=m |
957 | CONFIG_HID_SUPPORT=y | ||
958 | CONFIG_HID=y | ||
959 | # CONFIG_HID_DEBUG is not set | ||
1028 | 960 | ||
1029 | # | 961 | # |
1030 | # HID Devices | 962 | # USB Input Devices |
1031 | # | 963 | # |
1032 | CONFIG_HID=y | 964 | CONFIG_USB_HID=m |
1033 | # CONFIG_HID_DEBUG is not set | 965 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
966 | # CONFIG_HID_FF is not set | ||
967 | # CONFIG_USB_HIDDEV is not set | ||
1034 | 968 | ||
1035 | # | 969 | # |
1036 | # USB support | 970 | # USB HID Boot Protocol drivers |
1037 | # | 971 | # |
972 | # CONFIG_USB_KBD is not set | ||
973 | # CONFIG_USB_MOUSE is not set | ||
974 | CONFIG_USB_SUPPORT=y | ||
1038 | CONFIG_USB_ARCH_HAS_HCD=y | 975 | CONFIG_USB_ARCH_HAS_HCD=y |
1039 | CONFIG_USB_ARCH_HAS_OHCI=y | 976 | CONFIG_USB_ARCH_HAS_OHCI=y |
1040 | CONFIG_USB_ARCH_HAS_EHCI=y | 977 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -1045,8 +982,10 @@ CONFIG_USB=m | |||
1045 | # Miscellaneous USB options | 982 | # Miscellaneous USB options |
1046 | # | 983 | # |
1047 | CONFIG_USB_DEVICEFS=y | 984 | CONFIG_USB_DEVICEFS=y |
985 | CONFIG_USB_DEVICE_CLASS=y | ||
1048 | # CONFIG_USB_DYNAMIC_MINORS is not set | 986 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1049 | # CONFIG_USB_SUSPEND is not set | 987 | # CONFIG_USB_SUSPEND is not set |
988 | # CONFIG_USB_PERSIST is not set | ||
1050 | # CONFIG_USB_OTG is not set | 989 | # CONFIG_USB_OTG is not set |
1051 | 990 | ||
1052 | # | 991 | # |
@@ -1056,7 +995,6 @@ CONFIG_USB_EHCI_HCD=m | |||
1056 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 995 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
1057 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 996 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1058 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 997 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1059 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
1060 | # CONFIG_USB_ISP116X_HCD is not set | 998 | # CONFIG_USB_ISP116X_HCD is not set |
1061 | CONFIG_USB_OHCI_HCD=m | 999 | CONFIG_USB_OHCI_HCD=m |
1062 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1000 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -1064,6 +1002,7 @@ CONFIG_USB_OHCI_HCD=m | |||
1064 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1002 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
1065 | CONFIG_USB_UHCI_HCD=m | 1003 | CONFIG_USB_UHCI_HCD=m |
1066 | # CONFIG_USB_SL811_HCD is not set | 1004 | # CONFIG_USB_SL811_HCD is not set |
1005 | # CONFIG_USB_R8A66597_HCD is not set | ||
1067 | 1006 | ||
1068 | # | 1007 | # |
1069 | # USB Device Class drivers | 1008 | # USB Device Class drivers |
@@ -1093,47 +1032,10 @@ CONFIG_USB_STORAGE=m | |||
1093 | # CONFIG_USB_LIBUSUAL is not set | 1032 | # CONFIG_USB_LIBUSUAL is not set |
1094 | 1033 | ||
1095 | # | 1034 | # |
1096 | # USB Input Devices | ||
1097 | # | ||
1098 | CONFIG_USB_HID=m | ||
1099 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
1100 | # CONFIG_HID_FF is not set | ||
1101 | # CONFIG_USB_HIDDEV is not set | ||
1102 | |||
1103 | # | ||
1104 | # USB HID Boot Protocol drivers | ||
1105 | # | ||
1106 | # CONFIG_USB_KBD is not set | ||
1107 | # CONFIG_USB_MOUSE is not set | ||
1108 | # CONFIG_USB_AIPTEK is not set | ||
1109 | # CONFIG_USB_WACOM is not set | ||
1110 | # CONFIG_USB_ACECAD is not set | ||
1111 | # CONFIG_USB_KBTAB is not set | ||
1112 | # CONFIG_USB_POWERMATE is not set | ||
1113 | # CONFIG_USB_TOUCHSCREEN is not set | ||
1114 | # CONFIG_USB_YEALINK is not set | ||
1115 | # CONFIG_USB_XPAD is not set | ||
1116 | # CONFIG_USB_ATI_REMOTE is not set | ||
1117 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
1118 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
1119 | # CONFIG_USB_APPLETOUCH is not set | ||
1120 | # CONFIG_USB_GTCO is not set | ||
1121 | |||
1122 | # | ||
1123 | # USB Imaging devices | 1035 | # USB Imaging devices |
1124 | # | 1036 | # |
1125 | # CONFIG_USB_MDC800 is not set | 1037 | # CONFIG_USB_MDC800 is not set |
1126 | # CONFIG_USB_MICROTEK is not set | 1038 | # CONFIG_USB_MICROTEK is not set |
1127 | |||
1128 | # | ||
1129 | # USB Network Adapters | ||
1130 | # | ||
1131 | # CONFIG_USB_CATC is not set | ||
1132 | # CONFIG_USB_KAWETH is not set | ||
1133 | # CONFIG_USB_PEGASUS is not set | ||
1134 | # CONFIG_USB_RTL8150 is not set | ||
1135 | # CONFIG_USB_USBNET_MII is not set | ||
1136 | # CONFIG_USB_USBNET is not set | ||
1137 | CONFIG_USB_MON=y | 1039 | CONFIG_USB_MON=y |
1138 | 1040 | ||
1139 | # | 1041 | # |
@@ -1177,10 +1079,6 @@ CONFIG_USB_MON=y | |||
1177 | # USB Gadget Support | 1079 | # USB Gadget Support |
1178 | # | 1080 | # |
1179 | # CONFIG_USB_GADGET is not set | 1081 | # CONFIG_USB_GADGET is not set |
1180 | |||
1181 | # | ||
1182 | # MMC/SD Card support | ||
1183 | # | ||
1184 | # CONFIG_MMC is not set | 1082 | # CONFIG_MMC is not set |
1185 | 1083 | ||
1186 | # | 1084 | # |
@@ -1195,10 +1093,6 @@ CONFIG_USB_MON=y | |||
1195 | # | 1093 | # |
1196 | # LED Triggers | 1094 | # LED Triggers |
1197 | # | 1095 | # |
1198 | |||
1199 | # | ||
1200 | # InfiniBand support | ||
1201 | # | ||
1202 | CONFIG_INFINIBAND=m | 1096 | CONFIG_INFINIBAND=m |
1203 | # CONFIG_INFINIBAND_USER_MAD is not set | 1097 | # CONFIG_INFINIBAND_USER_MAD is not set |
1204 | # CONFIG_INFINIBAND_USER_ACCESS is not set | 1098 | # CONFIG_INFINIBAND_USER_ACCESS is not set |
@@ -1206,6 +1100,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y | |||
1206 | CONFIG_INFINIBAND_MTHCA=m | 1100 | CONFIG_INFINIBAND_MTHCA=m |
1207 | CONFIG_INFINIBAND_MTHCA_DEBUG=y | 1101 | CONFIG_INFINIBAND_MTHCA_DEBUG=y |
1208 | # CONFIG_INFINIBAND_AMSO1100 is not set | 1102 | # CONFIG_INFINIBAND_AMSO1100 is not set |
1103 | # CONFIG_MLX4_INFINIBAND is not set | ||
1209 | CONFIG_INFINIBAND_IPOIB=m | 1104 | CONFIG_INFINIBAND_IPOIB=m |
1210 | # CONFIG_INFINIBAND_IPOIB_CM is not set | 1105 | # CONFIG_INFINIBAND_IPOIB_CM is not set |
1211 | CONFIG_INFINIBAND_IPOIB_DEBUG=y | 1106 | CONFIG_INFINIBAND_IPOIB_DEBUG=y |
@@ -1214,10 +1109,6 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
1214 | # CONFIG_INFINIBAND_ISER is not set | 1109 | # CONFIG_INFINIBAND_ISER is not set |
1215 | 1110 | ||
1216 | # | 1111 | # |
1217 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
1218 | # | ||
1219 | |||
1220 | # | ||
1221 | # Real Time Clock | 1112 | # Real Time Clock |
1222 | # | 1113 | # |
1223 | # CONFIG_RTC_CLASS is not set | 1114 | # CONFIG_RTC_CLASS is not set |
@@ -1236,12 +1127,9 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
1236 | # | 1127 | # |
1237 | 1128 | ||
1238 | # | 1129 | # |
1239 | # Auxiliary Display support | 1130 | # Userspace I/O |
1240 | # | ||
1241 | |||
1242 | # | ||
1243 | # Virtualization | ||
1244 | # | 1131 | # |
1132 | # CONFIG_UIO is not set | ||
1245 | # CONFIG_MSPEC is not set | 1133 | # CONFIG_MSPEC is not set |
1246 | 1134 | ||
1247 | # | 1135 | # |
@@ -1357,7 +1245,8 @@ CONFIG_EXPORTFS=m | |||
1357 | CONFIG_NFS_COMMON=y | 1245 | CONFIG_NFS_COMMON=y |
1358 | CONFIG_SUNRPC=m | 1246 | CONFIG_SUNRPC=m |
1359 | CONFIG_SUNRPC_GSS=m | 1247 | CONFIG_SUNRPC_GSS=m |
1360 | CONFIG_RPCSEC_GSS_KRB5=m | 1248 | # CONFIG_SUNRPC_BIND34 is not set |
1249 | CONFIG_RPCSEC_GSS_KRB5=y | ||
1361 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1250 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1362 | CONFIG_SMB_FS=m | 1251 | CONFIG_SMB_FS=m |
1363 | CONFIG_SMB_NLS_DEFAULT=y | 1252 | CONFIG_SMB_NLS_DEFAULT=y |
@@ -1371,7 +1260,6 @@ CONFIG_CIFS=m | |||
1371 | # CONFIG_NCP_FS is not set | 1260 | # CONFIG_NCP_FS is not set |
1372 | # CONFIG_CODA_FS is not set | 1261 | # CONFIG_CODA_FS is not set |
1373 | # CONFIG_AFS_FS is not set | 1262 | # CONFIG_AFS_FS is not set |
1374 | # CONFIG_9P_FS is not set | ||
1375 | 1263 | ||
1376 | # | 1264 | # |
1377 | # Partition Types | 1265 | # Partition Types |
@@ -1393,6 +1281,7 @@ CONFIG_SGI_PARTITION=y | |||
1393 | # CONFIG_SUN_PARTITION is not set | 1281 | # CONFIG_SUN_PARTITION is not set |
1394 | # CONFIG_KARMA_PARTITION is not set | 1282 | # CONFIG_KARMA_PARTITION is not set |
1395 | CONFIG_EFI_PARTITION=y | 1283 | CONFIG_EFI_PARTITION=y |
1284 | # CONFIG_SYSV68_PARTITION is not set | ||
1396 | 1285 | ||
1397 | # | 1286 | # |
1398 | # Native Language Support | 1287 | # Native Language Support |
@@ -1449,11 +1338,14 @@ CONFIG_NLS_UTF8=m | |||
1449 | CONFIG_BITREVERSE=y | 1338 | CONFIG_BITREVERSE=y |
1450 | # CONFIG_CRC_CCITT is not set | 1339 | # CONFIG_CRC_CCITT is not set |
1451 | # CONFIG_CRC16 is not set | 1340 | # CONFIG_CRC16 is not set |
1341 | # CONFIG_CRC_ITU_T is not set | ||
1452 | CONFIG_CRC32=y | 1342 | CONFIG_CRC32=y |
1343 | # CONFIG_CRC7 is not set | ||
1453 | # CONFIG_LIBCRC32C is not set | 1344 | # CONFIG_LIBCRC32C is not set |
1454 | CONFIG_PLIST=y | 1345 | CONFIG_PLIST=y |
1455 | CONFIG_HAS_IOMEM=y | 1346 | CONFIG_HAS_IOMEM=y |
1456 | CONFIG_HAS_IOPORT=y | 1347 | CONFIG_HAS_IOPORT=y |
1348 | CONFIG_HAS_DMA=y | ||
1457 | CONFIG_GENERIC_HARDIRQS=y | 1349 | CONFIG_GENERIC_HARDIRQS=y |
1458 | CONFIG_GENERIC_IRQ_PROBE=y | 1350 | CONFIG_GENERIC_IRQ_PROBE=y |
1459 | CONFIG_GENERIC_PENDING_IRQ=y | 1351 | CONFIG_GENERIC_PENDING_IRQ=y |
@@ -1483,8 +1375,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1483 | # CONFIG_HEADERS_CHECK is not set | 1375 | # CONFIG_HEADERS_CHECK is not set |
1484 | CONFIG_DEBUG_KERNEL=y | 1376 | CONFIG_DEBUG_KERNEL=y |
1485 | # CONFIG_DEBUG_SHIRQ is not set | 1377 | # CONFIG_DEBUG_SHIRQ is not set |
1486 | CONFIG_LOG_BUF_SHIFT=20 | ||
1487 | CONFIG_DETECT_SOFTLOCKUP=y | 1378 | CONFIG_DETECT_SOFTLOCKUP=y |
1379 | CONFIG_SCHED_DEBUG=y | ||
1488 | # CONFIG_SCHEDSTATS is not set | 1380 | # CONFIG_SCHEDSTATS is not set |
1489 | # CONFIG_TIMER_STATS is not set | 1381 | # CONFIG_TIMER_STATS is not set |
1490 | # CONFIG_DEBUG_SLAB is not set | 1382 | # CONFIG_DEBUG_SLAB is not set |
@@ -1514,10 +1406,6 @@ CONFIG_SYSVIPC_COMPAT=y | |||
1514 | # | 1406 | # |
1515 | # CONFIG_KEYS is not set | 1407 | # CONFIG_KEYS is not set |
1516 | # CONFIG_SECURITY is not set | 1408 | # CONFIG_SECURITY is not set |
1517 | |||
1518 | # | ||
1519 | # Cryptographic options | ||
1520 | # | ||
1521 | CONFIG_CRYPTO=y | 1409 | CONFIG_CRYPTO=y |
1522 | CONFIG_CRYPTO_ALGAPI=y | 1410 | CONFIG_CRYPTO_ALGAPI=y |
1523 | CONFIG_CRYPTO_BLKCIPHER=m | 1411 | CONFIG_CRYPTO_BLKCIPHER=m |
@@ -1537,6 +1425,7 @@ CONFIG_CRYPTO_ECB=m | |||
1537 | CONFIG_CRYPTO_CBC=m | 1425 | CONFIG_CRYPTO_CBC=m |
1538 | CONFIG_CRYPTO_PCBC=m | 1426 | CONFIG_CRYPTO_PCBC=m |
1539 | # CONFIG_CRYPTO_LRW is not set | 1427 | # CONFIG_CRYPTO_LRW is not set |
1428 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1540 | CONFIG_CRYPTO_DES=m | 1429 | CONFIG_CRYPTO_DES=m |
1541 | # CONFIG_CRYPTO_FCRYPT is not set | 1430 | # CONFIG_CRYPTO_FCRYPT is not set |
1542 | # CONFIG_CRYPTO_BLOWFISH is not set | 1431 | # CONFIG_CRYPTO_BLOWFISH is not set |
@@ -1554,7 +1443,4 @@ CONFIG_CRYPTO_DES=m | |||
1554 | # CONFIG_CRYPTO_CRC32C is not set | 1443 | # CONFIG_CRYPTO_CRC32C is not set |
1555 | # CONFIG_CRYPTO_CAMELLIA is not set | 1444 | # CONFIG_CRYPTO_CAMELLIA is not set |
1556 | # CONFIG_CRYPTO_TEST is not set | 1445 | # CONFIG_CRYPTO_TEST is not set |
1557 | 1446 | CONFIG_CRYPTO_HW=y | |
1558 | # | ||
1559 | # Hardware crypto devices | ||
1560 | # | ||
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index 6f4d3d06f0ed..e1189ba1ca5e 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
@@ -195,62 +195,27 @@ ia64_elf32_init (struct pt_regs *regs) | |||
195 | ia32_load_state(current); | 195 | ia32_load_state(current); |
196 | } | 196 | } |
197 | 197 | ||
198 | /* | ||
199 | * Undo the override of setup_arg_pages() without this ia32_setup_arg_pages() | ||
200 | * will suffer infinite self recursion. | ||
201 | */ | ||
202 | #undef setup_arg_pages | ||
203 | |||
198 | int | 204 | int |
199 | ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack) | 205 | ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack) |
200 | { | 206 | { |
201 | unsigned long stack_base; | 207 | int ret; |
202 | struct vm_area_struct *mpnt; | 208 | |
203 | struct mm_struct *mm = current->mm; | 209 | ret = setup_arg_pages(bprm, IA32_STACK_TOP, executable_stack); |
204 | int i, ret; | 210 | if (!ret) { |
205 | 211 | /* | |
206 | stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE; | 212 | * Can't do it in ia64_elf32_init(). Needs to be done before |
207 | mm->arg_start = bprm->p + stack_base; | 213 | * calls to elf32_map() |
208 | 214 | */ | |
209 | bprm->p += stack_base; | 215 | current->thread.ppl = ia32_init_pp_list(); |
210 | if (bprm->loader) | ||
211 | bprm->loader += stack_base; | ||
212 | bprm->exec += stack_base; | ||
213 | |||
214 | mpnt = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); | ||
215 | if (!mpnt) | ||
216 | return -ENOMEM; | ||
217 | |||
218 | down_write(¤t->mm->mmap_sem); | ||
219 | { | ||
220 | mpnt->vm_mm = current->mm; | ||
221 | mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p; | ||
222 | mpnt->vm_end = IA32_STACK_TOP; | ||
223 | if (executable_stack == EXSTACK_ENABLE_X) | ||
224 | mpnt->vm_flags = VM_STACK_FLAGS | VM_EXEC; | ||
225 | else if (executable_stack == EXSTACK_DISABLE_X) | ||
226 | mpnt->vm_flags = VM_STACK_FLAGS & ~VM_EXEC; | ||
227 | else | ||
228 | mpnt->vm_flags = VM_STACK_FLAGS; | ||
229 | mpnt->vm_page_prot = (mpnt->vm_flags & VM_EXEC)? | ||
230 | PAGE_COPY_EXEC: PAGE_COPY; | ||
231 | if ((ret = insert_vm_struct(current->mm, mpnt))) { | ||
232 | up_write(¤t->mm->mmap_sem); | ||
233 | kmem_cache_free(vm_area_cachep, mpnt); | ||
234 | return ret; | ||
235 | } | ||
236 | current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt); | ||
237 | } | 216 | } |
238 | 217 | ||
239 | for (i = 0 ; i < MAX_ARG_PAGES ; i++) { | 218 | return ret; |
240 | struct page *page = bprm->page[i]; | ||
241 | if (page) { | ||
242 | bprm->page[i] = NULL; | ||
243 | install_arg_page(mpnt, page, stack_base); | ||
244 | } | ||
245 | stack_base += PAGE_SIZE; | ||
246 | } | ||
247 | up_write(¤t->mm->mmap_sem); | ||
248 | |||
249 | /* Can't do it in ia64_elf32_init(). Needs to be done before calls to | ||
250 | elf32_map() */ | ||
251 | current->thread.ppl = ia32_init_pp_list(); | ||
252 | |||
253 | return 0; | ||
254 | } | 219 | } |
255 | 220 | ||
256 | static void | 221 | static void |
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 95f517515235..c36f43c94600 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -1581,7 +1581,7 @@ sys_call_table: | |||
1581 | data8 sys_sync_file_range // 1300 | 1581 | data8 sys_sync_file_range // 1300 |
1582 | data8 sys_tee | 1582 | data8 sys_tee |
1583 | data8 sys_vmsplice | 1583 | data8 sys_vmsplice |
1584 | data8 sys_ni_syscall // reserved for move_pages | 1584 | data8 sys_fallocate |
1585 | data8 sys_getcpu | 1585 | data8 sys_getcpu |
1586 | data8 sys_epoll_pwait // 1305 | 1586 | data8 sys_epoll_pwait // 1305 |
1587 | data8 sys_utimensat | 1587 | data8 sys_utimensat |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 37f46527d233..91e6dc1e7baf 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -118,15 +118,25 @@ static DEFINE_SPINLOCK(iosapic_lock); | |||
118 | * vector. | 118 | * vector. |
119 | */ | 119 | */ |
120 | 120 | ||
121 | struct iosapic_rte_info { | 121 | #define NO_REF_RTE 0 |
122 | struct list_head rte_list; /* node in list of RTEs sharing the | 122 | |
123 | * same vector */ | 123 | static struct iosapic { |
124 | char __iomem *addr; /* base address of IOSAPIC */ | 124 | char __iomem *addr; /* base address of IOSAPIC */ |
125 | unsigned int gsi_base; /* first GSI assigned to this | 125 | unsigned int gsi_base; /* GSI base */ |
126 | * IOSAPIC */ | 126 | unsigned short num_rte; /* # of RTEs on this IOSAPIC */ |
127 | int rtes_inuse; /* # of RTEs in use on this IOSAPIC */ | ||
128 | #ifdef CONFIG_NUMA | ||
129 | unsigned short node; /* numa node association via pxm */ | ||
130 | #endif | ||
131 | spinlock_t lock; /* lock for indirect reg access */ | ||
132 | } iosapic_lists[NR_IOSAPICS]; | ||
133 | |||
134 | struct iosapic_rte_info { | ||
135 | struct list_head rte_list; /* RTEs sharing the same vector */ | ||
127 | char rte_index; /* IOSAPIC RTE index */ | 136 | char rte_index; /* IOSAPIC RTE index */ |
128 | int refcnt; /* reference counter */ | 137 | int refcnt; /* reference counter */ |
129 | unsigned int flags; /* flags */ | 138 | unsigned int flags; /* flags */ |
139 | struct iosapic *iosapic; | ||
130 | } ____cacheline_aligned; | 140 | } ____cacheline_aligned; |
131 | 141 | ||
132 | static struct iosapic_intr_info { | 142 | static struct iosapic_intr_info { |
@@ -140,24 +150,23 @@ static struct iosapic_intr_info { | |||
140 | unsigned char polarity: 1; /* interrupt polarity | 150 | unsigned char polarity: 1; /* interrupt polarity |
141 | * (see iosapic.h) */ | 151 | * (see iosapic.h) */ |
142 | unsigned char trigger : 1; /* trigger mode (see iosapic.h) */ | 152 | unsigned char trigger : 1; /* trigger mode (see iosapic.h) */ |
143 | } iosapic_intr_info[IA64_NUM_VECTORS]; | 153 | } iosapic_intr_info[NR_IRQS]; |
144 | |||
145 | static struct iosapic { | ||
146 | char __iomem *addr; /* base address of IOSAPIC */ | ||
147 | unsigned int gsi_base; /* first GSI assigned to this | ||
148 | * IOSAPIC */ | ||
149 | unsigned short num_rte; /* # of RTEs on this IOSAPIC */ | ||
150 | int rtes_inuse; /* # of RTEs in use on this IOSAPIC */ | ||
151 | #ifdef CONFIG_NUMA | ||
152 | unsigned short node; /* numa node association via pxm */ | ||
153 | #endif | ||
154 | } iosapic_lists[NR_IOSAPICS]; | ||
155 | 154 | ||
156 | static unsigned char pcat_compat __devinitdata; /* 8259 compatibility flag */ | 155 | static unsigned char pcat_compat __devinitdata; /* 8259 compatibility flag */ |
157 | 156 | ||
158 | static int iosapic_kmalloc_ok; | 157 | static int iosapic_kmalloc_ok; |
159 | static LIST_HEAD(free_rte_list); | 158 | static LIST_HEAD(free_rte_list); |
160 | 159 | ||
160 | static inline void | ||
161 | iosapic_write(struct iosapic *iosapic, unsigned int reg, u32 val) | ||
162 | { | ||
163 | unsigned long flags; | ||
164 | |||
165 | spin_lock_irqsave(&iosapic->lock, flags); | ||
166 | __iosapic_write(iosapic->addr, reg, val); | ||
167 | spin_unlock_irqrestore(&iosapic->lock, flags); | ||
168 | } | ||
169 | |||
161 | /* | 170 | /* |
162 | * Find an IOSAPIC associated with a GSI | 171 | * Find an IOSAPIC associated with a GSI |
163 | */ | 172 | */ |
@@ -175,17 +184,18 @@ find_iosapic (unsigned int gsi) | |||
175 | return -1; | 184 | return -1; |
176 | } | 185 | } |
177 | 186 | ||
178 | static inline int | 187 | static inline int __gsi_to_irq(unsigned int gsi) |
179 | _gsi_to_vector (unsigned int gsi) | ||
180 | { | 188 | { |
189 | int irq; | ||
181 | struct iosapic_intr_info *info; | 190 | struct iosapic_intr_info *info; |
182 | struct iosapic_rte_info *rte; | 191 | struct iosapic_rte_info *rte; |
183 | 192 | ||
184 | for (info = iosapic_intr_info; info < | 193 | for (irq = 0; irq < NR_IRQS; irq++) { |
185 | iosapic_intr_info + IA64_NUM_VECTORS; ++info) | 194 | info = &iosapic_intr_info[irq]; |
186 | list_for_each_entry(rte, &info->rtes, rte_list) | 195 | list_for_each_entry(rte, &info->rtes, rte_list) |
187 | if (rte->gsi_base + rte->rte_index == gsi) | 196 | if (rte->iosapic->gsi_base + rte->rte_index == gsi) |
188 | return info - iosapic_intr_info; | 197 | return irq; |
198 | } | ||
189 | return -1; | 199 | return -1; |
190 | } | 200 | } |
191 | 201 | ||
@@ -196,7 +206,10 @@ _gsi_to_vector (unsigned int gsi) | |||
196 | inline int | 206 | inline int |
197 | gsi_to_vector (unsigned int gsi) | 207 | gsi_to_vector (unsigned int gsi) |
198 | { | 208 | { |
199 | return _gsi_to_vector(gsi); | 209 | int irq = __gsi_to_irq(gsi); |
210 | if (check_irq_used(irq) < 0) | ||
211 | return -1; | ||
212 | return irq_to_vector(irq); | ||
200 | } | 213 | } |
201 | 214 | ||
202 | int | 215 | int |
@@ -204,66 +217,48 @@ gsi_to_irq (unsigned int gsi) | |||
204 | { | 217 | { |
205 | unsigned long flags; | 218 | unsigned long flags; |
206 | int irq; | 219 | int irq; |
207 | /* | 220 | |
208 | * XXX fix me: this assumes an identity mapping between IA-64 vector | ||
209 | * and Linux irq numbers... | ||
210 | */ | ||
211 | spin_lock_irqsave(&iosapic_lock, flags); | 221 | spin_lock_irqsave(&iosapic_lock, flags); |
212 | { | 222 | irq = __gsi_to_irq(gsi); |
213 | irq = _gsi_to_vector(gsi); | ||
214 | } | ||
215 | spin_unlock_irqrestore(&iosapic_lock, flags); | 223 | spin_unlock_irqrestore(&iosapic_lock, flags); |
216 | |||
217 | return irq; | 224 | return irq; |
218 | } | 225 | } |
219 | 226 | ||
220 | static struct iosapic_rte_info *gsi_vector_to_rte(unsigned int gsi, | 227 | static struct iosapic_rte_info *find_rte(unsigned int irq, unsigned int gsi) |
221 | unsigned int vec) | ||
222 | { | 228 | { |
223 | struct iosapic_rte_info *rte; | 229 | struct iosapic_rte_info *rte; |
224 | 230 | ||
225 | list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) | 231 | list_for_each_entry(rte, &iosapic_intr_info[irq].rtes, rte_list) |
226 | if (rte->gsi_base + rte->rte_index == gsi) | 232 | if (rte->iosapic->gsi_base + rte->rte_index == gsi) |
227 | return rte; | 233 | return rte; |
228 | return NULL; | 234 | return NULL; |
229 | } | 235 | } |
230 | 236 | ||
231 | static void | 237 | static void |
232 | set_rte (unsigned int gsi, unsigned int vector, unsigned int dest, int mask) | 238 | set_rte (unsigned int gsi, unsigned int irq, unsigned int dest, int mask) |
233 | { | 239 | { |
234 | unsigned long pol, trigger, dmode; | 240 | unsigned long pol, trigger, dmode; |
235 | u32 low32, high32; | 241 | u32 low32, high32; |
236 | char __iomem *addr; | ||
237 | int rte_index; | 242 | int rte_index; |
238 | char redir; | 243 | char redir; |
239 | struct iosapic_rte_info *rte; | 244 | struct iosapic_rte_info *rte; |
245 | ia64_vector vector = irq_to_vector(irq); | ||
240 | 246 | ||
241 | DBG(KERN_DEBUG"IOSAPIC: routing vector %d to 0x%x\n", vector, dest); | 247 | DBG(KERN_DEBUG"IOSAPIC: routing vector %d to 0x%x\n", vector, dest); |
242 | 248 | ||
243 | rte = gsi_vector_to_rte(gsi, vector); | 249 | rte = find_rte(irq, gsi); |
244 | if (!rte) | 250 | if (!rte) |
245 | return; /* not an IOSAPIC interrupt */ | 251 | return; /* not an IOSAPIC interrupt */ |
246 | 252 | ||
247 | rte_index = rte->rte_index; | 253 | rte_index = rte->rte_index; |
248 | addr = rte->addr; | 254 | pol = iosapic_intr_info[irq].polarity; |
249 | pol = iosapic_intr_info[vector].polarity; | 255 | trigger = iosapic_intr_info[irq].trigger; |
250 | trigger = iosapic_intr_info[vector].trigger; | 256 | dmode = iosapic_intr_info[irq].dmode; |
251 | dmode = iosapic_intr_info[vector].dmode; | ||
252 | 257 | ||
253 | redir = (dmode == IOSAPIC_LOWEST_PRIORITY) ? 1 : 0; | 258 | redir = (dmode == IOSAPIC_LOWEST_PRIORITY) ? 1 : 0; |
254 | 259 | ||
255 | #ifdef CONFIG_SMP | 260 | #ifdef CONFIG_SMP |
256 | { | 261 | set_irq_affinity_info(irq, (int)(dest & 0xffff), redir); |
257 | unsigned int irq; | ||
258 | |||
259 | for (irq = 0; irq < NR_IRQS; ++irq) | ||
260 | if (irq_to_vector(irq) == vector) { | ||
261 | set_irq_affinity_info(irq, | ||
262 | (int)(dest & 0xffff), | ||
263 | redir); | ||
264 | break; | ||
265 | } | ||
266 | } | ||
267 | #endif | 262 | #endif |
268 | 263 | ||
269 | low32 = ((pol << IOSAPIC_POLARITY_SHIFT) | | 264 | low32 = ((pol << IOSAPIC_POLARITY_SHIFT) | |
@@ -275,10 +270,10 @@ set_rte (unsigned int gsi, unsigned int vector, unsigned int dest, int mask) | |||
275 | /* dest contains both id and eid */ | 270 | /* dest contains both id and eid */ |
276 | high32 = (dest << IOSAPIC_DEST_SHIFT); | 271 | high32 = (dest << IOSAPIC_DEST_SHIFT); |
277 | 272 | ||
278 | iosapic_write(addr, IOSAPIC_RTE_HIGH(rte_index), high32); | 273 | iosapic_write(rte->iosapic, IOSAPIC_RTE_HIGH(rte_index), high32); |
279 | iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32); | 274 | iosapic_write(rte->iosapic, IOSAPIC_RTE_LOW(rte_index), low32); |
280 | iosapic_intr_info[vector].low32 = low32; | 275 | iosapic_intr_info[irq].low32 = low32; |
281 | iosapic_intr_info[vector].dest = dest; | 276 | iosapic_intr_info[irq].dest = dest; |
282 | } | 277 | } |
283 | 278 | ||
284 | static void | 279 | static void |
@@ -294,15 +289,18 @@ kexec_disable_iosapic(void) | |||
294 | { | 289 | { |
295 | struct iosapic_intr_info *info; | 290 | struct iosapic_intr_info *info; |
296 | struct iosapic_rte_info *rte; | 291 | struct iosapic_rte_info *rte; |
297 | u8 vec = 0; | 292 | ia64_vector vec; |
298 | for (info = iosapic_intr_info; info < | 293 | int irq; |
299 | iosapic_intr_info + IA64_NUM_VECTORS; ++info, ++vec) { | 294 | |
295 | for (irq = 0; irq < NR_IRQS; irq++) { | ||
296 | info = &iosapic_intr_info[irq]; | ||
297 | vec = irq_to_vector(irq); | ||
300 | list_for_each_entry(rte, &info->rtes, | 298 | list_for_each_entry(rte, &info->rtes, |
301 | rte_list) { | 299 | rte_list) { |
302 | iosapic_write(rte->addr, | 300 | iosapic_write(rte->iosapic, |
303 | IOSAPIC_RTE_LOW(rte->rte_index), | 301 | IOSAPIC_RTE_LOW(rte->rte_index), |
304 | IOSAPIC_MASK|vec); | 302 | IOSAPIC_MASK|vec); |
305 | iosapic_eoi(rte->addr, vec); | 303 | iosapic_eoi(rte->iosapic->addr, vec); |
306 | } | 304 | } |
307 | } | 305 | } |
308 | } | 306 | } |
@@ -311,54 +309,36 @@ kexec_disable_iosapic(void) | |||
311 | static void | 309 | static void |
312 | mask_irq (unsigned int irq) | 310 | mask_irq (unsigned int irq) |
313 | { | 311 | { |
314 | unsigned long flags; | ||
315 | char __iomem *addr; | ||
316 | u32 low32; | 312 | u32 low32; |
317 | int rte_index; | 313 | int rte_index; |
318 | ia64_vector vec = irq_to_vector(irq); | ||
319 | struct iosapic_rte_info *rte; | 314 | struct iosapic_rte_info *rte; |
320 | 315 | ||
321 | if (list_empty(&iosapic_intr_info[vec].rtes)) | 316 | if (list_empty(&iosapic_intr_info[irq].rtes)) |
322 | return; /* not an IOSAPIC interrupt! */ | 317 | return; /* not an IOSAPIC interrupt! */ |
323 | 318 | ||
324 | spin_lock_irqsave(&iosapic_lock, flags); | 319 | /* set only the mask bit */ |
325 | { | 320 | low32 = iosapic_intr_info[irq].low32 |= IOSAPIC_MASK; |
326 | /* set only the mask bit */ | 321 | list_for_each_entry(rte, &iosapic_intr_info[irq].rtes, rte_list) { |
327 | low32 = iosapic_intr_info[vec].low32 |= IOSAPIC_MASK; | 322 | rte_index = rte->rte_index; |
328 | list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, | 323 | iosapic_write(rte->iosapic, IOSAPIC_RTE_LOW(rte_index), low32); |
329 | rte_list) { | ||
330 | addr = rte->addr; | ||
331 | rte_index = rte->rte_index; | ||
332 | iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32); | ||
333 | } | ||
334 | } | 324 | } |
335 | spin_unlock_irqrestore(&iosapic_lock, flags); | ||
336 | } | 325 | } |
337 | 326 | ||
338 | static void | 327 | static void |
339 | unmask_irq (unsigned int irq) | 328 | unmask_irq (unsigned int irq) |
340 | { | 329 | { |
341 | unsigned long flags; | ||
342 | char __iomem *addr; | ||
343 | u32 low32; | 330 | u32 low32; |
344 | int rte_index; | 331 | int rte_index; |
345 | ia64_vector vec = irq_to_vector(irq); | ||
346 | struct iosapic_rte_info *rte; | 332 | struct iosapic_rte_info *rte; |
347 | 333 | ||
348 | if (list_empty(&iosapic_intr_info[vec].rtes)) | 334 | if (list_empty(&iosapic_intr_info[irq].rtes)) |
349 | return; /* not an IOSAPIC interrupt! */ | 335 | return; /* not an IOSAPIC interrupt! */ |
350 | 336 | ||
351 | spin_lock_irqsave(&iosapic_lock, flags); | 337 | low32 = iosapic_intr_info[irq].low32 &= ~IOSAPIC_MASK; |
352 | { | 338 | list_for_each_entry(rte, &iosapic_intr_info[irq].rtes, rte_list) { |
353 | low32 = iosapic_intr_info[vec].low32 &= ~IOSAPIC_MASK; | 339 | rte_index = rte->rte_index; |
354 | list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, | 340 | iosapic_write(rte->iosapic, IOSAPIC_RTE_LOW(rte_index), low32); |
355 | rte_list) { | ||
356 | addr = rte->addr; | ||
357 | rte_index = rte->rte_index; | ||
358 | iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32); | ||
359 | } | ||
360 | } | 341 | } |
361 | spin_unlock_irqrestore(&iosapic_lock, flags); | ||
362 | } | 342 | } |
363 | 343 | ||
364 | 344 | ||
@@ -366,23 +346,24 @@ static void | |||
366 | iosapic_set_affinity (unsigned int irq, cpumask_t mask) | 346 | iosapic_set_affinity (unsigned int irq, cpumask_t mask) |
367 | { | 347 | { |
368 | #ifdef CONFIG_SMP | 348 | #ifdef CONFIG_SMP |
369 | unsigned long flags; | ||
370 | u32 high32, low32; | 349 | u32 high32, low32; |
371 | int dest, rte_index; | 350 | int dest, rte_index; |
372 | char __iomem *addr; | ||
373 | int redir = (irq & IA64_IRQ_REDIRECTED) ? 1 : 0; | 351 | int redir = (irq & IA64_IRQ_REDIRECTED) ? 1 : 0; |
374 | ia64_vector vec; | ||
375 | struct iosapic_rte_info *rte; | 352 | struct iosapic_rte_info *rte; |
353 | struct iosapic *iosapic; | ||
376 | 354 | ||
377 | irq &= (~IA64_IRQ_REDIRECTED); | 355 | irq &= (~IA64_IRQ_REDIRECTED); |
378 | vec = irq_to_vector(irq); | ||
379 | 356 | ||
357 | cpus_and(mask, mask, cpu_online_map); | ||
380 | if (cpus_empty(mask)) | 358 | if (cpus_empty(mask)) |
381 | return; | 359 | return; |
382 | 360 | ||
361 | if (reassign_irq_vector(irq, first_cpu(mask))) | ||
362 | return; | ||
363 | |||
383 | dest = cpu_physical_id(first_cpu(mask)); | 364 | dest = cpu_physical_id(first_cpu(mask)); |
384 | 365 | ||
385 | if (list_empty(&iosapic_intr_info[vec].rtes)) | 366 | if (list_empty(&iosapic_intr_info[irq].rtes)) |
386 | return; /* not an IOSAPIC interrupt */ | 367 | return; /* not an IOSAPIC interrupt */ |
387 | 368 | ||
388 | set_irq_affinity_info(irq, dest, redir); | 369 | set_irq_affinity_info(irq, dest, redir); |
@@ -390,31 +371,24 @@ iosapic_set_affinity (unsigned int irq, cpumask_t mask) | |||
390 | /* dest contains both id and eid */ | 371 | /* dest contains both id and eid */ |
391 | high32 = dest << IOSAPIC_DEST_SHIFT; | 372 | high32 = dest << IOSAPIC_DEST_SHIFT; |
392 | 373 | ||
393 | spin_lock_irqsave(&iosapic_lock, flags); | 374 | low32 = iosapic_intr_info[irq].low32 & ~(7 << IOSAPIC_DELIVERY_SHIFT); |
394 | { | 375 | if (redir) |
395 | low32 = iosapic_intr_info[vec].low32 & | 376 | /* change delivery mode to lowest priority */ |
396 | ~(7 << IOSAPIC_DELIVERY_SHIFT); | 377 | low32 |= (IOSAPIC_LOWEST_PRIORITY << IOSAPIC_DELIVERY_SHIFT); |
397 | 378 | else | |
398 | if (redir) | 379 | /* change delivery mode to fixed */ |
399 | /* change delivery mode to lowest priority */ | 380 | low32 |= (IOSAPIC_FIXED << IOSAPIC_DELIVERY_SHIFT); |
400 | low32 |= (IOSAPIC_LOWEST_PRIORITY << | 381 | low32 &= IOSAPIC_VECTOR_MASK; |
401 | IOSAPIC_DELIVERY_SHIFT); | 382 | low32 |= irq_to_vector(irq); |
402 | else | 383 | |
403 | /* change delivery mode to fixed */ | 384 | iosapic_intr_info[irq].low32 = low32; |
404 | low32 |= (IOSAPIC_FIXED << IOSAPIC_DELIVERY_SHIFT); | 385 | iosapic_intr_info[irq].dest = dest; |
405 | 386 | list_for_each_entry(rte, &iosapic_intr_info[irq].rtes, rte_list) { | |
406 | iosapic_intr_info[vec].low32 = low32; | 387 | iosapic = rte->iosapic; |
407 | iosapic_intr_info[vec].dest = dest; | 388 | rte_index = rte->rte_index; |
408 | list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, | 389 | iosapic_write(iosapic, IOSAPIC_RTE_HIGH(rte_index), high32); |
409 | rte_list) { | 390 | iosapic_write(iosapic, IOSAPIC_RTE_LOW(rte_index), low32); |
410 | addr = rte->addr; | ||
411 | rte_index = rte->rte_index; | ||
412 | iosapic_write(addr, IOSAPIC_RTE_HIGH(rte_index), | ||
413 | high32); | ||
414 | iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32); | ||
415 | } | ||
416 | } | 391 | } |
417 | spin_unlock_irqrestore(&iosapic_lock, flags); | ||
418 | #endif | 392 | #endif |
419 | } | 393 | } |
420 | 394 | ||
@@ -434,10 +408,20 @@ iosapic_end_level_irq (unsigned int irq) | |||
434 | { | 408 | { |
435 | ia64_vector vec = irq_to_vector(irq); | 409 | ia64_vector vec = irq_to_vector(irq); |
436 | struct iosapic_rte_info *rte; | 410 | struct iosapic_rte_info *rte; |
411 | int do_unmask_irq = 0; | ||
437 | 412 | ||
438 | move_native_irq(irq); | 413 | if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) { |
439 | list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) | 414 | do_unmask_irq = 1; |
440 | iosapic_eoi(rte->addr, vec); | 415 | mask_irq(irq); |
416 | } | ||
417 | |||
418 | list_for_each_entry(rte, &iosapic_intr_info[irq].rtes, rte_list) | ||
419 | iosapic_eoi(rte->iosapic->addr, vec); | ||
420 | |||
421 | if (unlikely(do_unmask_irq)) { | ||
422 | move_masked_irq(irq); | ||
423 | unmask_irq(irq); | ||
424 | } | ||
441 | } | 425 | } |
442 | 426 | ||
443 | #define iosapic_shutdown_level_irq mask_irq | 427 | #define iosapic_shutdown_level_irq mask_irq |
@@ -519,13 +503,12 @@ iosapic_version (char __iomem *addr) | |||
519 | * unsigned int reserved2 : 8; | 503 | * unsigned int reserved2 : 8; |
520 | * } | 504 | * } |
521 | */ | 505 | */ |
522 | return iosapic_read(addr, IOSAPIC_VERSION); | 506 | return __iosapic_read(addr, IOSAPIC_VERSION); |
523 | } | 507 | } |
524 | 508 | ||
525 | static int iosapic_find_sharable_vector (unsigned long trigger, | 509 | static int iosapic_find_sharable_irq(unsigned long trigger, unsigned long pol) |
526 | unsigned long pol) | ||
527 | { | 510 | { |
528 | int i, vector = -1, min_count = -1; | 511 | int i, irq = -ENOSPC, min_count = -1; |
529 | struct iosapic_intr_info *info; | 512 | struct iosapic_intr_info *info; |
530 | 513 | ||
531 | /* | 514 | /* |
@@ -533,21 +516,21 @@ static int iosapic_find_sharable_vector (unsigned long trigger, | |||
533 | * supported yet | 516 | * supported yet |
534 | */ | 517 | */ |
535 | if (trigger == IOSAPIC_EDGE) | 518 | if (trigger == IOSAPIC_EDGE) |
536 | return -1; | 519 | return -EINVAL; |
537 | 520 | ||
538 | for (i = IA64_FIRST_DEVICE_VECTOR; i <= IA64_LAST_DEVICE_VECTOR; i++) { | 521 | for (i = 0; i <= NR_IRQS; i++) { |
539 | info = &iosapic_intr_info[i]; | 522 | info = &iosapic_intr_info[i]; |
540 | if (info->trigger == trigger && info->polarity == pol && | 523 | if (info->trigger == trigger && info->polarity == pol && |
541 | (info->dmode == IOSAPIC_FIXED || info->dmode == | 524 | (info->dmode == IOSAPIC_FIXED || |
542 | IOSAPIC_LOWEST_PRIORITY)) { | 525 | info->dmode == IOSAPIC_LOWEST_PRIORITY) && |
526 | can_request_irq(i, IRQF_SHARED)) { | ||
543 | if (min_count == -1 || info->count < min_count) { | 527 | if (min_count == -1 || info->count < min_count) { |
544 | vector = i; | 528 | irq = i; |
545 | min_count = info->count; | 529 | min_count = info->count; |
546 | } | 530 | } |
547 | } | 531 | } |
548 | } | 532 | } |
549 | 533 | return irq; | |
550 | return vector; | ||
551 | } | 534 | } |
552 | 535 | ||
553 | /* | 536 | /* |
@@ -555,25 +538,25 @@ static int iosapic_find_sharable_vector (unsigned long trigger, | |||
555 | * assign a new vector for the other and make the vector available | 538 | * assign a new vector for the other and make the vector available |
556 | */ | 539 | */ |
557 | static void __init | 540 | static void __init |
558 | iosapic_reassign_vector (int vector) | 541 | iosapic_reassign_vector (int irq) |
559 | { | 542 | { |
560 | int new_vector; | 543 | int new_irq; |
561 | 544 | ||
562 | if (!list_empty(&iosapic_intr_info[vector].rtes)) { | 545 | if (!list_empty(&iosapic_intr_info[irq].rtes)) { |
563 | new_vector = assign_irq_vector(AUTO_ASSIGN); | 546 | new_irq = create_irq(); |
564 | if (new_vector < 0) | 547 | if (new_irq < 0) |
565 | panic("%s: out of interrupt vectors!\n", __FUNCTION__); | 548 | panic("%s: out of interrupt vectors!\n", __FUNCTION__); |
566 | printk(KERN_INFO "Reassigning vector %d to %d\n", | 549 | printk(KERN_INFO "Reassigning vector %d to %d\n", |
567 | vector, new_vector); | 550 | irq_to_vector(irq), irq_to_vector(new_irq)); |
568 | memcpy(&iosapic_intr_info[new_vector], &iosapic_intr_info[vector], | 551 | memcpy(&iosapic_intr_info[new_irq], &iosapic_intr_info[irq], |
569 | sizeof(struct iosapic_intr_info)); | 552 | sizeof(struct iosapic_intr_info)); |
570 | INIT_LIST_HEAD(&iosapic_intr_info[new_vector].rtes); | 553 | INIT_LIST_HEAD(&iosapic_intr_info[new_irq].rtes); |
571 | list_move(iosapic_intr_info[vector].rtes.next, | 554 | list_move(iosapic_intr_info[irq].rtes.next, |
572 | &iosapic_intr_info[new_vector].rtes); | 555 | &iosapic_intr_info[new_irq].rtes); |
573 | memset(&iosapic_intr_info[vector], 0, | 556 | memset(&iosapic_intr_info[irq], 0, |
574 | sizeof(struct iosapic_intr_info)); | 557 | sizeof(struct iosapic_intr_info)); |
575 | iosapic_intr_info[vector].low32 = IOSAPIC_MASK; | 558 | iosapic_intr_info[irq].low32 = IOSAPIC_MASK; |
576 | INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes); | 559 | INIT_LIST_HEAD(&iosapic_intr_info[irq].rtes); |
577 | } | 560 | } |
578 | } | 561 | } |
579 | 562 | ||
@@ -610,29 +593,18 @@ static struct iosapic_rte_info *iosapic_alloc_rte (void) | |||
610 | return rte; | 593 | return rte; |
611 | } | 594 | } |
612 | 595 | ||
613 | static void iosapic_free_rte (struct iosapic_rte_info *rte) | 596 | static inline int irq_is_shared (int irq) |
614 | { | 597 | { |
615 | if (rte->flags & RTE_PREALLOCATED) | 598 | return (iosapic_intr_info[irq].count > 1); |
616 | list_add_tail(&rte->rte_list, &free_rte_list); | ||
617 | else | ||
618 | kfree(rte); | ||
619 | } | ||
620 | |||
621 | static inline int vector_is_shared (int vector) | ||
622 | { | ||
623 | return (iosapic_intr_info[vector].count > 1); | ||
624 | } | 599 | } |
625 | 600 | ||
626 | static int | 601 | static int |
627 | register_intr (unsigned int gsi, int vector, unsigned char delivery, | 602 | register_intr (unsigned int gsi, int irq, unsigned char delivery, |
628 | unsigned long polarity, unsigned long trigger) | 603 | unsigned long polarity, unsigned long trigger) |
629 | { | 604 | { |
630 | irq_desc_t *idesc; | 605 | irq_desc_t *idesc; |
631 | struct hw_interrupt_type *irq_type; | 606 | struct hw_interrupt_type *irq_type; |
632 | int rte_index; | ||
633 | int index; | 607 | int index; |
634 | unsigned long gsi_base; | ||
635 | void __iomem *iosapic_address; | ||
636 | struct iosapic_rte_info *rte; | 608 | struct iosapic_rte_info *rte; |
637 | 609 | ||
638 | index = find_iosapic(gsi); | 610 | index = find_iosapic(gsi); |
@@ -642,10 +614,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery, | |||
642 | return -ENODEV; | 614 | return -ENODEV; |
643 | } | 615 | } |
644 | 616 | ||
645 | iosapic_address = iosapic_lists[index].addr; | 617 | rte = find_rte(irq, gsi); |
646 | gsi_base = iosapic_lists[index].gsi_base; | ||
647 | |||
648 | rte = gsi_vector_to_rte(gsi, vector); | ||
649 | if (!rte) { | 618 | if (!rte) { |
650 | rte = iosapic_alloc_rte(); | 619 | rte = iosapic_alloc_rte(); |
651 | if (!rte) { | 620 | if (!rte) { |
@@ -654,40 +623,42 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery, | |||
654 | return -ENOMEM; | 623 | return -ENOMEM; |
655 | } | 624 | } |
656 | 625 | ||
657 | rte_index = gsi - gsi_base; | 626 | rte->iosapic = &iosapic_lists[index]; |
658 | rte->rte_index = rte_index; | 627 | rte->rte_index = gsi - rte->iosapic->gsi_base; |
659 | rte->addr = iosapic_address; | ||
660 | rte->gsi_base = gsi_base; | ||
661 | rte->refcnt++; | 628 | rte->refcnt++; |
662 | list_add_tail(&rte->rte_list, &iosapic_intr_info[vector].rtes); | 629 | list_add_tail(&rte->rte_list, &iosapic_intr_info[irq].rtes); |
663 | iosapic_intr_info[vector].count++; | 630 | iosapic_intr_info[irq].count++; |
664 | iosapic_lists[index].rtes_inuse++; | 631 | iosapic_lists[index].rtes_inuse++; |
665 | } | 632 | } |
666 | else if (vector_is_shared(vector)) { | 633 | else if (rte->refcnt == NO_REF_RTE) { |
667 | struct iosapic_intr_info *info = &iosapic_intr_info[vector]; | 634 | struct iosapic_intr_info *info = &iosapic_intr_info[irq]; |
668 | if (info->trigger != trigger || info->polarity != polarity) { | 635 | if (info->count > 0 && |
636 | (info->trigger != trigger || info->polarity != polarity)){ | ||
669 | printk (KERN_WARNING | 637 | printk (KERN_WARNING |
670 | "%s: cannot override the interrupt\n", | 638 | "%s: cannot override the interrupt\n", |
671 | __FUNCTION__); | 639 | __FUNCTION__); |
672 | return -EINVAL; | 640 | return -EINVAL; |
673 | } | 641 | } |
642 | rte->refcnt++; | ||
643 | iosapic_intr_info[irq].count++; | ||
644 | iosapic_lists[index].rtes_inuse++; | ||
674 | } | 645 | } |
675 | 646 | ||
676 | iosapic_intr_info[vector].polarity = polarity; | 647 | iosapic_intr_info[irq].polarity = polarity; |
677 | iosapic_intr_info[vector].dmode = delivery; | 648 | iosapic_intr_info[irq].dmode = delivery; |
678 | iosapic_intr_info[vector].trigger = trigger; | 649 | iosapic_intr_info[irq].trigger = trigger; |
679 | 650 | ||
680 | if (trigger == IOSAPIC_EDGE) | 651 | if (trigger == IOSAPIC_EDGE) |
681 | irq_type = &irq_type_iosapic_edge; | 652 | irq_type = &irq_type_iosapic_edge; |
682 | else | 653 | else |
683 | irq_type = &irq_type_iosapic_level; | 654 | irq_type = &irq_type_iosapic_level; |
684 | 655 | ||
685 | idesc = irq_desc + vector; | 656 | idesc = irq_desc + irq; |
686 | if (idesc->chip != irq_type) { | 657 | if (idesc->chip != irq_type) { |
687 | if (idesc->chip != &no_irq_type) | 658 | if (idesc->chip != &no_irq_type) |
688 | printk(KERN_WARNING | 659 | printk(KERN_WARNING |
689 | "%s: changing vector %d from %s to %s\n", | 660 | "%s: changing vector %d from %s to %s\n", |
690 | __FUNCTION__, vector, | 661 | __FUNCTION__, irq_to_vector(irq), |
691 | idesc->chip->name, irq_type->name); | 662 | idesc->chip->name, irq_type->name); |
692 | idesc->chip = irq_type; | 663 | idesc->chip = irq_type; |
693 | } | 664 | } |
@@ -695,18 +666,19 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery, | |||
695 | } | 666 | } |
696 | 667 | ||
697 | static unsigned int | 668 | static unsigned int |
698 | get_target_cpu (unsigned int gsi, int vector) | 669 | get_target_cpu (unsigned int gsi, int irq) |
699 | { | 670 | { |
700 | #ifdef CONFIG_SMP | 671 | #ifdef CONFIG_SMP |
701 | static int cpu = -1; | 672 | static int cpu = -1; |
702 | extern int cpe_vector; | 673 | extern int cpe_vector; |
674 | cpumask_t domain = irq_to_domain(irq); | ||
703 | 675 | ||
704 | /* | 676 | /* |
705 | * In case of vector shared by multiple RTEs, all RTEs that | 677 | * In case of vector shared by multiple RTEs, all RTEs that |
706 | * share the vector need to use the same destination CPU. | 678 | * share the vector need to use the same destination CPU. |
707 | */ | 679 | */ |
708 | if (!list_empty(&iosapic_intr_info[vector].rtes)) | 680 | if (!list_empty(&iosapic_intr_info[irq].rtes)) |
709 | return iosapic_intr_info[vector].dest; | 681 | return iosapic_intr_info[irq].dest; |
710 | 682 | ||
711 | /* | 683 | /* |
712 | * If the platform supports redirection via XTP, let it | 684 | * If the platform supports redirection via XTP, let it |
@@ -723,7 +695,7 @@ get_target_cpu (unsigned int gsi, int vector) | |||
723 | return cpu_physical_id(smp_processor_id()); | 695 | return cpu_physical_id(smp_processor_id()); |
724 | 696 | ||
725 | #ifdef CONFIG_ACPI | 697 | #ifdef CONFIG_ACPI |
726 | if (cpe_vector > 0 && vector == IA64_CPEP_VECTOR) | 698 | if (cpe_vector > 0 && irq_to_vector(irq) == IA64_CPEP_VECTOR) |
727 | return get_cpei_target_cpu(); | 699 | return get_cpei_target_cpu(); |
728 | #endif | 700 | #endif |
729 | 701 | ||
@@ -738,7 +710,7 @@ get_target_cpu (unsigned int gsi, int vector) | |||
738 | goto skip_numa_setup; | 710 | goto skip_numa_setup; |
739 | 711 | ||
740 | cpu_mask = node_to_cpumask(iosapic_lists[iosapic_index].node); | 712 | cpu_mask = node_to_cpumask(iosapic_lists[iosapic_index].node); |
741 | 713 | cpus_and(cpu_mask, cpu_mask, domain); | |
742 | for_each_cpu_mask(numa_cpu, cpu_mask) { | 714 | for_each_cpu_mask(numa_cpu, cpu_mask) { |
743 | if (!cpu_online(numa_cpu)) | 715 | if (!cpu_online(numa_cpu)) |
744 | cpu_clear(numa_cpu, cpu_mask); | 716 | cpu_clear(numa_cpu, cpu_mask); |
@@ -749,8 +721,8 @@ get_target_cpu (unsigned int gsi, int vector) | |||
749 | if (!num_cpus) | 721 | if (!num_cpus) |
750 | goto skip_numa_setup; | 722 | goto skip_numa_setup; |
751 | 723 | ||
752 | /* Use vector assignment to distribute across cpus in node */ | 724 | /* Use irq assignment to distribute across cpus in node */ |
753 | cpu_index = vector % num_cpus; | 725 | cpu_index = irq % num_cpus; |
754 | 726 | ||
755 | for (numa_cpu = first_cpu(cpu_mask) ; i < cpu_index ; i++) | 727 | for (numa_cpu = first_cpu(cpu_mask) ; i < cpu_index ; i++) |
756 | numa_cpu = next_cpu(numa_cpu, cpu_mask); | 728 | numa_cpu = next_cpu(numa_cpu, cpu_mask); |
@@ -768,7 +740,7 @@ skip_numa_setup: | |||
768 | do { | 740 | do { |
769 | if (++cpu >= NR_CPUS) | 741 | if (++cpu >= NR_CPUS) |
770 | cpu = 0; | 742 | cpu = 0; |
771 | } while (!cpu_online(cpu)); | 743 | } while (!cpu_online(cpu) || !cpu_isset(cpu, domain)); |
772 | 744 | ||
773 | return cpu_physical_id(cpu); | 745 | return cpu_physical_id(cpu); |
774 | #else /* CONFIG_SMP */ | 746 | #else /* CONFIG_SMP */ |
@@ -785,84 +757,72 @@ int | |||
785 | iosapic_register_intr (unsigned int gsi, | 757 | iosapic_register_intr (unsigned int gsi, |
786 | unsigned long polarity, unsigned long trigger) | 758 | unsigned long polarity, unsigned long trigger) |
787 | { | 759 | { |
788 | int vector, mask = 1, err; | 760 | int irq, mask = 1, err; |
789 | unsigned int dest; | 761 | unsigned int dest; |
790 | unsigned long flags; | 762 | unsigned long flags; |
791 | struct iosapic_rte_info *rte; | 763 | struct iosapic_rte_info *rte; |
792 | u32 low32; | 764 | u32 low32; |
793 | again: | 765 | |
794 | /* | 766 | /* |
795 | * If this GSI has already been registered (i.e., it's a | 767 | * If this GSI has already been registered (i.e., it's a |
796 | * shared interrupt, or we lost a race to register it), | 768 | * shared interrupt, or we lost a race to register it), |
797 | * don't touch the RTE. | 769 | * don't touch the RTE. |
798 | */ | 770 | */ |
799 | spin_lock_irqsave(&iosapic_lock, flags); | 771 | spin_lock_irqsave(&iosapic_lock, flags); |
800 | { | 772 | irq = __gsi_to_irq(gsi); |
801 | vector = gsi_to_vector(gsi); | 773 | if (irq > 0) { |
802 | if (vector > 0) { | 774 | rte = find_rte(irq, gsi); |
803 | rte = gsi_vector_to_rte(gsi, vector); | 775 | if(iosapic_intr_info[irq].count == 0) { |
776 | assign_irq_vector(irq); | ||
777 | dynamic_irq_init(irq); | ||
778 | } else if (rte->refcnt != NO_REF_RTE) { | ||
804 | rte->refcnt++; | 779 | rte->refcnt++; |
805 | spin_unlock_irqrestore(&iosapic_lock, flags); | 780 | goto unlock_iosapic_lock; |
806 | return vector; | ||
807 | } | 781 | } |
808 | } | 782 | } else |
809 | spin_unlock_irqrestore(&iosapic_lock, flags); | 783 | irq = create_irq(); |
810 | 784 | ||
811 | /* If vector is running out, we try to find a sharable vector */ | 785 | /* If vector is running out, we try to find a sharable vector */ |
812 | vector = assign_irq_vector(AUTO_ASSIGN); | 786 | if (irq < 0) { |
813 | if (vector < 0) { | 787 | irq = iosapic_find_sharable_irq(trigger, polarity); |
814 | vector = iosapic_find_sharable_vector(trigger, polarity); | 788 | if (irq < 0) |
815 | if (vector < 0) | 789 | goto unlock_iosapic_lock; |
816 | return -ENOSPC; | ||
817 | } | 790 | } |
818 | 791 | ||
819 | spin_lock_irqsave(&irq_desc[vector].lock, flags); | 792 | spin_lock(&irq_desc[irq].lock); |
820 | spin_lock(&iosapic_lock); | 793 | dest = get_target_cpu(gsi, irq); |
821 | { | 794 | err = register_intr(gsi, irq, IOSAPIC_LOWEST_PRIORITY, |
822 | if (gsi_to_vector(gsi) > 0) { | 795 | polarity, trigger); |
823 | if (list_empty(&iosapic_intr_info[vector].rtes)) | 796 | if (err < 0) { |
824 | free_irq_vector(vector); | 797 | irq = err; |
825 | spin_unlock(&iosapic_lock); | 798 | goto unlock_all; |
826 | spin_unlock_irqrestore(&irq_desc[vector].lock, | ||
827 | flags); | ||
828 | goto again; | ||
829 | } | ||
830 | |||
831 | dest = get_target_cpu(gsi, vector); | ||
832 | err = register_intr(gsi, vector, IOSAPIC_LOWEST_PRIORITY, | ||
833 | polarity, trigger); | ||
834 | if (err < 0) { | ||
835 | spin_unlock(&iosapic_lock); | ||
836 | spin_unlock_irqrestore(&irq_desc[vector].lock, | ||
837 | flags); | ||
838 | return err; | ||
839 | } | ||
840 | |||
841 | /* | ||
842 | * If the vector is shared and already unmasked for | ||
843 | * other interrupt sources, don't mask it. | ||
844 | */ | ||
845 | low32 = iosapic_intr_info[vector].low32; | ||
846 | if (vector_is_shared(vector) && !(low32 & IOSAPIC_MASK)) | ||
847 | mask = 0; | ||
848 | set_rte(gsi, vector, dest, mask); | ||
849 | } | 799 | } |
850 | spin_unlock(&iosapic_lock); | 800 | |
851 | spin_unlock_irqrestore(&irq_desc[vector].lock, flags); | 801 | /* |
802 | * If the vector is shared and already unmasked for other | ||
803 | * interrupt sources, don't mask it. | ||
804 | */ | ||
805 | low32 = iosapic_intr_info[irq].low32; | ||
806 | if (irq_is_shared(irq) && !(low32 & IOSAPIC_MASK)) | ||
807 | mask = 0; | ||
808 | set_rte(gsi, irq, dest, mask); | ||
852 | 809 | ||
853 | printk(KERN_INFO "GSI %u (%s, %s) -> CPU %d (0x%04x) vector %d\n", | 810 | printk(KERN_INFO "GSI %u (%s, %s) -> CPU %d (0x%04x) vector %d\n", |
854 | gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), | 811 | gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), |
855 | (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), | 812 | (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), |
856 | cpu_logical_id(dest), dest, vector); | 813 | cpu_logical_id(dest), dest, irq_to_vector(irq)); |
857 | 814 | unlock_all: | |
858 | return vector; | 815 | spin_unlock(&irq_desc[irq].lock); |
816 | unlock_iosapic_lock: | ||
817 | spin_unlock_irqrestore(&iosapic_lock, flags); | ||
818 | return irq; | ||
859 | } | 819 | } |
860 | 820 | ||
861 | void | 821 | void |
862 | iosapic_unregister_intr (unsigned int gsi) | 822 | iosapic_unregister_intr (unsigned int gsi) |
863 | { | 823 | { |
864 | unsigned long flags; | 824 | unsigned long flags; |
865 | int irq, vector, index; | 825 | int irq, index; |
866 | irq_desc_t *idesc; | 826 | irq_desc_t *idesc; |
867 | u32 low32; | 827 | u32 low32; |
868 | unsigned long trigger, polarity; | 828 | unsigned long trigger, polarity; |
@@ -881,78 +841,56 @@ iosapic_unregister_intr (unsigned int gsi) | |||
881 | WARN_ON(1); | 841 | WARN_ON(1); |
882 | return; | 842 | return; |
883 | } | 843 | } |
884 | vector = irq_to_vector(irq); | ||
885 | 844 | ||
886 | idesc = irq_desc + irq; | 845 | spin_lock_irqsave(&iosapic_lock, flags); |
887 | spin_lock_irqsave(&idesc->lock, flags); | 846 | if ((rte = find_rte(irq, gsi)) == NULL) { |
888 | spin_lock(&iosapic_lock); | 847 | printk(KERN_ERR "iosapic_unregister_intr(%u) unbalanced\n", |
889 | { | 848 | gsi); |
890 | if ((rte = gsi_vector_to_rte(gsi, vector)) == NULL) { | 849 | WARN_ON(1); |
891 | printk(KERN_ERR | 850 | goto out; |
892 | "iosapic_unregister_intr(%u) unbalanced\n", | 851 | } |
893 | gsi); | ||
894 | WARN_ON(1); | ||
895 | goto out; | ||
896 | } | ||
897 | 852 | ||
898 | if (--rte->refcnt > 0) | 853 | if (--rte->refcnt > 0) |
899 | goto out; | 854 | goto out; |
900 | 855 | ||
901 | /* Mask the interrupt */ | 856 | idesc = irq_desc + irq; |
902 | low32 = iosapic_intr_info[vector].low32 | IOSAPIC_MASK; | 857 | rte->refcnt = NO_REF_RTE; |
903 | iosapic_write(rte->addr, IOSAPIC_RTE_LOW(rte->rte_index), | ||
904 | low32); | ||
905 | 858 | ||
906 | /* Remove the rte entry from the list */ | 859 | /* Mask the interrupt */ |
907 | list_del(&rte->rte_list); | 860 | low32 = iosapic_intr_info[irq].low32 | IOSAPIC_MASK; |
908 | iosapic_intr_info[vector].count--; | 861 | iosapic_write(rte->iosapic, IOSAPIC_RTE_LOW(rte->rte_index), low32); |
909 | iosapic_free_rte(rte); | ||
910 | index = find_iosapic(gsi); | ||
911 | iosapic_lists[index].rtes_inuse--; | ||
912 | WARN_ON(iosapic_lists[index].rtes_inuse < 0); | ||
913 | |||
914 | trigger = iosapic_intr_info[vector].trigger; | ||
915 | polarity = iosapic_intr_info[vector].polarity; | ||
916 | dest = iosapic_intr_info[vector].dest; | ||
917 | printk(KERN_INFO | ||
918 | "GSI %u (%s, %s) -> CPU %d (0x%04x)" | ||
919 | " vector %d unregistered\n", | ||
920 | gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), | ||
921 | (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), | ||
922 | cpu_logical_id(dest), dest, vector); | ||
923 | 862 | ||
924 | if (list_empty(&iosapic_intr_info[vector].rtes)) { | 863 | iosapic_intr_info[irq].count--; |
925 | /* Sanity check */ | 864 | index = find_iosapic(gsi); |
926 | BUG_ON(iosapic_intr_info[vector].count); | 865 | iosapic_lists[index].rtes_inuse--; |
866 | WARN_ON(iosapic_lists[index].rtes_inuse < 0); | ||
927 | 867 | ||
928 | /* Clear the interrupt controller descriptor */ | 868 | trigger = iosapic_intr_info[irq].trigger; |
929 | idesc->chip = &no_irq_type; | 869 | polarity = iosapic_intr_info[irq].polarity; |
870 | dest = iosapic_intr_info[irq].dest; | ||
871 | printk(KERN_INFO | ||
872 | "GSI %u (%s, %s) -> CPU %d (0x%04x) vector %d unregistered\n", | ||
873 | gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), | ||
874 | (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), | ||
875 | cpu_logical_id(dest), dest, irq_to_vector(irq)); | ||
930 | 876 | ||
877 | if (iosapic_intr_info[irq].count == 0) { | ||
931 | #ifdef CONFIG_SMP | 878 | #ifdef CONFIG_SMP |
932 | /* Clear affinity */ | 879 | /* Clear affinity */ |
933 | cpus_setall(idesc->affinity); | 880 | cpus_setall(idesc->affinity); |
934 | #endif | 881 | #endif |
935 | 882 | /* Clear the interrupt information */ | |
936 | /* Clear the interrupt information */ | 883 | iosapic_intr_info[irq].dest = 0; |
937 | memset(&iosapic_intr_info[vector], 0, | 884 | iosapic_intr_info[irq].dmode = 0; |
938 | sizeof(struct iosapic_intr_info)); | 885 | iosapic_intr_info[irq].polarity = 0; |
939 | iosapic_intr_info[vector].low32 |= IOSAPIC_MASK; | 886 | iosapic_intr_info[irq].trigger = 0; |
940 | INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes); | 887 | iosapic_intr_info[irq].low32 |= IOSAPIC_MASK; |
941 | 888 | ||
942 | if (idesc->action) { | 889 | /* Destroy and reserve IRQ */ |
943 | printk(KERN_ERR | 890 | destroy_and_reserve_irq(irq); |
944 | "interrupt handlers still exist on" | ||
945 | "IRQ %u\n", irq); | ||
946 | WARN_ON(1); | ||
947 | } | ||
948 | |||
949 | /* Free the interrupt vector */ | ||
950 | free_irq_vector(vector); | ||
951 | } | ||
952 | } | 891 | } |
953 | out: | 892 | out: |
954 | spin_unlock(&iosapic_lock); | 893 | spin_unlock_irqrestore(&iosapic_lock, flags); |
955 | spin_unlock_irqrestore(&idesc->lock, flags); | ||
956 | } | 894 | } |
957 | 895 | ||
958 | /* | 896 | /* |
@@ -965,27 +903,30 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi, | |||
965 | { | 903 | { |
966 | static const char * const name[] = {"unknown", "PMI", "INIT", "CPEI"}; | 904 | static const char * const name[] = {"unknown", "PMI", "INIT", "CPEI"}; |
967 | unsigned char delivery; | 905 | unsigned char delivery; |
968 | int vector, mask = 0; | 906 | int irq, vector, mask = 0; |
969 | unsigned int dest = ((id << 8) | eid) & 0xffff; | 907 | unsigned int dest = ((id << 8) | eid) & 0xffff; |
970 | 908 | ||
971 | switch (int_type) { | 909 | switch (int_type) { |
972 | case ACPI_INTERRUPT_PMI: | 910 | case ACPI_INTERRUPT_PMI: |
973 | vector = iosapic_vector; | 911 | irq = vector = iosapic_vector; |
912 | bind_irq_vector(irq, vector, CPU_MASK_ALL); | ||
974 | /* | 913 | /* |
975 | * since PMI vector is alloc'd by FW(ACPI) not by kernel, | 914 | * since PMI vector is alloc'd by FW(ACPI) not by kernel, |
976 | * we need to make sure the vector is available | 915 | * we need to make sure the vector is available |
977 | */ | 916 | */ |
978 | iosapic_reassign_vector(vector); | 917 | iosapic_reassign_vector(irq); |
979 | delivery = IOSAPIC_PMI; | 918 | delivery = IOSAPIC_PMI; |
980 | break; | 919 | break; |
981 | case ACPI_INTERRUPT_INIT: | 920 | case ACPI_INTERRUPT_INIT: |
982 | vector = assign_irq_vector(AUTO_ASSIGN); | 921 | irq = create_irq(); |
983 | if (vector < 0) | 922 | if (irq < 0) |
984 | panic("%s: out of interrupt vectors!\n", __FUNCTION__); | 923 | panic("%s: out of interrupt vectors!\n", __FUNCTION__); |
924 | vector = irq_to_vector(irq); | ||
985 | delivery = IOSAPIC_INIT; | 925 | delivery = IOSAPIC_INIT; |
986 | break; | 926 | break; |
987 | case ACPI_INTERRUPT_CPEI: | 927 | case ACPI_INTERRUPT_CPEI: |
988 | vector = IA64_CPE_VECTOR; | 928 | irq = vector = IA64_CPE_VECTOR; |
929 | BUG_ON(bind_irq_vector(irq, vector, CPU_MASK_ALL)); | ||
989 | delivery = IOSAPIC_LOWEST_PRIORITY; | 930 | delivery = IOSAPIC_LOWEST_PRIORITY; |
990 | mask = 1; | 931 | mask = 1; |
991 | break; | 932 | break; |
@@ -995,7 +936,7 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi, | |||
995 | return -1; | 936 | return -1; |
996 | } | 937 | } |
997 | 938 | ||
998 | register_intr(gsi, vector, delivery, polarity, trigger); | 939 | register_intr(gsi, irq, delivery, polarity, trigger); |
999 | 940 | ||
1000 | printk(KERN_INFO | 941 | printk(KERN_INFO |
1001 | "PLATFORM int %s (0x%x): GSI %u (%s, %s) -> CPU %d (0x%04x)" | 942 | "PLATFORM int %s (0x%x): GSI %u (%s, %s) -> CPU %d (0x%04x)" |
@@ -1005,7 +946,7 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi, | |||
1005 | (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), | 946 | (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), |
1006 | cpu_logical_id(dest), dest, vector); | 947 | cpu_logical_id(dest), dest, vector); |
1007 | 948 | ||
1008 | set_rte(gsi, vector, dest, mask); | 949 | set_rte(gsi, irq, dest, mask); |
1009 | return vector; | 950 | return vector; |
1010 | } | 951 | } |
1011 | 952 | ||
@@ -1017,30 +958,32 @@ iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, | |||
1017 | unsigned long polarity, | 958 | unsigned long polarity, |
1018 | unsigned long trigger) | 959 | unsigned long trigger) |
1019 | { | 960 | { |
1020 | int vector; | 961 | int vector, irq; |
1021 | unsigned int dest = cpu_physical_id(smp_processor_id()); | 962 | unsigned int dest = cpu_physical_id(smp_processor_id()); |
1022 | 963 | ||
1023 | vector = isa_irq_to_vector(isa_irq); | 964 | irq = vector = isa_irq_to_vector(isa_irq); |
1024 | 965 | BUG_ON(bind_irq_vector(irq, vector, CPU_MASK_ALL)); | |
1025 | register_intr(gsi, vector, IOSAPIC_LOWEST_PRIORITY, polarity, trigger); | 966 | register_intr(gsi, irq, IOSAPIC_LOWEST_PRIORITY, polarity, trigger); |
1026 | 967 | ||
1027 | DBG("ISA: IRQ %u -> GSI %u (%s,%s) -> CPU %d (0x%04x) vector %d\n", | 968 | DBG("ISA: IRQ %u -> GSI %u (%s,%s) -> CPU %d (0x%04x) vector %d\n", |
1028 | isa_irq, gsi, trigger == IOSAPIC_EDGE ? "edge" : "level", | 969 | isa_irq, gsi, trigger == IOSAPIC_EDGE ? "edge" : "level", |
1029 | polarity == IOSAPIC_POL_HIGH ? "high" : "low", | 970 | polarity == IOSAPIC_POL_HIGH ? "high" : "low", |
1030 | cpu_logical_id(dest), dest, vector); | 971 | cpu_logical_id(dest), dest, vector); |
1031 | 972 | ||
1032 | set_rte(gsi, vector, dest, 1); | 973 | set_rte(gsi, irq, dest, 1); |
1033 | } | 974 | } |
1034 | 975 | ||
1035 | void __init | 976 | void __init |
1036 | iosapic_system_init (int system_pcat_compat) | 977 | iosapic_system_init (int system_pcat_compat) |
1037 | { | 978 | { |
1038 | int vector; | 979 | int irq; |
1039 | 980 | ||
1040 | for (vector = 0; vector < IA64_NUM_VECTORS; ++vector) { | 981 | for (irq = 0; irq < NR_IRQS; ++irq) { |
1041 | iosapic_intr_info[vector].low32 = IOSAPIC_MASK; | 982 | iosapic_intr_info[irq].low32 = IOSAPIC_MASK; |
1042 | /* mark as unused */ | 983 | /* mark as unused */ |
1043 | INIT_LIST_HEAD(&iosapic_intr_info[vector].rtes); | 984 | INIT_LIST_HEAD(&iosapic_intr_info[irq].rtes); |
985 | |||
986 | iosapic_intr_info[irq].count = 0; | ||
1044 | } | 987 | } |
1045 | 988 | ||
1046 | pcat_compat = system_pcat_compat; | 989 | pcat_compat = system_pcat_compat; |
@@ -1108,31 +1051,35 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base) | |||
1108 | unsigned long flags; | 1051 | unsigned long flags; |
1109 | 1052 | ||
1110 | spin_lock_irqsave(&iosapic_lock, flags); | 1053 | spin_lock_irqsave(&iosapic_lock, flags); |
1111 | { | 1054 | index = find_iosapic(gsi_base); |
1112 | addr = ioremap(phys_addr, 0); | 1055 | if (index >= 0) { |
1113 | ver = iosapic_version(addr); | 1056 | spin_unlock_irqrestore(&iosapic_lock, flags); |
1057 | return -EBUSY; | ||
1058 | } | ||
1114 | 1059 | ||
1115 | if ((err = iosapic_check_gsi_range(gsi_base, ver))) { | 1060 | addr = ioremap(phys_addr, 0); |
1116 | iounmap(addr); | 1061 | ver = iosapic_version(addr); |
1117 | spin_unlock_irqrestore(&iosapic_lock, flags); | 1062 | if ((err = iosapic_check_gsi_range(gsi_base, ver))) { |
1118 | return err; | 1063 | iounmap(addr); |
1119 | } | 1064 | spin_unlock_irqrestore(&iosapic_lock, flags); |
1065 | return err; | ||
1066 | } | ||
1120 | 1067 | ||
1121 | /* | 1068 | /* |
1122 | * The MAX_REDIR register holds the highest input pin | 1069 | * The MAX_REDIR register holds the highest input pin number |
1123 | * number (starting from 0). | 1070 | * (starting from 0). We add 1 so that we can use it for |
1124 | * We add 1 so that we can use it for number of pins (= RTEs) | 1071 | * number of pins (= RTEs) |
1125 | */ | 1072 | */ |
1126 | num_rte = ((ver >> 16) & 0xff) + 1; | 1073 | num_rte = ((ver >> 16) & 0xff) + 1; |
1127 | 1074 | ||
1128 | index = iosapic_alloc(); | 1075 | index = iosapic_alloc(); |
1129 | iosapic_lists[index].addr = addr; | 1076 | iosapic_lists[index].addr = addr; |
1130 | iosapic_lists[index].gsi_base = gsi_base; | 1077 | iosapic_lists[index].gsi_base = gsi_base; |
1131 | iosapic_lists[index].num_rte = num_rte; | 1078 | iosapic_lists[index].num_rte = num_rte; |
1132 | #ifdef CONFIG_NUMA | 1079 | #ifdef CONFIG_NUMA |
1133 | iosapic_lists[index].node = MAX_NUMNODES; | 1080 | iosapic_lists[index].node = MAX_NUMNODES; |
1134 | #endif | 1081 | #endif |
1135 | } | 1082 | spin_lock_init(&iosapic_lists[index].lock); |
1136 | spin_unlock_irqrestore(&iosapic_lock, flags); | 1083 | spin_unlock_irqrestore(&iosapic_lock, flags); |
1137 | 1084 | ||
1138 | if ((gsi_base == 0) && pcat_compat) { | 1085 | if ((gsi_base == 0) && pcat_compat) { |
@@ -1157,25 +1104,22 @@ iosapic_remove (unsigned int gsi_base) | |||
1157 | unsigned long flags; | 1104 | unsigned long flags; |
1158 | 1105 | ||
1159 | spin_lock_irqsave(&iosapic_lock, flags); | 1106 | spin_lock_irqsave(&iosapic_lock, flags); |
1160 | { | 1107 | index = find_iosapic(gsi_base); |
1161 | index = find_iosapic(gsi_base); | 1108 | if (index < 0) { |
1162 | if (index < 0) { | 1109 | printk(KERN_WARNING "%s: No IOSAPIC for GSI base %u\n", |
1163 | printk(KERN_WARNING "%s: No IOSAPIC for GSI base %u\n", | 1110 | __FUNCTION__, gsi_base); |
1164 | __FUNCTION__, gsi_base); | 1111 | goto out; |
1165 | goto out; | 1112 | } |
1166 | } | ||
1167 | |||
1168 | if (iosapic_lists[index].rtes_inuse) { | ||
1169 | err = -EBUSY; | ||
1170 | printk(KERN_WARNING | ||
1171 | "%s: IOSAPIC for GSI base %u is busy\n", | ||
1172 | __FUNCTION__, gsi_base); | ||
1173 | goto out; | ||
1174 | } | ||
1175 | 1113 | ||
1176 | iounmap(iosapic_lists[index].addr); | 1114 | if (iosapic_lists[index].rtes_inuse) { |
1177 | iosapic_free(index); | 1115 | err = -EBUSY; |
1116 | printk(KERN_WARNING "%s: IOSAPIC for GSI base %u is busy\n", | ||
1117 | __FUNCTION__, gsi_base); | ||
1118 | goto out; | ||
1178 | } | 1119 | } |
1120 | |||
1121 | iounmap(iosapic_lists[index].addr); | ||
1122 | iosapic_free(index); | ||
1179 | out: | 1123 | out: |
1180 | spin_unlock_irqrestore(&iosapic_lock, flags); | 1124 | spin_unlock_irqrestore(&iosapic_lock, flags); |
1181 | return err; | 1125 | return err; |
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 407b45870489..cc3ee4ef37af 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c | |||
@@ -35,7 +35,7 @@ void ack_bad_irq(unsigned int irq) | |||
35 | #ifdef CONFIG_IA64_GENERIC | 35 | #ifdef CONFIG_IA64_GENERIC |
36 | unsigned int __ia64_local_vector_to_irq (ia64_vector vec) | 36 | unsigned int __ia64_local_vector_to_irq (ia64_vector vec) |
37 | { | 37 | { |
38 | return (unsigned int) vec; | 38 | return __get_cpu_var(vector_irq)[vec]; |
39 | } | 39 | } |
40 | #endif | 40 | #endif |
41 | 41 | ||
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c index bc47049f060f..91797c111162 100644 --- a/arch/ia64/kernel/irq_ia64.c +++ b/arch/ia64/kernel/irq_ia64.c | |||
@@ -46,6 +46,12 @@ | |||
46 | 46 | ||
47 | #define IRQ_DEBUG 0 | 47 | #define IRQ_DEBUG 0 |
48 | 48 | ||
49 | #define IRQ_VECTOR_UNASSIGNED (0) | ||
50 | |||
51 | #define IRQ_UNUSED (0) | ||
52 | #define IRQ_USED (1) | ||
53 | #define IRQ_RSVD (2) | ||
54 | |||
49 | /* These can be overridden in platform_irq_init */ | 55 | /* These can be overridden in platform_irq_init */ |
50 | int ia64_first_device_vector = IA64_DEF_FIRST_DEVICE_VECTOR; | 56 | int ia64_first_device_vector = IA64_DEF_FIRST_DEVICE_VECTOR; |
51 | int ia64_last_device_vector = IA64_DEF_LAST_DEVICE_VECTOR; | 57 | int ia64_last_device_vector = IA64_DEF_LAST_DEVICE_VECTOR; |
@@ -54,6 +60,8 @@ int ia64_last_device_vector = IA64_DEF_LAST_DEVICE_VECTOR; | |||
54 | void __iomem *ipi_base_addr = ((void __iomem *) | 60 | void __iomem *ipi_base_addr = ((void __iomem *) |
55 | (__IA64_UNCACHED_OFFSET | IA64_IPI_DEFAULT_BASE_ADDR)); | 61 | (__IA64_UNCACHED_OFFSET | IA64_IPI_DEFAULT_BASE_ADDR)); |
56 | 62 | ||
63 | static cpumask_t vector_allocation_domain(int cpu); | ||
64 | |||
57 | /* | 65 | /* |
58 | * Legacy IRQ to IA-64 vector translation table. | 66 | * Legacy IRQ to IA-64 vector translation table. |
59 | */ | 67 | */ |
@@ -64,46 +72,269 @@ __u8 isa_irq_to_vector_map[16] = { | |||
64 | }; | 72 | }; |
65 | EXPORT_SYMBOL(isa_irq_to_vector_map); | 73 | EXPORT_SYMBOL(isa_irq_to_vector_map); |
66 | 74 | ||
67 | static unsigned long ia64_vector_mask[BITS_TO_LONGS(IA64_MAX_DEVICE_VECTORS)]; | 75 | DEFINE_SPINLOCK(vector_lock); |
76 | |||
77 | struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = { | ||
78 | [0 ... NR_IRQS - 1] = { | ||
79 | .vector = IRQ_VECTOR_UNASSIGNED, | ||
80 | .domain = CPU_MASK_NONE | ||
81 | } | ||
82 | }; | ||
83 | |||
84 | DEFINE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq) = { | ||
85 | [0 ... IA64_NUM_VECTORS - 1] = IA64_SPURIOUS_INT_VECTOR | ||
86 | }; | ||
87 | |||
88 | static cpumask_t vector_table[IA64_MAX_DEVICE_VECTORS] = { | ||
89 | [0 ... IA64_MAX_DEVICE_VECTORS - 1] = CPU_MASK_NONE | ||
90 | }; | ||
91 | |||
92 | static int irq_status[NR_IRQS] = { | ||
93 | [0 ... NR_IRQS -1] = IRQ_UNUSED | ||
94 | }; | ||
95 | |||
96 | int check_irq_used(int irq) | ||
97 | { | ||
98 | if (irq_status[irq] == IRQ_USED) | ||
99 | return 1; | ||
100 | |||
101 | return -1; | ||
102 | } | ||
103 | |||
104 | static void reserve_irq(unsigned int irq) | ||
105 | { | ||
106 | unsigned long flags; | ||
107 | |||
108 | spin_lock_irqsave(&vector_lock, flags); | ||
109 | irq_status[irq] = IRQ_RSVD; | ||
110 | spin_unlock_irqrestore(&vector_lock, flags); | ||
111 | } | ||
112 | |||
113 | static inline int find_unassigned_irq(void) | ||
114 | { | ||
115 | int irq; | ||
116 | |||
117 | for (irq = IA64_FIRST_DEVICE_VECTOR; irq < NR_IRQS; irq++) | ||
118 | if (irq_status[irq] == IRQ_UNUSED) | ||
119 | return irq; | ||
120 | return -ENOSPC; | ||
121 | } | ||
122 | |||
123 | static inline int find_unassigned_vector(cpumask_t domain) | ||
124 | { | ||
125 | cpumask_t mask; | ||
126 | int pos; | ||
127 | |||
128 | cpus_and(mask, domain, cpu_online_map); | ||
129 | if (cpus_empty(mask)) | ||
130 | return -EINVAL; | ||
131 | |||
132 | for (pos = 0; pos < IA64_NUM_DEVICE_VECTORS; pos++) { | ||
133 | cpus_and(mask, domain, vector_table[pos]); | ||
134 | if (!cpus_empty(mask)) | ||
135 | continue; | ||
136 | return IA64_FIRST_DEVICE_VECTOR + pos; | ||
137 | } | ||
138 | return -ENOSPC; | ||
139 | } | ||
140 | |||
141 | static int __bind_irq_vector(int irq, int vector, cpumask_t domain) | ||
142 | { | ||
143 | cpumask_t mask; | ||
144 | int cpu, pos; | ||
145 | struct irq_cfg *cfg = &irq_cfg[irq]; | ||
146 | |||
147 | cpus_and(mask, domain, cpu_online_map); | ||
148 | if (cpus_empty(mask)) | ||
149 | return -EINVAL; | ||
150 | if ((cfg->vector == vector) && cpus_equal(cfg->domain, domain)) | ||
151 | return 0; | ||
152 | if (cfg->vector != IRQ_VECTOR_UNASSIGNED) | ||
153 | return -EBUSY; | ||
154 | for_each_cpu_mask(cpu, mask) | ||
155 | per_cpu(vector_irq, cpu)[vector] = irq; | ||
156 | cfg->vector = vector; | ||
157 | cfg->domain = domain; | ||
158 | irq_status[irq] = IRQ_USED; | ||
159 | pos = vector - IA64_FIRST_DEVICE_VECTOR; | ||
160 | cpus_or(vector_table[pos], vector_table[pos], domain); | ||
161 | return 0; | ||
162 | } | ||
163 | |||
164 | int bind_irq_vector(int irq, int vector, cpumask_t domain) | ||
165 | { | ||
166 | unsigned long flags; | ||
167 | int ret; | ||
168 | |||
169 | spin_lock_irqsave(&vector_lock, flags); | ||
170 | ret = __bind_irq_vector(irq, vector, domain); | ||
171 | spin_unlock_irqrestore(&vector_lock, flags); | ||
172 | return ret; | ||
173 | } | ||
174 | |||
175 | static void __clear_irq_vector(int irq) | ||
176 | { | ||
177 | int vector, cpu, pos; | ||
178 | cpumask_t mask; | ||
179 | cpumask_t domain; | ||
180 | struct irq_cfg *cfg = &irq_cfg[irq]; | ||
181 | |||
182 | BUG_ON((unsigned)irq >= NR_IRQS); | ||
183 | BUG_ON(cfg->vector == IRQ_VECTOR_UNASSIGNED); | ||
184 | vector = cfg->vector; | ||
185 | domain = cfg->domain; | ||
186 | cpus_and(mask, cfg->domain, cpu_online_map); | ||
187 | for_each_cpu_mask(cpu, mask) | ||
188 | per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR; | ||
189 | cfg->vector = IRQ_VECTOR_UNASSIGNED; | ||
190 | cfg->domain = CPU_MASK_NONE; | ||
191 | irq_status[irq] = IRQ_UNUSED; | ||
192 | pos = vector - IA64_FIRST_DEVICE_VECTOR; | ||
193 | cpus_andnot(vector_table[pos], vector_table[pos], domain); | ||
194 | } | ||
195 | |||
196 | static void clear_irq_vector(int irq) | ||
197 | { | ||
198 | unsigned long flags; | ||
199 | |||
200 | spin_lock_irqsave(&vector_lock, flags); | ||
201 | __clear_irq_vector(irq); | ||
202 | spin_unlock_irqrestore(&vector_lock, flags); | ||
203 | } | ||
68 | 204 | ||
69 | int | 205 | int |
70 | assign_irq_vector (int irq) | 206 | assign_irq_vector (int irq) |
71 | { | 207 | { |
72 | int pos, vector; | 208 | unsigned long flags; |
73 | again: | 209 | int vector, cpu; |
74 | pos = find_first_zero_bit(ia64_vector_mask, IA64_NUM_DEVICE_VECTORS); | 210 | cpumask_t domain; |
75 | vector = IA64_FIRST_DEVICE_VECTOR + pos; | 211 | |
76 | if (vector > IA64_LAST_DEVICE_VECTOR) | 212 | vector = -ENOSPC; |
77 | return -ENOSPC; | 213 | |
78 | if (test_and_set_bit(pos, ia64_vector_mask)) | 214 | spin_lock_irqsave(&vector_lock, flags); |
79 | goto again; | 215 | if (irq < 0) { |
216 | goto out; | ||
217 | } | ||
218 | for_each_online_cpu(cpu) { | ||
219 | domain = vector_allocation_domain(cpu); | ||
220 | vector = find_unassigned_vector(domain); | ||
221 | if (vector >= 0) | ||
222 | break; | ||
223 | } | ||
224 | if (vector < 0) | ||
225 | goto out; | ||
226 | BUG_ON(__bind_irq_vector(irq, vector, domain)); | ||
227 | out: | ||
228 | spin_unlock_irqrestore(&vector_lock, flags); | ||
80 | return vector; | 229 | return vector; |
81 | } | 230 | } |
82 | 231 | ||
83 | void | 232 | void |
84 | free_irq_vector (int vector) | 233 | free_irq_vector (int vector) |
85 | { | 234 | { |
86 | int pos; | 235 | if (vector < IA64_FIRST_DEVICE_VECTOR || |
87 | 236 | vector > IA64_LAST_DEVICE_VECTOR) | |
88 | if (vector < IA64_FIRST_DEVICE_VECTOR || vector > IA64_LAST_DEVICE_VECTOR) | ||
89 | return; | 237 | return; |
90 | 238 | clear_irq_vector(vector); | |
91 | pos = vector - IA64_FIRST_DEVICE_VECTOR; | ||
92 | if (!test_and_clear_bit(pos, ia64_vector_mask)) | ||
93 | printk(KERN_WARNING "%s: double free!\n", __FUNCTION__); | ||
94 | } | 239 | } |
95 | 240 | ||
96 | int | 241 | int |
97 | reserve_irq_vector (int vector) | 242 | reserve_irq_vector (int vector) |
98 | { | 243 | { |
99 | int pos; | ||
100 | |||
101 | if (vector < IA64_FIRST_DEVICE_VECTOR || | 244 | if (vector < IA64_FIRST_DEVICE_VECTOR || |
102 | vector > IA64_LAST_DEVICE_VECTOR) | 245 | vector > IA64_LAST_DEVICE_VECTOR) |
103 | return -EINVAL; | 246 | return -EINVAL; |
247 | return !!bind_irq_vector(vector, vector, CPU_MASK_ALL); | ||
248 | } | ||
104 | 249 | ||
105 | pos = vector - IA64_FIRST_DEVICE_VECTOR; | 250 | /* |
106 | return test_and_set_bit(pos, ia64_vector_mask); | 251 | * Initialize vector_irq on a new cpu. This function must be called |
252 | * with vector_lock held. | ||
253 | */ | ||
254 | void __setup_vector_irq(int cpu) | ||
255 | { | ||
256 | int irq, vector; | ||
257 | |||
258 | /* Clear vector_irq */ | ||
259 | for (vector = 0; vector < IA64_NUM_VECTORS; ++vector) | ||
260 | per_cpu(vector_irq, cpu)[vector] = IA64_SPURIOUS_INT_VECTOR; | ||
261 | /* Mark the inuse vectors */ | ||
262 | for (irq = 0; irq < NR_IRQS; ++irq) { | ||
263 | if (!cpu_isset(cpu, irq_cfg[irq].domain)) | ||
264 | continue; | ||
265 | vector = irq_to_vector(irq); | ||
266 | per_cpu(vector_irq, cpu)[vector] = irq; | ||
267 | } | ||
268 | } | ||
269 | |||
270 | #if defined(CONFIG_SMP) && (defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_DIG)) | ||
271 | static enum vector_domain_type { | ||
272 | VECTOR_DOMAIN_NONE, | ||
273 | VECTOR_DOMAIN_PERCPU | ||
274 | } vector_domain_type = VECTOR_DOMAIN_NONE; | ||
275 | |||
276 | static cpumask_t vector_allocation_domain(int cpu) | ||
277 | { | ||
278 | if (vector_domain_type == VECTOR_DOMAIN_PERCPU) | ||
279 | return cpumask_of_cpu(cpu); | ||
280 | return CPU_MASK_ALL; | ||
281 | } | ||
282 | |||
283 | static int __init parse_vector_domain(char *arg) | ||
284 | { | ||
285 | if (!arg) | ||
286 | return -EINVAL; | ||
287 | if (!strcmp(arg, "percpu")) { | ||
288 | vector_domain_type = VECTOR_DOMAIN_PERCPU; | ||
289 | no_int_routing = 1; | ||
290 | } | ||
291 | return 1; | ||
292 | } | ||
293 | early_param("vector", parse_vector_domain); | ||
294 | #else | ||
295 | static cpumask_t vector_allocation_domain(int cpu) | ||
296 | { | ||
297 | return CPU_MASK_ALL; | ||
298 | } | ||
299 | #endif | ||
300 | |||
301 | |||
302 | void destroy_and_reserve_irq(unsigned int irq) | ||
303 | { | ||
304 | dynamic_irq_cleanup(irq); | ||
305 | |||
306 | clear_irq_vector(irq); | ||
307 | reserve_irq(irq); | ||
308 | } | ||
309 | |||
310 | static int __reassign_irq_vector(int irq, int cpu) | ||
311 | { | ||
312 | struct irq_cfg *cfg = &irq_cfg[irq]; | ||
313 | int vector; | ||
314 | cpumask_t domain; | ||
315 | |||
316 | if (cfg->vector == IRQ_VECTOR_UNASSIGNED || !cpu_online(cpu)) | ||
317 | return -EINVAL; | ||
318 | if (cpu_isset(cpu, cfg->domain)) | ||
319 | return 0; | ||
320 | domain = vector_allocation_domain(cpu); | ||
321 | vector = find_unassigned_vector(domain); | ||
322 | if (vector < 0) | ||
323 | return -ENOSPC; | ||
324 | __clear_irq_vector(irq); | ||
325 | BUG_ON(__bind_irq_vector(irq, vector, domain)); | ||
326 | return 0; | ||
327 | } | ||
328 | |||
329 | int reassign_irq_vector(int irq, int cpu) | ||
330 | { | ||
331 | unsigned long flags; | ||
332 | int ret; | ||
333 | |||
334 | spin_lock_irqsave(&vector_lock, flags); | ||
335 | ret = __reassign_irq_vector(irq, cpu); | ||
336 | spin_unlock_irqrestore(&vector_lock, flags); | ||
337 | return ret; | ||
107 | } | 338 | } |
108 | 339 | ||
109 | /* | 340 | /* |
@@ -111,18 +342,35 @@ reserve_irq_vector (int vector) | |||
111 | */ | 342 | */ |
112 | int create_irq(void) | 343 | int create_irq(void) |
113 | { | 344 | { |
114 | int vector = assign_irq_vector(AUTO_ASSIGN); | 345 | unsigned long flags; |
115 | 346 | int irq, vector, cpu; | |
116 | if (vector >= 0) | 347 | cpumask_t domain; |
117 | dynamic_irq_init(vector); | 348 | |
118 | 349 | irq = vector = -ENOSPC; | |
119 | return vector; | 350 | spin_lock_irqsave(&vector_lock, flags); |
351 | for_each_online_cpu(cpu) { | ||
352 | domain = vector_allocation_domain(cpu); | ||
353 | vector = find_unassigned_vector(domain); | ||
354 | if (vector >= 0) | ||
355 | break; | ||
356 | } | ||
357 | if (vector < 0) | ||
358 | goto out; | ||
359 | irq = find_unassigned_irq(); | ||
360 | if (irq < 0) | ||
361 | goto out; | ||
362 | BUG_ON(__bind_irq_vector(irq, vector, domain)); | ||
363 | out: | ||
364 | spin_unlock_irqrestore(&vector_lock, flags); | ||
365 | if (irq >= 0) | ||
366 | dynamic_irq_init(irq); | ||
367 | return irq; | ||
120 | } | 368 | } |
121 | 369 | ||
122 | void destroy_irq(unsigned int irq) | 370 | void destroy_irq(unsigned int irq) |
123 | { | 371 | { |
124 | dynamic_irq_cleanup(irq); | 372 | dynamic_irq_cleanup(irq); |
125 | free_irq_vector(irq); | 373 | clear_irq_vector(irq); |
126 | } | 374 | } |
127 | 375 | ||
128 | #ifdef CONFIG_SMP | 376 | #ifdef CONFIG_SMP |
@@ -301,14 +549,13 @@ register_percpu_irq (ia64_vector vec, struct irqaction *action) | |||
301 | irq_desc_t *desc; | 549 | irq_desc_t *desc; |
302 | unsigned int irq; | 550 | unsigned int irq; |
303 | 551 | ||
304 | for (irq = 0; irq < NR_IRQS; ++irq) | 552 | irq = vec; |
305 | if (irq_to_vector(irq) == vec) { | 553 | BUG_ON(bind_irq_vector(irq, vec, CPU_MASK_ALL)); |
306 | desc = irq_desc + irq; | 554 | desc = irq_desc + irq; |
307 | desc->status |= IRQ_PER_CPU; | 555 | desc->status |= IRQ_PER_CPU; |
308 | desc->chip = &irq_type_ia64_lsapic; | 556 | desc->chip = &irq_type_ia64_lsapic; |
309 | if (action) | 557 | if (action) |
310 | setup_irq(irq, action); | 558 | setup_irq(irq, action); |
311 | } | ||
312 | } | 559 | } |
313 | 560 | ||
314 | void __init | 561 | void __init |
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index 5bc46f151344..5dc98b5abcfb 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c | |||
@@ -936,10 +936,15 @@ static void ia64_get_bsp_cfm(struct unw_frame_info *info, void *arg) | |||
936 | return; | 936 | return; |
937 | } | 937 | } |
938 | 938 | ||
939 | unsigned long arch_deref_entry_point(void *entry) | ||
940 | { | ||
941 | return ((struct fnptr *)entry)->ip; | ||
942 | } | ||
943 | |||
939 | int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) | 944 | int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) |
940 | { | 945 | { |
941 | struct jprobe *jp = container_of(p, struct jprobe, kp); | 946 | struct jprobe *jp = container_of(p, struct jprobe, kp); |
942 | unsigned long addr = ((struct fnptr *)(jp->entry))->ip; | 947 | unsigned long addr = arch_deref_entry_point(jp->entry); |
943 | struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); | 948 | struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); |
944 | struct param_bsp_cfm pa; | 949 | struct param_bsp_cfm pa; |
945 | int bytes; | 950 | int bytes; |
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c index c81080df70df..2fdbd5c3f213 100644 --- a/arch/ia64/kernel/msi_ia64.c +++ b/arch/ia64/kernel/msi_ia64.c | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | #define MSI_DATA_VECTOR_SHIFT 0 | 14 | #define MSI_DATA_VECTOR_SHIFT 0 |
15 | #define MSI_DATA_VECTOR(v) (((u8)v) << MSI_DATA_VECTOR_SHIFT) | 15 | #define MSI_DATA_VECTOR(v) (((u8)v) << MSI_DATA_VECTOR_SHIFT) |
16 | #define MSI_DATA_VECTOR_MASK 0xffffff00 | ||
16 | 17 | ||
17 | #define MSI_DATA_DELIVERY_SHIFT 8 | 18 | #define MSI_DATA_DELIVERY_SHIFT 8 |
18 | #define MSI_DATA_DELIVERY_FIXED (0 << MSI_DATA_DELIVERY_SHIFT) | 19 | #define MSI_DATA_DELIVERY_FIXED (0 << MSI_DATA_DELIVERY_SHIFT) |
@@ -50,17 +51,29 @@ static struct irq_chip ia64_msi_chip; | |||
50 | static void ia64_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask) | 51 | static void ia64_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask) |
51 | { | 52 | { |
52 | struct msi_msg msg; | 53 | struct msi_msg msg; |
53 | u32 addr; | 54 | u32 addr, data; |
55 | int cpu = first_cpu(cpu_mask); | ||
56 | |||
57 | if (!cpu_online(cpu)) | ||
58 | return; | ||
59 | |||
60 | if (reassign_irq_vector(irq, cpu)) | ||
61 | return; | ||
54 | 62 | ||
55 | read_msi_msg(irq, &msg); | 63 | read_msi_msg(irq, &msg); |
56 | 64 | ||
57 | addr = msg.address_lo; | 65 | addr = msg.address_lo; |
58 | addr &= MSI_ADDR_DESTID_MASK; | 66 | addr &= MSI_ADDR_DESTID_MASK; |
59 | addr |= MSI_ADDR_DESTID_CPU(cpu_physical_id(first_cpu(cpu_mask))); | 67 | addr |= MSI_ADDR_DESTID_CPU(cpu_physical_id(cpu)); |
60 | msg.address_lo = addr; | 68 | msg.address_lo = addr; |
61 | 69 | ||
70 | data = msg.data; | ||
71 | data &= MSI_DATA_VECTOR_MASK; | ||
72 | data |= MSI_DATA_VECTOR(irq_to_vector(irq)); | ||
73 | msg.data = data; | ||
74 | |||
62 | write_msi_msg(irq, &msg); | 75 | write_msi_msg(irq, &msg); |
63 | irq_desc[irq].affinity = cpu_mask; | 76 | irq_desc[irq].affinity = cpumask_of_cpu(cpu); |
64 | } | 77 | } |
65 | #endif /* CONFIG_SMP */ | 78 | #endif /* CONFIG_SMP */ |
66 | 79 | ||
@@ -69,13 +82,15 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) | |||
69 | struct msi_msg msg; | 82 | struct msi_msg msg; |
70 | unsigned long dest_phys_id; | 83 | unsigned long dest_phys_id; |
71 | int irq, vector; | 84 | int irq, vector; |
85 | cpumask_t mask; | ||
72 | 86 | ||
73 | irq = create_irq(); | 87 | irq = create_irq(); |
74 | if (irq < 0) | 88 | if (irq < 0) |
75 | return irq; | 89 | return irq; |
76 | 90 | ||
77 | set_irq_msi(irq, desc); | 91 | set_irq_msi(irq, desc); |
78 | dest_phys_id = cpu_physical_id(first_cpu(cpu_online_map)); | 92 | cpus_and(mask, irq_to_domain(irq), cpu_online_map); |
93 | dest_phys_id = cpu_physical_id(first_cpu(mask)); | ||
79 | vector = irq_to_vector(irq); | 94 | vector = irq_to_vector(irq); |
80 | 95 | ||
81 | msg.address_hi = 0; | 96 | msg.address_hi = 0; |
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index b3a47f986e1e..9f72838db26e 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c | |||
@@ -82,7 +82,7 @@ static volatile struct call_data_struct *call_data; | |||
82 | #define IPI_KDUMP_CPU_STOP 3 | 82 | #define IPI_KDUMP_CPU_STOP 3 |
83 | 83 | ||
84 | /* This needs to be cacheline aligned because it is written to by *other* CPUs. */ | 84 | /* This needs to be cacheline aligned because it is written to by *other* CPUs. */ |
85 | static DEFINE_PER_CPU(u64, ipi_operation) ____cacheline_aligned; | 85 | static DEFINE_PER_CPU_SHARED_ALIGNED(u64, ipi_operation); |
86 | 86 | ||
87 | extern void cpu_halt (void); | 87 | extern void cpu_halt (void); |
88 | 88 | ||
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 3c9d8e6089cf..9f5c90b594b9 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -395,9 +395,13 @@ smp_callin (void) | |||
395 | fix_b0_for_bsp(); | 395 | fix_b0_for_bsp(); |
396 | 396 | ||
397 | lock_ipi_calllock(); | 397 | lock_ipi_calllock(); |
398 | spin_lock(&vector_lock); | ||
399 | /* Setup the per cpu irq handling data structures */ | ||
400 | __setup_vector_irq(cpuid); | ||
398 | cpu_set(cpuid, cpu_online_map); | 401 | cpu_set(cpuid, cpu_online_map); |
399 | unlock_ipi_calllock(); | 402 | unlock_ipi_calllock(); |
400 | per_cpu(cpu_state, cpuid) = CPU_ONLINE; | 403 | per_cpu(cpu_state, cpuid) = CPU_ONLINE; |
404 | spin_unlock(&vector_lock); | ||
401 | 405 | ||
402 | smp_setup_percpu_timer(); | 406 | smp_setup_percpu_timer(); |
403 | 407 | ||
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 5a65965c8b53..860f251d2fc2 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
@@ -206,6 +206,7 @@ SECTIONS | |||
206 | { | 206 | { |
207 | __per_cpu_start = .; | 207 | __per_cpu_start = .; |
208 | *(.data.percpu) | 208 | *(.data.percpu) |
209 | *(.data.percpu.shared_aligned) | ||
209 | __per_cpu_end = .; | 210 | __per_cpu_end = .; |
210 | } | 211 | } |
211 | . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits | 212 | . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits |
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index b87f785c2416..73ccb6010c05 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c | |||
@@ -80,6 +80,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re | |||
80 | struct mm_struct *mm = current->mm; | 80 | struct mm_struct *mm = current->mm; |
81 | struct siginfo si; | 81 | struct siginfo si; |
82 | unsigned long mask; | 82 | unsigned long mask; |
83 | int fault; | ||
83 | 84 | ||
84 | /* mmap_sem is performance critical.... */ | 85 | /* mmap_sem is performance critical.... */ |
85 | prefetchw(&mm->mmap_sem); | 86 | prefetchw(&mm->mmap_sem); |
@@ -147,26 +148,25 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re | |||
147 | * sure we exit gracefully rather than endlessly redo the | 148 | * sure we exit gracefully rather than endlessly redo the |
148 | * fault. | 149 | * fault. |
149 | */ | 150 | */ |
150 | switch (handle_mm_fault(mm, vma, address, (mask & VM_WRITE) != 0)) { | 151 | fault = handle_mm_fault(mm, vma, address, (mask & VM_WRITE) != 0); |
151 | case VM_FAULT_MINOR: | 152 | if (unlikely(fault & VM_FAULT_ERROR)) { |
152 | ++current->min_flt; | ||
153 | break; | ||
154 | case VM_FAULT_MAJOR: | ||
155 | ++current->maj_flt; | ||
156 | break; | ||
157 | case VM_FAULT_SIGBUS: | ||
158 | /* | 153 | /* |
159 | * We ran out of memory, or some other thing happened | 154 | * We ran out of memory, or some other thing happened |
160 | * to us that made us unable to handle the page fault | 155 | * to us that made us unable to handle the page fault |
161 | * gracefully. | 156 | * gracefully. |
162 | */ | 157 | */ |
163 | signal = SIGBUS; | 158 | if (fault & VM_FAULT_OOM) { |
164 | goto bad_area; | 159 | goto out_of_memory; |
165 | case VM_FAULT_OOM: | 160 | } else if (fault & VM_FAULT_SIGBUS) { |
166 | goto out_of_memory; | 161 | signal = SIGBUS; |
167 | default: | 162 | goto bad_area; |
163 | } | ||
168 | BUG(); | 164 | BUG(); |
169 | } | 165 | } |
166 | if (fault & VM_FAULT_MAJOR) | ||
167 | current->maj_flt++; | ||
168 | else | ||
169 | current->min_flt++; | ||
170 | up_read(&mm->mmap_sem); | 170 | up_read(&mm->mmap_sem); |
171 | return; | 171 | return; |
172 | 172 | ||