1. 28 5月, 2011 5 次提交
  2. 27 5月, 2011 2 次提交
  3. 26 5月, 2011 33 次提交
    • A
      perf tools: Fix build on older systems · 75911c9b
      Arnaldo Carvalho de Melo 提交于
      Where /usr/include/linux/const.h is not present, e.g. RHEL5.
      Reported-by: NSrikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      Link: http://lkml.kernel.org/n/tip-ypcw2mu0w7dl1rrc6ncz3pee@git.kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      75911c9b
    • A
      perf symbols: Handle /proc/sys/kernel/kptr_restrict · ec80fde7
      Arnaldo Carvalho de Melo 提交于
      Perf uses /proc/modules to figure out where kernel modules are loaded.
      
      With the advent of kptr_restrict, non root users get zeroes for all module
      start addresses.
      
      So check if kptr_restrict is non zero and don't generate the syntethic
      PERF_RECORD_MMAP events for them.
      
      Warn the user about it in perf record and in perf report.
      
      In perf report the reference relocation symbol being zero means that
      kptr_restrict was set, thus /proc/kallsyms has only zeroed addresses, so don't
      use it to fixup symbol addresses when using a valid kallsyms (in the buildid
      cache) or vmlinux (in the vmlinux path) build-id located automatically or
      specified by the user.
      
      Provide an explanation about it in 'perf report' if kernel samples were taken,
      checking if a suitable vmlinux or kallsyms was found/specified.
      
      Restricted /proc/kallsyms don't go to the buildid cache anymore.
      
      Example:
      
       [acme@emilia ~]$ perf record -F 100000 sleep 1
      
       WARNING: Kernel address maps (/proc/{kallsyms,modules}) are restricted, check
       /proc/sys/kernel/kptr_restrict.
      
       Samples in kernel functions may not be resolved if a suitable vmlinux file is
       not found in the buildid cache or in the vmlinux path.
      
       Samples in kernel modules won't be resolved at all.
      
       If some relocation was applied (e.g. kexec) symbols may be misresolved even
       with a suitable vmlinux or kallsyms file.
      
       [ perf record: Woken up 1 times to write data ]
       [ perf record: Captured and wrote 0.005 MB perf.data (~231 samples) ]
       [acme@emilia ~]$
      
       [acme@emilia ~]$ perf report --stdio
       Kernel address maps (/proc/{kallsyms,modules}) were restricted,
       check /proc/sys/kernel/kptr_restrict before running 'perf record'.
      
       If some relocation was applied (e.g. kexec) symbols may be misresolved.
      
       Samples in kernel modules can't be resolved as well.
      
       # Events: 13  cycles
       #
       # Overhead  Command      Shared Object                 Symbol
       # ........  .......  .................  .....................
       #
          20.24%    sleep  [kernel.kallsyms]  [k] page_fault
          20.04%    sleep  [kernel.kallsyms]  [k] filemap_fault
          19.78%    sleep  [kernel.kallsyms]  [k] __lru_cache_add
          19.69%    sleep  ld-2.12.so         [.] memcpy
          14.71%    sleep  [kernel.kallsyms]  [k] dput
           4.70%    sleep  [kernel.kallsyms]  [k] flush_signal_handlers
           0.73%    sleep  [kernel.kallsyms]  [k] perf_event_comm
           0.11%    sleep  [kernel.kallsyms]  [k] native_write_msr_safe
      
       #
       # (For a higher level overview, try: perf report --sort comm,dso)
       #
       [acme@emilia ~]$
      
      This is because it found a suitable vmlinux (build-id checked) in
      /lib/modules/2.6.39-rc7+/build/vmlinux (use -v in perf report to see the long
      file name).
      
      If we remove that file from the vmlinux path:
      
       [root@emilia ~]# mv /lib/modules/2.6.39-rc7+/build/vmlinux \
      		     /lib/modules/2.6.39-rc7+/build/vmlinux.OFF
       [acme@emilia ~]$ perf report --stdio
       [kernel.kallsyms] with build id 57298cdbe0131f6871667ec0eaab4804dcf6f562
       not found, continuing without symbols
      
       Kernel address maps (/proc/{kallsyms,modules}) were restricted, check
       /proc/sys/kernel/kptr_restrict before running 'perf record'.
      
       As no suitable kallsyms nor vmlinux was found, kernel samples can't be
       resolved.
      
       Samples in kernel modules can't be resolved as well.
      
       # Events: 13  cycles
       #
       # Overhead  Command      Shared Object  Symbol
       # ........  .......  .................  ......
       #
          80.31%    sleep  [kernel.kallsyms]  [k] 0xffffffff8103425a
          19.69%    sleep  ld-2.12.so         [.] memcpy
      
       #
       # (For a higher level overview, try: perf report --sort comm,dso)
       #
       [acme@emilia ~]$
      Reported-by: NStephane Eranian <eranian@google.com>
      Suggested-by: NDavid Miller <davem@davemloft.net>
      Cc: Dave Jones <davej@redhat.com>
      Cc: David Miller <davem@davemloft.net>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Kees Cook <kees.cook@canonical.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Pekka Enberg <penberg@cs.helsinki.fi>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      Link: http://lkml.kernel.org/n/tip-mt512joaxxbhhp1odop04yit@git.kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      ec80fde7
    • J
      perf: Remove duplicate headers · ea7659fb
      Jesper Juhl 提交于
      Signed-off-by: NJesper Juhl <jj@chaosbits.net>
      Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      Cc: trivial@kernel.org
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1105261011290.17400@swampdragon.chaosbits.netSigned-off-by: NIngo Molnar <mingo@elte.hu>
      ea7659fb
    • I
      Merge branch 'linus' into perf/urgent · 1102c660
      Ingo Molnar 提交于
      Merge reason: Linus applied an overlapping commit:
      
        5f2e8e2b: kernel/watchdog.c: Use proper ANSI C prototypes
      
      So merge it in to make sure we can iterate the file without conflicts.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      1102c660
    • E
      tmpfs: fix XATTR N overriding POSIX_ACL Y · 4db70f73
      Eric Paris 提交于
      Choosing TMPFS_XATTR default N was switching off TMPFS_POSIX_ACL,
      even if it had been Y in oldconfig; and Linus reports that PulseAudio
      goes subtly wrong unless it can use ACLs on /dev/shm.
      
      Make TMPFS_POSIX_ACL select TMPFS_XATTR (and depend upon TMPFS),
      and move the TMPFS_POSIX_ACL entry before the TMPFS_XATTR entry,
      to avoid asking unnecessary questions then ignoring their answers.
      Signed-off-by: NHugh Dickins <hughd@google.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4db70f73
    • S
      ftrace: Add internal recursive checks · b1cff0ad
      Steven Rostedt 提交于
      Witold reported a reboot caused by the selftests of the dynamic function
      tracer. He sent me a config and I used ktest to do a config_bisect on it
      (as my config did not cause the crash). It pointed out that the problem
      config was CONFIG_PROVE_RCU.
      
      What happened was that if multiple callbacks are attached to the
      function tracer, we iterate a list of callbacks. Because the list is
      managed by synchronize_sched() and preempt_disable, the access to the
      pointers uses rcu_dereference_raw().
      
      When PROVE_RCU is enabled, the rcu_dereference_raw() calls some
      debugging functions, which happen to be traced. The tracing of the debug
      function would then call rcu_dereference_raw() which would then call the
      debug function and then... well you get the idea.
      
      I first wrote two different patches to solve this bug.
      
      1) add a __rcu_dereference_raw() that would not do any checks.
      2) add notrace to the offending debug functions.
      
      Both of these patches worked.
      
      Talking with Paul McKenney on IRC, he suggested to add recursion
      detection instead. This seemed to be a better solution, so I decided to
      implement it. As the task_struct already has a trace_recursion to detect
      recursion in the ring buffer, and that has a very small number it
      allows, I decided to use that same variable to add flags that can detect
      the recursion inside the infrastructure of the function tracer.
      
      I plan to change it so that the task struct bit can be checked in
      mcount, but as that requires changes to all archs, I will hold that off
      to the next merge window.
      
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
      Link: http://lkml.kernel.org/r/1306348063.1465.116.camel@gandalf.stny.rr.comReported-by: NWitold Baryluk <baryluk@smp.if.uj.edu.pl>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      b1cff0ad
    • L
      tracing: Update btrfs's tracepoints to use u64 interface · 7f34b746
      liubo 提交于
      To avoid 64->32 truncating WARNING, update btrfs's tracepoints.
      Signed-off-by: NLiu Bo <liubo2009@cn.fujitsu.com>
      Link: http://lkml.kernel.org/r/4DACE6E3.8080200@cn.fujitsu.comSigned-off-by: NSteven Rostedt <rostedt@goodmis.org>
      7f34b746
    • L
      tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine · 2fc1b6f0
      liubo 提交于
      Filesystem, like Btrfs, has some "ULL" macros, and when these macros are passed
      to tracepoints'__print_symbolic(), there will be 64->32 truncate WARNINGS during
      compiling on 32bit box.
      Signed-off-by: NLiu Bo <liubo2009@cn.fujitsu.com>
      Link: http://lkml.kernel.org/r/4DACE6E0.7000507@cn.fujitsu.comSigned-off-by: NSteven Rostedt <rostedt@goodmis.org>
      2fc1b6f0
    • S
      ftrace: Set ops->flag to enabled even on static function tracing · 3b6cfdb1
      Steven Rostedt 提交于
      When dynamic ftrace is not configured, the ops->flags still needs
      to have its FTRACE_OPS_FL_ENABLED bit set in ftrace_startup().
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      3b6cfdb1
    • S
      tracing: Have event with function tracer check error return · 17bb615a
      Steven Rostedt 提交于
      The self tests for event tracer does not check if the function
      tracing was successfully activated. It needs to before it continues
      the tests, otherwise the wrong errors may be reported.
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      17bb615a
    • S
      ftrace: Have ftrace_startup() return failure code · a1cd6173
      Steven Rostedt 提交于
      The register_ftrace_function() returns an error code on failure
      except if the call to ftrace_startup() fails. Add a error return to
      ftrace_startup() if it fails to start, allowing register_ftrace_funtion()
      to return a proper error value.
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      a1cd6173
    • S
      video: mb862xx: udelay need linux/delay.h · 520fd845
      Stephen Rothwell 提交于
      Fix this:
      
        drivers/video/mb862xx/mb862xx-i2c.c: In function 'mb862xx_i2c_wait_event':
        drivers/video/mb862xx/mb862xx-i2c.c:25: error: implicit declaration of function 'udelay'
      
      caused by commit f8a6b1f4 ("video: mb862xx: add support for
      controller's I2C bus adapter").
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      520fd845
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd · 14d74e0c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd:
        net: fix get_net_ns_by_fd for !CONFIG_NET_NS
        ns proc: Return -ENOENT for a nonexistent /proc/self/ns/ entry.
        ns: Declare sys_setns in syscalls.h
        net: Allow setting the network namespace by fd
        ns proc: Add support for the ipc namespace
        ns proc: Add support for the uts namespace
        ns proc: Add support for the network namespace.
        ns: Introduce the setns syscall
        ns: proc files for namespace naming policy.
      14d74e0c
    • L
      slub: remove no-longer used 'unlock_out' label · 49a78d08
      Linus Torvalds 提交于
      Commit a71ae47a ("slub: Fix double bit unlock in debug mode")
      removed the only goto to this label, resulting in
      
        mm/slub.c: In function '__slab_alloc':
        mm/slub.c:1834: warning: label 'unlock_out' defined but not used
      
      fixed trivially by the removal of the label itself too.
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Christoph Lameter <cl@linux.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      49a78d08
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 3f5785ec
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
        bonding: documentation and code cleanup for resend_igmp
        bonding: prevent deadlock on slave store with alb mode (v3)
        net: hold rtnl again in dump callbacks
        Add Fujitsu 1000base-SX PCI ID to tg3
        bnx2x: protect sequence increment with mutex
        sch_sfq: fix peek() implementation
        isdn: netjet - blacklist Digium TDM400P
        via-velocity: don't annotate MAC registers as packed
        xen: netfront: hold RTNL when updating features.
        sctp: fix memory leak of the ASCONF queue when free asoc
        net: make dev_disable_lro use physical device if passed a vlan dev (v2)
        net: move is_vlan_dev into public header file (v2)
        bug.h: Fix build with CONFIG_PRINTK disabled.
        wireless: fix fatal kernel-doc error + warning in mac80211.h
        wireless: fix cfg80211.h new kernel-doc warnings
        iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
        dst: catch uninitialized metrics
        be2net: hash key for rss-config cmd not set
        bridge: initialize fake_rtable metrics
        net: fix __dst_destroy_metrics_generic()
        ...
      
      Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
      3f5785ec
    • J
      jump_label: Check entries limit in __jump_label_update · 7cbc5b8d
      Jiri Olsa 提交于
      When iterating the jump_label entries array (core or modules),
      the __jump_label_update function peeks over the last entry.
      
      The reason is that the end of the for loop depends on the key
      value of the processed entry. Thus when going through the
      last array entry, we will touch the memory behind the array
      limit.
      
      This bug probably will never be triggered, since most likely the
      memory behind the jump_label entries will be accesable and the
      entry->key will be different than the expected value.
      Signed-off-by: NJiri Olsa <jolsa@redhat.com>
      Acked-by: NJason Baron <jbaron@redhat.com>
      Link: http://lkml.kernel.org/r/20110510104346.GC1899@jolsa.brq.redhat.comSigned-off-by: NSteven Rostedt <rostedt@goodmis.org>
      7cbc5b8d
    • R
      ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM · 9905ce8a
      Rabin Vincent 提交于
      While find_secsym_ndx often finds the unamed local STT_SECTION, if a
      section has only one function in it, the ARM toolchain generates the
      STT_FUNC symbol before the STT_SECTION, and recordmcount finds this
      instead.
      
      This is problematic on ARM because in ARM ELFs, "if a [STT_FUNC] symbol
      addresses a Thumb instruction, its value is the address of the
      instruction with bit zero set (in a relocatable object, the section
      offset with bit zero set)".  This leads to incorrect mcount addresses
      being recorded.
      
      Fix this by not using STT_FUNC symbols as the base on ARM.
      Signed-off-by: NRabin Vincent <rabin@rab.in>
      Link: http://lkml.kernel.org/r/1305134631-31617-1-git-send-email-rabin@rab.inSigned-off-by: NSteven Rostedt <rostedt@goodmis.org>
      9905ce8a
    • S
      scripts/tags.sh: Add magic for trace-events for etags too · 4d7a2fa8
      Steven Rostedt 提交于
      Seems that Peter Zijlstra treats us emacs users as second class
      citizens and the commit:
      
       commit 15664125
       Author: Peter Zijlstra <peterz@infradead.org>
       scripts/tags.sh: Add magic for trace-events
      
      only updated ctags (for vim) and did not do the work to let us
      lowly emacs users benefit from such a change.
      
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      4d7a2fa8
    • S
      scripts/tags.sh: Fix ctags for DEFINE_EVENT() · 50d6828e
      Steven Rostedt 提交于
      The regex to handle DEFINE_EVENT() should not be the same as
      the TRACE_EVENT() as the first parameter in DEFINE_EVENT is the
      template name, not the event name. We need the second parameter
      as that is what the trace_... will use.
      Tested-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      50d6828e
    • R
      x86/ftrace: Fix compiler warning in ftrace.c · 0d098a7d
      Rakib Mullick 提交于
       Due to commit dc326fca (x86, cpu: Clean up and unify the NOP selection infrastructure), we get the following warning:
      
      arch/x86/kernel/ftrace.c: In function ‘ftrace_make_nop’:
      arch/x86/kernel/ftrace.c:308:6: warning: assignment discards qualifiers from pointer target type
      arch/x86/kernel/ftrace.c: In function ‘ftrace_make_call’:
      arch/x86/kernel/ftrace.c:318:6: warning: assignment discards qualifiers from pointer target type
      
      ftrace_nop_replace() now returns const unsigned char *, so change its associated function/variable to its compatible type to keep compiler clam.
      Signed-off-by: NRakib Mullick <rakib.mullick@gmail.com>
      Link: http://lkml.kernel.org/r/1305221620.7986.4.camel@localhost.localdomain
      
      [ updated for change of const void *src in probe_kernel_write() ]
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      0d098a7d
    • S
      maccess,probe_kernel: Make write/read src const void * · f29c5041
      Steven Rostedt 提交于
      The functions probe_kernel_write() and probe_kernel_read() do not modify
      the src pointer. Allow const pointers to be passed in without the need
      of a typecast.
      Acked-by: NMike Frysinger <vapier@gentoo.org>
      Acked-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Acked-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      Link: http://lkml.kernel.org/r/1305824936.1465.4.camel@gandalf.stny.rr.com
      f29c5041
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 8c1c77ff
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (75 commits)
        mmc: core: eMMC bus width may not work on all platforms
        mmc: sdhci: Auto-CMD23 fixes.
        mmc: sdhci: Auto-CMD23 support.
        mmc: core: Block CMD23 support for UHS104/SDXC cards.
        mmc: sdhci: Implement MMC_CAP_CMD23 for SDHCI.
        mmc: core: Use CMD23 for multiblock transfers when we can.
        mmc: quirks: Add/remove quirks conditional support.
        mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver
        mmc: sdhci-pxa: Add quirks for DMA/ADMA to match h/w
        mmc: core: duplicated trial with same freq in mmc_rescan_try_freq()
        mmc: core: add support for eMMC Dual Data Rate
        mmc: core: eMMC signal voltage does not use CMD11
        mmc: sdhci-pxa: add platform code for UHS signaling
        mmc: sdhci: add hooks for setting UHS in platform specific code
        mmc: core: clear MMC_PM_KEEP_POWER flag on resume
        mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume
        mmc: sdhi: allow powering down controller with no card inserted
        mmc: tmio: runtime suspend the controller, where possible
        mmc: sdhi: support up to 3 interrupt sources
        mmc: sdhi: print physical base address and clock rate
        ...
      8c1c77ff
    • L
      Merge branch 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · f3ae1c75
      Linus Torvalds 提交于
      * 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        xconfig: merge code path to conf_write()
        kconfig: do not record timestamp in .config
        gconfig: Hide unused left treeview when start up the interface
        gconfig: enable rules hint for main treeviews
        MAINTAINERS: Update KCONFIG entry
        kconfig-language: add to hints
        kconfig: Document the new "visible if" syntax
        kconfig: quiet commands when V=0
        kconfig: change update-po-config to reflect new layout of arch/um
        kconfig: make update-po-config work in KBUILD_OUTPUT
        kconfig: rearrange clean-files
        kconfig: change gconf to modify hostprogs-y like nconf and mconf
        kconfig: change qconf to modify hostprogs-y like nconf and mconf
        kconfig: only build kxgettext when needed
        nconfig: Silence unused return values from wattrset
        kconfig: Do not record timestamp in auto.conf and autoconf.h
        kconfig: get rid of unused flags
        kconfig: allow multiple inclusion of the same file
        kconfig: Avoid buffer underrun in choice input
      f3ae1c75
    • L
      Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc · 9720d753
      Linus Torvalds 提交于
      * 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc:
        signal: sys_pause() should check signal_pending()
        ptrace: ptrace_resume() shouldn't wake up !TASK_TRACED thread
      9720d753
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 0c63e38a
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: New driver for the SMSC EMC6W201
        hwmon: (abituguru) Depend on DMI
        hwmon: (it87) Use request_muxed_region
        hwmon: (sch5627) Trigger Vbat measurements
        hwmon: (sch5627) Add sch5627_send_cmd function
        i8k: Integrate with the hwmon subsystem
        hwmon: (max6650) Properly support the MAX6650
        hwmon: (max6650) Drop device detection
        Move ACPI power meter driver to hwmon
        hwmon: (f71882fg) Add support for F71808A
        hwmon: (f71882fg) Split has_beep in fan_has_beep and temp_has_beep
        hwmon: (asc7621) Drop duplicate dependency
        hwmon: (jc42) Change detection class
        hwmon: Add driver for AMD family 15h processor power information
        hwmon: (k10temp) Add support for Fam15h (Bulldozer)
        hwmon: Use helper functions to set and get driver data
        i8k: Avoid lahf in 64-bit code
      0c63e38a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 0798b1db
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (26 commits)
        arch/tile: prefer "tilepro" as the name of the 32-bit architecture
        compat: include aio_abi.h for aio_context_t
        arch/tile: cleanups for tilegx compat mode
        arch/tile: allocate PCI IRQs later in boot
        arch/tile: support signal "exception-trace" hook
        arch/tile: use better definitions of xchg() and cmpxchg()
        include/linux/compat.h: coding-style fixes
        tile: add an RTC driver for the Tilera hypervisor
        arch/tile: finish enabling support for TILE-Gx 64-bit chip
        compat: fixes to allow working with tile arch
        arch/tile: update defconfig file to something more useful
        tile: do_hardwall_trap: do not play with task->sighand
        tile: replace mm->cpu_vm_mask with mm_cpumask()
        tile,mn10300: add device parameter to dma_cache_sync()
        audit: support the "standard" <asm-generic/unistd.h>
        arch/tile: clarify flush_buffer()/finv_buffer() function names
        arch/tile: kernel-related cleanups from removing static page size
        arch/tile: various header improvements for building drivers
        arch/tile: disable GX prefetcher during cache flush
        arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD
        ...
      0798b1db
    • L
      Merge branch 'for-torvalds' of... · ad363e09
      Linus Torvalds 提交于
      Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
      
      * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        mach-ux500: voltage domain regulators for DB8500
        cpufreq: make DB8500 cpufreq driver compile
        cpufreq: update DB8500 cpufreq driver
        mach-ux500: move CPUfreq driver to cpufreq subsystem
        mfd: add DB5500 PRCMU driver
        mfd: update DB8500 PRCMU driver
        mach-ux500: move the DB8500 PRCMU driver to MFD
        mach-ux500: make PRCMU base address dynamic
        mach-ux500: rename PRCMU driver per SoC
        mach-ux500: update ASIC version detection
        mach-ux500: update SoC and board IRQ handling
        mach-ux500: update the DB5500 register file
        mach-ux500: update the DB8500 register file
      ad363e09
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · ed0795aa
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (37 commits)
        Blackfin: use new common PERCPU_INPUT define
        MAINTAINERS: Fix Analog Devices mailinglist address
        Blackfin: boards: update ASoC resources after machine driver overhaul
        Blackfin: work around anomaly 05000480
        Blackfin: fix addr type with bfin_write_{or,and} helpers
        Blackfin: convert /proc/sram to seq_file
        Blackfin: switch /proc/gpio to seq_file
        Blackfin: fix indentation with bfin_read() helper
        Blackfin: convert old cpumask API to new one
        Blackfin: don't touch task->cpus_allowed directly
        Blackfin: don't touch cpu_possible_map and cpu_present_map directly
        Blackfin: bf548-ezkit/bf561-ezkit: update nor flash layout
        Blackfin: initial perf_event support
        Blackfin: update anomaly lists to latest public info
        Blackfin: use on-chip reset func with newer parts
        Blackfin: bf533-stamp/bf537-stamp: drop ad1980 from defconfigs
        Blackfin: optimize MMR reads during startup a bit
        Blackfin: bf537: demux port H mask A and emac rx ints
        Blackfin: bf537: fix excessive gpio int demuxing
        Blackfin: bf54x: drop unused pm gpio handling
        ...
      ed0795aa
    • L
      Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 4e8a780e
      Linus Torvalds 提交于
      * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (34 commits)
        ARM: mach-shmobile: mackerel: add renesas_usbhs support for USB1
        ARM: mach-shmobile: Correct the G4EVM SDHI0 I/O range.
        ARM: arch-shmobile: sh7372: add renesas_usbhs irq support
        ARM: mach-shmobile: sh73a0: mark DMA slave ID 0 as invalid
        ARM: mach-shmobile: mark DMA slave ID 0 as invalid
        ARM: mach-shmobile: Enable DMAEngine for SDHI on AG5EVM
        ARM: mach-shmobile: Enable DMAEngine for MMCIF on AG5EVM
        ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC
        dmaengine: shdma: Update SH_DMAC_MAX_CHANNELS to 20
        dmaengine: shdma: Fix SH_DMAC_MAX_CHANNELS handling
        dmaengine: shdma: Make second memory window optional
        ARM: mach-shmobile: Tidy up after SH7372 pm changes.
        ARM: mach-shmobile: sh7372 Core Standby CPUIdle
        ARM: mach-shmobile: CPUIdle support
        ARM: mach-shmobile: sh7372 Core Standby Suspend-to-RAM
        ARM: mach-shmobile: Suspend-to-RAM support
        mailmap: Add entry for Damian Hobson-Garcia.
        ARM: switch mackerel to dynamically manage the platform camera
        ARM: mach-shmobile: Add SDHI support for AG5EVM and sh73a0
        ARM: arch-shmobile: Use multiple irq vectors for SDHI
        ...
      4e8a780e
    • T
      hrtimers: Fix typo causing erratic timers · 90ff1f30
      Thomas Gleixner 提交于
      commit 9ec26907 ("timerfd: Manage cancelable timers in timerfd")
      introduced a CONFIG_HIGHRES_TIMERS (should be CONFIG_HIGH_RES_TIMERS)
      typo, which caused applications depending on CLOCK_REALTIME timers to
      become sluggy due to the fact that the time base of the realtime
      timers was not updated when the wall clock time was set.
      
      This causes anything from 100% CPU use for some applications to odd
      delays and hickups.
      Reported-bisected-and-tested-by: NAnca Emanuel <anca.emanuel@gmail.com>
      Tested-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Fatfingered-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      90ff1f30
    • F
      bonding: documentation and code cleanup for resend_igmp · 94265cf5
      Flavio Leitner 提交于
      Improves the documentation about how IGMP resend parameter
      works, fix two missing checks and coding style issues.
      Signed-off-by: NFlavio Leitner <fbl@redhat.com>
      Acked-by: NRick Jones <rick.jones2@hp.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      94265cf5
    • N
      bonding: prevent deadlock on slave store with alb mode (v3) · 9fe0617d
      Neil Horman 提交于
      This soft lockup was recently reported:
      
      [root@dell-per715-01 ~]# echo +bond5 > /sys/class/net/bonding_masters
      [root@dell-per715-01 ~]# echo +eth1 > /sys/class/net/bond5/bonding/slaves
      bonding: bond5: doing slave updates when interface is down.
      bonding bond5: master_dev is not up in bond_enslave
      [root@dell-per715-01 ~]# echo -eth1 > /sys/class/net/bond5/bonding/slaves
      bonding: bond5: doing slave updates when interface is down.
      
      BUG: soft lockup - CPU#12 stuck for 60s! [bash:6444]
      CPU 12:
      Modules linked in: bonding autofs4 hidp rfcomm l2cap bluetooth lockd sunrpc
      be2d
      Pid: 6444, comm: bash Not tainted 2.6.18-262.el5 #1
      RIP: 0010:[<ffffffff80064bf0>]  [<ffffffff80064bf0>]
      .text.lock.spinlock+0x26/00
      RSP: 0018:ffff810113167da8  EFLAGS: 00000286
      RAX: ffff810113167fd8 RBX: ffff810123a47800 RCX: 0000000000ff1025
      RDX: 0000000000000000 RSI: ffff810123a47800 RDI: ffff81021b57f6f8
      RBP: ffff81021b57f500 R08: 0000000000000000 R09: 000000000000000c
      R10: 00000000ffffffff R11: ffff81011d41c000 R12: ffff81021b57f000
      R13: 0000000000000000 R14: 0000000000000282 R15: 0000000000000282
      FS:  00002b3b41ef3f50(0000) GS:ffff810123b27940(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      CR2: 00002b3b456dd000 CR3: 000000031fc60000 CR4: 00000000000006e0
      
      Call Trace:
       [<ffffffff80064af9>] _spin_lock_bh+0x9/0x14
       [<ffffffff886937d7>] :bonding:tlb_clear_slave+0x22/0xa1
       [<ffffffff8869423c>] :bonding:bond_alb_deinit_slave+0xba/0xf0
       [<ffffffff8868dda6>] :bonding:bond_release+0x1b4/0x450
       [<ffffffff8006457b>] __down_write_nested+0x12/0x92
       [<ffffffff88696ae4>] :bonding:bonding_store_slaves+0x25c/0x2f7
       [<ffffffff801106f7>] sysfs_write_file+0xb9/0xe8
       [<ffffffff80016b87>] vfs_write+0xce/0x174
       [<ffffffff80017450>] sys_write+0x45/0x6e
       [<ffffffff8005d28d>] tracesys+0xd5/0xe0
      
      It occurs because we are able to change the slave configuarion of a bond while
      the bond interface is down.  The bonding driver initializes some data structures
      only after its ndo_open routine is called.  Among them is the initalization of
      the alb tx and rx hash locks.  So if we add or remove a slave without first
      opening the bond master device, we run the risk of trying to lock/unlock a
      spinlock that has garbage for data in it, which results in our above softlock.
      
      Note that sometimes this works, because in many cases an unlocked spinlock has
      the raw_lock parameter initialized to zero (meaning that the kzalloc of the
      net_device private data is equivalent to calling spin_lock_init), but thats not
      true in all cases, and we aren't guaranteed that condition, so we need to pass
      the relevant spinlocks through the spin_lock_init function.
      
      Fix it by moving the spin_lock_init calls for the tx and rx hashtable locks to
      the ndo_init path, so they are ready for use by the bond_store_slaves path.
      
      Change notes:
      v2) Based on conversation with Jay and Nicolas it seems that the ability to
      enslave devices while the bond master is down should be safe to do.  As such
      this is an outlier bug, and so instead we'll just initalize the errant spinlocks
      in the init path rather than the open path, solving the problem.  We'll also
      remove the warnings about the bond being down during enslave operations, since
      it should be safe
      
      v3) Fix spelling error
      Signed-off-by: NNeil Horman <nhorman@tuxdriver.com>
      Reported-by: jtluka@redhat.com
      CC: Jay Vosburgh <fubar@us.ibm.com>
      CC: Andy Gospodarek <andy@greyhouse.net>
      CC: nicolas.2p.debian@gmail.com
      CC: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: NJay Vosburgh <fubar@us.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9fe0617d
    • E
      net: hold rtnl again in dump callbacks · 2907c35f
      Eric Dumazet 提交于
      Commit e67f88dd (dont hold rtnl mutex during netlink dump callbacks)
      missed fact that rtnl_fill_ifinfo() must be called with rtnl held.
      
      Because of possible deadlocks between two mutexes (cb_mutex and rtnl),
      its not easy to solve this problem, so revert this part of the patch.
      
      It also forgot one rcu_read_unlock() in FIB dump_rules()
      
      Add one ASSERT_RTNL() in rtnl_fill_ifinfo() to remind us the rule.
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      CC: Patrick McHardy <kaber@trash.net>
      CC: Stephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2907c35f