1. 12 12月, 2009 4 次提交
  2. 11 12月, 2009 12 次提交
    • Y
      x86: Use find_e820() instead of hard coded trampoline address · 893f38d1
      Yinghai Lu 提交于
      Jens found the following crash/regression:
      
      [    0.000000] found SMP MP-table at [ffff8800000fdd80] fdd80
      [    0.000000] Kernel panic - not syncing: Overlapping early reservations 12-f011 MP-table mpc to 0-fff BIOS data page
      
      and
      
      [    0.000000] Kernel panic - not syncing: Overlapping early reservations 12-f011 MP-table mpc to 6000-7fff TRAMPOLINE
      
      and bisected it to b24c2a92 ("x86: Move find_smp_config()
      earlier and avoid bootmem usage").
      
      It turns out the BIOS is using the first 64k for mptable,
      without reserving it.
      
      So try to find good range for the real-mode trampoline instead of
      hard coding it, in case some bios tries to use that range for sth.
      Reported-by: NJens Axboe <jens.axboe@oracle.com>
      Signed-off-by: NYinghai Lu <yinghai@kernel.org>
      Tested-by: NJens Axboe <jens.axboe@oracle.com>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      LKML-Reference: <4B21630A.6000308@kernel.org>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      893f38d1
    • L
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 3ef884b4
      Linus Torvalds 提交于
      * '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
        ...
      3ef884b4
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 4e5df806
      Linus Torvalds 提交于
      * '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
        ...
      4e5df806
    • L
      Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux · aa2cf420
      Linus Torvalds 提交于
      * '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
      aa2cf420
    • P
      x86, AMD: Fix stale cpuid4_info shared_map data in shared_cpu_map cpumasks · ebb682f5
      Prarit Bhargava 提交于
      The per_cpu cpuid4_info shared_map can contain stale data when CPUs are added
      and removed.
      
      The stale data can lead to a NULL pointer derefernce panic on a remove of a
      CPU that has had siblings previously removed.
      
      This patch resolves the panic by verifying a cpu is actually online before
      adding it to the shared_cpu_map, only examining cpus that are part of
      the same lower level cache, and by updating other siblings lowest level cache
      maps when a cpu is added.
      Signed-off-by: NPrarit Bhargava <prarit@redhat.com>
      LKML-Reference: <20091209183336.17855.98708.sendpatchset@prarit.bos.redhat.com>
      Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
      ebb682f5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · d71cb81a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: Add debugobjects support
      d71cb81a
    • L
      Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · ab1831b0
      Linus Torvalds 提交于
      * '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
      ab1831b0
    • L
      Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · eae6fa9b
      Linus Torvalds 提交于
      * 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        xen pvfb: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
        fb-defio: Inhibit VM_IO flag to be set on vmalloc-ed framebuffers.
        fb-defio: If FBINFO_VIRTFB is defined, do not set VM_IO flag.
        Fix toogle whether xenbus driver should be built as module or part of kernel.
      eae6fa9b
    • L
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 4515c306
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (47 commits)
        ext4: Fix potential fiemap deadlock (mmap_sem vs. i_data_sem)
        ext4: Do not override ext2 or ext3 if built they are built as modules
        jbd2: Export jbd2_log_start_commit to fix ext4 build
        ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT
        ext4: Wait for proper transaction commit on fsync
        ext4: fix incorrect block reservation on quota transfer.
        ext4: quota macros cleanup
        ext4: ext4_get_reserved_space() must return bytes instead of blocks
        ext4: remove blocks from inode prealloc list on failure
        ext4: wait for log to commit when umounting
        ext4: Avoid data / filesystem corruption when write fails to copy data
        ext4: Use ext4 file system driver for ext2/ext3 file system mounts
        ext4: Return the PTR_ERR of the correct pointer in setup_new_group_blocks()
        jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer()
        ext4: remove unused parameter wbc from __ext4_journalled_writepage()
        ext4: remove encountered_congestion trace
        ext4: move_extent_per_page() cleanup
        ext4: initialize moved_len before calling ext4_move_extents()
        ext4: Fix double-free of blocks with EXT4_IOC_MOVE_EXT
        ext4: use ext4_data_block_valid() in ext4_free_blocks()
        ...
      4515c306
    • L
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · a5eba3f6
      Linus Torvalds 提交于
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        exofs: Multi-device mirror support
        exofs: Move all operations to an io_engine
        exofs: move osd.c to ios.c
        exofs: statfs blocks is sectors not FS blocks
        exofs: Prints on mount and unmout
        exofs: refactor exofs_i_info initialization into common helper
        exofs: dbg-print less
        exofs: More sane debug print
        trivial: some small fixes in exofs documentation
      a5eba3f6
    • L
      Merge git://git.infradead.org/ubifs-2.6 · fc1495bf
      Linus Torvalds 提交于
      * git://git.infradead.org/ubifs-2.6:
        UBIFS: fix return code in check_leaf
        UBI: flush wl before clearing update marker
        MAINTAINERS: change e-mail of Artem Bityutskiy
        UBIFS: remove manual O_SYNC handling
        UBIFS: support mounting of UBI volume character devices
        UBI: Add ubi_open_volume_path
      fc1495bf
  3. 10 12月, 2009 24 次提交