diff options
Diffstat (limited to 'include/linux/utsname.h')
| -rw-r--r-- | include/linux/utsname.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/linux/utsname.h b/include/linux/utsname.h index f8d3b326e93a..923db99175f2 100644 --- a/include/linux/utsname.h +++ b/include/linux/utsname.h | |||
| @@ -48,26 +48,14 @@ static inline void get_uts_ns(struct uts_namespace *ns) | |||
| 48 | kref_get(&ns->kref); | 48 | kref_get(&ns->kref); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | #ifdef CONFIG_UTS_NS | 51 | extern struct uts_namespace *copy_utsname(unsigned long flags, |
| 52 | extern struct uts_namespace *copy_utsname(int flags, struct uts_namespace *ns); | 52 | struct uts_namespace *ns); |
| 53 | extern void free_uts_ns(struct kref *kref); | 53 | extern void free_uts_ns(struct kref *kref); |
| 54 | 54 | ||
| 55 | static inline void put_uts_ns(struct uts_namespace *ns) | 55 | static inline void put_uts_ns(struct uts_namespace *ns) |
| 56 | { | 56 | { |
| 57 | kref_put(&ns->kref, free_uts_ns); | 57 | kref_put(&ns->kref, free_uts_ns); |
| 58 | } | 58 | } |
| 59 | #else | ||
| 60 | static inline struct uts_namespace *copy_utsname(int flags, | ||
| 61 | struct uts_namespace *ns) | ||
| 62 | { | ||
| 63 | return ns; | ||
| 64 | } | ||
| 65 | |||
| 66 | static inline void put_uts_ns(struct uts_namespace *ns) | ||
| 67 | { | ||
| 68 | } | ||
| 69 | #endif | ||
| 70 | |||
| 71 | static inline struct new_utsname *utsname(void) | 59 | static inline struct new_utsname *utsname(void) |
| 72 | { | 60 | { |
| 73 | return ¤t->nsproxy->uts_ns->name; | 61 | return ¤t->nsproxy->uts_ns->name; |
