diff options
| author | Andrew Morton <akpm@digeo.com> | 2003-04-20 00:29:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-20 00:29:19 -0700 |
| commit | 4a6b60f25d68965452d60c2a77cccefffd8652b3 (patch) | |
| tree | f4ee67e30ca811090d0d30099898002003d6847c | |
| parent | 5fb58500eec7e5afab139a6b3825c55fbbeff48c (diff) | |
[PATCH] fix CONFIG_NOMMU mismerges
From: Christoph Hellwig <hch@lst.de>
we already have better stubs in nommu.c, the additional inlines in mm.h only
cause compile failures.
| -rw-r--r-- | include/linux/mm.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index ede6c5ff4181..6aa89d73f65b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -594,28 +594,10 @@ extern struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned lon extern unsigned int nr_used_zone_pages(void); -#ifdef CONFIG_MMU extern struct page * vmalloc_to_page(void *addr); extern struct page * follow_page(struct mm_struct *mm, unsigned long address, int write); extern int remap_page_range(struct vm_area_struct *vma, unsigned long from, unsigned long to, unsigned long size, pgprot_t prot); -#else -static inline struct page * vmalloc_to_page(void *addr) -{ - return NULL; -} -static inline struct page * follow_page(struct mm_struct *mm, - unsigned long address, int write) -{ - return NULL; -} -static inline int remap_page_range(struct vm_area_struct *vma, - unsigned long from, unsigned long to, - unsigned long size, pgprot_t prot) -{ - return -EPERM; -} -#endif /* CONFIG_MMU */ #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ |