Commit 00dc2660 authored by Pavel Emelyanov's avatar Pavel Emelyanov

restorer: Remove unused heap

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent b33fa025
...@@ -2522,9 +2522,8 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core) ...@@ -2522,9 +2522,8 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
if (thread_args[i].pid != pid) if (thread_args[i].pid != pid)
core_entry__free_unpacked(tcore, NULL); core_entry__free_unpacked(tcore, NULL);
pr_info("Thread %4d stack %8p heap %8p rt_sigframe %8p\n", pr_info("Thread %4d stack %8p rt_sigframe %8p\n",
i, thread_args[i].mem_zone.stack, i, thread_args[i].mem_zone.stack,
thread_args[i].mem_zone.heap,
thread_args[i].mem_zone.rt_sigframe); thread_args[i].mem_zone.rt_sigframe);
} }
......
...@@ -42,7 +42,6 @@ typedef long (*thread_restore_fcall_t) (struct thread_restore_args *args); ...@@ -42,7 +42,6 @@ typedef long (*thread_restore_fcall_t) (struct thread_restore_args *args);
/* sigframe should be aligned on 64 byte for x86 and 8 bytes for arm */ /* sigframe should be aligned on 64 byte for x86 and 8 bytes for arm */
#define RESTORE_STACK_SIGFRAME ALIGN(sizeof(struct rt_sigframe) + SIGFRAME_OFFSET, 64) #define RESTORE_STACK_SIGFRAME ALIGN(sizeof(struct rt_sigframe) + SIGFRAME_OFFSET, 64)
#define RESTORE_STACK_SIZE (KILO(32)) #define RESTORE_STACK_SIZE (KILO(32))
#define RESTORE_HEAP_SIZE (KILO(16))
#define RESTORE_ALIGN_STACK(start, size) \ #define RESTORE_ALIGN_STACK(start, size) \
(ALIGN((start) + (size) - sizeof(long), sizeof(long))) (ALIGN((start) + (size) - sizeof(long), sizeof(long)))
...@@ -51,12 +50,8 @@ struct restore_mem_zone { ...@@ -51,12 +50,8 @@ struct restore_mem_zone {
u8 redzone[RESTORE_STACK_REDZONE]; u8 redzone[RESTORE_STACK_REDZONE];
u8 stack[RESTORE_STACK_SIZE]; u8 stack[RESTORE_STACK_SIZE];
u8 rt_sigframe[RESTORE_STACK_SIGFRAME]; u8 rt_sigframe[RESTORE_STACK_SIGFRAME];
u8 heap[RESTORE_HEAP_SIZE];
} __aligned(sizeof(long)); } __aligned(sizeof(long));
#define first_on_heap(ptr, heap) ((typeof(ptr))heap)
#define next_on_heap(ptr, prev) ((typeof(ptr))((long)(prev) + sizeof(*(prev))))
struct rst_sched_param { struct rst_sched_param {
int policy; int policy;
int nice; int nice;
......
...@@ -791,14 +791,14 @@ long __export_restore_task(struct task_restore_core_args *args) ...@@ -791,14 +791,14 @@ long __export_restore_task(struct task_restore_core_args *args)
* *
* | <-- low addresses high addresses --> | * | <-- low addresses high addresses --> |
* +-------------------------------------------------------+-----------------------+ * +-------------------------------------------------------+-----------------------+
* | this proc body | own stack | heap | rt_sigframe space | thread restore zone | * | this proc body | own stack | rt_sigframe space | thread restore zone |
* +-------------------------------------------------------+-----------------------+ * +-------------------------------------------------------+-----------------------+
* *
* where each thread restore zone is the following * where each thread restore zone is the following
* *
* | <-- low addresses high addresses --> | * | <-- low addresses high addresses --> |
* +--------------------------------------------------------------------------+ * +--------------------------------------------------------------------------+
* | thread restore proc | thread1 stack | thread1 heap | thread1 rt_sigframe | * | thread restore proc | thread1 stack | thread1 rt_sigframe |
* +--------------------------------------------------------------------------+ * +--------------------------------------------------------------------------+
*/ */
......
Markdown is supported
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