diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-07-28 07:12:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-07-28 07:17:38 +0200 |
| commit | 5bf2f5119b9e957f773a22f226974166b58cff32 (patch) | |
| tree | e719f1a52a8c42077cc62ea39da69175d35138c7 /include/linux/blkdev.h | |
| parent | 65f55a30176662ee37fe18b47430ee30b57bfc98 (diff) | |
| parent | 038d61fd642278bab63ee8ef722c50d10ab01e8f (diff) | |
| download | linux-next-5bf2f5119b9e957f773a22f226974166b58cff32.tar.gz linux-next-5bf2f5119b9e957f773a22f226974166b58cff32.zip | |
Merge tag 'v6.16' into x86/cpu, to resolve conflict
Resolve overlapping context conflict between this upstream fix:
d8010d4ba43e ("x86/bugs: Add a Transient Scheduler Attacks mitigation")
And this pending commit in tip:x86/cpu:
65f55a301766 ("x86/CPU/AMD: Add CPUID faulting support")
Conflicts:
arch/x86/kernel/cpu/amd.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index a59880c809c7..181a0deadc9e 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -269,11 +269,16 @@ static inline dev_t disk_devt(struct gendisk *disk) return MKDEV(disk->major, disk->first_minor); } +#ifdef CONFIG_TRANSPARENT_HUGEPAGE /* * We should strive for 1 << (PAGE_SHIFT + MAX_PAGECACHE_ORDER) * however we constrain this to what we can validate and test. */ #define BLK_MAX_BLOCK_SIZE SZ_64K +#else +#define BLK_MAX_BLOCK_SIZE PAGE_SIZE +#endif + /* blk_validate_limits() validates bsize, so drivers don't usually need to */ static inline int blk_validate_block_size(unsigned long bsize) |