mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-31 08:04:55 +00:00
66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
59 lines
1.2 KiB
C
59 lines
1.2 KiB
C
/*
|
|
* irq.c
|
|
*
|
|
* (C) Copyright 2007, Greg Ungerer <gerg@snapgear.com>
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/kernel_stat.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/seq_file.h>
|
|
#include <asm/system.h>
|
|
#include <asm/traps.h>
|
|
|
|
asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
|
|
{
|
|
struct pt_regs *oldregs = set_irq_regs(regs);
|
|
|
|
irq_enter();
|
|
generic_handle_irq(irq);
|
|
irq_exit();
|
|
|
|
set_irq_regs(oldregs);
|
|
}
|
|
|
|
int show_interrupts(struct seq_file *p, void *v)
|
|
{
|
|
struct irqaction *ap;
|
|
int irq = *((loff_t *) v);
|
|
|
|
if (irq == 0)
|
|
seq_puts(p, " CPU0\n");
|
|
|
|
if (irq < NR_IRQS) {
|
|
struct irq_desc *desc = irq_to_desc(irq);
|
|
|
|
ap = desc->action;
|
|
if (ap) {
|
|
seq_printf(p, "%3d: ", irq);
|
|
seq_printf(p, "%10u ", kstat_irqs(irq));
|
|
seq_printf(p, "%14s ", get_irq_desc_chip(desc)->name);
|
|
|
|
seq_printf(p, "%s", ap->name);
|
|
for (ap = ap->next; ap; ap = ap->next)
|
|
seq_printf(p, ", %s", ap->name);
|
|
seq_putc(p, '\n');
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|