diff options
author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /mm/mempolicy.c | |
parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'mm/mempolicy.c')
-rw-r--r-- | mm/mempolicy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 78062ab641ff..959a8b8c7350 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -1979,8 +1979,7 @@ int __mpol_equal(struct mempolicy *a, struct mempolicy *b) | |||
1979 | case MPOL_INTERLEAVE: | 1979 | case MPOL_INTERLEAVE: |
1980 | return nodes_equal(a->v.nodes, b->v.nodes); | 1980 | return nodes_equal(a->v.nodes, b->v.nodes); |
1981 | case MPOL_PREFERRED: | 1981 | case MPOL_PREFERRED: |
1982 | return a->v.preferred_node == b->v.preferred_node && | 1982 | return a->v.preferred_node == b->v.preferred_node; |
1983 | a->flags == b->flags; | ||
1984 | default: | 1983 | default: |
1985 | BUG(); | 1984 | BUG(); |
1986 | return 0; | 1985 | return 0; |