| Message ID | 20231206084642.802053-1-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drivers: perf: constify the ctl_table argument of the riscv user access handler | expand |
On Wed, Dec 06, 2023 at 09:46:42AM +0100, Marek Szyprowski wrote: > > Fix riscv build break after commit c8be9e66ca1e ("sysctl: treewide: > constify the ctl_table argument of handlers"). > > Fixes: c8be9e66ca1e ("sysctl: treewide: constify the ctl_table argument of handlers") > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> This breaks the build when applied to the RISC-V tree. I'm going to mark it "handled elsewhere" in patchwork since it needs to go into whatever tree has the broken commit. Thanks, Conor.
On Wed, 06 Dec 2023 02:55:48 PST (-0800), Conor Dooley wrote: > On Wed, Dec 06, 2023 at 09:46:42AM +0100, Marek Szyprowski wrote: >> >> Fix riscv build break after commit c8be9e66ca1e ("sysctl: treewide: >> constify the ctl_table argument of handlers"). >> >> Fixes: c8be9e66ca1e ("sysctl: treewide: constify the ctl_table argument of handlers") >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > > This breaks the build when applied to the RISC-V tree. I'm going to mark > it "handled elsewhere" in patchwork since it needs to go into whatever > tree has the broken commit. Ya, thanks. There's a second copy of the fix over at https://lore.kernel.org/all/20231212-garage-pellet-c6a2bd34854c@spud/ . Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com> Acked-by: Palmer Dabbelt <palmer@rivosinc.com> for this one too. Just trying to merge that fixed hash into 6.7-rc1 is giving me a conflict, so I don't really want to pull it in myself. So I think the best bet here is to have whomever took the patch take the fix, but LMK if there's some shared tag thing I should grab to take this into the RISC-V tree. > > Thanks, > Conor.
On Tue, Dec 12, 2023 at 01:04:42PM -0800, Palmer Dabbelt wrote: > On Wed, 06 Dec 2023 02:55:48 PST (-0800), Conor Dooley wrote: > > On Wed, Dec 06, 2023 at 09:46:42AM +0100, Marek Szyprowski wrote: > > > > > > Fix riscv build break after commit c8be9e66ca1e ("sysctl: treewide: > > > constify the ctl_table argument of handlers"). > > > > > > Fixes: c8be9e66ca1e ("sysctl: treewide: constify the ctl_table argument of handlers") > > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> > > > > This breaks the build when applied to the RISC-V tree. I'm going to mark > > it "handled elsewhere" in patchwork since it needs to go into whatever > > tree has the broken commit. > > Ya, thanks. There's a second copy of the fix over at > https://lore.kernel.org/all/20231212-garage-pellet-c6a2bd34854c@spud/ . > > Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com> > Acked-by: Palmer Dabbelt <palmer@rivosinc.com> > > for this one too. Just trying to merge that fixed hash into 6.7-rc1 is > giving me a conflict, so I don't really want to pull it in myself. So I > think the best bet here is to have whomever took the patch take the fix, but > LMK if there's some shared tag thing I should grab to take this into the > RISC-V tree. Thomas has to fold this in to his patch. I'll drop his patches for now from linux-next. Luis
diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c index 16acd4dcdb96..97e345f7d25d 100644 --- a/drivers/perf/riscv_pmu_sbi.c +++ b/drivers/perf/riscv_pmu_sbi.c @@ -986,7 +986,7 @@ static void riscv_pmu_update_counter_access(void *info) csr_write(CSR_SCOUNTEREN, 0x2); } -static int riscv_pmu_proc_user_access_handler(struct ctl_table *table, +static int riscv_pmu_proc_user_access_handler(const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) {
Fix riscv build break after commit c8be9e66ca1e ("sysctl: treewide: constify the ctl_table argument of handlers"). Fixes: c8be9e66ca1e ("sysctl: treewide: constify the ctl_table argument of handlers") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/perf/riscv_pmu_sbi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)