commit fb7a0e36532bc231bea8adfb1dddc3961eb38940 · tjh.dev/kernel

+1 -1

arch/ia64/Kconfig

··· 220 220 221 221 config IA64_SGI_SN_SIM 222 222 bool "SGI Medusa Simulator Support" 223 - depends on IA64_SGI_SN2 223 + depends on IA64_SGI_SN2 || IA64_GENERIC 224 224 help 225 225 If you are compiling a kernel that will run under SGI's IA-64 226 226 simulator (Medusa) then say Y, otherwise say N.

+10 -9

arch/ia64/configs/tiger_defconfig

··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.12-rc3 4 - # Tue May 3 15:55:04 2005 3 + # Linux kernel version: 2.6.12-20050621 4 + # Tue Jun 21 14:03:24 2005 5 5 # 6 6 7 7 # ··· 67 67 CONFIG_TIME_INTERPOLATION=y 68 68 CONFIG_EFI=y 69 69 CONFIG_GENERIC_IOMAP=y 70 + CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 70 71 # CONFIG_IA64_GENERIC is not set 71 72 CONFIG_IA64_DIG=y 72 73 # CONFIG_IA64_HP_ZX1 is not set ··· 286 285 CONFIG_BLK_DEV_SR=m 287 286 # CONFIG_BLK_DEV_SR_VENDOR is not set 288 287 CONFIG_CHR_DEV_SG=m 288 + # CONFIG_CHR_DEV_SCH is not set 289 289 290 290 # 291 291 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs ··· 315 313 # CONFIG_MEGARAID_NEWGEN is not set 316 314 # CONFIG_MEGARAID_LEGACY is not set 317 315 # CONFIG_SCSI_SATA is not set 318 - # CONFIG_SCSI_BUSLOGIC is not set 319 316 # CONFIG_SCSI_DMX3191D is not set 320 - # CONFIG_SCSI_EATA is not set 321 317 # CONFIG_SCSI_FUTURE_DOMAIN is not set 322 - # CONFIG_SCSI_GDTH is not set 323 318 # CONFIG_SCSI_IPS is not set 324 319 # CONFIG_SCSI_INITIO is not set 325 320 # CONFIG_SCSI_INIA100 is not set ··· 365 366 # Fusion MPT device support 366 367 # 367 368 CONFIG_FUSION=y 368 - CONFIG_FUSION_MAX_SGE=40 369 - # CONFIG_FUSION_CTL is not set 369 + CONFIG_FUSION_SPI=y 370 + CONFIG_FUSION_FC=y 371 + CONFIG_FUSION_MAX_SGE=128 372 + CONFIG_FUSION_CTL=y 370 373 371 374 # 372 375 # IEEE 1394 (FireWire) support ··· 507 506 # CONFIG_HAMACHI is not set 508 507 # CONFIG_YELLOWFIN is not set 509 508 # CONFIG_R8169 is not set 509 + # CONFIG_SKGE is not set 510 510 # CONFIG_SK98LIN is not set 511 511 # CONFIG_VIA_VELOCITY is not set 512 512 CONFIG_TIGON3=y 513 + # CONFIG_BNX2 is not set 513 514 514 515 # 515 516 # Ethernet (10000 Mbit) ··· 601 598 # CONFIG_GAMEPORT_VORTEX is not set 602 599 # CONFIG_GAMEPORT_FM801 is not set 603 600 # CONFIG_GAMEPORT_CS461X is not set 604 - CONFIG_SOUND_GAMEPORT=m 605 601 606 602 # 607 603 # Character devices ··· 613 611 # CONFIG_CYCLADES is not set 614 612 # CONFIG_MOXA_SMARTIO is not set 615 613 # CONFIG_ISI is not set 616 - # CONFIG_SYNCLINK is not set 617 614 # CONFIG_SYNCLINKMP is not set 618 615 # CONFIG_N_HDLC is not set 619 616 # CONFIG_SPECIALIX is not set

+91 -47

arch/ia64/defconfig

··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.10 4 - # Thu Jan 6 11:13:13 2005 3 + # Linux kernel version: 2.6.12 4 + # Tue Jun 21 11:30:42 2005 5 5 # 6 6 7 7 # ··· 10 10 CONFIG_EXPERIMENTAL=y 11 11 CONFIG_CLEAN_COMPILE=y 12 12 CONFIG_LOCK_KERNEL=y 13 + CONFIG_INIT_ENV_ARG_LIMIT=32 13 14 14 15 # 15 16 # General setup ··· 22 21 # CONFIG_BSD_PROCESS_ACCT is not set 23 22 CONFIG_SYSCTL=y 24 23 # CONFIG_AUDIT is not set 25 - CONFIG_LOG_BUF_SHIFT=20 26 24 CONFIG_HOTPLUG=y 27 25 CONFIG_KOBJECT_UEVENT=y 28 26 CONFIG_IKCONFIG=y 29 27 CONFIG_IKCONFIG_PROC=y 28 + # CONFIG_CPUSETS is not set 30 29 # CONFIG_EMBEDDED is not set 31 30 CONFIG_KALLSYMS=y 32 31 CONFIG_KALLSYMS_ALL=y 33 32 # CONFIG_KALLSYMS_EXTRA_PASS is not set 33 + CONFIG_PRINTK=y 34 + CONFIG_BUG=y 35 + CONFIG_BASE_FULL=y 34 36 CONFIG_FUTEX=y 35 37 CONFIG_EPOLL=y 36 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 37 38 CONFIG_SHMEM=y 38 39 CONFIG_CC_ALIGN_FUNCTIONS=0 39 40 CONFIG_CC_ALIGN_LABELS=0 40 41 CONFIG_CC_ALIGN_LOOPS=0 41 42 CONFIG_CC_ALIGN_JUMPS=0 42 43 # CONFIG_TINY_SHMEM is not set 44 + CONFIG_BASE_SMALL=0 43 45 44 46 # 45 47 # Loadable module support ··· 67 63 CONFIG_TIME_INTERPOLATION=y 68 64 CONFIG_EFI=y 69 65 CONFIG_GENERIC_IOMAP=y 66 + CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 70 67 CONFIG_IA64_GENERIC=y 71 68 # CONFIG_IA64_DIG is not set 72 69 # CONFIG_IA64_HP_ZX1 is not set 70 + # CONFIG_IA64_HP_ZX1_SWIOTLB is not set 73 71 # CONFIG_IA64_SGI_SN2 is not set 74 72 # CONFIG_IA64_HP_SIM is not set 75 73 # CONFIG_ITANIUM is not set ··· 83 77 CONFIG_IA64_L1_CACHE_SHIFT=7 84 78 CONFIG_NUMA=y 85 79 CONFIG_VIRTUAL_MEM_MAP=y 80 + CONFIG_HOLES_IN_ZONE=y 86 81 CONFIG_DISCONTIGMEM=y 87 82 CONFIG_IA64_CYCLONE=y 88 83 CONFIG_IOSAPIC=y ··· 91 84 CONFIG_SMP=y 92 85 CONFIG_NR_CPUS=512 93 86 CONFIG_HOTPLUG_CPU=y 87 + # CONFIG_SCHED_SMT is not set 94 88 # CONFIG_PREEMPT is not set 95 89 CONFIG_HAVE_DEC_LOCK=y 96 90 CONFIG_IA32_SUPPORT=y ··· 143 135 # CONFIG_PCI_MSI is not set 144 136 CONFIG_PCI_LEGACY_PROC=y 145 137 CONFIG_PCI_NAMES=y 138 + # CONFIG_PCI_DEBUG is not set 146 139 147 140 # 148 141 # PCI Hotplug Support ··· 153 144 CONFIG_HOTPLUG_PCI_ACPI=m 154 145 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set 155 146 # CONFIG_HOTPLUG_PCI_CPCI is not set 156 - # CONFIG_HOTPLUG_PCI_PCIE is not set 157 147 # CONFIG_HOTPLUG_PCI_SHPC is not set 158 148 159 149 # 160 150 # PCCARD (PCMCIA/CardBus) support 161 151 # 162 152 # CONFIG_PCCARD is not set 163 - 164 - # 165 - # PC-card bridges 166 - # 167 153 168 154 # 169 155 # Device Drivers ··· 194 190 # CONFIG_BLK_CPQ_CISS_DA is not set 195 191 # CONFIG_BLK_DEV_DAC960 is not set 196 192 # CONFIG_BLK_DEV_UMEM is not set 193 + # CONFIG_BLK_DEV_COW_COMMON is not set 197 194 CONFIG_BLK_DEV_LOOP=m 198 195 CONFIG_BLK_DEV_CRYPTOLOOP=m 199 196 CONFIG_BLK_DEV_NBD=m ··· 214 209 CONFIG_IOSCHED_AS=y 215 210 CONFIG_IOSCHED_DEADLINE=y 216 211 CONFIG_IOSCHED_CFQ=y 212 + # CONFIG_ATA_OVER_ETH is not set 217 213 218 214 # 219 215 # ATA/ATAPI/MFM/RLL support ··· 289 283 CONFIG_BLK_DEV_SR=m 290 284 # CONFIG_BLK_DEV_SR_VENDOR is not set 291 285 CONFIG_CHR_DEV_SG=m 286 + # CONFIG_CHR_DEV_SCH is not set 292 287 293 288 # 294 289 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs ··· 317 310 # CONFIG_SCSI_AIC79XX is not set 318 311 # CONFIG_MEGARAID_NEWGEN is not set 319 312 # CONFIG_MEGARAID_LEGACY is not set 320 - # CONFIG_SCSI_SATA is not set 321 - # CONFIG_SCSI_BUSLOGIC is not set 313 + CONFIG_SCSI_SATA=y 314 + # CONFIG_SCSI_SATA_AHCI is not set 315 + # CONFIG_SCSI_SATA_SVW is not set 316 + # CONFIG_SCSI_ATA_PIIX is not set 317 + # CONFIG_SCSI_SATA_NV is not set 318 + # CONFIG_SCSI_SATA_PROMISE is not set 319 + # CONFIG_SCSI_SATA_QSTOR is not set 320 + # CONFIG_SCSI_SATA_SX4 is not set 321 + # CONFIG_SCSI_SATA_SIL is not set 322 + # CONFIG_SCSI_SATA_SIS is not set 323 + # CONFIG_SCSI_SATA_ULI is not set 324 + # CONFIG_SCSI_SATA_VIA is not set 325 + CONFIG_SCSI_SATA_VITESSE=y 322 326 # CONFIG_SCSI_DMX3191D is not set 323 - # CONFIG_SCSI_EATA is not set 324 - # CONFIG_SCSI_EATA_PIO is not set 325 327 # CONFIG_SCSI_FUTURE_DOMAIN is not set 326 - # CONFIG_SCSI_GDTH is not set 327 328 # CONFIG_SCSI_IPS is not set 328 329 # CONFIG_SCSI_INITIO is not set 329 330 # CONFIG_SCSI_INIA100 is not set ··· 341 326 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 342 327 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 343 328 # CONFIG_SCSI_IPR is not set 344 - # CONFIG_SCSI_QLOGIC_ISP is not set 345 329 CONFIG_SCSI_QLOGIC_FC=y 346 330 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set 347 331 CONFIG_SCSI_QLOGIC_1280=y ··· 351 337 CONFIG_SCSI_QLA2300=m 352 338 CONFIG_SCSI_QLA2322=m 353 339 # CONFIG_SCSI_QLA6312 is not set 340 + # CONFIG_SCSI_LPFC is not set 354 341 # CONFIG_SCSI_DC395x is not set 355 342 # CONFIG_SCSI_DC390T is not set 356 343 # CONFIG_SCSI_DEBUG is not set ··· 374 359 CONFIG_DM_SNAPSHOT=m 375 360 CONFIG_DM_MIRROR=m 376 361 CONFIG_DM_ZERO=m 362 + CONFIG_DM_MULTIPATH=m 363 + # CONFIG_DM_MULTIPATH_EMC is not set 377 364 378 365 # 379 366 # Fusion MPT device support 380 367 # 381 368 CONFIG_FUSION=y 382 - CONFIG_FUSION_MAX_SGE=40 369 + CONFIG_FUSION_SPI=y 370 + CONFIG_FUSION_FC=m 371 + CONFIG_FUSION_MAX_SGE=128 383 372 # CONFIG_FUSION_CTL is not set 384 373 385 374 # ··· 406 387 # 407 388 CONFIG_PACKET=y 408 389 # CONFIG_PACKET_MMAP is not set 409 - CONFIG_NETLINK_DEV=y 410 390 CONFIG_UNIX=y 411 391 # CONFIG_NET_KEY is not set 412 392 CONFIG_INET=y ··· 465 447 # CONFIG_BONDING is not set 466 448 # CONFIG_EQUALIZER is not set 467 449 # CONFIG_TUN is not set 468 - # CONFIG_ETHERTAP is not set 469 450 470 451 # 471 452 # ARCnet devices ··· 501 484 # CONFIG_FORCEDETH is not set 502 485 # CONFIG_DGRS is not set 503 486 CONFIG_EEPRO100=m 504 - # CONFIG_EEPRO100_PIO is not set 505 487 CONFIG_E100=m 506 - # CONFIG_E100_NAPI is not set 507 488 # CONFIG_FEALNX is not set 508 489 # CONFIG_NATSEMI is not set 509 490 # CONFIG_NE2K_PCI is not set ··· 523 508 # CONFIG_HAMACHI is not set 524 509 # CONFIG_YELLOWFIN is not set 525 510 # CONFIG_R8169 is not set 511 + # CONFIG_SKGE is not set 526 512 # CONFIG_SK98LIN is not set 527 513 # CONFIG_VIA_VELOCITY is not set 528 514 CONFIG_TIGON3=y 515 + # CONFIG_BNX2 is not set 529 516 530 517 # 531 518 # Ethernet (10000 Mbit) ··· 585 568 # CONFIG_INPUT_EVBUG is not set 586 569 587 570 # 588 - # Input I/O drivers 589 - # 590 - CONFIG_GAMEPORT=m 591 - CONFIG_SOUND_GAMEPORT=m 592 - # CONFIG_GAMEPORT_NS558 is not set 593 - # CONFIG_GAMEPORT_L4 is not set 594 - # CONFIG_GAMEPORT_EMU10K1 is not set 595 - # CONFIG_GAMEPORT_VORTEX is not set 596 - # CONFIG_GAMEPORT_FM801 is not set 597 - # CONFIG_GAMEPORT_CS461x is not set 598 - CONFIG_SERIO=y 599 - CONFIG_SERIO_I8042=y 600 - # CONFIG_SERIO_SERPORT is not set 601 - # CONFIG_SERIO_CT82C710 is not set 602 - # CONFIG_SERIO_PCIPS2 is not set 603 - CONFIG_SERIO_LIBPS2=y 604 - # CONFIG_SERIO_RAW is not set 605 - 606 - # 607 571 # Input Device Drivers 608 572 # 609 573 CONFIG_INPUT_KEYBOARD=y ··· 602 604 # CONFIG_INPUT_MISC is not set 603 605 604 606 # 607 + # Hardware I/O ports 608 + # 609 + CONFIG_SERIO=y 610 + CONFIG_SERIO_I8042=y 611 + # CONFIG_SERIO_SERPORT is not set 612 + # CONFIG_SERIO_PCIPS2 is not set 613 + CONFIG_SERIO_LIBPS2=y 614 + # CONFIG_SERIO_RAW is not set 615 + CONFIG_GAMEPORT=m 616 + # CONFIG_GAMEPORT_NS558 is not set 617 + # CONFIG_GAMEPORT_L4 is not set 618 + # CONFIG_GAMEPORT_EMU10K1 is not set 619 + # CONFIG_GAMEPORT_VORTEX is not set 620 + # CONFIG_GAMEPORT_FM801 is not set 621 + # CONFIG_GAMEPORT_CS461X is not set 622 + 623 + # 605 624 # Character devices 606 625 # 607 626 CONFIG_VT=y ··· 628 613 # CONFIG_ROCKETPORT is not set 629 614 # CONFIG_CYCLADES is not set 630 615 # CONFIG_MOXA_SMARTIO is not set 631 - # CONFIG_SYNCLINK is not set 616 + # CONFIG_ISI is not set 632 617 # CONFIG_SYNCLINKMP is not set 633 618 # CONFIG_N_HDLC is not set 619 + # CONFIG_SPECIALIX is not set 620 + # CONFIG_SX is not set 634 621 # CONFIG_STALDRV is not set 635 622 CONFIG_SGI_SNSC=y 623 + CONFIG_SGI_TIOCX=y 624 + CONFIG_SGI_MBCS=m 636 625 637 626 # 638 627 # Serial drivers ··· 658 639 CONFIG_SERIAL_CORE_CONSOLE=y 659 640 CONFIG_SERIAL_SGI_L1_CONSOLE=y 660 641 CONFIG_SERIAL_SGI_IOC4=y 642 + # CONFIG_SERIAL_JSM is not set 661 643 CONFIG_UNIX98_PTYS=y 662 644 CONFIG_LEGACY_PTYS=y 663 645 CONFIG_LEGACY_PTY_COUNT=256 ··· 684 664 CONFIG_AGP=m 685 665 CONFIG_AGP_I460=m 686 666 CONFIG_AGP_HP_ZX1=m 667 + CONFIG_AGP_SGI_TIOCA=m 687 668 CONFIG_DRM=m 688 669 CONFIG_DRM_TDFX=m 689 670 CONFIG_DRM_R128=m ··· 696 675 # CONFIG_HPET_RTC_IRQ is not set 697 676 CONFIG_HPET_MMAP=y 698 677 CONFIG_MAX_RAW_DEVS=256 678 + # CONFIG_HANGCHECK_TIMER is not set 699 679 CONFIG_MMTIMER=y 680 + 681 + # 682 + # TPM devices 683 + # 684 + # CONFIG_TCG_TPM is not set 700 685 701 686 # 702 687 # I2C support ··· 788 761 CONFIG_SND_CS46XX_NEW_DSP=y 789 762 CONFIG_SND_CS4281=m 790 763 CONFIG_SND_EMU10K1=m 764 + # CONFIG_SND_EMU10K1X is not set 765 + # CONFIG_SND_CA0106 is not set 791 766 # CONFIG_SND_KORG1212 is not set 792 767 # CONFIG_SND_MIXART is not set 793 768 # CONFIG_SND_NM256 is not set ··· 814 785 # CONFIG_SND_INTEL8X0M is not set 815 786 # CONFIG_SND_SONICVIBES is not set 816 787 # CONFIG_SND_VIA82XX is not set 788 + # CONFIG_SND_VIA82XX_MODEM is not set 817 789 # CONFIG_SND_VX222 is not set 790 + # CONFIG_SND_HDA_INTEL is not set 818 791 819 792 # 820 793 # USB devices 821 794 # 822 795 # CONFIG_SND_USB_AUDIO is not set 823 - # CONFIG_SND_USB_USX2Y is not set 824 796 825 797 # 826 798 # Open Sound System ··· 831 801 # 832 802 # USB support 833 803 # 804 + CONFIG_USB_ARCH_HAS_HCD=y 805 + CONFIG_USB_ARCH_HAS_OHCI=y 834 806 CONFIG_USB=m 835 807 # CONFIG_USB_DEBUG is not set 836 808 ··· 844 812 # CONFIG_USB_DYNAMIC_MINORS is not set 845 813 # CONFIG_USB_SUSPEND is not set 846 814 # CONFIG_USB_OTG is not set 847 - CONFIG_USB_ARCH_HAS_HCD=y 848 - CONFIG_USB_ARCH_HAS_OHCI=y 849 815 850 816 # 851 817 # USB Host Controller Drivers ··· 852 822 # CONFIG_USB_EHCI_SPLIT_ISO is not set 853 823 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set 854 824 CONFIG_USB_OHCI_HCD=m 825 + # CONFIG_USB_OHCI_BIG_ENDIAN is not set 826 + CONFIG_USB_OHCI_LITTLE_ENDIAN=y 855 827 CONFIG_USB_UHCI_HCD=m 856 828 # CONFIG_USB_SL811_HCD is not set 857 829 ··· 871 839 # 872 840 CONFIG_USB_STORAGE=m 873 841 # CONFIG_USB_STORAGE_DEBUG is not set 874 - # CONFIG_USB_STORAGE_RW_DETECT is not set 875 842 # CONFIG_USB_STORAGE_DATAFAB is not set 876 843 # CONFIG_USB_STORAGE_FREECOM is not set 877 844 # CONFIG_USB_STORAGE_ISD200 is not set 878 845 # CONFIG_USB_STORAGE_DPCM is not set 879 - # CONFIG_USB_STORAGE_HP8200e is not set 846 + # CONFIG_USB_STORAGE_USBAT is not set 880 847 # CONFIG_USB_STORAGE_SDDR09 is not set 881 848 # CONFIG_USB_STORAGE_SDDR55 is not set 882 849 # CONFIG_USB_STORAGE_JUMPSHOT is not set ··· 925 894 # CONFIG_USB_PEGASUS is not set 926 895 # CONFIG_USB_RTL8150 is not set 927 896 # CONFIG_USB_USBNET is not set 897 + CONFIG_USB_MON=m 928 898 929 899 # 930 900 # USB port drivers ··· 941 909 # 942 910 # CONFIG_USB_EMI62 is not set 943 911 # CONFIG_USB_EMI26 is not set 944 - # CONFIG_USB_TIGL is not set 945 912 # CONFIG_USB_AUERSWALD is not set 946 913 # CONFIG_USB_RIO500 is not set 947 914 # CONFIG_USB_LEGOTOWER is not set ··· 949 918 # CONFIG_USB_CYTHERM is not set 950 919 # CONFIG_USB_PHIDGETKIT is not set 951 920 # CONFIG_USB_PHIDGETSERVO is not set 921 + # CONFIG_USB_IDMOUSE is not set 922 + # CONFIG_USB_SISUSBVGA is not set 952 923 # CONFIG_USB_TEST is not set 953 924 954 925 # ··· 1003 970 CONFIG_REISERFS_FS_SECURITY=y 1004 971 # CONFIG_JFS_FS is not set 1005 972 CONFIG_FS_POSIX_ACL=y 973 + 974 + # 975 + # XFS support 976 + # 1006 977 CONFIG_XFS_FS=y 978 + CONFIG_XFS_EXPORT=y 1007 979 # CONFIG_XFS_RT is not set 1008 980 # CONFIG_XFS_QUOTA is not set 1009 981 # CONFIG_XFS_SECURITY is not set ··· 1086 1048 CONFIG_NFSD_TCP=y 1087 1049 CONFIG_LOCKD=m 1088 1050 CONFIG_LOCKD_V4=y 1089 - CONFIG_EXPORTFS=m 1051 + CONFIG_EXPORTFS=y 1090 1052 CONFIG_SUNRPC=m 1091 1053 CONFIG_SUNRPC_GSS=m 1092 1054 CONFIG_RPCSEC_GSS_KRB5=m ··· 1172 1134 # CONFIG_CRC_CCITT is not set 1173 1135 CONFIG_CRC32=y 1174 1136 # CONFIG_LIBCRC32C is not set 1137 + CONFIG_GENERIC_HARDIRQS=y 1138 + CONFIG_GENERIC_IRQ_PROBE=y 1175 1139 1176 1140 # 1177 1141 # HP Simulator drivers ··· 1190 1150 # 1191 1151 # Kernel hacking 1192 1152 # 1153 + # CONFIG_PRINTK_TIME is not set 1193 1154 CONFIG_DEBUG_KERNEL=y 1194 1155 CONFIG_MAGIC_SYSRQ=y 1156 + CONFIG_LOG_BUF_SHIFT=20 1195 1157 # CONFIG_SCHEDSTATS is not set 1196 1158 # CONFIG_DEBUG_SLAB is not set 1197 1159 # CONFIG_DEBUG_SPINLOCK is not set 1198 1160 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1199 1161 # CONFIG_DEBUG_KOBJECT is not set 1200 1162 # CONFIG_DEBUG_INFO is not set 1163 + # CONFIG_DEBUG_FS is not set 1201 1164 CONFIG_IA64_GRANULE_16MB=y 1202 1165 # CONFIG_IA64_GRANULE_64MB is not set 1203 1166 # CONFIG_IA64_PRINT_HAZARDS is not set ··· 1227 1184 # CONFIG_CRYPTO_SHA256 is not set 1228 1185 # CONFIG_CRYPTO_SHA512 is not set 1229 1186 # CONFIG_CRYPTO_WP512 is not set 1187 + # CONFIG_CRYPTO_TGR192 is not set 1230 1188 CONFIG_CRYPTO_DES=m 1231 1189 # CONFIG_CRYPTO_BLOWFISH is not set 1232 1190 # CONFIG_CRYPTO_TWOFISH is not set

+1 -1

arch/ia64/kernel/entry.h

··· 60 60 .spillsp @priunat,SW(AR_UNAT)+16+(off); \ 61 61 .spillsp ar.rnat,SW(AR_RNAT)+16+(off); \ 62 62 .spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off); \ 63 - .spillsp pr,SW(PR)+16+(off)) 63 + .spillsp pr,SW(PR)+16+(off) 64 64 65 65 #define DO_SAVE_SWITCH_STACK \ 66 66 movl r28=1f; \

+9 -4

arch/ia64/kernel/ivt.S

··· 405 405 * r30: continuation address 406 406 * r31: saved pr 407 407 * 408 - * Clobbered: b0, r18, r19, r21, psr.dt (cleared) 408 + * Clobbered: b0, r18, r19, r21, r22, psr.dt (cleared) 409 409 */ 410 410 rsm psr.dt // switch to using physical data addressing 411 411 mov r19=IA64_KR(PT_BASE) // get the page table base address 412 412 shl r21=r16,3 // shift bit 60 into sign bit 413 + mov r18=cr.itir 413 414 ;; 414 415 shr.u r17=r16,61 // get the region number into r17 416 + extr.u r18=r18,2,6 // get the faulting page size 415 417 ;; 416 418 cmp.eq p6,p7=5,r17 // is faulting address in region 5? 417 - shr.u r18=r16,PGDIR_SHIFT // get bits 33-63 of faulting address 419 + add r22=-PAGE_SHIFT,r18 // adjustment for hugetlb address 420 + add r18=PGDIR_SHIFT-PAGE_SHIFT,r18 418 421 ;; 422 + shr.u r22=r16,r22 423 + shr.u r18=r16,r18 419 424 (p7) dep r17=r17,r19,(PAGE_SHIFT-3),3 // put region number bits in place 420 425 421 426 srlz.d ··· 433 428 (p6) dep r17=r18,r19,3,(PAGE_SHIFT-3) // r17=PTA + IFA(33,42)*8 434 429 (p7) dep r17=r18,r17,3,(PAGE_SHIFT-6) // r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8) 435 430 cmp.eq p7,p6=0,r21 // unused address bits all zeroes? 436 - shr.u r18=r16,PMD_SHIFT // shift L2 index into position 431 + shr.u r18=r22,PMD_SHIFT // shift L2 index into position 437 432 ;; 438 433 ld8 r17=[r17] // fetch the L1 entry (may be 0) 439 434 ;; ··· 441 436 dep r17=r18,r17,3,(PAGE_SHIFT-3) // compute address of L2 page table entry 442 437 ;; 443 438 (p7) ld8 r17=[r17] // fetch the L2 entry (may be 0) 444 - shr.u r19=r16,PAGE_SHIFT // shift L3 index into position 439 + shr.u r19=r22,PAGE_SHIFT // shift L3 index into position 445 440 ;; 446 441 (p7) cmp.eq.or.andcm p6,p7=r17,r0 // was L2 entry NULL? 447 442 dep r17=r19,r17,3,(PAGE_SHIFT-3) // compute address of L3 page table entry

+10 -5

arch/ia64/kernel/ptrace.c

··· 945 945 *data = (pt->cr_ipsr & IPSR_MASK); 946 946 return 0; 947 947 948 + case PT_AR_RSC: 949 + if (write_access) 950 + pt->ar_rsc = *data | (3 << 2); /* force PL3 */ 951 + else 952 + *data = pt->ar_rsc; 953 + return 0; 954 + 948 955 case PT_AR_RNAT: 949 956 urbs_end = ia64_get_user_rbs_end(child, pt, NULL); 950 957 rnat_addr = (long) ia64_rse_rnat_addr((long *) ··· 1002 995 break; 1003 996 case PT_AR_BSPSTORE: 1004 997 ptr = pt_reg_addr(pt, ar_bspstore); 1005 - break; 1006 - case PT_AR_RSC: 1007 - ptr = pt_reg_addr(pt, ar_rsc); 1008 998 break; 1009 999 case PT_AR_UNAT: 1010 1000 ptr = pt_reg_addr(pt, ar_unat); ··· 1238 1234 static long 1239 1235 ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr) 1240 1236 { 1241 - unsigned long psr, ec, lc, rnat, bsp, cfm, nat_bits, val = 0; 1237 + unsigned long psr, rsc, ec, lc, rnat, bsp, cfm, nat_bits, val = 0; 1242 1238 struct unw_frame_info info; 1243 1239 struct switch_stack *sw; 1244 1240 struct ia64_fpreg fpval; ··· 1271 1267 /* app regs */ 1272 1268 1273 1269 retval |= __get_user(pt->ar_pfs, &ppr->ar[PT_AUR_PFS]); 1274 - retval |= __get_user(pt->ar_rsc, &ppr->ar[PT_AUR_RSC]); 1270 + retval |= __get_user(rsc, &ppr->ar[PT_AUR_RSC]); 1275 1271 retval |= __get_user(pt->ar_bspstore, &ppr->ar[PT_AUR_BSPSTORE]); 1276 1272 retval |= __get_user(pt->ar_unat, &ppr->ar[PT_AUR_UNAT]); 1277 1273 retval |= __get_user(pt->ar_ccv, &ppr->ar[PT_AUR_CCV]); ··· 1369 1365 retval |= __get_user(nat_bits, &ppr->nat); 1370 1366 1371 1367 retval |= access_uarea(child, PT_CR_IPSR, &psr, 1); 1368 + retval |= access_uarea(child, PT_AR_RSC, &rsc, 1); 1372 1369 retval |= access_uarea(child, PT_AR_EC, &ec, 1); 1373 1370 retval |= access_uarea(child, PT_AR_LC, &lc, 1); 1374 1371 retval |= access_uarea(child, PT_AR_RNAT, &rnat, 1);

+3 -2

arch/ia64/kernel/signal.c

··· 94 94 static long 95 95 restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr) 96 96 { 97 - unsigned long ip, flags, nat, um, cfm; 97 + unsigned long ip, flags, nat, um, cfm, rsc; 98 98 long err; 99 99 100 100 /* Always make any pending restarted system calls return -EINTR */ ··· 106 106 err |= __get_user(ip, &sc->sc_ip); /* instruction pointer */ 107 107 err |= __get_user(cfm, &sc->sc_cfm); 108 108 err |= __get_user(um, &sc->sc_um); /* user mask */ 109 - err |= __get_user(scr->pt.ar_rsc, &sc->sc_ar_rsc); 109 + err |= __get_user(rsc, &sc->sc_ar_rsc); 110 110 err |= __get_user(scr->pt.ar_unat, &sc->sc_ar_unat); 111 111 err |= __get_user(scr->pt.ar_fpsr, &sc->sc_ar_fpsr); 112 112 err |= __get_user(scr->pt.ar_pfs, &sc->sc_ar_pfs); ··· 119 119 err |= __copy_from_user(&scr->pt.r15, &sc->sc_gr[15], 8); /* r15 */ 120 120 121 121 scr->pt.cr_ifs = cfm | (1UL << 63); 122 + scr->pt.ar_rsc = rsc | (3 << 2); /* force PL3 */ 122 123 123 124 /* establish new instruction pointer: */ 124 125 scr->pt.cr_iip = ip & ~0x3UL;

+1 -1

arch/ia64/kernel/smp.c

··· 269 269 int me = get_cpu(); /* prevent preemption and reschedule on another processor */ 270 270 271 271 if (cpuid == me) { 272 - printk("%s: trying to call self\n", __FUNCTION__); 272 + printk(KERN_INFO "%s: trying to call self\n", __FUNCTION__); 273 273 put_cpu(); 274 274 return -EBUSY; 275 275 }

-20

arch/ia64/pci/pci.c

··· 33 33 #include <asm/hw_irq.h> 34 34 35 35 36 - static int pci_routeirq; 37 - 38 36 /* 39 37 * Low-level SAL-based PCI configuration access functions. Note that SAL 40 38 * calls are already serialized (via sal_lock), so we don't need another ··· 137 139 static int __init 138 140 pci_acpi_init (void) 139 141 { 140 - struct pci_dev *dev = NULL; 141 - 142 - printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n"); 143 - 144 142 acpi_map_iosapics(); 145 - 146 - if (pci_routeirq) { 147 - /* 148 - * PCI IRQ routing is set up by pci_enable_device(), but we 149 - * also do it here in case there are still broken drivers that 150 - * don't use pci_enable_device(). 151 - */ 152 - printk(KERN_INFO "PCI: Routing interrupts for all devices because \"pci=routeirq\" specified\n"); 153 - for_each_pci_dev(dev) 154 - acpi_pci_irq_enable(dev); 155 - } else 156 - printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\". If it helps, post a report\n"); 157 143 158 144 return 0; 159 145 } ··· 482 500 char * __init 483 501 pcibios_setup (char *str) 484 502 { 485 - if (!strcmp(str, "routeirq")) 486 - pci_routeirq = 1; 487 503 return NULL; 488 504 } 489 505

+1 -1

include/linux/efi.h

··· 315 315 */ 316 316 static inline int efi_range_is_wc(unsigned long start, unsigned long len) 317 317 { 318 - int i; 318 + unsigned long i; 319 319 320 320 for (i = 0; i < len; i += (1UL << EFI_PAGE_SHIFT)) { 321 321 unsigned long paddr = __pa(start + i);