Merge branch 'sched/urgent' into sched/core (8e9ed8b0) · Commits · e / devices / android_kernel_fairphone_FP4

CREDITS

+7 −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
		@@ -2006,6 +2006,9 @@ E: paul@laufernet.com
		D: Soundblaster driver fixes, ISAPnP quirk
		S: California, USA

		N: Jonathan Layes
		D: ARPD support

		N: Tom Lees
		E: tom@lpsg.demon.co.uk
		W: http://www.lpsg.demon.co.uk/
		@@ -3802,6 +3805,9 @@ S: van Bronckhorststraat 12
		S: 2612 XV Delft
		S: The Netherlands

		N: Thomas Woller
		D: CS461x Cirrus Logic sound driver

		N: David Woodhouse
		E: dwmw2@infradead.org
		D: JFFS2 file system, Memory Technology Device subsystem,

+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

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@ interface.
		Using sysfs
		~~~~~~~~~~~

		sysfs is always compiled in. You can access it by doing:
		sysfs is always compiled in if CONFIG_SYSFS is defined. You can access
		it by doing:

		mount -t sysfs sysfs /sys