Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1365629 > unrolled thread

[PATCH] x86/thread_info: Merge two !__ASSEMBLY__ sections

Started byBorislav Petkov <bp@alien8.de>
First post2016-03-28 20:30 +0200
Last post2016-03-29 11:30 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] x86/thread_info: Merge two !__ASSEMBLY__ sections Borislav Petkov <bp@alien8.de> - 2016-03-28 20:30 +0200
    [tip:x86/urgent] x86/thread_info: Merge two !__ASSEMBLY__ sections tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-03-29 11:20 +0200
    [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-03-29 11:30 +0200
      Re: [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections Ingo Molnar <mingo@kernel.org> - 2016-03-29 11:30 +0200

#1365629 — [PATCH] x86/thread_info: Merge two !__ASSEMBLY__ sections

FromBorislav Petkov <bp@alien8.de>
Date2016-03-28 20:30 +0200
Subject[PATCH] x86/thread_info: Merge two !__ASSEMBLY__ sections
Message-ID<rhK5k-2r4-29@gated-at.bofh.it>
From: Borislav Petkov <bp@suse.de>

We have

  #ifndef __ASSEMBLY__
  ...
  #endif

  #ifndef __ASSEMBLY__
  ...
  #endif

Merge the two.

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.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 82866697fcf1..ffae84df8a93 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 */
-- 
2.7.3

[toc] | [next] | [standalone]


#1366038 — [tip:x86/urgent] x86/thread_info: Merge two !__ASSEMBLY__ sections

Fromtip-bot for Borislav Petkov <tipbot@zytor.com>
Date2016-03-29 11:20 +0200
Subject[tip:x86/urgent] x86/thread_info: Merge two !__ASSEMBLY__ sections
Message-ID<rhXYC-3S8-21@gated-at.bofh.it>
In reply to#1365629
Commit-ID:  5f870a3f7188065e13efafe1faeb01c136173bc4
Gitweb:     http://git.kernel.org/tip/5f870a3f7188065e13efafe1faeb01c136173bc4
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 28 Mar 2016 20:20:17 +0200
Committer:  Thomas Gleixner <tglx@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 <bp@suse.de>
Link: http://lkml.kernel.org/r/1459189217-25532-1-git-send-email-bp@alien8.de
Signed-off-by: Thomas Gleixner <tglx@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 */

[toc] | [prev] | [next] | [standalone]


#1366064 — [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections

Fromtip-bot for Borislav Petkov <tipbot@zytor.com>
Date2016-03-29 11:30 +0200
Subject[tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections
Message-ID<rhY8j-3VB-41@gated-at.bofh.it>
In reply to#1365629
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 */

[toc] | [prev] | [next] | [standalone]


#1366066 — Re: [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections

FromIngo Molnar <mingo@kernel.org>
Date2016-03-29 11:30 +0200
SubjectRe: [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections
Message-ID<rhY8k-3VB-45@gated-at.bofh.it>
In reply to#1366064
* tip-bot for Borislav Petkov <tipbot@zytor.com> wrote:

> 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

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

Thanks,

	Ingo

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web