OSDN Git Service

UPSTREAM: thread_info: factor out restart_block
authorMark Rutland <mark.rutland@arm.com>
Wed, 19 Oct 2016 18:28:12 +0000 (19:28 +0100)
committerZubin Mithra <zsm@google.com>
Wed, 9 Aug 2017 14:23:22 +0000 (15:23 +0100)
commit264c551c4c77c9645a1c5a03735a71ed37348bc4
tree8825052b1b8b72b4a701cdfe720f84a2ac74f47f
parenta960dbced9c6e34bdb1fc5f69d673352d6c4d932
UPSTREAM: thread_info: factor out restart_block

Since commit f56141e3e2d9aabf ("all arches, signal: move restart_block
to struct task_struct"), thread_info and restart_block have been
logically distinct, yet struct restart_block is still defined in
<linux/thread_info.h>.

At least one architecture (erroneously) uses restart_block as part of
its thread_info, and thus the definition of restart_block must come
before the include of <asm/thread_info>. Subsequent patches in this
series need to shuffle the order of includes and definitions in
<linux/thread_info.h>, and will make this ordering fragile.

This patch moves the definition of restart_block out to its own header.
This serves as generic cleanup, logically separating thread_info and
restart_block, and also makes it easier to avoid fragility.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Bug: 38331309
Change-Id: I4283c87072c092179e2b6c02cbf7248b4a1c2d22
(cherry picked from commit 53d74d056a4e306a72b8883d325b5d853c0618e6)
Signed-off-by: Zubin Mithra <zsm@google.com>
include/linux/restart_block.h [new file with mode: 0644]
include/linux/thread_info.h