summaryrefslogtreecommitdiff
path: root/sys-boot/colo/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-03 16:06:58 +0000
commitbd4aeefe33e63f613512604e47bfca7b2187697d (patch)
treeadb35b5a9a00ee7ea591ab0c987f70167c23b597 /sys-boot/colo/files
parent48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
gentoo resync : 03.11.2019
Diffstat (limited to 'sys-boot/colo/files')
-rw-r--r--sys-boot/colo/files/colo-stage2_src_heap-fix.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/sys-boot/colo/files/colo-stage2_src_heap-fix.patch b/sys-boot/colo/files/colo-stage2_src_heap-fix.patch
new file mode 100644
index 000000000000..6cd4e3a2a226
--- /dev/null
+++ b/sys-boot/colo/files/colo-stage2_src_heap-fix.patch
@@ -0,0 +1,24 @@
+diff -Naurp colo-1.22.orig/stage2/src/heap.c colo-1.22/stage2/src/heap.c
+--- colo-1.22.orig/stage2/src/heap.c 2006-01-22 10:26:56.000000000 -0500
++++ colo-1.22/stage2/src/heap.c 2019-10-20 23:20:17.167266445 -0400
+@@ -25,16 +25,16 @@ static size_t next_size;
+ void heap_reset(void)
+ {
+ extern char __text;
+- void *restrict;
++ void *restrict2;
+
+ assert(!((unsigned long) &__text & 15));
+
+ free_lo = KSEG0(0);
+ free_hi = KSEG0(&__text) - (32 << 10); // XXX
+
+- restrict = KSEG0(ram_restrict) - (16 << 10); // XXX
+- if(free_hi > restrict)
+- free_hi = restrict;
++ restrict2 = KSEG0(ram_restrict) - (16 << 10); // XXX
++ if(free_hi > restrict2)
++ free_hi = restrict2;
+
+ image_size = 0;
+ image_size_mark = 0;