diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 17:53:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 17:53:16 -0500 |
| commit | a6525042bfdfcab128bd91fad264de10fd24a55e (patch) | |
| tree | 088102ff69846c71c963e970a90d627498202928 /include | |
| parent | b9a0d06a35c382c02f471a0815e2e27cdfe1c7f9 (diff) | |
| parent | 58dab916dfb57328d50deb0aa9b3fc92efa248ff (diff) | |
Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86 PAT: remove CPA WARN_ON for zero pte
x86 PAT: return compatible mapping to remap_pfn_range callers
x86 PAT: change track_pfn_vma_new to take pgprot_t pointer param
x86 PAT: consolidate old memtype new memtype check into a function
x86 PAT: remove PFNMAP type on track_pfn_vma_new() error
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/pgtable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 72ebe91005a8..8e6d0ca70aba 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h | |||
| @@ -301,7 +301,7 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm, | |||
| 301 | * track_pfn_vma_new is called when a _new_ pfn mapping is being established | 301 | * track_pfn_vma_new is called when a _new_ pfn mapping is being established |
| 302 | * for physical range indicated by pfn and size. | 302 | * for physical range indicated by pfn and size. |
| 303 | */ | 303 | */ |
| 304 | static inline int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t prot, | 304 | static inline int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t *prot, |
| 305 | unsigned long pfn, unsigned long size) | 305 | unsigned long pfn, unsigned long size) |
| 306 | { | 306 | { |
| 307 | return 0; | 307 | return 0; |
| @@ -332,7 +332,7 @@ static inline void untrack_pfn_vma(struct vm_area_struct *vma, | |||
| 332 | { | 332 | { |
| 333 | } | 333 | } |
| 334 | #else | 334 | #else |
| 335 | extern int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t prot, | 335 | extern int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t *prot, |
| 336 | unsigned long pfn, unsigned long size); | 336 | unsigned long pfn, unsigned long size); |
| 337 | extern int track_pfn_vma_copy(struct vm_area_struct *vma); | 337 | extern int track_pfn_vma_copy(struct vm_area_struct *vma); |
| 338 | extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn, | 338 | extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn, |