Index: kernel/arch/amd64/src/boot/boot.S
===================================================================
--- kernel/arch/amd64/src/boot/boot.S	(revision 896ad9f900f2434342a878312aa1a5cb22bdf135)
+++ kernel/arch/amd64/src/boot/boot.S	(revision 53634f9294eaa723f35916cf5364f8cd4ab720f8)
@@ -1,3 +1,3 @@
-
+#
 # Copyright (c) 2005 Ondrej Palkovsky
 # Copyright (c) 2006 Martin Decky
Index: kernel/arch/ppc32/src/mm/tlb.c
===================================================================
--- kernel/arch/ppc32/src/mm/tlb.c	(revision 896ad9f900f2434342a878312aa1a5cb22bdf135)
+++ kernel/arch/ppc32/src/mm/tlb.c	(revision 53634f9294eaa723f35916cf5364f8cd4ab720f8)
@@ -41,4 +41,5 @@
 #include <print.h>
 #include <symtab.h>
+#include <macros.h>
 
 
@@ -130,17 +131,4 @@
 
 
-/** Pseudorandom generator
- *
- * A pretty standard linear congruential pseudorandom
- * number generator (m = 2^32).
- *
- */
-#define RANDI(seed) \
-	({ \
-		(seed) = 1103515245 * (seed) + 12345; \
-		(seed); \
-	})
-
-
 static void pht_insert(const uintptr_t vaddr, const pte_t *pte)
 {
Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision 896ad9f900f2434342a878312aa1a5cb22bdf135)
+++ kernel/generic/include/macros.h	(revision 53634f9294eaa723f35916cf5364f8cd4ab720f8)
@@ -77,4 +77,16 @@
 #define STRING_ARG(arg) #arg
 
+/** Pseudorandom generator
+ *
+ * A pretty standard linear congruential pseudorandom
+ * number generator (m = 2^32 or 2^64 depending on architecture).
+ *
+ */
+#define RANDI(seed) \
+	({ \
+		(seed) = 1103515245 * (seed) + 12345; \
+		(seed); \
+	})
+
 #endif
 
Index: kernel/test/synch/rwlock4.c
===================================================================
--- kernel/test/synch/rwlock4.c	(revision 896ad9f900f2434342a878312aa1a5cb22bdf135)
+++ kernel/test/synch/rwlock4.c	(revision 53634f9294eaa723f35916cf5364f8cd4ab720f8)
@@ -61,5 +61,5 @@
 	spinlock_lock(&rw_lock);	
 	rc = seed % max;
-	seed = (((seed<<2) ^ (seed>>2)) * 487) + rc;
+	seed = (((seed << 2) ^ (seed >> 2)) * 487) + rc;
 	spinlock_unlock(&rw_lock);
 	return rc;
Index: kernel/test/synch/semaphore2.c
===================================================================
--- kernel/test/synch/semaphore2.c	(revision 896ad9f900f2434342a878312aa1a5cb22bdf135)
+++ kernel/test/synch/semaphore2.c	(revision 53634f9294eaa723f35916cf5364f8cd4ab720f8)
@@ -54,5 +54,5 @@
 	spinlock_lock(&sem_lock);	
 	rc = seed % max;
-	seed = (((seed<<2) ^ (seed>>2)) * 487) + rc;
+	seed = (((seed << 2) ^ (seed >> 2)) * 487) + rc;
 	spinlock_unlock(&sem_lock);
 	return rc;