diff options
author | Borislav Petkov <bp@suse.de> | 2019-04-17 23:54:41 +0200 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2019-04-17 23:54:41 +0200 |
commit | 1bddcc645f9b3d81adaf08d86289ebd733affc86 (patch) | |
tree | 172c5af0b63f2bb7a15ddfa48d47166e00074456 /arch/x86/kernel/cpu/resctrl/rdtgroup.c | |
parent | Linux 5.1-rc5 (diff) | |
parent | x86/Kconfig: Fix spelling mistake "effectivness" -> "effectiveness" (diff) | |
download | linux-dev-1bddcc645f9b3d81adaf08d86289ebd733affc86.tar.xz linux-dev-1bddcc645f9b3d81adaf08d86289ebd733affc86.zip |
Merge x86/urgent into x86/cache
Merge it to pick up dependent urgent changes before applying more
resctrl stuff.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/kernel/cpu/resctrl/rdtgroup.c')
-rw-r--r-- | arch/x86/kernel/cpu/resctrl/rdtgroup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 54b9eef3eea9..85212a32b54d 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2610,9 +2610,10 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) rdt_last_cmd_puts("Failed to initialize allocations\n"); return ret; } - rdtgrp->mode = RDT_MODE_SHAREABLE; } + rdtgrp->mode = RDT_MODE_SHAREABLE; + return 0; } |