Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b3be9f9 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

Move round_up/down to kernel.h 



... in preparation of moving early_res to kernel/.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-26-git-send-email-yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 59be5a8e

arch/x86/include/asm/proto.h

+0 −10
Original line number Diff line number Diff line
@@ -23,14 +23,4 @@ extern int reboot_force; 


long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);



/*

 * This looks more complex than it should be. But we need to

 * get the type for the ~ right in round_down (it needs to be

 * as wide as the result!), and we want to evaluate the macro

 * arguments just once each.

 */

#define __round_mask(x,y) ((__typeof__(x))((y)-1))

#define round_up(x,y) ((((x)-1) | __round_mask(x,y))+1)

#define round_down(x,y) ((x) & ~__round_mask(x,y))



#endif /* _ASM_X86_PROTO_H */

include/linux/kernel.h

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ extern const char linux_proc_banner[]; 


#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))



/*

 * This looks more complex than it should be. But we need to

 * get the type for the ~ right in round_down (it needs to be

 * as wide as the result!), and we want to evaluate the macro

 * arguments just once each.

 */

#define __round_mask(x, y) ((__typeof__(x))((y)-1))

#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)

#define round_down(x, y) ((x) & ~__round_mask(x, y))



#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))

#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))

#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))