strace: Remove the ability to write to Qstrace
[akaros.git] / kern / drivers / net / etherigbe.c
index 7c0a159..3bcf79f 100644 (file)
@@ -1054,7 +1054,7 @@ igbereplenish(struct ctlr* ctlr)
        while(NEXT_RING(rdt, ctlr->nrd) != ctlr->rdh){
                rd = &ctlr->rdba[rdt];
                if(ctlr->rb[rdt] == NULL){
-                       bp = iallocb(Rbsz);
+                       bp = block_alloc(Rbsz, MEM_ATOMIC);
                        if(bp == NULL){
                                /* needs to be a safe print for interrupt level */
                                printk("#l%d: igbereplenish: no available buffers\n",
@@ -1258,11 +1258,11 @@ igbeattach(struct ether* edev)
        }
 
        /* the ktasks should free these names, if they ever exit */
-       name = kmalloc(KNAMELEN, KMALLOC_WAIT);
+       name = kmalloc(KNAMELEN, MEM_WAIT);
        snprintf(name, KNAMELEN, "#l%dlproc", edev->ctlrno);
        ktask(name, igbelproc, edev);
 
-       name = kmalloc(KNAMELEN, KMALLOC_WAIT);
+       name = kmalloc(KNAMELEN, MEM_WAIT);
        snprintf(name, KNAMELEN, "#l%drproc", edev->ctlrno);
        ktask(name, igberproc, edev);
 
@@ -1971,7 +1971,7 @@ igbepci(void)
                       pcidev->ven_id, pcidev->dev_id,
                       pcidev->bus, pcidev->dev, pcidev->func);
 
-               mmio_paddr = pcidev->bar[0].mmio_base32 ? pcidev->bar[0].mmio_base32 : 
+               mmio_paddr = pcidev->bar[0].mmio_base32 ? pcidev->bar[0].mmio_base32 :
                                                          pcidev->bar[0].mmio_base64;
                mem = (void*)vmap_pmem_nocache(mmio_paddr, pcidev->bar[0].mmio_sz);
                if(mem == NULL){