diff options
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/014-x86_newsetup.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.22/014-x86_newsetup.patch | 444 |
1 files changed, 147 insertions, 297 deletions
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 827c917..9d77c83 100644 --- 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,11 +1362,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> include/linux/screen_info.h | 9 75 files changed, 4594 insertions(+), 5204 deletions(-) -Index: linux-2.6.22.19/MAINTAINERS -=================================================================== ---- linux-2.6.22.19.orig/MAINTAINERS -+++ linux-2.6.22.19/MAINTAINERS -@@ -1750,8 +1750,8 @@ T: http://www.harbaum.org/till/i2c_tiny_ +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -1750,8 +1750,8 @@ S: Maintained i386 BOOT CODE @@ -1377,11 +1375,9 @@ Index: linux-2.6.22.19/MAINTAINERS L: Linux-Kernel@vger.kernel.org S: Maintained -Index: linux-2.6.22.19/arch/i386/Kconfig.cpu -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/Kconfig.cpu -+++ linux-2.6.22.19/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 @@ -1390,11 +1386,9 @@ Index: linux-2.6.22.19/arch/i386/Kconfig.cpu + default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK + default "3" -Index: linux-2.6.22.19/arch/i386/boot/Makefile -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/Makefile -+++ linux-2.6.22.19/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 @@ -1452,7 +1446,7 @@ Index: linux-2.6.22.19/arch/i386/boot/Makefile $(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) @@ -1473,10 +1467,8 @@ Index: linux-2.6.22.19/arch/i386/boot/Makefile $(obj)/compressed/vmlinux: FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@ -Index: linux-2.6.22.19/arch/i386/boot/a20.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/a20.c ++++ b/arch/i386/boot/a20.c @@ -0,0 +1,161 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -1639,10 +1631,8 @@ Index: linux-2.6.22.19/arch/i386/boot/a20.c + return -1; +#endif +} -Index: linux-2.6.22.19/arch/i386/boot/apm.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/apm.c ++++ b/arch/i386/boot/apm.c @@ -0,0 +1,97 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -1741,10 +1731,8 @@ Index: linux-2.6.22.19/arch/i386/boot/apm.c +} + +#endif -Index: linux-2.6.22.19/arch/i386/boot/bitops.h -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/bitops.h ++++ b/arch/i386/boot/bitops.h @@ -0,0 +1,45 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -1791,10 +1779,8 @@ Index: linux-2.6.22.19/arch/i386/boot/bitops.h +} + +#endif /* BOOT_BITOPS_H */ -Index: linux-2.6.22.19/arch/i386/boot/boot.h -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/boot.h ++++ b/arch/i386/boot/boot.h @@ -0,0 +1,290 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -2086,9 +2072,7 @@ Index: linux-2.6.22.19/arch/i386/boot/boot.h +#endif /* __ASSEMBLY__ */ + +#endif /* BOOT_BOOT_H */ -Index: linux-2.6.22.19/arch/i386/boot/bootsect.S -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/bootsect.S +--- a/arch/i386/boot/bootsect.S +++ /dev/null @@ -1,98 +0,0 @@ -/* @@ -2189,10 +2173,8 @@ Index: linux-2.6.22.19/arch/i386/boot/bootsect.S -vid_mode: .word SVGA_MODE -root_dev: .word ROOT_DEV -boot_flag: .word 0xAA55 -Index: linux-2.6.22.19/arch/i386/boot/cmdline.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/cmdline.c ++++ b/arch/i386/boot/cmdline.c @@ -0,0 +1,97 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -2291,10 +2273,8 @@ Index: linux-2.6.22.19/arch/i386/boot/cmdline.c + + return len; +} -Index: linux-2.6.22.19/arch/i386/boot/code16gcc.h -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/code16gcc.h ++++ b/arch/i386/boot/code16gcc.h @@ -0,0 +1,9 @@ +/* + * code16gcc.h @@ -2305,11 +2285,9 @@ Index: linux-2.6.22.19/arch/i386/boot/code16gcc.h +#ifndef __ASSEMBLY__ +asm(".code16gcc"); +#endif -Index: linux-2.6.22.19/arch/i386/boot/compressed/Makefile -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/compressed/Makefile -+++ linux-2.6.22.19/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 @@ -2325,11 +2303,9 @@ Index: linux-2.6.22.19/arch/i386/boot/compressed/Makefile $(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE $(call if_changed,ld) @: -Index: linux-2.6.22.19/arch/i386/boot/compressed/head.S -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/compressed/head.S -+++ linux-2.6.22.19/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 @@ -2343,10 +2319,8 @@ Index: linux-2.6.22.19/arch/i386/boot/compressed/head.S call 1f 1: popl %ebp subl $1b, %ebp -Index: linux-2.6.22.19/arch/i386/boot/compressed/misc.c -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/compressed/misc.c -+++ linux-2.6.22.19/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 @@ -2355,7 +2329,7 @@ Index: linux-2.6.22.19/arch/i386/boot/compressed/misc.c #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"); @@ -2366,10 +2340,8 @@ Index: linux-2.6.22.19/arch/i386/boot/compressed/misc.c #ifndef CONFIG_RELOCATABLE if ((u32)output != LOAD_PHYSICAL_ADDR) error("Wrong destination address"); -Index: linux-2.6.22.19/arch/i386/boot/copy.S -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/copy.S ++++ b/arch/i386/boot/copy.S @@ -0,0 +1,101 @@ +/* ----------------------------------------------------------------------- * + * @@ -2472,10 +2444,8 @@ Index: linux-2.6.22.19/arch/i386/boot/copy.S + .size copy_to_gs, .-copy_to_gs + +#endif -Index: linux-2.6.22.19/arch/i386/boot/cpu.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/cpu.c ++++ b/arch/i386/boot/cpu.c @@ -0,0 +1,69 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -2546,10 +2516,8 @@ Index: linux-2.6.22.19/arch/i386/boot/cpu.c + return 0; + } +} -Index: linux-2.6.22.19/arch/i386/boot/cpucheck.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/cpucheck.c ++++ b/arch/i386/boot/cpucheck.c @@ -0,0 +1,266 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -2817,9 +2785,7 @@ Index: linux-2.6.22.19/arch/i386/boot/cpucheck.c + + return (cpu.level < req_level || err) ? -1 : 0; +} -Index: linux-2.6.22.19/arch/i386/boot/edd.S -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/edd.S +--- a/arch/i386/boot/edd.S +++ /dev/null @@ -1,231 +0,0 @@ -/* @@ -3053,10 +3019,8 @@ Index: linux-2.6.22.19/arch/i386/boot/edd.S - -edd_done: -#endif -Index: linux-2.6.22.19/arch/i386/boot/edd.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/edd.c ++++ b/arch/i386/boot/edd.c @@ -0,0 +1,196 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -3254,10 +3218,8 @@ Index: linux-2.6.22.19/arch/i386/boot/edd.c +} + +#endif -Index: linux-2.6.22.19/arch/i386/boot/header.S -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/header.S ++++ b/arch/i386/boot/header.S @@ -0,0 +1,283 @@ +/* + * header.S @@ -3542,10 +3504,8 @@ Index: linux-2.6.22.19/arch/i386/boot/header.S +setup_corrupt: + .byte 7 + .string "No setup signature found..." -Index: linux-2.6.22.19/arch/i386/boot/main.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/main.c ++++ b/arch/i386/boot/main.c @@ -0,0 +1,161 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -3708,10 +3668,8 @@ Index: linux-2.6.22.19/arch/i386/boot/main.c + /* Do the last things and invoke protected mode */ + go_to_protected_mode(); +} -Index: linux-2.6.22.19/arch/i386/boot/mca.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/mca.c ++++ b/arch/i386/boot/mca.c @@ -0,0 +1,43 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -3756,10 +3714,8 @@ Index: linux-2.6.22.19/arch/i386/boot/mca.c + copy_from_fs(&boot_params.sys_desc_table, bx, len); + return 0; +} -Index: linux-2.6.22.19/arch/i386/boot/memory.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/memory.c ++++ b/arch/i386/boot/memory.c @@ -0,0 +1,99 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -3860,10 +3816,8 @@ Index: linux-2.6.22.19/arch/i386/boot/memory.c + + return detect_memory_88(); +} -Index: linux-2.6.22.19/arch/i386/boot/pm.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/pm.c ++++ b/arch/i386/boot/pm.c @@ -0,0 +1,170 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -4035,10 +3989,8 @@ Index: linux-2.6.22.19/arch/i386/boot/pm.c + protected_mode_jump(boot_params.hdr.code32_start, + (u32)&boot_params + (ds() << 4)); +} -Index: linux-2.6.22.19/arch/i386/boot/pmjump.S -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/pmjump.S ++++ b/arch/i386/boot/pmjump.S @@ -0,0 +1,54 @@ +/* ----------------------------------------------------------------------- * + * @@ -4094,10 +4046,8 @@ Index: linux-2.6.22.19/arch/i386/boot/pmjump.S + .word __BOOT_CS # segment + + .size protected_mode_jump, .-protected_mode_jump -Index: linux-2.6.22.19/arch/i386/boot/printf.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/printf.c ++++ b/arch/i386/boot/printf.c @@ -0,0 +1,331 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -4430,9 +4380,7 @@ Index: linux-2.6.22.19/arch/i386/boot/printf.c + + return printed; +} -Index: linux-2.6.22.19/arch/i386/boot/setup.S -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/setup.S +--- a/arch/i386/boot/setup.S +++ /dev/null @@ -1,1075 +0,0 @@ -/* @@ -5510,10 +5458,8 @@ Index: linux-2.6.22.19/arch/i386/boot/setup.S -enddata: -.bss -endbss: -Index: linux-2.6.22.19/arch/i386/boot/setup.ld -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/setup.ld ++++ b/arch/i386/boot/setup.ld @@ -0,0 +1,54 @@ +/* + * setup.ld @@ -5569,10 +5515,8 @@ Index: linux-2.6.22.19/arch/i386/boot/setup.ld + . = ASSERT(_end <= 0x8000, "Setup too big!"); + . = ASSERT(hdr == 0x1f1, "The setup header has the wrong offset!"); +} -Index: linux-2.6.22.19/arch/i386/boot/string.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/string.c ++++ b/arch/i386/boot/string.c @@ -0,0 +1,34 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -5608,10 +5552,8 @@ Index: linux-2.6.22.19/arch/i386/boot/string.c + } + return 0; +} -Index: linux-2.6.22.19/arch/i386/boot/tools/build.c -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/tools/build.c -+++ linux-2.6.22.19/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 @@ -5669,7 +5611,7 @@ Index: linux-2.6.22.19/arch/i386/boot/tools/build.c { va_list args; va_start(args, str); -@@ -57,15 +59,9 @@ void die(const char * str, ...) +@@ -57,15 +59,9 @@ exit(1); } @@ -5687,7 +5629,7 @@ Index: linux-2.6.22.19/arch/i386/boot/tools/build.c } 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; @@ -5725,7 +5667,7 @@ Index: linux-2.6.22.19/arch/i386/boot/tools/build.c 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); @@ -5850,10 +5792,8 @@ Index: linux-2.6.22.19/arch/i386/boot/tools/build.c + /* Everything is OK */ + return 0; } -Index: linux-2.6.22.19/arch/i386/boot/tty.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/tty.c ++++ b/arch/i386/boot/tty.c @@ -0,0 +1,112 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -5967,10 +5907,8 @@ Index: linux-2.6.22.19/arch/i386/boot/tty.c + + return 0; /* Timeout! */ +} -Index: linux-2.6.22.19/arch/i386/boot/version.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/version.c ++++ b/arch/i386/boot/version.c @@ -0,0 +1,23 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -5995,10 +5933,8 @@ Index: linux-2.6.22.19/arch/i386/boot/version.c +const char kernel_version[] = + UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") " + UTS_VERSION; -Index: linux-2.6.22.19/arch/i386/boot/vesa.h -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/vesa.h ++++ b/arch/i386/boot/vesa.h @@ -0,0 +1,79 @@ +/* ----------------------------------------------------------------------- * + * @@ -6079,10 +6015,8 @@ Index: linux-2.6.22.19/arch/i386/boot/vesa.h +} __attribute__((packed)); + +#endif /* LIB_SYS_VESA_H */ -Index: linux-2.6.22.19/arch/i386/boot/video-bios.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/video-bios.c ++++ b/arch/i386/boot/video-bios.c @@ -0,0 +1,125 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -6209,10 +6143,8 @@ Index: linux-2.6.22.19/arch/i386/boot/video-bios.c + .xmode_first = VIDEO_FIRST_BIOS, + .xmode_n = 0x80, +}; -Index: linux-2.6.22.19/arch/i386/boot/video-vesa.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/video-vesa.c ++++ b/arch/i386/boot/video-vesa.c @@ -0,0 +1,283 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -6497,10 +6429,8 @@ Index: linux-2.6.22.19/arch/i386/boot/video-vesa.c + .xmode_first = VIDEO_FIRST_VESA, + .xmode_n = 0x200, +}; -Index: linux-2.6.22.19/arch/i386/boot/video-vga.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/video-vga.c ++++ b/arch/i386/boot/video-vga.c @@ -0,0 +1,260 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -6762,9 +6692,7 @@ Index: linux-2.6.22.19/arch/i386/boot/video-vga.c + .probe = vga_probe, + .set_mode = vga_set_mode, +}; -Index: linux-2.6.22.19/arch/i386/boot/video.S -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/boot/video.S +--- a/arch/i386/boot/video.S +++ /dev/null @@ -1,2043 +0,0 @@ -/* video.S @@ -8810,10 +8738,8 @@ Index: linux-2.6.22.19/arch/i386/boot/video.S -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 -Index: linux-2.6.22.19/arch/i386/boot/video.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/video.c ++++ b/arch/i386/boot/video.c @@ -0,0 +1,456 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -9271,10 +9197,8 @@ Index: linux-2.6.22.19/arch/i386/boot/video.c + if (do_restore) + restore_screen(); +} -Index: linux-2.6.22.19/arch/i386/boot/video.h -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/video.h ++++ b/arch/i386/boot/video.h @@ -0,0 +1,145 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -9421,10 +9345,8 @@ Index: linux-2.6.22.19/arch/i386/boot/video.h +u16 vga_crtc(void); /* video-vga.c */ + +#endif /* BOOT_VIDEO_H */ -Index: linux-2.6.22.19/arch/i386/boot/voyager.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/boot/voyager.c ++++ b/arch/i386/boot/voyager.c @@ -0,0 +1,46 @@ +/* -*- linux-c -*- ------------------------------------------------------- * + * @@ -9472,10 +9394,8 @@ Index: linux-2.6.22.19/arch/i386/boot/voyager.c +} + +#endif /* CONFIG_X86_VOYAGER */ -Index: linux-2.6.22.19/arch/i386/kernel/cpu/addon_cpuid_features.c -=================================================================== --- /dev/null -+++ linux-2.6.22.19/arch/i386/kernel/cpu/addon_cpuid_features.c ++++ b/arch/i386/kernel/cpu/addon_cpuid_features.c @@ -0,0 +1,50 @@ + +/* @@ -9527,11 +9447,9 @@ Index: linux-2.6.22.19/arch/i386/kernel/cpu/addon_cpuid_features.c + set_bit(cb->feature, c->x86_capability); + } +} -Index: linux-2.6.22.19/arch/i386/kernel/cpu/common.c -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/kernel/cpu/common.c -+++ linux-2.6.22.19/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 */ } @@ -9540,11 +9458,9 @@ Index: linux-2.6.22.19/arch/i386/kernel/cpu/common.c } early_intel_workaround(c); -Index: linux-2.6.22.19/arch/i386/kernel/cpu/proc.c -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/kernel/cpu/proc.c -+++ linux-2.6.22.19/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, @@ -9554,7 +9470,7 @@ Index: linux-2.6.22.19/arch/i386/kernel/cpu/proc.c /* 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, @@ -9566,7 +9482,7 @@ Index: linux-2.6.22.19/arch/i386/kernel/cpu/proc.c 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) */ @@ -9586,11 +9502,9 @@ Index: linux-2.6.22.19/arch/i386/kernel/cpu/proc.c NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; -Index: linux-2.6.22.19/arch/i386/kernel/e820.c -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/kernel/e820.c -+++ linux-2.6.22.19/arch/i386/kernel/e820.c -@@ -734,7 +734,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; @@ -9599,11 +9513,9 @@ Index: linux-2.6.22.19/arch/i386/kernel/e820.c break; } } -Index: linux-2.6.22.19/arch/i386/kernel/setup.c -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/kernel/setup.c -+++ linux-2.6.22.19/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 */ @@ -9623,7 +9535,7 @@ Index: linux-2.6.22.19/arch/i386/kernel/setup.c 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]; @@ -9632,7 +9544,7 @@ Index: linux-2.6.22.19/arch/i386/kernel/setup.c #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); @@ -9640,9 +9552,7 @@ Index: linux-2.6.22.19/arch/i386/kernel/setup.c screen_info = SCREEN_INFO; edid_info = EDID_INFO; apm_info.bios = APM_BIOS_INFO; -Index: linux-2.6.22.19/arch/i386/kernel/verify_cpu.S -=================================================================== ---- linux-2.6.22.19.orig/arch/i386/kernel/verify_cpu.S +--- a/arch/i386/kernel/verify_cpu.S +++ /dev/null @@ -1,94 +0,0 @@ -/* Check if CPU has some minimum CPUID bits @@ -9739,11 +9649,9 @@ Index: linux-2.6.22.19/arch/i386/kernel/verify_cpu.S - popfl - movl $1,%eax - ret -Index: linux-2.6.22.19/arch/x86_64/Kconfig -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/Kconfig -+++ linux-2.6.22.19/arch/x86_64/Kconfig -@@ -427,6 +427,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. @@ -9754,10 +9662,8 @@ Index: linux-2.6.22.19/arch/x86_64/Kconfig config HOTPLUG_CPU bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)" depends on SMP && HOTPLUG && EXPERIMENTAL -Index: linux-2.6.22.19/arch/x86_64/boot/Makefile -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/boot/Makefile -+++ linux-2.6.22.19/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 @@ -9899,9 +9805,7 @@ Index: linux-2.6.22.19/arch/x86_64/boot/Makefile - sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" +src := arch/i386/boot +include $(src)/Makefile -Index: linux-2.6.22.19/arch/x86_64/boot/bootsect.S -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/boot/bootsect.S +--- a/arch/x86_64/boot/bootsect.S +++ /dev/null @@ -1,98 +0,0 @@ -/* @@ -10002,10 +9906,8 @@ Index: linux-2.6.22.19/arch/x86_64/boot/bootsect.S -vid_mode: .word SVGA_MODE -root_dev: .word ROOT_DEV -boot_flag: .word 0xAA55 -Index: linux-2.6.22.19/arch/x86_64/boot/compressed/Makefile -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/boot/compressed/Makefile -+++ linux-2.6.22.19/arch/x86_64/boot/compressed/Makefile +--- a/arch/x86_64/boot/compressed/Makefile ++++ b/arch/x86_64/boot/compressed/Makefile @@ -7,11 +7,12 @@ # @@ -10023,11 +9925,9 @@ Index: linux-2.6.22.19/arch/x86_64/boot/compressed/Makefile LDFLAGS := -m elf_x86_64 LDFLAGS_vmlinux := -T -Index: linux-2.6.22.19/arch/x86_64/boot/compressed/head.S -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/boot/compressed/head.S -+++ linux-2.6.22.19/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 @@ -10041,16 +9941,12 @@ Index: linux-2.6.22.19/arch/x86_64/boot/compressed/head.S call 1f 1: popl %ebp subl $1b, %ebp -Index: linux-2.6.22.19/arch/x86_64/boot/install.sh -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/boot/install.sh +--- a/arch/x86_64/boot/install.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -. $srctree/arch/i386/boot/install.sh -Index: linux-2.6.22.19/arch/x86_64/boot/mtools.conf.in -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/boot/mtools.conf.in +--- a/arch/x86_64/boot/mtools.conf.in +++ /dev/null @@ -1,17 +0,0 @@ -# @@ -10070,9 +9966,7 @@ Index: linux-2.6.22.19/arch/x86_64/boot/mtools.conf.in - file="@OBJ@/fdimage" cylinders=80 heads=2 sectors=36 filter - - -Index: linux-2.6.22.19/arch/x86_64/boot/setup.S -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/boot/setup.S +--- a/arch/x86_64/boot/setup.S +++ /dev/null @@ -1,826 +0,0 @@ -/* @@ -10901,9 +10795,7 @@ Index: linux-2.6.22.19/arch/x86_64/boot/setup.S -enddata: -.bss -endbss: -Index: linux-2.6.22.19/arch/x86_64/boot/tools/build.c -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/boot/tools/build.c +--- a/arch/x86_64/boot/tools/build.c +++ /dev/null @@ -1,185 +0,0 @@ -/* @@ -11091,11 +10983,9 @@ Index: linux-2.6.22.19/arch/x86_64/boot/tools/build.c - - return 0; /* Everything is OK */ -} -Index: linux-2.6.22.19/arch/x86_64/kernel/Makefile -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/kernel/Makefile -+++ linux-2.6.22.19/arch/x86_64/kernel/Makefile -@@ -43,6 +43,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 @@ -11103,7 +10993,7 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/Makefile obj-y += pcspeaker.o CFLAGS_vsyscall.o := $(PROFILING) -g0 -@@ -53,6 +54,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 @@ -11111,11 +11001,9 @@ Index: linux-2.6.22.19/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 -Index: linux-2.6.22.19/arch/x86_64/kernel/setup.c -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/kernel/setup.c -+++ linux-2.6.22.19/arch/x86_64/kernel/setup.c -@@ -846,6 +846,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); } @@ -11124,7 +11012,7 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/setup.c c->apicid = phys_pkg_id(0); /* -@@ -931,7 +933,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", @@ -11133,7 +11021,7 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/setup.c /* AMD-defined */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -@@ -947,10 +949,11 @@ static int show_cpuinfo(struct seq_file +@@ -947,10 +949,11 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* Other (Linux-defined) */ @@ -11149,7 +11037,7 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/setup.c NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* Intel-defined (#2) */ -@@ -961,7 +964,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", @@ -11158,7 +11046,7 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/setup.c NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -@@ -972,6 +975,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, @@ -11171,11 +11059,9 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/setup.c }; static char *x86_power_flags[] = { "ts", /* temperature sensor */ -Index: linux-2.6.22.19/arch/x86_64/kernel/verify_cpu.S -=================================================================== ---- linux-2.6.22.19.orig/arch/x86_64/kernel/verify_cpu.S -+++ linux-2.6.22.19/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 @@ -11196,7 +11082,7 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/verify_cpu.S 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 @@ -11207,7 +11093,7 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/verify_cpu.S 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 @@ -11218,11 +11104,9 @@ Index: linux-2.6.22.19/arch/x86_64/kernel/verify_cpu.S jnz verify_cpu_no_longmode verify_cpu_sse_test: -Index: linux-2.6.22.19/drivers/ide/legacy/hd.c -=================================================================== ---- linux-2.6.22.19.orig/drivers/ide/legacy/hd.c -+++ linux-2.6.22.19/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); @@ -11309,10 +11193,8 @@ Index: linux-2.6.22.19/drivers/ide/legacy/hd.c for (drive=0 ; drive < NR_HD ; drive++) { struct gendisk *disk = alloc_disk(64); -Index: linux-2.6.22.19/include/asm-i386/boot.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-i386/boot.h -+++ linux-2.6.22.19/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 @@ -11327,10 +11209,8 @@ Index: linux-2.6.22.19/include/asm-i386/boot.h -#endif /* _LINUX_BOOT_H */ +#endif /* _ASM_BOOT_H */ -Index: linux-2.6.22.19/include/asm-i386/bootparam.h -=================================================================== --- /dev/null -+++ linux-2.6.22.19/include/asm-i386/bootparam.h ++++ b/include/asm-i386/bootparam.h @@ -0,0 +1,85 @@ +#ifndef _ASM_BOOTPARAM_H +#define _ASM_BOOTPARAM_H @@ -11417,10 +11297,8 @@ Index: linux-2.6.22.19/include/asm-i386/bootparam.h +} __attribute__((packed)); + +#endif /* _ASM_BOOTPARAM_H */ -Index: linux-2.6.22.19/include/asm-i386/cpufeature.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-i386/cpufeature.h -+++ linux-2.6.22.19/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> @@ -11468,10 +11346,8 @@ Index: linux-2.6.22.19/include/asm-i386/cpufeature.h #define boot_cpu_has(bit) cpu_has(&boot_cpu_data, bit) #define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) -Index: linux-2.6.22.19/include/asm-i386/e820.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-i386/e820.h -+++ linux-2.6.22.19/include/asm-i386/e820.h +--- a/include/asm-i386/e820.h ++++ b/include/asm-i386/e820.h @@ -25,13 +25,15 @@ #ifndef __ASSEMBLY__ @@ -11494,11 +11370,9 @@ Index: linux-2.6.22.19/include/asm-i386/e820.h }; extern struct e820map e820; -Index: linux-2.6.22.19/include/asm-i386/processor.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-i386/processor.h -+++ linux-2.6.22.19/include/asm-i386/processor.h -@@ -119,6 +119,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 *); @@ -11506,10 +11380,8 @@ Index: linux-2.6.22.19/include/asm-i386/processor.h extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); extern unsigned short num_cache_leaves; -Index: linux-2.6.22.19/include/asm-i386/required-features.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-i386/required-features.h -+++ linux-2.6.22.19/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 @@ -11572,10 +11444,8 @@ Index: linux-2.6.22.19/include/asm-i386/required-features.h +#define REQUIRED_MASK7 0 #endif -Index: linux-2.6.22.19/include/asm-i386/setup.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-i386/setup.h -+++ linux-2.6.22.19/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 */ @@ -11594,7 +11464,7 @@ Index: linux-2.6.22.19/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)) -@@ -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)) @@ -11604,10 +11474,8 @@ Index: linux-2.6.22.19/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))) -Index: linux-2.6.22.19/include/asm-x86_64/alternative.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-x86_64/alternative.h -+++ linux-2.6.22.19/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> @@ -11650,7 +11518,7 @@ Index: linux-2.6.22.19/include/asm-x86_64/alternative.h #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 @@ -11690,10 +11558,8 @@ Index: linux-2.6.22.19/include/asm-x86_64/alternative.h struct paravirt_patch; #ifdef CONFIG_PARAVIRT void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch *end); -Index: linux-2.6.22.19/include/asm-x86_64/boot.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-x86_64/boot.h -+++ linux-2.6.22.19/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 @@ -11711,16 +11577,12 @@ Index: linux-2.6.22.19/include/asm-x86_64/boot.h - -#endif +#include <asm-i386/boot.h> -Index: linux-2.6.22.19/include/asm-x86_64/bootparam.h -=================================================================== --- /dev/null -+++ linux-2.6.22.19/include/asm-x86_64/bootparam.h ++++ b/include/asm-x86_64/bootparam.h @@ -0,0 +1 @@ +#include <asm-i386/bootparam.h> -Index: linux-2.6.22.19/include/asm-x86_64/cpufeature.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-x86_64/cpufeature.h -+++ linux-2.6.22.19/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 @@ -11849,10 +11711,8 @@ Index: linux-2.6.22.19/include/asm-x86_64/cpufeature.h -#define cpu_has_bts boot_cpu_has(X86_FEATURE_BTS) #endif /* __ASM_X8664_CPUFEATURE_H */ -Index: linux-2.6.22.19/include/asm-x86_64/e820.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-x86_64/e820.h -+++ linux-2.6.22.19/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 @@ -11864,7 +11724,7 @@ Index: linux-2.6.22.19/include/asm-x86_64/e820.h #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 { @@ -11873,11 +11733,9 @@ Index: linux-2.6.22.19/include/asm-x86_64/e820.h struct e820entry map[E820MAX]; }; -Index: linux-2.6.22.19/include/asm-x86_64/processor.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-x86_64/processor.h -+++ linux-2.6.22.19/include/asm-x86_64/processor.h -@@ -100,6 +100,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 *); @@ -11885,7 +11743,7 @@ Index: linux-2.6.22.19/include/asm-x86_64/processor.h extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); extern unsigned short num_cache_leaves; -@@ -368,8 +369,6 @@ static inline void sync_core(void) +@@ -368,8 +369,6 @@ asm volatile("cpuid" : "=a" (tmp) : "0" (1) : "ebx","ecx","edx","memory"); } @@ -11894,10 +11752,8 @@ Index: linux-2.6.22.19/include/asm-x86_64/processor.h #define ARCH_HAS_PREFETCH static inline void prefetch(void *x) { -Index: linux-2.6.22.19/include/asm-x86_64/required-features.h -=================================================================== --- /dev/null -+++ linux-2.6.22.19/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 @@ -11945,10 +11801,8 @@ Index: linux-2.6.22.19/include/asm-x86_64/required-features.h +#define REQUIRED_MASK7 0 + +#endif -Index: linux-2.6.22.19/include/asm-x86_64/segment.h -=================================================================== ---- linux-2.6.22.19.orig/include/asm-x86_64/segment.h -+++ linux-2.6.22.19/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> @@ -11964,10 +11818,8 @@ Index: linux-2.6.22.19/include/asm-x86_64/segment.h #define __KERNEL_CS 0x10 #define __KERNEL_DS 0x18 -Index: linux-2.6.22.19/include/linux/edd.h -=================================================================== ---- linux-2.6.22.19.orig/include/linux/edd.h -+++ linux-2.6.22.19/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 @@ -11979,10 +11831,8 @@ Index: linux-2.6.22.19/include/linux/edd.h #ifndef __ASSEMBLY__ -Index: linux-2.6.22.19/include/linux/screen_info.h -=================================================================== ---- linux-2.6.22.19.orig/include/linux/screen_info.h -+++ linux-2.6.22.19/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 */ @@ -11992,7 +11842,7 @@ Index: linux-2.6.22.19/include/linux/screen_info.h 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 */ @@ -12001,7 +11851,7 @@ Index: linux-2.6.22.19/include/linux/screen_info.h 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 */ |