1. 30 Nov, 2009 8 commits
  2. 25 Nov, 2009 4 commits
  3. 24 Nov, 2009 6 commits
    • Paul Mundt's avatar
      sh: Apply the sleazy FPU changes for SH-2A FPU as well. · 0f09e197
      Paul Mundt authored
      This plugs in the fpu_counter manipulation for the SH-2A side also.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      0f09e197
    • Stuart Menefy's avatar
      sh: Minor optimisations to FPU handling · d3ea9fa0
      Stuart Menefy authored
      A number of small optimisations to FPU handling, in particular:
      
       - move the task USEDFPU flag from the thread_info flags field (which
         is accessed asynchronously to the thread) to a new status field,
         which is only accessed by the thread itself. This allows locking to
         be removed in most cases, or can be reduced to a preempt_lock().
         This mimics the i386 behaviour.
      
       - move the modification of regs->sr and thread_info->status flags out
         of save_fpu() to __unlazy_fpu(). This gives the compiler a better
         chance to optimise things, as well as making save_fpu() symmetrical
         with restore_fpu() and init_fpu().
      
       - implement prepare_to_copy(), so that when creating a thread, we can
         unlazy the FPU prior to copying the thread data structures.
      
      Also make sure that the FPU is disabled while in the kernel, in
      particular while booting, and for newly created kernel threads,
      
      In a very artificial benchmark, the execution time for 2500000
      context switches was reduced from 50 to 45 seconds.
      Signed-off-by: default avatarStuart Menefy <stuart.menefy@st.com>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      d3ea9fa0
    • Stuart Menefy's avatar
      sh: Improve performance of SH4 versions of copy/clear_user_highpage · 39ac11c1
      Stuart Menefy authored
      The previous implementation of clear_user_highpage and copy_user_highpage
      checked to see if there was a D-cache aliasing issue between the user
      and kernel mappings of a page, but if there was they always did a
      flush with writeback on the dirtied kernel alias.
      
      However as we now have the ability to map a page into kernel space
      with the same cache colour as the user mapping, there is no need to
      write back this data.
      
      Currently we also invalidate the kernel alias as a precaution, however
      I'm not sure if this is actually required.
      
      Also correct the definition of FIX_CMAP_END so that the mappings created
      by kmap_coherent() are actually at the correct colour.
      Signed-off-by: default avatarStuart Menefy <stuart.menefy@st.com>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      39ac11c1
    • Paul Mundt's avatar
      Merge branch 'master' into sh/st-integration · 49fb2cd2
      Paul Mundt authored
      49fb2cd2
    • Stuart Menefy's avatar
      sh: Optimised memset for SH4 · dfc34940
      Stuart Menefy authored
      Optimised version of memset for the SH4 which uses movca.l.
      Signed-off-by: default avatarStuart Menefy <stuart.menefy@st.com>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      dfc34940
    • Giuseppe CAVALLARO's avatar
      sh: add sleazy FPU optimization · a0458b07
      Giuseppe CAVALLARO authored
      sh port of the sLeAZY-fpu feature currently implemented for some architectures
      such us i386.
      
      Right now the SH kernel has a 100% lazy fpu behaviour.
      This is of course great for applications that have very sporadic or no FPU use.
      However for very frequent FPU users...  you take an extra trap every context
      switch.
      The patch below adds a simple heuristic to this code: after 5 consecutive
      context switches of FPU use, the lazy behavior is disabled and the context
      gets restored every context switch.
      After 256 switches, this is reset and the 100% lazy behavior is returned.
      
      Tests with LMbench showed no regression.
      I saw a little improvement due to the prefetching (~2%).
      
      The tests below also show that, with this sLeazy patch, indeed,
      the number of FPU exceptions is reduced.
      To test this. I hacked the lat_ctx LMBench to use the FPU a little more.
      
         sLeasy implementation
         ===========================================
         switch_to calls            |  79326
         sleasy   calls             |  42577
         do_fpu_state_restore  calls|  59232
         restore_fpu   calls        |  59032
      
         Exceptions:  0x800 (FPU disabled  ): 16604
      
         100% Leazy (default implementation)
         ===========================================
         switch_to  calls            |  79690
         do_fpu_state_restore calls  |  53299
         restore_fpu  calls          |   53101
      
         Exceptions: 0x800 (FPU disabled  ):  53273
      Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
      Signed-off-by: default avatarStuart Menefy <stuart.menefy@st.com>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      a0458b07
  4. 20 Nov, 2009 5 commits
  5. 19 Nov, 2009 9 commits
  6. 18 Nov, 2009 8 commits
    • Linus Torvalds's avatar
      Merge branch 'omap-fixes-for-linus' of... · d22966d0
      Linus Torvalds authored
      Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
        OMAP: cs should be positive in gpmc_cs_free()
        omap: fix unlikely(x) < y
        omap3: clock: Fixed dpll3_m2x2 rate calculation
        omap3: clock: Fix the DPLL freqsel computations
        omap: Fix keymap for zoom2 according to matrix keypad framwork
      d22966d0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 70b172b2
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ASoC: tlv320aic23 fix rate selection
        ASoC: OMAP3 Pandora: update for TWL4030 codec changes
        ASoC: Modifying the license string GPLv2 for OMAP3 EVM
        ALSA: hda - Fix quirk for VAIO type G
        ALSA: usb - Quirk to disable master volume control in PCM2702
      70b172b2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 486bfe5c
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
        cxgb3: fix premature page unmap
        ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts
        vlan: Fix register_vlan_dev() error path
        gro: Fix illegal merging of trailer trash
        sungem: Fix Serdes detection.
        net: fix mdio section mismatch warning
        ppp: fix BUG on non-linear SKB (multilink receive)
        ixgbe: Fixing EEH handler to handle more than one error
        net: Fix the rollback test in dev_change_name()
        Revert "isdn: isdn_ppp: Use SKB list facilities instead of home-grown implementation."
        TI Davinci EMAC : Fix Console Hang when bringing the interface down
        smsc911x: Fix Console Hang when bringing the interface down.
        mISDN: fix error return in HFCmulti_init()
        forcedeth: mac address fix
        r6040: fix version printing
        Bluetooth: Fix regression with L2CAP configuration in Basic Mode
        Bluetooth: Select Basic Mode as default for SOCK_SEQPACKET
        Bluetooth: Set general bonding security for ACL by default
        r8169: Fix receive buffer length when MTU is between 1515 and 1536
        can: add the missing netlink get_xstats_size callback
        ...
      486bfe5c
    • Mimi Zohar's avatar
      ima: replace GFP_KERNEL with GFP_NOFS · c09c59e6
      Mimi Zohar authored
      While running fsstress tests on the NFSv4 mounted ext3 and ext4
      filesystem, the following call trace was generated on the nfs
      server machine.
      
      Replace GFP_KERNEL with GFP_NOFS in ima_iint_insert() to avoid a
      potential deadlock.
      
           =================================
          [ INFO: inconsistent lock state ]
          2.6.31-31.el6.x86_64 #1
          ---------------------------------
          inconsistent {RECLAIM_FS-ON-W} -> {IN-RECLAIM_FS-W} usage.
          kswapd2/75 [HC0[0]:SC0[0]:HE1:SE1] takes:
           (jbd2_handle){+.+.?.}, at: [<ffffffff811edd5e>] jbd2_journal_start+0xfe/0x13f
          {RECLAIM_FS-ON-W} state was registered at:
            [<ffffffff81091e40>] mark_held_locks+0x65/0x99
            [<ffffffff81091f31>] lockdep_trace_alloc+0xbd/0xf5
            [<ffffffff81126fdd>] kmem_cache_alloc+0x40/0x185
            [<ffffffff812344d7>] ima_iint_insert+0x3d/0xf1
            [<ffffffff812345b0>] ima_inode_alloc+0x25/0x44
            [<ffffffff811484ac>] inode_init_always+0xec/0x271
            [<ffffffff81148682>] alloc_inode+0x51/0xa1
            [<ffffffff81148700>] new_inode+0x2e/0x94
            [<ffffffff811b2f08>] ext4_new_inode+0xb8/0xdc9
            [<ffffffff811be611>] ext4_create+0xcf/0x175
            [<ffffffff8113e2cd>] vfs_create+0x82/0xb8
            [<ffffffff8113f337>] do_filp_open+0x32c/0x9ee
            [<ffffffff811309b9>] do_sys_open+0x6c/0x12c
            [<ffffffff81130adc>] sys_open+0x2e/0x44
            [<ffffffff81011e42>] system_call_fastpath+0x16/0x1b
            [<ffffffffffffffff>] 0xffffffffffffffff
          irq event stamp: 90371
          hardirqs last  enabled at (90371): [<ffffffff8112708d>]
          kmem_cache_alloc+0xf0/0x185
          hardirqs last disabled at (90370): [<ffffffff81127026>]
          kmem_cache_alloc+0x89/0x185
          softirqs last  enabled at (89492): [<ffffffff81068ecf>]
          __do_softirq+0x1bf/0x1eb
          softirqs last disabled at (89477): [<ffffffff8101312c>] call_softirq+0x1c/0x30
      
          other info that might help us debug this:
          2 locks held by kswapd2/75:
           #0:  (shrinker_rwsem){++++..}, at: [<ffffffff810f98ba>] shrink_slab+0x44/0x177
           #1:  (&type->s_umount_key#25){++++..}, at: [<ffffffff811450ba>]
      Reported-by: default avatarMuni P. Beerakam <mbeeraka@in.ibm.com>
      Reported-by: default avatarAmit K. Arora <amitarora@in.ibm.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
      Signed-off-by: default avatarJames Morris <jmorris@namei.org>
      c09c59e6
    • Roel Kluin's avatar
      OMAP: cs should be positive in gpmc_cs_free() · e7fdc605
      Roel Kluin authored
      The index `cs' is signed, test whether it is negative before we release
      gpmc_cs_mem[cs].
      Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      e7fdc605
    • Roel Kluin's avatar
      omap: fix unlikely(x) < y · d32b20fc
      Roel Kluin authored
      The closing parenthesis was not in the right location.
      Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      d32b20fc
    • Takashi Iwai's avatar
      Merge branch 'fix/asoc' into for-linus · e2cd52e6
      Takashi Iwai authored
      e2cd52e6
    • Takashi Iwai's avatar
      Merge branch 'fix/hda' into for-linus · ef4b18e2
      Takashi Iwai authored
      ef4b18e2