git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh...
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
excreate.c
diff --git
a/drivers/acpi/acpica/excreate.c
b/drivers/acpi/acpica/excreate.c
index
3c61b48
..
e7b372d
100644
(file)
--- a/
drivers/acpi/acpica/excreate.c
+++ b/
drivers/acpi/acpica/excreate.c
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 201
0
, Intel Corp.
+ * Copyright (C) 2000 - 201
1
, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-482,13
+482,11
@@
acpi_ex_create_method(u8 * aml_start,
obj_desc->method.aml_length = aml_length;
/*
obj_desc->method.aml_length = aml_length;
/*
- * Disassemble the method flags. Split off the
Arg Count
- * f
or efficiency
+ * Disassemble the method flags. Split off the
arg_count, Serialized
+ * f
lag, and sync_level for efficiency.
*/
method_flags = (u8) operand[1]->integer.value;
*/
method_flags = (u8) operand[1]->integer.value;
- obj_desc->method.method_flags =
- (u8) (method_flags & ~AML_METHOD_ARG_COUNT);
obj_desc->method.param_count =
(u8) (method_flags & AML_METHOD_ARG_COUNT);
obj_desc->method.param_count =
(u8) (method_flags & AML_METHOD_ARG_COUNT);
@@
-497,6
+495,8
@@
acpi_ex_create_method(u8 * aml_start,
* created for this method when it is parsed.
*/
if (method_flags & AML_METHOD_SERIALIZED) {
* created for this method when it is parsed.
*/
if (method_flags & AML_METHOD_SERIALIZED) {
+ obj_desc->method.info_flags = ACPI_METHOD_SERIALIZED;
+
/*
* ACPI 1.0: sync_level = 0
* ACPI 2.0: sync_level = sync_level in method declaration
/*
* ACPI 1.0: sync_level = 0
* ACPI 2.0: sync_level = sync_level in method declaration