diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-30 15:33:40 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-30 15:33:40 -0500 |
| commit | b8840ad464cb9350352d16037512613755b4d02f (patch) | |
| tree | 31b308ed23a38147d0906cc1c9759e21345f6a91 | |
| parent | eb88ce9681d32edc611403cd334bedbf98ed90bb (diff) | |
| download | rt-patches-b8840ad464cb9350352d16037512613755b4d02f.tar.gz | |
refresh x86-get-user-pages-kmap-atomic-fix-32bit.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | x86-get-user-pages-kmap-atomic-fix-32bit.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/x86-get-user-pages-kmap-atomic-fix-32bit.patch b/x86-get-user-pages-kmap-atomic-fix-32bit.patch index d7c36bc..03a33fd 100644 --- a/x86-get-user-pages-kmap-atomic-fix-32bit.patch +++ b/x86-get-user-pages-kmap-atomic-fix-32bit.patch @@ -1,4 +1,4 @@ -From 9b09e394d118ac3614d1372ce3a1384e91e887e9 Mon Sep 17 00:00:00 2001 +From 4c3b055d795ffffcd207fb2cdbbe602a3e01469a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Fri, 3 Jul 2009 08:44:33 -0500 Subject: [PATCH] x86: get user pages kmap atomic fix (32bit) @@ -81,7 +81,7 @@ index b1e70d5..ca14f6c 100644 struct pv_lazy_ops lazy_mode; diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h -index 01fd946..b323c3d 100644 +index a286683..f33185a 100644 --- a/arch/x86/include/asm/pgtable_32.h +++ b/arch/x86/include/asm/pgtable_32.h @@ -59,14 +59,20 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); @@ -106,7 +106,7 @@ index 01fd946..b323c3d 100644 /* Clear a kernel PTE and flush it from the TLB */ diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h -index c57a301..efc01ae 100644 +index 181be52..3057193 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -126,8 +126,10 @@ static inline int pgd_large(pgd_t pgd) { return 0; } @@ -120,7 +120,7 @@ index c57a301..efc01ae 100644 +#define pte_unmap_nested(pte) do { } while (0) +#define pte_unmap_direct(pte) do { } while (0) - #define update_mmu_cache(vma, address, pte) do { } while (0) + #define update_mmu_cache(vma, address, ptep) do { } while (0) diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 768a973..024d2c1 100644 |