* [PATCH] x86/thread_info: Merge two !__ASSEMBLY__ sections
@ 2016-03-28 18:20 Borislav Petkov
2016-03-29 9:16 ` [tip:x86/urgent] " tip-bot for Borislav Petkov
2016-03-29 9:22 ` [tip:x86/asm] " tip-bot for Borislav Petkov
0 siblings, 2 replies; 4+ messages in thread
From: Borislav Petkov @ 2016-03-28 18:20 UTC (permalink / raw)
To: X86 ML; +Cc: LKML
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:x86/urgent] x86/thread_info: Merge two !__ASSEMBLY__ sections
2016-03-28 18:20 [PATCH] x86/thread_info: Merge two !__ASSEMBLY__ sections Borislav Petkov
@ 2016-03-29 9:16 ` tip-bot for Borislav Petkov
2016-03-29 9:22 ` [tip:x86/asm] " tip-bot for Borislav Petkov
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-03-29 9:16 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, tglx, bp, mingo, hpa
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 */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections
2016-03-28 18:20 [PATCH] x86/thread_info: Merge two !__ASSEMBLY__ sections 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
2016-03-29 9:29 ` Ingo Molnar
1 sibling, 1 reply; 4+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-03-29 9:22 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, peterz, mingo, bp, hpa, tglx, torvalds
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 */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [tip:x86/asm] x86/thread_info: Merge two !__ASSEMBLY__ sections
2016-03-29 9:22 ` [tip:x86/asm] " tip-bot for Borislav Petkov
@ 2016-03-29 9:29 ` Ingo Molnar
0 siblings, 0 replies; 4+ messages in thread
From: Ingo Molnar @ 2016-03-29 9:29 UTC (permalink / raw)
To: bp, tglx, hpa, linux-kernel, peterz; +Cc: linux-tip-commits
* 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-29 9:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-28 18:20 [PATCH] x86/thread_info: Merge two !__ASSEMBLY__ sections Borislav Petkov
2016-03-29 9:16 ` [tip:x86/urgent] " tip-bot for Borislav Petkov
2016-03-29 9:22 ` [tip:x86/asm] " tip-bot for Borislav Petkov
2016-03-29 9:29 ` Ingo Molnar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.