lkml.org 
[lkml]   [2006]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 10/11] adjust to changed HARDIRQ_MASK
    adjust entry.S to the changed HARDIRQ_MASK, add a check to prevent it
    from silently breaking again.

    Signed-off-by: Roman Zippel <zippel@linux-m68k.org>

    ---

    arch/m68k/kernel/entry.S | 4 ++--
    arch/m68k/kernel/ints.c | 6 ++++++
    2 files changed, 8 insertions(+), 2 deletions(-)

    Index: linux-2.6-mm/arch/m68k/kernel/entry.S
    ===================================================================
    --- linux-2.6-mm.orig/arch/m68k/kernel/entry.S
    +++ linux-2.6-mm/arch/m68k/kernel/entry.S
    @@ -226,7 +226,7 @@ ENTRY(nmi_handler)
    inthandler:
    SAVE_ALL_INT
    GET_CURRENT(%d0)
    - addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+2)
    + addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)
    | put exception # in d0
    bfextu %sp@(PT_VECTOR){#4,#10},%d0

    @@ -245,7 +245,7 @@ inthandler:
    3: addql #8,%sp | pop parameters off stack

    ret_from_interrupt:
    - subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+2)
    + subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)
    jeq 1f
    2:
    RESTORE_ALL
    Index: linux-2.6-mm/arch/m68k/kernel/ints.c
    ===================================================================
    --- linux-2.6-mm.orig/arch/m68k/kernel/ints.c
    +++ linux-2.6-mm/arch/m68k/kernel/ints.c
    @@ -95,6 +95,12 @@ void __init init_IRQ(void)
    {
    int i;

    + /* assembly irq entry code relies on this... */
    + if (HARDIRQ_MASK != 0x00ff0000) {
    + extern void hardirq_mask_is_broken(void);
    + hardirq_mask_is_broken();
    + }
    +
    for (i = 0; i < SYS_IRQS; i++) {
    if (mach_default_handler)
    irq_list[i].handler = (*mach_default_handler)[i];
    --

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-05-25 03:31    [W:0.024 / U:0.976 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site