From ce88294ca2c50901138b6ec02e90d44f9752f0bd Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Thu, 19 Jul 2012 09:13:53 +0200 Subject: [PATCH] --- yaml --- r: 312135 b: refs/heads/master c: 1bcfecc028686ea32e49b0f4f6e8a665917cb49a h: refs/heads/master i: 312133: 2db6038d29aa0cbfd57a042e1896a6370106837f 312131: c7e4118a96f97e1196edb0a2f0731ebbb95bdbf8 312127: f93ed4b5d175706b5782689d611f023fda3b2627 v: v3 --- [refs] | 2 +- trunk/arch/mips/cavium-octeon/smp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 62e418c845e7..638c810e7b9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68b6352cdcdaa743b38ca5705601f65ef9bd662f +refs/heads/master: 1bcfecc028686ea32e49b0f4f6e8a665917cb49a diff --git a/trunk/arch/mips/cavium-octeon/smp.c b/trunk/arch/mips/cavium-octeon/smp.c index 4b93048044eb..ee1fb9f7f517 100644 --- a/trunk/arch/mips/cavium-octeon/smp.c +++ b/trunk/arch/mips/cavium-octeon/smp.c @@ -185,7 +185,6 @@ static void __cpuinit octeon_init_secondary(void) octeon_init_cvmcount(); octeon_irq_setup_secondary(); - raw_local_irq_enable(); } /** @@ -233,6 +232,7 @@ static void octeon_smp_finish(void) /* to generate the first CPU timer interrupt */ write_c0_compare(read_c0_count() + mips_hpt_frequency / HZ); + local_irq_enable(); } /**