include/linux/sched.h | 2 +- include/linux/sched/task_stack.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
__HAVE_THREAD_FUNCTIONS could be defined by architectures wishing to
provide their own task_thread_info(), task_stack_page(),
setup_thread_stack() and end_of_stack() hooks.
Commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
removed the last upstream consumer of __HAVE_THREAD_FUNCTIONS, so change
the remaining !CONFIG_THREAD_INFO_IN_TASK && !__HAVE_THREAD_FUNCTIONS
conditionals to only check for the former case.
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
include/linux/sched.h | 2 +-
include/linux/sched/task_stack.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index f8d150343d42..9dbcdfe173cf 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1874,7 +1874,7 @@ extern unsigned long init_stack[THREAD_SIZE / sizeof(unsigned long)];
#ifdef CONFIG_THREAD_INFO_IN_TASK
# define task_thread_info(task) (&(task)->thread_info)
-#elif !defined(__HAVE_THREAD_FUNCTIONS)
+#else
# define task_thread_info(task) ((struct thread_info *)(task)->stack)
#endif
diff --git a/include/linux/sched/task_stack.h b/include/linux/sched/task_stack.h
index ccd72b978e1f..55042ff01a6d 100644
--- a/include/linux/sched/task_stack.h
+++ b/include/linux/sched/task_stack.h
@@ -33,7 +33,7 @@ static __always_inline unsigned long *end_of_stack(const struct task_struct *tas
#endif
}
-#elif !defined(__HAVE_THREAD_FUNCTIONS)
+#else
#define task_stack_page(task) ((void *)(task)->stack)
--
2.43.0
[cc'ing Ard as ia64 remover]
Ping - any thoughts on this patch?
On Thu, 22 Aug 2024 04:33:28 +0000, David Disseldorp wrote:
> __HAVE_THREAD_FUNCTIONS could be defined by architectures wishing to
> provide their own task_thread_info(), task_stack_page(),
> setup_thread_stack() and end_of_stack() hooks.
>
> Commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
> removed the last upstream consumer of __HAVE_THREAD_FUNCTIONS, so change
> the remaining !CONFIG_THREAD_INFO_IN_TASK && !__HAVE_THREAD_FUNCTIONS
> conditionals to only check for the former case.
>
> Signed-off-by: David Disseldorp <ddiss@suse.de>
> ---
> include/linux/sched.h | 2 +-
> include/linux/sched/task_stack.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index f8d150343d42..9dbcdfe173cf 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -1874,7 +1874,7 @@ extern unsigned long init_stack[THREAD_SIZE / sizeof(unsigned long)];
>
> #ifdef CONFIG_THREAD_INFO_IN_TASK
> # define task_thread_info(task) (&(task)->thread_info)
> -#elif !defined(__HAVE_THREAD_FUNCTIONS)
> +#else
> # define task_thread_info(task) ((struct thread_info *)(task)->stack)
> #endif
>
> diff --git a/include/linux/sched/task_stack.h b/include/linux/sched/task_stack.h
> index ccd72b978e1f..55042ff01a6d 100644
> --- a/include/linux/sched/task_stack.h
> +++ b/include/linux/sched/task_stack.h
> @@ -33,7 +33,7 @@ static __always_inline unsigned long *end_of_stack(const struct task_struct *tas
> #endif
> }
>
> -#elif !defined(__HAVE_THREAD_FUNCTIONS)
> +#else
>
> #define task_stack_page(task) ((void *)(task)->stack)
>
On Fri, 30 Aug 2024 at 03:26, David Disseldorp <ddiss@suse.de> wrote:
>
> [cc'ing Ard as ia64 remover]
>
> Ping - any thoughts on this patch?
>
> On Thu, 22 Aug 2024 04:33:28 +0000, David Disseldorp wrote:
>
> > __HAVE_THREAD_FUNCTIONS could be defined by architectures wishing to
> > provide their own task_thread_info(), task_stack_page(),
> > setup_thread_stack() and end_of_stack() hooks.
> >
> > Commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
> > removed the last upstream consumer of __HAVE_THREAD_FUNCTIONS, so change
> > the remaining !CONFIG_THREAD_INFO_IN_TASK && !__HAVE_THREAD_FUNCTIONS
> > conditionals to only check for the former case.
> >
> > Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
> > ---
> > include/linux/sched.h | 2 +-
> > include/linux/sched/task_stack.h | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/linux/sched.h b/include/linux/sched.h
> > index f8d150343d42..9dbcdfe173cf 100644
> > --- a/include/linux/sched.h
> > +++ b/include/linux/sched.h
> > @@ -1874,7 +1874,7 @@ extern unsigned long init_stack[THREAD_SIZE / sizeof(unsigned long)];
> >
> > #ifdef CONFIG_THREAD_INFO_IN_TASK
> > # define task_thread_info(task) (&(task)->thread_info)
> > -#elif !defined(__HAVE_THREAD_FUNCTIONS)
> > +#else
> > # define task_thread_info(task) ((struct thread_info *)(task)->stack)
> > #endif
> >
> > diff --git a/include/linux/sched/task_stack.h b/include/linux/sched/task_stack.h
> > index ccd72b978e1f..55042ff01a6d 100644
> > --- a/include/linux/sched/task_stack.h
> > +++ b/include/linux/sched/task_stack.h
> > @@ -33,7 +33,7 @@ static __always_inline unsigned long *end_of_stack(const struct task_struct *tas
> > #endif
> > }
> >
> > -#elif !defined(__HAVE_THREAD_FUNCTIONS)
> > +#else
> >
> > #define task_stack_page(task) ((void *)(task)->stack)
> >
>
© 2016 - 2026 Red Hat, Inc.