diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-01-27 08:18:31 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-01-27 08:18:31 +1100 |
commit | 0d0ffc8681023ad5c3465c538bfdbd73c8bf8a02 (patch) | |
tree | 51df810d52a38a2cfa5ceb6002c6ad634b7a1303 /Makefile | |
parent | 3e6d74db7e02b19e52e72fac6b984f48bef6398a (diff) | |
parent | 537896fabed11f8d9788886d1aacdb977213c7b3 (diff) | |
download | linux-next-0d0ffc8681023ad5c3465c538bfdbd73c8bf8a02.tar.gz |
Merge remote-tracking branch 'kbuild/for-next'
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1058,7 +1058,7 @@ ifdef CONFIG_MODULE_COMPRESS mod_compress_cmd = $(KGZIP) -n -f endif # CONFIG_MODULE_COMPRESS_GZIP ifdef CONFIG_MODULE_COMPRESS_XZ - mod_compress_cmd = $(XZ) -f + mod_compress_cmd = $(XZ) --lzma2=dict=2MiB -f endif # CONFIG_MODULE_COMPRESS_XZ endif # CONFIG_MODULE_COMPRESS export mod_compress_cmd @@ -1252,8 +1252,11 @@ endef define filechk_version.h echo \#define LINUX_VERSION_CODE $(shell \ - expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ - echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' + expr $(VERSION) \* 16777216 + 0$(PATCHLEVEL) \* 65536 + 0$(SUBLEVEL)); \ + echo \#define LINUX_VERSION_MAJOR $(VERSION); \ + echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ + echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL); \ + echo '#define KERNEL_VERSION(a,b,c) (((a) << 24) + ((b) << 16) + (c))' endef $(version_h): FORCE |