diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-12-28 04:02:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-28 04:28:35 -0500 |
| commit | c0ca9da442df82b67095f230f24762042f9f3b7d (patch) | |
| tree | 744b47b238cd17ffa28f088860ddafedbf495e11 | |
| parent | d015a092989d673df44a5ad6866dc5d5006b7a2a (diff) | |
x86, kmemcheck: Use KERN_WARNING for error reporting
As suggested by Vegard Nossum, use KERN_WARNING for error
reporting to make sure kmemcheck reports end up in syslog.
Suggested-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <1261990935.4641.7.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/mm/kmemcheck/error.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/x86/mm/kmemcheck/error.c b/arch/x86/mm/kmemcheck/error.c index 4901d0dafda6..af3b6c8a436f 100644 --- a/arch/x86/mm/kmemcheck/error.c +++ b/arch/x86/mm/kmemcheck/error.c | |||
| @@ -106,26 +106,25 @@ void kmemcheck_error_recall(void) | |||
| 106 | 106 | ||
| 107 | switch (e->type) { | 107 | switch (e->type) { |
| 108 | case KMEMCHECK_ERROR_INVALID_ACCESS: | 108 | case KMEMCHECK_ERROR_INVALID_ACCESS: |
| 109 | printk(KERN_ERR "WARNING: kmemcheck: Caught %d-bit read " | 109 | printk(KERN_WARNING "WARNING: kmemcheck: Caught %d-bit read from %s memory (%p)\n", |
| 110 | "from %s memory (%p)\n", | ||
| 111 | 8 * e->size, e->state < ARRAY_SIZE(desc) ? | 110 | 8 * e->size, e->state < ARRAY_SIZE(desc) ? |
| 112 | desc[e->state] : "(invalid shadow state)", | 111 | desc[e->state] : "(invalid shadow state)", |
| 113 | (void *) e->address); | 112 | (void *) e->address); |
| 114 | 113 | ||
| 115 | printk(KERN_INFO); | 114 | printk(KERN_WARNING); |
| 116 | for (i = 0; i < SHADOW_COPY_SIZE; ++i) | 115 | for (i = 0; i < SHADOW_COPY_SIZE; ++i) |
| 117 | printk("%02x", e->memory_copy[i]); | 116 | printk(KERN_CONT "%02x", e->memory_copy[i]); |
| 118 | printk("\n"); | 117 | printk(KERN_CONT "\n"); |
| 119 | 118 | ||
| 120 | printk(KERN_INFO); | 119 | printk(KERN_WARNING); |
| 121 | for (i = 0; i < SHADOW_COPY_SIZE; ++i) { | 120 | for (i = 0; i < SHADOW_COPY_SIZE; ++i) { |
| 122 | if (e->shadow_copy[i] < ARRAY_SIZE(short_desc)) | 121 | if (e->shadow_copy[i] < ARRAY_SIZE(short_desc)) |
| 123 | printk(" %c", short_desc[e->shadow_copy[i]]); | 122 | printk(KERN_CONT " %c", short_desc[e->shadow_copy[i]]); |
| 124 | else | 123 | else |
| 125 | printk(" ?"); | 124 | printk(KERN_CONT " ?"); |
| 126 | } | 125 | } |
| 127 | printk("\n"); | 126 | printk(KERN_CONT "\n"); |
| 128 | printk(KERN_INFO "%*c\n", 2 + 2 | 127 | printk(KERN_WARNING "%*c\n", 2 + 2 |
| 129 | * (int) (e->address & (SHADOW_COPY_SIZE - 1)), '^'); | 128 | * (int) (e->address & (SHADOW_COPY_SIZE - 1)), '^'); |
| 130 | break; | 129 | break; |
| 131 | case KMEMCHECK_ERROR_BUG: | 130 | case KMEMCHECK_ERROR_BUG: |
