From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Sep 2021 19:55:35 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: microblaze-v5.16~59
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=2d338201d5311bcd79d42f66df4cecbcbc5f4f2c

Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:
 "147 patches, based on 7d2a07b769330c34b4deabeed939325c77a7ec2f.

  Subsystems affected by this patch series: mm (memory-hotplug, rmap,
  ioremap, highmem, cleanups, secretmem, kfence, damon, and vmscan),
  alpha, percpu, procfs, misc, core-kernel, MAINTAINERS, lib,
  checkpatch, epoll, init, nilfs2, coredump, fork, pids, criu, kconfig,
  selftests, ipc, and scripts"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (94 commits)
  scripts: check_extable: fix typo in user error message
  mm/workingset: correct kernel-doc notations
  ipc: replace costly bailout check in sysvipc_find_ipc()
  selftests/memfd: remove unused variable
  Kconfig.debug: drop selecting non-existing HARDLOCKUP_DETECTOR_ARCH
  configs: remove the obsolete CONFIG_INPUT_POLLDEV
  prctl: allow to setup brk for et_dyn executables
  pid: cleanup the stale comment mentioning pidmap_init().
  kernel/fork.c: unexport get_{mm,task}_exe_file
  coredump: fix memleak in dump_vma_snapshot()
  fs/coredump.c: log if a core dump is aborted due to changed file permissions
  nilfs2: use refcount_dec_and_lock() to fix potential UAF
  nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group
  nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
  nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group
  nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group
  nilfs2: fix NULL pointer in nilfs_##name##_attr_release
  nilfs2: fix memory leak in nilfs_sysfs_create_device_group
  trap: cleanup trap_init()
  init: move usermodehelper_enable() to populate_rootfs()
  ...
---

2d338201d5311bcd79d42f66df4cecbcbc5f4f2c
diff --cc arch/riscv/Kconfig
index aac669a6c3d8,8598e3d103a3..c79955655fa4
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -50,11 -48,9 +50,11 @@@ config RISC
  	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
  	select GENERIC_EARLY_IOREMAP
  	select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO
 +	select GENERIC_IDLE_POLL_SETUP
- 	select GENERIC_IOREMAP
+ 	select GENERIC_IOREMAP if MMU
  	select GENERIC_IRQ_MULTI_HANDLER
  	select GENERIC_IRQ_SHOW
 +	select GENERIC_IRQ_SHOW_LEVEL
  	select GENERIC_LIB_DEVMEM_IS_ALLOWED
  	select GENERIC_PCI_IOMAP
  	select GENERIC_PTDUMP if MMU
diff --cc include/linux/units.h
index 4a25e0cc8fb3,8b8dc8a84d93..681fc652e3d7
--- a/include/linux/units.h
+++ b/include/linux/units.h
@@@ -4,25 -4,13 +4,29 @@@
  
  #include <linux/math.h>
  
 +/* Metric prefixes in accordance with Système international (d'unités) */
 +#define PETA	1000000000000000ULL
 +#define TERA	1000000000000ULL
 +#define GIGA	1000000000UL
 +#define MEGA	1000000UL
 +#define KILO	1000UL
 +#define HECTO	100UL
 +#define DECA	10UL
 +#define DECI	10UL
 +#define CENTI	100UL
 +#define MILLI	1000UL
 +#define MICRO	1000000UL
 +#define NANO	1000000000UL
 +#define PICO	1000000000000ULL
 +#define FEMTO	1000000000000000ULL
 +
- #define MILLIWATT_PER_WATT	1000L
- #define MICROWATT_PER_MILLIWATT	1000L
- #define MICROWATT_PER_WATT	1000000L
+ #define HZ_PER_KHZ		1000UL
+ #define KHZ_PER_MHZ		1000UL
+ #define HZ_PER_MHZ		1000000UL
+ 
+ #define MILLIWATT_PER_WATT	1000UL
+ #define MICROWATT_PER_MILLIWATT	1000UL
+ #define MICROWATT_PER_WATT	1000000UL
  
  #define ABSOLUTE_ZERO_MILLICELSIUS -273150