diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 21:11:25 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 21:11:25 -0500 |
| commit | 5970ecc9013ab303c4227702a8e1a2d5089da9bf (patch) | |
| tree | 31742f12fbd7996a881644c28627d58c87caf8d2 | |
| parent | 0fe3da06d53d652129eecdacdb0d3e7bda37fcd0 (diff) | |
| download | longterm-queue-4.8-5970ecc9013ab303c4227702a8e1a2d5089da9bf.tar.gz | |
pstore: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/pstore-Shut-down-worker-when-unregistering.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/queue/pstore-Shut-down-worker-when-unregistering.patch b/queue/pstore-Shut-down-worker-when-unregistering.patch index 83cd020..1bb4ca7 100644 --- a/queue/pstore-Shut-down-worker-when-unregistering.patch +++ b/queue/pstore-Shut-down-worker-when-unregistering.patch @@ -1,4 +1,4 @@ -From 6330d5534786d5315d56d558aa6d20740f97d80a Mon Sep 17 00:00:00 2001 +From 8ff530971677ac77b4dbe3d7a2042cab2d21e0da Mon Sep 17 00:00:00 2001 From: Kees Cook <keescook@chromium.org> Date: Mon, 6 Mar 2017 12:42:12 -0800 Subject: [PATCH] pstore: Shut down worker when unregistering @@ -13,18 +13,18 @@ Signed-off-by: Kees Cook <keescook@chromium.org> Cc: stable@vger.kernel.org diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c -index cfc1abd264d9..074fe85a2078 100644 +index 16ecca5b72d8..0872b8861d99 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c -@@ -709,6 +709,7 @@ int pstore_register(struct pstore_info *psi) - if (psi->flags & PSTORE_FLAGS_PMSG) +@@ -667,6 +667,7 @@ int pstore_register(struct pstore_info *psi) pstore_register_pmsg(); + } + /* Start watching for new records, if desired. */ if (pstore_update_ms >= 0) { pstore_timer.expires = jiffies + msecs_to_jiffies(pstore_update_ms); -@@ -731,6 +732,11 @@ EXPORT_SYMBOL_GPL(pstore_register); +@@ -689,6 +690,11 @@ EXPORT_SYMBOL_GPL(pstore_register); void pstore_unregister(struct pstore_info *psi) { @@ -33,10 +33,10 @@ index cfc1abd264d9..074fe85a2078 100644 + del_timer_sync(&pstore_timer); + flush_work(&pstore_work); + - if (psi->flags & PSTORE_FLAGS_PMSG) + if ((psi->flags & PSTORE_FLAGS_FRAGILE) == 0) { pstore_unregister_pmsg(); - if (psi->flags & PSTORE_FLAGS_FTRACE) -@@ -830,7 +836,9 @@ static void pstore_timefunc(unsigned long dummy) + pstore_unregister_ftrace(); +@@ -786,7 +792,9 @@ static void pstore_timefunc(unsigned long dummy) schedule_work(&pstore_work); } |