1. 05 7月, 2010 1 次提交
    • P
      rbtree: Undo augmented trees performance damage and regression · b945d6b2
      Peter Zijlstra 提交于
      Reimplement augmented RB-trees without sprinkling extra branches
      all over the RB-tree code (which lives in the scheduler hot path).
      
      This approach is 'borrowed' from Fabio's BFQ implementation and
      relies on traversing the rebalance path after the RB-tree-op to
      correct the heap property for insertion/removal and make up for
      the damage done by the tree rotations.
      
      For insertion the rebalance path is trivially that from the new
      node upwards to the root, for removal it is that from the deepest
      node in the path from the to be removed node that will still
      be around after the removal.
      
      [ This patch also fixes a video driver regression reported by
        Ali Gholami Rudi - the memtype->subtree_max_end was updated
        incorrectly. ]
      Acked-by: NSuresh Siddha <suresh.b.siddha@intel.com>
      Acked-by: NVenkatesh Pallipadi <venki@google.com>
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Tested-by: NAli Gholami Rudi <ali@rudi.ir>
      Cc: Fabio Checconi <fabio@gandalf.sssup.it>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      LKML-Reference: <1275414172.27810.27961.camel@twins>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      b945d6b2
  2. 01 7月, 2010 7 次提交
    • D
      x86, Calgary: Limit the max PHB number to 256 · d596043d
      Darrick J. Wong 提交于
      The x3950 family can have as many as 256 PCI buses in a single system, so
      change the limits to the maximum.  Since there can only be 256 PCI buses in one
      domain, we no longer need the BUG_ON check.
      Signed-off-by: NDarrick J. Wong <djwong@us.ibm.com>
      LKML-Reference: <20100701004519.GQ15515@tux1.beaverton.ibm.com>
      Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
      d596043d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 980019d7
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
        Staging: rtl8192u_usb: Add LG device ID 043e:7a01
        Staging: rtl8192s_usb: Remove duplicate device ID
        Staging: rt2870: add device id for Zyxel NWD-270N
        Staging: comedi: fix read past end of array in cb_pcidda_attach()
        Staging: rtl8192su: add device ids
        Staging: rtl8192su: remove device ids
        Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2
        Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not set
        Staging: wlags49_h2: add missing <linux/string.h> for strlen
        Staging: hv: fix hv_utils module to properly autoload
        staging: hv: Fix race condition on vmbus channel initialization
        Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW case
        Staging: mrst-touchscreen: fix dereferencing free memory
        Staging: batman-adv: fix function prototype
        Staging: batman-adv: return -EFAULT on copy_to_user errors
        staging: usbip: usbip_common: kill rx thread on tx thread creation error.
      980019d7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 9f2952db
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (22 commits)
        USB: gadget: f_mass_storage: stale common->fsg value bug fix
        USB: gadget: f_mass_storage: fixed fs descriptors not being updated
        USB: musb: Enable the maximum supported burst mode for DMA
        USB: musb: fix Blackfin ulpi stubs
        USB: MUSB: make non-OMAP platforms build with CONFIG_PM=y
        USB: musb_core: make disconnect and suspend interrupts work again
        USB: obey the sysfs power/wakeup setting
        USB: gadget eth: Fix calculate CRC32 in EEM
        USB: qcserial: fix a memory leak in qcprobe error path
        USB: gadget/printer, fix sleep inside atomic
        USB: isp1362-hcd, fix double lock
        USB: serial: ftdi: correct merge conflict with CONTEC id
        USB: fix oops in usb_sg_init()
        USB: s3c2410: deactivate endpoints before gadget unbinding
        USB: ehci-mxc: bail out on transceiver problems
        USB: otg/ulpi: bail out on read errors
        usb: musb: Fix a bug by making suspend interrupt available in device mode
        USB: r8a66597: Fix failure in change of status
        USB: xHCI: Fix bug in link TRB activation change.
        USB: gadget: g_fs: possible invalid pointer reference bug fixed
        ...
      9f2952db
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 59e76486
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        serial: cpm_uart: implement the cpm_uart_early_write() function for console poll
      59e76486
    • L
      Merge branch 'omap-fixes-for-linus' of... · c01ec7b1
      Linus Torvalds 提交于
      Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
        OMAP: hwmod: Fix the missing braces
        OMAP4: clock: Fix multi-omap boot with reset un-used clocks
        OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
        omap: GPIO: fix auto-disable of debounce clock
        omap: DMTIMER: Ack pending interrupt always when stopping a timer
        omap: Stalker board: switch over to gpio_set_debounce
        omap: fix build failure due to missing include dma-mapping.h
        omap iommu: Fix Memory leak
      c01ec7b1
    • J
      Add mdr as maintainer of qla1280 driver. · 5e9772b9
      Jes Sorensen 提交于
      As discussed with Mike Reed, add him as the maintainer of the qla1280
      driver as I no longer have any hardware and he is actively looking
      after it.
      Signed-off-by: NJes Sorensen <Jes.Sorensen@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5e9772b9
    • M
      futex: futex_find_get_task remove credentails check · 7a0ea09a
      Michal Hocko 提交于
      futex_find_get_task is currently used (through lookup_pi_state) from two
      contexts, futex_requeue and futex_lock_pi_atomic.  None of the paths
      looks it needs the credentials check, though.  Different (e)uids
      shouldn't matter at all because the only thing that is important for
      shared futex is the accessibility of the shared memory.
      
      The credentail check results in glibc assert failure or process hang (if
      glibc is compiled without assert support) for shared robust pthread
      mutex with priority inheritance if a process tries to lock already held
      lock owned by a process with a different euid:
      
      pthread_mutex_lock.c:312: __pthread_mutex_lock_full: Assertion `(-(e)) != 3 || !robust' failed.
      
      The problem is that futex_lock_pi_atomic which is called when we try to
      lock already held lock checks the current holder (tid is stored in the
      futex value) to get the PI state.  It uses lookup_pi_state which in turn
      gets task struct from futex_find_get_task.  ESRCH is returned either
      when the task is not found or if credentials check fails.
      
      futex_lock_pi_atomic simply returns if it gets ESRCH.  glibc code,
      however, doesn't expect that robust lock returns with ESRCH because it
      should get either success or owner died.
      Signed-off-by: NMichal Hocko <mhocko@suse.cz>
      Acked-by: NDarren Hart <dvhltc@us.ibm.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Nick Piggin <npiggin@suse.de>
      Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7a0ea09a
  3. 30 6月, 2010 32 次提交