Skip to content

Commit

Permalink
Merge branch 'akpm' (patches from Andrew)
Browse files Browse the repository at this point in the history
Merge yet more updates from Andrew Morton:
 "This is everything else from -mm for this merge window.

  90 patches.

  Subsystems affected by this patch series: mm (cleanups and slub),
  alpha, procfs, sysctl, misc, core-kernel, bitmap, lib, compat,
  checkpatch, epoll, isofs, nilfs2, hpfs, exit, fork, kexec, gcov,
  panic, delayacct, gdb, resource, selftests, async, initramfs, ipc,
  drivers/char, and spelling"

* emailed patches from Andrew Morton <[email protected]>: (90 commits)
  mm: fix typos in comments
  mm: fix typos in comments
  treewide: remove editor modelines and cruft
  ipc/sem.c: spelling fix
  fs: fat: fix spelling typo of values
  kernel/sys.c: fix typo
  kernel/up.c: fix typo
  kernel/user_namespace.c: fix typos
  kernel/umh.c: fix some spelling mistakes
  include/linux/pgtable.h: few spelling fixes
  mm/slab.c: fix spelling mistake "disired" -> "desired"
  scripts/spelling.txt: add "overflw"
  scripts/spelling.txt: Add "diabled" typo
  scripts/spelling.txt: add "overlfow"
  arm: print alloc free paths for address in registers
  mm/vmalloc: remove vwrite()
  mm: remove xlate_dev_kmem_ptr()
  drivers/char: remove /dev/kmem for good
  mm: fix some typos and code style problems
  ipc/sem.c: mundane typo fixes
  ...
  • Loading branch information
torvalds committed May 7, 2021
2 parents 05da1f6 + baf2f90 commit a48b087
Show file tree
Hide file tree
Showing 340 changed files with 1,323 additions and 2,093 deletions.
2 changes: 1 addition & 1 deletion Documentation/admin-guide/devices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

1 char Memory devices
1 = /dev/mem Physical memory access
2 = /dev/kmem Kernel virtual memory access
2 = /dev/kmem OBSOLETE - replaced by /proc/kcore
3 = /dev/null Null device
4 = /dev/port I/O port access
5 = /dev/zero Null byte source
Expand Down
12 changes: 12 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1835,6 +1835,18 @@
initcall functions. Useful for debugging built-in
modules and initcalls.

initramfs_async= [KNL]
Format: <bool>
Default: 1
This parameter controls whether the initramfs
image is unpacked asynchronously, concurrently
with devices being probed and
initialized. This should normally just work,
but as a debugging aid, one can get the
historical behaviour of the initramfs
unpacking being completed before device_ and
late_ initcalls.

initrd= [BOOT] Specify the location of the initial ramdisk

initrdmem= [KNL] Specify a physical address and size from which to
Expand Down
2 changes: 1 addition & 1 deletion Documentation/dev-tools/gdb-kernel-debugging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Examples of using the Linux-provided gdb helpers
[ 0.000000] BIOS-e820: [mem 0x000000000009fc00-0x000000000009ffff] reserved
....

- Examine fields of the current task struct::
- Examine fields of the current task struct(supported by x86 and arm64 only)::

(gdb) p $lx_current().pid
$1 = 4998
Expand Down
16 changes: 16 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3207,6 +3207,22 @@ F: Documentation/filesystems/bfs.rst
F: fs/bfs/
F: include/uapi/linux/bfs_fs.h

BITMAP API
M: Yury Norov <[email protected]>
R: Andy Shevchenko <[email protected]>
R: Rasmus Villemoes <[email protected]>
S: Maintained
F: include/asm-generic/bitops/find.h
F: include/linux/bitmap.h
F: lib/bitmap.c
F: lib/find_bit.c
F: lib/find_bit_benchmark.c
F: lib/test_bitmap.c
F: tools/include/asm-generic/bitops/find.h
F: tools/include/linux/bitmap.h
F: tools/lib/bitmap.c
F: tools/lib/find_bit.c

BLINKM RGB LED DRIVER
M: Jan-Simon Moeller <[email protected]>
S: Maintained
Expand Down
5 changes: 0 additions & 5 deletions arch/alpha/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -602,11 +602,6 @@ extern void outsl (unsigned long port, const void *src, unsigned long count);
*/
#define xlate_dev_mem_ptr(p) __va(p)

/*
* Convert a virtual cached pointer to an uncached pointer
*/
#define xlate_dev_kmem_ptr(p) p

#endif /* __KERNEL__ */

#endif /* __ALPHA_IO_H */
4 changes: 2 additions & 2 deletions arch/alpha/kernel/pc873xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ static char *pc873xx_names[] = {
static unsigned int base, model;


unsigned int __init pc873xx_get_base()
unsigned int __init pc873xx_get_base(void)
{
return base;
}

char *__init pc873xx_get_model()
char *__init pc873xx_get_model(void)
{
return pc873xx_names[model];
}
Expand Down
1 change: 1 addition & 0 deletions arch/alpha/lib/csum_partial_copy.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <linux/types.h>
#include <linux/string.h>
#include <linux/uaccess.h>
#include <net/checksum.h>


#define ldq_u(x,y) \
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/dove_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ CONFIG_INPUT_EVDEV=y
# CONFIG_MOUSE_PS2 is not set
# CONFIG_SERIO is not set
CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/magician_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
# CONFIG_SERIO is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_PXA=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_HW_RANDOM is not set
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/moxart_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ CONFIG_INPUT_EVBUG=y
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=1
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/mps2_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ CONFIG_SMSC911X=y
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_NONSTANDARD=y
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_MPS2_UART_CONSOLE=y
CONFIG_SERIAL_MPS2_UART=y
# CONFIG_HW_RANDOM is not set
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/mvebu_v5_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/xcep_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ CONFIG_NET_ETHERNET=y
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_SERIO is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_PXA=y
CONFIG_SERIAL_PXA_CONSOLE=y
# CONFIG_LEGACY_PTYS is not set
Expand Down
1 change: 1 addition & 0 deletions arch/arm/include/asm/bug.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,6 @@ extern asmlinkage void c_backtrace(unsigned long fp, int pmode,
struct mm_struct;
void show_pte(const char *lvl, struct mm_struct *mm, unsigned long addr);
extern void __show_regs(struct pt_regs *);
extern void __show_regs_alloc_free(struct pt_regs *regs);

#endif
5 changes: 0 additions & 5 deletions arch/arm/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -430,11 +430,6 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);
*/
#define xlate_dev_mem_ptr(p) __va(p)

/*
* Convert a virtual cached pointer to an uncached pointer
*/
#define xlate_dev_kmem_ptr(p) p

#include <asm-generic/io.h>

#ifdef CONFIG_MMU
Expand Down
11 changes: 11 additions & 0 deletions arch/arm/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,17 @@ void arch_cpu_idle_exit(void)
ledtrig_cpu(CPU_LED_IDLE_END);
}

void __show_regs_alloc_free(struct pt_regs *regs)
{
int i;

/* check for r0 - r12 only */
for (i = 0; i < 13; i++) {
pr_alert("Register r%d information:", i);
mem_dump_obj((void *)regs->uregs[i]);
}
}

void __show_regs(struct pt_regs *regs)
{
unsigned long flags;
Expand Down
1 change: 1 addition & 0 deletions arch/arm/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ static int __die(const char *str, int err, struct pt_regs *regs)

print_modules();
__show_regs(regs);
__show_regs_alloc_free(regs);
pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n",
TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk));

Expand Down
8 changes: 4 additions & 4 deletions arch/h8300/include/asm/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

#include <linux/compiler.h>

#include <asm-generic/bitops/fls.h>
#include <asm-generic/bitops/__fls.h>
#include <asm-generic/bitops/fls64.h>

#ifdef __KERNEL__

#ifndef _LINUX_BITOPS_H
Expand Down Expand Up @@ -173,8 +177,4 @@ static inline unsigned long __ffs(unsigned long word)

#endif /* __KERNEL__ */

#include <asm-generic/bitops/fls.h>
#include <asm-generic/bitops/__fls.h>
#include <asm-generic/bitops/fls64.h>

#endif /* _H8300_BITOPS_H */
1 change: 0 additions & 1 deletion arch/hexagon/configs/comet_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ CONFIG_NET_ETHERNET=y
# CONFIG_SERIO is not set
# CONFIG_CONSOLE_TRANSLATIONS is not set
CONFIG_LEGACY_PTY_COUNT=64
# CONFIG_DEVKMEM is not set
# CONFIG_HW_RANDOM is not set
CONFIG_SPI=y
CONFIG_SPI_DEBUG=y
Expand Down
1 change: 0 additions & 1 deletion arch/hexagon/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ static inline void *phys_to_virt(unsigned long address)
* convert a physical pointer to a virtual kernel pointer for
* /dev/mem access.
*/
#define xlate_dev_kmem_ptr(p) __va(p)
#define xlate_dev_mem_ptr(p) __va(p)

/*
Expand Down
1 change: 0 additions & 1 deletion arch/ia64/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ extern void memset_io(volatile void __iomem *s, int c, long n);
#define memcpy_fromio memcpy_fromio
#define memcpy_toio memcpy_toio
#define memset_io memset_io
#define xlate_dev_kmem_ptr xlate_dev_kmem_ptr
#define xlate_dev_mem_ptr xlate_dev_mem_ptr
#include <asm-generic/io.h>
#undef PCI_IOBASE
Expand Down
18 changes: 0 additions & 18 deletions arch/ia64/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -272,22 +272,4 @@ xlate_dev_mem_ptr(phys_addr_t p)
return ptr;
}

/*
* Convert a virtual cached kernel memory pointer to an uncached pointer
*/
static __inline__ void *
xlate_dev_kmem_ptr(void *p)
{
struct page *page;
void *ptr;

page = virt_to_page((unsigned long)p);
if (PageUncached(page))
ptr = (void *)__pa(p) + __IA64_UNCACHED_OFFSET;
else
ptr = p;

return ptr;
}

#endif /* _ASM_IA64_UACCESS_H */
7 changes: 0 additions & 7 deletions arch/m68k/atari/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,3 @@ int atari_tt_hwclk( int op, struct rtc_time *t )

return( 0 );
}

/*
* Local variables:
* c-indent-level: 4
* tab-width: 8
* End:
*/
1 change: 0 additions & 1 deletion arch/m68k/configs/amcore_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ CONFIG_DM9000=y
# CONFIG_VT is not set
# CONFIG_UNIX98_PTYS is not set
# CONFIG_DEVMEM is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_MCF=y
CONFIG_SERIAL_MCF_BAUDRATE=115200
CONFIG_SERIAL_MCF_CONSOLE=y
Expand Down
6 changes: 3 additions & 3 deletions arch/m68k/include/asm/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,6 @@ static inline unsigned long ffz(unsigned long word)

#endif

#include <asm-generic/bitops/find.h>

#ifdef __KERNEL__

#if defined(CONFIG_CPU_HAS_NO_BITFIELDS)
Expand Down Expand Up @@ -525,10 +523,12 @@ static inline int __fls(int x)
#define __clear_bit_unlock clear_bit_unlock

#include <asm-generic/bitops/ext2-atomic.h>
#include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/fls64.h>
#include <asm-generic/bitops/sched.h>
#include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/le.h>
#endif /* __KERNEL__ */

#include <asm-generic/bitops/find.h>

#endif /* _M68K_BITOPS_H */
5 changes: 0 additions & 5 deletions arch/m68k/include/asm/io_mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,6 @@ static inline void isa_delay(void)
*/
#define xlate_dev_mem_ptr(p) __va(p)

/*
* Convert a virtual cached pointer to an uncached pointer
*/
#define xlate_dev_kmem_ptr(p) p

#define readb_relaxed(addr) readb(addr)
#define readw_relaxed(addr) readw(addr)
#define readl_relaxed(addr) readl(addr)
Expand Down
5 changes: 0 additions & 5 deletions arch/mips/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -564,11 +564,6 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size);
*/
#define xlate_dev_mem_ptr(p) __va(p)

/*
* Convert a virtual cached pointer to an uncached pointer
*/
#define xlate_dev_kmem_ptr(p) p

void __ioread64_copy(void *to, const void __iomem *from, size_t count);

#endif /* _ASM_IO_H */
1 change: 0 additions & 1 deletion arch/openrisc/configs/or1ksim_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ CONFIG_MICREL_PHY=y
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
Expand Down
5 changes: 0 additions & 5 deletions arch/parisc/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,6 @@ extern void iowrite64be(u64 val, void __iomem *addr);
*/
#define xlate_dev_mem_ptr(p) __va(p)

/*
* Convert a virtual cached pointer to an uncached pointer
*/
#define xlate_dev_kmem_ptr(p) p

extern int devmem_is_allowed(unsigned long pfn);

#endif
1 change: 0 additions & 1 deletion arch/parisc/include/asm/pdc_chassis.h
Original file line number Diff line number Diff line change
Expand Up @@ -365,4 +365,3 @@ void parisc_pdc_chassis_init(void);
PDC_CHASSIS_EOM_SET )

#endif /* _PARISC_PDC_CHASSIS_H */
/* vim: set ts=8 */
5 changes: 0 additions & 5 deletions arch/powerpc/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -662,11 +662,6 @@ static inline void name at \
*/
#define xlate_dev_mem_ptr(p) __va(p)

/*
* Convert a virtual cached pointer to an uncached pointer
*/
#define xlate_dev_kmem_ptr(p) p

/*
* We don't do relaxed operations yet, at least not with this semantic
*/
Expand Down
5 changes: 0 additions & 5 deletions arch/s390/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ void *xlate_dev_mem_ptr(phys_addr_t phys);
#define unxlate_dev_mem_ptr unxlate_dev_mem_ptr
void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);

/*
* Convert a virtual cached pointer to an uncached pointer
*/
#define xlate_dev_kmem_ptr(p) p

#define IO_SPACE_LIMIT 0

void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot);
Expand Down
1 change: 0 additions & 1 deletion arch/sh/configs/edosk7705_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ CONFIG_SH_PCLK_FREQ=31250000
# CONFIG_INPUT is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_DEVKMEM is not set
# CONFIG_UNIX98_PTYS is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_HW_RANDOM is not set
Expand Down
1 change: 0 additions & 1 deletion arch/sh/configs/se7206_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ CONFIG_SMC91X=y
# CONFIG_INPUT is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=4
CONFIG_SERIAL_SH_SCI_CONSOLE=y
Expand Down
1 change: 0 additions & 1 deletion arch/sh/configs/sh2007_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ CONFIG_INPUT_FF_MEMLESS=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_SERIO is not set
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_CONSOLE=y
# CONFIG_LEGACY_PTYS is not set
Expand Down
Loading

0 comments on commit a48b087

Please sign in to comment.