diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-28 16:20:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-28 16:20:24 -0700 |
| commit | 53061afee43bc5041b67a45b6d793e7afdcf9ca7 (patch) | |
| tree | ed7e918bd7323ded4bdd899aded6384488dad9a4 /scripts | |
| parent | ae6dd8d61913b5341067c7c660e8e91430d22e7c (diff) | |
| parent | 231e97e2b8ec9a1556ced5d8a89cda03a480b179 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"4 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mem-hotplug: use nodes that contain memory as mask in new_node_page()
scripts/recordmcount.c: account for .softirqentry.text
dma-mapping.h: preserve unmap info for CONFIG_DMA_API_DEBUG
mm,ksm: fix endless looping in allocating memory when ksm enable
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, ); |