Merge tag 'kbuild-fixes-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahi...

[linux-block.git] / include / linux / mempolicy.h

diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 3c7595e81150b783c7c666966dea2e18def99be1..d232de7cdc569f88adb5e2fe5d978fcaa68b2cc2 100644 (file)
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -46,6 +46,7 @@ struct mempolicy {
        unsigned short mode;    /* See MPOL_* above */
        unsigned short flags;   /* See set_mempolicy() MPOL_F_* above */
        nodemask_t nodes;       /* interleave/bind/perfer */
+       int home_node;          /* Home node to use for MPOL_BIND and MPOL_PREFERRED_MANY */
 
        union {
                nodemask_t cpuset_mems_allowed; /* relative to these nodes */
@@ -150,13 +151,6 @@ extern bool mempolicy_in_oom_domain(struct task_struct *tsk,
                                const nodemask_t *mask);
 extern nodemask_t *policy_nodemask(gfp_t gfp, struct mempolicy *policy);
 
-static inline nodemask_t *policy_nodemask_current(gfp_t gfp)
-{
-       struct mempolicy *mpol = get_task_policy(current);
-
-       return policy_nodemask(gfp, mpol);
-}
-
 extern unsigned int mempolicy_slab_node(void);
 
 extern enum zone_type policy_zone;
@@ -188,6 +182,7 @@ static inline bool mpol_is_preferred_many(struct mempolicy *pol)
        return  (pol->mode == MPOL_PREFERRED_MANY);
 }
 
+extern bool apply_policy_zone(struct mempolicy *policy, enum zone_type zone);
 
 #else
 
@@ -293,11 +288,6 @@ static inline void mpol_put_task_policy(struct task_struct *task)
 {
 }
 
-static inline nodemask_t *policy_nodemask_current(gfp_t gfp)
-{
-       return NULL;
-}
-
 static inline bool mpol_is_preferred_many(struct mempolicy *pol)
 {
        return  false;