Re: CVS commit: [netbsd-9] src/sys

[Tobias Nygren <tnn%NetBSD.org@localhost>]

On Sun, 8 Mar 2020 10:54:43 +0000
Martin Husemann <martin%netbsd.org@localhost> wrote:

> Pull up following revision(s) (requested by pgoyette in ticket #762):
> cvs rdiff -u -r1.121 -r1.121.2.1 src/sys/arch/amd64/amd64/trap.c

Hi,

Someone reported on IRC that this seems to have become mismerged:

/usr/src/sys/arch/amd64/amd64/trap.c: In function 'trap':
/usr/src/sys/arch/amd64/amd64/trap.c:360:2: error: expected expression before '}' token

1.107     christos  356:
1.121.2.1! martin   357:                MODULE_HOOK_CALL(amd64_oosyscall_hook, (p, frame),
        !           358:                        ENOSYS, hook_ret);
        !           359:                if (hook_ret == 0)
1.107     christos  360:        }
1.116     mrg       361:                /* FALLTHROUGH */