From: "Jan Beulich" <jbeulich@novell.com>
To: <len.brown@intel.com>
Cc: "linux-acpi" <linux-acpi@intel.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] acpi: make __acpi_map_table() and __init function
Date: Thu, 13 Dec 2007 08:33:59 +0000 [thread overview]
Message-ID: <4760FC87.76E4.0078.0@novell.com> (raw)
.. as it it used only during early boot.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
arch/ia64/kernel/acpi.c | 2 +-
arch/x86/kernel/acpi/boot.c | 4 ++--
drivers/acpi/osl.c | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
--- linux-2.6.24-rc5/arch/ia64/kernel/acpi.c 2007-12-12 11:28:03.000000000 +0100
+++ 2.6.24-rc5-acpi-map-table-init/arch/ia64/kernel/acpi.c 2007-12-04 16:09:33.000000000 +0100
@@ -152,7 +152,7 @@ int acpi_request_vector(u32 int_type)
return vector;
}
-char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
+char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
{
return __va(phys_addr);
}
--- linux-2.6.24-rc5/arch/x86/kernel/acpi/boot.c 2007-12-12 11:28:17.000000000 +0100
+++ 2.6.24-rc5-acpi-map-table-init/arch/x86/kernel/acpi/boot.c 2007-12-04 16:09:33.000000000 +0100
@@ -106,7 +106,7 @@ enum acpi_irq_model_id acpi_irq_model =
#ifdef CONFIG_X86_64
/* rely on all ACPI tables being in the direct mapping */
-char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
+char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
{
if (!phys_addr || !size)
return NULL;
@@ -131,7 +131,7 @@ char *__acpi_map_table(unsigned long phy
* from the fixed base. That's why we start at FIX_IO_APIC_BASE_END and
* count idx down while incrementing the phys address.
*/
-char *__acpi_map_table(unsigned long phys, unsigned long size)
+char *__init __acpi_map_table(unsigned long phys, unsigned long size)
{
unsigned long base, offset, mapped_size;
int idx;
--- linux-2.6.24-rc5/drivers/acpi/osl.c 2007-12-12 11:28:21.000000000 +0100
+++ 2.6.24-rc5-acpi-map-table-init/drivers/acpi/osl.c 2007-12-04 16:09:33.000000000 +0100
@@ -211,7 +211,8 @@ acpi_physical_address __init acpi_os_get
return acpi_find_rsdp();
}
-void __iomem *acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
+void __iomem *__init_refok
+acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
{
if (phys > ULONG_MAX) {
printk(KERN_ERR PREFIX "Cannot map memory that high\n");
next reply other threads:[~2007-12-13 8:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-13 8:33 Jan Beulich [this message]
2007-12-13 23:03 ` [PATCH] acpi: make __acpi_map_table() and __init function Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4760FC87.76E4.0078.0@novell.com \
--to=jbeulich@novell.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@intel.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox