From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Oct 2018 13:42:02 +0000 (+0100)
Subject: Merge tag 'pstore-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=08ffb584d9eb17940321317ef6c9c7383ad4f149;p=linux.git

Merge tag 'pstore-v4.20-rc1' of git://git./linux/kernel/git/kees/linux

Pull pstore updates from Kees Cook:
 "pstore improvements:

   - refactor init to happen as early as possible again (Joel Fernandes)

   - improve resource reservation names"

* tag 'pstore-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore/ram: Clarify resource reservation labels
  pstore: Refactor compression initialization
  pstore: Allocate compression during late_initcall()
  pstore: Centralize init/exit routines
---

08ffb584d9eb17940321317ef6c9c7383ad4f149
diff --cc fs/pstore/ram.c
index f4fd2e72add4e,712960e117fea..ffcff6516e89c
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@@ -953,16 -947,10 +963,16 @@@ static void __init ramoops_register_dum
  
  static int __init ramoops_init(void)
  {
 +	int ret;
 +
  	ramoops_register_dummy();
 -	return platform_driver_register(&ramoops_driver);
 +	ret = platform_driver_register(&ramoops_driver);
 +	if (ret != 0)
 +		ramoops_unregister_dummy();
 +
 +	return ret;
  }
- late_initcall(ramoops_init);
+ postcore_initcall(ramoops_init);
  
  static void __exit ramoops_exit(void)
  {