sparc64: merge fix

[karo-tx-linux.git] / arch / sparc / mm / init_64.c

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 6b643790e4fe016105b9525c5ae77d07c5f20512..5322e530d09cf9cbbb459198a1613997c5bf9964 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2565,8 +2565,6 @@ pgtable_t pte_alloc_one(struct mm_struct *mm,
 {
        struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK |
                                       __GFP_REPEAT | __GFP_ZERO);
-       pte_t *pte = NULL;
-
        if (!page)
                return NULL;
        if (!pgtable_page_ctor(page)) {