← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/powerpc/platforms/powermac/smp.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/platforms/powermac/smp.c
35
35
#include <linux/compiler.h>
36
36
 
37
37
#include <asm/ptrace.h>
38
 
#include <asm/atomic.h>
 
38
#include <linux/atomic.h>
39
39
#include <asm/code-patching.h>
40
40
#include <asm/irq.h>
41
41
#include <asm/page.h>
200
200
 
201
201
        if (psurge_secondary_virq)
202
202
                rc = request_irq(psurge_secondary_virq, psurge_ipi_intr,
203
 
                        IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
 
203
                        IRQF_PERCPU, "IPI", NULL);
204
204
 
205
205
        if (rc)
206
206
                pr_err("Failed to setup secondary cpu IPI\n");
408
408
 
409
409
static struct irqaction psurge_irqaction = {
410
410
        .handler = psurge_ipi_intr,
411
 
        .flags = IRQF_DISABLED|IRQF_PERCPU,
 
411
        .flags = IRQF_PERCPU,
412
412
        .name = "primary IPI",
413
413
};
414
414
 
447
447
 
448
448
/* PowerSurge-style Macs */
449
449
struct smp_ops_t psurge_smp_ops = {
450
 
        .message_pass   = smp_muxed_ipi_message_pass,
 
450
        .message_pass   = NULL, /* Use smp_muxed_ipi_message_pass */
451
451
        .cause_ipi      = smp_psurge_cause_ipi,
452
452
        .probe          = smp_psurge_probe,
453
453
        .kick_cpu       = smp_psurge_kick_cpu,