Linus Torvalds
d12de1ef5e
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ...
Pull powerpc mremap fix from Ben Herrenschmidt:
"This is the patch that I had sent after -rc8 and which we decided to
wait before merging. It's based on a different tree than my -next
branch (it needs some pre-reqs that were in -rc4 or so while my -next
is based on -rc1) so I left it as a separate branch for your to pull.
It's identical to the request I did 2 or 3 weeks back.
This fixes crashes in mremap with THP on powerpc.
The fix however requires a small change in the generic code. It moves
a condition into a helper we can override from the arch which is
harmless, but it *also* slightly changes the order of the set_pmd and
the withdraw & deposit, which should be fine according to Kirill (who
wrote that code) but I agree -rc8 is a bit late...
It was acked by Kirill and Andrew told me to just merge it via powerpc"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/thp: Fix crash on mremap
2014-01-27 21:03:39 -08:00
2013-11-13 12:09:22 +09:00
2009-07-27 12:10:38 -07:00
2009-06-15 13:27:38 +10:00
2009-06-12 11:32:58 +02:00
2013-03-13 06:11:05 +01:00
2014-01-17 17:01:46 -05:00
2011-05-04 14:41:28 -04:00
2011-05-04 14:41:28 -04:00
2007-05-11 05:38:25 -04:00
2014-01-17 17:01:46 -05:00
2014-01-12 10:37:17 +01:00
2011-03-23 19:46:22 -07:00
2012-10-04 18:20:15 +01:00
2012-06-25 10:32:49 -07:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:50 +02:00
2011-05-25 08:39:37 -07:00
2013-02-11 20:00:33 +05:30
2012-10-03 21:33:53 +02:00
2013-02-19 08:43:37 +01:00
2013-03-13 06:11:05 +01:00
2013-01-27 19:23:25 +01:00
2013-04-26 18:58:12 +02:00
2013-01-27 19:23:27 +01:00
2009-06-11 21:02:37 +02:00
2011-07-22 18:45:33 +02:00
2009-07-22 00:28:38 +02:00
2008-05-01 08:03:58 -07:00
2012-07-30 12:25:46 +02:00
2012-12-25 20:14:54 +01:00
2012-07-30 12:25:46 +02:00
2009-06-11 21:02:42 +02:00
2005-07-26 14:35:41 -07:00
2012-03-28 18:30:03 +01:00
2009-06-11 21:02:37 +02:00
2014-01-23 16:36:54 -08:00
2011-03-17 09:19:04 +08:00
2011-03-11 12:23:31 +01:00
2012-02-24 10:39:27 -08:00
2013-11-12 15:50:46 +09:00
2010-10-07 14:08:55 +01:00
2013-12-19 00:14:53 -05:00
2013-10-02 20:02:35 -04:00
2009-06-11 21:02:42 +02:00
2005-04-16 15:20:36 -07:00
2012-10-04 18:20:15 +01:00
2012-02-21 16:47:28 -08:00
2012-02-21 16:47:28 -08:00
2013-05-22 09:45:57 +02:00
2012-10-04 18:20:15 +01:00
2012-02-27 09:43:30 -06:00
2010-12-17 15:07:19 +01:00
2009-06-11 21:02:37 +02:00
2010-10-07 14:08:55 +01:00
2012-10-02 18:01:56 +01:00
2010-10-09 21:51:44 +02:00
2012-07-24 15:27:30 +08:00
2013-06-05 13:21:29 +03:00
2007-10-12 14:55:37 -04:00
2009-06-11 21:02:37 +02:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2013-10-14 15:28:29 +02:00
2007-05-02 19:27:14 +02:00
2009-06-11 21:02:50 +02:00
2012-12-09 23:14:14 +01:00
2012-09-28 14:31:03 +09:30
2013-06-26 12:10:55 +02:00
2013-06-26 12:10:55 +02:00
2013-06-26 12:10:55 +02:00
2009-06-11 21:02:37 +02:00
2012-01-10 17:39:40 -08:00
2012-10-04 18:20:15 +01:00
2013-01-03 15:57:16 -08:00
2012-02-27 09:43:30 -06:00
2012-04-30 15:21:02 -06:00
2010-03-12 15:52:42 -08:00
2012-02-23 20:19:04 -07:00
2010-09-10 10:56:51 +02:00
2009-06-11 21:02:50 +02:00
2009-07-27 12:10:38 -07:00
2009-07-27 12:10:38 -07:00
2014-01-15 15:46:38 +11:00
2013-12-11 15:52:32 +01:00
2011-05-26 17:12:36 -07:00
2012-10-04 18:20:15 +01:00
2009-06-11 21:02:18 +02:00
2011-11-01 07:34:20 -07:00
2010-05-27 09:12:54 -07:00
2013-07-03 16:07:34 -07:00
2009-06-11 21:02:50 +02:00
2009-06-11 21:02:42 +02:00
2013-11-09 00:16:29 -05:00
2012-11-29 00:01:23 -05:00
2013-09-24 06:02:24 +10:00
2012-06-28 17:14:34 +01:00
2009-06-11 21:02:37 +02:00
2012-10-04 18:20:15 +01:00
2009-06-11 21:02:37 +02:00
2012-03-28 18:30:03 +01:00
2012-04-14 11:13:19 +10:00
2013-02-14 09:21:15 -05:00
2009-06-11 21:01:52 +02:00
2012-10-04 18:20:15 +01:00
2009-06-11 21:02:42 +02:00
2013-08-16 08:52:46 -07:00
2012-03-04 17:54:34 -05:00
2010-08-09 20:44:57 -07:00
2012-11-13 15:48:27 -05:00
2009-06-11 21:02:17 +02:00
2014-01-02 10:45:23 +01:00
2009-06-11 21:02:37 +02:00
2013-05-05 10:58:06 -07:00
2011-03-01 15:49:39 +01:00
2009-06-11 21:02:42 +02:00
2013-10-17 15:05:17 +10:30
2013-09-30 14:31:02 -07:00
2013-12-12 10:39:01 -08:00
2012-10-03 21:21:06 +02:00
d12de1ef5e