shithub: front

Info  •  Files  •  Log  •  Branches

kernel: make schedinit() _Noreturn void

--- a/sys/src/9/arm64/main.c

+++ b/sys/src/9/arm64/main.c

@@ -170,7 +170,6 @@

 		mmu1init();

 		m->ticks = MACHP(0)->ticks;

 		schedinit();

-		return;

 	}

 	uartconsinit();

 	quotefmtinstall();

--- a/sys/src/9/bcm/archbcm2.c

+++ b/sys/src/9/bcm/archbcm2.c

@@ -239,5 +239,4 @@

 	active.machs[m->machno] = 1;

 	unlock(&startlock[cpu]);

 	schedinit();

-	panic("schedinit returned");

 }

--- a/sys/src/9/bcm/main.c

+++ b/sys/src/9/bcm/main.c

@@ -119,7 +119,6 @@

 	launchinit();

 	mmuinit1(0);

 	schedinit();

-	assert(0);			/* shouldn't have returned */

 }

 /*

--- a/sys/src/9/bcm64/main.c

+++ b/sys/src/9/bcm64/main.c

@@ -171,7 +171,6 @@

 		mmu1init();

 		m->ticks = MACHP(0)->ticks;

 		schedinit();

-		return;

 	}

 	quotefmtinstall();

 	bootargsinit(arg0);

--- a/sys/src/9/cycv/main.c

+++ b/sys/src/9/cycv/main.c

@@ -210,7 +210,6 @@

 		synccycles();

 		timersinit();

 		schedinit();

-		return;

 	}

 	uartconsinit();

 	mmuinit();

--- a/sys/src/9/imx8/main.c

+++ b/sys/src/9/imx8/main.c

@@ -335,7 +335,6 @@

 		mmu1init();

 		m->ticks = MACHP(0)->ticks;

 		schedinit();

-		return;

 	}

 	uartconsinit();

 	quotefmtinstall();

--- a/sys/src/9/kw/main.c

+++ b/sys/src/9/kw/main.c

@@ -267,7 +267,6 @@

 	pageinit();

 	userinit();

 	schedinit();

-	panic("schedinit returned");

 }

 void

--- a/sys/src/9/lx2k/main.c

+++ b/sys/src/9/lx2k/main.c

@@ -320,7 +320,6 @@

 		mmu1init();

 		m->ticks = MACHP(0)->ticks;

 		schedinit();

-		return;

 	}

 	quotefmtinstall();

 	bootargsinit();

--- a/sys/src/9/mt7688/main.c

+++ b/sys/src/9/mt7688/main.c

@@ -147,8 +147,6 @@

 	userinit();

 	schedinit();

-

-	panic("schedinit returned");

 }

 /*

--- a/sys/src/9/port/portfns.h

+++ b/sys/src/9/port/portfns.h

@@ -325,7 +325,7 @@

 Proc*		runproc(void);

 void		savefpregs(FPsave*);

 void		sched(void);

-void		schedinit(void);

+_Noreturn void	schedinit(void);

 void		(*screenputs)(char*, int);

 void*		secalloc(ulong);

 void		secfree(void*);

--- a/sys/src/9/port/proc.c

+++ b/sys/src/9/port/proc.c

@@ -63,8 +63,8 @@

 /*

  * Always splhi()'ed.

  */

-void

-schedinit(void)		/* never returns */

+_Noreturn void

+schedinit(void)

 {

 	Edf *e;

--- a/sys/src/9/sgi/main.c

+++ b/sys/src/9/sgi/main.c

@@ -187,7 +187,6 @@

 	chandevreset();

 	userinit();

 	schedinit();

-	panic("schedinit returned");

 }

 /*

--- a/sys/src/9/teg2/archtegra.c

+++ b/sys/src/9/teg2/archtegra.c

@@ -733,7 +733,6 @@

 	if (Debug)

 		iprint("cpu%d: scheding\n", m->machno);

 	schedinit();

-	panic("cpu%d: schedinit returned", m->machno);

 }

 /* mainly used to break out of wfi */

--- a/sys/src/9/teg2/main.c

+++ b/sys/src/9/teg2/main.c

@@ -408,7 +408,6 @@

 	l1diag();

 	schedinit();

-	panic("cpu%d: schedinit returned", m->machno);

 }

 /*

--- a/sys/src/9/zynq/main.c

+++ b/sys/src/9/zynq/main.c

@@ -318,7 +318,6 @@

 		synccycles();

 		timersinit();

 		schedinit();

-		return;

 	}

 	uartconsinit();

 	mmuinit();

-- 

⑨