Skip to content

Commit 5f870a3

Browse files
suryasaimadhuKAGA-KOKO
authored andcommitted
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>
1 parent 4a6772f commit 5f870a3

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

arch/x86/include/asm/thread_info.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,9 @@ static inline bool is_ia32_task(void)
276276
*/
277277
#define force_iret() set_thread_flag(TIF_NOTIFY_RESUME)
278278

279-
#endif /* !__ASSEMBLY__ */
280-
281-
#ifndef __ASSEMBLY__
282279
extern void arch_task_cache_init(void);
283280
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
284281
extern void arch_release_task_struct(struct task_struct *tsk);
285-
#endif
282+
#endif /* !__ASSEMBLY__ */
283+
286284
#endif /* _ASM_X86_THREAD_INFO_H */

0 commit comments

Comments
 (0)