From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
mingo@kernel.org, bp@suse.de, hpa@zytor.com, tglx@linutronix.de,
torvalds@linux-foundation.org
Subject: [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections
Date: Tue, 29 Mar 2016 02:22:04 -0700 [thread overview]
Message-ID: <tip-7388573a341a27e595d23b034d711620cd9a5edb@git.kernel.org> (raw)
In-Reply-To: <1459189217-25532-1-git-send-email-bp@alien8.de>
Commit-ID: 7388573a341a27e595d23b034d711620cd9a5edb
Gitweb: http://git.kernel.org/tip/7388573a341a27e595d23b034d711620cd9a5edb
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 28 Mar 2016 20:20:17 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 29 Mar 2016 10:55:50 +0200
x86/thread_info: Merge two !__ASSEMBLY__ sections
We have
#ifndef __ASSEMBLY__
...
#endif
#ifndef __ASSEMBLY__
...
#endif
Merge the two.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1459189217-25532-1-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/thread_info.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index 8286669..ffae84d 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -276,11 +276,9 @@ static inline bool is_ia32_task(void)
*/
#define force_iret() set_thread_flag(TIF_NOTIFY_RESUME)
-#endif /* !__ASSEMBLY__ */
-
-#ifndef __ASSEMBLY__
extern void arch_task_cache_init(void);
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
extern void arch_release_task_struct(struct task_struct *tsk);
-#endif
+#endif /* !__ASSEMBLY__ */
+
#endif /* _ASM_X86_THREAD_INFO_H */
next prev parent reply other threads:[~2016-03-29 9:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-28 18:20 [PATCH] " Borislav Petkov
2016-03-29 9:16 ` [tip:x86/urgent] " tip-bot for Borislav Petkov
2016-03-29 9:22 ` tip-bot for Borislav Petkov [this message]
2016-03-29 9:29 ` [tip:x86/asm] " Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-7388573a341a27e595d23b034d711620cd9a5edb@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®