1. 16 Mar, 2011 12 commits
    • Linus Torvalds's avatar
      Merge branch 'um-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 0310e437
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of... · 5f6fb454
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of... · 3904afb4
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 502f4d4f
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · da849abe
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge branch 'timers-rtc-for-linus' of... · 21a32816
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of... · 420c1c57
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · 9620639b
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · a926021c
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of... · 0586bed3
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'core-futexes-for-linus' of... · b80cd62b
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'core-debugobjects-for-linus' of... · c345f60a
      Linus Torvalds authored
      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
  2. 15 Mar, 2011 28 commits