diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 13:08:56 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 13:08:56 +0100 |
| commit | 847b9d01474f710e7a018186917d05e59e258309 (patch) | |
| tree | c0da8777ce350c4b048aa6ed2c41fdd109c42e92 /arch/ia64/sn/kernel/xpc_channel.c | |
| parent | d1d051b28e9d3c3bed0bd15a2b49df3d04f7768f (diff) | |
| parent | a6df590dd8b7644c8e298e3b13442bcd6ceeb739 (diff) | |
| download | op-kernel-dev-847b9d01474f710e7a018186917d05e59e258309.zip op-kernel-dev-847b9d01474f710e7a018186917d05e59e258309.tar.gz | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/sn/kernel/xpc_channel.c')
| -rw-r--r-- | arch/ia64/sn/kernel/xpc_channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/xpc_channel.c b/arch/ia64/sn/kernel/xpc_channel.c index 8d950c7..36e5437 100644 --- a/arch/ia64/sn/kernel/xpc_channel.c +++ b/arch/ia64/sn/kernel/xpc_channel.c @@ -447,7 +447,7 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch) nbytes = nentries * ch->msg_size; ch->local_msgqueue = xpc_kmalloc_cacheline_aligned(nbytes, - (GFP_KERNEL | GFP_DMA), + GFP_KERNEL, &ch->local_msgqueue_base); if (ch->local_msgqueue == NULL) { continue; @@ -455,7 +455,7 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch) memset(ch->local_msgqueue, 0, nbytes); nbytes = nentries * sizeof(struct xpc_notify); - ch->notify_queue = kmalloc(nbytes, (GFP_KERNEL | GFP_DMA)); + ch->notify_queue = kmalloc(nbytes, GFP_KERNEL); if (ch->notify_queue == NULL) { kfree(ch->local_msgqueue_base); ch->local_msgqueue = NULL; @@ -502,7 +502,7 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch) nbytes = nentries * ch->msg_size; ch->remote_msgqueue = xpc_kmalloc_cacheline_aligned(nbytes, - (GFP_KERNEL | GFP_DMA), + GFP_KERNEL, &ch->remote_msgqueue_base); if (ch->remote_msgqueue == NULL) { continue; |
