diff options
| author | Anton Arapov <anton@redhat.com> | 2012-06-21 08:44:47 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-06-21 08:44:47 +0200 |
| commit | 35df99f47c4246df74ed7571c692138b83c3c486 (patch) | |
| tree | 1f14dd15cf001e590e7f7406c8e594a0003fcff0 /kernel | |
| parent | 8a6c6e11d3f0dcecf13668e33f5095b1fe9cb613 (diff) | |
| download | kernel-uprobes-35df99f47c4246df74ed7571c692138b83c3c486.tar.gz kernel-uprobes-35df99f47c4246df74ed7571c692138b83c3c486.tar.xz kernel-uprobes-35df99f47c4246df74ed7571c692138b83c3c486.zip | |
fedora kernel: 3d47c715a4a94b9d700c9e4ec1fc3a786bfde746v3.4.3-3
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 2 | ||||
| -rw-r--r-- | kernel/irq/spurious.c | 5 | ||||
| -rw-r--r-- | kernel/sched/core.c | 9 | ||||
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 81633337aee..c3eafd82441 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -523,7 +523,7 @@ static void check_mm(struct mm_struct *mm) if (unlikely(x)) printk(KERN_ALERT "BUG: Bad rss-counter state " - "mm:%p idx:%d val:%ld\n", mm, i, x); + "mm:%p idx:%d val:%ld (%s)\n", mm, i, x, print_tainted()); } #ifdef CONFIG_TRANSPARENT_HUGEPAGE diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 97b72a95250..f722eb6f9c4 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c @@ -334,12 +334,13 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, } desc->irq_count++; - if (!irq_poll_and_retry) + if (!irq_poll_and_retry) { if (likely(desc->irq_count < 100000)) return; - else + } else { if (likely(desc->irq_count < 10)) return; + } desc->irq_count = 0; if (irq_poll_and_retry) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index e5212ae294f..2000e069fc9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6230,11 +6230,8 @@ int sched_domain_level_max; static int __init setup_relax_domain_level(char *str) { - unsigned long val; - - val = simple_strtoul(str, NULL, 0); - if (val < sched_domain_level_max) - default_relax_domain_level = val; + if (kstrtoint(str, 0, &default_relax_domain_level)) + pr_warn("Unable to set relax_domain_level\n"); return 1; } @@ -6439,7 +6436,6 @@ struct sched_domain *build_sched_domain(struct sched_domain_topology_level *tl, if (!sd) return child; - set_domain_attribute(sd, attr); cpumask_and(sched_domain_span(sd), cpu_map, tl->mask(cpu)); if (child) { sd->level = child->level + 1; @@ -6447,6 +6443,7 @@ struct sched_domain *build_sched_domain(struct sched_domain_topology_level *tl, child->parent = sd; } sd->child = child; + set_domain_attribute(sd, attr); return sd; } diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index d66b21308f7..d42574df7c5 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -964,6 +964,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift) timekeeper.xtime.tv_sec++; leap = second_overflow(timekeeper.xtime.tv_sec); timekeeper.xtime.tv_sec += leap; + timekeeper.wall_to_monotonic.tv_sec -= leap; } /* Accumulate raw time */ @@ -1079,6 +1080,7 @@ static void update_wall_time(void) timekeeper.xtime.tv_sec++; leap = second_overflow(timekeeper.xtime.tv_sec); timekeeper.xtime.tv_sec += leap; + timekeeper.wall_to_monotonic.tv_sec -= leap; } timekeeping_update(false); |