Merge booke and aim interrupt.c files.

Summary:
Both booke and AIM interrupt.c files contain nearly identical code.  This merges
the two files, to reduce duplication.

Reviewers: #powerpc, marcel

Reviewed By: marcel

Subscribers: imp

Differential Revision: https://reviews.freebsd.org/D2991

1 files changed, 0 insertions, 122 deletions

diff --git a/sys/powerpc/aim/interrupt.c b/sys/powerpc/aim/interrupt.c
deleted file mode 100644
index 1db565c..0000000
--- a/sys/powerpc/aim/interrupt.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright 2002 by Peter Grehan. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. 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.
- *
- * $FreeBSD$
- */
-
-/*
- * Interrupts are dispatched to here from locore asm
- */
-
-#include "opt_hwpmc_hooks.h"
-
-#include <sys/cdefs.h>                  /* RCS ID & Copyright macro defns */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/interrupt.h>
-#include <sys/kernel.h>
-#include <sys/kthread.h>
-#include <sys/ktr.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#ifdef HWPMC_HOOKS
-#include <sys/pmckern.h>
-#endif
-#include <sys/proc.h>
-#include <sys/smp.h>
-#include <sys/unistd.h>
-#include <sys/vmmeter.h>
-
-#include <machine/cpu.h>
-#include <machine/clock.h>
-#include <machine/db_machdep.h>
-#include <machine/fpu.h>
-#include <machine/frame.h>
-#include <machine/intr_machdep.h>
-#include <machine/md_var.h>
-#include <machine/pcb.h>
-#include <machine/psl.h>
-#include <machine/trap.h>
-#include <machine/spr.h>
-#include <machine/sr.h>
-
-#include "pic_if.h"
-
-/*
- * A very short dispatch, to try and maximise assembler code use
- * between all exception types. Maybe 'true' interrupts should go
- * here, and the trap code can come in separately
- */
-void
-powerpc_interrupt(struct trapframe *framep)
-{
-	struct thread *td;
-	struct trapframe *oldframe;
-	register_t ee;
-
-	td = curthread;
-
-	CTR2(KTR_INTR, "%s: EXC=%x", __func__, framep->exc);
-
-	switch (framep->exc) {
-	case EXC_EXI:
-		critical_enter();
-		PIC_DISPATCH(root_pic, framep);
-		critical_exit();
-		break;
-
-	case EXC_DECR:
-		critical_enter();
-		atomic_add_int(&td->td_intr_nesting_level, 1);
-		oldframe = td->td_intr_frame;
-		td->td_intr_frame = framep;
-		decr_intr(framep);
-		td->td_intr_frame = oldframe;
-		atomic_subtract_int(&td->td_intr_nesting_level, 1);
-		critical_exit();
-		break;
-#ifdef HWPMC_HOOKS
-	case EXC_PERF:
-		critical_enter();
-		KASSERT(pmc_intr != NULL, ("Performance exception, but no handler!"));
-		(*pmc_intr)(PCPU_GET(cpuid), framep);
-		if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN))
-			pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, framep);
-		critical_exit();
-		break;
-#endif
-
-	default:
-		/* Re-enable interrupts if applicable. */
-		ee = framep->srr1 & PSL_EE;
-		if (ee != 0)
-			mtmsr(mfmsr() | ee);
-		trap(framep);
-	}	        
-}