Merge branch 'linux-2.6'

This commit is contained in:
Paul Mackerras
2008-03-13 15:26:33 +11:00
961 changed files with 17667 additions and 12639 deletions

View File

@@ -530,10 +530,10 @@ void __init htab_initialize(void)
} else {
/* Find storage for the HPT. Must be contiguous in
* the absolute address space. On cell we want it to be
* in the first 1 Gig.
* in the first 2 Gig so we can use it for IOMMU hacks.
*/
if (machine_is(cell))
limit = 0x40000000;
limit = 0x80000000;
else
limit = 0;