diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-06-17 11:41:54 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-20 15:09:51 +0200 |
| commit | 7c7e6e07e2a7c0d2d96389f4f0540e44a80ecdaa (patch) | |
| tree | 5d139f94cae6c1d0ff829c5e9eafd8ee96582712 /arch/x86/mm/pgtable_32.c | |
| parent | 944256e00a5466ae6b7a11fdb3a47d092f2f62c1 (diff) | |
| download | blackbird-op-linux-7c7e6e07e2a7c0d2d96389f4f0540e44a80ecdaa.tar.gz blackbird-op-linux-7c7e6e07e2a7c0d2d96389f4f0540e44a80ecdaa.zip | |
x86: unify __set_fixmap
In both cases, I went with the 32-bit behaviour.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/pgtable_32.c')
| -rw-r--r-- | arch/x86/mm/pgtable_32.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index 369cf065b6a4..3f97c3c87288 100644 --- a/arch/x86/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c @@ -145,18 +145,6 @@ static int fixmaps; unsigned long __FIXADDR_TOP = 0xfffff000; EXPORT_SYMBOL(__FIXADDR_TOP); -void __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t flags) -{ - unsigned long address = __fix_to_virt(idx); - - if (idx >= __end_of_fixed_addresses) { - BUG(); - return; - } - set_pte_pfn(address, phys >> PAGE_SHIFT, flags); - fixmaps++; -} - /** * reserve_top_address - reserves a hole in the top of kernel address space * @reserve - size of hole to reserve @@ -166,7 +154,7 @@ void __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t flags) */ void reserve_top_address(unsigned long reserve) { - BUG_ON(fixmaps > 0); + BUG_ON(fixmaps_set > 0); printk(KERN_INFO "Reserving virtual address space above 0x%08x\n", (int)-reserve); __FIXADDR_TOP = -reserve - PAGE_SIZE; |
