diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/mips/cavium-octeon/smp.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/mips/cavium-octeon/smp.c')
| -rw-r--r-- | arch/mips/cavium-octeon/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index c198efdf583e..51e980290ce1 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c | |||
| @@ -327,7 +327,7 @@ static void octeon_cpu_die(unsigned int cpu) | |||
| 327 | avail_coremask); | 327 | avail_coremask); |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | pr_info("Reset core %d. Available Coremask = %x \n", coreid, | 330 | pr_info("Reset core %d. Available Coremask = %x\n", coreid, |
| 331 | avail_coremask); | 331 | avail_coremask); |
| 332 | cvmx_write_csr(CVMX_CIU_PP_RST, 1 << coreid); | 332 | cvmx_write_csr(CVMX_CIU_PP_RST, 1 << coreid); |
| 333 | cvmx_write_csr(CVMX_CIU_PP_RST, 0); | 333 | cvmx_write_csr(CVMX_CIU_PP_RST, 0); |