diff --git a/[refs] b/[refs] index a9641867e1f7..08a6e6023464 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f34073b4e54ad58541e0e2b4a87f4f6c1460e21 +refs/heads/master: 67dd5a25f4efbfccf973159429cb20acdc5b0e0e diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index e24d348083c3..a7609cbcb00d 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -137,6 +137,7 @@ config SPLIT_PTLOCK_CPUS int default "4096" if ARM && !CPU_CACHE_VIPT default "4096" if PARISC && !PA20 + default "4096" if XEN default "4" #