Magellan Linux

Annotation of /trunk/kernel26-magellan/patches-2.6.16-r12/0123-2.6.16.12-mips-tx49_blast_icache32_page_indexed.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 72 - (hide annotations) (download)
Mon Jun 5 09:25:38 2006 UTC (17 years, 11 months ago) by niro
File size: 1141 byte(s)
ver bump to 2.6.16-r12:
- updated to linux-2.6.16.19
- updated to ck11

1 niro 72 From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
2     Date: Wed, 26 Apr 2006 23:00:03 +0000 (+0100)
3     Subject: [PATCH] MIPS: Fix tx49_blast_icache32_page_indexed.
4     X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/stable/linux-2.6.16.y.git;a=commitdiff;h=2d3b5e296167443bf42c1c962a0cb7ebde9b016b
5    
6     [PATCH] MIPS: Fix tx49_blast_icache32_page_indexed.
7    
8     Fix the cache index value in tx49_blast_icache32_page_indexed().
9     This is damage by de62893bc0725f8b5f0445250577cd7a10b2d8f8 commit.
10    
11     Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
12     Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
13     Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14     ---
15    
16     --- a/arch/mips/mm/c-r4k.c
17     +++ b/arch/mips/mm/c-r4k.c
18     @@ -154,7 +154,8 @@ static inline void blast_icache32_r4600_
19    
20     static inline void tx49_blast_icache32_page_indexed(unsigned long page)
21     {
22     - unsigned long start = page;
23     + unsigned long indexmask = current_cpu_data.icache.waysize - 1;
24     + unsigned long start = INDEX_BASE + (page & indexmask);
25     unsigned long end = start + PAGE_SIZE;
26     unsigned long ws_inc = 1UL << current_cpu_data.icache.waybit;
27     unsigned long ws_end = current_cpu_data.icache.ways <<