lkml.org 
[lkml]   [2009]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h
    [PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h

    There is nothing different required between the non-mmu and mmu
    versions of hardirq.h, so merge them back into a single file.

    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    ---
    arch/m68k/include/asm/{hardirq_mm.h => hardirq.h} | 2 +
    arch/m68k/include/asm/hardirq_no.h | 27 ---------------------
    2 files changed, 2 insertions(+), 27 deletions(-)
    rename arch/m68k/include/asm/{hardirq_mm.h => hardirq.h} (90%)
    delete mode 100644 arch/m68k/include/asm/hardirq_no.h

    diff --git a/arch/m68k/include/asm/hardirq_mm.h b/arch/m68k/include/asm/hardirq.h
    similarity index 90%
    rename from arch/m68k/include/asm/hardirq_mm.h
    rename to arch/m68k/include/asm/hardirq.h
    index 394ee94..7167ed2 100644
    --- a/arch/m68k/include/asm/hardirq_mm.h
    +++ b/arch/m68k/include/asm/hardirq.h
    @@ -13,4 +13,6 @@ typedef struct {

    #define HARDIRQ_BITS 8

    +void ack_bad_irq(unsigned int irq);
    +
    #endif
    diff --git a/arch/m68k/include/asm/hardirq_no.h b/arch/m68k/include/asm/hardirq_no.h
    deleted file mode 100644
    index bfad281..0000000
    --- a/arch/m68k/include/asm/hardirq_no.h
    +++ /dev/null
    @@ -1,27 +0,0 @@
    -#ifndef __M68K_HARDIRQ_H
    -#define __M68K_HARDIRQ_H
    -
    -#include <linux/cache.h>
    -#include <linux/threads.h>
    -#include <asm/irq.h>
    -
    -typedef struct {
    - unsigned int __softirq_pending;
    -} ____cacheline_aligned irq_cpustat_t;
    -
    -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
    -
    -#define HARDIRQ_BITS 8
    -
    -/*
    - * The hardirq mask has to be large enough to have
    - * space for potentially all IRQ sources in the system
    - * nesting on a single CPU:
    - */
    -#if (1 << HARDIRQ_BITS) < NR_IRQS
    -# error HARDIRQ_BITS is too low!
    -#endif
    -
    -void ack_bad_irq(unsigned int irq);
    -
    -#endif /* __M68K_HARDIRQ_H */

    \
     
     \ /
      Last update: 2009-06-17 09:13    [W:0.025 / U:28.852 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site