19 Jan, 2010

24 commits


12 Jan, 2010

16 commits

  • Ready to get everything using unlocked_ioctl()

    For ide_tape we just push down as this is legacy code anyway

    Signed-off-by: Alan Cox
    Signed-off-by: David S. Miller

    Alan Cox
     
  • Revert commit 2fbd07a5f5d1295fa9b0c0564ec27da7c276a75a, as this commit
    breaks an IBM platform with quad-core Xeon cpu's.

    According to Suresh, this might be an IBM platform issue, as on other
    Intel platforms with
    Acked-by: Suresh Siddha
    Signed-off-by: Linus Torvalds

    Ananth N Mavinakayanahalli
     
  • * 'for-linus' of git://oss.sgi.com/xfs/xfs:
    xfs: Ensure we force all busy extents in range to disk
    xfs: Don't flush stale inodes
    xfs: fix timestamp handling in xfs_setattr
    xfs: use DECLARE_EVENT_CLASS

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
    GFS2: Use MAX_LFS_FILESIZE for meta inode size
    GFS2: Fix gfs2_xattr_acl_chmod()
    GFS2: Fix locking bug in rename
    GFS2: Ensure uptodate inode size when using O_APPEND

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
    quota: Fix dquot_transfer for filesystems different from ext4

    Linus Torvalds
     
  • * 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
    agp/hp: fail gracefully if we don't find an IOC
    agp/hp: fixup hp agp after ACPI changes
    agp: correct missing cleanup on error in agp_add_bridge

    Linus Torvalds
     
  • * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (45 commits)
    drm/nv04: Fix set_operation software method.
    drm/nouveau: initialise DMA tracking parameters earlier
    drm/nouveau: use dma.max rather than pushbuf size for checking GET validity
    drm/nv04: differentiate between nv04/nv05
    drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence
    drm/nv50: prevent a possible ctxprog hang
    drm/nouveau: have ttm's fault handler called directly
    drm/nv50: restore correct cache1 get/put address on fifoctx load
    drm/nouveau: create function for "dealing" with gpu lockup
    drm/nouveau: remove unused nouveau_channel_idle() function
    drm/nouveau: fix handling of fbcon colours in 8bpp
    drm/nv04: Context switching fixes.
    drm/nouveau: Use the software object for fencing.
    drm/nouveau: Allocate a per-channel instance of NV_SW.
    drm/nv50: make the blocksize depend on vram size
    drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN
    drm/nouveau: Don't skip card take down on nv0x.
    drm/nouveau: Implement nv42-nv43 TV load detection.
    drm/nouveau: Clean up the nv17-nv4x load detection code a bit.
    drm/nv50: fix fillrect color
    ...

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: Make PCI device ids constant
    hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs
    hwmon: (k10temp) Blacklist more family 10h processors
    hwmon: (asus_atk0110) Add debugfs interface
    hwmon: (asus_atk0110) Refactor interface probe code
    hwmon: (adt7462) Fix pin 28 monitoring

    Linus Torvalds
     
  • The list macros use LIST_POISON1 and LIST_POISON2 as undereferencable
    pointers in order to trap erronous use of freed list_heads. Unfortunately
    userspace can arrange for those pointers to actually be dereferencable,
    potentially turning an oops to an expolit.

    To avoid this allow architectures (currently x86_64 only) to override
    the default values for these pointers with truly-undereferencable values.
    This is easy on x86_64 as the virtual address space is large and contains
    areas that cannot be mapped.

    Other 64-bit architectures will likely find similar unmapped ranges.

    [ingo: switch to 0xdead000000000000 as the unmapped area]
    [ingo: add comments, cleanup]
    [jaswinder: eliminate sparse warnings]

    Acked-by: Linus Torvalds
    Signed-off-by: Jaswinder Singh Rajput
    Signed-off-by: Ingo Molnar
    Signed-off-by: Avi Kivity
    Signed-off-by: Linus Torvalds

    Avi Kivity
     
  • …/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: (26 commits)
    OMAP2 clock: dynamically allocate CPUFreq frequency table
    OMAP clock/CPUFreq: add clk_exit_cpufreq_table()
    OMAP2xxx OPP: clean up comments in OPP data
    OMAP2xxx clock: clk2xxx.c doesn't compile if CPUFREQ is enabled
    OMAP1 clock: remove __initdata from struct clk_functions to prevent crash
    OMAP1 clock: Add missing clocks for OMAP 7xx
    OMAP clock: remove incorrect EXPORT_SYMBOL()s
    OMAP3 clock: Add capability to change rate of dpll4_m5_ck
    OMAP3 clock: McBSP 2, 3, 4 functional clock parent is PER_96M_FCLK, not CORE_96M_FCLK
    OMAP3: clock: add clockdomains for UART1 & 2
    OMAP2420 IO mapping: move IVA mapping virtual address out of vmalloc space
    OMAP2xxx IO mapping: mark DSP mappings as being 2420-only
    ARM: OMAP3: PM: Fix the Invalid CM_CLKSTCTRL reg access.
    OMAP2: remove duplicated #include
    omap3: EVM: Choose OMAP_PACKAGE_CBB
    omap3: Fix booting if package is uninitialized
    omap3: add missing parentheses
    omap3: add missing parentheses
    omap2/3: ZOOM: Correcting key mapping for few keys
    omap2/3: make serial_in_override() address the right uart port
    ...

    Linus Torvalds
     
  • Update the defconfig for the ASB2303 platform.

    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     
  • Access to the ASB2305's PCnet32 NIC doesn't work correctly because when
    the NIC attempts to update the ring buffer flags by DMA, the change to RAM
    crops up about 17uS after the interrupt line is asserted. This is almost
    certainly due to a bug in the PCI bridge FPGA on that board.

    We can get around this by making dma_alloc_coherent() put the ring buffer
    in the SRAM attached to the PCI bridge rather than in the SDRAM.

    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     
  • Insert PCI root bus resources for the MN10300-based ASB2305 development
    kit motherboard. This is required because the CPU's window onto the PCI
    bus address space is considerably smaller than the CPU's full address
    space and non-PCI devices lie outside of the PCI window that we might want
    to access.

    Without this patch, the PCI root bus uses the platform-level bus
    resources, and these are then confined to the PCI window, thus making
    platform_device_add() reject devices outside of this window.

    We also add a reservation for the PCI SRAM region.

    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     
  • Use the generic pci_enable_resources() instead of the arch-specific code.

    Unlike this arch-specific code, the generic version:

    - checks PCI_NUM_RESOURCES (11), not 6, resources
    - skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
    - skips ROM resources unless IORESOURCE_ROM_ENABLE is set
    - checks for resource collisions with "!r->parent"

    Signed-off-by: Bjorn Helgaas
    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bjorn Helgaas
     
  • Use KERN_ERR not KERN_ERROR in the ASB2305 platform code.

    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     
  • asm/cpu never existed for mn10300; the files they are looking for are in
    asm.

    Signed-off-by: Al Viro
    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Al Viro