diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 11:19:18 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 11:19:18 +0100 |
| commit | ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0 (patch) | |
| tree | d83637979db83bb9d5a23e190148b90b60c976d2 /arch/x86/mm/kmemcheck/error.c | |
| parent | d39e82db73eb876c60d00f00219d767b3be30307 (diff) | |
| parent | f167e1d073278fe231bbdd5d6c24fb9d091aa544 (diff) | |
Merge branch 'fixes' into devel
Diffstat (limited to 'arch/x86/mm/kmemcheck/error.c')
| -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) switch (e->type) { case KMEMCHECK_ERROR_INVALID_ACCESS: - printk(KERN_ERR "WARNING: kmemcheck: Caught %d-bit read " - "from %s memory (%p)\n", + printk(KERN_WARNING "WARNING: kmemcheck: Caught %d-bit read from %s memory (%p)\n", 8 * e->size, e->state < ARRAY_SIZE(desc) ? desc[e->state] : "(invalid shadow state)", (void *) e->address); - printk(KERN_INFO); + printk(KERN_WARNING); for (i = 0; i < SHADOW_COPY_SIZE; ++i) - printk("%02x", e->memory_copy[i]); - printk("\n"); + printk(KERN_CONT "%02x", e->memory_copy[i]); + printk(KERN_CONT "\n"); - printk(KERN_INFO); + printk(KERN_WARNING); for (i = 0; i < SHADOW_COPY_SIZE; ++i) { if (e->shadow_copy[i] < ARRAY_SIZE(short_desc)) - printk(" %c", short_desc[e->shadow_copy[i]]); + printk(KERN_CONT " %c", short_desc[e->shadow_copy[i]]); else - printk(" ?"); + printk(KERN_CONT " ?"); } - printk("\n"); - printk(KERN_INFO "%*c\n", 2 + 2 + printk(KERN_CONT "\n"); + printk(KERN_WARNING "%*c\n", 2 + 2 * (int) (e->address & (SHADOW_COPY_SIZE - 1)), '^'); break; case KMEMCHECK_ERROR_BUG: |