From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Fri, 9 Nov 2012 03:09:22 +0000 (+0900)
Subject: net: consolidate multiple init functions
X-Git-Tag: go1.1rc2~1911
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f668e0a5b3b1f393ecda995c92503da7b4c89e53;p=gostls13.git

net: consolidate multiple init functions

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/6819117
---

diff --git a/src/pkg/net/fd_unix.go b/src/pkg/net/fd_unix.go
index 7f82f203e1..f2f5ffa2f1 100644
--- a/src/pkg/net/fd_unix.go
+++ b/src/pkg/net/fd_unix.go
@@ -263,9 +263,6 @@ var startServersOnce []func()
 var canCancelIO = true // used for testing current package
 
 func sysInit() {
-}
-
-func init() {
 	pollMaxN = runtime.NumCPU()
 	if pollMaxN > 8 {
 		pollMaxN = 8 // No improvement then.