revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / misc / sgi-xp / xpc_partition.c

diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c
index 6956f7e7d43921ec80f5e450a471429bc21f55fc..d551f09ccb792175d49a83c4a929df7394f50a8a 100644 (file)
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
@@ -439,23 +439,18 @@ xpc_discovery(void)
         * nodes that can comprise an access protection grouping. The access
         * protection is in regards to memory, IOI and IPI.
         */
+       max_regions = 64;
        region_size = xp_region_size;
 
-       if (is_uv())
-               max_regions = 256;
-       else {
-               max_regions = 64;
-
-               switch (region_size) {
-               case 128:
-                       max_regions *= 2;
-               case 64:
-                       max_regions *= 2;
-               case 32:
-                       max_regions *= 2;
-                       region_size = 16;
-                       DBUG_ON(!is_shub2());
-               }
+       switch (region_size) {
+       case 128:
+               max_regions *= 2;
+       case 64:
+               max_regions *= 2;
+       case 32:
+               max_regions *= 2;
+               region_size = 16;
+               DBUG_ON(!is_shub2());
        }
 
        for (region = 0; region < max_regions; region++) {