diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2022-05-19 00:11:51 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-19 00:11:51 +1000 |
| commit | a5fc286f69fc9590c22995fe05dca461fd6295b1 (patch) | |
| tree | 358fb26ef57cef5ad7c88009c83c5dc977624b9b /arch/powerpc/platforms/pseries/vas.h | |
| parent | powerpc/rtas: Keep MSR[RI] set when calling RTAS (diff) | |
| parent | KVM: PPC: Book3S PR: Enable MSR_DR for switch_mmu_context() (diff) | |
| download | linux-dev-a5fc286f69fc9590c22995fe05dca461fd6295b1.tar.xz linux-dev-a5fc286f69fc9590c22995fe05dca461fd6295b1.zip | |
Merge branch 'fixes' into next
Merge our fixes branch from this cycle. In particular this brings in a
papr_scm.c change which a subsequent patch has a dependency on.
Diffstat (limited to 'arch/powerpc/platforms/pseries/vas.h')
| -rw-r--r-- | arch/powerpc/platforms/pseries/vas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/vas.h b/arch/powerpc/platforms/pseries/vas.h index 34177881e998..333ffa2f9f42 100644 --- a/arch/powerpc/platforms/pseries/vas.h +++ b/arch/powerpc/platforms/pseries/vas.h @@ -135,7 +135,7 @@ struct pseries_vas_window { }; int sysfs_add_vas_caps(struct vas_cop_feat_caps *caps); -int vas_reconfig_capabilties(u8 type); +int vas_reconfig_capabilties(u8 type, int new_nr_creds); int __init sysfs_pseries_vas_init(struct vas_all_caps *vas_caps); #ifdef CONFIG_PPC_VAS |