Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3963f00831bc01f509c7dc38d050505fca64f67d

Authored by KAMEZAWA Hiroyuki
Committed by Len Brown
1 parent ed03f430cd
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 6 additions and 7 deletions Side-by-side Diff

drivers/acpi/acpi_memhotplug.c
Diff comments   View file @ 3963f00
... ... @@ -71,8 +71,8 @@
71 71 struct acpi_memory_device {
72 72 acpi_handle handle;
73 73 unsigned int state; /* State of the memory device */
74   - unsigned short cache_attribute; /* memory cache attribute */
75   - unsigned short read_write_attribute; /* memory read/write attribute */
  74 + unsigned short caching; /* memory cache attribute */
  75 + unsigned short write_protect; /* memory read/write attribute */
76 76 u64 start_addr; /* Memory Range start physical addr */
77 77 u64 end_addr; /* Memory Range end physical addr */
78 78 };
... ... @@ -97,10 +97,10 @@
97 97 if (ACPI_SUCCESS(status)) {
98 98 if (address64.resource_type == ACPI_MEMORY_RANGE) {
99 99 /* Populate the structure */
100   - mem_device->cache_attribute =
101   - address64.attribute.memory.cache_attribute;
102   - mem_device->read_write_attribute =
103   - address64.attribute.memory.read_write_attribute;
  100 + mem_device->caching =
  101 + address64.info.mem.caching;
  102 + mem_device->write_protect =
  103 + address64.info.mem.write_protect;
104 104 mem_device->start_addr = address64.minimum;
105 105 mem_device->end_addr = address64.maximum;
106 106 }
... ... @@ -250,7 +250,6 @@
250 250 int result;
251 251 u64 start = mem_device->start_addr;
252 252 u64 len = mem_device->end_addr - start + 1;
253   - unsigned long attr = mem_device->read_write_attribute;
254 253  
255 254 ACPI_FUNCTION_TRACE("acpi_memory_disable_device");
256 255