lkml.org 
[lkml]   [2009]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC patch 22/32] x86: Remove do_timer hook
    This is a left over of the old x86 sub arch support. Remove it and
    open code it like we do in time_64.c

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/x86/include/asm/do_timer.h | 16 ----------------
    arch/x86/kernel/time_32.c | 7 ++++---
    2 files changed, 4 insertions(+), 19 deletions(-)

    Index: linux-2.6/arch/x86/include/asm/do_timer.h
    ===================================================================
    --- linux-2.6.orig/arch/x86/include/asm/do_timer.h
    +++ /dev/null
    @@ -1,16 +0,0 @@
    -/* defines for inline arch setup functions */
    -#include <linux/clockchips.h>
    -
    -#include <asm/i8259.h>
    -#include <asm/i8253.h>
    -
    -/**
    - * do_timer_interrupt_hook - hook into timer tick
    - *
    - * Call the pit clock event handler. see asm/i8253.h
    - **/
    -
    -static inline void do_timer_interrupt_hook(void)
    -{
    - global_clock_event->event_handler(global_clock_event);
    -}
    Index: linux-2.6/arch/x86/kernel/time_32.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/time_32.c
    +++ linux-2.6/arch/x86/kernel/time_32.c
    @@ -28,6 +28,7 @@
    * serialize accesses to xtime/lost_ticks).
    */

    +#include <linux/clockchips.h>
    #include <linux/init.h>
    #include <linux/interrupt.h>
    #include <linux/time.h>
    @@ -37,8 +38,8 @@
    #include <asm/hpet.h>
    #include <asm/time.h>
    #include <asm/timer.h>
    -
    -#include <asm/do_timer.h>
    +#include <asm/i8259.h>
    +#include <asm/i8253.h>

    int timer_ack;

    @@ -92,7 +93,7 @@ static irqreturn_t timer_interrupt(int i
    }
    #endif

    - do_timer_interrupt_hook();
    + global_clock_event->event_handler(global_clock_event);

    #ifdef CONFIG_MCA
    if (MCA_bus) {



    \
     
     \ /
      Last update: 2009-08-21 23:41    [W:4.078 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site