lkml.org 
[lkml]   [2019]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[GIT pull] sched/urgent for 5.3-rc2
    Linus,

    please pull the latest sched-urgent-for-linus git tree from:

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus

    up to: b8d3349803ba: sched/rt, Kconfig: Unbreak def/oldconfig with CONFIG_PREEMPT=y

    The PREEMPT_RT stub config renamed PREEMPT to PREEMPT_LL and defined
    PREEMPT outside of the menu and made it selectable by both PREEMPT_LL and
    PREEMPT_RT.

    Stupid me missed that 114 defconfigs select CONFIG_PREEMPT which obviously
    can't work anymore. oldconfig builds are affected as well, but it's more
    obvious as the user gets asked. [old]defconfig silently fixes it up and
    selects PREEMPT_NONE. Unbreak it by undoing the rename and adding a
    intermediate config symbol which is selected by both PREEMPT and
    PREEMPT_RT. That requires to chase down a few #ifdefs, but it's better than
    tweaking 114 defconfigs and annoying users.

    Sorry for the inconveniance.

    Thanks,

    tglx

    ------------------>
    Thomas Gleixner (1):
    sched/rt, Kconfig: Unbreak def/oldconfig with CONFIG_PREEMPT=y


    kernel/Kconfig.preempt | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
    index fc020c09b7e8..deff97217496 100644
    --- a/kernel/Kconfig.preempt
    +++ b/kernel/Kconfig.preempt
    @@ -35,10 +35,10 @@ config PREEMPT_VOLUNTARY

    Select this if you are building a kernel for a desktop system.

    -config PREEMPT_LL
    +config PREEMPT
    bool "Preemptible Kernel (Low-Latency Desktop)"
    depends on !ARCH_NO_PREEMPT
    - select PREEMPT
    + select PREEMPTION
    select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
    help
    This option reduces the latency of the kernel by making
    @@ -58,7 +58,7 @@ config PREEMPT_LL
    config PREEMPT_RT
    bool "Fully Preemptible Kernel (Real-Time)"
    depends on EXPERT && ARCH_SUPPORTS_RT
    - select PREEMPT
    + select PREEMPTION
    help
    This option turns the kernel into a real-time kernel by replacing
    various locking primitives (spinlocks, rwlocks, etc.) with
    @@ -77,6 +77,6 @@ endchoice
    config PREEMPT_COUNT
    bool

    -config PREEMPT
    +config PREEMPTION
    bool
    select PREEMPT_COUNT
    \
     
     \ /
      Last update: 2019-07-22 18:24    [W:4.090 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site