diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:05:56 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-24 04:05:56 +0300 |
| commit | 4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad (patch) | |
| tree | 8ae6e81fc69fe38db812573a66dc4b3a4d19b5fe /drivers/s390/cio/idset.h | |
| parent | 4a09cbcee49a6f94fa5f56e90b087dfbeb005b77 (diff) | |
| parent | fd2c32a95b10f49d3099188d4d825d9a91e9fe05 (diff) | |
| download | linux-4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad.tar.gz linux-4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad.tar.bz2 linux-4e3ab74c22425e73a0c11dcc065c94c5c75ed2ad.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Among the usual minor bug fixes the more interesting patches are the
perf counters for the latest machine, the missing select to enable
transparent huge pages and a build fix for the UAPI rework."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390,uapi: do not use uapi/asm-generic/kvm_para.h
s390/cache: fix data/instruction cache output
s390: fix linker script for 31 bit builds
s390/thp: select HAVE_ARCH_TRANSPARENT_HUGEPAGE
s390/kdump: Use 64 bit mode for 0x10000 entry point
perf_cpum_cf: Add support for counters available with IBM zEC12
s390/css: stop stsch loop after cc 3
s390/cio: use generic bitmap functions
s390/chpid: make headers usable (again)
Diffstat (limited to 'drivers/s390/cio/idset.h')
| -rw-r--r-- | drivers/s390/cio/idset.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/cio/idset.h b/drivers/s390/cio/idset.h index 3d943f03591e..06d3bc01bb09 100644 --- a/drivers/s390/cio/idset.h +++ b/drivers/s390/cio/idset.h @@ -1,5 +1,5 @@ /* - * Copyright IBM Corp. 2007 + * Copyright IBM Corp. 2007, 2012 * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> */ @@ -17,6 +17,7 @@ void idset_fill(struct idset *set); struct idset *idset_sch_new(void); void idset_sch_add(struct idset *set, struct subchannel_id id); void idset_sch_del(struct idset *set, struct subchannel_id id); +void idset_sch_del_subseq(struct idset *set, struct subchannel_id schid); int idset_sch_contains(struct idset *set, struct subchannel_id id); int idset_sch_get_first(struct idset *set, struct subchannel_id *id); int idset_is_empty(struct idset *set); |