diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 03:59:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 03:59:45 +0200 |
| commit | 409ab140e2ec662e473d4968e12b7ac97f5a5f4e (patch) | |
| tree | b6ddbb6ea24387b912706790cbd9302db01c3d5d /arch/s390/mm/cmm.c | |
| parent | Revert "Bluetooth: fix shutdown on SCO sockets" (diff) | |
| parent | [S390] fix alloc_pgste check in init_new_context (diff) | |
| download | linux-409ab140e2ec662e473d4968e12b7ac97f5a5f4e.tar.xz linux-409ab140e2ec662e473d4968e12b7ac97f5a5f4e.zip | |
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/cmm.c')
| -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 c66ffd8dbbb7..1f1dba9dcf58 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); |