Messages in this thread | | | From | Miguel Ojeda <> | Date | Sat, 19 Jan 2019 19:22:50 +0100 | Subject | Re: [PATCH] Compiler Attributes: move kernel-only attributes into __KERNEL__ |
| |
Hi Greg, Nick, Xiaozhou,
On Thu, Dec 6, 2018 at 1:50 PM Greg KH <gregkh@linuxfoundation.org> wrote: > > If something is fixed in Linus's tree for this, I want to take it into > the 4.19-stable tree as well.
This ended up in Linus' tree before the holidays, i.e. 4.20 has it, see commit 71391bdd2e9a ("include/linux/compiler_types.h: don't pollute userspace with macro definitions").
In case you want to still backport this to 4.19: you can't cherry-pick it without conflicts because some stuff was moved around due to the Compiler Attributes patch series (which also went in with 4.20 too), but you can move the macros like this commit does. There are 2 conflicts:
* The big block of macros for attributes: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/include/linux/compiler_types.h?h=v4.19.16#n189 * The __always_inline macro: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/include/linux/compiler_types.h?h=v4.19.16#n275
All those are nowadays inside __KERNEL__ && !__ASSEMBLY__, so it should be fine to move those too along the rest that this patch moves.
Cheers, Miguel
| |