1. 04 Mar, 2012 27 commits
  2. 03 Mar, 2012 3 commits
  3. 02 Mar, 2012 10 commits
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 62d222b8
      Linus Torvalds authored
      hhwmon fixes for 3.3-rc6 from Guenter Roeck:
      
      These patches are necessary for correct operation and management of
      F75387.
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (f75375s) Catch some attempts to write to r/o registers
        hwmon: (f75375s) Properly map the F75387 automatic modes to pwm_enable
        hwmon: (f75375s) Make pwm*_mode writable for the F75387
        hwmon: (f75375s) Fix writes to the pwm* attribute for the F75387
      62d222b8
    • Linus Torvalds's avatar
      Merge tag 'fbdev-fixes-for-3.3-2' of git://github.com/schandinat/linux-2.6 · d085a09c
      Linus Torvalds authored
      fbdev fixes for 3.3 from Florian Tobias Schandinat
      
      It includes:
       - two fixes for OMAP HDMI
       - one fix to make new OMAP functions behave as they are supposed to
       - one Kconfig dependency fix
       - two fixes for viafb for modesetting on VX900 hardware
      
      * tag 'fbdev-fixes-for-3.3-2' of git://github.com/schandinat/linux-2.6:
        OMAPDSS: APPLY: make ovl_enable/disable synchronous
        OMAPDSS: panel-dvi: Add Kconfig dependency on I2C
        viafb: fix IGA1 modesetting on VX900
        viafb: select HW scaling on VX900 for IGA2
        OMAPDSS: HDMI: hot plug detect fix
        OMAPDSS: HACK: Ensure DSS clock domain gets out of idle when HDMI is enabled
      d085a09c
    • Linus Torvalds's avatar
      Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 5e8063d7
      Linus Torvalds authored
      sound fixes for 3.3-rc6 from Takashi Iwai
      
      This contains again regression fixes for various HD-audio and ASoC
      regarding SSI and dapm shutdown path.  In addition, a minor azt3328
      fix and the correction of the new jack-notification strings in HD-audio.
      
      * tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Kill hyphenated names
        ALSA: hda - Add a fake mute feature
        ALSA: hda - Always set HP pin in unsol handler for STAC/IDT codecs
        ALSA: azt3328 - Fix NULL ptr dereference on cards without OPL3
        ALSA: hda/realtek - Fix resume of multiple input sources
        ASoC: i.MX SSI: Fix DSP_A format.
        ASoC: dapm: Check for bias level when powering down
      5e8063d7
    • Linus Torvalds's avatar
      vfs: split up name hashing in link_path_walk() into helper function · 200e9ef7
      Linus Torvalds authored
      The code in link_path_walk() that finds out the length and the hash of
      the next path component is some of the hottest code in the kernel.  And
      I have a version of it that does things at the full width of the CPU
      wordsize at a time, but that means that we *really* want to split it up
      into a separate helper function.
      
      So this re-organizes the code a bit and splits the hashing part into a
      helper function called "hash_name()".  It returns the length of the
      pathname component, while at the same time computing and writing the
      hash to the appropriate location.
      
      The code generation is slightly changed by this patch, but generally for
      the better - and the added abstraction actually makes the code easier to
      read too.  And the new interface is well suited for replacing just the
      "hash_name()" function with alternative implementations.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      200e9ef7
    • Linus Torvalds's avatar
      vfs: clarify and clean up dentry_cmp() · 5707c87f
      Linus Torvalds authored
      It did some odd things for unclear reasons.  As this is one of the
      functions that gets changed when doing word-at-a-time compares, this is
      yet another of the "don't change any semantics, but clean things up so
      that subsequent patches don't get obscured by the cleanups".
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5707c87f
    • Linus Torvalds's avatar
      vfs: uninline full_name_hash() · 0145acc2
      Linus Torvalds authored
      .. and also use it in lookup_one_len() rather than open-coding it.
      
      There aren't any performance-critical users, so inlining it is silly.
      But it wouldn't matter if it wasn't for the fact that the word-at-a-time
      dentry name patches want to conditionally replace the function, and
      uninlining it sets the stage for that.
      
      So again, this is a preparatory patch that doesn't change any semantics,
      and only prepares for a much cleaner and testable word-at-a-time dentry
      name accessor patch.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0145acc2
    • Linus Torvalds's avatar
      vfs: trivial __d_lookup_rcu() cleanups · 8966be90
      Linus Torvalds authored
      These don't change any semantics, but they clean up the code a bit and
      mark some arguments appropriately 'const'.
      
      They came up as I was doing the word-at-a-time dcache name accessor
      code, and cleaning this up now allows me to send out a smaller relevant
      interesting patch for the experimental stuff.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8966be90
    • Nikolaus Schulz's avatar
      hwmon: (f75375s) Catch some attempts to write to r/o registers · 15d1ad0c
      Nikolaus Schulz authored
      It makes no sense to attempt to manually configure the fan in auto mode,
      or set the duty cycle directly in closed loop mode.  The corresponding
      registers are then read-only.  If the user tries it nonetheless, error out
      with EINVAL instead of silently doing nothing.
      Signed-off-by: default avatarNikolaus Schulz <mail@microschulz.de>
      [guenter.roeck@ericsson.com: Minor formatting cleanup]
      Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      15d1ad0c
    • Nikolaus Schulz's avatar
      hwmon: (f75375s) Properly map the F75387 automatic modes to pwm_enable · b17d6561
      Nikolaus Schulz authored
      The F75387 supports automatic fan control using either PWM duty cycle or
      RPM speed values.  Make the driver detect the latter mode, and expose the
      different modes in sysfs as per pwm_enable, so that the user can switch
      between them.
      
      The interpretation of the pwm_enable attribute for the F75387 is adjusted
      to be a superset of those values used for similar Fintek chips which do
      not support automatic duty mode, with 2 mapping to automatic speed mode,
      and moving automatic duty mode to the new value 4.
      
      Toggling the duty mode via pwm_enable is currently denied for the F75387,
      as the chip then simply reinterprets the fan configuration register values
      according to the new mode, switching between RPM and PWM units, which
      makes this a dangerous operation.
      
      This patch introduces a new pwm mode into the driver. This is necessary
      because the new mode (automatic pwm mode, 4) may already be enabled by the
      BIOS, and the driver should not break existing functionality. This was seen
      on at least one board.
      Signed-off-by: default avatarNikolaus Schulz <mail@microschulz.de>
      Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
      b17d6561
    • Linus Torvalds's avatar
      Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and... · 2273d5cc
      Linus Torvalds authored
      Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pulling latest branches from Ingo:
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        memblock: Fix size aligning of memblock_alloc_base_nid()
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf probe: Ensure offset provided is not greater than function length without DWARF info too
        perf tools: Ensure comm string is properly terminated
        perf probe: Ensure offset provided is not greater than function length
        perf evlist: Return first evsel for non-sample event on old kernel
        perf/hwbp: Fix a possible memory leak
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        CPU hotplug, cpusets, suspend: Don't touch cpusets during suspend/resume
      2273d5cc