Skip to contentSkip to conversation

x86/thread_info: Merge two !__ASSEMBLY__ sections

PATCH In review Borislav Petkov 3 participants 4 messages Mar 28, 2016 – Mar 29, 2016 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/thread_info: Merge two !__ASSEMBLY__ sections

From: Borislav Petkov <[email protected]>

We have

  #ifndef __ASSEMBLY__
  ...
  #endif

  #ifndef __ASSEMBLY__
  ...
  #endif

Merge the two.

No functionality change.

Signed-off-by Borislav Petkov <[email protected]>
---
 arch/x86/include/asm/thread_info.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/include/asm/thread_info.h +2 -4
index 82866697fcf1..ffae84df8a93 100644
@@ -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 */
Signature · 1 line
2.7.3
merge bot
#1 lore raw
x86/thread_info: Merge two !__ASSEMBLY__ sections
Commit-ID:  5f870a3f7188065e13efafe1faeb01c136173bc4
Gitweb:     http://git.kernel.org/tip/5f870a3f7188065e13efafe1faeb01c136173bc4
Author:     Borislav Petkov <[email protected]>
AuthorDate: Mon, 28 Mar 2016 20:20:17 +0200
Committer:  Thomas Gleixner <[email protected]>
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 <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Thomas Gleixner <[email protected]>
---
 arch/x86/include/asm/thread_info.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/include/asm/thread_info.h +2 -4
index 8286669..ffae84d 100644
@@ -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 */
merge bot
#2 lore raw
In reply to Borislav Petkov
x86/thread_info: Merge two !__ASSEMBLY__ sections
Commit-ID:  7388573a341a27e595d23b034d711620cd9a5edb
Gitweb:     http://git.kernel.org/tip/7388573a341a27e595d23b034d711620cd9a5edb
Author:     Borislav Petkov <[email protected]>
AuthorDate: Mon, 28 Mar 2016 20:20:17 +0200
Committer:  Ingo Molnar <[email protected]>
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 <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/include/asm/thread_info.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/include/asm/thread_info.h +2 -4
index 8286669..ffae84d 100644
@@ -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 */
#3 lore raw
Quoted 8 lines · tip-bot for Borislav Petkov
Commit-ID:  7388573a341a27e595d23b034d711620cd9a5edb
Gitweb:     http://git.kernel.org/tip/7388573a341a27e595d23b034d711620cd9a5edb
Author:     Borislav Petkov <[email protected]>
AuthorDate: Mon, 28 Mar 2016 20:20:17 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 29 Mar 2016 10:55:50 +0200

x86/thread_info: Merge two !__ASSEMBLY__ sections

I just noticed that Thomas already added this to tip:x86/urgent - I zapped the x86/asm version.

Thanks,

Ingo