imamnurby/smpl_train_seed8 huggingface dataset:
--- initial
+++ final
@@ -1,36 +1,36 @@
 static int dsicm_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct device *dev = &ddata->pdev->dev;
   struct omap_dss_device *in;
   int r;
   if (omapdss_device_is_connected(dssdev)) return 0;
   in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(in)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(in);
   }
-  r = in->ops->connect(in, dssdev);
+  r = omapdss_device_connect(in, dssdev);
   if (r) {
     dev_err(dev, "Failed to connect to video source\n");
     goto err_connect;
   }
   r = in->ops->dsi.request_vc(in, &ddata->channel);
   if (r) {
     dev_err(dev, "failed to get virtual channel\n");
     goto err_req_vc;
   }
   r = in->ops->dsi.set_vc_id(in, ddata->channel, TCH);
   if (r) {
     dev_err(dev, "failed to set VC_ID\n");
     goto err_vc_id;
   }
   ddata->in = in;
   return 0;
 err_vc_id:
   in->ops->dsi.release_vc(in, ddata->channel);
 err_req_vc:
-  in->ops->disconnect(in, dssdev);
+  omapdss_device_disconnect(in, dssdev);
 err_connect:
   omap_dss_put_device(in);
   return r;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@

-       in->ops->connect
+       omapdss_device_connect
		(in, dssdev)

@@
struct omap_dss_device *in;
expression dssdev;
@@
-       in->ops->disconnect
+       omapdss_device_disconnect
		(in, dssdev)
--- initial
+++ final
@@ -1,9 +1,9 @@
 static void dsicm_disconnect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in = ddata->in;
   if (!omapdss_device_is_connected(dssdev)) return;
   in->ops->dsi.release_vc(in, ddata->channel);
-  in->ops->disconnect(in, dssdev);
+  omapdss_device_disconnect(in, dssdev);
   omap_dss_put_device(in);
   ddata->in = NULL;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@
-       in->ops->disconnect
+       omapdss_device_disconnect
		(in, dssdev)
--- initial
+++ final
@@ -1,19 +1,19 @@
 static int lb035q02_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in;
   int r;
   if (omapdss_device_is_connected(dssdev)) return 0;
   in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(in)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(in);
   }
-  r = in->ops->connect(in, dssdev);
+  r = omapdss_device_connect(in, dssdev);
   if (r) {
     omap_dss_put_device(in);
     return r;
   }
   init_lb035q02_panel(ddata->spi);
   ddata->in = in;
   return 0;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@

-       in->ops->connect
+       omapdss_device_connect
		(in, dssdev)
--- initial
+++ final
@@ -1,8 +1,8 @@
 static void lb035q02_disconnect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in = ddata->in;
   if (!omapdss_device_is_connected(dssdev)) return;
-  in->ops->disconnect(in, dssdev);
+  omapdss_device_disconnect(in, dssdev);
   omap_dss_put_device(in);
   ddata->in = NULL;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@
-       in->ops->disconnect
+       omapdss_device_disconnect
		(in, dssdev)
--- initial
+++ final
@@ -1,18 +1,18 @@
 static int nec_8048_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in;
   int r;
   if (omapdss_device_is_connected(dssdev)) return 0;
   in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(in)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(in);
   }
-  r = in->ops->connect(in, dssdev);
+  r = omapdss_device_connect(in, dssdev);
   if (r) {
     omap_dss_put_device(in);
     return r;
   }
   ddata->in = in;
   return 0;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@

-       in->ops->connect
+       omapdss_device_connect
		(in, dssdev)
--- initial
+++ final
@@ -1,8 +1,8 @@
 static void nec_8048_disconnect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in = ddata->in;
   if (!omapdss_device_is_connected(dssdev)) return;
-  in->ops->disconnect(in, dssdev);
+  omapdss_device_disconnect(in, dssdev);
   omap_dss_put_device(in);
   ddata->in = NULL;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@
-       in->ops->disconnect
+       omapdss_device_disconnect
		(in, dssdev)
--- initial
+++ final
@@ -1,18 +1,18 @@
 static int sharp_ls_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in;
   int r;
   if (omapdss_device_is_connected(dssdev)) return 0;
   in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(in)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(in);
   }
-  r = in->ops->connect(in, dssdev);
+  r = omapdss_device_connect(in, dssdev);
   if (r) {
     omap_dss_put_device(in);
     return r;
   }
   ddata->in = in;
   return 0;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@

-       in->ops->connect
+       omapdss_device_connect
		(in, dssdev)
--- initial
+++ final
@@ -1,8 +1,8 @@
 static void sharp_ls_disconnect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in = ddata->in;
   if (!omapdss_device_is_connected(dssdev)) return;
-  in->ops->disconnect(in, dssdev);
+  omapdss_device_disconnect(in, dssdev);
   omap_dss_put_device(in);
   ddata->in = NULL;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@
-       in->ops->disconnect
+       omapdss_device_disconnect
		(in, dssdev)
--- initial
+++ final
@@ -1,18 +1,18 @@
 static int acx565akm_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in;
   int r;
   if (omapdss_device_is_connected(dssdev)) return 0;
   in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(in)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(in);
   }
-  r = in->ops->connect(in, dssdev);
+  r = omapdss_device_connect(in, dssdev);
   if (r) {
     omap_dss_put_device(in);
     return r;
   }
   ddata->in = in;
   return 0;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@

-       in->ops->connect
+       omapdss_device_connect
		(in, dssdev)
--- initial
+++ final
@@ -1,8 +1,8 @@
 static void acx565akm_disconnect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in = ddata->in;
   if (!omapdss_device_is_connected(dssdev)) return;
-  in->ops->disconnect(in, dssdev);
+  omapdss_device_disconnect(in, dssdev);
   omap_dss_put_device(in);
   ddata->in = NULL;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@
-       in->ops->disconnect
+       omapdss_device_disconnect
		(in, dssdev)
--- initial
+++ final
@@ -1,18 +1,18 @@
 static int td028ttec1_panel_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in;
   int r;
   if (omapdss_device_is_connected(dssdev)) return 0;
   in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(in)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(in);
   }
-  r = in->ops->connect(in, dssdev);
+  r = omapdss_device_connect(in, dssdev);
   if (r) {
     omap_dss_put_device(in);
     return r;
   }
   ddata->in = in;
   return 0;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@

-       in->ops->connect
+       omapdss_device_connect
		(in, dssdev)
--- initial
+++ final
@@ -1,8 +1,8 @@
 static void td028ttec1_panel_disconnect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in = ddata->in;
   if (!omapdss_device_is_connected(dssdev)) return;
-  in->ops->disconnect(in, dssdev);
+  omapdss_device_disconnect(in, dssdev);
   omap_dss_put_device(in);
   ddata->in = NULL;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@
-       in->ops->disconnect
+       omapdss_device_disconnect
		(in, dssdev)
--- initial
+++ final
@@ -1,18 +1,18 @@
 static int tpo_td043_connect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in;
   int r;
   if (omapdss_device_is_connected(dssdev)) return 0;
   in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node);
   if (IS_ERR(in)) {
     dev_err(dssdev->dev, "failed to find video source\n");
     return PTR_ERR(in);
   }
-  r = in->ops->connect(in, dssdev);
+  r = omapdss_device_connect(in, dssdev);
   if (r) {
     omap_dss_put_device(in);
     return r;
   }
   ddata->in = in;
   return 0;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@

-       in->ops->connect
+       omapdss_device_connect
		(in, dssdev)
--- initial
+++ final
@@ -1,8 +1,8 @@
 static void tpo_td043_disconnect(struct omap_dss_device *dssdev) {
   struct panel_drv_data *ddata = to_panel_data(dssdev);
   struct omap_dss_device *in = ddata->in;
   if (!omapdss_device_is_connected(dssdev)) return;
-  in->ops->disconnect(in, dssdev);
+  omapdss_device_disconnect(in, dssdev);
   omap_dss_put_device(in);
   ddata->in = NULL;
 }<sep>@@
struct omap_dss_device *in;
expression dssdev;
@@
-       in->ops->disconnect
+       omapdss_device_disconnect
		(in, dssdev)
--- initial
+++ final
@@ -1,9 +1,9 @@
 void *__ref zalloc_maybe_bootmem(size_t size, gfp_t mask) {
   void *p;
   if (slab_is_available())
     p = kzalloc(size, mask);
   else {
-    p = memblock_alloc(size, 0);
+    p = memblock_alloc(size, SMP_CACHE_BYTES);
   }
   return p;
 }<sep>@@
expression size, min_addr, max_addr, nid;
@@
(
- memblock_alloc_try_nid_raw(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_raw(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid_nopanic(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_nopanic(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, nid)
|
- memblock_alloc(size, 0)
+ memblock_alloc(size, SMP_CACHE_BYTES)
|
- memblock_alloc_raw(size, 0)
+ memblock_alloc_raw(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from(size, 0, min_addr)
+ memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_nopanic(size, 0)
+ memblock_alloc_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low(size, 0)
+ memblock_alloc_low(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low_nopanic(size, 0)
+ memblock_alloc_low_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from_nopanic(size, 0, min_addr)
+ memblock_alloc_from_nopanic(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_node(size, 0, nid)
+ memblock_alloc_node(size, SMP_CACHE_BYTES, nid)
)
--- initial
+++ final
@@ -1,30 +1,30 @@
 static void __init request_standard_resources(void) {
   struct memblock_region *region;
   struct resource *res;
   unsigned long i = 0;
   kernel_code.start = __pa_symbol(_text);
   kernel_code.end = __pa_symbol(__init_begin - 1);
   kernel_data.start = __pa_symbol(_sdata);
   kernel_data.end = __pa_symbol(_end - 1);
   num_standard_resources = memblock.memory.cnt;
-  standard_resources = memblock_alloc_low(num_standard_resources * sizeof(*standard_resources), 0);
+  standard_resources = memblock_alloc_low(num_standard_resources * sizeof(*standard_resources), SMP_CACHE_BYTES);
   for_each_memblock(memory, region) {
     res = &standard_resources[i++];
     if (memblock_is_nomap(region)) {
       res->name = "reserved";
       res->flags = IORESOURCE_MEM;
     } else {
       res->name = "System RAM";
       res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
     }
     res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region));
     res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1;
     request_resource(&iomem_resource, res);
     if (kernel_code.start >= res->start && kernel_code.end <= res->end) request_resource(res, &kernel_code);
     if (kernel_data.start >= res->start && kernel_data.end <= res->end) request_resource(res, &kernel_data);
 #ifdef CONFIG_KEXEC_CORE
     /* Userspace will find "Crash kernel" region in /proc/iomem. */
     if (crashk_res.end && crashk_res.start >= res->start && crashk_res.end <= res->end) request_resource(res, &crashk_res);
 #endif
   }
 }<sep>@@
expression size, min_addr, max_addr, nid;
@@
(
- memblock_alloc_try_nid_raw(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_raw(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid_nopanic(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_nopanic(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, nid)
|
- memblock_alloc(size, 0)
+ memblock_alloc(size, SMP_CACHE_BYTES)
|
- memblock_alloc_raw(size, 0)
+ memblock_alloc_raw(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from(size, 0, min_addr)
+ memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_nopanic(size, 0)
+ memblock_alloc_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low(size, 0)
+ memblock_alloc_low(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low_nopanic(size, 0)
+ memblock_alloc_low_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from_nopanic(size, 0, min_addr)
+ memblock_alloc_from_nopanic(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_node(size, 0, nid)
+ memblock_alloc_node(size, SMP_CACHE_BYTES, nid)
)
--- initial
+++ final
@@ -1,6 +1,6 @@
 void __init omap2_clk_legacy_provider_init(int index, void __iomem *mem) {
   struct clk_iomap *io;
-  io = memblock_alloc(sizeof(*io), 0);
+  io = memblock_alloc(sizeof(*io), SMP_CACHE_BYTES);
   io->mem = mem;
   clk_memmaps[index] = io;
 }<sep>@@
expression size, min_addr, max_addr, nid;
@@
(
- memblock_alloc_try_nid_raw(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_raw(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid_nopanic(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_nopanic(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, nid)
|
- memblock_alloc(size, 0)
+ memblock_alloc(size, SMP_CACHE_BYTES)
|
- memblock_alloc_raw(size, 0)
+ memblock_alloc_raw(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from(size, 0, min_addr)
+ memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_nopanic(size, 0)
+ memblock_alloc_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low(size, 0)
+ memblock_alloc_low(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low_nopanic(size, 0)
+ memblock_alloc_low_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from_nopanic(size, 0, min_addr)
+ memblock_alloc_from_nopanic(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_node(size, 0, nid)
+ memblock_alloc_node(size, SMP_CACHE_BYTES, nid)
)
--- initial
+++ final
@@ -1,39 +1,39 @@
 void __init apecs_init_arch(void) {
   struct pci_controller *hose;
   /*
    * Create our single hose.
    */
   pci_isa_hose = hose = alloc_pci_controller();
   hose->io_space = &ioport_resource;
   hose->mem_space = &iomem_resource;
   hose->index = 0;
   hose->sparse_mem_base = APECS_SPARSE_MEM - IDENT_ADDR;
   hose->dense_mem_base = APECS_DENSE_MEM - IDENT_ADDR;
   hose->sparse_io_base = APECS_IO - IDENT_ADDR;
   hose->dense_io_base = 0;
   /*
    * Set up the PCI to main memory translation windows.
    *
    * Window 1 is direct access 1GB at 1GB
    * Window 2 is scatter-gather 8MB at 8MB (for isa)
    */
-  hose->sg_isa = iommu_arena_new(hose, 0x00800000, 0x00800000, 0);
+  hose->sg_isa = iommu_arena_new(hose, 0x00800000, 0x00800000, SMP_CACHE_BYTES);
   hose->sg_pci = NULL;
   __direct_map_base = 0x40000000;
   __direct_map_size = 0x40000000;
   *(vuip)APECS_IOC_PB1R = __direct_map_base | 0x00080000;
   *(vuip)APECS_IOC_PM1R = (__direct_map_size - 1) & 0xfff00000U;
   *(vuip)APECS_IOC_TB1R = 0;
   *(vuip)APECS_IOC_PB2R = hose->sg_isa->dma_base | 0x000c0000;
   *(vuip)APECS_IOC_PM2R = (hose->sg_isa->size - 1) & 0xfff00000;
   *(vuip)APECS_IOC_TB2R = virt_to_phys(hose->sg_isa->ptes) >> 1;
   apecs_pci_tbi(hose, 0, -1);
   /*
    * Finally, clear the HAXR2 register, which gets used
    * for PCI Config Space accesses. That is the way
    * we want to use it, and we do not want to depend on
    * what ARC or SRM might have left behind...
    */
   *(vuip)APECS_IOC_HAXR2 = 0;
   mb();
 }<sep>@@
expression hose, base, length;
@@

-	iommu_arena_new(hose, base, length, 0)
+	iommu_arena_new(hose, base, length, SMP_CACHE_BYTES)
--- initial
+++ final
@@ -1,49 +1,49 @@
 void __init lca_init_arch(void) {
   struct pci_controller *hose;
   /*
    * Create our single hose.
    */
   pci_isa_hose = hose = alloc_pci_controller();
   hose->io_space = &ioport_resource;
   hose->mem_space = &iomem_resource;
   hose->index = 0;
   hose->sparse_mem_base = LCA_SPARSE_MEM - IDENT_ADDR;
   hose->dense_mem_base = LCA_DENSE_MEM - IDENT_ADDR;
   hose->sparse_io_base = LCA_IO - IDENT_ADDR;
   hose->dense_io_base = 0;
   /*
    * Set up the PCI to main memory translation windows.
    *
    * Mimic the SRM settings for the direct-map window.
    *   Window 0 is scatter-gather 8MB at 8MB (for isa).
    *   Window 1 is direct access 1GB at 1GB.
    *
    * Note that we do not try to save any of the DMA window CSRs
    * before setting them, since we cannot read those CSRs on LCA.
    */
-  hose->sg_isa = iommu_arena_new(hose, 0x00800000, 0x00800000, 0);
+  hose->sg_isa = iommu_arena_new(hose, 0x00800000, 0x00800000, SMP_CACHE_BYTES);
   hose->sg_pci = NULL;
   __direct_map_base = 0x40000000;
   __direct_map_size = 0x40000000;
   *(vulp)LCA_IOC_W_BASE0 = hose->sg_isa->dma_base | (3UL << 32);
   *(vulp)LCA_IOC_W_MASK0 = (hose->sg_isa->size - 1) & 0xfff00000;
   *(vulp)LCA_IOC_T_BASE0 = virt_to_phys(hose->sg_isa->ptes);
   *(vulp)LCA_IOC_W_BASE1 = __direct_map_base | (2UL << 32);
   *(vulp)LCA_IOC_W_MASK1 = (__direct_map_size - 1) & 0xfff00000;
   *(vulp)LCA_IOC_T_BASE1 = 0;
   *(vulp)LCA_IOC_TB_ENA = 0x80;
   lca_pci_tbi(hose, 0, -1);
   /*
    * Disable PCI parity for now.  The NCR53c810 chip has
    * troubles meeting the PCI spec which results in
    * data parity errors.
    */
   *(vulp)LCA_IOC_PAR_DIS = 1UL << 5;
   /*
    * Finally, set up for restoring the correct HAE if using SRM.
    * Again, since we cannot read many of the CSRs on the LCA,
    * one of which happens to be the HAE, we save the value that
    * the SRM will expect...
    */
   if (alpha_using_srm) srm_hae = 0x80000000UL;
 }<sep>@@
expression hose, base, length;
@@

-	iommu_arena_new(hose, base, length, 0)
+	iommu_arena_new(hose, base, length, SMP_CACHE_BYTES)
--- initial
+++ final
@@ -1,47 +1,47 @@
 static struct io7 *__init alloc_io7(unsigned int pe) {
   struct io7 *io7;
   struct io7 *insp;
   int h;
   if (marvel_find_io7(pe)) {
     printk(KERN_WARNING "IO7 at PE %d already allocated!\n", pe);
     return NULL;
   }
-  io7 = memblock_alloc(sizeof(*io7), 0);
+  io7 = memblock_alloc(sizeof(*io7), SMP_CACHE_BYTES);
   io7->pe = pe;
   raw_spin_lock_init(&io7->irq_lock);
   for (h = 0; h < 4; h++) {
     io7->ports[h].io7 = io7;
     io7->ports[h].port = h;
     io7->ports[h].enabled = 0; /* default to disabled */
   }
   /*
    * Insert in pe sorted order.
    */
   if (NULL == io7_head) /* empty list */
     io7_head = io7;
   else if (io7_head->pe > io7->pe) { /* insert at head */
     io7->next = io7_head;
     io7_head = io7;
   } else { /* insert at position */
     for (insp = io7_head; insp; insp = insp->next) {
       if (insp->pe == io7->pe) {
         printk(KERN_ERR "Too many IO7s at PE %d\n", io7->pe);
         return NULL;
       }
       if (NULL == insp->next || insp->next->pe > io7->pe) { /* insert here */
         io7->next = insp->next;
         insp->next = io7;
         break;
       }
     }
     if (NULL == insp) { /* couldn't insert ?!? */
       printk(KERN_WARNING "Failed to insert IO7 at PE %d "
                           " - adding at head of list\n",
              io7->pe);
       io7->next = io7_head;
       io7_head = io7;
     }
   }
 
   return io7;
 }<sep>@@
expression size, min_addr, max_addr, nid;
@@
(
- memblock_alloc_try_nid_raw(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_raw(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid_nopanic(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_nopanic(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, nid)
|
- memblock_alloc(size, 0)
+ memblock_alloc(size, SMP_CACHE_BYTES)
|
- memblock_alloc_raw(size, 0)
+ memblock_alloc_raw(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from(size, 0, min_addr)
+ memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_nopanic(size, 0)
+ memblock_alloc_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low(size, 0)
+ memblock_alloc_low(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low_nopanic(size, 0)
+ memblock_alloc_low_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from_nopanic(size, 0, min_addr)
+ memblock_alloc_from_nopanic(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_node(size, 0, nid)
+ memblock_alloc_node(size, SMP_CACHE_BYTES, nid)
)
--- initial
+++ final
@@ -1,9 +1,9 @@
 static char *__init mk_resource_name(int pe, int port, char *str) {
   char tmp[80];
   char *name;
 
   sprintf(tmp, "PCI %s PE %d PORT %d", str, pe, port);
-  name = memblock_alloc(strlen(tmp) + 1, 0);
+  name = memblock_alloc(strlen(tmp) + 1, SMP_CACHE_BYTES);
   strcpy(name, tmp);
   return name;
 }<sep>@@
expression size, min_addr, max_addr, nid;
@@
(
- memblock_alloc_try_nid_raw(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_raw(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid_nopanic(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid_nopanic(size, SMP_CACHE_BYTES, min_addr, max_addr,nid)
|
- memblock_alloc_try_nid(size, 0, min_addr, max_addr, nid)
+ memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, nid)
|
- memblock_alloc(size, 0)
+ memblock_alloc(size, SMP_CACHE_BYTES)
|
- memblock_alloc_raw(size, 0)
+ memblock_alloc_raw(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from(size, 0, min_addr)
+ memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_nopanic(size, 0)
+ memblock_alloc_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low(size, 0)
+ memblock_alloc_low(size, SMP_CACHE_BYTES)
|
- memblock_alloc_low_nopanic(size, 0)
+ memblock_alloc_low_nopanic(size, SMP_CACHE_BYTES)
|
- memblock_alloc_from_nopanic(size, 0, min_addr)
+ memblock_alloc_from_nopanic(size, SMP_CACHE_BYTES, min_addr)
|
- memblock_alloc_node(size, 0, nid)
+ memblock_alloc_node(size, SMP_CACHE_BYTES, nid)
)