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

Commit 93b9e9a2 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 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] increase ia64 static per cpu area
  [IA64] Put ia64 config files on the Uwe Kleine-König diet
  [IA64] perfmon: convert to unlocked_ioctl
  [IA64] beautify vmlinux.lds.h
parents c3d1f174 9354a55f

arch/ia64/configs/bigsur_defconfig

+94 −1334

File changed.

Preview size limit exceeded, changes collapsed.

arch/ia64/configs/generic_defconfig

+175 −1613

File changed.

Preview size limit exceeded, changes collapsed.

arch/ia64/configs/gensparse_defconfig

+156 −1337

File changed.

Preview size limit exceeded, changes collapsed.

arch/ia64/configs/sim_defconfig

+45 −711
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc5

# Mon Feb 27 16:13:41 2006

#



#

# Code maturity level options

#

CONFIG_EXPERIMENTAL=y

CONFIG_LOCK_KERNEL=y

CONFIG_INIT_ENV_ARG_LIMIT=32



#

# General setup

#

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_POSIX_MQUEUE is not set

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_BINFMT_MISC=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_SD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

# 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

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLUB=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support

#

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_OBSOLETE_MODPARM=y

CONFIG_MODVERSIONS=y

# CONFIG_MODULE_SRCVERSION_ALL is not set

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_GENERIC_TIME=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 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_DEBUG_INFO=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_EFI_PARTITION=y

CONFIG_EFI_RTC=y

CONFIG_EFI_VARS=y

CONFIG_EXPERIMENTAL=y

CONFIG_EXT2_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_EXT3_FS=y

CONFIG_HP_SIMETH=y

CONFIG_HP_SIMSCSI=y

CONFIG_HP_SIMSERIAL_CONSOLE=y

CONFIG_HP_SIMSERIAL=y

CONFIG_HUGETLBFS=y

CONFIG_IA64_HP_SIM=y

# CONFIG_ITANIUM is not set

CONFIG_MCKINLEY=y

# CONFIG_IA64_PAGE_SIZE_4KB is not set

# CONFIG_IA64_PAGE_SIZE_8KB is not set

# CONFIG_IA64_PAGE_SIZE_16KB is not set

CONFIG_IA64_PAGE_SIZE_64KB=y

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_L1_CACHE_SHIFT=7

# CONFIG_IA64_CYCLONE is not set

CONFIG_FORCE_MAX_ZONEORDER=17

CONFIG_SMP=y

CONFIG_NR_CPUS=64

# CONFIG_HOTPLUG_CPU is not set

# CONFIG_SCHED_SMT is not set

CONFIG_PREEMPT=y

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

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_IA64_MCA_RECOVERY is not set

# CONFIG_PERFMON is not set

CONFIG_IA64_PALINFO=m



#

# Firmware Drivers

#

CONFIG_EFI_VARS=y

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=y



#

# Power management and ACPI

#



#

# Networking

#

CONFIG_NET=y



#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

# CONFIG_UNIX is not set

# CONFIG_NET_KEY is not set

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG=y

CONFIG_INET=y

CONFIG_INOTIFY=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_IP_MULTICAST=y

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

# CONFIG_IP_PNP is not set

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_IP_MROUTE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_NETFILTER is not set



#

# DCCP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_DCCP is not set



#

# 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

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# 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



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_IEEE80211 is not set



#

# Device Drivers

#



#

# Generic Driver Options

#

# CONFIG_STANDALONE is not set

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set



#

# Connector - unified userspace <-> kernelspace linker

#

# CONFIG_CONNECTOR is not set



#

# Memory Technology Devices (MTD)

#

# CONFIG_MTD is not set



#

# Parallel port support

#

# CONFIG_PARPORT is not set



#

# Plug and Play support

#



#

# Block devices

#

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

# CONFIG_BLK_DEV_CRYPTOLOOP is not set

# CONFIG_BLK_DEV_NBD is not set

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

# CONFIG_BLK_DEV_INITRD is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# ATA/ATAPI/MFM/RLL support

#

# CONFIG_IDE is not set



#

# SCSI device support

#

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

CONFIG_SCSI_PROC_FS=y



#

# SCSI support type (disk, tape, CD-ROM)

#

CONFIG_BLK_DEV_SD=y

# CONFIG_CHR_DEV_ST is not set

# CONFIG_CHR_DEV_OSST is not set

# CONFIG_BLK_DEV_SR is not set

# CONFIG_CHR_DEV_SG is not set

# CONFIG_CHR_DEV_SCH is not set



#

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

#

CONFIG_SCSI_MULTI_LUN=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_LOG_BUF_SHIFT=16

CONFIG_MCKINLEY=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_NET=y

CONFIG_NFSD_V3=y

CONFIG_NFSD=y

CONFIG_NFS_FS=y

CONFIG_NR_CPUS=64

CONFIG_PACKET=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_PREEMPT=y

CONFIG_PROC_KCORE=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y



#

# SCSI Transport Attributes

#

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_SPI_ATTRS=y

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_ATTRS is not set



#

# SCSI low-level drivers

#

# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_DEBUG is not set



#

# Multi-device support (RAID and LVM)

#

# CONFIG_MD is not set



#

# Fusion MPT device support

#

# CONFIG_FUSION is not set



#

# IEEE 1394 (FireWire) support

#



#

# I2O device support

#



#

# Network device support

#

# CONFIG_NETDEVICES is not set

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set



#

# PHY device support

#



#

# Ethernet (10 or 100Mbit)

#

# CONFIG_NET_ETHERNET is not set



#

# Ethernet (1000 Mbit)

#



#

# Ethernet (10000 Mbit)

#

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# ISDN subsystem

#

# CONFIG_ISDN is not set



#

# Telephony Support

#

# CONFIG_PHONE is not set



#

# Input device support

#

CONFIG_INPUT=y



#

# Userland interfaces

#

CONFIG_INPUT_MOUSEDEV=y

CONFIG_INPUT_MOUSEDEV_PSAUX=y

CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set



#

# Input Device Drivers

#

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set



#

# Hardware I/O ports

#

CONFIG_SERIO=y

CONFIG_SCSI=y

# CONFIG_SERIO_I8042 is not set

CONFIG_SERIO_SERPORT=y

# CONFIG_SERIO_RAW is not set

# CONFIG_GAMEPORT is not set



#

# Character devices

#

CONFIG_VT=y

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_SERIAL_NONSTANDARD is not set



#

# Serial drivers

#

# CONFIG_SERIAL_8250 is not set



#

# Non-8250 serial port support

#

CONFIG_UNIX98_PTYS=y

# CONFIG_LEGACY_PTYS is not set



#

# IPMI

#

# CONFIG_IPMI_HANDLER is not set



#

# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

CONFIG_EFI_RTC=y

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set



#

# Ftape, the floppy tape device driver

#

# CONFIG_AGP is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_HANGCHECK_TIMER is not set



#

# 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

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Misc devices

#



#

# Multimedia Capabilities Port drivers

#



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set



#

# Digital Video Broadcasting Devices

#

# CONFIG_DVB is not set



#

# Graphics support

#

# CONFIG_FB is not set



#

# Console display driver support

#

CONFIG_SMP=y

# CONFIG_STANDALONE is not set

CONFIG_SYSVIPC=y

# CONFIG_VGA_CONSOLE is not set
 
CONFIG_DUMMY_CONSOLE=y



#

# Sound

#

# CONFIG_SOUND is not set



#

# USB support

#

# CONFIG_USB_ARCH_HAS_HCD is not set

# CONFIG_USB_ARCH_HAS_OHCI is not set



#

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

#



#

# USB Gadget Support

#

# CONFIG_USB_GADGET is not set



#

# MMC/SD Card support

#

# CONFIG_MMC is not set



#

# InfiniBand support

#



#

# EDAC - error detection and reporting (RAS)

#



#

# File systems

#

CONFIG_EXT2_FS=y

# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

# CONFIG_XFS_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# CD-ROM/DVD Filesystems

#

# CONFIG_ISO9660_FS is not set

# CONFIG_UDF_FS is not set



#

# DOS/FAT/NT Filesystems

#

# CONFIG_MSDOS_FS is not set

# CONFIG_VFAT_FS is not set

# CONFIG_NTFS_FS is not set



#

# Pseudo filesystems

#

CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_SYSFS=y

# CONFIG_TMPFS is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems

#

# CONFIG_ADFS_FS is not set

# CONFIG_AFFS_FS is not set

# CONFIG_HFS_FS is not set

# CONFIG_HFSPLUS_FS is not set

# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NFS_FS=y

# CONFIG_NFS_V3 is not set

# CONFIG_NFS_V4 is not set

CONFIG_NFS_DIRECTIO=y

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

# CONFIG_NFSD_V3_ACL is not set

# CONFIG_NFSD_V4 is not set

# CONFIG_NFSD_TCP is not set

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_EXPORTFS=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set

# CONFIG_9P_FS is not set



#

# Partition Types

#

CONFIG_PARTITION_ADVANCED=y

# CONFIG_ACORN_PARTITION is not set

# CONFIG_OSF_PARTITION is not set

# CONFIG_AMIGA_PARTITION is not set

# CONFIG_ATARI_PARTITION is not set

# CONFIG_MAC_PARTITION is not set

CONFIG_MSDOS_PARTITION=y

# CONFIG_BSD_DISKLABEL is not set

# CONFIG_MINIX_SUBPARTITION is not set

# CONFIG_SOLARIS_X86_PARTITION is not set

# CONFIG_UNIXWARE_DISKLABEL is not set

# CONFIG_LDM_PARTITION is not set

# CONFIG_SGI_PARTITION is not set

# CONFIG_ULTRIX_PARTITION is not set

# CONFIG_SUN_PARTITION is not set

# CONFIG_KARMA_PARTITION is not set

CONFIG_EFI_PARTITION=y



#

# Native Language Support

#

# CONFIG_NLS is not set



#

# Library routines

#

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_GENERIC_PENDING_IRQ=y



#

# HP Simulator drivers

#

CONFIG_HP_SIMETH=y

CONFIG_HP_SIMSERIAL=y

CONFIG_HP_SIMSERIAL_CONSOLE=y

CONFIG_HP_SIMSCSI=y



#

# Instrumentation Support

#

# CONFIG_PROFILING is not set

# CONFIG_KPROBES is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

# CONFIG_MAGIC_SYSRQ is not set

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=y

# CONFIG_DEBUG_FS 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

# CONFIG_DISABLE_VHPT is not set

# CONFIG_IA64_DEBUG_CMPXCHG is not set

# CONFIG_IA64_DEBUG_IRQ is not set

CONFIG_SYSVIPC_COMPAT=y



#

# Security options

#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set



#

# Cryptographic options

#

# CONFIG_CRYPTO is not set



#

# Hardware crypto devices

#

arch/ia64/configs/tiger_defconfig

+132 −1224

File changed.

Preview size limit exceeded, changes collapsed.