Commit f4cd87aa 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] refresh config files
  [IA64] put kdump_find_rsvd_region in __init
  [IA64] Remove sparse warning from unwind code
  [IA64] add missing syscall trace clear
  [IA64] Cleanup in crash.c
  [IA64] kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
  [IA64] pci_get_legacy_ide_irq should return irq (not GSI)
  [IA64] whitespace fixes for include/asm-ia64/sal.h
  [IA64] Cache error recovery
  [IA64] Proper handling of TLB errors from duplicate itr.d dropins
parents 271368b6 e3a696e0

arch/ia64/configs/tiger_defconfig

+207 −56
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 15:49:18 2006

# Linux kernel version: 2.6.21-rc3

# Thu Mar  8 11:07:09 2007

#

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# Code maturity level options
@@ -18,16 +19,24 @@ CONFIG_LOCALVERSION="" 
CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

CONFIG_SYSVIPC_SYSCTL=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_TASKSTATS is not set

# CONFIG_UTS_NS is not set

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_CPUSETS is not set

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -39,11 +48,9 @@ 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_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set
@@ -54,7 +61,6 @@ CONFIG_BASE_SMALL=0 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_KMOD=y
@@ -63,6 +69,8 @@ CONFIG_STOP_MACHINE=y 
#

# Block layer

#

CONFIG_BLOCK=y

# CONFIG_BLK_DEV_IO_TRACE is not set



#

# IO Schedulers
@@ -82,15 +90,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

CONFIG_IA64=y

CONFIG_64BIT=y

CONFIG_ZONE_DMA=y

CONFIG_MMU=y

CONFIG_SWIOTLB=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_TIME_INTERPOLATION=y

CONFIG_DMI=y

CONFIG_EFI=y

CONFIG_GENERIC_IOMAP=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_DMA_IS_DMA32=y

CONFIG_AUDIT_ARCH=y

# CONFIG_IA64_GENERIC is not set

CONFIG_IA64_DIG=y

# CONFIG_IA64_HP_ZX1 is not set
@@ -107,6 +120,7 @@ CONFIG_PGTABLE_3=y 
# CONFIG_PGTABLE_4 is not set

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

CONFIG_IA64_L1_CACHE_SHIFT=7
@@ -116,9 +130,10 @@ CONFIG_FORCE_MAX_ZONEORDER=17 
CONFIG_SMP=y

CONFIG_NR_CPUS=16

CONFIG_HOTPLUG_CPU=y

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

# CONFIG_SCHED_SMT is not set

CONFIG_PERMIT_BSP_REMOVE=y

CONFIG_FORCE_CPEI_RETARGET=y

# CONFIG_SCHED_SMT is not set

# CONFIG_PREEMPT is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y
@@ -128,10 +143,13 @@ CONFIG_FLATMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_RESOURCES_64BIT=y

CONFIG_ZONE_DMA_FLAG=1

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_HOLES_IN_ZONE=y

CONFIG_IA32_SUPPORT=y
@@ -139,6 +157,9 @@ CONFIG_COMPAT=y 
CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

# CONFIG_IA64_ESI is not set

CONFIG_KEXEC=y

# CONFIG_CRASH_DUMP is not set



#

# Firmware Drivers
@@ -154,13 +175,16 @@ CONFIG_BINFMT_MISC=m 
CONFIG_PM=y

CONFIG_PM_LEGACY=y

# CONFIG_PM_DEBUG is not set

# CONFIG_PM_SYSFS_DEPRECATED is not set



#

# ACPI (Advanced Configuration and Power Interface) Support

#

CONFIG_ACPI=y

CONFIG_ACPI_PROCFS=y

CONFIG_ACPI_BUTTON=m

CONFIG_ACPI_FAN=m

# CONFIG_ACPI_DOCK is not set

CONFIG_ACPI_PROCESSOR=m

CONFIG_ACPI_HOTPLUG_CPU=y

CONFIG_ACPI_THERMAL=m
@@ -181,8 +205,8 @@ CONFIG_ACPI_CONTAINER=m 
#

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCIEPORTBUS is not set

# CONFIG_PCI_MSI is not set

CONFIG_PCI_LEGACY_PROC=y

# CONFIG_PCI_DEBUG is not set



#
@@ -212,6 +236,10 @@ CONFIG_NET=y 
CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_MULTICAST=y
@@ -226,12 +254,21 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set



#
@@ -257,7 +294,6 @@ CONFIG_TCP_CONG_BIC=y 
# 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
@@ -286,6 +322,8 @@ CONFIG_STANDALONE=y 
CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=m

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_DEBUG_DEVRES is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker
@@ -329,10 +367,16 @@ CONFIG_BLK_DEV_NBD=m 
CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_INITRD=y

CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set



#

# Misc devices

#

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set



#

# ATA/ATAPI/MFM/RLL support

#
@@ -350,6 +394,7 @@ CONFIG_BLK_DEV_IDECD=y 
# CONFIG_BLK_DEV_IDETAPE is not set

CONFIG_BLK_DEV_IDEFLOPPY=y

CONFIG_BLK_DEV_IDESCSI=m

# CONFIG_BLK_DEV_IDEACPI is not set

# CONFIG_IDE_TASK_IOCTL is not set



#
@@ -376,8 +421,10 @@ CONFIG_BLK_DEV_CMD64X=y 
# CONFIG_BLK_DEV_CS5530 is not set

# CONFIG_BLK_DEV_HPT34X is not set

# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_JMICRON is not set

# CONFIG_BLK_DEV_SC1200 is not set

CONFIG_BLK_DEV_PIIX=y

# CONFIG_BLK_DEV_IT8213 is not set

# CONFIG_BLK_DEV_IT821X is not set

# CONFIG_BLK_DEV_NS87415 is not set

# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -387,6 +434,7 @@ CONFIG_BLK_DEV_PIIX=y 
# CONFIG_BLK_DEV_SLC90E66 is not set

# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set

# CONFIG_BLK_DEV_TC86C001 is not set

# CONFIG_IDE_ARM is not set

CONFIG_BLK_DEV_IDEDMA=y

# CONFIG_IDEDMA_IVB is not set
@@ -398,6 +446,8 @@ CONFIG_IDEDMA_AUTO=y 
#

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

# CONFIG_SCSI_TGT is not set

CONFIG_SCSI_NETLINK=y

CONFIG_SCSI_PROC_FS=y



#
@@ -417,14 +467,16 @@ CONFIG_CHR_DEV_SG=m 
# CONFIG_SCSI_MULTI_LUN is not set

# CONFIG_SCSI_CONSTANTS is not set

# CONFIG_SCSI_LOGGING is not set

# CONFIG_SCSI_SCAN_ASYNC is not set



#

# SCSI Transport Attributes

# SCSI Transports

#

CONFIG_SCSI_SPI_ATTRS=y

CONFIG_SCSI_FC_ATTRS=y

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set



#

# SCSI low-level drivers
@@ -437,29 +489,36 @@ CONFIG_SCSI_FC_ATTRS=y 
# CONFIG_SCSI_AIC7XXX is not set

# CONFIG_SCSI_AIC7XXX_OLD is not set

# CONFIG_SCSI_AIC79XX is not set

# CONFIG_SCSI_AIC94XX is not set

# CONFIG_SCSI_ARCMSR 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_HPTIOP is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_STEX is not set

CONFIG_SCSI_SYM53C8XX_2=y

CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1

CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16

CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64

# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set

# CONFIG_SCSI_IPR is not set

CONFIG_SCSI_QLOGIC_FC=y

# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set

CONFIG_SCSI_SYM53C8XX_MMIO=y

CONFIG_SCSI_QLOGIC_1280=y

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_QLA_ISCSI is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set

# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_SRP is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers

#

# CONFIG_ATA is not set



#

# Multi-device support (RAID and LVM)
@@ -470,11 +529,11 @@ CONFIG_MD_LINEAR=m 
CONFIG_MD_RAID0=m

CONFIG_MD_RAID1=m

# CONFIG_MD_RAID10 is not set

CONFIG_MD_RAID5=m

CONFIG_MD_RAID6=m

# CONFIG_MD_RAID456 is not set

CONFIG_MD_MULTIPATH=m

# CONFIG_MD_FAULTY is not set

CONFIG_BLK_DEV_DM=m

# CONFIG_DM_DEBUG is not set

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_MIRROR=m
@@ -563,6 +622,7 @@ CONFIG_E100=m 
# CONFIG_EPIC100 is not set

# CONFIG_SUNDANCE is not set

# CONFIG_VIA_RHINE is not set

# CONFIG_SC92031 is not set



#

# Ethernet (1000 Mbit)
@@ -583,13 +643,18 @@ CONFIG_E1000=y 
# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y

# CONFIG_BNX2 is not set

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set



#

# Ethernet (10000 Mbit)

#

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T3 is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set



#

# Token Ring devices
@@ -631,6 +696,7 @@ CONFIG_NET_POLL_CONTROLLER=y 
# Input device support

#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set



#

# Userland interfaces
@@ -653,6 +719,7 @@ CONFIG_KEYBOARD_ATKBD=y 
# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_INPUT_MOUSE=y

CONFIG_MOUSE_PS2=y

# CONFIG_MOUSE_SERIAL is not set
@@ -682,6 +749,7 @@ CONFIG_GAMEPORT=m 
CONFIG_VT=y

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set

CONFIG_SERIAL_NONSTANDARD=y

# CONFIG_COMPUTONE is not set

# CONFIG_ROCKETPORT is not set
@@ -689,12 +757,14 @@ CONFIG_SERIAL_NONSTANDARD=y 
# CONFIG_DIGIEPCA is not set

# CONFIG_MOXA_INTELLIO is not set

# CONFIG_MOXA_SMARTIO is not set

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

# CONFIG_RIO is not set

# CONFIG_STALDRV is not set



#
@@ -702,7 +772,8 @@ CONFIG_SERIAL_NONSTANDARD=y 
#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_ACPI=y

CONFIG_SERIAL_8250_PCI=y

CONFIG_SERIAL_8250_PNP=y

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_EXTENDED=y
@@ -734,10 +805,6 @@ CONFIG_EFI_RTC=y 
# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set



#

# Ftape, the floppy tape device driver

#

CONFIG_AGP=m

CONFIG_AGP_I460=m

CONFIG_DRM=m
@@ -759,7 +826,6 @@ CONFIG_HPET_MMAP=y 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -782,16 +848,16 @@ CONFIG_HPET_MMAP=y 
#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Misc devices

#



#

# Multimedia Capabilities Port drivers

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set



#

# Multimedia devices
@@ -802,16 +868,19 @@ CONFIG_HWMON=y 
# Digital Video Broadcasting Devices

#

# CONFIG_DVB is not set

# CONFIG_USB_DABUSB is not set



#

# Graphics support

#

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

# CONFIG_FB is not set



#

# Console display driver support

#

CONFIG_VGA_CONSOLE=y

# CONFIG_VGACON_SOFT_SCROLLBACK is not set

CONFIG_DUMMY_CONSOLE=y



#
@@ -819,11 +888,18 @@ CONFIG_DUMMY_CONSOLE=y 
#

# CONFIG_SOUND is not set



#

# HID Devices

#

CONFIG_HID=y

# CONFIG_HID_DEBUG is not set



#

# USB support

#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set
@@ -831,7 +907,6 @@ CONFIG_USB=y 
# Miscellaneous USB options

#

CONFIG_USB_DEVICEFS=y

# CONFIG_USB_BANDWIDTH is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_SUSPEND is not set

# CONFIG_USB_OTG is not set
@@ -842,9 +917,12 @@ CONFIG_USB_DEVICEFS=y 
CONFIG_USB_EHCI_HCD=m

# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set

# CONFIG_USB_ISP116X_HCD is not set

CONFIG_USB_OHCI_HCD=m

# CONFIG_USB_OHCI_BIG_ENDIAN is not set

# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set

# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set

CONFIG_USB_OHCI_LITTLE_ENDIAN=y

CONFIG_USB_UHCI_HCD=y

# CONFIG_USB_SL811_HCD is not set
@@ -873,13 +951,13 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set

# CONFIG_USB_STORAGE_ALAUDA is not set

# CONFIG_USB_STORAGE_KARMA is not set

# CONFIG_USB_LIBUSUAL is not set



#

# USB Input Devices

#

CONFIG_USB_HID=y

CONFIG_USB_HIDINPUT=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

# CONFIG_USB_HIDDEV is not set
@@ -888,15 +966,14 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_ACECAD is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_POWERMATE is not set

# CONFIG_USB_MTOUCH is not set

# CONFIG_USB_ITMTOUCH is not set

# CONFIG_USB_EGALAX is not set

# CONFIG_USB_TOUCHSCREEN is not set

# 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

# CONFIG_USB_GTCO is not set



#

# USB Imaging devices
@@ -904,15 +981,6 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set



#

# USB Multimedia devices

#

# CONFIG_USB_DABUSB is not set



#

# Video4Linux support is needed for USB Multimedia device support

#



#

# USB Network Adapters

#
@@ -920,6 +988,7 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_KAWETH is not set

# CONFIG_USB_PEGASUS is not set

# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_USBNET_MII is not set

# CONFIG_USB_USBNET is not set

# CONFIG_USB_MON is not set
@@ -937,17 +1006,23 @@ CONFIG_USB_HIDINPUT=y 
#

# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_ADUTUX is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_BERRY_CHARGE is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set

# CONFIG_USB_TRANCEVIBRATOR is not set

# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set



#
@@ -964,15 +1039,55 @@ CONFIG_USB_HIDINPUT=y 
#

# CONFIG_MMC is not set



#

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#



#

# InfiniBand support

#

# CONFIG_INFINIBAND is not set



#

# EDAC - error detection and reporting (RAS)

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

# Real Time Clock

#

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# Auxiliary Display support

#



#

# Virtualization

#

# CONFIG_MSPEC is not set



#

# File systems

#
@@ -985,6 +1100,7 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT3_FS_XATTR=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

# CONFIG_EXT4DEV_FS is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

CONFIG_FS_MBCACHE=y
@@ -997,15 +1113,16 @@ CONFIG_REISERFS_FS_SECURITY=y 
# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_XFS_FS=y

CONFIG_XFS_EXPORT=y

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_SECURITY is not set

# CONFIG_XFS_POSIX_ACL is not set

# CONFIG_XFS_RT is not set

# CONFIG_GFS2_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_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

CONFIG_AUTOFS_FS=y
@@ -1038,12 +1155,13 @@ CONFIG_NTFS_FS=m 
#

CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

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



#
@@ -1078,7 +1196,7 @@ CONFIG_NFSD_V4=y 
CONFIG_NFSD_TCP=y

CONFIG_LOCKD=m

CONFIG_LOCKD_V4=y

CONFIG_EXPORTFS=y

CONFIG_EXPORTFS=m

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=m

CONFIG_SUNRPC_GSS=m
@@ -1089,7 +1207,9 @@ CONFIG_SMB_NLS_DEFAULT=y 
CONFIG_SMB_NLS_REMOTE="cp437"

CONFIG_CIFS=m

# CONFIG_CIFS_STATS is not set

# CONFIG_CIFS_WEAK_PW_HASH is not set

# CONFIG_CIFS_XATTR is not set

# CONFIG_CIFS_DEBUG2 is not set

# CONFIG_CIFS_EXPERIMENTAL is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set
@@ -1161,16 +1281,26 @@ CONFIG_NLS_KOI8_R=m 
CONFIG_NLS_KOI8_U=m

CONFIG_NLS_UTF8=m



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_GENERIC_PENDING_IRQ=y

CONFIG_IRQ_PER_CPU=y



#

# Instrumentation Support
@@ -1182,21 +1312,31 @@ CONFIG_GENERIC_PENDING_IRQ=y 
# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_SHIRQ is not set

CONFIG_LOG_BUF_SHIFT=20

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_FAULT_INJECTION is not set

CONFIG_IA64_GRANULE_16MB=y

# CONFIG_IA64_GRANULE_64MB is not set

# CONFIG_IA64_PRINT_HAZARDS is not set
@@ -1215,7 +1355,11 @@ CONFIG_SYSVIPC_COMPAT=y 
# Cryptographic options

#

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=m

CONFIG_CRYPTO_MANAGER=m

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=y
@@ -1224,7 +1368,13 @@ CONFIG_CRYPTO_MD5=y 
# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

CONFIG_CRYPTO_DES=m

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_SERPENT is not set
@@ -1238,6 +1388,7 @@ CONFIG_CRYPTO_DES=m 
# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set



#

arch/ia64/configs/zx1_defconfig

+271 −73

File changed.

Preview size limit exceeded, changes collapsed.

arch/ia64/defconfig

+243 −78

File changed.

Preview size limit exceeded, changes collapsed.

arch/ia64/kernel/crash.c

+5 −5
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
#include <asm/mca.h>



int kdump_status[NR_CPUS];

atomic_t kdump_cpu_freezed;

static atomic_t kdump_cpu_frozen;

atomic_t kdump_in_progress;

int kdump_on_init = 1;

static int kdump_on_init = 1;



static inline Elf64_Word

*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data,
@@ -86,7 +86,7 @@ kdump_wait_cpu_freeze(void) 
	int cpu_num = num_online_cpus() - 1;

	int timeout = 1000;

	while(timeout-- > 0) {

		if (atomic_read(&kdump_cpu_freezed) == cpu_num)

		if (atomic_read(&kdump_cpu_frozen) == cpu_num)

			return 0;

		udelay(1000);

	}
@@ -108,8 +108,8 @@ machine_crash_shutdown(struct pt_regs *pt) 
	kexec_disable_iosapic();

#ifdef CONFIG_SMP

	kdump_smp_send_stop();

	/* not all cpu response to IPI, send INIT to freeze them */

	if (kdump_wait_cpu_freeze() && kdump_on_init) 	{

		//not all cpu response to IPI, send INIT to freeze them

		kdump_smp_send_init();

	}

#endif
@@ -136,7 +136,7 @@ kdump_cpu_freeze(struct unw_frame_info *info, void *arg) 
	cpuid = smp_processor_id();

	crash_save_this_cpu();

	current->thread.ksp = (__u64)info->sw - 16;

	atomic_inc(&kdump_cpu_freezed);

	atomic_inc(&kdump_cpu_frozen);

	kdump_status[cpuid] = 1;

	mb();

#ifdef CONFIG_HOTPLUG_CPU

arch/ia64/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, 
/* find a block of memory aligned to 64M exclude reserved regions

   rsvd_regions are sorted

 */

unsigned long

unsigned long __init

kdump_find_rsvd_region (unsigned long size,

		struct rsvd_region *r, int n)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE