diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
| commit | c5974932c1e8514d3478573bb52beebeb2c786dd (patch) | |
| tree | a204156fbb0036fb76e89ceffa15a30e90bc3f75 /include/linux/mm.h | |
| parent | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (diff) | |
| parent | e760e716d47b48caf98da348368fd41b4a9b9e7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index e8abb3814209..26c7124b841a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -786,7 +786,7 @@ int __set_page_dirty_nobuffers(struct page *page); | |||
| 786 | int __set_page_dirty_no_writeback(struct page *page); | 786 | int __set_page_dirty_no_writeback(struct page *page); |
| 787 | int redirty_page_for_writepage(struct writeback_control *wbc, | 787 | int redirty_page_for_writepage(struct writeback_control *wbc, |
| 788 | struct page *page); | 788 | struct page *page); |
| 789 | int FASTCALL(set_page_dirty(struct page *page)); | 789 | int set_page_dirty(struct page *page); |
| 790 | int set_page_dirty_lock(struct page *page); | 790 | int set_page_dirty_lock(struct page *page); |
| 791 | int clear_page_dirty_for_io(struct page *page); | 791 | int clear_page_dirty_for_io(struct page *page); |
| 792 | 792 | ||
| @@ -829,7 +829,7 @@ extern void unregister_shrinker(struct shrinker *); | |||
| 829 | 829 | ||
| 830 | int vma_wants_writenotify(struct vm_area_struct *vma); | 830 | int vma_wants_writenotify(struct vm_area_struct *vma); |
| 831 | 831 | ||
| 832 | extern pte_t *FASTCALL(get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl)); | 832 | extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl); |
| 833 | 833 | ||
| 834 | #ifdef __PAGETABLE_PUD_FOLDED | 834 | #ifdef __PAGETABLE_PUD_FOLDED |
| 835 | static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, | 835 | static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, |