[patch 2/2] slqb: x86 cleanup

From: Nick Piggin
Date: Mon Mar 02 2009 - 01:53:00 EST



My virt_to_page_fast speedup for x86-64 snuck in to the slqb patch, where it
does not belong. Oops.

Signed-off-by: Nick Piggin <npiggin@xxxxxxx>
---
Index: linux-2.6/arch/x86/include/asm/page.h
===================================================================
--- linux-2.6.orig/arch/x86/include/asm/page.h 2009-03-02 17:41:56.000000000 +1100
+++ linux-2.6/arch/x86/include/asm/page.h 2009-03-02 17:42:02.000000000 +1100
@@ -193,7 +193,6 @@ static inline pteval_t native_pte_flags(
* virt_addr_valid(kaddr) returns true.
*/
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define virt_to_page_fast(kaddr) pfn_to_page(((unsigned long)(kaddr) - PAGE_OFFSET) >> PAGE_SHIFT)
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
extern bool __virt_addr_valid(unsigned long kaddr);
#define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
Index: linux-2.6/mm/slqb.c
===================================================================
--- linux-2.6.orig/mm/slqb.c 2009-03-02 17:41:56.000000000 +1100
+++ linux-2.6/mm/slqb.c 2009-03-02 17:42:09.000000000 +1100
@@ -156,11 +156,7 @@ static inline struct zone *slqb_page_zon

static inline int virt_to_nid(const void *addr)
{
-#ifdef virt_to_page_fast
- return page_to_nid(virt_to_page_fast(addr));
-#else
return page_to_nid(virt_to_page(addr));
-#endif
}

static inline struct slqb_page *virt_to_head_slqb_page(const void *addr)
Index: linux-2.6/include/linux/mm.h
===================================================================
--- linux-2.6.orig/include/linux/mm.h 2009-03-02 17:42:59.000000000 +1100
+++ linux-2.6/include/linux/mm.h 2009-03-02 17:43:09.000000000 +1100
@@ -305,11 +305,7 @@ static inline void get_page(struct page

static inline struct page *virt_to_head_page(const void *x)
{
-#ifdef virt_to_page_fast
- struct page *page = virt_to_page_fast(x);
-#else
struct page *page = virt_to_page(x);
-#endif
return compound_head(page);
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/