diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-04-11 10:47:28 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-04-11 10:47:28 +0200 |
commit | b6466d53afdb0c3ca058848cd4c12e141aba0763 (patch) | |
tree | 06da4bf69879a7a26dc78d1b4f4b47ca4aaf4c74 /arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | |
parent | 4ffa3c977b5da2907eb294dc6d0259a02f2284aa (diff) | |
parent | 7f00f388712b29005782bad7e4b25942620f3b9c (diff) |
Merge branch 'x86/urgent' into x86/cpu, to resolve conflict
Conflicts:
arch/x86/kernel/cpu/intel_rdt_schemata.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/intel_rdt_rdtgroup.c')
-rw-r--r-- | arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c index 8401cf5cc239..6870ebfcdcb3 100644 --- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c @@ -748,7 +748,7 @@ void rdtgroup_kn_unlock(struct kernfs_node *kn) if (atomic_dec_and_test(&rdtgrp->waitcount) && (rdtgrp->flags & RDT_DELETED)) { kernfs_unbreak_active_protection(kn); - kernfs_put(kn); + kernfs_put(rdtgrp->kn); kfree(rdtgrp); } else { kernfs_unbreak_active_protection(kn); |