From: Ralf Baechle Date: Mon, 28 Nov 2011 19:52:49 +0000 (+0000) Subject: Merge branch 'next/generic' into mips-for-linux-next X-Git-Tag: next-20111129~74^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e447040d18d56484d9b8db19a0215af8175b0021;p=karo-tx-linux.git Merge branch 'next/generic' into mips-for-linux-next --- e447040d18d56484d9b8db19a0215af8175b0021 diff --cc arch/mips/include/asm/pgtable-32.h index 469390656c3f,d169c07c38ee..5d56bb230345 --- a/arch/mips/include/asm/pgtable-32.h +++ b/arch/mips/include/asm/pgtable-32.h @@@ -19,17 -19,12 +19,7 @@@ #include /* - * - add_temporary_entry() add a temporary TLB entry. We use TLB entries - * starting at the top and working down. This is for populating the - * TLB before trap_init() puts the TLB miss handler in place. It - * should be used only for entries matching the actual page tables, - * to prevent inconsistencies. - * - add_wired_entry() add a fixed TLB entry, and move wired register -- */ - extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, -extern void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, -- unsigned long entryhi, unsigned long pagemask); - -- --/* Basically we have the same two-level (which is the logical three level ++ * Basically we have the same two-level (which is the logical three level * Linux page table layout folded) page tables as the i386. Some day * when we have proper page coloring support we can have a 1% quicker * tlb refill handling mechanism, but for now it is a bit slower but