diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-08 21:16:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-08 21:16:28 -0700 |
| commit | abe95e13471f945e4bc791f0d709969407ea9707 (patch) | |
| tree | a3d244dadc8fb6a2d272631b665ff06ea4c929e2 /arch | |
| parent | 0a72d6c42287fc511fee34783f0d1125b604bec2 (diff) | |
| parent | 961bb7796cbbbf12b9ed85ebe8c88eee41434c1a (diff) | |
| download | history-abe95e13471f945e4bc791f0d709969407ea9707.tar.gz | |
Merge http://lia64.bkbits.net/to-base-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/mm/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index a85063a1260b4e..3ab0b37e0fa9d8 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -63,6 +63,7 @@ check_pgt_cache (void) low = pgt_cache_water[0]; high = pgt_cache_water[1]; + preempt_disable(); if (pgtable_cache_size > (u64) high) { do { if (pgd_quicklist) @@ -71,6 +72,7 @@ check_pgt_cache (void) free_page((unsigned long)pmd_alloc_one_fast(0, 0)); } while (pgtable_cache_size > (u64) low); } + preempt_enable(); } void |