From 432922da1a3f487f9aea351abc7485ea78666e96 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 21 Jul 2009 12:58:21 +0200 Subject: [PATCH] --- yaml --- r: 235189 b: refs/heads/master c: 0a2e1d23f2976287904e611b195f628a52b299b1 h: refs/heads/master i: 235187: d213a1085367dbd528fdbac78a2a671c39af3669 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/include/asm/cacheflush.h | 1 - trunk/arch/microblaze/kernel/microblaze_ksyms.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c29a609e0ee0..88e6d6b55a84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 702d54277af852b99c05c42cc988bb2f9dede93b +refs/heads/master: 0a2e1d23f2976287904e611b195f628a52b299b1 diff --git a/trunk/arch/microblaze/include/asm/cacheflush.h b/trunk/arch/microblaze/include/asm/cacheflush.h index 5a5d835ae16d..0f553bc009a0 100644 --- a/trunk/arch/microblaze/include/asm/cacheflush.h +++ b/trunk/arch/microblaze/include/asm/cacheflush.h @@ -84,7 +84,6 @@ do { \ #define flush_dcache_mmap_lock(mapping) do { } while (0) #define flush_dcache_mmap_unlock(mapping) do { } while (0) - #define flush_cache_dup_mm(mm) do { } while (0) #define flush_cache_vmap(start, end) do { } while (0) #define flush_cache_vunmap(start, end) do { } while (0) diff --git a/trunk/arch/microblaze/kernel/microblaze_ksyms.c b/trunk/arch/microblaze/kernel/microblaze_ksyms.c index 5cb034174005..b52fc2fa4b3e 100644 --- a/trunk/arch/microblaze/kernel/microblaze_ksyms.c +++ b/trunk/arch/microblaze/kernel/microblaze_ksyms.c @@ -24,6 +24,7 @@ extern char *_ebss; EXPORT_SYMBOL_GPL(_ebss); + #ifdef CONFIG_FUNCTION_TRACER extern void _mcount(void); EXPORT_SYMBOL(_mcount);