Index: kernel/arch/ia64/src/asm.S =================================================================== --- kernel/arch/ia64/src/asm.S (revision 4fe907b9451912ec457f50c02ea022c9fd7bab92) +++ kernel/arch/ia64/src/asm.S (revision e4a4b4413aaef3d49bbd56900f9bc991e990beea) @@ -137,11 +137,4 @@ br cpu_halt -.global panic_printf -panic_printf: - { - br.call.sptk.many b0=printf - } - br halt - /** Switch to userspace - low level code. * Index: kernel/arch/mips32/Makefile.inc =================================================================== --- kernel/arch/mips32/Makefile.inc (revision 4fe907b9451912ec457f50c02ea022c9fd7bab92) +++ kernel/arch/mips32/Makefile.inc (revision e4a4b4413aaef3d49bbd56900f9bc991e990beea) @@ -54,5 +54,4 @@ arch/$(KARCH)/src/start.S \ arch/$(KARCH)/src/context.S \ - arch/$(KARCH)/src/panic.S \ arch/$(KARCH)/src/mips32.c \ arch/$(KARCH)/src/asm.S \ Index: kernel/arch/mips32/src/panic.S =================================================================== --- kernel/arch/mips32/src/panic.S (revision 4fe907b9451912ec457f50c02ea022c9fd7bab92) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2003-2004 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.set noat -.set noreorder -.set nomacro - -#include - -.global panic_printf - -/* From printf return directly to halt() */ -panic_printf: - lui $ra, %hi(halt) - j printf - ori $ra, %lo(halt) Index: kernel/arch/ppc32/Makefile.inc =================================================================== --- kernel/arch/ppc32/Makefile.inc (revision 4fe907b9451912ec457f50c02ea022c9fd7bab92) +++ kernel/arch/ppc32/Makefile.inc (revision e4a4b4413aaef3d49bbd56900f9bc991e990beea) @@ -40,5 +40,4 @@ ARCH_SOURCES = \ arch/$(KARCH)/src/context.S \ - arch/$(KARCH)/src/debug/panic.s \ arch/$(KARCH)/src/debug/stacktrace.c \ arch/$(KARCH)/src/debug/stacktrace_asm.S \ Index: kernel/arch/ppc32/src/debug/panic.s =================================================================== --- kernel/arch/ppc32/src/debug/panic.s (revision 4fe907b9451912ec457f50c02ea022c9fd7bab92) +++ (revision ) @@ -1,38 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -#include - -.text -.global panic_printf - -panic_printf: - lis %r14, halt@ha - addi %r14, %r14, halt@l - mtlr %r14 # fake stack to make printf return to halt - b printf Index: kernel/arch/sparc64/Makefile.inc =================================================================== --- kernel/arch/sparc64/Makefile.inc (revision 4fe907b9451912ec457f50c02ea022c9fd7bab92) +++ kernel/arch/sparc64/Makefile.inc (revision e4a4b4413aaef3d49bbd56900f9bc991e990beea) @@ -64,5 +64,4 @@ arch/$(KARCH)/src/asm.S \ arch/$(KARCH)/src/$(USARCH)/asm.S \ - arch/$(KARCH)/src/panic.S \ arch/$(KARCH)/src/console.c \ arch/$(KARCH)/src/context.S \ Index: kernel/arch/sparc64/src/panic.S =================================================================== --- kernel/arch/sparc64/src/panic.S (revision 4fe907b9451912ec457f50c02ea022c9fd7bab92) +++ (revision ) @@ -1,40 +1,0 @@ -# -# Copyright (c) 2005 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -#include - -.global panic_printf -panic_printf: - call printf - nop - call halt - nop - /* Not reached. */ -