diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:21:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:21:08 -0700 |
| commit | f10f114f199dbcb9e1d6b5a0b36a34acf93f6179 (patch) | |
| tree | 299058a338e245957bf9e132f5cbf222bd03cad6 /arch/mips/sibyte/sb1250/smp.c | |
| parent | 0c326331c8b107abc0a160e8899d749150b8f76a (diff) | |
| parent | dab969c00b8bee17a47057bbb91cd0a348cf6f76 (diff) | |
| download | kernel_samsung_smdk4412-f10f114f199dbcb9e1d6b5a0b36a34acf93f6179.zip kernel_samsung_smdk4412-f10f114f199dbcb9e1d6b5a0b36a34acf93f6179.tar.gz kernel_samsung_smdk4412-f10f114f199dbcb9e1d6b5a0b36a34acf93f6179.tar.bz2 | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] time: Make c0_compare_int_usable more bullet proof
[MIPS] Kbuild: Use the new cc-cross-prefix feature.
[MIPS] Fix include wrapper symbol to something sane.
[MIPS] Malta: Delete dead code.
[MIPS] time: Add GT641xx timer0 clockevent driver
[MIPS] time: SMP-proofing of Sibyte clockevent/clocksource code.
[MIPS] time: SMP/NUMA-proofing of IP27 HUB RT timer code.
[MIPS] time: Fix calculation in clockevent_set_clock()
Diffstat (limited to 'arch/mips/sibyte/sb1250/smp.c')
| -rw-r--r-- | arch/mips/sibyte/sb1250/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c index aaa4f30..3f52c95 100644 --- a/arch/mips/sibyte/sb1250/smp.c +++ b/arch/mips/sibyte/sb1250/smp.c @@ -46,7 +46,7 @@ static void *mailbox_regs[] = { /* * SMP init and finish on secondary CPUs */ -void sb1250_smp_init(void) +void __cpuinit sb1250_smp_init(void) { unsigned int imask = STATUSF_IP4 | STATUSF_IP3 | STATUSF_IP2 | STATUSF_IP1 | STATUSF_IP0; @@ -55,7 +55,7 @@ void sb1250_smp_init(void) change_c0_status(ST0_IM, imask); } -void sb1250_smp_finish(void) +void __cpuinit sb1250_smp_finish(void) { extern void sb1250_clockevent_init(void); |