kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] M68KNOMMU: user ARRAY_SIZE macro when appropriate

Browse source 
Use ARRAY_SIZE macro already defined in linux/kernel.h

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ahmed S. Darwish 2007-02-10 01:43:46 -08:00 committed by Linus Torvalds
parent dc29a3657b
commit bf0059b23f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/m68knommu/kernel/ptrace.c
View file

@ -62,7 +62,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;
@ -79,7 +79,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;

2
arch/m68knommu/kernel/traps.c
View file

@ -158,7 +158,7 @@ void show_stack(struct task_struct *task, unsigned long *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 (KERN_WARNING "*** %s *** FORMAT=%X\n", printk (KERN_WARNING "*** %s *** FORMAT=%X\n",
vec_names[(fp->ptregs.vector) >> 2], vec_names[(fp->ptregs.vector) >> 2],
fp->ptregs.format); fp->ptregs.format);