iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core

Browse Source
This commit is contained in:
Ingo Molnar 2010-10-15 05:12:45 +02:00
commit d9d572a9c0
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/mm/fault.c
View File

@ -251,6 +251,8 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
if (!(address >= VMALLOC_START && address < VMALLOC_END)) if (!(address >= VMALLOC_START && address < VMALLOC_END))
return -1; return -1;
WARN_ON_ONCE(in_nmi());
/* /*
* Synchronize this task's top level page-table * Synchronize this task's top level page-table
* with the 'reference' page table. * with the 'reference' page table.
@ -369,6 +371,8 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
if (!(address >= VMALLOC_START && address < VMALLOC_END)) if (!(address >= VMALLOC_START && address < VMALLOC_END))
return -1; return -1;
WARN_ON_ONCE(in_nmi());
/* /*
* Copy kernel mappings over when needed. This can also * Copy kernel mappings over when needed. This can also
* happen within a race in page table update. In the later * happen within a race in page table update. In the later

2
arch/x86/mm/kmemcheck/kmemcheck.c
View File

@ -631,6 +631,8 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
if (!pte) if (!pte)
return false; return false;
WARN_ON_ONCE(in_nmi());
if (error_code & 2) if (error_code & 2)
kmemcheck_access(regs, address, KMEMCHECK_WRITE); kmemcheck_access(regs, address, KMEMCHECK_WRITE);
else else

5
kernel/trace/trace_functions_graph.c
View File

@ -665,8 +665,9 @@ trace_print_graph_duration(unsigned long long duration, struct trace_seq *s)
/* Print nsecs (we don't want to exceed 7 numbers) */ /* Print nsecs (we don't want to exceed 7 numbers) */
if (len < 7) { if (len < 7) {
snprintf(nsecs_str, min(sizeof(nsecs_str), 8UL - len), "%03lu", size_t slen = min_t(size_t, sizeof(nsecs_str), 8UL - len);
nsecs_rem);
snprintf(nsecs_str, slen, "%03lu", nsecs_rem);
ret = trace_seq_printf(s, ".%s", nsecs_str); ret = trace_seq_printf(s, ".%s", nsecs_str);
if (!ret) if (!ret)
return TRACE_TYPE_PARTIAL_LINE; return TRACE_TYPE_PARTIAL_LINE;