Commit 4a6b60f2 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent 5fb58500
......@@ -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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment