Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v3.10

A series of driver specific updates, none particularly critical, plus
one fix to the compressed API code to handle capture streams properly
which is very safe for mainline as there's no current users.

4 files changed, 21 insertions, 143 deletions

diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
index a4ffc9500023..b5740599aabd 100755
--- a/tools/perf/scripts/python/net_dropmonitor.py
+++ b/tools/perf/scripts/python/net_dropmonitor.py
@@ -15,35 +15,38 @@ 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.append((loc, name))
         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)
+
+        # Invariant: kallsyms[i][0] <= loc for all 0 <= i <= start
+        #            kallsyms[i][0] > loc for all end <= i < len(kallsyms)
+        start, end = -1, len(kallsyms)
+        while end != start + 1:
+                pivot = (start + end) // 2
+                if loc < kallsyms[pivot][0]:
+                        end = pivot
+                else:
+                        start = pivot
+
+        # Now (start == -1 or kallsyms[start][0] <= loc)
+        # and (start == len(kallsyms) - 1 or loc < kallsyms[start + 1][0])
+        if start >= 0:
+                symloc, name = kallsyms[start]
+                return (name, loc - symloc)
+        else:
+                return (None, 0)
 
 def print_drop_table():
         print "%25s %25s %25s" % ("LOCATION", "OFFSET", "COUNT")
@@ -64,7 +67,7 @@ def trace_end():
 
 # called from perf, when it finds a correspoinding event
 def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm,
-                        skbaddr, protocol, location):
+                   skbaddr, location, protocol):
         slocation = str(location)
         try:
                 drop_log[slocation] = drop_log[slocation] + 1
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index d4abc59ce1d9..0a63658065f0 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -6,7 +6,6 @@ TARGETS += memory-hotplug
 TARGETS += mqueue
 TARGETS += net
 TARGETS += ptrace
-TARGETS += soft-dirty
 TARGETS += vm
 
 all:
diff --git a/tools/testing/selftests/soft-dirty/Makefile b/tools/testing/selftests/soft-dirty/Makefile
deleted file mode 100644
index a9cdc823d6e0..000000000000
--- a/tools/testing/selftests/soft-dirty/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-CFLAGS += -iquote../../../../include/uapi -Wall
-soft-dirty: soft-dirty.c
-
-all: soft-dirty
-
-clean:
-        rm -f soft-dirty
-
-run_tests: all
-        @./soft-dirty || echo "soft-dirty selftests: [FAIL]"
diff --git a/tools/testing/selftests/soft-dirty/soft-dirty.c b/tools/testing/selftests/soft-dirty/soft-dirty.c
deleted file mode 100644
index aba4f87f87f0..000000000000
--- a/tools/testing/selftests/soft-dirty/soft-dirty.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-
-typedef unsigned long long u64;
-
-#define PME_PRESENT     (1ULL << 63)
-#define PME_SOFT_DIRTY  (1Ull << 55)
-
-#define PAGES_TO_TEST   3
-#ifndef PAGE_SIZE
-#define PAGE_SIZE       4096
-#endif
-
-static void get_pagemap2(char *mem, u64 *map)
-{
-        int fd;
-
-        fd = open("/proc/self/pagemap2", O_RDONLY);
-        if (fd < 0) {
-                perror("Can't open pagemap2");
-                exit(1);
-        }
-
-        lseek(fd, (unsigned long)mem / PAGE_SIZE * sizeof(u64), SEEK_SET);
-        read(fd, map, sizeof(u64) * PAGES_TO_TEST);
-        close(fd);
-}
-
-static inline char map_p(u64 map)
-{
-        return map & PME_PRESENT ? 'p' : '-';
-}
-
-static inline char map_sd(u64 map)
-{
-        return map & PME_SOFT_DIRTY ? 'd' : '-';
-}
-
-static int check_pte(int step, int page, u64 *map, u64 want)
-{
-        if ((map[page] & want) != want) {
-                printf("Step %d Page %d has %c%c, want %c%c\n",
-                                step, page,
-                                map_p(map[page]), map_sd(map[page]),
-                                map_p(want), map_sd(want));
-                return 1;
-        }
-
-        return 0;
-}
-
-static void clear_refs(void)
-{
-        int fd;
-        char *v = "4";
-
-        fd = open("/proc/self/clear_refs", O_WRONLY);
-        if (write(fd, v, 3) < 3) {
-                perror("Can't clear soft-dirty bit");
-                exit(1);
-        }
-        close(fd);
-}
-
-int main(void)
-{
-        char *mem, x;
-        u64 map[PAGES_TO_TEST];
-
-        mem = mmap(NULL, PAGES_TO_TEST * PAGE_SIZE,
-                        PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, 0, 0);
-
-        x = mem[0];
-        mem[2 * PAGE_SIZE] = 'c';
-        get_pagemap2(mem, map);
-
-        if (check_pte(1, 0, map, PME_PRESENT))
-                return 1;
-        if (check_pte(1, 1, map, 0))
-                return 1;
-        if (check_pte(1, 2, map, PME_PRESENT | PME_SOFT_DIRTY))
-                return 1;
-
-        clear_refs();
-        get_pagemap2(mem, map);
-
-        if (check_pte(2, 0, map, PME_PRESENT))
-                return 1;
-        if (check_pte(2, 1, map, 0))
-                return 1;
-        if (check_pte(2, 2, map, PME_PRESENT))
-                return 1;
-
-        mem[0] = 'a';
-        mem[PAGE_SIZE] = 'b';
-        x = mem[2 * PAGE_SIZE];
-        get_pagemap2(mem, map);
-
-        if (check_pte(3, 0, map, PME_PRESENT | PME_SOFT_DIRTY))
-                return 1;
-        if (check_pte(3, 1, map, PME_PRESENT | PME_SOFT_DIRTY))
-                return 1;
-        if (check_pte(3, 2, map, PME_PRESENT))
-                return 1;
-
-        (void)x; /* gcc warn */
-
-        printf("PASS\n");
-        return 0;
-}