summaryrefslogtreecommitdiff
path: root/include/asm-x86
AgeCommit message (Collapse)Author
2008-06-25Merge commit 'd02859ecb321c8c0f74cb9bbe3f51a59e58822b0' into x86/setup-memoryIngo Molnar
2008-06-25x86: introduce init_memory_mapping for 32bit #3Yinghai Lu
move kva related early backto initmem_init for numa32 Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25x86: introduce init_memory_mapping for 32bit #2Yinghai Lu
moving relocate_initrd early Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25x86: introduce init_memory_mapping for 32bit #1Yinghai Lu
... so can we use mem below max_low_pfn earlier. this allows us to move several functions more early instead of waiting to after paging_init. That includes moving relocate_initrd() earlier in the bootup, and kva related early setup done in initmem_init. (in followup patches) Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25Merge branch 'x86/nmi-watchdog' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/oprofile' into auto-x86-nextIngo Molnar
2008-06-25manual merge of x86/setup-memoryIngo Molnar
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25Merge branch 'x86/fixmap' into auto-x86-nextIngo Molnar
2008-06-25manual merge of x86/smpbootIngo Molnar
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25Merge branch 'x86/mmio' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/setup' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/xen' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/threadinfo' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/resumetrace' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/ptemask' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/pat' into auto-x86-nextIngo Molnar
2008-06-25manual merge of x86/nmiIngo Molnar
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25manual merge of x86/mpparseIngo Molnar
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25Merge branch 'x86/kconfig' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/irqstats' into auto-x86-nextIngo Molnar
2008-06-25manual merge of x86/irqIngo Molnar
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25Merge branch 'x86/i8259' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/gart' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/cpu' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/cpa' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/cleanups' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/bitops' into auto-x86-nextIngo Molnar
2008-06-25Merge branch 'x86/apic' into auto-x86-nextIngo Molnar
2008-06-25paravirt: add hooks for ptep_modify_prot_start/commitJeremy Fitzhardinge
This patch adds paravirt-ops hooks in pv_mmu_ops for ptep_modify_prot_start and ptep_modify_prot_commit. This allows the hypervisor-specific backends to implement these in some more efficient way. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25Merge branch 'x86/xen' into x86/smpbootIngo Molnar
2008-06-25Merge branch 'x86/xen' into x86/setup-memoryIngo Molnar
2008-06-25Merge branch 'linus' into x86/nmi-watchdogIngo Molnar
2008-06-25Merge branch 'linus' into x86/nmitip-x86-nmi-2008-06-25_10.31_WedIngo Molnar
2008-06-25Merge branch 'linus' into x86/mpparseIngo Molnar
2008-06-25Merge branch 'linus' into x86/kconfigtip-x86-kconfig-2008-06-25_10.30_WedIngo Molnar
2008-06-25Merge branch 'linus' into x86/irqtip-x86-irq-2008-06-25_10.30_WedIngo Molnar
2008-06-25Merge branch 'linus' into x86/i8259tip-x86-i8259-2008-06-25_10.30_WedIngo Molnar
2008-06-25Merge branch 'linus' into x86/garttip-x86-gart-2008-06-25_10.30_WedIngo Molnar
2008-06-25Merge branch 'linus' into x86/fixmaptip-x86-fixmap-2008-06-25_10.30_WedIngo Molnar
2008-06-25Merge branch 'linus' into x86/cpuIngo Molnar
2008-06-25Merge branch 'linus' into x86/cleanupstip-x86-cleanups-2008-06-25_10.29_WedIngo Molnar
2008-06-25Merge branch 'linus' into tracing/mmiotraceIngo Molnar
2008-06-25Merge branch 'linus' into tracing/ftracetip-tracing-ftrace-2008-06-25_10.27_WedIngo Molnar
2008-06-25Merge branch 'linus' into stackprotectortip-stackprotector-2008-06-25_10.27_WedIngo Molnar
2008-06-25Merge branch 'linus' into cpus4096Ingo Molnar
2008-06-25Merge commit 'v2.6.26-rc8' into x86/xenIngo Molnar
Conflicts: arch/x86/xen/enlighten.c arch/x86/xen/mmu.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-25Merge branch 'master' of ↵Avi Kivity
master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: arch/x86/kvm/i8254.c arch/x86/kvm/lapic.c virt/kvm/ioapic.c Signed-off-by: Avi Kivity <avi@qumranet.com>
2008-06-24Merge branch 'kvm-updates-2.6.26' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: Remove now unused structs from kvm_para.h x86: KVM guest: Use the paravirt clocksource structs and functions KVM: Make kvm host use the paravirt clocksource structs x86: Make xen use the paravirt clocksource structs and functions x86: Add structs and functions for paravirt clocksource KVM: VMX: Fix host msr corruption with preemption enabled KVM: ioapic: fix lost interrupt when changing a device's irq KVM: MMU: Fix oops on guest userspace access to guest pagetable KVM: MMU: large page update_pte issue with non-PAE 32-bit guests (resend) KVM: MMU: Fix rmap_write_protect() hugepage iteration bug KVM: close timer injection race window in __vcpu_run KVM: Fix race between timer migration and vcpu migration
2008-06-24x86: nmi_watchdog - introduce nmi_watchdog_active() helperCyrill Gorcunov
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: macro@linux-mips.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-06-24x86: nmi_watchdog - use NMI_NONE by defaultCyrill Gorcunov
There is no need to keep NMI_DISABLED definition and use it for nmi_watchdog by default. Here is the point why: - IO-APIC and APIC chips are programmed for nmi_watchdog support at very early stage of kernel booting and not having nmi_watchdog specified as boot option lead only to nmi_watchdog becomes to NMI_NONE anyway - enable nmi_watchdog thru /proc/sys/kernel/nmi if it was not specified at boot is not possible too (even having this sysfs entry) Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: macro@linux-mips.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 12:25:44 +0000