lkml.org 
[lkml]   [2009]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[GIT PULL] core kernel fixes
    Linus,

    Please pull the latest core-fixes-for-linus git tree from:

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus

    Thanks,

    Ingo

    ------------------>
    Ingo Molnar (1):
    lockdep: increase MAX_LOCKDEP_ENTRIES and MAX_LOCKDEP_CHAINS

    Thomas Gleixner (1):
    futex: futex mapping needs to be writable


    kernel/futex.c | 2 +-
    kernel/lockdep_internals.h | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/kernel/futex.c b/kernel/futex.c
    index eef8cd2..09db3ae 100644
    --- a/kernel/futex.c
    +++ b/kernel/futex.c
    @@ -235,7 +235,7 @@ static int get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key)
    }

    again:
    - err = get_user_pages_fast(address, 1, 0, &page);
    + err = get_user_pages_fast(address, 1, 1, &page);
    if (err < 0)
    return err;

    diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h
    index a2cc7e9..699a2ac 100644
    --- a/kernel/lockdep_internals.h
    +++ b/kernel/lockdep_internals.h
    @@ -54,9 +54,9 @@ enum {
    * table (if it's not there yet), and we check it for lock order
    * conflicts and deadlocks.
    */
    -#define MAX_LOCKDEP_ENTRIES 8192UL
    +#define MAX_LOCKDEP_ENTRIES 16384UL

    -#define MAX_LOCKDEP_CHAINS_BITS 14
    +#define MAX_LOCKDEP_CHAINS_BITS 15
    #define MAX_LOCKDEP_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS)

    #define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5)

    \
     
     \ /
      Last update: 2009-05-18 16:27    [W:0.022 / U:0.820 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site