Index: kernel/arch/sparc64/include/trap/syscall.h
===================================================================
--- kernel/arch/sparc64/include/trap/syscall.h	(revision 9314ee12dbab7b901af6bd9906a7c6a1fa0aa885)
+++ kernel/arch/sparc64/include/trap/syscall.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
@@ -50,5 +50,4 @@
 	ba trap_instruction_handler
 	or %g1, %lo(syscall), %g1
-
 .endm
 
Index: kernel/arch/sparc64/src/trap/trap_table.S
===================================================================
--- kernel/arch/sparc64/src/trap/trap_table.S	(revision 9314ee12dbab7b901af6bd9906a7c6a1fa0aa885)
+++ kernel/arch/sparc64/src/trap/trap_table.S	(revision 002e6136848b41de207a590bc212ce31cce81d12)
@@ -514,5 +514,5 @@
  * Input registers:
  *	%g1		Address of function to call.
- * 	%g2	 	Argument for the function.
+ * 	%g2	 	First argument for the function.
  *	%g6		Pre-set as kernel stack base if trap from userspace.
  *	%g7		Pre-set as address of the userspace window buffer.
Index: kernel/generic/include/syscall/syscall.h
===================================================================
--- kernel/generic/include/syscall/syscall.h	(revision 9314ee12dbab7b901af6bd9906a7c6a1fa0aa885)
+++ kernel/generic/include/syscall/syscall.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
@@ -33,6 +33,6 @@
  */
 
-#ifndef __SYSCALL_H__
-#define __SYSCALL_H__
+#ifndef KERN_SYSCALL_H_
+#define KERN_SYSCALL_H_
 
 typedef enum {
@@ -81,5 +81,4 @@
 extern unative_t sys_tls_set(unative_t addr);
 
-
 #endif