x86, um: ... and asm-x86 move

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 0 insertions, 73 deletions

diff --git a/include/asm-x86/gart.h b/include/asm-x86/gart.h
deleted file mode 100644
index 605edb39ef9e..000000000000
--- a/include/asm-x86/gart.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef ASM_X86__GART_H
-#define ASM_X86__GART_H
-
-#include <asm/e820.h>
-
-extern void set_up_gart_resume(u32, u32);
-
-extern int fallback_aper_order;
-extern int fallback_aper_force;
-extern int fix_aperture;
-
-/* PTE bits. */
-#define GPTE_VALID      1
-#define GPTE_COHERENT   2
-
-/* Aperture control register bits. */
-#define GARTEN          (1<<0)
-#define DISGARTCPU      (1<<4)
-#define DISGARTIO       (1<<5)
-
-/* GART cache control register bits. */
-#define INVGART         (1<<0)
-#define GARTPTEERR      (1<<1)
-
-/* K8 On-cpu GART registers */
-#define AMD64_GARTAPERTURECTL   0x90
-#define AMD64_GARTAPERTUREBASE  0x94
-#define AMD64_GARTTABLEBASE     0x98
-#define AMD64_GARTCACHECTL      0x9c
-#define AMD64_GARTEN            (1<<0)
-
-extern int agp_amd64_init(void);
-
-static inline void enable_gart_translation(struct pci_dev *dev, u64 addr)
-{
-        u32 tmp, ctl;
-
-        /* address of the mappings table */
-        addr >>= 12;
-        tmp = (u32) addr<<4;
-        tmp &= ~0xf;
-        pci_write_config_dword(dev, AMD64_GARTTABLEBASE, tmp);
-
-        /* Enable GART translation for this hammer. */
-        pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &ctl);
-        ctl |= GARTEN;
-        ctl &= ~(DISGARTCPU | DISGARTIO);
-        pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl);
-}
-
-static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size)
-{
-        if (!aper_base)
-                return 0;
-
-        if (aper_base + aper_size > 0x100000000ULL) {
-                printk(KERN_INFO "Aperture beyond 4GB. Ignoring.\n");
-                return 0;
-        }
-        if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {
-                printk(KERN_INFO "Aperture pointing to e820 RAM. Ignoring.\n");
-                return 0;
-        }
-        if (aper_size < min_size) {
-                printk(KERN_INFO "Aperture too small (%d MB) than (%d MB)\n",
-                                 aper_size>>20, min_size>>20);
-                return 0;
-        }
-
-        return 1;
-}
-
-#endif /* ASM_X86__GART_H */