svn commit: r332039 - stable/10/sys/compat/linux

[Ed Maste]

Author: emaste
Date: Wed Apr  4 17:45:05 2018
New Revision: 332039
URL: https://svnweb.freebsd.org/changeset/base/332039

Log:
  Fix build: correct variable names on stable/10
  
  r332032 merged r330356 from HEAD but did not account for a renamed
  variable (of a different type) between stable/10 and HEAD.  Further
  fix to r332036.

Modified:
  stable/10/sys/compat/linux/linux_ipc.c

Modified: stable/10/sys/compat/linux/linux_ipc.c
==============================================================================
--- stable/10/sys/compat/linux/linux_ipc.c	Wed Apr  4 17:00:18 2018	(r332038)
+++ stable/10/sys/compat/linux/linux_ipc.c	Wed Apr  4 17:45:05 2018	(r332039)
@@ -664,7 +664,7 @@ linux_msgctl(struct thread *td, struct linux_msgctl_ar
 	struct l_msqid_ds linux_msqid;
 	struct msqid_ds bsd_msqid;
 
-	memset(&linux_msqid64, 0, sizeof(linux_msqid64));
+	memset(&linux_msqid, 0, sizeof(linux_msqid));
 
 	bsd_cmd = args->cmd & ~LINUX_IPC_64;
 	switch (bsd_cmd) {
@@ -796,8 +796,8 @@ linux_shmctl(struct thread *td, struct linux_shmctl_ar
 	int error;
 
 	memset(&linux_shm_info, 0, sizeof(linux_shm_info));
-	memset(&linux_shmid64, 0, sizeof(linux_shmid64));
-	memset(&linux_shminfo64, 0, sizeof(linux_shminfo64));
+	memset(&linux_shmid, 0, sizeof(linux_shmid));
+	memset(&linux_shminfo, 0, sizeof(linux_shminfo));
 
 	switch (args->cmd & ~LINUX_IPC_64) {