diff --git a/[refs] b/[refs] index f9baec6b2d7d..ff9e4bfc0406 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b6d1f12f9c4e0e420d5747d3ae285d8f66d627f +refs/heads/master: e5f5762177be52fde50ccba88938d66b5103c8e0 diff --git a/trunk/include/linux/freezer.h b/trunk/include/linux/freezer.h index d09af4b67cf1..b90091af5798 100644 --- a/trunk/include/linux/freezer.h +++ b/trunk/include/linux/freezer.h @@ -177,6 +177,7 @@ static inline int freeze_kernel_threads(void) { return -ENOSYS; } static inline void thaw_processes(void) {} static inline void thaw_kernel_threads(void) {} +static inline bool try_to_freeze_nowarn(void) { return false; } static inline bool try_to_freeze(void) { return false; } static inline void freezer_do_not_count(void) {}