[LV-kern-commit] CVS: kernel-2.4/include/asm-vax processor.h,1.4,1.5 pcb.h,1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv12736

Modified Files:
	processor.h pcb.h 
Log Message:
Changes to clear alpha port cruft from thread_struct and to re-define the
INIT_THREAD and INIT_PCB macros. 


Index: processor.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/processor.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** processor.h	2001/01/20 22:00:20	1.4
--- processor.h	2001/01/22 16:46:55	1.5
***************
*** 51,86 ****
  /* From alpha port: FIXME: this needs sorting. */
  /* I doubt we need flags ?(alpha specific) or fs */
  struct thread_struct {
          struct vax_pcb pcb;
- 	/*
- 	 * The fields below are Linux-specific:
- 	 *
- 	 * bit 1..5: IEEE_TRAP_ENABLE bits (see fpu.h)
- 	 * bit 6..8: UAC bits (see sysinfo.h)
- 	 * bit 17..21: IEEE_STATUS_MASK bits (see fpu.h)
- 	 * bit 63: die_if_kernel recursion lock
- 	 */
- 	unsigned long flags;
- 
- 	/* Perform syscall argument validation (get/set_fs). */
- 	mm_segment_t fs;
- 
- 	/* Breakpoint handling for ptrace.  */
- 	unsigned long bpt_addr[2];
- 	unsigned int bpt_insn[2];
- 	int bpt_nsaved;
  };
  
! /* FIXME: */
! #define INIT_THREAD { (struct pt_regs *) 0,                       \
!                     { 0,{{0},{0},{0},{0},{0},{0},{0},{0},{0},{0}, \
! 			    {0},{0},{0},{0},{0},{0}}},            \
!                      0, 0,                                        \
!                     sizeof(init_stack) + (__u32) &init_stack,     \
!               (__pa((__u32) &swapper_pg_dir[0]) + _SEGMENT_TABLE),\
!                      0,0,0,                                       \
!                      (mm_segment_t) { 0,1},                       \
!                      (per_struct) {{{{0,}}},0,0,0,0,{{0,}}}       \
! }
  
  /* FIXME: tune this to the VAX memory map */
--- 51,64 ----
  /* From alpha port: FIXME: this needs sorting. */
  /* I doubt we need flags ?(alpha specific) or fs */
+ /*  atp Jan 2000 - I'm going to restrict this to 
+  *  		   just the pcb at present. As we need
+  *                 more per-thread data, we can add it. 
+  */
  struct thread_struct {
          struct vax_pcb pcb;
  };
  
! /* At present only the pcb is here. */
! #define INIT_THREAD { INIT_PCB } 
  
  /* FIXME: tune this to the VAX memory map */

Index: pcb.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/pcb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pcb.h	2001/01/17 16:18:52	1.1
--- pcb.h	2001/01/22 16:46:55	1.2
***************
*** 35,37 ****
--- 35,65 ----
  };
  
+ /* Process control block initialiser  used in INIT_THREAD*/
+ #define INIT_PCB {				\
+    ksp:		0,				\
+    esp:		0,				\
+    ssp:		0,	/* null ? */		\
+    usp:		0,				\
+    r0:		0,				\
+    r1:		0,				\
+    r2:		0,				\
+    r3:		0,				\
+    r4:		0,				\
+    r5:		0,				\
+    r6:		0,				\
+    r7:		0,				\
+    r8:		0,				\
+    r9:		0,				\
+    r10:		0,				\
+    r11:		0,				\
+    ap:		0,				\
+    fp:		0,				\
+    pc:		0,				\
+    psl:		0,				\
+    p0br:	0,				\
+    p0lr:	0,	/* bits 0:21. astlvl is bits 24:26 */ \
+    p1br:	0,				\
+    p1lr:	0	/* pme is bit 31 *:		*/    \
+ }
+ 
  #endif /* _VAX_PCB_H */