Commit-ID:  5f870a3f7188065e13efafe1faeb01c136173bc4
Gitweb:     http://git.kernel.org/tip/5f870a3f7188065e13efafe1faeb01c136173bc4
Author:     Borislav Petkov <b...@suse.de>
AuthorDate: Mon, 28 Mar 2016 20:20:17 +0200
Committer:  Thomas Gleixner <t...@linutronix.de>
CommitDate: Tue, 29 Mar 2016 11:12:10 +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 <b...@suse.de>
Link: http://lkml.kernel.org/r/1459189217-25532-1-git-send-email...@alien8.de
Signed-off-by: Thomas Gleixner <t...@linutronix.de>

---
 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 */

Reply via email to