diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-02-05 16:52:22 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-02-05 16:52:22 -0800 |
| commit | 2522333aaeccf23749c20c29b2f1085e9d995ed4 (patch) | |
| tree | ac89185fd81d3d0f1db5cb0abb8c908915861b07 /include/linux | |
| parent | 9eedaf2a7f5ee23083c182ef067d8180c535c9d6 (diff) | |
[PATCH] Fix x86-64 compilation on 2.6.2-bk1
From: Andi Kleen <ak@suse.de>
The new linux/elf.h include in linux/mm.h caused all kinds of problems for
the x86-64 32bit emulation code. This patch avoids the dependency by
moving the depending functions out of line. It makes x86-64 compile again.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mm.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index ffc1e13d0a55..d21630b8f96d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -12,7 +12,6 @@ #include <linux/mmzone.h> #include <linux/rbtree.h> #include <linux/fs.h> -#include <linux/elf.h> #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ extern unsigned long max_mapnr; @@ -644,24 +643,8 @@ kernel_map_pages(struct page *page, int numpages, int enable) #endif #ifndef CONFIG_ARCH_GATE_AREA -static inline int in_gate_area(struct task_struct *task, unsigned long addr) -{ -#ifdef AT_SYSINFO_EHDR - if ((addr >= FIXADDR_USER_START) && (addr < FIXADDR_USER_END)) - return 1; -#endif - return 0; -} - -extern struct vm_area_struct gate_vma; -static inline struct vm_area_struct *get_gate_vma(struct task_struct *tsk) -{ -#ifdef AT_SYSINFO_EHDR - return &gate_vma; -#else - return 0; -#endif -} +extern struct vm_area_struct *get_gate_vma(struct task_struct *tsk); +int in_gate_area(struct task_struct *task, unsigned long addr); #endif #endif /* __KERNEL__ */ |