From: John L. <mov...@us...> - 2002-11-07 04:31:49
|
Update of /cvsroot/oprofile/oprofile/module/x86 In directory usw-pr-cvs1:/tmp/cvs-serv15140/module/x86 Modified Files: op_fixmap.c op_nmi.c Log Message: remove 2.5 support from old module. CONFIG_OPROFILE is the new way. Index: op_fixmap.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/module/x86/op_fixmap.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- op_fixmap.c 7 Sep 2002 18:19:39 -0000 1.8 +++ op_fixmap.c 7 Nov 2002 04:31:44 -0000 1.9 @@ -21,7 +21,7 @@ #if V_BEFORE(2, 4, 0) #define cpu_has_pge (test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability)) -#elif V_BEFORE(2, 5, 0) +#else #define cpu_has_pge (test_bit(X86_FEATURE_PGE, boot_cpu_data.x86_capability)) #endif @@ -51,7 +51,7 @@ pgprot_val(prot) |= _PAGE_PCD; if (cpu_has_pge) pgprot_val(prot) |= _PAGE_GLOBAL; - set_pte(pte, op_pfn_pte(phys, prot)); + set_pte(pte, mk_pte_phys(phys, prot)); __flush_tlb_one(vaddr); } Index: op_nmi.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/module/x86/op_nmi.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- op_nmi.c 25 Sep 2002 14:46:47 -0000 1.15 +++ op_nmi.c 7 Nov 2002 04:31:44 -0000 1.16 @@ -39,8 +39,6 @@ } -/* preempt: all things inside the interrupt handler are preempt safe : we - * never reenable interrupt */ asmlinkage void op_do_nmi(struct pt_regs * regs) { uint const cpu = op_cpu_id(); @@ -114,7 +112,7 @@ { int cpu, i; - for (cpu = 0 ; cpu < OP_MAX_CPUS; cpu++) { + for (cpu = 0 ; cpu < smp_num_cpus; cpu++) { struct _oprof_data * data = &oprof_data[cpu]; for (i = 0 ; i < get_model()->num_counters ; ++i) { |