Merge branch 'scale-amd64' of git+ssh://pdos.csail.mit.edu/home/am0/6.828/xv6 into scale-amd64

8af08b12 · Nickolai Zeldovich · 7a91f4de · 6ec84747 · 8af08b12
--- a/kernel/wq.cc
+++ b/kernel/wq.cc
@@ -171,7 +171,7 @@ int
 wq_trywork(void)
 {
  struct work *w;
-  int i, k;
+  u64 i, k;

  // A "random" victim CPU
  k = rdtsc();
@@ -183,7 +183,7 @@ wq_trywork(void)
  }

  for (i = 0; i < NCPU; i++) {
-    int j = (i+k) % NCPU;
+    u64 j = (i+k) % NCPU;

    if (j == mycpu()->id)
        continue;