powerpc: Tidy up a bit after removal of PowerPC 601. (2e38ea48) · Commits · 戴 / test

arch/powerpc/kernel/btext.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -95,13 +95,10 @@ void __init btext_prepare_BAT(void)
		boot_text_mapped = 0;
		return;
		}
		{
		/* 603, 604, G3, G4, ... */
		lowbits = addr & ~0xFF000000UL;
		addr &= 0xFF000000UL;
		disp_BAT[0] = vaddr \| (BL_16M<<2) \| 2;
		disp_BAT[1] = addr \| (_PAGE_NO_CACHE \| _PAGE_GUARDED \| BPP_RW);
		}
		logicalDisplayBase = (void *) (vaddr + lowbits);
		}
		#endif

+20 −25

Original line number	Diff line number	Diff line
		@@ -73,8 +73,6 @@ unsigned long p_block_mapped(phys_addr_t pa)
		static int find_free_bat(void)
		{
		int b;

		{
		int n = mmu_has_feature(MMU_FTR_USE_HIGH_BATS) ? 8 : 4;

		for (b = 0; b < n; b++) {
		@@ -83,7 +81,6 @@ static int find_free_bat(void)
		if (!(bat[1].batu & 3))
		return b;
		}
		}
		return -1;
		}

		@@ -280,7 +277,6 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys,
		flags &= ~_PAGE_COHERENT;

		bl = (size >> 17) - 1;
		{
		/* Do DBAT first */
		wimgxpp = flags & (_PAGE_WRITETHRU \| _PAGE_NO_CACHE
		\| _PAGE_COHERENT \| _PAGE_GUARDED);
		@@ -297,7 +293,6 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys,
		bat[0] = bat[1];
		else
		bat[0].batu = bat[0].batl = 0;
		}

		bat_addrs[index].start = virt;
		bat_addrs[index].limit = virt + ((bl + 1) << 17) - 1;