diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-02-09 21:49:38 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-02-09 21:49:38 +0000 |
| commit | ff879b07996ba2a08ddcc37091c2636f1be8354c (patch) | |
| tree | e7fa82a61c6d010f448cd0eec7231e4c6ba518ee /sys/contrib/dev/acpica/compiler/aslload.c | |
| parent | 778c8dac96279e2aa7f79804c8651591afd93371 (diff) | |
| parent | 04f27355c01cb894338c3382792c0c2b75c86239 (diff) | |
| download | src-ff879b07996ba2a08ddcc37091c2636f1be8354c.tar.gz src-ff879b07996ba2a08ddcc37091c2636f1be8354c.zip | |
MFV: r329072
Merge ACPICA 20180209.
Notes
Notes:
svn path=/head/; revision=329085
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/aslload.c')
| -rw-r--r-- | sys/contrib/dev/acpica/compiler/aslload.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/contrib/dev/acpica/compiler/aslload.c b/sys/contrib/dev/acpica/compiler/aslload.c index c90d58a9fc05..b77a1950aaf9 100644 --- a/sys/contrib/dev/acpica/compiler/aslload.c +++ b/sys/contrib/dev/acpica/compiler/aslload.c @@ -327,8 +327,8 @@ LdLoadFieldElements ( * The name already exists in this scope * But continue processing the elements */ - AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Child, - Child->Asl.Value.String, ASL_MSG_FOUND_HERE, Node->Op, + AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Child, + Child->Asl.Value.String, ASL_MSG_EXTERN_FOUND_HERE, Node->Op, Node->Op->Asl.ExternalName); } } @@ -830,8 +830,8 @@ LdNamespace1Begin ( if (Node->OwnerId == WalkState->OwnerId && !(Node->Flags & IMPLICIT_EXTERNAL)) { - AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op, - Op->Asl.ExternalName, ASL_MSG_FOUND_HERE, Node->Op, + AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Op, + Op->Asl.ExternalName, ASL_MSG_EXTERN_FOUND_HERE, Node->Op, Node->Op->Asl.ExternalName); } if (Node->Flags & IMPLICIT_EXTERNAL) @@ -853,8 +853,8 @@ LdNamespace1Begin ( if (Node->OwnerId == WalkState->OwnerId) { - AslDualParseOpError (ASL_ERROR, ASL_MSG_NAME_EXISTS, Op, - Op->Asl.ExternalName, ASL_MSG_FOUND_HERE, Node->Op, + AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Op, + Op->Asl.ExternalName, ASL_MSG_EXTERN_FOUND_HERE, Node->Op, Node->Op->Asl.ExternalName); } } |