diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /mm/hugetlb.c | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 9a565808da3f..728e9bda12ea 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -237,7 +237,6 @@ unsigned long hugetlb_total_pages(void) | |||
| 237 | { | 237 | { |
| 238 | return nr_huge_pages * (HPAGE_SIZE / PAGE_SIZE); | 238 | return nr_huge_pages * (HPAGE_SIZE / PAGE_SIZE); |
| 239 | } | 239 | } |
| 240 | EXPORT_SYMBOL(hugetlb_total_pages); | ||
| 241 | 240 | ||
| 242 | /* | 241 | /* |
| 243 | * We cannot handle pagefaults against hugetlb pages at all. They cause | 242 | * We cannot handle pagefaults against hugetlb pages at all. They cause |