FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-11 11:56:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pull address_range into release branch

Browse Source
This commit is contained in:
Len Brown 2006-06-15 15:34:42 -04:00
commit 59f720eb5a
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/acpi/acpi_memhotplug.c
View File

@ -74,7 +74,7 @@ struct acpi_memory_device {
unsigned short caching; /* memory cache attribute */ unsigned short caching; /* memory cache attribute */
unsigned short write_protect; /* memory read/write attribute */ unsigned short write_protect; /* memory read/write attribute */
u64 start_addr; /* Memory Range start physical addr */ u64 start_addr; /* Memory Range start physical addr */
u64 end_addr; /* Memory Range end physical addr */ u64 length; /* Memory Range length */
}; };
static int static int
@ -97,12 +97,11 @@ acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
if (ACPI_SUCCESS(status)) { if (ACPI_SUCCESS(status)) {
if (address64.resource_type == ACPI_MEMORY_RANGE) { if (address64.resource_type == ACPI_MEMORY_RANGE) {
/* Populate the structure */ /* Populate the structure */
mem_device->caching = mem_device->caching = address64.info.mem.caching;
address64.info.mem.caching;
mem_device->write_protect = mem_device->write_protect =
address64.info.mem.write_protect; address64.info.mem.write_protect;
mem_device->start_addr = address64.minimum; mem_device->start_addr = address64.minimum;
mem_device->end_addr = address64.maximum; mem_device->length = address64.address_length;
} }
} }
@ -199,8 +198,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
* Tell the VM there is more memory here... * Tell the VM there is more memory here...
* Note: Assume that this function returns zero on success * Note: Assume that this function returns zero on success
*/ */
result = add_memory(mem_device->start_addr, result = add_memory(mem_device->start_addr, mem_device->length);
(mem_device->end_addr - mem_device->start_addr) + 1);
if (result) { if (result) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "\nadd_memory failed\n")); ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "\nadd_memory failed\n"));
mem_device->state = MEMORY_INVALID_STATE; mem_device->state = MEMORY_INVALID_STATE;
@ -249,7 +247,7 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device)
{ {
int result; int result;
u64 start = mem_device->start_addr; u64 start = mem_device->start_addr;
u64 len = mem_device->end_addr - start + 1; u64 len = mem_device->length;
ACPI_FUNCTION_TRACE("acpi_memory_disable_device"); ACPI_FUNCTION_TRACE("acpi_memory_disable_device");

5
drivers/char/hpet.c
View File

@ -925,11 +925,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
status = acpi_resource_to_address64(res, &addr); status = acpi_resource_to_address64(res, &addr);
if (ACPI_SUCCESS(status)) { if (ACPI_SUCCESS(status)) {
unsigned long size;
size = addr.maximum - addr.minimum + 1;
hdp->hd_phys_address = addr.minimum; hdp->hd_phys_address = addr.minimum;
hdp->hd_address = ioremap(addr.minimum, size); hdp->hd_address = ioremap(addr.minimum, addr.address_length);
if (hpet_is_known(hdp)) { if (hpet_is_known(hdp)) {
printk(KERN_DEBUG "%s: 0x%lx is busy\n", printk(KERN_DEBUG "%s: 0x%lx is busy\n",