* Removed some dead code by applying a patch by lucian from ticket #6275,
thanks! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42970 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1999,7 +1999,6 @@ load_kernel_add_on(const char *path)
|
|||||||
struct elf_image_info *image;
|
struct elf_image_info *image;
|
||||||
const char *fileName;
|
const char *fileName;
|
||||||
void *reservedAddress;
|
void *reservedAddress;
|
||||||
addr_t start;
|
|
||||||
size_t reservedSize;
|
size_t reservedSize;
|
||||||
status_t status;
|
status_t status;
|
||||||
ssize_t length;
|
ssize_t length;
|
||||||
@@ -2125,7 +2124,6 @@ load_kernel_add_on(const char *path)
|
|||||||
goto error3;
|
goto error3;
|
||||||
}
|
}
|
||||||
|
|
||||||
start = (addr_t)reservedAddress;
|
|
||||||
image->data_region.size = 0;
|
image->data_region.size = 0;
|
||||||
image->text_region.size = 0;
|
image->text_region.size = 0;
|
||||||
|
|
||||||
@@ -2212,17 +2210,6 @@ load_kernel_add_on(const char *path)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the segment order
|
|
||||||
elf_region *firstRegion;
|
|
||||||
elf_region *secondRegion;
|
|
||||||
if (image->text_region.start < image->data_region.start) {
|
|
||||||
firstRegion = &image->text_region;
|
|
||||||
secondRegion = &image->data_region;
|
|
||||||
} else {
|
|
||||||
firstRegion = &image->data_region;
|
|
||||||
secondRegion = &image->text_region;
|
|
||||||
}
|
|
||||||
|
|
||||||
image->data_region.delta += image->data_region.start;
|
image->data_region.delta += image->data_region.start;
|
||||||
image->text_region.delta += image->text_region.start;
|
image->text_region.delta += image->text_region.start;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user