* [PATCH] MIPS: OCTEON: Replace SIZEOF_FIELD() macro
@ 2019-10-10 22:46 Kees Cook
2019-10-10 23:02 ` Joe Perches
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2019-10-10 22:46 UTC (permalink / raw)
To: Ralf Baechle
Cc: Paul Burton, James Hogan, Aaro Koskinen, Pankaj Bharadiya,
linux-mips, linux-kernel
From: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
In preparation for switching to a standard sizeof_member() macro to find the
size of a member of a struct, remove the custom SIZEOF_FIELD() macro and use
the more common FIELD_SIZEOF() instead. Later patches will globally replace
FIELD_SIZEOF() and sizeof_field() with the more accurate sizeof_member().
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Link: https://lore.kernel.org/r/20190924105839.110713-4-pankaj.laxminarayan.bharadiya@intel.com
Co-developed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
index ba8f82a29a81..44b506a14666 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
@@ -44,13 +44,6 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc;
/* See header file for descriptions of functions */
-/**
- * This macro returns the size of a member of a structure.
- * Logically it is the same as "sizeof(s::field)" in C++, but
- * C lacks the "::" operator.
- */
-#define SIZEOF_FIELD(s, field) sizeof(((s *)NULL)->field)
-
/**
* This macro returns a member of the
* cvmx_bootmem_named_block_desc_t structure. These members can't
@@ -65,7 +58,7 @@ static struct cvmx_bootmem_desc *cvmx_bootmem_desc;
#define CVMX_BOOTMEM_NAMED_GET_FIELD(addr, field) \
__cvmx_bootmem_desc_get(addr, \
offsetof(struct cvmx_bootmem_named_block_desc, field), \
- SIZEOF_FIELD(struct cvmx_bootmem_named_block_desc, field))
+ FIELD_SIZEOF(struct cvmx_bootmem_named_block_desc, field))
/**
* This function is the implementation of the get macros defined
--
2.17.1
--
Kees Cook
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MIPS: OCTEON: Replace SIZEOF_FIELD() macro
2019-10-10 22:46 [PATCH] MIPS: OCTEON: Replace SIZEOF_FIELD() macro Kees Cook
@ 2019-10-10 23:02 ` Joe Perches
0 siblings, 0 replies; 2+ messages in thread
From: Joe Perches @ 2019-10-10 23:02 UTC (permalink / raw)
To: Kees Cook, Ralf Baechle, Linus Torvalds
Cc: Paul Burton, James Hogan, Aaro Koskinen, Pankaj Bharadiya,
linux-mips, linux-kernel
On Thu, 2019-10-10 at 15:46 -0700, Kees Cook wrote:
> In preparation for switching to a standard sizeof_member() macro to find the
> size of a member of a struct, remove the custom SIZEOF_FIELD() macro and use
> the more common FIELD_SIZEOF() instead. Later patches will globally replace
> FIELD_SIZEOF() and sizeof_field() with the more accurate sizeof_member().
Is the intent to have a single treewide flag day conversion of
FIELD_SIZEOF -> sizeof_member or submit individual patches to
subsystem maintainers?
I don't recall Linus buying in to either mechanism.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-10 23:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-10 22:46 [PATCH] MIPS: OCTEON: Replace SIZEOF_FIELD() macro Kees Cook
2019-10-10 23:02 ` Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).