diff options
| -rw-r--r-- | config-generic | 8 | ||||
| -rw-r--r-- | config-nodebug | 118 | ||||
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch | 163 | ||||
| -rw-r--r-- | kernel.spec | 10 | ||||
| -rw-r--r-- | sources | 1 |
6 files changed, 71 insertions, 231 deletions
diff --git a/config-generic b/config-generic index 8aa44cfe6..b3d1cfe89 100644 --- a/config-generic +++ b/config-generic @@ -1680,13 +1680,13 @@ CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y # CONFIG_B43_BCMA_EXTRA is not set CONFIG_B43_BCMA_PIO=y -# CONFIG_B43_DEBUG is not set +CONFIG_B43_DEBUG=y CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_HT=y # CONFIG_B43_FORCE_PIO is not set CONFIG_B43LEGACY=m -# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -3543,7 +3543,7 @@ CONFIG_USB_STORAGE_REALTEK=m CONFIG_REALTEK_AUTOPM=y CONFIG_USB_STORAGE_ENE_UB6250=m # CONFIG_USB_LIBUSUAL is not set -# CONFIG_USB_UAS is not set +CONFIG_USB_UAS=m # @@ -4619,7 +4619,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 is not set +CONFIG_PM_TEST_SUSPEND=y CONFIG_PM_RUNTIME=y # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set diff --git a/config-nodebug b/config-nodebug index c6b4b7902..6cab3d175 100644 --- a/config-nodebug +++ b/config-nodebug @@ -2,100 +2,100 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y -# CONFIG_DEBUG_ATOMIC_SLEEP is not set - -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH 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_DEBUG_ATOMIC_SLEEP=y + +CONFIG_DEBUG_MUTEXES=y +CONFIG_DEBUG_WW_MUTEX_SLOWPATH=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_PROVE_RCU_REPEATEDLY is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_DEBUG_PER_CPU_MAPS=y CONFIG_CPUMASK_OFFSTACK=y -# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set +CONFIG_CPU_NOTIFIER_ERROR_INJECT=m -# 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_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_LOCK_STAT is not set +CONFIG_LOCK_STAT=y -# CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_DEBUG_STACK_USAGE=y -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set -# CONFIG_DEBUG_SG is not set +CONFIG_DEBUG_SG=y # CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_DEBUG_WRITECOUNT is not set -# CONFIG_DEBUG_OBJECTS is not set +CONFIG_DEBUG_WRITECOUNT=y +CONFIG_DEBUG_OBJECTS=y # CONFIG_DEBUG_OBJECTS_SELFTEST is not set -# 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_FREE=y +CONFIG_DEBUG_OBJECTS_TIMERS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 -# CONFIG_X86_PTDUMP is not set -# CONFIG_EFI_PGT_DUMP is not set +CONFIG_X86_PTDUMP=y +CONFIG_EFI_PGT_DUMP=y -# CONFIG_CAN_DEBUG_DEVICES is not set +CONFIG_CAN_DEBUG_DEVICES=y -# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y -# CONFIG_DEBUG_NOTIFIERS is not set +CONFIG_DEBUG_NOTIFIERS=y -# CONFIG_DMA_API_DEBUG is not set +CONFIG_DMA_API_DEBUG=y -# CONFIG_MMIOTRACE is not set +CONFIG_MMIOTRACE=y -# CONFIG_DEBUG_CREDENTIALS is not set +CONFIG_DEBUG_CREDENTIALS=y # off in both production debug and nodebug builds, # on in rawhide nodebug builds -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y -# CONFIG_EXT4_DEBUG is not set +CONFIG_EXT4_DEBUG=y # CONFIG_XFS_WARN is not set -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_DEBUG_PERF_USE_VMALLOC=y -# CONFIG_JBD2_DEBUG is not set +CONFIG_JBD2_DEBUG=y -# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_NFSD_FAULT_INJECTION=y -# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_DEBUG_BLK_CGROUP=y -# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_DRBD_FAULT_INJECTION=y -# CONFIG_ATH_DEBUG is not set -# CONFIG_CARL9170_DEBUGFS is not set -# CONFIG_IWLWIFI_DEVICE_TRACING is not set +CONFIG_ATH_DEBUG=y +CONFIG_CARL9170_DEBUGFS=y +CONFIG_IWLWIFI_DEVICE_TRACING=y # CONFIG_RTLWIFI_DEBUG is not set -# CONFIG_DEBUG_OBJECTS_WORK is not set +CONFIG_DEBUG_OBJECTS_WORK=y -# CONFIG_DMADEVICES_DEBUG is not set -# CONFIG_DMADEVICES_VDEBUG is not set +CONFIG_DMADEVICES_DEBUG=y +CONFIG_DMADEVICES_VDEBUG=y CONFIG_PM_ADVANCED_DEBUG=y -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -# CONFIG_QUOTA_DEBUG is not set +CONFIG_CEPH_LIB_PRETTYDEBUG=y +CONFIG_QUOTA_DEBUG=y CONFIG_PCI_DEFAULT_USE_CRS=y @@ -103,18 +103,18 @@ CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y CONFIG_KDB_CONTINUE_CATASTROPHIC=0 -# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set +CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y # CONFIG_PERCPU_TEST is not set -# CONFIG_TEST_LIST_SORT is not set +CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_DETECT_HUNG_TASK is not set +CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -# CONFIG_DEBUG_KMEMLEAK is not set +CONFIG_DEBUG_KMEMLEAK=y CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024 # CONFIG_DEBUG_KMEMLEAK_TEST is not set CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y @@ -125,7 +125,7 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y # CONFIG_SPI_DEBUG is not set -# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set +CONFIG_X86_DEBUG_STATIC_CPU_HAS=y # CONFIG_SCHEDSTATS is not set # CONFIG_LATENCYTOP is not set diff --git a/config-x86-generic b/config-x86-generic index ad3c5bb35..bcac9b274 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -336,7 +336,7 @@ CONFIG_SP5100_TCO=m # CONFIG_MEMTEST is not set # CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_MAXSMP is not set +CONFIG_MAXSMP=y CONFIG_HP_ILO=m diff --git a/gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch b/gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch deleted file mode 100644 index 56cd7535a..000000000 --- a/gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch +++ /dev/null @@ -1,163 +0,0 @@ -Path: news.gmane.org!not-for-mail -From: Mika Westerberg <mika.westerberg@linux.intel.com> -Newsgroups: gmane.linux.kernel.gpio,gmane.linux.kernel -Subject: [PATCH] gpio / ACPI: Don't crash on NULL chip->dev -Date: Mon, 31 Mar 2014 15:16:49 +0300 -Lines: 114 -Approved: news@gmane.org -Message-ID: <1396268209-19108-1-git-send-email-mika.westerberg@linux.intel.com> -NNTP-Posting-Host: plane.gmane.org -X-Trace: ger.gmane.org 1396268225 9280 80.91.229.3 (31 Mar 2014 12:17:05 GMT) -X-Complaints-To: usenet@ger.gmane.org -NNTP-Posting-Date: Mon, 31 Mar 2014 12:17:05 +0000 (UTC) -Cc: Alexandre Courbot <gnurou@gmail.com>, - Sabrina Dubroca <sd@queasysnail.net>, - linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, - Mika Westerberg <mika.westerberg@linux.intel.com> -To: Linus Walleij <linus.walleij@linaro.org> -Original-X-From: linux-gpio-owner@vger.kernel.org Mon Mar 31 14:16:58 2014 -Return-path: <linux-gpio-owner@vger.kernel.org> -Envelope-to: glg-linux-gpio@plane.gmane.org -Original-Received: from vger.kernel.org ([209.132.180.67]) - by plane.gmane.org with esmtp (Exim 4.69) - (envelope-from <linux-gpio-owner@vger.kernel.org>) - id 1WUb96-00049j-5K - for glg-linux-gpio@plane.gmane.org; Mon, 31 Mar 2014 14:16:56 +0200 -Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1752154AbaCaMQz (ORCPT <rfc822;glg-linux-gpio@m.gmane.org>); - Mon, 31 Mar 2014 08:16:55 -0400 -Original-Received: from mga11.intel.com ([192.55.52.93]:46420 "EHLO mga11.intel.com" - rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP - id S1751749AbaCaMQy (ORCPT <rfc822;linux-gpio@vger.kernel.org>); - Mon, 31 Mar 2014 08:16:54 -0400 -Original-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) - by fmsmga102.fm.intel.com with ESMTP; 31 Mar 2014 05:16:54 -0700 -X-ExtLoop1: 1 -X-IronPort-AV: E=Sophos;i="4.97,764,1389772800"; - d="scan'208";a="510938110" -Original-Received: from blue.fi.intel.com ([10.237.72.156]) - by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2014 05:16:50 -0700 -Original-Received: by blue.fi.intel.com (Postfix, from userid 1004) - id 73976E0098; Mon, 31 Mar 2014 15:16:49 +0300 (EEST) -X-Mailer: git-send-email 1.9.1 -Original-Sender: linux-gpio-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-gpio.vger.kernel.org> -X-Mailing-List: linux-gpio@vger.kernel.org -Xref: news.gmane.org gmane.linux.kernel.gpio:2461 gmane.linux.kernel:1675129 -Archived-At: <http://permalink.gmane.org/gmane.linux.kernel.gpio/2461> - -Commit aa92b6f689ac (gpio / ACPI: Allocate ACPI specific data directly in -acpi_gpiochip_add()) moved ACPI handle checking to acpi_gpiochip_add() but -forgot to check whether chip->dev is NULL before dereferencing it. - -Since chip->dev pointer is optional we can end up with crash like following: - - BUG: unable to handle kernel NULL pointer dereference at 00000138 - IP: [<c126c2b3>] acpi_gpiochip_add+0x13/0x190 - *pde = 00000000 - Oops: 0000 [#1] PREEMPT SMP - Modules linked in: ssb(+) ... - CPU: 0 PID: 512 Comm: modprobe Tainted: G W 3.14.0-rc7-next-20140324-t1 #24 - Hardware name: Dell Inc. Latitude D830 /0UY141, BIOS A02 06/07/2007 - task: f5799900 ti: f543e000 task.ti: f543e000 - EIP: 0060:[<c126c2b3>] EFLAGS: 00010282 CPU: 0 - EIP is at acpi_gpiochip_add+0x13/0x190 - EAX: 00000000 EBX: f57824c4 ECX: 00000000 EDX: 00000000 - ESI: f57824c4 EDI: 00000010 EBP: f543fc54 ESP: f543fc40 - DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 - CR0: 8005003b CR2: 00000138 CR3: 355f8000 CR4: 000007d0 - Stack: - f543fc5c fd1f7790 f57824c4 000000be 00000010 f543fc84 c1269f4e f543fc74 - fd1f78bd 00008002 f57822b0 f5782090 fd1f8400 00000286 fd1f9994 00000000 - f5782000 f543fc8c fd1f7e39 f543fcc8 fd1f0bd8 000000c0 00000000 00000000 - Call Trace: - [<fd1f7790>] ? ssb_pcie_mdio_write+0xa0/0xd0 [ssb] - [<c1269f4e>] gpiochip_add+0xee/0x300 - [<fd1f78bd>] ? ssb_pcicore_serdes_workaround+0xfd/0x140 [ssb] - [<fd1f7e39>] ssb_gpio_init+0x89/0xa0 [ssb] - [<fd1f0bd8>] ssb_attach_queued_buses+0xc8/0x2d0 [ssb] - [<fd1f0f65>] ssb_bus_register+0x185/0x1f0 [ssb] - [<fd1f3120>] ? ssb_pci_xtal+0x220/0x220 [ssb] - [<fd1f106c>] ssb_bus_pcibus_register+0x2c/0x80 [ssb] - [<fd1f40dc>] ssb_pcihost_probe+0x9c/0x110 [ssb] - [<c1276c8f>] pci_device_probe+0x6f/0xc0 - [<c11bdb55>] ? sysfs_create_link+0x25/0x40 - [<c131d8b9>] driver_probe_device+0x79/0x360 - [<c1276512>] ? pci_match_device+0xb2/0xc0 - [<c131dc51>] __driver_attach+0x71/0x80 - [<c131dbe0>] ? __device_attach+0x40/0x40 - [<c131bd87>] bus_for_each_dev+0x47/0x80 - [<c131d3ae>] driver_attach+0x1e/0x20 - [<c131dbe0>] ? __device_attach+0x40/0x40 - [<c131d007>] bus_add_driver+0x157/0x230 - [<c131e219>] driver_register+0x59/0xe0 - ... - -Fix this by checking chip->dev pointer against NULL first. Also we can now -remove redundant check in acpi_gpiochip_request/free_interrupts(). - -Reported-by: Sabrina Dubroca <sd@queasysnail.net> -Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> ---- -Sabrina, - -Can you please re-test this and provide your tested-by? I changed the patch -a bit to remove redundant checks. Just to be sure that I don't accidentally -break something. - -Thanks. - - drivers/gpio/gpiolib-acpi.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c -index bf0f8b476696..d5be56fe689e 100644 ---- a/drivers/gpio/gpiolib-acpi.c -+++ b/drivers/gpio/gpiolib-acpi.c -@@ -233,7 +233,7 @@ static void acpi_gpiochip_request_interrupts(struct acpi_gpio_chip *acpi_gpio) - { - struct gpio_chip *chip = acpi_gpio->chip; - -- if (!chip->dev || !chip->to_irq) -+ if (!chip->to_irq) - return; - - INIT_LIST_HEAD(&acpi_gpio->events); -@@ -253,7 +253,7 @@ static void acpi_gpiochip_free_interrupts(struct acpi_gpio_chip *acpi_gpio) - struct acpi_gpio_event *event, *ep; - struct gpio_chip *chip = acpi_gpio->chip; - -- if (!chip->dev || !chip->to_irq) -+ if (!chip->to_irq) - return; - - list_for_each_entry_safe_reverse(event, ep, &acpi_gpio->events, node) { -@@ -501,6 +501,9 @@ void acpi_gpiochip_add(struct gpio_chip *chip) - acpi_handle handle; - acpi_status status; - -+ if (!chip || !chip->dev) -+ return; -+ - handle = ACPI_HANDLE(chip->dev); - if (!handle) - return; -@@ -531,6 +534,9 @@ void acpi_gpiochip_remove(struct gpio_chip *chip) - acpi_handle handle; - acpi_status status; - -+ if (!chip || !chip->dev) -+ return; -+ - handle = ACPI_HANDLE(chip->dev); - if (!handle) - return; --- -1.9.1 - --- -To unsubscribe from this list: send the line "unsubscribe linux-gpio" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - diff --git a/kernel.spec b/kernel.spec index 1381bc76a..42cc9612d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -61,7 +61,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 3.%{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 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -629,7 +629,6 @@ Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch #rhbz 1085582 1085697 Patch25049: 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch -Patch25061: gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch Patch25062: gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch #rhbz 1025603 @@ -1284,7 +1283,6 @@ ApplyPatch 0001-HID-rmi-do-not-handle-touchscreens-through-hid-rmi.patch #rhbz 1085582 1085697 ApplyPatch 0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch -ApplyPatch gpio-ACPI-Dont-crash-on-NULL-chip-dev.patch ApplyPatch gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch #rhbz 1025603 @@ -2069,6 +2067,10 @@ fi # ||----w | # || || %changelog +* Tue Apr 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc2.git1.1 +- Linux v3.15-rc2-42-g4d0fa8a0f012 +- Reenable debugging options. + * Tue Apr 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - Add patch to fix Synaptics touchscreens and HID rmi driver (rhbz 1089583) @@ -1,3 +1,4 @@ b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz d36baf2d62de5aa61f10a976d00d2d2a perf-man-3.14.tar.gz f8adc3ee2a7490a403ae1971597c0d0e patch-3.15-rc2.xz +dc9d72f4ca8908aee3bd7014f4d9f032 patch-3.15-rc2-git1.xz |