diff --git a/scripts/spatch/linux/funcs.cocci b/scripts/spatch/linux/funcs.cocci
index 01802f6..69e0d80 100644
--- a/scripts/spatch/linux/funcs.cocci
+++ b/scripts/spatch/linux/funcs.cocci
@@ -92,13 +92,13 @@
 expression E;
 @@
 -spin_lock_bh(E)
-+spin_lock(E)
++spin_lock_irqsave(E)
 
 @@
 expression E;
 @@
 -spin_unlock_bh(E)
-+spin_unlock(E)
++spin_unlock_irqsave(E)
 @@
 
 expression E;
@@ -349,3 +349,15 @@
 @@
 -pci_clear_master(P)
 +pci_clr_bus_master(P)
+
+@@
+expression X;
+@@
+-upper_32_bits(X)
++high32(X)
+
+@@
+expression X;
+@@
+-lower_32_bits(X)
++low32(X)
diff --git a/scripts/spatch/linux/memory.cocci b/scripts/spatch/linux/memory.cocci
index 19d573e..591b627 100644
--- a/scripts/spatch/linux/memory.cocci
+++ b/scripts/spatch/linux/memory.cocci
@@ -1,7 +1,7 @@
 @@
 @@
 -GFP_ATOMIC
-+0
++MEM_ATOMIC
 
 @@
 @@
@@ -24,6 +24,11 @@
 +MEM_WAIT
 
 @@
+@@
+-GFP_NOWAIT
++MEM_ATOMIC
+
+@@
 expression SZ;
 expression FL;
 @@
@@ -55,6 +60,18 @@
 +kva2page(get_cont_pages(ORDER, FLAGS))
 
 @@
+expression ADDR;
+@@
+-__free_page(ADDR)
++kpages_free(page2kva(ADDR), PGSIZE)
+
+@@
+expression FLAGS;
+@@
+-alloc_page(FLAGS)
++kva2page(kpages_alloc(PGSIZE, FLAGS))
+
+@@
 expression FLAGS;
 @@
 -__get_free_page(FLAGS)
diff --git a/scripts/spatch/linux/scalar.cocci b/scripts/spatch/linux/scalar.cocci
index 7df8941..9a7486a 100644
--- a/scripts/spatch/linux/scalar.cocci
+++ b/scripts/spatch/linux/scalar.cocci
@@ -153,6 +153,18 @@
 +p->linux_dev
 
 @@
+struct pci_device *p;
+@@
+-p->device
++p->dev_id
+
+@@
+struct pci_device *p;
+@@
+-p->vendor
++p->ven_id
+
+@@
 struct ether *p;
 @@
 -p->features