git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
acpi
/
resources
/
rsmisc.c
diff --git
a/drivers/acpi/resources/rsmisc.c
b/drivers/acpi/resources/rsmisc.c
index
ed866cf
..
faf6e10
100644
(file)
--- a/
drivers/acpi/resources/rsmisc.c
+++ b/
drivers/acpi/resources/rsmisc.c
@@
-81,9
+81,10
@@
acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
u16 item_count = 0;
u16 temp16 = 0;
u16 item_count = 0;
u16 temp16 = 0;
- ACPI_FUNCTION_TRACE(
"rs_get_resource"
);
+ ACPI_FUNCTION_TRACE(
rs_convert_aml_to_resource
);
if (((acpi_native_uint) resource) & 0x3) {
if (((acpi_native_uint) resource) & 0x3) {
+
/* Each internal resource struct is expected to be 32-bit aligned */
ACPI_WARNING((AE_INFO,
/* Each internal resource struct is expected to be 32-bit aligned */
ACPI_WARNING((AE_INFO,
@@
-295,9
+296,11
@@
acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
exit:
if (!flags_mode) {
exit:
if (!flags_mode) {
- /* Round the resource struct length up to the next 32-bit boundary */
- resource->length = ACPI_ROUND_UP_to_32_bITS(resource->length);
+ /* Round the resource struct length up to the next boundary (32 or 64) */
+
+ resource->length =
+ (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(resource->length);
}
return_ACPI_STATUS(AE_OK);
}
}
return_ACPI_STATUS(AE_OK);
}
@@
-329,7
+332,7
@@
acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
u16 temp16 = 0;
u16 item_count = 0;
u16 temp16 = 0;
u16 item_count = 0;
- ACPI_FUNCTION_TRACE(
"rs_convert_resource_to_aml"
);
+ ACPI_FUNCTION_TRACE(
rs_convert_resource_to_aml
);
/*
* First table entry must be ACPI_RSC_INITxxx and must contain the
/*
* First table entry must be ACPI_RSC_INITxxx and must contain the
@@
-535,6
+538,7
@@
if (((aml->irq.flags & 0x09) == 0x00) || ((aml->irq.flags & 0x09) == 0x09)) {
resource->data.extended_irq.interrupt_count = temp8;
if (temp8 < 1) {
resource->data.extended_irq.interrupt_count = temp8;
if (temp8 < 1) {
+
/* Must have at least one IRQ */
return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
/* Must have at least one IRQ */
return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);