diff options
| author | Matthew Garrett <mjg@redhat.com> | 2010-05-17 12:11:21 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-05-17 12:11:21 -0400 |
| commit | a1e66dd0515c8cfa72b8e2a3834d59548cf84ba5 (patch) | |
| tree | e1e1edf210c8dde6edbdfa32ed6ff59ac553729b /kernel/kexec.c | |
| parent | d89d63a973986bf6c1d8b28ab62eb61491a3bb34 (diff) | |
| parent | 6c62673cf58516e1b82329ac90ebf3ff3f485672 (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'kernel/kexec.c')
| -rw-r--r-- | kernel/kexec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 87ebe8adc474..474a84715eac 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
| @@ -1134,11 +1134,9 @@ int crash_shrink_memory(unsigned long new_size) | |||
| 1134 | 1134 | ||
| 1135 | free_reserved_phys_range(end, crashk_res.end); | 1135 | free_reserved_phys_range(end, crashk_res.end); |
| 1136 | 1136 | ||
| 1137 | if (start == end) { | 1137 | if (start == end) |
| 1138 | crashk_res.end = end; | ||
| 1139 | release_resource(&crashk_res); | 1138 | release_resource(&crashk_res); |
| 1140 | } else | 1139 | crashk_res.end = end - 1; |
| 1141 | crashk_res.end = end - 1; | ||
| 1142 | 1140 | ||
| 1143 | unlock: | 1141 | unlock: |
| 1144 | mutex_unlock(&kexec_mutex); | 1142 | mutex_unlock(&kexec_mutex); |
