20 Dec, 2009

1 commit

  • Fix typos, spellos, hyphenation, line lengths.

    BTW: are there some userspace tools? There is a reference to
    some at the wiki page, but there are no tools listed there.

    Signed-off-by: Randy Dunlap
    Acked-by: Pekka Paalanen
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Randy Dunlap
     

15 Dec, 2009

2 commits


14 Dec, 2009

14 commits

  • Conflicts:
    kernel/trace/trace_kprobe.c

    Merge reason: resolve the conflict.

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • Fix this warning:

    kernel/trace/trace_ksym.c: In function 'ksym_trace_filter_read':
    kernel/trace/trace_ksym.c:239: warning: cast to pointer from integer of different size

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    Cc: "K.Prasad"
    LKML-Reference:
    [remove the strstrip fix as tglx already fixed that]
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • trace_power_start and trace_power_end are used in
    arch/x86/kernel/power.c, and this file can't be compiled
    as a module, so these two tracepoints don't need to be
    exported.

    Signed-off-by: Li Zefan
    Acked-by: Arjan van de Ven
    Acked-by: Steven Rostedt
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • Like total_profile_count, struct ftrace_event_call::profile_count
    is protected by event_mutex, so it doesn't need to be atomic_t.

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    Cc: Jason Baron
    Cc: Masami Hiramatsu
    Cc: Peter Zijlstra
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • - remove duplicate code inside trace_options_write()
    - extract duplicate code in trace_options_write() and set_tracer_option()

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • Since commit 4d9493c90f8e6e1b164aede3814010a290161abb
    ("ftrace: remove add-hoc code"), option "sched-tree"
    has become useless.

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • The buffer for the output is as small as 64 bytes, so it'll
    overflow if we add more clock type. Use seq file instead.

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • Code simplification for reading trace_options.

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    LKML-reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • # echo 'do_open' > set_graph_function
    # echo 'do_open' >> set_graph_function
    bash: echo: write error: Invalid argument

    Make it valid to write the same value to set_graph_function,
    which is consistent with set_ftrace_filter interface.

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    LKML-reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • I found a weird behavior:

    # echo 'fuse:*' > set_ftrace_filter
    bash: echo: write error: Invalid argument
    # cat set_ftrace_filter
    fuse_dev_fasync
    fuse_dev_poll
    fuse_copy_do

    We should call trace_parser_clear() no matter ftrace_process_regex()
    returns 0 or -errno, otherwise we will actually take the unaccepted
    records from ftrace_regex_release().

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • Currently it doesn't warn user on invald value:

    # echo nonexist_symbol > set_ftrace_filter
    or:
    # echo 'nonexist_symbol:mod:fuse' > set_ftrace_filter

    Better make it return failure.

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • Move the printk from each ftrace_raw_reg_event_foo() to
    its caller ftrace_event_enable_disable(). This avoids each
    regfunc trace event callbacks to handle a same error report
    that can be carried from the caller.

    See how much space this saves:

    text data bss dec hex filename
    5345151 1961864 7103260 14410275 dbe223 vmlinux.o.old
    5331487 1961864 7103260 14396611 dbacc3 vmlinux.o

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    Cc: Jason Baron
    LKML-Reference:
    [start cmdline record before calling regfunc to avoid lost
    window of pid to comm resolution]
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • Call trace_define_common_fields() in event_create_dir() only.
    This avoids trace events to handle it from their define_fields
    callbacks and shrinks the kernel code size:

    text data bss dec hex filename
    5346802 1961864 7103260 14411926 dbe896 vmlinux.o.old
    5345151 1961864 7103260 14410275 dbe223 vmlinux.o

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    Cc: Ingo Molnar
    Cc: Jason Baron
    Cc: Masami Hiramatsu
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     
  • Use a generic trace_event_raw_init() function for all event's raw_init
    callbacks (but kprobes) instead of defining the same version for each
    of these.
    This shrinks the kernel code:

    text data bss dec hex filename
    5355293 1961928 7103260 14420481 dc0a01 vmlinux.o.old
    5346802 1961864 7103260 14411926 dbe896 vmlinux.o

    raw_init can't be removed, because ftrace events and kprobe events
    use different raw_init callbacks. Though it's possible to totally
    remove raw_init, I choose to leave it as it is for now.

    Signed-off-by: Li Zefan
    Acked-by: Steven Rostedt
    Cc: Jason Baron
    Cc: Ingo Molnar
    LKML-Reference:
    Signed-off-by: Frederic Weisbecker

    Li Zefan
     

13 Dec, 2009

12 commits

  • Reduces fmt string space a bit.

    Signed-off-by: Joe Perches
    Cc: Frederic Weisbecker
    Cc: Steven Rostedt
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Joe Perches
     
  • * 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
    IXP4xx: GTWX5715 platform only has two PCI IRQ lines, not four.
    IXP4xx: Introduce IXP4XX_GPIO_IRQ(n) macro and convert IXP4xx platform files.
    IXP4xx: move Gemtek GTWX5715 platform macros to the platform code.
    IXP4xx: Remove unused Motorola PrPMC1100 platform macros.
    IXP4xx: move FSG platform macros to the platform code.
    IXP4xx: move DSM G600 platform macros to the platform code.
    IXP4xx: move NAS100D platform macros to the platform code.
    IXP4xx: move NSLU2 platform macros to the platform code.
    IXP4xx: move Coyote platform macros to the platform code.
    IXP4xx: move AVILA platform macros to the platform code.
    IXP4xx: move IXDP425 platform macros to the platform code.
    IXP4xx: Extend PCI MMIO indirect address space to 1 GB.
    IXP4xx: Fix compilation failure with CONFIG_IXP4XX_INDIRECT_PCI.
    IXP4xx: Drop "__ixp4xx_" prefix from in/out/ioread/iowrite functions for clarity.
    IXP4xx: Rename indirect MMIO primitives from __ixp4xx_* to __indirect_*.
    IXP4xx: Ensure index is positive in irq_to_gpio() and npe_request().
    ARM: fix insl() and outsl() endianness on IXP4xx architecture.
    IXP4xx: Fix normally-disabled debugging text in drivers/net/arm/ixp4xx_eth.c.
    IXP4xx: change the timer base frequency to 66.666000 MHz.

    Linus Torvalds
     
  • As shown by the previous patch (6698e3472: "tty: Fix BKL taken under a
    spinlock bug introduced in the BKL split") the BKL removal is prone to
    some subtle issues, where removing the BKL in one place may in fact make
    a previously nested BKL call the new outer call, and then prone to nasty
    deadlocks with other spinlocks.

    In general, we should never take the BKL while we're holding a spinlock,
    so let's just add a "might_sleep()" to it (even though the BKL doesn't
    technically sleep - at least not yet), and we'll get nice warnings the
    next time this kind of problem happens during BKL removal.

    Acked-and-Tested-by: Thomas Gleixner
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • The fasync path takes the BKL (it probably doesn't need to in fact)
    while holding the file_list spinlock. You can't do that with the kernel
    lock: it causes lock inversions and deadlocks.

    Leave the BKL over that bit for the moment.

    Identified by AKPM.

    Signed-off-by: Alan Cox
    Acked-and-Tested-by: Thomas Gleixner
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits)
    powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
    MAINTAINERS: Add PowerPC patterns
    powerpc/pseries: Track previous CPPR values to correctly EOI interrupts
    powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP
    powerpc: Make "intspec" pointers in irq_host->xlate() const
    powerpc/8xx: DTLB Miss cleanup
    powerpc/8xx: Remove DIRTY pte handling in DTLB Error.
    powerpc/8xx: Start using dcbX instructions in various copy routines
    powerpc/8xx: Restore _PAGE_WRITETHRU
    powerpc/8xx: Add missing Guarded setting in DTLB Error.
    powerpc/8xx: Fixup DAR from buggy dcbX instructions.
    powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions.
    powerpc/8xx: Update TLB asm so it behaves as linux mm expects.
    powerpc/8xx: Invalidate non present TLBs
    powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
    pseries/pseries: Add code to online/offline CPUs of a DLPAR node
    powerpc: stop_this_cpu: remove the cpu from the online map.
    powerpc/pseries: Add kernel based CPU DLPAR handling
    sysfs/cpu: Add probe/release files
    powerpc/pseries: Kernel DLPAR Infrastructure
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: hda - Overwrite pin config on intel DG45ID board.
    intelhdmi - dont power off HDA link
    ALSA: hrtimer - Fix lock-up
    ALSA: intelhdmi - add channel mapping for typical configurations
    ALSA: intelhdmi - channel mapping applies to Pin
    ALSA: intelhdmi - accept DisplayPort pin
    ALSA: hda - show HBR(High Bit Rate) pin cap in procfs
    ALSA: hda - Fix LED GPIO setup for HP laptops with IDT codecs
    ASoC: Fix build of OMAP sound drivers
    ALSA: opti93x: fix irq releasing if the irq cannot be allocated

    Linus Torvalds
     
  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (75 commits)
    omap3: Fix OMAP35XX_REV macros
    omap: serial: fix non-empty uart fifo read abort
    omap3: Zoom2/3: Update hsmmc board config params
    omap3 : Enable TWL4030 Keypad for Zoom2 and Zoom3 boards
    omap3: id code detection 3525 vs 3515
    omap3: rx51: Use wl1251 in SPI mode 3
    omap3: zoom2/3: make MMC slot work again
    omap1: htcherald: Update defconfig to include mux support
    omap1: LCD_DMA: Use some define rather than a hexadecimal
    omap: header: remove unused data-type
    omap: arch/arm/plat-omap/devices.c - sort alphabetically
    omap: Correcting GPMC_CONFIG1_DEVICETYPE_NAND
    OMAP3: serial - allow platforms specify which UARTs to initialize
    omap3: cm-t35: add mux initialization
    OMAP4: Sync up omap4430 defconfig
    OMAP4: Remove the secondary wait loop
    OMAP4: AuxCoreBoot registers only accessible in secure mode
    OMAP4: Fix SRAM base and size
    OMAP4: Fix cpu detection
    omap3: pandora: board file updates for .33
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
    be2net: fix error in rx completion processing.
    igbvf: avoid reset storms due to mailbox issues
    igb: fix handling of mailbox collisions between PF/VF
    usb: remove rare pm primitive for conversion to new API

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
    slab, kmemleak: pass the correct pointer to kmemleak_erase()
    slab, kmemleak: stop calling kmemleak_erase() unconditionally
    SLAB: Fix unlikely() annotation in __cache_alloc_node()
    SLAB: Fix lockdep annotations for CPU hotplug
    SLUB: Fix __GFP_ZERO unlikely() annotation
    slub: allow stats to be cleared

    Linus Torvalds
     
  • …l/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: (21 commits)
    sched: Remove forced2_migrations stats
    sched: Fix memory leak in two error corner cases
    sched: Fix build warning in get_update_sysctl_factor()
    sched: Update normalized values on user updates via proc
    sched: Make tunable scaling style configurable
    sched: Fix missing sched tunable recalculation on cpu add/remove
    sched: Fix task priority bug
    sched: cgroup: Implement different treatment for idle shares
    sched: Remove unnecessary RCU exclusion
    sched: Discard some old bits
    sched: Clean up check_preempt_wakeup()
    sched: Move update_curr() in check_preempt_wakeup() to avoid redundant call
    sched: Sanitize fork() handling
    sched: Clean up ttwu() rq locking
    sched: Remove rq->clock coupling from set_task_cpu()
    sched: Consolidate select_task_rq() callers
    sched: Remove sysctl.sched_features
    sched: Protect sched_rr_get_param() access to task->sched_class
    sched: Protect task->cpus_allowed access in sched_getaffinity()
    sched: Fix balance vs hotplug race
    ...

    Fixed up conflicts in kernel/sysctl.c (due to sysctl cleanup)

    Linus Torvalds
     
  • Takashi Iwai
     
  • Takashi Iwai
     

12 Dec, 2009

11 commits