1. 17 3月, 2011 4 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · fc82e1d5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (21 commits)
        PM / Hibernate: Reduce autotuned default image size
        PM / Core: Introduce struct syscore_ops for core subsystems PM
        PM QoS: Make pm_qos settings readable
        PM / OPP: opp_find_freq_exact() documentation fix
        PM: Documentation/power/states.txt: fix repetition
        PM: Make system-wide PM and runtime PM treat subsystems consistently
        PM: Simplify kernel/power/Kconfig
        PM: Add support for device power domains
        PM: Drop pm_flags that is not necessary
        PM: Allow pm_runtime_suspend() to succeed during system suspend
        PM: Clean up PM_TRACE dependencies and drop unnecessary Kconfig option
        PM: Remove CONFIG_PM_OPS
        PM: Reorder power management Kconfig options
        PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)
        PM / ACPI: Remove references to pm_flags from bus.c
        PM: Do not create wakeup sysfs files for devices that cannot wake up
        USB / Hub: Do not call device_set_wakeup_capable() under spinlock
        PM: Use appropriate printk() priority level in trace.c
        PM / Wakeup: Don't update events_check_enabled in pm_get_wakeup_count()
        PM / Wakeup: Make pm_save_wakeup_count() work as documented
        ...
      fc82e1d5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 48d5f673
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/cma: Replace global lock in rdma_destroy_id() with id-specific one
        IB/cm: Cancel pending LAP message when exiting IB_CM_ESTABLISH state
        IB/cm: Bump reference count on cm_id before invoking callback
        RDMA/cma: Fix crash in request handlers
        IB/ipath: Don't reset disabled devices
        IB/qib: Fix M_Key field in SubnGet and SubnGetResp MADs
        IB/qib: Set default LE2 value for active cables to 0
        RDMA/cxgb4: Debugfs dump_qp() updates
        RDMA/cxgb4: Dispatch FATAL event on EEH errors
        RDMA/cxgb4: Use ULP_MODE_TCPDDP
        RDMA/cxgb4: Enable on-chip SQ support by default
        RDMA/cxgb4: Do CIDX_INC updates every 1/16 CQ depth CQE reaps
        RDMA/cxgb4: Remove db_drop_task
        RDMA/cxgb4: Turn on delayed ACK
        IB/qib: Return correct MAD when setting link width to 255
      48d5f673
    • L
      Merge branch 'for-linus' of... · 0f6e0e84
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (33 commits)
        AppArmor: kill unused macros in lsm.c
        AppArmor: cleanup generated files correctly
        KEYS: Add an iovec version of KEYCTL_INSTANTIATE
        KEYS: Add a new keyctl op to reject a key with a specified error code
        KEYS: Add a key type op to permit the key description to be vetted
        KEYS: Add an RCU payload dereference macro
        AppArmor: Cleanup make file to remove cruft and make it easier to read
        SELinux: implement the new sb_remount LSM hook
        LSM: Pass -o remount options to the LSM
        SELinux: Compute SID for the newly created socket
        SELinux: Socket retains creator role and MLS attribute
        SELinux: Auto-generate security_is_socket_class
        TOMOYO: Fix memory leak upon file open.
        Revert "selinux: simplify ioctl checking"
        selinux: drop unused packet flow permissions
        selinux: Fix packet forwarding checks on postrouting
        selinux: Fix wrong checks for selinux_policycap_netpeer
        selinux: Fix check for xfrm selinux context algorithm
        ima: remove unnecessary call to ima_must_measure
        IMA: remove IMA imbalance checking
        ...
      0f6e0e84
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 0d2ecee2
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: tcrypt - do not attempt to write to readonly variable
        random: update interface comments to reflect reality
        crypto: picoxcell - add support for the picoxcell crypto engines
        crypto: sha1 - Add test vector to test partial block processing
        hwrng: omap - Convert release_resource to release_region/release_mem_region
        crypto: aesni-intel - Fix remaining leak in rfc4106_set_hash_key
        crypto: omap-sham - don't treat NULL clk as an error
        crypto: omap-aes - don't treat NULL clk as an error
        crypto: testmgr - mark ghash as fips_allowed
        crypto: testmgr - mark xts(aes) as fips_allowed
        crypto: skcipher - remove redundant NULL check
        hwrng: pixocell - add support for picoxcell TRNG
        crypto: aesni-intel - Don't leak memory in rfc4106_set_hash_subkey
      0d2ecee2
  2. 16 3月, 2011 36 次提交
    • 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
    • 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
    • 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
    • L
      Merge branch 'um-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 0310e437
      Linus Torvalds 提交于
      * 'um-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        um: Select GENERIC_HARDIRQS_NO_DEPRECATED
        um: Use proper accessors in show_interrupts()
        um: Convert irq_chips to new functions
        um: Remove stale irq_chip.end
      0310e437
    • L
      Merge branch 'irq-core-for-linus' of... · 5f6fb454
      Linus Torvalds 提交于
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (116 commits)
        x86: Enable forced interrupt threading support
        x86: Mark low level interrupts IRQF_NO_THREAD
        x86: Use generic show_interrupts
        x86: ioapic: Avoid redundant lookup of irq_cfg
        x86: ioapic: Use new move_irq functions
        x86: Use the proper accessors in fixup_irqs()
        x86: ioapic: Use irq_data->state
        x86: ioapic: Simplify irq chip and handler setup
        x86: Cleanup the genirq name space
        genirq: Add chip flag to force mask on suspend
        genirq: Add desc->irq_data accessor
        genirq: Add comments to Kconfig switches
        genirq: Fixup fasteoi handler for oneshot mode
        genirq: Provide forced interrupt threading
        sched: Switch wait_task_inactive to schedule_hrtimeout()
        genirq: Add IRQF_NO_THREAD
        genirq: Allow shared oneshot interrupts
        genirq: Prepare the handling of shared oneshot interrupts
        genirq: Make warning in handle_percpu_event useful
        x86: ioapic: Move trigger defines to io_apic.h
        ...
      
      Fix up trivial(?) conflicts in arch/x86/pci/xen.c due to genirq name
      space changes clashing with the Xen cleanups.  The set_irq_msi() had
      moved to xen_bind_pirq_msi_to_irq().
      5f6fb454
    • L
      Merge branch 'x86-debug-for-linus' of... · 3904afb4
      Linus Torvalds 提交于
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Combine printk()s in show_regs_common()
        x86: Don't call dump_stack() from arch_trigger_all_cpu_backtrace_handler()
      3904afb4
    • L
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 502f4d4f
      Linus Torvalds 提交于
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Fix and clean up generic_processor_info()
        x86: Don't copy per_cpu cpuinfo for BSP two times
        x86: Move llc_shared_map out of cpu_info
      502f4d4f
    • L
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · da849abe
      Linus Torvalds 提交于
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, binutils, xen: Fix another wrong size directive
        x86: Remove dead config option X86_CPU
        x86: Really print supported CPUs if PROCESSOR_SELECT=y
        x86: Fix a bogus unwind annotation in lib/semaphore_32.S
        um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S
        x86: Remove unused bits from lib/thunk_*.S
        x86: Use {push,pop}_cfi in more places
        x86-64: Add CFI annotations to lib/rwsem_64.S
        x86, asm: Cleanup unnecssary macros in asm-offsets.c
        x86, system.h: Drop unused __SAVE/__RESTORE macros
        x86: Use bitmap library functions
        x86: Partly unify asm-offsets_{32,64}.c
        x86: Reduce back the alignment of the per-CPU data section
      da849abe
    • L
      Merge branch 'timers-rtc-for-linus' of... · 21a32816
      Linus Torvalds 提交于
      Merge branch 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer
        RTC: sa1100: Update the sa1100 RTC driver.
        RTC: Fix the cross interrupt issue on rtc-test.
        RTC: Remove UIE and PIE information from the sa1100 driver proc.
        RTC: Include information about UIE and PIE in RTC driver proc.
        RTC: Clean out UIE icotl implementations
        RTC: Cleanup rtc_class_ops->update_irq_enable()
        RTC: Cleanup rtc_class_ops->irq_set_freq()
        RTC: Cleanup rtc_class_ops->irq_set_state
        RTC: Initialize kernel state from RTC
      21a32816
    • L
      Merge branch 'timers-core-for-linus' of... · 420c1c57
      Linus Torvalds 提交于
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (62 commits)
        posix-clocks: Check write permissions in posix syscalls
        hrtimer: Remove empty hrtimer_init_hres_timer()
        hrtimer: Update hrtimer->state documentation
        hrtimer: Update base[CLOCK_BOOTTIME].offset correctly
        timers: Export CLOCK_BOOTTIME via the posix timers interface
        timers: Add CLOCK_BOOTTIME hrtimer base
        time: Extend get_xtime_and_monotonic_offset() to also return sleep
        time: Introduce get_monotonic_boottime and ktime_get_boottime
        hrtimers: extend hrtimer base code to handle more then 2 clockids
        ntp: Remove redundant and incorrect parameter check
        mn10300: Switch do_timer() to xtimer_update()
        posix clocks: Introduce dynamic clocks
        posix-timers: Cleanup namespace
        posix-timers: Add support for fd based clocks
        x86: Add clock_adjtime for x86
        posix-timers: Introduce a syscall for clock tuning.
        time: Splitout compat timex accessors
        ntp: Add ADJ_SETOFFSET mode bit
        time: Introduce timekeeping_inject_offset
        posix-timer: Update comment
        ...
      
      Fix up new system-call-related conflicts in
      	arch/x86/ia32/ia32entry.S
      	arch/x86/include/asm/unistd_32.h
      	arch/x86/include/asm/unistd_64.h
      	arch/x86/kernel/syscall_table_32.S
      (name_to_handle_at()/open_by_handle_at() vs clock_adjtime()), and some
      due to movement of get_jiffies_64() in:
      	kernel/time.c
      420c1c57
    • L
      Merge branch 'sched-core-for-linus' of... · 9620639b
      Linus Torvalds 提交于
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
        sched: Resched proper CPU on yield_to()
        sched: Allow users with sufficient RLIMIT_NICE to change from SCHED_IDLE policy
        sched: Allow SCHED_BATCH to preempt SCHED_IDLE tasks
        sched: Clean up the IRQ_TIME_ACCOUNTING code
        sched: Add #ifdef around irq time accounting functions
        sched, autogroup: Stop claiming ownership of the root task group
        sched, autogroup: Stop going ahead if autogroup is disabled
        sched, autogroup, sysctl: Use proc_dointvec_minmax() instead
        sched: Fix the group_imb logic
        sched: Clean up some f_b_g() comments
        sched: Clean up remnants of sd_idle
        sched: Wholesale removal of sd_idle logic
        sched: Add yield_to(task, preempt) functionality
        sched: Use a buddy to implement yield_task_fair()
        sched: Limit the scope of clear_buddies
        sched: Check the right ->nr_running in yield_task_fair()
        sched: Avoid expensive initial update_cfs_load(), on UP too
        sched: Fix switch_from_fair()
        sched: Simplify the idle scheduling class
        softirqs: Account ksoftirqd time as cpustat softirq
        ...
      9620639b
    • L
      Merge branch 'perf-core-for-linus' of... · a926021c
      Linus Torvalds 提交于
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (184 commits)
        perf probe: Clean up probe_point_lazy_walker() return value
        tracing: Fix irqoff selftest expanding max buffer
        tracing: Align 4 byte ints together in struct tracer
        tracing: Export trace_set_clr_event()
        tracing: Explain about unstable clock on resume with ring buffer warning
        ftrace/graph: Trace function entry before updating index
        ftrace: Add .ref.text as one of the safe areas to trace
        tracing: Adjust conditional expression latency formatting.
        tracing: Fix event alignment: skb:kfree_skb
        tracing: Fix event alignment: mce:mce_record
        tracing: Fix event alignment: kvm:kvm_hv_hypercall
        tracing: Fix event alignment: module:module_request
        tracing: Fix event alignment: ftrace:context_switch and ftrace:wakeup
        tracing: Remove lock_depth from event entry
        perf header: Stop using 'self'
        perf session: Use evlist/evsel for managing perf.data attributes
        perf top: Don't let events to eat up whole header line
        perf top: Fix events overflow in top command
        ring-buffer: Remove unused #include <linux/trace_irq.h>
        tracing: Add an 'overwrite' trace_option.
        ...
      a926021c
    • L
      Merge branch 'core-locking-for-linus' of... · 0586bed3
      Linus Torvalds 提交于
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rtmutex: tester: Remove the remaining BKL leftovers
        lockdep/timers: Explain in detail the locking problems del_timer_sync() may cause
        rtmutex: Simplify PI algorithm and make highest prio task get lock
        rwsem: Remove redundant asmregparm annotation
        rwsem: Move duplicate function prototypes to linux/rwsem.h
        rwsem: Unify the duplicate rwsem_is_locked() inlines
        rwsem: Move duplicate init macros and functions to linux/rwsem.h
        rwsem: Move duplicate struct rwsem declaration to linux/rwsem.h
        x86: Cleanup rwsem_count_t typedef
        rwsem: Cleanup includes
        locking: Remove deprecated lock initializers
        cred: Replace deprecated spinlock initialization
        kthread: Replace deprecated spinlock initialization
        xtensa: Replace deprecated spinlock initialization
        um: Replace deprecated spinlock initialization
        sparc: Replace deprecated spinlock initialization
        mips: Replace deprecated spinlock initialization
        cris: Replace deprecated spinlock initialization
        alpha: Replace deprecated spinlock initialization
        rtmutex-tester: Remove BKL tests
      0586bed3
    • L
      Merge branch 'core-futexes-for-linus' of... · b80cd62b
      Linus Torvalds 提交于
      Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        arm: Remove bogus comment in futex_atomic_cmpxchg_inatomic()
        futex: Deobfuscate handle_futex_death()
        plist: Add priority list test
        plist: Shrink struct plist_head
        futex,plist: Remove debug lock assignment from plist_node
        futex,plist: Pass the real head of the priority list to plist_del()
        futex: Sanitize futex ops argument types
        futex: Sanitize cmpxchg_futex_value_locked API
        futex: Remove redundant pagefault_disable in futex_atomic_cmpxchg_inatomic()
        futex: Avoid redudant evaluation of task_pid_vnr()
        futex: Update futex_wait_setup comments about locking
      b80cd62b
    • L
      Merge branch 'core-debugobjects-for-linus' of... · c345f60a
      Linus Torvalds 提交于
      Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        debugobjects: Add hint for better object identification
      c345f60a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 422e6c4b
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (57 commits)
        tidy the trailing symlinks traversal up
        Turn resolution of trailing symlinks iterative everywhere
        simplify link_path_walk() tail
        Make trailing symlink resolution in path_lookupat() iterative
        update nd->inode in __do_follow_link() instead of after do_follow_link()
        pull handling of one pathname component into a helper
        fs: allow AT_EMPTY_PATH in linkat(), limit that to CAP_DAC_READ_SEARCH
        Allow passing O_PATH descriptors via SCM_RIGHTS datagrams
        readlinkat(), fchownat() and fstatat() with empty relative pathnames
        Allow O_PATH for symlinks
        New kind of open files - "location only".
        ext4: Copy fs UUID to superblock
        ext3: Copy fs UUID to superblock.
        vfs: Export file system uuid via /proc/<pid>/mountinfo
        unistd.h: Add new syscalls numbers to asm-generic
        x86: Add new syscalls for x86_64
        x86: Add new syscalls for x86_32
        fs: Remove i_nlink check from file system link callback
        fs: Don't allow to create hardlink for deleted file
        vfs: Add open by file handle support
        ...
      422e6c4b
    • T
      VFS: Fix the nfs sillyrename regression in kernel 2.6.38 · c83ce989
      Trond Myklebust 提交于
      The new vfs locking scheme introduced in 2.6.38 breaks NFS sillyrename
      because the latter relies on being able to determine the parent
      directory of the dentry in the ->iput() callback in order to send the
      appropriate unlink rpc call.
      
      Looking at the code that cares about races with dput(), there doesn't
      seem to be anything that specifically uses d_parent as a test for
      whether or not there is a race:
        - __d_lookup_rcu(), __d_lookup() all test for d_hashed() after d_parent
        - shrink_dcache_for_umount() is safe since nothing else can rearrange
          the dentries in that super block.
        - have_submount(), select_parent() and d_genocide() can test for a
          deletion if we set the DCACHE_DISCONNECTED flag when the dentry
          is removed from the parent's d_subdirs list.
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      Cc: stable@kernel.org (2.6.38, needs commit c826cb7d "dcache.c:
      	create helper function for duplicated functionality" )
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c83ce989
    • J
      Merge branch 'next' into for-linus · a002951c
      James Morris 提交于
      a002951c
    • L
      dcache.c: create helper function for duplicated functionality · c826cb7d
      Linus Torvalds 提交于
      This creates a helper function for he "try to ascend into the parent
      directory" case, which was written out in triplicate before.  With all
      the locking and subtle sequence number stuff, we really don't want to
      duplicate that kind of code.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c826cb7d
    • A
      tidy the trailing symlinks traversal up · 574197e0
      Al Viro 提交于
      * pull the handling of current->total_link_count into
      __do_follow_link()
      * put the common "do ->put_link() if needed and path_put() the link"
        stuff into a helper (put_link(nd, link, cookie))
      * rename __do_follow_link() to follow_link(), while we are at it
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      574197e0
    • A
      Turn resolution of trailing symlinks iterative everywhere · b356379a
      Al Viro 提交于
      The last remaining place (resolution of nested symlink) converted
      to the loop of the same kind we have in path_lookupat() and
      path_openat().
      
      Note that we still *do* have a recursion in pathname resolution;
      can't avoid it, really.  However, it's strictly for nested symlinks
      now - i.e. ones in the middle of a pathname.
      
      link_path_walk() has lost the tail now - it always walks everything
      except the last component.
      
      do_follow_link() renamed to nested_symlink() and moved down.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      b356379a
    • A
      simplify link_path_walk() tail · ce052544
      Al Viro 提交于
      Now that link_path_walk() is called without LOOKUP_PARENT
      only from do_follow_link(), we can simplify the checks in
      last component handling.  First of all, checking if we'd
      arrived to a directory is not needed - the caller will check
      it anyway.  And LOOKUP_FOLLOW is guaranteed to be there,
      since we only get to that place with nd->depth > 0.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      ce052544
    • A
      Make trailing symlink resolution in path_lookupat() iterative · bd92d7fe
      Al Viro 提交于
      Now the only caller of link_path_walk() that does *not* pass
      LOOKUP_PARENT is do_follow_link()
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      bd92d7fe
    • A
      update nd->inode in __do_follow_link() instead of after do_follow_link() · b21041d0
      Al Viro 提交于
      ... and note that we only need to do it for LAST_BIND symlinks
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      b21041d0
    • A
      pull handling of one pathname component into a helper · ce57dfc1
      Al Viro 提交于
      new helper: walk_component().  Handles everything except symlinks;
      returns negative on error, 0 on success and 1 on symlinks we decided
      to follow.  Drops out of RCU mode on such symlinks.
      
      link_path_walk() and do_last() switched to using that.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      ce57dfc1