projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/users/eparis/audit
[linux-2.6-microblaze.git]
/
kernel
/
gcov
/
base.c
diff --git
a/kernel/gcov/base.c
b/kernel/gcov/base.c
index
912576a
..
f45b75b
100644
(file)
--- a/
kernel/gcov/base.c
+++ b/
kernel/gcov/base.c
@@
-79,6
+79,12
@@
void __gcov_merge_delta(gcov_type *counters, unsigned int n_counters)
}
EXPORT_SYMBOL(__gcov_merge_delta);
+void __gcov_merge_ior(gcov_type *counters, unsigned int n_counters)
+{
+ /* Unused. */
+}
+EXPORT_SYMBOL(__gcov_merge_ior);
+
/**
* gcov_enable_events - enable event reporting through gcov_event()
*