diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-07 21:34:03 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-07 21:34:03 -0500 |
| commit | 2e18e047981ae04be9bd0d9760057f7c1a7b3785 (patch) | |
| tree | 999941abf466ce4d6915273e2e7a42bf0a107385 /mm | |
| parent | b06ede84dd1473dec7c6af03a41c8d04d2fee437 (diff) | |
| parent | cfefe99795251d76d92e8457f4152f532a961ec5 (diff) | |
Merge branch 'sh/dmaengine'
Conflicts:
arch/sh/drivers/dma/dma-sh.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/migrate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index efddbf0926b2..9a0db5bbabe4 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -912,6 +912,9 @@ static int do_pages_move(struct mm_struct *mm, struct task_struct *task, | |||
| 912 | goto out_pm; | 912 | goto out_pm; |
| 913 | 913 | ||
| 914 | err = -ENODEV; | 914 | err = -ENODEV; |
| 915 | if (node < 0 || node >= MAX_NUMNODES) | ||
| 916 | goto out_pm; | ||
| 917 | |||
| 915 | if (!node_state(node, N_HIGH_MEMORY)) | 918 | if (!node_state(node, N_HIGH_MEMORY)) |
| 916 | goto out_pm; | 919 | goto out_pm; |
| 917 | 920 | ||