3 files changed, 5 insertions, 7 deletions

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index d86842c21710..55da93f4e818 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -107,7 +107,6 @@ config ARCH_RV32I
         select GENERIC_LIB_ASHRDI3
         select GENERIC_LIB_LSHRDI3
         select GENERIC_LIB_UCMPDI2
-        select GENERIC_LIB_UMODDI3
 
 config ARCH_RV64I
         bool "RV64I"
diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h
index a1ef503d616e..697fc23b0d5a 100644
--- a/arch/riscv/include/asm/elf.h
+++ b/arch/riscv/include/asm/elf.h
@@ -16,9 +16,6 @@
 #include <asm/auxvec.h>
 #include <asm/byteorder.h>
 
-/* TODO: Move definition into include/uapi/linux/elf-em.h */
-#define EM_RISCV        0xF3
-
 /*
  * These are used to set parameters in the core dumps.
  */
diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c
index 5493f3228704..0339087aa652 100644
--- a/arch/riscv/kernel/cpufeature.c
+++ b/arch/riscv/kernel/cpufeature.c
@@ -28,7 +28,7 @@ bool has_fpu __read_mostly;
 
 void riscv_fill_hwcap(void)
 {
-        struct device_node *node;
+        struct device_node *node = NULL;
         const char *isa;
         size_t i;
         static unsigned long isa2hwcap[256] = {0};
@@ -44,9 +44,11 @@ void riscv_fill_hwcap(void)
 
         /*
          * We don't support running Linux on hertergenous ISA systems.  For
-         * now, we just check the ISA of the first processor.
+         * now, we just check the ISA of the first "okay" processor.
          */
-        node = of_find_node_by_type(NULL, "cpu");
+        while ((node = of_find_node_by_type(node, "cpu")))
+                if (riscv_of_processor_hartid(node) >= 0)
+                        break;
         if (!node) {
                 pr_warning("Unable to find \"cpu\" devicetree entry");
                 return;