Commit e58b7dab 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] Fix incorrect return value from ia64_setup_msi_irq()
  [IA64] arch/ia64/sn/kernel/mca.c: undo lock when sn_oemdata can't be extended
  [IA64] update sn2 defconfig to 64kb pages
  [IA64] fix typo in per_cpu_offset
  [IA64] /proc/cpuinfo "physical id" field cleanups
  [IA64] vDSO vs --build-id
  [IA64] check-segrel.lds vs --build-id
  [IA64] vmcore_find_descriptor_size should be in __init
  [IA64] ia64/mm/init.c: fix section mismatches
parents 71d00fec 3aff0373

arch/ia64/configs/sn2_defconfig

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

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23-rc6

# Tue Sep 18 11:24:01 2007

# Linux kernel version: 2.6.23

# Thu Oct 18 16:03:40 2007

#

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -28,6 +28,8 @@ CONFIG_TASK_IO_ACCOUNTING=y 
CONFIG_LOG_BUF_SHIFT=20

CONFIG_CGROUPS=y

CONFIG_CPUSETS=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

CONFIG_SYSFS_DEPRECATED=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y
@@ -48,7 +50,6 @@ CONFIG_FUTEX=y 
CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y
@@ -69,6 +70,7 @@ CONFIG_STOP_MACHINE=y 
CONFIG_BLOCK=y

# CONFIG_BLK_DEV_IO_TRACE is not set

CONFIG_BLK_DEV_BSG=y

CONFIG_BLOCK_COMPAT=y



#

# IO Schedulers
@@ -93,6 +95,7 @@ CONFIG_MMU=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

CONFIG_GENERIC_TIME=y
@@ -113,10 +116,10 @@ CONFIG_IA64_SGI_SN2=y 
CONFIG_MCKINLEY=y

# CONFIG_IA64_PAGE_SIZE_4KB is not set

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

CONFIG_PGTABLE_4=y

# 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_300 is not set
@@ -131,6 +134,7 @@ CONFIG_SMP=y 
CONFIG_NR_CPUS=1024

# CONFIG_HOTPLUG_CPU is not set

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

CONFIG_SCHED_SMT=y

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set
@@ -144,6 +148,7 @@ 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_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

CONFIG_RESOURCES_64BIT=y
@@ -171,6 +176,7 @@ CONFIG_IA64_PALINFO=y 
CONFIG_IA64_MC_ERR_INJECT=y

CONFIG_SGI_SN=y

# CONFIG_IA64_ESI is not set

# CONFIG_IA64_HP_AML_NFW is not set



#

# SN Devices
@@ -220,7 +226,6 @@ CONFIG_PCI_DOMAINS=y 
CONFIG_PCI_SYSCALL=y

CONFIG_PCIEPORTBUS=y

CONFIG_HOTPLUG_PCI_PCIE=y

# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set

CONFIG_PCIEAER=y

CONFIG_ARCH_SUPPORTS_MSI=y

# CONFIG_PCI_MSI is not set
@@ -231,10 +236,6 @@ CONFIG_HOTPLUG_PCI=y 
# CONFIG_HOTPLUG_PCI_CPCI is not set

# CONFIG_HOTPLUG_PCI_SHPC is not set

CONFIG_HOTPLUG_PCI_SGI=y



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set



#
@@ -271,6 +272,7 @@ CONFIG_INET_TUNNEL=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

CONFIG_INET_LRO=y

CONFIG_INET_DIAG=m

CONFIG_INET_TCP_DIAG=m

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -342,6 +344,7 @@ CONFIG_IPV6_SIT=m 
#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=y
@@ -402,7 +405,12 @@ CONFIG_IDE_PROC_FS=y 
# IDE chipset support/bugfixes

#

CONFIG_IDE_GENERIC=y

# CONFIG_BLK_DEV_PLATFORM is not set

# CONFIG_BLK_DEV_IDEPNP is not set



#

# PCI IDE chipsets support

#

CONFIG_BLK_DEV_IDEPCI=y

CONFIG_IDEPCI_SHARE_IRQ=y

CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -410,8 +418,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y 
# CONFIG_BLK_DEV_GENERIC is not set

# CONFIG_BLK_DEV_OPTI621 is not set

CONFIG_BLK_DEV_IDEDMA_PCI=y

# CONFIG_BLK_DEV_IDEDMA_FORCED is not set

# CONFIG_IDEDMA_ONLYDISK is not set

# CONFIG_BLK_DEV_AEC62XX is not set

# CONFIG_BLK_DEV_ALI15X3 is not set

# CONFIG_BLK_DEV_AMD74XX is not set
@@ -439,7 +445,6 @@ CONFIG_BLK_DEV_SGIIOC4=y 
# CONFIG_BLK_DEV_TC86C001 is not set

# CONFIG_IDE_ARM is not set

CONFIG_BLK_DEV_IDEDMA=y

# CONFIG_IDEDMA_IVB is not set

# CONFIG_BLK_DEV_HD is not set



#
@@ -482,6 +487,7 @@ CONFIG_SCSI_SAS_ATTRS=y 
CONFIG_SCSI_SAS_LIBSAS=y

# CONFIG_SCSI_SAS_ATA is not set

# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set

CONFIG_SCSI_SRP_ATTRS=y

CONFIG_SCSI_LOWLEVEL=y

CONFIG_ISCSI_TCP=m

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -492,6 +498,7 @@ CONFIG_ISCSI_TCP=m 
# CONFIG_SCSI_AIC7XXX_OLD is not set

# CONFIG_SCSI_AIC79XX is not set

# CONFIG_SCSI_AIC94XX is not set

# CONFIG_SCSI_ADVANSYS is not set

# CONFIG_SCSI_ARCMSR is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set
@@ -532,6 +539,7 @@ CONFIG_ATA_ACPI=y 
# CONFIG_SATA_VIA is not set

CONFIG_SATA_VITESSE=y

# CONFIG_SATA_INIC162X is not set

# CONFIG_PATA_ACPI is not set

# CONFIG_PATA_ALI is not set

# CONFIG_PATA_AMD is not set

# CONFIG_PATA_ARTOP is not set
@@ -556,6 +564,7 @@ CONFIG_SATA_VITESSE=y 
# CONFIG_PATA_OLDPIIX is not set

# CONFIG_PATA_NETCELL is not set

# CONFIG_PATA_NS87410 is not set

# CONFIG_PATA_NS87415 is not set

# CONFIG_PATA_OPTI is not set

# CONFIG_PATA_OPTIDMA is not set

# CONFIG_PATA_PDC_OLD is not set
@@ -588,10 +597,6 @@ CONFIG_DM_MULTIPATH=m 
CONFIG_DM_MULTIPATH_EMC=m

# CONFIG_DM_MULTIPATH_RDAC is not set

# CONFIG_DM_DELAY is not set



#

# Fusion MPT device support

#

CONFIG_FUSION=y

CONFIG_FUSION_SPI=y

CONFIG_FUSION_FC=y
@@ -613,13 +618,16 @@ CONFIG_NETDEVICES=y 
# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_NET_SB1000 is not set

# CONFIG_IP1000 is not set

# CONFIG_ARCNET is not set

# CONFIG_NET_ETHERNET is not set

CONFIG_NETDEV_1000=y

# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

# CONFIG_E1000 is not set

# CONFIG_E1000E is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set
@@ -638,12 +646,15 @@ CONFIG_CHELSIO_T1=m 
CONFIG_CHELSIO_T1_1G=y

# CONFIG_CHELSIO_T1_NAPI is not set

CONFIG_CHELSIO_T3=m

CONFIG_IXGBE=m

# CONFIG_IXGB is not set

CONFIG_S2IO=m

# CONFIG_S2IO_NAPI is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set

# CONFIG_NIU is not set

# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_TR is not set



#
@@ -669,6 +680,7 @@ CONFIG_S2IO=m 
# CONFIG_NET_FC is not set

# CONFIG_SHAPER is not set

CONFIG_NETCONSOLE=y

# CONFIG_NETCONSOLE_DYNAMIC is not set

CONFIG_NETPOLL=y

# CONFIG_NETPOLL_TRAP is not set

CONFIG_NET_POLL_CONTROLLER=y
@@ -690,7 +702,6 @@ CONFIG_INPUT_MOUSEDEV=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
@@ -714,6 +725,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 
# Character devices

#

CONFIG_VT=y

# CONFIG_VT_UNICODE is not set

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set
@@ -760,9 +772,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
CONFIG_EFI_RTC=y

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

CONFIG_AGP=y

CONFIG_AGP_SGI_TIOCA=y

# CONFIG_DRM is not set

CONFIG_RAW_DRIVER=m

CONFIG_MAX_RAW_DEVS=256

# CONFIG_HPET is not set
@@ -781,6 +790,12 @@ CONFIG_DEVPORT=y 
# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers

#
@@ -796,15 +811,18 @@ CONFIG_DEVPORT=y 
#

# Graphics support

#

CONFIG_AGP=y

CONFIG_AGP_SGI_TIOCA=y

# CONFIG_DRM is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

# CONFIG_FB is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

# CONFIG_FB is not set



#

# Console display driver support
@@ -820,6 +838,7 @@ CONFIG_DUMMY_CONSOLE=y 
CONFIG_HID_SUPPORT=y

CONFIG_HID=y

CONFIG_HID_DEBUG=y

# CONFIG_HIDRAW is not set



#

# USB Input Devices
@@ -950,19 +969,6 @@ CONFIG_INFINIBAND_SRP=m 
# CONFIG_INFINIBAND_ISER is not set

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# Userspace I/O

#
@@ -1005,6 +1011,8 @@ CONFIG_XFS_RT=y 
CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_PRINT_QUOTA_WARNING=y

# CONFIG_QFMT_V1 is not set

# CONFIG_QFMT_V2 is not set

CONFIG_QUOTACTL=y
@@ -1043,7 +1051,6 @@ CONFIG_TMPFS=y 
# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_CONFIGFS_FS is not set



#
@@ -1062,10 +1069,7 @@ CONFIG_RAMFS=y 
# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set
@@ -1082,6 +1086,7 @@ CONFIG_EXPORTFS=m 
CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=m

CONFIG_SUNRPC_GSS=m

CONFIG_SUNRPC_XPRT_RDMA=m

# CONFIG_SUNRPC_BIND34 is not set

CONFIG_RPCSEC_GSS_KRB5=m

# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -1118,10 +1123,6 @@ CONFIG_SGI_PARTITION=y 
# CONFIG_KARMA_PARTITION is not set

CONFIG_EFI_PARTITION=y

# CONFIG_SYSV68_PARTITION is not set



#

# Native Language Support

#

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

CONFIG_NLS_CODEPAGE_437=y
@@ -1162,10 +1163,6 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

CONFIG_NLS_UTF8=y



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#
@@ -1223,6 +1220,7 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_FAULT_INJECTION is not set

CONFIG_IA64_GRANULE_16MB=y
@@ -1238,6 +1236,7 @@ CONFIG_SYSVIPC_COMPAT=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_XOR_BLOCKS=y

CONFIG_ASYNC_CORE=y

CONFIG_ASYNC_MEMCPY=y
@@ -1262,6 +1261,7 @@ CONFIG_CRYPTO_ECB=m 
CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=m

# CONFIG_CRYPTO_FCRYPT is not set
@@ -1275,9 +1275,11 @@ CONFIG_CRYPTO_DES=m 
# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

CONFIG_CRYPTO_DEFLATE=m

# CONFIG_CRYPTO_MICHAEL_MIC is not set

CONFIG_CRYPTO_CRC32C=m

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_HW is not set

arch/ia64/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,7 @@ kdump_find_rsvd_region (unsigned long size, 


#ifdef CONFIG_PROC_VMCORE

/* locate the size find a the descriptor at a certain address */

unsigned long

unsigned long __init

vmcore_find_descriptor_size (unsigned long address)

{

	void *efi_map_start, *efi_map_end, *p;

arch/ia64/kernel/gate.lds.S

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ SECTIONS 
	.gnu.version_d		: { *(.gnu.version_d) }

	.gnu.version_r		: { *(.gnu.version_r) }



	.note			: { *(.note*) }		:readable	:note



	.dynamic		: { *(.dynamic) }	:readable	:dynamic



	/*
@@ -83,6 +85,7 @@ PHDRS 
	epc		PT_LOAD	FILEHDR PHDRS	FLAGS(1);	/* PF_X */

#endif

	dynamic		PT_DYNAMIC		FLAGS(4);	/* PF_R */

	note		PT_NOTE			FLAGS(4);	/* PF_R */

	unwind		PT_IA_64_UNWIND;

}

arch/ia64/kernel/msi_ia64.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) 
	write_msi_msg(irq, &msg);

	set_irq_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);



	return irq;

	return 0;

}



void ia64_teardown_msi_irq(unsigned int irq)

arch/ia64/kernel/setup.c

+8 −41
Original line number Diff line number Diff line
@@ -417,34 +417,6 @@ mark_bsp_online (void) 
#endif

}



#ifdef CONFIG_SMP

static void __init

check_for_logical_procs (void)

{

	pal_logical_to_physical_t info;

	s64 status;



	status = ia64_pal_logical_to_phys(0, &info);

	if (status == -1) {

		printk(KERN_INFO "No logical to physical processor mapping "

		       "available\n");

		return;

	}

	if (status) {

		printk(KERN_ERR "ia64_pal_logical_to_phys failed with %ld\n",

		       status);

		return;

	}

	/*

	 * Total number of siblings that BSP has.  Though not all of them 

	 * may have booted successfully. The correct number of siblings 

	 * booted is in info.overview_num_log.

	 */

	smp_num_siblings = info.overview_tpc;

	smp_num_cpucores = info.overview_cpp;

}

#endif



static __initdata int nomca;

static __init int setup_nomca(char *s)

{
@@ -540,15 +512,6 @@ setup_arch (char **cmdline_p) 


#ifdef CONFIG_SMP

	cpu_physical_id(0) = hard_smp_processor_id();

	check_for_logical_procs();

	if (smp_num_cpucores > 1)

		printk(KERN_INFO

		       "cpu package is Multi-Core capable: number of cores=%d\n",

		       smp_num_cpucores);

	if (smp_num_siblings > 1)

		printk(KERN_INFO

		       "cpu package is Multi-Threading capable: number of siblings=%d\n",

		       smp_num_siblings);

#endif



	cpu_init();	/* initialize the bootstrap CPU */
@@ -661,12 +624,13 @@ show_cpuinfo (struct seq_file *m, void *v) 
		   lpj*HZ/500000, (lpj*HZ/5000) % 100);

#ifdef CONFIG_SMP

	seq_printf(m, "siblings   : %u\n", cpus_weight(cpu_core_map[cpunum]));

	if (c->socket_id != -1)

		seq_printf(m, "physical id: %u\n", c->socket_id);

	if (c->threads_per_core > 1 || c->cores_per_socket > 1)

		seq_printf(m,

		   	   "physical id: %u\n"

			   "core id    : %u\n"

			   "thread id  : %u\n",

		   	   c->socket_id, c->core_id, c->thread_id);

			   c->core_id, c->thread_id);

#endif

	seq_printf(m,"\n");
@@ -778,6 +742,9 @@ identify_cpu (struct cpuinfo_ia64 *c) 
	c->socket_id = -1;



	identify_siblings(c);



	if (c->threads_per_core > smp_num_siblings)

		smp_num_siblings = c->threads_per_core;

#endif

	c->ppn = cpuid.field.ppn;

	c->number = cpuid.field.number;

CRA Git | Maintained and supported by SUSTech CRA and CCSE