← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to kernel/trace/trace_functions.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/trace/trace_functions.c
54
54
        struct trace_array_cpu *data;
55
55
        unsigned long flags;
56
56
        long disabled;
57
 
        int cpu, resched;
 
57
        int cpu;
58
58
        int pc;
59
59
 
60
60
        if (unlikely(!ftrace_function_enabled))
61
61
                return;
62
62
 
63
63
        pc = preempt_count();
64
 
        resched = ftrace_preempt_disable();
 
64
        preempt_disable_notrace();
65
65
        local_save_flags(flags);
66
66
        cpu = raw_smp_processor_id();
67
67
        data = tr->data[cpu];
71
71
                trace_function(tr, ip, parent_ip, flags, pc);
72
72
 
73
73
        atomic_dec(&data->disabled);
74
 
        ftrace_preempt_enable(resched);
 
74
        preempt_enable_notrace();
75
75
}
76
76
 
77
77
static void