summaryrefslogtreecommitdiff
path: root/arch/sandbox/include/asm/io.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-12-31 10:58:36 -0600
committerTom Rini <trini@konsulko.com>2024-12-31 10:58:36 -0600
commitf4e871196568a5a8cc4d150e11f23d902e740286 (patch)
tree440c8b7a3fcdf50a9a8499836fbf4dccdc1b1f0f /arch/sandbox/include/asm/io.h
parent6c76f67ac5f0c796610b624fb839e3f9fc19f775 (diff)
parent43ca65b30555d9b8e2a31f71d8756aa8c0ffbcf5 (diff)
Merge patch series "Select CONFIG_64BIT for sandbox64 and x86_64"
Andrew Goodbody <andrew.goodbody@linaro.org> says: Picking up a series from Dan Carpenter and applying requested changes for v2. I had previously set CONFIG_64BIT for arm64. This patchset does the same thing for sandbox and x86_64. (Mips and riscv were already doing it). This CONFIG option is used in the Makefile to determine if it's a 32 or 64 bit system for the CHECKER. Makefile 1052 # the checker needs the correct machine size 1053 CHECKFLAGS += $(if $(CONFIG_64BIT),-m64,-m32) Link: https://lore.kernel.org/r/20241216180736.1933807-1-andrew.goodbody@linaro.org
Diffstat (limited to 'arch/sandbox/include/asm/io.h')
-rw-r--r--arch/sandbox/include/asm/io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h
index 3d09170063f..f656f361cd5 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