From efbd0318eb6b4a64d0d35b22a8188140ee584963 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 25 Apr 2008 17:07:03 +0200
Subject: [PATCH] --- yaml --- r: 92981 b: refs/heads/master c:
 00c6b2d5d7b2414bd46c620d6a8c37fa7a716f29 h: refs/heads/master i:   92979:
 20ff14d8fb7be4247f4954211716c8093fef51a3 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/alternative.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8bf5aef2c2a6..bf4497c87189 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7b66baa8bc3f8e0cda6576e31e9bde09382565d
+refs/heads/master: 00c6b2d5d7b2414bd46c620d6a8c37fa7a716f29
diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c
index 60299f61843f..65c7857a90dd 100644
--- a/trunk/arch/x86/kernel/alternative.c
+++ b/trunk/arch/x86/kernel/alternative.c
@@ -519,6 +519,7 @@ void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
 		pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
 	} else {
 		pages[0] = virt_to_page(addr);
+		WARN_ON(!PageReserved(pages[0]));
 		pages[1] = virt_to_page(addr + PAGE_SIZE);
 	}
 	BUG_ON(!pages[0]);