.. | .. |
---|
3 | 3 | * License. See the file "COPYING" in the main directory of this archive |
---|
4 | 4 | * for more details. |
---|
5 | 5 | * |
---|
| 6 | + * (C) Copyright 2020 Hewlett Packard Enterprise Development LP |
---|
6 | 7 | * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. |
---|
7 | 8 | */ |
---|
8 | 9 | |
---|
.. | .. |
---|
93 | 94 | if (ret != xpNeedMoreInfo) |
---|
94 | 95 | break; |
---|
95 | 96 | |
---|
96 | | - /* !!! L1_CACHE_ALIGN() is only a sn2-bte_copy requirement */ |
---|
97 | | - if (is_shub()) |
---|
98 | | - len = L1_CACHE_ALIGN(len); |
---|
99 | | - |
---|
100 | 97 | if (len > buf_len) { |
---|
101 | | - if (buf_base != NULL) |
---|
102 | | - kfree(buf_base); |
---|
| 98 | + kfree(buf_base); |
---|
103 | 99 | buf_len = L1_CACHE_ALIGN(len); |
---|
104 | 100 | buf = xpc_kmalloc_cacheline_aligned(buf_len, GFP_KERNEL, |
---|
105 | 101 | &buf_base); |
---|
.. | .. |
---|
438 | 434 | */ |
---|
439 | 435 | region_size = xp_region_size; |
---|
440 | 436 | |
---|
441 | | - if (is_uv()) |
---|
| 437 | + if (is_uv_system()) |
---|
442 | 438 | max_regions = 256; |
---|
443 | 439 | else { |
---|
444 | 440 | max_regions = 64; |
---|
.. | .. |
---|
446 | 442 | switch (region_size) { |
---|
447 | 443 | case 128: |
---|
448 | 444 | max_regions *= 2; |
---|
449 | | - /* fall through */ |
---|
| 445 | + fallthrough; |
---|
450 | 446 | case 64: |
---|
451 | 447 | max_regions *= 2; |
---|
452 | | - /* fall through */ |
---|
| 448 | + fallthrough; |
---|
453 | 449 | case 32: |
---|
454 | 450 | max_regions *= 2; |
---|
455 | 451 | region_size = 16; |
---|
456 | | - DBUG_ON(!is_shub2()); |
---|
457 | 452 | } |
---|
458 | 453 | } |
---|
459 | 454 | |
---|