fix linux build

R=rsc
OCL=27579
CL=27579

diff --git a/src/lib/net/fd_linux.go b/src/lib/net/fd_linux.go
index 8e2b57f224e908190b68bc8784597926a81bac12..ecdf1da841d11c6ffcbf60d88a12ab90e5e05b7f 100644 (file)
--- a/src/lib/net/fd_linux.go
+++ b/src/lib/net/fd_linux.go
@@ -114,9 +114,9 @@ func (p *pollster) WaitFD(nsec int64) (fd int64, mode int, err *os.Error) {
        if nsec > 0 {
                msec = (nsec + 1e6 - 1)/1e6;
        }
-       n, e := syscall.Epoll_wait(p.epfd, evarray, msec);
+       n, e := syscall.Epoll_wait(p.epfd, &evarray, msec);
        for e == syscall.EAGAIN || e == syscall.EINTR {
-               n, e = syscall.Epoll_wait(p.epfd, evarray, msec);
+               n, e = syscall.Epoll_wait(p.epfd, &evarray, msec);
        }
        if e != 0 {
                return -1, 0, os.ErrnoToError(e);

diff --git a/src/lib/os/dir_amd64_linux.go b/src/lib/os/dir_amd64_linux.go
index 7f8be6f5098a789667c38ec6f0a6f6a923069426..582e4f632d6ce92710f937a12518a6db5bebc802 100644 (file)
--- a/src/lib/os/dir_amd64_linux.go
+++ b/src/lib/os/dir_amd64_linux.go
@@ -59,7 +59,7 @@ func readdirnames(file *File, count int) (names []string, err *os.Error) {
                        if dirent.Ino == 0 {    // File absent in directory.
                                continue
                        }
-                       var name = string(dirent.Name[0:clen(dirent.Name)]);
+                       var name = string(dirent.Name[0:clen(&dirent.Name)]);
                        if name == "." || name == ".." {        // Useless names
                                continue
                        }