5 files changed, 8 insertions(+), 12 deletions(-)

M port/devproc.c
M port/fault.c
M port/portdat.h
M port/swap.c
M port/sysproc.c

@@ 49,7 49,7 @@ Dirtab procdir[] =
 };
 
 /* Segment type from portdat.h */
-char *sname[]={ "Text", "Data", "Bss", "Stack", "Shared", "Phys", "Shdata" };
+char *sname[]={ "Text", "Data", "Bss", "Stack", "Shared", "Phys" };
 
 /*
  * Qids are, in path:

@@ 98,7 98,6 @@ fixfault(Segment *s, ulong addr, int read, int doputmmu)
 		goto common;
 
 	case SG_DATA:
-	case SG_SHDATA:
 	common:			/* Demand load/pagein/copy on write */
 		if(pagedout(*pg))
 			pio(s, addr, soff, pg);

@@ 342,7 342,6 @@ enum
 	SG_STACK	= 03,
 	SG_SHARED	= 04,
 	SG_PHYSICAL	= 05,
-	SG_SHDATA	= 06,
 
 	SG_RONLY	= 0040,		/* Segment is read only */
 	SG_CEXEC	= 0100,		/* Detach at exec */

@@ 147,7 147,6 @@ loop:
 					case SG_BSS:
 					case SG_STACK:
 					case SG_SHARED:
-					case SG_SHDATA:
 						up->psstate = "Pageout";
 						pageout(p, s);
 						if(ioptr != 0) {


@@ 280,7 279,6 @@ pagepte(int type, Page **pg)
 	case SG_BSS:
 	case SG_STACK:
 	case SG_SHARED:
-	case SG_SHDATA:
 		/*
 		 *  get a new swap address and clear any pages
 		 *  referring to it from the cache

@@ 665,21 665,21 @@ long
 syssegfree(ulong *arg)
 {
 	Segment *s;
-	ulong from, pages;
+	ulong from, to;
 
-	from = PGROUND(arg[0]);
+	from = arg[0];
 	s = seg(up, from, 1);
-	if(s == 0)
+	if(s == nil)
 		error(Ebadarg);
+	to = (from + arg[1]) & ~(BY2PG-1);
+	from = PGROUND(from);
 
-	pages = (arg[1]+BY2PG-1)/BY2PG;
-
-	if(from+pages*BY2PG > s->top) {
+	if(to > s->top) {
 		qunlock(&s->lk);
 		error(Ebadarg);
 	}
 
-	mfreeseg(s, from, pages);
+	mfreeseg(s, from, (to - from) / BY2PG);
 	qunlock(&s->lk);
 	flushmmu();