diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-11 18:59:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-11 18:59:45 -0700 |
| commit | 409ab140e2ec662e473d4968e12b7ac97f5a5f4e (patch) | |
| tree | b6ddbb6ea24387b912706790cbd9302db01c3d5d /arch/s390/mm | |
| parent | ce8453776d68982cfe93bcb28191af8ccad01f45 (diff) | |
| parent | badb8bb983e9cf5b7a872e0a4f6ebeac2b1ce133 (diff) | |
| download | op-kernel-dev-409ab140e2ec662e473d4968e12b7ac97f5a5f4e.zip op-kernel-dev-409ab140e2ec662e473d4968e12b7ac97f5a5f4e.tar.gz | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] fix alloc_pgste check in init_new_context
[S390] oprofile: fix min/max interval query checks
[S390] replace diag10() with diag10_range() function
[S390] disassembler: handle b280/spp instruction
[S390] kernel: Initialize register 14 when starting new CPU
[S390] dasd: prevent IO error during reserve/release loop
[S390] sclp/memory hotplug: fix initial usecount of increments
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/cmm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index c66ffd8..1f1dba9 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c @@ -91,7 +91,7 @@ static long cmm_alloc_pages(long nr, long *counter, } else free_page((unsigned long) npa); } - diag10(addr); + diag10_range(addr >> PAGE_SHIFT, 1); pa->pages[pa->index++] = addr; (*counter)++; spin_unlock(&cmm_lock); |
