Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51fae6de authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Add a is_kernel_addr() macro 



There's a bunch of code that compares an address with KERNELBASE to see if
it's a "kernel address", ie. >= KERNELBASE. The proper test is actually to
compare with PAGE_OFFSET, since we're going to change KERNELBASE soon.

So replace all of them with an is_kernel_addr() macro that does that.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent cd0ca2ce

arch/powerpc/kernel/prom_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1994,7 +1994,7 @@ static void __init prom_check_initrd(unsigned long r3, unsigned long r4) 
	if (r3 && r4 && r4 != 0xdeadbeef) {

		unsigned long val;



		RELOC(prom_initrd_start) = (r3 >= KERNELBASE) ? __pa(r3) : r3;

		RELOC(prom_initrd_start) = is_kernel_addr(r3) ? __pa(r3) : r3;

		RELOC(prom_initrd_end) = RELOC(prom_initrd_start) + r4;



		val = RELOC(prom_initrd_start);

arch/powerpc/kernel/setup-common.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ void __init check_for_initrd(void) 
	/* If we were passed an initrd, set the ROOT_DEV properly if the values

	 * look sensible. If not, clear initrd reference.

	 */

	if (initrd_start >= KERNELBASE && initrd_end >= KERNELBASE &&

	if (is_kernel_addr(initrd_start) && is_kernel_addr(initrd_end) &&

	    initrd_end > initrd_start)

		ROOT_DEV = Root_RAM0;

	else

arch/powerpc/mm/slb.c

+3 −3
Original line number Diff line number Diff line
@@ -134,14 +134,14 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm) 
	else

		unmapped_base = TASK_UNMAPPED_BASE_USER64;



	if (pc >= KERNELBASE)

	if (is_kernel_addr(pc))

		return;

	slb_allocate(pc);



	if (GET_ESID(pc) == GET_ESID(stack))

		return;



	if (stack >= KERNELBASE)

	if (is_kernel_addr(stack))

		return;

	slb_allocate(stack);
@@ -149,7 +149,7 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm) 
	    || (GET_ESID(stack) == GET_ESID(unmapped_base)))

		return;



	if (unmapped_base >= KERNELBASE)

	if (is_kernel_addr(unmapped_base))

		return;

	slb_allocate(unmapped_base);

}

arch/powerpc/mm/stab.c

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int __ste_allocate(unsigned long ea, struct mm_struct *mm) 
	unsigned long offset;



	/* Kernel or user address? */

	if (ea >= KERNELBASE) {

	if (is_kernel_addr(ea)) {

		vsid = get_kernel_vsid(ea);

	} else {

		if ((ea >= TASK_SIZE_USER64) || (! mm))
@@ -133,7 +133,7 @@ static int __ste_allocate(unsigned long ea, struct mm_struct *mm) 


	stab_entry = make_ste(get_paca()->stab_addr, GET_ESID(ea), vsid);



	if (ea < KERNELBASE) {

	if (!is_kernel_addr(ea)) {

		offset = __get_cpu_var(stab_cache_ptr);

		if (offset < NR_STAB_CACHE_ENTRIES)

			__get_cpu_var(stab_cache[offset++]) = stab_entry;
@@ -190,7 +190,7 @@ void switch_stab(struct task_struct *tsk, struct mm_struct *mm) 
		     entry++, ste++) {

			unsigned long ea;

			ea = ste->esid_data & ESID_MASK;

			if (ea < KERNELBASE) {

			if (!is_kernel_addr(ea)) {

				ste->esid_data = 0;

			}

		}

arch/powerpc/mm/tlb_64.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void hpte_update(struct mm_struct *mm, unsigned long addr, 
		batch->mm = mm;

		batch->psize = psize;

	}

	if (addr < KERNELBASE) {

	if (!is_kernel_addr(addr)) {

		vsid = get_vsid(mm->context.id, addr);

		WARN_ON(vsid == 0);

	} else