| From eb@emlix.com Sun Aug 2 09:02:43 2020 |
| From: Rolf Eike Beer <eb@emlix.com> |
| Date: Thu, 30 Jul 2020 15:01:45 +0200 |
| Subject: install several missing uapi headers |
| To: stable@vger.kernel.org |
| Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com> |
| Message-ID: <2892097.ECyh5nn9PN@devpool35> |
| |
| From: Rolf Eike Beer <eb@emlix.com> |
| |
| Commit fcc8487d477a3452a1d0ccbdd4c5e0e1e3cb8bed ("uapi: export all headers |
| under uapi directories") changed the default to install all headers not marked |
| to be conditional. This takes the list of headers listed in the commit message |
| and manually adds an export for those that are already present in this kernel |
| version. |
| |
| Found during an attempt to build mtd-utils 2.1.2 as it wants hash_info.h, which |
| exists since 3.13 but has not been installed until the above mentioned commit, |
| which ended up in 4.12. |
| |
| Signed-off-by: Rolf Eike Beer <eb@emlix.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/mips/include/uapi/asm/Kbuild | 3 +++ |
| arch/powerpc/include/uapi/asm/Kbuild | 1 + |
| include/uapi/drm/Kbuild | 3 +++ |
| include/uapi/linux/Kbuild | 20 ++++++++++++++++++++ |
| include/uapi/linux/cifs/Kbuild | 1 + |
| include/uapi/linux/genwqe/Kbuild | 1 + |
| 6 files changed, 29 insertions(+) |
| create mode 100644 include/uapi/linux/cifs/Kbuild |
| create mode 100644 include/uapi/linux/genwqe/Kbuild |
| |
| --- a/arch/mips/include/uapi/asm/Kbuild |
| +++ b/arch/mips/include/uapi/asm/Kbuild |
| @@ -39,3 +39,6 @@ header-y += termbits.h |
| header-y += termios.h |
| header-y += types.h |
| header-y += unistd.h |
| +header-y += hwcap.h |
| +header-y += reg.h |
| +header-y += ucontext.h |
| --- a/arch/powerpc/include/uapi/asm/Kbuild |
| +++ b/arch/powerpc/include/uapi/asm/Kbuild |
| @@ -45,3 +45,4 @@ header-y += tm.h |
| header-y += types.h |
| header-y += ucontext.h |
| header-y += unistd.h |
| +header-y += perf_regs.h |
| --- a/include/uapi/drm/Kbuild |
| +++ b/include/uapi/drm/Kbuild |
| @@ -20,3 +20,6 @@ header-y += vmwgfx_drm.h |
| header-y += msm_drm.h |
| header-y += vc4_drm.h |
| header-y += virtgpu_drm.h |
| +header-y += armada_drm.h |
| +header-y += etnaviv_drm.h |
| +header-y += vgem_drm.h |
| --- a/include/uapi/linux/Kbuild |
| +++ b/include/uapi/linux/Kbuild |
| @@ -475,3 +475,23 @@ header-y += xilinx-v4l2-controls.h |
| header-y += zorro.h |
| header-y += zorro_ids.h |
| header-y += userfaultfd.h |
| +header-y += auto_dev-ioctl.h |
| +header-y += bcache.h |
| +header-y += btrfs_tree.h |
| +header-y += coresight-stm.h |
| +header-y += cryptouser.h |
| +header-y += hash_info.h |
| +header-y += kcm.h |
| +header-y += kcov.h |
| +header-y += kfd_ioctl.h |
| +header-y += lightnvm.h |
| +header-y += module.h |
| +header-y += nilfs2_api.h |
| +header-y += nilfs2_ondisk.h |
| +header-y += nsfs.h |
| +header-y += pr.h |
| +header-y += qrtr.h |
| +header-y += stm.h |
| +header-y += wil6210_uapi.h |
| +header-y += cifs/ |
| +header-y += genwqe/ |
| --- /dev/null |
| +++ b/include/uapi/linux/cifs/Kbuild |
| @@ -0,0 +1 @@ |
| +header-y += cifs_mount.h |
| --- /dev/null |
| +++ b/include/uapi/linux/genwqe/Kbuild |
| @@ -0,0 +1 @@ |
| +header-y += genwqe_card.h |