]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
kernel: Update to 4.4.19
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 7 Sep 2016 10:40:56 +0000 (11:40 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 7 Sep 2016 10:40:56 +0000 (11:40 +0100)
Drop i686 kernel configuration because we won't support
x86 32bit any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
kernel/config-arm-generic
kernel/config-generic
kernel/config-i686-default [deleted file]
kernel/config-i686-legacy [deleted file]
kernel/config-x86-generic
kernel/config-x86_64-default [deleted file]
kernel/kernel.nm
kernel/scripts/configure

index 085f04b7a283bbb975b541882d169b80666a51ba..973441e435c99f855a2f05c2c61566cdf2d5ce38 100644 (file)
@@ -9,27 +9,10 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 
-#
-# Timers subsystem
-#
-# CONFIG_NO_HZ_IDLE is not set
-CONFIG_NO_HZ_FULL=y
-# CONFIG_NO_HZ_FULL_ALL is not set
-# CONFIG_NO_HZ_FULL_SYSIDLE is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
-
 #
 # RCU Subsystem
 #
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_NONE=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
 # CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -102,11 +85,6 @@ CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_SCPI_CPUFREQ=m
 
-#
-# Classification
-#
-CONFIG_BPF_JIT=y
-
 #
 # Bluetooth device drivers
 #
@@ -327,7 +305,6 @@ CONFIG_GPIO_PL061=y
 # CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
-CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_VEXPRESS=y
 
 #
@@ -397,7 +374,6 @@ CONFIG_DVB_TTUSB_DEC=y
 # CONFIG_DVB_PT1 is not set
 # CONFIG_MANTIS_CORE is not set
 # CONFIG_DVB_NGENE is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
 
 #
 # DVB-S (satellite) frontends
@@ -681,6 +657,5 @@ CONFIG_CRYPTO_XTS=m
 #
 # Library routines
 #
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_LIBFDT=y
index 34efb895349da36124a17d658344265e10b286fa..8b2c2875c7f513f04b5183457603c4daaf0916d9 100644 (file)
@@ -60,12 +60,18 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ_COMMON=y
 # CONFIG_HZ_PERIODIC is not set
+# CONFIG_NO_HZ_IDLE is not set
+CONFIG_NO_HZ_FULL=y
+# CONFIG_NO_HZ_FULL_ALL is not set
+# CONFIG_NO_HZ_FULL_SYSIDLE is not set
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 
 #
 # CPU/Task time and stats accounting
 #
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_TASKSTATS=y
@@ -81,7 +87,10 @@ CONFIG_TREE_RCU=y
 CONFIG_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
+CONFIG_CONTEXT_TRACKING=y
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_NOCB_CPU=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 # CONFIG_BUILD_BIN2C is not set
 # CONFIG_IKCONFIG is not set
@@ -190,6 +199,8 @@ CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
 CONFIG_CC_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_OLD_SIGSUSPEND3=y
 
@@ -386,6 +397,7 @@ CONFIG_PCIE_PME=y
 CONFIG_BINFMT_ELF=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_HAVE_AOUT is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 CONFIG_NET=y
@@ -915,6 +927,7 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+CONFIG_BPF_JIT=y
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1011,6 +1024,7 @@ CONFIG_RFKILL_INPUT=y
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
 CONFIG_LWTUNNEL=y
+CONFIG_HAVE_BPF_JIT=y
 
 #
 # Device Drivers
@@ -2469,6 +2483,7 @@ CONFIG_CHARGER_MAX77693=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_AXP20X_POWER is not set
 CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_LTC2952=y
@@ -3115,6 +3130,7 @@ CONFIG_DVB_PT3=m
 # CONFIG_DVB_DDBRIDGE is not set
 CONFIG_DVB_SMIPCIE=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
+# CONFIG_VIDEO_CAFE_CCIC is not set
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 # CONFIG_VIDEO_XILINX is not set
@@ -5216,6 +5232,7 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/kernel/config-i686-default b/kernel/config-i686-default
deleted file mode 100644 (file)
index 47d5994..0000000
+++ /dev/null
@@ -1,377 +0,0 @@
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_X86_32_SMP=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_PGTABLE_LEVELS=3
-
-#
-# Timers subsystem
-#
-CONFIG_NO_HZ_IDLE=y
-
-#
-# CPU/Task time and stats accounting
-#
-# CONFIG_TICK_CPU_ACCOUNTING is not set
-CONFIG_IRQ_TIME_ACCOUNTING=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_LBDAF=y
-
-#
-# Processor type and features
-#
-CONFIG_X86_BIGSMP=y
-# CONFIG_X86_INTEL_MID is not set
-CONFIG_X86_INTEL_QUARK=y
-CONFIG_IOSF_MBI=y
-# CONFIG_X86_RDC321X is not set
-CONFIG_X86_32_NON_STANDARD=y
-# CONFIG_STA2X11 is not set
-CONFIG_X86_32_IRIS=m
-# CONFIG_LGUEST_GUEST is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-CONFIG_X86_GENERIC=y
-# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-# CONFIG_X86_ANCIENT_MCE is not set
-# CONFIG_X86_LEGACY_VM86 is not set
-CONFIG_TOSHIBA=m
-# CONFIG_X86_REBOOTFIXUPS is not set
-# CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-CONFIG_X86_PAE=y
-# CONFIG_NUMA is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HIGHPTE=y
-CONFIG_PHYSICAL_START=0x400000
-CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
-CONFIG_PHYSICAL_ALIGN=0x400000
-
-#
-# Power management and ACPI options
-#
-CONFIG_X86_APM_BOOT=y
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-
-#
-# CPU frequency scaling drivers
-#
-# CONFIG_X86_POWERNOW_K6 is not set
-CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K7_ACPI=y
-# CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_ICH=y
-CONFIG_X86_SPEEDSTEP_SMI=y
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-CONFIG_X86_LONGRUN=y
-# CONFIG_X86_LONGHAUL is not set
-# CONFIG_X86_E_POWERSAVER is not set
-
-#
-# shared options
-#
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-
-#
-# Bus options (PCI etc.)
-#
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-# CONFIG_PCI_PRI is not set
-
-#
-# PCI host controller drivers
-#
-# CONFIG_ISA is not set
-# CONFIG_SCx200 is not set
-# CONFIG_ALIX is not set
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
-
-#
-# PC-card bridges
-#
-# CONFIG_HOTPLUG_PCI_COMPAQ is not set
-# CONFIG_HOTPLUG_PCI_IBM is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-
-#
-# Executable file formats / Emulations
-#
-# CONFIG_BINFMT_AOUT is not set
-
-#
-# Misc devices
-#
-CONFIG_IBM_ASM=m
-# CONFIG_SGI_IOC4 is not set
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_PCH_PHUB=m
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_FLASHPOINT is not set
-# CONFIG_SCSI_NSP32 is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-# CONFIG_PATA_CS5535 is not set
-CONFIG_PATA_CS5536=m
-# CONFIG_PATA_SC1200 is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_PCH_GBE=m
-
-#
-# Input Device Drivers
-#
-# CONFIG_KEYBOARD_STMPE is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_PCH_UART is not set
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_SONYPI=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-# CONFIG_I2C_EG20T is not set
-# CONFIG_I2C_PXA is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_SCx200_ACB=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PTP_1588_CLOCK_PCH=m
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_CS5535=m
-# CONFIG_GPIO_TC3589X is not set
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_PCH=m
-
-#
-# USB GPIO expanders
-#
-# CONFIG_POWER_RESET_AS3722 is not set
-
-#
-# ACPI drivers
-#
-CONFIG_INTEL_QUARK_DTS_THERMAL=m
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_GEODE_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC7240_WDT=m
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CS5535=m
-
-#
-# STMicroelectronics STMPE Interface Drivers
-#
-# CONFIG_MFD_TIMBERDALE is not set
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_VIDEO_CAFE_CCIC=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-
-#
-# Graphics support
-#
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_ATI is not set
-# CONFIG_AGP_AMD is not set
-# CONFIG_AGP_NVIDIA is not set
-# CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_EFFICEON is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_I810 is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_BACKLIGHT_OT200 is not set
-
-#
-# Console display driver support
-#
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-# CONFIG_SND_SIS7019 is not set
-
-#
-# LED drivers
-#
-CONFIG_LEDS_OT200=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_EDAC_AMD76X is not set
-# CONFIG_EDAC_E7XXX is not set
-# CONFIG_EDAC_I82875P is not set
-# CONFIG_EDAC_I82860 is not set
-# CONFIG_EDAC_R82600 is not set
-
-#
-# DMA Devices
-#
-CONFIG_PCH_DMA=m
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_TC1100_WMI=m
-CONFIG_INTEL_IMR=y
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKSRC_I8253=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_HIGHMEM is not set
-
-#
-# Runtime Testing
-#
-# CONFIG_DEBUG_IMR_SELFTEST is not set
-
-#
-# Security options
-#
-# CONFIG_INTEL_TXT is not set
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES_586=y
-CONFIG_CRYPTO_SALSA20_586=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_TWOFISH_586=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_DEV_GEODE=m
-
-#
-# Certificates for signature checking
-#
-# CONFIG_LGUEST is not set
-
-#
-# Library routines
-#
-CONFIG_AUDIT_GENERIC=y
diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
deleted file mode 100644 (file)
index bafe9ab..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-CONFIG_PGTABLE_LEVELS=2
-
-#
-# Processor type and features
-#
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-
-#
-# Bus options (PCI etc.)
-#
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCI_OLPC=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_OLPC=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
-CONFIG_OLPC_XO15_SCI=y
-
-#
-# Generic Driver Options
-#
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-
-#
-# Bus devices
-#
-CONFIG_OF_PROMTREE=y
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_STMPE=m
-CONFIG_KEYBOARD_TC3589X=m
-CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_INPUT_MAX77693_HAPTIC=m
-CONFIG_INPUT_MAX8997_HAPTIC=m
-# CONFIG_INPUT_GPIO_BEEPER is not set
-CONFIG_INPUT_PWM_BEEPER=m
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO_OLPC_APSP is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250_DW is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_OF_PLATFORM=y
-
-#
-# Pin controllers
-#
-CONFIG_PINCTRL_AS3722=y
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_CS5535=y
-
-#
-# USB GPIO expanders
-#
-CONFIG_BATTERY_OLPC=y
-CONFIG_POWER_RESET_AS3722=y
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_PWM_FAN=m
-
-#
-# ACPI drivers
-#
-# CONFIG_THERMAL_OF is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_RK808=y
-
-#
-# STMicroelectronics STMPE Interface Drivers
-#
-CONFIG_REGULATOR_PWM=m
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_LP8788 is not set
-
-#
-# LED drivers
-#
-CONFIG_LEDS_PWM=m
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_XO1_RFKILL=m
-# CONFIG_XO15_EBOOK is not set
-
-#
-# Common Clock Framework
-#
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK_PWM=m
-
-#
-# Temperature sensors
-#
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-CONFIG_PWM_ATMEL_HLCDC_PWM=m
-CONFIG_PWM_CRC=y
-CONFIG_PWM_FSL_FTM=m
-CONFIG_PWM_LP3943=m
-CONFIG_PWM_LPSS=m
-CONFIG_PWM_LPSS_PCI=m
-CONFIG_PWM_LPSS_PLATFORM=m
-CONFIG_PWM_PCA9685=m
-CONFIG_PWM_TWL=m
-CONFIG_PWM_TWL_LED=m
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
index f9c44638e5839ad567f9a20b90a22390592f3895..42fde9176fff702c51580f066db76c2bf3adc907 100644 (file)
@@ -1,7 +1,12 @@
+CONFIG_64BIT=y
+CONFIG_X86_64=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -9,9 +14,14 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
 CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_PGTABLE_LEVELS=4
 
 #
 # General setup
@@ -38,7 +48,13 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 #
 # RCU Subsystem
 #
+CONFIG_CONTEXT_TRACKING_FORCE=y
+# CONFIG_RCU_NOCB_CPU_NONE is not set
+CONFIG_RCU_NOCB_CPU_ALL=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+# CONFIG_NUMA_BALANCING is not set
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_PCSPKR_PLATFORM=y
 
@@ -51,6 +67,15 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+
+#
+# Partition Types
+#
+CONFIG_BLOCK_COMPAT=y
 
 #
 # IO Schedulers
@@ -65,11 +90,16 @@ CONFIG_QUEUED_RWLOCKS=y
 # Processor type and features
 #
 CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_EXTENDED_PLATFORM=y
+CONFIG_X86_NUMACHIP=y
+# CONFIG_X86_VSMP is not set
+# CONFIG_X86_UV is not set
 # CONFIG_X86_GOLDFISH is not set
 CONFIG_X86_INTEL_LPSS=y
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
+CONFIG_IOSF_MBI=m
 # CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
@@ -82,13 +112,16 @@ CONFIG_KVM_GUEST=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
 # CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_PROCESSOR_SELECT is not set
 CONFIG_CPU_SUP_INTEL=y
@@ -97,6 +130,9 @@ CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+# CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=64
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
@@ -108,6 +144,7 @@ CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
 # CONFIG_VM86 is not set
+CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
@@ -117,10 +154,28 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_CPUID=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_X86_DIRECT_GBPAGES=y
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=9
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
+CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
+# CONFIG_MOVABLE_NODE is not set
+# CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_VIRT_TO_BUS=y
@@ -149,22 +204,32 @@ CONFIG_X86_SMAP=y
 CONFIG_X86_INTEL_MPX=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
+# CONFIG_EFI_MIXED is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
 CONFIG_HZ_300=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=300
 # CONFIG_KEXEC is not set
+# CONFIG_KEXEC_FILE is not set
 CONFIG_CRASH_DUMP=y
+CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
+# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_MODIFY_LDT_SYSCALL is not set
+# CONFIG_LIVEPATCH is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 
 #
 # Power management and ACPI options
@@ -192,6 +257,7 @@ CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_NUMA=y
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 # CONFIG_ACPI_DEBUG is not set
@@ -244,6 +310,12 @@ CONFIG_X86_SPEEDSTEP_LIB=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
 #
 # Bus options (PCI etc.)
 #
@@ -262,6 +334,7 @@ CONFIG_PCI_STUB=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_ATS=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_LABEL=y
 
@@ -287,13 +360,24 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_RAPIDIO is not set
 # CONFIG_X86_SYSFB is not set
 
 #
 # Executable file formats / Emulations
 #
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_AOUT is not set
+# CONFIG_X86_X32 is not set
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_PMC_ATOM=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
 
 #
 # Classification
@@ -342,6 +426,7 @@ CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
+CONFIG_BLK_DEV_SKD=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_BLK_DEV_HD is not set
@@ -352,6 +437,8 @@ CONFIG_BLK_DEV_NVME=m
 # Misc devices
 #
 CONFIG_SENSORS_LIS3LV02D=m
+# CONFIG_IBM_ASM is not set
+CONFIG_SGI_IOC4=m
 CONFIG_HP_ILO=m
 CONFIG_VMWARE_BALLOON=m
 # CONFIG_SRAM is not set
@@ -364,9 +451,20 @@ CONFIG_INTEL_MEI_ME=m
 CONFIG_INTEL_MEI_TXE=m
 CONFIG_VMWARE_VMCI=m
 
+#
+# Intel MIC Bus Driver
+#
+CONFIG_INTEL_MIC_BUS=m
+
+#
+# SCIF Bus Driver
+#
+# CONFIG_SCIF_BUS is not set
+
 #
 # Intel MIC Coprocessor State Management (COSM) Drivers
 #
+# CONFIG_GENWQE is not set
 # CONFIG_IDE is not set
 
 #
@@ -381,6 +479,7 @@ CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
 CONFIG_VMWARE_PVSCSI=m
 CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_EATA=m
@@ -439,6 +538,10 @@ CONFIG_AMD8111_ETH=m
 CONFIG_MACB=m
 CONFIG_BNX2X_SRIOV=y
 CONFIG_BNXT_SRIOV=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_LIQUIDIO=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CX_ECAT=m
 CONFIG_DE2104X=m
@@ -448,12 +551,15 @@ CONFIG_TULIP_NAPI=y
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
 CONFIG_DE4X5=m
 CONFIG_PCMCIA_XIRCOM=m
+CONFIG_IGB_DCA=y
+CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E_VXLAN=y
 CONFIG_I40EVF=m
 CONFIG_FM10K=m
 CONFIG_FM10K_VXLAN=y
 CONFIG_SKGE_GENESIS=y
+CONFIG_MYRI10GE_DCA=y
 CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLCNIC_VXLAN=y
 CONFIG_ATP=m
@@ -467,6 +573,7 @@ CONFIG_NET_SB1000=m
 #
 # MII PHY device drivers
 #
+CONFIG_MDIO_OCTEON=m
 # CONFIG_PLIP is not set
 CONFIG_AIRO=m
 # CONFIG_WIL6210_TRACING is not set
@@ -497,6 +604,7 @@ CONFIG_INPUT_MATRIXKMAP=m
 #
 CONFIG_KEYBOARD_ADP5520=m
 CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STMPE=m
 CONFIG_KEYBOARD_CAP11XX=m
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_VMMOUSE=y
@@ -573,9 +681,14 @@ CONFIG_I2C_MUX_PINCTRL=m
 #
 # PC SMBus host controller drivers
 #
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_NFORCE2_S4985=m
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
 
 #
 # ACPI drivers
@@ -649,6 +762,11 @@ CONFIG_GPIO_IT87=m
 CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SCH311X is not set
 
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_TC3589X=y
+
 #
 # PCI GPIO expanders
 #
@@ -933,6 +1051,11 @@ CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 
+#
+# Display Interface Bridges
+#
+CONFIG_HSA_AMD=m
+
 #
 # Frame buffer hardware drivers
 #
@@ -1030,6 +1153,7 @@ CONFIG_EDAC_I7CORE=m
 CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
 
 #
 # Platform RTC drivers
@@ -1040,6 +1164,8 @@ CONFIG_RTC_DRV_CMOS=y
 # DMA Devices
 #
 CONFIG_DMA_ACPI=y
+CONFIG_INTEL_IOATDMA=m
+CONFIG_INTEL_MIC_X100_DMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
@@ -1047,6 +1173,8 @@ CONFIG_DW_DMAC_PCI=m
 #
 # DMA Clients
 #
+CONFIG_DMA_ENGINE_RAID=y
+CONFIG_DCA=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
@@ -1136,11 +1264,15 @@ CONFIG_PCC=y
 # Generic IOMMU Pagetable Support
 #
 CONFIG_IOMMU_IOVA=y
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_STATS=y
+CONFIG_AMD_IOMMU_V2=m
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_SVM=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_IRQ_REMAP=y
 
 #
 # SOC (System On Chip) specific Drivers
@@ -1215,6 +1347,7 @@ CONFIG_UEFI_CPER=y
 # File systems
 #
 # CONFIG_FS_DAX is not set
+CONFIG_QUOTACTL_COMPAT=y
 
 #
 # Pseudo filesystems
@@ -1273,6 +1406,7 @@ CONFIG_DEBUG_WX=y
 CONFIG_DEBUG_NX_TEST=m
 CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
@@ -1295,6 +1429,7 @@ CONFIG_OPTIMIZE_INLINING=y
 #
 # Security options
 #
+CONFIG_INTEL_TXT=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
 #
@@ -1302,6 +1437,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 #
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_ABLK_HELPER=y
+CONFIG_CRYPTO_GLUE_HELPER_X86=y
 
 #
 # Block modes
@@ -1314,11 +1450,34 @@ CONFIG_CRYPTO_XTS=y
 #
 CONFIG_CRYPTO_CRC32C_INTEL=y
 CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+# CONFIG_CRYPTO_SHA1_MB is not set
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 
 #
 # Ciphers
 #
+CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
 #
 # Random Number Generation
@@ -1341,6 +1500,7 @@ CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
@@ -1356,4 +1516,5 @@ CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_UCS2_STRING=y
+CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y
diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default
deleted file mode 100644 (file)
index 4dc0eb8..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_X86_64_SMP=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_PGTABLE_LEVELS=4
-
-#
-# Timers subsystem
-#
-# CONFIG_NO_HZ_IDLE is not set
-CONFIG_NO_HZ_FULL=y
-# CONFIG_NO_HZ_FULL_ALL is not set
-# CONFIG_NO_HZ_FULL_SYSIDLE is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
-
-#
-# RCU Subsystem
-#
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_CONTEXT_TRACKING_FORCE=y
-CONFIG_RCU_NOCB_CPU=y
-# CONFIG_RCU_NOCB_CPU_NONE is not set
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
-CONFIG_RCU_NOCB_CPU_ALL=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-# CONFIG_NUMA_BALANCING is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-
-#
-# Partition Types
-#
-CONFIG_BLOCK_COMPAT=y
-
-#
-# Processor type and features
-#
-CONFIG_X86_X2APIC=y
-CONFIG_X86_NUMACHIP=y
-# CONFIG_X86_VSMP is not set
-# CONFIG_X86_UV is not set
-CONFIG_IOSF_MBI=m
-# CONFIG_MPSC is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-# CONFIG_MAXSMP is not set
-CONFIG_X86_VSYSCALL_EMULATION=y
-CONFIG_X86_DIRECT_GBPAGES=y
-CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=9
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-# CONFIG_MOVABLE_NODE is not set
-# CONFIG_MEMORY_HOTPLUG is not set
-# CONFIG_EFI_MIXED is not set
-# CONFIG_KEXEC_FILE is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
-CONFIG_PHYSICAL_ALIGN=0x1000000
-# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
-# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
-CONFIG_LEGACY_VSYSCALL_NONE=y
-# CONFIG_LIVEPATCH is not set
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ACPI_NUMA=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI_PRI=y
-
-#
-# PC-card bridges
-#
-CONFIG_HOTPLUG_PCI_SHPC=m
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
-# CONFIG_X86_X32 is not set
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
-CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-
-#
-# Classification
-#
-CONFIG_BPF_JIT=y
-
-#
-# Protocols
-#
-CONFIG_BLK_DEV_SKD=m
-
-#
-# Misc devices
-#
-# CONFIG_IBM_ASM is not set
-CONFIG_SGI_IOC4=m
-
-#
-# Intel MIC Bus Driver
-#
-CONFIG_INTEL_MIC_BUS=m
-
-#
-# SCIF Bus Driver
-#
-# CONFIG_SCIF_BUS is not set
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-# CONFIG_GENWQE is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_FLASHPOINT=y
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_VF=m
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_LIQUIDIO=m
-CONFIG_IGB_DCA=y
-CONFIG_IXGBE_DCA=y
-CONFIG_MYRI10GE_DCA=y
-
-#
-# MII PHY device drivers
-#
-CONFIG_MDIO_OCTEON=m
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_STMPE=m
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_TC3589X=y
-
-#
-# USB GPIO expanders
-#
-CONFIG_POWER_RESET_AS3722=y
-
-#
-# Media digital TV PCI Adapters
-#
-# CONFIG_VIDEO_CAFE_CCIC is not set
-
-#
-# Display Interface Bridges
-#
-CONFIG_HSA_AMD=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_EDAC_SBRIDGE=m
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_IOATDMA=m
-CONFIG_INTEL_MIC_X100_DMA=m
-
-#
-# DMA Clients
-#
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DCA=m
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_STATS=y
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_IRQ_REMAP=y
-
-#
-# File systems
-#
-CONFIG_QUOTACTL_COMPAT=y
-
-#
-# Runtime Testing
-#
-# CONFIG_IOMMU_DEBUG is not set
-
-#
-# Security options
-#
-CONFIG_INTEL_TXT=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_GLUE_HELPER_X86=y
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_POLY1305_X86_64=m
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-# CONFIG_CRYPTO_SHA1_MB is not set
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# Certificates for signature checking
-#
-CONFIG_KVM_COMPAT=y
-
-#
-# Library routines
-#
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_PMEM_API=y
index 1514f502ac917cc2d1e192145bac0a8befdd6153..4a3ac98aad3ac3dfdf09c69255e8741cd8150b65 100644 (file)
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.4.10
+version    = 4.4.19
 release    = 1
 thisapp    = linux-%{version}
 
@@ -60,11 +60,6 @@ build
                %{kernel_logo}
        end
 
-       # i686 needs librmi for cpupower.
-       if "%{DISTRO_ARCH}" == "i686"
-               requires += liblrmi-devel
-       end
-
        # A list of kernels to build.
        kernels =
 
@@ -75,13 +70,6 @@ build
        kernel_target = bzImage
        kernel_image = arch/%{kernel_arch}/boot/%{kernel_target}
 
-       if "%{DISTRO_ARCH}" == "i686"
-               # Build a default and legacy kernel for the
-               # i686 architecture.
-               build_kernel_default = 1
-               build_kernel_legacy = 1
-       end
-
        if "%{DISTRO_ARCH}" == "x86_64"
                build_kernel_default = 1
        end
@@ -111,11 +99,6 @@ build
                kernels += default
        end
 
-       # Build legacy kernel.
-       if "%{build_kernel_legacy}" == "1"
-               kernels += legacy
-       end
-
        perf_make = make %{MAKETUNING} -C tools/perf V=1 WERROR=0 \
                NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 \
                NO_STRLCPY=1 NO_BIONIC=1 prefix=%{prefix} perfexecdir=lib/perf-core
@@ -222,14 +205,6 @@ build
                        make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT}/usr mod-fw= V=1 \
                                KERNELRELEASE=${fullversion} modules_install
 
-                       # Install vdso.
-                       case "%{DISTRO_ARCH}" in
-                               i686)
-                                       make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \
-                                               KERNELRELEASE=${fullversion} vdso_install
-                                       ;;
-                       esac
-
                        # Create an empty settings file for dracut
                        mkdir -p %{BUILDROOT}/etc/ld.so.conf.d
                        echo "# Placeholder file, no vDSO hwcap entries used in this kernel." \
@@ -301,24 +276,11 @@ build
                        pushd tools/power/cpupower/debug/x86_64
                        make %{MAKETUNING} centrino-decode powernow-k8-decode
                        popd
-               elif [ "%{DISTRO_ARCH}" = "i686" ]; then
-                       pushd tools/power/cpupower/debug/i386
-                       make %{MAKETUNING} centrino-decode powernow-k8-decode
-                       popd
-               fi
 
-               # Should be built for all x86 architectures
-               if [ "%{DISTRO_ARCH}" = "x86_64" ]; then
-                       # Won't compile on i686
-                       # x86_energy_perf_policy.c: In function ‘validate_cpuid’:
-                       # x86_energy_perf_policy.c:154:2: error: PIC register clobbered by ‘ebx’ in ‘asm’
-                       #   asm("cpuid" : "=a" (fms), "=c" (ecx), "=d" (edx) : "a" (1) : "ebx");
-                       #   ^
                        pushd tools/power/x86/x86_energy_perf_policy
                        make
                        popd
 
-                       # Same as above
                        pushd tools/power/x86/turbostat
                        make
                        popd
@@ -363,13 +325,6 @@ build
                        install -m 755 powernow-k8-decode \
                                %{BUILDROOT}/usr/bin/powernow-k8-decode
                        popd
-               elif [ "%{DISTRO_ARCH}" = "i686" ]; then
-                       pushd tools/power/cpupower/debug/i386
-                       install -m 755 centrino-decode \
-                               %{BUILDROOT}/usr/bin/centrino-decode
-                       install -m 755 powernow-k8-decode \
-                               %{BUILDROOT}/usr/bin/powernow-k8-decode
-                       popd
                fi
 
                chmod 0755 %{BUILDROOT}%{libdir}/libcpupower.so*
@@ -525,22 +480,6 @@ packages
                end
        end
 
-       if "%{build_kernel_legacy}" == "1"
-               package kernel-legacy
-                       template KERNEL
-
-                       kernel_name = kernel-legacy
-                       kernel_release = %{fullver}.legacy
-               end
-
-               package kernel-legacy-devel
-                       template KERNELDEVEL
-
-                       kernel_name = kernel-legacy
-                       kernel_release = %{fullver}.legacy
-               end
-       end
-
        package kernel-headers
                summary = Header files of the kernel release %{fullver}.
                desciption = %{summary}
index 68a3c8a4694eb139447e07f55027acf10b988323..397beb836ea3884cd7f244990522aec33d0c362d 100755 (executable)
@@ -10,9 +10,6 @@ SCRIPTS_DIR=${BASEDIR}
 # x86_64
 CONFIGS="x86_64:default"
 
-# i686
-CONFIGS="${CONFIGS} i686:legacy i686:default"
-
 # aarch64
 CONFIGS="${CONFIGS} aarch64:default"
 
@@ -67,7 +64,7 @@ function get_kernel_arch() {
                arm*)
                        echo "arm"
                        ;;
-               x86_64|i?86)
+               x86_64)
                        echo "x86"
                        ;;
        esac
@@ -110,14 +107,7 @@ function merge_config() {
        case "${arch}:${flavour}" in
                # x86
                x86_64:default)
-                       configs="${configs} config-x86-generic config-x86_64-default"
-                       ;;
-               i686:default)
-                       configs="${configs} config-x86-generic config-i686-default"
-                       ;;
-               i686:legacy)
-                       configs="${configs} config-x86-generic config-i686-default"
-                       configs="${configs} config-i686-legacy"
+                       configs="${configs} config-x86-generic"
                        ;;
 
                # ARM64
@@ -208,9 +198,6 @@ function make_oldconfig() {
 
 # config-generic
 #  Intersection of all files.
-# config-x86-generic
-#  Diff of (intersection of (i686-{default,legacy} and x86_64-default)
-#  against config-generic).
 # config-x86-x86_64
 #  Diff against merge of (config-generic and config-x86-generic).
 
@@ -234,13 +221,6 @@ function diff_configs() {
 
                merge_config ${arch} ${flavour} ${filename} ${extra_configs}
 
-               # Do not include leaf configuration.
-               case "${config}" in
-                       i686:legacy)
-                               continue
-                               ;;
-               esac
-
                platform="$(get_platform "${arch}")"
                subplatform="$(get_subplatform "${arch}")"
 
@@ -296,11 +276,6 @@ function diff_configs() {
                                rm -f ${filename}
                                continue
                                ;;
-                       i686:legacy)
-                               # Legacy depends directly on the default configuration.
-                               ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${arch}-default \
-                                       ${filename} > ${filename}.tmp
-                               ;;
                        *)
                                platform="$(get_subplatform "${arch}" || get_platform "${arch}")"
                                ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-${platform}-common \