Merge branch 'v3.10/topic/gator' into linux-linaro-lsk-v3.10

* v3.10/topic/gator:
  gator: Enable multiple source copies to exist in Android build environments
  gator: Add config for building the module in-tree
  gator: Version 5.21.1

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/gator/daemon/KMod.cpp b/tools/gator/daemon/KMod.cpp
index fe9dc6a7e4f7..e33b499d831b 100644
--- a/tools/gator/daemon/KMod.cpp
+++ b/tools/gator/daemon/KMod.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) ARM Limited 2013-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2013-2015. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -83,13 +83,13 @@ void KMod::setupCounter(Counter &counter) {
 	if (access(text, F_OK) == 0) {
 		int count = counter.getCount();
 		if (DriverSource::writeReadDriver(text, &count) && counter.getCount() > 0) {
-			logg->logError(__FILE__, __LINE__, "Cannot enable EBS for %s:%i with a count of %d\n", counter.getType(), counter.getEvent(), counter.getCount());
+			logg->logError("Cannot enable EBS for %s:%i with a count of %d\n", counter.getType(), counter.getEvent(), counter.getCount());
 			handleException();
 		}
 		counter.setCount(count);
 	} else if (counter.getCount() > 0) {
 		ConfigurationXML::remove();
-		logg->logError(__FILE__, __LINE__, "Event Based Sampling is only supported with kernel versions 3.0.0 and higher with CONFIG_PERF_EVENTS=y, and CONFIG_HW_PERF_EVENTS=y. The invalid configuration.xml has been removed.\n");
+		logg->logError("Event Based Sampling is only supported with kernel versions 3.0.0 and higher with CONFIG_PERF_EVENTS=y, and CONFIG_HW_PERF_EVENTS=y. The invalid configuration.xml has been removed.\n");
 		handleException();
 	}
 }