Merge branch 'merge'

This commit is contained in:
Paul Mackerras
2008-12-03 20:11:06 +11:00
501 changed files with 7896 additions and 4451 deletions

View File

@@ -676,7 +676,7 @@ repeat:
return err;
}
void set_huge_psize(int psize)
static void __init set_huge_psize(int psize)
{
/* Check that it is a page size supported by the hardware and
* that it fits within pagetable limits. */