Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da9a92f0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

parents aa6b4960 b0ba6b0a

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+1 −1
Original line number Diff line number Diff line 
What		/sys/bus/iio/devices/iio:deviceX/in_proximity_raw

What		/sys/bus/iio/devices/iio:deviceX/in_proximity_input

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Documentation/scsi/scsi_eh.txt

+6 −2
Original line number Diff line number Diff line
@@ -263,19 +263,23 @@ scmd->allowed. 


 3. scmd recovered

    ACTION: scsi_eh_finish_cmd() is invoked to EH-finish scmd

	- shost->host_failed--

	- clear scmd->eh_eflags

	- scsi_setup_cmd_retry()

	- move from local eh_work_q to local eh_done_q

    LOCKING: none

    CONCURRENCY: at most one thread per separate eh_work_q to

		 keep queue manipulation lockless



 4. EH completes

    ACTION: scsi_eh_flush_done_q() retries scmds or notifies upper

	    layer of failure.

	    layer of failure. May be called concurrently but must have

	    a no more than one thread per separate eh_work_q to

	    manipulate the queue locklessly

	- scmd is removed from eh_done_q and scmd->eh_entry is cleared

	- if retry is necessary, scmd is requeued using

          scsi_queue_insert()

	- otherwise, scsi_finish_command() is invoked for scmd

	- zero shost->host_failed

    LOCKING: queue or finish function performs appropriate locking

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 15

SUBLEVEL = 16

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ config ARC_HAS_LLSC 


config ARC_STAR_9000923308

	bool "Workaround for llock/scond livelock"

	default y

	default n

	depends on ISA_ARCV2 && SMP && ARC_HAS_LLSC



config ARC_HAS_SWAPE

arch/arc/kernel/setup.c

+0 −4
Original line number Diff line number Diff line
@@ -332,10 +332,6 @@ static void arc_chk_core_config(void) 
		pr_warn("CONFIG_ARC_FPU_SAVE_RESTORE needed for working apps\n");

	else if (!cpu->extn.fpu_dp && fpu_enabled)

		panic("FPU non-existent, disable CONFIG_ARC_FPU_SAVE_RESTORE\n");



	if (is_isa_arcv2() && IS_ENABLED(CONFIG_SMP) && cpu->isa.atomic &&

	    !IS_ENABLED(CONFIG_ARC_STAR_9000923308))

		panic("llock/scond livelock workaround missing\n");

}



/*