diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 20:10:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 20:10:11 +0200 |
| commit | fb9fc395174138983a49f2da982ed14caabbe741 (patch) | |
| tree | 5d5d3643ee6853a899205613da272cc343fdc1a4 /mm | |
| parent | [MIPS] IP22: Fix hang due to messing with timer interrupt handler (diff) | |
| parent | xfs: eagerly remove vmap mappings to avoid upsetting Xen (diff) | |
| download | linux-fb9fc395174138983a49f2da982ed14caabbe741.tar.xz linux-fb9fc395174138983a49f2da982ed14caabbe741.zip | |
Merge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xfs: eagerly remove vmap mappings to avoid upsetting Xen
xen: add some debug output for failed multicalls
xen: fix incorrect vcpu_register_vcpu_info hypercall argument
xen: ask the hypervisor how much space it needs reserved
xen: lock pte pages while pinning/unpinning
xen: deal with stale cr3 values when unpinning pagetables
xen: add batch completion callbacks
xen: yield to IPI target if necessary
Clean up duplicate includes in arch/i386/xen/
remove dead code in pgtable_cache_init
paravirt: clean up lazy mode handling
paravirt: refactor struct paravirt_ops into smaller pv_*_ops
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 1cc6cada2bbf..b1f03b0eb7f1 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -155,7 +155,6 @@ config SPLIT_PTLOCK_CPUS int default "4096" if ARM && !CPU_CACHE_VIPT default "4096" if PARISC && !PA20 - default "4096" if XEN default "4" # |