1. 17 3月, 2011 23 次提交
  2. 16 3月, 2011 17 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 3ae2a1ce
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Don't use _raw version of RCU dereference
        GFS2: Adding missing unlock_page()
        GFS2: Update to AIL list locking
        GFS2: introduce AIL lock
        GFS2: fix block allocation check for fallocate
        GFS2: Optimize glock multiple-dequeue code
        GFS2: Remove potential race in flock code
        GFS2: Fix glock deallocation race
        GFS2: quota allows exceeding hard limit
        GFS2: deallocation performance patch
        GFS2: panics on quotacheck update
        GFS2: Improve cluster mmap scalability
        GFS2: Fix glock queue trace point
        GFS2: Post-VFS scale update for RCU path walk
        GFS2: Use RCU for glock hash table
      3ae2a1ce
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 26a992db
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: (46 commits)
        fs/9p: Make the writeback_fid owned by root
        fs/9p: Writeback dirty data before setattr
        fs/9p: call vmtruncate before setattr 9p opeation
        fs/9p: Properly update inode attributes on link
        fs/9p: Prevent multiple inclusion of same header
        fs/9p: Workaround vfs rename rehash bug
        fs/9p: Mark directory inode invalid for many directory inode operations
        fs/9p: Add . and .. dentry revalidation flag
        fs/9p: mark inode attribute invalid on rename, unlink and setattr
        fs/9p: Add support for marking inode attribute invalid
        fs/9p: Initialize root inode number for dotl
        fs/9p: Update link count correctly on different file system operations
        fs/9p: Add drop_inode 9p callback
        fs/9p: Add direct IO support in cached mode
        fs/9p: Fix inode i_size update in file_write
        fs/9p: set default readahead pages in cached mode
        fs/9p: Move writeback fid to v9fs_inode
        fs/9p: Add v9fs_inode
        fs/9p: Don't set stat.st_blocks based on nrpages
        fs/9p: Add inode hashing
        ...
      26a992db
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · abab012a
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (29 commits)
        ahci: add another PCI ID for marvell
        libata: Use 'bool' return value for ata_id_XXX
        sata_fsl: Update RX_WATER_MARK for TRANSCFG
        sata_fsl: Fix wrong Device Error Register usage
        libata: Include WWN ID in inquiry VPD emulation
        ata/pata_arasan_cf: fill dma chan->private from pdata->dma_priv
        ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_<level>
        pata_arasan_cf: fix printk format string warning
        pata_arasan_cf: Adding support for arasan compact flash host controller
        libata-sff: add ata_sff_queue_work() & ata_sff_queue_delayed_work()
        ahci: AHCI mode SATA patch for Intel Patsburg SATA RAID controller
        ahci: recognize Marvell 88se9125 PCIe SATA 6.0 Gb/s controller
        libata: remove ATA_FLAG_LPM
        libata: remove ATA_FLAG_NO_LEGACY
        libata: remove ATA_FLAG_MMIO
        libata: remove ATA_FLAG_{SRST|SATA_RESET}
        ipr/sas_ata: use mode mask macros from <linux/ata.h>
        sata_dwc_460ex: add debugging options
        sata_dwc_460ex: fix misuse of ata_get_cmd_descript()
        sata_dwc_460ex: fix return value of dma_dwc_xfer_setup()
        ...
      abab012a
    • I
      Merge branch 'x86/amd-nb' into x86/urgent · 344c21c3
      Ingo Molnar 提交于
      Merge reason: This is one followup commit that was not in x86/mm - merge it via the urgent path
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      344c21c3
    • L
      Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 79d8a8f7
      Linus Torvalds 提交于
      * 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu, x86: Add arch-specific this_cpu_cmpxchg_double() support
        percpu: Generic support for this_cpu_cmpxchg_double()
        alpha: use L1_CACHE_BYTES for cacheline size in the linker script
        percpu: align percpu readmostly subsection to cacheline
      
      Fix up trivial conflict in arch/x86/kernel/vmlinux.lds.S due to the
      percpu alignment having changed ("x86: Reduce back the alignment of the
      per-CPU data section")
      79d8a8f7
    • L
      Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · bd2895ee
      Linus Torvalds 提交于
      * 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix build failure introduced by s/freezeable/freezable/
        workqueue: add system_freezeable_wq
        rds/ib: use system_wq instead of rds_ib_fmr_wq
        net/9p: replace p9_poll_task with a work
        net/9p: use system_wq instead of p9_mux_wq
        xfs: convert to alloc_workqueue()
        reiserfs: make commit_wq use the default concurrency level
        ocfs2: use system_wq instead of ocfs2_quota_wq
        ext4: convert to alloc_workqueue()
        scsi/scsi_tgt_lib: scsi_tgtd isn't used in memory reclaim path
        scsi/be2iscsi,qla2xxx: convert to alloc_workqueue()
        misc/iwmc3200top: use system_wq instead of dedicated workqueues
        i2o: use alloc_workqueue() instead of create_workqueue()
        acpi: kacpi*_wq don't need WQ_MEM_RECLAIM
        fs/aio: aio_wq isn't used in memory reclaim path
        input/tps6507x-ts: use system_wq instead of dedicated workqueue
        cpufreq: use system_wq instead of dedicated workqueues
        wireless/ipw2x00: use system_wq instead of dedicated workqueues
        arm/omap: use system_wq in mailbox
        workqueue: use WQ_MEM_RECLAIM instead of WQ_RESCUER
      bd2895ee
    • L
      Merge branch 'core-rcu-for-linus' of... · 016aa2ed
      Linus Torvalds 提交于
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        smp: Document transitivity for memory barriers.
        rcu: add comment saying why DEBUG_OBJECTS_RCU_HEAD depends on PREEMPT.
        rcupdate: remove dead code
        rcu: add documentation saying which RCU flavor to choose
        rcutorture: Get rid of duplicate sched.h include
        rcu: call __rcu_read_unlock() in exit_rcu for tiny RCU
      016aa2ed
    • L
      Increase OSF partition limit from 8 to 18 · 34d211a2
      Linus Torvalds 提交于
      It turns out that while a maximum of 8 partitions may be what people
      "should" have had, you can actually fit up to 18 entries(*) in a sector.
      
      And some people clearly were taking advantage of that, like Michael
      Cree, who had ten partitions on one of his OSF disks.
      
      (*) The OSF partition data starts at byte offset 64 in the first sector,
          and the array of 16-byte partition entries start at offset 148 in
          the on-disk partition structure.
      Reported-by: NMichael Cree <mcree@orcon.net.nz>
      Cc: stable@kernel.org (v2.6.38)
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      34d211a2
    • C
      prune back iprune_sem · bab1d944
      Christoph Hellwig 提交于
      iprune_sem is continously giving us lockdep warnings because we do take it in
      read mode in the reclaim path, but we're also doing non-NOFS allocations under
      it taken in write mode.
      
      Taking a bit deeper look at it I think it's fixable quite trivially:
      
       - for invalidate_inodes we do not need iprune_sem at all.  We have an active
         reference on the superblock, so the filesystem is not going away until it
         has finished.
       - for evict_inodes we do need it, to make sure prune_icache has done it's
         work before we tear down the superblock.  But there is no reason to
         hold it over the actual reclaim operation - it's enough to cycle through
         it after the actual reclaim to make sure we wait for any pending
         prune_icache to complete.  We just have to remove the WARN_ON for
         otherwise busy inodes as they can actually happen now.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      bab1d944
    • S
      vfs: add nonconflicting values for O_PATH · 5229645b
      Stephen Rothwell 提交于
      [AV: on architectures where default conflicts with existing
      flags, that is]
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      5229645b
    • B
      x86, AMD: Set ARAT feature on AMD processors · b87cf80a
      Boris Ostrovsky 提交于
      Support for Always Running APIC timer (ARAT) was introduced in
      commit db954b58. This feature
      allows us to avoid switching timers from LAPIC to something else
      (e.g. HPET) and go into timer broadcasts when entering deep
      C-states.
      
      AMD processors don't provide a CPUID bit for that feature but
      they also keep APIC timers running in deep C-states (except for
      cases when the processor is affected by erratum 400). Therefore
      we should set ARAT feature bit on AMD CPUs.
      Tested-by: NBorislav Petkov <borislav.petkov@amd.com>
      Acked-by: NAndreas Herrmann <andreas.herrmann3@amd.com>
      Acked-by: NMark Langsdorf <mark.langsdorf@amd.com>
      Acked-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NBoris Ostrovsky <boris.ostrovsky@amd.com>
      LKML-Reference: <1300205624-4813-1-git-send-email-ostr@amd64.org>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      b87cf80a
    • A
      x86, quirk: Fix SB600 revision check · 1d3e09a3
      Andreas Herrmann 提交于
      Commit 7f74f8f2
      (x86 quirk: Fix polarity for IRQ0 pin2 override on SB800
      systems) introduced a regression. It removed some SB600 specific
      code to determine the revision ID without adapting a
      corresponding revision ID check for SB600.
      
      See this mail thread:
      
        http://marc.info/?l=linux-kernel&m=129980296006380&w=2
      
      This patch adapts the corresponding check to cover all SB600
      revisions.
      Tested-by: NWang Lei <f3d27b@gmail.com>
      Signed-off-by: NAndreas Herrmann <andreas.herrmann3@amd.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: stable@kernel.org # 38.x, 37.x, 32.x
      LKML-Reference: <20110315143137.GD29499@alberich.amd.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      1d3e09a3
    • A
      fix follow_link() breakage · 0e794589
      Al Viro 提交于
      commit 574197e0 had a missing
      piece, breaking the loop detection ;-/
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      0e794589
    • L
      Merge branch 'x86-platform-for-linus' of... · d1090281
      Linus Torvalds 提交于
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
        x86: Clean up apic.c and apic.h
        x86: Remove superflous goal definition of tsc_sync
        x86: dt: Correct local apic documentation in device tree bindings
        x86: dt: Cleanup local apic setup
        x86: dt: Fix OLPC=y/INTEL_CE=n build
        rtc: cmos: Add OF bindings
        x86: ce4100: Use OF to setup devices
        x86: ioapic: Add OF bindings for IO_APIC
        x86: dtb: Add generic bus probe
        x86: dtb: Add support for PCI devices backed by dtb nodes
        x86: dtb: Add device tree support for HPET
        x86: dtb: Add early parsing of IO_APIC
        x86: dtb: Add irq domain abstraction
        x86: dtb: Add a device tree for CE4100
        x86: Add device tree support
        x86: e820: Remove conditional early mapping in parse_e820_ext
        x86: OLPC: Make OLPC=n build again
        x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection
        x86: OLPC: Cleanup config maze completely
        x86: OLPC: Hide OLPC_OPENFIRMWARE config switch
        ...
      
      Fix up conflicts in arch/x86/platform/ce4100/ce4100.c
      d1090281
    • L
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 181f977d
      Linus Torvalds 提交于
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (93 commits)
        x86, tlb, UV: Do small micro-optimization for native_flush_tlb_others()
        x86-64, NUMA: Don't call numa_set_distanc() for all possible node combinations during emulation
        x86-64, NUMA: Don't assume phys node 0 is always online in numa_emulation()
        x86-64, NUMA: Clean up initmem_init()
        x86-64, NUMA: Fix numa_emulation code with node0 without RAM
        x86-64, NUMA: Revert NUMA affine page table allocation
        x86: Work around old gas bug
        x86-64, NUMA: Better explain numa_distance handling
        x86-64, NUMA: Fix distance table handling
        mm: Move early_node_map[] reverse scan helpers under HAVE_MEMBLOCK
        x86-64, NUMA: Fix size of numa_distance array
        x86: Rename e820_table_* to pgt_buf_*
        bootmem: Move __alloc_memory_core_early() to nobootmem.c
        bootmem: Move contig_page_data definition to bootmem.c/nobootmem.c
        bootmem: Separate out CONFIG_NO_BOOTMEM code into nobootmem.c
        x86-64, NUMA: Seperate out numa_alloc_distance() from numa_set_distance()
        x86-64, NUMA: Add proper function comments to global functions
        x86-64, NUMA: Move NUMA emulation into numa_emulation.c
        x86-64, NUMA: Prepare numa_emulation() for moving NUMA emulation into a separate file
        x86-64, NUMA: Do not scan two times for setup_node_bootmem()
        ...
      
      Fix up conflicts in arch/x86/kernel/smpboot.c
      181f977d
    • L
      Merge branch 'x86-mem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · d5d42399
      Linus Torvalds 提交于
      * 'x86-mem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86-64, mem: Convert memmove() to assembly file and fix return value bug
      d5d42399
    • L
      Merge branch 'x86-microcode-for-linus' of... · 209b6c8f
      Linus Torvalds 提交于
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, microcode, AMD: Fix signedness bug in generic_load_microcode()
        x86, microcode, AMD: Extend ucode size verification
        x86, microcode, AMD: Cleanup dmesg output
        x86, microcode, AMD: Remove unneeded memset call
        x86, microcode, AMD: Simplify get_next_ucode
        x86, microcode, AMD: Simplify install_equiv_cpu_table
        x86, microcode, AMD: Release firmware on error
        x86, microcode: Correct sysdev_add error path
      209b6c8f