Merge tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

torvalds · torvalds · commit 8328dd2f394e · 2019-12-02T11:26:40.000-08:00
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
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ static void pstore_timefunc(struct timer_list *unused)`
`793`	`793`	`jiffies + msecs_to_jiffies(pstore_update_ms));`
`794`	`794`	`}`
`795`	`795`
`796`		`-void __init pstore_choose_compression(void)`
	`796`	`+static void __init pstore_choose_compression(void)`
`797`	`797`	`{`
`798`	`798`	`const struct pstore_zbackend *step;`
`799`	`799`