1. 16 3月, 2011 25 次提交
    • 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
    • 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
    • A
      fs: allow AT_EMPTY_PATH in linkat(), limit that to CAP_DAC_READ_SEARCH · 11a7b371
      Aneesh Kumar K.V 提交于
      We don't want to allow creation of private hardlinks by different application
      using the fd passed to them via SCM_RIGHTS. So limit the null relative name
      usage in linkat syscall to CAP_DAC_READ_SEARCH
      Signed-off-by: NAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      11a7b371
    • I
      perf probe: Clean up probe_point_lazy_walker() return value · 5e814dd5
      Ingo Molnar 提交于
      Newer compilers (gcc 4.6) complains about:
      
              return ret < 0 ?: 0;
      
      For the following reason:
      
        util/probe-finder.c: In function ‘probe_point_lazy_walker’:
        util/probe-finder.c:1331:18: error: the omitted middle operand in ?: will always be ‘true’, suggest explicit middle operand [-Werror=parentheses]
      
      And indeed the return value is a somewhat obscure (but correct) value
      of 'true', so return 'ret' instead - this is cleaner and unconfuses
      GCC as well.
      
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      LKML-Reference: <new-submission>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      5e814dd5
    • L
      Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm · 76ca0783
      Linus Torvalds 提交于
      * 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
        xen: suspend: remove xen_hvm_suspend
        xen: suspend: pull pre/post suspend hooks out into suspend_info
        xen: suspend: move arch specific pre/post suspend hooks into generic hooks
        xen: suspend: refactor non-arch specific pre/post suspend hooks
        xen: suspend: add "arch" to pre/post suspend hooks
        xen: suspend: pass extra hypercall argument via suspend_info struct
        xen: suspend: refactor cancellation flag into a structure
        xen: suspend: use HYPERVISOR_suspend for PVHVM case instead of open coding
        xen: switch to new schedop hypercall by default.
        xen: use new schedop interface for suspend
        xen: do not respond to unknown xenstore control requests
        xen: fix compile issue if XEN is enabled but XEN_PVHVM is disabled
        xen: PV on HVM: support PV spinlocks and IPIs
        xen: make the ballon driver work for hvm domains
        xen-blkfront: handle Xen major numbers other than XENVBD
        xen: do not use xen_info on HVM, set pv_info name to "Xen HVM"
        xen: no need to delay xen_setup_shutdown_event for hvm guests anymore
      76ca0783
    • L
      Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup'... · 27d2a8b9
      Linus Torvalds 提交于
      Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/ia64' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: ia64 build broken due to "xen: switch to new schedop hypercall by default."
      
      * 'stable/blkfront-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: Union the blkif_request request specific fields
      
      * 'stable/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: annotate functions which only call into __init at start of day
        xen p2m: annotate variable which appears unused
        xen: events: mark cpu_evtchn_mask_p as __refdata
      27d2a8b9
    • L
      Merge branch 'stable/irq.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 010b8f4e
      Linus Torvalds 提交于
      * 'stable/irq.cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: events: remove dom0 specific xen_create_msi_irq
        xen: events: use xen_bind_pirq_msi_to_irq from xen_create_msi_irq
        xen: events: push set_irq_msi down into xen_create_msi_irq
        xen: events: update pirq_to_irq in xen_create_msi_irq
        xen: events: refactor xen_create_msi_irq slightly
        xen: events: separate MSI PIRQ allocation from PIRQ binding to IRQ
        xen: events: assume PHYSDEVOP_get_free_pirq exists
        xen: pci: collapse apic_register_gsi_xen_hvm and xen_hvm_register_pirq
        xen: events: return irq from xen_allocate_pirq_msi
        xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi
        xen: events: do not leak IRQ from xen_allocate_pirq_msi when no pirq available.
        xen: pci: only define xen_initdom_setup_msi_irqs if CONFIG_XEN_DOM0
      010b8f4e
    • L
      Merge branches 'stable/irq.rework' and 'stable/pcifront-fixes' of... · 397fae08
      Linus Torvalds 提交于
      Merge branches 'stable/irq.rework' and 'stable/pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/irq.rework' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/irq: Cleanup up the pirq_to_irq for DomU PV PCI passthrough guests as well.
        xen: Use IRQF_FORCE_RESUME
        xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend.
        xen: Fix compile error introduced by "switch to new irq_chip functions"
        xen: Switch to new irq_chip functions
        xen: Remove stale irq_chip.end
        xen: events: do not free legacy IRQs
        xen: events: allocate GSIs and dynamic IRQs from separate IRQ ranges.
        xen: events: add xen_allocate_irq_{dynamic, gsi} and xen_free_irq
        xen:events: move find_unbound_irq inside CONFIG_PCI_MSI
        xen: handled remapped IRQs when enabling a pcifront PCI device.
        genirq: Add IRQF_FORCE_RESUME
      
      * 'stable/pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        pci/xen: When free-ing MSI-X/MSI irq->desc also use generic code.
        pci/xen: Cleanup: convert int** to int[]
        pci/xen: Use xen_allocate_pirq_msi instead of xen_allocate_pirq
        xen-pcifront: Sanity check the MSI/MSI-X values
        xen-pcifront: don't use flush_scheduled_work()
      397fae08
    • L
      Merge branches 'stable/p2m-identity.v4.9.1' and 'stable/e820' of... · c7146dd0
      Linus Torvalds 提交于
      Merge branches 'stable/p2m-identity.v4.9.1' and 'stable/e820' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/p2m-identity.v4.9.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/m2p: Check whether the MFN has IDENTITY_FRAME bit set..
        xen/m2p: No need to catch exceptions when we know that there is no RAM
        xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set.
        xen/debugfs: Add 'p2m' file for printing out the P2M layout.
        xen/setup: Set identity mapping for non-RAM E820 and E820 gaps.
        xen/mmu: WARN_ON when racing to swap middle leaf.
        xen/mmu: Set _PAGE_IOMAP if PFN is an identity PFN.
        xen/mmu: Add the notion of identity (1-1) mapping.
        xen: Mark all initial reserved pages for the balloon as INVALID_P2M_ENTRY.
      
      * 'stable/e820' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/e820: Don't mark balloon memory as E820_UNUSABLE when running as guest and fix overflow.
        xen/setup: Inhibit resource API from using System RAM E820 gaps as PCI mem gaps.
      c7146dd0
  2. 15 3月, 2011 15 次提交