1. 23 10月, 2010 27 次提交
  2. 22 10月, 2010 13 次提交
    • L
      Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 91151240
      Linus Torvalds 提交于
      * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE
        x86: Move alloc_desk_mask variables inside ifdef
        x86-32: Align IRQ stacks properly
        x86: Remove CONFIG_4KSTACKS
        x86: Always use irq stacks
      
      Fixed up trivial conflicts in include/linux/{irq.h, percpu-defs.h}
      91151240
    • L
      Merge branch 'x86-timers-for-linus' of... · 211baf4f
      Linus Torvalds 提交于
      Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Hpet: Avoid the comparator readback penalty
      211baf4f
    • A
      bluetooth: Fix missing NULL check · c19483cc
      Alan Cox 提交于
      Fortunately this is only exploitable on very unusual hardware.
      
      [Reported a while ago but nothing happened so just fixing it]
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c19483cc
    • D
      pcmcia: IOCARD is also required for using IRQs · ff10fca5
      Dominik Brodowski 提交于
      Dave Hinds pointed out to me that 37979e15 will break b43 and
      ray_cs, as IOCARD is not -- as the name would suggest -- only needed
      for cards using IO ports. Instead, as it re-deines several pins, it
      is also required for using interrupts.
      Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>
      ff10fca5
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · d4429f60
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)
        powerpc/44x: Update ppc44x_defconfig
        powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option
        fsl_rio: Add comments for sRIO registers.
        powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig
        powerpc/fsl-booke: Add p5020 DS board support
        powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips
        powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes
        powerpc/fsl-booke: Add support for FSL 64-bit e5500 core
        powerpc/85xx: add cache-sram support
        powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board
        powerpc: Fix compile error with paca code on ppc64e
        powerpc/fsl-booke: Add p3041 DS board support
        oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.
        powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
        powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers
        powerpc/fsl_booke: Add support to boot from core other than 0
        powerpc/p1022: Add probing for individual DMA channels
        powerpc/fsl_soc: Search all global-utilities nodes for rstccr
        powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT
        powerpc/mpc83xx: Support for MPC8308 P1M board
        ...
      
      Fix up conflict with the generic irq_work changes in arch/powerpc/kernel/time.c
      d4429f60
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · e10117d3
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (26 commits)
        include/linux/libata.h: fix typo
        pata_bf54x: fix return type of bfin_set_devctl
        Drivers: ata: Makefile: replace the use of <module>-objs with <module>-y
        libahci: fix result_tf handling after an ATA PIO data-in command
        pata_sl82c105: implement sff_irq_check() method
        pata_sil680: implement sff_irq_check() method
        pata_pdc202xx_old: implement sff_irq_check() method
        pata_cmd640: implement sff_irq_check() method
        ata_piix: Add device ID for ICH4-L
        pata_sil680: make sil680_sff_exec_command() 'static'
        ata: Intel IDE-R support
        libata: reorder ata_queued_cmd to remove alignment padding on 64 bit builds
        libata: Signal that our SATL supports WRITE SAME(16) with UNMAP
        ata_piix: remove SIDPR locking
        libata: implement cross-port EH exclusion
        libata: add @ap to ata_wait_register() and introduce ata_msleep()
        ata_piix: implement LPM support
        libata: implement LPM support for port multipliers
        libata: reimplement link power management
        libata: implement sata_link_scr_lpm() and make ata_dev_set_feature() global
        ...
      e10117d3
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · f3270b16
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (48 commits)
        ocfs2: Avoid to evaluate xattr block flags again.
        ocfs2/cluster: Release debugfs file elapsed_time_in_ms
        ocfs2: Add a mount option "coherency=*" to handle cluster coherency for O_DIRECT writes.
        Initialize max_slots early
        When I tried to compile I got the following warning: fs/ocfs2/slot_map.c: In function ‘ocfs2_init_slot_info’: fs/ocfs2/slot_map.c:360: warning: ‘bytes’ may be used uninitialized in this function fs/ocfs2/slot_map.c:360: note: ‘bytes’ was declared here Compiler: gcc version 4.4.3 (GCC) on Mandriva I'm not sure why this warning occurs, I think compiler don't know that variable "bytes" is initialized when it is sent by reference to ocfs2_slot_map_physical_size and it throws that ugly warning. However, a simple initialization of "bytes" variable with 0 will fix it.
        ocfs2: validate bg_free_bits_count after update
        ocfs2/cluster: Bump up dlm protocol to version 1.1
        ocfs2/cluster: Show per region heartbeat elapsed time
        ocfs2/cluster: Add mlogs for heartbeat up/down events
        ocfs2/cluster: Create debugfs dir/files for each region
        ocfs2/cluster: Create debugfs files for live, quorum and failed region bitmaps
        ocfs2/cluster: Maintain bitmap of failed regions
        ocfs2/cluster: Maintain bitmap of quorum regions
        ocfs2/cluster: Track bitmap of live heartbeat regions
        ocfs2/cluster: Track number of global heartbeat regions
        ocfs2/cluster: Maintain live node bitmap per heartbeat region
        ocfs2/cluster: Reorganize o2hb debugfs init
        ocfs2/cluster: Check slots for unconfigured live nodes
        ocfs2/cluster: Print messages when adding/removing nodes
        ocfs2/cluster: Print messages when adding/removing heartbeat regions
        ...
      f3270b16
    • L
      Merge branch 'core-memblock-for-linus' of... · 3044100e
      Linus Torvalds 提交于
      Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits)
        x86-64: Only set max_pfn_mapped to 512 MiB if we enter via head_64.S
        xen: Cope with unmapped pages when initializing kernel pagetable
        memblock, bootmem: Round pfn properly for memory and reserved regions
        memblock: Annotate memblock functions with __init_memblock
        memblock: Allow memblock_init to be called early
        memblock/arm: Fix memblock_region_is_memory() typo
        x86, memblock: Remove __memblock_x86_find_in_range_size()
        memblock: Fix wraparound in find_region()
        x86-32, memblock: Make add_highpages honor early reserved ranges
        x86, memblock: Fix crashkernel allocation
        arm, memblock: Fix the sparsemem build
        memblock: Fix section mismatch warnings
        powerpc, memblock: Fix memblock API change fallout
        memblock, microblaze: Fix memblock API change fallout
        x86: Remove old bootmem code
        x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve
        x86: Remove not used early_res code
        x86, memblock: Replace e820_/_early string with memblock_
        x86: Use memblock to replace early_res
        x86, memblock: Use memblock_debug to control debug message print out
        ...
      
      Fix up trivial conflicts in arch/x86/kernel/setup.c and kernel/Makefile
      3044100e
    • A
      include/linux/libata.h: fix typo · 89692c03
      Andrea Gelmini 提交于
      Signed-off-by: NAndrea Gelmini <andrea.gelmini@gelma.net>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      89692c03
    • M
      pata_bf54x: fix return type of bfin_set_devctl · c0695733
      Mike Frysinger 提交于
      The new devctl func added for us to the driver has the wrong return
      type.  Which is to say there shouldn't be any.  This fixes compile
      time warnings as there shouldn't be any runtime difference.
      Signed-off-by: NMike Frysinger <vapier@gentoo.org>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      c0695733
    • T
      Drivers: ata: Makefile: replace the use of <module>-objs with <module>-y · 4b1be934
      Tracey Dent 提交于
      Changed <module>-objs to <module>-y in Makefile.
      Signed-off-by: NTracey Dent <tdent48227@gmail.com>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      4b1be934
    • T
      libahci: fix result_tf handling after an ATA PIO data-in command · 6ad60195
      Tejun Heo 提交于
      ATA devices don't send D2H Reg FIS after an successful ATA PIO data-in
      command.  The host is supposed to take the TF and E_Status of the
      preceding PIO Setup FIS.  Update ahci_qc_fill_rtf() such that it takes
      TF + E_Status from PIO Setup FIS after a successful ATA PIO data-in
      command.
      
      Without this patch, result_tf for such a command is filled with the
      content of the previous D2H Reg FIS which belongs to a previous
      command, which can make the command incorrectly seen as failed.
      
      * Patch updated to grab the whole TF + E_Status from PIO Setup FIS
        instead of just E_Status as suggested by Robert Hancock.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Reported-by: NMark Lord <kernel@teksavvy.com>
      Cc: Robert Hancock <hancockrwd@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      6ad60195
    • S
      f7a437dd