Merge branch 'perf/urgent' into perf/core, to resolve a conflict

[sfrench/cifs-2.6.git] / arch / mips / include / asm / maar.h

diff --git a/arch/mips/include/asm/maar.h b/arch/mips/include/asm/maar.h
index 6c62b0f899c0fdae992bd2a3f7c5bcb5eb38ba0d..b02891f9caaf1d8ffecf14b0e0fa7be5b7fb33c8 100644 (file)
--- a/arch/mips/include/asm/maar.h
+++ b/arch/mips/include/asm/maar.h
@@ -26,7 +26,7 @@
  *
  * Return:     The number of MAAR pairs configured.
  */
-unsigned __weak platform_maar_init(unsigned num_pairs);
+unsigned platform_maar_init(unsigned num_pairs);
 
 /**
  * write_maar_pair() - write to a pair of MAARs