From 92639b6ba95d1d960a9e808c7163f6d171b2e4a3 Mon Sep 17 00:00:00 2001
From: Austin Clements <amdragon@mit.edu>
Date: Tue, 31 Aug 2010 16:43:41 -0400
Subject: [PATCH] Follow xv6 code style.  Also fixes indexing for these
 functions

---
 x86.h | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/x86.h b/x86.h
index 71427b3..1f903b2 100644
--- a/x86.h
+++ b/x86.h
@@ -132,7 +132,8 @@ sti(void)
   asm volatile("sti");
 }
 
-static inline void nop_pause(void)
+static inline void
+nop_pause(void)
 {
   asm volatile("pause" : :);
 }
@@ -151,31 +152,36 @@ xchg(volatile uint *addr, uint newval)
   return result;
 }
 
-static inline void lcr0(uint val)
+static inline void
+lcr0(uint val)
 {
   asm volatile("movl %0,%%cr0" : : "r" (val));
 }
 
-static inline uint rcr0(void)
+static inline uint
+rcr0(void)
 {
   uint val;
   asm volatile("movl %%cr0,%0" : "=r" (val));
   return val;
 }
 
-static inline uint rcr2(void)
+static inline uint
+rcr2(void)
 {
   uint val;
   asm volatile("movl %%cr2,%0" : "=r" (val));
   return val;
 }
 
-static inline void lcr3(uint val) 
+static inline void
+lcr3(uint val) 
 {
   asm volatile("movl %0,%%cr3" : : "r" (val));
 }
 
-static inline uint rcr3(void)
+static inline uint
+rcr3(void)
 {
   uint val;
   asm volatile("movl %%cr3,%0" : "=r" (val));