Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Kill bogus TPC/address truncation during 32-bit faults. sparc: fixup for sparseirq changes sparc64: Validate kernel generated fault addresses on sparc64. sparc64: On non-Niagara, need to touch NMI watchdog in NOHZ mode. sparc64: Implement NMI watchdog on capable cpus. sparc: Probe PMU type and record in sparc_pmu_type. sparc64: Move generic PCR support code to seperate file.
Showing
- arch/sparc/include/asm/cpudata_64.h 1 addition, 1 deletionarch/sparc/include/asm/cpudata_64.h
- arch/sparc/include/asm/irq_64.h 1 addition, 3 deletionsarch/sparc/include/asm/irq_64.h
- arch/sparc/include/asm/kdebug_64.h 2 additions, 0 deletionsarch/sparc/include/asm/kdebug_64.h
- arch/sparc/include/asm/nmi.h 10 additions, 0 deletionsarch/sparc/include/asm/nmi.h
- arch/sparc/include/asm/pcr.h 46 additions, 0 deletionsarch/sparc/include/asm/pcr.h
- arch/sparc/include/asm/pil.h 1 addition, 0 deletionsarch/sparc/include/asm/pil.h
- arch/sparc/kernel/Makefile 2 additions, 0 deletionsarch/sparc/kernel/Makefile
- arch/sparc/kernel/cpu.c 22 additions, 11 deletionsarch/sparc/kernel/cpu.c
- arch/sparc/kernel/irq_64.c 5 additions, 63 deletionsarch/sparc/kernel/irq_64.c
- arch/sparc/kernel/kernel.h 1 addition, 0 deletionsarch/sparc/kernel/kernel.h
- arch/sparc/kernel/nmi.c 224 additions, 0 deletionsarch/sparc/kernel/nmi.c
- arch/sparc/kernel/pcr.c 153 additions, 0 deletionsarch/sparc/kernel/pcr.c
- arch/sparc/kernel/process_64.c 4 additions, 1 deletionarch/sparc/kernel/process_64.c
- arch/sparc/kernel/setup_64.c 2 additions, 0 deletionsarch/sparc/kernel/setup_64.c
- arch/sparc/kernel/ttable.S 2 additions, 1 deletionarch/sparc/kernel/ttable.S
- arch/sparc/mm/fault_64.c 38 additions, 6 deletionsarch/sparc/mm/fault_64.c
- arch/sparc/oprofile/init.c 34 additions, 198 deletionsarch/sparc/oprofile/init.c
Loading
Please register or sign in to comment