x86: unify __set_fixmap

__set_fixmap() is functionally identical in 32 and 64-bit. The cosmetic differences are:
1. 32-bit __set_fixmap keeps track of the number of times it has been called, so that reserve_top_address can BUG if it's called too late
2. 64-bit prints a message if the index is bad, rather than bugging.

In both cases, I went with the 32-bit behaviour.

---

arch/x86/mm/init_64.c    |   12 ------------
arch/x86/mm/pgtable.c    |   14 ++++++++++++++
arch/x86/mm/pgtable_32.c |   14 +-------------
include/asm-x86/fixmap.h |    2 ++
4 files changed, 17 insertions(+), 25 deletions(-)

===================================================================

@@ -212,18 +212,6 @@

		if (vaddr < (unsigned long) _text || vaddr > end)
			set_pmd(pmd, __pmd(0));
	}

-}
-
-/* NOTE: this is meant to be run only at boot */
-void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) -{
- unsigned long address = __fix_to_virt(idx);
-
- if (idx >= __end_of_fixed_addresses) {
- printk(KERN_ERR "Invalid __set_fixmap\n");
- return;
- }
- set_pte_phys(address, phys, prot);
}

static unsigned long __initdata table_start;
===================================================================

@@ -274,3 +274,17 @@
 

	return young;
}

+
+int fixmaps_set;
+
+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_set++;
+}
===================================================================

@@ -145,18 +145,6 @@

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 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;

===================================================================

@@ -6,6 +6,8 @@

#else

# include "fixmap_64.h"
#endif
+
+extern int fixmaps_set;

extern void __set_fixmap(enum fixed_addresses idx,

			 unsigned long phys, pgprot_t flags);