diff options
| author | Tom Rini <trini@konsulko.com> | 2023-05-15 15:26:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-05-15 15:26:54 -0400 |
| commit | 5d0b3dde115b0d26d414199678983d01b738ad1b (patch) | |
| tree | 2d08c0a256f50eb3c22bfbb84b2fc9cc3eb0e980 /include/linux/stddef.h | |
| parent | eaa9efafffaf87e3414db5d21face5e2dad105e4 (diff) | |
| parent | 6ab7c3d6bab1584e43f0c0a7e92134811b78bc61 (diff) | |
Merge branch '2023-05-15-build-system-updates' into next
- Bring in a few kbuild changes from upstream Linux to fix running the
checker (make C=1/C=2), and clean up some of the logic related to how
choose what device trees to build.
Diffstat (limited to 'include/linux/stddef.h')
| -rw-r--r-- | include/linux/stddef.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/stddef.h b/include/linux/stddef.h index a7f546fdfe5..c732eef65ac 100644 --- a/include/linux/stddef.h +++ b/include/linux/stddef.h @@ -14,13 +14,7 @@ #include <linux/types.h> #endif -#ifndef __CHECKER__ #undef offsetof -#ifdef __compiler_offsetof -#define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) -#else -#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER) -#endif -#endif +#define offsetof(TYPE, MEMBER) __builtin_offsetof(TYPE, MEMBER) #endif |