lkml.org 
[lkml]   [2019]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: sched/urgent] sched/rt, btrfs: Use CONFIG_PREEMPTION
    The following commit has been merged into the sched/urgent branch of tip:

    Commit-ID: 94545870b14b5eb6d8a887fab845d1918f4f62ac
    Gitweb: https://git.kernel.org/tip/94545870b14b5eb6d8a887fab845d1918f4f62ac
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Tue, 15 Oct 2019 21:18:11 +02:00
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitterDate: Sun, 08 Dec 2019 14:37:36 +01:00

    sched/rt, btrfs: Use CONFIG_PREEMPTION

    CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT.
    Both PREEMPT and PREEMPT_RT require the same functionality which today
    depends on CONFIG_PREEMPT.

    Switch the btrfs_device_set_…() macro over to use CONFIG_PREEMPTION.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: David Sterba <dsterba@suse.com>
    Cc: Chris Mason <clm@fb.com>
    Cc: Josef Bacik <josef@toxicpanda.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: linux-btrfs@vger.kernel.org
    Link: https://lore.kernel.org/r/20191015191821.11479-25-bigeasy@linutronix.de
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    fs/btrfs/volumes.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
    index fc1b564..0ee5386 100644
    --- a/fs/btrfs/volumes.h
    +++ b/fs/btrfs/volumes.h
    @@ -168,7 +168,7 @@ btrfs_device_set_##name(struct btrfs_device *dev, u64 size) \
    write_seqcount_end(&dev->data_seqcount); \
    preempt_enable(); \
    }
    -#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPT)
    +#elif BITS_PER_LONG==32 && defined(CONFIG_PREEMPTION)
    #define BTRFS_DEVICE_GETSET_FUNCS(name) \
    static inline u64 \
    btrfs_device_get_##name(const struct btrfs_device *dev) \
    \
     
     \ /
      Last update: 2019-12-08 16:00    [W:4.080 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site