Skip to content

Commit eb5b0f9

Browse files
committed
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()
2 parents 4ffc458 + d21dffe commit eb5b0f9

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

arch/sparc/mm/leon_mm.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,10 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr)
3939
unsigned int ctxtbl;
4040
unsigned int pgd, pmd, ped;
4141
unsigned int ptr;
42-
unsigned int lvl, pte, paddrbase;
42+
unsigned int lvl, pte;
4343
unsigned int ctx;
4444
unsigned int paddr_calc;
4545

46-
paddrbase = 0;
47-
4846
if (srmmu_swprobe_trace)
4947
printk(KERN_INFO "swprobe: trace on\n");
5048

@@ -73,7 +71,6 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr)
7371
printk(KERN_INFO "swprobe: pgd is entry level 3\n");
7472
lvl = 3;
7573
pte = pgd;
76-
paddrbase = pgd & _SRMMU_PTE_PMASK_LEON;
7774
goto ready;
7875
}
7976
if (((pgd & SRMMU_ET_MASK) != SRMMU_ET_PTD)) {
@@ -96,7 +93,6 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr)
9693
printk(KERN_INFO "swprobe: pmd is entry level 2\n");
9794
lvl = 2;
9895
pte = pmd;
99-
paddrbase = pmd & _SRMMU_PTE_PMASK_LEON;
10096
goto ready;
10197
}
10298
if (((pmd & SRMMU_ET_MASK) != SRMMU_ET_PTD)) {
@@ -124,7 +120,6 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr)
124120
printk(KERN_INFO "swprobe: ped is entry level 1\n");
125121
lvl = 1;
126122
pte = ped;
127-
paddrbase = ped & _SRMMU_PTE_PMASK_LEON;
128123
goto ready;
129124
}
130125
if (((ped & SRMMU_ET_MASK) != SRMMU_ET_PTD)) {
@@ -147,7 +142,6 @@ unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr)
147142
printk(KERN_INFO "swprobe: ptr is entry level 0\n");
148143
lvl = 0;
149144
pte = ptr;
150-
paddrbase = ptr & _SRMMU_PTE_PMASK_LEON;
151145
goto ready;
152146
}
153147
if (srmmu_swprobe_trace)

0 commit comments

Comments
 (0)