From 090f8af6391cb49840f05866921b04336b63b413 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 2 Jul 2009 12:05:10 -0700 Subject: [PATCH] --- yaml --- r: 154757 b: refs/heads/master c: 43644679a1e80f53e6e0155ab75b1093ba3c0365 h: refs/heads/master i: 154755: 4ef0a6ee5aa047ddab5db1ac1ac79aec0e828c91 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/proto.h | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 39079072e9ee..81b298c8adce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42ca4fb69126dd9d0e25112edca1cacf846aa5c3 +refs/heads/master: 43644679a1e80f53e6e0155ab75b1093ba3c0365 diff --git a/trunk/arch/x86/include/asm/proto.h b/trunk/arch/x86/include/asm/proto.h index 49fb3ecf3bb3..621f56d73121 100644 --- a/trunk/arch/x86/include/asm/proto.h +++ b/trunk/arch/x86/include/asm/proto.h @@ -22,7 +22,14 @@ extern int reboot_force; long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); -#define round_up(x, y) (((x) + (y) - 1) & ~((y) - 1)) -#define round_down(x, y) ((x) & ~((y) - 1)) +/* + * 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 */