diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpiosxf.h | 4 | ||||
-rw-r--r-- | include/linux/acpi.h | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index ca882b8e7d10..c082c7de88a0 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
@@ -239,8 +239,8 @@ acpi_status acpi_os_validate_interface(char *interface); | |||
239 | acpi_status acpi_osi_invalidate(char* interface); | 239 | acpi_status acpi_osi_invalidate(char* interface); |
240 | 240 | ||
241 | acpi_status | 241 | acpi_status |
242 | acpi_os_validate_address(u8 space_id, | 242 | acpi_os_validate_address(u8 space_id, acpi_physical_address address, |
243 | acpi_physical_address address, acpi_size length); | 243 | acpi_size length, char *name); |
244 | 244 | ||
245 | u64 acpi_os_get_timer(void); | 245 | u64 acpi_os_get_timer(void); |
246 | 246 | ||
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 63f2e6ed698f..893f90a5dea9 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -217,6 +217,11 @@ extern int pnpacpi_disabled; | |||
217 | #define PXM_INVAL (-1) | 217 | #define PXM_INVAL (-1) |
218 | #define NID_INVAL (-1) | 218 | #define NID_INVAL (-1) |
219 | 219 | ||
220 | int acpi_check_region(resource_size_t start, resource_size_t n, | ||
221 | const char *name); | ||
222 | int acpi_check_mem_region(resource_size_t start, resource_size_t n, | ||
223 | const char *name); | ||
224 | |||
220 | #else /* CONFIG_ACPI */ | 225 | #else /* CONFIG_ACPI */ |
221 | 226 | ||
222 | static inline int acpi_boot_init(void) | 227 | static inline int acpi_boot_init(void) |
@@ -229,5 +234,17 @@ static inline int acpi_boot_table_init(void) | |||
229 | return 0; | 234 | return 0; |
230 | } | 235 | } |
231 | 236 | ||
237 | static inline int acpi_check_region(resource_size_t start, resource_size_t n, | ||
238 | const char *name) | ||
239 | { | ||
240 | return 0; | ||
241 | } | ||
242 | |||
243 | static inline int acpi_check_mem_region(resource_size_t start, | ||
244 | resource_size_t n, const char *name) | ||
245 | { | ||
246 | return 0; | ||
247 | } | ||
248 | |||
232 | #endif /* !CONFIG_ACPI */ | 249 | #endif /* !CONFIG_ACPI */ |
233 | #endif /*_LINUX_ACPI_H*/ | 250 | #endif /*_LINUX_ACPI_H*/ |