lkml.org 
[lkml]   [2009]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [GIT pull] bkl core patches for 2.6.33
    Thomas Gleixner <tglx@linutronix.de> writes:

    > Linus,
    >
    > Please pull the latest bkl-core-for-linus git tree from:
    >
    > git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git bkl-core-for-linus
    >
    > Thanks,


    Was this tree in linux-next? I'm certain I would have remembered the
    conflict in kernel/sysctl.c. Among other things in my sysctl tree
    lock_kernel() is gone. The removal of lock_kernel() happened to fall
    out of my other changes. I remember having a conversation with Arnd
    Bergmann about this, and the conclusion being was that my change
    correct and superior to this patch. So I'm surprised a sysctl change
    made it into your tree.

    Eric


    > diff --git a/kernel/sysctl.c b/kernel/sysctl.c
    > index 0d949c5..72040e5 100644
    > --- a/kernel/sysctl.c
    > +++ b/kernel/sysctl.c
    > @@ -1848,6 +1848,8 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *ol
    > return -EFAULT;
    > }
    >
    > + lock_kernel();
    > +
    > for (head = sysctl_head_next(NULL); head;
    > head = sysctl_head_next(head)) {
    > error = parse_table(name, nlen, oldval, oldlenp,
    > @@ -1858,6 +1860,8 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *ol
    > break;
    > }
    > }
    > +
    > + unlock_kernel();
    > return error;
    > }
    >
    > @@ -1873,10 +1877,8 @@ SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args)
    > if (error)
    > goto out;
    >
    > - lock_kernel();
    > error = do_sysctl(tmp.name, tmp.nlen, tmp.oldval, tmp.oldlenp,
    > tmp.newval, tmp.newlen);
    > - unlock_kernel();
    > out:
    > return error;
    > }
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    > Please read the FAQ at http://www.tux.org/lkml/


    \
     
     \ /
      Last update: 2009-12-07 22:49    [W:0.023 / U:154.256 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site