Index: kernel/arch/sparc64/include/asm.h
===================================================================
--- kernel/arch/sparc64/include/asm.h	(revision 4e33b6b225ade31ba0ed3f0d717b4c3af3a41738)
+++ kernel/arch/sparc64/include/asm.h	(revision c738d657d3d585f90fca437b475d4589b00e50be)
@@ -266,4 +266,30 @@
 }
 
+/** Read Trap Program Counter register.
+ *
+ * @return Current value in TPC.
+ */
+static inline uint64_t tpc_read(void)
+{
+	uint64_t v;
+	
+	__asm__ volatile ("rdpr %%tpc, %0\n" : "=r" (v));
+	
+	return v;
+}
+
+/** Read Trap Level register.
+ *
+ * @return Current value in TL.
+ */
+static inline uint64_t tl_read(void)
+{
+	uint64_t v;
+	
+	__asm__ volatile ("rdpr %%tl, %0\n" : "=r" (v));
+	
+	return v;
+}
+
 /** Read Trap Base Address register.
  *
@@ -275,30 +301,4 @@
 	
 	__asm__ volatile ("rdpr %%tba, %0\n" : "=r" (v));
-	
-	return v;
-}
-
-/** Read Trap Program Counter register.
- *
- * @return Current value in TPC.
- */
-static inline uint64_t tpc_read(void)
-{
-	uint64_t v;
-	
-	__asm__ volatile ("rdpr %%tpc, %0\n" : "=r" (v));
-	
-	return v;
-}
-
-/** Read Trap Level register.
- *
- * @return Current value in TL.
- */
-static inline uint64_t tl_read(void)
-{
-	uint64_t v;
-	
-	__asm__ volatile ("rdpr %%tl, %0\n" : "=r" (v));
 	
 	return v;
Index: kernel/arch/sparc64/include/debug.h
===================================================================
--- kernel/arch/sparc64/include/debug.h	(revision 4e33b6b225ade31ba0ed3f0d717b4c3af3a41738)
+++ kernel/arch/sparc64/include/debug.h	(revision c738d657d3d585f90fca437b475d4589b00e50be)
@@ -1,4 +1,4 @@
 /*
- * Copyright (C) 2005 
+ * Copyright (C) 2005 Jakub Jermar 
  * All rights reserved.
  *
Index: kernel/arch/sparc64/include/mm/frame.h
===================================================================
--- kernel/arch/sparc64/include/mm/frame.h	(revision 4e33b6b225ade31ba0ed3f0d717b4c3af3a41738)
+++ kernel/arch/sparc64/include/mm/frame.h	(revision c738d657d3d585f90fca437b475d4589b00e50be)
@@ -37,5 +37,5 @@
 
 #define FRAME_WIDTH		13	/* 8K */
-#define FRAME_SIZE		(1<<FRAME_WIDTH)
+#define FRAME_SIZE		(1 << FRAME_WIDTH)
 
 #ifdef KERNEL
Index: kernel/arch/sparc64/include/regdef.h
===================================================================
--- kernel/arch/sparc64/include/regdef.h	(revision 4e33b6b225ade31ba0ed3f0d717b4c3af3a41738)
+++ kernel/arch/sparc64/include/regdef.h	(revision c738d657d3d585f90fca437b475d4589b00e50be)
@@ -36,23 +36,23 @@
 #define KERN_sparc64_REGDEF_H_
 
-#define PSTATE_IE_BIT	(1<<1)
-#define PSTATE_AM_BIT	(1<<3)
+#define PSTATE_IE_BIT	(1 << 1)
+#define PSTATE_AM_BIT	(1 << 3)
 
-#define PSTATE_AG_BIT	(1<<0)
-#define PSTATE_IG_BIT	(1<<11)
-#define PSTATE_MG_BIT	(1<<10)
+#define PSTATE_AG_BIT	(1 << 0)
+#define PSTATE_IG_BIT	(1 << 11)
+#define PSTATE_MG_BIT	(1 << 10)
 
-#define PSTATE_PRIV_BIT	(1<<2)
-#define PSTATE_PEF_BIT	(1<<4)
+#define PSTATE_PRIV_BIT	(1 << 2)
+#define PSTATE_PEF_BIT	(1 << 4)
 
 #define TSTATE_PSTATE_SHIFT	8
-#define TSTATE_PRIV_BIT		(PSTATE_PRIV_BIT<<TSTATE_PSTATE_SHIFT)
-#define TSTATE_IE_BIT		(PSTATE_IE_BIT<<TSTATE_PSTATE_SHIFT)
-#define TSTATE_PEF_BIT		(PSTATE_PEF_BIT<<TSTATE_PSTATE_SHIFT)
+#define TSTATE_PRIV_BIT		(PSTATE_PRIV_BIT << TSTATE_PSTATE_SHIFT)
+#define TSTATE_IE_BIT		(PSTATE_IE_BIT << TSTATE_PSTATE_SHIFT)
+#define TSTATE_PEF_BIT		(PSTATE_PEF_BIT << TSTATE_PSTATE_SHIFT)
 
 #define TSTATE_CWP_MASK		0x1f
 
 #define WSTATE_NORMAL(n)	(n)
-#define WSTATE_OTHER(n)		((n)<<3)
+#define WSTATE_OTHER(n)		((n) << 3)
 
 #define UPA_CONFIG_MID_SHIFT    17
Index: kernel/arch/sparc64/include/trap/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/trap/interrupt.h	(revision 4e33b6b225ade31ba0ed3f0d717b4c3af3a41738)
+++ kernel/arch/sparc64/include/trap/interrupt.h	(revision c738d657d3d585f90fca437b475d4589b00e50be)
@@ -44,5 +44,5 @@
 #define IGN_MASK	0x7c0
 #define INO_MASK	0x1f
-#define IMAP_V_MASK	(1ULL<<31)
+#define IMAP_V_MASK	(1ULL << 31)
 
 #define IGN_SHIFT	6
Index: kernel/arch/sparc64/include/trap/syscall.h
===================================================================
--- kernel/arch/sparc64/include/trap/syscall.h	(revision 4e33b6b225ade31ba0ed3f0d717b4c3af3a41738)
+++ kernel/arch/sparc64/include/trap/syscall.h	(revision c738d657d3d585f90fca437b475d4589b00e50be)
@@ -40,5 +40,5 @@
 #define KERN_sparc64_SYSCALL_TRAP_H_
 
-#define TT_TRAP_INSTRUCTION(n)		(0x100+(n))
+#define TT_TRAP_INSTRUCTION(n)		(0x100 + (n))
 #define TT_TRAP_INSTRUCTION_LAST	TT_TRAP_INSTRUCTION(127)
 
Index: kernel/arch/sparc64/include/trap/trap_table.h
===================================================================
--- kernel/arch/sparc64/include/trap/trap_table.h	(revision 4e33b6b225ade31ba0ed3f0d717b4c3af3a41738)
+++ kernel/arch/sparc64/include/trap/trap_table.h	(revision c738d657d3d585f90fca437b475d4589b00e50be)
@@ -40,5 +40,5 @@
 #define TRAP_TABLE_ENTRY_COUNT	1024
 #define TRAP_TABLE_ENTRY_SIZE	32
-#define TRAP_TABLE_SIZE		(TRAP_TABLE_ENTRY_COUNT*TRAP_TABLE_ENTRY_SIZE)
+#define TRAP_TABLE_SIZE		(TRAP_TABLE_ENTRY_COUNT * TRAP_TABLE_ENTRY_SIZE)
 
 #ifndef __ASM__