diff options
| -rw-r--r-- | config-generic | 7 | ||||
| -rw-r--r-- | config-nodebug | 120 | ||||
| -rw-r--r-- | config-s390x | 1 | ||||
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 18 | ||||
| -rw-r--r-- | sources | 3 | ||||
| -rw-r--r-- | x86_32-signal-Fix-vdso-rt_sigreturn.patch | 102 |
7 files changed, 183 insertions, 70 deletions
diff --git a/config-generic b/config-generic index d4dd21744..a1c6c4e6a 100644 --- a/config-generic +++ b/config-generic @@ -1694,13 +1694,13 @@ CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y # CONFIG_B43_BCMA_EXTRA is not set 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_FORCE_PIO is not set 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 @@ -2440,6 +2440,7 @@ CONFIG_I2C_TINY_USB=m # CONFIG_I2C_VIAPRO is not set # CONFIG_I2C_DESIGNWARE is not set # CONFIG_I2C_XILINX is not set +# CONFIG_I2C_RK3X is not set CONFIG_I2C_DIOLAN_U2C=m @@ -4639,7 +4640,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_RUNTIME=y # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set diff --git a/config-nodebug b/config-nodebug index 360f418d4..e16a37b57 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_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_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_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_DEBUG_FUNC_TRACE 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_DEBUG_PAGEALLOC is not set -CONFIG_DEBUG_WRITECOUNT=y -CONFIG_DEBUG_OBJECTS=y +# CONFIG_DEBUG_WRITECOUNT is not set +# 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_EFI_PGT_DUMP=y +# CONFIG_X86_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_SYSCTL_SYSCALL_CHECK=y +# CONFIG_SYSCTL_SYSCALL_CHECK 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_VDEBUG=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_PCI_DEFAULT_USE_CRS=y @@ -104,18 +104,18 @@ CONFIG_KGDB_KDB=y 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_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 @@ -126,7 +126,7 @@ 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 # CONFIG_SCHEDSTATS is not set # CONFIG_LATENCYTOP is not set diff --git a/config-s390x b/config-s390x index 6f3d3253e..874f80847 100644 --- a/config-s390x +++ b/config-s390x @@ -153,6 +153,7 @@ CONFIG_CHECK_STACK=y # CONFIG_SMALL_STACK is not set CONFIG_ZVM_WATCHDOG=m +CONFIG_DIAG288_WATCHDOG=m CONFIG_VMLOGRDR=m CONFIG_MONREADER=m diff --git a/config-x86-generic b/config-x86-generic index 997bc472a..7968fdaea 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -334,7 +334,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/kernel.spec b/kernel.spec index 57d823bd2..18fdcebcb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -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 1 +%define rcrev 2 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -128,7 +128,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} @@ -637,6 +637,9 @@ Patch25102: intel_pstate-Fix-setting-VID.patch Patch25103: intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch Patch25104: intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch +#rhbz 1110968 +Patch25105: x86_32-signal-Fix-vdso-rt_sigreturn.patch + # END OF PATCH DEFINITIONS %endif @@ -1353,6 +1356,9 @@ ApplyPatch intel_pstate-Fix-setting-VID.patch ApplyPatch intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch ApplyPatch intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch +#rhbz 1110968 +ApplyPatch x86_32-signal-Fix-vdso-rt_sigreturn.patch + # END OF PATCH APPLICATIONS %endif @@ -2225,6 +2231,10 @@ fi # ||----w | # || || %changelog +* Mon Jun 23 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc2.git0.1 +- Linux v3.16-rc2 +- Disable debugging options. + * Sun Jun 22 2014 Peter Robinson <pbrobinson@fedoraproject.org> - Enable Exynos now it's finally multi platform capable - Minor TI Keystone update @@ -1,4 +1,3 @@ 97ca1625bb40368dc41b9a7971549071 linux-3.15.tar.xz ef8f4db937f521a7e323ec589536ba25 perf-man-3.15.tar.gz -8edcef1e40ebea460ba0e43d913ff928 patch-3.16-rc1.xz -3d7caaa5bbfb7f1227c11fc725fb2f9d patch-3.16-rc1-git4.xz +77133c50724a5510c3d7a61703deccf5 patch-3.16-rc2.xz diff --git a/x86_32-signal-Fix-vdso-rt_sigreturn.patch b/x86_32-signal-Fix-vdso-rt_sigreturn.patch new file mode 100644 index 000000000..19567400e --- /dev/null +++ b/x86_32-signal-Fix-vdso-rt_sigreturn.patch @@ -0,0 +1,102 @@ +Bugzilla: 1110968 +Upstream-status: Sent for 3.16 +Delivered-To: jwboyer@gmail.com +Received: by 10.76.6.212 with SMTP id d20csp498917oaa; + Sat, 21 Jun 2014 07:32:08 -0700 (PDT) +X-Received: by 10.68.222.196 with SMTP id qo4mr13568182pbc.14.1403361127771; + Sat, 21 Jun 2014 07:32:07 -0700 (PDT) +Return-Path: <luto@amacapital.net> +Received: from bastion.fedoraproject.org (bastion02.fedoraproject.org. [209.132.181.3]) + by mx.google.com with ESMTP id lc8si14177597pab.180.2014.06.21.07.32.07 + for <jwboyer@gmail.com>; + Sat, 21 Jun 2014 07:32:07 -0700 (PDT) +Received-SPF: softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) client-ip=209.132.181.3; +Authentication-Results: mx.google.com; + spf=softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) smtp.mail=luto@amacapital.net +Received: by bastion02.phx2.fedoraproject.org (Postfix) + id 168B1409CE; Sat, 21 Jun 2014 14:32:07 +0000 (UTC) +Delivered-To: jwboyer@fedoraproject.org +Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18]) + by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id D0C2F409C7 + for <jwboyer@fedoraproject.org>; Sat, 21 Jun 2014 14:32:06 +0000 (UTC) +Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) + by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5LEW4FM005994 + (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL) + for <jwboyer@fedoraproject.org>; Sat, 21 Jun 2014 10:32:05 -0400 +Received: by mail-pd0-f176.google.com with SMTP id ft15so3955970pdb.7 + for <jwboyer@fedoraproject.org>; Sat, 21 Jun 2014 07:32:04 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references; + bh=9ojFh7kYLbjyUNQqXEB1a+XYU5MXkJE3dfv8VGqmp7U=; + b=R90lfJ9+LPLahfLiaskJdqINOIulosFA5kTRA6zFncXdehLXlO1/bgzCbVSBQp0Zda + jH2JtoZFUe+cfg5kQTtnVhE+H5Z+J6zTGQy3vmlloZh5QOxVDtHZU85FKZWL4ME/teZD + 4dHDVOmlO9zXrhRKLs6jdxQnKCJNCovWf5DVPe51OuwKKCwm49VmLTHaYkCox+vsVaGk + J5FG3Q7yxRpGwrhMvI3yWuhj5hxaAq+R+B7pk7xY1xrekBoah2W983/ZXUVYWcclOoi+ + pw4ntIfVczLCLffVR4UmV4/Tf4SU/pzUHAwKoDzVG8E1JP4oxtBquCPMfm19ZM0lwStV + wgpw== +X-Gm-Message-State: ALoCoQlE1XpTJdEnv/MtB0QmbA8XP2ta23AV4hVoUU4182Z6n5xs9NiTKRJfyIbepTPOiKzLFr/I +X-Received: by 10.68.132.42 with SMTP id or10mr13559986pbb.80.1403361124560; + Sat, 21 Jun 2014 07:32:04 -0700 (PDT) +Received: from localhost (pool-108-13-237-90.lsanca.fios.verizon.net. [108.13.237.90]) + by mx.google.com with ESMTPSA id ak1sm18452139pbc.58.2014.06.21.07.32.02 + for <multiple recipients> + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 21 Jun 2014 07:32:03 -0700 (PDT) +From: Andy Lutomirski <luto@amacapital.net> +To: Josh Boyer <jwboyer@fedoraproject.org>, "H. Peter Anvin" <hpa@zytor.com> +Cc: "Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org>, + Andy Lutomirski <luto@amacapital.net> +Subject: [PATCH] x86_32,signal: Fix vdso rt_sigreturn +Date: Sat, 21 Jun 2014 07:31:55 -0700 +Message-Id: <1eb40ad923acde2e18357ef2832867432e70ac42.1403361010.git.luto@amacapital.net> +X-Mailer: git-send-email 1.9.3 +In-Reply-To: <CA+5PVA61wwmnstiBdDemufGvXvSu4RL3WHds3NSstH-rVx7tYg@mail.gmail.com> +References: <CA+5PVA61wwmnstiBdDemufGvXvSu4RL3WHds3NSstH-rVx7tYg@mail.gmail.com> +X-RedHat-Spam-Score: -2.011 (BAYES_00,DCC_REPUT_13_19,RCVD_IN_DNSWL_NONE,SPF_PASS) +X-Scanned-By: MIMEDefang 2.68 on 10.5.110.18 + +This commit: + + commit 6f121e548f83674ab4920a4e60afb58d4f61b829 + Author: Andy Lutomirski <luto@amacapital.net> + Date: Mon May 5 12:19:34 2014 -0700 + + x86, vdso: Reimplement vdso.so preparation in build-time C + +Contained this obvious typo: + +- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); ++ restorer = current->mm->context.vdso + ++ selected_vdso32->sym___kernel_sigreturn; + +Note the missing 'rt_' in the new code. Fix it. + +Signed-off-by: Andy Lutomirski <luto@amacapital.net> +--- + +Compile-tested only. I bet that someone will test it here far more quickly +than I can figure out how to test it: + +https://bugzilla.redhat.com/show_bug.cgi?id=1110968 + + arch/x86/kernel/signal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c +index a0da58d..2851d63 100644 +--- a/arch/x86/kernel/signal.c ++++ b/arch/x86/kernel/signal.c +@@ -363,7 +363,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, + + /* Set up to return from userspace. */ + restorer = current->mm->context.vdso + +- selected_vdso32->sym___kernel_sigreturn; ++ selected_vdso32->sym___kernel_rt_sigreturn; + if (ksig->ka.sa.sa_flags & SA_RESTORER) + restorer = ksig->ka.sa.sa_restorer; + put_user_ex(restorer, &frame->pretcode); +-- +1.9.3 + |