Merge 20d49bfcc3 ("Merge tag 'core-debugobjects-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline

Steps on the way to 5.10-rc1

Change-Id: I354c03b310a92c4271b496c04bf597335e019e30
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2020-10-21 09:31:15 +02:00
11 changed files with 69 additions and 43 deletions

View File

@@ -431,7 +431,7 @@ static void show_pwq(struct pool_workqueue *pwq);
#ifdef CONFIG_DEBUG_OBJECTS_WORK
static struct debug_obj_descr work_debug_descr;
static const struct debug_obj_descr work_debug_descr;
static void *work_debug_hint(void *addr)
{
@@ -481,7 +481,7 @@ static bool work_fixup_free(void *addr, enum debug_obj_state state)
}
}
static struct debug_obj_descr work_debug_descr = {
static const struct debug_obj_descr work_debug_descr = {
.name = "work_struct",
.debug_hint = work_debug_hint,
.is_static_object = work_is_static_object,