mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
[ACPI] acpi_memhotplug.c build fix
drivers/acpi/acpi_memhotplug.c: In function `acpi_memory_get_device_resources': drivers/acpi/acpi_memhotplug.c:101: error: structure has no member named `attribute' drivers/acpi/acpi_memhotplug.c:103: error: structure has no member named `attribute' drivers/acpi/acpi_memhotplug.c: In function `acpi_memory_disable_device': drivers/acpi/acpi_memhotplug.c:253: warning: unused variable `attr' Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
ed03f430cd
commit
3963f00831
1 changed files with 6 additions and 7 deletions
|
@ -71,8 +71,8 @@ static struct acpi_driver acpi_memory_device_driver = {
|
|||
struct acpi_memory_device {
|
||||
acpi_handle handle;
|
||||
unsigned int state; /* State of the memory device */
|
||||
unsigned short cache_attribute; /* memory cache attribute */
|
||||
unsigned short read_write_attribute; /* memory read/write attribute */
|
||||
unsigned short caching; /* memory cache attribute */
|
||||
unsigned short write_protect; /* memory read/write attribute */
|
||||
u64 start_addr; /* Memory Range start physical addr */
|
||||
u64 end_addr; /* Memory Range end physical addr */
|
||||
};
|
||||
|
@ -97,10 +97,10 @@ acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
|
|||
if (ACPI_SUCCESS(status)) {
|
||||
if (address64.resource_type == ACPI_MEMORY_RANGE) {
|
||||
/* Populate the structure */
|
||||
mem_device->cache_attribute =
|
||||
address64.attribute.memory.cache_attribute;
|
||||
mem_device->read_write_attribute =
|
||||
address64.attribute.memory.read_write_attribute;
|
||||
mem_device->caching =
|
||||
address64.info.mem.caching;
|
||||
mem_device->write_protect =
|
||||
address64.info.mem.write_protect;
|
||||
mem_device->start_addr = address64.minimum;
|
||||
mem_device->end_addr = address64.maximum;
|
||||
}
|
||||
|
@ -250,7 +250,6 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device)
|
|||
int result;
|
||||
u64 start = mem_device->start_addr;
|
||||
u64 len = mem_device->end_addr - start + 1;
|
||||
unsigned long attr = mem_device->read_write_attribute;
|
||||
|
||||
ACPI_FUNCTION_TRACE("acpi_memory_disable_device");
|
||||
|
||||
|
|
Loading…
Reference in a new issue