diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-03-15 13:24:29 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-03-15 15:01:55 +0530 |
| commit | 3aa99367190965aa8881a187e484bec34e3a794f (patch) | |
| tree | 0c18c13fe4c2eb12d2969cedaa4a18ef7462045b /drivers | |
| parent | eec2486674b53d8ca576677cae60bc3f380d33c1 (diff) | |
| parent | 35bab84a0e530d4ce42a3ce84c3976ce8017eac8 (diff) | |
Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common into linaro-android-3.14-lsk
* android-3.14:
seccomp: really fix syscall numbers for x86 and x86_64
proc: make oom adjustment files user read-only
Revert "Grants system server access to /proc/<pid>/oom_adj for Android applications."
mmc: Move tracepoint creation and export symbols
power: Remove HAS_WAKELOCK config and document WAKELOCK
android: base-cfg: turn off /dev/mem and /dev/kmem
input: evdev: fix double free in evdev_release
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
arch/x86/syscalls/syscall_32.tbl
arch/x86/syscalls/syscall_64.tbl
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/card/block.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/core/core.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index feb9bf5e4c17..118db7ad69ef 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -36,7 +36,6 @@ #include <linux/compat.h> #include <linux/pm_runtime.h> -#define CREATE_TRACE_POINTS #include <trace/events/mmc.h> #include <linux/mmc/ioctl.h> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 6cd1114c1334..2a1cc36b3ace 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -31,6 +31,7 @@ #include <linux/of.h> #include <linux/wakelock.h> +#define CREATE_TRACE_POINTS #include <trace/events/mmc.h> #include <linux/mmc/card.h> @@ -47,6 +48,11 @@ #include "sd_ops.h" #include "sdio_ops.h" +EXPORT_TRACEPOINT_SYMBOL_GPL(mmc_blk_erase_start); +EXPORT_TRACEPOINT_SYMBOL_GPL(mmc_blk_erase_end); +EXPORT_TRACEPOINT_SYMBOL_GPL(mmc_blk_rw_start); +EXPORT_TRACEPOINT_SYMBOL_GPL(mmc_blk_rw_end); + /* If the device is not responding */ #define MMC_CORE_TIMEOUT_MS (10 * 60 * 1000) /* 10 minute timeout */ |