Merge branch 'page' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page

1 files changed, 3 insertions, 3 deletions

diff --git a/pipe.c b/pipe.c
index 4a1857c..bc847b9 100644
--- a/pipe.c
+++ b/pipe.c
@@ -27,7 +27,7 @@ pipealloc(struct file **f0, struct file **f1)
   *f0 = *f1 = 0;
   if((*f0 = filealloc()) == 0 || (*f1 = filealloc()) == 0)
     goto bad;
-  if((p = (struct pipe*)kalloc(PAGE)) == 0)
+  if((p = (struct pipe*)kalloc()) == 0)
     goto bad;
   p->readopen = 1;
   p->writeopen = 1;
@@ -47,7 +47,7 @@ pipealloc(struct file **f0, struct file **f1)
 //PAGEBREAK: 20
  bad:
   if(p)
-    kfree((char*)p, PAGE);
+    kfree((char*)p);
   if(*f0)
     fileclose(*f0);
   if(*f1)
@@ -68,7 +68,7 @@ pipeclose(struct pipe *p, int writable)
   }
   if(p->readopen == 0 && p->writeopen == 0) {
     release(&p->lock);
-    kfree((char*)p, PAGE);
+    kfree((char*)p);
   } else
     release(&p->lock);
 }