Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1500826

[PATCH] thread_info: include <current.h> for THREAD_INFO_IN_TASK (WAS: [PATCH 2/3] sched/preempt: include asm/current.h)

Show all headers | View raw

When CONFIG_THREAD_INFO_IN_TASK is selected, the current_thread_info()
macro relies on current having been defined prior to its use. However,
not all users of current_thread_info() include <asm/current.h>, and thus
current is not guaranteed to be defined.

When CONFIG_THREAD_INFO_IN_TASK is not selected, it's possible that
get_current() / current are based upon current_thread_info(), and
<asm/current.h> includes <asm/thread_info.h>. Thus always including
<asm/current.h> would result in circular dependences on some platforms.

To ensure both cases work, this patch includes <asm/current.h>, but only
when CONFIG_THREAD_INFO_IN_TASK is selected.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
---
 include/linux/thread_info.h | 1 +
 1 file changed, 1 insertion(+)

As discussed, it would be great if this could go in along with the patch to
make thread_info arch-specific again, to make merging the arch-specific parts
easier (for arm64 and s390).

Mark.

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index 45f004e..521f84b 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -25,6 +25,7 @@ struct thread_info {
 #endif
 
 #ifdef CONFIG_THREAD_INFO_IN_TASK
+#include <asm/current.h>
 #define current_thread_info() ((struct thread_info *)current)
 #endif
 
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] THREAD_INFO_IN_TASK_STRUCT vs generic preemption code Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-10-13 14:50 +0200
  [PATCH 1/3] sched/core,x86: make struct thread_info arch specific again Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-10-13 15:10 +0200
    Re: [PATCH 1/3] sched/core,x86: make struct thread_info arch  specific again Mark Rutland <mark.rutland@arm.com> - 2016-10-14 01:50 +0200
      Re: [PATCH 1/3] sched/core,x86: make struct thread_info arch specific again Andy Lutomirski <luto@amacapital.net> - 2016-10-14 02:00 +0200
  [PATCH 2/3] sched/preempt: include asm/current.h Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-10-13 15:10 +0200
    Re: [PATCH 2/3] sched/preempt: include asm/current.h Mark Rutland <mark.rutland@arm.com> - 2016-10-14 01:30 +0200
      Re: [PATCH 2/3] sched/preempt: include asm/current.h Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-10-14 10:20 +0200
        [PATCH] thread_info: include <current.h> for THREAD_INFO_IN_TASK (WAS: [PATCH 2/3] sched/preempt: include asm/current.h) Mark Rutland <mark.rutland@arm.com> - 2016-10-14 12:50 +0200
          Re: [PATCH] thread_info: include <current.h> for THREAD_INFO_IN_TASK  (WAS: [PATCH 2/3] sched/preempt: include asm/current.h) Mark Rutland <mark.rutland@arm.com> - 2016-10-17 16:50 +0200
            Re: [PATCH] thread_info: include <current.h> for THREAD_INFO_IN_TASK  (WAS: [PATCH 2/3] sched/preempt: include asm/current.h) Mark Rutland <mark.rutland@arm.com> - 2016-10-17 19:40 +0200
              Re: [PATCH] thread_info: include <current.h> for THREAD_INFO_IN_TASK  (WAS: [PATCH 2/3] sched/preempt: include asm/current.h) Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-10-18 12:40 +0200
  [PATCH 3/3] s390: move thread_info into task_struct Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-10-13 22:10 +0200
  Re: [PATCH 0/3] THREAD_INFO_IN_TASK_STRUCT vs generic preemption code Andy Lutomirski <luto@amacapital.net> - 2016-10-14 00:10 +0200

csiph-web