diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-01 15:02:37 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-01 15:02:37 -0700 |
| commit | 12725675e26d52c39e856d341035b94bf7802458 (patch) | |
| tree | f9cf054ddcdf3845df7e9e0b4f84a87e86577a03 /arch/ppc64/kernel/time.c | |
| parent | af6f5e3247a68074e384ef93c0b4bce1b73c9d80 (diff) | |
| parent | eff910a91ac04ab1d9e210d4f721484af3b39c8d (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc64/kernel/time.c')
| -rw-r--r-- | arch/ppc64/kernel/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 3d54745108c7..33364a7d2cd2 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c @@ -325,9 +325,7 @@ int timer_interrupt(struct pt_regs * regs) irq_enter(); -#ifndef CONFIG_PPC_ISERIES profile_tick(CPU_PROFILING, regs); -#endif lpaca->lppaca.int_dword.fields.decr_int = 0; |