From 67d7f5037f0428d85f66231e3b5b49d5b6212e7b Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Wed, 7 Oct 2009 16:32:31 -0700
Subject: [PATCH] --- yaml --- r: 166943 b: refs/heads/master c:
 48640d69f5f06fe951a4de065a7f374cb9ee6040 h: refs/heads/master i:   166941:
 26fc836357cf19d405c3a60aee2141a76f7b0fff   166939:
 699257bdeecdd599d909d79688b5c5d4bcbe61bd   166935:
 8b77c4d84047a1759ea84a4106436e99e024ca4f   166927:
 5868af007a59b38470543091b7f02f2cfc045287   166911:
 ef70879ccc11ebc6d0113d9415de64982ccda17a v: v3

---
 [refs]                              |  2 +-
 trunk/Documentation/vm/page-types.c | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b064dea85e9b..983f2c95e453 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e577ebde9fb161bdc87511763c75dfad291059e2
+refs/heads/master: 48640d69f5f06fe951a4de065a7f374cb9ee6040
diff --git a/trunk/Documentation/vm/page-types.c b/trunk/Documentation/vm/page-types.c
index 56f33b63d160..11b9a03f7b10 100644
--- a/trunk/Documentation/vm/page-types.c
+++ b/trunk/Documentation/vm/page-types.c
@@ -436,6 +436,16 @@ static uint64_t well_known_flags(uint64_t flags)
 	return flags;
 }
 
+static uint64_t kpageflags_flags(uint64_t flags)
+{
+	flags = expand_overloaded_flags(flags);
+
+	if (!opt_raw)
+		flags = well_known_flags(flags);
+
+	return flags;
+}
+
 /*
  * page frame walker
  */
@@ -470,10 +480,7 @@ static int hash_slot(uint64_t flags)
 static void add_page(unsigned long voffset,
 		     unsigned long offset, uint64_t flags)
 {
-	flags = expand_overloaded_flags(flags);
-
-	if (!opt_raw)
-		flags = well_known_flags(flags);
+	flags = kpageflags_flags(flags);
 
 	if (!bit_mask_ok(flags))
 		return;