diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-17 08:57:24 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-17 09:00:20 +0200 |
commit | b491f8091eec92cd00723082a68b48e38c4f41fa (patch) | |
tree | 1b8b3647470b05ddb0522387c86d844b2579011b /0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch | |
parent | 0ebd93898b5f0a0fa9697e1c85ebe60e67ae81cc (diff) | |
parent | d70892345222ea163abe0fdc7cf500be5fd8dfb8 (diff) | |
download | kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.tar.gz kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.tar.xz kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.zip |
merge 5.9 release
Diffstat (limited to '0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch')
-rw-r--r-- | 0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch b/0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch deleted file mode 100644 index 9b7e53ca0..000000000 --- a/0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Camuso <tcamuso@redhat.com> -Date: Wed, 19 Feb 2020 11:52:17 +0100 -Subject: [PATCH] redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference - operator - -RH-Acked-by: Prarit Bhargava <prarit@redhat.com> -RH-Acked-by: Jiri Benc <jbenc@redhat.com> - -Upstream Status: RHEL only - -Since this macro is intended to record the sizeof extension structs that -are dynamically allocated, using the structure dereference operator '->' -is a better choice, else the macro would have to be invoked with the -_name argument dereferenced as (*_name). - -Also added a short note explaining that, unlike the other RH_KABI -macros that are invoked from within structs, this macro is invoked -outside a struct and therefore needs a semicolon termination. - -Upstream Status: RHEL only -Signed-off-by: Tony Camuso <tcamuso@redhat.com> -Signed-off-by: Jiri Benc <jbenc@redhat.com> ---- - include/linux/rh_kabi.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h -index d551df994583..9a4fea93ad99 100644 ---- a/include/linux/rh_kabi.h -+++ b/include/linux/rh_kabi.h -@@ -224,9 +224,11 @@ - * This macro MUST be called when expanding a base struct with - * RH_KABI_SIZE_AND_EXTEND, and it MUST be called from the allocation site - * regardless of being allocated in the kernel or a module. -+ * Note: since this macro is intended to be invoked outside of a struct, -+ * a semicolon is necessary at the end of the line where it is invoked. - */ - #define RH_KABI_SET_SIZE(_name, _struct) ({ \ -- _name._struct##_size_rh = sizeof(struct _struct##_rh); \ -+ _name->_struct##_size_rh = sizeof(struct _struct##_rh); \ - }) - - /* --- -2.26.2 - |