From fe45ee7ed0a946bf2bd10276de33f7b2bef5f302 Mon Sep 17 00:00:00 2001 From: Thomas Veerman Date: Wed, 23 Jan 2013 15:07:04 +0100 Subject: [PATCH] ARM: disable __minix_init for now 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. --- lib/libc/sys-minix/init.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libc/sys-minix/init.c b/lib/libc/sys-minix/init.c index 544a60d53..a515761ea 100644 --- a/lib/libc/sys-minix/init.c +++ b/lib/libc/sys-minix/init.c @@ -19,6 +19,9 @@ struct minix_ipcvecs _minix_ipcvecs = { void __minix_init(void) { +#ifdef __arm__ + _minix_kerninfo = NULL; +#else if((_minix_kernel_info_struct(&_minix_kerninfo)) != 0 || _minix_kerninfo->kerninfo_magic != KERNINFO_MAGIC) { _minix_kerninfo = NULL; @@ -26,5 +29,6 @@ void __minix_init(void) _minix_kerninfo->minix_ipcvecs) { _minix_ipcvecs = *_minix_kerninfo->minix_ipcvecs; } +#endif /* __arm__ */ } -- 2.44.0