diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch) | |
tree | c8885c49f37c8d383945b8af69d51597494ed62c /drivers/block | |
parent | f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff) |
[PATCH] slab: remove SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/DAC960.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 742d07403101..8d81a3a64c07 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c | |||
@@ -324,13 +324,13 @@ static boolean DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) | |||
324 | Command->Next = Controller->FreeCommands; | 324 | Command->Next = Controller->FreeCommands; |
325 | Controller->FreeCommands = Command; | 325 | Controller->FreeCommands = Command; |
326 | Controller->Commands[CommandIdentifier-1] = Command; | 326 | Controller->Commands[CommandIdentifier-1] = Command; |
327 | ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, SLAB_ATOMIC, | 327 | ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, GFP_ATOMIC, |
328 | &ScatterGatherDMA); | 328 | &ScatterGatherDMA); |
329 | if (ScatterGatherCPU == NULL) | 329 | if (ScatterGatherCPU == NULL) |
330 | return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION"); | 330 | return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION"); |
331 | 331 | ||
332 | if (RequestSensePool != NULL) { | 332 | if (RequestSensePool != NULL) { |
333 | RequestSenseCPU = pci_pool_alloc(RequestSensePool, SLAB_ATOMIC, | 333 | RequestSenseCPU = pci_pool_alloc(RequestSensePool, GFP_ATOMIC, |
334 | &RequestSenseDMA); | 334 | &RequestSenseDMA); |
335 | if (RequestSenseCPU == NULL) { | 335 | if (RequestSenseCPU == NULL) { |
336 | pci_pool_free(ScatterGatherPool, ScatterGatherCPU, | 336 | pci_pool_free(ScatterGatherPool, ScatterGatherCPU, |