Messages in this thread Patch in this message | | | Date | Tue, 29 Mar 2016 02:22:04 -0700 | From | tip-bot for Borislav Petkov <> | Subject | [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections |
| |
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 */
| |