← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/arm/mach-pxa/cm-x2xx-pci.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-pxa/cm-x2xx-pci.c
35
35
 * This is really ugly and we need a better way of specifying
36
36
 * DMA-capable regions of memory.
37
37
 */
38
 
void __init cmx2xx_pci_adjust_zones(int node, unsigned long *zone_size,
 
38
void __init cmx2xx_pci_adjust_zones(unsigned long *zone_size,
39
39
        unsigned long *zhole_size)
40
40
{
41
41
        unsigned int sz = SZ_64M >> PAGE_SHIFT;
46
46
                /*
47
47
                 * Only adjust if > 64M on current system
48
48
                 */
49
 
                if (node || (zone_size[0] <= sz))
 
49
                if (zone_size[0] <= sz)
50
50
                        return;
51
51
 
52
52
                zone_size[1] = zone_size[0] - sz;
59
59
static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
60
60
{
61
61
        /* clear our parent irq */
62
 
        GEDR(cmx2xx_it8152_irq_gpio) = GPIO_bit(cmx2xx_it8152_irq_gpio);
 
62
        desc->irq_data.chip->irq_ack(&desc->irq_data);
63
63
 
64
64
        it8152_irq_demux(irq, desc);
65
65
}