提交 ea5e1a82 编写于 作者: A Ahmed S. Darwish 提交者: Linus Torvalds

[PATCH] M68K: user ARRAY_SIZE macro when appropriate

Use ARRAY_SIZE macro already defined in linux/kernel.h
Signed-off-by: NAhmed S. Darwish <darwish.07@gmail.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 bf0059b2
...@@ -76,7 +76,7 @@ static inline long get_reg(struct task_struct *task, int regno) ...@@ -76,7 +76,7 @@ static inline long get_reg(struct task_struct *task, int regno)
if (regno == PT_USP) if (regno == PT_USP)
addr = &task->thread.usp; addr = &task->thread.usp;
else if (regno < sizeof(regoff)/sizeof(regoff[0])) else if (regno < ARRAY_SIZE(regoff))
addr = (unsigned long *)(task->thread.esp0 + regoff[regno]); addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
else else
return 0; return 0;
...@@ -93,7 +93,7 @@ static inline int put_reg(struct task_struct *task, int regno, ...@@ -93,7 +93,7 @@ static inline int put_reg(struct task_struct *task, int regno,
if (regno == PT_USP) if (regno == PT_USP)
addr = &task->thread.usp; addr = &task->thread.usp;
else if (regno < sizeof(regoff)/sizeof(regoff[0])) else if (regno < ARRAY_SIZE(regoff))
addr = (unsigned long *)(task->thread.esp0 + regoff[regno]); addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
else else
return -1; return -1;
......
...@@ -1011,7 +1011,7 @@ EXPORT_SYMBOL(dump_stack); ...@@ -1011,7 +1011,7 @@ EXPORT_SYMBOL(dump_stack);
void bad_super_trap (struct frame *fp) void bad_super_trap (struct frame *fp)
{ {
console_verbose(); console_verbose();
if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0])) if (fp->ptregs.vector < 4 * ARRAY_SIZE(vec_names))
printk ("*** %s *** FORMAT=%X\n", printk ("*** %s *** FORMAT=%X\n",
vec_names[(fp->ptregs.vector) >> 2], vec_names[(fp->ptregs.vector) >> 2],
fp->ptregs.format); fp->ptregs.format);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册