diff options
| author | Ingo Molnar | 2008-12-16 22:53:53 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-12-16 22:53:53 +0100 |
| commit | c15cb37cc4e9809624411333b96109ddf770e29c (patch) | |
| tree | 3d4dbb48d97d5df9096ad815b99b20660cdc1bbf /drivers/misc/sgi-gru | |
| parent | x86: fix arch/x86/kernel/genx2apic_uv_x.c build warning when !CONFIG_HOTPLUG_CPU (diff) | |
| parent | Linux 2.6.28-rc8 (diff) | |
| download | kernel-qcow2-linux-c15cb37cc4e9809624411333b96109ddf770e29c.tar.gz kernel-qcow2-linux-c15cb37cc4e9809624411333b96109ddf770e29c.tar.xz kernel-qcow2-linux-c15cb37cc4e9809624411333b96109ddf770e29c.zip | |
Merge commit 'v2.6.28-rc8' into x86/uv
Diffstat (limited to 'drivers/misc/sgi-gru')
| -rw-r--r-- | drivers/misc/sgi-gru/grufault.c | 4 | ||||
| -rw-r--r-- | drivers/misc/sgi-gru/grufile.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index 8c389d606c30..3ee698ad8599 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c @@ -254,7 +254,11 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr, return 1; *paddr = pte_pfn(pte) << PAGE_SHIFT; +#ifdef CONFIG_HUGETLB_PAGE *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; +#else + *pageshift = PAGE_SHIFT; +#endif return 0; err: diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 5c027b6b4e5a..650983806392 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c @@ -481,7 +481,7 @@ struct vm_operations_struct gru_vm_ops = { .fault = gru_fault, }; -module_init(gru_init); +fs_initcall(gru_init); module_exit(gru_exit); module_param(gru_options, ulong, 0644); |