diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-02-22 22:16:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-02-22 22:16:13 -0800 |
| commit | 5d12615b8549d93f1a77348309694b932ae949c5 (patch) | |
| tree | ba8b7fda0ddf3bfd7a60093bb9f0e0829c8536c1 /include/linux | |
| parent | 5da0c2c3b175c1217e5e4890c898628ca2a6bd22 (diff) | |
[PATCH] Fix do_shmat() for CONFIG_SYSVIPC=n
- The do_shmat() stub needs `static inline', not `inline'
- We need errno.h for ENOSYS.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/shm.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/shm.h b/include/linux/shm.h index 69698d344053..1f2b5ee10897 100644 --- a/include/linux/shm.h +++ b/include/linux/shm.h @@ -2,6 +2,7 @@ #define _LINUX_SHM_H_ #include <linux/ipc.h> +#include <linux/errno.h> #include <asm/page.h> /* @@ -91,9 +92,10 @@ struct shmid_kernel /* private to the kernel */ #define SHM_HUGETLB 04000 /* segment will use huge TLB pages */ #ifdef CONFIG_SYSVIPC -long do_shmat (int shmid, char __user *shmaddr, int shmflg, unsigned long *addr); +long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr); #else -inline long do_shmat (int shmid, char __user *shmaddr, int shmflg, unsigned long *addr) +static inline long do_shmat(int shmid, char __user *shmaddr, + int shmflg, unsigned long *addr) { return -ENOSYS; } |
