projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lua: Fixed some cross-platform issues for PPC (and probably other architectures)
[openwrt.git] / target / linux / generic-2.6 / patches-2.6.22 / 014-x86_newsetup.patch
diff --git a/target/linux/generic-2.6/patches-2.6.22/014-x86_newsetup.patch b/target/linux/generic-2.6/patches-2.6.22/014-x86_newsetup.patch
index d73691f..9d77c83 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.22/014-x86_newsetup.patch
+++ b/target/linux/generic-2.6/patches-2.6.22/014-x86_newsetup.patch
@@ -1362,10 +1362,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  include/linux/screen_info.h                 |    9 
  75 files changed, 4594 insertions(+), 5204 deletions(-)
 
  include/linux/screen_info.h                 |    9 
  75 files changed, 4594 insertions(+), 5204 deletions(-)
 
-diff -puN MAINTAINERS~git-newsetup MAINTAINERS
---- a/MAINTAINERS~git-newsetup
-+++ a/MAINTAINERS
-@@ -1774,8 +1774,8 @@ T:       http://www.harbaum.org/till/i2c_tiny_
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -1750,8 +1750,8 @@
  S:    Maintained
  
  i386 BOOT CODE
  S:    Maintained
  
  i386 BOOT CODE
@@ -1376,10 +1375,9 @@ diff -puN MAINTAINERS~git-newsetup MAINTAINERS
  L:    Linux-Kernel@vger.kernel.org
  S:    Maintained
  
  L:    Linux-Kernel@vger.kernel.org
  S:    Maintained
  
-diff -puN arch/i386/Kconfig.cpu~git-newsetup arch/i386/Kconfig.cpu
---- a/arch/i386/Kconfig.cpu~git-newsetup
-+++ a/arch/i386/Kconfig.cpu
-@@ -346,6 +346,6 @@ config X86_CMOV
+--- a/arch/i386/Kconfig.cpu
++++ b/arch/i386/Kconfig.cpu
+@@ -346,6 +346,6 @@
  
  config X86_MINIMUM_CPU_MODEL
        int
  
  config X86_MINIMUM_CPU_MODEL
        int
@@ -1388,10 +1386,9 @@ diff -puN arch/i386/Kconfig.cpu~git-newsetup arch/i386/Kconfig.cpu
 +      default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK
 +      default "3"
  
 +      default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK
 +      default "3"
  
-diff -puN arch/i386/boot/Makefile~git-newsetup arch/i386/boot/Makefile
---- a/arch/i386/boot/Makefile~git-newsetup
-+++ a/arch/i386/boot/Makefile
-@@ -25,27 +25,53 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
+--- a/arch/i386/boot/Makefile
++++ b/arch/i386/boot/Makefile
+@@ -25,27 +25,53 @@
  
  #RAMDISK := -DRAMDISK=512
  
  
  #RAMDISK := -DRAMDISK=512
  
@@ -1449,7 +1446,7 @@ diff -puN arch/i386/boot/Makefile~git-newsetup arch/i386/boot/Makefile
                              $(obj)/vmlinux.bin $(obj)/tools/build FORCE
        $(call if_changed,image)
        @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
                              $(obj)/vmlinux.bin $(obj)/tools/build FORCE
        $(call if_changed,image)
        @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
-@@ -53,12 +79,17 @@ $(obj)/zImage $(obj)/bzImage: $(obj)/boo
+@@ -53,12 +79,17 @@
  $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
        $(call if_changed,objcopy)
  
  $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
        $(call if_changed,objcopy)
  
@@ -1470,9 +1467,8 @@ diff -puN arch/i386/boot/Makefile~git-newsetup arch/i386/boot/Makefile
  $(obj)/compressed/vmlinux: FORCE
        $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
  
  $(obj)/compressed/vmlinux: FORCE
        $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
  
-diff -puN /dev/null arch/i386/boot/a20.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/a20.c
++++ b/arch/i386/boot/a20.c
 @@ -0,0 +1,161 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,161 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -1635,9 +1631,8 @@ diff -puN /dev/null arch/i386/boot/a20.c
 +      return -1;
 +#endif
 +}
 +      return -1;
 +#endif
 +}
-diff -puN /dev/null arch/i386/boot/apm.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/apm.c
++++ b/arch/i386/boot/apm.c
 @@ -0,0 +1,97 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,97 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -1736,9 +1731,8 @@ diff -puN /dev/null arch/i386/boot/apm.c
 +}
 +
 +#endif
 +}
 +
 +#endif
-diff -puN /dev/null arch/i386/boot/bitops.h
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/bitops.h
++++ b/arch/i386/boot/bitops.h
 @@ -0,0 +1,45 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,45 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -1785,9 +1779,8 @@ diff -puN /dev/null arch/i386/boot/bitops.h
 +}
 +
 +#endif /* BOOT_BITOPS_H */
 +}
 +
 +#endif /* BOOT_BITOPS_H */
-diff -puN /dev/null arch/i386/boot/boot.h
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/boot.h
++++ b/arch/i386/boot/boot.h
 @@ -0,0 +1,290 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,290 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -2079,7 +2072,6 @@ diff -puN /dev/null arch/i386/boot/boot.h
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* BOOT_BOOT_H */
 +#endif /* __ASSEMBLY__ */
 +
 +#endif /* BOOT_BOOT_H */
-diff -puN arch/i386/boot/bootsect.S~git-newsetup /dev/null
 --- a/arch/i386/boot/bootsect.S
 +++ /dev/null
 @@ -1,98 +0,0 @@
 --- a/arch/i386/boot/bootsect.S
 +++ /dev/null
 @@ -1,98 +0,0 @@
@@ -2181,9 +2173,8 @@ diff -puN arch/i386/boot/bootsect.S~git-newsetup /dev/null
 -vid_mode:     .word SVGA_MODE
 -root_dev:     .word ROOT_DEV
 -boot_flag:    .word 0xAA55
 -vid_mode:     .word SVGA_MODE
 -root_dev:     .word ROOT_DEV
 -boot_flag:    .word 0xAA55
-diff -puN /dev/null arch/i386/boot/cmdline.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/cmdline.c
++++ b/arch/i386/boot/cmdline.c
 @@ -0,0 +1,97 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,97 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -2282,9 +2273,8 @@ diff -puN /dev/null arch/i386/boot/cmdline.c
 +
 +      return len;
 +}
 +
 +      return len;
 +}
-diff -puN /dev/null arch/i386/boot/code16gcc.h
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/code16gcc.h
++++ b/arch/i386/boot/code16gcc.h
 @@ -0,0 +1,9 @@
 +/*
 + * code16gcc.h
 @@ -0,0 +1,9 @@
 +/*
 + * code16gcc.h
@@ -2295,10 +2285,9 @@ diff -puN /dev/null arch/i386/boot/code16gcc.h
 +#ifndef __ASSEMBLY__
 +asm(".code16gcc");
 +#endif
 +#ifndef __ASSEMBLY__
 +asm(".code16gcc");
 +#endif
-diff -puN arch/i386/boot/compressed/Makefile~git-newsetup arch/i386/boot/compressed/Makefile
---- a/arch/i386/boot/compressed/Makefile~git-newsetup
-+++ a/arch/i386/boot/compressed/Makefile
-@@ -9,9 +9,14 @@ targets               := vmlinux vmlinux.bin vmlinux.
+--- a/arch/i386/boot/compressed/Makefile
++++ b/arch/i386/boot/compressed/Makefile
+@@ -9,9 +9,14 @@
  EXTRA_AFLAGS  := -traditional
  
  LDFLAGS_vmlinux := -T
  EXTRA_AFLAGS  := -traditional
  
  LDFLAGS_vmlinux := -T
@@ -2314,10 +2303,9 @@ diff -puN arch/i386/boot/compressed/Makefile~git-newsetup arch/i386/boot/compres
  $(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
        $(call if_changed,ld)
        @:
  $(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
        $(call if_changed,ld)
        @:
-diff -puN arch/i386/boot/compressed/head.S~git-newsetup arch/i386/boot/compressed/head.S
---- a/arch/i386/boot/compressed/head.S~git-newsetup
-+++ a/arch/i386/boot/compressed/head.S
-@@ -45,10 +45,10 @@ startup_32:
+--- a/arch/i386/boot/compressed/head.S
++++ b/arch/i386/boot/compressed/head.S
+@@ -45,10 +45,10 @@
   * at and where we were actually loaded at.  This can only be done
   * with a short local call on x86.  Nothing  else will tell us what
   * address we are running at.  The reserved chunk of the real-mode
   * at and where we were actually loaded at.  This can only be done
   * with a short local call on x86.  Nothing  else will tell us what
   * address we are running at.  The reserved chunk of the real-mode
@@ -2331,9 +2319,8 @@ diff -puN arch/i386/boot/compressed/head.S~git-newsetup arch/i386/boot/compresse
        call 1f
  1:    popl %ebp
        subl $1b, %ebp
        call 1f
  1:    popl %ebp
        subl $1b, %ebp
-diff -puN arch/i386/boot/compressed/misc.c~git-newsetup arch/i386/boot/compressed/misc.c
---- a/arch/i386/boot/compressed/misc.c~git-newsetup
-+++ a/arch/i386/boot/compressed/misc.c
+--- a/arch/i386/boot/compressed/misc.c
++++ b/arch/i386/boot/compressed/misc.c
 @@ -11,7 +11,6 @@
  
  #undef CONFIG_PARAVIRT
 @@ -11,7 +11,6 @@
  
  #undef CONFIG_PARAVIRT
@@ -2342,7 +2329,7 @@ diff -puN arch/i386/boot/compressed/misc.c~git-newsetup arch/i386/boot/compresse
  #include <linux/screen_info.h>
  #include <asm/io.h>
  #include <asm/page.h>
  #include <linux/screen_info.h>
  #include <asm/io.h>
  #include <asm/page.h>
-@@ -364,8 +363,10 @@ asmlinkage void decompress_kernel(void *
+@@ -364,8 +363,10 @@
  
        if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
                error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
  
        if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
                error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
@@ -2353,9 +2340,8 @@ diff -puN arch/i386/boot/compressed/misc.c~git-newsetup arch/i386/boot/compresse
  #ifndef CONFIG_RELOCATABLE
        if ((u32)output != LOAD_PHYSICAL_ADDR)
                error("Wrong destination address");
  #ifndef CONFIG_RELOCATABLE
        if ((u32)output != LOAD_PHYSICAL_ADDR)
                error("Wrong destination address");
-diff -puN /dev/null arch/i386/boot/copy.S
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/copy.S
++++ b/arch/i386/boot/copy.S
 @@ -0,0 +1,101 @@
 +/* ----------------------------------------------------------------------- *
 + *
 @@ -0,0 +1,101 @@
 +/* ----------------------------------------------------------------------- *
 + *
@@ -2458,9 +2444,8 @@ diff -puN /dev/null arch/i386/boot/copy.S
 +      .size   copy_to_gs, .-copy_to_gs
 +
 +#endif
 +      .size   copy_to_gs, .-copy_to_gs
 +
 +#endif
-diff -puN /dev/null arch/i386/boot/cpu.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/cpu.c
++++ b/arch/i386/boot/cpu.c
 @@ -0,0 +1,69 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,69 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -2531,9 +2516,8 @@ diff -puN /dev/null arch/i386/boot/cpu.c
 +              return 0;
 +      }
 +}
 +              return 0;
 +      }
 +}
-diff -puN /dev/null arch/i386/boot/cpucheck.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/cpucheck.c
++++ b/arch/i386/boot/cpucheck.c
 @@ -0,0 +1,266 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,266 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -2801,7 +2785,6 @@ diff -puN /dev/null arch/i386/boot/cpucheck.c
 +
 +      return (cpu.level < req_level || err) ? -1 : 0;
 +}
 +
 +      return (cpu.level < req_level || err) ? -1 : 0;
 +}
-diff -puN arch/i386/boot/edd.S~git-newsetup /dev/null
 --- a/arch/i386/boot/edd.S
 +++ /dev/null
 @@ -1,231 +0,0 @@
 --- a/arch/i386/boot/edd.S
 +++ /dev/null
 @@ -1,231 +0,0 @@
@@ -3036,9 +3019,8 @@ diff -puN arch/i386/boot/edd.S~git-newsetup /dev/null
 -
 -edd_done:
 -#endif
 -
 -edd_done:
 -#endif
-diff -puN /dev/null arch/i386/boot/edd.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/edd.c
++++ b/arch/i386/boot/edd.c
 @@ -0,0 +1,196 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,196 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -3236,9 +3218,8 @@ diff -puN /dev/null arch/i386/boot/edd.c
 +}
 +
 +#endif
 +}
 +
 +#endif
-diff -puN /dev/null arch/i386/boot/header.S
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/header.S
++++ b/arch/i386/boot/header.S
 @@ -0,0 +1,283 @@
 +/*
 + *    header.S
 @@ -0,0 +1,283 @@
 +/*
 + *    header.S
@@ -3523,9 +3504,8 @@ diff -puN /dev/null arch/i386/boot/header.S
 +setup_corrupt:
 +      .byte   7
 +      .string "No setup signature found..."
 +setup_corrupt:
 +      .byte   7
 +      .string "No setup signature found..."
-diff -puN /dev/null arch/i386/boot/main.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/main.c
++++ b/arch/i386/boot/main.c
 @@ -0,0 +1,161 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,161 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -3688,9 +3668,8 @@ diff -puN /dev/null arch/i386/boot/main.c
 +      /* Do the last things and invoke protected mode */
 +      go_to_protected_mode();
 +}
 +      /* Do the last things and invoke protected mode */
 +      go_to_protected_mode();
 +}
-diff -puN /dev/null arch/i386/boot/mca.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/mca.c
++++ b/arch/i386/boot/mca.c
 @@ -0,0 +1,43 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,43 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -3735,9 +3714,8 @@ diff -puN /dev/null arch/i386/boot/mca.c
 +      copy_from_fs(&boot_params.sys_desc_table, bx, len);
 +      return 0;
 +}
 +      copy_from_fs(&boot_params.sys_desc_table, bx, len);
 +      return 0;
 +}
-diff -puN /dev/null arch/i386/boot/memory.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/memory.c
++++ b/arch/i386/boot/memory.c
 @@ -0,0 +1,99 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,99 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -3838,9 +3816,8 @@ diff -puN /dev/null arch/i386/boot/memory.c
 +
 +      return detect_memory_88();
 +}
 +
 +      return detect_memory_88();
 +}
-diff -puN /dev/null arch/i386/boot/pm.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/pm.c
++++ b/arch/i386/boot/pm.c
 @@ -0,0 +1,170 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,170 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -4012,9 +3989,8 @@ diff -puN /dev/null arch/i386/boot/pm.c
 +      protected_mode_jump(boot_params.hdr.code32_start,
 +                          (u32)&boot_params + (ds() << 4));
 +}
 +      protected_mode_jump(boot_params.hdr.code32_start,
 +                          (u32)&boot_params + (ds() << 4));
 +}
-diff -puN /dev/null arch/i386/boot/pmjump.S
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/pmjump.S
++++ b/arch/i386/boot/pmjump.S
 @@ -0,0 +1,54 @@
 +/* ----------------------------------------------------------------------- *
 + *
 @@ -0,0 +1,54 @@
 +/* ----------------------------------------------------------------------- *
 + *
@@ -4070,9 +4046,8 @@ diff -puN /dev/null arch/i386/boot/pmjump.S
 +      .word   __BOOT_CS               # segment
 +
 +      .size   protected_mode_jump, .-protected_mode_jump
 +      .word   __BOOT_CS               # segment
 +
 +      .size   protected_mode_jump, .-protected_mode_jump
-diff -puN /dev/null arch/i386/boot/printf.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/printf.c
++++ b/arch/i386/boot/printf.c
 @@ -0,0 +1,331 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,331 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -4405,7 +4380,6 @@ diff -puN /dev/null arch/i386/boot/printf.c
 +
 +      return printed;
 +}
 +
 +      return printed;
 +}
-diff -puN arch/i386/boot/setup.S~git-newsetup /dev/null
 --- a/arch/i386/boot/setup.S
 +++ /dev/null
 @@ -1,1075 +0,0 @@
 --- a/arch/i386/boot/setup.S
 +++ /dev/null
 @@ -1,1075 +0,0 @@
@@ -5484,9 +5458,8 @@ diff -puN arch/i386/boot/setup.S~git-newsetup /dev/null
 -enddata:
 -.bss
 -endbss:
 -enddata:
 -.bss
 -endbss:
-diff -puN /dev/null arch/i386/boot/setup.ld
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/setup.ld
++++ b/arch/i386/boot/setup.ld
 @@ -0,0 +1,54 @@
 +/*
 + * setup.ld
 @@ -0,0 +1,54 @@
 +/*
 + * setup.ld
@@ -5542,9 +5515,8 @@ diff -puN /dev/null arch/i386/boot/setup.ld
 +      . = ASSERT(_end <= 0x8000, "Setup too big!");
 +      . = ASSERT(hdr == 0x1f1, "The setup header has the wrong offset!");
 +}
 +      . = ASSERT(_end <= 0x8000, "Setup too big!");
 +      . = ASSERT(hdr == 0x1f1, "The setup header has the wrong offset!");
 +}
-diff -puN /dev/null arch/i386/boot/string.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/string.c
++++ b/arch/i386/boot/string.c
 @@ -0,0 +1,34 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,34 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -5580,9 +5552,8 @@ diff -puN /dev/null arch/i386/boot/string.c
 +      }
 +      return 0;
 +}
 +      }
 +      return 0;
 +}
-diff -puN arch/i386/boot/tools/build.c~git-newsetup arch/i386/boot/tools/build.c
---- a/arch/i386/boot/tools/build.c~git-newsetup
-+++ a/arch/i386/boot/tools/build.c
+--- a/arch/i386/boot/tools/build.c
++++ b/arch/i386/boot/tools/build.c
 @@ -1,13 +1,12 @@
  /*
   *  Copyright (C) 1991, 1992  Linus Torvalds
 @@ -1,13 +1,12 @@
  /*
   *  Copyright (C) 1991, 1992  Linus Torvalds
@@ -5640,7 +5611,7 @@ diff -puN arch/i386/boot/tools/build.c~git-newsetup arch/i386/boot/tools/build.c
  {
        va_list args;
        va_start(args, str);
  {
        va_list args;
        va_start(args, str);
-@@ -57,15 +59,9 @@ void die(const char * str, ...)
+@@ -57,15 +59,9 @@
        exit(1);
  }
  
        exit(1);
  }
  
@@ -5658,7 +5629,7 @@ diff -puN arch/i386/boot/tools/build.c~git-newsetup arch/i386/boot/tools/build.c
  }
  
  int main(int argc, char ** argv)
  }
  
  int main(int argc, char ** argv)
-@@ -73,27 +69,30 @@ int main(int argc, char ** argv)
+@@ -73,27 +69,30 @@
        unsigned int i, sz, setup_sectors;
        int c;
        u32 sys_size;
        unsigned int i, sz, setup_sectors;
        int c;
        u32 sys_size;
@@ -5696,7 +5667,7 @@ diff -puN arch/i386/boot/tools/build.c~git-newsetup arch/i386/boot/tools/build.c
                                die("Couldn't stat root device.");
                        }
                        major_root = major(sb.st_rdev);
                                die("Couldn't stat root device.");
                        }
                        major_root = major(sb.st_rdev);
-@@ -108,79 +107,62 @@ int main(int argc, char ** argv)
+@@ -108,79 +107,62 @@
        }
        fprintf(stderr, "Root device is (%d, %d)\n", major_root, minor_root);
  
        }
        fprintf(stderr, "Root device is (%d, %d)\n", major_root, minor_root);
  
@@ -5821,9 +5792,8 @@ diff -puN arch/i386/boot/tools/build.c~git-newsetup arch/i386/boot/tools/build.c
 +      /* Everything is OK */
 +      return 0;
  }
 +      /* Everything is OK */
 +      return 0;
  }
-diff -puN /dev/null arch/i386/boot/tty.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/tty.c
++++ b/arch/i386/boot/tty.c
 @@ -0,0 +1,112 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,112 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -5937,9 +5907,8 @@ diff -puN /dev/null arch/i386/boot/tty.c
 +
 +      return 0;               /* Timeout! */
 +}
 +
 +      return 0;               /* Timeout! */
 +}
-diff -puN /dev/null arch/i386/boot/version.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/version.c
++++ b/arch/i386/boot/version.c
 @@ -0,0 +1,23 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,23 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -5964,9 +5933,8 @@ diff -puN /dev/null arch/i386/boot/version.c
 +const char kernel_version[] =
 +      UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
 +      UTS_VERSION;
 +const char kernel_version[] =
 +      UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") "
 +      UTS_VERSION;
-diff -puN /dev/null arch/i386/boot/vesa.h
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/vesa.h
++++ b/arch/i386/boot/vesa.h
 @@ -0,0 +1,79 @@
 +/* ----------------------------------------------------------------------- *
 + *
 @@ -0,0 +1,79 @@
 +/* ----------------------------------------------------------------------- *
 + *
@@ -6047,9 +6015,8 @@ diff -puN /dev/null arch/i386/boot/vesa.h
 +} __attribute__((packed));
 +
 +#endif /* LIB_SYS_VESA_H */
 +} __attribute__((packed));
 +
 +#endif /* LIB_SYS_VESA_H */
-diff -puN /dev/null arch/i386/boot/video-bios.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/video-bios.c
++++ b/arch/i386/boot/video-bios.c
 @@ -0,0 +1,125 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,125 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -6176,9 +6143,8 @@ diff -puN /dev/null arch/i386/boot/video-bios.c
 +      .xmode_first    = VIDEO_FIRST_BIOS,
 +      .xmode_n        = 0x80,
 +};
 +      .xmode_first    = VIDEO_FIRST_BIOS,
 +      .xmode_n        = 0x80,
 +};
-diff -puN /dev/null arch/i386/boot/video-vesa.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/video-vesa.c
++++ b/arch/i386/boot/video-vesa.c
 @@ -0,0 +1,283 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,283 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -6463,9 +6429,8 @@ diff -puN /dev/null arch/i386/boot/video-vesa.c
 +      .xmode_first    = VIDEO_FIRST_VESA,
 +      .xmode_n        = 0x200,
 +};
 +      .xmode_first    = VIDEO_FIRST_VESA,
 +      .xmode_n        = 0x200,
 +};
-diff -puN /dev/null arch/i386/boot/video-vga.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/video-vga.c
++++ b/arch/i386/boot/video-vga.c
 @@ -0,0 +1,260 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,260 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -6727,7 +6692,6 @@ diff -puN /dev/null arch/i386/boot/video-vga.c
 +      .probe          = vga_probe,
 +      .set_mode       = vga_set_mode,
 +};
 +      .probe          = vga_probe,
 +      .set_mode       = vga_set_mode,
 +};
-diff -puN arch/i386/boot/video.S~git-newsetup /dev/null
 --- a/arch/i386/boot/video.S
 +++ /dev/null
 @@ -1,2043 +0,0 @@
 --- a/arch/i386/boot/video.S
 +++ /dev/null
 @@ -1,2043 +0,0 @@
@@ -8774,9 +8738,8 @@ diff -puN arch/i386/boot/video.S~git-newsetup /dev/null
 -adapter:      .byte   0       # Video adapter: 0=CGA/MDA/HGA,1=EGA,2=VGA
 -video_segment:        .word   0xb800  # Video memory segment
 -force_size:   .word   0       # Use this size instead of the one in BIOS vars
 -adapter:      .byte   0       # Video adapter: 0=CGA/MDA/HGA,1=EGA,2=VGA
 -video_segment:        .word   0xb800  # Video memory segment
 -force_size:   .word   0       # Use this size instead of the one in BIOS vars
-diff -puN /dev/null arch/i386/boot/video.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/video.c
++++ b/arch/i386/boot/video.c
 @@ -0,0 +1,456 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,456 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -9234,9 +9197,8 @@ diff -puN /dev/null arch/i386/boot/video.c
 +      if (do_restore)
 +              restore_screen();
 +}
 +      if (do_restore)
 +              restore_screen();
 +}
-diff -puN /dev/null arch/i386/boot/video.h
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/video.h
++++ b/arch/i386/boot/video.h
 @@ -0,0 +1,145 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,145 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -9383,9 +9345,8 @@ diff -puN /dev/null arch/i386/boot/video.h
 +u16 vga_crtc(void);           /* video-vga.c */
 +
 +#endif /* BOOT_VIDEO_H */
 +u16 vga_crtc(void);           /* video-vga.c */
 +
 +#endif /* BOOT_VIDEO_H */
-diff -puN /dev/null arch/i386/boot/voyager.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/boot/voyager.c
++++ b/arch/i386/boot/voyager.c
 @@ -0,0 +1,46 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
 @@ -0,0 +1,46 @@
 +/* -*- linux-c -*- ------------------------------------------------------- *
 + *
@@ -9433,10 +9394,8 @@ diff -puN /dev/null arch/i386/boot/voyager.c
 +}
 +
 +#endif /* CONFIG_X86_VOYAGER */
 +}
 +
 +#endif /* CONFIG_X86_VOYAGER */
-diff -puN arch/i386/kernel/cpu/Makefile~git-newsetup arch/i386/kernel/cpu/Makefile
-diff -puN /dev/null arch/i386/kernel/cpu/addon_cpuid_features.c
 --- /dev/null
 --- /dev/null
-+++ a/arch/i386/kernel/cpu/addon_cpuid_features.c
++++ b/arch/i386/kernel/cpu/addon_cpuid_features.c
 @@ -0,0 +1,50 @@
 +
 +/*
 @@ -0,0 +1,50 @@
 +
 +/*
@@ -9488,10 +9447,9 @@ diff -puN /dev/null arch/i386/kernel/cpu/addon_cpuid_features.c
 +                      set_bit(cb->feature, c->x86_capability);
 +      }
 +}
 +                      set_bit(cb->feature, c->x86_capability);
 +      }
 +}
-diff -puN arch/i386/kernel/cpu/common.c~git-newsetup arch/i386/kernel/cpu/common.c
---- a/arch/i386/kernel/cpu/common.c~git-newsetup
-+++ a/arch/i386/kernel/cpu/common.c
-@@ -353,6 +353,8 @@ static void __cpuinit generic_identify(s
+--- a/arch/i386/kernel/cpu/common.c
++++ b/arch/i386/kernel/cpu/common.c
+@@ -353,6 +353,8 @@
                        if ( xlvl >= 0x80000004 )
                                get_model_name(c); /* Default name */
                }
                        if ( xlvl >= 0x80000004 )
                                get_model_name(c); /* Default name */
                }
@@ -9500,10 +9458,9 @@ diff -puN arch/i386/kernel/cpu/common.c~git-newsetup arch/i386/kernel/cpu/common
        }
  
        early_intel_workaround(c);
        }
  
        early_intel_workaround(c);
-diff -puN arch/i386/kernel/cpu/proc.c~git-newsetup arch/i386/kernel/cpu/proc.c
---- a/arch/i386/kernel/cpu/proc.c~git-newsetup
-+++ a/arch/i386/kernel/cpu/proc.c
-@@ -29,7 +29,8 @@ static int show_cpuinfo(struct seq_file 
+--- a/arch/i386/kernel/cpu/proc.c
++++ b/arch/i386/kernel/cpu/proc.c
+@@ -29,7 +29,8 @@
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
@@ -9513,7 +9470,7 @@ diff -puN arch/i386/kernel/cpu/proc.c~git-newsetup arch/i386/kernel/cpu/proc.c
  
                /* Transmeta-defined */
                "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
  
                /* Transmeta-defined */
                "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
-@@ -40,8 +41,9 @@ static int show_cpuinfo(struct seq_file 
+@@ -40,8 +41,9 @@
                /* Other (Linux-defined) */
                "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",
                NULL, NULL, NULL, NULL,
                /* Other (Linux-defined) */
                "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",
                NULL, NULL, NULL, NULL,
@@ -9525,7 +9482,7 @@ diff -puN arch/i386/kernel/cpu/proc.c~git-newsetup arch/i386/kernel/cpu/proc.c
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* Intel-defined (#2) */
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* Intel-defined (#2) */
-@@ -57,9 +59,16 @@ static int show_cpuinfo(struct seq_file 
+@@ -57,9 +59,16 @@
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* AMD-defined (#2) */
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* AMD-defined (#2) */
@@ -9545,10 +9502,9 @@ diff -puN arch/i386/kernel/cpu/proc.c~git-newsetup arch/i386/kernel/cpu/proc.c
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        };
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        };
-diff -puN arch/i386/kernel/e820.c~git-newsetup arch/i386/kernel/e820.c
---- a/arch/i386/kernel/e820.c~git-newsetup
-+++ a/arch/i386/kernel/e820.c
-@@ -766,7 +766,7 @@ void __init print_memory_map(char *who)
+--- a/arch/i386/kernel/e820.c
++++ b/arch/i386/kernel/e820.c
+@@ -734,7 +734,7 @@
                case E820_NVS:
                                printk("(ACPI NVS)\n");
                                break;
                case E820_NVS:
                                printk("(ACPI NVS)\n");
                                break;
@@ -9557,10 +9513,9 @@ diff -puN arch/i386/kernel/e820.c~git-newsetup arch/i386/kernel/e820.c
                                break;
                }
        }
                                break;
                }
        }
-diff -puN arch/i386/kernel/setup.c~git-newsetup arch/i386/kernel/setup.c
---- a/arch/i386/kernel/setup.c~git-newsetup
-+++ a/arch/i386/kernel/setup.c
-@@ -102,19 +102,10 @@ static unsigned int highmem_pages = -1;
+--- a/arch/i386/kernel/setup.c
++++ b/arch/i386/kernel/setup.c
+@@ -102,19 +102,10 @@
  /*
   * Setup options
   */
  /*
   * Setup options
   */
@@ -9580,7 +9535,7 @@ diff -puN arch/i386/kernel/setup.c~git-newsetup arch/i386/kernel/setup.c
  struct edid_info edid_info;
  EXPORT_SYMBOL_GPL(edid_info);
  struct ist_info ist_info;
  struct edid_info edid_info;
  EXPORT_SYMBOL_GPL(edid_info);
  struct ist_info ist_info;
-@@ -134,7 +125,7 @@ unsigned long saved_videomode;
+@@ -134,7 +125,7 @@
  
  static char __initdata command_line[COMMAND_LINE_SIZE];
  
  
  static char __initdata command_line[COMMAND_LINE_SIZE];
  
@@ -9589,7 +9544,7 @@ diff -puN arch/i386/kernel/setup.c~git-newsetup arch/i386/kernel/setup.c
  
  #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
  struct edd edd;
  
  #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
  struct edd edd;
-@@ -528,7 +519,6 @@ void __init setup_arch(char **cmdline_p)
+@@ -528,7 +519,6 @@
  #endif
  
        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
  #endif
  
        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
@@ -9597,7 +9552,6 @@ diff -puN arch/i386/kernel/setup.c~git-newsetup arch/i386/kernel/setup.c
        screen_info = SCREEN_INFO;
        edid_info = EDID_INFO;
        apm_info.bios = APM_BIOS_INFO;
        screen_info = SCREEN_INFO;
        edid_info = EDID_INFO;
        apm_info.bios = APM_BIOS_INFO;
-diff -puN arch/i386/kernel/verify_cpu.S~git-newsetup /dev/null
 --- a/arch/i386/kernel/verify_cpu.S
 +++ /dev/null
 @@ -1,94 +0,0 @@
 --- a/arch/i386/kernel/verify_cpu.S
 +++ /dev/null
 @@ -1,94 +0,0 @@
@@ -9695,10 +9649,9 @@ diff -puN arch/i386/kernel/verify_cpu.S~git-newsetup /dev/null
 -      popfl
 -      movl    $1,%eax
 -      ret
 -      popfl
 -      movl    $1,%eax
 -      ret
-diff -puN arch/x86_64/Kconfig~git-newsetup arch/x86_64/Kconfig
---- a/arch/x86_64/Kconfig~git-newsetup
-+++ a/arch/x86_64/Kconfig
-@@ -453,6 +453,10 @@ config NR_CPUS
+--- a/arch/x86_64/Kconfig
++++ b/arch/x86_64/Kconfig
+@@ -427,6 +427,10 @@
          This is purely to save memory - each supported CPU requires
          memory in the static kernel configuration.
  
          This is purely to save memory - each supported CPU requires
          memory in the static kernel configuration.
  
@@ -9709,9 +9662,8 @@ diff -puN arch/x86_64/Kconfig~git-newsetup arch/x86_64/Kconfig
  config HOTPLUG_CPU
        bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
        depends on SMP && HOTPLUG && EXPERIMENTAL
  config HOTPLUG_CPU
        bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
        depends on SMP && HOTPLUG && EXPERIMENTAL
-diff -puN arch/x86_64/boot/Makefile~git-newsetup arch/x86_64/boot/Makefile
---- a/arch/x86_64/boot/Makefile~git-newsetup
-+++ a/arch/x86_64/boot/Makefile
+--- a/arch/x86_64/boot/Makefile
++++ b/arch/x86_64/boot/Makefile
 @@ -1,135 +1,9 @@
  #
  # arch/x86_64/boot/Makefile
 @@ -1,135 +1,9 @@
  #
  # arch/x86_64/boot/Makefile
@@ -9853,7 +9805,6 @@ diff -puN arch/x86_64/boot/Makefile~git-newsetup arch/x86_64/boot/Makefile
 -      sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
 +src := arch/i386/boot
 +include $(src)/Makefile
 -      sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
 +src := arch/i386/boot
 +include $(src)/Makefile
-diff -puN arch/x86_64/boot/bootsect.S~git-newsetup /dev/null
 --- a/arch/x86_64/boot/bootsect.S
 +++ /dev/null
 @@ -1,98 +0,0 @@
 --- a/arch/x86_64/boot/bootsect.S
 +++ /dev/null
 @@ -1,98 +0,0 @@
@@ -9955,9 +9906,8 @@ diff -puN arch/x86_64/boot/bootsect.S~git-newsetup /dev/null
 -vid_mode:     .word SVGA_MODE
 -root_dev:     .word ROOT_DEV
 -boot_flag:    .word 0xAA55
 -vid_mode:     .word SVGA_MODE
 -root_dev:     .word ROOT_DEV
 -boot_flag:    .word 0xAA55
-diff -puN arch/x86_64/boot/compressed/Makefile~git-newsetup arch/x86_64/boot/compressed/Makefile
---- a/arch/x86_64/boot/compressed/Makefile~git-newsetup
-+++ a/arch/x86_64/boot/compressed/Makefile
+--- a/arch/x86_64/boot/compressed/Makefile
++++ b/arch/x86_64/boot/compressed/Makefile
 @@ -7,11 +7,12 @@
  #
  
 @@ -7,11 +7,12 @@
  #
  
@@ -9975,10 +9925,9 @@ diff -puN arch/x86_64/boot/compressed/Makefile~git-newsetup arch/x86_64/boot/com
  LDFLAGS := -m elf_x86_64
  
  LDFLAGS_vmlinux := -T
  LDFLAGS := -m elf_x86_64
  
  LDFLAGS_vmlinux := -T
-diff -puN arch/x86_64/boot/compressed/head.S~git-newsetup arch/x86_64/boot/compressed/head.S
---- a/arch/x86_64/boot/compressed/head.S~git-newsetup
-+++ a/arch/x86_64/boot/compressed/head.S
-@@ -46,10 +46,10 @@ startup_32:
+--- a/arch/x86_64/boot/compressed/head.S
++++ b/arch/x86_64/boot/compressed/head.S
+@@ -46,10 +46,10 @@
   * at and where we were actually loaded at.  This can only be done
   * with a short local call on x86.  Nothing  else will tell us what
   * address we are running at.  The reserved chunk of the real-mode
   * at and where we were actually loaded at.  This can only be done
   * with a short local call on x86.  Nothing  else will tell us what
   * address we are running at.  The reserved chunk of the real-mode
@@ -9992,13 +9941,11 @@ diff -puN arch/x86_64/boot/compressed/head.S~git-newsetup arch/x86_64/boot/compr
        call    1f
  1:    popl    %ebp
        subl    $1b, %ebp
        call    1f
  1:    popl    %ebp
        subl    $1b, %ebp
-diff -puN arch/x86_64/boot/install.sh~git-newsetup /dev/null
 --- a/arch/x86_64/boot/install.sh
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -#!/bin/sh
 -. $srctree/arch/i386/boot/install.sh
 --- a/arch/x86_64/boot/install.sh
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -#!/bin/sh
 -. $srctree/arch/i386/boot/install.sh
-diff -puN arch/x86_64/boot/mtools.conf.in~git-newsetup /dev/null
 --- a/arch/x86_64/boot/mtools.conf.in
 +++ /dev/null
 @@ -1,17 +0,0 @@
 --- a/arch/x86_64/boot/mtools.conf.in
 +++ /dev/null
 @@ -1,17 +0,0 @@
@@ -10019,7 +9966,6 @@ diff -puN arch/x86_64/boot/mtools.conf.in~git-newsetup /dev/null
 -  file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=36 filter
 -
 -
 -  file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=36 filter
 -
 -
-diff -puN arch/x86_64/boot/setup.S~git-newsetup /dev/null
 --- a/arch/x86_64/boot/setup.S
 +++ /dev/null
 @@ -1,826 +0,0 @@
 --- a/arch/x86_64/boot/setup.S
 +++ /dev/null
 @@ -1,826 +0,0 @@
@@ -10849,7 +10795,6 @@ diff -puN arch/x86_64/boot/setup.S~git-newsetup /dev/null
 -enddata:
 -.bss
 -endbss:
 -enddata:
 -.bss
 -endbss:
-diff -puN arch/x86_64/boot/tools/build.c~git-newsetup /dev/null
 --- a/arch/x86_64/boot/tools/build.c
 +++ /dev/null
 @@ -1,185 +0,0 @@
 --- a/arch/x86_64/boot/tools/build.c
 +++ /dev/null
 @@ -1,185 +0,0 @@
@@ -11038,10 +10983,9 @@ diff -puN arch/x86_64/boot/tools/build.c~git-newsetup /dev/null
 -
 -      return 0;                                           /* Everything is OK */
 -}
 -
 -      return 0;                                           /* Everything is OK */
 -}
-diff -puN arch/x86_64/kernel/Makefile~git-newsetup arch/x86_64/kernel/Makefile
---- a/arch/x86_64/kernel/Makefile~git-newsetup
-+++ a/arch/x86_64/kernel/Makefile
-@@ -45,6 +45,7 @@ obj-$(CONFIG_PCI)            += early-quirks.o
+--- a/arch/x86_64/kernel/Makefile
++++ b/arch/x86_64/kernel/Makefile
+@@ -43,6 +43,7 @@
  
  obj-y                         += topology.o
  obj-y                         += intel_cacheinfo.o
  
  obj-y                         += topology.o
  obj-y                         += intel_cacheinfo.o
@@ -11049,7 +10993,7 @@ diff -puN arch/x86_64/kernel/Makefile~git-newsetup arch/x86_64/kernel/Makefile
  obj-y                         += pcspeaker.o
  
  CFLAGS_vsyscall.o             := $(PROFILING) -g0
  obj-y                         += pcspeaker.o
  
  CFLAGS_vsyscall.o             := $(PROFILING) -g0
-@@ -58,6 +59,7 @@ cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  
+@@ -53,6 +54,7 @@
  topology-y                     += ../../i386/kernel/topology.o
  microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
  intel_cacheinfo-y             += ../../i386/kernel/cpu/intel_cacheinfo.o
  topology-y                     += ../../i386/kernel/topology.o
  microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
  intel_cacheinfo-y             += ../../i386/kernel/cpu/intel_cacheinfo.o
@@ -11057,10 +11001,9 @@ diff -puN arch/x86_64/kernel/Makefile~git-newsetup arch/x86_64/kernel/Makefile
  quirks-y                      += ../../i386/kernel/quirks.o
  i8237-y                               += ../../i386/kernel/i8237.o
  msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
  quirks-y                      += ../../i386/kernel/quirks.o
  i8237-y                               += ../../i386/kernel/i8237.o
  msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
-diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
---- a/arch/x86_64/kernel/setup.c~git-newsetup
-+++ a/arch/x86_64/kernel/setup.c
-@@ -855,6 +855,8 @@ void __cpuinit identify_cpu(struct cpuin
+--- a/arch/x86_64/kernel/setup.c
++++ b/arch/x86_64/kernel/setup.c
+@@ -846,6 +846,8 @@
                        c->x86_capability[2] = cpuid_edx(0x80860001);
        }
  
                        c->x86_capability[2] = cpuid_edx(0x80860001);
        }
  
@@ -11069,7 +11012,7 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
        c->apicid = phys_pkg_id(0);
  
        /*
        c->apicid = phys_pkg_id(0);
  
        /*
-@@ -940,7 +942,7 @@ static int show_cpuinfo(struct seq_file 
+@@ -931,7 +933,7 @@
                "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
                "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
                "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
                "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
                "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
                "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
@@ -11078,7 +11021,7 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
  
                /* AMD-defined */
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* AMD-defined */
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-@@ -956,10 +958,11 @@ static int show_cpuinfo(struct seq_file 
+@@ -947,10 +949,11 @@
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* Other (Linux-defined) */
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* Other (Linux-defined) */
@@ -11094,7 +11037,7 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* Intel-defined (#2) */
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                /* Intel-defined (#2) */
-@@ -970,7 +973,7 @@ static int show_cpuinfo(struct seq_file 
+@@ -961,7 +964,7 @@
  
                /* VIA/Cyrix/Centaur-defined */
                NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
  
                /* VIA/Cyrix/Centaur-defined */
                NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
@@ -11103,7 +11046,7 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
  
-@@ -981,6 +984,12 @@ static int show_cpuinfo(struct seq_file 
+@@ -972,6 +975,12 @@
                "osvw", "ibs", NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                "osvw", "ibs", NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -11116,10 +11059,9 @@ diff -puN arch/x86_64/kernel/setup.c~git-newsetup arch/x86_64/kernel/setup.c
        };
        static char *x86_power_flags[] = { 
                "ts",   /* temperature sensor */
        };
        static char *x86_power_flags[] = { 
                "ts",   /* temperature sensor */
-diff -puN arch/x86_64/kernel/verify_cpu.S~git-newsetup arch/x86_64/kernel/verify_cpu.S
---- a/arch/x86_64/kernel/verify_cpu.S~git-newsetup
-+++ a/arch/x86_64/kernel/verify_cpu.S
-@@ -37,20 +37,6 @@ verify_cpu:
+--- a/arch/x86_64/kernel/verify_cpu.S
++++ b/arch/x86_64/kernel/verify_cpu.S
+@@ -37,20 +37,6 @@
        pushl   $0                      # Kill any dangerous flags
        popfl
  
        pushl   $0                      # Kill any dangerous flags
        popfl
  
@@ -11140,7 +11082,7 @@ diff -puN arch/x86_64/kernel/verify_cpu.S~git-newsetup arch/x86_64/kernel/verify
        pushfl                          # standard way to check for cpuid
        popl    %eax
        movl    %eax,%ebx
        pushfl                          # standard way to check for cpuid
        popl    %eax
        movl    %eax,%ebx
-@@ -79,8 +65,8 @@ verify_cpu:
+@@ -79,8 +65,8 @@
  verify_cpu_noamd:
        movl    $0x1,%eax               # Does the cpu have what it takes
        cpuid
  verify_cpu_noamd:
        movl    $0x1,%eax               # Does the cpu have what it takes
        cpuid
@@ -11151,7 +11093,7 @@ diff -puN arch/x86_64/kernel/verify_cpu.S~git-newsetup arch/x86_64/kernel/verify
        jnz     verify_cpu_no_longmode
  
        movl    $0x80000000,%eax        # See if extended cpuid is implemented
        jnz     verify_cpu_no_longmode
  
        movl    $0x80000000,%eax        # See if extended cpuid is implemented
-@@ -90,8 +76,8 @@ verify_cpu_noamd:
+@@ -90,8 +76,8 @@
  
        movl    $0x80000001,%eax        # Does the cpu have what it takes
        cpuid
  
        movl    $0x80000001,%eax        # Does the cpu have what it takes
        cpuid
@@ -11162,10 +11104,9 @@ diff -puN arch/x86_64/kernel/verify_cpu.S~git-newsetup arch/x86_64/kernel/verify
        jnz     verify_cpu_no_longmode
  
  verify_cpu_sse_test:
        jnz     verify_cpu_no_longmode
  
  verify_cpu_sse_test:
-diff -puN drivers/ide/legacy/hd.c~git-newsetup drivers/ide/legacy/hd.c
---- a/drivers/ide/legacy/hd.c~git-newsetup
-+++ a/drivers/ide/legacy/hd.c
-@@ -718,74 +718,25 @@ static int __init hd_init(void)
+--- a/drivers/ide/legacy/hd.c
++++ b/drivers/ide/legacy/hd.c
+@@ -718,74 +718,25 @@
        device_timer.function = hd_times_out;
        blk_queue_hardsect_size(hd_queue, 512);
  
        device_timer.function = hd_times_out;
        blk_queue_hardsect_size(hd_queue, 512);
  
@@ -11252,9 +11193,8 @@ diff -puN drivers/ide/legacy/hd.c~git-newsetup drivers/ide/legacy/hd.c
  
        for (drive=0 ; drive < NR_HD ; drive++) {
                struct gendisk *disk = alloc_disk(64);
  
        for (drive=0 ; drive < NR_HD ; drive++) {
                struct gendisk *disk = alloc_disk(64);
-diff -puN include/asm-i386/boot.h~git-newsetup include/asm-i386/boot.h
---- a/include/asm-i386/boot.h~git-newsetup
-+++ a/include/asm-i386/boot.h
+--- a/include/asm-i386/boot.h
++++ b/include/asm-i386/boot.h
 @@ -1,5 +1,5 @@
 -#ifndef _LINUX_BOOT_H
 -#define _LINUX_BOOT_H
 @@ -1,5 +1,5 @@
 -#ifndef _LINUX_BOOT_H
 -#define _LINUX_BOOT_H
@@ -11269,9 +11209,8 @@ diff -puN include/asm-i386/boot.h~git-newsetup include/asm-i386/boot.h
  
 -#endif /* _LINUX_BOOT_H */
 +#endif /* _ASM_BOOT_H */
  
 -#endif /* _LINUX_BOOT_H */
 +#endif /* _ASM_BOOT_H */
-diff -puN /dev/null include/asm-i386/bootparam.h
 --- /dev/null
 --- /dev/null
-+++ a/include/asm-i386/bootparam.h
++++ b/include/asm-i386/bootparam.h
 @@ -0,0 +1,85 @@
 +#ifndef _ASM_BOOTPARAM_H
 +#define _ASM_BOOTPARAM_H
 @@ -0,0 +1,85 @@
 +#ifndef _ASM_BOOTPARAM_H
 +#define _ASM_BOOTPARAM_H
@@ -11358,9 +11297,8 @@ diff -puN /dev/null include/asm-i386/bootparam.h
 +} __attribute__((packed));
 +
 +#endif /* _ASM_BOOTPARAM_H */
 +} __attribute__((packed));
 +
 +#endif /* _ASM_BOOTPARAM_H */
-diff -puN include/asm-i386/cpufeature.h~git-newsetup include/asm-i386/cpufeature.h
---- a/include/asm-i386/cpufeature.h~git-newsetup
-+++ a/include/asm-i386/cpufeature.h
+--- a/include/asm-i386/cpufeature.h
++++ b/include/asm-i386/cpufeature.h
 @@ -12,7 +12,7 @@
  #endif
  #include <asm/required-features.h>
 @@ -12,7 +12,7 @@
  #endif
  #include <asm/required-features.h>
@@ -11372,7 +11310,7 @@ diff -puN include/asm-i386/cpufeature.h~git-newsetup include/asm-i386/cpufeature
  #define X86_FEATURE_FPU               (0*32+ 0) /* Onboard FPU */
 @@ -81,6 +81,7 @@
  #define X86_FEATURE_BTS               (3*32+13)  /* Branch Trace Store */
  #define X86_FEATURE_FPU               (0*32+ 0) /* Onboard FPU */
 @@ -81,6 +81,7 @@
  #define X86_FEATURE_BTS               (3*32+13)  /* Branch Trace Store */
- #define X86_FEATURE_LAPIC_TIMER_BROKEN (3*32+ 14) /* lapic timer broken in C1 */
+ /* 14 free */
  #define X86_FEATURE_SYNC_RDTSC        (3*32+15)  /* RDTSC synchronizes the CPU */
 +#define X86_FEATURE_REP_GOOD   (3*32+16) /* rep microcode works well on this CPU */
  
  #define X86_FEATURE_SYNC_RDTSC        (3*32+15)  /* RDTSC synchronizes the CPU */
 +#define X86_FEATURE_REP_GOOD   (3*32+16) /* rep microcode works well on this CPU */
  
@@ -11408,9 +11346,8 @@ diff -puN include/asm-i386/cpufeature.h~git-newsetup include/asm-i386/cpufeature
  #define boot_cpu_has(bit)     cpu_has(&boot_cpu_data, bit)
  
  #define cpu_has_fpu           boot_cpu_has(X86_FEATURE_FPU)
  #define boot_cpu_has(bit)     cpu_has(&boot_cpu_data, bit)
  
  #define cpu_has_fpu           boot_cpu_has(X86_FEATURE_FPU)
-diff -puN include/asm-i386/e820.h~git-newsetup include/asm-i386/e820.h
---- a/include/asm-i386/e820.h~git-newsetup
-+++ a/include/asm-i386/e820.h
+--- a/include/asm-i386/e820.h
++++ b/include/asm-i386/e820.h
 @@ -25,13 +25,15 @@
  
  #ifndef __ASSEMBLY__
 @@ -25,13 +25,15 @@
  
  #ifndef __ASSEMBLY__
@@ -11433,10 +11370,9 @@ diff -puN include/asm-i386/e820.h~git-newsetup include/asm-i386/e820.h
  };
  
  extern struct e820map e820;
  };
  
  extern struct e820map e820;
-diff -puN include/asm-i386/processor.h~git-newsetup include/asm-i386/processor.h
---- a/include/asm-i386/processor.h~git-newsetup
-+++ a/include/asm-i386/processor.h
-@@ -118,6 +118,7 @@ void __init cpu_detect(struct cpuinfo_x8
+--- a/include/asm-i386/processor.h
++++ b/include/asm-i386/processor.h
+@@ -119,6 +119,7 @@
  extern void identify_boot_cpu(void);
  extern void identify_secondary_cpu(struct cpuinfo_x86 *);
  extern void print_cpu_info(struct cpuinfo_x86 *);
  extern void identify_boot_cpu(void);
  extern void identify_secondary_cpu(struct cpuinfo_x86 *);
  extern void print_cpu_info(struct cpuinfo_x86 *);
@@ -11444,9 +11380,8 @@ diff -puN include/asm-i386/processor.h~git-newsetup include/asm-i386/processor.h
  extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
  extern unsigned short num_cache_leaves;
  
  extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
  extern unsigned short num_cache_leaves;
  
-diff -puN include/asm-i386/required-features.h~git-newsetup include/asm-i386/required-features.h
---- a/include/asm-i386/required-features.h~git-newsetup
-+++ a/include/asm-i386/required-features.h
+--- a/include/asm-i386/required-features.h
++++ b/include/asm-i386/required-features.h
 @@ -3,7 +3,7 @@
  
  /* Define minimum CPUID feature set for kernel These bits are checked
 @@ -3,7 +3,7 @@
  
  /* Define minimum CPUID feature set for kernel These bits are checked
@@ -11509,9 +11444,8 @@ diff -puN include/asm-i386/required-features.h~git-newsetup include/asm-i386/req
 +#define REQUIRED_MASK7        0
  
  #endif
 +#define REQUIRED_MASK7        0
  
  #endif
-diff -puN include/asm-i386/setup.h~git-newsetup include/asm-i386/setup.h
---- a/include/asm-i386/setup.h~git-newsetup
-+++ a/include/asm-i386/setup.h
+--- a/include/asm-i386/setup.h
++++ b/include/asm-i386/setup.h
 @@ -26,12 +26,15 @@
  #define NEW_CL_POINTER                0x228   /* Relative to real mode data */
  
 @@ -26,12 +26,15 @@
  #define NEW_CL_POINTER                0x228   /* Relative to real mode data */
  
@@ -11530,7 +11464,7 @@ diff -puN include/asm-i386/setup.h~git-newsetup include/asm-i386/setup.h
  #define SCREEN_INFO (*(struct screen_info *) (PARAM+0))
  #define EXT_MEM_K (*(unsigned short *) (PARAM+2))
  #define ALT_MEM_K (*(unsigned long *) (PARAM+0x1e0))
  #define SCREEN_INFO (*(struct screen_info *) (PARAM+0))
  #define EXT_MEM_K (*(unsigned short *) (PARAM+2))
  #define ALT_MEM_K (*(unsigned long *) (PARAM+0x1e0))
-@@ -39,8 +42,7 @@ extern unsigned char boot_params[PARAM_S
+@@ -39,8 +42,7 @@
  #define E820_MAP    ((struct e820entry *) (PARAM+E820MAP))
  #define APM_BIOS_INFO (*(struct apm_bios_info *) (PARAM+0x40))
  #define IST_INFO   (*(struct ist_info *) (PARAM+0x60))
  #define E820_MAP    ((struct e820entry *) (PARAM+E820MAP))
  #define APM_BIOS_INFO (*(struct apm_bios_info *) (PARAM+0x40))
  #define IST_INFO   (*(struct ist_info *) (PARAM+0x60))
@@ -11540,9 +11474,8 @@ diff -puN include/asm-i386/setup.h~git-newsetup include/asm-i386/setup.h
  #define EFI_SYSTAB ((efi_system_table_t *) *((unsigned long *)(PARAM+0x1c4)))
  #define EFI_MEMDESC_SIZE (*((unsigned long *) (PARAM+0x1c8)))
  #define EFI_MEMDESC_VERSION (*((unsigned long *) (PARAM+0x1cc)))
  #define EFI_SYSTAB ((efi_system_table_t *) *((unsigned long *)(PARAM+0x1c4)))
  #define EFI_MEMDESC_SIZE (*((unsigned long *) (PARAM+0x1c8)))
  #define EFI_MEMDESC_VERSION (*((unsigned long *) (PARAM+0x1cc)))
-diff -puN include/asm-x86_64/alternative.h~git-newsetup include/asm-x86_64/alternative.h
---- a/include/asm-x86_64/alternative.h~git-newsetup
-+++ a/include/asm-x86_64/alternative.h
+--- a/include/asm-x86_64/alternative.h
++++ b/include/asm-x86_64/alternative.h
 @@ -5,6 +5,41 @@
  
  #include <linux/types.h>
 @@ -5,6 +5,41 @@
  
  #include <linux/types.h>
@@ -11585,7 +11518,7 @@ diff -puN include/asm-x86_64/alternative.h~git-newsetup include/asm-x86_64/alter
  #include <asm/cpufeature.h>
  
  struct alt_instr {
  #include <asm/cpufeature.h>
  
  struct alt_instr {
-@@ -108,39 +143,6 @@ static inline void alternatives_smp_swit
+@@ -108,39 +143,6 @@
   */
  #define ASM_OUTPUT2(a, b) a, b
  
   */
  #define ASM_OUTPUT2(a, b) a, b
  
@@ -11625,9 +11558,8 @@ diff -puN include/asm-x86_64/alternative.h~git-newsetup include/asm-x86_64/alter
  struct paravirt_patch;
  #ifdef CONFIG_PARAVIRT
  void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end);
  struct paravirt_patch;
  #ifdef CONFIG_PARAVIRT
  void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end);
-diff -puN include/asm-x86_64/boot.h~git-newsetup include/asm-x86_64/boot.h
---- a/include/asm-x86_64/boot.h~git-newsetup
-+++ a/include/asm-x86_64/boot.h
+--- a/include/asm-x86_64/boot.h
++++ b/include/asm-x86_64/boot.h
 @@ -1,15 +1 @@
 -#ifndef _LINUX_BOOT_H
 -#define _LINUX_BOOT_H
 @@ -1,15 +1 @@
 -#ifndef _LINUX_BOOT_H
 -#define _LINUX_BOOT_H
@@ -11645,14 +11577,12 @@ diff -puN include/asm-x86_64/boot.h~git-newsetup include/asm-x86_64/boot.h
 -
 -#endif
 +#include <asm-i386/boot.h>
 -
 -#endif
 +#include <asm-i386/boot.h>
-diff -puN /dev/null include/asm-x86_64/bootparam.h
 --- /dev/null
 --- /dev/null
-+++ a/include/asm-x86_64/bootparam.h
++++ b/include/asm-x86_64/bootparam.h
 @@ -0,0 +1 @@
 +#include <asm-i386/bootparam.h>
 @@ -0,0 +1 @@
 +#include <asm-i386/bootparam.h>
-diff -puN include/asm-x86_64/cpufeature.h~git-newsetup include/asm-x86_64/cpufeature.h
---- a/include/asm-x86_64/cpufeature.h~git-newsetup
-+++ a/include/asm-x86_64/cpufeature.h
+--- a/include/asm-x86_64/cpufeature.h
++++ b/include/asm-x86_64/cpufeature.h
 @@ -7,115 +7,24 @@
  #ifndef __ASM_X8664_CPUFEATURE_H
  #define __ASM_X8664_CPUFEATURE_H
 @@ -7,115 +7,24 @@
  #ifndef __ASM_X8664_CPUFEATURE_H
  #define __ASM_X8664_CPUFEATURE_H
@@ -11781,9 +11711,8 @@ diff -puN include/asm-x86_64/cpufeature.h~git-newsetup include/asm-x86_64/cpufea
 -#define cpu_has_bts          boot_cpu_has(X86_FEATURE_BTS)
  
  #endif /* __ASM_X8664_CPUFEATURE_H */
 -#define cpu_has_bts          boot_cpu_has(X86_FEATURE_BTS)
  
  #endif /* __ASM_X8664_CPUFEATURE_H */
-diff -puN include/asm-x86_64/e820.h~git-newsetup include/asm-x86_64/e820.h
---- a/include/asm-x86_64/e820.h~git-newsetup
-+++ a/include/asm-x86_64/e820.h
+--- a/include/asm-x86_64/e820.h
++++ b/include/asm-x86_64/e820.h
 @@ -11,7 +11,9 @@
  #ifndef __E820_HEADER
  #define __E820_HEADER
 @@ -11,7 +11,9 @@
  #ifndef __E820_HEADER
  #define __E820_HEADER
@@ -11795,7 +11724,7 @@ diff -puN include/asm-x86_64/e820.h~git-newsetup include/asm-x86_64/e820.h
  
  #define E820MAP       0x2d0           /* our map */
  #define E820MAX       128             /* number of entries in E820MAP */
  
  #define E820MAP       0x2d0           /* our map */
  #define E820MAX       128             /* number of entries in E820MAP */
-@@ -30,7 +32,7 @@ struct e820entry {
+@@ -30,7 +32,7 @@
  } __attribute__((packed));
  
  struct e820map {
  } __attribute__((packed));
  
  struct e820map {
@@ -11804,10 +11733,9 @@ diff -puN include/asm-x86_64/e820.h~git-newsetup include/asm-x86_64/e820.h
        struct e820entry map[E820MAX];
  };
  
        struct e820entry map[E820MAX];
  };
  
-diff -puN include/asm-x86_64/processor.h~git-newsetup include/asm-x86_64/processor.h
---- a/include/asm-x86_64/processor.h~git-newsetup
-+++ a/include/asm-x86_64/processor.h
-@@ -99,6 +99,7 @@ extern char ignore_irq13;
+--- a/include/asm-x86_64/processor.h
++++ b/include/asm-x86_64/processor.h
+@@ -100,6 +100,7 @@
  
  extern void identify_cpu(struct cpuinfo_x86 *);
  extern void print_cpu_info(struct cpuinfo_x86 *);
  
  extern void identify_cpu(struct cpuinfo_x86 *);
  extern void print_cpu_info(struct cpuinfo_x86 *);
@@ -11815,7 +11743,7 @@ diff -puN include/asm-x86_64/processor.h~git-newsetup include/asm-x86_64/process
  extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
  extern unsigned short num_cache_leaves;
  
  extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
  extern unsigned short num_cache_leaves;
  
-@@ -367,8 +368,6 @@ static inline void sync_core(void)
+@@ -368,8 +369,6 @@
        asm volatile("cpuid" : "=a" (tmp) : "0" (1) : "ebx","ecx","edx","memory");
  } 
  
        asm volatile("cpuid" : "=a" (tmp) : "0" (1) : "ebx","ecx","edx","memory");
  } 
  
@@ -11824,9 +11752,8 @@ diff -puN include/asm-x86_64/processor.h~git-newsetup include/asm-x86_64/process
  #define ARCH_HAS_PREFETCH
  static inline void prefetch(void *x) 
  { 
  #define ARCH_HAS_PREFETCH
  static inline void prefetch(void *x) 
  { 
-diff -puN /dev/null include/asm-x86_64/required-features.h
 --- /dev/null
 --- /dev/null
-+++ a/include/asm-x86_64/required-features.h
++++ b/include/asm-x86_64/required-features.h
 @@ -0,0 +1,46 @@
 +#ifndef _ASM_REQUIRED_FEATURES_H
 +#define _ASM_REQUIRED_FEATURES_H 1
 @@ -0,0 +1,46 @@
 +#ifndef _ASM_REQUIRED_FEATURES_H
 +#define _ASM_REQUIRED_FEATURES_H 1
@@ -11874,9 +11801,8 @@ diff -puN /dev/null include/asm-x86_64/required-features.h
 +#define REQUIRED_MASK7        0
 +
 +#endif
 +#define REQUIRED_MASK7        0
 +
 +#endif
-diff -puN include/asm-x86_64/segment.h~git-newsetup include/asm-x86_64/segment.h
---- a/include/asm-x86_64/segment.h~git-newsetup
-+++ a/include/asm-x86_64/segment.h
+--- a/include/asm-x86_64/segment.h
++++ b/include/asm-x86_64/segment.h
 @@ -3,6 +3,14 @@
  
  #include <asm/cache.h>
 @@ -3,6 +3,14 @@
  
  #include <asm/cache.h>
@@ -11892,9 +11818,8 @@ diff -puN include/asm-x86_64/segment.h~git-newsetup include/asm-x86_64/segment.h
  #define __KERNEL_CS   0x10
  #define __KERNEL_DS   0x18
  
  #define __KERNEL_CS   0x10
  #define __KERNEL_DS   0x18
  
-diff -puN include/linux/edd.h~git-newsetup include/linux/edd.h
---- a/include/linux/edd.h~git-newsetup
-+++ a/include/linux/edd.h
+--- a/include/linux/edd.h
++++ b/include/linux/edd.h
 @@ -49,10 +49,6 @@
  #define EDD_MBR_SIG_MAX 16        /* max number of signatures to store */
  #define EDD_MBR_SIG_NR_BUF 0x1ea  /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF
 @@ -49,10 +49,6 @@
  #define EDD_MBR_SIG_MAX 16        /* max number of signatures to store */
  #define EDD_MBR_SIG_NR_BUF 0x1ea  /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF
@@ -11906,9 +11831,8 @@ diff -puN include/linux/edd.h~git-newsetup include/linux/edd.h
  
  #ifndef __ASSEMBLY__
  
  
  #ifndef __ASSEMBLY__
  
-diff -puN include/linux/screen_info.h~git-newsetup include/linux/screen_info.h
---- a/include/linux/screen_info.h~git-newsetup
-+++ a/include/linux/screen_info.h
+--- a/include/linux/screen_info.h
++++ b/include/linux/screen_info.h
 @@ -10,7 +10,7 @@
  struct screen_info {
        u8  orig_x;             /* 0x00 */
 @@ -10,7 +10,7 @@
  struct screen_info {
        u8  orig_x;             /* 0x00 */
@@ -11918,7 +11842,7 @@ diff -puN include/linux/screen_info.h~git-newsetup include/linux/screen_info.h
        u16 orig_video_page;    /* 0x04 */
        u8  orig_video_mode;    /* 0x06 */
        u8  orig_video_cols;    /* 0x07 */
        u16 orig_video_page;    /* 0x04 */
        u8  orig_video_mode;    /* 0x06 */
        u8  orig_video_cols;    /* 0x07 */
-@@ -27,7 +27,7 @@ struct screen_info {
+@@ -27,7 +27,7 @@
        u16 lfb_depth;          /* 0x16 */
        u32 lfb_base;           /* 0x18 */
        u32 lfb_size;           /* 0x1c */
        u16 lfb_depth;          /* 0x16 */
        u32 lfb_base;           /* 0x18 */
        u32 lfb_size;           /* 0x1c */
@@ -11927,7 +11851,7 @@ diff -puN include/linux/screen_info.h~git-newsetup include/linux/screen_info.h
        u16 lfb_linelength;     /* 0x24 */
        u8  red_size;           /* 0x26 */
        u8  red_pos;            /* 0x27 */
        u16 lfb_linelength;     /* 0x24 */
        u8  red_size;           /* 0x26 */
        u8  red_pos;            /* 0x27 */
-@@ -42,9 +42,8 @@ struct screen_info {
+@@ -42,9 +42,8 @@
        u16 pages;              /* 0x32 */
        u16 vesa_attributes;    /* 0x34 */
        u32 capabilities;       /* 0x36 */
        u16 pages;              /* 0x32 */
        u16 vesa_attributes;    /* 0x34 */
        u32 capabilities;       /* 0x36 */
@@ -11939,4 +11863,3 @@ diff -puN include/linux/screen_info.h~git-newsetup include/linux/screen_info.h
  
  extern struct screen_info screen_info;
  
  
  extern struct screen_info screen_info;
  
-_
Personal OpenWRT clone
This page took 0.057614 seconds and 4 git commands to generate.