diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-28 16:56:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-28 16:56:10 +1000 |
| commit | f4bd21583b4299129a76283a282e90e80b562243 (patch) | |
| tree | c55a37283c35deeda0d211124d44dd1e0e10c2f2 | |
| parent | adfc987237b3058e04cb2e3af53559d584e01e70 (diff) | |
| parent | 4733fd328f14280900435d9dbae1487d110a4d56 (diff) | |
Merge branch 'mtmp'
Conflicts:
drivers/usb/serial/usb-serial.c
| -rw-r--r-- | arch/mips/include/asm/pgalloc.h | 11 | ||||
| -rw-r--r-- | arch/sh/include/asm/pgalloc.h | 8 |
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h index f705735feefc..3738f4b48cbd 100644 --- a/arch/mips/include/asm/pgalloc.h +++ b/arch/mips/include/asm/pgalloc.h @@ -104,17 +104,6 @@ do { \ tlb_remove_page((tlb), pte); \ } while (0) -#ifdef CONFIG_32BIT - -/* - * allocating and freeing a pmd is trivial: the 1-entry pmd is - * inside the pgd, so has no extra memory associated with it. - */ -#define pmd_free(mm, x) do { } while (0) -#define __pmd_free_tlb(tlb, x, addr) do { } while (0) - -#endif - #ifdef CONFIG_64BIT static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h index 89a482750a5b..63ca37bd9a95 100644 --- a/arch/sh/include/asm/pgalloc.h +++ b/arch/sh/include/asm/pgalloc.h @@ -79,14 +79,6 @@ do { \ tlb_remove_page((tlb), (pte)); \ } while (0) -/* - * allocating and freeing a pmd is trivial: the 1-entry pmd is - * inside the pgd, so has no extra memory associated with it. - */ - -#define pmd_free(mm, x) do { } while (0) -#define __pmd_free_tlb(tlb,x,addr) do { } while (0) - static inline void check_pgt_cache(void) { quicklist_trim(QUICK_PGD, NULL, 25, 16); |