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

9e9abecf · Linus Torvalds <[email protected]> · 2008-04-18 08:25:51 -07:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (613 commits)
  x86: standalone trampoline code
  x86: move suspend wakeup code to C
  x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
  x86: setup_trampoline() - fix section mismatch warning
  x86: section mismatch fixes, #1
  x86: fix paranoia about using BIOS quickboot mechanism.
  x86: print out buggy mptable
  x86: use cpu_online()
  x86: use cpumask_of_cpu()
  x86: remove unnecessary tmp local variable
  x86: remove unnecessary memset()
  x86: use ioapic_read_entry() and ioapic_write_entry()
  x86: avoid redundant loop in io_apic_level_ack_pending()
  x86: remove superfluous initialisation in boot code.
  x86: merge mpparse_{32,64}.c
  x86: unify mp_register_gsi
  x86: unify mp_config_acpi_legacy_irqs
  x86: unify mp_register_ioapic
  x86: unify uniq_io_apic_id
  x86: unify smp_scan_config
  ...

Commit: 9e9abecfc0ff3a9ad2ead954b37bbfcb863c775e
Parents: d7bb545d · 77ad386e

Merge commit. Changes below are compared with the first parent: d7bb545d.

Changes

360 files changed · +14193 −12967

File	Status	Add	Del	Content
Documentation/feature-removal-schedule.txt	modified	+1	−1	View file
Documentation/i386/boot.txt	modified	+28	−0	View file
Documentation/kernel-parameters.txt	modified	+18	−0	View file
Documentation/x86/pat.txt	added	+100	−0	View file
Documentation/x86_64/boot-options.txt	modified	+5	−0	View file
arch/x86/Kconfig	modified	+57	−13	View file
arch/x86/Kconfig.cpu	modified	+1	−1	View file
arch/x86/Kconfig.debug	modified	+25	−1	View file
arch/x86/Makefile	modified	+3	−4	View file
arch/x86/boot/Makefile	modified	+15	−1	View file
arch/x86/boot/boot.h	modified	+5	−0	View file
arch/x86/boot/compressed/Makefile	modified	+1	−1	View file
arch/x86/boot/compressed/misc.c	modified	+134	−68	View file
arch/x86/boot/cpucheck.c	modified	+10	−10	View file
arch/x86/boot/header.S	modified	+5	−1	View file
arch/x86/boot/pm.c	modified	+1	−1	View file
arch/x86/boot/tools/build.c	modified	+87	−1	View file
arch/x86/boot/video-bios.c	modified	+6	−0	View file
arch/x86/boot/video-mode.c	added	+173	−0	View file
arch/x86/boot/video-vesa.c	modified	+8	−0	View file
arch/x86/boot/video-vga.c	modified	+10	−2	View file
arch/x86/boot/video.c	modified	+1	−156	View file
arch/x86/ia32/ia32_signal.c	modified	+1	−1	View file
arch/x86/ia32/ia32entry.S	modified	+8	−4	View file
arch/x86/ia32/sys_ia32.c	modified	+1	−30	View file
arch/x86/kernel/Makefile	modified	+10	−9	View file
arch/x86/kernel/acpi/Makefile	modified	+8	−1	View file
arch/x86/kernel/acpi/boot.c	modified	+57	−10	View file
arch/x86/kernel/acpi/realmode/Makefile	added	+57	−0	View file
arch/x86/kernel/acpi/realmode/copy.S	added	+1	−0	View file
arch/x86/kernel/acpi/realmode/video-bios.c	added	+1	−0	View file
arch/x86/kernel/acpi/realmode/video-mode.c	added	+1	−0	View file
arch/x86/kernel/acpi/realmode/video-vesa.c	added	+1	−0	View file
arch/x86/kernel/acpi/realmode/video-vga.c	added	+1	−0	View file
arch/x86/kernel/acpi/realmode/wakemain.c	added	+81	−0	View file
arch/x86/kernel/acpi/realmode/wakeup.S	added	+113	−0	View file
arch/x86/kernel/acpi/realmode/wakeup.h	added	+36	−0	View file
arch/x86/kernel/acpi/realmode/wakeup.lds.S	added	+61	−0	View file
arch/x86/kernel/acpi/sleep.c	modified	+60	−13	View file
arch/x86/kernel/acpi/sleep.h	added	+16	−0	View file
arch/x86/kernel/acpi/sleep_32.c	deleted	+0	−40	View before deletion
arch/x86/kernel/acpi/wakeup_32.S	modified	+20	−227	View file
arch/x86/kernel/acpi/wakeup_64.S	modified	+9	−304	View file
arch/x86/kernel/acpi/wakeup_rm.S	added	+10	−0	View file
arch/x86/kernel/alternative.c	modified	+76	−27	View file
arch/x86/kernel/aperture_64.c	modified	+3	−3	View file
arch/x86/kernel/apic_32.c	modified	+189	−35	View file
arch/x86/kernel/apic_64.c	modified	+125	−15	View file
arch/x86/kernel/apm_32.c	modified	+1	−4	View file
arch/x86/kernel/asm-offsets_32.c	modified	+1	−1	View file
arch/x86/kernel/bugs_64.c	modified	+13	−1	View file
arch/x86/kernel/cpu/Makefile	modified	+2	−2	View file
arch/x86/kernel/cpu/amd.c	modified	+63	−58	View file
arch/x86/kernel/cpu/centaur.c	modified	+244	−246	View file
arch/x86/kernel/cpu/common.c	modified	+99	−81	View file
arch/x86/kernel/cpu/cpu.h	modified	+13	−13	View file
arch/x86/kernel/cpu/cyrix.c	modified	+63	−73	View file
arch/x86/kernel/cpu/feature_names.c	modified	+1	−1	View file
arch/x86/kernel/cpu/intel.c	modified	+53	−53	View file
arch/x86/kernel/cpu/mcheck/mce_32.c	modified	+25	−25	View file
arch/x86/kernel/cpu/mcheck/non-fatal.c	modified	+12	−9	View file
arch/x86/kernel/cpu/mcheck/p5.c	modified	+8	−8	View file
arch/x86/kernel/cpu/mcheck/p6.c	modified	+24	−24	View file
arch/x86/kernel/cpu/mcheck/winchip.c	modified	+4	−4	View file
arch/x86/kernel/cpu/mtrr/generic.c	modified	+139	−0	View file
arch/x86/kernel/cpu/mtrr/if.c	modified	+3	−4	View file
arch/x86/kernel/cpu/mtrr/main.c	modified	+1	−1	View file
arch/x86/kernel/cpu/mtrr/state.c	modified	+8	−6	View file
arch/x86/kernel/cpu/nexgen.c	modified	+7	−8	View file
arch/x86/kernel/cpu/proc.c	modified	+116	−54	View file
arch/x86/kernel/cpu/transmeta.c	modified	+14	−16	View file
arch/x86/kernel/cpu/umc.c	modified	+9	−10	View file
arch/x86/kernel/crash.c	modified	+0	−4	View file
arch/x86/kernel/ds.c	modified	+4	−4	View file
arch/x86/kernel/e820_32.c	modified	+7	−20	View file
arch/x86/kernel/e820_64.c	modified	+107	−49	View file
arch/x86/kernel/early_printk.c	modified	+12	−12	View file
arch/x86/kernel/entry_32.S	modified	+17	−22	View file
arch/x86/kernel/entry_64.S	modified	+3	−5	View file
arch/x86/kernel/genapic_64.c	modified	+41	−6	View file
arch/x86/kernel/genapic_flat_64.c	modified	+2	−5	View file
arch/x86/kernel/genx2apic_uv_x.c	added	+245	−0	View file
arch/x86/kernel/head32.c	added	+14	−0	View file
arch/x86/kernel/head64.c	modified	+57	−21	View file
arch/x86/kernel/head_32.S	modified	+1	−1	View file
arch/x86/kernel/head_64.S	modified	+10	−18	View file
arch/x86/kernel/i387.c	modified	+46	−42	View file
arch/x86/kernel/io_apic_32.c	modified	+64	−100	View file
arch/x86/kernel/io_apic_64.c	modified	+30	−33	View file
arch/x86/kernel/ipi.c	added	+178	−0	View file
arch/x86/kernel/irq_32.c	modified	+1	−1	View file
arch/x86/kernel/kprobes.c	modified	+7	−7	View file
arch/x86/kernel/mca_32.c	modified	+53	−43	View file
arch/x86/kernel/microcode.c	modified	+8	−8	View file
arch/x86/kernel/mpparse.c	added	+1105	−0	View file
arch/x86/kernel/mpparse_32.c	deleted	+0	−1139	View before deletion
arch/x86/kernel/mpparse_64.c	deleted	+0	−867	View before deletion
arch/x86/kernel/msr.c	modified	+2	−2	View file
arch/x86/kernel/nmi_32.c	modified	+9	−5	View file
arch/x86/kernel/nmi_64.c	modified	+2	−0	View file
arch/x86/kernel/paravirt.c	modified	+1	−17	View file
arch/x86/kernel/pci-dma_64.c	modified	+10	−10	View file
arch/x86/kernel/process_32.c	modified	+26	−15	View file
arch/x86/kernel/process_64.c	modified	+17	−10	View file
arch/x86/kernel/ptrace.c	modified	+0	−1	View file
arch/x86/kernel/reboot.c	modified	+2	−3	View file
arch/x86/kernel/relocate_kernel_32.S	modified	+15	−15	View file
arch/x86/kernel/relocate_kernel_64.S	modified	+15	−25	View file
arch/x86/kernel/rtc.c	modified	+14	−19	View file
arch/x86/kernel/setup.c	added	+113	−0	View file
arch/x86/kernel/setup64.c	modified	+4	−77	View file
arch/x86/kernel/setup_32.c	modified	+78	−17	View file
arch/x86/kernel/setup_64.c	modified	+88	−136	View file
arch/x86/kernel/sigframe_32.h → arch/x86/kernel/sigframe.h	renamed	+10	−4	View file
arch/x86/kernel/signal_32.c	modified	+154	−149	View file
arch/x86/kernel/signal_64.c	modified	+45	−63	View file
arch/x86/kernel/smp.c	added	+343	−0	View file
arch/x86/kernel/smp_32.c	deleted	+0	−712	View before deletion
arch/x86/kernel/smpboot_32.c → arch/x86/kernel/smpboot.c	renamed	+734	−615	View file
arch/x86/kernel/smpboot_64.c	deleted	+0	−1108	View before deletion
arch/x86/kernel/smpcommon.c	added	+83	−0	View file
arch/x86/kernel/smpcommon_32.c	modified	+0	−81	View file
arch/x86/kernel/srat_32.c	modified	+5	−5	View file
arch/x86/kernel/step.c	modified	+1	−1	View file
arch/x86/kernel/summit_32.c	modified	+31	−26	View file
arch/x86/kernel/syscall_64.c	modified	+8	−5	View file
arch/x86/kernel/test_nx.c	modified	+2	−0	View file
arch/x86/kernel/tlb_32.c	added	+243	−0	View file
arch/x86/kernel/smp_64.c → arch/x86/kernel/tlb_64.c	renamed	+5	−261	View file
arch/x86/kernel/trampoline.c	added	+18	−0	View file
arch/x86/kernel/trampoline_64.S	modified	+0	−5	View file
arch/x86/kernel/traps_32.c	modified	+322	−290	View file
arch/x86/kernel/traps_64.c	modified	+2	−0	View file
arch/x86/kernel/tsc_32.c	modified	+6	−10	View file
arch/x86/kernel/tsc_64.c	modified	+1	−2	View file
arch/x86/kernel/vm86_32.c	modified	+105	−108	View file
arch/x86/kernel/vmlinux_32.lds.S	modified	+5	−0	View file
arch/x86/kernel/vmlinux_64.lds.S	modified	+11	−0	View file
arch/x86/kernel/vsmp_64.c	modified	+116	−15	View file
arch/x86/kernel/x8664_ksyms_64.c	modified	+7	−5	View file
arch/x86/lguest/boot.c	modified	+1	−1	View file
arch/x86/lib/memcpy_32.c	modified	+1	−1	View file
arch/x86/lib/memmove_64.c	modified	+4	−4	View file
arch/x86/lib/mmx_32.c	modified	+94	−103	View file
arch/x86/lib/string_32.c	modified	+30	−30	View file
arch/x86/lib/strstr_32.c	modified	+2	−2	View file
arch/x86/lib/usercopy_32.c	modified	+61	−61	View file
arch/x86/mach-generic/bigsmp.c	modified	+15	−15	View file
arch/x86/mach-generic/default.c	modified	+4	−4	View file
arch/x86/mach-generic/probe.c	modified	+19	−18	View file
arch/x86/mach-generic/summit.c	modified	+4	−4	View file
arch/x86/mach-rdc321x/Makefile	modified	+1	−1	View file
arch/x86/mach-rdc321x/wdt.c	deleted	+0	−275	View before deletion
arch/x86/mach-voyager/voyager_smp.c	modified	+6	−12	View file
arch/x86/math-emu/fpu_entry.c	modified	+1	−0	View file
arch/x86/math-emu/reg_ld_str.c	modified	+4	−9	View file
arch/x86/mm/Makefile	modified	+14	−2	View file
arch/x86/mm/Makefile_32	deleted	+0	−9	View before deletion
arch/x86/mm/Makefile_64	deleted	+0	−9	View before deletion
arch/x86/mm/discontig_32.c	modified	+1	−1	View file
arch/x86/mm/dump_pagetables.c	added	+354	−0	View file
arch/x86/mm/fault.c	modified	+1	−5	View file
arch/x86/mm/init_32.c	modified	+18	−17	View file
arch/x86/mm/init_64.c	modified	+184	−38	View file
arch/x86/mm/ioremap.c	modified	+114	−38	View file
arch/x86/mm/numa_64.c	modified	+3	−3	View file
arch/x86/mm/pageattr.c	modified	+97	−8	View file
arch/x86/mm/pat.c	added	+421	−0	View file
arch/x86/mm/pgtable_32.c	modified	+7	−1	View file
arch/x86/mm/srat_64.c	modified	+6	−1	View file
arch/x86/oprofile/init.c	modified	+7	−6	View file
arch/x86/oprofile/nmi_timer_int.c	modified	+3	−3	View file
arch/x86/oprofile/op_model_athlon.c	modified	+23	−23	View file
arch/x86/oprofile/op_model_ppro.c	modified	+26	−26	View file
arch/x86/pci/i386.c	modified	+65	−8	View file
arch/x86/pci/irq.c	modified	+6	−6	View file
arch/x86/pci/numa.c	modified	+31	−1	View file
arch/x86/power/cpu_32.c	modified	+23	−18	View file
arch/x86/vdso/Makefile	modified	+1	−1	View file
arch/x86/vdso/vdso32-setup.c	modified	+9	−2	View file
arch/x86/xen/enlighten.c	modified	+5	−2	View file
arch/x86/xen/multicalls.c	modified	+2	−2	View file
arch/x86/xen/smp.c	modified	+3	−3	View file
arch/x86/xen/xen-asm.S	modified	+3	−8	View file
arch/x86/xen/xen-ops.h	modified	+1	−1	View file
include/asm-x86/Kbuild	modified	+1	−0	View file
include/asm-x86/a.out-core.h	modified	+7	−5	View file
include/asm-x86/acpi.h	modified	+4	−4	View file
include/asm-x86/alternative.h	modified	+26	−6	View file
include/asm-x86/apic.h	modified	+4	−3	View file
include/asm-x86/apicdef.h	modified	+35	−34	View file
include/asm-x86/atomic_32.h	modified	+68	−75	View file
include/asm-x86/atomic_64.h	modified	+119	−132	View file
include/asm-x86/mach-default/bios_ebda.h → include/asm-x86/bios_ebda.h	renamed	+0	−0	View file
include/asm-x86/bitops.h	modified	+24	−30	View file
include/asm-x86/bitops_32.h	modified	+21	−19	View file
include/asm-x86/bitops_64.h	modified	+20	−20	View file
include/asm-x86/bug.h	modified	+17	−17	View file
include/asm-x86/byteorder.h	modified	+24	−15	View file
include/asm-x86/cacheflush.h	modified	+66	−14	View file
include/asm-x86/checksum_32.h	modified	+75	−77	View file
include/asm-x86/checksum_64.h	modified	+57	−61	View file
include/asm-x86/cmpxchg_32.h	modified	+132	−121	View file
include/asm-x86/cmpxchg_64.h	modified	+69	−65	View file
include/asm-x86/compat.h	modified	+1	−1	View file
include/asm-x86/cpufeature.h	modified	+7	−1	View file
include/asm-x86/current_32.h	modified	+1	−1	View file
include/asm-x86/current_64.h	modified	+6	−6	View file
include/asm-x86/desc.h	modified	+31	−30	View file
include/asm-x86/desc_defs.h	modified	+8	−7	View file
include/asm-x86/div64.h	modified	+18	−17	View file
include/asm-x86/dma.h	modified	+22	−23	View file
include/asm-x86/dwarf2_64.h	modified	+4	−5	View file
include/asm-x86/e820_32.h	modified	+2	−2	View file
include/asm-x86/e820_64.h	modified	+14	−10	View file
include/asm-x86/edac.h	modified	+2	−2	View file
include/asm-x86/efi.h	modified	+1	−1	View file
include/asm-x86/elf.h	modified	+62	−50	View file
include/asm-x86/fixmap_32.h	modified	+10	−11	View file
include/asm-x86/fixmap_64.h	modified	+11	−9	View file
include/asm-x86/floppy.h	modified	+48	−45	View file
include/asm-x86/futex.h	modified	+55	−46	View file
include/asm-x86/genapic_32.h	modified	+50	−55	View file
include/asm-x86/genapic_64.h	modified	+10	−0	View file
include/asm-x86/geode.h	modified	+1	−1	View file
include/asm-x86/highmem.h	modified	+1	−1	View file
include/asm-x86/hw_irq_64.h	modified	+7	−8	View file
include/asm-x86/hypertransport.h	modified	+9	−6	View file
include/asm-x86/i387.h	modified	+13	−10	View file
include/asm-x86/i8259.h	modified	+26	−3	View file
include/asm-x86/ia32.h	modified	+30	−32	View file
include/asm-x86/io.h	modified	+6	−0	View file
include/asm-x86/io_32.h	modified	+83	−54	View file
include/asm-x86/io_64.h	modified	+68	−42	View file
include/asm-x86/io_apic.h	modified	+7	−1	View file
include/asm-x86/ioctls.h	modified	+7	−6	View file
include/asm-x86/ipcbuf.h	modified	+1	−2	View file
include/asm-x86/ipi.h	modified	+7	−4	View file
include/asm-x86/irq_32.h	modified	+1	−1	View file
include/asm-x86/irq_64.h	modified	+2	−2	View file
include/asm-x86/irqflags.h	modified	+13	−46	View file
include/asm-x86/kdebug.h	modified	+2	−2	View file
include/asm-x86/kexec.h	modified	+35	−36	View file
include/asm-x86/kprobes.h	modified	+6	−6	View file
include/asm-x86/kvm_host.h	modified	+13	−11	View file
include/asm-x86/kvm_x86_emulate.h	modified	+14	−14	View file
include/asm-x86/lguest.h	modified	+4	−7	View file
include/asm-x86/lguest_hcall.h	modified	+2	−3	View file
include/asm-x86/linkage.h	modified	+3	−0	View file
include/asm-x86/local.h	modified	+50	−55	View file
include/asm-x86/mach-bigsmp/mach_apic.h	modified	+2	−16	View file
include/asm-x86/mach-default/mach_apic.h	modified	+53	−42	View file
include/asm-x86/mach-default/mach_apicdef.h	modified	+7	−2	View file
include/asm-x86/mach-default/mach_ipi.h	modified	+10	−0	View file
include/asm-x86/mach-default/mach_mpparse.h	modified	+0	−11	View file
include/asm-x86/mach-default/mach_reboot.h	deleted	+0	−61	View before deletion
include/asm-x86/mach-default/smpboot_hooks.h	modified	+7	−0	View file
include/asm-x86/mach-es7000/mach_apic.h	modified	+4	−16	View file
include/asm-x86/mach-es7000/mach_mpparse.h	modified	+0	−11	View file
include/asm-x86/mach-generic/mach_apic.h	modified	+0	−1	View file
include/asm-x86/mach-generic/mach_mpparse.h	modified	+0	−5	View file
include/asm-x86/mach-numaq/mach_apic.h	modified	+10	−0	View file
include/asm-x86/mach-numaq/mach_mpparse.h	modified	+4	−19	View file
include/asm-x86/mach-summit/mach_apic.h	modified	+1	−13	View file
include/asm-x86/mach-summit/mach_mpparse.h	modified	+0	−11	View file
include/asm-x86/mach-visws/mach_apic.h	modified	+1	−1	View file
include/asm-x86/mach-visws/smpboot_hooks.h	modified	+4	−0	View file
include/asm-x86/mach_apic.h	deleted	+0	−29	View before deletion
include/asm-x86/mc146818rtc.h	modified	+10	−6	View file
include/asm-x86/mca_dma.h	modified	+17	−17	View file
include/asm-x86/mmu.h	modified	+2	−2	View file
include/asm-x86/mmu_context_32.h	modified	+6	−6	View file
include/asm-x86/mmu_context_64.h	modified	+11	−10	View file
include/asm-x86/mmx.h	modified	+1	−1	View file
include/asm-x86/mmzone_32.h	modified	+2	−2	View file
include/asm-x86/mmzone_64.h	modified	+12	−12	View file
include/asm-x86/mpspec.h	modified	+23	−24	View file
include/asm-x86/mpspec_def.h	modified	+13	−33	View file
include/asm-x86/msidef.h	modified	+8	−4	View file
include/asm-x86/msr-index.h	modified	+4	−0	View file
include/asm-x86/msr.h	modified	+50	−39	View file
include/asm-x86/mtrr.h	modified	+39	−34	View file
include/asm-x86/mutex_32.h	modified	+31	−35	View file
include/asm-x86/mutex_64.h	modified	+34	−39	View file
include/asm-x86/nmi.h	modified	+91	−3	View file
include/asm-x86/nmi_32.h	deleted	+0	−61	View before deletion
include/asm-x86/nmi_64.h	deleted	+0	−90	View before deletion
include/asm-x86/nops.h	modified	+2	−0	View file
include/asm-x86/numa_64.h	modified	+3	−2	View file
include/asm-x86/numaq.h	modified	+5	−4	View file
include/asm-x86/page.h	modified	+2	−2	View file
include/asm-x86/page_32.h	modified	+6	−3	View file
include/asm-x86/page_64.h	modified	+6	−4	View file
include/asm-x86/param.h	modified	+2	−2	View file
include/asm-x86/paravirt.h	modified	+35	−19	View file
include/asm-x86/parport.h	modified	+3	−3	View file
include/asm-x86/pat.h	added	+16	−0	View file
include/asm-x86/pci-direct.h	modified	+1	−1	View file
include/asm-x86/pci.h	modified	+4	−4	View file
include/asm-x86/pci_64.h	modified	+5	−9	View file
include/asm-x86/pda.h	modified	+42	−39	View file
include/asm-x86/percpu.h	modified	+54	−50	View file
include/asm-x86/pgtable-2level.h	modified	+11	−7	View file
include/asm-x86/pgtable-3level.h	modified	+28	−20	View file
include/asm-x86/pgtable.h	modified	+135	−43	View file
include/asm-x86/pgtable_32.h	modified	+55	−45	View file
include/asm-x86/pgtable_64.h	modified	+83	−68	View file
include/asm-x86/posix_types.h	modified	+1	−7	View file
include/asm-x86/posix_types_32.h	modified	+27	−20	View file
include/asm-x86/posix_types_64.h	modified	+27	−27	View file
include/asm-x86/processor.h	modified	+404	−325	View file
include/asm-x86/proto.h	modified	+2	−4	View file
include/asm-x86/ptrace.h	modified	+25	−21	View file
include/asm-x86/reboot.h	modified	+1	−2	View file
include/asm-x86/resume-trace.h	modified	+8	−7	View file
include/asm-x86/rio.h	modified	+38	−38	View file
include/asm-x86/rwsem.h	modified	+86	−83	View file
include/asm-x86/segment.h	modified	+2	−1	View file
include/asm-x86/setup.h	modified	+6	−2	View file
include/asm-x86/sigcontext.h	modified	+4	−3	View file
include/asm-x86/sigcontext32.h	modified	+2	−2	View file
include/asm-x86/signal.h	modified	+24	−24	View file
include/asm-x86/smp.h	modified	+207	−3	View file
include/asm-x86/smp_32.h	deleted	+0	−165	View before deletion
include/asm-x86/smp_64.h	deleted	+0	−101	View before deletion
include/asm-x86/sparsemem.h	modified	+3	−3	View file
include/asm-x86/spinlock.h	modified	+56	−61	View file
include/asm-x86/srat.h	modified	+1	−1	View file
include/asm-x86/string_32.h	modified	+1	−1	View file
include/asm-x86/string_64.h	modified	+33	−33	View file
include/asm-x86/suspend_32.h	modified	+6	−6	View file
include/asm-x86/suspend_64.h	modified	+2	−3	View file
include/asm-x86/swiotlb.h	modified	+14	−14	View file
include/asm-x86/sync_bitops.h	modified	+29	−48	View file
include/asm-x86/system.h	modified	+64	−51	View file
include/asm-x86/tce.h	modified	+1	−1	View file
include/asm-x86/thread_info_32.h	modified	+46	−42	View file
include/asm-x86/thread_info_64.h	modified	+41	−37	View file
include/asm-x86/tlbflush.h	modified	+2	−3	View file
include/asm-x86/topology.h	modified	+15	−8	View file
include/asm-x86/trampoline.h	added	+21	−0	View file
include/asm-x86/tsc.h	modified	+1	−1	View file
include/asm-x86/uaccess_32.h	modified	+187	−129	View file
include/asm-x86/uaccess_64.h	modified	+227	−149	View file
include/asm-x86/unaligned.h	modified	+1	−1	View file
include/asm-x86/unistd.h	modified	+1	−7	View file
include/asm-x86/unistd_32.h	modified	+1	−1	View file
include/asm-x86/unistd_64.h	modified	+1	−1	View file
include/asm-x86/user32.h	modified	+4	−3	View file
include/asm-x86/user_32.h	modified	+3	−3	View file
include/asm-x86/user_64.h	modified	+9	−7	View file
include/asm-x86/uv/uv_hub.h	added	+284	−0	View file
include/asm-x86/uv/uv_mmrs.h	added	+373	−0	View file
include/asm-x86/vdso.h	modified	+17	−6	View file
include/asm-x86/vga.h	modified	+2	−2	View file
include/asm-x86/vm86.h	modified	+10	−13	View file
include/asm-x86/vmi.h	modified	+44	−44	View file
include/asm-x86/voyager.h	modified	+31	−20	View file
include/asm-x86/xor_32.h	modified	+248	−246	View file
include/asm-x86/xor_64.h	modified	+149	−145	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/feature-removal-schedule.txt

View file

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index bf0e3df..164c893 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -212,7 +212,7 @@ Who:    Stephen Hemminger <[email protected]>
 ---------------------------
 
 What:	i386/x86_64 bzImage symlinks
-When:	April 2008
+When:	April 2010
 
 Why:	The i386/x86_64 merge provides a symlink to the old bzImage
 	location so not yet updated user space tools, e.g. package

Documentation/i386/boot.txt

View file

diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt
index fc49b79..2eb1610 100644
--- a/Documentation/i386/boot.txt
+++ b/Documentation/i386/boot.txt
@@ -170,6 +170,8 @@ Offset	Proto	Name		Meaning
 0238/4	2.06+	cmdline_size	Maximum size of the kernel command line
 023C/4	2.07+	hardware_subarch Hardware subarchitecture
 0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data
+0248/4	2.08+	payload_offset	Offset of kernel payload
+024C/4	2.08+	payload_length	Length of kernel payload
 
 (1) For backwards compatibility, if the setup_sects field contains 0, the
     real value is 4.
@@ -512,6 +514,32 @@ Protocol:	2.07+
 
   A pointer to data that is specific to hardware subarch
 
+Field name:	payload_offset
+Type:		read
+Offset/size:	0x248/4
+Protocol:	2.08+
+
+  If non-zero then this field contains the offset from the end of the
+  real-mode code to the payload.
+
+  The payload may be compressed. The format of both the compressed and
+  uncompressed data should be determined using the standard magic
+  numbers. Currently only gzip compressed ELF is used.
+  
+Field name:	payload_length
+Type:		read
+Offset/size:	0x24c/4
+Protocol:	2.08+
+
+  The length of the payload.
+
+**** THE IMAGE CHECKSUM
+
+From boot protocol version 2.08 onwards the CRC-32 is calculated over
+the entire file using the characteristic polynomial 0x04C11DB7 and an
+initial remainder of 0xffffffff.  The checksum is appended to the
+file; therefore the CRC of the file up to the limit specified in the
+syssize field of the header is always 0.
 
 **** THE KERNEL COMMAND LINE
 

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index dafd001..f9ea080 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -812,6 +812,19 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	inttest=	[IA64]
 
+	iommu=		[x86]
+		off
+		force
+		noforce
+		biomerge
+		panic
+		nopanic
+		merge
+		nomerge
+		forcesac
+		soft
+
+
 	intel_iommu=	[DMAR] Intel IOMMU driver (DMAR) option
 		off
 			Disable intel iommu driver.
@@ -1134,6 +1147,11 @@ and is between 256 and 4096 characters. It is defined in the file
 			         or
 			         memmap=0x10000$0x18690000
 
+	memtest=	[KNL,X86_64] Enable memtest
+			Format: <integer>
+			range: 0,4 : pattern number
+			default : 0 <disable>
+
 	meye.*=		[HW] Set MotionEye Camera parameters
 			See Documentation/video4linux/meye.txt.
 

Documentation/x86/pat.txt

View file

diff --git a/Documentation/x86/pat.txt b/Documentation/x86/pat.txt
new file mode 100644
index 0000000..17965f9
--- /dev/null
+++ b/Documentation/x86/pat.txt
@@ -0,0 +1,100 @@
+
+PAT (Page Attribute Table)
+
+x86 Page Attribute Table (PAT) allows for setting the memory attribute at the
+page level granularity. PAT is complementary to the MTRR settings which allows
+for setting of memory types over physical address ranges. However, PAT is
+more flexible than MTRR due to its capability to set attributes at page level
+and also due to the fact that there are no hardware limitations on number of
+such attribute settings allowed. Added flexibility comes with guidelines for
+not having memory type aliasing for the same physical memory with multiple
+virtual addresses.
+
+PAT allows for different types of memory attributes. The most commonly used
+ones that will be supported at this time are Write-back, Uncached,
+Write-combined and Uncached Minus.
+
+There are many different APIs in the kernel that allows setting of memory
+attributes at the page level. In order to avoid aliasing, these interfaces
+should be used thoughtfully. Below is a table of interfaces available,
+their intended usage and their memory attribute relationships. Internally,
+these APIs use a reserve_memtype()/free_memtype() interface on the physical
+address range to avoid any aliasing.
+
+
+-------------------------------------------------------------------
+API                    |    RAM   |  ACPI,...  |  Reserved/Holes  |
+-----------------------|----------|------------|------------------|
+                       |          |            |                  |
+ioremap                |    --    |    UC      |       UC         |
+                       |          |            |                  |
+ioremap_cache          |    --    |    WB      |       WB         |
+                       |          |            |                  |
+ioremap_nocache        |    --    |    UC      |       UC         |
+                       |          |            |                  |
+ioremap_wc             |    --    |    --      |       WC         |
+                       |          |            |                  |
+set_memory_uc          |    UC    |    --      |       --         |
+ set_memory_wb         |          |            |                  |
+                       |          |            |                  |
+set_memory_wc          |    WC    |    --      |       --         |
+ set_memory_wb         |          |            |                  |
+                       |          |            |                  |
+pci sysfs resource     |    --    |    --      |       UC         |
+                       |          |            |                  |
+pci sysfs resource_wc  |    --    |    --      |       WC         |
+ is IORESOURCE_PREFETCH|          |            |                  |
+                       |          |            |                  |
+pci proc               |    --    |    --      |       UC         |
+ !PCIIOC_WRITE_COMBINE |          |            |                  |
+                       |          |            |                  |
+pci proc               |    --    |    --      |       WC         |
+ PCIIOC_WRITE_COMBINE  |          |            |                  |
+                       |          |            |                  |
+/dev/mem               |    --    |    UC      |       UC         |
+ read-write            |          |            |                  |
+                       |          |            |                  |
+/dev/mem               |    --    |    UC      |       UC         |
+ mmap SYNC flag        |          |            |                  |
+                       |          |            |                  |
+/dev/mem               |    --    |  WB/WC/UC  |    WB/WC/UC      |
+ mmap !SYNC flag       |          |(from exist-|  (from exist-    |
+ and                   |          |  ing alias)|    ing alias)    |
+ any alias to this area|          |            |                  |
+                       |          |            |                  |
+/dev/mem               |    --    |    WB      |       WB         |
+ mmap !SYNC flag       |          |            |                  |
+ no alias to this area |          |            |                  |
+ and                   |          |            |                  |
+ MTRR says WB          |          |            |                  |
+                       |          |            |                  |
+/dev/mem               |    --    |    --      |    UC_MINUS      |
+ mmap !SYNC flag       |          |            |                  |
+ no alias to this area |          |            |                  |
+ and                   |          |            |                  |
+ MTRR says !WB         |          |            |                  |
+                       |          |            |                  |
+-------------------------------------------------------------------
+
+Notes:
+
+-- in the above table mean "Not suggested usage for the API". Some of the --'s
+are strictly enforced by the kernel. Some others are not really enforced
+today, but may be enforced in future.
+
+For ioremap and pci access through /sys or /proc - The actual type returned
+can be more restrictive, in case of any existing aliasing for that address.
+For example: If there is an existing uncached mapping, a new ioremap_wc can
+return uncached mapping in place of write-combine requested.
+
+set_memory_[uc|wc] and set_memory_wb should be used in pairs, where driver will
+first make a region uc or wc and switch it back to wb after use.
+
+Over time writes to /proc/mtrr will be deprecated in favor of using PAT based
+interfaces. Users writing to /proc/mtrr are suggested to use above interfaces.
+
+Drivers should use ioremap_[uc|wc] to access PCI BARs with [uc|wc] access
+types.
+
+Drivers should use set_memory_[uc|wc] to set access type for RAM ranges.
+

Documentation/x86_64/boot-options.txt

View file

diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 34abae4..b0c7b6c 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -307,3 +307,8 @@ Debugging
 			stuck (default)
 
 Miscellaneous
+
+	nogbpages
+		Do not use GB pages for kernel direct mappings.
+	gbpages
+		Use GB pages for kernel direct mappings.

arch/x86/Kconfig

View file

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e4b3886..701c4a2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -114,7 +114,7 @@ config ARCH_HAS_CPU_RELAX
 	def_bool y
 
 config HAVE_SETUP_PER_CPU_AREA
-	def_bool X86_64
+	def_bool X86_64 || (X86_SMP && !X86_VOYAGER)
 
 config ARCH_HIBERNATION_POSSIBLE
 	def_bool y
@@ -168,7 +168,7 @@ config X86_64_SMP
 config X86_HT
 	bool
 	depends on SMP
-	depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8)
+	depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || X86_64
 	default y
 
 config X86_BIOS_REBOOT
@@ -178,7 +178,7 @@ config X86_BIOS_REBOOT
 
 config X86_TRAMPOLINE
 	bool
-	depends on X86_SMP || (X86_VOYAGER && SMP)
+	depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP)
 	default y
 
 config KTIME_SCALAR
@@ -238,8 +238,7 @@ config X86_ELAN
 
 config X86_VOYAGER
 	bool "Voyager (NCR)"
-	depends on X86_32
-	select SMP if !BROKEN
+	depends on X86_32 && (SMP || BROKEN)
 	help
 	  Voyager is an MCA-based 32-way capable SMP architecture proprietary
 	  to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -251,9 +250,8 @@ config X86_VOYAGER
 
 config X86_NUMAQ
 	bool "NUMAQ (IBM/Sequent)"
-	select SMP
+	depends on SMP && X86_32
 	select NUMA
-	depends on X86_32
 	help
 	  This option is used for getting Linux to run on a (IBM/Sequent) NUMA
 	  multiquad box. This changes the way that processors are bootstrapped,
@@ -324,8 +322,9 @@ config X86_RDC321X
 
 config X86_VSMP
 	bool "Support for ScaleMP vSMP"
-	depends on X86_64 && PCI
-	 help
+	select PARAVIRT
+	depends on X86_64
+	help
 	  Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
 	  supposed to run on these EM64T-based machines.  Only choose this option
 	  if you have one of these machines.
@@ -380,6 +379,35 @@ config PARAVIRT
 
 endif
 
+config MEMTEST_BOOTPARAM
+	bool "Memtest boot parameter"
+	depends on X86_64
+	default y
+	help
+	  This option adds a kernel parameter 'memtest', which allows memtest
+	  to be disabled at boot.  If this option is selected, memtest
+	  functionality can be disabled with memtest=0 on the kernel
+	  command line.  The purpose of this option is to allow a single
+	  kernel image to be distributed with memtest built in, but not
+	  necessarily enabled.
+
+	  If you are unsure how to answer this question, answer Y.
+
+config MEMTEST_BOOTPARAM_VALUE
+	int "Memtest boot parameter default value (0-4)"
+	depends on MEMTEST_BOOTPARAM
+	range 0 4
+	default 0
+	help
+	  This option sets the default value for the kernel parameter
+	  'memtest', which allows memtest to be disabled at boot.  If this
+	  option is set to 0 (zero), the memtest kernel parameter will
+	  default to 0, disabling memtest at bootup.  If this option is
+	  set to 4, the memtest kernel parameter will default to 4,
+	  enabling memtest at bootup, and use that as pattern number.
+
+	  If you are unsure how to answer this question, answer 0.
+
 config ACPI_SRAT
 	def_bool y
 	depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
@@ -504,7 +532,7 @@ config NR_CPUS
 
 config SCHED_SMT
 	bool "SMT (Hyperthreading) scheduler support"
-	depends on (X86_64 && SMP) || (X86_32 && X86_HT)
+	depends on X86_HT
 	help
 	  SMT scheduler support improves the CPU scheduler's decision making
 	  when dealing with Intel Pentium 4 chips with HyperThreading at a
@@ -514,7 +542,7 @@ config SCHED_SMT
 config SCHED_MC
 	def_bool y
 	prompt "Multi-core scheduler support"
-	depends on (X86_64 && SMP) || (X86_32 && X86_HT)
+	depends on X86_HT
 	help
 	  Multi-core scheduler support improves the CPU scheduler's decision
 	  making when dealing with multi-core CPU chips at a cost of slightly
@@ -883,7 +911,7 @@ config NUMA_EMU
 	  number of nodes. This is only useful for debugging.
 
 config NODES_SHIFT
-	int
+	int "Max num nodes shift(1-15)"
 	range 1 15  if X86_64
 	default "6" if X86_64
 	default "4" if X86_NUMAQ
@@ -1007,6 +1035,21 @@ config MTRR
 
 	  See <file:Documentation/mtrr.txt> for more information.
 
+config X86_PAT
+	def_bool y
+	prompt "x86 PAT support"
+	depends on MTRR && NONPROMISC_DEVMEM
+	help
+	  Use PAT attributes to setup page level cache control.
+
+	  PATs are the modern equivalents of MTRRs and are much more
+	  flexible than MTRRs.
+
+	  Say N here if you see bootup problems (boot crash, boot hang,
+	  spontaneous reboots) or a non-working video driver.
+
+	  If unsure, say Y.
+
 config EFI
 	def_bool n
 	prompt "EFI runtime service support"
@@ -1075,6 +1118,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
 	bool "kexec system call"
+	depends on X86_64 || X86_BIOS_REBOOT
 	help
 	  kexec is a system call that implements the ability to shutdown your
 	  current kernel, and to start another kernel.  It is like a reboot
@@ -1376,7 +1420,7 @@ endmenu
 menu "Bus options (PCI etc.)"
 
 config PCI
-	bool "PCI support" if !X86_VISWS
+	bool "PCI support" if !X86_VISWS && !X86_VSMP
 	depends on !X86_VOYAGER
 	default y
 	select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)

arch/x86/Kconfig.cpu

View file

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 9304bfb..57072f2 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -388,7 +388,7 @@ config X86_OOSTORE
 #
 config X86_P6_NOP
 	def_bool y
-	depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4)
+	depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC)
 
 config X86_TSC
 	def_bool y

arch/x86/Kconfig.debug

View file

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 702eb39..610aaec 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -54,6 +54,18 @@ config DEBUG_PER_CPU_MAPS
 
 	  Say N if unsure.
 
+config X86_PTDUMP
+	bool "Export kernel pagetable layout to userspace via debugfs"
+	depends on DEBUG_KERNEL
+	select DEBUG_FS
+	help
+	  Say Y here if you want to show the kernel pagetable layout in a
+	  debugfs file. This information is only useful for kernel developers
+	  who are working in architecture specific areas of the kernel.
+	  It is probably not a good idea to enable this feature in a production
+	  kernel.
+	  If in doubt, say "N"
+
 config DEBUG_RODATA
 	bool "Write protect kernel read-only data structures"
 	default y
@@ -64,6 +76,18 @@ config DEBUG_RODATA
 	  data. This is recommended so that we can catch kernel bugs sooner.
 	  If in doubt, say "Y".
 
+config DIRECT_GBPAGES
+	bool "Enable gbpages-mapped kernel pagetables"
+	depends on DEBUG_KERNEL && EXPERIMENTAL && X86_64
+	help
+	  Enable gigabyte pages support (if the CPU supports it). This can
+	  improve the kernel's performance a tiny bit by reducing TLB
+	  pressure.
+
+	  This is experimental code.
+
+	  If in doubt, say "N".
+
 config DEBUG_RODATA_TEST
 	bool "Testcase for the DEBUG_RODATA feature"
 	depends on DEBUG_RODATA
@@ -82,8 +106,8 @@ config DEBUG_NX_TEST
 
 config 4KSTACKS
 	bool "Use 4Kb for kernel stacks instead of 8Kb"
-	depends on DEBUG_KERNEL
 	depends on X86_32
+	default y
 	help
 	  If you say Y here the kernel will use a 4Kb stacksize for the
 	  kernel stack attached to each process/thread. This facilitates

arch/x86/Makefile

View file

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f1e739a..3cff3c8 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -151,7 +151,6 @@ mflags-y += -Iinclude/asm-x86/mach-default
 # 64 bit does not support subarch support - clear sub arch variables
 fcore-$(CONFIG_X86_64)  :=
 mcore-$(CONFIG_X86_64)  :=
-mflags-$(CONFIG_X86_64) :=
 
 KBUILD_CFLAGS += $(mflags-y)
 KBUILD_AFLAGS += $(mflags-y)
@@ -159,9 +158,9 @@ KBUILD_AFLAGS += $(mflags-y)
 ###
 # Kernel objects
 
-head-y                := arch/x86/kernel/head_$(BITS).o
-head-$(CONFIG_X86_64) += arch/x86/kernel/head64.o
-head-y                += arch/x86/kernel/init_task.o
+head-y := arch/x86/kernel/head_$(BITS).o
+head-y += arch/x86/kernel/head$(BITS).o
+head-y += arch/x86/kernel/init_task.o
 
 libs-y  += arch/x86/lib/
 

arch/x86/boot/Makefile

View file

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index f88458e..7ee102f 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -30,7 +30,7 @@ subdir-		:= compressed
 
 setup-y		+= a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o
 setup-y		+= header.o main.o mca.o memory.o pm.o pmjump.o
-setup-y		+= printf.o string.o tty.o video.o version.o
+setup-y		+= printf.o string.o tty.o video.o video-mode.o version.o
 setup-$(CONFIG_X86_APM_BOOT) += apm.o
 setup-$(CONFIG_X86_VOYAGER) += voyager.o
 
@@ -94,6 +94,20 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
 
 SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))
 
+sed-offsets := -e 's/^00*/0/' \
+        -e 's/^\([0-9a-fA-F]*\) . \(input_data\|input_data_end\)$$/\#define \2 0x\1/p'
+
+quiet_cmd_offsets = OFFSETS $@
+      cmd_offsets = $(NM) $< | sed -n $(sed-offsets) > $@
+
+$(obj)/offsets.h: $(obj)/compressed/vmlinux FORCE
+	$(call if_changed,offsets)
+
+targets += offsets.h
+
+AFLAGS_header.o += -I$(obj)
+$(obj)/header.o: $(obj)/offsets.h
+
 LDFLAGS_setup.elf	:= -T
 $(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE
 	$(call if_changed,ld)

arch/x86/boot/boot.h

View file

diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 7822a49..0957807 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -286,6 +286,11 @@ int getchar_timeout(void);
 /* video.c */
 void set_video(void);
 
+/* video-mode.c */
+int set_mode(u16 mode);
+int mode_defined(u16 mode);
+void probe_cards(int unsafe);
+
 /* video-vesa.c */
 void vesa_store_edid(void);
 

arch/x86/boot/compressed/Makefile

View file

diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index d2b9f3b..92fdd35 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -22,7 +22,7 @@ $(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc.o $
 	$(call if_changed,ld)
 	@:
 
-OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S
+OBJCOPYFLAGS_vmlinux.bin :=  -R .comment -S
 $(obj)/vmlinux.bin: vmlinux FORCE
 	$(call if_changed,objcopy)
 

arch/x86/boot/compressed/misc.c

View file

diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 8182e32..dad4e69 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -15,6 +15,10 @@
  * we just keep it from happening
  */
 #undef CONFIG_PARAVIRT
+#ifdef CONFIG_X86_32
+#define _ASM_DESC_H_ 1
+#endif
+
 #ifdef CONFIG_X86_64
 #define _LINUX_STRING_H_ 1
 #define __LINUX_BITMAP_H 1
@@ -22,6 +26,7 @@
 
 #include <linux/linkage.h>
 #include <linux/screen_info.h>
+#include <linux/elf.h>
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/boot.h>
@@ -53,8 +58,8 @@
  * 1 bit (last block flag)
  * 2 bits (block type)
  *
- * 1 block occurs every 32K -1 bytes or when there 50% compression has been achieved.
- * The smallest block type encoding is always used.
+ * 1 block occurs every 32K -1 bytes or when there 50% compression
+ * has been achieved. The smallest block type encoding is always used.
  *
  * stored:
  *    32 bits length in bytes.
@@ -90,9 +95,9 @@
  *
  * All of which is enough to compute an amount of extra data that is required
  * to be safe.  To avoid problems at the block level allocating 5 extra bytes
- * per 32767 bytes of data is sufficient.  To avoind problems internal to a block
- * adding an extra 32767 bytes (the worst case uncompressed block size) is
- * sufficient, to ensure that in the worst case the decompressed data for
+ * per 32767 bytes of data is sufficient.  To avoind problems internal to a
+ * block adding an extra 32767 bytes (the worst case uncompressed block size)
+ * is sufficient, to ensure that in the worst case the decompressed data for
  * block will stop the byte before the compressed data for a block begins.
  * To avoid problems with the compressed data's meta information an extra 18
  * bytes are needed.  Leading to the formula:
@@ -111,58 +116,66 @@
  * gzip declarations
  */
 
-#define OF(args)  args
-#define STATIC static
+#define OF(args)	args
+#define STATIC		static
 
 #undef memset
 #undef memcpy
-#define memzero(s, n)     memset ((s), 0, (n))
+#define memzero(s, n)	memset((s), 0, (n))
+
+typedef unsigned char	uch;
+typedef unsigned short	ush;
+typedef unsigned long	ulg;
+
+/*
+ * Window size must be at least 32k, and a power of two.