diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 12:36:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 12:36:28 -0400 |
| commit | 2e515bf096c245ba87f20ab4b4ea20f911afaeda (patch) | |
| tree | 8ce40f811092844ea9da683804db6e2afa410808 /drivers/infiniband/hw | |
| parent | 22e04f6b4b04a8afe9af9239224591d06ba3b24d (diff) | |
| parent | f8ea61e63442c25cbe6ddee48979b444f1f2a01c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"The usual trivial updates all over the tree -- mostly typo fixes and
documentation updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
doc: Documentation/cputopology.txt fix typo
treewide: Convert retrun typos to return
Fix comment typo for init_cma_reserved_pageblock
Documentation/trace: Correcting and extending tracepoint documentation
mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
power: Documentation: Update s2ram link
doc: fix a typo in Documentation/00-INDEX
Documentation/printk-formats.txt: No casts needed for u64/s64
doc: Fix typo "is is" in Documentations
treewide: Fix printks with 0x%#
zram: doc fixes
Documentation/kmemcheck: update kmemcheck documentation
doc: documentation/hwspinlock.txt fix typo
PM / Hibernate: add section for resume options
doc: filesystems : Fix typo in Documentations/filesystems
scsi/megaraid fixed several typos in comments
ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
page_isolation: Fix a comment typo in test_pages_isolated()
doc: fix a typo about irq affinity
...
Diffstat (limited to 'drivers/infiniband/hw')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ipz_pt_fn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c index 62c71fadb4d9..8d594517cd29 100644 --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c | |||
| @@ -222,7 +222,8 @@ int ipz_queue_ctor(struct ehca_pd *pd, struct ipz_queue *queue, | |||
| 222 | queue->small_page = NULL; | 222 | queue->small_page = NULL; |
| 223 | 223 | ||
| 224 | /* allocate queue page pointers */ | 224 | /* allocate queue page pointers */ |
| 225 | queue->queue_pages = kzalloc(nr_of_pages * sizeof(void *), GFP_KERNEL); | 225 | queue->queue_pages = kzalloc(nr_of_pages * sizeof(void *), |
| 226 | GFP_KERNEL | __GFP_NOWARN); | ||
| 226 | if (!queue->queue_pages) { | 227 | if (!queue->queue_pages) { |
| 227 | queue->queue_pages = vzalloc(nr_of_pages * sizeof(void *)); | 228 | queue->queue_pages = vzalloc(nr_of_pages * sizeof(void *)); |
| 228 | if (!queue->queue_pages) { | 229 | if (!queue->queue_pages) { |