summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Bin <huawei.libin@huawei.com>2015-10-28 09:23:26 +0100
committerSteven Rostedt <rostedt@goodmis.org>2015-11-02 19:34:32 +0100
commit46a2b61ecb286dddb4efa73b119fec54e1576efe (patch)
tree936187fd9d1d94a8f67a2b41f00f9de02f83ecc7
parenttracing: Call on_each_cpu() when adding or removing single pids from set_even... (diff)
downloadlinux-46a2b61ecb286dddb4efa73b119fec54e1576efe.tar.xz
linux-46a2b61ecb286dddb4efa73b119fec54e1576efe.zip
recordmcount: x86: Assign a meaningful value to rel_type_nop
Although, the default value of rel_type_nop is zero, and the value of R_386_NONE/R_X86_64_NONE is zero too, but it should be assigned a meaningful value explicitly, otherwise it looks confused. Assign R_386_NONE to rel_type_nop for 386, assign R_X86_64_NONE to rel_type_nop for x86_64. Link: http://lkml.kernel.org/r/1446020606-16352-1-git-send-email-huawei.libin@huawei.com Signed-off-by: Li Bin <huawei.libin@huawei.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--scripts/recordmcount.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 3d1984e59a30..8cc020bbe859 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -345,6 +345,7 @@ do_file(char const *const fname)
break;
case EM_386:
reltype = R_386_32;
+ rel_type_nop = R_386_NONE;
make_nop = make_nop_x86;
ideal_nop = ideal_nop5_x86_32;
mcount_adjust_32 = -1;
@@ -371,6 +372,7 @@ do_file(char const *const fname)
make_nop = make_nop_x86;
ideal_nop = ideal_nop5_x86_64;
reltype = R_X86_64_64;
+ rel_type_nop = R_X86_64_NONE;
mcount_adjust_64 = -1;
break;
} /* end switch */