Skip to content
Commits on Feb 1, 2010
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: AM3517: ASoC driver not getting compiled
      ASoC: AIC23: Fixing writes to non-existing registers in resume function
      ALSA: hda - Add an ASUS mobo to MSI blacklist
    torvalds committed Feb 1, 2010
  2. @torvalds

    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure.
      drm/radeon/kms: move radeon KMS on/off switch out of staging.
      drm/radeon/kms: Bailout of blit if error happen & protect with mutex V3
      drm/vmwgfx: Don't send bad flags to the host
      drm/vmwgfx: Request SVGA version 2 and bail if not found
      drm/vmwgfx: Correctly detect 3D
      drm/ttm: remove unnecessary save_flags and ttm_flag_masked in ttm_bo_util.c
      drm/kms: Remove incorrect comment in struct drm_mode_modeinfo
      drm/ttm: remove padding from ttm_ref_object on 64bit builds
      drm/radeon/kms: release agp on error.
      drm/kms/radeon/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info
      drm/kms/radeon/agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’
      drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.
      drm/kms/radeon: pick digitial encoders smarter. (v3)
      drm/radeon/kms: use active device to pick connector for encoder
      drm/radeon/kms: fix incorrect logic in DP vs eDP connector checking.
    torvalds committed Feb 1, 2010
  3. @torvalds

    Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linu…

    …x/kernel/git/frederic/random-tracing
    
    * 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
      reiserfs: Fix vmalloc call under reiserfs lock
    torvalds committed Feb 1, 2010
  4. @torvalds

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      lockdep: Fix check_usage_backwards() error message
    torvalds committed Feb 1, 2010
  5. @torvalds

    Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf, hw_breakpoint, kgdb: Do not take mutex for kernel debugger
      x86, hw_breakpoints, kgdb: Fix kgdb to use hw_breakpoint API
      hw_breakpoints: Release the bp slot if arch_validate_hwbkpt_settings() fails.
      perf: Ignore perf.data.old
      perf report: Fix segmentation fault when running with '-g none'
    torvalds committed Feb 1, 2010
  6. @torvalds

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: Correct printk whitespace in warning from cpu down task check
      sched: Fix incorrect sanity check
      sched: Fix fork vs hotplug vs cpuset namespaces
    torvalds committed Feb 1, 2010
  7. @torvalds

    Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…

    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      clocksource: Prevent potential kgdb dead lock
    torvalds committed Feb 1, 2010
  8. @torvalds

    Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    …m/linux/kernel/git/tip/linux-2.6-tip
    
    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      tracing/documentation: Cover new frame pointer semantics
      tracing/documentation: Fix a typo in ftrace.txt
      ring-buffer: Check for end of page in iterator
      ring-buffer: Check if ring buffer iterator has stale data
      tracing: Prevent kernel oops with corrupted buffer
    torvalds committed Feb 1, 2010
  9. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86/agp: Fix agp_amd64_init regression
      x86: Add quirk for Intel DG45FC board to avoid low memory corruption
      x86: Add Dell OptiPlex 760 reboot quirk
      x86, UV: Fix RTC latency bug by reading replicated cachelines
      oprofile/x86: add Xeon 7500 series support
      oprofile/x86: fix crash when profiling more than 28 events
      lib/dma-debug.c: mark file-local struct symbol static.
      x86/amd-iommu: Fix deassignment of a device from the pt_domain
      x86/amd-iommu: Fix IOMMU-API initialization for iommu=pt
      x86/amd-iommu: Fix NULL pointer dereference in __detach_device()
      x86/amd-iommu: Fix possible integer overflow
    torvalds committed Feb 1, 2010
  10. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      regulator: Specify REGULATOR_CHANGE_STATUS for WM835x LED constraints
    torvalds committed Feb 1, 2010
  11. @torvalds

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/benh/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
      powerpc: TIF_ABI_PENDING bit removal
      powerpc/pseries: Fix xics build without CONFIG_SMP
      powerpc/4xx: Add pcix type 1 transactions
      powerpc/pci: Add missing call to header fixup
      powerpc/pci: Add missing hookup to pci_slot
      powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()
      powerpc/40x: Update the PowerPC 40x board defconfigs
      powerpc/44x: Update PowerPC 44x board defconfigs
    torvalds committed Feb 1, 2010
  12. @broonie

    regulator: Specify REGULATOR_CHANGE_STATUS for WM835x LED constraints

    The WM8350 LED driver needs to be able to enable and disable the
    regulators it is using. Previously the core wasn't properly enforcing
    status change constraints so the driver was able to function but this
    has always been intended to be required.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: stable@kernel.org
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
    broonie committed with Liam Girdwood Jan 4, 2010
  13. @andreas-schwab @ozbenh

    powerpc: TIF_ABI_PENDING bit removal

    Here are the powerpc bits to remove TIF_ABI_PENDING now that
    set_personality() is called at the appropriate place in exec.
    
    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    andreas-schwab committed with ozbenh Jan 30, 2010
  14. drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure.

    If radeon_cs_parser_init() fails, radeon_cs_ioctl() calls
    radeon_cs_parser_fini() with the non-zero error value. The latter dereferenced
    parser->ib which hasn't been initialized yet -> boom. Add a test for parser->ib
    being non-NULL before dereferencing it.
    
    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Michel Dänzer committed with Dave Airlie Jan 22, 2010
  15. @ozbenh

    powerpc/pseries: Fix xics build without CONFIG_SMP

    desc->affinity doesn't exit in that case. Let's use a macro for
    the UP variant of get_irq_server(), it's the easiest way, avoids
    evaluating arguments.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    ozbenh committed Feb 1, 2010
  16. drm/radeon/kms: move radeon KMS on/off switch out of staging.

    We are happy enough that the KMS driver is stable enough for enough people
    for the kms enable/disable to leave staging. Distros can now contemplate
    turning this on.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Feb 1, 2010
  17. drm/radeon/kms: Bailout of blit if error happen & protect with mutex V3

    If an error happen in r600_blit_prepare_copy report it rather
    than WARNING and keeping execution. For instance if ib allocation
    failed we did just warn about but then latter tried to access
    NULL ib ptr causing oops. This patch also protect r600_copy_blit
    with a mutex as otherwise one process might overwrite blit temporary
    data with new one possibly leading to GPU lockup.
    
    Should partialy or totaly fix:
    https://bugzilla.redhat.com/show_bug.cgi?id=553279
    
    V2 failing blit initialization is not fatal, fallback to memcpy when
    this happen
    V3 init blit before startup as we pin in startup, remove duplicate
    code (this one was actualy tested unlike V2)
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jerome Glisse committed with Dave Airlie Jan 22, 2010
  18. drm/vmwgfx: Don't send bad flags to the host

    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jakob Bornecrantz committed with Dave Airlie Jan 30, 2010
  19. @hanzelpeter

    drm/vmwgfx: Request SVGA version 2 and bail if not found

    This fixes the driver not loading on older versions of VMware.
    
    Signed-off-by: Peter Hanzel <hanzelpeter@gmail.com>
    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    hanzelpeter committed with Dave Airlie Jan 30, 2010
  20. drm/vmwgfx: Correctly detect 3D

    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jakob Bornecrantz committed with Dave Airlie Jan 30, 2010
  21. drm/ttm: remove unnecessary save_flags and ttm_flag_masked in ttm_bo_…

    …util.c
    
    Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>
    Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Austin Yuan committed with Dave Airlie Jan 21, 2010
  22. @koriakin

    drm/kms: Remove incorrect comment in struct drm_mode_modeinfo

    Signed-off-by: Dave Airlie <airlied@redhat.com>
    koriakin committed with Dave Airlie Jan 23, 2010
  23. drm/ttm: remove padding from ttm_ref_object on 64bit builds

    Re-order structure ttm_ref_object to remove 8 bytes of alignment padding
    on 64 bit builds, so shrinking its size from 72 to 64 bytes allowing it
    to fit into a smaller slab.
    
    Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
    Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Richard Kennedy committed with Dave Airlie Jan 26, 2010
  24. drm/radeon/kms: release agp on error.

    if we get an error, release the AGP if we've acquired it already.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Feb 1, 2010
  25. drm/kms/radeon/agp: Move the check of the aper_size after drm_acp_acq…

    …uire and drm_agp_info
    
    First call drm_agp_acquire to check if agp has been acquired.
    Second call drm_agp_info to fill in the info data struct, including aper_size.
    Finally do the check to see if the aper_size makes sense.
    
    Signed-off-by: John Kacur <jkacur@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    John Kacur committed with Dave Airlie Jan 31, 2010
  26. drm/kms/radeon/agp: Fix warning, format ‘%d’ expects type ‘int’, but …

    …argument 4 has type ‘size_t’
    
    - Fix warning by using %zu instead of %d for size_t
    - Fix spelling mistake, "to" should be "too".
    
    Signed-off-by: John Kacur <jkacur@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    John Kacur committed with Dave Airlie Jan 31, 2010
  27. @curro

    drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_cac…

    …hing.
    
    Fixes errors like:
    > reserve_ram_pages_type failed 0x15b7a000-0x15b7b000, track 0x8, req 0x10
    when a BO is moved between WC and UC areas.
    
    Reported-by: Xavier Chantry <shiningxc@gmail.com>
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    curro committed with Dave Airlie Jan 12, 2010
  28. drm/kms/radeon: pick digitial encoders smarter. (v3)

    booting a Lenovo W500 with LVDS + DP outputs showed up a TODO we had
    on our list, to pick a correct digital encoder block. The LVTMA
    encoder requires the second digital encoder, all others can use any
    encoder at all.
    
    This fixes the digital encoder selection logic to enable LVDS/DP combos
    to work okay.
    
    V2: fix silly addition of connector dig_block and cleanup the other
    places in the code that pick the encoder.
    
    V3: rename to dig_encoder and clean up further - also fix
    the picking algorithm.
    
    tested on Lenovo W500 + desktop 3650 cards.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Jan 28, 2010
  29. drm/radeon/kms: use active device to pick connector for encoder

    On the W500 we have UNIPHY routed to both DVI and DP, this seems
    to always pick the DVI connector which means link training fails.
    
    Switch to using active device to pick the connector, this seems
    like it should be safe from a code review, and it fixes things
    a bit more here.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed with Dave Airlie Jan 29, 2010
  30. drm/radeon/kms: fix incorrect logic in DP vs eDP connector checking.

    This makes displayport work again here.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Jan 29, 2010
Commits on Jan 31, 2010
  1. @tiwai
  2. @tiwai
  3. @fujita

    x86/agp: Fix agp_amd64_init regression

    This fixes the regression introduced by commit
    42590a7 ("x86/agp: Fix
    agp_amd64_init and agp_amd64_cleanup").
    
    The above commit changes agp_amd64_init() not to do anything if
    gart_iommu_aperture is not zero.
    
    If GART iommu calls agp_amd64_init(), we need to skip
    agp_amd64_init() when it's called later via module_init.
    
    The problem is that gart_iommu_init() calls agp_amd64_init()
    with not zero gart_iommu_aperture so agp_amd64_init() is never
    initialized.
    
    When gart_iommu_init() calls agp_amd64_init(), agp should be
    always initialized.
    
    Reported-by: Marin Mitov <mitov@issp.bas.bg>
    Reported-by: Johannes Hirte <johannes.hirte@fem.tu-ilmenau.de>
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Tested-by: Marin Mitov <mitov@issp.bas.bg>
    Tested-by: Kevin Winchester <kjwinchester@gmail.com>
    Cc: davej@redhat.com
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    LKML-Reference: <20100125141006O.fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    fujita committed with Ingo Molnar Jan 25, 2010
Commits on Jan 30, 2010
  1. @jwessel

    perf, hw_breakpoint, kgdb: Do not take mutex for kernel debugger

    This patch fixes the regression in functionality where the
    kernel debugger and the perf API do not nicely share hw
    breakpoint reservations.
    
    The kernel debugger cannot use any mutex_lock() calls because it
    can start the kernel running from an invalid context.
    
    A mutex free version of the reservation API needed to get
    created for the kernel debugger to safely update hw breakpoint
    reservations.
    
    The possibility for a breakpoint reservation to be concurrently
    processed at the time that kgdb interrupts the system is
    improbable. Should this corner case occur the end user is
    warned, and the kernel debugger will prohibit updating the
    hardware breakpoint reservations.
    
    Any time the kernel debugger reserves a hardware breakpoint it
    will be a system wide reservation.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: kgdb-bugreport@lists.sourceforge.net
    Cc: K.Prasad <prasad@linux.vnet.ibm.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: torvalds@linux-foundation.org
    LKML-Reference: <1264719883-7285-3-git-send-email-jason.wessel@windriver.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    jwessel committed with Ingo Molnar Jan 28, 2010
  2. @jwessel

    x86, hw_breakpoints, kgdb: Fix kgdb to use hw_breakpoint API

    In the 2.6.33 kernel, the hw_breakpoint API is now used for the
    performance event counters.  The hw_breakpoint_handler() now
    consumes the hw breakpoints that were previously set by kgdb
    arch specific code.  In order for kgdb to work in conjunction
    with this core API change, kgdb must use some of the low level
    functions of the hw_breakpoint API to install, uninstall, and
    deal with hw breakpoint reservations.
    
    The kgdb core required a change to call kgdb_disable_hw_debug
    anytime a slave cpu enters kgdb_wait() in order to keep all the
    hw breakpoints in sync as well as to prevent hitting a hw
    breakpoint while kgdb is active.
    
    During the architecture specific initialization of kgdb, it will
    pre-allocate 4 disabled (struct perf event **) structures.  Kgdb
    will use these to manage the capabilities for the 4 hw
    breakpoint registers, per cpu.  Right now the hw_breakpoint API
    does not have a way to ask how many breakpoints are available,
    on each CPU so it is possible that the install of a breakpoint
    might fail when kgdb restores the system to the run state.  The
    intent of this patch is to first get the basic functionality of
    hw breakpoints working and leave it to the person debugging the
    kernel to understand what hw breakpoints are in use and what
    restrictions have been imposed as a result.  Breakpoint
    constraints will be dealt with in a future patch.
    
    While atomic, the x86 specific kgdb code will call
    arch_uninstall_hw_breakpoint() and arch_install_hw_breakpoint()
    to manage the cpu specific hw breakpoints.
    
    The net result of these changes allow kgdb to use the same pool
    of hw_breakpoints that are used by the perf event API, but
    neither knows about future reservations for the available hw
    breakpoint slots.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: kgdb-bugreport@lists.sourceforge.net
    Cc: K.Prasad <prasad@linux.vnet.ibm.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: torvalds@linux-foundation.org
    LKML-Reference: <1264719883-7285-2-git-send-email-jason.wessel@windriver.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    jwessel committed with Ingo Molnar Jan 28, 2010
Something went wrong with that request. Please try again.