Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb7a0e36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git 

Do arch/ia64/defconfig by hand.
parents 4e93d3e8 29516d75

arch/ia64/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -220,7 +220,7 @@ config IOSAPIC 




config IA64_SGI_SN_SIM

config IA64_SGI_SN_SIM

	bool "SGI Medusa Simulator Support"

	bool "SGI Medusa Simulator Support"

	depends on IA64_SGI_SN2

	depends on IA64_SGI_SN2 || IA64_GENERIC

	help

	help

	  If you are compiling a kernel that will run under SGI's IA-64

	  If you are compiling a kernel that will run under SGI's IA-64

	  simulator (Medusa) then say Y, otherwise say N.

	  simulator (Medusa) then say Y, otherwise say N.

arch/ia64/configs/tiger_defconfig

+10 −9
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.12-rc3

# Linux kernel version: 2.6.12-20050621

# Tue May  3 15:55:04 2005

# Tue Jun 21 14:03:24 2005

#

#





#

#
@@ -67,6 +67,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y 
CONFIG_TIME_INTERPOLATION=y

CONFIG_TIME_INTERPOLATION=y

CONFIG_EFI=y

CONFIG_EFI=y

CONFIG_GENERIC_IOMAP=y

CONFIG_GENERIC_IOMAP=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

# CONFIG_IA64_GENERIC is not set

# CONFIG_IA64_GENERIC is not set

CONFIG_IA64_DIG=y

CONFIG_IA64_DIG=y

# CONFIG_IA64_HP_ZX1 is not set

# CONFIG_IA64_HP_ZX1 is not set
@@ -285,6 +286,7 @@ CONFIG_CHR_DEV_ST=m 
CONFIG_BLK_DEV_SR=m

CONFIG_BLK_DEV_SR=m

# CONFIG_BLK_DEV_SR_VENDOR is not set

# CONFIG_BLK_DEV_SR_VENDOR is not set

CONFIG_CHR_DEV_SG=m

CONFIG_CHR_DEV_SG=m

# CONFIG_CHR_DEV_SCH is not set





#

#

# Some SCSI devices (e.g. CD jukebox) support multiple LUNs

# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -313,11 +315,8 @@ CONFIG_SCSI_FC_ATTRS=y 
# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_GDTH is not set

# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_INIA100 is not set
@@ -366,8 +365,10 @@ CONFIG_DM_ZERO=m 
# Fusion MPT device support

# Fusion MPT device support

#

#

CONFIG_FUSION=y

CONFIG_FUSION=y

CONFIG_FUSION_MAX_SGE=40

CONFIG_FUSION_SPI=y

# CONFIG_FUSION_CTL is not set

CONFIG_FUSION_FC=y

CONFIG_FUSION_MAX_SGE=128

CONFIG_FUSION_CTL=y





#

#

# IEEE 1394 (FireWire) support

# IEEE 1394 (FireWire) support
@@ -506,9 +507,11 @@ CONFIG_E1000=y 
# CONFIG_HAMACHI is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set

# CONFIG_YELLOWFIN is not set

# CONFIG_R8169 is not set

# CONFIG_R8169 is not set

# CONFIG_SKGE is not set

# CONFIG_SK98LIN is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y

CONFIG_TIGON3=y

# CONFIG_BNX2 is not set





#

#

# Ethernet (10000 Mbit)

# Ethernet (10000 Mbit)
@@ -598,7 +601,6 @@ CONFIG_GAMEPORT=m 
# CONFIG_GAMEPORT_VORTEX is not set

# CONFIG_GAMEPORT_VORTEX is not set

# CONFIG_GAMEPORT_FM801 is not set

# CONFIG_GAMEPORT_FM801 is not set

# CONFIG_GAMEPORT_CS461X is not set

# CONFIG_GAMEPORT_CS461X is not set

CONFIG_SOUND_GAMEPORT=m





#

#

# Character devices

# Character devices
@@ -611,7 +613,6 @@ CONFIG_SERIAL_NONSTANDARD=y 
# CONFIG_CYCLADES is not set

# CONFIG_CYCLADES is not set

# CONFIG_MOXA_SMARTIO is not set

# CONFIG_MOXA_SMARTIO is not set

# CONFIG_ISI is not set

# CONFIG_ISI is not set

# CONFIG_SYNCLINK is not set

# CONFIG_SYNCLINKMP is not set

# CONFIG_SYNCLINKMP is not set

# CONFIG_N_HDLC is not set

# CONFIG_N_HDLC is not set

# CONFIG_SPECIALIX is not set

# CONFIG_SPECIALIX is not set

arch/ia64/defconfig

+91 −47
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.10

# Linux kernel version: 2.6.12

# Thu Jan  6 11:13:13 2005

# Tue Jun 21 11:30:42 2005

#

#





#

#
@@ -10,6 +10,7 @@ 
CONFIG_EXPERIMENTAL=y

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_CLEAN_COMPILE=y

CONFIG_LOCK_KERNEL=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32





#

#

# General setup

# General setup
@@ -21,24 +22,27 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

# CONFIG_AUDIT is not set

CONFIG_LOG_BUF_SHIFT=20

CONFIG_HOTPLUG=y

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

CONFIG_KOBJECT_UEVENT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set

# CONFIG_EMBEDDED is not set

# CONFIG_EMBEDDED is not set

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_EPOLL=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SHMEM=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_CC_ALIGN_JUMPS=0

# CONFIG_TINY_SHMEM is not set

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0





#

#

# Loadable module support

# Loadable module support
@@ -63,9 +67,11 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y 
CONFIG_TIME_INTERPOLATION=y

CONFIG_TIME_INTERPOLATION=y

CONFIG_EFI=y

CONFIG_EFI=y

CONFIG_GENERIC_IOMAP=y

CONFIG_GENERIC_IOMAP=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_IA64_GENERIC=y

CONFIG_IA64_GENERIC=y

# CONFIG_IA64_DIG is not set

# CONFIG_IA64_DIG is not set

# CONFIG_IA64_HP_ZX1 is not set

# CONFIG_IA64_HP_ZX1 is not set

# CONFIG_IA64_HP_ZX1_SWIOTLB is not set

# CONFIG_IA64_SGI_SN2 is not set

# CONFIG_IA64_SGI_SN2 is not set

# CONFIG_IA64_HP_SIM is not set

# CONFIG_IA64_HP_SIM is not set

# CONFIG_ITANIUM is not set

# CONFIG_ITANIUM is not set
@@ -77,6 +83,7 @@ CONFIG_IA64_PAGE_SIZE_16KB=y 
CONFIG_IA64_L1_CACHE_SHIFT=7

CONFIG_IA64_L1_CACHE_SHIFT=7

CONFIG_NUMA=y

CONFIG_NUMA=y

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_HOLES_IN_ZONE=y

CONFIG_DISCONTIGMEM=y

CONFIG_DISCONTIGMEM=y

CONFIG_IA64_CYCLONE=y

CONFIG_IA64_CYCLONE=y

CONFIG_IOSAPIC=y

CONFIG_IOSAPIC=y
@@ -84,6 +91,7 @@ CONFIG_FORCE_MAX_ZONEORDER=18 
CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_NR_CPUS=512

CONFIG_NR_CPUS=512

CONFIG_HOTPLUG_CPU=y

CONFIG_HOTPLUG_CPU=y

# CONFIG_SCHED_SMT is not set

# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT is not set

CONFIG_HAVE_DEC_LOCK=y

CONFIG_HAVE_DEC_LOCK=y

CONFIG_IA32_SUPPORT=y

CONFIG_IA32_SUPPORT=y
@@ -135,6 +143,7 @@ CONFIG_PCI_DOMAINS=y 
# CONFIG_PCI_MSI is not set

# CONFIG_PCI_MSI is not set

CONFIG_PCI_LEGACY_PROC=y

CONFIG_PCI_LEGACY_PROC=y

CONFIG_PCI_NAMES=y

CONFIG_PCI_NAMES=y

# CONFIG_PCI_DEBUG is not set





#

#

# PCI Hotplug Support

# PCI Hotplug Support
@@ -144,7 +153,6 @@ CONFIG_HOTPLUG_PCI=m 
CONFIG_HOTPLUG_PCI_ACPI=m

CONFIG_HOTPLUG_PCI_ACPI=m

# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set

# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set

# CONFIG_HOTPLUG_PCI_CPCI is not set

# CONFIG_HOTPLUG_PCI_CPCI is not set

# CONFIG_HOTPLUG_PCI_PCIE is not set

# CONFIG_HOTPLUG_PCI_SHPC is not set

# CONFIG_HOTPLUG_PCI_SHPC is not set





#

#
@@ -152,10 +160,6 @@ CONFIG_HOTPLUG_PCI_ACPI=m 
#

#

# CONFIG_PCCARD is not set

# CONFIG_PCCARD is not set





#

# PC-card bridges

#



#

#

# Device Drivers

# Device Drivers

#

#
@@ -190,6 +194,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
# CONFIG_BLK_CPQ_CISS_DA is not set

# CONFIG_BLK_CPQ_CISS_DA is not set

# CONFIG_BLK_DEV_DAC960 is not set

# CONFIG_BLK_DEV_DAC960 is not set

# CONFIG_BLK_DEV_UMEM is not set

# CONFIG_BLK_DEV_UMEM is not set

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_NBD=m
@@ -209,6 +214,7 @@ CONFIG_IOSCHED_NOOP=y 
CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_ATA_OVER_ETH is not set





#

#

# ATA/ATAPI/MFM/RLL support

# ATA/ATAPI/MFM/RLL support
@@ -283,6 +289,7 @@ CONFIG_CHR_DEV_ST=m 
CONFIG_BLK_DEV_SR=m

CONFIG_BLK_DEV_SR=m

# CONFIG_BLK_DEV_SR_VENDOR is not set

# CONFIG_BLK_DEV_SR_VENDOR is not set

CONFIG_CHR_DEV_SG=m

CONFIG_CHR_DEV_SG=m

# CONFIG_CHR_DEV_SCH is not set





#

#

# Some SCSI devices (e.g. CD jukebox) support multiple LUNs

# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -310,13 +317,21 @@ CONFIG_SCSI_FC_ATTRS=y 
# CONFIG_SCSI_AIC79XX is not set

# CONFIG_SCSI_AIC79XX is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_SCSI_SATA is not set

CONFIG_SCSI_SATA=y

# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_SCSI_SATA_AHCI is not set

# CONFIG_SCSI_SATA_SVW is not set

# CONFIG_SCSI_ATA_PIIX is not set

# CONFIG_SCSI_SATA_NV is not set

# CONFIG_SCSI_SATA_PROMISE is not set

# CONFIG_SCSI_SATA_QSTOR is not set

# CONFIG_SCSI_SATA_SX4 is not set

# CONFIG_SCSI_SATA_SIL is not set

# CONFIG_SCSI_SATA_SIS is not set

# CONFIG_SCSI_SATA_ULI is not set

# CONFIG_SCSI_SATA_VIA is not set

CONFIG_SCSI_SATA_VITESSE=y

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set

# CONFIG_SCSI_EATA_PIO is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_GDTH is not set

# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_INIA100 is not set
@@ -326,7 +341,6 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64

CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64

# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set

# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_ISP is not set

CONFIG_SCSI_QLOGIC_FC=y

CONFIG_SCSI_QLOGIC_FC=y

# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set

# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set

CONFIG_SCSI_QLOGIC_1280=y

CONFIG_SCSI_QLOGIC_1280=y
@@ -337,6 +351,7 @@ CONFIG_SCSI_QLA22XX=m 
CONFIG_SCSI_QLA2300=m

CONFIG_SCSI_QLA2300=m

CONFIG_SCSI_QLA2322=m

CONFIG_SCSI_QLA2322=m

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_DEBUG is not set
@@ -359,12 +374,16 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_MIRROR=m

CONFIG_DM_MIRROR=m

CONFIG_DM_ZERO=m

CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

# CONFIG_DM_MULTIPATH_EMC is not set





#

#

# Fusion MPT device support

# Fusion MPT device support

#

#

CONFIG_FUSION=y

CONFIG_FUSION=y

CONFIG_FUSION_MAX_SGE=40

CONFIG_FUSION_SPI=y

CONFIG_FUSION_FC=m

CONFIG_FUSION_MAX_SGE=128

# CONFIG_FUSION_CTL is not set

# CONFIG_FUSION_CTL is not set





#

#
@@ -387,7 +406,6 @@ CONFIG_NET=y 
#

#

CONFIG_PACKET=y

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

# CONFIG_PACKET_MMAP is not set

CONFIG_NETLINK_DEV=y

CONFIG_UNIX=y

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_INET=y
@@ -447,7 +465,6 @@ CONFIG_DUMMY=m 
# CONFIG_BONDING is not set

# CONFIG_BONDING is not set

# CONFIG_EQUALIZER is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_TUN is not set

# CONFIG_ETHERTAP is not set





#

#

# ARCnet devices

# ARCnet devices
@@ -484,9 +501,7 @@ CONFIG_NET_PCI=y 
# CONFIG_FORCEDETH is not set

# CONFIG_FORCEDETH is not set

# CONFIG_DGRS is not set

# CONFIG_DGRS is not set

CONFIG_EEPRO100=m

CONFIG_EEPRO100=m

# CONFIG_EEPRO100_PIO is not set

CONFIG_E100=m

CONFIG_E100=m

# CONFIG_E100_NAPI is not set

# CONFIG_FEALNX is not set

# CONFIG_FEALNX is not set

# CONFIG_NATSEMI is not set

# CONFIG_NATSEMI is not set

# CONFIG_NE2K_PCI is not set

# CONFIG_NE2K_PCI is not set
@@ -508,9 +523,11 @@ CONFIG_E1000=y 
# CONFIG_HAMACHI is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set

# CONFIG_YELLOWFIN is not set

# CONFIG_R8169 is not set

# CONFIG_R8169 is not set

# CONFIG_SKGE is not set

# CONFIG_SK98LIN is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y

CONFIG_TIGON3=y

# CONFIG_BNX2 is not set





#

#

# Ethernet (10000 Mbit)

# Ethernet (10000 Mbit)
@@ -567,25 +584,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 
# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set

# CONFIG_INPUT_EVBUG is not set





#

# Input I/O drivers

#

CONFIG_GAMEPORT=m

CONFIG_SOUND_GAMEPORT=m

# CONFIG_GAMEPORT_NS558 is not set

# CONFIG_GAMEPORT_L4 is not set

# CONFIG_GAMEPORT_EMU10K1 is not set

# CONFIG_GAMEPORT_VORTEX is not set

# CONFIG_GAMEPORT_FM801 is not set

# CONFIG_GAMEPORT_CS461x is not set

CONFIG_SERIO=y

CONFIG_SERIO_I8042=y

# CONFIG_SERIO_SERPORT is not set

# CONFIG_SERIO_CT82C710 is not set

# CONFIG_SERIO_PCIPS2 is not set

CONFIG_SERIO_LIBPS2=y

# CONFIG_SERIO_RAW is not set



#

#

# Input Device Drivers

# Input Device Drivers

#

#
@@ -603,6 +601,23 @@ CONFIG_MOUSE_PS2=y 
# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set

# CONFIG_INPUT_MISC is not set





#

# Hardware I/O ports

#

CONFIG_SERIO=y

CONFIG_SERIO_I8042=y

# CONFIG_SERIO_SERPORT is not set

# CONFIG_SERIO_PCIPS2 is not set

CONFIG_SERIO_LIBPS2=y

# CONFIG_SERIO_RAW is not set

CONFIG_GAMEPORT=m

# CONFIG_GAMEPORT_NS558 is not set

# CONFIG_GAMEPORT_L4 is not set

# CONFIG_GAMEPORT_EMU10K1 is not set

# CONFIG_GAMEPORT_VORTEX is not set

# CONFIG_GAMEPORT_FM801 is not set

# CONFIG_GAMEPORT_CS461X is not set



#

#

# Character devices

# Character devices

#

#
@@ -613,11 +628,15 @@ CONFIG_SERIAL_NONSTANDARD=y 
# CONFIG_ROCKETPORT is not set

# CONFIG_ROCKETPORT is not set

# CONFIG_CYCLADES is not set

# CONFIG_CYCLADES is not set

# CONFIG_MOXA_SMARTIO is not set

# CONFIG_MOXA_SMARTIO is not set

# CONFIG_SYNCLINK is not set

# CONFIG_ISI is not set

# CONFIG_SYNCLINKMP is not set

# CONFIG_SYNCLINKMP is not set

# CONFIG_N_HDLC is not set

# CONFIG_N_HDLC is not set

# CONFIG_SPECIALIX is not set

# CONFIG_SX is not set

# CONFIG_STALDRV is not set

# CONFIG_STALDRV is not set

CONFIG_SGI_SNSC=y

CONFIG_SGI_SNSC=y

CONFIG_SGI_TIOCX=y

CONFIG_SGI_MBCS=m





#

#

# Serial drivers

# Serial drivers
@@ -639,6 +658,7 @@ CONFIG_SERIAL_CORE=y 
CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_SGI_L1_CONSOLE=y

CONFIG_SERIAL_SGI_L1_CONSOLE=y

CONFIG_SERIAL_SGI_IOC4=y

CONFIG_SERIAL_SGI_IOC4=y

# CONFIG_SERIAL_JSM is not set

CONFIG_UNIX98_PTYS=y

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

CONFIG_LEGACY_PTY_COUNT=256
@@ -664,6 +684,7 @@ CONFIG_EFI_RTC=y 
CONFIG_AGP=m

CONFIG_AGP=m

CONFIG_AGP_I460=m

CONFIG_AGP_I460=m

CONFIG_AGP_HP_ZX1=m

CONFIG_AGP_HP_ZX1=m

CONFIG_AGP_SGI_TIOCA=m

CONFIG_DRM=m

CONFIG_DRM=m

CONFIG_DRM_TDFX=m

CONFIG_DRM_TDFX=m

CONFIG_DRM_R128=m

CONFIG_DRM_R128=m
@@ -675,8 +696,14 @@ CONFIG_HPET=y 
# CONFIG_HPET_RTC_IRQ is not set

# CONFIG_HPET_RTC_IRQ is not set

CONFIG_HPET_MMAP=y

CONFIG_HPET_MMAP=y

CONFIG_MAX_RAW_DEVS=256

CONFIG_MAX_RAW_DEVS=256

# CONFIG_HANGCHECK_TIMER is not set

CONFIG_MMTIMER=y

CONFIG_MMTIMER=y





#

# TPM devices

#

# CONFIG_TCG_TPM is not set



#

#

# I2C support

# I2C support

#

#
@@ -761,6 +788,8 @@ CONFIG_SND_CS46XX=m 
CONFIG_SND_CS46XX_NEW_DSP=y

CONFIG_SND_CS46XX_NEW_DSP=y

CONFIG_SND_CS4281=m

CONFIG_SND_CS4281=m

CONFIG_SND_EMU10K1=m

CONFIG_SND_EMU10K1=m

# CONFIG_SND_EMU10K1X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_NM256 is not set
@@ -785,13 +814,14 @@ CONFIG_SND_FM801=m 
# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_SONICVIBES is not set

# CONFIG_SND_SONICVIBES is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_HDA_INTEL is not set





#

#

# USB devices

# USB devices

#

#

# CONFIG_SND_USB_AUDIO is not set

# CONFIG_SND_USB_AUDIO is not set

# CONFIG_SND_USB_USX2Y is not set





#

#

# Open Sound System

# Open Sound System
@@ -801,6 +831,8 @@ CONFIG_SND_FM801=m 
#

#

# USB support

# USB support

#

#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB=m

CONFIG_USB=m

# CONFIG_USB_DEBUG is not set

# CONFIG_USB_DEBUG is not set
@@ -812,8 +844,6 @@ CONFIG_USB_DEVICEFS=y 
# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_SUSPEND is not set

# CONFIG_USB_SUSPEND is not set

# CONFIG_USB_OTG is not set

# CONFIG_USB_OTG is not set

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y





#

#

# USB Host Controller Drivers

# USB Host Controller Drivers
@@ -822,6 +852,8 @@ CONFIG_USB_EHCI_HCD=m 
# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

CONFIG_USB_OHCI_HCD=m

CONFIG_USB_OHCI_HCD=m

# CONFIG_USB_OHCI_BIG_ENDIAN is not set

CONFIG_USB_OHCI_LITTLE_ENDIAN=y

CONFIG_USB_UHCI_HCD=m

CONFIG_USB_UHCI_HCD=m

# CONFIG_USB_SL811_HCD is not set

# CONFIG_USB_SL811_HCD is not set
@@ -839,12 +871,11 @@ CONFIG_USB_UHCI_HCD=m 
#

#

CONFIG_USB_STORAGE=m

CONFIG_USB_STORAGE=m

# CONFIG_USB_STORAGE_DEBUG is not set

# CONFIG_USB_STORAGE_DEBUG is not set

# CONFIG_USB_STORAGE_RW_DETECT is not set

# CONFIG_USB_STORAGE_DATAFAB is not set

# CONFIG_USB_STORAGE_DATAFAB is not set

# CONFIG_USB_STORAGE_FREECOM is not set

# CONFIG_USB_STORAGE_FREECOM is not set

# CONFIG_USB_STORAGE_ISD200 is not set

# CONFIG_USB_STORAGE_ISD200 is not set

# CONFIG_USB_STORAGE_DPCM is not set

# CONFIG_USB_STORAGE_DPCM is not set

# CONFIG_USB_STORAGE_HP8200e is not set

# CONFIG_USB_STORAGE_USBAT is not set

# CONFIG_USB_STORAGE_SDDR09 is not set

# CONFIG_USB_STORAGE_SDDR09 is not set

# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set
@@ -894,6 +925,7 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_PEGASUS is not set

# CONFIG_USB_PEGASUS is not set

# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_USBNET is not set

# CONFIG_USB_USBNET is not set

CONFIG_USB_MON=m





#

#

# USB port drivers

# USB port drivers
@@ -909,7 +941,6 @@ CONFIG_USB_HIDINPUT=y 
#

#

# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_TIGL is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LEGOTOWER is not set
@@ -918,6 +949,8 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_TEST is not set





#

#
@@ -970,7 +1003,12 @@ CONFIG_REISERFS_FS_POSIX_ACL=y 
CONFIG_REISERFS_FS_SECURITY=y

CONFIG_REISERFS_FS_SECURITY=y

# CONFIG_JFS_FS is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_FS_POSIX_ACL=y



#

# XFS support

#

CONFIG_XFS_FS=y

CONFIG_XFS_FS=y

CONFIG_XFS_EXPORT=y

# CONFIG_XFS_RT is not set

# CONFIG_XFS_RT is not set

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_SECURITY is not set

# CONFIG_XFS_SECURITY is not set
@@ -1048,7 +1086,7 @@ CONFIG_NFSD_V4=y 
CONFIG_NFSD_TCP=y

CONFIG_NFSD_TCP=y

CONFIG_LOCKD=m

CONFIG_LOCKD=m

CONFIG_LOCKD_V4=y

CONFIG_LOCKD_V4=y

CONFIG_EXPORTFS=m

CONFIG_EXPORTFS=y

CONFIG_SUNRPC=m

CONFIG_SUNRPC=m

CONFIG_SUNRPC_GSS=m

CONFIG_SUNRPC_GSS=m

CONFIG_RPCSEC_GSS_KRB5=m

CONFIG_RPCSEC_GSS_KRB5=m
@@ -1134,6 +1172,8 @@ CONFIG_NLS_UTF8=m 
# CONFIG_CRC_CCITT is not set

# CONFIG_CRC_CCITT is not set

CONFIG_CRC32=y

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

# CONFIG_LIBCRC32C is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y





#

#

# HP Simulator drivers

# HP Simulator drivers
@@ -1150,14 +1190,17 @@ CONFIG_CRC32=y 
#

#

# Kernel hacking

# Kernel hacking

#

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_LOG_BUF_SHIFT=20

# CONFIG_SCHEDSTATS is not set

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

CONFIG_IA64_GRANULE_16MB=y

CONFIG_IA64_GRANULE_16MB=y

# CONFIG_IA64_GRANULE_64MB is not set

# CONFIG_IA64_GRANULE_64MB is not set

# CONFIG_IA64_PRINT_HAZARDS is not set

# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1184,6 +1227,7 @@ CONFIG_CRYPTO_MD5=m 
# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_DES=m

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

arch/ia64/kernel/entry.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ 
	.spillsp @priunat,SW(AR_UNAT)+16+(off);					\

	.spillsp @priunat,SW(AR_UNAT)+16+(off);					\

	.spillsp ar.rnat,SW(AR_RNAT)+16+(off);					\

	.spillsp ar.rnat,SW(AR_RNAT)+16+(off);					\

	.spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off);				\

	.spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off);				\

	.spillsp pr,SW(PR)+16+(off))

	.spillsp pr,SW(PR)+16+(off)





#define DO_SAVE_SWITCH_STACK			\

#define DO_SAVE_SWITCH_STACK			\

	movl r28=1f;				\

	movl r28=1f;				\

arch/ia64/kernel/ivt.S

+9 −4
Original line number Original line Diff line number Diff line
@@ -405,17 +405,22 @@ ENTRY(nested_dtlb_miss) 
	 *		r30:	continuation address

	 *		r30:	continuation address

	 *		r31:	saved pr

	 *		r31:	saved pr

	 *

	 *

	 * Clobbered:	b0, r18, r19, r21, psr.dt (cleared)

	 * Clobbered:	b0, r18, r19, r21, r22, psr.dt (cleared)

	 */

	 */

	rsm psr.dt				// switch to using physical data addressing

	rsm psr.dt				// switch to using physical data addressing

	mov r19=IA64_KR(PT_BASE)		// get the page table base address

	mov r19=IA64_KR(PT_BASE)		// get the page table base address

	shl r21=r16,3				// shift bit 60 into sign bit

	shl r21=r16,3				// shift bit 60 into sign bit

	mov r18=cr.itir

	;;

	;;

	shr.u r17=r16,61			// get the region number into r17

	shr.u r17=r16,61			// get the region number into r17

	extr.u r18=r18,2,6			// get the faulting page size

	;;

	;;

	cmp.eq p6,p7=5,r17			// is faulting address in region 5?

	cmp.eq p6,p7=5,r17			// is faulting address in region 5?

	shr.u r18=r16,PGDIR_SHIFT		// get bits 33-63 of faulting address

	add r22=-PAGE_SHIFT,r18			// adjustment for hugetlb address

	add r18=PGDIR_SHIFT-PAGE_SHIFT,r18

	;;

	;;

	shr.u r22=r16,r22

	shr.u r18=r16,r18

(p7)	dep r17=r17,r19,(PAGE_SHIFT-3),3	// put region number bits in place

(p7)	dep r17=r17,r19,(PAGE_SHIFT-3),3	// put region number bits in place





	srlz.d

	srlz.d
@@ -428,7 +433,7 @@ ENTRY(nested_dtlb_miss) 
(p6)	dep r17=r18,r19,3,(PAGE_SHIFT-3)	// r17=PTA + IFA(33,42)*8

(p6)	dep r17=r18,r19,3,(PAGE_SHIFT-3)	// r17=PTA + IFA(33,42)*8

(p7)	dep r17=r18,r17,3,(PAGE_SHIFT-6)	// r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8)

(p7)	dep r17=r18,r17,3,(PAGE_SHIFT-6)	// r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8)

	cmp.eq p7,p6=0,r21			// unused address bits all zeroes?

	cmp.eq p7,p6=0,r21			// unused address bits all zeroes?

	shr.u r18=r16,PMD_SHIFT			// shift L2 index into position

	shr.u r18=r22,PMD_SHIFT			// shift L2 index into position

	;;

	;;

	ld8 r17=[r17]				// fetch the L1 entry (may be 0)

	ld8 r17=[r17]				// fetch the L1 entry (may be 0)

	;;

	;;
@@ -436,7 +441,7 @@ ENTRY(nested_dtlb_miss) 
	dep r17=r18,r17,3,(PAGE_SHIFT-3)	// compute address of L2 page table entry

	dep r17=r18,r17,3,(PAGE_SHIFT-3)	// compute address of L2 page table entry

	;;

	;;

(p7)	ld8 r17=[r17]				// fetch the L2 entry (may be 0)

(p7)	ld8 r17=[r17]				// fetch the L2 entry (may be 0)

	shr.u r19=r16,PAGE_SHIFT		// shift L3 index into position

	shr.u r19=r22,PAGE_SHIFT		// shift L3 index into position

	;;

	;;

(p7)	cmp.eq.or.andcm p6,p7=r17,r0		// was L2 entry NULL?

(p7)	cmp.eq.or.andcm p6,p7=r17,r0		// was L2 entry NULL?

	dep r17=r19,r17,3,(PAGE_SHIFT-3)	// compute address of L3 page table entry

	dep r17=r19,r17,3,(PAGE_SHIFT-3)	// compute address of L3 page table entry