ppc64: fixes for iseries

arch/ppc64/kernel/iSeries_setup.c

@@ -295,7 +295,7 @@ iSeries_init_early(void)
 		initrd_start = (unsigned long)__va(naca->xRamDisk);
 		initrd_end   = initrd_start + naca->xRamDiskSize * PAGE_SIZE;
 		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 )
 			rd_size = (naca->xRamDiskSize*PAGE_SIZE)/1024;
@@ -304,7 +304,7 @@ iSeries_init_early(void)
 #endif /* CONFIG_BLK_DEV_INITRD */
 	  {
                 
-	    /*		ROOT_DEV = MKDEV( VIODASD_MAJOR, 1 ); */
+	    /*		ROOT_DEV = mk_kdev( VIODASD_MAJOR, 1 ); */
 	  }
 
 	iSeries_recal_tb = get_tb();

arch/ppc64/kernel/idle.c

@@ -68,15 +68,18 @@ static void yield_shared_processor(void)
 
 int cpu_idle(void)
 {
-	struct Paca *lpaca;
+	struct paca_struct *lpaca;
 	long oldval;
 	unsigned long CTRL;
 
+#warning fix iseries run light
+#if 0
 	/* ensure iSeries run light will be out when idle */
 	current->thread.flags &= ~PPC_FLAG_RUN_LIGHT;
 	CTRL = mfspr(CTRLF);
 	CTRL &= ~RUNLATCH;
 	mtspr(CTRLT, CTRL);
+#endif
 
 	lpaca = get_paca();