svn commit: r333700 - head/sys/sys

[Matt Macy]

Author: mmacy
Date: Thu May 17 02:54:30 2018
New Revision: 333700
URL: https://svnweb.freebsd.org/changeset/base/333700

Log:
  Fix i386 build
  
  Move epoch_section to after td_emuldata, but note the 3 surrounding LP64 holes
  while I'm here.
  
  Approved by:	sbruno

Modified:
  head/sys/sys/proc.h

Modified: head/sys/sys/proc.h
==============================================================================
--- head/sys/sys/proc.h	Thu May 17 02:46:27 2018	(r333699)
+++ head/sys/sys/proc.h	Thu May 17 02:54:30 2018	(r333700)
@@ -347,6 +347,7 @@ struct thread {
 	} td_uretoff;			/* (k) Syscall aux returns. */
 #define td_retval	td_uretoff.tdu_retval
 	u_int		td_cowgen;	/* (k) Generation of COW pointers. */
+	/* LP64 hole */
 	struct callout	td_slpcallout;	/* (h) Callout for sleep. */
 	struct trapframe *td_frame;	/* (k) */
 	struct vm_object *td_kstack_obj;/* (a) Kstack object. */
@@ -358,18 +359,20 @@ struct thread {
 	struct lpohead	td_lprof[2];	/* (a) lock profiling objects. */
 	struct kdtrace_thread	*td_dtrace; /* (*) DTrace-specific data. */
 	int		td_errno;	/* Error returned by last syscall. */
+	/* LP64 hole */
 	struct vnet	*td_vnet;	/* (k) Effective vnet. */
 	const char	*td_vnet_lpush;	/* (k) Debugging vnet push / pop. */
 	struct trapframe *td_intr_frame;/* (k) Frame of the current irq */
 	struct proc	*td_rfppwait_p;	/* (k) The vforked child */
 	struct vm_page	**td_ma;	/* (k) uio pages held */
 	int		td_ma_cnt;	/* (k) size of *td_ma */
-	epoch_section_t td_epoch_section; /* (t) epoch section object */
+	/* LP64 hole */
 	void		*td_emuldata;	/* Emulator state data */
 	int		td_lastcpu;	/* (t) Last cpu we were on. */
 	int		td_oncpu;	/* (t) Which cpu we are on. */
 	void		*td_lkpi_task;	/* LinuxKPI task struct pointer */
 	TAILQ_ENTRY(thread) td_epochq;	/* (t) Epoch queue. */
+	epoch_section_t td_epoch_section; /* (t) epoch section object */
 };
 
 struct thread0_storage {