Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
exit signals: use of uninitialized field notify_count
lockdep: fix invalid list_del_rcu in zap_class
lockstat: repair erronous contention statistics
lockstat: fix numerical output rounding error
+7
-6
+2
-2
kernel/exit.c
+2
-2
kernel/exit.c
···
918
918
919
919
/* mt-exec, de_thread() is waiting for us */
920
920
if (thread_group_leader(tsk) &&
921
-
tsk->signal->notify_count < 0 &&
922
-
tsk->signal->group_exit_task)
921
+
tsk->signal->group_exit_task &&
922
+
tsk->signal->notify_count < 0)
923
923
wake_up_process(tsk->signal->group_exit_task);
924
924
925
925
write_unlock_irq(&tasklist_lock);
+3
-3
kernel/lockdep.c
+3
-3
kernel/lockdep.c
···
875
875
if (!entry)
876
876
return 0;
877
877
878
-
entry->class = this;
879
-
entry->distance = distance;
880
878
if (!save_trace(&entry->trace))
881
879
return 0;
882
880
881
+
entry->class = this;
882
+
entry->distance = distance;
883
883
/*
884
884
* Since we never remove from the dependency list, the list can
885
885
* be walked lockless by other CPUs, it's only allocation
···
3029
3029
3030
3030
stats = get_lock_stats(hlock_class(hlock));
3031
3031
if (point < ARRAY_SIZE(stats->contention_point))
3032
-
stats->contention_point[i]++;
3032
+
stats->contention_point[point]++;
3033
3033
if (lock->cpu != smp_processor_id())
3034
3034
stats->bounces[bounce_contended + !!hlock->read]++;
3035
3035
put_lock_stats(stats);
+2
-1
kernel/lockdep_proc.c
+2
-1
kernel/lockdep_proc.c
···
472
472
{
473
473
unsigned long rem;
474
474
475
+
nr += 5; /* for display rounding */
475
476
rem = do_div(nr, 1000); /* XXX: do_div_signed */
476
-
snprintf(buf, bufsiz, "%lld.%02d", (long long)nr, ((int)rem+5)/10);
477
+
snprintf(buf, bufsiz, "%lld.%02d", (long long)nr, (int)rem/10);
477
478
}
478
479
479
480
static void seq_time(struct seq_file *m, s64 time)