← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-ports/karmic

« back to all changes in this revision

Viewing changes to arch/mips/kernel/cevt-bcm1480.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Luke Yelavich, Michael Casadevall, Tim Gardner, Upstream Kernel Changes
  • Date: 2009-05-06 18:18:55 UTC
  • Revision ID: james.westby@ubuntu.com-20090506181855-t00baeevpnvd9o7a
Tags: 2.6.30-1.1
[ Luke Yelavich ]
* initial release for karmic
* SAUCE: rebase-ports - adjust for the karmic ports kernel
* SAUCE: rebase-ports - also remove abi dirs/files on rebase
* Update configs after rebase against mainline Jaunty tree
* [Config] Disable CONFIG_BLK_DEV_UB and CONFIG_USB_LIBUSUAL as per
  mainline jaunty
* forward-port patch to drbd for powerpc compilation
* [Config] disable CONFIG_LENOVO_SL_LAPTOP for i386 due to FTBFS
* add .o files found in arch/powerpc/lib to all powerpc kernel header
  packages
* [Config] enable CONFIG_DRM_I915_KMS for i386 as per karmic mainline

[ Michael Casadevall ]

* Disable kgdb on sparc64
* [sparc] [Config] Disable GPIO LEDS
* [ia64] Rename -ia64-generic to -ia64 in line with other architectures
* Correct kernel image path for sparc builds
* [hppa] Fix HPPA config files to build modules for all udebian

Rebase on top of karmic mainline 2.6.30-1.1

[ Tim Gardner ]

* [Config] armel: disable staging drivers, fixes FTBS
* [Config] armel imx51: Disable CONFIG_MTD_NAND_MXC, fixes FTBS

[ Upstream Kernel Changes ]

* mpt2sas: Change reset_type enum to avoid namespace collision.
  Submitted upstream.

* Initial release after rebasing against v2.6.30-rc3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/mips/kernel/cevt-bcm1480.c
126
126
        cd->min_delta_ns        = clockevent_delta2ns(2, cd);
127
127
        cd->rating              = 200;
128
128
        cd->irq                 = irq;
129
 
        cd->cpumask             = cpumask_of_cpu(cpu);
 
129
        cd->cpumask             = cpumask_of(cpu);
130
130
        cd->set_next_event      = sibyte_next_event;
131
131
        cd->set_mode            = sibyte_set_mode;
132
132
        clockevents_register_device(cd);
144
144
 
145
145
        action->handler = sibyte_counter_handler;
146
146
        action->flags   = IRQF_DISABLED | IRQF_PERCPU;
147
 
        action->mask    = cpumask_of_cpu(cpu);
148
147
        action->name    = name;
149
148
        action->dev_id  = cd;
150
149
 
151
 
        irq_set_affinity(irq, cpumask_of_cpu(cpu));
 
150
        irq_set_affinity(irq, cpumask_of(cpu));
152
151
        setup_irq(irq, action);
153
152
}