summaryrefslogtreecommitdiff
path: root/arch/mips/lib/cmpdi2.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-06-08 10:26:46 +0300
committerIngo Molnar <mingo@kernel.org>2016-06-08 10:26:46 +0300
commit616d1c1b98ac79f30216a57a170dd7cea19b3df3 (patch)
tree6f244c2e5a7160190e73bc82b4cd7fa7bb22ee31 /arch/mips/lib/cmpdi2.c
parenta4f144ebbdf6f7807c477bce8e136047ed27321f (diff)
parentc8ae067f2635be0f8c7e5db1bb74b757d623e05b (diff)
downloadlinux-616d1c1b98ac79f30216a57a170dd7cea19b3df3.tar.xz
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/lib/cmpdi2.c')
-rw-r--r--arch/mips/lib/cmpdi2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lib/cmpdi2.c b/arch/mips/lib/cmpdi2.c
index 8c1306437ed1..06857da96993 100644
--- a/arch/mips/lib/cmpdi2.c
+++ b/arch/mips/lib/cmpdi2.c
@@ -2,7 +2,7 @@
#include "libgcc.h"
-word_type __cmpdi2(long long a, long long b)
+word_type notrace __cmpdi2(long long a, long long b)
{
const DWunion au = {
.ll = a