From 5d12615b8549d93f1a77348309694b932ae949c5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 22 Feb 2004 22:16:13 -0800 Subject: [PATCH] [PATCH] Fix do_shmat() for CONFIG_SYSVIPC=n - The do_shmat() stub needs `static inline', not `inline' - We need errno.h for ENOSYS. --- include/linux/shm.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/shm.h b/include/linux/shm.h index 69698d3440532..1f2b5ee108978 100644 --- a/include/linux/shm.h +++ b/include/linux/shm.h @@ -2,6 +2,7 @@ #define _LINUX_SHM_H_ #include +#include #include /* @@ -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; } -- 2.53.0