diff options
| author | Andrew Morton <akpm@digeo.com> | 2002-09-19 08:37:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-19 08:37:26 -0700 |
| commit | c7ea169dbcf0fed457edead3cb615f0c5fe8995e (patch) | |
| tree | 71eec50800856ca1a87c0d802ed7a55c5618227d | |
| parent | 12f189a18113958566b83dce8182fc4452cd6c4b (diff) | |
[PATCH] permit hugetlb pages to be allocated from highmem
Patch from Rohit Seth: allow hugetlb pages to be allocated from the
highmem zone.
| -rw-r--r-- | arch/i386/mm/hugetlbpage.c | 4 | ||||
| -rw-r--r-- | arch/i386/mm/init.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/mm/hugetlbpage.c b/arch/i386/mm/hugetlbpage.c index c50cec1dbafb..928622ee5b22 100644 --- a/arch/i386/mm/hugetlbpage.c +++ b/arch/i386/mm/hugetlbpage.c @@ -319,7 +319,7 @@ set_new_inode(unsigned long len, int prot, int flag, int key) } if (i == MAX_ID) return NULL; - inode = kmalloc(sizeof (struct inode), GFP_KERNEL); + inode = kmalloc(sizeof (struct inode), GFP_ATOMIC); if (inode == NULL) return NULL; @@ -502,7 +502,7 @@ set_hugetlb_mem_size(int count) if (lcount > 0) { /* Increase the mem size. */ while (lcount--) { - page = alloc_pages(GFP_ATOMIC, HUGETLB_PAGE_ORDER); + page = alloc_pages(__GFP_HIGHMEM, HUGETLB_PAGE_ORDER); if (page == NULL) break; map = page; diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index c2042aee2b65..c672b966bcca 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -506,7 +506,7 @@ void __init mem_init(void) /*Will make this kernel command line. */ INIT_LIST_HEAD(&htlbpage_freelist); for (i=0; i<htlbzone_pages; i++) { - page = alloc_pages(GFP_ATOMIC, HUGETLB_PAGE_ORDER); + page = alloc_pages(__GFP_HIGHMEM, HUGETLB_PAGE_ORDER); if (page == NULL) break; map = page; |