diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-16 00:05:57 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-16 00:05:57 +0400 |
| commit | 11e7651432405eeee833fe9d1307488df7a81cd3 (patch) | |
| tree | 95e6b990ff145cac9c58f40e12f2e116acb260b3 /drivers/block | |
| parent | 5c0857a9afc74ec83e222ea1b9808988d08139d9 (diff) | |
| parent | f4d9605434c0fd4cc8639bf25cfc043418c52362 (diff) | |
| download | linux-11e7651432405eeee833fe9d1307488df7a81cd3.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"A couple small fixes for sparc including some THP brown-paper-bag
material:
1) During the merging of all the THP support for various
architectures, sparc missed adding a
HAVE_ARCH_TRANSPARENT_HUGEPAGE to it's Kconfig, oops.
2) Sparc needs to be mindful of hugepages in get_user_pages_fast().
3) Fix memory leak in SBUS probe, from Cong Ding.
4) The sunvdc virtual disk client driver has a test of the bitmask of
vdisk server supported operations which was off by one bit"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sunvdc: Fix off-by-one in generic_request().
sparc64: Fix get_user_pages_fast() wrt. THP.
sparc64: Add missing HAVE_ARCH_TRANSPARENT_HUGEPAGE.
sparc: kernel/sbus.c: fix memory leakage
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/sunvdc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c index 564156a8e572..5814deb6963d 100644 --- a/drivers/block/sunvdc.c +++ b/drivers/block/sunvdc.c @@ -461,7 +461,7 @@ static int generic_request(struct vdc_port *port, u8 op, void *buf, int len) int op_len, err; void *req_buf; - if (!(((u64)1 << ((u64)op - 1)) & port->operations)) + if (!(((u64)1 << (u64)op) & port->operations)) return -EOPNOTSUPP; switch (op) { |