| From 8a350158acf9d03525e949969faf22cb818f6b8e Mon Sep 17 00:00:00 2001 |
| From: Ingo Molnar <mingo@elte.hu> |
| Date: Fri, 3 Jul 2009 08:29:25 -0500 |
| Subject: [PATCH] x86: highmem: Replace BUG_ON by WARN_ON |
| |
| commit 1b4dbe669d40066fe35bc6b581677dc824970a6e in tip. |
| |
| The machine might survive that problem and be at least in a state |
| which allows us to get more information about the problem. |
| |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c |
| index 63a6ba6..c838ac8 100644 |
| --- a/arch/x86/mm/highmem_32.c |
| +++ b/arch/x86/mm/highmem_32.c |
| @@ -42,7 +42,7 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot) |
| |
| idx = type + KM_TYPE_NR*smp_processor_id(); |
| vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); |
| - BUG_ON(!pte_none(*(kmap_pte-idx))); |
| + WARN_ON(!pte_none(*(kmap_pte-idx))); |
| set_pte(kmap_pte-idx, mk_pte(page, prot)); |
| |
| return (void *)vaddr; |
| -- |
| 1.7.1.1 |
| |
