projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 7be4ccde SL |
1 | From 41c0ae8d1aa7277db2de943cb81cda92e10659a1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Waiman Long <longman@redhat.com> | |
| 3 | Date: Wed, 14 Nov 2018 09:55:40 -0800 | |
| 4 | Subject: efi: Fix debugobjects warning on 'efi_rts_work' | |
| 5 | ||
| 6 | [ Upstream commit ef1491e791308317bb9851a0ad380c4a68b58d54 ] | |
| 7 | ||
| 8 | The following commit: | |
| 9 | ||
| 10 | 9dbbedaa6171 ("efi: Make efi_rts_work accessible to efi page fault handler") | |
| 11 | ||
| 12 | converted 'efi_rts_work' from an auto variable to a global variable. | |
| 13 | However, when submitting the work, INIT_WORK_ONSTACK() was still used, | |
| 14 | causing the following complaint from debugobjects: | |
| 15 | ||
| 16 | ODEBUG: object 00000000ed27b500 is NOT on stack 00000000c7d38760, but annotated. | |
| 17 | ||
| 18 | Change the macro to just INIT_WORK() to eliminate the warning. | |
| 19 | ||
| 20 | Signed-off-by: Waiman Long <longman@redhat.com> | |
| 21 | Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> | |
| 22 | Acked-by: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com> | |
| 23 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
| 24 | Cc: Peter Zijlstra <peterz@infradead.org> | |
| 25 | Cc: Thomas Gleixner <tglx@linutronix.de> | |
| 26 | Cc: linux-efi@vger.kernel.org | |
| 27 | Fixes: 9dbbedaa6171 ("efi: Make efi_rts_work accessible to efi page fault handler") | |
| 28 | Link: http://lkml.kernel.org/r/20181114175544.12860-2-ard.biesheuvel@linaro.org | |
| 29 | Signed-off-by: Ingo Molnar <mingo@kernel.org> | |
| 30 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| 31 | --- | |
| 32 | drivers/firmware/efi/runtime-wrappers.c | 2 +- | |
| 33 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 34 | ||
| 35 | diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c | |
| 36 | index b0aeffd4e269..1606abead22c 100644 | |
| 37 | --- a/drivers/firmware/efi/runtime-wrappers.c | |
| 38 | +++ b/drivers/firmware/efi/runtime-wrappers.c | |
| 39 | @@ -95,7 +95,7 @@ struct efi_runtime_work { | |
| 40 | efi_rts_work.status = EFI_ABORTED; \ | |
| 41 | \ | |
| 42 | init_completion(&efi_rts_work.efi_rts_comp); \ | |
| 43 | - INIT_WORK_ONSTACK(&efi_rts_work.work, efi_call_rts); \ | |
| 44 | + INIT_WORK(&efi_rts_work.work, efi_call_rts); \ | |
| 45 | efi_rts_work.arg1 = _arg1; \ | |
| 46 | efi_rts_work.arg2 = _arg2; \ | |
| 47 | efi_rts_work.arg3 = _arg3; \ | |
| 48 | -- | |
| 49 | 2.20.1 | |
| 50 |