Merge branch 'for-linus' into for-next

[linux-2.6-microblaze.git] / tools / perf / jvmti / jvmti_agent.c

diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
index 8810859..526dcaf 100644 (file)
--- a/tools/perf/jvmti/jvmti_agent.c
+++ b/tools/perf/jvmti/jvmti_agent.c
@@ -390,7 +390,7 @@ jvmti_write_code(void *agent, char const *sym,
                rec.p.total_size += size;
 
        /*
-        * If JVM is multi-threaded, nultiple concurrent calls to agent
+        * If JVM is multi-threaded, multiple concurrent calls to agent
         * may be possible, so protect file writes
         */
        flockfile(fp);
@@ -457,7 +457,7 @@ jvmti_write_debug_info(void *agent, uint64_t code,
        rec.p.total_size = size;
 
        /*
-        * If JVM is multi-threaded, nultiple concurrent calls to agent
+        * If JVM is multi-threaded, multiple concurrent calls to agent
         * may be possible, so protect file writes
         */
        flockfile(fp);