diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-09 01:41:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-09 01:41:58 +0300 |
| commit | 636c8a8d85d0564222071f0caa4a4e6bf527efe5 (patch) | |
| tree | f1958f80f596cfcf496904f12a62662fa79ce990 /arch/x86/include/asm/thread_info.h | |
| parent | 39ec5cbed0bb1878d0b65af0c5e653e37e1945a5 (diff) | |
| parent | d48d5691ebf88a15d95ba96486917ffc79256536 (diff) | |
| download | linux-636c8a8d85d0564222071f0caa4a4e6bf527efe5.tar.xz | |
Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.6-rc3
Here are some new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/thread_info.h')
| -rw-r--r-- | arch/x86/include/asm/thread_info.h | 6 |
1 files 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 */ |