From 282f2c9ca4f0625d5823e8a836d38f8d4f100b43 Mon Sep 17 00:00:00 2001 From: Jakub Jermar Date: Thu, 16 Nov 2006 23:46:27 +0000 Subject: [PATCH] Fix bad indentation in ofw.c sparc64 work: o Fix copyright in main.c o Move code from unused parts of the trap table. --- boot/arch/sparc64/loader/main.c | 1 + boot/genarch/ofw.c | 2 +- kernel/arch/sparc64/src/trap/trap_table.S | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/boot/arch/sparc64/loader/main.c b/boot/arch/sparc64/loader/main.c index 389f65133..1ff941140 100644 --- a/boot/arch/sparc64/loader/main.c +++ b/boot/arch/sparc64/loader/main.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Martin Decky + * Copyright (C) 2006 Jakub Jermar * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/boot/genarch/ofw.c b/boot/genarch/ofw.c index 7c0649299..8c919e663 100644 --- a/boot/genarch/ofw.c +++ b/boot/genarch/ofw.c @@ -298,5 +298,5 @@ int ofw_screen(screen_t *screen) void ofw_quiesce(void) { - ofw_call("quiesce", 0, 0, NULL); + ofw_call("quiesce", 0, 0, NULL); } diff --git a/kernel/arch/sparc64/src/trap/trap_table.S b/kernel/arch/sparc64/src/trap/trap_table.S index bbcda6b3d..9e8150991 100644 --- a/kernel/arch/sparc64/src/trap/trap_table.S +++ b/kernel/arch/sparc64/src/trap/trap_table.S @@ -618,6 +618,9 @@ spill_0_other_tl1: fill_0_normal_tl1: FILL_NORMAL_HANDLER_KERNEL +.align TABLE_SIZE + + #define NOT(x) ((x) == 0) /* Preemptible trap handler for TL=1. -- 2.11.4.GIT