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

Commit f2c3c67f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu into fixes

Merge " mvebu fixes for 3.19-rc (part #3)" from Andrew Lunn:

mvebu: completely disable hardware I/O coherency

* tag 'mvebu-fixes-3.19-3' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: completely disable hardware I/O coherency

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 966903a9
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -246,9 +246,14 @@ static int coherency_type(void)
	return type;
}

/*
 * As a precaution, we currently completely disable hardware I/O
 * coherency, until enough testing is done with automatic I/O
 * synchronization barriers to validate that it is a proper solution.
 */
int coherency_available(void)
{
	return coherency_type() != COHERENCY_FABRIC_TYPE_NONE;
	return false;
}

int __init coherency_init(void)