1. 17 10月, 2009 5 次提交
    • M
      perf: Check libdwarf APIs for perf probe · 4c20194c
      Masami Hiramatsu 提交于
      Check libdwarf APIs for perf probe in tools/perf/Makefile. Since
      dwarf_get_ranges() has been added from libdwarf 20081231 (and
      it's the newest function used in probe-finder.c), this just
      checks whether the function is defined.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <20091017000752.16556.92051.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      4c20194c
    • M
      x86: Add AMD prefetch and 3DNow! opcodes to opcode map · d1baf5a5
      Masami Hiramatsu 提交于
      Add AMD prefetch and 3DNow! opcode including FEMMS. Since 3DNow!
      uses the last immediate byte as an opcode extension byte, x86
      insn just treats the extenstion byte as an immediate byte
      instead of a part of opcode (insn_get_opcode() decodes first
      "0x0f 0x0f" bytes.)
      
      Users who are interested in analyzing 3DNow! opcode still can
      decode it by analyzing the immediate byte.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <20091017000744.16556.27881.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      d1baf5a5
    • M
      x86: Add MMX/SSE opcode groups to opcode map · 8c95bc3e
      Masami Hiramatsu 提交于
      Add missing MMX/SSE opcode groups to x86 opcode map.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <20091017000736.16556.29061.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      8c95bc3e
    • M
      tracing/kprobes: Add failure messages for debugging · e63cc239
      Masami Hiramatsu 提交于
      Add verbose failure messages to kprobe-tracer for debugging.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <20091017000728.16556.16713.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      e63cc239
    • M
      tracing/kprobes: Update kprobe-tracer selftest against new syntax · f397af06
      Masami Hiramatsu 提交于
      Update kprobe-tracer selftest since command syntax has been
      changed.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <20091017000720.16556.26343.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      f397af06
  2. 13 10月, 2009 7 次提交
    • M
      perf probe: Add perf probe command support without libdwarf · 23e8ec0d
      Masami Hiramatsu 提交于
      Enables 'perf probe' even if libdwarf is not installed. If libdwarf is
      not found, 'perf probe' just disables dwarf support. Users can use
      'perf probe' to set up new events by using kprobe_events format.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      LKML-Reference: <20091007222830.1684.25665.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      23e8ec0d
    • M
      perf: Add perf probe subcommand, a kprobe-event setup helper · 4ea42b18
      Masami Hiramatsu 提交于
      Add perf probe subcommand that implements a kprobe-event setup helper
      to the perf command.
      This allows user to define kprobe events using C expressions (C line
      numbers, C function names, and C local variables).
      
      Usage
      -----
       perf probe [<options>] -P 'PROBEDEF' [-P 'PROBEDEF' ...]
      
          -k, --vmlinux <file>  vmlinux/module pathname
          -P, --probe <p|r:[GRP/]NAME FUNC[+OFFS][@src]|@src:LINE [ARG ...]>
                                probe point definition, where
      		p:	kprobe probe
      		r:	kretprobe probe
      		GRP:	Group name (optional)
      		NAME:	Event name
      		FUNC:	Function name
      		OFFS:	Offset from function entry (in byte)
      		SRC:	Source code path
      		LINE:	Line number
      		ARG:	Probe argument (local variable name or
      			kprobe-tracer argument format is supported.)
      
      Changes in v4:
       - Add _GNU_SOURCE macro for strndup().
      
      Changes in v3:
       - Remove -r option because perf always be used for online kernel.
       - Check malloc/calloc results.
      
      Changes in v2:
       - Check synthesized string length.
       - Rename perf kprobe to perf probe.
       - Use spaces for separator and update usage comment.
       - Check error paths in parse_probepoint().
       - Check optimized-out variables.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      LKML-Reference: <20091008211737.29299.14784.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      4ea42b18
    • M
      tracing/kprobes: Robustify fixed field names against variable field names conflicts · e93f4d85
      Masami Hiramatsu 提交于
      Rename probe-common fixed field names to harder conflictable names,
      because current 'ip', 'func', and other probe field names are easily in
      conflict with user-specified variable names.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      LKML-Reference: <20091007222814.1684.407.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      e93f4d85
    • M
      tracing/kprobes: Avoid field name confliction · a703d946
      Masami Hiramatsu 提交于
      Check whether the argument name is in conflict with other field names
      while creating a kprobe through the debugfs interface.
      
      Changes in v3:
       - Check strcmp() == 0 instead of !strcmp().
      
      Changes in v2:
       - Add common_lock_depth to reserved name list.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      LKML-Reference: <20091007222807.1684.26880.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      a703d946
    • M
      tracing/kprobes: Make special variable names more self-explainable · 2e06ff63
      Masami Hiramatsu 提交于
      Rename special variables to more self-explainable names as below:
      - $rv to $retval
      - $sa to $stack
      - $aN to $argN
      - $sN to $stackN
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      LKML-Reference: <20091007222759.1684.3319.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      2e06ff63
    • M
      tracing/kprobes: Remove '$ra' special variable · 99329c44
      Masami Hiramatsu 提交于
      Remove '$ra' (return address) because it is already shown at the head of
      each entry.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      LKML-Reference: <20091007222748.1684.12711.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      99329c44
    • M
      tracing/kprobes: Add $ prefix to special variables · 405b2651
      Masami Hiramatsu 提交于
      Add $ prefix to the special variables(e.g. sa, rv) of kprobe-tracer.
      This resolves consistency issues between kprobe_events and perf-kprobe.
      
      The main goal is to avoid conflicts between local variable names of
      probed functions, used by perf probe, and special variables used
      in the kprobe event creation interface (stack values, etc...) and
      also available from perf probe.
      
      ie: we don't want rv (return value) to conflict with a local variable
      named rv in a probed function.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      LKML-Reference: <20091007222740.1684.91170.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      405b2651
  3. 03 10月, 2009 3 次提交
    • M
      tracing/ftrace: Fix to check create_event_dir() when adding new events · 88f70d75
      Masami Hiramatsu 提交于
      Check result of event_create_dir() and add ftrace_event_call to
      ftrace_events list only if it is succeeded. Thanks to Li for pointing
      it out.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Acked-by: NSteven Rostedt <rostedt@goodmis.org>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Jason Baron <jbaron@redhat.com>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
      Cc: Li Zefan <lizf@cn.fujitsu.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <20090925182054.10157.55219.stgit@omoto>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      88f70d75
    • M
      x86: Add VIA processor instructions in opcodes decoder · c0b11d3a
      Masami Hiramatsu 提交于
      Add VIA processor's Padlock instructions(MONTMUL, XSHA1, XSHA256)
      as parts of the kernel may use them.
      
      This fixes the following crash in opcodes decoder selftests:
      
       make[2]: `scripts/unifdef' is up to date.
         TEST    posttest
       Error: c145cf71:        f3 0f a6 d0             repz xsha256
       Error: objdump says 4 bytes, but insn_get_length() says 3 (attr:0)
       make[1]: *** [posttest] Error 2
       make: *** [bzImage] Error 2
      Reported-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Acked-by: NSteven Rostedt <rostedt@goodmis.org>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Jason Baron <jbaron@redhat.com>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
      Cc: Li Zefan <lizf@cn.fujitsu.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <20090925182037.10157.3180.stgit@omoto>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      c0b11d3a
    • M
      tracing/kprobes: Use global event perf buffers in kprobe tracer · a1a138d0
      Masami Hiramatsu 提交于
      Use new percpu global event buffer instead of stack in kprobe
      tracer while tracing through perf.
      Signed-off-by: NMasami Hiramatsu <mhiramat@redhat.com>
      Acked-by: NSteven Rostedt <rostedt@goodmis.org>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Frank Ch. Eigler <fche@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Jason Baron <jbaron@redhat.com>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
      Cc: Li Zefan <lizf@cn.fujitsu.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <20090925182011.10157.60140.stgit@omoto>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      a1a138d0
  4. 24 9月, 2009 25 次提交
    • F
      Merge commit 'linus/master' into tracing/kprobes · d7a4b414
      Frederic Weisbecker 提交于
      Conflicts:
      	kernel/trace/Makefile
      	kernel/trace/trace.h
      	kernel/trace/trace_event_types.h
      	kernel/trace/trace_export.c
      
      Merge reason:
      	Sync with latest significant tracing core changes.
      d7a4b414
    • L
      Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 · a724eada
      Linus Torvalds 提交于
      * 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
        Add MAINTAINERS entry for ARM/INTEL IXP4xx arch support.
        ixp4xx: arch_idle() documentation fixup
        ixp4xx: timer and clocks cleanups
      a724eada
    • R
      serial core: fix new kernel-doc warnings · 1b9894f3
      Randy Dunlap 提交于
      Fix new kernel-doc warnings in serial_core.[hc] files.
      
        Warning(include/linux/serial_core.h:485): No description found for parameter 'uport'
        Warning(include/linux/serial_core.h:485): Excess function parameter 'port' description in 'uart_handle_dcd_change'
        Warning(include/linux/serial_core.h:511): No description found for parameter 'uport'
        Warning(include/linux/serial_core.h:511): Excess function parameter 'port' description in 'uart_handle_cts_change'
        Warning(drivers/serial/serial_core.c:2437): No description found for parameter 'uport'
        Warning(drivers/serial/serial_core.c:2437): Excess function parameter 'port' description in 'uart_add_one_port'
        Warning(drivers/serial/serial_core.c:2509): No description found for parameter 'uport'
        Warning(drivers/serial/serial_core.c:2509): Excess function parameter 'port' description in 'uart_remove_one_port'
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1b9894f3
    • D
      MN10300: Handle removal of struct uart_info · 70430786
      David Howells 提交于
      Commit ebd2c8f6 removed struct uart_info and
      commit bdc04e31 further moved delta_msr_wait.
      Fix up the MN10300 on-chip serial port drivers to comply with this.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      70430786
    • C
      FRV: Use asm/generic-hardirq.h · a7077099
      Christoph Hellwig 提交于
      Use asm/generic-hardirq.h to build asm/hardirq.h and also remove the unused
      idle_timestamp field in irq_cpustat whilst we're at it.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a7077099
    • L
      Merge branch 'x86/ptrace-syscall-exit' of... · d19110ba
      Linus Torvalds 提交于
      Merge branch 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland
      
      * 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
        x86: ptrace: sysret path should reach syscall_trace_leave
      d19110ba
    • L
      Merge git://git.infradead.org/battery-2.6 · 433c24ed
      Linus Torvalds 提交于
      * git://git.infradead.org/battery-2.6:
        power_supply: Add driver for the PMU on WM831x PMICs
        ds2760_battery: Fix integer overflow for time_to_empty_now
        wm97xx_battery: Convert to dev_pm_ops
        wm97xx_battery: Use irq to detect charger state
        wm97xx_battery: Use platform_data
        wm97xx-core: Pass platform_data to battery
        ds2760_battery: implement set_charged() feature
        power_supply: get_by_name and set_charged functionality
        power_supply: EXPORT_SYMBOL cleanups
        ds2760_battery: add current_accum module parameter
        ds2760_battery: handle full_active_uAh == 0 case correctly
        ds2760_battery: add rated_capacity module parameter
        ds2760_battery: export more features
        ds2760_battery: delay power supply registration
        wm8350_power: Implement charge type property
        power_supply: Add a charge_type property, and use it for olpc driver
        olpc_battery: Add an 'error' sysfs device that displays raw errors
        Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"
      433c24ed
    • L
      Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 85afd827
      Linus Torvalds 提交于
      * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/radeon/r600: set correct pitch for 4 byte copy
        drm/radeon: consolidate family flags used in pciids.
      85afd827
    • L
      Merge git://git.infradead.org/mtd-2.6 · a7c367b9
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (58 commits)
        mtd: jedec_probe: add PSD4256G6V id
        mtd: OneNand support for Nomadik 8815 SoC (on NHK8815 board)
        mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board)
        m25p80: Add Spansion S25FL129P serial flashes
        jffs2: Use SLAB_HWCACHE_ALIGN for jffs2_raw_{dirent,inode} slabs
        mtd: sh_flctl: register sh_flctl using platform_driver_probe()
        mtd: nand: txx9ndfmc: transfer 512 byte at a time if possible
        mtd: nand: fix tmio_nand ecc correction
        mtd: nand: add __nand_correct_data helper function
        mtd: cfi_cmdset_0002: add 0xFF intolerance for M29W128G
        mtd: inftl: fix fold chain block number
        mtd: jedec: fix compilation problem with I28F640C3B definition
        mtd: nand: fix ECC Correction bug for SMC ordering for NDFC driver
        mtd: ofpart: Check availability of reg property instead of name property
        driver/Makefile: Initialize "mtd" and "spi" before "net"
        mtd: omap: adding DMA mode support in nand prefetch/post-write
        mtd: omap: add support for nand prefetch-read and post-write
        mtd: add nand support for w90p910 (v2)
        mtd: maps: add mtd-ram support to physmap_of
        mtd: pxa3xx_nand: add single-bit error corrections reporting
        ...
      a7c367b9
    • L
      Merge branch 'vgaarb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 15f964be
      Linus Torvalds 提交于
      * 'vgaarb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        vgaarb: make client interface config invariant.
      15f964be
    • L
      Merge git://git.infradead.org/iommu-2.6 · b09a75fc
      Linus Torvalds 提交于
      * git://git.infradead.org/iommu-2.6: (23 commits)
        intel-iommu: Disable PMRs after we enable translation, not before
        intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
        intel-iommu: Fix integer wrap on 32 bit kernels
        intel-iommu: Fix integer overflow in dma_pte_{clear_range,free_pagetable}()
        intel-iommu: Limit DOMAIN_MAX_PFN to fit in an 'unsigned long'
        intel-iommu: Fix kernel hang if interrupt remapping disabled in BIOS
        intel-iommu: Disallow interrupt remapping if not all ioapics covered
        intel-iommu: include linux/dmi.h to use dmi_ routines
        pci/dmar: correct off-by-one error in dmar_fault()
        intel-iommu: Cope with yet another BIOS screwup causing crashes
        intel-iommu: iommu init error path bug fixes
        intel-iommu: Mark functions with __init
        USB: Work around BIOS bugs by quiescing USB controllers earlier
        ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
        intel-iommu: make domain_add_dev_info() call domain_context_mapping()
        intel-iommu: Unify hardware and software passthrough support
        intel-iommu: Cope with broken HP DC7900 BIOS
        iommu=pt is a valid early param
        intel-iommu: double kfree()
        intel-iommu: Kill pointless intel_unmap_single() function
        ...
      
      Fixed up trivial include lines conflict in drivers/pci/intel-iommu.c
      b09a75fc
    • R
      misc: remove redundant start_kernel prototypes · cf63ff5f
      Rusty Russell 提交于
      Impact: cleanup
      
      No need for redeclaration.
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cf63ff5f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · fd8b327e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (41 commits)
        regulator: Add some brief design documentation
        regulator: fix voltage range in da9034 ldo12
        regulator/driver: be more specific in nanodoc for is_enabled
        regulator/lp3971: drop unnecessary initialization
        regulator: drop 'default n'
        regulator: fix typos
        regulator: fix calculation of voltage range in da9034_set_ldo12_voltage()
        regulator: update a filename in documentation
        drivers/regulator/Kconfig: fix typo (s/Usersapce/Userspace/) in REGULATOR_USERSPACE_CONSUMER description
        REGULATOR Handle positive returncode from enable
        regulator: tps650xx - build fixes for x86_64
        Fix some regulator documentation
        Regulator: Adding TPS65023 and TPS6507x in Kconfig and Makefile
        Regulator: Add TPS6507x regulator driver
        Regulator: Add TPS65023 regulator driver
        regulator: userspace: use sysfs_create_group
        regulator: Add GPIO enable control to fixed voltage regulator driver
        Regulator: Implement list_voltage for pcf50633 regulator driver.
        regulator: regulator_enable() permission checking
        regulator: Push locking for regulator_is_enabled() out
        ...
      fd8b327e
    • L
      Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 0c9af280
      Linus Torvalds 提交于
      * 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: lx6464es - remove unused struct member
        ALSA: lx6464es - cleanup of rmh message bus function
        ALSA: pcm - Simplify snd_pcm_drain() implementation
      0c9af280
    • L
      Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · fe61c99a
      Linus Torvalds 提交于
      * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ASoC: wm8753: fix mapping when MONOMIX is set to Stereo
        ASoC: some minor changes for AD1836 and AD1938 codec drivers
        ASoC: DaVinci: Fixes to McASP configuration
        ASoC: Blackfin I2S: fix resuming when device hasn't been used
        ASoC: Blackfin I2S: add lost platform_device parameter to resume function
        ASoC: fix typos in Blackfin headers
        ASoC: bf5xx-sport: the irq save/restore funcs take an unsigned long
        ASoC: Blackfin AC97: add a few missing multichannel define handling
      fe61c99a
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 9fd815b5
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (22 commits)
        [S390] Update default configuration.
        [S390] hibernate: Do real CPU swap at resume time
        [S390] dasd: tolerate devices that have no feature codes
        [S390] zcrypt: Do not add/remove devices in s/r callbacks
        [S390] hibernate: make sure pfn_is_nosave handles lowcore pages
        [S390] smp: introduce LC_ORDER and simplify lowcore handling
        [S390] ptrace: use common code for simple peek/poke operations
        [S390] fix disabled_wait inline assembly clobber list
        [S390] Change kernel_page_present coding style.
        [S390] hibernation: reset system after resume
        [S390] hibernation: fix guest page hinting related crash
        [S390] Get rid of init_module/delete_module compat functions.
        [S390] Convert sys_execve to function with parameters.
        [S390] Convert sys_clone to function with parameters.
        [S390] qdio: change state of all primed input buffers
        [S390] qdio: reduce per device debug messages
        [S390] cio: introduce consistent subchannel scanning
        [S390] cio: idset use actual number of ssids
        [S390] cio: dont kfree vmalloced memory
        [S390] cio: introduce css_settle
        ...
      9fd815b5
    • L
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 31bbb9b5
      Linus Torvalds 提交于
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        itimers: Add tracepoints for itimer
        hrtimer: Add tracepoint for hrtimers
        timers: Add tracepoints for timer_list timers
        cputime: Optimize jiffies_to_cputime(1)
        itimers: Simplify arm_timer() code a bit
        itimers: Fix periodic tics precision
        itimers: Merge ITIMER_VIRT and ITIMER_PROF
      
      Trivial header file include conflicts in kernel/fork.c
      31bbb9b5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · ff830b8e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        ieee1394: sbp2: remove a workaround for Momobay FX-3A
        firewire: sbp2: remove a workaround for Momobay FX-3A
        firewire: sbp2: fix status reception
        firewire: core: fix topology map response handler
        firewire: core: fix race with parallel PCI device probe
        firewire: core: header file cleanup
        firewire: ohci: fix Self ID Count register mask (safeguard against buffer overflow)
        ieee1394: raw1394: Do not leak memory on failed trylock.
      ff830b8e
    • L
      Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 · 746942d0
      Linus Torvalds 提交于
      * 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
        SFI: remove unneeded includes
        sfi: Remove unused code
        SFI: Hook PCI MMCONFIG
        x86: add arch-specific SFI support
        SFI: add capability to parse ACPI tables
        SFI: add platform-independent core support
        SFI: create linux/sfi.h
        SFI: Simple Firmware Interface - MAINTAINERS, Kconfig
      746942d0
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · c11f6c82
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (119 commits)
        ACPI: don't pass handle for fixed hardware notifications
        ACPI: remove null pointer checks in deferred execution path
        ACPI: simplify deferred execution path
        acerhdf: additional BIOS versions
        acerhdf: convert to dev_pm_ops
        acerhdf: fix fan control for AOA150 model
        thermal: add missing Kconfig dependency
        acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file
        hp-wmi: fix rfkill memory leak on unload
        ACPI: remove unnecessary #ifdef CONFIG_DMI
        ACPI: linux/acpi.h should not include linux/dmi.h
        hwmon driver for ACPI 4.0 power meters
        topstar-laptop: add new driver for hotkeys support on Topstar N01
        thinkpad_acpi: fix rfkill memory leak on unload
        thinkpad-acpi: report brightness events when required
        thinkpad-acpi: don't poll by default any of the reserved hotkeys
        thinkpad-acpi: Fix procfs hotkey reset command
        thinkpad-acpi: deprecate hotkey_bios_mask
        thinkpad-acpi: hotkey poll fixes
        thinkpad-acpi: be more strict when detecting a ThinkPad
        ...
      c11f6c82
    • L
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 40aba218
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: Clearly mark ACPI drivers as such
        i2c: Add driver for SMBus Control Method Interface
        i2c-pnx: Correct use of request_region/request_mem_region
        MAINTAINERS: Add maintainer for AT24 and PCA9564/PCA9665
        i2c-piix4: Add AMD SB900 SMBus device ID
        i2c/chips: Remove deprecated pcf8574 driver
        i2c/chips: Remove deprecated pca9539 driver
        i2c/chips: Remove deprecated pcf8575 driver
        gpio/pcf857x: Copy i2c_device_id from old pcf8574 driver
        i2c/scx200_acb: Provide more information on bus errors
        i2c: Provide compatibility links for i2c adapters
        i2c: Convert i2c adapters to bus devices
        i2c: Convert i2c clients to a device type
        i2c/tsl2550: Use combined SMBus transactions
        i2c-taos-evm: Switch echo off to improve performance
        i2c: Drop unused i2c_driver.id field
      40aba218
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · b64ada6b
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (85 commits)
        ocfs2: Use buffer IO if we are appending a file.
        ocfs2: add spinlock protection when dealing with lockres->purge.
        dlmglue.c: add missed mlog lines
        ocfs2: __ocfs2_abort() should not enable panic for local mounts
        ocfs2: Add ioctl for reflink.
        ocfs2: Enable refcount tree support.
        ocfs2: Implement ocfs2_reflink.
        ocfs2: Add preserve to reflink.
        ocfs2: Create reflinked file in orphan dir.
        ocfs2: Use proper parameter for some inode operation.
        ocfs2: Make transaction extend more efficient.
        ocfs2: Don't merge in 1st refcount ops of reflink.
        ocfs2: Modify removing xattr process for refcount.
        ocfs2: Add reflink support for xattr.
        ocfs2: Create an xattr indexed block if needed.
        ocfs2: Call refcount tree remove process properly.
        ocfs2: Attach xattr clusters to refcount tree.
        ocfs2: Abstract ocfs2 xattr tree extend rec iteration process.
        ocfs2: Abstract the creation of xattr block.
        ocfs2: Remove inode from ocfs2_xattr_bucket_get_name_value.
        ...
      b64ada6b
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · be90a49c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (142 commits)
        USB: Fix sysfs paths in documentation
        USB: skeleton: fix coding style issues.
        USB: O_NONBLOCK in read path of skeleton
        USB: make usb-skeleton honor O_NONBLOCK in write path
        USB: skel_read really sucks royally
        USB: Add hub descriptor update hook for xHCI
        USB: xhci: Support USB hubs.
        USB: xhci: Set multi-TT field for LS/FS devices under hubs.
        USB: xhci: Set route string for all devices.
        USB: xhci: Fix command wait list handling.
        USB: xhci: Change how xHCI commands are handled.
        USB: xhci: Refactor input device context setup.
        USB: xhci: Endpoint representation refactoring.
        USB: gadget: ether needs to select CRC32
        USB: fix USBTMC get_capabilities success handling
        USB: fix missing error check in probing
        USB: usbfs: add USBDEVFS_URB_BULK_CONTINUATION flag
        USB: support for autosuspend in sierra while online
        USB: ehci-dbgp,ehci: Allow dbpg to work with suspend/resume
        USB: ehci-dbgp,documentation: Documentation updates for ehci-dbgp
        ...
      be90a49c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 1f0918d0
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        lguest: don't force VIRTIO_F_NOTIFY_ON_EMPTY
        lguest: cleanup for map_switcher()
        lguest: use PGDIR_SHIFT for PAE code to allow different PAGE_OFFSET
        lguest: use set_pte/set_pmd uniformly for real page table entries
        lguest: move panic notifier registration to its expected place.
        virtio_blk: add support for cache flush
        virtio: add virtio IDs file
        virtio: get rid of redundant VIRTIO_ID_9P definition
        virtio: make add_buf return capacity remaining
        virtio_pci: minor MSI-X cleanups
      1f0918d0
    • H
      nommu: fix two build breakages · 4266c97a
      Hugh Dickins 提交于
      My 58fa879e "mm: FOLL flags for GUP flags"
      broke CONFIG_NOMMU build by forgetting to update nommu.c foll_flags type:
      
        mm/nommu.c:171: error: conflicting types for `__get_user_pages'
        mm/internal.h:254: error: previous declaration of `__get_user_pages' was here
        make[1]: *** [mm/nommu.o] Error 1
      
      My 03f6462a "mm: move highest_memmap_pfn"
      broke CONFIG_NOMMU build by forgetting to add a nommu.c highest_memmap_pfn:
      
        mm/built-in.o: In function `memmap_init_zone':
        (.meminit.text+0x326): undefined reference to `highest_memmap_pfn'
        mm/built-in.o: In function `memmap_init_zone':
        (.meminit.text+0x32d): undefined reference to `highest_memmap_pfn'
      
      Fix both breakages, and give myself 30 lashes (ouch!)
      Reported-by: NMichal Simek <michal.simek@petalogix.com>
      Signed-off-by: NHugh Dickins <hugh.dickins@tiscali.co.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4266c97a