Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git (897f5ab2) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/ia64/Kconfig

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -217,6 +217,16 @@ config IA64_SGI_SN_SIM
	If you are compiling a kernel that will run under SGI's IA-64		If you are compiling a kernel that will run under SGI's IA-64
	simulator (Medusa) then say Y, otherwise say N.		simulator (Medusa) then say Y, otherwise say N.

			config IA64_SGI_SN_XP
			tristate "Support communication between SGI SSIs"
			depends on MSPEC
			help
			An SGI machine can be divided into multiple Single System
			Images which act independently of each other and have
			hardware based memory protection from the others. Enabling
			this feature will allow for direct communication between SSIs
			based on a network adapter and DMA messaging.

	config FORCE_MAX_ZONEORDER		config FORCE_MAX_ZONEORDER
	int		int
	default "18"		default "18"
	@@ -261,6 +271,15 @@ config HOTPLUG_CPU
	can be controlled through /sys/devices/system/cpu/cpu#.		can be controlled through /sys/devices/system/cpu/cpu#.
	Say N if you want to disable CPU hotplug.		Say N if you want to disable CPU hotplug.

			config SCHED_SMT
			bool "SMT scheduler support"
			depends on SMP
			default off
			help
			Improves the CPU scheduler's decision making when dealing with
			Intel IA64 chips with MultiThreading at a cost of slightly increased
			overhead in some places. If unsure say N here.

	config PREEMPT		config PREEMPT
	bool "Preemptible Kernel"		bool "Preemptible Kernel"
	help		help

arch/ia64/configs/tiger_defconfig

+57 −39

Original line number	Original line	Diff line number	Diff line
	#		#
	# Automatically generated make config: don't edit		# Automatically generated make config: don't edit
	# Linux kernel version: 2.6.11-rc2		# Linux kernel version: 2.6.12-rc3
	# Sat Jan 22 11:17:02 2005		# Tue May 3 15:55:04 2005
	#		#

	#		#
	@@ -10,6 +10,7 @@
	CONFIG_EXPERIMENTAL=y		CONFIG_EXPERIMENTAL=y
	CONFIG_CLEAN_COMPILE=y		CONFIG_CLEAN_COMPILE=y
	CONFIG_LOCK_KERNEL=y		CONFIG_LOCK_KERNEL=y
			CONFIG_INIT_ENV_ARG_LIMIT=32

	#		#
	# General setup		# General setup
	@@ -21,24 +22,27 @@ CONFIG_POSIX_MQUEUE=y
	# CONFIG_BSD_PROCESS_ACCT is not set		# CONFIG_BSD_PROCESS_ACCT is not set
	CONFIG_SYSCTL=y		CONFIG_SYSCTL=y
	# CONFIG_AUDIT is not set		# CONFIG_AUDIT is not set
	CONFIG_LOG_BUF_SHIFT=20
	CONFIG_HOTPLUG=y		CONFIG_HOTPLUG=y
	CONFIG_KOBJECT_UEVENT=y		CONFIG_KOBJECT_UEVENT=y
	CONFIG_IKCONFIG=y		CONFIG_IKCONFIG=y
	CONFIG_IKCONFIG_PROC=y		CONFIG_IKCONFIG_PROC=y
			# CONFIG_CPUSETS is not set
	# CONFIG_EMBEDDED is not set		# CONFIG_EMBEDDED is not set
	CONFIG_KALLSYMS=y		CONFIG_KALLSYMS=y
	CONFIG_KALLSYMS_ALL=y		CONFIG_KALLSYMS_ALL=y
	# CONFIG_KALLSYMS_EXTRA_PASS is not set		# CONFIG_KALLSYMS_EXTRA_PASS is not set
			CONFIG_PRINTK=y
			CONFIG_BUG=y
			CONFIG_BASE_FULL=y
	CONFIG_FUTEX=y		CONFIG_FUTEX=y
	CONFIG_EPOLL=y		CONFIG_EPOLL=y
	# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
	CONFIG_SHMEM=y		CONFIG_SHMEM=y
	CONFIG_CC_ALIGN_FUNCTIONS=0		CONFIG_CC_ALIGN_FUNCTIONS=0
	CONFIG_CC_ALIGN_LABELS=0		CONFIG_CC_ALIGN_LABELS=0
	CONFIG_CC_ALIGN_LOOPS=0		CONFIG_CC_ALIGN_LOOPS=0
	CONFIG_CC_ALIGN_JUMPS=0		CONFIG_CC_ALIGN_JUMPS=0
	# CONFIG_TINY_SHMEM is not set		# CONFIG_TINY_SHMEM is not set
			CONFIG_BASE_SMALL=0

	#		#
	# Loadable module support		# Loadable module support
	@@ -85,6 +89,7 @@ CONFIG_FORCE_MAX_ZONEORDER=18
	CONFIG_SMP=y		CONFIG_SMP=y
	CONFIG_NR_CPUS=4		CONFIG_NR_CPUS=4
	CONFIG_HOTPLUG_CPU=y		CONFIG_HOTPLUG_CPU=y
			# CONFIG_SCHED_SMT is not set
	# CONFIG_PREEMPT is not set		# CONFIG_PREEMPT is not set
	CONFIG_HAVE_DEC_LOCK=y		CONFIG_HAVE_DEC_LOCK=y
	CONFIG_IA32_SUPPORT=y		CONFIG_IA32_SUPPORT=y
	@@ -135,6 +140,7 @@ CONFIG_PCI_DOMAINS=y
	# CONFIG_PCI_MSI is not set		# CONFIG_PCI_MSI is not set
	CONFIG_PCI_LEGACY_PROC=y		CONFIG_PCI_LEGACY_PROC=y
	CONFIG_PCI_NAMES=y		CONFIG_PCI_NAMES=y
			# CONFIG_PCI_DEBUG is not set

	#		#
	# PCI Hotplug Support		# PCI Hotplug Support
	@@ -151,10 +157,6 @@ CONFIG_HOTPLUG_PCI_ACPI=m
	#		#
	# CONFIG_PCCARD is not set		# CONFIG_PCCARD is not set

	#
	# PC-card bridges
	#

	#		#
	# Device Drivers		# Device Drivers
	#		#
	@@ -195,9 +197,10 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
	CONFIG_BLK_DEV_NBD=m		CONFIG_BLK_DEV_NBD=m
	# CONFIG_BLK_DEV_SX8 is not set		# CONFIG_BLK_DEV_SX8 is not set
	# CONFIG_BLK_DEV_UB is not set		# CONFIG_BLK_DEV_UB is not set
	CONFIG_BLK_DEV_RAM=m		CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_COUNT=16		CONFIG_BLK_DEV_RAM_COUNT=16
	CONFIG_BLK_DEV_RAM_SIZE=4096		CONFIG_BLK_DEV_RAM_SIZE=4096
			CONFIG_BLK_DEV_INITRD=y
	CONFIG_INITRAMFS_SOURCE=""		CONFIG_INITRAMFS_SOURCE=""
	# CONFIG_CDROM_PKTCDVD is not set		# CONFIG_CDROM_PKTCDVD is not set

	@@ -313,7 +316,6 @@ CONFIG_SCSI_FC_ATTRS=y
	# CONFIG_SCSI_BUSLOGIC is not set		# CONFIG_SCSI_BUSLOGIC is not set
	# CONFIG_SCSI_DMX3191D is not set		# CONFIG_SCSI_DMX3191D is not set
	# CONFIG_SCSI_EATA is not set		# CONFIG_SCSI_EATA is not set
	# CONFIG_SCSI_EATA_PIO is not set
	# CONFIG_SCSI_FUTURE_DOMAIN is not set		# CONFIG_SCSI_FUTURE_DOMAIN is not set
	# CONFIG_SCSI_GDTH is not set		# CONFIG_SCSI_GDTH is not set
	# CONFIG_SCSI_IPS is not set		# CONFIG_SCSI_IPS is not set
	@@ -325,7 +327,6 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
	CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64		CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
	# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set		# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
	# CONFIG_SCSI_IPR is not set		# CONFIG_SCSI_IPR is not set
	# CONFIG_SCSI_QLOGIC_ISP is not set
	CONFIG_SCSI_QLOGIC_FC=y		CONFIG_SCSI_QLOGIC_FC=y
	# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set		# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
	CONFIG_SCSI_QLOGIC_1280=y		CONFIG_SCSI_QLOGIC_1280=y
	@@ -336,6 +337,7 @@ CONFIG_SCSI_QLA22XX=m
	CONFIG_SCSI_QLA2300=m		CONFIG_SCSI_QLA2300=m
	CONFIG_SCSI_QLA2322=m		CONFIG_SCSI_QLA2322=m
	# CONFIG_SCSI_QLA6312 is not set		# CONFIG_SCSI_QLA6312 is not set
			# CONFIG_SCSI_LPFC is not set
	# CONFIG_SCSI_DC395x is not set		# CONFIG_SCSI_DC395x is not set
	# CONFIG_SCSI_DC390T is not set		# CONFIG_SCSI_DC390T is not set
	# CONFIG_SCSI_DEBUG is not set		# CONFIG_SCSI_DEBUG is not set
	@@ -358,6 +360,7 @@ CONFIG_DM_CRYPT=m
	CONFIG_DM_SNAPSHOT=m		CONFIG_DM_SNAPSHOT=m
	CONFIG_DM_MIRROR=m		CONFIG_DM_MIRROR=m
	CONFIG_DM_ZERO=m		CONFIG_DM_ZERO=m
			# CONFIG_DM_MULTIPATH is not set

	#		#
	# Fusion MPT device support		# Fusion MPT device support
	@@ -386,7 +389,6 @@ CONFIG_NET=y
	#		#
	CONFIG_PACKET=y		CONFIG_PACKET=y
	# CONFIG_PACKET_MMAP is not set		# CONFIG_PACKET_MMAP is not set
	CONFIG_NETLINK_DEV=y
	CONFIG_UNIX=y		CONFIG_UNIX=y
	# CONFIG_NET_KEY is not set		# CONFIG_NET_KEY is not set
	CONFIG_INET=y		CONFIG_INET=y
	@@ -446,7 +448,6 @@ CONFIG_DUMMY=m
	# CONFIG_BONDING is not set		# CONFIG_BONDING is not set
	# CONFIG_EQUALIZER is not set		# CONFIG_EQUALIZER is not set
	# CONFIG_TUN is not set		# CONFIG_TUN is not set
	# CONFIG_ETHERTAP is not set

	#		#
	# ARCnet devices		# ARCnet devices
	@@ -484,7 +485,6 @@ CONFIG_NET_PCI=y
	# CONFIG_DGRS is not set		# CONFIG_DGRS is not set
	CONFIG_EEPRO100=m		CONFIG_EEPRO100=m
	CONFIG_E100=m		CONFIG_E100=m
	# CONFIG_E100_NAPI is not set
	# CONFIG_FEALNX is not set		# CONFIG_FEALNX is not set
	# CONFIG_NATSEMI is not set		# CONFIG_NATSEMI is not set
	# CONFIG_NE2K_PCI is not set		# CONFIG_NE2K_PCI is not set
	@@ -565,25 +565,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
	# CONFIG_INPUT_EVDEV is not set		# CONFIG_INPUT_EVDEV is not set
	# CONFIG_INPUT_EVBUG is not set		# CONFIG_INPUT_EVBUG is not set

	#
	# Input I/O drivers
	#
	CONFIG_GAMEPORT=m
	CONFIG_SOUND_GAMEPORT=m
	# CONFIG_GAMEPORT_NS558 is not set
	# CONFIG_GAMEPORT_L4 is not set
	# CONFIG_GAMEPORT_EMU10K1 is not set
	# CONFIG_GAMEPORT_VORTEX is not set
	# CONFIG_GAMEPORT_FM801 is not set
	# CONFIG_GAMEPORT_CS461X is not set
	CONFIG_SERIO=y
	CONFIG_SERIO_I8042=y
	# CONFIG_SERIO_SERPORT is not set
	# CONFIG_SERIO_CT82C710 is not set
	# CONFIG_SERIO_PCIPS2 is not set
	CONFIG_SERIO_LIBPS2=y
	# CONFIG_SERIO_RAW is not set

	#		#
	# Input Device Drivers		# Input Device Drivers
	#		#
	@@ -601,6 +582,24 @@ CONFIG_MOUSE_PS2=y
	# CONFIG_INPUT_TOUCHSCREEN is not set		# CONFIG_INPUT_TOUCHSCREEN is not set
	# CONFIG_INPUT_MISC is not set		# CONFIG_INPUT_MISC is not set

			#
			# Hardware I/O ports
			#
			CONFIG_SERIO=y
			CONFIG_SERIO_I8042=y
			# CONFIG_SERIO_SERPORT is not set
			# CONFIG_SERIO_PCIPS2 is not set
			CONFIG_SERIO_LIBPS2=y
			# CONFIG_SERIO_RAW is not set
			CONFIG_GAMEPORT=m
			# CONFIG_GAMEPORT_NS558 is not set
			# CONFIG_GAMEPORT_L4 is not set
			# CONFIG_GAMEPORT_EMU10K1 is not set
			# CONFIG_GAMEPORT_VORTEX is not set
			# CONFIG_GAMEPORT_FM801 is not set
			# CONFIG_GAMEPORT_CS461X is not set
			CONFIG_SOUND_GAMEPORT=m

	#		#
	# Character devices		# Character devices
	#		#
	@@ -615,6 +614,8 @@ CONFIG_SERIAL_NONSTANDARD=y
	# CONFIG_SYNCLINK is not set		# CONFIG_SYNCLINK is not set
	# CONFIG_SYNCLINKMP is not set		# CONFIG_SYNCLINKMP is not set
	# CONFIG_N_HDLC is not set		# CONFIG_N_HDLC is not set
			# CONFIG_SPECIALIX is not set
			# CONFIG_SX is not set
	# CONFIG_STALDRV is not set		# CONFIG_STALDRV is not set

	#		#
	@@ -635,6 +636,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
	#		#
	CONFIG_SERIAL_CORE=y		CONFIG_SERIAL_CORE=y
	CONFIG_SERIAL_CORE_CONSOLE=y		CONFIG_SERIAL_CORE_CONSOLE=y
			# CONFIG_SERIAL_JSM is not set
	CONFIG_UNIX98_PTYS=y		CONFIG_UNIX98_PTYS=y
	CONFIG_LEGACY_PTYS=y		CONFIG_LEGACY_PTYS=y
	CONFIG_LEGACY_PTY_COUNT=256		CONFIG_LEGACY_PTY_COUNT=256
	@@ -670,6 +672,12 @@ CONFIG_HPET=y
	# CONFIG_HPET_RTC_IRQ is not set		# CONFIG_HPET_RTC_IRQ is not set
	CONFIG_HPET_MMAP=y		CONFIG_HPET_MMAP=y
	CONFIG_MAX_RAW_DEVS=256		CONFIG_MAX_RAW_DEVS=256
			# CONFIG_HANGCHECK_TIMER is not set

			#
			# TPM devices
			#
			# CONFIG_TCG_TPM is not set

	#		#
	# I2C support		# I2C support
	@@ -705,7 +713,6 @@ CONFIG_MAX_RAW_DEVS=256
	#		#
	CONFIG_VGA_CONSOLE=y		CONFIG_VGA_CONSOLE=y
	CONFIG_DUMMY_CONSOLE=y		CONFIG_DUMMY_CONSOLE=y
	# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

	#		#
	# Sound		# Sound
	@@ -715,6 +722,8 @@ CONFIG_DUMMY_CONSOLE=y
	#		#
	# USB support		# USB support
	#		#
			CONFIG_USB_ARCH_HAS_HCD=y
			CONFIG_USB_ARCH_HAS_OHCI=y
	CONFIG_USB=y		CONFIG_USB=y
	# CONFIG_USB_DEBUG is not set		# CONFIG_USB_DEBUG is not set

	@@ -726,8 +735,6 @@ CONFIG_USB_DEVICEFS=y
	# CONFIG_USB_DYNAMIC_MINORS is not set		# CONFIG_USB_DYNAMIC_MINORS is not set
	# CONFIG_USB_SUSPEND is not set		# CONFIG_USB_SUSPEND is not set
	# CONFIG_USB_OTG is not set		# CONFIG_USB_OTG is not set
	CONFIG_USB_ARCH_HAS_HCD=y
	CONFIG_USB_ARCH_HAS_OHCI=y

	#		#
	# USB Host Controller Drivers		# USB Host Controller Drivers
	@@ -736,6 +743,8 @@ CONFIG_USB_EHCI_HCD=m
	# CONFIG_USB_EHCI_SPLIT_ISO is not set		# CONFIG_USB_EHCI_SPLIT_ISO is not set
	# CONFIG_USB_EHCI_ROOT_HUB_TT is not set		# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
	CONFIG_USB_OHCI_HCD=m		CONFIG_USB_OHCI_HCD=m
			# CONFIG_USB_OHCI_BIG_ENDIAN is not set
			CONFIG_USB_OHCI_LITTLE_ENDIAN=y
	CONFIG_USB_UHCI_HCD=y		CONFIG_USB_UHCI_HCD=y
	# CONFIG_USB_SL811_HCD is not set		# CONFIG_USB_SL811_HCD is not set

	@@ -751,12 +760,11 @@ CONFIG_USB_UHCI_HCD=y
	#		#
	CONFIG_USB_STORAGE=m		CONFIG_USB_STORAGE=m
	# CONFIG_USB_STORAGE_DEBUG is not set		# CONFIG_USB_STORAGE_DEBUG is not set
	# CONFIG_USB_STORAGE_RW_DETECT is not set
	# CONFIG_USB_STORAGE_DATAFAB is not set		# CONFIG_USB_STORAGE_DATAFAB is not set
	# CONFIG_USB_STORAGE_FREECOM is not set		# CONFIG_USB_STORAGE_FREECOM is not set
	# CONFIG_USB_STORAGE_ISD200 is not set		# CONFIG_USB_STORAGE_ISD200 is not set
	# CONFIG_USB_STORAGE_DPCM is not set		# CONFIG_USB_STORAGE_DPCM is not set
	# CONFIG_USB_STORAGE_HP8200e is not set		# CONFIG_USB_STORAGE_USBAT is not set
	# CONFIG_USB_STORAGE_SDDR09 is not set		# CONFIG_USB_STORAGE_SDDR09 is not set
	# CONFIG_USB_STORAGE_SDDR55 is not set		# CONFIG_USB_STORAGE_SDDR55 is not set
	# CONFIG_USB_STORAGE_JUMPSHOT is not set		# CONFIG_USB_STORAGE_JUMPSHOT is not set
	@@ -800,6 +808,7 @@ CONFIG_USB_HIDINPUT=y
	# CONFIG_USB_PEGASUS is not set		# CONFIG_USB_PEGASUS is not set
	# CONFIG_USB_RTL8150 is not set		# CONFIG_USB_RTL8150 is not set
	# CONFIG_USB_USBNET is not set		# CONFIG_USB_USBNET is not set
			# CONFIG_USB_MON is not set

	#		#
	# USB port drivers		# USB port drivers
	@@ -824,6 +833,7 @@ CONFIG_USB_HIDINPUT=y
	# CONFIG_USB_PHIDGETKIT is not set		# CONFIG_USB_PHIDGETKIT is not set
	# CONFIG_USB_PHIDGETSERVO is not set		# CONFIG_USB_PHIDGETSERVO is not set
	# CONFIG_USB_IDMOUSE is not set		# CONFIG_USB_IDMOUSE is not set
			# CONFIG_USB_SISUSBVGA is not set
	# CONFIG_USB_TEST is not set		# CONFIG_USB_TEST is not set

	#		#
	@@ -867,7 +877,12 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
	CONFIG_REISERFS_FS_SECURITY=y		CONFIG_REISERFS_FS_SECURITY=y
	# CONFIG_JFS_FS is not set		# CONFIG_JFS_FS is not set
	CONFIG_FS_POSIX_ACL=y		CONFIG_FS_POSIX_ACL=y

			#
			# XFS support
			#
	CONFIG_XFS_FS=y		CONFIG_XFS_FS=y
			CONFIG_XFS_EXPORT=y
	# CONFIG_XFS_RT is not set		# CONFIG_XFS_RT is not set
	# CONFIG_XFS_QUOTA is not set		# CONFIG_XFS_QUOTA is not set
	# CONFIG_XFS_SECURITY is not set		# CONFIG_XFS_SECURITY is not set
	@@ -945,7 +960,7 @@ CONFIG_NFSD_V4=y
	CONFIG_NFSD_TCP=y		CONFIG_NFSD_TCP=y
	CONFIG_LOCKD=m		CONFIG_LOCKD=m
	CONFIG_LOCKD_V4=y		CONFIG_LOCKD_V4=y
	CONFIG_EXPORTFS=m		CONFIG_EXPORTFS=y
	CONFIG_SUNRPC=m		CONFIG_SUNRPC=m
	CONFIG_SUNRPC_GSS=m		CONFIG_SUNRPC_GSS=m
	CONFIG_RPCSEC_GSS_KRB5=m		CONFIG_RPCSEC_GSS_KRB5=m
	@@ -1042,8 +1057,10 @@ CONFIG_GENERIC_IRQ_PROBE=y
	#		#
	# Kernel hacking		# Kernel hacking
	#		#
			# CONFIG_PRINTK_TIME is not set
	CONFIG_DEBUG_KERNEL=y		CONFIG_DEBUG_KERNEL=y
	CONFIG_MAGIC_SYSRQ=y		CONFIG_MAGIC_SYSRQ=y
			CONFIG_LOG_BUF_SHIFT=20
	# CONFIG_SCHEDSTATS is not set		# CONFIG_SCHEDSTATS is not set
	# CONFIG_DEBUG_SLAB is not set		# CONFIG_DEBUG_SLAB is not set
	# CONFIG_DEBUG_SPINLOCK is not set		# CONFIG_DEBUG_SPINLOCK is not set
	@@ -1077,6 +1094,7 @@ CONFIG_CRYPTO_MD5=m
	# CONFIG_CRYPTO_SHA256 is not set		# CONFIG_CRYPTO_SHA256 is not set
	# CONFIG_CRYPTO_SHA512 is not set		# CONFIG_CRYPTO_SHA512 is not set
	# CONFIG_CRYPTO_WP512 is not set		# CONFIG_CRYPTO_WP512 is not set
			# CONFIG_CRYPTO_TGR192 is not set
	CONFIG_CRYPTO_DES=m		CONFIG_CRYPTO_DES=m
	# CONFIG_CRYPTO_BLOWFISH is not set		# CONFIG_CRYPTO_BLOWFISH is not set
	# CONFIG_CRYPTO_TWOFISH is not set		# CONFIG_CRYPTO_TWOFISH is not set

arch/ia64/hp/common/sba_iommu.c

+4 −30

Original line number	Original line	Diff line number	Diff line
	@@ -1944,43 +1944,17 @@ sba_connect_bus(struct pci_bus *bus)
	static void __init		static void __init
	sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)		sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle)
	{		{
	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
	union acpi_object *obj;
	acpi_handle phandle;
	unsigned int node;		unsigned int node;
			int pxm;

	ioc->node = MAX_NUMNODES;		ioc->node = MAX_NUMNODES;

	/*		pxm = acpi_get_pxm(handle);
	* Check for a _PXM on this node first. We don't typically see
	* one here, so we'll end up getting it from the parent.
	*/
	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PXM", NULL, &buffer))) {
	if (ACPI_FAILURE(acpi_get_parent(handle, &phandle)))
	return;

	/* Reset the acpi buffer */		if (pxm < 0)
	buffer.length = ACPI_ALLOCATE_BUFFER;
	buffer.pointer = NULL;

	if (ACPI_FAILURE(acpi_evaluate_object(phandle, "_PXM", NULL,
	&buffer)))
	return;		return;
	}

	if (!buffer.length \|\| !buffer.pointer)
	return;

	obj = buffer.pointer;

	if (obj->type != ACPI_TYPE_INTEGER \|\|
	obj->integer.value >= MAX_PXM_DOMAINS) {
	acpi_os_free(buffer.pointer);
	return;
	}

	node = pxm_to_nid_map[obj->integer.value];		node = pxm_to_nid_map[pxm];
	acpi_os_free(buffer.pointer);

	if (node >= MAX_NUMNODES \|\| !node_online(node))		if (node >= MAX_NUMNODES \|\| !node_online(node))
	return;		return;

arch/ia64/kernel/acpi.c

+5 −18

Original line number	Original line	Diff line number	Diff line
	@@ -779,7 +779,7 @@ acpi_map_iosapic (acpi_handle handle, u32 depth, void context, void *ret)
	union acpi_object *obj;		union acpi_object *obj;
	struct acpi_table_iosapic *iosapic;		struct acpi_table_iosapic *iosapic;
	unsigned int gsi_base;		unsigned int gsi_base;
	int node;		int pxm, node;

	/* Only care about objects w/ a method that returns the MADT */		/* Only care about objects w/ a method that returns the MADT */
	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))		if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))
	@@ -805,29 +805,16 @@ acpi_map_iosapic (acpi_handle handle, u32 depth, void context, void *ret)
	gsi_base = iosapic->global_irq_base;		gsi_base = iosapic->global_irq_base;

	acpi_os_free(buffer.pointer);		acpi_os_free(buffer.pointer);
	buffer.length = ACPI_ALLOCATE_BUFFER;
	buffer.pointer = NULL;

	/*		/*
	* OK, it's an IOSAPIC MADT entry, look for a _PXM method to tell		* OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell
	* us which node to associate this with.		* us which node to associate this with.
	*/		*/
	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PXM", NULL, &buffer)))		pxm = acpi_get_pxm(handle);
	return AE_OK;		if (pxm < 0)

	if (!buffer.length \|\| !buffer.pointer)
	return AE_OK;

	obj = buffer.pointer;

	if (obj->type != ACPI_TYPE_INTEGER \|\|
	obj->integer.value >= MAX_PXM_DOMAINS) {
	acpi_os_free(buffer.pointer);
	return AE_OK;		return AE_OK;
	}

	node = pxm_to_nid_map[obj->integer.value];		node = pxm_to_nid_map[pxm];
	acpi_os_free(buffer.pointer);

	if (node >= MAX_NUMNODES \|\| !node_online(node) \|\|		if (node >= MAX_NUMNODES \|\| !node_online(node) \|\|
	cpus_empty(node_to_cpumask(node)))		cpus_empty(node_to_cpumask(node)))

arch/ia64/kernel/entry.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -782,7 +782,7 @@ GLOBAL_ENTRY(ia64_ret_from_ia32_execve)
	st8.spill [r2]=r8 // store return value in slot for r8 and set unat bit		st8.spill [r2]=r8 // store return value in slot for r8 and set unat bit
	.mem.offset 8,0		.mem.offset 8,0
	st8.spill [r3]=r0 // clear error indication in slot for r10 and set unat bit		st8.spill [r3]=r0 // clear error indication in slot for r10 and set unat bit
	END(ia64_ret_from_ia32_execve_syscall)		END(ia64_ret_from_ia32_execve)
	// fall through		// fall through
	#endif /* CONFIG_IA32_SUPPORT */		#endif /* CONFIG_IA32_SUPPORT */
	GLOBAL_ENTRY(ia64_leave_kernel)		GLOBAL_ENTRY(ia64_leave_kernel)