PERFORCE change 100769 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=100769

Change 100769 by rwatson at rwatson_zoo on 2006/07/06 16:17:09

	Rename of userret function premature.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#12 edit
.. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#20 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#12 (text+ko) ====


==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#20 (text+ko) ====

@@ -363,7 +363,6 @@
 typedef void	(*mpo_proc_destroy_label_t)(struct label *label);
 typedef void	(*mpo_proc_create_init_t)(struct ucred *cred);
 typedef void	(*mpo_proc_create_swapper_t)(struct ucred *cred);
-typedef void	(*mpo_proc_thread_userret_t)(struct thread *thread);
 typedef int	(*mpo_proc_check_debug_t)(struct ucred *cred,
 		    struct proc *proc);
 typedef int	(*mpo_proc_check_sched_t)(struct ucred *cred,
@@ -386,6 +385,7 @@
 		    struct proc *proc, int signum);
 typedef int	(*mpo_proc_check_wait_t)(struct ucred *cred,
 		    struct proc *proc);
+typedef void	(*mpo_thread_userret_t)(struct thread *thread);
 typedef int	(*mpo_associate_nfsd_label_t)(struct ucred *cred);
 
 /*
@@ -784,7 +784,6 @@
 	mpo_proc_destroy_label_t		mpo_proc_destroy_label;
 	mpo_proc_create_init_t			mpo_proc_create_init;
 	mpo_proc_create_swapper_t		mpo_proc_create_swapper;
-	mpo_proc_thread_userret_t		mpo_proc_thread_userret;
 	mpo_proc_check_debug_t			mpo_proc_check_debug;
 	mpo_proc_check_sched_t			mpo_proc_check_sched;
 	mpo_proc_check_setuid_t			mpo_proc_check_setuid;
@@ -798,6 +797,7 @@
 	mpo_proc_check_setresgid_t		mpo_proc_check_setresgid;
 	mpo_proc_check_signal_t			mpo_proc_check_signal;
 	mpo_proc_check_wait_t			mpo_proc_check_wait;
+	mpo_thread_userret_t			mpo_thread_userret;
 
 	mpo_sysvmsq_init_label_t		mpo_sysvmsq_init_label;
 	mpo_sysvmsq_destroy_t			mpo_sysvmsq_destroy;