From d7de672580f1f7131dd65bcbb237d24b0ee0bc3f Mon Sep 17 00:00:00 2001 From: Franck Bui-Huu Date: Thu, 18 Oct 2007 09:11:16 +0200 Subject: [PATCH] --- yaml --- r: 78028 b: refs/heads/master c: cbdbe07f9d60b80c903bddf6533db839789925c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/mm/tlbex.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 963c367928c9..3327b20f401e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f49b94d8c111e86e4e04a5a0eb83988d9d935d56 +refs/heads/master: cbdbe07f9d60b80c903bddf6533db839789925c7 diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c index 325bc730ab5e..21bcf084882f 100644 --- a/trunk/arch/mips/mm/tlbex.c +++ b/trunk/arch/mips/mm/tlbex.c @@ -1391,18 +1391,15 @@ static void __init build_r4000_tlb_refill_handler(void) extern void tlb_do_page_fault_0(void); extern void tlb_do_page_fault_1(void); -#define __tlb_handler_align \ - __attribute__((__aligned__(1 << CONFIG_MIPS_L1_CACHE_SHIFT))) - /* * 128 instructions for the fastpath handler is generous and should * never be exceeded. */ #define FASTPATH_SIZE 128 -u32 __tlb_handler_align handle_tlbl[FASTPATH_SIZE]; -u32 __tlb_handler_align handle_tlbs[FASTPATH_SIZE]; -u32 __tlb_handler_align handle_tlbm[FASTPATH_SIZE]; +u32 handle_tlbl[FASTPATH_SIZE] __cacheline_aligned; +u32 handle_tlbs[FASTPATH_SIZE] __cacheline_aligned; +u32 handle_tlbm[FASTPATH_SIZE] __cacheline_aligned; static void __init iPTE_LW(u32 **p, struct label **l, unsigned int pte, unsigned int ptr)