diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 20:59:58 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 20:59:58 -0500 |
| commit | 51a175f3eb8e7571f997cd4b7c6a536218315497 (patch) | |
| tree | d06dc0f9f4e384e328e22554962218ccf43dfa24 | |
| parent | 517c287fd3cead70854f57a3dbe9726a36278383 (diff) | |
| download | rt-patches-51a175f3eb8e7571f997cd4b7c6a536218315497.tar.gz | |
refresh x86-highmem-Remove-stale-function-prototype.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | x86-highmem-Remove-stale-function-prototype.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/x86-highmem-Remove-stale-function-prototype.patch b/x86-highmem-Remove-stale-function-prototype.patch index 2ec50d6..9dc96d1 100644 --- a/x86-highmem-Remove-stale-function-prototype.patch +++ b/x86-highmem-Remove-stale-function-prototype.patch @@ -1,4 +1,4 @@ -From c28c2c8e98d32af9fe20c0512c5f456edd01ea24 Mon Sep 17 00:00:00 2001 +From fb519f311f92997c8560119bda5154b16b126c2d Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Wed, 10 Mar 2010 18:05:47 +0100 Subject: [PATCH] x86: highmem: Remove stale function prototype @@ -8,18 +8,18 @@ commit c28c2c8e98d32af9fe20c0512c5f456edd01ea24 in tip. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> diff --git a/arch/x86/include/asm/highmem.h b/arch/x86/include/asm/highmem.h -index 8279657..c21ba64 100644 +index 2aea538..233b903 100644 --- a/arch/x86/include/asm/highmem.h +++ b/arch/x86/include/asm/highmem.h -@@ -72,8 +72,6 @@ void __kunmap_atomic(void *kvaddr, enum km_type type); +@@ -71,8 +71,6 @@ void __kunmap_atomic(void *kvaddr, enum km_type type); void *__kmap_atomic_pfn(unsigned long pfn, enum km_type type); struct page *__kmap_atomic_to_page(void *ptr); -void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot); - - #ifndef CONFIG_PARAVIRT - #define kmap_atomic_pte(page, type) kmap_atomic(page, type) - #define kmap_atomic_pte_direct(page, type) kmap_atomic_direct(page, type) + #define flush_cache_kmaps() do { } while (0) + + extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn, -- 1.7.1.1 |