[PATCH] acpi: add some missing section markers

[PATCH] acpi: add some missing section markers

[Jeremy Fitzhardinge]

early_acpi_os_unmap_memory() is an __init function, and
acpi_os_unmap_memory() is allowed to access an __init function
until acpi_gbl_permanent_mmap is set up.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index d1dd516..dd6f249 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -272,7 +272,7 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 }
 EXPORT_SYMBOL_GPL(acpi_os_map_memory);
 
-void acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
+void __ref acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
 {
 	if (acpi_gbl_permanent_mmap)
 		iounmap(virt);
@@ -281,7 +281,7 @@ void acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
 }
 EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);
 
-void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
+void __init early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
 {
 	if (!acpi_gbl_permanent_mmap)
 		__acpi_unmap_table(virt, size);

Re: [PATCH] acpi: add some missing section markers

[Ingo Molnar]

* Jeremy Fitzhardinge <jeremy@goop.org> wrote:

> early_acpi_os_unmap_memory() is an __init function, and 
> acpi_os_unmap_memory() is allowed to access an __init function 
> until acpi_gbl_permanent_mmap is set up.
>
> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

Note, this is modified by tip:x86/acpi, so if Len applies it to 
the ACPI tree we'll generate conflicts. Since the problem itself 
has been generated by the 6 commits in tip:x86/acpi, if Len is 
fine with it i'd like to apply your fix there.

	Ingo

Re: [PATCH] acpi: add some missing section markers

[Jeremy Fitzhardinge]

Ingo Molnar wrote:
> * Jeremy Fitzhardinge <jeremy@goop.org> wrote:
>
>   
>> early_acpi_os_unmap_memory() is an __init function, and 
>> acpi_os_unmap_memory() is allowed to access an __init function 
>> until acpi_gbl_permanent_mmap is set up.
>>
>> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
>>     
>
> Note, this is modified by tip:x86/acpi, so if Len applies it to 
> the ACPI tree we'll generate conflicts. Since the problem itself 
> has been generated by the 6 commits in tip:x86/acpi, if Len is 
> fine with it i'd like to apply your fix there.

Sorry, I'd forgotten what path those patches were taking;  I just 
blindly applied the "ACPI=Len" pattern.

    J

Re: [PATCH] acpi: add some missing section markers

[Ingo Molnar]

* Jeremy Fitzhardinge <jeremy@goop.org> wrote:

> Ingo Molnar wrote:
>> * Jeremy Fitzhardinge <jeremy@goop.org> wrote:
>>
>>   
>>> early_acpi_os_unmap_memory() is an __init function, and  
>>> acpi_os_unmap_memory() is allowed to access an __init function until 
>>> acpi_gbl_permanent_mmap is set up.
>>>
>>> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
>>>     
>>
>> Note, this is modified by tip:x86/acpi, so if Len applies it to the 
>> ACPI tree we'll generate conflicts. Since the problem itself has been 
>> generated by the 6 commits in tip:x86/acpi, if Len is fine with it i'd 
>> like to apply your fix there.
>
> Sorry, I'd forgotten what path those patches were taking; I 
> just blindly applied the "ACPI=Len" pattern.

That was the correct pattern to apply in any case, as it 
modifies drivers/acpi/.

	Ingo