Merge branch 'master' into for-linus (b4093d62) · Commits · e / devices / android_kernel_oneplus_sm8150

CREDITS

+1 −1

Original line number	Diff line number	Diff line
		@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
		D: The Linux Support Team Erlangen

		N: Andreas Koensgen
		E: ajk@iehk.rwth-aachen.de
		E: ajk@comnets.uni-bremen.de
		D: 6pack driver for AX.25

		N: Harald Koerfgen

+6 −1

Original line number	Diff line number	Diff line
		@@ -83,11 +83,12 @@ not detect it missed following items in original chain.
		obj = kmem_cache_alloc(...);
		lock_chain(); // typically a spin_lock()
		obj->key = key;
		atomic_inc(&obj->refcnt);
		/*
		* we need to make sure obj->key is updated before obj->next
		* or obj->refcnt
		*/
		smp_wmb();
		atomic_set(&obj->refcnt, 1);
		hlist_add_head_rcu(&obj->obj_node, list);
		unlock_chain(); // typically a spin_unlock()

		@@ -159,6 +160,10 @@ out:
		obj = kmem_cache_alloc(cachep);
		lock_chain(); // typically a spin_lock()
		obj->key = key;
		/*
		* changes to obj->key must be visible before refcnt one
		*/
		smp_wmb();
		atomic_set(&obj->refcnt, 1);
		/*
		* insert obj in RCU way (readers might be traversing chain)

+2 −2

Original line number	Diff line number	Diff line
		/*
		* cn_test.c
		*
		* 2004-2005 Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru>
		* 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
		* All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		@@ -194,5 +194,5 @@ module_init(cn_test_init);
		module_exit(cn_test_fini);

		MODULE_LICENSE("GPL");
		MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
		MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
		MODULE_DESCRIPTION("Connector's test module");

+1 −1

Original line number	Diff line number	Diff line
		/*
		* ucon.c
		*
		* Copyright (c) 2004+ Evgeniy Polyakov <johnpol@2ka.mipt.ru>
		* Copyright (c) 2004+ Evgeniy Polyakov <zbr@ioremap.net>
		*
		*
		* This program is free software; you can redistribute it and/or modify

+1 −1

Original line number	Diff line number	Diff line
		This is the 6pack-mini-HOWTO, written by

		Andreas Könsgen DG3KQ
		Internet: ajk@iehk.rwth-aachen.de
		Internet: ajk@comnets.uni-bremen.de
		AMPR-net: dg3kq@db0pra.ampr.org
		AX.25: dg3kq@db0ach.#nrw.deu.eu