Merge branch 'master' into x86/memblock

Conflicts & resolutions:

* arch/x86/xen/setup.c

	dc91c728fd "xen: allow extra memory to be in multiple regions"
	24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..."

	conflicted on xen_add_extra_mem() updates.  The resolution is
	trivial as the latter just want to replace
	memblock_x86_reserve_range() with memblock_reserve().

* drivers/pci/intel-iommu.c

	166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/"
	5dfe8660a3d "bootmem: Replace work_with_active_regions() with..."

	conflicted as the former moved the file under drivers/iommu/.
	Resolved by applying the chnages from the latter on the moved
	file.

* mm/Kconfig

	6661672053a "memblock: add NO_BOOTMEM config symbol"
	c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option"

	conflicted trivially.  Both added config options.  Just
	letting both add their own options resolves the conflict.

* mm/memblock.c

	d1f0ece6cdc "mm/memblock.c: small function definition fixes"
	ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()"

	confliected.  The former updates function removed by the
	latter.  Resolution is trivial.

Signed-off-by: Tejun Heo <tj@kernel.org>

3 files changed, 78 insertions, 0 deletions

diff --git a/tools/perf/scripts/python/bin/net_dropmonitor-record b/tools/perf/scripts/python/bin/net_dropmonitor-record
new file mode 100755
index 000000000000..423fb81dadae
--- /dev/null
+++ b/tools/perf/scripts/python/bin/net_dropmonitor-record
@@ -0,0 +1,2 @@
+#!/bin/bash
+perf record -e skb:kfree_skb $@
diff --git a/tools/perf/scripts/python/bin/net_dropmonitor-report b/tools/perf/scripts/python/bin/net_dropmonitor-report
new file mode 100755
index 000000000000..8d698f5a06aa
--- /dev/null
+++ b/tools/perf/scripts/python/bin/net_dropmonitor-report
@@ -0,0 +1,4 @@
+#!/bin/bash
+# description: display a table of dropped frames
+
+perf script -s "$PERF_EXEC_PATH"/scripts/python/net_dropmonitor.py $@
diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
new file mode 100755
index 000000000000..a4ffc9500023
--- /dev/null
+++ b/tools/perf/scripts/python/net_dropmonitor.py
@@ -0,0 +1,72 @@
+# Monitor the system for dropped packets and proudce a report of drop locations and counts
+
+import os
+import sys
+
+sys.path.append(os.environ['PERF_EXEC_PATH'] + \
+                '/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
+
+from perf_trace_context import *
+from Core import *
+from Util import *
+
+drop_log = {}
+kallsyms = []
+
+def get_kallsyms_table():
+        global kallsyms
+        try:
+                f = open("/proc/kallsyms", "r")
+                linecount = 0
+                for line in f:
+                        linecount = linecount+1
+                f.seek(0)
+        except:
+                return
+
+
+        j = 0
+        for line in f:
+                loc = int(line.split()[0], 16)
+                name = line.split()[2]
+                j = j +1
+                if ((j % 100) == 0):
+                        print "\r" + str(j) + "/" + str(linecount),
+                kallsyms.append({ 'loc': loc, 'name' : name})
+
+        print "\r" + str(j) + "/" + str(linecount)
+        kallsyms.sort()
+        return
+
+def get_sym(sloc):
+        loc = int(sloc)
+        for i in kallsyms:
+                if (i['loc'] >= loc):
+                        return (i['name'], i['loc']-loc)
+        return (None, 0)
+
+def print_drop_table():
+        print "%25s %25s %25s" % ("LOCATION", "OFFSET", "COUNT")
+        for i in drop_log.keys():
+                (sym, off) = get_sym(i)
+                if sym == None:
+                        sym = i
+                print "%25s %25s %25s" % (sym, off, drop_log[i])
+
+
+def trace_begin():
+        print "Starting trace (Ctrl-C to dump results)"
+
+def trace_end():
+        print "Gathering kallsyms data"
+        get_kallsyms_table()
+        print_drop_table()
+
+# called from perf, when it finds a correspoinding event
+def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm,
+                        skbaddr, protocol, location):
+        slocation = str(location)
+        try:
+                drop_log[slocation] = drop_log[slocation] + 1
+        except:
+                drop_log[slocation] = 1