From 0aec8a810ae657926e533afbe8e13ac523e7d49a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 8 Feb 2016 12:04:18 -0600 Subject: [PATCH] Linux v4.5-rc3 --- ...ell-ULT-to-Intel-MCH-size-workaround.patch | 119 ------------------ config-generic | 6 +- config-nodebug | 112 ++++++++--------- config-x86-generic | 2 +- gitrev | 2 +- kernel.spec | 13 +- sources | 3 +- 7 files changed, 69 insertions(+), 188 deletions(-) delete mode 100644 PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch diff --git a/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch b/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch deleted file mode 100644 index c2082a3b4..000000000 --- a/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch +++ /dev/null @@ -1,119 +0,0 @@ -From afa5b65015ff2a7f0b4ec8cab6f58fa47025259a Mon Sep 17 00:00:00 2001 -From: Josh Boyer -Date: Fri, 22 Jan 2016 08:11:46 -0500 -Subject: [PATCH] PNP: Add Haswell-ULT to Intel MCH size workaround - -Add device ID 0x0a04 for Haswell-ULT to the list of devices with MCH -problems. - -From a Lenovo ThinkPad T440S: -[ 0.188604] pnp: PnP ACPI init -[ 0.189044] system 00:00: [mem 0x00000000-0x0009ffff] could not be reserved -[ 0.189048] system 00:00: [mem 0x000c0000-0x000c3fff] could not be reserved -[ 0.189050] system 00:00: [mem 0x000c4000-0x000c7fff] could not be reserved -[ 0.189052] system 00:00: [mem 0x000c8000-0x000cbfff] could not be reserved -[ 0.189054] system 00:00: [mem 0x000cc000-0x000cffff] could not be reserved -[ 0.189056] system 00:00: [mem 0x000d0000-0x000d3fff] has been reserved -[ 0.189058] system 00:00: [mem 0x000d4000-0x000d7fff] has been reserved -[ 0.189060] system 00:00: [mem 0x000d8000-0x000dbfff] has been reserved -[ 0.189061] system 00:00: [mem 0x000dc000-0x000dffff] has been reserved -[ 0.189063] system 00:00: [mem 0x000e0000-0x000e3fff] could not be reserved -[ 0.189065] system 00:00: [mem 0x000e4000-0x000e7fff] could not be reserved -[ 0.189067] system 00:00: [mem 0x000e8000-0x000ebfff] could not be reserved -[ 0.189069] system 00:00: [mem 0x000ec000-0x000effff] could not be reserved -[ 0.189071] system 00:00: [mem 0x000f0000-0x000fffff] could not be reserved -[ 0.189073] system 00:00: [mem 0x00100000-0xdf9fffff] could not be reserved -[ 0.189075] system 00:00: [mem 0xfec00000-0xfed3ffff] could not be reserved -[ 0.189078] system 00:00: [mem 0xfed4c000-0xffffffff] could not be reserved -[ 0.189082] system 00:00: Plug and Play ACPI device, IDs PNP0c01 (active) -[ 0.189216] system 00:01: [io 0x1800-0x189f] could not be reserved -[ 0.189220] system 00:01: [io 0x0800-0x087f] has been reserved -[ 0.189222] system 00:01: [io 0x0880-0x08ff] has been reserved -[ 0.189224] system 00:01: [io 0x0900-0x097f] has been reserved -[ 0.189226] system 00:01: [io 0x0980-0x09ff] has been reserved -[ 0.189229] system 00:01: [io 0x0a00-0x0a7f] has been reserved -[ 0.189231] system 00:01: [io 0x0a80-0x0aff] has been reserved -[ 0.189233] system 00:01: [io 0x0b00-0x0b7f] has been reserved -[ 0.189235] system 00:01: [io 0x0b80-0x0bff] has been reserved -[ 0.189238] system 00:01: [io 0x15e0-0x15ef] has been reserved -[ 0.189240] system 00:01: [io 0x1600-0x167f] has been reserved -[ 0.189242] system 00:01: [io 0x1640-0x165f] has been reserved -[ 0.189246] system 00:01: [mem 0xf8000000-0xfbffffff] could not be reserved -[ 0.189249] system 00:01: [mem 0x00000000-0x00000fff] could not be reserved -[ 0.189251] system 00:01: [mem 0xfed1c000-0xfed1ffff] has been reserved -[ 0.189254] system 00:01: [mem 0xfed10000-0xfed13fff] has been reserved -[ 0.189256] system 00:01: [mem 0xfed18000-0xfed18fff] has been reserved -[ 0.189258] system 00:01: [mem 0xfed19000-0xfed19fff] has been reserved -[ 0.189261] system 00:01: [mem 0xfed45000-0xfed4bfff] has been reserved -[ 0.189264] system 00:01: Plug and Play ACPI device, IDs PNP0c02 (active) -[....] -[ 0.583653] resource sanity check: requesting [mem 0xfed10000-0xfed15fff], which spans more than pnp 00:01 [mem 0xfed10000-0xfed13fff] -[ 0.583654] ------------[ cut here ]------------ -[ 0.583660] WARNING: CPU: 0 PID: 1 at arch/x86/mm/ioremap.c:198 __ioremap_caller+0x2c5/0x380() -[ 0.583661] Info: mapping multiple BARs. Your kernel is fine. -[ 0.583662] Modules linked in: - -[ 0.583666] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.3.3-303.fc23.x86_64 #1 -[ 0.583668] Hardware name: LENOVO 20AR001GXS/20AR001GXS, BIOS GJET86WW (2.36 ) 12/04/2015 -[ 0.583670] 0000000000000000 0000000014cf7e59 ffff880214a1baf8 ffffffff813a625f -[ 0.583673] ffff880214a1bb40 ffff880214a1bb30 ffffffff810a07c2 00000000fed10000 -[ 0.583675] ffffc90000cb8000 0000000000006000 0000000000000000 ffff8800d6381040 -[ 0.583678] Call Trace: -[ 0.583683] [] dump_stack+0x44/0x55 -[ 0.583686] [] warn_slowpath_common+0x82/0xc0 -[ 0.583688] [] warn_slowpath_fmt+0x5c/0x80 -[ 0.583692] [] ? iomem_map_sanity_check+0xba/0xd0 -[ 0.583695] [] __ioremap_caller+0x2c5/0x380 -[ 0.583698] [] ioremap_nocache+0x17/0x20 -[ 0.583701] [] snb_uncore_imc_init_box+0x79/0xb0 -[ 0.583705] [] uncore_pci_probe+0xd0/0x1b0 -[ 0.583707] [] local_pci_probe+0x45/0xa0 -[ 0.583710] [] pci_device_probe+0xfd/0x140 -[ 0.583713] [] driver_probe_device+0x222/0x480 -[ 0.583715] [] __driver_attach+0x84/0x90 -[ 0.583717] [] ? driver_probe_device+0x480/0x480 -[ 0.583720] [] bus_for_each_dev+0x6c/0xc0 -[ 0.583722] [] driver_attach+0x1e/0x20 -[ 0.583724] [] bus_add_driver+0x1eb/0x280 -[ 0.583727] [] ? uncore_cpu_setup+0x12/0x12 -[ 0.583729] [] driver_register+0x60/0xe0 -[ 0.583733] [] __pci_register_driver+0x4c/0x50 -[ 0.583736] [] intel_uncore_init+0xe2/0x2e6 -[ 0.583738] [] ? uncore_cpu_setup+0x12/0x12 -[ 0.583741] [] do_one_initcall+0xb3/0x200 -[ 0.583745] [] ? parse_args+0x1a0/0x4a0 -[ 0.583749] [] kernel_init_freeable+0x189/0x223 -[ 0.583752] [] ? rest_init+0x80/0x80 -[ 0.583754] [] kernel_init+0xe/0xe0 -[ 0.583758] [] ret_from_fork+0x3f/0x70 -[ 0.583760] [] ? rest_init+0x80/0x80 -[ 0.583765] ---[ end trace 077c426a39e018aa ]--- - -00:00.0 Host bridge [0600]: Intel Corporation Haswell-ULT DRAM Controller [8086:0a04] (rev 0b) - Subsystem: Lenovo Device [17aa:220c] - Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- - Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- SERR- - Kernel driver in use: hsw_uncore - -Signed-off-by: Josh Boyer ---- - drivers/pnp/quirks.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c -index f700723ca5d6..d28e3ab9479c 100644 ---- a/drivers/pnp/quirks.c -+++ b/drivers/pnp/quirks.c -@@ -342,6 +342,7 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev) - /* Device IDs of parts that have 32KB MCH space */ - static const unsigned int mch_quirk_devices[] = { - 0x0154, /* Ivy Bridge */ -+ 0x0a04, /* Haswell-ULT */ - 0x0c00, /* Haswell */ - 0x1604, /* Broadwell */ - }; --- -2.5.0 - diff --git a/config-generic b/config-generic index 2830de78c..7dd27101c 100644 --- a/config-generic +++ b/config-generic @@ -1825,13 +1825,13 @@ CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y CONFIG_B43_BCMA_PIO=y -CONFIG_B43_DEBUG=y +# CONFIG_B43_DEBUG is not set CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_HT=y CONFIG_B43_PHY_G=y CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_DEBUG=y +# CONFIG_B43LEGACY_DEBUG is not set CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -5125,7 +5125,7 @@ CONFIG_PM_DEBUG=y # CONFIG_DPM_WATCHDOG is not set # revisit this in debug CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y -CONFIG_PM_TEST_SUSPEND=y +# CONFIG_PM_TEST_SUSPEND is not set # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set diff --git a/config-nodebug b/config-nodebug index 3a2eee381..c173637a2 100644 --- a/config-nodebug +++ b/config-nodebug @@ -2,101 +2,101 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y -CONFIG_DEBUG_ATOMIC_SLEEP=y +# CONFIG_DEBUG_ATOMIC_SLEEP is not set -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_LOCK_TORTURE_TEST=m -CONFIG_PROVE_LOCKING=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_PROVE_RCU=y +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_LOCK_TORTURE_TEST is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_PROVE_RCU is not set # CONFIG_PROVE_RCU_REPEATEDLY is not set -CONFIG_DEBUG_PER_CPU_MAPS=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_CPUMASK_OFFSTACK=y -CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set -CONFIG_FAULT_INJECTION=y -CONFIG_FAILSLAB=y -CONFIG_FAIL_PAGE_ALLOC=y -CONFIG_FAIL_MAKE_REQUEST=y -CONFIG_FAULT_INJECTION_DEBUG_FS=y -CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y -CONFIG_FAIL_IO_TIMEOUT=y -CONFIG_FAIL_MMC_REQUEST=y +# CONFIG_FAULT_INJECTION is not set +# CONFIG_FAILSLAB is not set +# CONFIG_FAIL_PAGE_ALLOC is not set +# CONFIG_FAIL_MAKE_REQUEST is not set +# CONFIG_FAULT_INJECTION_DEBUG_FS is not set +# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set +# CONFIG_FAIL_IO_TIMEOUT is not set +# CONFIG_FAIL_MMC_REQUEST is not set -CONFIG_LOCK_STAT=y +# CONFIG_LOCK_STAT is not set -CONFIG_DEBUG_STACK_USAGE=y +# CONFIG_DEBUG_STACK_USAGE is not set -CONFIG_ACPI_DEBUG=y +# CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_DEBUGGER is not set -CONFIG_DEBUG_SG=y -CONFIG_DEBUG_PI_LIST=y +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_PI_LIST is not set # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_DEBUG_PAGEALLOC is not set -CONFIG_DEBUG_OBJECTS=y +# CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_OBJECTS_SELFTEST is not set -CONFIG_DEBUG_OBJECTS_FREE=y -CONFIG_DEBUG_OBJECTS_TIMERS=y -CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +# CONFIG_DEBUG_OBJECTS_FREE is not set +# CONFIG_DEBUG_OBJECTS_TIMERS is not set +# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 CONFIG_X86_PTDUMP=y -CONFIG_ARM64_PTDUMP=y -CONFIG_EFI_PGT_DUMP=y +# CONFIG_ARM64_PTDUMP is not set +# CONFIG_EFI_PGT_DUMP is not set -CONFIG_CAN_DEBUG_DEVICES=y +# CONFIG_CAN_DEBUG_DEVICES is not set -CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_DEBUG_NOTIFIERS=y +# CONFIG_DEBUG_NOTIFIERS is not set -CONFIG_DMA_API_DEBUG=y +# CONFIG_DMA_API_DEBUG is not set -CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE is not set -CONFIG_DEBUG_CREDENTIALS=y +# CONFIG_DEBUG_CREDENTIALS is not set # off in both production debug and nodebug builds, # on in rawhide nodebug builds -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_EXT4_DEBUG=y +# CONFIG_EXT4_DEBUG is not set # CONFIG_XFS_WARN is not set -CONFIG_DEBUG_PERF_USE_VMALLOC=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_JBD2_DEBUG=y +# CONFIG_JBD2_DEBUG is not set -CONFIG_NFSD_FAULT_INJECTION=y +# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_DEBUG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_DRBD_FAULT_INJECTION=y +# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_ATH_DEBUG=y -CONFIG_CARL9170_DEBUGFS=y -CONFIG_IWLWIFI_DEVICE_TRACING=y +# CONFIG_ATH_DEBUG is not set +# CONFIG_CARL9170_DEBUGFS is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set # CONFIG_RTLWIFI_DEBUG is not set -CONFIG_DEBUG_OBJECTS_WORK=y +# CONFIG_DEBUG_OBJECTS_WORK is not set -CONFIG_DMADEVICES_DEBUG=y +# CONFIG_DMADEVICES_DEBUG is not set # CONFIG_DMADEVICES_VDEBUG is not set CONFIG_PM_ADVANCED_DEBUG=y -CONFIG_CEPH_LIB_PRETTYDEBUG=y -CONFIG_QUOTA_DEBUG=y +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_QUOTA_DEBUG is not set CONFIG_KGDB_KDB=y @@ -104,19 +104,19 @@ CONFIG_KDB_DEFAULT_ENABLE=0x0 CONFIG_KDB_KEYBOARD=y CONFIG_KDB_CONTINUE_CATASTROPHIC=0 -CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y +# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set # CONFIG_PERCPU_TEST is not set -CONFIG_TEST_LIST_SORT=y +# CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_STRING_HELPERS is not set -CONFIG_DETECT_HUNG_TASK=y +# CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_WQ_WATCHDOG=y +# CONFIG_WQ_WATCHDOG is not set -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set -CONFIG_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024 # CONFIG_DEBUG_KMEMLEAK_TEST is not set CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y @@ -127,4 +127,4 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y # CONFIG_SPI_DEBUG is not set -CONFIG_X86_DEBUG_STATIC_CPU_HAS=y +# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set diff --git a/config-x86-generic b/config-x86-generic index 33b55f3a1..f54836a6d 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -377,7 +377,7 @@ CONFIG_SP5100_TCO=m # CONFIG_MEMTEST is not set # CONFIG_DEBUG_TLBFLUSH is not set -CONFIG_MAXSMP=y +# CONFIG_MAXSMP is not set CONFIG_HP_ILO=m diff --git a/gitrev b/gitrev index e9a33cac9..336279529 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -df48ab3c2f5ffca88b7803ffbadd074bd5a0a2ef +388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 diff --git a/kernel.spec b/kernel.spec index 706efc6bf..539c45b8a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -65,9 +65,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 2 +%define rcrev 3 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -586,9 +586,6 @@ Patch571: ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch #rhbz 1295646 Patch621: drm-udl-Use-unlocked-gem-unreferencing.patch -#rhbz 1300955 -Patch640: PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch - #Required for some persistent memory options Patch641: disable-CONFIG_EXPERT-for-ZONE_DMA.patch @@ -2044,6 +2041,10 @@ fi # # %changelog +* Mon Feb 08 2016 Justin M. Forbes - 4.5.0-0.rc3.git0.1 +- Disable debugging options. +- Linux v4.5-rc3 + * Fri Feb 05 2016 Justin M. Forbes - 4.5.0-0.rc2.git3.1 - Linux v4.5-rc2-212-gdf48ab3 diff --git a/sources b/sources index 87f720562..bbf1b88a7 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ 9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz dcbc8fe378a676d5d0dd208cf524e144 perf-man-4.4.tar.gz -54449bfbdc10d5cce559d2d7fb5689ac patch-4.5-rc2.xz -c43d7ae0ea4440556ee254e706123c0a patch-4.5-rc2-git3.xz +1ae1cd8a5d6555ac73c727982008a2b8 patch-4.5-rc3.xz