lkml.org 
[lkml]   [2023]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/50] wait: Remove uapi header file from main header file
    Date
    From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

    There's really no overlap between uapi/linux/wait.h and linux/wait.h.
    There are two files which rely on the uapi file being implcitly included,
    so explicitly include it there and remove it from the main header file.

    Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
    Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
    ---
    include/linux/wait.h | 1 -
    kernel/exit.c | 4 +++-
    kernel/pid_namespace.c | 1 +
    3 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/include/linux/wait.h b/include/linux/wait.h
    index 3473b663176f..8aa3372f21a0 100644
    --- a/include/linux/wait.h
    +++ b/include/linux/wait.h
    @@ -9,7 +9,6 @@
    #include <linux/spinlock.h>

    #include <asm/current.h>
    -#include <uapi/linux/wait.h>

    typedef struct wait_queue_entry wait_queue_entry_t;

    diff --git a/kernel/exit.c b/kernel/exit.c
    index ee9f43bed49a..2ef33047371b 100644
    --- a/kernel/exit.c
    +++ b/kernel/exit.c
    @@ -69,8 +69,10 @@
    #include <linux/rethook.h>
    #include <linux/sysfs.h>
    #include <linux/user_events.h>
    -
    #include <linux/uaccess.h>
    +
    +#include <uapi/linux/wait.h>
    +
    #include <asm/unistd.h>
    #include <asm/mmu_context.h>

    diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
    index 3028b2218aa4..7ade20e95232 100644
    --- a/kernel/pid_namespace.c
    +++ b/kernel/pid_namespace.c
    @@ -23,6 +23,7 @@
    #include <linux/sched/task.h>
    #include <linux/sched/signal.h>
    #include <linux/idr.h>
    +#include <uapi/linux/wait.h>
    #include "pid_sysctl.h"

    static DEFINE_MUTEX(pid_caches_mutex);
    --
    2.43.0

    \
     
     \ /
      Last update: 2023-12-16 04:32    [W:9.136 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site