Sun Oct 9 14:06:11 2016 UTC ()
PR/51540: Henning Petersen: replace , with ;


(christos)
diff -r1.1.1.8 -r1.2 src/sys/external/bsd/acpica/dist/compiler/aslopt.c

cvs diff -r1.1.1.8 -r1.2 src/sys/external/bsd/acpica/dist/compiler/aslopt.c (expand / switch to unified diff)

--- src/sys/external/bsd/acpica/dist/compiler/aslopt.c 2016/05/04 18:15:55 1.1.1.8
+++ src/sys/external/bsd/acpica/dist/compiler/aslopt.c 2016/10/09 14:06:11 1.2
@@ -123,27 +123,27 @@ OptSearchToRoot ( @@ -123,27 +123,27 @@ OptSearchToRoot (
123 123
124 124
125 ACPI_FUNCTION_NAME (OptSearchToRoot); 125 ACPI_FUNCTION_NAME (OptSearchToRoot);
126 126
127 127
128 /* 128 /*
129 * Check if search-to-root can be utilized. Use the last NameSeg of 129 * Check if search-to-root can be utilized. Use the last NameSeg of
130 * the NamePath and 1) See if can be found and 2) If found, make 130 * the NamePath and 1) See if can be found and 2) If found, make
131 * sure that it is the same node that we want. If there is another 131 * sure that it is the same node that we want. If there is another
132 * name in the search path before the one we want, the nodes will 132 * name in the search path before the one we want, the nodes will
133 * not match, and we cannot use this optimization. 133 * not match, and we cannot use this optimization.
134 */ 134 */
135 Path = &(((char *) TargetPath->Pointer)[ 135 Path = &(((char *) TargetPath->Pointer)[
136 TargetPath->Length - ACPI_NAME_SIZE]), 136 TargetPath->Length - ACPI_NAME_SIZE]);
137 ScopeInfo.Scope.Node = CurrentNode; 137 ScopeInfo.Scope.Node = CurrentNode;
138 138
139 /* Lookup the NameSeg using SEARCH_PARENT (search-to-root) */ 139 /* Lookup the NameSeg using SEARCH_PARENT (search-to-root) */
140 140
141 Status = AcpiNsLookup (&ScopeInfo, Path, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE, 141 Status = AcpiNsLookup (&ScopeInfo, Path, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
142 ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, 142 ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
143 WalkState, &(Node)); 143 WalkState, &(Node));
144 if (ACPI_FAILURE (Status)) 144 if (ACPI_FAILURE (Status))
145 { 145 {
146 return (Status); 146 return (Status);
147 } 147 }
148 148
149 /* 149 /*