← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to arch/ia64/kernel/smpboot.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/ia64/kernel/smpboot.c
677
677
int migrate_platform_irqs(unsigned int cpu)
678
678
{
679
679
        int new_cpei_cpu;
680
 
        struct irq_desc *desc = NULL;
 
680
        struct irq_data *data = NULL;
681
681
        const struct cpumask *mask;
682
682
        int             retval = 0;
683
683
 
693
693
                        new_cpei_cpu = any_online_cpu(cpu_online_map);
694
694
                        mask = cpumask_of(new_cpei_cpu);
695
695
                        set_cpei_target_cpu(new_cpei_cpu);
696
 
                        desc = irq_desc + ia64_cpe_irq;
 
696
                        data = irq_get_irq_data(ia64_cpe_irq);
697
697
                        /*
698
698
                         * Switch for now, immediately, we need to do fake intr
699
699
                         * as other interrupts, but need to study CPEI behaviour with
700
700
                         * polling before making changes.
701
701
                         */
702
 
                        if (desc) {
703
 
                                desc->chip->disable(ia64_cpe_irq);
704
 
                                desc->chip->set_affinity(ia64_cpe_irq, mask);
705
 
                                desc->chip->enable(ia64_cpe_irq);
706
 
                                printk ("Re-targetting CPEI to cpu %d\n", new_cpei_cpu);
 
702
                        if (data && data->chip) {
 
703
                                data->chip->irq_disable(data);
 
704
                                data->chip->irq_set_affinity(data, mask, false);
 
705
                                data->chip->irq_enable(data);
 
706
                                printk ("Re-targeting CPEI to cpu %d\n", new_cpei_cpu);
707
707
                        }
708
708
                }
709
 
                if (!desc) {
 
709
                if (!data) {
710
710
                        printk ("Unable to retarget CPEI, offline cpu [%d] failed\n", cpu);
711
711
                        retval = -EBUSY;
712
712
                }