1. 24 Jun, 2009 1 commit
    • Heiko Carstens's avatar
      timer stats: Optimize by adding quick check to avoid function calls · 507e1231
      Heiko Carstens authored
      When the kernel is configured with CONFIG_TIMER_STATS but timer
      stats are runtime disabled we still get calls to
      __timer_stats_timer_set_start_info which initializes some
      fields in the corresponding struct timer_list.
      
      So add some quick checks in the the timer stats setup functions
      to avoid function calls to __timer_stats_timer_set_start_info
      when timer stats are disabled.
      
      In an artificial workload that does nothing but playing ping
      pong with a single tcp packet via loopback this decreases cpu
      consumption by 1 - 1.5%.
      
      This is part of a modified function trace output on SLES11:
      
       perl-2497  [00] 28630647177732388 [+  125]: sk_reset_timer <-tcp_v4_rcv
       perl-2497  [00] 28630647177732513 [+  125]: mod_timer <-sk_reset_timer
       perl-2497  [00] 28630647177732638 [+  125]: __timer_stats_timer_set_start_info <-mod_timer
       perl-2497  [00] 28630647177732763 [+  125]: __mod_timer <-mod_timer
       perl-2497  [00] 28630647177732888 [+  125]: __timer_stats_timer_set_start_info <-__mod_timer
       perl-2497  [00] 28630647177733013 [+   93]: lock_timer_base <-__mod_timer
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Cc: Mustafa Mesanovic <mustafa.mesanovic@de.ibm.com>
      Cc: Arjan van de Ven <arjan@infradead.org>
      LKML-Reference: <20090623153811.GA4641@osiris.boeblingen.de.ibm.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      507e1231
  2. 23 Jun, 2009 37 commits
  3. 22 Jun, 2009 2 commits
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · ac1b7c37
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (63 commits)
        mtd: OneNAND: Allow setting of boundary information when built as module
        jffs2: leaking jffs2_summary in function jffs2_scan_medium
        mtd: nand: Fix memory leak on txx9ndfmc probe failure.
        mtd: orion_nand: use burst reads with double word accesses
        mtd/nand: s3c6400 support for s3c2410 driver
        [MTD] [NAND] S3C2410: Use DIV_ROUND_UP
        [MTD] [NAND] S3C2410: Deal with unaligned lengths in S3C2440 buffer read/write
        [MTD] [NAND] S3C2410: Allow the machine code to get the BBT table from NAND
        [MTD] [NAND] S3C2410: Added a kerneldoc for s3c2410_nand_set
        mtd: physmap_of: Add multiple regions and concatenation support
        mtd: nand: max_retries off by one in mxc_nand
        mtd: nand: s3c2410_nand_setrate(): use correct macros for 2412/2440
        mtd: onenand: add bbt_wait & unlock_all as replaceable for some platform
        mtd: Flex-OneNAND support
        mtd: nand: add OMAP2/OMAP3 NAND driver
        mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs
        mtd: uclinux: mark local stuff static
        mtd: uclinux: do not allow to be built as a module
        mtd: uclinux: allow systems to override map addr/size
        mtd: blackfin NFC: fix hang when using NAND on BF527-EZKITs
        ...
      ac1b7c37
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 9e268beb
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (49 commits)
        [ARM] idle: clean up pm_idle calling, obey hlt_counter
        [ARM] S3C: Fix gpio-config off-by-one bug
        [ARM] S3C64XX: add to_irq() support for EINT() GPIO
        [ARM] S3C64XX: clock.c: fix typo in usb-host clock ctrlbit
        [ARM] S3C64XX: fix HCLK gate defines
        [ARM] Update mach-types
        [ARM] wire up rt_tgsigqueueinfo and perf_counter_open
        OMAP2 clock/powerdomain: off by 1 error in loop timeout comparisons
        OMAP3 SDRC: set FIXEDDELAY when disabling SDRC DLL
        OMAP3: Add support for DPLL3 divisor values higher than 2
        OMAP3 SRAM: convert SRAM code to use macros rather than magic numbers
        OMAP3 SRAM: add more comments on the SRAM code
        OMAP3 clock/SDRC: program SDRC_MR register during SDRC clock change
        OMAP3 clock: add a short delay when lowering CORE clk rate
        OMAP3 clock: initialize SDRC timings at kernel start
        OMAP3 clock: remove wait for DPLL3 M2 clock to stabilize
        [ARM] Add old Feroceon support to compressed/head.S
        [ARM] 5559/1: Limit the stack unwinding caused by a kthread exit
        [ARM] 5558/1: Add extra checks to ARM unwinder to avoid tracing corrupt stacks
        [ARM] 5557/1: Discard some ARM.ex*.*exit.text sections when !HOTPLUG or !HOTPLUG_CPU
        ...
      9e268beb