kernel-6.0.0-0.rc2.20220823git072e51356cd5.20
* Tue Aug 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc2.072e51356cd5.20] - Linux v6.0.0-0.rc2.072e51356cd5 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
b05a508db6
commit
a1ec896de3
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 19
|
||||
RHEL_RELEASE = 20
|
||||
|
||||
#
|
||||
# ZSTREAM
|
||||
|
||||
11
kernel.spec
11
kernel.spec
@ -120,17 +120,17 @@ Summary: The Linux kernel
|
||||
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
|
||||
# to build the base kernel using the debug configuration. (Specifying
|
||||
# the --with-release option overrides this setting.)
|
||||
%define debugbuildsenabled 1
|
||||
%define debugbuildsenabled 0
|
||||
# define buildid .local
|
||||
%define specversion 6.0.0
|
||||
%define patchversion 6.0
|
||||
%define pkgrelease 0.rc2.19
|
||||
%define pkgrelease 0.rc2.20220823git072e51356cd5.20
|
||||
%define kversion 6
|
||||
%define tarfile_release 6.0-rc2
|
||||
%define tarfile_release 6.0-rc2-16-g072e51356cd5
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 0
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc2.19%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc2.20220823git072e51356cd5.20%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.0.0
|
||||
|
||||
@ -3147,6 +3147,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Tue Aug 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc2.072e51356cd5.20]
|
||||
- Linux v6.0.0-0.rc2.072e51356cd5
|
||||
|
||||
* Mon Aug 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc2.19]
|
||||
- Linux v6.0.0-0.rc2
|
||||
|
||||
|
||||
@ -3028,65 +3028,3 @@ index 14d30fec8a00..df70ea0b84a1 100644
|
||||
#ifdef CONFIG_PERF_EVENTS
|
||||
int security_perf_event_open(struct perf_event_attr *attr, int type)
|
||||
{
|
||||
From nobody Mon Aug 22 09:25:09 2022
|
||||
From: Yang Jihong <yangjihong1@huawei.com>
|
||||
To: <bp@suse.de>, <ndesaulniers@google.com>, <nathan@kernel.org>, <alexandre.belloni@bootlin.com>, <mingo@kernel.org>, <acme@kernel.org>, <namhyung@kernel.org>, <jolsa@kernel.org>, <linux-perf-users@vger.kernel.org>, <linux-kernel@vger.kernel.org>
|
||||
Subject: [PATCH] perf tools: Fix compile error for x86
|
||||
Date: Mon, 22 Aug 2022 17:25:57 +0800
|
||||
Message-ID: <20220822092557.210209-1-yangjihong1@huawei.com>
|
||||
List-ID: <linux-kernel.vger.kernel.org>
|
||||
X-Mailing-List: linux-kernel@vger.kernel.org
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Commit a0a12c3ed057 ("asm goto: eradicate CC_HAS_ASM_GOTO") eradicates
|
||||
CC_HAS_ASM_GOTO, perf on x86 call asm_volatile_goto when compiling __GEN_RMWcc.
|
||||
However, asm_volatile_goto is not declared, which causes compilation error:
|
||||
|
||||
In file included from /home/linux/tools/include/asm/../../arch/x86/include/asm/atomic.h:7,
|
||||
from /home/linux/tools/include/asm/atomic.h:6,
|
||||
from /home/linux/tools/include/linux/atomic.h:5,
|
||||
from /home/linux/tools/include/linux/refcount.h:41,
|
||||
from /home/linux/tools/lib/perf/include/internal/cpumap.h:5,
|
||||
from /home/linux/tools/perf/util/cpumap.h:7,
|
||||
from /home/linux/tools/perf/util/env.h:7,
|
||||
from /home/linux/tools/perf/util/header.h:12,
|
||||
from pmu-events/pmu-events.c:9:
|
||||
/home/linux/tools/include/asm/../../arch/x86/include/asm/atomic.h: In function ‘atomic_dec_and_test’:
|
||||
/home/linux/tools/include/asm/../../arch/x86/include/asm/rmwcc.h:7:2: error: implicit declaration of function ‘asm_volatile_goto’ [-Werror=implicit-function-declaration]
|
||||
asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
|
||||
^~~~~~~~~~~~~~~~~
|
||||
|
||||
Solution:
|
||||
Define asm_volatile_goto in compiler_types.h if not declared.
|
||||
|
||||
Currently, only x86 architecture uses asm_volatile_goto.
|
||||
Theoretically, this patch affects only the x86 architecture.
|
||||
|
||||
|
||||
|
||||
Fixes: a0a12c3ed057 ("asm goto: eradicate CC_HAS_ASM_GOTO")
|
||||
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
|
||||
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||
Tested-by: Ingo Molnar <mingo@kernel.org>
|
||||
---
|
||||
tools/include/linux/compiler_types.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/tools/include/linux/compiler_types.h b/tools/include/linux/compiler_types.h
|
||||
index 24ae3054f304..1bdd834bdd57 100644
|
||||
--- a/tools/include/linux/compiler_types.h
|
||||
+++ b/tools/include/linux/compiler_types.h
|
||||
@@ -36,4 +36,8 @@
|
||||
#include <linux/compiler-gcc.h>
|
||||
#endif
|
||||
|
||||
+#ifndef asm_volatile_goto
|
||||
+#define asm_volatile_goto(x...) asm goto(x)
|
||||
+#endif
|
||||
+
|
||||
#endif /* __LINUX_COMPILER_TYPES_H */
|
||||
--
|
||||
2.30.GIT
|
||||
|
||||
|
||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-6.0-rc2.tar.xz) = 16475da408c9a2e93509033fa0df65ae1b92cca876c03024915e49b4c8883b07fb74a27dbef4d1934e0c0379583c86897a139fc6c0d8ffd780e978326dc95859
|
||||
SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 1c847d0c1cf15d996370f462122900e4e19badd5b077c8c9723b6bddec2bb28113c1d6dba6c4ad43b74c45c5bbcd665de3b0de3acf08a0e71c4bb01e1a379847
|
||||
SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 22de7be64df3cdbd8d12938ad0907d204331cdec41082f0c0dceec086b02e0c85d4c70796fc5c18f9c2baa3f6ad74241c14e4b2b6c6fd58baf11cb110f67ef11
|
||||
SHA512 (linux-6.0-rc2-16-g072e51356cd5.tar.xz) = 0a0918190c881c71a8615ff5a06fab80af41826e3f1b1268ab27988ab5c79e4908347b0ad56b637bc30a1a6122187ebacffd92436b920be96d50e0a58ca72981
|
||||
SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = da4f4535abc5a0a36e9cd7ecace39f301c5f42de605db502b3d124ae4ba2469fd7e7fe76875d567ef46fe2daed45a01ec595c1f1a68e5725d84e8b22c88fbbee
|
||||
SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 327caa06af87f78b76cbdd6cb7aa2acf037f43dc1b828484811ec7c01bd5b07050dabe11015d263e7f369eb3f3ee05f2eb829d319bbbc2759d13a3e0f62a97b9
|
||||
|
||||
Loading…
Reference in New Issue
Block a user