Commit 3e89759a authored by Anton Blanchard's avatar Anton Blanchard

ppc64: fixes for iseries

parent cf93039a
...@@ -295,7 +295,7 @@ iSeries_init_early(void) ...@@ -295,7 +295,7 @@ iSeries_init_early(void)
initrd_start = (unsigned long)__va(naca->xRamDisk); initrd_start = (unsigned long)__va(naca->xRamDisk);
initrd_end = initrd_start + naca->xRamDiskSize * PAGE_SIZE; initrd_end = initrd_start + naca->xRamDiskSize * PAGE_SIZE;
initrd_below_start_ok = 1; // ramdisk in kernel space initrd_below_start_ok = 1; // ramdisk in kernel space
ROOT_DEV = MKDEV( RAMDISK_MAJOR, 0 ); ROOT_DEV = mk_kdev( RAMDISK_MAJOR, 0 );
if ( ((rd_size*1024)/PAGE_SIZE) < naca->xRamDiskSize ) if ( ((rd_size*1024)/PAGE_SIZE) < naca->xRamDiskSize )
rd_size = (naca->xRamDiskSize*PAGE_SIZE)/1024; rd_size = (naca->xRamDiskSize*PAGE_SIZE)/1024;
...@@ -304,7 +304,7 @@ iSeries_init_early(void) ...@@ -304,7 +304,7 @@ iSeries_init_early(void)
#endif /* CONFIG_BLK_DEV_INITRD */ #endif /* CONFIG_BLK_DEV_INITRD */
{ {
/* ROOT_DEV = MKDEV( VIODASD_MAJOR, 1 ); */ /* ROOT_DEV = mk_kdev( VIODASD_MAJOR, 1 ); */
} }
iSeries_recal_tb = get_tb(); iSeries_recal_tb = get_tb();
......
...@@ -68,15 +68,18 @@ static void yield_shared_processor(void) ...@@ -68,15 +68,18 @@ static void yield_shared_processor(void)
int cpu_idle(void) int cpu_idle(void)
{ {
struct Paca *lpaca; struct paca_struct *lpaca;
long oldval; long oldval;
unsigned long CTRL; unsigned long CTRL;
#warning fix iseries run light
#if 0
/* ensure iSeries run light will be out when idle */ /* ensure iSeries run light will be out when idle */
current->thread.flags &= ~PPC_FLAG_RUN_LIGHT; current->thread.flags &= ~PPC_FLAG_RUN_LIGHT;
CTRL = mfspr(CTRLF); CTRL = mfspr(CTRLF);
CTRL &= ~RUNLATCH; CTRL &= ~RUNLATCH;
mtspr(CTRLT, CTRL); mtspr(CTRLT, CTRL);
#endif
lpaca = get_paca(); lpaca = get_paca();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment