diff options
author | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
---|---|---|
committer | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
commit | 0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch) | |
tree | bab97e72ada703fd5a1d9c774d3d0451d6ceade7 /xen/arch/i386/irq.c | |
parent | d9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff) | |
parent | f9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff) | |
download | xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2 xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip |
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to 'xen/arch/i386/irq.c')
-rw-r--r-- | xen/arch/i386/irq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xen/arch/i386/irq.c b/xen/arch/i386/irq.c index 312cfe7970..6485b6ba15 100644 --- a/xen/arch/i386/irq.c +++ b/xen/arch/i386/irq.c @@ -537,7 +537,9 @@ asmlinkage unsigned int do_IRQ(struct pt_regs regs) do_softirq(); rdtscl(cc_end); - perfc_adda(irq_time, cpu, cc_end - cc_start); + + if(!action || (!(action->flags & SA_NOPROFILE)) ) + perfc_adda(irq_time, cpu, cc_end - cc_start); return 1; } |