diff options
author | Jan Beulich <jbeulich@novell.com> | 2007-12-13 03:33:59 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-12-13 17:17:50 -0500 |
commit | 2fdf07417e57136cf6baedf9508e2169a059ebea (patch) | |
tree | c413d5b49684f9320825405b002b129766e6aa17 /arch | |
parent | da8cadb31b82c9d41fc593c8deab6aa20b162d6b (diff) |
acpi: make __acpi_map_table() and __init function
.. 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(-)
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 00b5d08f6da8..f932c486836a 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -152,7 +152,7 @@ int acpi_request_vector(u32 int_type) | |||
152 | return vector; | 152 | return vector; |
153 | } | 153 | } |
154 | 154 | ||
155 | char *__acpi_map_table(unsigned long phys_addr, unsigned long size) | 155 | char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size) |
156 | { | 156 | { |
157 | return __va(phys_addr); | 157 | return __va(phys_addr); |
158 | } | 158 | } |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 0ca27c7b0e8d..b595522dd799 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -106,7 +106,7 @@ enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; | |||
106 | #ifdef CONFIG_X86_64 | 106 | #ifdef CONFIG_X86_64 |
107 | 107 | ||
108 | /* rely on all ACPI tables being in the direct mapping */ | 108 | /* rely on all ACPI tables being in the direct mapping */ |
109 | char *__acpi_map_table(unsigned long phys_addr, unsigned long size) | 109 | char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size) |
110 | { | 110 | { |
111 | if (!phys_addr || !size) | 111 | if (!phys_addr || !size) |
112 | return NULL; | 112 | return NULL; |
@@ -131,7 +131,7 @@ char *__acpi_map_table(unsigned long phys_addr, unsigned long size) | |||
131 | * from the fixed base. That's why we start at FIX_IO_APIC_BASE_END and | 131 | * from the fixed base. That's why we start at FIX_IO_APIC_BASE_END and |
132 | * count idx down while incrementing the phys address. | 132 | * count idx down while incrementing the phys address. |
133 | */ | 133 | */ |
134 | char *__acpi_map_table(unsigned long phys, unsigned long size) | 134 | char *__init __acpi_map_table(unsigned long phys, unsigned long size) |
135 | { | 135 | { |
136 | unsigned long base, offset, mapped_size; | 136 | unsigned long base, offset, mapped_size; |
137 | int idx; | 137 | int idx; |