From b0badaeaed0cb05995fd0131975a619d0d195ace Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Fri, 25 Jul 2008 16:48:56 +0200
Subject: [PATCH] --- yaml --- r: 110330 b: refs/heads/master c:
 15ae2d76ceb037a1e3fcd8fc9b4fe3177f9f3831 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/mm/pageattr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0fca8475a17e..a2bb656be17c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ddb5518052e4e28ab489237443f7443b3fd69ca
+refs/heads/master: 15ae2d76ceb037a1e3fcd8fc9b4fe3177f9f3831
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
index 65c6e46bf059..0d254adcc82d 100644
--- a/trunk/arch/x86/mm/pageattr.c
+++ b/trunk/arch/x86/mm/pageattr.c
@@ -78,7 +78,7 @@ static inline unsigned long highmap_start_pfn(void)
 
 static inline unsigned long highmap_end_pfn(void)
 {
-	return __pa(round_up((unsigned long)_end, PMD_SIZE)) >> PAGE_SHIFT;
+	return __pa(roundup((unsigned long)_end, PMD_SIZE)) >> PAGE_SHIFT;
 }
 
 #endif