Skip to contentSkip to conversation

x86 updates for v2.6.28, phase #4, x2apic, unify-cpu-detect

GIT PULL Ingo Molnar 2 participants 6 messages Oct 10, 2008 – Oct 11, 2008

Subsystems (13)
Documentation x86 ACPI PCI +9 more subsystems
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-v28-for-linus-phase4 git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase4

x86/x2apic and x86/unify-cpu-detect topics.

out-of-topic modifications in x86-v28-for-linus-phase4:
-------------------------------------------------------
arch/um/sys-x86_64/syscall_table.c # b76d69e: x86_64: uml: fix rename header gu
drivers/pci/Makefile # ad3ad3f: x64, x2apic/intr-remap: parse ioa
drivers/pci/dma_remapping.h # 2ae2101: x64, x2apic/intr-remap: Interrupt

                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/dmar.c                 # 1cb1158: x64, x2apic/intr-remap: disable D
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # fe962e9: x64, x2apic/intr-remap: Queued in
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 2d6b5f8: x64, x2apic/intr-remap: Fix the n
                                   # aaa9d1d: x64, x2apic/intr-remap: use CONFI
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s
                                   # c42d9f3: x64, x2apic/intr-remap: fix the n
                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/intel-iommu.h          # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # fe962e9: x64, x2apic/intr-remap: Queued in
                                   # cf1337f: x64, x2apic/intr-remap: move IOMM
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s
                                   # c42d9f3: x64, x2apic/intr-remap: fix the n
                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/intr_remapping.c       # 75c46fa: x64, x2apic/intr-remap: MSI and M
                                   # 89027d3: x64, x2apic/intr-remap: IO-APIC s
                                   # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa

drivers/pci/intr_remapping.h # 2ae2101: x64, x2apic/intr-remap: Interrupt
# ad3ad3f: x64, x2apic/intr-remap: parse ioa
include/asm-generic/vmlinux.lds.h # 63cc8c7: percpu: introduce DEFINE_PER_CPU_
include/linux/dmar.h # 75c46fa: x64, x2apic/intr-remap: MSI and M

                                   # 89027d3: x64, x2apic/intr-remap: IO-APIC s
                                   # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s
include/linux/ioport.h             # 268364a: IO resources: add reserve_region_
include/linux/irq.h                # 72b1e22: x64, x2apic/intr-remap: generic i
include/linux/percpu.h             # 63cc8c7: percpu: introduce DEFINE_PER_CPU_
kernel/irq/manage.c                # 72b1e22: x64, x2apic/intr-remap: generic i
kernel/resource.c                  # 268364a: IO resources: add reserve_region_

Special mention for the kernel/resource.c change.

Thanks,

Ingo

------------------>
Andi Kleen (1):
x86: drop -funroll-loops for csum_partial_64.c

Andreas Herrmann (2):
x86: pda_init(): fix memory leak when using CPU hotplug
x86: cpu_init(): fix memory leak when using CPU hotplug

Cihula, Joseph (1):
x86, e820: add support for AddressRangeUnusuable ACPI memory type

Cyrill Gorcunov (34):
x86: apic unification - merge down lapic_get_maxlvt
x86: apic unification - merge down enable_NMI_through_LVT0
x86: apic interrupts - move assignments to irqinit_32.c, v2
x86: apic - use SET_APIC_DEST_FIELD instead of hardcoded shift
x86: apic - unify disable_apic_timer
x86: apic - unify __setup_APIC_LVTT
x86: apic - do not clear APIC twice in lapic_shutdown
x86: apic - get rid of local_apic_timer_verify_ok
x86: apic - unify verify_local_APIC
x86: apic - unify sync_Arb_IDs
x86: apic - sync_Arb_IDs style fixup
x86: apic - unify init_bsp_APIC
x86: apic - unify clear_local_APIC
x86: apic - unify lapic_resume
x86: apic - unify lapic_suspend
x86: apic - rearrange functions and comments
x86: apic - unify lapic_is_integrated
x86: apic - unify xapic_icr_read
x86: apic - rearrange maxcpu definition
x86: apic - unify setup_boot_APIC_clock
x86: apic - unify disable_local_APIC
x86: apic - unify lapic_shutdown
x86: apic - unify connect_bsp_APIC
x86: apic - unify lapic_setup_esr
x86: apic - unify __setup_APIC_LVTT
x86: apic - unify disconnect_bsp_APIC
x86: apic - generic_processor_info
x86: apic - unify end_local_APIC_setup
x86: apic - unify local_apic_timer_interrupt
x86: apic - unify apic_set_verbosity
x86: apic - unify disableapic and nolapic setup handlers
x86: apic - rearrange parse_lapic_timer_c2_ok
x86: apic - lapic_resume 32bit - unification fix
x86: apic - compilation warnings fix

Eric Dumazet (1):
percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro

H. Peter Anvin (10):
x86, xsave: add <asm/xcr.h> header file for XCR registers x86, xsave: keep the XSAVE feature mask as an u64
x86: boot: stub out unimplemented CPU feature words
x86: add NOPL as a synthetic CPU feature bit
x86: use X86_FEATURE_NOPL in alternatives
x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>
x86: cpufeature: add Intel features from CPUID and AVX specs
x86: <asm/cpufeature.h>: clean up overlong lines, whitespace
x86: cpufeature: fix SMX flag
x86 setup: handle more than 8 CPU flag words

Hiroshi Shimamoto (2):
x86_32: use apic_ops at print_local_APIC()
x86_64: uml: fix rename header guard

Huang Weiyi (1):
arch/x86/kernel/genx2apic_uv_x.c: Removed duplicated include

Ingo Molnar (11):
x86, xen: fix apic_ops build on UP
x86, lguest: fix apic_ops build on UP x86, cyrix: debug
x86: L3 cache index disable for 2.6.26, cleanups x86 l3 cache index disable for 2 6 26 fix
x86: L3 cache index disable for 2.6.26, fix #2
x86: fix xsave build error
x86: split e820 reserved entries record to late v4
x86: cpu/common*.c, merge whitespaces x86, init_64.c: cleanup
x86: cpuid, fix typo

Jan Beulich (1):
x86-64: add two __cpuinit annotations

Krzysztof Helt (1):
x86: delay early cpu initialization until cpuid is done

Maciej W. Rozycki (1):
x86: PIC, L-APIC and I/O APIC debug information

Mark Langsdorf (2):

      x86: L3 cache index disable for 2.6.26
      x86: L3 cache index disable for 2.6.26

Sheng Yang (2):
x86: move VMX MSRs to msr-index.h
x86: extended "flags" to show virtualization HW feature in /proc/cpuinfo

Suresh Siddha (51):
x64, x2apic/intr-remap: Intel vt-d, IOMMU code reorganization
x64, x2apic/intr-remap: fix the need for sequential array allocation of iommus x64, x2apic/intr-remap: code re-structuring, to be used by both DMA and Interrupt remapping x64, x2apic/intr-remap: use CONFIG_DMAR for DMA-remapping specific code
x64, x2apic/intr-remap: Fix the need for RMRR in the DMA-remapping detection
x64, x2apic/intr-remap: parse ioapic scope under vt-d structures
x64, x2apic/intr-remap: move IOMMU_WAIT_OP() macro to intel-iommu.h
x64, x2apic/intr-remap: Queued invalidation infrastructure (part of VT-d)
x64, x2apic/intr-remap: Interrupt remapping infrastructure
x64, x2apic/intr-remap: routines managing Interrupt remapping table entries.
x64, x2apic/intr-remap: generic irq migration support from process context
x64, x2apic/intr-remap: 8259 specific mask/unmask routines
x64, x2apic/intr-remap: ioapic routines which deal with initial io-apic RTE setup x64, x2apic/intr-remap: introduce read_apic_id() to genapic routines
x64, x2apic/intr-remap: Interrupt-remapping and x2apic support, fix
x64, x2apic/intr-remap: basic apic ops support
x64, x2apic/intr-remap: cpuid bits for x2apic feature
x64, x2apic/intr-remap: disable DMA-remapping if Interrupt-remapping is detected (temporary quirk) x64, x2apic/intr-remap: x2apic ops for x2apic mode support
x64, x2apic/intr-remap: introcude self IPI to genapic routines
x64, x2apic/intr-remap: x2apic cluster mode support
x64, x2apic/intr-remap: setup init_apic_ldr for UV
x64, x2apic/intr-remap: IO-APIC support for interrupt-remapping
x64, x2apic/intr-remap: MSI and MSI-X support for interrupt remapping infrastructure x64, x2apic/intr-remap: add x2apic support, including enabling interrupt-remapping x64, x2apic/intr-remap: support for x2apic physical mode support
x64, x2apic/intr-remap: introduce CONFIG_INTR_REMAP
x64, x2apic/intr-remap: Interrupt-remapping and x2apic support
x2apic: uninline uv_init_apic_ldr()
x2apic: xen64 paravirt basic apic ops
x2apic: kernel-parameter documentation for "x2apic_phys"
x86: let 32bit use apic_ops too - fix
x86: apic_ops for lguest
x86: APIC: Remove apic_write_around(); use alternatives, merge fix
x64, apic: use generic apic_write() for ack_APIC_irq()
x86, xsave: xsave cpuid feature bits
x86, xsave: enable xsave/xrstor on cpus with xsave support
x86, xsave: context switch support using xsave/xrstor
x86, xsave: dynamically allocate sigframes fpstate instead of static allocation x86, xsave: reorganization of signal save/restore fpstate code layout
x86, xsave: xsave/xrstor specific routines
x86, xsave: struct _fpstate extensions to include extended state information
x86, xsave: save/restore the extended state context in sigframe
x86, xsave: update xsave header bits during ptrace fpregs set
x86, xsave: remove the redundant access_ok() in setup_rt_frame()
x86, xsave: clear the user buffer before doing fxsave/xsave
x86, xsave: use BUG_ON() instead of BUILD_BUG_ON()
x86: use cpuid vector 0xb when available for detecting cpu topology
x86: use x2apic id reported by cpuid during topology discovery
x86: use x2apic id reported by cpuid during topology discovery, fix
x86: xsave: restore xcr0 during resume

Thomas Petazzoni (3):
x86: make movsl_mask definition non-CPU specific
x86: move cmpxchg fallbacks to a generic place
x86: configuration options to compile out x86 CPU support code

Yinghai Lu (61):
x86: let 32bit use apic_ops too
x86: mach_apicdef.h need to include before smp.h
x86: make read_apic_id return final apicid
x86: make 64bit have get_apic_id
x86: let 32bit use apic_ops too - fix
x86: add apic probe for genapic 64bit, v2
x86: move declaring x2apic_extra_bits
x86: add setup_ioapic_ids for numaq in x86_quirks
x86: mach-bigsmp to bigsmp
x86: mach_es7000 to es7000
x86: mach_summit to summit
x86: mach-numaq to numaq
x86: add apic probe for genapic 64bit - fix
x86: apic - unify lapic_resume - fix
x86: fix apic version warning
x86: move dir es7000 to es7000_32.c
x86: split e820 reserved entries record to late v2
IO resources: add reserve_region_with_split()
x86: split e820 reserved entries record to late, v7
x86: unify using pci_mmcfg_insert_resource
x86: move mtrr cpu cap setting early in early_init_xxxx
x86: make (early)_identify_cpu more the same between 32bit and 64 bit
x86: order functions in cpu/common.c and cpu/common_64.c v2
x86: remove cpu_vendor_dev
x86: make 32bit support show_msr like 64 bit
x86: make get_mode_name of 64bit the same as 32bit
x86: move 32bit related functions together
x86: make detect_ht depend on CONFIG_X86_HT
x86: make header file the same in arch/x86/kernel/cpu/common_xx.c
x86: same gdt_page with macro
x86: cpu/common.c, let 64-bit code have 32-bit only functions
x86: cpu/common*.c, make 32-bit have 64-bit only functions
x86: cpu/common*.c have same cpu_init(), with copying and #ifdef
x86: cpu/common*.c, merge switch_to_new_gdt()
x86: cpu/common.c, merge default_init()
x86: cpu/common*.c, merge display_cacheinfo()
x86: cpu/common*.c, merge detect_ht()
x86: cpu/common.c: merge get_cpu_cap()
x86: cpu/common*.c, merge early_identify_cpu()
x86: cpu/common*.c: merge print_cpu_info()
x86: cpu/common*.c, merge generic_identify()
x86: cpu/common*.c, merge identify_cpu()
x86: use cpu/common.c on 64 bit
x86: move nonx_setup etc from common.c to init_64.c
x86: remove duplicated get_model_name() calling
x86, cpu init: call early_init_xxx in init_xxx
x86: cpu make amd.c more like amd_64.c v2
x86: remove duplicated force_mwait
x86: add srat_detect_node for amd64
x86: merge header in amd_64.c
x86: make amd.c have 64bit support code
x86: make amd_64 have 32 bit code
x86: make 64 bit to use amd.c
x86: little clean up of intel.c/intel_64.c
x86: make intel.c have 64-bit support code
x86: make intel_64.c the same as intel.c
x86: let intel 64-bit use intel.c
x86: intel.c put workaround for old cpus together
x86: centaur_64.c remove duplicated setting of CONSTANT_TSC
x86: identify_cpu_without_cpuid v2
x86: move transmeta cap read to early_init_transmeta()

 Documentation/kernel-parameters.txt                |    6 +
 arch/um/sys-x86_64/syscall_table.c                 |    4 +-
 arch/x86/Kconfig                                   |    8 +
 arch/x86/Kconfig.cpu                               |   54 ++
 arch/x86/boot/cpu.c                                |   17 +-
 arch/x86/boot/mkcpustr.c                           |   40 +-
 arch/x86/ia32/ia32_signal.c                        |   51 +-
 arch/x86/kernel/Makefile                           |    5 +-
 arch/x86/kernel/acpi/boot.c                        |    8 +-
 arch/x86/kernel/apic_32.c                          |  437 +++++----
 arch/x86/kernel/apic_64.c                          |  626 +++++++++++--
 arch/x86/kernel/cpu/Makefile                       |   34 +-
 arch/x86/kernel/cpu/addon_cpuid_features.c         |   88 ++
 arch/x86/kernel/cpu/amd.c                          |  548 ++++++++----
 arch/x86/kernel/cpu/amd_64.c                       |  224 -----
 arch/x86/kernel/cpu/centaur.c                      |    4 +-
 arch/x86/kernel/cpu/centaur_64.c                   |    6 +-
 arch/x86/kernel/cpu/cmpxchg.c                      |   72 ++
 arch/x86/kernel/cpu/common.c                       |  971 ++++++++++++++------
 arch/x86/kernel/cpu/common_64.c                    |  763 ---------------
 arch/x86/kernel/cpu/cpu.h                          |   19 +-
 arch/x86/kernel/cpu/cyrix.c                        |   23 +-
 arch/x86/kernel/cpu/feature_names.c                |   84 --
 arch/x86/kernel/cpu/intel.c                        |  364 ++++----
 arch/x86/kernel/cpu/intel_64.c                     |   95 --
 arch/x86/kernel/cpu/intel_cacheinfo.c              |  169 +++-
 arch/x86/kernel/cpu/mcheck/mce_64.c                |    2 +-
 arch/x86/kernel/cpu/mkcapflags.pl                  |   32 +
 arch/x86/kernel/cpu/powerflags.c                   |   20 +
 arch/x86/kernel/cpu/transmeta.c                    |   32 +-
 arch/x86/kernel/cpu/umc.c                          |    3 +-
 arch/x86/kernel/e820.c                             |   28 +-
 .../es7000plat.c => kernel/es7000_32.c}            |   87 ++-
 arch/x86/kernel/genapic_64.c                       |   88 +--
 arch/x86/kernel/genapic_flat_64.c                  |   62 ++-
 arch/x86/kernel/genx2apic_cluster.c                |  159 ++++
 arch/x86/kernel/genx2apic_phys.c                   |  154 +++
 arch/x86/kernel/genx2apic_uv_x.c                   |   70 ++-
 arch/x86/kernel/i387.c                             |  154 +++-
 arch/x86/kernel/i8259.c                            |   24 +
 arch/x86/kernel/io_apic_32.c                       |   47 +-
 arch/x86/kernel/io_apic_64.c                       |  639 ++++++++++++-
 arch/x86/kernel/irqinit_32.c                       |   49 +
 arch/x86/kernel/mpparse.c                          |    2 +
 arch/x86/kernel/numaq_32.c                         |    7 +
 arch/x86/kernel/paravirt.c                         |    2 -
 arch/x86/kernel/process.c                          |    1 -
 arch/x86/kernel/setup.c                            |    2 +
 arch/x86/kernel/sigframe.h                         |   14 +-
 arch/x86/kernel/signal_32.c                        |   45 +-
 arch/x86/kernel/signal_64.c                        |   95 +--
 arch/x86/kernel/smpboot.c                          |   38 +-
 arch/x86/kernel/summit_32.c                        |    2 +-
 arch/x86/kernel/traps_32.c                         |    1 -
 arch/x86/kernel/traps_64.c                         |    6 +-
 arch/x86/kernel/vmi_32.c                           |    4 +-
 arch/x86/kernel/vmlinux_32.lds.S                   |    9 +-
 arch/x86/kernel/vmlinux_64.lds.S                   |    9 +-
 arch/x86/kernel/xsave.c                            |  316 +++++++
 arch/x86/kvm/vmx.h                                 |   15 -
 arch/x86/lguest/boot.c                             |   38 +-
 arch/x86/lib/Makefile                              |    3 -
 arch/x86/lib/usercopy_32.c                         |    7 +
 arch/x86/mach-default/setup.c                      |   15 -
 arch/x86/mach-es7000/Makefile                      |    5 -
 arch/x86/mach-es7000/es7000.h                      |  114 ---
 arch/x86/mach-generic/Makefile                     |    1 -
 arch/x86/mach-generic/bigsmp.c                     |    9 +-
 arch/x86/mach-generic/es7000.c                     |   13 +-
 arch/x86/mach-generic/numaq.c                      |   12 +-
 arch/x86/mach-generic/summit.c                     |   11 +-
 arch/x86/mm/init_64.c                              |   56 ++
 arch/x86/pci/acpi.c                                |    5 -
 arch/x86/pci/i386.c                                |    3 +
 arch/x86/pci/mmconfig-shared.c                     |   12 +-
 arch/x86/power/cpu_32.c                            |    7 +
 arch/x86/power/cpu_64.c                            |    7 +
 arch/x86/xen/enlighten.c                           |   45 +-
 drivers/pci/Makefile                               |    2 +
 drivers/pci/dma_remapping.h                        |  157 ++++
 drivers/pci/dmar.c                                 |  397 ++++++++-
 drivers/pci/intel-iommu.c                          |  185 +----
 drivers/pci/intel-iommu.h                          |  233 ++---
 drivers/pci/intr_remapping.c                       |  471 ++++++++++
 drivers/pci/intr_remapping.h                       |    8 +
 include/asm-generic/vmlinux.lds.h                  |    1 +
 include/asm-x86/apic.h                             |   65 ++-
 include/asm-x86/apicdef.h                          |    3 +
 include/asm-x86/arch_hooks.h                       |    2 -
 .../{mach-bigsmp/mach_apic.h => bigsmp/apic.h}     |   10 +-
 include/asm-x86/bigsmp/apicdef.h                   |   13 +
 .../{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h}       |    6 +-
 include/asm-x86/bugs.h                             |    5 +
 include/asm-x86/cpufeature.h                       |  118 ++-
 include/asm-x86/e820.h                             |    2 +
 .../{mach-es7000/mach_apic.h => es7000/apic.h}     |   32 +-
 include/asm-x86/es7000/apicdef.h                   |   13 +
 .../{mach-es7000/mach_ipi.h => es7000/ipi.h}       |    6 +-
 .../mach_mpparse.h => es7000/mpparse.h}            |    6 +-
 .../mach_wakecpu.h => es7000/wakecpu.h}            |    8 +-
 include/asm-x86/genapic_64.h                       |    8 +
 include/asm-x86/hw_irq.h                           |    3 +-
 include/asm-x86/i387.h                             |   84 ++-
 include/asm-x86/i8259.h                            |    3 +
 include/asm-x86/io_apic.h                          |   20 +
 include/asm-x86/ipi.h                              |   16 +-
 include/asm-x86/irq_remapping.h                    |    8 +
 include/asm-x86/mach-bigsmp/mach_apicdef.h         |   13 -
 include/asm-x86/mach-default/mach_apic.h           |    4 +-
 include/asm-x86/mach-default/mach_apicdef.h        |    6 +-
 include/asm-x86/mach-es7000/mach_apicdef.h         |   13 -
 include/asm-x86/mach-numaq/mach_mpparse.h          |    7 -
 include/asm-x86/mach-summit/mach_apicdef.h         |   13 -
 include/asm-x86/mpspec.h                           |    3 +-
 include/asm-x86/msidef.h                           |    4 +
 include/asm-x86/msr-index.h                        |   16 +
 .../{mach-numaq/mach_apic.h => numaq/apic.h}       |    6 +-
 .../{mach-numaq/mach_apicdef.h => numaq/apicdef.h} |    6 +-
 .../asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} |    6 +-
 include/asm-x86/numaq/mpparse.h                    |    7 +
 .../{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} |    6 +-
 include/asm-x86/paravirt.h                         |   19 -
 include/asm-x86/processor-cyrix.h                  |    8 +
 include/asm-x86/processor-flags.h                  |    1 +
 include/asm-x86/processor.h                        |   27 +-
 include/asm-x86/setup.h                            |    1 +
 include/asm-x86/sigcontext.h                       |   87 ++-
 include/asm-x86/sigcontext32.h                     |    6 +-
 include/asm-x86/smp.h                              |   17 +-
 .../{mach-summit/mach_apic.h => summit/apic.h}     |   24 +-
 include/asm-x86/summit/apicdef.h                   |   13 +
 .../{mach-summit/mach_ipi.h => summit/ipi.h}       |    6 +-
 .../{mach-summit => summit}/irq_vectors_limits.h   |    6 +-
 .../mach_mpparse.h => summit/mpparse.h}            |   13 +-
 include/asm-x86/thread_info.h                      |    1 +
 include/asm-x86/ucontext.h                         |    6 +
 include/asm-x86/xcr.h                              |   49 +
 include/asm-x86/xsave.h                            |  118 +++
 include/linux/dmar.h                               |  127 ++-
 include/linux/ioport.h                             |    3 +
 include/linux/irq.h                                |    1 +
 include/linux/percpu.h                             |    7 +
 kernel/irq/manage.c                                |    9 +-
 kernel/resource.c                                  |   68 ++
 144 files changed, 6627 insertions(+), 3286 deletions(-)
 delete mode 100644 arch/x86/kernel/cpu/amd_64.c
 create mode 100644 arch/x86/kernel/cpu/cmpxchg.c
 delete mode 100644 arch/x86/kernel/cpu/common_64.c
 delete mode 100644 arch/x86/kernel/cpu/feature_names.c
 delete mode 100644 arch/x86/kernel/cpu/intel_64.c
 create mode 100644 arch/x86/kernel/cpu/mkcapflags.pl
 create mode 100644 arch/x86/kernel/cpu/powerflags.c
 rename arch/x86/{mach-es7000/es7000plat.c => kernel/es7000_32.c} (78%)
 create mode 100644 arch/x86/kernel/genx2apic_cluster.c
 create mode 100644 arch/x86/kernel/genx2apic_phys.c
 create mode 100644 arch/x86/kernel/xsave.c
 delete mode 100644 arch/x86/mach-es7000/Makefile
 delete mode 100644 arch/x86/mach-es7000/es7000.h
 create mode 100644 drivers/pci/dma_remapping.h
 create mode 100644 drivers/pci/intr_remapping.c
 create mode 100644 drivers/pci/intr_remapping.h
 rename include/asm-x86/{mach-bigsmp/mach_apic.h => bigsmp/apic.h} (94%)
 create mode 100644 include/asm-x86/bigsmp/apicdef.h
 rename include/asm-x86/{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} (77%)
 rename include/asm-x86/{mach-es7000/mach_apic.h => es7000/apic.h} (91%)
 create mode 100644 include/asm-x86/es7000/apicdef.h
 rename include/asm-x86/{mach-es7000/mach_ipi.h => es7000/ipi.h} (77%)
 rename include/asm-x86/{mach-es7000/mach_mpparse.h => es7000/mpparse.h} (81%)
 rename include/asm-x86/{mach-es7000/mach_wakecpu.h => es7000/wakecpu.h} (89%)
 create mode 100644 include/asm-x86/irq_remapping.h
 delete mode 100644 include/asm-x86/mach-bigsmp/mach_apicdef.h
 delete mode 100644 include/asm-x86/mach-es7000/mach_apicdef.h
 delete mode 100644 include/asm-x86/mach-numaq/mach_mpparse.h
 delete mode 100644 include/asm-x86/mach-summit/mach_apicdef.h
 rename include/asm-x86/{mach-numaq/mach_apic.h => numaq/apic.h} (96%)
 rename include/asm-x86/{mach-numaq/mach_apicdef.h => numaq/apicdef.h} (55%)
 rename include/asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} (77%)
 create mode 100644 include/asm-x86/numaq/mpparse.h
 rename include/asm-x86/{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} (88%)
 rename include/asm-x86/{mach-summit/mach_apic.h => summit/apic.h} (93%)
 create mode 100644 include/asm-x86/summit/apicdef.h
 rename include/asm-x86/{mach-summit/mach_ipi.h => summit/ipi.h} (77%)
 rename include/asm-x86/{mach-summit => summit}/irq_vectors_limits.h (65%)
 rename include/asm-x86/{mach-summit/mach_mpparse.h => summit/mpparse.h} (95%)
 create mode 100644 include/asm-x86/xcr.h
 create mode 100644 include/asm-x86/xsave.h
#1 lore raw
Quoted 5 lines · Ingo Molnar

Linus,

Please pull the latest x86-v28-for-linus-phase4 git tree from:

x86/x2apic and x86/unify-cpu-detect topics.

Linus, please find a new pull request below - relative to x86-v28-for-linus-phase3-B.

I'm double-checking all the new integrations by merging them ontop of the old ones, and it's also being rolling tested.

Ingo

----------------->
Linus,

Please pull the latest x86-v28-for-linus-phase4-B git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase4-B

out-of-topic modifications in x86-v28-for-linus-phase4-B:
---------------------------------------------------------
arch/um/sys-x86_64/syscall_table.c # b76d69e: x86_64: uml: fix rename header gu
drivers/pci/Makefile # ad3ad3f: x64, x2apic/intr-remap: parse ioa
drivers/pci/dma_remapping.h # 2ae2101: x64, x2apic/intr-remap: Interrupt

                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/dmar.c                 # 1cb1158: x64, x2apic/intr-remap: disable D
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # fe962e9: x64, x2apic/intr-remap: Queued in
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 2d6b5f8: x64, x2apic/intr-remap: Fix the n
                                   # aaa9d1d: x64, x2apic/intr-remap: use CONFI
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s
                                   # c42d9f3: x64, x2apic/intr-remap: fix the n
                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/intel-iommu.h          # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # fe962e9: x64, x2apic/intr-remap: Queued in
                                   # cf1337f: x64, x2apic/intr-remap: move IOMM
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s
                                   # c42d9f3: x64, x2apic/intr-remap: fix the n
                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/intr_remapping.c       # 75c46fa: x64, x2apic/intr-remap: MSI and M
                                   # 89027d3: x64, x2apic/intr-remap: IO-APIC s
                                   # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
drivers/pci/intr_remapping.h       # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
include/linux/dmar.h               # 75c46fa: x64, x2apic/intr-remap: MSI and M
                                   # 89027d3: x64, x2apic/intr-remap: IO-APIC s
                                   # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s

include/linux/irq.h # 72b1e22: x64, x2apic/intr-remap: generic i
kernel/irq/manage.c # 72b1e22: x64, x2apic/intr-remap: generic i

Thanks,

Ingo

------------------>
Andreas Herrmann (2):
x86: pda_init(): fix memory leak when using CPU hotplug
x86: cpu_init(): fix memory leak when using CPU hotplug

Cyrill Gorcunov (34):
x86: apic unification - merge down lapic_get_maxlvt
x86: apic unification - merge down enable_NMI_through_LVT0
x86: apic interrupts - move assignments to irqinit_32.c, v2
x86: apic - use SET_APIC_DEST_FIELD instead of hardcoded shift
x86: apic - unify disable_apic_timer
x86: apic - unify __setup_APIC_LVTT
x86: apic - do not clear APIC twice in lapic_shutdown
x86: apic - get rid of local_apic_timer_verify_ok
x86: apic - unify verify_local_APIC
x86: apic - unify sync_Arb_IDs
x86: apic - sync_Arb_IDs style fixup
x86: apic - unify init_bsp_APIC
x86: apic - unify clear_local_APIC
x86: apic - unify lapic_resume
x86: apic - unify lapic_suspend
x86: apic - rearrange functions and comments
x86: apic - unify lapic_is_integrated
x86: apic - unify xapic_icr_read
x86: apic - rearrange maxcpu definition
x86: apic - unify setup_boot_APIC_clock
x86: apic - unify disable_local_APIC
x86: apic - unify lapic_shutdown
x86: apic - unify connect_bsp_APIC
x86: apic - unify lapic_setup_esr
x86: apic - unify __setup_APIC_LVTT
x86: apic - unify disconnect_bsp_APIC
x86: apic - generic_processor_info
x86: apic - unify end_local_APIC_setup
x86: apic - unify local_apic_timer_interrupt
x86: apic - unify apic_set_verbosity
x86: apic - unify disableapic and nolapic setup handlers
x86: apic - rearrange parse_lapic_timer_c2_ok
x86: apic - lapic_resume 32bit - unification fix
x86: apic - compilation warnings fix

Hiroshi Shimamoto (2):
x86_32: use apic_ops at print_local_APIC()
x86_64: uml: fix rename header guard

Huang Weiyi (1):
arch/x86/kernel/genx2apic_uv_x.c: Removed duplicated include

Ingo Molnar (2):
x86, xen: fix apic_ops build on UP
x86, lguest: fix apic_ops build on UP

Maciej W. Rozycki (1):
x86: PIC, L-APIC and I/O APIC debug information

Suresh Siddha (35):
x64, x2apic/intr-remap: Intel vt-d, IOMMU code reorganization
x64, x2apic/intr-remap: fix the need for sequential array allocation of iommus x64, x2apic/intr-remap: code re-structuring, to be used by both DMA and Interrupt remapping x64, x2apic/intr-remap: use CONFIG_DMAR for DMA-remapping specific code
x64, x2apic/intr-remap: Fix the need for RMRR in the DMA-remapping detection
x64, x2apic/intr-remap: parse ioapic scope under vt-d structures
x64, x2apic/intr-remap: move IOMMU_WAIT_OP() macro to intel-iommu.h
x64, x2apic/intr-remap: Queued invalidation infrastructure (part of VT-d)
x64, x2apic/intr-remap: Interrupt remapping infrastructure
x64, x2apic/intr-remap: routines managing Interrupt remapping table entries.
x64, x2apic/intr-remap: generic irq migration support from process context
x64, x2apic/intr-remap: 8259 specific mask/unmask routines
x64, x2apic/intr-remap: ioapic routines which deal with initial io-apic RTE setup x64, x2apic/intr-remap: introduce read_apic_id() to genapic routines
x64, x2apic/intr-remap: Interrupt-remapping and x2apic support, fix
x64, x2apic/intr-remap: basic apic ops support
x64, x2apic/intr-remap: cpuid bits for x2apic feature
x64, x2apic/intr-remap: disable DMA-remapping if Interrupt-remapping is detected (temporary quirk) x64, x2apic/intr-remap: x2apic ops for x2apic mode support
x64, x2apic/intr-remap: introcude self IPI to genapic routines
x64, x2apic/intr-remap: x2apic cluster mode support
x64, x2apic/intr-remap: setup init_apic_ldr for UV
x64, x2apic/intr-remap: IO-APIC support for interrupt-remapping
x64, x2apic/intr-remap: MSI and MSI-X support for interrupt remapping infrastructure x64, x2apic/intr-remap: add x2apic support, including enabling interrupt-remapping x64, x2apic/intr-remap: support for x2apic physical mode support
x64, x2apic/intr-remap: introduce CONFIG_INTR_REMAP
x64, x2apic/intr-remap: Interrupt-remapping and x2apic support
x2apic: uninline uv_init_apic_ldr()
x2apic: xen64 paravirt basic apic ops
x2apic: kernel-parameter documentation for "x2apic_phys"
x86: let 32bit use apic_ops too - fix
x86: apic_ops for lguest
x86: APIC: Remove apic_write_around(); use alternatives, merge fix
x64, apic: use generic apic_write() for ack_APIC_irq()

Yinghai Lu (15):
x86: let 32bit use apic_ops too
x86: mach_apicdef.h need to include before smp.h
x86: make read_apic_id return final apicid
x86: make 64bit have get_apic_id
x86: let 32bit use apic_ops too - fix
x86: add apic probe for genapic 64bit, v2
x86: move declaring x2apic_extra_bits
x86: add setup_ioapic_ids for numaq in x86_quirks
x86: mach-bigsmp to bigsmp
x86: mach_es7000 to es7000
x86: mach_summit to summit
x86: mach-numaq to numaq
x86: add apic probe for genapic 64bit - fix
x86: apic - unify lapic_resume - fix
x86: fix apic version warning

 Documentation/kernel-parameters.txt                |    6 +
 arch/um/sys-x86_64/syscall_table.c                 |    4 +-
 arch/x86/Kconfig                                   |    8 +
 arch/x86/{mach-es7000 => es7000}/Makefile          |    0
 arch/x86/{mach-es7000 => es7000}/es7000.h          |   18 +-
 arch/x86/{mach-es7000 => es7000}/es7000plat.c      |    2 +-
 arch/x86/kernel/Makefile                           |    2 +
 arch/x86/kernel/acpi/boot.c                        |    8 +-
 arch/x86/kernel/apic_32.c                          |  437 ++++++++------
 arch/x86/kernel/apic_64.c                          |  626 +++++++++++++++++---
 arch/x86/kernel/cpu/common_64.c                    |    2 +
 arch/x86/kernel/cpu/feature_names.c                |    2 +-
 arch/x86/kernel/genapic_64.c                       |   88 +--
 arch/x86/kernel/genapic_flat_64.c                  |   62 ++-
 arch/x86/kernel/genx2apic_cluster.c                |  164 +++++
 arch/x86/kernel/genx2apic_phys.c                   |  159 +++++
 arch/x86/kernel/genx2apic_uv_x.c                   |   70 ++-
 arch/x86/kernel/i8259.c                            |   24 +
 arch/x86/kernel/io_apic_32.c                       |   47 +-
 arch/x86/kernel/io_apic_64.c                       |  639 ++++++++++++++++++--
 arch/x86/kernel/irqinit_32.c                       |   49 ++
 arch/x86/kernel/mpparse.c                          |    2 +
 arch/x86/kernel/numaq_32.c                         |    7 +
 arch/x86/kernel/paravirt.c                         |    2 -
 arch/x86/kernel/setup.c                            |    2 +
 arch/x86/kernel/smpboot.c                          |   38 +-
 arch/x86/kernel/summit_32.c                        |    2 +-
 arch/x86/kernel/vmi_32.c                           |    4 +-
 arch/x86/lguest/boot.c                             |   38 +-
 arch/x86/mach-default/setup.c                      |   15 -
 arch/x86/mach-generic/Makefile                     |    2 +-
 arch/x86/mach-generic/bigsmp.c                     |    9 +-
 arch/x86/mach-generic/es7000.c                     |   13 +-
 arch/x86/mach-generic/numaq.c                      |   12 +-
 arch/x86/mach-generic/summit.c                     |   11 +-
 arch/x86/pci/acpi.c                                |    5 -
 arch/x86/xen/enlighten.c                           |   45 ++-
 drivers/pci/Makefile                               |    2 +
 drivers/pci/dma_remapping.h                        |  157 +++++
 drivers/pci/dmar.c                                 |  397 ++++++++++++-
 drivers/pci/intel-iommu.c                          |  185 +-----
 drivers/pci/intel-iommu.h                          |  233 +++----
 drivers/pci/intr_remapping.c                       |  471 ++++++++++++++
 drivers/pci/intr_remapping.h                       |    8 +
 include/asm-x86/apic.h                             |   65 ++-
 include/asm-x86/apicdef.h                          |    3 +
 include/asm-x86/arch_hooks.h                       |    2 -
 .../{mach-bigsmp/mach_apic.h => bigsmp/apic.h}     |   10 +-
 include/asm-x86/bigsmp/apicdef.h                   |   13 +
 .../{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h}       |    6 +-
 include/asm-x86/cpufeature.h                       |    2 +
 include/asm-x86/dma-mapping.h                      |    1 +
 .../{mach-es7000/mach_apic.h => es7000/apic.h}     |   32 +-
 include/asm-x86/es7000/apicdef.h                   |   13 +
 .../{mach-es7000/mach_ipi.h => es7000/ipi.h}       |    6 +-
 .../mach_mpparse.h => es7000/mpparse.h}            |    6 +-
 .../mach_wakecpu.h => es7000/wakecpu.h}            |    8 +-
 include/asm-x86/genapic_64.h                       |    8 +
 include/asm-x86/hw_irq.h                           |    3 +-
 include/asm-x86/i8259.h                            |    3 +
 include/asm-x86/io_apic.h                          |   20 +
 include/asm-x86/ipi.h                              |   16 +-
 include/asm-x86/irq_remapping.h                    |    8 +
 include/asm-x86/mach-bigsmp/mach_apicdef.h         |   13 -
 include/asm-x86/mach-default/mach_apic.h           |    4 +-
 include/asm-x86/mach-default/mach_apicdef.h        |    6 +-
 include/asm-x86/mach-es7000/mach_apicdef.h         |   13 -
 include/asm-x86/mach-numaq/mach_mpparse.h          |    7 -
 include/asm-x86/mach-summit/mach_apicdef.h         |   13 -
 include/asm-x86/mpspec.h                           |    3 +-
 include/asm-x86/msidef.h                           |    4 +
 .../{mach-numaq/mach_apic.h => numaq/apic.h}       |    6 +-
 .../{mach-numaq/mach_apicdef.h => numaq/apicdef.h} |    6 +-
 .../asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} |    6 +-
 include/asm-x86/numaq/mpparse.h                    |    7 +
 .../{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} |    6 +-
 include/asm-x86/paravirt.h                         |   19 -
 include/asm-x86/setup.h                            |    1 +
 include/asm-x86/smp.h                              |   17 +-
 .../{mach-summit/mach_apic.h => summit/apic.h}     |   24 +-
 include/asm-x86/summit/apicdef.h                   |   13 +
 .../{mach-summit/mach_ipi.h => summit/ipi.h}       |    6 +-
 .../{mach-summit => summit}/irq_vectors_limits.h   |    6 +-
 .../mach_mpparse.h => summit/mpparse.h}            |   13 +-
 include/linux/dmar.h                               |  127 +++-
 include/linux/irq.h                                |    1 +
 kernel/irq/manage.c                                |    9 +-
 87 files changed, 3636 insertions(+), 996 deletions(-)
 rename arch/x86/{mach-es7000 => es7000}/Makefile (100%)
 rename arch/x86/{mach-es7000 => es7000}/es7000.h (89%)
 rename arch/x86/{mach-es7000 => es7000}/es7000plat.c (99%)
 create mode 100644 arch/x86/kernel/genx2apic_cluster.c
 create mode 100644 arch/x86/kernel/genx2apic_phys.c
 create mode 100644 drivers/pci/dma_remapping.h
 create mode 100644 drivers/pci/intr_remapping.c
 create mode 100644 drivers/pci/intr_remapping.h
 rename include/asm-x86/{mach-bigsmp/mach_apic.h => bigsmp/apic.h} (94%)
 create mode 100644 include/asm-x86/bigsmp/apicdef.h
 rename include/asm-x86/{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} (77%)
 rename include/asm-x86/{mach-es7000/mach_apic.h => es7000/apic.h} (91%)
 create mode 100644 include/asm-x86/es7000/apicdef.h
 rename include/asm-x86/{mach-es7000/mach_ipi.h => es7000/ipi.h} (77%)
 rename include/asm-x86/{mach-es7000/mach_mpparse.h => es7000/mpparse.h} (81%)
 rename include/asm-x86/{mach-es7000/mach_wakecpu.h => es7000/wakecpu.h} (89%)
 create mode 100644 include/asm-x86/irq_remapping.h
 delete mode 100644 include/asm-x86/mach-bigsmp/mach_apicdef.h
 delete mode 100644 include/asm-x86/mach-es7000/mach_apicdef.h
 delete mode 100644 include/asm-x86/mach-numaq/mach_mpparse.h
 delete mode 100644 include/asm-x86/mach-summit/mach_apicdef.h
 rename include/asm-x86/{mach-numaq/mach_apic.h => numaq/apic.h} (96%)
 rename include/asm-x86/{mach-numaq/mach_apicdef.h => numaq/apicdef.h} (55%)
 rename include/asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} (77%)
 create mode 100644 include/asm-x86/numaq/mpparse.h
 rename include/asm-x86/{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} (88%)
 rename include/asm-x86/{mach-summit/mach_apic.h => summit/apic.h} (93%)
 create mode 100644 include/asm-x86/summit/apicdef.h
 rename include/asm-x86/{mach-summit/mach_ipi.h => summit/ipi.h} (77%)
 rename include/asm-x86/{mach-summit => summit}/irq_vectors_limits.h (65%)
 rename include/asm-x86/{mach-summit/mach_mpparse.h => summit/mpparse.h} (95%)
Documentation/kernel-parameters.txt +6 -0
index a2701cb..c5d891f 100644
@@ -1424,6 +1424,12 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.
 
+	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.
+
+	x2apic_phys	[X86-64,APIC] Use x2apic physical mode instead of
+			default x2apic cluster mode on platforms
+			supporting x2apic.
+
 	noltlbs		[PPC] Do not use large page/tlb entries for kernel
 			lowmem mapping on PPC40x.
 
arch/um/sys-x86_64/syscall_table.c +2 -2
index c128eb8..32f5fbe 100644
@@ -41,12 +41,12 @@
 #define stub_rt_sigreturn sys_rt_sigreturn
 
 #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
-#undef _ASM_X86_64_UNISTD_H_
+#undef ASM_X86__UNISTD_64_H
 #include <asm-x86/unistd_64.h>
 
 #undef __SYSCALL
 #define __SYSCALL(nr, sym) [ nr ] = sym,
-#undef _ASM_X86_64_UNISTD_H_
+#undef ASM_X86__UNISTD_64_H
 
 typedef void (*sys_call_ptr_t)(void);
 
arch/x86/Kconfig +8 -0
index 0d7cdbb..44d4f21 100644
@@ -1689,6 +1689,14 @@ config DMAR_FLOPPY_WA
 	 workaround will setup a 1:1 mapping for the first
 	 16M to make floppy (an ISA device) work.
 
+config INTR_REMAP
+	bool "Support for Interrupt Remapping (EXPERIMENTAL)"
+	depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
+	help
+	 Supports Interrupt remapping for IO-APIC and MSI devices.
+	 To use x2apic mode in the CPU's which support x2APIC enhancements or
+	 to support platforms with CPU's having > 8 bit APIC ID, say Y.
+
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"
arch/x86/es7000/Makefile renamed from arch/x86/mach-es7000/Makefile +0 -0
similarity index 100%
rename from arch/x86/mach-es7000/Makefile
rename to arch/x86/es7000/Makefile
arch/x86/es7000/es7000.h renamed from arch/x86/mach-es7000/es7000.h +9 -9
similarity index 89%
rename from arch/x86/mach-es7000/es7000.h
rename to arch/x86/es7000/es7000.h
index c8d5aa1..4e62f6f 100644
@@ -1,7 +1,7 @@
 /*
  * Written by: Garry Forsgren, Unisys Corporation
  *             Natalie Protasevich, Unisys Corporation
- * This file contains the code to configure and interface 
+ * This file contains the code to configure and interface
  * with Unisys ES7000 series hardware system manager.
  *
  * Copyright (c) 2003 Unisys Corporation.  All Rights Reserved.
@@ -18,7 +18,7 @@
  * with this program; if not, write the Free Software Foundation, Inc., 59
  * Temple Place - Suite 330, Boston MA 02111-1307, USA.
  *
- * Contact information: Unisys Corporation, Township Line & Union Meeting 
+ * Contact information: Unisys Corporation, Township Line & Union Meeting
  * Roads-A, Unisys Way, Blue Bell, Pennsylvania, 19424, or:
  *
  * http://www.unisys.com
@@ -41,7 +41,7 @@
 #define	MIP_VALID		0x0100000000000000ULL
 #define	MIP_PORT(VALUE)	((VALUE >> 32) & 0xffff)
 
-#define	MIP_RD_LO(VALUE)	(VALUE & 0xffffffff)   
+#define	MIP_RD_LO(VALUE)	(VALUE & 0xffffffff)
 
 struct mip_reg_info {
 	unsigned long long mip_info;
@@ -51,11 +51,11 @@ struct mip_reg_info {
 };
 
 struct part_info {
-	unsigned char type;   
+	unsigned char type;
 	unsigned char length;
 	unsigned char part_id;
 	unsigned char apic_mode;
-	unsigned long snum;    
+	unsigned long snum;
 	char ptype[16];
 	char sname[64];
 	char pname[64];
@@ -68,11 +68,11 @@ struct psai {
 };
 
 struct es7000_mem_info {
-	unsigned char type;   
+	unsigned char type;
 	unsigned char length;
 	unsigned char resv[6];
-	unsigned long long  start; 
-	unsigned long long  size; 
+	unsigned long long  start;
+	unsigned long long  size;
 };
 
 struct es7000_oem_table {
@@ -106,7 +106,7 @@ struct mip_reg {
 };
 
 #define	MIP_SW_APIC		0x1020b
-#define	MIP_FUNC(VALUE) 	(VALUE & 0xff)
+#define	MIP_FUNC(VALUE)		(VALUE & 0xff)
 
 extern int parse_unisys_oem (char *oemptr);
 extern void setup_unisys(void);
arch/x86/es7000/es7000plat.c renamed from arch/x86/mach-es7000/es7000plat.c +1 -1
similarity index 99%
rename from arch/x86/mach-es7000/es7000plat.c
rename to arch/x86/es7000/es7000plat.c
index 50189af..7789fde 100644
@@ -72,7 +72,7 @@ es7000_rename_gsi(int ioapic, int gsi)
 			base += nr_ioapic_registers[i];
 	}
 
-	if (!ioapic && (gsi < 16)) 
+	if (!ioapic && (gsi < 16))
 		gsi += base;
 	return gsi;
 }
arch/x86/kernel/Makefile +2 -0
index 3db651f..a07ec14 100644
@@ -104,6 +104,8 @@ obj-$(CONFIG_OLPC)		+= olpc.o
 ifeq ($(CONFIG_X86_64),y)
         obj-y				+= genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o
 	obj-y				+= bios_uv.o
+        obj-y				+= genx2apic_cluster.o
+        obj-y				+= genx2apic_phys.o
         obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
         obj-$(CONFIG_AUDIT)		+= audit_64.o
 
arch/x86/kernel/acpi/boot.c +3 -5
index 7d40ef7..c2ac1b4 100644
@@ -252,10 +252,8 @@ static void __cpuinit acpi_register_lapic(int id, u8 enabled)
 		return;
 	}
 
-#ifdef CONFIG_X86_32
 	if (boot_cpu_physical_apicid != -1U)
 		ver = apic_version[boot_cpu_physical_apicid];
-#endif
 
 	generic_processor_info(id, ver);
 }
@@ -774,11 +772,9 @@ static void __init acpi_register_lapic_address(unsigned long address)
 
 	set_fixmap_nocache(FIX_APIC_BASE, address);
 	if (boot_cpu_physical_apicid == -1U) {
-		boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());
-#ifdef CONFIG_X86_32
+		boot_cpu_physical_apicid  = read_apic_id();
 		apic_version[boot_cpu_physical_apicid] =
 			 GET_APIC_VERSION(apic_read(APIC_LVR));
-#endif
 	}
 }
 
@@ -1350,7 +1346,9 @@ static void __init acpi_process_madt(void)
 				acpi_ioapic = 1;
 
 				smp_found_config = 1;
+#ifdef CONFIG_X86_32
 				setup_apic_routing();
+#endif
 			}
 		}
 		if (error == -EINVAL) {
arch/x86/kernel/apic_32.c +253 -184

787 lines not on this page · raw message

arch/x86/kernel/apic_64.c +540 -86

982 lines not on this page · raw message

arch/x86/kernel/cpu/common_64.c +2 -0
index 305b465..43f1aa5 100644
@@ -687,6 +687,8 @@ void __cpuinit cpu_init(void)
 	barrier();
 
 	check_efer();
+	if (cpu != 0 && x2apic)
+		enable_x2apic();
 
 	/*
 	 * set up and load the per-CPU TSS
arch/x86/kernel/cpu/feature_names.c +1 -1
index c901779..b96b695 100644
@@ -46,7 +46,7 @@ const char * const x86_cap_flags[NCAPINTS*32] = {
 	/* Intel-defined (#2) */
 	"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
 	"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
-	NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",
+	NULL, NULL, "dca", "sse4_1", "sse4_2", "x2apic", NULL, "popcnt",
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 
 	/* VIA/Cyrix/Centaur-defined */
arch/x86/kernel/genapic_64.c +32 -56

119 lines not on this page · raw message

arch/x86/kernel/genapic_flat_64.c +61 -1

111 lines not on this page · raw message

arch/x86/kernel/genx2apic_cluster.c new file +164 -0

164 lines not on this page · raw message

arch/x86/kernel/genx2apic_phys.c new file +159 -0

159 lines not on this page · raw message

arch/x86/kernel/genx2apic_uv_x.c +68 -2

121 lines not on this page · raw message

arch/x86/kernel/i8259.c +24 -0
index dc92b49..4b8a53d 100644
@@ -282,6 +282,30 @@ static int __init i8259A_init_sysfs(void)
 
 device_initcall(i8259A_init_sysfs);
 
+void mask_8259A(void)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&i8259A_lock, flags);
+
+	outb(0xff, PIC_MASTER_IMR);	/* mask all of 8259A-1 */
+	outb(0xff, PIC_SLAVE_IMR);	/* mask all of 8259A-2 */
+
+	spin_unlock_irqrestore(&i8259A_lock, flags);
+}
+
+void unmask_8259A(void)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&i8259A_lock, flags);
+
+	outb(cached_master_mask, PIC_MASTER_IMR); /* restore master IRQ mask */
+	outb(cached_slave_mask, PIC_SLAVE_IMR);	  /* restore slave IRQ mask */
+
+	spin_unlock_irqrestore(&i8259A_lock, flags);
+}
+
 void init_8259A(int auto_eoi)
 {
 	unsigned long flags;
arch/x86/kernel/io_apic_32.c +27 -20

124 lines not on this page · raw message

arch/x86/kernel/io_apic_64.c +591 -48

241 lines not on this page · raw message

arch/x86/kernel/irqinit_32.c +49 -0

49 lines not on this page · raw message

arch/x86/kernel/mpparse.c +2 -0
index b3fb430..f98f4e1 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/numaq_32.c +7 -0
index eecc8c1..4caff39 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/paravirt.c +0 -2
index e2f4376..6b0bb73 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/setup.c +2 -0
index 141efab..46c98ef 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/smpboot.c +19 -19
index 45531e3..2ff0bbc 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/summit_32.c +1 -1
index d67ce5f..7b98785 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/vmi_32.c +2 -2
index 8c9ad02..8b6c393 100644

Lines of this file are not shown. View the raw message.

arch/x86/lguest/boot.c +34 -4
index d9249a8..65f0b8a 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-default/setup.c +0 -15
index 3f2cf11..37b9ae4 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/Makefile +1 -1
index 0dbd780..4706de7 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/bigsmp.c +4 -5
index 59d7717..df37fc9 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/es7000.c +6 -7
index 4742626..520cca0 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/numaq.c +6 -6
index 8091e68..8cf5839 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/summit.c +5 -6
index a97ea0f..6ad6b67 100644

Lines of this file are not shown. View the raw message.

arch/x86/pci/acpi.c +0 -5
index 19af069..1d88d2b 100644

Lines of this file are not shown. View the raw message.

arch/x86/xen/enlighten.c +41 -4

45 lines not on this page · raw message

drivers/pci/Makefile +2 -0
index 7d63f8c..4b47f4e 100644

Lines of this file are not shown. View the raw message.

drivers/pci/dma_remapping.h new file +157 -0

157 lines not on this page · raw message

drivers/pci/dmar.c +378 -19

397 lines not on this page · raw message

drivers/pci/intel-iommu.c +25 -160

185 lines not on this page · raw message

drivers/pci/intel-iommu.h +98 -135

233 lines not on this page · raw message

drivers/pci/intr_remapping.c new file +471 -0

471 lines not on this page · raw message

drivers/pci/intr_remapping.h new file +8 -0
new file mode 100644
index 0000000..05f2635

Lines of this file are not shown. View the raw message.

include/asm-x86/apic.h +59 -6

65 lines not on this page · raw message

include/asm-x86/apicdef.h +3 -0
index c40687d..b922c85 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/arch_hooks.h +0 -2
index 72adc3a..de4596b 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/bigsmp/apic.h renamed from include/asm-x86/mach-bigsmp/mach_apic.h +5 -5
similarity index 94%
rename from include/asm-x86/mach-bigsmp/mach_apic.h
rename to include/asm-x86/bigsmp/apic.h
index 05362d4..0a9cd7c 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/bigsmp/apicdef.h new file +13 -0
new file mode 100644
index 0000000..392c3f5

Lines of this file are not shown. View the raw message.

include/asm-x86/bigsmp/ipi.h renamed from include/asm-x86/mach-bigsmp/mach_ipi.h +3 -3
similarity index 77%
rename from include/asm-x86/mach-bigsmp/mach_ipi.h
rename to include/asm-x86/bigsmp/ipi.h
index b1b0f96..9404c53 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/cpufeature.h +2 -0
index 250fa0c..065c6a8 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/dma-mapping.h +1 -0
index 219c33d..0fff2e0 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/apic.h renamed from include/asm-x86/mach-es7000/mach_apic.h +16 -16
similarity index 91%
rename from include/asm-x86/mach-es7000/mach_apic.h
rename to include/asm-x86/es7000/apic.h
index c1f6f68..bd2c44d 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/apicdef.h new file +13 -0
new file mode 100644
index 0000000..8b234a3

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/ipi.h renamed from include/asm-x86/mach-es7000/mach_ipi.h +3 -3
similarity index 77%
rename from include/asm-x86/mach-es7000/mach_ipi.h
rename to include/asm-x86/es7000/ipi.h
index 3a21240..632a955 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/mpparse.h renamed from include/asm-x86/mach-es7000/mach_mpparse.h +3 -3
similarity index 81%
rename from include/asm-x86/mach-es7000/mach_mpparse.h
rename to include/asm-x86/es7000/mpparse.h
index befde24..7b5c889 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/wakecpu.h renamed from include/asm-x86/mach-es7000/mach_wakecpu.h +4 -4
similarity index 89%
rename from include/asm-x86/mach-es7000/mach_wakecpu.h
rename to include/asm-x86/es7000/wakecpu.h
index 97c776c..3ffc5a7 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/genapic_64.h +8 -0
index 25097a8..ed6a488 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/hw_irq.h +2 -1
index 65997b1..50f6e03 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/i8259.h +3 -0
index c586559..23c1b3b 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/io_apic.h +20 -0
index be62847..8ec68a5 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/ipi.h +11 -5
index c1b2267..30a692c 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/irq_remapping.h new file +8 -0
new file mode 100644
index 0000000..78242c6

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-bigsmp/mach_apicdef.h deleted +0 -13
deleted file mode 100644
index 811935d..0000000

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-default/mach_apic.h +3 -1
index b615f40..2a330a4 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-default/mach_apicdef.h +3 -3
index 936704f..0c2d41c 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-es7000/mach_apicdef.h deleted +0 -13
deleted file mode 100644
index a07e567..0000000

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-numaq/mach_mpparse.h deleted +0 -7
deleted file mode 100644
index 74ade18..0000000

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-summit/mach_apicdef.h deleted +0 -13
deleted file mode 100644
index d4bc859..0000000

Lines of this file are not shown. View the raw message.

include/asm-x86/mpspec.h +2 -1
index 118da36..be2241a 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/msidef.h +4 -0
index 3139666..ed91902 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/apic.h renamed from include/asm-x86/mach-numaq/mach_apic.h +3 -3
similarity index 96%
rename from include/asm-x86/mach-numaq/mach_apic.h
rename to include/asm-x86/numaq/apic.h
index 7a0d39e..a8344ba 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/apicdef.h renamed from include/asm-x86/mach-numaq/mach_apicdef.h +3 -3
similarity index 55%
rename from include/asm-x86/mach-numaq/mach_apicdef.h
rename to include/asm-x86/numaq/apicdef.h
index f870ec5..e012a46 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/ipi.h renamed from include/asm-x86/mach-numaq/mach_ipi.h +3 -3
similarity index 77%
rename from include/asm-x86/mach-numaq/mach_ipi.h
rename to include/asm-x86/numaq/ipi.h
index 1e83582..935588d 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/mpparse.h new file +7 -0
new file mode 100644
index 0000000..252292e

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/wakecpu.h renamed from include/asm-x86/mach-numaq/mach_wakecpu.h +3 -3
similarity index 88%
rename from include/asm-x86/mach-numaq/mach_wakecpu.h
rename to include/asm-x86/numaq/wakecpu.h
index 0db8cea..c577bda 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/paravirt.h +0 -19
index 891971f..d7d358a 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/setup.h +1 -0
index 9030cb7..11b6cc1 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/smp.h +10 -7
index 04f84f4..29324c1 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/apic.h renamed from include/asm-x86/mach-summit/mach_apic.h +12 -12
similarity index 93%
rename from include/asm-x86/mach-summit/mach_apic.h
rename to include/asm-x86/summit/apic.h
index 7a66758..c5b2e4b 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/apicdef.h new file +13 -0
new file mode 100644
index 0000000..f3fbca1

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/ipi.h renamed from include/asm-x86/mach-summit/mach_ipi.h +3 -3
similarity index 77%
rename from include/asm-x86/mach-summit/mach_ipi.h
rename to include/asm-x86/summit/ipi.h
index a3b31c5..53bd1e7 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/irq_vectors_limits.h renamed from include/asm-x86/mach-summit/irq_vectors_limits.h +3 -3
similarity index 65%
rename from include/asm-x86/mach-summit/irq_vectors_limits.h
rename to include/asm-x86/summit/irq_vectors_limits.h
index 22f376a..890ce3f 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/mpparse.h renamed from include/asm-x86/mach-summit/mach_mpparse.h +6 -7
similarity index 95%
rename from include/asm-x86/mach-summit/mach_mpparse.h
rename to include/asm-x86/summit/mpparse.h
index 92396f2..013ce6f 100644

Lines of this file are not shown. View the raw message.

include/linux/dmar.h +100 -27

127 lines not on this page · raw message

include/linux/irq.h +1 -0
index 8ccb462..8d9411b 100644

Lines of this file are not shown. View the raw message.

kernel/irq/manage.c +8 -1
index 0314074..60c49e3 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#2 lore raw
Quoted 11 lines · Ingo Molnar
Quoted 5 lines · Ingo Molnar

Linus,

Please pull the latest x86-v28-for-linus-phase4 git tree from:

x86/x2apic and x86/unify-cpu-detect topics.

Linus, please find a new pull request below - relative to x86-v28-for-linus-phase3-B.

and here's x86-v28-for-linus-phase4-C: the second part of
x86-v28-for-linus-phase3: x86/unify-cpu-detect and its dependent topics. Relative to x86-v28-for-linus-phase4-B.

Ingo

--------------->
Linus,

Please pull the latest x86-v28-for-linus-phase4-C git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase4-C

out-of-topic modifications in x86-v28-for-linus-phase4-C:
---------------------------------------------------------

include/asm-generic/vmlinux.lds.h  # 63cc8c7: percpu: introduce DEFINE_PER_CPU_
include/linux/ioport.h             # 268364a: IO resources: add reserve_region_
include/linux/percpu.h             # 63cc8c7: percpu: introduce DEFINE_PER_CPU_
kernel/resource.c                  # 268364a: IO resources: add reserve_region_

Thanks,

Ingo

------------------>
Andi Kleen (1):
x86: drop -funroll-loops for csum_partial_64.c

Cihula, Joseph (1):
x86, e820: add support for AddressRangeUnusuable ACPI memory type

Eric Dumazet (1):
percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro

H. Peter Anvin (10):
x86, xsave: add <asm/xcr.h> header file for XCR registers x86, xsave: keep the XSAVE feature mask as an u64
x86: boot: stub out unimplemented CPU feature words
x86: add NOPL as a synthetic CPU feature bit
x86: use X86_FEATURE_NOPL in alternatives
x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>
x86: cpufeature: add Intel features from CPUID and AVX specs
x86: <asm/cpufeature.h>: clean up overlong lines, whitespace
x86: cpufeature: fix SMX flag
x86 setup: handle more than 8 CPU flag words

Hans Schou (1):
x86, debug: print more information about unknown CPUs

Ingo Molnar (9):
x86, cyrix: debug
x86: L3 cache index disable for 2.6.26, cleanups x86 l3 cache index disable for 2 6 26 fix
x86: L3 cache index disable for 2.6.26, fix #2
x86: fix xsave build error
x86: split e820 reserved entries record to late v4
x86: cpu/common*.c, merge whitespaces x86, init_64.c: cleanup
x86: cpuid, fix typo

Jan Beulich (1):
x86-64: add two __cpuinit annotations

Krzysztof Helt (1):
x86: delay early cpu initialization until cpuid is done

Mark Langsdorf (2):

      x86: L3 cache index disable for 2.6.26
      x86: L3 cache index disable for 2.6.26

Sheng Yang (2):
x86: move VMX MSRs to msr-index.h
x86: extended "flags" to show virtualization HW feature in /proc/cpuinfo

Suresh Siddha (16):
x86, xsave: xsave cpuid feature bits
x86, xsave: enable xsave/xrstor on cpus with xsave support
x86, xsave: context switch support using xsave/xrstor
x86, xsave: dynamically allocate sigframes fpstate instead of static allocation x86, xsave: reorganization of signal save/restore fpstate code layout x86, xsave: xsave/xrstor specific routines
x86, xsave: struct _fpstate extensions to include extended state information x86, xsave: save/restore the extended state context in sigframe x86, xsave: update xsave header bits during ptrace fpregs set x86, xsave: remove the redundant access_ok() in setup_rt_frame() x86, xsave: clear the user buffer before doing fxsave/xsave
x86, xsave: use BUG_ON() instead of BUILD_BUG_ON()
x86: use cpuid vector 0xb when available for detecting cpu topology
x86: use x2apic id reported by cpuid during topology discovery
x86: use x2apic id reported by cpuid during topology discovery, fix
x86: xsave: restore xcr0 during resume

Thomas Petazzoni (3):
x86: make movsl_mask definition non-CPU specific
x86: move cmpxchg fallbacks to a generic place
x86: configuration options to compile out x86 CPU support code

Yinghai Lu (46):
x86: move dir es7000 to es7000_32.c
x86: split e820 reserved entries record to late v2
IO resources: add reserve_region_with_split()
x86: split e820 reserved entries record to late, v7
x86: unify using pci_mmcfg_insert_resource
x86: move mtrr cpu cap setting early in early_init_xxxx
x86: make (early)_identify_cpu more the same between 32bit and 64 bit
x86: order functions in cpu/common.c and cpu/common_64.c v2
x86: remove cpu_vendor_dev
x86: make 32bit support show_msr like 64 bit
x86: make get_mode_name of 64bit the same as 32bit
x86: move 32bit related functions together
x86: make detect_ht depend on CONFIG_X86_HT
x86: make header file the same in arch/x86/kernel/cpu/common_xx.c
x86: same gdt_page with macro
x86: cpu/common.c, let 64-bit code have 32-bit only functions
x86: cpu/common*.c, make 32-bit have 64-bit only functions
x86: cpu/common*.c have same cpu_init(), with copying and #ifdef
x86: cpu/common*.c, merge switch_to_new_gdt()
x86: cpu/common.c, merge default_init()
x86: cpu/common*.c, merge display_cacheinfo()
x86: cpu/common*.c, merge detect_ht()
x86: cpu/common.c: merge get_cpu_cap()
x86: cpu/common*.c, merge early_identify_cpu()
x86: cpu/common*.c: merge print_cpu_info()
x86: cpu/common*.c, merge generic_identify()
x86: cpu/common*.c, merge identify_cpu()
x86: use cpu/common.c on 64 bit
x86: move nonx_setup etc from common.c to init_64.c
x86: remove duplicated get_model_name() calling
x86, cpu init: call early_init_xxx in init_xxx
x86: cpu make amd.c more like amd_64.c v2
x86: remove duplicated force_mwait
x86: add srat_detect_node for amd64
x86: merge header in amd_64.c
x86: make amd.c have 64bit support code
x86: make amd_64 have 32 bit code
x86: make 64 bit to use amd.c
x86: little clean up of intel.c/intel_64.c
x86: make intel.c have 64-bit support code
x86: make intel_64.c the same as intel.c
x86: let intel 64-bit use intel.c
x86: intel.c put workaround for old cpus together
x86: centaur_64.c remove duplicated setting of CONSTANT_TSC
x86: identify_cpu_without_cpuid v2
x86: move transmeta cap read to early_init_transmeta()

 arch/x86/Kconfig.cpu                               |   54 ++
 arch/x86/boot/cpu.c                                |   17 +-
 arch/x86/boot/mkcpustr.c                           |   40 +-
 arch/x86/es7000/Makefile                           |    5 -
 arch/x86/es7000/es7000.h                           |  114 ---
 arch/x86/ia32/ia32_signal.c                        |   51 +-
 arch/x86/kernel/Makefile                           |    3 +-
 arch/x86/kernel/cpu/Makefile                       |   34 +-
 arch/x86/kernel/cpu/addon_cpuid_features.c         |   88 ++
 arch/x86/kernel/cpu/amd.c                          |  548 +++++++----
 arch/x86/kernel/cpu/amd_64.c                       |  224 -----
 arch/x86/kernel/cpu/centaur.c                      |    4 +-
 arch/x86/kernel/cpu/centaur_64.c                   |    6 +-
 arch/x86/kernel/cpu/cmpxchg.c                      |   72 ++
 arch/x86/kernel/cpu/common.c                       |  973 ++++++++++++++------
 arch/x86/kernel/cpu/common_64.c                    |  765 ---------------
 arch/x86/kernel/cpu/cpu.h                          |   19 +-
 arch/x86/kernel/cpu/cyrix.c                        |   23 +-
 arch/x86/kernel/cpu/feature_names.c                |   84 --
 arch/x86/kernel/cpu/intel.c                        |  364 ++++----
 arch/x86/kernel/cpu/intel_64.c                     |   95 --
 arch/x86/kernel/cpu/intel_cacheinfo.c              |  169 +++-
 arch/x86/kernel/cpu/mcheck/mce_64.c                |    2 +-
 arch/x86/kernel/cpu/mkcapflags.pl                  |   32 +
 arch/x86/kernel/cpu/powerflags.c                   |   20 +
 arch/x86/kernel/cpu/transmeta.c                    |   32 +-
 arch/x86/kernel/cpu/umc.c                          |    3 +-
 arch/x86/kernel/e820.c                             |   28 +-
 .../{es7000/es7000plat.c => kernel/es7000_32.c}    |   85 ++-
 arch/x86/kernel/genx2apic_cluster.c                |    7 +-
 arch/x86/kernel/genx2apic_phys.c                   |    7 +-
 arch/x86/kernel/i387.c                             |  154 +++-
 arch/x86/kernel/process.c                          |    1 -
 arch/x86/kernel/sigframe.h                         |   14 +-
 arch/x86/kernel/signal_32.c                        |   45 +-
 arch/x86/kernel/signal_64.c                        |   95 +--
 arch/x86/kernel/traps_32.c                         |    1 -
 arch/x86/kernel/traps_64.c                         |    6 +-
 arch/x86/kernel/vmlinux_32.lds.S                   |    9 +-
 arch/x86/kernel/vmlinux_64.lds.S                   |    9 +-
 arch/x86/kernel/xsave.c                            |  316 +++++++
 arch/x86/kvm/vmx.h                                 |   15 -
 arch/x86/lib/Makefile                              |    3 -
 arch/x86/lib/usercopy_32.c                         |    7 +
 arch/x86/mach-generic/Makefile                     |    1 -
 arch/x86/mm/init_64.c                              |   56 ++
 arch/x86/pci/i386.c                                |    3 +
 arch/x86/pci/mmconfig-shared.c                     |   12 +-
 arch/x86/power/cpu_32.c                            |    7 +
 arch/x86/power/cpu_64.c                            |    7 +
 include/asm-generic/vmlinux.lds.h                  |    1 +
 include/asm-x86/bugs.h                             |    5 +
 include/asm-x86/cpufeature.h                       |  118 ++-
 include/asm-x86/e820.h                             |    2 +
 include/asm-x86/i387.h                             |   84 ++-
 include/asm-x86/msr-index.h                        |   16 +
 include/asm-x86/processor-cyrix.h                  |    8 +
 include/asm-x86/processor-flags.h                  |    1 +
 include/asm-x86/processor.h                        |   27 +-
 include/asm-x86/sigcontext.h                       |   87 ++-
 include/asm-x86/sigcontext32.h                     |    6 +-
 include/asm-x86/thread_info.h                      |    1 +
 include/asm-x86/ucontext.h                         |    6 +
 include/asm-x86/xcr.h                              |   49 +
 include/asm-x86/xsave.h                            |  118 +++
 include/linux/ioport.h                             |    3 +
 include/linux/percpu.h                             |    7 +
 kernel/resource.c                                  |   68 ++
 68 files changed, 3019 insertions(+), 2317 deletions(-)
 delete mode 100644 arch/x86/es7000/Makefile
 delete mode 100644 arch/x86/es7000/es7000.h
 delete mode 100644 arch/x86/kernel/cpu/amd_64.c
 create mode 100644 arch/x86/kernel/cpu/cmpxchg.c
 delete mode 100644 arch/x86/kernel/cpu/common_64.c
 delete mode 100644 arch/x86/kernel/cpu/feature_names.c
 delete mode 100644 arch/x86/kernel/cpu/intel_64.c
 create mode 100644 arch/x86/kernel/cpu/mkcapflags.pl
 create mode 100644 arch/x86/kernel/cpu/powerflags.c
 rename arch/x86/{es7000/es7000plat.c => kernel/es7000_32.c} (78%)
 create mode 100644 arch/x86/kernel/xsave.c
 create mode 100644 include/asm-x86/xcr.h
 create mode 100644 include/asm-x86/xsave.h
arch/x86/Kconfig.cpu +54 -0
index 60a8576..f8843c3 100644
@@ -419,6 +419,60 @@ config X86_DEBUGCTLMSR
 	def_bool y
 	depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)
 
+menuconfig PROCESSOR_SELECT
+	default y
+	bool "Supported processor vendors" if EMBEDDED
+	help
+	  This lets you choose what x86 vendor support code your kernel
+	  will include.
+
+config CPU_SUP_INTEL
+	default y
+	bool "Support Intel processors" if PROCESSOR_SELECT
+	help
+	  This enables extended support for Intel processors
+
+config CPU_SUP_CYRIX_32
+	default y
+	bool "Support Cyrix processors" if PROCESSOR_SELECT
+	depends on !64BIT
+	help
+	  This enables extended support for Cyrix processors
+
+config CPU_SUP_AMD
+	default y
+	bool "Support AMD processors" if PROCESSOR_SELECT
+	help
+	  This enables extended support for AMD processors
+
+config CPU_SUP_CENTAUR_32
+	default y
+	bool "Support Centaur processors" if PROCESSOR_SELECT
+	depends on !64BIT
+	help
+	  This enables extended support for Centaur processors
+
+config CPU_SUP_CENTAUR_64
+	default y
+	bool "Support Centaur processors" if PROCESSOR_SELECT
+	depends on 64BIT
+	help
+	  This enables extended support for Centaur processors
+
+config CPU_SUP_TRANSMETA_32
+	default y
+	bool "Support Transmeta processors" if PROCESSOR_SELECT
+	depends on !64BIT
+	help
+	  This enables extended support for Transmeta processors
+
+config CPU_SUP_UMC_32
+	default y
+	bool "Support UMC processors" if PROCESSOR_SELECT
+	depends on !64BIT
+	help
+	  This enables extended support for UMC processors
+
 config X86_DS
 	bool "Debug Store support"
 	default y
arch/x86/boot/cpu.c +9 -8
index 75298fe..6ec6bb6 100644
@@ -59,17 +59,18 @@ int validate_cpu(void)
 			u32 e = err_flags[i];
 
 			for (j = 0; j < 32; j++) {
-				int n = (i << 5)+j;
-				if (*msg_strs < n) {
+				if (msg_strs[0] < i ||
+				    (msg_strs[0] == i && msg_strs[1] < j)) {
 					/* Skip to the next string */
-					do {
-						msg_strs++;
-					} while (*msg_strs);
-					msg_strs++;
+					msg_strs += 2;
+					while (*msg_strs++)
+						;
 				}
 				if (e & 1) {
-					if (*msg_strs == n && msg_strs[1])
-						printf("%s ", msg_strs+1);
+					if (msg_strs[0] == i &&
+					    msg_strs[1] == j &&
+					    msg_strs[2])
+						printf("%s ", msg_strs+2);
 					else
 						printf("%d:%d ", i, j);
 				}
arch/x86/boot/mkcpustr.c +20 -20
index bbe7695..8ef60f2 100644
@@ -15,33 +15,33 @@
 
 #include <stdio.h>
 
-#include "../kernel/cpu/feature_names.c"
-
-#if NCAPFLAGS > 8
-# error "Need to adjust the boot code handling of CPUID strings"
-#endif
+#include "../kernel/cpu/capflags.c"
 
 int main(void)
 {
-	int i;
+	int i, j;
 	const char *str;
 
 	printf("static const char x86_cap_strs[] = \n");
 
-	for (i = 0; i < NCAPINTS*32; i++) {
-		str = x86_cap_flags[i];
-
-		if (i == NCAPINTS*32-1) {
-			/* The last entry must be unconditional; this
-			   also consumes the compiler-added null character */
-			if (!str)
-				str = "";
-			printf("\t\"\\x%02x\"\"%s\"\n", i, str);
-		} else if (str) {
-			printf("#if REQUIRED_MASK%d & (1 << %d)\n"
-			       "\t\"\\x%02x\"\"%s\\0\"\n"
-			       "#endif\n",
-			       i >> 5, i & 31, i, str);
+	for (i = 0; i < NCAPINTS; i++) {
+		for (j = 0; j < 32; j++) {
+			str = x86_cap_flags[i*32+j];
+
+			if (i == NCAPINTS-1 && j == 31) {
+				/* The last entry must be unconditional; this
+				   also consumes the compiler-added null
+				   character */
+				if (!str)
+					str = "";
+				printf("\t\"\\x%02x\\x%02x\"\"%s\"\n",
+				       i, j, str);
+			} else if (str) {
+				printf("#if REQUIRED_MASK%d & (1 << %d)\n"
+				       "\t\"\\x%02x\\x%02x\"\"%s\\0\"\n"
+				       "#endif\n",
+				       i, j, i, j, str);
+			}
 		}
 	}
 	printf("\t;\n");
arch/x86/es7000/Makefile deleted +0 -5
deleted file mode 100644
index 3ef8b43..0000000
@@ -1,5 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-obj-$(CONFIG_X86_ES7000)	:= es7000plat.o
arch/x86/es7000/es7000.h deleted +0 -114

114 lines not on this page · raw message

arch/x86/ia32/ia32_signal.c +24 -27

148 lines not on this page · raw message

arch/x86/kernel/Makefile +2 -1
index a07ec14..c9be69f 100644
@@ -38,7 +38,7 @@ obj-y			+= tsc.o io_delay.o rtc.o
 
 obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o
 obj-y				+= process.o
-obj-y				+= i387.o
+obj-y				+= i387.o xsave.o
 obj-y				+= ptrace.o
 obj-y				+= ds.o
 obj-$(CONFIG_X86_32)		+= tls.o
@@ -69,6 +69,7 @@ obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o
 obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
 obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o
+obj-$(CONFIG_X86_ES7000)	+= es7000_32.o
 obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit_32.o
 obj-y				+= vsmp_64.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
arch/x86/kernel/cpu/Makefile +21 -13
index ee76eaa..7f0b45a 100644
@@ -3,22 +3,30 @@
 #
 
 obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
-obj-y			+= proc.o feature_names.o
-
-obj-$(CONFIG_X86_32)	+= common.o bugs.o
-obj-$(CONFIG_X86_64)	+= common_64.o bugs_64.o
-obj-$(CONFIG_X86_32)	+= amd.o
-obj-$(CONFIG_X86_64)	+= amd_64.o
-obj-$(CONFIG_X86_32)	+= cyrix.o
-obj-$(CONFIG_X86_32)	+= centaur.o
-obj-$(CONFIG_X86_64)	+= centaur_64.o
-obj-$(CONFIG_X86_32)	+= transmeta.o
-obj-$(CONFIG_X86_32)	+= intel.o
-obj-$(CONFIG_X86_64)	+= intel_64.o
-obj-$(CONFIG_X86_32)	+= umc.o
+obj-y			+= proc.o capflags.o powerflags.o common.o
+
+obj-$(CONFIG_X86_32)	+= bugs.o cmpxchg.o
+obj-$(CONFIG_X86_64)	+= bugs_64.o
+
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel.o
+obj-$(CONFIG_CPU_SUP_AMD)		+= amd.o
+obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix.o
+obj-$(CONFIG_CPU_SUP_CENTAUR_32)	+= centaur.o
+obj-$(CONFIG_CPU_SUP_CENTAUR_64)	+= centaur_64.o
+obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
+obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
 obj-$(CONFIG_X86_MCE)	+= mcheck/
 obj-$(CONFIG_MTRR)	+= mtrr/
 obj-$(CONFIG_CPU_FREQ)	+= cpufreq/
 
 obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
+
+quiet_cmd_mkcapflags = MKCAP   $@
+      cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
+
+cpufeature = $(src)/../../../../include/asm-x86/cpufeature.h
+
+targets += capflags.c
+$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE
+	$(call if_changed,mkcapflags)
arch/x86/kernel/cpu/addon_cpuid_features.c +88 -0

100 lines not on this page · raw message

arch/x86/kernel/cpu/amd.c +359 -189

633 lines not on this page · raw message

arch/x86/kernel/cpu/amd_64.c deleted +0 -224

224 lines not on this page · raw message

arch/x86/kernel/cpu/centaur.c +2 -2
index a0534c0..89bfdd9 100644
@@ -289,7 +289,6 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)
 	if (c->x86_model >= 6 && c->x86_model < 9)
 		set_cpu_cap(c, X86_FEATURE_3DNOW);
 
-	get_model_name(c);
 	display_cacheinfo(c);
 }
 
@@ -475,6 +474,7 @@ static struct cpu_dev centaur_cpu_dev __cpuinitdata = {
 	.c_early_init	= early_init_centaur,
 	.c_init		= init_centaur,
 	.c_size_cache	= centaur_size_cache,
+	.c_x86_vendor	= X86_VENDOR_CENTAUR,
 };
 
-cpu_vendor_dev_register(X86_VENDOR_CENTAUR, &centaur_cpu_dev);
+cpu_dev_register(centaur_cpu_dev);
arch/x86/kernel/cpu/centaur_64.c +4 -2
index 1d181c4..a1625f5 100644
@@ -16,9 +16,10 @@ static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)
 
 static void __cpuinit init_centaur(struct cpuinfo_x86 *c)
 {
+	early_init_centaur(c);
+
 	if (c->x86 == 0x6 && c->x86_model >= 0xf) {
 		c->x86_cache_alignment = c->x86_clflush_size * 2;
-		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
 		set_cpu_cap(c, X86_FEATURE_REP_GOOD);
 	}
 	set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
@@ -29,7 +30,8 @@ static struct cpu_dev centaur_cpu_dev __cpuinitdata = {
 	.c_ident	= { "CentaurHauls" },
 	.c_early_init	= early_init_centaur,
 	.c_init		= init_centaur,
+	.c_x86_vendor	= X86_VENDOR_CENTAUR,
 };
 
-cpu_vendor_dev_register(X86_VENDOR_CENTAUR, &centaur_cpu_dev);
+cpu_dev_register(centaur_cpu_dev);
 
arch/x86/kernel/cpu/cmpxchg.c new file +72 -0

72 lines not on this page · raw message

arch/x86/kernel/cpu/common.c +684 -289

1,252 lines not on this page · raw message

arch/x86/kernel/cpu/common_64.c deleted +0 -765

220 lines not on this page · raw message

arch/x86/kernel/cpu/cpu.h +6 -13
index 4d894e8..de4094a 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/cyrix.c +12 -11
index 898a5a2..ffd0f5e 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/feature_names.c deleted +0 -84

84 lines not on this page · raw message

arch/x86/kernel/cpu/intel.c +196 -168

364 lines not on this page · raw message

arch/x86/kernel/cpu/intel_64.c deleted +0 -95

95 lines not on this page · raw message

arch/x86/kernel/cpu/intel_cacheinfo.c +147 -22

169 lines not on this page · raw message

arch/x86/kernel/cpu/mcheck/mce_64.c +1 -1
index 726a5fc..4b031a4 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/mkcapflags.pl new file +32 -0
new file mode 100644
index 0000000..dfea390

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/powerflags.c new file +20 -0
new file mode 100644
index 0000000..5abbea2

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/transmeta.c +17 -15
index b911a2c..52b3fef 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/umc.c +2 -1
index b1fc909..e777f79 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/e820.c +27 -1
index 66e48aa..78e642f 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/es7000_32.c renamed from arch/x86/es7000/es7000plat.c +84 -1

85 lines not on this page · raw message

arch/x86/kernel/genx2apic_cluster.c +1 -6
index fed9f68..e4bf2cc 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/genx2apic_phys.c +1 -6
index 958d537..8f1343d 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/i387.c +135 -19

154 lines not on this page · raw message

arch/x86/kernel/process.c +0 -1
index ec7a2ba..c622772 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/sigframe.h +12 -2
index 8b4956e..cc673aa 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/signal_32.c +21 -24

45 lines not on this page · raw message

arch/x86/kernel/signal_64.c +9 -86

95 lines not on this page · raw message

arch/x86/kernel/traps_32.c +0 -1
index 03df8e4..da5a596 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/traps_64.c +1 -5
index 7a31f10..2887a78 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/vmlinux_32.lds.S +5 -4
index af5bdad..a9b8560 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/vmlinux_64.lds.S +4 -5
index 63e5c1a..201e81a 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/xsave.c new file +316 -0

316 lines not on this page · raw message

arch/x86/kvm/vmx.h +0 -15
index 23e8373..17e2599 100644

Lines of this file are not shown. View the raw message.

arch/x86/lib/Makefile +0 -3
index aa3fa41..55e11aa 100644

Lines of this file are not shown. View the raw message.

arch/x86/lib/usercopy_32.c +7 -0
index 24e6094..9e68075 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/Makefile +0 -1
index 4706de7..6730f4e 100644

Lines of this file are not shown. View the raw message.

arch/x86/mm/init_64.c +56 -0

56 lines not on this page · raw message

arch/x86/pci/i386.c +3 -0
index 8791fc5..844df0c 100644

Lines of this file are not shown. View the raw message.

arch/x86/pci/mmconfig-shared.c +5 -7
index d963576..654a223 100644

Lines of this file are not shown. View the raw message.

arch/x86/power/cpu_32.c +7 -0
index d3e083d..274d060 100644

Lines of this file are not shown. View the raw message.

arch/x86/power/cpu_64.c +7 -0
index 66bdfb5..e3b6cf7 100644

Lines of this file are not shown. View the raw message.

include/asm-generic/vmlinux.lds.h +1 -0
index cb752ba..7440a0d 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/bugs.h +5 -0
index 4761c46..dc60498 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/cpufeature.h +80 -38

118 lines not on this page · raw message

include/asm-x86/e820.h +2 -0
index f52daf1..5abbdec 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/i387.h +72 -12

84 lines not on this page · raw message

include/asm-x86/msr-index.h +16 -0
index 3052f05..0bb4330 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/processor-cyrix.h +8 -0
index 97568ad..1198f2a 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/processor-flags.h +1 -0
index 5dd7977..dc5f071 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/processor.h +21 -6
index 5eaf9bf..c7d3546 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/sigcontext.h +83 -4

87 lines not on this page · raw message

include/asm-x86/sigcontext32.h +5 -1
index 4e2ec73..8c34703 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/thread_info.h +1 -0
index 4db0066..3f4e52b 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/ucontext.h +6 -0
index 9948dd3..89eaa54 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/xcr.h new file +49 -0

49 lines not on this page · raw message

include/asm-x86/xsave.h new file +118 -0

118 lines not on this page · raw message

include/linux/ioport.h +3 -0
index 350033e..ee9bcc6 100644

Lines of this file are not shown. View the raw message.

include/linux/percpu.h +7 -0
index fac3337..9f2a375 100644

Lines of this file are not shown. View the raw message.

kernel/resource.c +68 -0

68 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#3 lore raw
In reply to Ingo Molnar
Quoted 4 lines · Ingo Molnar

Please pull the latest x86-v28-for-linus-phase4-B git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase4-B

This is broken.

I get an absolute metric shitload of:

include/asm/dma-mapping.h:309:2: error: #endif without #if

errors, and I suspect it's because of some broken merge resolution that you didn't even test and then fixed in some later branch.

I double-checked: it's already broken in your tree, it's not from my merge (ie commit 0d4ab8b5aa74f6be4d022dcf5e27845b7c290294 is already showing that bug).

Not pulled.

Linus

#4 lore raw
Quoted 8 lines · Linus Torvalds
Quoted 4 lines · Ingo Molnar

Please pull the latest x86-v28-for-linus-phase4-B git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase4-B
Quoted 8 lines

This is broken.

I get an absolute metric shitload of:

include/asm/dma-mapping.h:309:2: error: #endif without #if

errors, and I suspect it's because of some broken merge resolution that you didn't even test and then fixed in some later branch.

possible - i tested the first series at all 10 merge points for 3 days.

and indeed the problem is not there in the old, x86-v28-for-linus-phase4 branch.

Quoted 5 lines

I double-checked: it's already broken in your tree, it's not from my merge (ie commit 0d4ab8b5aa74f6be4d022dcf5e27845b7c290294 is already showing that bug).

Not pulled.

indeed:

#endif
#endif /* ASM_X86__DMA_MAPPING_H */

that goes away in x86-v28-for-linus-phase6-B.

Ingo

#5 lore raw
Quoted 6 lines · Ingo Molnar

indeed:

#endif
#endif /* ASM_X86__DMA_MAPPING_H */

that goes away in x86-v28-for-linus-phase6-B.

please find the new pull request below for x86-v28-for-linus-phase4-D (relative to x86-v28-for-linus-phase3-B) - i sanity-tested it on a couple of systems.

Ingo

------------->
Linus,

Please pull the latest x86-v28-for-linus-phase4-D git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase4-D

out-of-topic modifications in x86-v28-for-linus-phase4-D:
---------------------------------------------------------
arch/um/sys-x86_64/syscall_table.c # b76d69e: x86_64: uml: fix rename header gu
drivers/pci/Makefile # ad3ad3f: x64, x2apic/intr-remap: parse ioa
drivers/pci/dma_remapping.h # 2ae2101: x64, x2apic/intr-remap: Interrupt

                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/dmar.c                 # 1cb1158: x64, x2apic/intr-remap: disable D
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # fe962e9: x64, x2apic/intr-remap: Queued in
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 2d6b5f8: x64, x2apic/intr-remap: Fix the n
                                   # aaa9d1d: x64, x2apic/intr-remap: use CONFI
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s
                                   # c42d9f3: x64, x2apic/intr-remap: fix the n
                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/intel-iommu.h          # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # fe962e9: x64, x2apic/intr-remap: Queued in
                                   # cf1337f: x64, x2apic/intr-remap: move IOMM
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s
                                   # c42d9f3: x64, x2apic/intr-remap: fix the n
                                   # e61d98d: x64, x2apic/intr-remap: Intel vt-
drivers/pci/intr_remapping.c       # 75c46fa: x64, x2apic/intr-remap: MSI and M
                                   # 89027d3: x64, x2apic/intr-remap: IO-APIC s
                                   # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa

drivers/pci/intr_remapping.h # 2ae2101: x64, x2apic/intr-remap: Interrupt
# ad3ad3f: x64, x2apic/intr-remap: parse ioa
include/asm-generic/vmlinux.lds.h # 63cc8c7: percpu: introduce DEFINE_PER_CPU_
include/linux/dmar.h # 75c46fa: x64, x2apic/intr-remap: MSI and M

                                   # 89027d3: x64, x2apic/intr-remap: IO-APIC s
                                   # b6fcb33: x64, x2apic/intr-remap: routines 
                                   # 2ae2101: x64, x2apic/intr-remap: Interrupt
                                   # ad3ad3f: x64, x2apic/intr-remap: parse ioa
                                   # 1886e8a: x64, x2apic/intr-remap: code re-s
include/linux/ioport.h             # 268364a: IO resources: add reserve_region_
include/linux/irq.h                # 72b1e22: x64, x2apic/intr-remap: generic i
include/linux/percpu.h             # 63cc8c7: percpu: introduce DEFINE_PER_CPU_
kernel/irq/manage.c                # 72b1e22: x64, x2apic/intr-remap: generic i
kernel/resource.c                  # 268364a: IO resources: add reserve_region_

Thanks,

Ingo

------------------>
Andi Kleen (1):
x86: drop -funroll-loops for csum_partial_64.c

Andreas Herrmann (2):
x86: pda_init(): fix memory leak when using CPU hotplug
x86: cpu_init(): fix memory leak when using CPU hotplug

Cihula, Joseph (1):
x86, e820: add support for AddressRangeUnusuable ACPI memory type

Cyrill Gorcunov (34):
x86: apic unification - merge down lapic_get_maxlvt
x86: apic unification - merge down enable_NMI_through_LVT0
x86: apic interrupts - move assignments to irqinit_32.c, v2
x86: apic - use SET_APIC_DEST_FIELD instead of hardcoded shift
x86: apic - unify disable_apic_timer
x86: apic - unify __setup_APIC_LVTT
x86: apic - do not clear APIC twice in lapic_shutdown
x86: apic - get rid of local_apic_timer_verify_ok
x86: apic - unify verify_local_APIC
x86: apic - unify sync_Arb_IDs
x86: apic - sync_Arb_IDs style fixup
x86: apic - unify init_bsp_APIC
x86: apic - unify clear_local_APIC
x86: apic - unify lapic_resume
x86: apic - unify lapic_suspend
x86: apic - rearrange functions and comments
x86: apic - unify lapic_is_integrated
x86: apic - unify xapic_icr_read
x86: apic - rearrange maxcpu definition
x86: apic - unify setup_boot_APIC_clock
x86: apic - unify disable_local_APIC
x86: apic - unify lapic_shutdown
x86: apic - unify connect_bsp_APIC
x86: apic - unify lapic_setup_esr
x86: apic - unify __setup_APIC_LVTT
x86: apic - unify disconnect_bsp_APIC
x86: apic - generic_processor_info
x86: apic - unify end_local_APIC_setup
x86: apic - unify local_apic_timer_interrupt
x86: apic - unify apic_set_verbosity
x86: apic - unify disableapic and nolapic setup handlers
x86: apic - rearrange parse_lapic_timer_c2_ok
x86: apic - lapic_resume 32bit - unification fix
x86: apic - compilation warnings fix

Eric Dumazet (1):
percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro

H. Peter Anvin (10):
x86, xsave: add <asm/xcr.h> header file for XCR registers x86, xsave: keep the XSAVE feature mask as an u64
x86: boot: stub out unimplemented CPU feature words
x86: add NOPL as a synthetic CPU feature bit
x86: use X86_FEATURE_NOPL in alternatives
x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>
x86: cpufeature: add Intel features from CPUID and AVX specs
x86: <asm/cpufeature.h>: clean up overlong lines, whitespace
x86: cpufeature: fix SMX flag
x86 setup: handle more than 8 CPU flag words

Hans Schou (1):
x86, debug: print more information about unknown CPUs

Hiroshi Shimamoto (2):
x86_32: use apic_ops at print_local_APIC()
x86_64: uml: fix rename header guard

Huang Weiyi (1):
arch/x86/kernel/genx2apic_uv_x.c: Removed duplicated include

Ingo Molnar (11):
x86, xen: fix apic_ops build on UP
x86, lguest: fix apic_ops build on UP x86, cyrix: debug
x86: L3 cache index disable for 2.6.26, cleanups x86 l3 cache index disable for 2 6 26 fix
x86: L3 cache index disable for 2.6.26, fix #2
x86: fix xsave build error
x86: split e820 reserved entries record to late v4
x86: cpu/common*.c, merge whitespaces x86, init_64.c: cleanup
x86: cpuid, fix typo

Jan Beulich (1):
x86-64: add two __cpuinit annotations

Krzysztof Helt (1):
x86: delay early cpu initialization until cpuid is done

Maciej W. Rozycki (1):
x86: PIC, L-APIC and I/O APIC debug information

Mark Langsdorf (2):

      x86: L3 cache index disable for 2.6.26
      x86: L3 cache index disable for 2.6.26

Sheng Yang (2):
x86: move VMX MSRs to msr-index.h
x86: extended "flags" to show virtualization HW feature in /proc/cpuinfo

Suresh Siddha (51):
x64, x2apic/intr-remap: Intel vt-d, IOMMU code reorganization
x64, x2apic/intr-remap: fix the need for sequential array allocation of iommus x64, x2apic/intr-remap: code re-structuring, to be used by both DMA and Interrupt remapping x64, x2apic/intr-remap: use CONFIG_DMAR for DMA-remapping specific code
x64, x2apic/intr-remap: Fix the need for RMRR in the DMA-remapping detection
x64, x2apic/intr-remap: parse ioapic scope under vt-d structures
x64, x2apic/intr-remap: move IOMMU_WAIT_OP() macro to intel-iommu.h
x64, x2apic/intr-remap: Queued invalidation infrastructure (part of VT-d)
x64, x2apic/intr-remap: Interrupt remapping infrastructure
x64, x2apic/intr-remap: routines managing Interrupt remapping table entries.
x64, x2apic/intr-remap: generic irq migration support from process context
x64, x2apic/intr-remap: 8259 specific mask/unmask routines
x64, x2apic/intr-remap: ioapic routines which deal with initial io-apic RTE setup x64, x2apic/intr-remap: introduce read_apic_id() to genapic routines
x64, x2apic/intr-remap: Interrupt-remapping and x2apic support, fix
x64, x2apic/intr-remap: basic apic ops support
x64, x2apic/intr-remap: cpuid bits for x2apic feature
x64, x2apic/intr-remap: disable DMA-remapping if Interrupt-remapping is detected (temporary quirk) x64, x2apic/intr-remap: x2apic ops for x2apic mode support
x64, x2apic/intr-remap: introcude self IPI to genapic routines
x64, x2apic/intr-remap: x2apic cluster mode support
x64, x2apic/intr-remap: setup init_apic_ldr for UV
x64, x2apic/intr-remap: IO-APIC support for interrupt-remapping
x64, x2apic/intr-remap: MSI and MSI-X support for interrupt remapping infrastructure x64, x2apic/intr-remap: add x2apic support, including enabling interrupt-remapping x64, x2apic/intr-remap: support for x2apic physical mode support
x64, x2apic/intr-remap: introduce CONFIG_INTR_REMAP
x64, x2apic/intr-remap: Interrupt-remapping and x2apic support
x2apic: uninline uv_init_apic_ldr()
x2apic: xen64 paravirt basic apic ops
x2apic: kernel-parameter documentation for "x2apic_phys"
x86: let 32bit use apic_ops too - fix
x86: apic_ops for lguest
x86: APIC: Remove apic_write_around(); use alternatives, merge fix
x64, apic: use generic apic_write() for ack_APIC_irq()
x86, xsave: xsave cpuid feature bits
x86, xsave: enable xsave/xrstor on cpus with xsave support
x86, xsave: context switch support using xsave/xrstor
x86, xsave: dynamically allocate sigframes fpstate instead of static allocation x86, xsave: reorganization of signal save/restore fpstate code layout
x86, xsave: xsave/xrstor specific routines
x86, xsave: struct _fpstate extensions to include extended state information
x86, xsave: save/restore the extended state context in sigframe
x86, xsave: update xsave header bits during ptrace fpregs set
x86, xsave: remove the redundant access_ok() in setup_rt_frame()
x86, xsave: clear the user buffer before doing fxsave/xsave
x86, xsave: use BUG_ON() instead of BUILD_BUG_ON()
x86: use cpuid vector 0xb when available for detecting cpu topology
x86: use x2apic id reported by cpuid during topology discovery
x86: use x2apic id reported by cpuid during topology discovery, fix
x86: xsave: restore xcr0 during resume

Thomas Petazzoni (3):
x86: make movsl_mask definition non-CPU specific
x86: move cmpxchg fallbacks to a generic place
x86: configuration options to compile out x86 CPU support code

Yinghai Lu (61):
x86: let 32bit use apic_ops too
x86: mach_apicdef.h need to include before smp.h
x86: make read_apic_id return final apicid
x86: make 64bit have get_apic_id
x86: let 32bit use apic_ops too - fix
x86: add apic probe for genapic 64bit, v2
x86: move declaring x2apic_extra_bits
x86: add setup_ioapic_ids for numaq in x86_quirks
x86: mach-bigsmp to bigsmp
x86: mach_es7000 to es7000
x86: mach_summit to summit
x86: mach-numaq to numaq
x86: add apic probe for genapic 64bit - fix
x86: apic - unify lapic_resume - fix
x86: fix apic version warning
x86: move dir es7000 to es7000_32.c
x86: split e820 reserved entries record to late v2
IO resources: add reserve_region_with_split()
x86: split e820 reserved entries record to late, v7
x86: unify using pci_mmcfg_insert_resource
x86: move mtrr cpu cap setting early in early_init_xxxx
x86: make (early)_identify_cpu more the same between 32bit and 64 bit
x86: order functions in cpu/common.c and cpu/common_64.c v2
x86: remove cpu_vendor_dev
x86: make 32bit support show_msr like 64 bit
x86: make get_mode_name of 64bit the same as 32bit
x86: move 32bit related functions together
x86: make detect_ht depend on CONFIG_X86_HT
x86: make header file the same in arch/x86/kernel/cpu/common_xx.c
x86: same gdt_page with macro
x86: cpu/common.c, let 64-bit code have 32-bit only functions
x86: cpu/common*.c, make 32-bit have 64-bit only functions
x86: cpu/common*.c have same cpu_init(), with copying and #ifdef
x86: cpu/common*.c, merge switch_to_new_gdt()
x86: cpu/common.c, merge default_init()
x86: cpu/common*.c, merge display_cacheinfo()
x86: cpu/common*.c, merge detect_ht()
x86: cpu/common.c: merge get_cpu_cap()
x86: cpu/common*.c, merge early_identify_cpu()
x86: cpu/common*.c: merge print_cpu_info()
x86: cpu/common*.c, merge generic_identify()
x86: cpu/common*.c, merge identify_cpu()
x86: use cpu/common.c on 64 bit
x86: move nonx_setup etc from common.c to init_64.c
x86: remove duplicated get_model_name() calling
x86, cpu init: call early_init_xxx in init_xxx
x86: cpu make amd.c more like amd_64.c v2
x86: remove duplicated force_mwait
x86: add srat_detect_node for amd64
x86: merge header in amd_64.c
x86: make amd.c have 64bit support code
x86: make amd_64 have 32 bit code
x86: make 64 bit to use amd.c
x86: little clean up of intel.c/intel_64.c
x86: make intel.c have 64-bit support code
x86: make intel_64.c the same as intel.c
x86: let intel 64-bit use intel.c
x86: intel.c put workaround for old cpus together
x86: centaur_64.c remove duplicated setting of CONSTANT_TSC
x86: identify_cpu_without_cpuid v2
x86: move transmeta cap read to early_init_transmeta()

 Documentation/kernel-parameters.txt                |    6 +
 arch/um/sys-x86_64/syscall_table.c                 |    4 +-
 arch/x86/Kconfig                                   |    8 +
 arch/x86/Kconfig.cpu                               |   54 ++
 arch/x86/boot/cpu.c                                |   17 +-
 arch/x86/boot/mkcpustr.c                           |   40 +-
 arch/x86/ia32/ia32_signal.c                        |   51 +-
 arch/x86/kernel/Makefile                           |    5 +-
 arch/x86/kernel/acpi/boot.c                        |    8 +-
 arch/x86/kernel/apic_32.c                          |  437 +++++----
 arch/x86/kernel/apic_64.c                          |  626 +++++++++++--
 arch/x86/kernel/cpu/Makefile                       |   34 +-
 arch/x86/kernel/cpu/addon_cpuid_features.c         |   88 ++
 arch/x86/kernel/cpu/amd.c                          |  548 +++++++----
 arch/x86/kernel/cpu/amd_64.c                       |  224 -----
 arch/x86/kernel/cpu/centaur.c                      |    4 +-
 arch/x86/kernel/cpu/centaur_64.c                   |    6 +-
 arch/x86/kernel/cpu/cmpxchg.c                      |   72 ++
 arch/x86/kernel/cpu/common.c                       |  973 ++++++++++++++------
 arch/x86/kernel/cpu/common_64.c                    |  763 ---------------
 arch/x86/kernel/cpu/cpu.h                          |   19 +-
 arch/x86/kernel/cpu/cyrix.c                        |   23 +-
 arch/x86/kernel/cpu/feature_names.c                |   84 --
 arch/x86/kernel/cpu/intel.c                        |  364 ++++----
 arch/x86/kernel/cpu/intel_64.c                     |   95 --
 arch/x86/kernel/cpu/intel_cacheinfo.c              |  169 +++-
 arch/x86/kernel/cpu/mcheck/mce_64.c                |    2 +-
 arch/x86/kernel/cpu/mkcapflags.pl                  |   32 +
 arch/x86/kernel/cpu/powerflags.c                   |   20 +
 arch/x86/kernel/cpu/transmeta.c                    |   32 +-
 arch/x86/kernel/cpu/umc.c                          |    3 +-
 arch/x86/kernel/e820.c                             |   28 +-
 .../es7000plat.c => kernel/es7000_32.c}            |   87 ++-
 arch/x86/kernel/genapic_64.c                       |   88 +--
 arch/x86/kernel/genapic_flat_64.c                  |   62 ++-
 arch/x86/kernel/genx2apic_cluster.c                |  159 ++++
 arch/x86/kernel/genx2apic_phys.c                   |  154 +++
 arch/x86/kernel/genx2apic_uv_x.c                   |   70 ++-
 arch/x86/kernel/i387.c                             |  154 +++-
 arch/x86/kernel/i8259.c                            |   24 +
 arch/x86/kernel/io_apic_32.c                       |   47 +-
 arch/x86/kernel/io_apic_64.c                       |  639 ++++++++++++-
 arch/x86/kernel/irqinit_32.c                       |   49 +
 arch/x86/kernel/mpparse.c                          |    2 +
 arch/x86/kernel/numaq_32.c                         |    7 +
 arch/x86/kernel/paravirt.c                         |    2 -
 arch/x86/kernel/process.c                          |    1 -
 arch/x86/kernel/setup.c                            |    2 +
 arch/x86/kernel/sigframe.h                         |   14 +-
 arch/x86/kernel/signal_32.c                        |   45 +-
 arch/x86/kernel/signal_64.c                        |   95 +--
 arch/x86/kernel/smpboot.c                          |   38 +-
 arch/x86/kernel/summit_32.c                        |    2 +-
 arch/x86/kernel/traps_32.c                         |    1 -
 arch/x86/kernel/traps_64.c                         |    6 +-
 arch/x86/kernel/vmi_32.c                           |    4 +-
 arch/x86/kernel/vmlinux_32.lds.S                   |    9 +-
 arch/x86/kernel/vmlinux_64.lds.S                   |    9 +-
 arch/x86/kernel/xsave.c                            |  316 +++++++
 arch/x86/kvm/vmx.h                                 |   15 -
 arch/x86/lguest/boot.c                             |   38 +-
 arch/x86/lib/Makefile                              |    3 -
 arch/x86/lib/usercopy_32.c                         |    7 +
 arch/x86/mach-default/setup.c                      |   15 -
 arch/x86/mach-es7000/Makefile                      |    5 -
 arch/x86/mach-es7000/es7000.h                      |  114 ---
 arch/x86/mach-generic/Makefile                     |    1 -
 arch/x86/mach-generic/bigsmp.c                     |    9 +-
 arch/x86/mach-generic/es7000.c                     |   13 +-
 arch/x86/mach-generic/numaq.c                      |   12 +-
 arch/x86/mach-generic/summit.c                     |   11 +-
 arch/x86/mm/init_64.c                              |   56 ++
 arch/x86/pci/acpi.c                                |    5 -
 arch/x86/pci/i386.c                                |    3 +
 arch/x86/pci/mmconfig-shared.c                     |   12 +-
 arch/x86/power/cpu_32.c                            |    7 +
 arch/x86/power/cpu_64.c                            |    7 +
 arch/x86/xen/enlighten.c                           |   45 +-
 drivers/pci/Makefile                               |    2 +
 drivers/pci/dma_remapping.h                        |  157 ++++
 drivers/pci/dmar.c                                 |  397 ++++++++-
 drivers/pci/intel-iommu.c                          |  185 +----
 drivers/pci/intel-iommu.h                          |  233 ++---
 drivers/pci/intr_remapping.c                       |  471 ++++++++++
 drivers/pci/intr_remapping.h                       |    8 +
 include/asm-generic/vmlinux.lds.h                  |    1 +
 include/asm-x86/apic.h                             |   65 ++-
 include/asm-x86/apicdef.h                          |    3 +
 include/asm-x86/arch_hooks.h                       |    2 -
 .../{mach-bigsmp/mach_apic.h => bigsmp/apic.h}     |   10 +-
 include/asm-x86/bigsmp/apicdef.h                   |   13 +
 .../{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h}       |    6 +-
 include/asm-x86/bugs.h                             |    5 +
 include/asm-x86/cpufeature.h                       |  118 ++-
 include/asm-x86/e820.h                             |    2 +
 .../{mach-es7000/mach_apic.h => es7000/apic.h}     |   32 +-
 include/asm-x86/es7000/apicdef.h                   |   13 +
 .../{mach-es7000/mach_ipi.h => es7000/ipi.h}       |    6 +-
 .../mach_mpparse.h => es7000/mpparse.h}            |    6 +-
 .../mach_wakecpu.h => es7000/wakecpu.h}            |    8 +-
 include/asm-x86/genapic_64.h                       |    8 +
 include/asm-x86/hw_irq.h                           |    3 +-
 include/asm-x86/i387.h                             |   84 ++-
 include/asm-x86/i8259.h                            |    3 +
 include/asm-x86/io_apic.h                          |   20 +
 include/asm-x86/ipi.h                              |   16 +-
 include/asm-x86/irq_remapping.h                    |    8 +
 include/asm-x86/mach-bigsmp/mach_apicdef.h         |   13 -
 include/asm-x86/mach-default/mach_apic.h           |    4 +-
 include/asm-x86/mach-default/mach_apicdef.h        |    6 +-
 include/asm-x86/mach-es7000/mach_apicdef.h         |   13 -
 include/asm-x86/mach-numaq/mach_mpparse.h          |    7 -
 include/asm-x86/mach-summit/mach_apicdef.h         |   13 -
 include/asm-x86/mpspec.h                           |    3 +-
 include/asm-x86/msidef.h                           |    4 +
 include/asm-x86/msr-index.h                        |   16 +
 .../{mach-numaq/mach_apic.h => numaq/apic.h}       |    6 +-
 .../{mach-numaq/mach_apicdef.h => numaq/apicdef.h} |    6 +-
 .../asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} |    6 +-
 include/asm-x86/numaq/mpparse.h                    |    7 +
 .../{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} |    6 +-
 include/asm-x86/paravirt.h                         |   19 -
 include/asm-x86/processor-cyrix.h                  |    8 +
 include/asm-x86/processor-flags.h                  |    1 +
 include/asm-x86/processor.h                        |   27 +-
 include/asm-x86/setup.h                            |    1 +
 include/asm-x86/sigcontext.h                       |   87 ++-
 include/asm-x86/sigcontext32.h                     |    6 +-
 include/asm-x86/smp.h                              |   17 +-
 .../{mach-summit/mach_apic.h => summit/apic.h}     |   24 +-
 include/asm-x86/summit/apicdef.h                   |   13 +
 .../{mach-summit/mach_ipi.h => summit/ipi.h}       |    6 +-
 .../{mach-summit => summit}/irq_vectors_limits.h   |    6 +-
 .../mach_mpparse.h => summit/mpparse.h}            |   13 +-
 include/asm-x86/thread_info.h                      |    1 +
 include/asm-x86/ucontext.h                         |    6 +
 include/asm-x86/xcr.h                              |   49 +
 include/asm-x86/xsave.h                            |  118 +++
 include/linux/dmar.h                               |  127 ++-
 include/linux/ioport.h                             |    3 +
 include/linux/irq.h                                |    1 +
 include/linux/percpu.h                             |    7 +
 kernel/irq/manage.c                                |    9 +-
 kernel/resource.c                                  |   68 ++
 144 files changed, 6628 insertions(+), 3287 deletions(-)
 delete mode 100644 arch/x86/kernel/cpu/amd_64.c
 create mode 100644 arch/x86/kernel/cpu/cmpxchg.c
 delete mode 100644 arch/x86/kernel/cpu/common_64.c
 delete mode 100644 arch/x86/kernel/cpu/feature_names.c
 delete mode 100644 arch/x86/kernel/cpu/intel_64.c
 create mode 100644 arch/x86/kernel/cpu/mkcapflags.pl
 create mode 100644 arch/x86/kernel/cpu/powerflags.c
 rename arch/x86/{mach-es7000/es7000plat.c => kernel/es7000_32.c} (78%)
 create mode 100644 arch/x86/kernel/genx2apic_cluster.c
 create mode 100644 arch/x86/kernel/genx2apic_phys.c
 create mode 100644 arch/x86/kernel/xsave.c
 delete mode 100644 arch/x86/mach-es7000/Makefile
 delete mode 100644 arch/x86/mach-es7000/es7000.h
 create mode 100644 drivers/pci/dma_remapping.h
 create mode 100644 drivers/pci/intr_remapping.c
 create mode 100644 drivers/pci/intr_remapping.h
 rename include/asm-x86/{mach-bigsmp/mach_apic.h => bigsmp/apic.h} (94%)
 create mode 100644 include/asm-x86/bigsmp/apicdef.h
 rename include/asm-x86/{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} (77%)
 rename include/asm-x86/{mach-es7000/mach_apic.h => es7000/apic.h} (91%)
 create mode 100644 include/asm-x86/es7000/apicdef.h
 rename include/asm-x86/{mach-es7000/mach_ipi.h => es7000/ipi.h} (77%)
 rename include/asm-x86/{mach-es7000/mach_mpparse.h => es7000/mpparse.h} (81%)
 rename include/asm-x86/{mach-es7000/mach_wakecpu.h => es7000/wakecpu.h} (89%)
 create mode 100644 include/asm-x86/irq_remapping.h
 delete mode 100644 include/asm-x86/mach-bigsmp/mach_apicdef.h
 delete mode 100644 include/asm-x86/mach-es7000/mach_apicdef.h
 delete mode 100644 include/asm-x86/mach-numaq/mach_mpparse.h
 delete mode 100644 include/asm-x86/mach-summit/mach_apicdef.h
 rename include/asm-x86/{mach-numaq/mach_apic.h => numaq/apic.h} (96%)
 rename include/asm-x86/{mach-numaq/mach_apicdef.h => numaq/apicdef.h} (55%)
 rename include/asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} (77%)
 create mode 100644 include/asm-x86/numaq/mpparse.h
 rename include/asm-x86/{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} (88%)
 rename include/asm-x86/{mach-summit/mach_apic.h => summit/apic.h} (93%)
 create mode 100644 include/asm-x86/summit/apicdef.h
 rename include/asm-x86/{mach-summit/mach_ipi.h => summit/ipi.h} (77%)
 rename include/asm-x86/{mach-summit => summit}/irq_vectors_limits.h (65%)
 rename include/asm-x86/{mach-summit/mach_mpparse.h => summit/mpparse.h} (95%)
 create mode 100644 include/asm-x86/xcr.h
 create mode 100644 include/asm-x86/xsave.h
Documentation/kernel-parameters.txt +6 -0
index a2701cb..c5d891f 100644
@@ -1424,6 +1424,12 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.
 
+	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.
+
+	x2apic_phys	[X86-64,APIC] Use x2apic physical mode instead of
+			default x2apic cluster mode on platforms
+			supporting x2apic.
+
 	noltlbs		[PPC] Do not use large page/tlb entries for kernel
 			lowmem mapping on PPC40x.
 
arch/um/sys-x86_64/syscall_table.c +2 -2
index c128eb8..32f5fbe 100644
@@ -41,12 +41,12 @@
 #define stub_rt_sigreturn sys_rt_sigreturn
 
 #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
-#undef _ASM_X86_64_UNISTD_H_
+#undef ASM_X86__UNISTD_64_H
 #include <asm-x86/unistd_64.h>
 
 #undef __SYSCALL
 #define __SYSCALL(nr, sym) [ nr ] = sym,
-#undef _ASM_X86_64_UNISTD_H_
+#undef ASM_X86__UNISTD_64_H
 
 typedef void (*sys_call_ptr_t)(void);
 
arch/x86/Kconfig +8 -0
index 0d7cdbb..44d4f21 100644
@@ -1689,6 +1689,14 @@ config DMAR_FLOPPY_WA
 	 workaround will setup a 1:1 mapping for the first
 	 16M to make floppy (an ISA device) work.
 
+config INTR_REMAP
+	bool "Support for Interrupt Remapping (EXPERIMENTAL)"
+	depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
+	help
+	 Supports Interrupt remapping for IO-APIC and MSI devices.
+	 To use x2apic mode in the CPU's which support x2APIC enhancements or
+	 to support platforms with CPU's having > 8 bit APIC ID, say Y.
+
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"
arch/x86/Kconfig.cpu +54 -0

60 lines not on this page · raw message

arch/x86/boot/cpu.c +9 -8
index 75298fe..6ec6bb6 100644
@@ -59,17 +59,18 @@ int validate_cpu(void)
 			u32 e = err_flags[i];
 
 			for (j = 0; j < 32; j++) {
-				int n = (i << 5)+j;
-				if (*msg_strs < n) {
+				if (msg_strs[0] < i ||
+				    (msg_strs[0] == i && msg_strs[1] < j)) {
 					/* Skip to the next string */
-					do {
-						msg_strs++;
-					} while (*msg_strs);
-					msg_strs++;
+					msg_strs += 2;
+					while (*msg_strs++)
+						;
 				}
 				if (e & 1) {
-					if (*msg_strs == n && msg_strs[1])
-						printf("%s ", msg_strs+1);
+					if (msg_strs[0] == i &&
+					    msg_strs[1] == j &&
+					    msg_strs[2])
+						printf("%s ", msg_strs+2);
 					else
 						printf("%d:%d ", i, j);
 				}
arch/x86/boot/mkcpustr.c +20 -20
index bbe7695..8ef60f2 100644
@@ -15,33 +15,33 @@
 
 #include <stdio.h>
 
-#include "../kernel/cpu/feature_names.c"
-
-#if NCAPFLAGS > 8
-# error "Need to adjust the boot code handling of CPUID strings"
-#endif
+#include "../kernel/cpu/capflags.c"
 
 int main(void)
 {
-	int i;
+	int i, j;
 	const char *str;
 
 	printf("static const char x86_cap_strs[] = \n");
 
-	for (i = 0; i < NCAPINTS*32; i++) {
-		str = x86_cap_flags[i];
-
-		if (i == NCAPINTS*32-1) {
-			/* The last entry must be unconditional; this
-			   also consumes the compiler-added null character */
-			if (!str)
-				str = "";
-			printf("\t\"\\x%02x\"\"%s\"\n", i, str);
-		} else if (str) {
-			printf("#if REQUIRED_MASK%d & (1 << %d)\n"
-			       "\t\"\\x%02x\"\"%s\\0\"\n"
-			       "#endif\n",
-			       i >> 5, i & 31, i, str);
+	for (i = 0; i < NCAPINTS; i++) {
+		for (j = 0; j < 32; j++) {
+			str = x86_cap_flags[i*32+j];
+
+			if (i == NCAPINTS-1 && j == 31) {
+				/* The last entry must be unconditional; this
+				   also consumes the compiler-added null
+				   character */
+				if (!str)
+					str = "";
+				printf("\t\"\\x%02x\\x%02x\"\"%s\"\n",
+				       i, j, str);
+			} else if (str) {
+				printf("#if REQUIRED_MASK%d & (1 << %d)\n"
+				       "\t\"\\x%02x\\x%02x\"\"%s\\0\"\n"
+				       "#endif\n",
+				       i, j, i, j, str);
+			}
 		}
 	}
 	printf("\t;\n");
arch/x86/ia32/ia32_signal.c +24 -27

148 lines not on this page · raw message

arch/x86/kernel/Makefile +4 -1
index 3db651f..c9be69f 100644
@@ -38,7 +38,7 @@ obj-y			+= tsc.o io_delay.o rtc.o
 
 obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o
 obj-y				+= process.o
-obj-y				+= i387.o
+obj-y				+= i387.o xsave.o
 obj-y				+= ptrace.o
 obj-y				+= ds.o
 obj-$(CONFIG_X86_32)		+= tls.o
@@ -69,6 +69,7 @@ obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o
 obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
 obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o
+obj-$(CONFIG_X86_ES7000)	+= es7000_32.o
 obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit_32.o
 obj-y				+= vsmp_64.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
@@ -104,6 +105,8 @@ obj-$(CONFIG_OLPC)		+= olpc.o
 ifeq ($(CONFIG_X86_64),y)
         obj-y				+= genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o
 	obj-y				+= bios_uv.o
+        obj-y				+= genx2apic_cluster.o
+        obj-y				+= genx2apic_phys.o
         obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o
         obj-$(CONFIG_AUDIT)		+= audit_64.o
 
arch/x86/kernel/acpi/boot.c +3 -5
index 7d40ef7..c2ac1b4 100644
@@ -252,10 +252,8 @@ static void __cpuinit acpi_register_lapic(int id, u8 enabled)
 		return;
 	}
 
-#ifdef CONFIG_X86_32
 	if (boot_cpu_physical_apicid != -1U)
 		ver = apic_version[boot_cpu_physical_apicid];
-#endif
 
 	generic_processor_info(id, ver);
 }
@@ -774,11 +772,9 @@ static void __init acpi_register_lapic_address(unsigned long address)
 
 	set_fixmap_nocache(FIX_APIC_BASE, address);
 	if (boot_cpu_physical_apicid == -1U) {
-		boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());
-#ifdef CONFIG_X86_32
+		boot_cpu_physical_apicid  = read_apic_id();
 		apic_version[boot_cpu_physical_apicid] =
 			 GET_APIC_VERSION(apic_read(APIC_LVR));
-#endif
 	}
 }
 
@@ -1350,7 +1346,9 @@ static void __init acpi_process_madt(void)
 				acpi_ioapic = 1;
 
 				smp_found_config = 1;
+#ifdef CONFIG_X86_32
 				setup_apic_routing();
+#endif
 			}
 		}
 		if (error == -EINVAL) {
arch/x86/kernel/apic_32.c +253 -184

787 lines not on this page · raw message

arch/x86/kernel/apic_64.c +540 -86

982 lines not on this page · raw message

arch/x86/kernel/cpu/Makefile +21 -13
index ee76eaa..7f0b45a 100644
@@ -3,22 +3,30 @@
 #
 
 obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
-obj-y			+= proc.o feature_names.o
-
-obj-$(CONFIG_X86_32)	+= common.o bugs.o
-obj-$(CONFIG_X86_64)	+= common_64.o bugs_64.o
-obj-$(CONFIG_X86_32)	+= amd.o
-obj-$(CONFIG_X86_64)	+= amd_64.o
-obj-$(CONFIG_X86_32)	+= cyrix.o
-obj-$(CONFIG_X86_32)	+= centaur.o
-obj-$(CONFIG_X86_64)	+= centaur_64.o
-obj-$(CONFIG_X86_32)	+= transmeta.o
-obj-$(CONFIG_X86_32)	+= intel.o
-obj-$(CONFIG_X86_64)	+= intel_64.o
-obj-$(CONFIG_X86_32)	+= umc.o
+obj-y			+= proc.o capflags.o powerflags.o common.o
+
+obj-$(CONFIG_X86_32)	+= bugs.o cmpxchg.o
+obj-$(CONFIG_X86_64)	+= bugs_64.o
+
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel.o
+obj-$(CONFIG_CPU_SUP_AMD)		+= amd.o
+obj-$(CONFIG_CPU_SUP_CYRIX_32)		+= cyrix.o
+obj-$(CONFIG_CPU_SUP_CENTAUR_32)	+= centaur.o
+obj-$(CONFIG_CPU_SUP_CENTAUR_64)	+= centaur_64.o
+obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
+obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
 obj-$(CONFIG_X86_MCE)	+= mcheck/
 obj-$(CONFIG_MTRR)	+= mtrr/
 obj-$(CONFIG_CPU_FREQ)	+= cpufreq/
 
 obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
+
+quiet_cmd_mkcapflags = MKCAP   $@
+      cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
+
+cpufeature = $(src)/../../../../include/asm-x86/cpufeature.h
+
+targets += capflags.c
+$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE
+	$(call if_changed,mkcapflags)
arch/x86/kernel/cpu/addon_cpuid_features.c +88 -0

100 lines not on this page · raw message

arch/x86/kernel/cpu/amd.c +359 -189

633 lines not on this page · raw message

arch/x86/kernel/cpu/amd_64.c deleted +0 -224

74 lines not on this page · raw message

arch/x86/kernel/cpu/centaur.c +2 -2
index a0534c0..89bfdd9 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/centaur_64.c +4 -2
index 1d181c4..a1625f5 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/cmpxchg.c new file +72 -0

72 lines not on this page · raw message

arch/x86/kernel/cpu/common.c +684 -289

973 lines not on this page · raw message

arch/x86/kernel/cpu/common_64.c deleted +0 -763

763 lines not on this page · raw message

arch/x86/kernel/cpu/cpu.h +6 -13
index 4d894e8..de4094a 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/cyrix.c +12 -11
index 898a5a2..ffd0f5e 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/feature_names.c deleted +0 -84

84 lines not on this page · raw message

arch/x86/kernel/cpu/intel.c +196 -168

364 lines not on this page · raw message

arch/x86/kernel/cpu/intel_64.c deleted +0 -95

95 lines not on this page · raw message

arch/x86/kernel/cpu/intel_cacheinfo.c +147 -22

169 lines not on this page · raw message

arch/x86/kernel/cpu/mcheck/mce_64.c +1 -1
index 726a5fc..4b031a4 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/mkcapflags.pl new file +32 -0
new file mode 100644
index 0000000..dfea390

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/powerflags.c new file +20 -0
new file mode 100644
index 0000000..5abbea2

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/transmeta.c +17 -15
index b911a2c..52b3fef 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/cpu/umc.c +2 -1
index b1fc909..e777f79 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/e820.c +27 -1
index 66e48aa..78e642f 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/es7000_32.c renamed from arch/x86/mach-es7000/es7000plat.c +85 -2

87 lines not on this page · raw message

arch/x86/kernel/genapic_64.c +32 -56

88 lines not on this page · raw message

arch/x86/kernel/genapic_flat_64.c +61 -1

62 lines not on this page · raw message

arch/x86/kernel/genx2apic_cluster.c new file +159 -0

159 lines not on this page · raw message

arch/x86/kernel/genx2apic_phys.c new file +154 -0

154 lines not on this page · raw message

arch/x86/kernel/genx2apic_uv_x.c +68 -2

70 lines not on this page · raw message

arch/x86/kernel/i387.c +135 -19

154 lines not on this page · raw message

arch/x86/kernel/i8259.c +24 -0
index dc92b49..4b8a53d 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/io_apic_32.c +27 -20

47 lines not on this page · raw message

arch/x86/kernel/io_apic_64.c +591 -48

639 lines not on this page · raw message

arch/x86/kernel/irqinit_32.c +49 -0

49 lines not on this page · raw message

arch/x86/kernel/mpparse.c +2 -0
index b3fb430..f98f4e1 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/numaq_32.c +7 -0
index eecc8c1..4caff39 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/paravirt.c +0 -2
index e2f4376..6b0bb73 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/process.c +0 -1
index ec7a2ba..c622772 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/setup.c +2 -0
index 141efab..46c98ef 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/sigframe.h +12 -2
index 8b4956e..cc673aa 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/signal_32.c +21 -24

45 lines not on this page · raw message

arch/x86/kernel/signal_64.c +9 -86

95 lines not on this page · raw message

arch/x86/kernel/smpboot.c +19 -19
index 45531e3..2ff0bbc 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/summit_32.c +1 -1
index d67ce5f..7b98785 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/traps_32.c +0 -1
index 03df8e4..da5a596 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/traps_64.c +1 -5
index 7a31f10..2887a78 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/vmi_32.c +2 -2
index 8c9ad02..8b6c393 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/vmlinux_32.lds.S +5 -4
index af5bdad..a9b8560 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/vmlinux_64.lds.S +4 -5
index 63e5c1a..201e81a 100644

Lines of this file are not shown. View the raw message.

arch/x86/kernel/xsave.c new file +316 -0

316 lines not on this page · raw message

arch/x86/kvm/vmx.h +0 -15
index 23e8373..17e2599 100644

Lines of this file are not shown. View the raw message.

arch/x86/lguest/boot.c +34 -4
index d9249a8..65f0b8a 100644

Lines of this file are not shown. View the raw message.

arch/x86/lib/Makefile +0 -3
index aa3fa41..55e11aa 100644

Lines of this file are not shown. View the raw message.

arch/x86/lib/usercopy_32.c +7 -0
index 24e6094..9e68075 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-default/setup.c +0 -15
index 3f2cf11..37b9ae4 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-es7000/Makefile deleted +0 -5
deleted file mode 100644
index 3ef8b43..0000000

Lines of this file are not shown. View the raw message.

arch/x86/mach-es7000/es7000.h deleted +0 -114

114 lines not on this page · raw message

arch/x86/mach-generic/Makefile +0 -1
index 0dbd780..6730f4e 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/bigsmp.c +4 -5
index 59d7717..df37fc9 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/es7000.c +6 -7
index 4742626..520cca0 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/numaq.c +6 -6
index 8091e68..8cf5839 100644

Lines of this file are not shown. View the raw message.

arch/x86/mach-generic/summit.c +5 -6
index a97ea0f..6ad6b67 100644

Lines of this file are not shown. View the raw message.

arch/x86/mm/init_64.c +56 -0

56 lines not on this page · raw message

arch/x86/pci/acpi.c +0 -5
index 19af069..1d88d2b 100644

Lines of this file are not shown. View the raw message.

arch/x86/pci/i386.c +3 -0
index 8791fc5..844df0c 100644

Lines of this file are not shown. View the raw message.

arch/x86/pci/mmconfig-shared.c +5 -7
index d963576..654a223 100644

Lines of this file are not shown. View the raw message.

arch/x86/power/cpu_32.c +7 -0
index d3e083d..274d060 100644

Lines of this file are not shown. View the raw message.

arch/x86/power/cpu_64.c +7 -0
index 66bdfb5..e3b6cf7 100644

Lines of this file are not shown. View the raw message.

arch/x86/xen/enlighten.c +41 -4

45 lines not on this page · raw message

drivers/pci/Makefile +2 -0
index 7d63f8c..4b47f4e 100644

Lines of this file are not shown. View the raw message.

drivers/pci/dma_remapping.h new file +157 -0

157 lines not on this page · raw message

drivers/pci/dmar.c +378 -19

397 lines not on this page · raw message

drivers/pci/intel-iommu.c +25 -160

185 lines not on this page · raw message

drivers/pci/intel-iommu.h +98 -135

233 lines not on this page · raw message

drivers/pci/intr_remapping.c new file +471 -0

471 lines not on this page · raw message

drivers/pci/intr_remapping.h new file +8 -0
new file mode 100644
index 0000000..05f2635

Lines of this file are not shown. View the raw message.

include/asm-generic/vmlinux.lds.h +1 -0
index cb752ba..7440a0d 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/apic.h +59 -6

65 lines not on this page · raw message

include/asm-x86/apicdef.h +3 -0
index c40687d..b922c85 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/arch_hooks.h +0 -2
index 72adc3a..de4596b 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/bigsmp/apic.h renamed from include/asm-x86/mach-bigsmp/mach_apic.h +5 -5
similarity index 94%
rename from include/asm-x86/mach-bigsmp/mach_apic.h
rename to include/asm-x86/bigsmp/apic.h
index 05362d4..0a9cd7c 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/bigsmp/apicdef.h new file +13 -0
new file mode 100644
index 0000000..392c3f5

Lines of this file are not shown. View the raw message.

include/asm-x86/bigsmp/ipi.h renamed from include/asm-x86/mach-bigsmp/mach_ipi.h +3 -3
similarity index 77%
rename from include/asm-x86/mach-bigsmp/mach_ipi.h
rename to include/asm-x86/bigsmp/ipi.h
index b1b0f96..9404c53 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/bugs.h +5 -0
index 4761c46..dc60498 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/cpufeature.h +81 -37

118 lines not on this page · raw message

include/asm-x86/e820.h +2 -0
index f52daf1..5abbdec 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/apic.h renamed from include/asm-x86/mach-es7000/mach_apic.h +16 -16
similarity index 91%
rename from include/asm-x86/mach-es7000/mach_apic.h
rename to include/asm-x86/es7000/apic.h
index c1f6f68..bd2c44d 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/apicdef.h new file +13 -0
new file mode 100644
index 0000000..8b234a3

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/ipi.h renamed from include/asm-x86/mach-es7000/mach_ipi.h +3 -3
similarity index 77%
rename from include/asm-x86/mach-es7000/mach_ipi.h
rename to include/asm-x86/es7000/ipi.h
index 3a21240..632a955 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/mpparse.h renamed from include/asm-x86/mach-es7000/mach_mpparse.h +3 -3
similarity index 81%
rename from include/asm-x86/mach-es7000/mach_mpparse.h
rename to include/asm-x86/es7000/mpparse.h
index befde24..7b5c889 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/es7000/wakecpu.h renamed from include/asm-x86/mach-es7000/mach_wakecpu.h +4 -4
similarity index 89%
rename from include/asm-x86/mach-es7000/mach_wakecpu.h
rename to include/asm-x86/es7000/wakecpu.h
index 97c776c..3ffc5a7 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/genapic_64.h +8 -0
index 25097a8..ed6a488 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/hw_irq.h +2 -1
index 65997b1..50f6e03 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/i387.h +72 -12

84 lines not on this page · raw message

include/asm-x86/i8259.h +3 -0
index c586559..23c1b3b 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/io_apic.h +20 -0
index be62847..8ec68a5 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/ipi.h +11 -5
index c1b2267..30a692c 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/irq_remapping.h new file +8 -0
new file mode 100644
index 0000000..78242c6

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-bigsmp/mach_apicdef.h deleted +0 -13
deleted file mode 100644
index 811935d..0000000

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-default/mach_apic.h +3 -1
index b615f40..2a330a4 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-default/mach_apicdef.h +3 -3
index 936704f..0c2d41c 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-es7000/mach_apicdef.h deleted +0 -13
deleted file mode 100644
index a07e567..0000000

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-numaq/mach_mpparse.h deleted +0 -7
deleted file mode 100644
index 74ade18..0000000

Lines of this file are not shown. View the raw message.

include/asm-x86/mach-summit/mach_apicdef.h deleted +0 -13
deleted file mode 100644
index d4bc859..0000000

Lines of this file are not shown. View the raw message.

include/asm-x86/mpspec.h +2 -1
index 118da36..be2241a 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/msidef.h +4 -0
index 3139666..ed91902 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/msr-index.h +16 -0
index 3052f05..0bb4330 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/apic.h renamed from include/asm-x86/mach-numaq/mach_apic.h +3 -3
similarity index 96%
rename from include/asm-x86/mach-numaq/mach_apic.h
rename to include/asm-x86/numaq/apic.h
index 7a0d39e..a8344ba 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/apicdef.h renamed from include/asm-x86/mach-numaq/mach_apicdef.h +3 -3
similarity index 55%
rename from include/asm-x86/mach-numaq/mach_apicdef.h
rename to include/asm-x86/numaq/apicdef.h
index f870ec5..e012a46 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/ipi.h renamed from include/asm-x86/mach-numaq/mach_ipi.h +3 -3
similarity index 77%
rename from include/asm-x86/mach-numaq/mach_ipi.h
rename to include/asm-x86/numaq/ipi.h
index 1e83582..935588d 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/mpparse.h new file +7 -0
new file mode 100644
index 0000000..252292e

Lines of this file are not shown. View the raw message.

include/asm-x86/numaq/wakecpu.h renamed from include/asm-x86/mach-numaq/mach_wakecpu.h +3 -3
similarity index 88%
rename from include/asm-x86/mach-numaq/mach_wakecpu.h
rename to include/asm-x86/numaq/wakecpu.h
index 0db8cea..c577bda 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/paravirt.h +0 -19
index 891971f..d7d358a 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/processor-cyrix.h +8 -0
index 97568ad..1198f2a 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/processor-flags.h +1 -0
index 5dd7977..dc5f071 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/processor.h +21 -6
index 5eaf9bf..c7d3546 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/setup.h +1 -0
index 9030cb7..11b6cc1 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/sigcontext.h +83 -4

87 lines not on this page · raw message

include/asm-x86/sigcontext32.h +5 -1
index 4e2ec73..8c34703 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/smp.h +10 -7
index 04f84f4..29324c1 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/apic.h renamed from include/asm-x86/mach-summit/mach_apic.h +12 -12
similarity index 93%
rename from include/asm-x86/mach-summit/mach_apic.h
rename to include/asm-x86/summit/apic.h
index 7a66758..c5b2e4b 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/apicdef.h new file +13 -0
new file mode 100644
index 0000000..f3fbca1

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/ipi.h renamed from include/asm-x86/mach-summit/mach_ipi.h +3 -3
similarity index 77%
rename from include/asm-x86/mach-summit/mach_ipi.h
rename to include/asm-x86/summit/ipi.h
index a3b31c5..53bd1e7 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/irq_vectors_limits.h renamed from include/asm-x86/mach-summit/irq_vectors_limits.h +3 -3
similarity index 65%
rename from include/asm-x86/mach-summit/irq_vectors_limits.h
rename to include/asm-x86/summit/irq_vectors_limits.h
index 22f376a..890ce3f 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/summit/mpparse.h renamed from include/asm-x86/mach-summit/mach_mpparse.h +6 -7
similarity index 95%
rename from include/asm-x86/mach-summit/mach_mpparse.h
rename to include/asm-x86/summit/mpparse.h
index 92396f2..013ce6f 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/thread_info.h +1 -0
index 4db0066..3f4e52b 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/ucontext.h +6 -0
index 9948dd3..89eaa54 100644

Lines of this file are not shown. View the raw message.

include/asm-x86/xcr.h new file +49 -0

49 lines not on this page · raw message

include/asm-x86/xsave.h new file +118 -0

118 lines not on this page · raw message

include/linux/dmar.h +100 -27

127 lines not on this page · raw message

include/linux/ioport.h +3 -0
index 350033e..ee9bcc6 100644

Lines of this file are not shown. View the raw message.

include/linux/irq.h +1 -0
index 8ccb462..8d9411b 100644

Lines of this file are not shown. View the raw message.

include/linux/percpu.h +7 -0
index fac3337..9f2a375 100644

Lines of this file are not shown. View the raw message.

kernel/irq/manage.c +8 -1
index 0314074..60c49e3 100644

Lines of this file are not shown. View the raw message.

kernel/resource.c +68 -0

68 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.