[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>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index cf8c07b2704f..66a27b9688ca 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -295,7 +295,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
         new_packet = dccp_tx_hist_head(&hctx->ccid3hctx_hist);
         if (new_packet == NULL || new_packet->dccphtx_sent) {
                 new_packet = dccp_tx_hist_entry_new(ccid3_tx_hist,
-                                                    SLAB_ATOMIC);
+                                                    GFP_ATOMIC);
 
                 if (unlikely(new_packet == NULL)) {
                         DCCP_WARN("%s, sk=%p, not enough mem to add to history,"
@@ -889,7 +889,7 @@ static void ccid3_hc_rx_update_li(struct sock *sk, u64 seq_loss, u8 win_loss)
                 /* new loss event detected */
                 /* calculate last interval length */
                 seq_temp = dccp_delta_seqno(head->dccplih_seqno, seq_loss);
-                entry = dccp_li_hist_entry_new(ccid3_li_hist, SLAB_ATOMIC);
+                entry = dccp_li_hist_entry_new(ccid3_li_hist, GFP_ATOMIC);
 
                 if (entry == NULL) {
                         DCCP_BUG("out of memory - can not allocate entry");
@@ -1011,7 +1011,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
         }
 
         packet = dccp_rx_hist_entry_new(ccid3_rx_hist, sk, opt_recv->dccpor_ndp,
-                                        skb, SLAB_ATOMIC);
+                                        skb, GFP_ATOMIC);
         if (unlikely(packet == NULL)) {
                 DCCP_WARN("%s, sk=%p, Not enough mem to add rx packet "
                           "to history, consider it lost!\n", dccp_role(sk), sk);
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index 48b9b93f8acb..0a0baef16b3e 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -125,7 +125,7 @@ int dccp_li_hist_interval_new(struct dccp_li_hist *hist,
         int i;
 
         for (i = 0; i < DCCP_LI_HIST_IVAL_F_LENGTH; i++) {
-                entry = dccp_li_hist_entry_new(hist, SLAB_ATOMIC);
+                entry = dccp_li_hist_entry_new(hist, GFP_ATOMIC);
                 if (entry == NULL) {
                         dccp_li_hist_purge(hist, list);
                         DCCP_BUG("loss interval list entry is NULL");