diff --git a/[refs] b/[refs] index 59ffec83550a..b4e8d5e79bfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0dcec8c27ba44cd11c6e68c46d5fd553818a3837 +refs/heads/master: d2b0261506602bd969164879206027b30358ffdf diff --git a/trunk/include/linux/percpu.h b/trunk/include/linux/percpu.h index 910beb0abea2..d8e5a9abbce0 100644 --- a/trunk/include/linux/percpu.h +++ b/trunk/include/linux/percpu.h @@ -157,7 +157,7 @@ static inline void *__alloc_percpu(size_t size, size_t align) * percpu sections on SMP for which this path isn't used. */ WARN_ON_ONCE(align > __alignof__(unsigned long long)); - return kzalloc(size, gfp); + return kzalloc(size, GFP_KERNEL); } static inline void free_percpu(void *p)