diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:38:53 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:39:00 -0400 |
commit | 8dd8997d2c56c9f248294805e129e1fc69444380 (patch) | |
tree | 3b030a04295fc031db98746c4074c2df1ed6a19f /scripts/recordmcount.c | |
parent | 1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff) | |
parent | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff) |
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts/recordmcount.c')
-rw-r--r-- | scripts/recordmcount.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 038b3d1e298..f9f6f52db77 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c | |||
@@ -206,7 +206,8 @@ static uint32_t (*w2)(uint16_t); | |||
206 | static int | 206 | static int |
207 | is_mcounted_section_name(char const *const txtname) | 207 | is_mcounted_section_name(char const *const txtname) |
208 | { | 208 | { |
209 | return 0 == strcmp(".text", txtname) || | 209 | return 0 == strcmp(".text", txtname) || |
210 | 0 == strcmp(".ref.text", txtname) || | ||
210 | 0 == strcmp(".sched.text", txtname) || | 211 | 0 == strcmp(".sched.text", txtname) || |
211 | 0 == strcmp(".spinlock.text", txtname) || | 212 | 0 == strcmp(".spinlock.text", txtname) || |
212 | 0 == strcmp(".irqentry.text", txtname) || | 213 | 0 == strcmp(".irqentry.text", txtname) || |