]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Use NLDT to get number of LDTs on i386
authorDimitry Andric <dim@FreeBSD.org>
Mon, 4 Feb 2019 18:07:03 +0000 (18:07 +0000)
committerDimitry Andric <dim@FreeBSD.org>
Mon, 4 Feb 2019 18:07:03 +0000 (18:07 +0000)
commit0f166953f72731daca1ddf8311d6e828723ff062
tree8d524ad54d89ebcef230b78e072d7f191af10440
parent2d01f2dee3186137a7cff88d2aa5ee0e7a84e93a
Use NLDT to get number of LDTs on i386

Compiling a GENERIC kernel for i386 with clang 8.0 results in the
following warning:

/usr/src/sys/i386/i386/sys_machdep.c:542:40: error: 'sizeof ((ldt))' will return the size of the pointer, not the array itself [-Werror,-Wsizeof-pointer-div]
        nldt = pldt != NULL ? pldt->ldt_len : nitems(ldt);
                                              ^~~~~~~~~~~
/usr/src/sys/sys/param.h:299:32: note: expanded from macro 'nitems'
#define nitems(x)       (sizeof((x)) / sizeof((x)[0]))
                         ~~~~~~~~~~~ ^

Indeed, 'ldt' is declared as 'union descriptor *', so nitems() is not
the right way to determine the number of LDTs.  Instead, the NLDT define
from sys/x86/include/segments.h should be used.

Reviewed by: kib
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D19074
sys/i386/i386/sys_machdep.c