diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/bugfix/all/spec/powerpc-64s-include-cpu-header.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 47 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 73d3664b1550..f2b5695c040a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (4.19.37-3) unstable; urgency=medium + + * [powerpc*] 64s: Include cpu header (fixes FTBFS) + + -- Ben Hutchings <ben@decadent.org.uk> Wed, 15 May 2019 23:07:16 +0100 + linux (4.19.37-2) unstable; urgency=high * debian/bin: Fix Python static checker regressions (Closes: #928618) diff --git a/debian/patches/bugfix/all/spec/powerpc-64s-include-cpu-header.patch b/debian/patches/bugfix/all/spec/powerpc-64s-include-cpu-header.patch new file mode 100644 index 000000000000..564e6d1b872d --- /dev/null +++ b/debian/patches/bugfix/all/spec/powerpc-64s-include-cpu-header.patch @@ -0,0 +1,40 @@ +From: Breno Leitao <leitao@debian.org> +Date: Mon, 22 Oct 2018 11:54:12 -0300 +Subject: powerpc/64s: Include cpu header +Origin: https://git.kernel.org/linus/42e2acde1237878462b028f5a27d9cc5bea7502c + +Current powerpc security.c file is defining functions, as +cpu_show_meltdown(), cpu_show_spectre_v{1,2} and others, that are being +declared at linux/cpu.h header without including the header file that +contains these declarations. + +This is being reported by sparse, which thinks that these functions are +static, due to the lack of declaration: + + arch/powerpc/kernel/security.c:105:9: warning: symbol 'cpu_show_meltdown' was not declared. Should it be static? + arch/powerpc/kernel/security.c:139:9: warning: symbol 'cpu_show_spectre_v1' was not declared. Should it be static? + arch/powerpc/kernel/security.c:161:9: warning: symbol 'cpu_show_spectre_v2' was not declared. Should it be static? + arch/powerpc/kernel/security.c:209:6: warning: symbol 'stf_barrier' was not declared. Should it be static? + arch/powerpc/kernel/security.c:289:9: warning: symbol 'cpu_show_spec_store_bypass' was not declared. Should it be static? + +This patch simply includes the proper header (linux/cpu.h) to match +function definition and declaration. + +Signed-off-by: Breno Leitao <leitao@debian.org> +Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +--- + arch/powerpc/kernel/security.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c +index f6f469fc4073..9703dce36307 100644 +--- a/arch/powerpc/kernel/security.c ++++ b/arch/powerpc/kernel/security.c +@@ -4,6 +4,7 @@ + // + // Copyright 2018, Michael Ellerman, IBM Corporation. + ++#include <linux/cpu.h> + #include <linux/kernel.h> + #include <linux/device.h> + #include <linux/seq_buf.h> diff --git a/debian/patches/series b/debian/patches/series index 1a3e67d01c21..89df35626fbc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -211,6 +211,7 @@ bugfix/all/spec/0027-x86-speculation-mds-Add-mitigations-support-for-MDS.patch bugfix/all/spec/0028-x86-mds-Add-MDSUM-variant-to-the-MDS-documentation.patch bugfix/all/spec/0029-Documentation-Correct-the-possible-MDS-sysfs-values.patch bugfix/all/spec/0030-x86-speculation-mds-Fix-documentation-typo.patch +bugfix/all/spec/powerpc-64s-include-cpu-header.patch # Fix exported symbol versions bugfix/all/module-disable-matching-missing-version-crc.patch |