Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286488
b: refs/heads/master
c: 6f68c91
h: refs/heads/master
v: v3
  • Loading branch information
Myron Stowe authored and Len Brown committed Jan 17, 2012
1 parent 183413a commit 4b1ca86
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bc9ffce27962c0c5fdc6adf74790ea0fcbe4a99c
refs/heads/master: 6f68c91c55ea3576d366797fa8d45e31c4aa79f8
6 changes: 4 additions & 2 deletions trunk/drivers/acpi/osl.c
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ void __init early_acpi_os_unmap_memory(void __iomem *virt, acpi_size size)
__acpi_unmap_table(virt, size);
}

static int acpi_os_map_generic_address(struct acpi_generic_address *gas)
int acpi_os_map_generic_address(struct acpi_generic_address *gas)
{
u64 addr;
void __iomem *virt;
Expand All @@ -450,8 +450,9 @@ static int acpi_os_map_generic_address(struct acpi_generic_address *gas)

return 0;
}
EXPORT_SYMBOL(acpi_os_map_generic_address);

static void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)
void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)
{
u64 addr;
struct acpi_ioremap *map;
Expand All @@ -475,6 +476,7 @@ static void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)

acpi_os_map_cleanup(map);
}
EXPORT_SYMBOL(acpi_os_unmap_generic_address);

#ifdef ACPI_FUTURE_USAGE
acpi_status
Expand Down
3 changes: 3 additions & 0 deletions trunk/include/linux/acpi_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,

void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);

int acpi_os_map_generic_address(struct acpi_generic_address *addr);
void acpi_os_unmap_generic_address(struct acpi_generic_address *addr);

#endif

0 comments on commit 4b1ca86

Please sign in to comment.