diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-28 20:40:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-28 20:40:17 -0700 |
| commit | 79dba2eaa771c3173957eccfd288e0e0d12e4d3f (patch) | |
| tree | 4cafc47b8eaed5d40b2d8705c9f9036fe6b463d3 /arch/x86/pci/i386.c | |
| parent | d9e80b7de91db05c1c4d2e5ebbfd70b3b3ba0e0f (diff) | |
| parent | 48728e077480910df45baabc5f87b04276348c90 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86/PCI: compute Address Space length rather than using _LEN
x86/PCI: never allocate PCI MMIO resources below BIOS_END
Diffstat (limited to 'arch/x86/pci/i386.c')
| -rw-r--r-- | arch/x86/pci/i386.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 46fd43f7910..97da2ba9344 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -72,6 +72,9 @@ pcibios_align_resource(void *data, const struct resource *res, return start; if (start & 0x300) start = (start + 0x3ff) & ~0x3ff; + } else if (res->flags & IORESOURCE_MEM) { + if (start < BIOS_END) + start = BIOS_END; } return start; } |