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

Commit 77eebf34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 2641dfd9 d2b176ed

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,8 @@ running once the system is up. 


	nomce		[IA-32] Machine Check Exception



	nomca		[IA-64] Disable machine check abort handling



	noresidual	[PPC] Don't use residual data on PReP machines.



	noresume	[SWSUSP] Disables resume and restores original swap

arch/ia64/configs/bigsur_defconfig

+107 −54
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.14-rc1

# Wed Sep 14 15:18:49 2005

# Linux kernel version: 2.6.16-rc5

# Mon Feb 27 16:10:42 2006

#



#

# Code maturity level options

#

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -23,17 +22,18 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

# CONFIG_IKCONFIG is not set

# CONFIG_CPUSETS is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_EMBEDDED is not set

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y
@@ -42,8 +42,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 
CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support
@@ -57,18 +59,37 @@ CONFIG_OBSOLETE_MODPARM=y 
CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y



#

# Block layer

#



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_DEFAULT_AS=y

# CONFIG_DEFAULT_DEADLINE is not set

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"



#

# Processor type and features

#

CONFIG_IA64=y

CONFIG_64BIT=y

CONFIG_MMU=y

CONFIG_SWIOTLB=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_TIME_INTERPOLATION=y

CONFIG_EFI=y

CONFIG_GENERIC_IOMAP=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_DMA_IS_DMA32=y

# CONFIG_IA64_GENERIC is not set

CONFIG_IA64_DIG=y

# CONFIG_IA64_HP_ZX1 is not set
@@ -81,18 +102,17 @@ CONFIG_ITANIUM=y 
# CONFIG_IA64_PAGE_SIZE_8KB is not set

CONFIG_IA64_PAGE_SIZE_16KB=y

# CONFIG_IA64_PAGE_SIZE_64KB is not set

CONFIG_PGTABLE_3=y

# CONFIG_PGTABLE_4 is not set

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

CONFIG_IA64_BRL_EMU=y

CONFIG_IA64_L1_CACHE_SHIFT=6

# CONFIG_NUMA is not set

# CONFIG_VIRTUAL_MEM_MAP is not set

# CONFIG_IA64_CYCLONE is not set

CONFIG_IOSAPIC=y

# CONFIG_IA64_SGI_SN_XP is not set

CONFIG_FORCE_MAX_ZONEORDER=18

CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_SMP=y

CONFIG_NR_CPUS=2

# CONFIG_HOTPLUG_CPU is not set
@@ -105,7 +125,12 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_HAVE_DEC_LOCK=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

# CONFIG_VIRTUAL_MEM_MAP is not set

CONFIG_IA32_SUPPORT=y

CONFIG_COMPAT=y

# CONFIG_IA64_MCA_RECOVERY is not set
@@ -117,7 +142,6 @@ CONFIG_IA64_PALINFO=y 
#

CONFIG_EFI_VARS=y

CONFIG_EFI_PCDP=y

# CONFIG_DELL_RBU is not set

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m
@@ -125,6 +149,7 @@ CONFIG_BINFMT_MISC=m 
# Power management and ACPI

#

CONFIG_PM=y

CONFIG_PM_LEGACY=y

# CONFIG_PM_DEBUG is not set



#
@@ -137,6 +162,7 @@ CONFIG_ACPI_PROCESSOR=m 
CONFIG_ACPI_THERMAL=m

CONFIG_ACPI_BLACKLIST_YEAR=0

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_EC=y

CONFIG_ACPI_POWER=y

CONFIG_ACPI_SYSTEM=y

# CONFIG_ACPI_CONTAINER is not set
@@ -173,6 +199,7 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y
@@ -206,6 +233,11 @@ CONFIG_TCP_CONG_BIC=y 
# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set



#

# TIPC Configuration (EXPERIMENTAL)

#

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set
@@ -218,14 +250,16 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set
@@ -286,20 +320,13 @@ CONFIG_BLK_DEV_RAM=m 
CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

# CONFIG_CDROM_PKTCDVD is not set



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_ATA_OVER_ETH is not set



#

# ATA/ATAPI/MFM/RLL support

#

CONFIG_IDE=m

CONFIG_IDE_MAX_HWIFS=4

CONFIG_BLK_DEV_IDE=m



#
@@ -390,6 +417,7 @@ CONFIG_SCSI_SPI_ATTRS=m 
#

# SCSI low-level drivers

#

# CONFIG_ISCSI_TCP is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_ACARD is not set
@@ -399,6 +427,7 @@ CONFIG_SCSI_SPI_ATTRS=m 
# CONFIG_SCSI_AIC79XX is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -409,14 +438,7 @@ CONFIG_SCSI_SPI_ATTRS=m 
# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_FC is not set

CONFIG_SCSI_QLOGIC_1280=y

# CONFIG_SCSI_QLOGIC_1280_1040 is not set

CONFIG_SCSI_QLA2XXX=y

# CONFIG_SCSI_QLA21XX is not set

# CONFIG_SCSI_QLA22XX is not set

# CONFIG_SCSI_QLA2300 is not set

# CONFIG_SCSI_QLA2322 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_QLA24XX is not set

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -448,6 +470,7 @@ CONFIG_DM_ZERO=m 
# CONFIG_FUSION is not set

# CONFIG_FUSION_SPI is not set

# CONFIG_FUSION_FC is not set

# CONFIG_FUSION_SAS is not set



#

# IEEE 1394 (FireWire) support
@@ -486,6 +509,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_MII=y

# CONFIG_HAPPYMEAL is not set

# CONFIG_SUNGEM is not set

# CONFIG_CASSINI is not set

# CONFIG_NET_VENDOR_3COM is not set



#
@@ -524,6 +548,7 @@ CONFIG_EEPRO100=y 
# CONFIG_R8169 is not set

# CONFIG_SIS190 is not set

# CONFIG_SKGE is not set

# CONFIG_SKY2 is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

# CONFIG_TIGON3 is not set
@@ -630,6 +655,7 @@ CONFIG_SERIAL_8250=y 
CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_ACPI=y

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

# CONFIG_SERIAL_8250_DETECT_IRQ is not set
@@ -681,6 +707,7 @@ CONFIG_DRM_R128=m 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -731,11 +758,18 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_RTC_X1205_I2C is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set



#

# SPI support

#

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set



#

# Dallas's 1-wire bus

#
@@ -754,6 +788,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_GL518SM is not set
@@ -775,6 +810,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_VT8231 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83L785TS is not set
@@ -830,6 +866,8 @@ CONFIG_SND_OSSEMUL=y 
CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

# CONFIG_SND_SEQUENCER_OSS is not set

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set
@@ -837,17 +875,18 @@ CONFIG_SND_PCM_OSS=m 
# Generic devices

#

CONFIG_SND_OPL3_LIB=m

CONFIG_SND_AC97_CODEC=m

CONFIG_SND_AC97_BUS=m

# CONFIG_SND_DUMMY is not set

# CONFIG_SND_VIRMIDI is not set

# CONFIG_SND_MTPAV is not set

# CONFIG_SND_SERIAL_U16550 is not set

# CONFIG_SND_MPU401 is not set

CONFIG_SND_AC97_CODEC=m

CONFIG_SND_AC97_BUS=m



#

# PCI devices

#

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALI5451 is not set

# CONFIG_SND_ATIIXP is not set

# CONFIG_SND_ATIIXP_MODEM is not set
@@ -856,38 +895,38 @@ CONFIG_SND_AC97_BUS=m 
# CONFIG_SND_AU8830 is not set

# CONFIG_SND_AZT3328 is not set

# CONFIG_SND_BT87X is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_CMIPCI is not set

CONFIG_SND_CS4281=m

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_EMU10K1 is not set

# CONFIG_SND_EMU10K1X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_YMFPCI is not set

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_ENS1370 is not set

# CONFIG_SND_ENS1371 is not set

# CONFIG_SND_ES1938 is not set

# CONFIG_SND_ES1968 is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_FM801 is not set

# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_ICE1712 is not set

# CONFIG_SND_ICE1724 is not set

# CONFIG_SND_INTEL8X0 is not set

# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_PCXHR is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_SONICVIBES is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_YMFPCI is not set



#

# USB devices
@@ -929,12 +968,15 @@ CONFIG_USB_UHCI_HCD=m 
# USB Device Class drivers

#

# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set

CONFIG_USB_BLUETOOTH_TTY=m

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=m



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#



#

# may also be needed; see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=m

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -946,13 +988,15 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_STORAGE_SDDR09 is not set

# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set

# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_LIBUSUAL is not set



#

# USB Input Devices

#

CONFIG_USB_HID=m

CONFIG_USB_HIDINPUT=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

CONFIG_USB_HIDDEV=y
@@ -972,6 +1016,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_YEALINK is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set

# CONFIG_USB_ATI_REMOTE2 is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set
@@ -1046,7 +1091,7 @@ CONFIG_USB_MON=y 
# CONFIG_INFINIBAND is not set



#

# SN Devices

# EDAC - error detection and reporting (RAS)

#



#
@@ -1071,6 +1116,7 @@ CONFIG_XFS_QUOTA=y 
CONFIG_XFS_SECURITY=y

CONFIG_XFS_POSIX_ACL=y

# CONFIG_XFS_RT is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y
@@ -1111,6 +1157,7 @@ CONFIG_HUGETLBFS=y 
CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems
@@ -1153,6 +1200,7 @@ CONFIG_RPCSEC_GSS_KRB5=m 
# CONFIG_SMB_FS is not set

CONFIG_CIFS=m

CONFIG_CIFS_STATS=y

# CONFIG_CIFS_STATS2 is not set

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y

# CONFIG_CIFS_EXPERIMENTAL is not set
@@ -1179,6 +1227,7 @@ CONFIG_MSDOS_PARTITION=y 
CONFIG_SGI_PARTITION=y

# CONFIG_ULTRIX_PARTITION is not set

# CONFIG_SUN_PARTITION is not set

# CONFIG_KARMA_PARTITION is not set

CONFIG_EFI_PARTITION=y



#
@@ -1237,28 +1286,32 @@ CONFIG_GENERIC_IRQ_PROBE=y 
CONFIG_GENERIC_PENDING_IRQ=y



#

# Profiling support

# Instrumentation Support

#

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

# CONFIG_KPROBES is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_PREEMPT=y

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_KPROBES is not set

# CONFIG_DEBUG_VM is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_IA64_GRANULE_16MB is not set

CONFIG_IA64_GRANULE_64MB=y

# CONFIG_IA64_PRINT_HAZARDS is not set

arch/ia64/configs/gensparse_defconfig

+112 −49
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.14-rc2

# Wed Sep 28 08:27:29 2005

# Linux kernel version: 2.6.16-rc5

# Mon Feb 27 16:15:43 2006

#



#

# Code maturity level options

#

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -23,18 +22,19 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_HOTPLUG=y

CONFIG_KOBJECT_UEVENT=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_EMBEDDED is not set

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y
@@ -43,8 +43,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 
CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support
@@ -58,18 +60,37 @@ CONFIG_MODVERSIONS=y 
CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y



#

# Block layer

#



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_DEFAULT_AS=y

# CONFIG_DEFAULT_DEADLINE is not set

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"



#

# Processor type and features

#

CONFIG_IA64=y

CONFIG_64BIT=y

CONFIG_MMU=y

CONFIG_SWIOTLB=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_TIME_INTERPOLATION=y

CONFIG_EFI=y

CONFIG_GENERIC_IOMAP=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_DMA_IS_DMA32=y

CONFIG_IA64_GENERIC=y

# CONFIG_IA64_DIG is not set

# CONFIG_IA64_HP_ZX1 is not set
@@ -82,6 +103,8 @@ CONFIG_MCKINLEY=y 
# CONFIG_IA64_PAGE_SIZE_8KB is not set

CONFIG_IA64_PAGE_SIZE_16KB=y

# CONFIG_IA64_PAGE_SIZE_64KB is not set

CONFIG_PGTABLE_3=y

# CONFIG_PGTABLE_4 is not set

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_1000 is not set
@@ -105,6 +128,9 @@ CONFIG_NEED_MULTIPLE_NODES=y 
CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

# CONFIG_MEMORY_HOTPLUG is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -117,13 +143,13 @@ CONFIG_COMPAT=y 
CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

CONFIG_SGI_SN=y



#

# Firmware Drivers

#

CONFIG_EFI_VARS=y

CONFIG_EFI_PCDP=y

# CONFIG_DELL_RBU is not set

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m
@@ -131,6 +157,7 @@ CONFIG_BINFMT_MISC=m 
# Power management and ACPI

#

CONFIG_PM=y

CONFIG_PM_LEGACY=y

# CONFIG_PM_DEBUG is not set



#
@@ -145,6 +172,7 @@ CONFIG_ACPI_THERMAL=m 
CONFIG_ACPI_NUMA=y

CONFIG_ACPI_BLACKLIST_YEAR=0

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_EC=y

CONFIG_ACPI_POWER=y

CONFIG_ACPI_SYSTEM=y

CONFIG_ACPI_CONTAINER=m
@@ -187,6 +215,7 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y
@@ -221,6 +250,11 @@ CONFIG_TCP_CONG_BIC=y 
# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set



#

# TIPC Configuration (EXPERIMENTAL)

#

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set
@@ -233,8 +267,11 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

# CONFIG_NET_CLS_ROUTE is not set



#

# Network testing
@@ -295,20 +332,13 @@ CONFIG_BLK_DEV_RAM_COUNT=16 
CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CDROM_PKTCDVD is not set



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_ATA_OVER_ETH is not set



#

# ATA/ATAPI/MFM/RLL support

#

CONFIG_IDE=y

CONFIG_IDE_MAX_HWIFS=4

CONFIG_BLK_DEV_IDE=y



#
@@ -400,6 +430,7 @@ CONFIG_SCSI_FC_ATTRS=y 
#

# SCSI low-level drivers

#

# CONFIG_ISCSI_TCP is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_ACARD is not set
@@ -409,16 +440,19 @@ CONFIG_SCSI_FC_ATTRS=y 
# CONFIG_SCSI_AIC79XX is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

CONFIG_SCSI_SATA=y

# CONFIG_SCSI_SATA_AHCI is not set

# CONFIG_SCSI_SATA_SVW is not set

# CONFIG_SCSI_ATA_PIIX is not set

# CONFIG_SCSI_SATA_MV is not set

# CONFIG_SCSI_SATA_NV is not set

# CONFIG_SCSI_SATA_PROMISE is not set

# CONFIG_SCSI_PDC_ADMA is not set

# CONFIG_SCSI_SATA_QSTOR is not set

# CONFIG_SCSI_SATA_PROMISE is not set

# CONFIG_SCSI_SATA_SX4 is not set

# CONFIG_SCSI_SATA_SIL is not set

# CONFIG_SCSI_SATA_SIL24 is not set

# CONFIG_SCSI_SATA_SIS is not set

# CONFIG_SCSI_SATA_ULI is not set

# CONFIG_SCSI_SATA_VIA is not set
@@ -436,14 +470,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 
# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_FC is not set

CONFIG_SCSI_QLOGIC_1280=y

# CONFIG_SCSI_QLOGIC_1280_1040 is not set

CONFIG_SCSI_QLA2XXX=y

CONFIG_SCSI_QLA21XX=m

CONFIG_SCSI_QLA22XX=m

CONFIG_SCSI_QLA2300=m

CONFIG_SCSI_QLA2322=m

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_QLA24XX is not set

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -476,6 +503,7 @@ CONFIG_DM_MULTIPATH=m 
CONFIG_FUSION=y

CONFIG_FUSION_SPI=y

CONFIG_FUSION_FC=m

# CONFIG_FUSION_SAS is not set

CONFIG_FUSION_MAX_SGE=128

# CONFIG_FUSION_CTL is not set
@@ -515,6 +543,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_MII=m

# CONFIG_HAPPYMEAL is not set

# CONFIG_SUNGEM is not set

# CONFIG_CASSINI is not set

# CONFIG_NET_VENDOR_3COM is not set



#
@@ -564,6 +593,7 @@ CONFIG_E1000=y 
# CONFIG_R8169 is not set

# CONFIG_SIS190 is not set

# CONFIG_SKGE is not set

# CONFIG_SKY2 is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y
@@ -668,12 +698,15 @@ CONFIG_VT=y 
CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

CONFIG_SERIAL_NONSTANDARD=y

# CONFIG_COMPUTONE is not set

# CONFIG_ROCKETPORT is not set

# CONFIG_CYCLADES is not set

# CONFIG_DIGIEPCA is not set

# CONFIG_MOXA_INTELLIO is not set

# CONFIG_MOXA_SMARTIO is not set

# CONFIG_ISI is not set

# CONFIG_SYNCLINKMP is not set

# CONFIG_SYNCLINK_GT is not set

# CONFIG_N_HDLC is not set

# CONFIG_SPECIALIX is not set

# CONFIG_SX is not set
@@ -689,6 +722,7 @@ CONFIG_SERIAL_8250=y 
CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_ACPI=y

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

# CONFIG_SERIAL_8250_DETECT_IRQ is not set
@@ -738,10 +772,10 @@ CONFIG_DRM_SIS=m 
# CONFIG_DRM_VIA is not set

# CONFIG_DRM_SAVAGE is not set

CONFIG_RAW_DRIVER=m

CONFIG_MAX_RAW_DEVS=256

CONFIG_HPET=y

# CONFIG_HPET_RTC_IRQ is not set

CONFIG_HPET_MMAP=y

CONFIG_MAX_RAW_DEVS=256

# CONFIG_HANGCHECK_TIMER is not set

CONFIG_MMTIMER=y
@@ -749,12 +783,19 @@ CONFIG_MMTIMER=y 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support

#

# CONFIG_I2C is not set



#

# SPI support

#

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set



#

# Dallas's 1-wire bus

#
@@ -765,6 +806,7 @@ CONFIG_MMTIMER=y 
#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#
@@ -815,26 +857,28 @@ CONFIG_SND_OSSEMUL=y 
CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_SUPPORT_OLD_API=y

CONFIG_SND_VERBOSE_PRINTK=y

# CONFIG_SND_DEBUG is not set

CONFIG_SND_GENERIC_DRIVER=y



#

# Generic devices

#

CONFIG_SND_MPU401_UART=m

CONFIG_SND_OPL3_LIB=m

CONFIG_SND_AC97_CODEC=m

CONFIG_SND_AC97_BUS=m

CONFIG_SND_DUMMY=m

CONFIG_SND_VIRMIDI=m

CONFIG_SND_MTPAV=m

CONFIG_SND_SERIAL_U16550=m

CONFIG_SND_MPU401=m

CONFIG_SND_AC97_CODEC=m

CONFIG_SND_AC97_BUS=m



#

# PCI devices

#

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALI5451 is not set

# CONFIG_SND_ATIIXP is not set

# CONFIG_SND_ATIIXP_MODEM is not set
@@ -843,40 +887,40 @@ CONFIG_SND_AC97_BUS=m 
# CONFIG_SND_AU8830 is not set

# CONFIG_SND_AZT3328 is not set

# CONFIG_SND_BT87X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_CMIPCI is not set

CONFIG_SND_CS4281=m

CONFIG_SND_CS46XX=m

CONFIG_SND_CS46XX_NEW_DSP=y

CONFIG_SND_CS4281=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_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_YMFPCI is not set

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_ENS1370 is not set

# CONFIG_SND_ENS1371 is not set

# CONFIG_SND_ES1938 is not set

# CONFIG_SND_ES1968 is not set

# CONFIG_SND_MAESTRO3 is not set

CONFIG_SND_FM801=m

# CONFIG_SND_FM801_TEA575X is not set

# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_ICE1712 is not set

# CONFIG_SND_ICE1724 is not set

# CONFIG_SND_INTEL8X0 is not set

# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_PCXHR is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_SONICVIBES is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_HDA_INTEL is not set

# CONFIG_SND_YMFPCI is not set



#

# USB devices
@@ -922,12 +966,15 @@ CONFIG_USB_UHCI_HCD=m 
# USB Device Class drivers

#

# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set

# CONFIG_USB_BLUETOOTH_TTY is not set

# CONFIG_USB_ACM is not set

# CONFIG_USB_PRINTER is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#



#

# may also be needed; see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=m

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -939,12 +986,15 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_STORAGE_SDDR09 is not set

# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set

# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_LIBUSUAL is not set



#

# USB Input Devices

#

CONFIG_USB_HID=m

CONFIG_USB_HIDINPUT=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

# CONFIG_USB_HIDDEV is not set
@@ -964,6 +1014,7 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_YEALINK is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set

# CONFIG_USB_ATI_REMOTE2 is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set
@@ -1043,6 +1094,7 @@ CONFIG_INFINIBAND_MTHCA=m 
# CONFIG_INFINIBAND_MTHCA_DEBUG is not set

CONFIG_INFINIBAND_IPOIB=m

# CONFIG_INFINIBAND_IPOIB_DEBUG is not set

# CONFIG_INFINIBAND_SRP is not set



#

# SN Devices
@@ -1050,6 +1102,10 @@ CONFIG_INFINIBAND_IPOIB=m 
CONFIG_SGI_IOC4=y

CONFIG_SGI_IOC3=y



#

# EDAC - error detection and reporting (RAS)

#



#

# File systems

#
@@ -1079,6 +1135,7 @@ CONFIG_XFS_EXPORT=y 
# CONFIG_XFS_SECURITY is not set

# CONFIG_XFS_POSIX_ACL is not set

# CONFIG_XFS_RT is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y
@@ -1120,6 +1177,7 @@ CONFIG_HUGETLBFS=y 
CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems
@@ -1189,6 +1247,7 @@ CONFIG_MSDOS_PARTITION=y 
CONFIG_SGI_PARTITION=y

# CONFIG_ULTRIX_PARTITION is not set

# CONFIG_SUN_PARTITION is not set

# CONFIG_KARMA_PARTITION is not set

CONFIG_EFI_PARTITION=y



#
@@ -1254,26 +1313,30 @@ CONFIG_GENERIC_PENDING_IRQ=y 
# CONFIG_HP_SIMSCSI is not set



#

# Profiling support

# Instrumentation Support

#

# CONFIG_PROFILING is not set

# CONFIG_KPROBES is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=20

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_KPROBES is not set

# CONFIG_DEBUG_VM is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_IA64_GRANULE_16MB=y

# CONFIG_IA64_GRANULE_64MB is not set

# CONFIG_IA64_PRINT_HAZARDS is not set

arch/ia64/configs/sim_defconfig

+281 −90

File changed.

Preview size limit exceeded, changes collapsed.

arch/ia64/configs/sn2_defconfig

+43 −15

File changed.

Preview size limit exceeded, changes collapsed.