projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i2c: some overdue driver removal
[powerpc.git]
/
include
/
linux
/
utsname.h
diff --git
a/include/linux/utsname.h
b/include/linux/utsname.h
index
f8d3b32
..
923db99
100644
(file)
--- a/
include/linux/utsname.h
+++ b/
include/linux/utsname.h
@@
-48,26
+48,14
@@
static inline void get_uts_ns(struct uts_namespace *ns)
kref_get(&ns->kref);
}
kref_get(&ns->kref);
}
-#ifdef CONFIG_UTS_NS
-
extern struct uts_namespace *copy_utsname(int flags,
struct uts_namespace *ns);
+extern struct uts_namespace *copy_utsname(unsigned long flags,
+
struct uts_namespace *ns);
extern void free_uts_ns(struct kref *kref);
static inline void put_uts_ns(struct uts_namespace *ns)
{
kref_put(&ns->kref, free_uts_ns);
}
extern void free_uts_ns(struct kref *kref);
static inline void put_uts_ns(struct uts_namespace *ns)
{
kref_put(&ns->kref, free_uts_ns);
}
-#else
-static inline struct uts_namespace *copy_utsname(int flags,
- struct uts_namespace *ns)
-{
- return ns;
-}
-
-static inline void put_uts_ns(struct uts_namespace *ns)
-{
-}
-#endif
-
static inline struct new_utsname *utsname(void)
{
return ¤t->nsproxy->uts_ns->name;
static inline struct new_utsname *utsname(void)
{
return ¤t->nsproxy->uts_ns->name;