svn commit: r194832 - head/sys/kern

[John Baldwin]

Author: jhb
Date: Wed Jun 24 13:35:38 2009
New Revision: 194832
URL: http://svn.freebsd.org/changeset/base/194832

Log:
  - Move syscall function argument structure types to be just above the
    relevenat system call function.
  - Whitespace fixes.

Modified:
  head/sys/kern/sysv_msg.c
  head/sys/kern/sysv_sem.c
  head/sys/kern/sysv_shm.c

Modified: head/sys/kern/sysv_msg.c
==============================================================================
--- head/sys/kern/sysv_msg.c	Wed Jun 24 12:52:59 2009	(r194831)
+++ head/sys/kern/sysv_msg.c	Wed Jun 24 13:35:38 2009	(r194832)
@@ -314,8 +314,7 @@ SYSCALL_MODULE_HELPER(msgget);
 SYSCALL_MODULE_HELPER(msgsnd);
 SYSCALL_MODULE_HELPER(msgrcv);
 
-DECLARE_MODULE(sysvmsg, sysvmsg_mod,
-	SI_SUB_SYSV_MSG, SI_ORDER_FIRST);
+DECLARE_MODULE(sysvmsg, sysvmsg_mod, SI_SUB_SYSV_MSG, SI_ORDER_FIRST);
 MODULE_VERSION(sysvmsg, 1);
 
 /*

Modified: head/sys/kern/sysv_sem.c
==============================================================================
--- head/sys/kern/sysv_sem.c	Wed Jun 24 12:52:59 2009	(r194831)
+++ head/sys/kern/sysv_sem.c	Wed Jun 24 13:35:38 2009	(r194832)
@@ -322,8 +322,7 @@ SYSCALL_MODULE_HELPER(__semctl);
 SYSCALL_MODULE_HELPER(semget);
 SYSCALL_MODULE_HELPER(semop);
 
-DECLARE_MODULE(sysvsem, sysvsem_mod,
-	SI_SUB_SYSV_SEM, SI_ORDER_FIRST);
+DECLARE_MODULE(sysvsem, sysvsem_mod, SI_SUB_SYSV_SEM, SI_ORDER_FIRST);
 MODULE_VERSION(sysvsem, 1);
 
 /*

Modified: head/sys/kern/sysv_shm.c
==============================================================================
--- head/sys/kern/sysv_shm.c	Wed Jun 24 12:52:59 2009	(r194831)
+++ head/sys/kern/sysv_shm.c	Wed Jun 24 13:35:38 2009	(r194832)
@@ -519,13 +519,6 @@ done2:
 }
 #endif
 
-#ifndef _SYS_SYSPROTO_H_
-struct shmctl_args {
-	int shmid;
-	int cmd;
-	struct shmid_ds *buf;
-};
-#endif
 int
 kern_shmctl(td, shmid, cmd, buf, bufsz)
 	struct thread *td;
@@ -636,6 +629,13 @@ done2:
 	return (error);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct shmctl_args {
+	int shmid;
+	int cmd;
+	struct shmid_ds *buf;
+};
+#endif
 int
 shmctl(td, uap)
 	struct thread *td;
@@ -680,13 +680,6 @@ done:
 }
 
 
-#ifndef _SYS_SYSPROTO_H_
-struct shmget_args {
-	key_t key;
-	size_t size;
-	int shmflg;
-};
-#endif
 static int
 shmget_existing(td, uap, mode, segnum)
 	struct thread *td;
@@ -807,6 +800,13 @@ shmget_allocate_segment(td, uap, mode)
 	return (0);
 }
 
+#ifndef _SYS_SYSPROTO_H_
+struct shmget_args {
+	key_t key;
+	size_t size;
+	int shmflg;
+};
+#endif
 int
 shmget(td, uap)
 	struct thread *td;
@@ -1024,6 +1024,5 @@ SYSCALL_MODULE_HELPER(shmctl);
 SYSCALL_MODULE_HELPER(shmdt);
 SYSCALL_MODULE_HELPER(shmget);
 
-DECLARE_MODULE(sysvshm, sysvshm_mod,
-	SI_SUB_SYSV_SHM, SI_ORDER_FIRST);
+DECLARE_MODULE(sysvshm, sysvshm_mod, SI_SUB_SYSV_SHM, SI_ORDER_FIRST);
 MODULE_VERSION(sysvshm, 1);