Commit 061afe9f 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] SN: prevent IRQ retargetting in request_irq()
  [IA64] Fix section mismatch ioc3uart_init()/ioc3uart_submodule
  [IA64] Clear up section mismatch for ioc4_ide_attach_one.
  [IA64] Clear up section mismatch with arch_unregister_cpu()
  [IA64] Clear up section mismatch for sn_check_wars.
  [IA64] Updated the generic_defconfig to work with the 2.6.28-rc7 kernel.
  [IA64] Fix GRU compile error w/o CONFIG_HUGETLB_PAGE
  [IA64] eliminate NULL test and memset after alloc_bootmem
  [IA64] remove BUILD_BUG_ON from paravirt_getreg()
parents 942c88cc ff740fb0

arch/ia64/configs/generic_defconfig

+147 −71
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.27-rc1

# Mon Aug  4 15:38:01 2008

# Linux kernel version: 2.6.28-rc7

# Mon Dec  8 08:12:07 2008

#

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -26,6 +26,7 @@ CONFIG_LOG_BUF_SHIFT=20 
CONFIG_CGROUPS=y

# CONFIG_CGROUP_DEBUG is not set

# CONFIG_CGROUP_NS is not set

# CONFIG_CGROUP_FREEZER is not set

# CONFIG_CGROUP_DEVICE is not set

CONFIG_CPUSETS=y

# CONFIG_GROUP_SCHED is not set
@@ -46,7 +47,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_SYSCTL_SYSCALL=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -63,7 +63,9 @@ CONFIG_SIGNALFD=y 
CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

CONFIG_SLUB_DEBUG=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y
@@ -72,15 +74,11 @@ CONFIG_SLUB=y 
# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set

# CONFIG_HAVE_IOREMAP_PROT is not set

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

# CONFIG_HAVE_ARCH_TRACEHOOK is not set

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_DMA_ATTRS=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

# CONFIG_HAVE_CLK is not set

CONFIG_PROC_PAGE_MONITOR=y

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -113,6 +111,7 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_FREEZER is not set



#

# Processor type and features
@@ -125,8 +124,6 @@ CONFIG_MMU=y 
CONFIG_SWIOTLB=y

CONFIG_IOMMU_HELPER=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -139,13 +136,16 @@ CONFIG_GENERIC_IOMAP=y 
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_IA64_UNCACHED_ALLOCATOR=y

CONFIG_AUDIT_ARCH=y

# CONFIG_PARAVIRT_GUEST is not set

CONFIG_IA64_GENERIC=y

# CONFIG_IA64_DIG is not set

# CONFIG_IA64_DIG_VTD 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_UV is not set

# CONFIG_IA64_HP_SIM is not set

# CONFIG_IA64_XEN_GUEST is not set

# CONFIG_ITANIUM is not set

CONFIG_MCKINLEY=y

# CONFIG_IA64_PAGE_SIZE_4KB is not set
@@ -182,16 +182,17 @@ CONFIG_DISCONTIGMEM_MANUAL=y 
CONFIG_DISCONTIGMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

CONFIG_NEED_MULTIPLE_NODES=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y

CONFIG_PAGEFLAGS_EXTENDED=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

CONFIG_RESOURCES_64BIT=y

CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_NR_QUICK=1

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_MMU_NOTIFIER=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
@@ -231,12 +232,12 @@ CONFIG_EFI_VARS=y 
CONFIG_EFI_PCDP=y

CONFIG_DMIID=y

CONFIG_BINFMT_ELF=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_HAVE_AOUT is not set

CONFIG_BINFMT_MISC=m



# CONFIG_DMAR is not set



#

# Power management and ACPI

# Power management and ACPI options

#

CONFIG_PM=y

# CONFIG_PM_DEBUG is not set
@@ -248,7 +249,6 @@ CONFIG_ACPI_PROC_EVENT=y 
CONFIG_ACPI_BUTTON=m

CONFIG_ACPI_FAN=m

CONFIG_ACPI_DOCK=y

# CONFIG_ACPI_BAY is not set

CONFIG_ACPI_PROCESSOR=m

CONFIG_ACPI_HOTPLUG_CPU=y

CONFIG_ACPI_THERMAL=m
@@ -256,9 +256,7 @@ CONFIG_ACPI_NUMA=y 
# CONFIG_ACPI_CUSTOM_DSDT is not set

CONFIG_ACPI_BLACKLIST_YEAR=0

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_EC=y

# CONFIG_ACPI_PCI_SLOT is not set

CONFIG_ACPI_POWER=y

CONFIG_ACPI_SYSTEM=y

CONFIG_ACPI_CONTAINER=m
@@ -275,7 +273,7 @@ CONFIG_PCI_DOMAINS=y 
CONFIG_PCI_SYSCALL=y

# CONFIG_PCIEPORTBUS is not set

CONFIG_ARCH_SUPPORTS_MSI=y

# CONFIG_PCI_MSI is not set

CONFIG_PCI_MSI=y

CONFIG_PCI_LEGACY=y

# CONFIG_PCI_DEBUG is not set

CONFIG_HOTPLUG_PCI=m
@@ -286,6 +284,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m 
# CONFIG_HOTPLUG_PCI_SHPC is not set

# CONFIG_HOTPLUG_PCI_SGI is not set

# CONFIG_PCCARD is not set

CONFIG_DMAR=y

CONFIG_NET=y



#
@@ -333,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_NET_DSA is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set
@@ -353,11 +353,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_PHONET is not set

CONFIG_WIRELESS=y

# CONFIG_CFG80211 is not set

CONFIG_WIRELESS_OLD_REGULATORY=y

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set
@@ -385,7 +384,7 @@ CONFIG_PROC_EVENTS=y 
# CONFIG_MTD is not set

# CONFIG_PARPORT is not set

CONFIG_PNP=y

# CONFIG_PNP_DEBUG is not set

# CONFIG_PNP_DEBUG_MESSAGES is not set



#

# Protocols
@@ -419,10 +418,9 @@ CONFIG_SGI_XP=m 
# CONFIG_HP_ILO is not set

CONFIG_SGI_GRU=m

# CONFIG_SGI_GRU_DEBUG is not set

# CONFIG_C2PORT is not set

CONFIG_HAVE_IDE=y

CONFIG_IDE=y

CONFIG_IDE_MAX_HWIFS=4

CONFIG_BLK_DEV_IDE=y



#

# Please see Documentation/ide/ide.txt for help/info on IDE drives
@@ -430,12 +428,12 @@ CONFIG_BLK_DEV_IDE=y 
CONFIG_IDE_TIMINGS=y

CONFIG_IDE_ATAPI=y

# CONFIG_BLK_DEV_IDE_SATA is not set

CONFIG_BLK_DEV_IDEDISK=y

# CONFIG_IDEDISK_MULTI_MODE is not set

CONFIG_IDE_GD=y

CONFIG_IDE_GD_ATA=y

# CONFIG_IDE_GD_ATAPI is not set

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=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
@@ -705,6 +703,9 @@ CONFIG_TULIP=m 
# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

CONFIG_NET_PCI=y

# CONFIG_PCNET32 is not set

# CONFIG_AMD8111_ETH is not set
@@ -725,11 +726,11 @@ CONFIG_E100=m 
# CONFIG_TLAN is not set

# CONFIG_VIA_RHINE is not set

# CONFIG_SC92031 is not set

# CONFIG_ATL2 is not set

CONFIG_NETDEV_1000=y

# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

CONFIG_E1000=y

# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set

# CONFIG_E1000E is not set

# CONFIG_IP1000 is not set

CONFIG_IGB=y
@@ -747,18 +748,22 @@ CONFIG_TIGON3=y 
# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1E is not set

# CONFIG_JME is not set

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T3 is not set

# CONFIG_ENIC is not set

# CONFIG_IXGBE is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set

# CONFIG_NIU is not set

# CONFIG_MLX4_EN is not set

# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_BNX2X is not set

# CONFIG_QLGE is not set

# CONFIG_SFC is not set

# CONFIG_TR is not set
@@ -826,9 +831,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y 
CONFIG_MOUSE_PS2_SYNAPTICS=y

CONFIG_MOUSE_PS2_LIFEBOOK=y

CONFIG_MOUSE_PS2_TRACKPOINT=y

# CONFIG_MOUSE_PS2_ELANTECH is not set

# CONFIG_MOUSE_PS2_TOUCHKIT is not set

# CONFIG_MOUSE_SERIAL is not set

# CONFIG_MOUSE_APPLETOUCH is not set

# CONFIG_MOUSE_BCM5974 is not set

# CONFIG_MOUSE_VSXXXAA is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set
@@ -942,15 +949,16 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_VT8231 is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_SENSORS_LIS3LV02D is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

CONFIG_THERMAL=m

# CONFIG_THERMAL_HWMON is not set

# CONFIG_WATCHDOG is not set

CONFIG_SSB_POSSIBLE=y



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#
@@ -959,6 +967,8 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_CORE is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_REGULATOR is not set



#

# Multimedia devices
@@ -1009,6 +1019,7 @@ CONFIG_VGA_CONSOLE=y 
# CONFIG_VGACON_SOFT_SCROLLBACK is not set

CONFIG_DUMMY_CONSOLE=y

CONFIG_SOUND=m

CONFIG_SOUND_OSS_CORE=y

CONFIG_SND=m

CONFIG_SND_TIMER=m

CONFIG_SND_PCM=m
@@ -1113,8 +1124,7 @@ CONFIG_HID=y 
# USB Input Devices

#

CONFIG_USB_HID=m

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

# CONFIG_HID_PID is not set

# CONFIG_USB_HIDDEV is not set



#
@@ -1122,6 +1132,34 @@ CONFIG_USB_HID=m 
#

# CONFIG_USB_KBD is not set

# CONFIG_USB_MOUSE is not set



#

# Special HID drivers

#

CONFIG_HID_COMPAT=y

CONFIG_HID_A4TECH=m

CONFIG_HID_APPLE=m

CONFIG_HID_BELKIN=m

CONFIG_HID_BRIGHT=m

CONFIG_HID_CHERRY=m

CONFIG_HID_CHICONY=m

CONFIG_HID_CYPRESS=m

CONFIG_HID_DELL=m

CONFIG_HID_EZKEY=m

CONFIG_HID_GYRATION=m

CONFIG_HID_LOGITECH=m

# CONFIG_LOGITECH_FF is not set

# CONFIG_LOGIRUMBLEPAD2_FF is not set

CONFIG_HID_MICROSOFT=m

CONFIG_HID_MONTEREY=m

CONFIG_HID_PANTHERLORD=m

# CONFIG_PANTHERLORD_FF is not set

CONFIG_HID_PETALYNX=m

CONFIG_HID_SAMSUNG=m

CONFIG_HID_SONY=m

CONFIG_HID_SUNPLUS=m

# CONFIG_THRUSTMASTER_FF is not set

# CONFIG_ZEROPLUS_FF is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1138,6 +1176,9 @@ CONFIG_USB_DEVICE_CLASS=y 
# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_SUSPEND is not set

# CONFIG_USB_OTG is not set

CONFIG_USB_MON=y

# CONFIG_USB_WUSB is not set

# CONFIG_USB_WUSB_CBAF is not set



#

# USB Host Controller Drivers
@@ -1155,6 +1196,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
CONFIG_USB_UHCI_HCD=m

# CONFIG_USB_SL811_HCD is not set

# CONFIG_USB_R8A66597_HCD is not set

# CONFIG_USB_WHCI_HCD is not set

# CONFIG_USB_HWA_HCD is not set



#

# Enable Host or Gadget support to see Inventra options

#



#

# USB Device Class drivers
@@ -1162,13 +1209,14 @@ CONFIG_USB_UHCI_HCD=m 
# CONFIG_USB_ACM is not set

# CONFIG_USB_PRINTER is not set

# CONFIG_USB_WDM is not set

# CONFIG_USB_TMC is not set



#

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

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

#



#

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

# see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=m

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1191,7 +1239,6 @@ CONFIG_USB_STORAGE=m 
#

# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set

CONFIG_USB_MON=y



#

# USB port drivers
@@ -1204,7 +1251,7 @@ CONFIG_USB_MON=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_SEVSEG is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set
@@ -1222,7 +1269,9 @@ CONFIG_USB_MON=y 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

# CONFIG_USB_GADGET is not set

# CONFIG_UWB is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set
@@ -1246,6 +1295,15 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y 
# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

CONFIG_STAGING_EXCLUDE_BUILD=y



#

# HP Simulator drivers

#

# CONFIG_HP_SIMETH is not set

# CONFIG_HP_SIMSERIAL is not set

# CONFIG_HP_SIMSCSI is not set

CONFIG_MSPEC=m



#
@@ -1260,7 +1318,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_EXT4_FS is not set

CONFIG_JBD=y

CONFIG_FS_MBCACHE=y

CONFIG_REISERFS_FS=y
@@ -1271,6 +1329,7 @@ CONFIG_REISERFS_FS_POSIX_ACL=y 
CONFIG_REISERFS_FS_SECURITY=y

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_FILE_LOCKING=y

CONFIG_XFS_FS=y

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_POSIX_ACL is not set
@@ -1282,8 +1341,8 @@ CONFIG_DNOTIFY=y 
CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_AUTOFS_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_AUTOFS_FS=m

CONFIG_AUTOFS4_FS=m

# CONFIG_FUSE_FS is not set



#
@@ -1314,6 +1373,7 @@ CONFIG_PROC_FS=y 
CONFIG_PROC_KCORE=y

CONFIG_PROC_VMCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1356,6 +1416,7 @@ CONFIG_NFS_COMMON=y 
CONFIG_SUNRPC=m

CONFIG_SUNRPC_GSS=m

CONFIG_SUNRPC_XPRT_RDMA=m

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=m

# CONFIG_RPCSEC_GSS_SPKM3 is not set

CONFIG_SMB_FS=m
@@ -1433,38 +1494,6 @@ CONFIG_NLS_KOI8_R=m 
CONFIG_NLS_KOI8_U=m

CONFIG_NLS_UTF8=m

# CONFIG_DLM is not set

CONFIG_HAVE_KVM=y

CONFIG_VIRTUALIZATION=y

# CONFIG_KVM is not set



#

# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_GENERIC_FIND_FIRST_BIT is not set

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC_T10DIF=y

CONFIG_CRC_ITU_T=m

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_GENERIC_ALLOCATOR=y

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_GENERIC_PENDING_IRQ=y

CONFIG_IRQ_PER_CPU=y



#

# HP Simulator drivers

#

# CONFIG_HP_SIMETH is not set

# CONFIG_HP_SIMSERIAL is not set

# CONFIG_HP_SIMSCSI is not set



#

# Kernel hacking
@@ -1503,8 +1532,19 @@ CONFIG_DEBUG_MEMORY_INIT=y 
# CONFIG_DEBUG_SG is not set

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_FAULT_INJECTION is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y



#

# Tracers

#

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_IA64_GRANULE_16MB=y

# CONFIG_IA64_GRANULE_64MB is not set
@@ -1519,14 +1559,19 @@ CONFIG_SYSVIPC_COMPAT=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_CRYPTO=y



#

# Crypto core or helper

#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=m

CONFIG_CRYPTO_BLKCIPHER=m

CONFIG_CRYPTO_HASH=m

CONFIG_CRYPTO_RNG=m

CONFIG_CRYPTO_MANAGER=m

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set
@@ -1599,5 +1644,36 @@ CONFIG_CRYPTO_DES=m 
#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_LZO is not set



#

# Random Number Generation

#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_HIFN_795X is not set

CONFIG_HAVE_KVM=y

CONFIG_VIRTUALIZATION=y

# CONFIG_KVM is not set

# CONFIG_VIRTIO_PCI is not set

# CONFIG_VIRTIO_BALLOON is not set



#

# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

CONFIG_CRC_T10DIF=y

CONFIG_CRC_ITU_T=m

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_GENERIC_ALLOCATOR=y

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_GENERIC_PENDING_IRQ=y

CONFIG_IRQ_PER_CPU=y

arch/ia64/include/asm/paravirt_privop.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ extern unsigned long ia64_native_getreg_func(int regnum); 
#define paravirt_getreg(reg)					\

	({							\

		unsigned long res;				\

		BUILD_BUG_ON(!__builtin_constant_p(reg));	\

		if ((reg) == _IA64_REG_IP)			\

			res = ia64_native_getreg(_IA64_REG_IP); \

		else						\

arch/ia64/kernel/topology.c

+3 −1
Original line number Diff line number Diff line
@@ -53,10 +53,12 @@ int __ref arch_register_cpu(int num) 
}

EXPORT_SYMBOL(arch_register_cpu);



void arch_unregister_cpu(int num)

void __ref arch_unregister_cpu(int num)

{

	unregister_cpu(&sysfs_cpus[num].cpu);

#ifdef CONFIG_ACPI

	unmap_cpu_from_node(num, cpu_to_node(num));

#endif

}

EXPORT_SYMBOL(arch_unregister_cpu);

#else

arch/ia64/sn/kernel/irq.c

+8 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (c) 2000-2007 Silicon Graphics, Inc.  All Rights Reserved.

 * Copyright (c) 2000-2008 Silicon Graphics, Inc.  All Rights Reserved.

 */



#include <linux/irq.h>
@@ -375,6 +375,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) 
	int cpu = nasid_slice_to_cpuid(nasid, slice);

#ifdef CONFIG_SMP

	int cpuphys;

	irq_desc_t *desc;

#endif



	pci_dev_get(pci_dev);
@@ -391,6 +392,12 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) 
#ifdef CONFIG_SMP

	cpuphys = cpu_physical_id(cpu);

	set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0);

	desc = irq_to_desc(sn_irq_info->irq_irq);

	/*

	 * Affinity was set by the PROM, prevent it from

	 * being reset by the request_irq() path.

	 */

	desc->status |= IRQ_AFFINITY_SET;

#endif

}

arch/ia64/sn/kernel/setup.c

+3 −6
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int __cpuinitdata shub_1_1_found; 
 * Set flag for enabling shub specific wars

 */



static inline int __init is_shub_1_1(int nasid)

static inline int __cpuinit is_shub_1_1(int nasid)

{

	unsigned long id;

	int rev;
@@ -212,7 +212,7 @@ static inline int __init is_shub_1_1(int nasid) 
	return rev <= 2;

}



static void __init sn_check_for_wars(void)

static void __cpuinit sn_check_for_wars(void)

{

	int cnode;
@@ -512,7 +512,6 @@ static void __init sn_init_pdas(char **cmdline_p) 
	for_each_online_node(cnode) {

		nodepdaindr[cnode] =

		    alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t));

		memset(nodepdaindr[cnode], 0, sizeof(nodepda_t));

		memset(nodepdaindr[cnode]->phys_cpuid, -1,

		    sizeof(nodepdaindr[cnode]->phys_cpuid));

		spin_lock_init(&nodepdaindr[cnode]->ptc_lock);
@@ -521,11 +520,9 @@ static void __init sn_init_pdas(char **cmdline_p) 
	/*

	 * Allocate & initialize nodepda for TIOs.  For now, put them on node 0.

	 */

	for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) {

	for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++)

		nodepdaindr[cnode] =

		    alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t));

		memset(nodepdaindr[cnode], 0, sizeof(nodepda_t));

	}



	/*

	 * Now copy the array of nodepda pointers to each nodepda.

CRA Git | Maintained and supported by SUSTech CRA and CCSE