diff --git a/[refs] b/[refs] index c00021b4c2c5..512dcd1a2c54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a +refs/heads/master: 4c8bd7eeee4c8f157fb61fb64b57500990b42e0e diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index 851aa1bcfc1a..2b2ae4fdce8b 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -31,7 +31,7 @@ extern const char linux_banner[]; #define STACK_MAGIC 0xdeadbeef #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1)) +#define ALIGN(x,a) (((x)+(a)-1UL)&~((a)-1UL)) #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))