x86-core-v4-for-linus
Subsystems (8)
Linus,
Please pull the latest x86-core-v4-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-core-v4-for-linus
it merges:
oprofile
timers/hpet # the timers/hpet-percpu bits come later
x86/traps [v2]
x86/time [v2]
x86/core misc items
out-of-topic modifications in x86-core-v4-for-linus:
----------------------------------------------------arch/Kconfig # 852402c: x86/oprofile: add CONFIG_OPROFILEdrivers/char/hpet.c # f26ed11: HPET: Remove spurious HPET busy w
# f92a789: hpet: /dev/hpet - fixes and clean # 64a76f6: hpet: /dev/hpet - fixes and clean # 70ef6d5: x86: get irq for hpet timerdrivers/oprofile/buffer_sync.c # 852402c: x86/oprofile: add CONFIG_OPROFILE
# 345c257: x86/oprofile: add IBS support for # 5e11f98: OProfile: moving increment_tail() # 73185e0: drivers/oprofile: coding style fidrivers/oprofile/cpu_buffer.c # bd17b62: oprofile: fix printk in cpu_buffe
# 852402c: x86/oprofile: add CONFIG_OPROFILE
# 345c257: x86/oprofile: add IBS support fordrivers/oprofile/cpu_buffer.h # 345c257: x86/oprofile: add IBS support forinclude/linux/hpet.h # 64a76f6: hpet: /dev/hpet - fixes and clean
# 70ef6d5: x86: get irq for hpet timerinclude/linux/oprofile.h # ee648bc: OProfile: add IBS code macros
Thanks,
Ingo
------------------>
Alexander van Heukelum (54):
i386: remove kprobes' restore_interrupts in favour of conditional_sti
i386: prepare to convert exceptions to interrupts
i386: convert hardware exception 0 to an interrupt gate
i386: expand exception 3 DO_TRAP macro
i386: convert hardware exception 4 to an interrupt gate
i386: convert hardware exception 5 to an interrupt gate
i386: convert hardware exception 6 to an interrupt gate
i386: convert hardware exception 7 to an interrupt gate
i386: convert hardware exception 9 to an interrupt gate
i386: convert hardware exception 10 to an interrupt gate
i386: convert hardware exception 11 to an interrupt gate
i386: convert hardware exception 12 to an interrupt gate
i386: convert hardware exception 13 to an interrupt gate
i386: convert hardware exception 15 to an interrupt gate
i386: convert hardware exception 16 to an interrupt gate
i386: convert hardware exception 17 to an interrupt gate
i386: convert hardware exception 18 to an interrupt gate
i386: convert hardware exception 19 to an interrupt gate
i386: remove temporary DO_TRAP macros, expanding the last one used
i386: add TRACE_IRQS_OFF to entry_32.S in 'error_code'
i386: add TRACE_IRQS_OFF for exception 1 (debug)
i386: add TRACE_IRQS_OFF for the nmi
i386: add TRACE_IRQS_OFF for the exception 3 (int3)
i386: trace_hardirqs_fixup should now not be necessary: irqs are off.
traps: x86_64: add TRACE_IRQS_OFF in error_entry
traps: x86_64: add TRACE_IRQS_OFF in paranoidentry macro
traps: x86_64: remove trace_hardirqs_fixup from DO_ERROR_INFO macro
traps: x86_64: remove trace_hardirqs_fixup from int3 handler
traps: x86_64: remove trace_hardirqs_fixup from debug handler
traps: x86: remove trace_hardirqs_fixup from pagefault handler
traps: i386: make do_trap more like x86_64
i386: split out dumpstack code from traps_32.c
x86_64: split out dumpstack code from traps_64.c
x86, traps: split out math_error and simd_math_error
x86, traps, i386: factor out lazy io-bitmap copy
x86, traps: introduce dotraplinkage
x86, traps: converge do_debug handlers
traps: x86: converge trap_init functions
traps: x86_64: make math_state_restore more like i386
traps: i386: use preempt_conditional_sti/cli in do_int3
traps: x86_64: make io_check_error equal to the one on i386
traps: i386: expand clear_mem_error and remove from mach_traps.h
traps: x86_64: use task_pid_nr(tsk) instead of tsk->pid in do_general_protection
traps: x86: various noop-changes preparing for unification of traps_xx.c
traps: x86: make traps_32.c and traps_64.c equal
traps: x86: finalize unification of traps.c
dumpstack: x86: move die_nmi to dumpstack_32.c
dumpstack: x86: make printk_address equal
dumpstack: x86: add "end" parameter to valid_stack_ptr and print_context_stack
dumptrace: x86: consistently include loglevel, print stack switch
dumpstack: x86: use log_lvl and unify trace formatting
dumpstack: i386: make kstack= an early boot-param and add oops=panic
dumpstack: x86: various small unification steps
dumpstack: x86: various small unification steps, fix
Andreas Herrmann (1):
x86: hpet: modify IXP400 quirk to enable interrupts
Barry Kasindorf (3):
oprofile: Add support for AMD Family 11h
x86/oprofile: add IBS support for AMD CPUs, IBS buffer handling routines x86/oprofile: add IBS support for AMD CPUs, model specific code
Chuck Ebbert (2):
x86: move prefill_possible_map calling early, fix, V2
x86: allow number of additional hotplug CPUs to be set at compile time, V2
Cyrill Gorcunov (1):
x86: smpboot - check if we have ESR register in wakeup_secondary_cpu
David Brownell (2):
hpet: /dev/hpet - fixes and cleanup
hpet: /dev/hpet - fixes and cleanup, fix
David John (1):
HPET: Remove spurious HPET busy warning message.
Glauber Costa (13):
x86: use user_mode macro
x86: coalesce tests
x86: set bp field in pt_regs properly
x86: use frame pointer information on x86_64 profile_pc
x86: remove SEGMENT_IS_FLAT_CODE
x86: use user_mode_vm instead of user_mode
x86: bind irq0 irq data to cpu0
x86: factor out irq initialization for x86_64
x86: make init_ISA_irqs nonstatic
x86: rename timer_event_interrupt to timer_interrupt
x86: replace hardcoded number
x86: wrap MCA_bus test around an ifdef
x86: move vgetcpu mode probing to cpu detection
Ingo Molnar (2):
x86: print out EBDA/lowmem address
x86: remove additional_cpus configurability
Jack Steiner (3):
x86, uv: add early detection of UV system types x86, uv: fix for size of hub mappings x86, UV: new UV genapic functions for x2apic
Jan Beulich (5):
x86-64: reduce boot fixmap space
x86-64: slightly stream-line 32-bit syscall entry code
x86-64: fix combining of regions in init_memory_mapping()
x86: make mm/gup.c more virtualization friendly
x86: adjust dependencies for CONFIG_X86_CMOV
Jeremy Fitzhardinge (5):
x86: add _PAGE_IOMAP pte flag for IO mappings
x86: remove duplicate early_ioremap declarations
x86: add early_memremap()
x86: use early_memremap() in setup.c
x86-64: don't check for map replacement
Joe Buehler (1):
x86: add PCI ID for 6300ESB force hpet
Jordan Crouse (1):
x86, hpet: SB600 - remove HPET resources from PCI device
Kevin Hao (1):
x86: get irq for hpet timer
Krzysztof Helt (2):
x86: merge winchip-2 and winchip-2a cpu choices
x86: do not allow to optimize flag_is_changeable_p() (rev. 2)
Krzysztof Oledzki (1):
x86: add another PCI ID for ICH6 force-hpet
Manfred Spraul (1):
arch/x86/kernel/smpboot.c: Clarify when irq processing begins.
Pekka Enberg (1):
x86: __show_registers() and __show_regs() API unification
Randy Dunlap (1):
documentation: move hpet.txt to timers/ subdirectory
Robert Richter (22):
x86: add PCI IDs for AMD Barcelona PCI devices
x86: apic_*.c: add description to AMD's extended LVT functions x86/oprofile: introduce model specific init/exit functions x86/oprofile: Minor changes in op_model_athlon.c x86/oprofile: renaming athlon_*() into op_amd_*() drivers/oprofile: coding style fixes in buffer_sync.c
OProfile: moving increment_tail() in buffer_sync.c
OProfile: add IBS code macros
x86/oprofile: separating the IBS handler
OProfile: change IBS interrupt initialization
OProfile: Fix build error in op_model_athlon.c
OProfile: on_each_cpu(): kill unused retry parameter
OProfile: fix setup_ibs_files() function interface
OProfile: enable IBS for AMD CPUs
OProfile: fix IBS build error for UP
x86/oprofile: macro definition cleanup in op_model_athlon.c x86/oprofile: op_model_athlon.c: fix counter reset when reenabling IBS OP
x86: apic: export symbols for extended interrupt LVT functions
x86: apic: changing export symbols to *_GPL
x86/oprofile: add CONFIG_OPROFILE_IBS option
oprofile: fix printk in cpu_buffer.c
x86/oprofile: reanaming op_model_athlon.c to op_model_amd.c
Thomas Gleixner (2):
x86: improve UP kernel when CPU-hotplug and SMP is enabled
x86: remove additional_cpus
Vegard Nossum (2):
x86: add memory clobber in switch_to()
x86: fix virt_addr_valid() with CONFIG_DEBUG_VIRTUAL=y, v2
Yinghai Lu (5):
x86: rename discontig_32.c to numa_32.c
x86: check dsdt before find oem table for es7000, v2
x86: cpu don't print duplicated vendor string
x86: cleanup, remove extra ifdef
x86: change early_ioremap to use slots instead of nesting
Documentation/00-INDEX | 2 -
Documentation/timers/00-INDEX | 10 +
Documentation/{ => timers}/hpet.txt | 43 +-
arch/Kconfig | 14 +
arch/x86/Kconfig.cpu | 29 +-
arch/x86/Makefile_32.cpu | 1 -
arch/x86/configs/i386_defconfig | 1 -
arch/x86/configs/x86_64_defconfig | 1 -
arch/x86/ia32/ia32entry.S | 26 +-
arch/x86/kernel/Makefile | 2 +-
arch/x86/kernel/alternative.c | 2 +-
arch/x86/kernel/apic_32.c | 4 +
arch/x86/kernel/apic_64.c | 4 +
arch/x86/kernel/cpu/common.c | 45 +-
arch/x86/kernel/doublefault_32.c | 2 +-
arch/x86/kernel/dumpstack_32.c | 447 +++++++++++
arch/x86/kernel/dumpstack_64.c | 573 ++++++++++++++
arch/x86/kernel/entry_32.S | 22 +-
arch/x86/kernel/entry_64.S | 15 +-
arch/x86/kernel/es7000_32.c | 28 +-
arch/x86/kernel/genx2apic_uv_x.c | 23 +-
arch/x86/kernel/head.c | 1 +
arch/x86/kernel/hpet.c | 6 +-
arch/x86/kernel/irqinit_64.c | 43 +-
arch/x86/kernel/process_32.c | 4 +-
arch/x86/kernel/process_64.c | 7 +-
arch/x86/kernel/quirks.c | 41 +-
arch/x86/kernel/setup.c | 10 +-
arch/x86/kernel/smpboot.c | 87 +--
arch/x86/kernel/time_32.c | 7 +-
arch/x86/kernel/time_64.c | 23 +-
arch/x86/kernel/{traps_32.c => traps.c} | 893 ++++++++-------------
arch/x86/kernel/traps_64.c | 1214 -----------------------------
arch/x86/mach-generic/es7000.c | 20 +-
arch/x86/mm/Makefile | 6 +-
arch/x86/mm/fault.c | 5 -
arch/x86/mm/gup.c | 10 +-
arch/x86/mm/init_32.c | 2 +-
arch/x86/mm/init_64.c | 9 +-
arch/x86/mm/ioremap.c | 143 +++-
arch/x86/mm/{discontig_32.c => numa_32.c} | 0
arch/x86/mm/srat_64.c | 2 +-
arch/x86/oprofile/Makefile | 2 +-
arch/x86/oprofile/nmi_int.c | 27 +-
arch/x86/oprofile/op_model_amd.c | 543 +++++++++++++
arch/x86/oprofile/op_model_athlon.c | 190 -----
arch/x86/oprofile/op_x86_model.h | 4 +-
arch/x86/pci/fixup.c | 28 +
drivers/char/hpet.c | 159 +++--
drivers/oprofile/buffer_sync.c | 209 ++++--
drivers/oprofile/cpu_buffer.c | 74 ++-
drivers/oprofile/cpu_buffer.h | 2 +
include/asm-x86/desc.h | 14 +-
include/asm-x86/es7000/mpparse.h | 1 +
include/asm-x86/fixmap_32.h | 4 +-
include/asm-x86/fixmap_64.h | 12 +-
include/asm-x86/io.h | 15 +-
include/asm-x86/io_64.h | 3 -
include/asm-x86/irqflags.h | 21 -
include/asm-x86/kdebug.h | 3 +-
include/asm-x86/kprobes.h | 9 -
include/asm-x86/mach-default/mach_traps.h | 6 -
include/asm-x86/module.h | 2 -
include/asm-x86/nmi.h | 4 -
include/asm-x86/page.h | 8 +-
include/asm-x86/page_32.h | 10 +-
include/asm-x86/pgtable.h | 16 +-
include/asm-x86/ptrace.h | 4 -
include/asm-x86/segment.h | 6 -
include/asm-x86/smp.h | 8 +-
include/asm-x86/system.h | 5 +-
include/asm-x86/traps.h | 73 +-
include/linux/hpet.h | 14 +-
include/linux/oprofile.h | 2 +
74 files changed, 2793 insertions(+), 2512 deletions(-)
create mode 100644 Documentation/timers/00-INDEX
rename Documentation/{ => timers}/hpet.txt (81%)
create mode 100644 arch/x86/kernel/dumpstack_32.c
create mode 100644 arch/x86/kernel/dumpstack_64.c
rename arch/x86/kernel/{traps_32.c => traps.c} (57%)
delete mode 100644 arch/x86/kernel/traps_64.c
rename arch/x86/mm/{discontig_32.c => numa_32.c} (100%)
create mode 100644 arch/x86/oprofile/op_model_amd.c
delete mode 100644 arch/x86/oprofile/op_model_athlon.cDocumentation/00-INDEX +0 -2
@@ -159,8 +159,6 @@ hayes-esp.txt - info on using the Hayes ESP serial driver. highuid.txt - notes on the change from 16 bit to 32 bit user/group IDs. -hpet.txt - - High Precision Event Timer Driver for Linux. timers/ - info on the timer related topics hw_random.txt
Documentation/timers/00-INDEX new file +10 -0
@@ -0,0 +1,10 @@ +00-INDEX + - this file +highres.txt + - High resolution timers and dynamic ticks design notes +hpet.txt + - High Precision Event Timer Driver for Linux +hrtimers.txt + - subsystem for high-resolution kernel timers +timer_stats.txt + - timer usage statistics
Documentation/timers/hpet.txt renamed from Documentation/hpet.txt +21 -22
57 lines not on this page · raw message
arch/Kconfig +14 -0
@@ -13,6 +13,20 @@ config OPROFILE If unsure, say N. +config OPROFILE_IBS + bool "OProfile AMD IBS support (EXPERIMENTAL)" + default n + depends on OPROFILE && SMP && X86 + help + Instruction-Based Sampling (IBS) is a new profiling + technique that provides rich, precise program performance + information. IBS is introduced by AMD Family10h processors + (AMD Opteron Quad-Core processor “Barcelona”) to overcome + the limitations of conventional performance counter + sampling. + + If unsure, say N. + config HAVE_OPROFILE def_bool n
arch/x86/Kconfig.cpu +10 -19
@@ -38,8 +38,7 @@ config M386 - "Crusoe" for the Transmeta Crusoe series. - "Efficeon" for the Transmeta Efficeon series. - "Winchip-C6" for original IDT Winchip. - - "Winchip-2" for IDT Winchip 2. - - "Winchip-2A" for IDT Winchips with 3dNow! capabilities. + - "Winchip-2" for IDT Winchips with 3dNow! capabilities. - "GeodeGX1" for Geode GX1 (Cyrix MediaGX). - "Geode GX/LX" For AMD Geode GX and LX processors. - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
@@ -194,19 +193,11 @@ config MWINCHIPC6 treat this chip as a 586TSC with some extended instructions and alignment requirements. -config MWINCHIP2 - bool "Winchip-2" - depends on X86_32 - help - Select this for an IDT Winchip-2. Linux and GCC - treat this chip as a 586TSC with some extended instructions - and alignment requirements. - config MWINCHIP3D - bool "Winchip-2A/Winchip-3" + bool "Winchip-2/Winchip-2A/Winchip-3" depends on X86_32 help - Select this for an IDT Winchip-2A or 3. Linux and GCC + Select this for an IDT Winchip-2, 2A or 3. Linux and GCC treat this chip as a 586TSC with some extended instructions and alignment requirements. Also enable out of order memory stores for this CPU, which can increase performance of some
@@ -318,7 +309,7 @@ config X86_L1_CACHE_SHIFT int default "7" if MPENTIUM4 || X86_GENERIC || GENERIC_CPU || MPSC default "4" if X86_ELAN || M486 || M386 || MGEODEGX1 - default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX + default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MVIAC7 config X86_XADD
@@ -360,7 +351,7 @@ config X86_POPAD_OK config X86_ALIGNMENT_16 def_bool y - depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1 config X86_INTEL_USERCOPY def_bool y
@@ -368,7 +359,7 @@ config X86_INTEL_USERCOPY config X86_USE_PPRO_CHECKSUM def_bool y - depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX || MCORE2 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX || MCORE2 config X86_USE_3DNOW def_bool y
@@ -376,7 +367,7 @@ config X86_USE_3DNOW config X86_OOSTORE def_bool y - depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR + depends on (MWINCHIP3D || MWINCHIPC6) && MTRR # # P6_NOPs are a relatively minor optimization that require a family >=
@@ -396,7 +387,7 @@ config X86_P6_NOP config X86_TSC def_bool y - depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64 + depends on ((MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64 config X86_CMPXCHG64 def_bool y
@@ -406,7 +397,7 @@ config X86_CMPXCHG64 # generates cmov. config X86_CMOV def_bool y - depends on (MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || X86_64) + depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64) config X86_MINIMUM_CPU_FAMILY int
@@ -417,7 +408,7 @@ config X86_MINIMUM_CPU_FAMILY config X86_DEBUGCTLMSR def_bool y - depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386) + depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386) menuconfig PROCESSOR_SELECT bool "Supported processor vendors" if EMBEDDED
arch/x86/Makefile_32.cpu +0 -1
@@ -28,7 +28,6 @@ cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8,-march=athlon) cflags-$(CONFIG_MCRUSOE) += -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0 cflags-$(CONFIG_MEFFICEON) += -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0 cflags-$(CONFIG_MWINCHIPC6) += $(call cc-option,-march=winchip-c6,-march=i586) -cflags-$(CONFIG_MWINCHIP2) += $(call cc-option,-march=winchip2,-march=i586) cflags-$(CONFIG_MWINCHIP3D) += $(call cc-option,-march=winchip2,-march=i586) cflags-$(CONFIG_MCYRIXIII) += $(call cc-option,-march=c3,-march=i486) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0 cflags-$(CONFIG_MVIAC3_2) += $(call cc-option,-march=c3-2,-march=i686)
arch/x86/configs/i386_defconfig +0 -1
@@ -213,7 +213,6 @@ CONFIG_M686=y # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set
arch/x86/configs/x86_64_defconfig +0 -1
@@ -210,7 +210,6 @@ CONFIG_X86_PC=y # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set
arch/x86/ia32/ia32entry.S +10 -16
@@ -39,11 +39,11 @@ .endm /* clobbers %eax */ - .macro CLEAR_RREGS + .macro CLEAR_RREGS _r9=rax xorl %eax,%eax movq %rax,R11(%rsp) movq %rax,R10(%rsp) - movq %rax,R9(%rsp) + movq %\_r9,R9(%rsp) movq %rax,R8(%rsp) .endm
@@ -52,11 +52,10 @@ * We don't reload %eax because syscall_trace_enter() returned * the value it wants us to use in the table lookup. */ - .macro LOAD_ARGS32 offset - movl \offset(%rsp),%r11d - movl \offset+8(%rsp),%r10d + .macro LOAD_ARGS32 offset, _r9=0 + .if \_r9 movl \offset+16(%rsp),%r9d - movl \offset+24(%rsp),%r8d + .endif movl \offset+40(%rsp),%ecx movl \offset+48(%rsp),%edx movl \offset+56(%rsp),%esi
@@ -145,7 +144,7 @@ ENTRY(ia32_sysenter_target) SAVE_ARGS 0,0,1 /* no need to do an access_ok check here because rbp has been 32bit zero extended */ -1: movl (%rbp),%r9d +1: movl (%rbp),%ebp .section __ex_table,"a" .quad 1b,ia32_badarg .previous
@@ -157,7 +156,7 @@ ENTRY(ia32_sysenter_target) cmpl $(IA32_NR_syscalls-1),%eax ja ia32_badsys sysenter_do_call: - IA32_ARG_FIXUP 1 + IA32_ARG_FIXUP sysenter_dispatch: call *ia32_sys_call_table(,%rax,8) movq %rax,RAX-ARGOFFSET(%rsp)
@@ -234,20 +233,17 @@ sysexit_audit: #endif sysenter_tracesys: - xchgl %r9d,%ebp #ifdef CONFIG_AUDITSYSCALL testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10) jz sysenter_auditsys #endif SAVE_REST CLEAR_RREGS - movq %r9,R9(%rsp) movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST - xchgl %ebp,%r9d cmpl $(IA32_NR_syscalls-1),%eax ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */ jmp sysenter_do_call
@@ -314,9 +310,9 @@ ENTRY(ia32_cstar_target) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) CFI_REMEMBER_STATE jnz cstar_tracesys -cstar_do_call: cmpl $IA32_NR_syscalls-1,%eax ja ia32_badsys +cstar_do_call: IA32_ARG_FIXUP 1 cstar_dispatch: call *ia32_sys_call_table(,%rax,8)
@@ -357,15 +353,13 @@ cstar_tracesys: #endif xchgl %r9d,%ebp SAVE_REST - CLEAR_RREGS - movq %r9,R9(%rsp) + CLEAR_RREGS r9 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ movq %rsp,%rdi /* &pt_regs -> arg1 */ call syscall_trace_enter - LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ + LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */ RESTORE_REST xchgl %ebp,%r9d - movl RSP-ARGOFFSET(%rsp), %r8d cmpl $(IA32_NR_syscalls-1),%eax ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */ jmp cstar_do_call
arch/x86/kernel/Makefile +1 -1
@@ -23,7 +23,7 @@ CFLAGS_hpet.o := $(nostackp) CFLAGS_tsc.o := $(nostackp) obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o -obj-y += traps_$(BITS).o irq_$(BITS).o +obj-y += traps.o irq_$(BITS).o dumpstack_$(BITS).o obj-y += time_$(BITS).o ioport.o ldt.o obj-y += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o obj-$(CONFIG_X86_VISWS) += visws_quirks.o
arch/x86/kernel/alternative.c +1 -1
@@ -444,7 +444,7 @@ void __init alternative_instructions(void) _text, _etext);/* Only switch to UP mode if we don't immediately boot others */ -if (num_possible_cpus () ==1 || setup_max_cpus <=1 ) +if (num_present_cpus () ==1 || setup_max_cpus <=1 ) alternatives_smp_switch(0); }#endif
arch/x86/kernel/apic_32.c +4 -0
@@ -295,6 +295,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)* * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and * MCE interrupts are supported. Thus MCE offset must be set to 0. +* +* If mask=1, the LVT entry does not generate interrupts while mask=0 +* enables the vector. See also the BKDGs. */ #define APIC_EILVT_LVTOFF_MCE 0
@@ -319,6 +322,7 @@ u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)setup_APIC_eilvt (APIC_EILVT_LVTOFF_IBS , vector, msg_type, mask);return APIC_EILVT_LVTOFF_IBS ; } +EXPORT_SYMBOL_GPL (setup_APIC_eilvt_ibs);/* * Program the next event, relative to now
arch/x86/kernel/apic_64.c +4 -0
@@ -307,6 +307,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)* * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and * MCE interrupts are supported. Thus MCE offset must be set to 0. +* +* If mask=1, the LVT entry does not generate interrupts while mask=0 +* enables the vector. See also the BKDGs. */ #define APIC_EILVT_LVTOFF_MCE 0
@@ -331,6 +334,7 @@ u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)setup_APIC_eilvt (APIC_EILVT_LVTOFF_IBS , vector, msg_type, mask);return APIC_EILVT_LVTOFF_IBS ; } +EXPORT_SYMBOL_GPL (setup_APIC_eilvt_ibs);/* * Program the next event, relative to now
arch/x86/kernel/cpu/common.c +32 -13
69 lines not on this page · raw message
arch/x86/kernel/doublefault_32.c +1 -1
@@ -66,6 +66,6 @@ struct tss_struct doublefault_tss __cacheline_aligned = { .ds = __USER_DS, .fs = __KERNEL_PERCPU, - .__cr3 = __phys_addr_const((unsigned long)swapper_pg_dir) + .__cr3 = __pa_nodebug(swapper_pg_dir), } };
arch/x86/kernel/dumpstack_32.c new file +447 -0
447 lines not on this page · raw message
arch/x86/kernel/dumpstack_64.c new file +573 -0
573 lines not on this page · raw message
arch/x86/kernel/entry_32.S +8 -14
@@ -730,6 +730,7 @@ error_code: movl $(__USER_DS), %ecx movl %ecx, %ds movl %ecx, %es + TRACE_IRQS_OFF movl %esp,%eax # pt_regs pointer call *%edi jmp ret_from_exception
@@ -760,20 +761,9 @@ ENTRY(device_not_available) RING0_INT_FRAME pushl $-1 # mark this as an int CFI_ADJUST_CFA_OFFSET 4 - SAVE_ALL - GET_CR0_INTO_EAX - testl $0x4, %eax # EM (math emulation bit) - jne device_not_available_emulate - preempt_stop(CLBR_ANY) - call math_state_restore - jmp ret_from_exception -device_not_available_emulate: - pushl $0 # temporary storage for ORIG_EIP + pushl $do_device_not_available CFI_ADJUST_CFA_OFFSET 4 - call math_emulate - addl $4, %esp - CFI_ADJUST_CFA_OFFSET -4 - jmp ret_from_exception + jmp error_code CFI_ENDPROC END(device_not_available)
@@ -814,6 +804,7 @@ debug_stack_correct: pushl $-1 # mark this as an int CFI_ADJUST_CFA_OFFSET 4 SAVE_ALL + TRACE_IRQS_OFF xorl %edx,%edx # error code 0 movl %esp,%eax # pt_regs pointer call do_debug
@@ -858,6 +849,7 @@ nmi_stack_correct: pushl %eax CFI_ADJUST_CFA_OFFSET 4 SAVE_ALL + TRACE_IRQS_OFF xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_nmi
@@ -898,6 +890,7 @@ nmi_espfix_stack: pushl %eax CFI_ADJUST_CFA_OFFSET 4 SAVE_ALL + TRACE_IRQS_OFF FIXUP_ESPFIX_STACK # %eax == %esp xorl %edx,%edx # zero error code call do_nmi
@@ -928,6 +921,7 @@ KPROBE_ENTRY(int3) pushl $-1 # mark this as an int CFI_ADJUST_CFA_OFFSET 4 SAVE_ALL + TRACE_IRQS_OFF xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_int3
@@ -1030,7 +1024,7 @@ ENTRY(machine_check) RING0_INT_FRAME pushl $0 CFI_ADJUST_CFA_OFFSET 4 - pushl machine_check_vector + pushl $do_machine_check CFI_ADJUST_CFA_OFFSET 4 jmp error_code CFI_ENDPROC
arch/x86/kernel/entry_64.S +13 -2
@@ -667,6 +667,13 @@ END(stub_rt_sigreturn) SAVE_ARGS leaq -ARGOFFSET(%rsp),%rdi # arg1 for handler pushq %rbp + /* + * Save rbp twice: One is for marking the stack frame, as usual, and the + * other, to fill pt_regs properly. This is because bx comes right + * before the last saved register in that structure, and not bp. If the + * base pointer were in the place bx is today, this would not be needed. + */ + movq %rbp, -8(%rsp) CFI_ADJUST_CFA_OFFSET 8 CFI_REL_OFFSET rbp, 0 movq %rsp,%rbp
@@ -932,6 +939,9 @@ END(spurious_interrupt) .if \ist movq %gs:pda_data_offset, %rbp .endif + .if \irqtrace + TRACE_IRQS_OFF + .endif movq %rsp,%rdi movq ORIG_RAX(%rsp),%rsi movq $-1,ORIG_RAX(%rsp)
@@ -1058,7 +1068,8 @@ KPROBE_ENTRY(error_entry) je error_kernelspace error_swapgs: SWAPGS -error_sti: +error_sti: + TRACE_IRQS_OFF movq %rdi,RDI(%rsp) CFI_REL_OFFSET rdi,RDI movq %rsp,%rdi
@@ -1232,7 +1243,7 @@ ENTRY(simd_coprocessor_error) END(simd_coprocessor_error) ENTRY(device_not_available) - zeroentry math_state_restore + zeroentry do_device_not_available END(device_not_available) /* runs on exception stack */
arch/x86/kernel/es7000_32.c +23 -5
@@ -109,6 +109,7 @@ struct oem_table { };extern int find_unisys_acpi_oem_table (unsigned long *oem_addr); +extern void unmap_unisys_acpi_oem_table (unsigned long oem_addr);#endif struct mip_reg {
@@ -243,21 +244,38 @@ parse_unisys_oem (char *oemptr) }#ifdef CONFIG_ACPI -int __init -find_unisys_acpi_oem_table (unsigned long *oem_addr) +static unsigned long oem_addrX; +static unsigned long oem_size; +int __init find_unisys_acpi_oem_table (unsigned long *oem_addr) {struct acpi_table_header *header =NULL ;int i =0 ; -while (ACPI_SUCCESS (acpi_get_table ("OEM1" , i++, &header))) { +acpi_size tbl_size; + +while (ACPI_SUCCESS (acpi_get_table_with_size ("OEM1" , i++, &header, &tbl_size))) {if (!memcmp ((char *) &header->oem_id,"UNISYS" ,6 )) {struct oem_table *t = (struct oem_table *)header; - *oem_addr = (unsigned long )__acpi_map_table (t->OEMTableAddr, - t->OEMTableSize); + + oem_addrX = t->OEMTableAddr; + oem_size = t->OEMTableSize; +early_acpi_os_unmap_memory (header, tbl_size); + + *oem_addr = (unsigned long )__acpi_map_table (oem_addrX, + oem_size);return 0 ; } +early_acpi_os_unmap_memory (header, tbl_size); }return -1 ; } + +void __init unmap_unisys_acpi_oem_table (unsigned long oem_addr) +{ +if (!oem_addr) +return ; + +__acpi_unmap_table ((char *)oem_addr, oem_size); +}#endif static void
arch/x86/kernel/genx2apic_uv_x.c +11 -12
@@ -114,7 +114,7 @@ static void uv_send_IPI_one(int cpu, int vector)unsigned long val, apicid, lapicid;int pnode; - apicid =per_cpu (x86_cpu_to_apicid, cpu);/* ZZZ - cache node-local ? */ + apicid =per_cpu (x86_cpu_to_apicid, cpu); lapicid = apicid &0x3f ;/* ZZZ macro needed */ pnode =uv_apicid_to_pnode (apicid); val =
@@ -202,12 +202,10 @@ static unsigned int phys_pkg_id(int index_msb)return uv_read_apic_id () >> index_msb; } -#ifdef ZZZ /* Needs x2apic patch */ static void uv_send_IPI_self (int vector) {apic_write (APIC_SELF_IPI , vector); } -#endif struct genapic apic_x2apic_uv_x = { .name ="UV large system" ,
@@ -215,15 +213,15 @@ struct genapic apic_x2apic_uv_x = { .int_delivery_mode = dest_Fixed, .int_dest_mode = (APIC_DEST_PHYSICAL != 0), .target_cpus = uv_target_cpus, - .vector_allocation_domain = uv_vector_allocation_domain,/* Fixme ZZZ */ + .vector_allocation_domain = uv_vector_allocation_domain, .apic_id_registered = uv_apic_id_registered, .init_apic_ldr = uv_init_apic_ldr, .send_IPI_all = uv_send_IPI_all, .send_IPI_allbutself = uv_send_IPI_allbutself, .send_IPI_mask = uv_send_IPI_mask, -/* ZZZ.send_IPI_self = uv_send_IPI_self, */ + .send_IPI_self = uv_send_IPI_self, .cpu_mask_to_apicid = uv_cpu_mask_to_apicid, - .phys_pkg_id = phys_pkg_id, /* Fixme ZZZ */ + .phys_pkg_id = phys_pkg_id, .get_apic_id = get_apic_id, .set_apic_id = set_apic_id, .apic_id_mask = (0xFFFFFFFFu),
@@ -286,12 +284,13 @@ static __init void map_low_mmrs(void)enum map_type {map_wb, map_uc}; -static __init void map_high (char *id,unsigned long base,int shift,enum map_type map_type) +static __init void map_high (char *id,unsigned long base,int shift, +int max_pnode,enum map_type map_type) {unsigned long bytes, paddr; paddr = base << shift; - bytes = (1UL << shift); + bytes = (1UL << shift) * (max_pnode +1 );printk (KERN_INFO "UV: Map %s_HI 0x%lx - 0x%lx\n" , id, paddr, paddr + bytes);if (map_type == map_uc)
@@ -307,7 +306,7 @@ static __init void map_gru_high(int max_pnode) gru.v =uv_read_local_mmr (UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR );if (gru.s.enable) -map_high ("GRU" , gru.s.base, shift, map_wb); +map_high ("GRU" , gru.s.base, shift, max_pnode, map_wb); }static __init void map_config_high (int max_pnode)
@@ -317,7 +316,7 @@ static __init void map_config_high(int max_pnode) cfg.v =uv_read_local_mmr (UVH_RH_GAM_CFG_OVERLAY_CONFIG_MMR );if (cfg.s.enable) -map_high ("CONFIG" , cfg.s.base, shift, map_uc); +map_high ("CONFIG" , cfg.s.base, shift, max_pnode, map_uc); }static __init void map_mmr_high (int max_pnode)
@@ -327,7 +326,7 @@ static __init void map_mmr_high(int max_pnode) mmr.v =uv_read_local_mmr (UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR );if (mmr.s.enable) -map_high ("MMR" , mmr.s.base, shift, map_uc); +map_high ("MMR" , mmr.s.base, shift, max_pnode, map_uc); }static __init void map_mmioh_high (int max_pnode)
@@ -337,7 +336,7 @@ static __init void map_mmioh_high(int max_pnode) mmioh.v =uv_read_local_mmr (UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR );if (mmioh.s.enable) -map_high ("MMIOH" , mmioh.s.base, shift, map_uc); +map_high ("MMIOH" , mmioh.s.base, shift, max_pnode, map_uc); }static __init void uv_rtc_init (void )
arch/x86/kernel/head.c +1 -0
@@ -35,6 +35,7 @@ void __init reserve_ebda_region(void)/* start of EBDA area */ ebda_addr =get_bios_ebda (); +printk (KERN_INFO "BIOS EBDA/lowmem at: %08x/%08x\n" , ebda_addr, lowmem);/* Fixup: bios puts an EBDA in the top 64K segment */ /* of conventional memory, but does not adjust lowmem. */
arch/x86/kernel/hpet.c +5 -1
@@ -115,13 +115,17 @@ static void hpet_reserve_platform_timers(unsigned long id) hd.hd_phys_address = hpet_address; hd.hd_address = hpet; hd.hd_nirqs = nrtimers; - hd.hd_flags =HPET_DATA_PLATFORM ;hpet_reserve_timer (&hd,0 );#ifdef CONFIG_HPET_EMULATE_RTC hpet_reserve_timer (&hd,1 );#endif +/* +* NOTE that hd_irq[] reflects IOAPIC input pins (LEGACY_8254 +* is wrong for i8259!) not the output IRQ. Many BIOS writers +* don't bother configuring *any* comparator interrupts. +*/ hd.hd_irq[0 ] =HPET_LEGACY_8254 ; hd.hd_irq[1 ] =HPET_LEGACY_RTC ;
arch/x86/kernel/irqinit_64.c +27 -16
68 lines not on this page · raw message
arch/x86/kernel/process_32.c +2 -2
@@ -123,7 +123,7 @@ void cpu_idle(void) } } -void __show_registers (struct pt_regs *regs,int all) +void __show_regs (struct pt_regs *regs,int all) {unsigned long cr0 =0L , cr2 =0L , cr3 =0L , cr4 =0L ;unsigned long d0, d1, d2, d3, d6, d7;
@@ -189,7 +189,7 @@ void __show_registers(struct pt_regs *regs, int all)void show_regs (struct pt_regs *regs) { -__show_registers (regs,1 ); +__show_regs (regs,1 );show_trace (NULL , regs, ®s->sp, regs->bp); }
arch/x86/kernel/process_64.c +5 -2
@@ -136,7 +136,7 @@ void cpu_idle(void) }/* Prints also some state that isn't saved in the pt_regs */ -void __show_regs (struct pt_regs *regs) +void __show_regs (struct pt_regs *regs,int all) {unsigned long cr0 =0L , cr2 =0L , cr3 =0L , cr4 =0L , fs, gs, shadowgs;unsigned long d0, d1, d2, d3, d6, d7;
@@ -175,6 +175,9 @@ void __show_regs(struct pt_regs *regs)rdmsrl (MSR_GS_BASE , gs);rdmsrl (MSR_KERNEL_GS_BASE , shadowgs); +if (!all) +return ; + cr0 =read_cr0 (); cr2 =read_cr2 (); cr3 =read_cr3 ();
@@ -200,7 +203,7 @@ void __show_regs(struct pt_regs *regs)void show_regs (struct pt_regs *regs) {printk (KERN_INFO "CPU %d:" ,smp_processor_id ()); -__show_regs (regs); +__show_regs (regs,1 );show_trace (NULL , regs, (void *)(regs +1 ), regs->bp); }
arch/x86/kernel/quirks.c +39 -2
62 lines not on this page · raw message
arch/x86/kernel/setup.c +6 -4
@@ -302,7 +302,7 @@ static void __init relocate_initrd(void)if (clen >MAX_MAP_CHUNK -slop) clen =MAX_MAP_CHUNK -slop; mapaddr = ramdisk_image &PAGE_MASK ; - p =early_ioremap (mapaddr, clen+slop); + p =early_memremap (mapaddr, clen+slop);memcpy (q, p+slop, clen);early_iounmap (p, clen+slop); q += clen;
@@ -379,7 +379,7 @@ static void __init parse_setup_data(void)return ; pa_data = boot_params.hdr.setup_data;while (pa_data) { - data =early_ioremap (pa_data,PAGE_SIZE ); + data =early_memremap (pa_data,PAGE_SIZE );switch (data->type) {case SETUP_E820_EXT :parse_e820_ext (data, pa_data);
@@ -402,7 +402,7 @@ static void __init e820_reserve_setup_data(void)return ; pa_data = boot_params.hdr.setup_data;while (pa_data) { - data =early_ioremap (pa_data,sizeof (*data)); + data =early_memremap (pa_data,sizeof (*data));e820_update_range (pa_data,sizeof (*data)+data->len,E820_RAM ,E820_RESERVED_KERN ); found =1 ;
@@ -428,7 +428,7 @@ static void __init reserve_early_setup_data(void)return ; pa_data = boot_params.hdr.setup_data;while (pa_data) { - data =early_ioremap (pa_data,sizeof (*data)); + data =early_memremap (pa_data,sizeof (*data));sprintf (buf,"setup data %x" , data->type);reserve_early (pa_data, pa_data+sizeof (*data)+data->len, buf); pa_data = data->next;
@@ -998,6 +998,8 @@ void __init setup_arch(char **cmdline_p)*/ acpi_boot_table_init (); +early_acpi_boot_init (); +#ifdef CONFIG_ACPI_NUMA /* * Parse SRAT to discover nodes.
arch/x86/kernel/smpboot.c +38 -49
128 lines not on this page · raw message
arch/x86/kernel/time_32.c +4 -3
@@ -47,10 +47,9 @@ unsigned long profile_pc(struct pt_regs *regs)unsigned long pc =instruction_pointer (regs);#ifdef CONFIG_SMP -if (!v8086_mode (regs) &&SEGMENT_IS_KERNEL_CODE (regs->cs) && -in_lock_functions (pc)) { +if (!user_mode_vm (regs) &&in_lock_functions (pc)) {#ifdef CONFIG_FRAME_POINTER -return *(unsigned long *)(regs->bp +4 ); +return *(unsigned long *)(regs->bp +sizeof (long ));#else unsigned long *sp = (unsigned long *)®s->sp;
@@ -95,6 +94,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)do_timer_interrupt_hook (); +#ifdef CONFIG_MCA if (MCA_bus) {/* The PS/2 uses level-triggered interrupts. You can't turn them off, nor would you want to (any attempt to
@@ -108,6 +108,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)u8 irq_v =inb_p (0x61 );/* read the current state */ outb_p( irq_v|0x80, 0x61 ); /* reset the IRQ */ } +#endif return IRQ_HANDLED ; }
arch/x86/kernel/time_64.c +16 -7
@@ -16,6 +16,7 @@#include <linux/interrupt.h> #include <linux/module.h> #include <linux/time.h> +#include <linux/mca.h> #include <asm/i8253.h> #include <asm/hpet.h>
@@ -33,23 +34,34 @@ unsigned long profile_pc(struct pt_regs *regs)/* Assume the lock function has either no stack frame or a copy of flags from PUSHF Eflags always has bits 22 and up cleared unlike kernel addresses. */ -if (!user_mode (regs) &&in_lock_functions (pc)) { +if (!user_mode_vm (regs) &&in_lock_functions (pc)) { +#ifdef CONFIG_FRAME_POINTER +return *(unsigned long *)(regs->bp +sizeof (long )); +#else unsigned long *sp = (unsigned long *)regs->sp;if (sp[0 ] >>22 )return sp[0 ];if (sp[1 ] >>22 )return sp[1 ]; +#endif }return pc; }EXPORT_SYMBOL (profile_pc); -static irqreturn_t timer_event_interrupt (int irq,void *dev_id) +irqreturn_t timer_interrupt (int irq,void *dev_id) {add_pda (irq0_irqs,1 ); global_clock_event->event_handler (global_clock_event); +#ifdef CONFIG_MCA +if (MCA_bus) { +u8 irq_v =inb_p (0x61 );/* read the current state */ +outb_p (irq_v|0x80 ,0x61 );/* reset the IRQ */ + } +#endif +return IRQ_HANDLED ; }
@@ -100,7 +112,7 @@ unsigned long __init calibrate_cpu(void) }static struct irqaction irq0 = { - .handler = timer_event_interrupt, + .handler = timer_interrupt, .flags =IRQF_DISABLED |IRQF_IRQPOLL |IRQF_NOBALANCING , .mask =CPU_MASK_NONE , .name ="timer"
@@ -111,16 +123,13 @@ void __init hpet_time_init(void)if (!hpet_enable ())setup_pit_timer (); + irq0.mask =cpumask_of_cpu (0 );setup_irq (0 , &irq0); }void __init time_init (void ) {tsc_init (); -if (cpu_has (&boot_cpu_data,X86_FEATURE_RDTSCP )) - vgetcpu_mode =VGETCPU_RDTSCP ; -else - vgetcpu_mode =VGETCPU_LSL ; late_time_init =choose_time_init (); }
arch/x86/kernel/traps.c renamed from arch/x86/kernel/traps_32.c +335 -558
867 lines not on this page · raw message
arch/x86/kernel/traps_64.c deleted +0 -1214
1,214 lines not on this page · raw message
arch/x86/mm/ioremap.c +112 -31
143 lines not on this page · raw message
arch/x86/mm/numa_32.c renamed from arch/x86/mm/discontig_32.c +0 -0
arch/x86/oprofile/op_model_amd.c new file +543 -0
543 lines not on this page · raw message
arch/x86/oprofile/op_model_athlon.c deleted +0 -190
190 lines not on this page · raw message
drivers/char/hpet.c +89 -70
159 lines not on this page · raw message
drivers/oprofile/buffer_sync.c +143 -66
209 lines not on this page · raw message
drivers/oprofile/cpu_buffer.c +72 -2
74 lines not on this page · raw message
include/asm-x86/mach-default/mach_traps.h +0 -6
Lines of this file are not shown. View the raw message.
include/asm-x86/traps.h +36 -37
73 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.