PERFORCE change 45116 for review

[Juli Mallett]

http://perforce.freebsd.org/chv.cgi?CH=45116

Change 45116 by jmallett at jmallett_oingo on 2004/01/10 22:40:51

	Clean up some cruft, unused stuff, etc.,

Affected files ...

.. //depot/projects/mips/sys/mips/include/param.h#15 edit
.. //depot/projects/mips/sys/mips/include/proc.h#3 edit
.. //depot/projects/mips/sys/mips/include/vmparam.h#10 edit
.. //depot/projects/mips/sys/mips/mips/genassym.c#10 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/param.h#15 (text+ko) ====

@@ -28,18 +28,6 @@
 #define	UAREA_PAGES	1		/* pages of u-area */
 
 /*
- * On mips, UPAGES is fixed by sys/arch/mips/mips/locore code
- * to be the number of per-process-wired kernel-stack pages/PTES.
- */
-
-#define	UPAGES		2		/* pages of u-area */
-#define	USPACE		(UPAGES*NBPG)	/* size of u-area in bytes */
-
-#ifndef MSGBUFSIZE
-#define MSGBUFSIZE	NBPG		/* default message buffer size */
-#endif
-
-/*
  * Define the architecture.  If no platform has been defined, fall back
  * to the architecture name, but warn.
  */
@@ -69,8 +57,6 @@
 #define ALIGNBYTES	_ALIGNBYTES
 #define ALIGN(p)	_ALIGN(p)
 
-#define	NBPG		(PAGE_SIZE)
-
 #define	atop(x)			((unsigned long)(x) >> PAGE_SHIFT)
 #define	ptoa(x)			((unsigned long)(x) << PAGE_SHIFT)
 #define	pgtok(x)		((unsigned long)(x) * (PAGE_SIZE / 1024))
@@ -79,14 +65,8 @@
 #define	ctob(x)		((x) << PAGE_SHIFT)
 #define btoc(x)		(((x) + PAGE_MASK) >> PAGE_SHIFT)
 
-/* bytes to disk blocks */
-#define	btodb(x)	((x) >> DEV_BSHIFT)
-#define dbtob(x)	((x) << DEV_BSHIFT)
-
 /*
  * Mach derived conversion macros
  */
-#define round_page(x)	((((unsigned long)(x)) + NBPG - 1) & ~(NBPG-1))
-#define trunc_page(x)	((unsigned long)(x) & ~(NBPG-1))
-#define btop(x)		((unsigned long)(x) >> PGSHIFT)
-#define ptob(x)		((unsigned long)(x) << PGSHIFT)
+#define round_page(x)	((((unsigned long)(x)) + PAGE_SIZE - 1) & ~(PAGE_SIZE-1))
+#define trunc_page(x)	((unsigned long)(x) & ~(PAGE_SIZE-1))

==== //depot/projects/mips/sys/mips/include/proc.h#3 (text+ko) ====

@@ -35,7 +35,6 @@
 struct mdthread {
 	void	*md_regs;		/* registers on current frame */
 	int	md_flags;		/* machine-dependent flags */
-	int	md_upte[UPAGES];	/* ptes for mapping u page */
 };
 
 #endif	/* !_MACHINE_PROC_H_ */

==== //depot/projects/mips/sys/mips/include/vmparam.h#10 (text+ko) ====

@@ -51,19 +51,12 @@
 #include <platform/vmparam.h>
 
 /*
- * USRTEXT is the start of the user text/data space, while USRSTACK
- * is the top (end) of the user stack.
- *
  * USRSTACK needs to start a little below 0x8000000 because the R8000
  * and some QED CPUs perform some virtual address checks before the
  * offset is calculated.
  */
-#define	USRTEXT		0x00001000		/* Start of user text */
 #define	USRSTACK	0x7ffff000		/* Start of user stack */
 
-/* alignment requirement for u-area space in bytes */
-#define	USPACE_ALIGN	USPACE
-
 /*
  * Virtual memory related constants, all in bytes
  */
@@ -87,22 +80,6 @@
 #endif
 
 /*
- * PTEs for mapping user space into the kernel for phyio operations.
- * The default PTE number is enough to cover 8 disks * MAXBSIZE.
- */
-#ifndef USRIOSIZE
-#define USRIOSIZE	(MAXBSIZE/NBPG * 8)
-#endif
-
-/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS	1024		/* 4mb */
-#endif
-
-/*
  * The time for a process to be blocked before being very swappable.
  * This is a number of seconds which the system takes as being a non-trivial
  * amount of real time.  You probably shouldn't change this;
@@ -136,6 +113,5 @@
 
 /* virtual sizes (bytes) for various kernel submaps */
 #define	VM_KMEM_SIZE		(16*1024*1024)		/* XXX ??? */
-#define VM_PHYS_SIZE		(USRIOSIZE*NBPG)
 
 #endif /* ! _MIPS_VMPARAM_H_ */

==== //depot/projects/mips/sys/mips/mips/genassym.c#10 (text+ko) ====

@@ -56,8 +56,6 @@
 ASSYM(TD_PROC, offsetof(struct thread, td_proc));
 
 ASSYM(TD_MD_REGS, offsetof(struct thread, td_md.md_regs));
-ASSYM(TD_MD_UPTE_0, offsetof(struct thread, td_md.md_upte[0]));
-ASSYM(TD_MD_UPTE_1, offsetof(struct thread, td_md.md_upte[1]));
 
 ASSYM(P_UAREA, offsetof(struct proc, p_uarea));