← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to kernel/trace/ring_buffer.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/trace/ring_buffer.c
2216
2216
 
2217
2217
        printk_once(KERN_WARNING "Tracing recursion: depth[%ld]:"
2218
2218
                    "HC[%lu]:SC[%lu]:NMI[%lu]\n",
2219
 
                    current->trace_recursion,
 
2219
                    trace_recursion_buffer(),
2220
2220
                    hardirq_count() >> HARDIRQ_SHIFT,
2221
2221
                    softirq_count() >> SOFTIRQ_SHIFT,
2222
2222
                    in_nmi());
2226
2226
 
2227
2227
static inline int trace_recursive_lock(void)
2228
2228
{
2229
 
        current->trace_recursion++;
 
2229
        trace_recursion_inc();
2230
2230
 
2231
 
        if (likely(current->trace_recursion < TRACE_RECURSIVE_DEPTH))
 
2231
        if (likely(trace_recursion_buffer() < TRACE_RECURSIVE_DEPTH))
2232
2232
                return 0;
2233
2233
 
2234
2234
        trace_recursive_fail();
2238
2238
 
2239
2239
static inline void trace_recursive_unlock(void)
2240
2240
{
2241
 
        WARN_ON_ONCE(!current->trace_recursion);
 
2241
        WARN_ON_ONCE(!trace_recursion_buffer());
2242
2242
 
2243
 
        current->trace_recursion--;
 
2243
        trace_recursion_dec();
2244
2244
}
2245
2245
 
2246
2246
#else