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

    Linux 2.6.33-rc7

    torvalds committed Feb 6, 2010
  2. @torvalds

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

    …kernel/git/jdelvare/staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      hwmon: (w83781d) Request I/O ports individually for probing
      hwmon: (lm78) Request I/O ports individually for probing
      hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT
    torvalds committed Feb 6, 2010
  3. @torvalds

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

    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: Fix leak of relocs along do_execbuffer error path
      drm/i915: slow acpi_lid_open() causes flickering - V2
      drm/i915: Disable SR when more than one pipe is enabled
      drm/i915: page flip support for Ironlake
      drm/i915: Fix the incorrect DMI string for Samsung SX20S laptop
      drm/i915: Add support for SDVO composite TV
      drm/i915: don't trigger ironlake vblank interrupt at irq install
      drm/i915: handle non-flip pending case when unpinning the scanout buffer
      drm/i915: Fix the device info of Pineview
      drm/i915: enable vblank interrupt on ironlake
      drm/i915: Prevent use of uninitialized pointers along error path.
      drm/i915: disable hotplug detect before Ironlake CRT detect
    torvalds committed Feb 6, 2010
  4. @torvalds

    Fix potential crash with sys_move_pages

    We incorrectly depended on the 'node_state/node_isset()' functions
    testing the node range, rather than checking it explicitly.  That's not
    reliable, even if it might often happen to work.  So do the proper
    explicit test.
    
    Reported-by: Marcus Meissner <meissner@suse.de>
    Acked-and-tested-by: Brice Goglin <Brice.Goglin@inria.fr>
    Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Feb 5, 2010
Commits on Feb 5, 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: pandora: Add APLL supply to fix audio output
      ALSA: ice1724 - aureon - fix wm8770 volume offset
      ALSA: cosmetic: make hda intel interrupt name consistent with others
      ALSA: hda - Delay switching to polling mode if an interrupt was missing
      ALSA: ctxfi - fix PTP address initialization
    torvalds committed Feb 5, 2010
  2. hwmon: (w83781d) Request I/O ports individually for probing

    Different motherboards have different PNP declarations for
    W83781D/W83782D chips. Some declare the whole range of I/O ports (8
    ports), some declare only the useful ports (2 ports at offset 5) and
    some declare fancy ranges, for example 4 ports at offset 4. To
    properly handle all cases, request all ports individually for probing.
    After we have determined that we really have a W83781D or W83782D
    chip, the useful port range will be requested again, as a single
    block.
    
    I did not see a board which needs this yet, but I know of one for lm78
    driver and I'd like to keep the logic of these two drivers in sync.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
    Jean Delvare committed Feb 5, 2010
  3. hwmon: (lm78) Request I/O ports individually for probing

    Different motherboards have different PNP declarations for LM78/LM79
    chips. Some declare the whole range of I/O ports (8 ports), some
    declare only the useful ports (2 ports at offset 5) and some declare
    fancy ranges, for example 4 ports at offset 4. To properly handle all
    cases, request all ports individually for probing. After we have
    determined that we really have an LM78 or LM79 chip, the useful port
    range will be requested again, as a single block.
    
    This fixes the driver on the Olivetti M3000 DT 540, at least.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
    Jean Delvare committed Feb 5, 2010
  4. hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT

    The #define ADT7462_VOLT_COUNT is wrong, it should be 13 not 12. All the 
    for loops that use this as a limit count are of the typical form, "for 
    (n = 0; n < ADT7462_VOLT_COUNT; n++)", so to loop through all voltages 
    w/o missing the last one it is necessary for the count to be one greater 
    than it is.  (Specifically, you will miss the +1.5V 3GPIO input with count 
    = 12 vs. 13.)
    
    Signed-off-by: Ray Copeland <ray.copeland@aprius.com>
    Acked-by: "Darrick J. Wong" <djwong@us.ibm.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@kernel.org
    Ray Copeland committed with Jean Delvare Feb 5, 2010
  5. @tiwai
  6. @tiwai
  7. @tiwai
  8. @torvalds

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

    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      [libata] Call flush_dcache_page after PIO data transfers in libata-sff.c
      ahci: add Acer G725 to broken suspend list
      libata: fix ata_id_logical_per_physical_sectors
      libata-scsi passthru: fix bug which truncated LBA48 return values
    torvalds committed Feb 5, 2010
  9. @torvalds

    CS5536: apply pci quirk for BIOS SMBUS bug

    The new cs5535-* drivers use PCI header config info rather than MSRs to
    determine the memory region to use for things like GPIOs and MFGPTs.  As
    anticipated, we've run into a buggy BIOS:
    
    [    0.081818] pci 0000:00:14.0: reg 10: [io  0x6000-0x7fff]
    [    0.081906] pci 0000:00:14.0: reg 14: [io  0x6100-0x61ff]
    [    0.082015] pci 0000:00:14.0: reg 18: [io  0x6200-0x63ff]
    [    0.082917] pci 0000:00:14.2: reg 20: [io  0xe000-0xe00f]
    [    0.083551] pci 0000:00:15.0: reg 10: [mem 0xa0010000-0xa0010fff]
    [    0.084436] pci 0000:00:15.1: reg 10: [mem 0xa0011000-0xa0011fff]
    [    0.088816] PCI: pci_cache_line_size set to 32 bytes
    [    0.088938] pci 0000:00:14.0: address space collision: [io 0x6100-0x61ff] already in use
    [    0.089052] pci 0000:00:14.0: can't reserve [io  0x6100-0x61ff]
    
    This is a Soekris board, and its BIOS sets the size of the PCI ISA bridge
    device's BAR0 to 8k.  In reality, it should be 8 bytes (BAR0 is used for
    SMBus stuff).  This quirk checks for an incorrect size, and resets it
    accordingly.
    
    Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
    Tested-by: Leigh Porter <leigh@leighporter.org>
    Tested-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Andres Salomon committed with torvalds Feb 5, 2010
  10. @torvalds

    percpu: add __percpu for sparse

    This is to make the annotation of percpu variables during the next merge
    window less painfull.
    
    Extracted from a patch by Rusty Russell.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Stephen Rothwell committed with torvalds Feb 5, 2010
  11. @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 r300 vram width calculations
      drm/radeon/kms: rs400/480 MC setup is different than r300.
      drm/radeon/kms: make initial state of load detect property correct.
      drm/radeon/kms: disable HDMI audio for now on rv710/rv730
      drm/radeon/kms: don't call suspend path before cleaning up GPU
      drivers/gpu/drm/radeon/radeon_combios.c: fix warning
      ati_pcigart: fix printk format warning
      drm/r100/kms: Emit cache flush to the end of command buffer. (v2)
      drm/radeon/kms: fix regression rendering issue on R6XX/R7XX
      drm/radeon/kms: move blit initialization after we disabled VGA
    torvalds committed Feb 5, 2010
  12. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

    * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
      Btrfs: apply updated fallocate i_size fix
      Btrfs: do not try and lookup the file extent when finishing ordered io
      Btrfs: Fix oopsen when dropping empty tree.
      Btrfs: remove BUG_ON() due to mounting bad filesystem
      Btrfs: make error return negative in btrfs_sync_file()
      Btrfs: fix race between allocate and release extent buffer.
    torvalds committed Feb 5, 2010
  13. @notaz @broonie

    ASoC: pandora: Add APLL supply to fix audio output

    Pandora's external DAC is using 256*Fs output from the TWL4030
    codec, and TWL4030 needs to have APLL enabled for it's 256*Fs
    output to function.
    
    Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    notaz committed with broonie Feb 5, 2010
  14. @perexg

    ALSA: ice1724 - aureon - fix wm8770 volume offset

    The volume register is from 0..0x7f and 0..0x1a range is mute.
    Also, fix mute combining in wm_vol_put(). The wrong behaviour was
    noticed by Peter Christensen.
    
    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
    perexg committed Feb 5, 2010
  15. @maximlevitsky @tiwai

    ALSA: cosmetic: make hda intel interrupt name consistent with others

    This renames the interrupt name in /proc/interrupt.
    HDA Intel -> hda_intel
    
    This also eliminates space from the name, probably helping some
    parsers.
    Don't think anybody depends on this name in userspace
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    maximlevitsky committed with tiwai Feb 4, 2010
  16. @maximlevitsky @tiwai

    ALSA: hda - Delay switching to polling mode if an interrupt was missing

    My sound codec seems sometimes (very rarely) to omit interrupts (ALC268)
    However, interrupt mode still works.
    Thus if we get timeout, poll the codec once.
    
    If we get 3 such polls in a row, then switch to polling mode.
    
    This patch is maybe an bandaid, but this might be a workaround for hardware bug.
    
    Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    maximlevitsky committed with tiwai Feb 4, 2010
  17. drm/radeon/kms: fix r300 vram width calculations

    This was incorrect according to the docs and the UMS driver does
    it like this.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Feb 5, 2010
  18. drm/radeon/kms: rs400/480 MC setup is different than r300.

    Boot testing on my rs480 laptop found the MC idle never happened
    on startup, a quick check with AMD found the idle bit is in a different
    place on the rs4xx than r300.
    
    Implement a new rs400 mc idle function to fix this.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Feb 5, 2010
  19. drm/radeon/kms: make initial state of load detect property correct.

    this was incorrect on my rs480.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed with Dave Airlie Jan 27, 2010
  20. drm/radeon/kms: disable HDMI audio for now on rv710/rv730

    Support isn't correct yet and we are getting green tinges on the
    displays.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Feb 5, 2010
  21. drm/radeon/kms: don't call suspend path before cleaning up GPU

    In suspend path we unmap the GART table while in cleaning up
    path we will unbind buffer and thus try to write to unmapped
    GART leading to oops. In order to avoid this we don't call the
    suspend path in cleanup path. Cleanup path is clever enough
    to desactive GPU like the suspend path is doing, thus this was
    redondant.
    
    Tested on: RV370, R420, RV515, RV570, RV610, RV770 (all PCIE)
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jerome Glisse committed with Dave Airlie Feb 2, 2010
  22. drivers/gpu/drm/radeon/radeon_combios.c: fix warning

    drivers/gpu/drm/radeon/radeon_combios.c: In function 'radeon_combios_get_lvds_info':
    drivers/gpu/drm/radeon/radeon_combios.c:893: warning: comparison is always false due to limited range of data type
    
    Cc: Dave Airlie <airlied@linux.ie>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Andrew Morton committed with Dave Airlie Feb 2, 2010
  23. ati_pcigart: fix printk format warning

    Fix ati_pcigart printk format warning:
    
    drivers/gpu/drm/ati_pcigart.c:115: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'dma_addr_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
    Cc: Dave Airlie <airlied@linux.ie>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Randy Dunlap committed with Dave Airlie Feb 2, 2010
  24. @suokko

    drm/r100/kms: Emit cache flush to the end of command buffer. (v2)

    Cache flush is required in case CPU is accessing rendered data.
    
    This fixes glean/readPixSanity test case and random rendering
    errors in sauerbraten and warzone2100.
    
    v2 Fix comment ordering in r100_fence_ring_emit and remove extra
       defines added in first version.
    
    Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    suokko committed with Dave Airlie Feb 4, 2010
  25. drm/radeon/kms: fix regression rendering issue on R6XX/R7XX

    It seems that some R6XX/R7XX silently ignore HDP flush when
    programmed through ring, this patch addback an ioctl callback
    to allow R6XX/R7XX hw to perform such flush through MMIO in
    order to fix a regression. For more details see:
    
    http://bugzilla.kernel.org/show_bug.cgi?id=15186
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jerome Glisse committed with Dave Airlie Feb 4, 2010
  26. drm/radeon/kms: move blit initialization after we disabled VGA

    VGA might be overwritting VRAM and corrupt our blit shader leading
    to corruption, it likely won't happen if you load fbcon right after
    radeon. Thanks to Shawn Starr and Andre Maasikas for tracking down
    this issue.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jerome Glisse committed with Dave Airlie Feb 4, 2010
  27. @torvalds

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: Fix wrong register in proc-arm6_7.S data abort handler
      ARM: 5909/1: ARM: Correct the FPSCR bits setting when raising exceptions
      ARM: 5904/1: ARM: Always generate the IT instruction when compiling for Thumb-2
      ARM: 5907/1: ARM: Fix the reset on the RealView PBX Development board
      mx35: add a missing comma in a pad definition
      mx25: make the FEC AHB clk secondary of the IPG
      mx25: fix time accounting
      mx25: properly initialize clocks
      mx25: remove unused mx25_clocks_init() argument
      i.MX25: implement secondary clocks for uarts and fec
      i.MX25: Allow secondary clocks in DEFINE_CLOCK
      ARM: MX3: Fixed typo in declared enum type name.
      MXC: Add AUDMUXv2 register decode to debugfs
      mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module
      mx31ads: Provide a name for EXPIO interrupt chip
      mx31ads: Allow enable/disable of switchable supplies
    torvalds committed Feb 4, 2010
  28. @torvalds

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

    …inux/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: Disable serial port autoidle by default
      omap: Fix access to already released memory in clk_debugfs_register_one()
      omap: Fix arch/arm/mach-omap2/mux.c: Off by one error
      omap: Fix 3630 mux errors
      OMAP2/3: GPMC: ensure valid clock pointer
      OMAP2/3: IRQ: ensure valid base address
      ARCH OMAP : enable ARCH_HAS_HOLES_MEMORYMODEL for OMAP
      omap: Remove old unused defines for OMAP_32KSYNCT_BASE
      omap: define _toggle_gpio_edge_triggering only for OMAP1
    torvalds committed Feb 4, 2010
  29. @torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFS: Don't clobber the attribute type in nfs_update_inode()
      NFS: Fix a umount race
      NFS: Fix an Oops when truncating a file
      NFS: Ensure that we handle NFS4ERR_STALE_STATEID correctly
      NFSv4.1: Don't call nfs4_schedule_state_recovery() unnecessarily
      NFSv4: Don't allow posix locking against servers that don't support it
      NFSv4: Ensure that the NFSv4 locking can recover from stateid errors
      NFS: Avoid warnings when CONFIG_NFS_V4=n
      NFS: Make nfs_commitdata_release static
      NFS: Try to commit unstable writes in nfs_release_page()
      NFS: Fix a reference leak in nfs_wb_cancel_page()
    torvalds committed Feb 4, 2010
  30. @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:
      futex: Handle futex value corruption gracefully
      futex: Handle user space corruption gracefully
      futex_lock_pi() key refcnt fix
      softlockup: Add sched_clock_tick() to avoid kernel warning on kgdb resume
    torvalds committed Feb 4, 2010
  31. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      GFS2: Extend umount wait coverage to full glock lifetime
      GFS2: Wait for unlock completion on umount
    torvalds committed Feb 4, 2010
Something went wrong with that request. Please try again.