diff --git a/[refs] b/[refs] index 19af78e8a476..cb5972ed9970 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 060ec3d52db417a4fa554b6e14594ca62418c326 +refs/heads/master: 930631edd4b1fe2781d9fe90edbe35d89dfc94cc diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index 2b2ae4fdce8b..e44a37e2c71c 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -33,6 +33,7 @@ extern const char linux_banner[]; #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ALIGN(x,a) (((x)+(a)-1UL)&~((a)-1UL)) #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)) #define KERN_EMERG "<0>" /* system is unusable */