diff --git a/sys/src/9/bcm/main.c b/sys/src/9/bcm/main.c index 2d74f083f..c6f03c164 100644 --- a/sys/src/9/bcm/main.c +++ b/sys/src/9/bcm/main.c @@ -430,17 +430,18 @@ confinit(void) uintptr pa; char *p; - if(p = getconf("*kernelpercent")) - userpcnt = 100 - strtol(p, 0, 0); - else - userpcnt = 0; - - if(0 && (p = getconf("service")) != nil){ + if(p = getconf("service")){ if(strcmp(p, "cpu") == 0) cpuserver = 1; else if(strcmp(p,"terminal") == 0) cpuserver = 0; } + + if(p = getconf("*kernelpercent")) + userpcnt = 100 - strtol(p, 0, 0); + else + userpcnt = 0; + if((p = getconf("*maxmem")) != nil){ memsize = strtoul(p, 0, 0) - PHYSDRAM; if (memsize < 16*MB) /* sanity */ diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c index d9fa45648..62d6a192a 100644 --- a/sys/src/9/pc/main.c +++ b/sys/src/9/pc/main.c @@ -416,6 +416,13 @@ confinit(void) int i, userpcnt; ulong kpages; + if(p = getconf("service")){ + if(strcmp(p, "cpu") == 0) + cpuserver = 1; + else if(strcmp(p,"terminal") == 0) + cpuserver = 0; + } + if(p = getconf("*kernelpercent")) userpcnt = 100 - strtol(p, 0, 0); else diff --git a/sys/src/9/pc64/main.c b/sys/src/9/pc64/main.c index f3f94e5b2..4c2e5c803 100644 --- a/sys/src/9/pc64/main.c +++ b/sys/src/9/pc64/main.c @@ -140,6 +140,13 @@ confinit(void) int i, userpcnt; ulong kpages; + if(p = getconf("service")){ + if(strcmp(p, "cpu") == 0) + cpuserver = 1; + else if(strcmp(p,"terminal") == 0) + cpuserver = 0; + } + if(p = getconf("*kernelpercent")) userpcnt = 100 - strtol(p, 0, 0); else diff --git a/sys/src/9/ppc/main.c b/sys/src/9/ppc/main.c index 734550acd..9c6c4ea4c 100644 --- a/sys/src/9/ppc/main.c +++ b/sys/src/9/ppc/main.c @@ -334,6 +334,13 @@ confinit(void) ulong pa, kpages; /* passed in from ROM monitor: */ + if(p = getconf("service")){ + if(strcmp(p, "cpu") == 0) + cpuserver = 1; + else if(strcmp(p,"terminal") == 0) + cpuserver = 0; + } + if(p = getconf("*kernelpercent")) userpcnt = 100 - strtol(p, 0, 0); else diff --git a/sys/src/9/teg2/main.c b/sys/src/9/teg2/main.c index 4c4df93ce..1c2abe8fa 100644 --- a/sys/src/9/teg2/main.c +++ b/sys/src/9/teg2/main.c @@ -833,6 +833,13 @@ confinit(void) uintptr pa; char *p; + if(p = getconf("service")){ + if(strcmp(p, "cpu") == 0) + cpuserver = 1; + else if(strcmp(p,"terminal") == 0) + cpuserver = 0; + } + /* * Copy the physical memory configuration to Conf.mem. */ @@ -912,8 +919,6 @@ confinit(void) * be careful with 32-bit overflow. */ imagmem->maxsize = kpages; - -// archconfinit(); } int