Commit 1e4cb7c8 authored by David Mosberger's avatar David Mosberger

ia64: Make kernel profiling work again (patch by Peter Chubb).

parent de1a5fa0
/* /*
* linux/arch/ia64/kernel/time.c * linux/arch/ia64/kernel/time.c
* *
* Copyright (C) 1998-2001 Hewlett-Packard Co * Copyright (C) 1998-2002 Hewlett-Packard Co
* Copyright (C) 1998-2000 Stephane Eranian <eranian@hpl.hp.com> * Stephane Eranian <eranian@hpl.hp.com>
* Copyright (C) 1999-2001 David Mosberger <davidm@hpl.hp.com> * David Mosberger <davidm@hpl.hp.com>
* Copyright (C) 1999 Don Dugger <don.dugger@intel.com> * Copyright (C) 1999 Don Dugger <don.dugger@intel.com>
* Copyright (C) 1999-2000 VA Linux Systems * Copyright (C) 1999-2000 VA Linux Systems
* Copyright (C) 1999-2000 Walt Drummond <drummond@valinux.com> * Copyright (C) 1999-2000 Walt Drummond <drummond@valinux.com>
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/profile.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -35,7 +36,6 @@ unsigned long last_cli_ip; ...@@ -35,7 +36,6 @@ unsigned long last_cli_ip;
#endif #endif
#if 0
static void static void
do_profile (unsigned long ip) do_profile (unsigned long ip)
{ {
...@@ -59,7 +59,6 @@ do_profile (unsigned long ip) ...@@ -59,7 +59,6 @@ do_profile (unsigned long ip)
atomic_inc((atomic_t *) &prof_buffer[ip]); atomic_inc((atomic_t *) &prof_buffer[ip]);
} }
#endif
/* /*
* Return the number of micro-seconds that elapsed since the last update to jiffy. The * Return the number of micro-seconds that elapsed since the last update to jiffy. The
...@@ -168,11 +167,8 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -168,11 +167,8 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
* four so that we can use a prof_shift of 2 to get instruction-level * four so that we can use a prof_shift of 2 to get instruction-level
* instead of just bundle-level accuracy. * instead of just bundle-level accuracy.
*/ */
#if 0
XXX fix me!
if (!user_mode(regs)) if (!user_mode(regs))
do_profile(regs->cr_iip + 4*ia64_psr(regs)->ri); do_profile(regs->cr_iip + 4*ia64_psr(regs)->ri);
#endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
smp_do_timer(regs); smp_do_timer(regs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment