xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2014-03-15 00:56:36 +01:00
commit 483f1ba602
5 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sys/src/9/bcm/main.c
View file

@ -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 */

7
sys/src/9/pc/main.c
View file

@ -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

7
sys/src/9/pc64/main.c
View file

@ -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

7
sys/src/9/ppc/main.c
View file

@ -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

9
sys/src/9/teg2/main.c
View file

@ -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