| Message ID | 20241120100157.485418-2-andrew.goodbody@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Select CONFIG_64BIT for sandbox64 and x86_64 | expand |
On Wed, 20 Nov 2024 at 03:02, Andrew Goodbody <andrew.goodbody@linaro.org> wrote: > > In include/linux/io.h the declarations of ioread64 and iowrite64 > which make use of readq/writeq are guarded with CONFIG_64BIT so > guard the sandbox declarations of readq and writeq also with > CONFIG_64BIT. > > Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org> > --- > > Changes in v3: > This is a new patch in the series at this point. > > arch/sandbox/include/asm/io.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> > > diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h > index 3d09170063..f656f361cd 100644 > --- a/arch/sandbox/include/asm/io.h > +++ b/arch/sandbox/include/asm/io.h > @@ -39,13 +39,13 @@ void sandbox_write(void *addr, unsigned int val, enum sandboxio_size_t size); > #define readb(addr) sandbox_read((const void *)addr, SB_SIZE_8) > #define readw(addr) sandbox_read((const void *)addr, SB_SIZE_16) > #define readl(addr) sandbox_read((const void *)addr, SB_SIZE_32) > -#ifdef CONFIG_SANDBOX64 > +#ifdef CONFIG_64BIT > #define readq(addr) sandbox_read((const void *)addr, SB_SIZE_64) > #endif > #define writeb(v, addr) sandbox_write((void *)addr, v, SB_SIZE_8) > #define writew(v, addr) sandbox_write((void *)addr, v, SB_SIZE_16) > #define writel(v, addr) sandbox_write((void *)addr, v, SB_SIZE_32) > -#ifdef CONFIG_SANDBOX64 > +#ifdef CONFIG_64BIT > #define writeq(v, addr) sandbox_write((void *)addr, v, SB_SIZE_64) > #endif > > -- > 2.39.5 >
diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h index 3d09170063..f656f361cd 100644 --- a/arch/sandbox/include/asm/io.h +++ b/arch/sandbox/include/asm/io.h @@ -39,13 +39,13 @@ void sandbox_write(void *addr, unsigned int val, enum sandboxio_size_t size); #define readb(addr) sandbox_read((const void *)addr, SB_SIZE_8) #define readw(addr) sandbox_read((const void *)addr, SB_SIZE_16) #define readl(addr) sandbox_read((const void *)addr, SB_SIZE_32) -#ifdef CONFIG_SANDBOX64 +#ifdef CONFIG_64BIT #define readq(addr) sandbox_read((const void *)addr, SB_SIZE_64) #endif #define writeb(v, addr) sandbox_write((void *)addr, v, SB_SIZE_8) #define writew(v, addr) sandbox_write((void *)addr, v, SB_SIZE_16) #define writel(v, addr) sandbox_write((void *)addr, v, SB_SIZE_32) -#ifdef CONFIG_SANDBOX64 +#ifdef CONFIG_64BIT #define writeq(v, addr) sandbox_write((void *)addr, v, SB_SIZE_64) #endif
In include/linux/io.h the declarations of ioread64 and iowrite64 which make use of readq/writeq are guarded with CONFIG_64BIT so guard the sandbox declarations of readq and writeq also with CONFIG_64BIT. Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org> --- Changes in v3: This is a new patch in the series at this point. arch/sandbox/include/asm/io.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)