diff --git a/src/sys/include/lib/kmalloc.h b/src/sys/include/lib/kmalloc.h
index 139941e..702293b 100644
--- a/src/sys/include/lib/kmalloc.h
+++ b/src/sys/include/lib/kmalloc.h
@@ -38,7 +38,7 @@
 
 #define sysID      -2
 #define MALLOC_ALIGN_SIZE  32
-#define MALLOC_ALIGN(size) (size + ((((size) % MALLOC_ALIGN_SIZE) == 0)? 0 : (MALLOC_ALIGN_SIZE - ((size) % MALLOC_ALIGN_SIZE))))
+#define MALLOC_ALIGN(size) (size + ((((size) % (MALLOC_ALIGN_SIZE)) == 0)? 0 : ((MALLOC_ALIGN_SIZE) - ((size) % (MALLOC_ALIGN_SIZE)))))
 
 struct memDescriptor {
   struct memDescriptor *prev;        //4
@@ -60,6 +60,18 @@
 
 /***
  $Log$
+ Revision 1.6  2004/07/21 10:02:09  reddawg
+ devfs: renamed functions
+ device system: renamed functions
+ fdc: fixed a few potential bugs and cleaned up some unused variables
+ strol: fixed definition
+ endtask: made it print out freepage debug info
+ kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
+ ld: fixed a pointer conversion
+ file: cleaned up a few unused variables
+ sched: broke task deletion
+ kprintf: fixed ogPrintf definition
+
  Revision 1.5  2004/07/19 02:08:27  reddawg
  Cleaned out the rest of debuging code also temporarily disabled the ip stack to improve boot time
 
diff --git a/src/sys/include/ubixfs/ubixfs.h b/src/sys/include/ubixfs/ubixfs.h
index d72658b..2cd8f1f 100644
--- a/src/sys/include/ubixfs/ubixfs.h
+++ b/src/sys/include/ubixfs/ubixfs.h
@@ -38,7 +38,7 @@
 
 
 #define UBIXFS_BLOCKSIZE_BYTES     blockSize*512
-#define UBIXFS_ALIGN(size) (size + ((((size) % UBIXFS_BLOCKSIZE_BYTES) == 0)? 0 : (UBIXFS_BLOCKSIZE_BYTES - ((size) % UBIXFS_BLOCKSIZE_BYTES))))
+#define UBIXFS_ALIGN(size) (size + ((((size) % (UBIXFS_BLOCKSIZE_BYTES)) == 0)? 0 : ((UBIXFS_BLOCKSIZE_BYTES) - ((size) % (UBIXFS_BLOCKSIZE_BYTES)))))
 
 #define UBIXDISKMAGIC     ((uInt32)0x45) /* The disk magic number */
 #define MAXUBIXPARTITIONS 16
@@ -160,6 +160,9 @@
 
 /***
  $Log$
+ Revision 1.20  2004/08/01 17:58:39  flameshadow
+ chg: fixed string allocation bug in ubixfs_cacheNew()
+
  Revision 1.19  2004/07/27 12:02:01  reddawg
  chg: fixed marks bug readFile did a lookup which is why it looked like it was loopping so much