1. 22 9月, 2009 10 次提交
    • M
      ixp4xx: arch_idle() documentation fixup · 74c32e72
      Mikael Pettersson 提交于
      The body of the mach-ixp4xx arch_idle() is mysteriously
      disabled by an #if 0 .. #endif. Normally one would expect
      to find a call to cpu_do_idle() there, but that call is
      disabled, even though cpu_do_idle() is implemented for
      XScale cores (and ixp4xx is one).
      
      The explanation can be found in the ixp42x developer's manual
      which states that the XScale core clock and power management
      registers aren't implemented on ixp42x [3.5.2.2].
      
      Also, the disabled code has suffered from bit rot:
      - it checks hlt_counter which is obsolete, as that variable
        and all related code now is private to kernel/process.c
      - it passes too many parameters to cpu_do_idle()
      
      So this patch:
      - adds a comment before the #if 0 to explain why
        cpu_do_idle() mustn't be called on ixp4xx
      - removes the obsolete test of hlt_counter and the
        obsolete parameter to cpu_do_idle()
      
      This is purely a documentation fixup and changes no
      generated code. Even so, it has been tested on an
      ixp420 machine (ds101).
      Signed-off-by: NMikael Pettersson <mikpe@it.uu.se>
      Signed-off-by: NKrzysztof Hałasa <khc@pm.waw.pl>
      74c32e72
    • M
      ixp4xx: timer and clocks cleanups · ceb69a89
      Mikael Pettersson 提交于
      This patch does a few simple cleanups of the ixp4xx timer
      and clocksource/clockevent code in mach-ixp4xx/common.c:
      
      - ixp4xx_clocksource_init() is static and always returns 0,
        which is ignored by its only caller: make it return void
      - ixp4xx_clockevent_init(): ditto
      - ixp4xx_get_cycles() is only referenced locally: make it static
      - use the ixp4xx_timer_irq.dev_id field to pass &clockevent_ixp4xx
        to ixp4xx_timer_interrupt() via its dev_id parameter, allowing
        the code in ixp4xx_timer_interrupt() to be smaller and faster
      
      Tested on an ixp420 machine (ds101).
      Signed-off-by: NMikael Pettersson <mikpe@it.uu.se>
      Signed-off-by: NKrzysztof Hałasa <khc@pm.waw.pl>
      ceb69a89
    • L
      Merge branch 'perfcounters-rename-for-linus' of... · 43c1266c
      Linus Torvalds 提交于
      Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf: Tidy up after the big rename
        perf: Do the big rename: Performance Counters -> Performance Events
        perf_counter: Rename 'event' to event_id/hw_event
        perf_counter: Rename list_entry -> group_entry, counter_list -> group_list
      
      Manually resolved some fairly trivial conflicts with the tracing tree in
      include/trace/ftrace.h and kernel/trace/trace_syscalls.c.
      43c1266c
    • L
      Merge branch 'core-fixes-for-linus' of... · b8c7f1dc
      Linus Torvalds 提交于
      Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rcu: Fix whitespace inconsistencies
        rcu: Fix thinko, actually initialize full tree
        rcu: Apply results of code inspection of kernel/rcutree_plugin.h
        rcu: Add WARN_ON_ONCE() consistency checks covering state transitions
        rcu: Fix synchronize_rcu() for TREE_PREEMPT_RCU
        rcu: Simplify rcu_read_unlock_special() quiescent-state accounting
        rcu: Add debug checks to TREE_PREEMPT_RCU for premature grace periods
        rcu: Kconfig help needs to say that TREE_PREEMPT_RCU scales down
        rcutorture: Occasionally delay readers enough to make RCU force_quiescent_state
        rcu: Initialize multi-level RCU grace periods holding locks
        rcu: Need to update rnp->gpnum if preemptable RCU is to be reliable
      b8c7f1dc
    • L
      Merge branch 'perfcounters-fixes-for-linus' of... · f4eccb6d
      Linus Torvalds 提交于
      Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf_counter, powerpc, sparc: Fix compilation after perf_counter_overflow() change
        perf_counter: x86: Fix PMU resource leak
        perf util: SVG performance improvements
        perf util: Make the timechart SVG width dynamic
        perf timechart: Show the duration of scheduler delays in the SVG
        perf timechart: Show the name of the waker/wakee in timechart
      f4eccb6d
    • L
      Merge branch 'sched-fixes-for-linus' of... · 8e4bc3dd
      Linus Torvalds 提交于
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: Simplify sys_sched_rr_get_interval() system call
        sched: Fix potential NULL derference of doms_cur
        sched: Fix raciness in runqueue_is_locked()
        sched: Re-add lost cpu_allowed check to sched_fair.c::select_task_rq_fair()
        sched: Remove unneeded indentation in sched_fair.c::place_entity()
      8e4bc3dd
    • L
      Merge branch 'tracing-fixes-for-linus' of... · bd4c3a34
      Linus Torvalds 提交于
      Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        kernel/profile.c: Switch /proc/irq/prof_cpu_mask to seq_file
        tracing: Export trace_profile_buf symbols
        tracing/events: use list_for_entry_continue
        tracing: remove max_tracer_type_len
        function-graph: use ftrace_graph_funcs directly
        tracing: Remove markers
        tracing: Allocate the ftrace event profile buffer dynamically
        tracing: Factorize the events profile accounting
      bd4c3a34
    • L
      Merge branch 'x86-fixes-for-linus' of... · b3727c24
      Linus Torvalds 提交于
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Print the hypervisor returned tsc_khz during boot
        x86: Correct segment permission flags in 64-bit linker script
        x86: cpuinit-annotate SMP boot trampolines properly
        x86: Increase timeout for EHCI debug port reset completion in early printk
        x86: Fix uaccess_32.h typo
        x86: Trivial whitespace cleanups
        x86, apic: Fix missed handling of discrete apics
        x86/i386: Remove duplicated #include
        x86, mtrr: Convert loop to a while based construct, avoid naked semicolon
        Revert 'x86: Fix system crash when loading with "reservetop" parameter'
        x86, mce: Fix compile warning in case of CONFIG_SMP=n
        x86, apic: Use logical flat on intel with <= 8 logical cpus
        x86: SGI UV: Map MMIO-High memory range
        x86: SGI UV: Add volatile semantics to macros that access chipset registers
        x86: SGI UV: Fix IPI macros
        x86: apic: Convert BUG() to BUG_ON()
        x86: Remove final bits of CONFIG_X86_OLD_MCE
      b3727c24
    • L
      Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block · 58e75a09
      Linus Torvalds 提交于
      * 'writeback' of git://git.kernel.dk/linux-2.6-block:
        nfs: initialize the backing_dev_info when creating the server
        writeback: make balance_dirty_pages() gradually back more off
        writeback: don't use schedule_timeout() without setting runstate
        nfs: nfs_kill_super() should call bdi_unregister() after killing super
      58e75a09
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · c720f565
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (222 commits)
        V4L/DVB (13033): pt1: Don't use a deprecated DMA_BIT_MASK macro
        V4L/DVB (13029): radio-si4713: remove #include <linux/version.h>
        V4L/DVB (13027): go7007: convert printks to v4l2_info
        V4L/DVB (13026): s2250-board: Implement brightness and contrast controls
        V4L/DVB (13025): s2250-board: Fix memory leaks
        V4L/DVB (13024): go7007: Implement vidioc_g_std and vidioc_querystd
        V4L/DVB (13023): go7007: Merge struct gofh and go declarations
        V4L/DVB (13022): go7007: Fix mpeg controls
        V4L/DVB (13021): go7007: Fix whitespace and line lengths
        V4L/DVB (13020): go7007: Updates to Kconfig and Makefile
        V4L/DVB (13019): video: initial support for ADV7180
        V4L/DVB (13018): kzalloc failure ignored in au8522_probe()
        V4L/DVB (13017): gspca: kmalloc failure ignored in sd_start()
        V4L/DVB (13016): kmalloc failure ignored in lgdt3304_attach() and s921_attach()
        V4L/DVB (13015): kmalloc failure ignored in m920x_firmware_download()
        V4L/DVB (13014): Add support for Compro VideoMate E800 (DVB-T part only)
        V4L/DVB (13013): FM TX: si4713: Kconfig: Fixed two typos.
        V4L/DVB (13012): uvc: introduce missing kfree
        V4L/DVB (13011): Change tuner type of BeholdTV cards
        V4L/DVB (13009): gspca - stv06xx-hdcs: Reduce exposure range
        ...
      c720f565
  2. 21 9月, 2009 30 次提交