| Message ID | 1496303101-18049-1-git-send-email-linux@rasmusvillemoes.dk |
|---|---|
| State | New |
| Headers | show |
On Thu, Jun 01, 2017 at 09:45:01AM +0200, Rasmus Villemoes wrote: > This reverts the part of > 1a4573084ebb1298a90694259f853c1327a62079 (x86/kernel: Audit and remove > any unnecessary uses of module.h) that touches x86/kernel/setup.c. While > nothing in mainline's version of the file uses anything from module.h, > Ubuntu's kernel has a call to enforce_signed_modules(). > > This goes unnoticed with the defalt Ubuntu config, because the file > includes linux/kexec.h, which in turn includes linux/module.h. However, > that #include is guarded by CONFIG_KEXEC_CORE, so if one disables > CONFIG_KEXEC and CONFIG_KEXEC_FILE, the result is > > arch/x86/kernel/setup.c:1149:3: error: implicit declaration of function > ‘enforce_signed_modules’ [-Werror=implicit-function-declaration] > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Thanks for the patch. I think this looks fine, but you're missing a few things: - You need to specify which releases you are targeting with the patch. - All patches for stable releases require a corresponding bug, and the commit message for the patch must include a BugLink line indicating which bug the patch fixes, i.e. BugLink: http://bugs.launchpad.net/bugs/XXXXXX - The bug description should follow the SRU bug template (see https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template). Thanks, Seth
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d179725..b815923 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -36,7 +36,7 @@ #include <linux/console.h> #include <linux/root_dev.h> #include <linux/highmem.h> -#include <linux/export.h> +#include <linux/module.h> #include <linux/efi.h> #include <linux/init.h> #include <linux/edd.h>
This reverts the part of 1a4573084ebb1298a90694259f853c1327a62079 (x86/kernel: Audit and remove any unnecessary uses of module.h) that touches x86/kernel/setup.c. While nothing in mainline's version of the file uses anything from module.h, Ubuntu's kernel has a call to enforce_signed_modules(). This goes unnoticed with the defalt Ubuntu config, because the file includes linux/kexec.h, which in turn includes linux/module.h. However, that #include is guarded by CONFIG_KEXEC_CORE, so if one disables CONFIG_KEXEC and CONFIG_KEXEC_FILE, the result is arch/x86/kernel/setup.c:1149:3: error: implicit declaration of function ‘enforce_signed_modules’ [-Werror=implicit-function-declaration] Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/x86/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)