sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

kernel: Remove unnecessary ACK conditionals

Browse source
This commit is contained in:
Arun Thomas 2012-03-29 13:29:09 +02:00
parent 5ab87a6c38
commit b0666ba6b6
2 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kernel/arch/i386/klib.S
View file

@ -129,22 +129,6 @@ csinit:
pop %ebp
ret
/*===========================================================================*/
/* exit */
/*===========================================================================*/
/*
* PUBLIC void exit();
* Some library routines use exit, so provide a dummy version.
* Actual calls to exit cannot occur in the kernel.
* GNU CC likes to call ___main from main() for nonobvious reasons.
*/
#ifdef __ACK__
ENTRY(exit)
ENTRY(_exit)
ENTRY(__exit)
sti
jmp _C_LABEL(__exit)
#endif
ENTRY(__main)
ret

24
kernel/arch/i386/mpx.S
View file

@ -26,22 +26,6 @@
/* sections */
#include <machine/vm.h>
#ifdef __ACK__
.text
begtext:
#ifdef __ACK__
.rom
#else
.data
#endif
begrom:
.data
begdata:
.bss
begbss:
#endif
#include "../../kernel.h"
#include <minix/config.h>
#include <minix/const.h>
@ -70,10 +54,6 @@ IMPORT(mon_ds)
IMPORT(switch_to_user)
IMPORT(multiboot_init)
/* Exported variables. */
.globl begbss
.globl begdata
.text
/*===========================================================================*/
/* MINIX */
@ -636,11 +616,7 @@ ENTRY(startup_ap_32)
/* data */
/*===========================================================================*/
#ifdef __ACK__
.rom /* Before the string table please */
#else
.data
#endif
.short 0x526F /* this must be the first data entry (magic #) */
.bss
/*