diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-10 08:04:04 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-10 08:04:04 +0300 |
| commit | a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc (patch) | |
| tree | d5d5515c98d6163e14d56dfe3272cb3b4e9c7d71 /include | |
| parent | 5ce344beaca688f4cdea07045e0b8f03dc537e74 (diff) | |
| parent | 2c71fdf02a95b3dd425b42f28fd47fb2b1d22702 (diff) | |
| download | linux-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.tar.xz | |
Merge branch 'linus' into x86/urgent, to pick up dependent commits
Prepare to fix aspects of the new BHI code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compiler.h | 2 | ||||
| -rw-r--r-- | include/linux/gfp_types.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index c00cc6c0878a..8c252e073bd8 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -268,7 +268,7 @@ static inline void *offset_to_ptr(const int *off) * - When one operand is a null pointer constant (i.e. when x is an integer * constant expression) and the other is an object pointer (i.e. our * third operand), the conditional operator returns the type of the - * object pointer operand (i.e. "int *). Here, within the sizeof(), we + * object pointer operand (i.e. "int *"). Here, within the sizeof(), we * would then get: * sizeof(*((int *)(...)) == sizeof(int) == 4 * - When one operand is a void pointer (i.e. when x is not an integer diff --git a/include/linux/gfp_types.h b/include/linux/gfp_types.h index 868c8fb1bbc1..13becafe41df 100644 --- a/include/linux/gfp_types.h +++ b/include/linux/gfp_types.h @@ -2,6 +2,8 @@ #ifndef __LINUX_GFP_TYPES_H #define __LINUX_GFP_TYPES_H +#include <linux/bits.h> + /* The typedef is in types.h but we want the documentation here */ #if 0 /** |