Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1332986

[PATCH v2 2/9] ACPI: Change __init to __ref for early_acpi_os_unmap_memory()

Show all headers | View raw

early_acpi_os_unmap_memory() is marked as __init because it calls
__acpi_unmap_table(), but only when acpi_gbl_permanent_mmap is not set.

acpi_gbl_permanent_mmap is set in __init acpi_early_init()
so it is safe to call early_acpi_os_unmap_memory() from anywhere

We need this function to be non-__init because we need access to
some tables at unpredictable time--it may be before or after
acpi_gbl_permanent_mmap is set.  For example, SPCR (Serial Port Console
Redirection) table is needed each time a new console is registered.
It can be quite early (console_initcall) or when a module is inserted.
When this table accessed before acpi_gbl_permanent_mmap is set,
the pointer should be unmapped.  This is exactly what this function
does.

Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
---
 drivers/acpi/osl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 67da6fb..8a552cd 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -497,7 +497,11 @@ void __ref acpi_os_unmap_memory(void *virt, acpi_size size)
 }
 EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);
 
-void __init early_acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
+/*
+ * acpi_gbl_permanent_mmap is set in __init acpi_early_init()
+ * so it is safe to call early_acpi_os_unmap_memory() from anywhere
+ */
+void __ref early_acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
 {
 	if (!acpi_gbl_permanent_mmap)
 		__acpi_unmap_table(virt, size);
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] ACPI: parse the SPCR table Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-12 18:50 +0100
  [PATCH v2 6/9] ACPI: add definition of DBG2 subtypes Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-12 18:50 +0100
    RE: [PATCH v2 6/9] ACPI: add definition of DBG2 subtypes "Moore, Robert" <robert.moore@intel.com> - 2016-02-12 23:50 +0100
  [PATCH v2 1/9] printk: fix name and type of some variables Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-12 18:50 +0100
  [PATCH v2 5/9] ACPI: enable ACPI_SPCR_TABLE on ARM64 Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-12 19:00 +0100
  [PATCH v2 4/9] ACPI: parse SPCR and enable matching console Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-12 19:00 +0100
    Re: [PATCH v2 4/9] ACPI: parse SPCR and enable matching console Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-12 20:00 +0100
  [PATCH v2 3/9] ACPI: introduce acpi_table_parse2() Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-12 19:00 +0100
    Re: [PATCH v2 3/9] ACPI: introduce acpi_table_parse2() kbuild test robot <lkp@intel.com> - 2016-02-12 19:50 +0100
    Re: [PATCH v2 3/9] ACPI: introduce acpi_table_parse2() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-12 20:00 +0100
      Re: [PATCH v2 3/9] ACPI: introduce acpi_table_parse2() "Rafael J. Wysocki" <rafael@kernel.org> - 2016-02-13 00:10 +0100
        Re: [PATCH v2 3/9] ACPI: introduce acpi_table_parse2() Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-15 14:10 +0100
    Re: [PATCH v2 3/9] ACPI: introduce acpi_table_parse2() "Rafael J. Wysocki" <rafael@kernel.org> - 2016-02-13 00:10 +0100
      Re: [PATCH v2 3/9] ACPI: introduce acpi_table_parse2() Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-15 14:00 +0100
  [PATCH v2 2/9] ACPI: Change __init to __ref for early_acpi_os_unmap_memory() Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-12 19:00 +0100
  [PATCH v2 7/9] serial: pl011: add acpi_match Aleksey Makarov <aleksey.makarov@linaro.org> - 2016-02-12 19:00 +0100

csiph-web