diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
| commit | 2cd1176bd9e92924242e779dcc5c8fc922f96659 (patch) | |
| tree | e9daa254647af2e7d9f99694e19976df0ea2a14d /arch/sparc/prom/mp.c | |
| parent | a18711120764dd96ed2ee6a4d436c448542bad77 (diff) | |
| parent | e92d03bff9a0d0bcbb812c9b1290ca96c9338d45 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/sparc/prom/mp.c')
| -rw-r--r-- | arch/sparc/prom/mp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/prom/mp.c b/arch/sparc/prom/mp.c index 97c44c9ddbc8..0da8256cf76f 100644 --- a/arch/sparc/prom/mp.c +++ b/arch/sparc/prom/mp.c | |||
| @@ -35,7 +35,7 @@ prom_startcpu(int cpunode, struct linux_prom_registers *ctable_reg, int ctx, cha | |||
| 35 | case PROM_V3: | 35 | case PROM_V3: |
| 36 | ret = (*(romvec->v3_cpustart))(cpunode, (int) ctable_reg, ctx, pc); | 36 | ret = (*(romvec->v3_cpustart))(cpunode, (int) ctable_reg, ctx, pc); |
| 37 | break; | 37 | break; |
| 38 | }; | 38 | } |
| 39 | restore_current(); | 39 | restore_current(); |
| 40 | spin_unlock_irqrestore(&prom_lock, flags); | 40 | spin_unlock_irqrestore(&prom_lock, flags); |
| 41 | 41 | ||