diff options
Diffstat (limited to 'arch/x86/boot/main.c')
-rw-r--r-- | arch/x86/boot/main.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c index 22ca62ba40c8..7828da5cfd07 100644 --- a/arch/x86/boot/main.c +++ b/arch/x86/boot/main.c | |||
@@ -100,20 +100,32 @@ static void set_bios_mode(void) | |||
100 | #endif | 100 | #endif |
101 | } | 101 | } |
102 | 102 | ||
103 | void main(void) | 103 | static void init_heap(void) |
104 | { | 104 | { |
105 | /* First, copy the boot header into the "zeropage" */ | 105 | char *stack_end; |
106 | copy_boot_params(); | ||
107 | 106 | ||
108 | /* End of heap check */ | ||
109 | if (boot_params.hdr.loadflags & CAN_USE_HEAP) { | 107 | if (boot_params.hdr.loadflags & CAN_USE_HEAP) { |
110 | heap_end = (char *)(boot_params.hdr.heap_end_ptr | 108 | asm("leal %P1(%%esp),%0" |
111 | +0x200-STACK_SIZE); | 109 | : "=r" (stack_end) : "i" (-STACK_SIZE)); |
110 | |||
111 | heap_end = (char *) | ||
112 | ((size_t)boot_params.hdr.heap_end_ptr + 0x200); | ||
113 | if (heap_end > stack_end) | ||
114 | heap_end = stack_end; | ||
112 | } else { | 115 | } else { |
113 | /* Boot protocol 2.00 only, no heap available */ | 116 | /* Boot protocol 2.00 only, no heap available */ |
114 | puts("WARNING: Ancient bootloader, some functionality " | 117 | puts("WARNING: Ancient bootloader, some functionality " |
115 | "may be limited!\n"); | 118 | "may be limited!\n"); |
116 | } | 119 | } |
120 | } | ||
121 | |||
122 | void main(void) | ||
123 | { | ||
124 | /* First, copy the boot header into the "zeropage" */ | ||
125 | copy_boot_params(); | ||
126 | |||
127 | /* End of heap check */ | ||
128 | init_heap(); | ||
117 | 129 | ||
118 | /* Make sure we have all the proper CPU support */ | 130 | /* Make sure we have all the proper CPU support */ |
119 | if (validate_cpu()) { | 131 | if (validate_cpu()) { |