Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

	  Say no to build a 32-bit kernel - formerly known as i386

config X86_32

	def_bool !64BIT

	def_bool y

	depends on !64BIT

	select CLKSRC_I8253

config X86_64

	def_bool 64BIT

	def_bool y

	depends on 64BIT

	select X86_DEV_DMA_OPS

### Arch settings

	select HAVE_IRQ_TIME_ACCOUNTING

config INSTRUCTION_DECODER

	def_bool (KPROBES || PERF_EVENTS || UPROBES)

	def_bool y

	depends on KPROBES || PERF_EVENTS || UPROBES

config OUTPUT_FORMAT

	string

	bool

config NEED_DMA_MAP_STATE

       def_bool (X86_64 || INTEL_IOMMU || DMA_API_DEBUG)

	def_bool y

	depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG

config NEED_SG_DMA_LENGTH

	def_bool y

config GENERIC_ISA_DMA

	def_bool ISA_DMA_API

	def_bool y

	depends on ISA_DMA_API

config GENERIC_BUG

	def_bool y

	bool

config ARCH_MAY_HAVE_PC_FDC

	def_bool ISA_DMA_API

	def_bool y

	depends on ISA_DMA_API

config RWSEM_GENERIC_SPINLOCK

	def_bool !X86_XADD

	def_bool y

	depends on !X86_XADD

config RWSEM_XCHGADD_ALGORITHM

	def_bool X86_XADD

	def_bool y

	depends on X86_XADD

config GENERIC_CALIBRATE_DELAY

	def_bool y

	  If unsure, say Y.

config IOMMU_HELPER

	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)

	def_bool y

	depends on CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU

config MAXSMP

	bool "Enable Maximum number of SMP Processors and NUMA Nodes"

	  consumes more pagetable space per process.

config ARCH_PHYS_ADDR_T_64BIT

	def_bool X86_64 || X86_PAE

	def_bool y

	depends on X86_64 || X86_PAE

config ARCH_DMA_ADDR_T_64BIT

	def_bool X86_64 || HIGHMEM64G

	def_bool y

	depends on X86_64 || HIGHMEM64G

config DIRECT_GBPAGES

	bool "Enable 1GB pages for kernel pagetables" if EXPERT

	depends on ARCH_SPARSEMEM_ENABLE

config ARCH_MEMORY_PROBE

	def_bool X86_64

	depends on MEMORY_HOTPLUG

	def_bool y

	depends on X86_64 && MEMORY_HOTPLUG

config ARCH_PROC_KCORE_TEXT

	def_bool y

config PCI_CNB20LE_QUIRK

	bool "Read CNB20LE Host Bridge Windows" if EXPERT

	default n

	depends on PCI && EXPERIMENTAL

	help

	  Read the PCI windows out of the CNB20LE host bridge. This allows

	depends on IA32_EMULATION || X86_X32

	select ARCH_WANT_OLD_COMPAT_IPC

if COMPAT

config COMPAT_FOR_U64_ALIGNMENT

	def_bool COMPAT

	depends on X86_64

	def_bool y

config SYSVIPC_COMPAT

	def_bool y

	depends on COMPAT && SYSVIPC

	depends on SYSVIPC

config KEYS_COMPAT

	bool

	depends on COMPAT && KEYS

	default y

	def_bool y

	depends on KEYS

endif

endmenu

	default X86_L1_CACHE_SHIFT

config X86_CMPXCHG

	def_bool X86_64 || (X86_32 && !M386)

	def_bool y

	depends on X86_64 || (X86_32 && !M386)

config X86_L1_CACHE_SHIFT

	int

config X86_XADD

	def_bool y

	depends on X86_64 || !M386

	depends on !M386

config X86_PPRO_FENCE

	bool "PentiumPro memory ordering errata workaround"

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=18

CONFIG_CGROUPS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_SUN_PARTITION=y

CONFIG_KARMA_PARTITION=y

CONFIG_EFI_PARTITION=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_X86_GENERIC=y

CONFIG_HPET_TIMER=y

CONFIG_DEBUG_DEVRES=y

CONFIG_CONNECTOR=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_SND_HDA_INTEL=y

CONFIG_SND_HDA_HWDEP=y

CONFIG_HIDRAW=y

CONFIG_HID_PID=y

CONFIG_USB_HIDDEV=y

CONFIG_HID_GYRATION=y

CONFIG_LOGITECH_FF=y

CONFIG_HID_NTRIG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_TOPSEED=y

CONFIG_HID_PID=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_DEBUG=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_DEVICEFS=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_DMADEVICES=y

CONFIG_EEEPC_LAPTOP=y

CONFIG_EFI_VARS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_HUGETLBFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_PROVIDE_OHCI1394_DMA_INIT=y

CONFIG_EARLY_PRINTK_DBGP=y

CONFIG_DEBUG_STACKOVERFLOW=y

# CONFIG_DEBUG_RODATA_TEST is not set

CONFIG_DEBUG_NX_TEST=m

CONFIG_DEBUG_BOOT_PARAMS=y

CONFIG_OPTIMIZE_INLINING=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_SECURITY_SELINUX_DISABLE=y

CONFIG_CRYPTO_AES_586=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_T10DIF=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=18

CONFIG_CGROUPS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_SUN_PARTITION=y

CONFIG_KARMA_PARTITION=y

CONFIG_EFI_PARTITION=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_CALGARY_IOMMU=y

CONFIG_NR_CPUS=64

CONFIG_DEBUG_DEVRES=y

CONFIG_CONNECTOR=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_SND_HDA_INTEL=y

CONFIG_SND_HDA_HWDEP=y

CONFIG_HIDRAW=y

CONFIG_HID_PID=y

CONFIG_USB_HIDDEV=y

CONFIG_HID_GYRATION=y

CONFIG_LOGITECH_FF=y

CONFIG_HID_NTRIG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_TOPSEED=y

CONFIG_HID_PID=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_DEBUG=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_DEVICEFS=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_INTEL_IOMMU=y

# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set

CONFIG_EFI_VARS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_HUGETLBFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_PROVIDE_OHCI1394_DMA_INIT=y

CONFIG_EARLY_PRINTK_DBGP=y

CONFIG_DEBUG_STACKOVERFLOW=y

# CONFIG_DEBUG_RODATA_TEST is not set

CONFIG_DEBUG_NX_TEST=m

CONFIG_DEBUG_BOOT_PARAMS=y

CONFIG_OPTIMIZE_INLINING=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_DISABLE=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_T10DIF=y