aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-02 11:26:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-02 11:26:40 -0800
commit8328dd2f394e48a010383af176bf55ba4be79da0 (patch)
treed2d7a88a051b99e9a78af2ba9a0ee217cb6ae580
parentMerge tag 'iommu-updates-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff)
parentpstore: Make pstore_choose_compression() static (diff)
downloadlinux-dev-8328dd2f394e48a010383af176bf55ba4be79da0.tar.xz
linux-dev-8328dd2f394e48a010383af176bf55ba4be79da0.zip
Merge tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore bug fix from Kees Cook: - add missing "static" (Ben Dooks) * tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: pstore: Make pstore_choose_compression() static
-rw-r--r--fs/pstore/platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 3d7024662d29..d896457e7c11 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -793,7 +793,7 @@ static void pstore_timefunc(struct timer_list *unused)
jiffies + msecs_to_jiffies(pstore_update_ms));
}
-void __init pstore_choose_compression(void)
+static void __init pstore_choose_compression(void)
{
const struct pstore_zbackend *step;