diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-15 07:09:41 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-15 07:09:41 -0600 |
| commit | b1d63f0c777b6df1ab53c5597d5fc25753f52f07 (patch) | |
| tree | 1b6e412f19c579e62f5cb73e16a6b5c364808940 /arch/powerpc/boot | |
| parent | 7c698440524117dca7534592db0e7f465ae4d0bb (diff) | |
| parent | f12cd06109f47c2fb4b23a45ab55404c47ef7fae (diff) | |
Merge tag 'powerpc-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- Fix a build failure with some versions of ld that have an odd version
string
- Fix incorrect use of mutex in the IMC PMU driver
Thanks to Kajol Jain, Michael Petlan, Ojaswin Mujoo, Peter Zijlstra, and
Yang Yingliang.
* tag 'powerpc-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/64s/hash: Make stress_hpt_timer_fn() static
powerpc/imc-pmu: Fix use of mutex in IRQs disabled section
powerpc/boot: Fix incorrect version calculation issue in ld_version
Diffstat (limited to 'arch/powerpc/boot')
| -rwxr-xr-x | arch/powerpc/boot/wrapper | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index af04cea82b94..352d7de24018 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -210,6 +210,10 @@ ld_version() gsub(".*version ", ""); gsub("-.*", ""); split($1,a, "."); + if( length(a[3]) == "8" ) + # a[3] is probably a date of format yyyymmdd used for release snapshots. We + # can assume it to be zero as it does not signify a new version as such. + a[3] = 0; print a[1]*100000000 + a[2]*1000000 + a[3]*10000; exit }' |