aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r--arch/parisc/kernel/pci.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
index 9e74bfe071dc..38372e7cbb88 100644
--- a/arch/parisc/kernel/pci.c
+++ b/arch/parisc/kernel/pci.c
@@ -257,10 +257,10 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
257 * Since we are just checking candidates, don't use any fields other 257 * Since we are just checking candidates, don't use any fields other
258 * than res->start. 258 * than res->start.
259 */ 259 */
260void pcibios_align_resource(void *data, struct resource *res, 260resource_size_t pcibios_align_resource(void *data, const struct resource *res,
261 resource_size_t size, resource_size_t alignment) 261 resource_size_t size, resource_size_t alignment)
262{ 262{
263 resource_size_t mask, align; 263 resource_size_t mask, align, start = res->start;
264 264
265 DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n", 265 DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n",
266 pci_name(((struct pci_dev *) data)), 266 pci_name(((struct pci_dev *) data)),
@@ -272,10 +272,10 @@ void pcibios_align_resource(void *data, struct resource *res,
272 272
273 /* Align to largest of MIN or input size */ 273 /* Align to largest of MIN or input size */
274 mask = max(alignment, align) - 1; 274 mask = max(alignment, align) - 1;
275 res->start += mask; 275 start += mask;
276 res->start &= ~mask; 276 start &= ~mask;
277 277
278 /* The caller updates the end field, we don't. */ 278 return start;
279} 279}
280 280
281 281