diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-28 18:50:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-28 18:50:04 +0200 |
| commit | f24767ca4f004f6a34411229a84394e1b94deae7 (patch) | |
| tree | 352749779619d562dea6eaf7a91c8f9d1532ea2a /tools | |
| parent | Revert "mm,memblock: reset memblock.reserved to system init state to prevent ... (diff) | |
| parent | tools/testing/cxl: Remove unused SZ_512G macro (diff) | |
| download | linux-f24767ca4f004f6a34411229a84394e1b94deae7.tar.xz linux-f24767ca4f004f6a34411229a84394e1b94deae7.zip | |
Merge tag 'cxl-fixes-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl
Pull cxl fixes from Vishal Verma:
- Update MAINTAINERS for cxl
- A few static analysis fixes
- Fix a Kconfig dependency for CONFIG_FW_LOADER
* tag 'cxl-fixes-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl:
tools/testing/cxl: Remove unused SZ_512G macro
cxl/acpi: Return 'rc' instead of '0' in cxl_parse_cfmws()
cxl/acpi: Fix a use-after-free in cxl_parse_cfmws()
cxl: Update MAINTAINERS
cxl/mem: Fix a double shift bug
cxl: fix CONFIG_FW_LOADER dependency
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/cxl/test/cxl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index 0e78d8e19895..fb6ab9cef84f 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -999,10 +999,6 @@ static void mock_companion(struct acpi_device *adev, struct device *dev) #define SZ_64G (SZ_32G * 2) #endif -#ifndef SZ_512G -#define SZ_512G (SZ_64G * 8) -#endif - static __init int cxl_rch_init(void) { int rc, i; |