Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

[powerpc.git] / arch / i386 / boot / compressed / misc.c

diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c
index 4eac24e..1ce7017 100644 (file)
--- a/arch/i386/boot/compressed/misc.c
+++ b/arch/i386/boot/compressed/misc.c
@@ -9,11 +9,13 @@
  * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
  */
 
+#undef CONFIG_PARAVIRT
 #include <linux/linkage.h>
 #include <linux/vmalloc.h>
 #include <linux/screen_info.h>
 #include <asm/io.h>
 #include <asm/page.h>
+#include <asm/boot.h>
 
 /* WARNING!!
  * This code is compiled with -fPIC and it is relocated dynamically
@@ -194,7 +196,7 @@ static int vidport;
 static int lines, cols;
 
 #ifdef CONFIG_X86_NUMAQ
-static void * xquad_portio = NULL;
+void *xquad_portio;
 #endif
 
 #include "../../../../lib/inflate.c"
@@ -360,12 +362,12 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end,
        insize = input_len;
        inptr  = 0;
 
-       if (((u32)output - CONFIG_PHYSICAL_START) & 0x3fffff)
-               error("Destination address not 4M aligned");
+       if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
+               error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
        if (end > ((-__PAGE_OFFSET-(512 <<20)-1) & 0x7fffffff))
                error("Destination address too large");
 #ifndef CONFIG_RELOCATABLE
-       if ((u32)output != CONFIG_PHYSICAL_START)
+       if ((u32)output != LOAD_PHYSICAL_ADDR)
                error("Wrong destination address");
 #endif