diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 20:17:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 20:17:38 -0400 |
commit | bdf428feb225229b1d4715b45bbdad4a934cd89c (patch) | |
tree | 9bc47e348c2081fd46c0f7d715780ce294a6953d /Makefile | |
parent | a40a7201a4584a66ab234ba1006472be952f20e0 (diff) | |
parent | 184c3fc3f52fb75800deb76deffb70907d1f76ea (diff) |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module update from Rusty Russell:
"Nothing major: support for compressing modules, and auto-tainting
params.
PS. My virtio-next tree is empty: DaveM took the patches I had. There
might be a virtio-rng starvation fix, but so far it's a bit voodoo
so I will get to that in the next two days or it will wait"
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
moduleparam: Resolve missing-field-initializer warning
kbuild: handle module compression while running 'make modules_install'.
modinst: wrap long lines in order to enhance cmd_modules_install
modsign: lookup lines ending in .ko in .mod files
modpost: simplify file name generation of *.mod.c files
modpost: reduce visibility of symbols and constify r/o arrays
param: check for tainting before calling set op.
drm/i915: taint the kernel if unsafe module parameters are set
module: add module_param_unsafe and module_param_named_unsafe
module: make it possible to have unsafe, tainting module params
module: rename KERNEL_PARAM_FL_NOARG to avoid confusion
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -842,6 +842,21 @@ mod_strip_cmd = true | |||
842 | endif # INSTALL_MOD_STRIP | 842 | endif # INSTALL_MOD_STRIP |
843 | export mod_strip_cmd | 843 | export mod_strip_cmd |
844 | 844 | ||
845 | # CONFIG_MODULE_COMPRESS, if defined, will cause module to be compressed | ||
846 | # after they are installed in agreement with CONFIG_MODULE_COMPRESS_GZIP | ||
847 | # or CONFIG_MODULE_COMPRESS_XZ. | ||
848 | |||
849 | mod_compress_cmd = true | ||
850 | ifdef CONFIG_MODULE_COMPRESS | ||
851 | ifdef CONFIG_MODULE_COMPRESS_GZIP | ||
852 | mod_compress_cmd = gzip -n | ||
853 | endif # CONFIG_MODULE_COMPRESS_GZIP | ||
854 | ifdef CONFIG_MODULE_COMPRESS_XZ | ||
855 | mod_compress_cmd = xz | ||
856 | endif # CONFIG_MODULE_COMPRESS_XZ | ||
857 | endif # CONFIG_MODULE_COMPRESS | ||
858 | export mod_compress_cmd | ||
859 | |||
845 | # Select initial ramdisk compression format, default is gzip(1). | 860 | # Select initial ramdisk compression format, default is gzip(1). |
846 | # This shall be used by the dracut(8) tool while creating an initramfs image. | 861 | # This shall be used by the dracut(8) tool while creating an initramfs image. |
847 | # | 862 | # |