From 24d56158cb4435f4e4a4fe0c4d558a34435a8298 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 17 Jun 2009 13:13:58 -0700 Subject: [PATCH] --- yaml --- r: 157118 b: refs/heads/master c: dc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/motorola_pgalloc.h | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f502804dcb3e..d1ed3cbe0e92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd9b3e84f2095ed19582f4df5d20e1e40c01ca3c +refs/heads/master: dc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8 diff --git a/trunk/arch/m68k/include/asm/motorola_pgalloc.h b/trunk/arch/m68k/include/asm/motorola_pgalloc.h index 15ee4c74a9f0..2f02f264e694 100644 --- a/trunk/arch/m68k/include/asm/motorola_pgalloc.h +++ b/trunk/arch/m68k/include/asm/motorola_pgalloc.h @@ -36,12 +36,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres return NULL; pte = kmap(page); - if (pte) { - __flush_page_to_ram(pte); - flush_tlb_kernel_page(pte); - nocache_page(pte); - } - kunmap(pte); + __flush_page_to_ram(pte); + flush_tlb_kernel_page(pte); + nocache_page(pte); + kunmap(page); pgtable_page_ctor(page); return page; }