diff options
Diffstat (limited to 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/xpc.h | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/pci_dma.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/xpc.h b/arch/ia64/sn/kernel/xpc.h index 33df1b3758b6..fbcedc7c27fa 100644 --- a/arch/ia64/sn/kernel/xpc.h +++ b/arch/ia64/sn/kernel/xpc.h | |||
@@ -1221,7 +1221,7 @@ xpc_map_bte_errors(bte_result_t error) | |||
1221 | 1221 | ||
1222 | 1222 | ||
1223 | static inline void * | 1223 | static inline void * |
1224 | xpc_kmalloc_cacheline_aligned(size_t size, int flags, void **base) | 1224 | xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base) |
1225 | { | 1225 | { |
1226 | /* see if kmalloc will give us cachline aligned memory by default */ | 1226 | /* see if kmalloc will give us cachline aligned memory by default */ |
1227 | *base = kmalloc(size, flags); | 1227 | *base = kmalloc(size, flags); |
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c index abdf6eea6ac8..9bf9f23b9a1f 100644 --- a/arch/ia64/sn/pci/pci_dma.c +++ b/arch/ia64/sn/pci/pci_dma.c | |||
@@ -75,7 +75,7 @@ EXPORT_SYMBOL(sn_dma_set_mask); | |||
75 | * more information. | 75 | * more information. |
76 | */ | 76 | */ |
77 | void *sn_dma_alloc_coherent(struct device *dev, size_t size, | 77 | void *sn_dma_alloc_coherent(struct device *dev, size_t size, |
78 | dma_addr_t * dma_handle, int flags) | 78 | dma_addr_t * dma_handle, gfp_t flags) |
79 | { | 79 | { |
80 | void *cpuaddr; | 80 | void *cpuaddr; |
81 | unsigned long phys_addr; | 81 | unsigned long phys_addr; |