diff options
| author | Jeremy Cline <jcline@redhat.com> | 2020-04-23 16:47:21 -0400 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2020-04-23 16:47:21 -0400 |
| commit | d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (patch) | |
| tree | 842b7a6410c2572bc8c1643196f83d2e19d80e1e /0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch | |
| parent | 4f478aae8055f932b9a8fdd88d93db6b9da5709e (diff) | |
| download | kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.tar.gz kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.tar.xz kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.zip | |
kernel-5.7.0-0.rc2.20200423git7adc4b399952.1
* Thu Apr 23 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc2.20200423git7adc4b399952.1]
- 7adc4b399952 rebase
- Match template format in kernel.spec.template ("Justin M. Forbes")
- Break out the Patches into individual files for dist-git ("Justin M. Forbes")
- Break the Red Hat patch into individual commits (Jeremy Cline)
- Adjust module filtering so CONFIG_DRM_DP_CEC can be set (Jeremy Cline)
- Add a script to generate release tags and branches (Jeremy Cline)
- Set CONFIG_VDPA for fedora ("Justin M. Forbes")
- Provide defaults in ark-rebase-patches.sh (Jeremy Cline)
- Default ark-rebase-patches.sh to not report issues (Jeremy Cline)
Resolves: rhbz#
Signed-off-by: Jeremy Cline <jcline@redhat.com>
Diffstat (limited to '0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch')
| -rw-r--r-- | 0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch b/0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch new file mode 100644 index 000000000..142212472 --- /dev/null +++ b/0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch @@ -0,0 +1,50 @@ +From 6319fc7f2c963314fed1447ad502cf03f98a29b1 Mon Sep 17 00:00:00 2001 +From: Don Dutile <ddutile@redhat.com> +Date: Wed, 19 Feb 2020 11:52:18 +0100 +Subject: [PATCH] redhat: rh_kabi: Indirect EXTEND macros so nesting of other + macros will resolve. + +RH-Acked-by: Neil Horman <nhorman@redhat.com> +RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com> +RH-Acked-by: Jiri Benc <jbenc@redhat.com> +RH-Acked-by: Prarit Bhargava <prarit@redhat.com> + +Upstream status: RHEL only + +rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve. + +Upstream Status: RHEL only +Suggested-by: Jiri Benc <jbenc@redhat.com> +Signed-off-by: Donald Dutile <ddutile@redhat.com> +Signed-off-by: Jiri Benc <jbenc@redhat.com> +--- + include/linux/rh_kabi.h | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h +index 9a4fea93ad99..cdc636d3013d 100644 +--- a/include/linux/rh_kabi.h ++++ b/include/linux/rh_kabi.h +@@ -210,13 +210,17 @@ + * a pointer in a base struct. The name of the new struct is the name + * of the base struct appended with _rh. + */ +-#define RH_KABI_SIZE_AND_EXTEND_PTR(_struct) \ ++#define _RH_KABI_SIZE_AND_EXTEND_PTR(_struct) \ + size_t _struct##_size_rh; \ + RH_KABI_EXCLUDE(struct _struct##_rh *_struct##_rh) ++#define RH_KABI_SIZE_AND_EXTEND_PTR(_struct) \ ++ _RH_KABI_SIZE_AND_EXTEND_PTR(_struct) + +-#define RH_KABI_SIZE_AND_EXTEND(_struct) \ ++#define _RH_KABI_SIZE_AND_EXTEND(_struct) \ + size_t _struct##_size_rh; \ + RH_KABI_EXCLUDE(struct _struct##_rh _struct##_rh) ++#define RH_KABI_SIZE_AND_EXTEND(_struct) \ ++ _RH_KABI_SIZE_AND_EXTEND(_struct) + + /* + * RH_KABI_SET_SIZE calculates and sets the size of the extended struct and +-- +2.26.0 + |