lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'release', 'bugzilla-6217', 'bugzilla-6629', 'bugzilla-6933', 'bugzilla-7186', 'bugzilla-8269', 'bugzilla-8570', 'bugzilla-9139', 'bugzilla-9277', 'bugzilla-9341', 'bugzilla-9444', 'bugzilla-9614', 'bugzilla-9643' and 'bugzilla-9644' into release

Browse Source
This commit is contained in:
Len Brown
2008-02-07 03:09:43 -05:00
parent 8f859016ea a7f9b1f249 b4d2730a0d 37748ebf88 ed9cbcd400 856608ee5e cfaf3747ff 223630fe3d 38531e6fe5 b3b233c7d9 239665a3bb 0119509c4f 975c30257e 0879802950
commit c64768a7d6
19 changed files with 209 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/osl.c
View File

@@ -250,8 +250,12 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
"System description tables not found\n");
return 0;
}
} else
return acpi_find_rsdp();
} else {
acpi_physical_address pa = 0;
acpi_find_root_pointer(&pa);
return pa;
}
}
void __iomem *acpi_os_map_memory(acpi_physical_address phys, acpi_size size)