Skip to contentSkip to conversation

x86, acpi: Correct out-of-date comment of __acpi_map_table

PATCH New Zhang Yanfei 2 participants 2 messages Jul 23, 2013 – Jul 27, 2013

Subsystems (2)
x86 ACPI
lore
Share & tools
lore

Zhang Yanfei

author
#0 lore raw

PATCH v2 1/1 x86, acpi: Correct out-of-date comment of __acpi_map_table

From: Zhang Yanfei <[email protected]>

The implementation of function __acpi_map_table() has been changed long time ago, and now it directly invokes early_ioremap() to setup the temporarily acpi table mappings. So correct its out-of-date comment.

Signed-off-by Zhang Yanfei <[email protected]>

---
-v2: Replace the comment with a simple correct one instead of removing
it -- suggested by Ingo

---
 arch/x86/kernel/acpi/boot.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
arch/x86/kernel/acpi/boot.c +3 -10
index 2627a81..c7f61cf 100644
@@ -141,16 +141,8 @@ static u32 irq_to_gsi(int irq)
 }
 
 /*
- * Temporarily use the virtual area starting from FIX_IO_APIC_BASE_END,
- * to map the target physical address. The problem is that set_fixmap()
- * provides a single page, and it is possible that the page is not
- * sufficient.
- * By using this area, we can map up to MAX_IO_APICS pages temporarily,
- * i.e. until the next __va_range() call.
- *
- * Important Safety Note:  The fixed I/O APIC page numbers are *subtracted*
- * from the fixed base.  That's why we start at FIX_IO_APIC_BASE_END and
- * count idx down while incrementing the phys address.
+ * This is just a simple wrapper around early_ioremap(),
+ * with sanity checks for phys == 0 and size == 0.
  */
 char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 {

@@ -160,6 +152,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 
 	return early_ioremap(phys, size);
 }
+
 void __init __acpi_unmap_table(char *map, unsigned long size)
 {
 	if (!map || !size)
Signature · 1 line
1.7.1
merge bot
#1 lore raw

[tip:x86/platform] x86/acpi: Correct out-of-date comment of __acpi_map_table()

x86/acpi: Correct out-of-date comment of __acpi_map_table()
Commit-ID:  45f1330af6819b348fbac89e69d59d8129d61960
Gitweb:     http://git.kernel.org/tip/45f1330af6819b348fbac89e69d59d8129d61960
Author:     Zhang Yanfei <[email protected]>
AuthorDate: Tue, 23 Jul 2013 21:03:24 +0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 26 Jul 2013 22:12:36 +0200

x86/acpi: Correct out-of-date comment of __acpi_map_table()

The implementation of function __acpi_map_table() has been changed long time ago, and now it directly invokes early_ioremap() to setup the temporarily acpi table mappings.

So correct its out-of-date comment.

Signed-off-by Zhang Yanfei <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/kernel/acpi/boot.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
arch/x86/kernel/acpi/boot.c +3 -10
index 2627a81..c7f61cf 100644
@@ -141,16 +141,8 @@ static u32 irq_to_gsi(int irq)
 }
 
 /*
- * Temporarily use the virtual area starting from FIX_IO_APIC_BASE_END,
- * to map the target physical address. The problem is that set_fixmap()
- * provides a single page, and it is possible that the page is not
- * sufficient.
- * By using this area, we can map up to MAX_IO_APICS pages temporarily,
- * i.e. until the next __va_range() call.
- *
- * Important Safety Note:  The fixed I/O APIC page numbers are *subtracted*
- * from the fixed base.  That's why we start at FIX_IO_APIC_BASE_END and
- * count idx down while incrementing the phys address.
+ * This is just a simple wrapper around early_ioremap(),
+ * with sanity checks for phys == 0 and size == 0.
  */
 char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 {

@@ -160,6 +152,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 
 	return early_ioremap(phys, size);
 }
+
 void __init __acpi_unmap_table(char *map, unsigned long size)
 {
 	if (!map || !size)