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 /init/Kconfig | |
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 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index b48917717bae..e25a82a291a6 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1919,6 +1919,49 @@ config MODULE_SIG_HASH | |||
1919 | default "sha384" if MODULE_SIG_SHA384 | 1919 | default "sha384" if MODULE_SIG_SHA384 |
1920 | default "sha512" if MODULE_SIG_SHA512 | 1920 | default "sha512" if MODULE_SIG_SHA512 |
1921 | 1921 | ||
1922 | config MODULE_COMPRESS | ||
1923 | bool "Compress modules on installation" | ||
1924 | depends on MODULES | ||
1925 | help | ||
1926 | This option compresses the kernel modules when 'make | ||
1927 | modules_install' is run. | ||
1928 | |||
1929 | The modules will be compressed either using gzip or xz depend on the | ||
1930 | choice made in "Compression algorithm". | ||
1931 | |||
1932 | module-init-tools has support for gzip format while kmod handle gzip | ||
1933 | and xz compressed modules. | ||
1934 | |||
1935 | When a kernel module is installed from outside of the main kernel | ||
1936 | source and uses the Kbuild system for installing modules then that | ||
1937 | kernel module will also be compressed when it is installed. | ||
1938 | |||
1939 | This option provides little benefit when the modules are to be used inside | ||
1940 | an initrd or initramfs, it generally is more efficient to compress the whole | ||
1941 | initrd or initramfs instead. | ||
1942 | |||
1943 | This is fully compatible with signed modules while the signed module is | ||
1944 | compressed. module-init-tools or kmod handles decompression and provide to | ||
1945 | other layer the uncompressed but signed payload. | ||
1946 | |||
1947 | choice | ||
1948 | prompt "Compression algorithm" | ||
1949 | depends on MODULE_COMPRESS | ||
1950 | default MODULE_COMPRESS_GZIP | ||
1951 | help | ||
1952 | This determines which sort of compression will be used during | ||
1953 | 'make modules_install'. | ||
1954 | |||
1955 | GZIP (default) and XZ are supported. | ||
1956 | |||
1957 | config MODULE_COMPRESS_GZIP | ||
1958 | bool "GZIP" | ||
1959 | |||
1960 | config MODULE_COMPRESS_XZ | ||
1961 | bool "XZ" | ||
1962 | |||
1963 | endchoice | ||
1964 | |||
1922 | endif # MODULES | 1965 | endif # MODULES |
1923 | 1966 | ||
1924 | config INIT_ALL_POSSIBLE | 1967 | config INIT_ALL_POSSIBLE |