oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: disable __minix_init for now

Browse Source 
On ARM we can't yet globally map pages into every process. So now that
we correctly receive the pointer to the globally mapped kern_info
struct, we have to ignore it on ARM because attempting to dereference
the pointer yields a segfault.
This commit is contained in:
Thomas Veerman 2013-01-23 15:07:04 +01:00
parent e52ecfbf5d
commit fe45ee7ed0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/sys-minix/init.c
View File

@ -19,6 +19,9 @@ struct minix_ipcvecs _minix_ipcvecs = {
void __minix_init(void) void __minix_init(void)
{ {
#ifdef __arm__
_minix_kerninfo = NULL;
#else
if((_minix_kernel_info_struct(&_minix_kerninfo)) != 0 if((_minix_kernel_info_struct(&_minix_kerninfo)) != 0
|| _minix_kerninfo->kerninfo_magic != KERNINFO_MAGIC) { || _minix_kerninfo->kerninfo_magic != KERNINFO_MAGIC) {
_minix_kerninfo = NULL; _minix_kerninfo = NULL;
@ -26,5 +29,6 @@ void __minix_init(void)
_minix_kerninfo->minix_ipcvecs) { _minix_kerninfo->minix_ipcvecs) {
_minix_ipcvecs = *_minix_kerninfo->minix_ipcvecs; _minix_ipcvecs = *_minix_kerninfo->minix_ipcvecs;
} }
#endif /* __arm__ */
} }