1. 28 Dec, 2009 3 commits
  2. 18 Dec, 2009 3 commits
    • Arnaldo Carvalho de Melo's avatar
      perf diff: Fix usage array, it must end with a NULL entry · 0422a4fc
      Arnaldo Carvalho de Melo authored
      Fixing this:
      
       [acme@doppio linux-2.6-tip]$ perf diff --hell
         Error: unknown option `hell'
      
        usage: perf diff [<options>] [old_file] [new_file]
       Segmentation fault
       [acme@doppio linux-2.6-tip]$
      
      Also go over the other such arrays to check if they all were OK,
      they are, but there were some minor changes to do like making
      one static and renaming another to match the command it refers
      to.
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      LKML-Reference: <1261161358-23959-1-git-send-email-acme@infradead.org>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      0422a4fc
    • Arnaldo Carvalho de Melo's avatar
      perf session: Make events_stats u64 to avoid overflow on 32-bit arches · b5b60fda
      Arnaldo Carvalho de Melo authored
      Pekka Enberg reported weird percentages in perf report. It
      turns out we are overflowing a 32-bit variables in struct
      events_stats on 32-bit architectures.
      
      Before:
      
       [acme@ana linux-2.6-tip]$ perf report -i pekka.perf.data 2> /dev/null | head -10
         281.96%       Xorg                        b710a561  [.] 0x000000b710a561
         140.15%       Xorg  [kernel]                        [k] __initramfs_end
          51.56%   metacity  libgobject-2.0.so.0.2000.1      [.] 0x00000000026e46
          35.12%  evolution  libcairo.so.2.10800.6           [.] 0x000000000203bd
          33.84%   metacity  libpthread-2.9.so               [.] 0x00000000007a3d
      
      After:
      
       [acme@ana linux-2.6-tip]$ perf report -i pekka.perf.data 2> /dev/null | head -10
          30.04%       Xorg                       b710a561   [.] 0x000000b710a561
          14.93%       Xorg  [kernel]                        [k] __initramfs_end
           5.49%   metacity  libgobject-2.0.so.0.2000.1      [.] 0x00000000026e46
           3.74%  evolution  libcairo.so.2.10800.6           [.] 0x000000000203bd
           3.61%   metacity  libpthread-2.9.so               [.] 0x00000000007a3d
      Reported-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Tested-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      LKML-Reference: <1261148583-20395-1-git-send-email-acme@infradead.org>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      b5b60fda
    • Frederic Weisbecker's avatar
      hw-breakpoints: Fix hardware breakpoints -> perf events dependency · 99e8c5a3
      Frederic Weisbecker authored
      The kbuild's select command doesn't propagate through the config
      dependencies.
      
      Hence the current rules of hardware breakpoint's config can't
      ensure perf can never be disabled under us.
      
      We have:
      
      config X86
      	selects HAVE_HW_BREAKPOINTS
      
      config HAVE_HW_BREAKPOINTS
      	select PERF_EVENTS
      
      config PERF_EVENTS
      	[...]
      
      x86 will select the breakpoints but that won't propagate to perf
      events. The user can still disable the latter, but it is
      necessary for the breakpoints.
      
      What we need is:
      
       - x86 selects HAVE_HW_BREAKPOINTS and PERF_EVENTS
       - HAVE_HW_BREAKPOINTS depends on PERF_EVENTS
      
      so that we ensure PERF_EVENTS is enabled and frozen for x86.
      
      This fixes the following kind of build errors:
      
       In file included from arch/x86/kernel/hw_breakpoint.c:31:
       include/linux/hw_breakpoint.h: In function 'hw_breakpoint_addr':
       include/linux/hw_breakpoint.h:39: error: 'struct perf_event' has no member named 'attr'
      
      v2: Select also ANON_INODES from x86, required for perf
      Reported-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
      Reported-by: default avatarMichal Marek <mmarek@suse.cz>
      Reported-by: default avatarAndrew Randrianasulu <randrik_a@yahoo.com>
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      LKML-Reference: <1261010034-7786-1-git-send-regression-fweisbec@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      99e8c5a3
  3. 17 Dec, 2009 9 commits
    • Peter Zijlstra's avatar
      perf events: Dont report side-band events on each cpu for per-task-per-cpu events · 5d27c23d
      Peter Zijlstra authored
      Acme noticed that his FORK/MMAP numbers were inflated by about
      the same factor as his cpu-count.
      
      This led to the discovery of a few more sites that need to
      respect the event->cpu filter.
      Reported-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
      Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      LKML-Reference: <20091217121830.215333434@chello.nl>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      5d27c23d
    • Frederic Weisbecker's avatar
      perf events, x86/stacktrace: Fix performance/softlockup by providing a special... · 06d65bda
      Frederic Weisbecker authored
      perf events, x86/stacktrace: Fix performance/softlockup by providing a special frame pointer-only stack walker
      
      It's just wasteful for stacktrace users like perf to walk
      through every entries on the stack whereas these only accept
      reliable ones, ie: that the frame pointer validates.
      
      Since perf requires pure reliable stacktraces, it needs a stack
      walker based on frame pointers-only to optimize the stacktrace
      processing.
      
      This might solve some near-lockup scenarios that can be triggered
      by call-graph tracing timer events.
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Paul Mackerras <paulus@samba.org>
      LKML-Reference: <1261024834-5336-2-git-send-regression-fweisbec@gmail.com>
      [ v2: fix for modular builds and small detail tidyup ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      06d65bda
    • Frederic Weisbecker's avatar
      perf events, x86/stacktrace: Make stack walking optional · 61c1917f
      Frederic Weisbecker authored
      The current print_context_stack helper that does the stack
      walking job is good for usual stacktraces as it walks through
      all the stack and reports even addresses that look unreliable,
      which is nice when we don't have frame pointers for example.
      
      But we have users like perf that only require reliable
      stacktraces, and those may want a more adapted stack walker, so
      lets make this function a callback in stacktrace_ops that users
      can tune for their needs.
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Paul Mackerras <paulus@samba.org>
      LKML-Reference: <1261024834-5336-1-git-send-regression-fweisbec@gmail.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      61c1917f
    • Robert P. J. Day's avatar
      perf events: Remove unused perf_counter.h header file · 5b74ed47
      Robert P. J. Day authored
      Since nothing includes the <linux/perf_counter.h> file and it's
      also not exported to user space, remove it.
      Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      LKML-Reference: <alpine.LFD.2.00.0912161007430.8198@localhost>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      5b74ed47
    • Masami Hiramatsu's avatar
      perf probe: Check new event name · b7702a21
      Masami Hiramatsu authored
      Check new event name is same syntax as a C symbol in perf command.
      In other words, checking the name is as like as other tracepoint
      events.
      
      This can prevent user to create an event with useless name (e.g.
      foo|bar, foo*bar).
      Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Jason Baron <jbaron@redhat.com>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: systemtap <systemtap@sources.redhat.com>
      Cc: DLE <dle-develop@lists.sourceforge.net>
      LKML-Reference: <20091216222415.14459.71383.stgit@dhcp-100-2-132.bos.redhat.com>
      [ v2: minor cleanups ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      b7702a21
    • Masami Hiramatsu's avatar
      kprobe-tracer: Check new event/group name · 6f3cf440
      Masami Hiramatsu authored
      Check new event/group name is same syntax as a C symbol. In other
      words, checking the name is as like as other tracepoint events.
      
      This can prevent user to create an event with useless name (e.g.
      foo|bar, foo*bar).
      Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Jason Baron <jbaron@redhat.com>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: systemtap <systemtap@sources.redhat.com>
      Cc: DLE <dle-develop@lists.sourceforge.net>
      LKML-Reference: <20091216222408.14459.68790.stgit@dhcp-100-2-132.bos.redhat.com>
      [ v2: minor cleanups ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      6f3cf440
    • Masami Hiramatsu's avatar
      perf probe: Check whether debugfs path is correct · 96c96612
      Masami Hiramatsu authored
      Check whether the debugfs path is correct before executing
      a command, because perf-probe depends on debugfs.
      Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Jim Keniston <jkenisto@us.ibm.com>
      Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Jason Baron <jbaron@redhat.com>
      Cc: K.Prasad <prasad@linux.vnet.ibm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: systemtap <systemtap@sources.redhat.com>
      Cc: DLE <dle-develop@lists.sourceforge.net>
      LKML-Reference: <20091216222400.14459.48162.stgit@dhcp-100-2-132.bos.redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      96c96612
    • Masami Hiramatsu's avatar
      perf probe: Fix libdwarf include path for Debian · 27f3b24d
      Masami Hiramatsu authored
      Fix libdwarf include path to fit debian-like systems too.
      
      Borislav Petkov reported:
      
      > even after installing libdwarf-dev on my debian box here,
      > make in tools/perf/ still complains that it cannot find libdwarf:
      >
      > Makefile:491: No libdwarf.h found or old libdwarf.h found, disables dwarf
      > support. Please install libdwarf-dev/libdwarf-devel >= 20081231
      >
      > The problem is that the include path on debian is not
      > /usr/include/libdwarf/ but simply /usr/include because the debian
      > package libdwarf-dev puts the headers straight into
      > /usr/include.
      
      This patch adds -I/usr/include/libdwarf to BASIC_CFLAGS
      and fix probe-finder.h to include just libdwarf.h/dwarf.h.
      
      This patch also adds a workaround for the undefined _MIPS_SZLONG
      bug in libdwarf.h.
      Reported-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
      Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
      Cc: Gabor Gombas <gombasg@sztaki.hu>
      Cc: systemtap <systemtap@sources.redhat.com>
      Cc: DLE <dle-develop@lists.sourceforge.net>
      LKML-Reference: <20091216221618.13816.83296.stgit@dhcp-100-2-132.bos.redhat.com>
      [ v2: small stylistic fixlets to probe-finder.h ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      27f3b24d
    • Al Viro's avatar
      Fix breakage in shmem.c · 718deb6b
      Al Viro authored
      Replacing
      	error = 0;
      	if (error)
      		op
      with nothing is not quite an equivalent transformation ;-)
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      718deb6b
  4. 16 Dec, 2009 25 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · bea4c899
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        XFS: Free buffer pages array unconditionally
        xfs: kill xfs_bmbt_rec_32/64 types
        xfs: improve metadata I/O merging in the elevator
        xfs: check for not fully initialized inodes in xfs_ireclaim
      bea4c899
    • Roland Dreier's avatar
      re-export alloc_file() · 73efc468
      Roland Dreier authored
      Commit 3d1e4631 ("get rid of init_file()") removed the export of
      alloc_file() -- possibly inadvertently, since that commit mainly
      consisted of deleting the lines between the end of alloc_file() and
      the start of the code in init_file().
      
      There is in fact one modular use of alloc_file() in the tree, in
      drivers/infiniband/core/uverbs_main.c, so re-add the export to fix:
      
          ERROR: "alloc_file" [drivers/infiniband/core/ib_uverbs.ko] undefined!
      
      when CONFIG_INFINIBAND_USER_ACCESS=m.
      
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      73efc468
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6 · a73611b6
      Linus Torvalds authored
      * 'next' of git://git.secretlab.ca/git/linux-2.6: (23 commits)
        powerpc: fix up for mmu_mapin_ram api change
        powerpc: wii: allow ioremap within the memory hole
        powerpc: allow ioremap within reserved memory regions
        wii: use both mem1 and mem2 as ram
        wii: bootwrapper: add fixup to calc useable mem2
        powerpc: gamecube/wii: early debugging using usbgecko
        powerpc: reserve fixmap entries for early debug
        powerpc: wii: default config
        powerpc: wii: platform support
        powerpc: wii: hollywood interrupt controller support
        powerpc: broadway processor support
        powerpc: wii: bootwrapper bits
        powerpc: wii: device tree
        powerpc: gamecube: default config
        powerpc: gamecube: platform support
        powerpc: gamecube/wii: flipper interrupt controller support
        powerpc: gamecube/wii: udbg support for usbgecko
        powerpc: gamecube/wii: do not include PCI support
        powerpc: gamecube/wii: declare as non-coherent platforms
        powerpc: gamecube/wii: introduce GAMECUBE_COMMON
        ...
      
      Fix up conflicts in arch/powerpc/mm/fsl_booke_mmu.c.
      
      Hopefully even close to correctly.
      a73611b6
    • Linus Torvalds's avatar
      Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 5fa3577b
      Linus Torvalds authored
      * 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/vmwgfx: Add DRM driver for VMware Virtual GPU
        drm/vmwgfx: Add svga headers for vmwgfx driver
        drm/ttm: Add more driver type enums
      5fa3577b
    • Linus Torvalds's avatar
      Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6 · d4220f98
      Linus Torvalds authored
      * 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (34 commits)
        HWPOISON: Remove stray phrase in a comment
        HWPOISON: Try to allocate migration page on the same node
        HWPOISON: Don't do early filtering if filter is disabled
        HWPOISON: Add a madvise() injector for soft page offlining
        HWPOISON: Add soft page offline support
        HWPOISON: Undefine short-hand macros after use to avoid namespace conflict
        HWPOISON: Use new shake_page in memory_failure
        HWPOISON: Use correct name for MADV_HWPOISON in documentation
        HWPOISON: mention HWPoison in Kconfig entry
        HWPOISON: Use get_user_page_fast in hwpoison madvise
        HWPOISON: add an interface to switch off/on all the page filters
        HWPOISON: add memory cgroup filter
        memcg: add accessor to mem_cgroup.css
        memcg: rename and export try_get_mem_cgroup_from_page()
        HWPOISON: add page flags filter
        mm: export stable page flags
        HWPOISON: limit hwpoison injector to known page types
        HWPOISON: add fs/device filters
        HWPOISON: return 0 to indicate success reliably
        HWPOISON: make semantics of IGNORED/DELAYED clear
        ...
      d4220f98
    • Andi Kleen's avatar
      [sysctl] Fix breakage on systems with older glibc · 61cf6931
      Andi Kleen authored
      As predicted during code review, the sysctl(2) changes made systems with
      old glibc nearly unusable.  About every command gives a:
      
        warning: process `ls' used the deprecated sysctl system call with 1.4
      
      warning in the log.
      
      I see this on a SUSE 10.0 system with glibc 2.3.5.
      
      Don't warn for this common case.
      Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      61cf6931
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 288f02bb
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (117 commits)
        ACPI processor: Fix section mismatch for processor_add()
        ACPI: Add platform-wide _OSC support.
        ACPI: cleanup pci_root _OSC code.
        ACPI: Add a generic API for _OSC -v2
        msi-wmi: depend on backlight and fix corner-cases problems
        msi-wmi: switch to using input sparse keymap library
        msi-wmi: replace one-condition switch-case with if statement
        msi-wmi: remove unused field 'instance' in key_entry structure
        msi-wmi: remove custom runtime debug implementation
        msi-wmi: rework init
        msi-wmi: remove useless includes
        X86 drivers: Introduce msi-wmi driver
        Toshiba Bluetooth Enabling driver (RFKill handler v3)
        ACPI: fix for lapic_timer_propagate_broadcast()
        acpi_pad: squish warning
        ACPI: dock: minor whitespace and style cleanups
        ACPI: dock: add struct dock_station * directly to platform device data
        ACPI: dock: dock_add - hoist up platform_device_register_simple()
        ACPI: dock: remove global 'dock_device_name'
        ACPI: dock: combine add|alloc_dock_dependent_device (v2)
        ...
      288f02bb
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · 8aedf8a6
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (52 commits)
        perf record: Use per-task-per-cpu events for inherited events
        perf record: Properly synchronize child creation
        perf events: Allow per-task-per-cpu counters
        perf diff: Percent calcs should use double values
        perf diff: Change the default sort order to "dso,symbol"
        perf diff: Use perf_session__fprintf_hists just like 'perf record'
        perf report: Fix cut'n'paste error recently introduced
        perf session: Move perf report specific hits out of perf_session__fprintf_hists
        perf tools: Move hist entries printing routines from perf report
        perf report: Generalize perf_session__fprintf_hists()
        perf symbols: Move symbol filtering to event__preprocess_sample()
        perf symbols: Adopt the strlists for dso, comm
        perf symbols: Make symbol_conf global
        perf probe: Fix to show which probe point is not found
        perf probe: Check symbols in symtab/kallsyms
        perf probe: Check build-id of vmlinux
        perf probe: Reject second attempt of adding same-name event
        perf probe: Support event name for --add option
        perf probe: Add glob matching support on --del
        perf probe: Use strlist__for_each macros in probe-event.c
        ...
      8aedf8a6
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · bac5e54c
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits)
        direct I/O fallback sync simplification
        ocfs: stop using do_sync_mapping_range
        cleanup blockdev_direct_IO locking
        make generic_acl slightly more generic
        sanitize xattr handler prototypes
        libfs: move EXPORT_SYMBOL for d_alloc_name
        vfs: force reval of target when following LAST_BIND symlinks (try #7)
        ima: limit imbalance msg
        Untangling ima mess, part 3: kill dead code in ima
        Untangling ima mess, part 2: deal with counters
        Untangling ima mess, part 1: alloc_file()
        O_TRUNC open shouldn't fail after file truncation
        ima: call ima_inode_free ima_inode_free
        IMA: clean up the IMA counts updating code
        ima: only insert at inode creation time
        ima: valid return code from ima_inode_alloc
        fs: move get_empty_filp() deffinition to internal.h
        Sanitize exec_permission_lite()
        Kill cached_lookup() and real_lookup()
        Kill path_lookup_open()
        ...
      
      Trivial conflicts in fs/direct-io.c
      bac5e54c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · 529e8943
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM: rwsem.h need not be included into main.c
        PM: Remove unnecessary goto from device_resume_noirq()
        PM: Add initcall_debug style timing for suspend/resume
        PM: allow for usage_count > 0 in pm_runtime_get()
      529e8943
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · 61ecdb84
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Fix kprobes build with non-gawk awk
        x86: Split swiotlb initialization into two stages
        x86: Regex support and known-movable symbols for relocs, fix _end
        x86, msr: Remove incorrect, duplicated code in the MSR driver
        x86: Merge kernel_thread()
        x86: Sync 32/64-bit kernel_thread
        x86, 32-bit: Use same regs as 64-bit for kernel_thread_helper
        x86, 64-bit: Use user_mode() to determine new stack pointer in copy_thread()
        x86, 64-bit: Move kernel_thread to C
        x86-64, paravirt: Call set_iopl_mask() on 64 bits
        x86-32: Avoid pipeline serialization in PTREGSCALL1 and 2
        x86: Merge sys_clone
        x86, 32-bit: Convert sys_vm86 & sys_vm86old
        x86: Merge sys_sigaltstack
        x86: Merge sys_execve
        x86: Merge sys_iopl
        x86-32: Add new pt_regs stubs
        cpumask: Use modern cpumask style in arch/x86/kernel/cpu/mcheck/mce-inject.c
      61ecdb84
    • Linus Torvalds's avatar
      Merge branch 'tracing-fixes-for-linus' of... · da184a80
      Linus Torvalds authored
      Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        tracing: Fix return of trace_dump_stack()
        ksym_tracer: Fix bad cast
        tracing/power: Remove two exports
        tracing: Change event->profile_count to be int type
        tracing: Simplify trace_option_write()
        tracing: Remove useless trace option
        tracing: Use seq file for trace_clock
        tracing: Use seq file for trace_options
        function-graph: Allow writing the same val to set_graph_function
        ftrace: Call trace_parser_clear() properly
        ftrace: Return EINVAL when writing invalid val to set_ftrace_filter
        tracing: Move a printk out of ftrace_raw_reg_event_foo()
        tracing: Pull up calls to trace_define_common_fields()
        tracing: Extract duplicate ftrace_raw_init_event_foo()
        ftrace.h: Use common pr_info fmt string
        tracing: Add stack trace to irqsoff tracer
        tracing: Add trace_dump_stack()
        ring-buffer: Move resize integrity check under reader lock
        ring-buffer: Use sync sched protection on ring buffer resizing
        tracing: Fix wrong usage of strstrip in trace_ksyms
      da184a80
    • Dave Chinner's avatar
      XFS: Free buffer pages array unconditionally · 3fc98b1a
      Dave Chinner authored
      The code in xfs_free_buf() only attempts to free the b_pages array if the
      buffer is a page cache backed or page allocated buffer. The extra log buffer
      that is used when the log wraps uses pages that are allocated to a different
      log buffer, but it still has a b_pages array allocated when those pages
      are associated to with the extra buffer in xfs_buf_associate_memory.
      
      Hence we need to always attempt to free the b_pages array when tearing
      down a buffer, not just on buffers that are explicitly marked as page bearing
      buffers. This fixes a leak detected by the kernel memory leak code.
      Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
      Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
      3fc98b1a
    • Christoph Hellwig's avatar
      xfs: kill xfs_bmbt_rec_32/64 types · a5f9be58
      Christoph Hellwig authored
      For a long time we've always stored bmap btree records in the 64bit format,
      so kill off the dead 32bit type, and make sure the 64bit type is named just
      xfs_bmbt_rec everywhere, without any size postfix.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
      Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
      a5f9be58
    • Dave Chinner's avatar
      xfs: improve metadata I/O merging in the elevator · 2ee1abad
      Dave Chinner authored
      Change all async metadata buffers to use [READ|WRITE]_META I/O types
      so that the I/O doesn't get issued immediately. This allows merging of
      adjacent metadata requests but still prioritises them over bulk data.
      This shows a 10-15% improvement in sequential create speed of small
      files.
      
      Don't include the log buffers in this classification - leave them as
      sync types so they are issued immediately.
      Signed-off-by: default avatarDave Chinner <dgc@sgi.com>
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
      2ee1abad
    • Len Brown's avatar
      Merge branch 'misc-2.6.33' into release · aa96ce0a
      Len Brown authored
      aa96ce0a
    • Thomas Renninger's avatar
      ACPI processor: Fix section mismatch for processor_add() · bf8b4542
      Thomas Renninger authored
      Due to the merge of processor_start() (declared with __cpuinit) into
      processor_add(), a section mismatch warning appears:
      
      WARNING: drivers/built-in.o(.text+0x4d59d): Section mismatch in reference
      from the function acpi_processor_add() to the function
      .cpuinit.text:acpi_processor_power_init()
      ...
      
      This patch fixes the warning by declaring processor_add() as __cpuinit
      and also declares acpi_processor_add_fs() as __cpuinit as it is only
      used in acpi_processor_add().
      Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      bf8b4542
    • Christoph Hellwig's avatar
      xfs: check for not fully initialized inodes in xfs_ireclaim · b44b1126
      Christoph Hellwig authored
      Add an assert for inodes not added to the inode cache in xfs_ireclaim,
      to make sure we're not going to introduce something like the
      famous nfsd inode cache bug again.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
      b44b1126
    • Len Brown's avatar
      Merge branch 'osc' into release · 2900681b
      Len Brown authored
      2900681b
    • Shaohua Li's avatar
      ACPI: Add platform-wide _OSC support. · 3563ff96
      Shaohua Li authored
      Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      3563ff96
    • Shaohua Li's avatar
      ACPI: cleanup pci_root _OSC code. · 3a9622dc
      Shaohua Li authored
      Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      3a9622dc
    • Shaohua Li's avatar
      ACPI: Add a generic API for _OSC -v2 · 70023de8
      Shaohua Li authored
      v2->v1:
      .improve debug info as suggedted by Bjorn,Kenji
      .API is using uuid string as suggested by Alexey
      
      Add an API to execute _OSC. A lot of devices can have this method, so add a
      generic API.
      Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      70023de8
    • Len Brown's avatar
      Merge branch 'toshiba-bt' into release · 243e1ef8
      Len Brown authored
      243e1ef8
    • Len Brown's avatar
      Merge branch 'msi-wmi' into release · 7d8c2206
      Len Brown authored
      7d8c2206
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 525995d7
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (88 commits)
        Blackfin: Convert BUG() to use unreachable()
        Blackfin: define __NR_recvmmsg
        Blackfin: drop duplicate sched_clock
        Blackfin: NOMPU: skip DMA ICPLB hole when it is redundant
        Blackfin: MPU: add missing __init markings
        Blackfin: add support for TIF_NOTIFY_RESUME
        Blackfin: kgdb_test: clean up code a bit
        Blackfin: convert kgdbtest to proc_fops
        Blackfin: convert cyc2ns() to clocksource_cyc2ns()
        Blackfin: ip0x: pull in asm/portmux.h for P_xxx defines
        Blackfin: drop unused ax88180 resources
        Blackfin: bf537-stamp: add ADF702x network driver resources
        Blackfin: bf537-stamp: add CAN resources
        Blackfin: bf537-stamp: add AD5258 i2c address
        Blackfin: bf537-stamp: add adau1761 i2c address
        Blackfin: bf537-stamp: add adau1371 i2c address
        Blackfin: bf537-stamp: add ADP8870 resources
        Blackfin: bf537-stamp: kill AD714x board-specific Kconfigs
        Blackfin: bf537-stamp: update ADP5520 resources
        Blackfin: bf537-stamp: add ADXL346 orientation sensing support
        ...
      525995d7