2 files changed, 22 insertions, 7 deletions

diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index 9527d47a1070..01ec04bf91b5 100644
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -140,8 +140,8 @@ static u32 handle[] = {
         [6] = NFIT_DIMM_HANDLE(1, 0, 0, 0, 1),
 };
 
-static unsigned long dimm_fail_cmd_flags[NUM_DCR];
-static int dimm_fail_cmd_code[NUM_DCR];
+static unsigned long dimm_fail_cmd_flags[ARRAY_SIZE(handle)];
+static int dimm_fail_cmd_code[ARRAY_SIZE(handle)];
 
 static const struct nd_intel_smart smart_def = {
         .flags = ND_INTEL_SMART_HEALTH_VALID
@@ -205,7 +205,7 @@ struct nfit_test {
                 unsigned long deadline;
                 spinlock_t lock;
         } ars_state;
-        struct device *dimm_dev[NUM_DCR];
+        struct device *dimm_dev[ARRAY_SIZE(handle)];
         struct nd_intel_smart *smart;
         struct nd_intel_smart_threshold *smart_threshold;
         struct badrange badrange;
@@ -2680,7 +2680,7 @@ static int nfit_test_probe(struct platform_device *pdev)
                 u32 nfit_handle = __to_nfit_memdev(nfit_mem)->device_handle;
                 int i;
 
-                for (i = 0; i < NUM_DCR; i++)
+                for (i = 0; i < ARRAY_SIZE(handle); i++)
                         if (nfit_handle == handle[i])
                                 dev_set_drvdata(nfit_test->dimm_dev[i],
                                                 nfit_mem);
diff --git a/tools/testing/selftests/powerpc/mm/wild_bctr.c b/tools/testing/selftests/powerpc/mm/wild_bctr.c
index 1b0e9e9a2ddc..f2fa101c5a6a 100644
--- a/tools/testing/selftests/powerpc/mm/wild_bctr.c
+++ b/tools/testing/selftests/powerpc/mm/wild_bctr.c
@@ -47,8 +47,9 @@ static int ok(void)
         return 0;
 }
 
-#define REG_POISON      0x5a5aUL
-#define POISONED_REG(n) ((REG_POISON << 48) | ((n) << 32) | (REG_POISON << 16) | (n))
+#define REG_POISON      0x5a5a
+#define POISONED_REG(n) ((((unsigned long)REG_POISON) << 48) | ((n) << 32) | \
+                         (((unsigned long)REG_POISON) << 16) | (n))
 
 static inline void poison_regs(void)
 {
@@ -105,6 +106,20 @@ static void dump_regs(void)
         }
 }
 
+#ifdef _CALL_AIXDESC
+struct opd {
+        unsigned long ip;
+        unsigned long toc;
+        unsigned long env;
+};
+static struct opd bad_opd = {
+        .ip = BAD_NIP,
+};
+#define BAD_FUNC (&bad_opd)
+#else
+#define BAD_FUNC BAD_NIP
+#endif
+
 int test_wild_bctr(void)
 {
         int (*func_ptr)(void);
@@ -133,7 +148,7 @@ int test_wild_bctr(void)
 
                 poison_regs();
 
-                func_ptr = (int (*)(void))BAD_NIP;
+                func_ptr = (int (*)(void))BAD_FUNC;
                 func_ptr();
 
                 FAIL_IF(1); /* we didn't segv? */