From 6abd9c204a57fd955713fe0e521506e5383cd807 Mon Sep 17 00:00:00 2001 From: Vitaly Mayatskikh Date: Tue, 11 May 2010 14:06:51 -0700 Subject: [PATCH] --- yaml --- r: 190783 b: refs/heads/master c: 475f9aa6aa538befcbd0fa95bdebada600f247cd h: refs/heads/master i: 190781: 289e1b563da3cd0faf42a571d19ecba09fd1a095 190779: 9bb3777cce5567a960b43b409a31e634a8ca85b8 190775: 5ac198fd97d91ecb59acb2b8f9adf11838e31bab 190767: 97a03b73a01fb4f3bbb4676ea6cfe6c068bf1ce3 190751: a4921c4b0be83d975209f3082afcdc24395b4df4 190719: a5575fcfc6bc8edfa1c371656f6d8e04c7d7875d v: v3 --- [refs] | 2 +- trunk/kernel/kexec.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cf6c4e311166..270848590ca7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d586ebbb8814e039545d38f69029533f3f17748d +refs/heads/master: 475f9aa6aa538befcbd0fa95bdebada600f247cd diff --git a/trunk/kernel/kexec.c b/trunk/kernel/kexec.c index 87ebe8adc474..474a84715eac 100644 --- a/trunk/kernel/kexec.c +++ b/trunk/kernel/kexec.c @@ -1134,11 +1134,9 @@ int crash_shrink_memory(unsigned long new_size) free_reserved_phys_range(end, crashk_res.end); - if (start == end) { - crashk_res.end = end; + if (start == end) release_resource(&crashk_res); - } else - crashk_res.end = end - 1; + crashk_res.end = end - 1; unlock: mutex_unlock(&kexec_mutex);