kernel: make addbroken() static, remove misleading Proc* argument

[plan9front.git] / sys / src / 9 / omap / mem.h

diff --git a/sys/src/9/omap/mem.h b/sys/src/9/omap/mem.h
old mode 100755 (executable)
new mode 100644 (file)
index 1e5c570..435f47c
--- a/sys/src/9/omap/mem.h
+++ b/sys/src/9/omap/mem.h
@@ -5,9 +5,6 @@
 #define MiB            1048576u                /* Mebi 0x0000000000100000 */
 #define GiB            1073741824u             /* Gibi 000000000040000000 */
 
-#define HOWMANY(x, y)  (((x)+((y)-1))/(y))
-#define ROUNDUP(x, y)  (HOWMANY((x), (y))*(y)) /* ceiling */
-#define ROUNDDN(x, y)  (((x)/(y))*(y))         /* floor */
 #define MIN(a, b)      ((a) < (b)? (a): (b))
 #define MAX(a, b)      ((a) > (b)? (a): (b))
 
@@ -36,13 +33,13 @@
  */
 #define        BY2PG           (4*KiB)                 /* bytes per page */
 #define        PGSHIFT         12                      /* log(BY2PG) */
-#define        PGROUND(s)      ROUNDUP(s, BY2PG)
+#define        PGROUND(s)      ROUND(s, BY2PG)
 #define        ROUND(s, sz)    (((s)+(sz-1))&~(sz-1))
 
 #define        MAXMACH         1                       /* max # cpus system can run */
 #define        MACHSIZE        BY2PG
 
-#define KSTKSIZE       (16*KiB)                        /* was 8K */
+#define KSTACK         (16*KiB)                        /* was 8K */
 #define STACKALIGN(sp) ((sp) & ~3)             /* bug: assure with alloc */
 
 /*
@@ -71,12 +68,10 @@
 
 #define        UZERO           0                       /* user segment */
 #define        UTZERO          (UZERO+BY2PG)           /* user text start */
-#define UTROUND(t)     ROUNDUP((t), BY2PG)
+
 /* moved USTKTOP down to 512MB to keep MMIO space out of user space. */
 #define        USTKTOP         0x20000000              /* user segment end +1 */
 #define        USTKSIZE        (8*1024*1024)           /* user stack size */
-#define        TSTKTOP         (USTKTOP-USTKSIZE)      /* sysexec temporary stack */
-#define        TSTKSIZ         256
 
 /* address at which to copy and execute rebootcode */
 #define        REBOOTADDR      KADDR(0x100)
@@ -85,7 +80,6 @@
  * Legacy...
  */
 #define BLOCKALIGN     32                      /* only used in allocb.c */
-#define KSTACK         KSTKSIZE
 
 /*
  * Sizes
@@ -103,13 +97,14 @@
 #define        PPN(x)          ((x)&~(BY2PG-1))        /* pure page number? */
 
 /*
+ * These bits are completely artificial.
  * With a little work these move to port.
  */
 #define        PTEVALID        (1<<0)
 #define        PTERONLY        0
 #define        PTEWRITE        (1<<1)
+#define        PTECACHED       0
 #define        PTEUNCACHED     (1<<2)
-#define PTEKERNEL      (1<<3)
 
 /*
  * Physical machine information from here on.