linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-i386 / setup.h

diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h
index 2734909..826a8ca 100644 (file)
--- a/include/asm-i386/setup.h
+++ b/include/asm-i386/setup.h
@@ -6,15 +6,15 @@
 #ifndef _i386_SETUP_H
 #define _i386_SETUP_H
 
-#ifdef __KERNEL__
-#include <linux/pfn.h>
+#define PFN_UP(x)      (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
+#define PFN_DOWN(x)    ((x) >> PAGE_SHIFT)
+#define PFN_PHYS(x)    ((x) << PAGE_SHIFT)
 
 /*
  * Reserved space for vmalloc and iomap - defined in asm/page.h
  */
 #define MAXMEM_PFN     PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN (1 << 20)
-#endif
 
 #define PARAM_SIZE 4096
 #define COMMAND_LINE_SIZE 256
@@ -61,21 +61,6 @@ extern unsigned char boot_params[PARAM_SIZE];
 #define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
 #define EDD_BUF     ((struct edd_info *) (PARAM+EDDBUF))
 
-/*
- * Do NOT EVER look at the BIOS memory size location.
- * It does not work on many machines.
- */
-#define LOWMEMSIZE()   (0x9f000)
-
-struct e820entry;
-
-char * __init machine_specific_memory_setup(void);
-
-int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
-int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
-void __init add_memory_region(unsigned long long start,
-                             unsigned long long size, int type);
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* _i386_SETUP_H */