@@ -10,10 +10,10 @@ Subject: [PATCH] Patch from Clear Linux

  mm/vmstat.c                   | 2 +-

  4 files changed, 6 insertions(+), 4 deletions(-)

-diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c

+diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c

 index 4db10d7990c9..1f84959cc87e 100644

-+++ b/drivers/video/console/fbcon.c

+--- a/drivers/video/fbdev/core/fbcon.c

 @@ -146,7 +146,7 @@ static const struct consw fb_con;

  static int fbcon_set_origin(struct vc_data *);

@@ -28,14 +28,14 @@ index f6a816129856..f4fb458a91dd 100644

 --- a/include/linux/blkdev.h

 +++ b/include/linux/blkdev.h

 @@ -39,7 +39,7 @@ struct blk_flush_queue;

- struct pr_ops;

+ struct blk_stat_callback;

  #define BLKDEV_MIN_RQ	4

 -#define BLKDEV_MAX_RQ	128	/* Default maximum */

 +#define BLKDEV_MAX_RQ	4096	/* Default maximum */

- /*

-  * Maximum number of blkcg policies allowed to be registered concurrently.

+ /* Must be consisitent with blk_mq_poll_stats_bkt() */

+ #define BLK_MQ_POLL_STATS_BKTS 16

 diff --git a/init/do_mounts.c b/init/do_mounts.c

 index dea5de95c2dd..da840946d90b 100644

 --- a/init/do_mounts.c

@@ -63,8 +63,8 @@ index 604f26a4f696..bfbbcd76df57 100644

 --- a/mm/vmstat.c

 +++ b/mm/vmstat.c

 @@ -1549,7 +1549,7 @@ static const struct file_operations proc_vmstat_file_operations = {

+ 

  #ifdef CONFIG_SMP

- static struct workqueue_struct *vmstat_wq;

  static DEFINE_PER_CPU(struct delayed_work, vmstat_work);

 -int sysctl_stat_interval __read_mostly = HZ;

 +int sysctl_stat_interval __read_mostly = 8 * HZ;

@@ -55,7 +55,7 @@ index d266d800f246..11544ddd6e5c 100644

 +int __pci_read_base_shortcut(struct pci_dev *dev, enum pci_bar_type type,

 +		    struct resource *res, unsigned int pos, u32 sz_in, u32 sz2_in)

 +{

-+	u32 l, sz;

++	u32 l = 0, sz = 0;

 +	u64 l64, sz64, mask64;

 +	struct pci_bus_region region, inverted_region;

 +

@@ -97,7 +97,7 @@ index d266d800f246..11544ddd6e5c 100644

 +			res->flags |= IORESOURCE_ROM_ENABLE;

 +		l64 = l & PCI_ROM_ADDRESS_MASK;

 +		sz64 = sz & PCI_ROM_ADDRESS_MASK;

-+		mask64 = (u32)PCI_ROM_ADDRESS_MASK;

++		mask64 = PCI_ROM_ADDRESS_MASK;

 +	}

 +

 +	if (res->flags & IORESOURCE_MEM_64) {

@@ -120,7 +120,7 @@ index d266d800f246..11544ddd6e5c 100644

 +	}

 +

 +	if (res->flags & IORESOURCE_MEM_64) {

-+		if ((sizeof(dma_addr_t) < 8 || sizeof(resource_size_t) < 8) &&

++		if ((sizeof(pci_bus_addr_t) < 8 || sizeof(resource_size_t) < 8) &&

 +		    sz64 > 0x100000000ULL) {

 +			res->flags |= IORESOURCE_UNSET | IORESOURCE_DISABLED;

 +			res->start = 0;

@@ -130,7 +130,7 @@ index d266d800f246..11544ddd6e5c 100644

 +			goto out;

 +		}

 +

-+		if ((sizeof(dma_addr_t) < 8) && l) {

++		if ((sizeof(pci_bus_addr_t) < 8) && l) {

 +			/* Above 32-bit boundary; try to reallocate */

 +			res->flags |= IORESOURCE_UNSET;

 +			res->start = 0;

@@ -391,8 +391,8 @@ index d266d800f246..11544ddd6e5c 100644

  int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

  		    struct resource *res, unsigned int pos)

  {

--	u32 l, sz, mask;

-+	u32 l, sz, known_sz, mask;

+-	u32 l = 0, sz = 0, mask;

++	u32 l = 0, sz = 0, known_sz, mask;

  	u64 l64, sz64, mask64;

  	u16 orig_cmd;

  	struct pci_bus_region region, inverted_region;

@@ -15,9 +15,9 @@ index 70b8c4614e22..987ac571d16c 100644

  	pr_info("using clock offset of %llu ns\n", d->cyc2ns_offset);

  }

-+static cycle_t vmware_clock_get_cycles(struct clocksource *cs)

++static u64 vmware_clock_get_cycles(struct clocksource *cs)

 +{

-+	return (cycle_t)rdtsc_ordered();

++	return (u64)rdtsc_ordered();

 +}

 +

 +static struct clocksource clocksource_vmware = {

@@ -40,15 +40,15 @@ index 0f400c0e4979..5f09979f612d 100644

 +# define timespec64 timespec

 +#endif

 +struct timespec64;

+ struct flush_tlb_info;

  /*

-  * Wrapper type for pointers to code which uses the non-standard

 @@ -96,6 +100,7 @@ struct pv_lazy_ops {

  struct pv_time_ops {

  	unsigned long long (*sched_clock)(void);

  	unsigned long long (*steal_clock)(int cpu);

 +	void (*read_boot_clock64)(struct timespec64 *ts);

- };

+ } __no_randomize_layout;

  struct pv_cpu_ops {

 diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

@@ -15,9 +15,9 @@ index 4eece91ada37..5b8e45f48bf3 100644

 --- a/arch/x86/kernel/cpu/common.c

 +++ b/arch/x86/kernel/cpu/common.c

 @@ -1089,7 +1089,9 @@ static void identify_cpu(struct cpuinfo_x86 *c)

+ 	detect_ht(c);

  #endif

- 	init_hypervisor(c);

 +#if 0 /* disable rdrand probbing */

  	x86_init_rdrand(c);

 +#endif

@@ -54,8 +54,8 @@ index 0e1fc6e17efc..59e2cc6a70d2 100644

  #include <linux/cpu.h>

  #include <linux/kmsg_dump.h>

 @@ -378,6 +379,10 @@ static void __init vmware_platform_setup(void)

+ 	vmware_set_capabilities();

- 	vmware_paravirt_ops_setup();

  	kmsg_dump_register(&kmsg_dumper);

 +#ifdef CONFIG_PCI

 +	/* PCI BIOS service won't work from a PV guest. */

@@ -1,6 +1,6 @@

 #

 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 4.9.66 Kernel Configuration

+# Linux/x86 4.14.8 Kernel Configuration

 #

 CONFIG_64BIT=y

 CONFIG_X86_64=y

@@ -40,7 +40,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

 CONFIG_X86_64_SMP=y

 CONFIG_ARCH_SUPPORTS_UPROBES=y

 CONFIG_FIX_EARLYCON_MEM=y

-CONFIG_DEBUG_RODATA=y

 CONFIG_PGTABLE_LEVELS=4

 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

 CONFIG_IRQ_WORK=y

@@ -87,7 +86,9 @@ CONFIG_AUDIT_TREE=y

 #

 CONFIG_GENERIC_IRQ_PROBE=y

 CONFIG_GENERIC_IRQ_SHOW=y

+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y

 CONFIG_GENERIC_PENDING_IRQ=y

+CONFIG_GENERIC_IRQ_MIGRATION=y

 CONFIG_IRQ_DOMAIN=y

 CONFIG_IRQ_DOMAIN_HIERARCHY=y

 CONFIG_GENERIC_MSI_IRQ=y

@@ -95,6 +96,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y

 # CONFIG_IRQ_DOMAIN_DEBUG is not set

 CONFIG_IRQ_FORCED_THREADING=y

 CONFIG_SPARSE_IRQ=y

+# CONFIG_GENERIC_IRQ_DEBUGFS is not set

 CONFIG_CLOCKSOURCE_WATCHDOG=y

 CONFIG_ARCH_CLOCKSOURCE_DATA=y

 CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y

@@ -134,15 +136,15 @@ CONFIG_TASK_IO_ACCOUNTING=y

 CONFIG_TREE_RCU=y

 # CONFIG_RCU_EXPERT is not set

 CONFIG_SRCU=y

+CONFIG_TREE_SRCU=y

 # CONFIG_TASKS_RCU is not set

 CONFIG_RCU_STALL_COMMON=y

-# CONFIG_TREE_RCU_TRACE is not set

-# CONFIG_RCU_EXPEDITE_BOOT is not set

+CONFIG_RCU_NEED_SEGCBLIST=y

 # CONFIG_BUILD_BIN2C is not set

 # CONFIG_IKCONFIG is not set

 CONFIG_LOG_BUF_SHIFT=19

 CONFIG_LOG_CPU_MAX_BUF_SHIFT=14

-CONFIG_NMI_LOG_BUF_SHIFT=13

+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13

 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y

 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y

 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y

@@ -160,6 +162,7 @@ CONFIG_FAIR_GROUP_SCHED=y

 CONFIG_CFS_BANDWIDTH=y

 # CONFIG_RT_GROUP_SCHED is not set

 CONFIG_CGROUP_PIDS=y

+# CONFIG_CGROUP_RDMA is not set

 CONFIG_CGROUP_FREEZER=y

 CONFIG_CGROUP_HUGETLB=y

 CONFIG_CPUSETS=y

@@ -168,6 +171,7 @@ CONFIG_CGROUP_DEVICE=y

 CONFIG_CGROUP_CPUACCT=y

 CONFIG_CGROUP_PERF=y

 # CONFIG_CGROUP_DEBUG is not set

+CONFIG_SOCK_CGROUP_DATA=y

 # CONFIG_CHECKPOINT_RESTORE is not set

 CONFIG_NAMESPACES=y

 CONFIG_UTS_NS=y

@@ -200,6 +204,7 @@ CONFIG_MULTIUSER=y

 CONFIG_SGETMASK_SYSCALL=y

 CONFIG_SYSFS_SYSCALL=y

 # CONFIG_SYSCTL_SYSCALL is not set

+CONFIG_POSIX_TIMERS=y

 CONFIG_KALLSYMS=y

 # CONFIG_KALLSYMS_ALL is not set

 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y

@@ -211,6 +216,7 @@ CONFIG_ELF_CORE=y

 CONFIG_PCSPKR_PLATFORM=y

 CONFIG_BASE_FULL=y

 CONFIG_FUTEX=y

+CONFIG_FUTEX_PI=y

 CONFIG_EPOLL=y

 CONFIG_SIGNALFD=y

 CONFIG_TIMERFD=y

@@ -224,6 +230,7 @@ CONFIG_PCI_QUIRKS=y

 CONFIG_MEMBARRIER=y

 # CONFIG_EMBEDDED is not set

 CONFIG_HAVE_PERF_EVENTS=y

+# CONFIG_PC104 is not set

 #

 # Kernel Performance Events And Counters

@@ -235,6 +242,7 @@ CONFIG_VM_EVENT_COUNTERS=y

 CONFIG_SLAB=y

 # CONFIG_SLUB is not set

 # CONFIG_SLOB is not set

+CONFIG_SLAB_MERGE_DEFAULT=y

 # CONFIG_SLAB_FREELIST_RANDOM is not set

 CONFIG_SYSTEM_DATA_VERIFICATION=y

 # CONFIG_PROFILING is not set

@@ -255,16 +263,21 @@ CONFIG_HAVE_NMI=y

 CONFIG_HAVE_ARCH_TRACEHOOK=y

 CONFIG_HAVE_DMA_CONTIGUOUS=y

 CONFIG_GENERIC_SMP_IDLE_THREAD=y

+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y

+CONFIG_ARCH_HAS_SET_MEMORY=y

 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y

 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y

+CONFIG_HAVE_CLK=y

 CONFIG_HAVE_DMA_API_DEBUG=y

 CONFIG_HAVE_HW_BREAKPOINT=y

 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y

 CONFIG_HAVE_USER_RETURN_NOTIFIER=y

 CONFIG_HAVE_PERF_EVENTS_NMI=y

+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y

 CONFIG_HAVE_PERF_REGS=y

 CONFIG_HAVE_PERF_USER_STACK_DUMP=y

 CONFIG_HAVE_ARCH_JUMP_LABEL=y

+CONFIG_HAVE_RCU_TABLE_FREE=y

 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y

 CONFIG_HAVE_CMPXCHG_LOCAL=y

 CONFIG_HAVE_CMPXCHG_DOUBLE=y

@@ -279,13 +292,16 @@ CONFIG_CC_STACKPROTECTOR=y

 # CONFIG_CC_STACKPROTECTOR_NONE is not set

 CONFIG_CC_STACKPROTECTOR_REGULAR=y

 # CONFIG_CC_STACKPROTECTOR_STRONG is not set

+CONFIG_THIN_ARCHIVES=y

 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y

 CONFIG_HAVE_CONTEXT_TRACKING=y

 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y

 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y

 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y

+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y

 CONFIG_HAVE_ARCH_HUGE_VMAP=y

 CONFIG_HAVE_ARCH_SOFT_DIRTY=y

+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y

 CONFIG_MODULES_USE_ELF_RELA=y

 CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y

 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y

@@ -294,6 +310,7 @@ CONFIG_HAVE_EXIT_THREAD=y

 CONFIG_ARCH_MMAP_RND_BITS=28

 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y

 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8

+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y

 CONFIG_HAVE_COPY_THREAD_TLS=y

 CONFIG_HAVE_STACK_VALIDATION=y

 # CONFIG_HAVE_ARCH_HASH is not set

@@ -303,6 +320,14 @@ CONFIG_COMPAT_OLD_SIGACTION=y

 # CONFIG_CPU_NO_EFFICIENT_FFS is not set

 CONFIG_HAVE_ARCH_VMAP_STACK=y

 CONFIG_VMAP_STACK=y

+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set

+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set

+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y

+CONFIG_STRICT_KERNEL_RWX=y

+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y

+CONFIG_STRICT_MODULE_RWX=y

+CONFIG_ARCH_HAS_REFCOUNT=y

+# CONFIG_REFCOUNT_FULL is not set

 #

 # GCOV-based kernel profiling

@@ -332,11 +357,17 @@ CONFIG_MODULE_SIG_HASH="sha512"

 # CONFIG_TRIM_UNUSED_KSYMS is not set

 CONFIG_MODULES_TREE_LOOKUP=y

 CONFIG_BLOCK=y

+CONFIG_BLK_SCSI_REQUEST=y

 CONFIG_BLK_DEV_BSG=y

 CONFIG_BLK_DEV_BSGLIB=y

 # CONFIG_BLK_DEV_INTEGRITY is not set

+# CONFIG_BLK_DEV_ZONED is not set

 CONFIG_BLK_DEV_THROTTLING=y

+# CONFIG_BLK_DEV_THROTTLING_LOW is not set

 # CONFIG_BLK_CMDLINE_PARSER is not set

+# CONFIG_BLK_WBT is not set

+CONFIG_BLK_DEBUG_FS=y

+# CONFIG_BLK_SED_OPAL is not set

 #

 # Partition Types

@@ -368,10 +399,15 @@ CONFIG_BLK_MQ_PCI=y

 # IO Schedulers

 #

 CONFIG_IOSCHED_NOOP=y

-# CONFIG_IOSCHED_DEADLINE is not set

-# CONFIG_IOSCHED_CFQ is not set

+CONFIG_IOSCHED_DEADLINE=m

+CONFIG_IOSCHED_CFQ=m

+CONFIG_CFQ_GROUP_IOSCHED=y

+# CONFIG_DEFAULT_DEADLINE is not set

 CONFIG_DEFAULT_NOOP=y

 CONFIG_DEFAULT_IOSCHED="noop"

+# CONFIG_MQ_IOSCHED_DEADLINE is not set

+# CONFIG_MQ_IOSCHED_KYBER is not set

+# CONFIG_IOSCHED_BFQ is not set

 CONFIG_PADATA=y

 CONFIG_ASN1=y

 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y

@@ -399,6 +435,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y

 CONFIG_X86_X2APIC=y

 CONFIG_X86_MPPARSE=y

 # CONFIG_GOLDFISH is not set

+# CONFIG_INTEL_RDT is not set

 # CONFIG_X86_EXTENDED_PLATFORM is not set

 # CONFIG_X86_INTEL_LPSS is not set

 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set

@@ -440,6 +477,7 @@ CONFIG_IOMMU_HELPER=y

 CONFIG_NR_CPUS=128

 # CONFIG_SCHED_SMT is not set

 CONFIG_SCHED_MC=y

+CONFIG_SCHED_MC_PRIO=y

 CONFIG_PREEMPT_NONE=y

 # CONFIG_PREEMPT_VOLUNTARY is not set

 # CONFIG_PREEMPT is not set

@@ -463,9 +501,12 @@ CONFIG_X86_VSYSCALL_EMULATION=y

 # CONFIG_MICROCODE is not set

 CONFIG_X86_MSR=y

 CONFIG_X86_CPUID=y

+# CONFIG_X86_5LEVEL is not set

 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y

 CONFIG_ARCH_DMA_ADDR_T_64BIT=y

 CONFIG_X86_DIRECT_GBPAGES=y

+CONFIG_ARCH_HAS_MEM_ENCRYPT=y

+# CONFIG_AMD_MEM_ENCRYPT is not set

 # CONFIG_NUMA is not set

 CONFIG_ARCH_SPARSEMEM_ENABLE=y

 CONFIG_ARCH_SPARSEMEM_DEFAULT=y

@@ -482,6 +523,7 @@ CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y

 CONFIG_SPARSEMEM_VMEMMAP=y

 CONFIG_HAVE_MEMBLOCK=y

 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y

+CONFIG_HAVE_GENERIC_GUP=y

 CONFIG_ARCH_DISCARD_MEMBLOCK=y

 CONFIG_MEMORY_ISOLATION=y

 CONFIG_HAVE_BOOTMEM_INFO_NODE=y

@@ -494,6 +536,7 @@ CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y

 CONFIG_COMPACTION=y

 CONFIG_MIGRATION=y

 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y

+CONFIG_ARCH_ENABLE_THP_MIGRATION=y

 CONFIG_PHYS_ADDR_T_64BIT=y

 CONFIG_VIRT_TO_BUS=y

 CONFIG_KSM=y

@@ -501,6 +544,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

 CONFIG_TRANSPARENT_HUGEPAGE=y

 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y

 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set

+CONFIG_ARCH_WANTS_THP_SWAP=y

+CONFIG_THP_SWAP=y

 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y

 # CONFIG_CLEANCACHE is not set

 # CONFIG_FRONTSWAP is not set

@@ -512,7 +557,13 @@ CONFIG_GENERIC_EARLY_IOREMAP=y

 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y

 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set

 # CONFIG_IDLE_PAGE_TRACKING is not set

+CONFIG_ARCH_HAS_ZONE_DEVICE=y

 CONFIG_ZONE_DEVICE=y

+CONFIG_ARCH_HAS_HMM=y

+# CONFIG_HMM_MIRROR is not set

+# CONFIG_DEVICE_PRIVATE is not set

+# CONFIG_DEVICE_PUBLIC is not set

+# CONFIG_PERCPU_STATS is not set

 CONFIG_X86_PMEM_LEGACY_DEVICE=y

 CONFIG_X86_PMEM_LEGACY=m

 CONFIG_X86_CHECK_BIOS_CORRUPTION=y

@@ -554,6 +605,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y

 # CONFIG_CMDLINE_BOOL is not set

 CONFIG_MODIFY_LDT_SYSCALL=y

 CONFIG_HAVE_LIVEPATCH=y

+CONFIG_ARCH_HAS_ADD_PAGES=y

 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

@@ -579,7 +631,8 @@ CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y

 CONFIG_ACPI_CPU_FREQ_PSS=y

 CONFIG_ACPI_PROCESSOR_CSTATE=y

 CONFIG_ACPI_PROCESSOR_IDLE=y

-CONFIG_ACPI_PROCESSOR=m

+CONFIG_ACPI_CPPC_LIB=y

+CONFIG_ACPI_PROCESSOR=y

 CONFIG_ACPI_HOTPLUG_CPU=y

 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set

 # CONFIG_ACPI_THERMAL is not set

@@ -598,7 +651,6 @@ CONFIG_ACPI_HOTPLUG_IOAPIC=y

 # CONFIG_ACPI_BGRT is not set

 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set

 CONFIG_ACPI_NFIT=m

-# CONFIG_ACPI_NFIT_DEBUG is not set

 CONFIG_HAVE_ACPI_APEI=y

 CONFIG_HAVE_ACPI_APEI_NMI=y

 # CONFIG_ACPI_APEI is not set

@@ -610,7 +662,34 @@ CONFIG_HAVE_ACPI_APEI_NMI=y

 #

 # CPU Frequency scaling

 #

-# CONFIG_CPU_FREQ is not set

+CONFIG_CPU_FREQ=y

+# CONFIG_CPU_FREQ_STAT is not set

+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set

+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set

+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set

+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set

+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set

+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set

+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set

+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set

+# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set

+

+#

+# CPU frequency scaling drivers

+#

+CONFIG_X86_INTEL_PSTATE=y

+# CONFIG_X86_PCC_CPUFREQ is not set

+# CONFIG_X86_ACPI_CPUFREQ is not set

+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set

+# CONFIG_X86_P4_CLOCKMOD is not set

+

+#

+# shared options

+#

+# CONFIG_X86_SPEEDSTEP_LIB is not set

 #

 # CPU Idle

@@ -622,11 +701,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y

 # CONFIG_INTEL_IDLE is not set

 #

-# Memory power savings

-#

-# CONFIG_I7300_IDLE is not set

-

-#

 # Bus options (PCI etc.)

 #

 CONFIG_PCI=y

@@ -641,6 +715,7 @@ CONFIG_PCIEASPM=y

 # CONFIG_PCIEASPM_DEBUG is not set

 CONFIG_PCIEASPM_DEFAULT=y

 # CONFIG_PCIEASPM_POWERSAVE is not set

+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set

 # CONFIG_PCIEASPM_PERFORMANCE is not set

 # CONFIG_PCIE_DPC is not set

 # CONFIG_PCIE_PTM is not set

@@ -651,6 +726,7 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y

 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set

 # CONFIG_PCI_STUB is not set

 # CONFIG_HT_IRQ is not set

+CONFIG_PCI_LOCKLESS_CONFIG=y

 # CONFIG_PCI_IOV is not set

 # CONFIG_PCI_PRI is not set

 # CONFIG_PCI_PASID is not set

@@ -662,10 +738,24 @@ CONFIG_HOTPLUG_PCI_ACPI=y

 # CONFIG_HOTPLUG_PCI_SHPC is not set

 #

-# PCI host controller drivers

+# DesignWare PCI Core Support

 #

 # CONFIG_PCIE_DW_PLAT is not set

+

+#

+# PCI host controller drivers

+#

 # CONFIG_VMD is not set

+

+#

+# PCI Endpoint

+#

+# CONFIG_PCI_ENDPOINT is not set

+

+#

+# PCI switch controller drivers

+#

+# CONFIG_PCI_SW_SWITCHTEC is not set

 # CONFIG_ISA_BUS is not set

 CONFIG_ISA_DMA_API=y

 CONFIG_AMD_NB=y

@@ -687,11 +777,11 @@ CONFIG_COREDUMP=y

 CONFIG_IA32_EMULATION=y

 # CONFIG_IA32_AOUT is not set

 # CONFIG_X86_X32 is not set

+CONFIG_COMPAT_32=y

 CONFIG_COMPAT=y

 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y

 CONFIG_SYSVIPC_COMPAT=y

 CONFIG_X86_DEV_DMA_OPS=y

-CONFIG_PMC_ATOM=y

 CONFIG_NET=y

 #

@@ -701,6 +791,7 @@ CONFIG_PACKET=y

 CONFIG_PACKET_DIAG=y

 CONFIG_UNIX=y

 CONFIG_UNIX_DIAG=m

+# CONFIG_TLS is not set

 CONFIG_XFRM=y

 CONFIG_XFRM_ALGO=y

 CONFIG_XFRM_USER=y

@@ -730,6 +821,7 @@ CONFIG_NET_FOU=m

 # CONFIG_NET_FOU_IP_TUNNELS is not set

 CONFIG_INET_AH=m

 CONFIG_INET_ESP=m

+# CONFIG_INET_ESP_OFFLOAD is not set

 CONFIG_INET_IPCOMP=m

 CONFIG_INET_XFRM_TUNNEL=m

 CONFIG_INET_TUNNEL=m

@@ -739,6 +831,7 @@ CONFIG_INET_XFRM_MODE_BEET=m

 CONFIG_INET_DIAG=m

 CONFIG_INET_TCP_DIAG=m

 CONFIG_INET_UDP_DIAG=m

+# CONFIG_INET_RAW_DIAG is not set

 # CONFIG_INET_DIAG_DESTROY is not set

 CONFIG_TCP_CONG_ADVANCED=y

 CONFIG_TCP_CONG_BIC=m

@@ -767,6 +860,7 @@ CONFIG_IPV6_ROUTE_INFO=y

 CONFIG_IPV6_OPTIMISTIC_DAD=y

 CONFIG_INET6_AH=m

 CONFIG_INET6_ESP=m

+# CONFIG_INET6_ESP_OFFLOAD is not set

 CONFIG_INET6_IPCOMP=m

 CONFIG_IPV6_MIP6=m

 # CONFIG_IPV6_ILA is not set

@@ -786,11 +880,12 @@ CONFIG_IPV6_FOU=m

 CONFIG_IPV6_MULTIPLE_TABLES=y

 # CONFIG_IPV6_SUBTREES is not set

 # CONFIG_IPV6_MROUTE is not set

+# CONFIG_IPV6_SEG6_LWTUNNEL is not set

+# CONFIG_IPV6_SEG6_HMAC is not set

 # CONFIG_NETWORK_SECMARK is not set

 CONFIG_NET_PTP_CLASSIFY=y

 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set

 CONFIG_NETFILTER=y

-# CONFIG_NETFILTER_DEBUG is not set

 CONFIG_NETFILTER_ADVANCED=y

 CONFIG_BRIDGE_NETFILTER=m

@@ -804,6 +899,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m

 CONFIG_NETFILTER_NETLINK_LOG=m

 CONFIG_NF_CONNTRACK=m

 CONFIG_NF_LOG_COMMON=m

+# CONFIG_NF_LOG_NETDEV is not set

 CONFIG_NF_CONNTRACK_MARK=y

 # CONFIG_NF_CONNTRACK_ZONES is not set

 # CONFIG_NF_CONNTRACK_PROCFS is not set

@@ -811,10 +907,10 @@ CONFIG_NF_CONNTRACK_EVENTS=y

 # CONFIG_NF_CONNTRACK_TIMEOUT is not set

 # CONFIG_NF_CONNTRACK_TIMESTAMP is not set

 CONFIG_NF_CONNTRACK_LABELS=y

-CONFIG_NF_CT_PROTO_DCCP=m

+# CONFIG_NF_CT_PROTO_DCCP is not set

 CONFIG_NF_CT_PROTO_GRE=m

-CONFIG_NF_CT_PROTO_SCTP=m

-CONFIG_NF_CT_PROTO_UDPLITE=m

+# CONFIG_NF_CT_PROTO_SCTP is not set

+# CONFIG_NF_CT_PROTO_UDPLITE is not set

 # CONFIG_NF_CONNTRACK_AMANDA is not set

 CONFIG_NF_CONNTRACK_FTP=m

 CONFIG_NF_CONNTRACK_H323=m

@@ -831,9 +927,6 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m

 # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set

 CONFIG_NF_NAT=m

 CONFIG_NF_NAT_NEEDED=y

-CONFIG_NF_NAT_PROTO_DCCP=m

-CONFIG_NF_NAT_PROTO_UDPLITE=m

-CONFIG_NF_NAT_PROTO_SCTP=m

 # CONFIG_NF_NAT_AMANDA is not set

 CONFIG_NF_NAT_FTP=m

 CONFIG_NF_NAT_IRC=m

@@ -919,7 +1012,6 @@ CONFIG_NETFILTER_XT_MATCH_RATEEST=m

 CONFIG_NETFILTER_XT_MATCH_REALM=m

 CONFIG_NETFILTER_XT_MATCH_RECENT=m

 CONFIG_NETFILTER_XT_MATCH_SCTP=m

-CONFIG_NETFILTER_XT_MATCH_SOCKET=m

 CONFIG_NETFILTER_XT_MATCH_STATE=m

 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m

 CONFIG_NETFILTER_XT_MATCH_STRING=m

@@ -936,6 +1028,7 @@ CONFIG_IP_SET_HASH_IPMARK=m

 CONFIG_IP_SET_HASH_IPPORT=m

 CONFIG_IP_SET_HASH_IPPORTIP=m

 CONFIG_IP_SET_HASH_IPPORTNET=m

+# CONFIG_IP_SET_HASH_IPMAC is not set

 CONFIG_IP_SET_HASH_MAC=m

 CONFIG_IP_SET_HASH_NETPORTNET=m

 CONFIG_IP_SET_HASH_NET=m

@@ -991,6 +1084,7 @@ CONFIG_IP_VS_NFCT=y

 #

 CONFIG_NF_DEFRAG_IPV4=m

 CONFIG_NF_CONNTRACK_IPV4=m

+# CONFIG_NF_SOCKET_IPV4 is not set

 CONFIG_NF_DUP_IPV4=m

 # CONFIG_NF_LOG_ARP is not set

 CONFIG_NF_LOG_IPV4=m

@@ -1027,6 +1121,7 @@ CONFIG_IP_NF_ARP_MANGLE=m

 #

 CONFIG_NF_DEFRAG_IPV6=m

 CONFIG_NF_CONNTRACK_IPV6=m

+# CONFIG_NF_SOCKET_IPV6 is not set

 CONFIG_NF_DUP_IPV6=m

 CONFIG_NF_REJECT_IPV6=m

 CONFIG_NF_LOG_IPV6=m

@@ -1126,6 +1221,7 @@ CONFIG_NET_SCH_FQ_CODEL=y

 # CONFIG_NET_SCH_HHF is not set

 # CONFIG_NET_SCH_PIE is not set

 # CONFIG_NET_SCH_PLUG is not set

+# CONFIG_NET_SCH_DEFAULT is not set

 #

 # Classification

@@ -1168,6 +1264,7 @@ CONFIG_VMWARE_VMCI_VSOCKETS=y

 CONFIG_MPLS=y

 CONFIG_NET_MPLS_GSO=m

 # CONFIG_MPLS_ROUTING is not set

+# CONFIG_NET_NSH is not set

 # CONFIG_HSR is not set

 # CONFIG_NET_SWITCHDEV is not set

 CONFIG_NET_L3_MASTER_DEV=y

@@ -1175,7 +1272,6 @@ CONFIG_NET_L3_MASTER_DEV=y

 CONFIG_RPS=y

 CONFIG_RFS_ACCEL=y

 CONFIG_XPS=y

-CONFIG_SOCK_CGROUP_DATA=y

 CONFIG_CGROUP_NET_PRIO=y

 CONFIG_CGROUP_NET_CLASSID=y

 CONFIG_NET_RX_BUSY_POLL=y

@@ -1189,7 +1285,6 @@ CONFIG_NET_FLOW_LIMIT=y

 # CONFIG_NET_PKTGEN is not set

 # CONFIG_HAMRADIO is not set

 # CONFIG_CAN is not set

-# CONFIG_IRDA is not set

 # CONFIG_BT is not set

 # CONFIG_AF_RXRPC is not set

 # CONFIG_AF_KCM is not set

@@ -1203,8 +1298,11 @@ CONFIG_NET_9P=m

 # CONFIG_CAIF is not set

 # CONFIG_CEPH_LIB is not set

 # CONFIG_NFC is not set

+# CONFIG_PSAMPLE is not set

+# CONFIG_NET_IFE is not set

 # CONFIG_LWTUNNEL is not set

 CONFIG_DST_CACHE=y

+CONFIG_GRO_CELLS=y

 # CONFIG_NET_DEVLINK is not set

 CONFIG_MAY_USE_DEVLINK=y

 CONFIG_HAVE_EBPF_JIT=y

@@ -1229,13 +1327,14 @@ CONFIG_ALLOW_DEV_COREDUMP=y

 # CONFIG_DEBUG_DRIVER is not set

 # CONFIG_DEBUG_DEVRES is not set

 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set

+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set

 # CONFIG_SYS_HYPERVISOR is not set

 # CONFIG_GENERIC_CPU_DEVICES is not set

 CONFIG_GENERIC_CPU_AUTOPROBE=y

 CONFIG_REGMAP=y

 CONFIG_REGMAP_I2C=m

 CONFIG_DMA_SHARED_BUFFER=y

-# CONFIG_FENCE_TRACE is not set

+# CONFIG_DMA_FENCE_TRACE is not set

 #

 # Bus devices

@@ -1256,7 +1355,6 @@ CONFIG_BLK_DEV=y

 # CONFIG_BLK_DEV_NULL_BLK is not set

 # CONFIG_BLK_DEV_FD is not set

 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set

-# CONFIG_BLK_CPQ_CISS_DA is not set

 # CONFIG_BLK_DEV_DAC960 is not set

 # CONFIG_BLK_DEV_UMEM is not set

 # CONFIG_BLK_DEV_COW_COMMON is not set

@@ -1273,12 +1371,11 @@ CONFIG_BLK_DEV_RAM_SIZE=16384

 CONFIG_BLK_DEV_RAM_DAX=y

 # CONFIG_CDROM_PKTCDVD is not set

 # CONFIG_ATA_OVER_ETH is not set

-# CONFIG_BLK_DEV_HD is not set

 # CONFIG_BLK_DEV_RBD is not set

 # CONFIG_BLK_DEV_RSXX is not set

 CONFIG_NVME_CORE=y

 CONFIG_BLK_DEV_NVME=y

-# CONFIG_BLK_DEV_NVME_SCSI is not set

+# CONFIG_NVME_FC is not set

 # CONFIG_NVME_TARGET is not set

 #

@@ -1305,6 +1402,7 @@ CONFIG_BLK_DEV_NVME=y

 CONFIG_VMWARE_BALLOON=y

 # CONFIG_USB_SWITCH_FSA9480 is not set

 # CONFIG_SRAM is not set

+# CONFIG_PCI_ENDPOINT_TEST is not set

 # CONFIG_C2PORT is not set

 #

@@ -1314,6 +1412,7 @@ CONFIG_VMWARE_BALLOON=y

 # CONFIG_EEPROM_LEGACY is not set

 # CONFIG_EEPROM_MAX6875 is not set

 # CONFIG_EEPROM_93CX6 is not set

+# CONFIG_EEPROM_IDT_89HPESX is not set

 # CONFIG_CB710_CORE is not set

 #

@@ -1368,6 +1467,7 @@ CONFIG_VMWARE_VMCI=y

 # CONFIG_ECHO is not set

 # CONFIG_CXL_BASE is not set

 # CONFIG_CXL_AFU_DRIVER_OPS is not set

+# CONFIG_CXL_LIB is not set

 CONFIG_HAVE_IDE=y

 # CONFIG_IDE is not set

@@ -1561,7 +1661,7 @@ CONFIG_BLK_DEV_DM=m

 # CONFIG_DM_MQ_DEFAULT is not set

 # CONFIG_DM_DEBUG is not set

 CONFIG_DM_BUFIO=m

-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set

+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set

 CONFIG_DM_BIO_PRISON=m

 CONFIG_DM_PERSISTENT_DATA=m

 CONFIG_DM_CRYPT=m

@@ -1580,6 +1680,7 @@ CONFIG_DM_UEVENT=y

 # CONFIG_DM_VERITY is not set

 # CONFIG_DM_SWITCH is not set

 # CONFIG_DM_LOG_WRITES is not set

+# CONFIG_DM_INTEGRITY is not set

 # CONFIG_TARGET_CORE is not set

 CONFIG_FUSION=y

 CONFIG_FUSION_SPI=y

@@ -1605,6 +1706,7 @@ CONFIG_DUMMY=m

 CONFIG_MACVLAN=m

 # CONFIG_MACVTAP is not set

 CONFIG_IPVLAN=m

+# CONFIG_IPVTAP is not set

 CONFIG_VXLAN=m

 CONFIG_GENEVE=m

 # CONFIG_GTP is not set

@@ -1630,12 +1732,16 @@ CONFIG_ETHERNET=y

 # CONFIG_NET_VENDOR_3COM is not set

 # CONFIG_NET_VENDOR_ADAPTEC is not set

 # CONFIG_NET_VENDOR_AGERE is not set

+# CONFIG_NET_VENDOR_ALACRITECH is not set

 # CONFIG_NET_VENDOR_ALTEON is not set

 # CONFIG_ALTERA_TSE is not set

 # CONFIG_NET_VENDOR_AMAZON is not set

 CONFIG_NET_VENDOR_AMD=y

 # CONFIG_AMD8111_ETH is not set

 CONFIG_PCNET32=m

+# CONFIG_AMD_XGBE is not set

+# CONFIG_AMD_XGBE_HAVE_ECC is not set

+# CONFIG_NET_VENDOR_AQUANTIA is not set

 # CONFIG_NET_VENDOR_ARC is not set

 # CONFIG_NET_VENDOR_ATHEROS is not set

 # CONFIG_NET_VENDOR_AURORA is not set

@@ -1653,6 +1759,7 @@ CONFIG_PCNET32=m

 # CONFIG_NET_VENDOR_EZCHIP is not set

 # CONFIG_NET_VENDOR_EXAR is not set

 # CONFIG_NET_VENDOR_HP is not set

+# CONFIG_NET_VENDOR_HUAWEI is not set

 CONFIG_NET_VENDOR_INTEL=y

 # CONFIG_E100 is not set

 CONFIG_E1000=m

@@ -1689,18 +1796,20 @@ CONFIG_E1000E=m

 # CONFIG_NET_VENDOR_SEEQ is not set

 # CONFIG_NET_VENDOR_SILAN is not set

 # CONFIG_NET_VENDOR_SIS is not set

-# CONFIG_SFC is not set

+# CONFIG_NET_VENDOR_SOLARFLARE is not set

 # CONFIG_NET_VENDOR_SMSC is not set

 # CONFIG_NET_VENDOR_STMICRO is not set

 # CONFIG_NET_VENDOR_SUN is not set

-# CONFIG_NET_VENDOR_SYNOPSYS is not set

 # CONFIG_NET_VENDOR_TEHUTI is not set

 # CONFIG_NET_VENDOR_TI is not set

 # CONFIG_NET_VENDOR_VIA is not set

 # CONFIG_NET_VENDOR_WIZNET is not set

+# CONFIG_NET_VENDOR_SYNOPSYS is not set

 # CONFIG_FDDI is not set

 # CONFIG_HIPPI is not set

 # CONFIG_NET_SB1000 is not set

+# CONFIG_MDIO_DEVICE is not set

+# CONFIG_MDIO_BUS is not set

 # CONFIG_PHYLIB is not set

 # CONFIG_PPP is not set

 # CONFIG_SLIP is not set

@@ -1749,6 +1858,7 @@ CONFIG_INPUT_KEYBOARD=y

 CONFIG_KEYBOARD_ATKBD=y

 # CONFIG_KEYBOARD_QT1070 is not set

 # CONFIG_KEYBOARD_QT2160 is not set

+# CONFIG_KEYBOARD_DLINK_DIR685 is not set

 # CONFIG_KEYBOARD_LKKBD is not set

 # CONFIG_KEYBOARD_TCA6416 is not set

 # CONFIG_KEYBOARD_TCA8418 is not set

@@ -1758,6 +1868,7 @@ CONFIG_KEYBOARD_ATKBD=y

 # CONFIG_KEYBOARD_MPR121 is not set

 # CONFIG_KEYBOARD_NEWTON is not set

 # CONFIG_KEYBOARD_OPENCORES is not set

+# CONFIG_KEYBOARD_SAMSUNG is not set

 # CONFIG_KEYBOARD_STOWAWAY is not set

 # CONFIG_KEYBOARD_SUNKBD is not set

 # CONFIG_KEYBOARD_XTKBD is not set

@@ -1767,6 +1878,7 @@ CONFIG_MOUSE_PS2_ALPS=y

 CONFIG_MOUSE_PS2_BYD=y

 CONFIG_MOUSE_PS2_LOGIPS2PP=y

 CONFIG_MOUSE_PS2_SYNAPTICS=y

+# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set

 CONFIG_MOUSE_PS2_CYPRESS=y

 CONFIG_MOUSE_PS2_LIFEBOOK=y

 CONFIG_MOUSE_PS2_TRACKPOINT=y

@@ -1834,6 +1946,7 @@ CONFIG_SERIAL_8250_PNP=y

 # CONFIG_SERIAL_8250_FINTEK is not set

 CONFIG_SERIAL_8250_CONSOLE=y

 CONFIG_SERIAL_8250_PCI=y

+# CONFIG_SERIAL_8250_EXAR is not set

 CONFIG_SERIAL_8250_NR_UARTS=4

 CONFIG_SERIAL_8250_RUNTIME_UARTS=4

 # CONFIG_SERIAL_8250_EXTENDED is not set

@@ -1858,6 +1971,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y

 # CONFIG_SERIAL_ARC is not set

 # CONFIG_SERIAL_RP2 is not set

 # CONFIG_SERIAL_FSL_LPUART is not set

+# CONFIG_SERIAL_DEV_BUS is not set

 # CONFIG_TTY_PRINTK is not set

 # CONFIG_IPMI_HANDLER is not set

 # CONFIG_HW_RANDOM is not set

@@ -1922,7 +2036,9 @@ CONFIG_I2C_ALGOBIT=m

 #

 # I2C system bus drivers (mostly embedded / system-on-chip)

 #

+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set

 # CONFIG_I2C_DESIGNWARE_PCI is not set

+# CONFIG_I2C_EMEV2 is not set

 # CONFIG_I2C_OCORES is not set

 # CONFIG_I2C_PCA_PLATFORM is not set

 # CONFIG_I2C_PXA_PCI is not set

@@ -1941,6 +2057,7 @@ CONFIG_I2C_ALGOBIT=m

 #

 # Other I2C/SMBus bus drivers

 #

+# CONFIG_I2C_MLXCPLD is not set

 # CONFIG_I2C_STUB is not set

 # CONFIG_I2C_SLAVE is not set

 # CONFIG_I2C_DEBUG_CORE is not set

@@ -1949,10 +2066,6 @@ CONFIG_I2C_ALGOBIT=m

 # CONFIG_SPI is not set

 # CONFIG_SPMI is not set

 # CONFIG_HSI is not set

-

-#

-# PPS support

-#

 CONFIG_PPS=y

 # CONFIG_PPS_DEBUG is not set

@@ -1982,6 +2095,7 @@ CONFIG_PTP_1588_CLOCK=m

 # CONFIG_POWER_SUPPLY is not set

 # CONFIG_HWMON is not set

 CONFIG_THERMAL=y

+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0

 # CONFIG_THERMAL_WRITABLE_TRIPS is not set

 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set

@@ -2009,10 +2123,6 @@ CONFIG_SSB_POSSIBLE=y

 #

 # CONFIG_SSB is not set

 CONFIG_BCMA_POSSIBLE=y

-

-#

-# Broadcom specific AMBA

-#

 # CONFIG_BCMA is not set