Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f870a3f authored by Borislav Petkov's avatar Borislav Petkov Committed by Thomas Gleixner
Browse files

x86/thread_info: Merge two !__ASSEMBLY__ sections 



We have

  #ifndef __ASSEMBLY__
  ...
  #endif

  #ifndef __ASSEMBLY__
  ...
  #endif

Merge the two.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1459189217-25532-1-git-send-email-bp@alien8.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4a6772f5

arch/x86/include/asm/thread_info.h

+2 −4
Original line number Diff line number Diff line
@@ -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 */