diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-16 11:31:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-16 11:31:59 -0700 |
| commit | ad54e461137765aaf090eb7f54c3b51fc0ad5d62 (patch) | |
| tree | fb257781ffc6bdb5267f8754cb4c7cd9d41f7070 /net/x25 | |
| parent | 15a063f78eba39e1b040b2c4cab422980b58219a (diff) | |
| parent | 5bc6f9888db5739abfa0cae279b4b442e4db8049 (diff) | |
| download | op-kernel-dev-ad54e461137765aaf090eb7f54c3b51fc0ad5d62.zip op-kernel-dev-ad54e461137765aaf090eb7f54c3b51fc0ad5d62.tar.gz | |
Merge tag 'stable/for-linus-3.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen fix from Konrad Rzeszutek Wilk:
"Way back in v3.5 we added a mechanism to populate back pages that were
released (they overlapped with MMIO regions), but neglected to reserve
the proper amount of virtual space for extend_brk to work properly.
Coincidentally some other commit aligned the _brk space to larger area
so I didn't trigger this until it was run on a machine with more than
2GB of MMIO space."
* On machines with large MMIO/PCI E820 spaces we fail to boot b/c
we failed to pre-allocate large enough virtual space for extend_brk.
* tag 'stable/for-linus-3.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/p2m: Reserve 8MB of _brk space for P2M leafs when populating back.
Diffstat (limited to 'net/x25')
0 files changed, 0 insertions, 0 deletions
