Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.32-git8
Commits on Dec 11, 2009
  1. @torvalds

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

    torvalds authored
    …/kernel/git/airlied/drm-2.6
    
    * 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/nouveau: Add DRM driver for NVIDIA GPUs
  2. @torvalds

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

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/ttm: export some functions useful to drivers using ttm
      drm/radeon/kms/avivo: fix typo in new_pll module description
      drm/radeon/kms: Convert radeon to new ttm_bo_init
      drm/ttm: Convert ttm_buffer_object_init to use ttm_placement
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap:
      Add missing alignment check in arch/score sys_mmap()
      fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh
      Get rid of open-coding in ia64_brk()
      sparc_brk() is not needed anymore
      switch do_brk() to get_unmapped_area()
      Take arch_mmap_check() into get_unmapped_area()
      fix a struct file leak in do_mmap_pgoff()
      Unify sys_mmap*
      Cut hugetlb case early for 32bit on ia64
      arch_mmap_check() on mn10300
      Kill ancient crap in s390 compat mmap
      arm: add arch_mmap_check(), get rid of sys_arm_mremap()
      file ->get_unmapped_area() shouldn't duplicate work of get_unmapped_area()
      kill useless checks in sparc mremap variants
      fix pgoff in "have to relocate" case of mremap()
      fix the arch checks in MREMAP_FIXED case
      fix checks for expand-in-place mremap
      do_mremap() untangling, part 3
      do_mremap() untangling, part 2
      untangling do_mremap(), part 1
  4. @torvalds

    Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kerne…

    torvalds authored
    …l/git/jbarnes/pci-2.6
    
    * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (109 commits)
      PCI: fix coding style issue in pci_save_state()
      PCI: add pci_request_acs
      PCI: fix BUG_ON triggered by logical PCIe root port removal
      PCI: remove ifdefed pci_cleanup_aer_correct_error_status
      PCI: unconditionally clear AER uncorr status register during cleanup
      x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
      PCI: portdrv: remove redundant definitions
      PCI: portdrv: remove unnecessary struct pcie_port_data
      PCI: portdrv: minor cleanup for pcie_port_device_register
      PCI: portdrv: add missing irq cleanup
      PCI: portdrv: enable device before irq initialization
      PCI: portdrv: cleanup service irqs initialization
      PCI: portdrv: check capabilities first
      PCI: portdrv: move PME capability check
      PCI: portdrv: remove redundant pcie type calculation
      PCI: portdrv: cleanup pcie_device registration
      PCI: portdrv: remove redundant pcie_port_device_probe
      PCI: Always set prefetchable base/limit upper32 registers
      PCI: read-modify-write the pcie device control register when initiating pcie flr
      PCI: show dma_mask bits in /sys
      ...
    
    Fixed up conflicts in:
    	arch/x86/kernel/amd_iommu_init.c
    	drivers/pci/dmar.c
    	drivers/pci/hotplug/acpiphp_glue.c
  5. @torvalds

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

    torvalds authored
    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (49 commits)
      nilfs2: separate wait function from nilfs_segctor_write
      nilfs2: add iterator for segment buffers
      nilfs2: hide nilfs_write_info struct in segment buffer code
      nilfs2: relocate io status variables to segment buffer
      nilfs2: do not return io error for bio allocation failure
      nilfs2: use list_splice_tail or list_splice_tail_init
      nilfs2: replace mark_inode_dirty as nilfs_mark_inode_dirty
      nilfs2: delete mark_inode_dirty in nilfs_delete_entry
      nilfs2: delete mark_inode_dirty in nilfs_commit_chunk
      nilfs2: change return type of nilfs_commit_chunk
      nilfs2: split nilfs_unlink as nilfs_do_unlink and nilfs_unlink
      nilfs2: delete redundant mark_inode_dirty
      nilfs2: expand inode_inc_link_count and inode_dec_link_count
      nilfs2: delete mark_inode_dirty from nilfs_set_link
      nilfs2: delete mark_inode_dirty in nilfs_new_inode
      nilfs2: add norecovery mount option
      nilfs2: add helper to get if volume is in a valid state
      nilfs2: move recovery completion into load_nilfs function
      nilfs2: apply readahead for recovery on mount
      nilfs2: clean up get/put function of a segment usage
      ...
  6. Add missing alignment check in arch/score sys_mmap()

    Al Viro authored
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  7. fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh

    Al Viro authored
    We want addr - (pgoff << PAGE_SHIFT) consistently coloured...
    
    Acked-by: Paul Mundt <lethal@linux-sh.org>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  8. Get rid of open-coding in ia64_brk()

    Al Viro authored
    The comment in there used to be true, but these days do_brk() does
    the arch-specific check that covers what we open-coded here.  So we
    can use sys_brk() just fine, only need to do force_successful_syscall_return()
    after it.
    
    See commit 3a45975 - that's when the
    checks in do_brk() had been originally added.
    
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  9. sparc_brk() is not needed anymore

    Al Viro authored
    the checks it's doing are duplicated in sys_brk() and failing
    them early makes no sense, AFAICT.
    
    Acked-by: David S. Miller <davem@davemloft.net>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  10. switch do_brk() to get_unmapped_area()

    Al Viro authored
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  11. Take arch_mmap_check() into get_unmapped_area()

    Al Viro authored
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  12. fix a struct file leak in do_mmap_pgoff()

    Al Viro authored
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  13. Unify sys_mmap*

    Al Viro authored
    New helper - sys_mmap_pgoff(); switch syscalls to using it.
    
    Acked-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  14. Cut hugetlb case early for 32bit on ia64

    Al Viro authored
    It won't work anyway (hugetlb addresses there are way beyond 4Gb)
    and it's easier to stop it here.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  15. arch_mmap_check() on mn10300

    Al Viro authored
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  16. Kill ancient crap in s390 compat mmap

    Al Viro authored
    We've had TASK_SIZE set to 1<<31 for 31bit tasks since May 2004.
    Before that old32_mmap() had to deal with do_mmap_pgoff() giving
    it an address out of range.  It had tried to do that by checking
    return value and doing do_munmap() (at wrong address, BTW).
    
    IOW, that code had been dead for 5.5 years (and bogus - for 8).
    Kill.
    
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  17. arm: add arch_mmap_check(), get rid of sys_arm_mremap()

    Al Viro authored
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  18. file ->get_unmapped_area() shouldn't duplicate work of get_unmapped_a…

    Al Viro authored
    …rea()
    
    ... we should call mm ->get_unmapped_area() instead and let our caller
    do the final checks.
    
    Acked-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  19. kill useless checks in sparc mremap variants

    Al Viro authored
    Acked-by: David S. Miller <davem@davemloft.net>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  20. fix pgoff in "have to relocate" case of mremap()

    Al Viro authored
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  21. fix the arch checks in MREMAP_FIXED case

    Al Viro authored
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  22. fix checks for expand-in-place mremap

    Al Viro authored
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  23. do_mremap() untangling, part 3

    Al Viro authored
    Take the check for being able to expand vma in place into a separate
    helper.
    
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  24. do_mremap() untangling, part 2

    Al Viro authored
    Take the MREMAP_FIXED into a separate helper, simplify the living
    hell out of conditions in both cases.
    
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  25. untangling do_mremap(), part 1

    Al Viro authored
    Take locating vma and checks on it to a separate helper (it will be
    shared between MREMAP_FIXED/non-MREMAP_FIXED cases when we split
    them in the next patch)
    
    Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  26. drm/nouveau: Add DRM driver for NVIDIA GPUs

    Ben Skeggs authored Dave Airlie committed
    This adds a drm/kms staging non-API stable driver for GPUs from NVIDIA.
    
    This driver is a KMS-based driver and requires a compatible nouveau
    userspace libdrm and nouveau X.org driver.
    
    This driver requires firmware files not available in this kernel tree,
    interested parties can find them via the nouveau project git archive.
    
    This driver is reverse engineered, and is in no way supported by nVidia.
    
    Support for nearly the complete range of nvidia hw from nv04->g80 (nv50)
    is available, and the kms driver should support driving nearly all
    output types (displayport is under development still) along with supporting
    suspend/resume.
    
    This work is all from the upstream nouveau project found at
    nouveau.freedesktop.org.
    
    The original authors list from nouveau git tree is:
    Anssi Hannula <anssi.hannula@iki.fi>
    Ben Skeggs <bskeggs@redhat.com>
    Francisco Jerez <currojerez@riseup.net>
    Maarten Maathuis <madman2003@gmail.com>
    Marcin Kościelnicki <koriakin@0x04.net>
    Matthew Garrett <mjg@redhat.com>
    Matt Parnell <mparnell@gmail.com>
    Patrice Mandin <patmandin@gmail.com>
    Pekka Paalanen <pq@iki.fi>
    Xavier Chantry <shiningxc@gmail.com>
    along with project founder Stephane Marchesin <marchesin@icps.u-strasbg.fr>
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  27. @torvalds

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

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (189 commits)
      drm/radeon/kms: fix warning about cur_placement being uninitialised.
      drm/ttm: Print debug information on memory manager when eviction fails
      drm: Add memory manager debug function
      drm/radeon/kms: restore surface registers on resume.
      drm/radeon/kms/r600/r700: fallback gracefully on ucode failure
      drm/ttm: Initialize eviction placement in case the driver callback doesn't
      drm/radeon/kms: cleanup structure and module if initialization fails
      drm/radeon/kms: actualy set the eviction placements we choose
      drm/radeon/kms: Fix NULL ptr dereference
      drm/radeon/kms/avivo: add support for new pll selection algo
      drm/radeon/kms/avivo: fix some bugs in the display bandwidth setup
      drm/radeon/kms: fix return value from fence function.
      drm/radeon: Remove tests for -ERESTART from the TTM code.
      drm/ttm: Have the TTM code return -ERESTARTSYS instead of -ERESTART.
      drm/radeon/kms: Convert radeon to new TTM validation API (V2)
      drm/ttm: Rework validation & memory space allocation (V3)
      drm: Add search/get functions to get a block in a specific range
      drm/radeon/kms: fix avivo tiling regression since radeon object rework
      drm/i915: Remove a debugging printk from hangcheck
      drm/radeon/kms: make sure i2c id matches
      ...
  28. @torvalds

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

    torvalds authored
    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (21 commits)
      amd64_edac: bump driver version
      amd64_edac: fix use-uninitialised bug
      amd64_edac: correct sys address to chip select mapping
      amd64_edac: add a leaner syndrome decoding algorithm
      amd64_edac: remove early hw support check
      amd64_edac: detect DDR3 memory type
      edac: add memory types strings for debugging
      edac, mce: update AMD F10h revD check
      amd64_edac: remove unneeded extract_error_address wrapper
      amd64_edac: rename StinkyIdentifier
      amd64_edac: remove superfluous dbg printk
      amd64_edac: enhance address to DRAM bank mapping
      amd64_edac: cleanup f10_early_channel_count
      amd64_edac: dump DIMM sizes on K8 too
      amd64_edac: cleanup rest of amd64_dump_misc_regs
      amd64_edac: cleanup DRAM cfg low debug output
      amd64_edac: wrap-up pci config read error handling
      amd64_edac: unify MCGCTL ECC switching
      cpumask: use modern cpumask style in drivers/edac/amd64_edac.c
      amd64_edac: make DRAM regions output more human-readable
      ...
  29. @torvalds

    Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

    torvalds authored
    * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
      MAINTAINERS: Add OMAP2/3 DSS and OMAPFB maintainer
      OMAP: SDP: Enable DSS2 for OMAP3 SDP board
      OMAP: DSS2: Taal DSI command mode panel driver
      OMAP: DSS2: Add generic and Sharp panel drivers
      OMAP: DSS2: omapfb driver
      OMAP: DSS2: DSI driver
      OMAP: DSS2: SDI driver
      OMAP: DSS2: RFBI driver
      OMAP: DSS2: Video encoder driver
      OMAP: DSS2: DPI driver
      OMAP: DSS2: DISPC
      OMAP: DSS2: Add more core files
      OMAP: DSS2: Display Subsystem Driver core
      OMAP: DSS2: Documentation for DSS2
      OMAP: Add support for VRFB rotation engine
      OMAP: Add VRAM manager
      OMAP: OMAPFB: add omapdss device
      OMAP: OMAPFB: split omapfb.h
      OMAP2: Add funcs for writing SMS_ROT_* registers
  30. drm/ttm: export some functions useful to drivers using ttm

    Ben Skeggs authored Dave Airlie committed
    These are functions required by nouveau which will be merged later.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  31. drm/radeon/kms/avivo: fix typo in new_pll module description

    Alex Deucher authored Dave Airlie committed
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  32. drm/radeon/kms: Convert radeon to new ttm_bo_init

    Jerome Glisse authored Dave Airlie committed
    Now bo init use placement structure like bo validation does.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  33. drm/ttm: Convert ttm_buffer_object_init to use ttm_placement

    Jerome Glisse authored Dave Airlie committed
    Convert ttm_buffer_object_init to use struct ttm_placement and
    rename to ttm_bo_init for consistency with function naming. This
    allow to give more complex placement at buffer creation. For
    instance you ask to allocate bo into vram first but if there is
    not enough vram you can give system as a second possible
    placement. It also allow to create buffer in a specific range.
    
    Also rename ttm_buffer_object_validate to ttm_bo_validate.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Dec 10, 2009
  1. @torvalds

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

    torvalds authored
    …/git/tj/wq
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
      workqueue: Add debugobjects support
  2. @torvalds

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

    torvalds authored
    …t/jeremy/xen
    
    * 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
      xen: try harder to balloon up under memory pressure.
      Xen balloon: fix totalram_pages counting.
      xen: explicitly create/destroy stop_machine workqueues outside suspend/resume region.
      xen: improve error handling in do_suspend.
      xen: don't leak IRQs over suspend/resume.
      xen: call clock resume notifier on all CPUs
      xen: use iret for return from 64b kernel to 32b usermode
      xen: don't call dpm_resume_noirq() with interrupts disabled.
      xen: register runstate info for boot CPU early
      xen: register runstate on secondary CPUs
      xen: register timer interrupt with IRQF_TIMER
      xen: correctly restore pfn_to_mfn_list_list after resume
      xen: restore runstate_info even if !have_vcpu_info_placement
      xen: re-register runstate area earlier on resume.
      xen: wait up to 5 minutes for device connetion
      xen: improvement to wait_for_devices()
      xen: fix is_disconnected_device/exists_disconnected_device
      xen/xenbus: make DEVICE_ATTR()s static
Something went wrong with that request. Please try again.