Commit 207da4c8 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL again 



Commit 78d3bb44 ("kbuild: Fix <linux/version.h> for empty SUBLEVEL
or PATCHLEVEL") fixed the build error for empty SUBLEVEL or PATCHLEVEL
by prepending a zero.

Commit 9b82f13e ("kbuild: clamp SUBLEVEL to 255") re-introduced
this issue.

This time, we cannot take the same approach because we have C code:

  #define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL)
  #define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)

Replace empty SUBLEVEL/PATCHLEVEL with a zero.

Fixes: 9b82f13e ("kbuild: clamp SUBLEVEL to 255")
Reported-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-and-tested-by: default avatarSasha Levin <sashal@kernel.org>
parent 22149454

Makefile

+4 −2
Original line number Diff line number Diff line
@@ -1284,10 +1284,10 @@ endef 
define filechk_version.h

	if [ $(SUBLEVEL) -gt 255 ]; then                                 \

		echo \#define LINUX_VERSION_CODE $(shell                 \

		expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 255); \

		expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + 255); \

	else                                                             \

		echo \#define LINUX_VERSION_CODE $(shell                 \

		expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \

		expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \

	fi;                                                              \

	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) +  \

	((c) > 255 ? 255 : (c)))';                                       \
@@ -1296,6 +1296,8 @@ define filechk_version.h 
	echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)

endef



$(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0)

$(version_h): SUBLEVEL := $(if $(SUBLEVEL), $(SUBLEVEL), 0)

$(version_h): FORCE

	$(call filechk,version.h)