[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <162436341797.395.13837570842333490587.tip-bot2@tip-bot2>
Date: Tue, 22 Jun 2021 12:03:37 -0000
From: "tip-bot2 for Peter Zijlstra" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@...radead.org>,
Ingo Molnar <mingo@...nel.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: objtool/urgent] x86: Always inline task_size_max()
The following commit has been merged into the objtool/urgent branch of tip:
Commit-ID: 1f008d46f1243899d27fd034ab5c41985bd16cee
Gitweb: https://git.kernel.org/tip/1f008d46f1243899d27fd034ab5c41985bd16cee
Author: Peter Zijlstra <peterz@...radead.org>
AuthorDate: Mon, 21 Jun 2021 13:12:37 +02:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Tue, 22 Jun 2021 13:56:43 +02:00
x86: Always inline task_size_max()
Fix:
vmlinux.o: warning: objtool: handle_bug()+0x10: call to task_size_max() leaves .noinstr.text section
When #UD isn't a BUG, we shouldn't violate noinstr (we'll still
probably die, but that's another story).
Fixes: 025768a966a3 ("x86/cpu: Use alternative to generate the TASK_SIZE_MAX constant")
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Link: https://lore.kernel.org/r/20210621120120.682468274@infradead.org
---
arch/x86/include/asm/page_64.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index ca840fe..4bde0dc 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -75,7 +75,7 @@ void copy_page(void *to, void *from);
*
* With page table isolation enabled, we map the LDT in ... [stay tuned]
*/
-static inline unsigned long task_size_max(void)
+static __always_inline unsigned long task_size_max(void)
{
unsigned long ret;
Powered by blists - more mailing lists