[PATCH] x86-64 merge
commit4fb416f4abe28a060a5a5b6aba60af0924e0f27c
authorAndi Kleen <ak@suse.de>
Mon, 16 Jun 2003 03:10:50 +0000 (15 20:10 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Mon, 16 Jun 2003 03:10:50 +0000 (15 20:10 -0700)
treed70c25295725e7a9ca00a907b3281a1db0ad89b7
parent571d4a87234210727052104ed931f3ef3fcb9df6
[PATCH] x86-64 merge

Lots of small fixes and I merged the PCI subsystem with i386 again
because it was mostly identical. This makes the patch quite big,
but it only removes files.

 - Merge PCI subsystem with i386.

   This changes the initialization order of PCI and IOMMU slightly.  It
   didn't see any problems yet, but it could cause some in theory.  It
   re-adds some code that used to be removed, but it's only small stuff
   and it should hopefully cause less mainteance overhead longer term.

 - Fix warnings
 - Merge cpuid.c with i386.c
 - Sync msr.c with i386
 - Consolidate externs in asm/proto.h
 - sysfs/sysdev fixes for apic/nmi (Bryan O'Sullivan)
 - Fix /proc/kcore access
 - Add real kern_addr_valid (used for above).
 - Support consistent dma_mask in IOMMU
 - Fix double print of AMD for CPU model.
 - Remove unused wakeup.S file.
 - Remove obsolete CONFIG_SIMNOW ifdef.
 - Support ptrace access for 32bit vsyscalls.
 - Fix warnings in 32bit boot code compilation.
38 files changed:
arch/x86_64/Makefile
arch/x86_64/ia32/vsyscall.S
arch/x86_64/kernel/Makefile
arch/x86_64/kernel/aperture.c
arch/x86_64/kernel/apic.c
arch/x86_64/kernel/bluesmoke.c
arch/x86_64/kernel/cpuid.c [deleted file]
arch/x86_64/kernel/ldt.c
arch/x86_64/kernel/msr.c
arch/x86_64/kernel/nmi.c
arch/x86_64/kernel/pci-gart.c
arch/x86_64/kernel/pci-nommu.c
arch/x86_64/kernel/process.c
arch/x86_64/kernel/setup.c
arch/x86_64/kernel/signal.c
arch/x86_64/kernel/smpboot.c
arch/x86_64/kernel/time.c
arch/x86_64/kernel/traps.c
arch/x86_64/kernel/wakeup.S [deleted file]
arch/x86_64/lib/delay.c
arch/x86_64/mm/init.c
arch/x86_64/pci/Makefile
arch/x86_64/pci/acpi.c [deleted file]
arch/x86_64/pci/changelog [deleted file]
arch/x86_64/pci/common.c [deleted file]
arch/x86_64/pci/direct.c [deleted file]
arch/x86_64/pci/fixup.c [deleted file]
arch/x86_64/pci/irq.c [deleted file]
arch/x86_64/pci/legacy.c [deleted file]
arch/x86_64/pci/pci.h [deleted file]
arch/x86_64/pci/x86-64.c [deleted file]
include/asm-x86_64/fixmap.h
include/asm-x86_64/io.h
include/asm-x86_64/mmzone.h
include/asm-x86_64/page.h
include/asm-x86_64/pci.h
include/asm-x86_64/pgtable.h
include/asm-x86_64/proto.h