SA-12:04 commit on RELENG_8_1 incorrect?

[Robert Simmons]

On Sat, Jun 16, 2012 at 1:57 PM, Steven Chamberlain <steven at pyro.eu.org> wrote:
> Hi,
>
> This was the commit of SA-12:04.sysret to RELENG_7_4, which makes sense
> to me:
>
> http://svnweb.freebsd.org/base/releng/7.4/sys/amd64/amd64/trap.c?r1=216618&r2=236953
>
> But when it was applied to RELENG_8_1, it looks wrong, as if it was
> applied in the wrong place.  The indentation is broken, and the code
> inserted looks like it wouldn't be effective:
>
> http://svnweb.freebsd.org/base/releng/8.1/sys/amd64/amd64/trap.c?revision=236953&view=markup#l965
>
> Please could someone take a look at this and let me know if it was
> really intended.

Looks like the if statement was inserted inside the if statement above
it by accident. where in the other patch the new if statement occurs
before.  Certainly looks incorrect to me.