diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/parisc/kernel/smp.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/parisc/kernel/smp.c')
| -rw-r--r-- | arch/parisc/kernel/smp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 69d63d354ef0..828305f19cff 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
| @@ -155,10 +155,7 @@ ipi_interrupt(int irq, void *dev_id) | |||
| 155 | 155 | ||
| 156 | case IPI_RESCHEDULE: | 156 | case IPI_RESCHEDULE: |
| 157 | smp_debug(100, KERN_DEBUG "CPU%d IPI_RESCHEDULE\n", this_cpu); | 157 | smp_debug(100, KERN_DEBUG "CPU%d IPI_RESCHEDULE\n", this_cpu); |
| 158 | /* | 158 | scheduler_ipi(); |
| 159 | * Reschedule callback. Everything to be | ||
| 160 | * done is done by the interrupt return path. | ||
| 161 | */ | ||
| 162 | break; | 159 | break; |
| 163 | 160 | ||
| 164 | case IPI_CALL_FUNC: | 161 | case IPI_CALL_FUNC: |