Commit d03ab7ff 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] wrong attribute of HUB chip written in uv_setup()
  [IA64] remove trailing space in messages
  [IA64] use asm-generic/scatterlist.h
  [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI
  [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI
  [IA64] Remove COMPAT_IA32 support
parents 8098a7ef 4d86e1b1

arch/ia64/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -499,23 +499,6 @@ config ARCH_PROC_KCORE_TEXT 
	def_bool y

	depends on PROC_KCORE



config IA32_SUPPORT

	bool "Support for Linux/x86 binaries"

	help

	  IA-64 processors can execute IA-32 (X86) instructions.  By

	  saying Y here, the kernel will include IA-32 system call

	  emulation support which makes it possible to transparently

	  run IA-32 Linux binaries on an IA-64 Linux system.

	  If in doubt, say Y.



config COMPAT

	bool

	depends on IA32_SUPPORT

	default y



config COMPAT_FOR_U64_ALIGNMENT

	def_bool COMPAT



config IA64_MCA_RECOVERY

	tristate "MCA recovery from errors other than TLB."

arch/ia64/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o 


libs-y				+= arch/ia64/lib/

core-y				+= arch/ia64/kernel/ arch/ia64/mm/

core-$(CONFIG_IA32_SUPPORT)	+= arch/ia64/ia32/

core-$(CONFIG_IA64_DIG) 	+= arch/ia64/dig/

core-$(CONFIG_IA64_DIG_VTD) 	+= arch/ia64/dig/

core-$(CONFIG_IA64_GENERIC) 	+= arch/ia64/dig/

arch/ia64/configs/bigsur_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 
CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

# CONFIG_VIRTUAL_MEM_MAP is not set

CONFIG_IA32_SUPPORT=y

CONFIG_COMPAT=y

# CONFIG_IA64_MCA_RECOVERY is not set

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

arch/ia64/configs/generic_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -205,8 +205,6 @@ CONFIG_VIRTUAL_MEM_MAP=y 
CONFIG_HOLES_IN_ZONE=y

CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y

CONFIG_HAVE_ARCH_NODEDATA_EXTENSION=y

CONFIG_IA32_SUPPORT=y

CONFIG_COMPAT=y

CONFIG_COMPAT_FOR_U64_ALIGNMENT=y

CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

arch/ia64/configs/gensparse_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y 
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y

CONFIG_NUMA=y

CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y

CONFIG_IA32_SUPPORT=y

CONFIG_COMPAT=y

CONFIG_IA64_MCA_RECOVERY=y

CONFIG_PERFMON=y

CONFIG_IA64_PALINFO=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE