PERFORCE change 116898 for review

Jung-uk Kim jkim at FreeBSD.org
Fri Mar 30 01:22:44 UTC 2007


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

Change 116898 by jkim at jkim_hammer on 2007/03/30 01:22:41

	IFC 116897

Affected files ...

.. //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#4 integrate
.. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#15 integrate
.. //depot/projects/linuxolator/src/sys/i386/i386/support.s#4 integrate

Differences ...

==== //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#4 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.121 2006/10/17 02:24:45 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.122 2007/03/30 01:07:27 jkim Exp $
  */
 
 #include "opt_ddb.h"
@@ -733,4 +733,3 @@
 	xorl	%eax, %eax
 	movq	%rax, PCB_ONFAULT(%r11)
 	ret
-

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#15 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.8 2007/02/25 12:43:07 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_futex.c,v 1.9 2007/03/30 01:07:28 jkim Exp $");
 #if 0
 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $");
 #endif
@@ -188,7 +188,8 @@
 		case 0:		/* FUTEX_WAKE received */
 #ifdef DEBUG
 			if (ldebug(sys_futex))
-				printf("FUTEX_WAIT %d: uaddr = %p, got FUTEX_WAKE\n",
+				printf("FUTEX_WAIT %d: uaddr = %p, "
+				    "got FUTEX_WAKE\n",
 				    td->td_proc->p_pid, args->uaddr);
 #endif
 			return 0;
@@ -196,7 +197,8 @@
 		default:
 #ifdef DEBUG
 			if (ldebug(sys_futex))
-				printf("FUTEX_WAIT: unexpected ret = %d\n", ret);
+				printf("FUTEX_WAIT: unexpected ret = %d\n",
+				    ret);
 #endif
 			break;
 		}
@@ -240,7 +242,8 @@
 
 		f = futex_get(args->uaddr, FUTEX_UNLOCKED);
 		newf = futex_get(args->uaddr2, FUTEX_UNLOCKED);
-		td->td_retval[0] = futex_wake(f, args->val, newf, (int)(unsigned long)args->timeout);
+		td->td_retval[0] = futex_wake(f, args->val, newf,
+		    (int)(unsigned long)args->timeout);
 		futex_put(f);
 		futex_put(newf);
 
@@ -252,7 +255,8 @@
 
 		f = futex_get(args->uaddr, FUTEX_UNLOCKED);
 		newf = futex_get(args->uaddr2, FUTEX_UNLOCKED);
-		td->td_retval[0] = futex_wake(f, args->val, newf, (int)(unsigned long)args->timeout);
+		td->td_retval[0] = futex_wake(f, args->val, newf,
+		    (int)(unsigned long)args->timeout);
 		futex_put(f);
 		futex_put(newf);
 
@@ -260,7 +264,7 @@
 		break;
 
 	case LINUX_FUTEX_FD:
-		/* XXX: linux plans to remove this operation */
+		/* XXX: Linux plans to remove this operation */
 		printf("linux_sys_futex: unimplemented op %d\n",
 		    args->op);
 		break;
@@ -269,9 +273,10 @@
 		FUTEX_SYSTEM_LOCK;
 #ifdef DEBUG
 		if (ldebug(sys_futex))
-			printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, val = %d, uaddr2 = %p, val3 = %d\n",
-			    td->td_proc->p_pid, args->uaddr, args->op, args->val,
-			    args->uaddr2, args->val3);
+			printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, "
+			    "val = %d, uaddr2 = %p, val3 = %d\n",
+			    td->td_proc->p_pid, args->uaddr, args->op,
+			    args->val, args->uaddr2, args->val3);
 #endif
 		f = futex_get(args->uaddr, FUTEX_UNLOCKED);
 		f2 = futex_get(args->uaddr2, FUTEX_UNLOCKED);
@@ -307,7 +312,8 @@
 			 * Linux abuses the address of the timespec parameter
 			 * as the number of retries.
 			 */
-			op_ret += futex_wake(f2, (int) (unsigned long) args->timeout, NULL, 0);
+			op_ret += futex_wake(f2,
+			    (int)(unsigned long)args->timeout, NULL, 0);
 			ret += op_ret;
 		}
 		futex_put(f2);
@@ -381,8 +387,8 @@
 
 #ifdef DEBUG
 	if (ldebug(sys_futex))
-		printf("FUTEX --> %d tlseep timeout = %ld\n", td->td_proc->p_pid,
-		    timeout);
+		printf("FUTEX --> %d tlseep timeout = %ld\n",
+		    td->td_proc->p_pid, timeout);
 #endif
 	ret = tsleep(wp, PCATCH | PZERO, "linuxfutex", timeout);
 #ifdef DEBUG
@@ -426,7 +432,8 @@
 		} else {
 			if (newf != NULL) {
 				/* futex_put called after tsleep */
-				wp->wp_new_futex = futex_get(newf->f_uaddr, FUTEX_LOCKED);
+				wp->wp_new_futex = futex_get(newf->f_uaddr,
+				    FUTEX_LOCKED);
 				wakeup_one(wp);
 				if (count - n >= n2)
 					break;
@@ -451,8 +458,8 @@
 		oparg = 1 << oparg;
 
 #ifdef DEBUG
-	printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d, uaddr = %p\n",
-	    op, cmp, oparg, cmparg, uaddr);
+	printf("futex_atomic_op: op = %d, cmp = %d, oparg = %d, cmparg = %d, "
+	    "uaddr = %p\n", op, cmp, oparg, cmparg, uaddr);
 #endif
 	/* XXX: linux verifies access here and returns EFAULT */
 

==== //depot/projects/linuxolator/src/sys/i386/i386/support.s#4 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/i386/support.s,v 1.112 2006/10/17 02:24:46 davidxu Exp $
+ * $FreeBSD: src/sys/i386/i386/support.s,v 1.113 2007/03/30 01:07:28 jkim Exp $
  */
 
 #include "opt_npx.h"


More information about the p4-projects mailing list