Commit 98c82b4b authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'core-stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull stacktrace fixlet from Ingo Molnar:
 "Two comment fixes"

* 'core-stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lib/stackdepot: Fix outdated comments
parents 94d18ee9 ee050dc8
...@@ -87,7 +87,7 @@ static bool init_stack_slab(void **prealloc) ...@@ -87,7 +87,7 @@ static bool init_stack_slab(void **prealloc)
stack_slabs[depot_index + 1] = *prealloc; stack_slabs[depot_index + 1] = *prealloc;
/* /*
* This smp_store_release pairs with smp_load_acquire() from * This smp_store_release pairs with smp_load_acquire() from
* |next_slab_inited| above and in depot_save_stack(). * |next_slab_inited| above and in stack_depot_save().
*/ */
smp_store_release(&next_slab_inited, 1); smp_store_release(&next_slab_inited, 1);
} }
...@@ -114,7 +114,7 @@ static struct stack_record *depot_alloc_stack(unsigned long *entries, int size, ...@@ -114,7 +114,7 @@ static struct stack_record *depot_alloc_stack(unsigned long *entries, int size,
depot_offset = 0; depot_offset = 0;
/* /*
* smp_store_release() here pairs with smp_load_acquire() from * smp_store_release() here pairs with smp_load_acquire() from
* |next_slab_inited| in depot_save_stack() and * |next_slab_inited| in stack_depot_save() and
* init_stack_slab(). * init_stack_slab().
*/ */
if (depot_index + 1 < STACK_ALLOC_MAX_SLABS) if (depot_index + 1 < STACK_ALLOC_MAX_SLABS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment