diff options
author | 2009-08-15 13:00:02 +0900 | |
---|---|---|
committer | 2009-08-15 13:00:02 +0900 | |
commit | 4b6b987969b076298485697bfb0d0e35502642a3 (patch) | |
tree | a8f5ebd6a0b9efbe30272012d759669b0c5ddc13 /arch/x86/mm/pgtable.c | |
parent | sh: Runtime PM pdev hwblk - Solution Engine 7724 (diff) | |
parent | Merge branch 'sh/stable-updates' (diff) | |
download | linux-dev-4b6b987969b076298485697bfb0d0e35502642a3.tar.xz linux-dev-4b6b987969b076298485697bfb0d0e35502642a3.zip |
Merge branch 'master' into sh/hwblk
Diffstat (limited to 'arch/x86/mm/pgtable.c')
-rw-r--r-- | arch/x86/mm/pgtable.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index af8f9650058c..ed34f5e35999 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -329,7 +329,6 @@ void __init reserve_top_address(unsigned long reserve) printk(KERN_INFO "Reserving virtual address space above 0x%08x\n", (int)-reserve); __FIXADDR_TOP = -reserve - PAGE_SIZE; - __VMALLOC_RESERVE += reserve; #endif } |