From 4304d7335c79ac1c4d905ebc7774167947935856 Mon Sep 17 00:00:00 2001 From: "Ahmed S. Darwish" Date: Sat, 10 Feb 2007 01:43:51 -0800 Subject: [PATCH] --- yaml --- r: 47439 b: refs/heads/master c: 8447157a1ac467fae2125074f3693f557c8e05d3 h: refs/heads/master i: 47437: 1b3fedf3bf4aaf9af7e3eda40fc60c8151afba03 47435: 4816632ed7cfa0e59d4d1bf1c65d9ec769ede823 47431: ea413e158a847e17248cc4840c30c56357c21e60 47423: 6499b36ae829aaa905b7866ff166cb66b6008ef5 v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/drivers/axisflashmap.c | 3 +-- trunk/arch/cris/mm/tlb.c | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b5a3b2331754..51caf7855729 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 047c7c42327433a13ed2971de41ef7c6943b37ec +refs/heads/master: 8447157a1ac467fae2125074f3693f557c8e05d3 diff --git a/trunk/arch/cris/arch-v10/drivers/axisflashmap.c b/trunk/arch/cris/arch-v10/drivers/axisflashmap.c index ffade19a14e6..efd7b0f3a910 100644 --- a/trunk/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/trunk/arch/cris/arch-v10/drivers/axisflashmap.c @@ -359,8 +359,7 @@ static struct mtd_info *flash_probe(void) * So we use the MTD concatenation layer instead of further * complicating the probing procedure. */ - mtd_cse = mtd_concat_create(mtds, - sizeof(mtds) / sizeof(mtds[0]), + mtd_cse = mtd_concat_create(mtds, ARRAY_SIZE(mtds), "cse0+cse1"); #else printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel " diff --git a/trunk/arch/cris/mm/tlb.c b/trunk/arch/cris/mm/tlb.c index 0df390a656cd..c4a98e2e529e 100644 --- a/trunk/arch/cris/mm/tlb.c +++ b/trunk/arch/cris/mm/tlb.c @@ -8,6 +8,7 @@ */ #include +#include #include #define D(x) @@ -100,7 +101,7 @@ tlb_init(void) /* clear the page_id map */ - for (i = 1; i < sizeof (page_id_map) / sizeof (page_id_map[0]); i++) + for (i = 1; i < ARRAY_SIZE(page_id_map); i++) page_id_map[i] = NULL; /* invalidate the entire TLB */