summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-07-08 21:55:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2022-07-08 21:55:25 +0200
commit483e4a1d83db1a6d339cd76f7966bf9e1748f752 (patch)
tree05db90a8af7dd76ab0d985a02c5959dbacfca721 /include
parentMerge tag 'iommu-fixes-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentcxl/mbox: Fix missing variable payload checks in cmd size validation (diff)
downloadlinux-483e4a1d83db1a6d339cd76f7966bf9e1748f752.tar.xz
linux-483e4a1d83db1a6d339cd76f7966bf9e1748f752.zip
Merge tag 'cxl-fixes-for-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl
Pull cxl fixes from Vishal Verma: - Update MAINTAINERS for Ben's email - Fix cleanup of port devices on failure to probe driver - Fix endianness in get/set LSA mailbox command structures - Fix memregion_free() fallback definition - Fix missing variable payload checks in CXL cmd size validation * tag 'cxl-fixes-for-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl: cxl/mbox: Fix missing variable payload checks in cmd size validation memregion: Fix memregion_free() fallback definition cxl/mbox: Use __le32 in get,set_lsa mailbox structures cxl/core: Use is_endpoint_decoder cxl: Fix cleanup of port devices on failure to probe driver. MAINTAINERS: Update Ben's email address
Diffstat (limited to 'include')
-rw-r--r--include/linux/memregion.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/memregion.h b/include/linux/memregion.h
index e11595256cac..c04c4fd2e209 100644
--- a/include/linux/memregion.h
+++ b/include/linux/memregion.h
@@ -16,7 +16,7 @@ static inline int memregion_alloc(gfp_t gfp)
{
return -ENOMEM;
}
-void memregion_free(int id)
+static inline void memregion_free(int id)
{
}
#endif