Skip to content
Commit 05418815 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

range: Do not add new blank slot with add_range_with_merge



Joshua reported: Commit cd7b304d (x86, range: fix missing merge
during add range) broke mtrr cleanup on his setup in 3.9.5.
corresponding commit in upstream is fbe06b7b.

The reason is add_range_with_merge could generate blank spot.

We could avoid that by searching new expanded start/end, that
new range should include all connected ranges in range array.
At last add the new expanded start/end to the range array.
Also move up left array so do not add new blank slot in the
range array.

-v2: move left array to avoid enhance add_range()
-v3: include fix from Joshua about memmove declaring when
     DYN_DEBUG is used.

Reported-by: default avatarJoshua Covington <joshuacov@googlemail.com>
Tested-by: default avatarJoshua Covington <joshuacov@googlemail.com>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1371154622-8929-3-git-send-email-yinghai@kernel.org


Cc: <stable@vger.kernel.org> v3.9
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent d8d386c1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment