diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-12-06 02:01:03 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-12-06 02:01:03 +0400 |
| commit | 655f68bcede9873825e1d4d82fac9d75193294f6 (patch) | |
| tree | 4456bab385230c42c73fa644e0ce736f5645242e | |
| parent | ce99c9c307c1ec326f6d5e6da948bd1157da1930 (diff) | |
| parent | 95a0d540949a34359f541e3f0584a0f5c825fa3a (diff) | |
Merge branch 'tracking-llct-v3.13-misc-fixes' into merge-linux-linaro-core-trackingllct-20131206.0
| -rw-r--r-- | arch/arm/xen/p2m.c | 1 | ||||
| -rw-r--r-- | tools/perf/Makefile.perf | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/xen/p2m.c b/arch/arm/xen/p2m.c index 23732cdff551..0f842e858790 100644 --- a/arch/arm/xen/p2m.c +++ b/arch/arm/xen/p2m.c @@ -27,6 +27,7 @@ struct xen_p2m_entry { rwlock_t p2m_lock; struct rb_root phys_to_mach = RB_ROOT; +EXPORT_SYMBOL_GPL(phys_to_mach); static struct rb_root mach_to_phys = RB_ROOT; static int xen_add_phys_to_mach_entry(struct xen_p2m_entry *new) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 7fc8f179cae7..85b25a16b26d 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -723,13 +723,13 @@ LIBLK_SOURCES = $(wildcard $(LK_PATH)*.[ch]) # already $(LIBLK): $(LIBLK_SOURCES) ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) liblk.a + $(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) liblk.a endif $(LIBLK)-clean: ifeq ($(subdir),) $(call QUIET_CLEAN, liblk) - @$(MAKE) -C $(LK_DIR) O=$(OUTPUT) clean >/dev/null + @$(MAKE) -C $(LK_DIR) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) clean >/dev/null endif help: |