diff options
| author | Dan McDonald <danmcd@joyent.com> | 2018-04-10 12:01:06 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-04-10 12:01:06 -0400 |
| commit | 139ef88f7450e3f31a633bfb9428cbdc881bee74 (patch) | |
| tree | 217d5a43e40a334ff59e7a928eca17e33159a138 | |
| parent | 5f633405e54baecc905f42c59f8fc7aaca7a7c05 (diff) | |
| download | illumos-joyent-139ef88f7450e3f31a633bfb9428cbdc881bee74.tar.gz | |
8956 Implement KPTI (fix cstyle)
| -rw-r--r-- | usr/src/uts/i86pc/os/intr.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/uts/i86pc/os/intr.c b/usr/src/uts/i86pc/os/intr.c index 36ec2e4945..f66f0e69e8 100644 --- a/usr/src/uts/i86pc/os/intr.c +++ b/usr/src/uts/i86pc/os/intr.c @@ -473,17 +473,17 @@ #if defined(__amd64) && !defined(__xpv) /* If this fails, then the padding numbers in machcpuvar.h are wrong. */ -CTASSERT((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_pad)) - < MMU_PAGESIZE); -CTASSERT((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_kpti)) - >= MMU_PAGESIZE); -CTASSERT((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_kpti_dbg)) - < 2 * MMU_PAGESIZE); -CTASSERT((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_pad2)) - < 2 * MMU_PAGESIZE); +CTASSERT((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_pad)) < + MMU_PAGESIZE); +CTASSERT((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_kpti)) >= + MMU_PAGESIZE); +CTASSERT((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_kpti_dbg)) < + 2 * MMU_PAGESIZE); +CTASSERT((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_pad2)) < + 2 * MMU_PAGESIZE); CTASSERT(((sizeof (struct kpti_frame)) & 0xF) == 0); -CTASSERT(((offsetof(cpu_t, cpu_m) + offsetof(struct machcpu, mcpu_kpti_dbg)) - & 0xF) == 0); +CTASSERT(((offsetof(cpu_t, cpu_m) + + offsetof(struct machcpu, mcpu_kpti_dbg)) & 0xF) == 0); CTASSERT((offsetof(struct kpti_frame, kf_tr_rsp) & 0xF) == 0); #endif |