summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/mach-fs/io.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-10-06 15:02:30 +0200
committerIngo Molnar <mingo@elte.hu>2009-10-06 15:02:34 +0200
commitd9b2002c406011164f245de7a81304625989f1c9 (patch)
treea2bb74773cd1409acbec5eb2fbba2ae9889d55e8 /arch/cris/arch-v32/mach-fs/io.c
parentperf report: Use kernel_maps__find_symbol as fallback to find vdsos, etc (diff)
parentperf_event: Provide vmalloc() based mmap() backing (diff)
downloadlinux-d9b2002c406011164f245de7a81304625989f1c9.tar.xz
linux-d9b2002c406011164f245de7a81304625989f1c9.zip
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/cris/arch-v32/mach-fs/io.c')
-rw-r--r--arch/cris/arch-v32/mach-fs/io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/mach-fs/io.c b/arch/cris/arch-v32/mach-fs/io.c
index cb6327b1f8f8..a6958661fa8e 100644
--- a/arch/cris/arch-v32/mach-fs/io.c
+++ b/arch/cris/arch-v32/mach-fs/io.c
@@ -52,7 +52,7 @@ struct crisv32_ioport crisv32_ioports[] = {
}
};
-#define NBR_OF_PORTS sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport)
+#define NBR_OF_PORTS ARRAY_SIZE(crisv32_ioports)
struct crisv32_iopin crisv32_led_net0_green;
struct crisv32_iopin crisv32_led_net0_red;