diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-02 21:17:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-02 22:20:41 -0400 |
| commit | b50afd203a5ef1998c18d6519ad2b2c546d6af22 (patch) | |
| tree | 608e6845e78a4ffe623c7cdf6581e29e2d9be0a9 /scripts | |
| parent | d6169b0206db1c8c8d0e4c6b79fdf4b2fc6455f1 (diff) | |
| parent | c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 (diff) | |
| download | linux-stable-b50afd203a5ef1998c18d6519ad2b2c546d6af22.tar.gz linux-stable-b50afd203a5ef1998c18d6519ad2b2c546d6af22.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes. Nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/recordmcount.c | 1 | ||||
| -rwxr-xr-x | scripts/recordmcount.pl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 42396a74405d..a68f03133df9 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c @@ -363,6 +363,7 @@ is_mcounted_section_name(char const *const txtname) strcmp(".sched.text", txtname) == 0 || strcmp(".spinlock.text", txtname) == 0 || strcmp(".irqentry.text", txtname) == 0 || + strcmp(".softirqentry.text", txtname) == 0 || strcmp(".kprobes.text", txtname) == 0 || strcmp(".text.unlikely", txtname) == 0; } diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 96e2486a6fc4..2d48011bc362 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -134,6 +134,7 @@ my %text_sections = ( ".sched.text" => 1, ".spinlock.text" => 1, ".irqentry.text" => 1, + ".softirqentry.text" => 1, ".kprobes.text" => 1, ".text.unlikely" => 1, ); |