X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Flinux%2Futsname.h;h=f8d3b326e93a2f9b8a2f5bc616877a433acfa73a;hb=e3222c4ecc649c4ae568e61dda9349482401b501;hp=99e522369f4fa2680587566e5105584ee34886c7;hpb=bf47fdcda65b44dbd674eeedcaa06e0aa28a5a00;p=safe%2Fjmp%2Flinux-2.6 diff --git a/include/linux/utsname.h b/include/linux/utsname.h index 99e5223..f8d3b32 100644 --- a/include/linux/utsname.h +++ b/include/linux/utsname.h @@ -1,11 +1,6 @@ #ifndef _LINUX_UTSNAME_H #define _LINUX_UTSNAME_H -#include -#include -#include -#include - #define __OLD_UTS_LEN 8 struct oldold_utsname { @@ -35,6 +30,13 @@ struct new_utsname { char domainname[65]; }; +#ifdef __KERNEL__ + +#include +#include +#include +#include + struct uts_namespace { struct kref kref; struct new_utsname name; @@ -47,7 +49,7 @@ static inline void get_uts_ns(struct uts_namespace *ns) } #ifdef CONFIG_UTS_NS -extern int copy_utsname(int flags, struct task_struct *tsk); +extern struct uts_namespace *copy_utsname(int flags, struct uts_namespace *ns); extern void free_uts_ns(struct kref *kref); static inline void put_uts_ns(struct uts_namespace *ns) @@ -55,10 +57,12 @@ static inline void put_uts_ns(struct uts_namespace *ns) kref_put(&ns->kref, free_uts_ns); } #else -static inline int copy_utsname(int flags, struct task_struct *tsk) +static inline struct uts_namespace *copy_utsname(int flags, + struct uts_namespace *ns) { - return 0; + return ns; } + static inline void put_uts_ns(struct uts_namespace *ns) { } @@ -75,4 +79,7 @@ static inline struct new_utsname *init_utsname(void) } extern struct rw_semaphore uts_sem; -#endif + +#endif /* __KERNEL__ */ + +#endif /* _LINUX_UTSNAME_H */