diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 20:53:17 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 20:53:17 -0500 |
| commit | 3208128a0c2fdedc88c49374d5e1cdf28100448f (patch) | |
| tree | bfba4d74a29cc0ca8eaf60c69319069c5a631adf | |
| parent | c56f356dacdb96c4b10473cb8599464b74adc473 (diff) | |
| download | rt-patches-3208128a0c2fdedc88c49374d5e1cdf28100448f.tar.gz | |
refresh highmem-rt-Implement-pfn-and-prot-kmaps.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | highmem-rt-Implement-pfn-and-prot-kmaps.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/highmem-rt-Implement-pfn-and-prot-kmaps.patch b/highmem-rt-Implement-pfn-and-prot-kmaps.patch index b532cb7..ec3bdd3 100644 --- a/highmem-rt-Implement-pfn-and-prot-kmaps.patch +++ b/highmem-rt-Implement-pfn-and-prot-kmaps.patch @@ -1,4 +1,4 @@ -From e946864ec813ebab2f42752c99b080e1e012aaf6 Mon Sep 17 00:00:00 2001 +From 1bdf59aac85b1f5345b0f9040a20031ef959e15f Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <a.p.zijlstra@chello.nl> Date: Thu, 25 Feb 2010 12:43:52 +0100 Subject: [PATCH] highmem, -rt: Implement pfn and prot kmaps @@ -13,7 +13,7 @@ Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> 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 433ae1f..8279657 100644 +index 91bc9f6..d20a885 100644 --- a/arch/x86/include/asm/highmem.h +++ b/arch/x86/include/asm/highmem.h @@ -55,14 +55,17 @@ extern unsigned long highstart_pfn, highend_pfn; @@ -34,7 +34,7 @@ index 433ae1f..8279657 100644 void *__kmap_atomic(struct page *page, enum km_type type); void *__kmap_atomic_direct(struct page *page, enum km_type type); void __kunmap_atomic(void *kvaddr, enum km_type type); -@@ -85,15 +88,17 @@ extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn, +@@ -82,15 +85,17 @@ extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn, * on PREEMPT_RT kmap_atomic() is a wrapper that uses kmap(): */ #ifdef CONFIG_PREEMPT_RT @@ -55,7 +55,7 @@ index 433ae1f..8279657 100644 # define kmap_atomic_pfn(pfn, type) __kmap_atomic_pfn(pfn, type) # define kunmap_atomic(kvaddr, type) __kunmap_atomic(kvaddr, type) diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c -index dcb1899..b4eb59a 100644 +index dcb1899..7f2ac8a 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c @@ -19,16 +19,6 @@ void kunmap(struct page *page) @@ -75,8 +75,8 @@ index dcb1899..b4eb59a 100644 struct page *kmap_to_page(void *ptr) { struct page *page; -@@ -70,6 +60,23 @@ void *__kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot) - return (void *)vaddr; +@@ -75,6 +65,23 @@ void *__kmap_atomic_direct(struct page *page, enum km_type type) + return __kmap_atomic_prot(page, type, kmap_prot); } +void *__kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot) @@ -96,9 +96,9 @@ index dcb1899..b4eb59a 100644 + return (void *)vaddr; +} + - void *__kmap_atomic_direct(struct page *page, enum km_type type) + void *__kmap_atomic(struct page *page, enum km_type type) { - return __kmap_atomic_prot(page, type, kmap_prot); + return kmap_atomic_prot(page, type, kmap_prot); diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c index 715d822..38a1a68 100644 --- a/arch/x86/mm/iomap_32.c @@ -413,5 +413,5 @@ index 446b75c..1b534a8 100644 atomic_set(&pkmap_free, LAST_PKMAP); atomic_set(&pkmap_users, 0); -- -1.7.1.1 +1.7.0.4 |