summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2021-02-07 15:45:02 +0200
committerMichael Bestas <mkbestas@lineageos.org>2021-02-07 15:45:02 +0200
commit32ed4c6cace37c492b7deacdf3fa223618b1ad2e (patch)
tree0d247f7c30832c3137d9a868f95df59b19bf7712 /init
parent4d2544c30eab39bfe0eed6027fe4059f58ee91ad (diff)
parent0566f6529a7b8d15d8ff50797331717b346f9aa4 (diff)
Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/common into lineage-18.1-caf-msm8998
This brings LA.UM.9.2.r1-02000-SDMxx0.0 up to date with https://android.googlesource.com/kernel/common/ android-4.4-p at commit: 0566f6529a7b8 Merge 4.4.255 into android-4.4-p Conflicts: drivers/scsi/ufs/ufshcd.c drivers/usb/gadget/function/f_accessory.c drivers/usb/gadget/function/f_uac2.c net/core/skbuff.c Change-Id: I327c7f3793e872609f33f2a8e70eba7b580d70f3
Diffstat (limited to 'init')
-rw-r--r--init/version.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/init/version.c b/init/version.c
index fe41a63efed6..5606341e9efd 100644
--- a/init/version.c
+++ b/init/version.c
@@ -23,9 +23,7 @@ int version_string(LINUX_VERSION_CODE);
#endif
struct uts_namespace init_uts_ns = {
- .kref = {
- .refcount = ATOMIC_INIT(2),
- },
+ .kref = KREF_INIT(2),
.name = {
.sysname = UTS_SYSNAME,
.nodename = UTS_NODENAME,