diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-12-14 09:31:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-12-14 09:31:23 +0100 |
| commit | 057032e457f702e2f4af18cfa99c3afab6841d24 (patch) | |
| tree | d46c8325756a3a2be28c286b1408e2e314e3dafb /drivers/base/memory.c | |
| parent | 54c9238cfd495d234b0e02fa7dcce5b1671a42dd (diff) | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
Merge tag 'v4.4-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/base/memory.c')
| -rw-r--r-- | drivers/base/memory.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 2804aed3f416..25425d3f2575 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -303,6 +303,10 @@ static int memory_subsys_offline(struct device *dev) if (mem->state == MEM_OFFLINE) return 0; + /* Can't offline block with non-present sections */ + if (mem->section_count != sections_per_block) + return -EINVAL; + return memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE); } |