Commit eb5b0f98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sparc-for-6.12-tag1' of... 

Merge tag 'sparc-for-6.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc

Pull sparc32 update from Andreas Larsson:

 - Remove an unused variable for sparc32

* tag 'sparc-for-6.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc:
  arch/sparc: remove unused varible paddrbase in function leon_swprobe()
parents 4ffc4580 d21dffe5

arch/sparc/mm/leon_mm.c

+1 −7
Original line number Diff line number Diff line
@@ -39,12 +39,10 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr) 
	unsigned int ctxtbl;

	unsigned int pgd, pmd, ped;

	unsigned int ptr;

	unsigned int lvl, pte, paddrbase;

	unsigned int lvl, pte;

	unsigned int ctx;

	unsigned int paddr_calc;



	paddrbase = 0;



	if (srmmu_swprobe_trace)

		printk(KERN_INFO "swprobe: trace on\n");
@@ -73,7 +71,6 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr) 
			printk(KERN_INFO "swprobe: pgd is entry level 3\n");

		lvl = 3;

		pte = pgd;

		paddrbase = pgd & _SRMMU_PTE_PMASK_LEON;

		goto ready;

	}

	if (((pgd & SRMMU_ET_MASK) != SRMMU_ET_PTD)) {
@@ -96,7 +93,6 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr) 
			printk(KERN_INFO "swprobe: pmd is entry level 2\n");

		lvl = 2;

		pte = pmd;

		paddrbase = pmd & _SRMMU_PTE_PMASK_LEON;

		goto ready;

	}

	if (((pmd & SRMMU_ET_MASK) != SRMMU_ET_PTD)) {
@@ -124,7 +120,6 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr) 
			printk(KERN_INFO "swprobe: ped is entry level 1\n");

		lvl = 1;

		pte = ped;

		paddrbase = ped & _SRMMU_PTE_PMASK_LEON;

		goto ready;

	}

	if (((ped & SRMMU_ET_MASK) != SRMMU_ET_PTD)) {
@@ -147,7 +142,6 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr) 
			printk(KERN_INFO "swprobe: ptr is entry level 0\n");

		lvl = 0;

		pte = ptr;

		paddrbase = ptr & _SRMMU_PTE_PMASK_LEON;

		goto ready;

	}

	if (srmmu_swprobe_trace)