Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, setup: Don't skip mode setting for the standard VGA modes
  x86-64, setup: Inhibit decompressor output if video info is invalid
  x86, setup: When restoring the screen, update boot_params.screen_info

diff --combined arch/x86/boot/compressed/misc.c
index 88042e812d3c1c536232219bd1390afa233d292a,3487e86ed3cccba81a1c0e19a67f1f8542953356..51e240779a44c5b912957c31c7e877b29d058d9c
--- 1/arch/x86/boot/compressed/misc.c
--- 2/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@@ -19,6 -19,11 +19,6 @@@
  #define _ASM_X86_DESC_H 1
  #endif
  
 -#ifdef CONFIG_X86_64
 -#define _LINUX_STRING_H_ 1
 -#define __LINUX_BITMAP_H 1
 -#endif
 -
  #include <linux/linkage.h>
  #include <linux/screen_info.h>
  #include <linux/elf.h>
@@@ -126,8 -131,8 +126,8 @@@ static void error(char *m)
  static struct boot_params *real_mode;         /* Pointer to real-mode data */
  static int quiet;
  
 -static void *memset(void *s, int c, unsigned n);
 -void *memcpy(void *dest, const void *src, unsigned n);
 +void *memset(void *s, int c, size_t n);
 +void *memcpy(void *dest, const void *src, size_t n);
  
  static void __putstr(int, const char *);
  #define putstr(__x)  __putstr(0, __x)
@@@ -180,11 -185,9 +180,9 @@@ static void __putstr(int error, const c
                return;
  #endif
  
- #ifdef CONFIG_X86_32
        if (real_mode->screen_info.orig_video_mode == 0 &&
            lines == 0 && cols == 0)
                return;
- #endif
  
        x = real_mode->screen_info.orig_x;
        y = real_mode->screen_info.orig_y;
@@@ -218,7 -221,7 +216,7 @@@
        outb(0xff & (pos >> 1), vidport+1);
  }
  
 -static void *memset(void *s, int c, unsigned n)
 +void *memset(void *s, int c, size_t n)
  {
        int i;
        char *ss = s;
@@@ -228,7 -231,7 +226,7 @@@
        return s;
  }
  
 -void *memcpy(void *dest, const void *src, unsigned n)
 +void *memcpy(void *dest, const void *src, size_t n)
  {
        int i;
        const char *s = src;