Skip to content

Commit 8a53197

Browse files
authored
feat: merge overlapping reserved memory regions from FDT (#70)
* feat: merge overlapping reserved memory regions from FDT * fix overwritable * fix overwritable * fix err --------- Co-authored-by: szy <songzhyo@qq.com>
1 parent 4b6aedc commit 8a53197

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

crates/ranges-ext/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pub trait VecOp<T: RangeOp>: Send + 'static {
105105
// 检查是否有重叠: new.start < existing.end && new.end > existing.start
106106
if new_range.start < existing_range.end && new_range.end > existing_range.start {
107107
// 有重叠,检查是否可覆盖
108-
if !existing.overwritable(&item) {
108+
if !(existing.overwritable(&item) || existing.mergeable(&item)) {
109109
// 不可覆盖,返回冲突错误
110110
return Err(RangeError::Conflict {
111111
new: item,

0 commit comments

Comments
 (0)