Skip to content

Commit a48b087

Browse files
committed
Merge branch 'akpm' (patches from Andrew)
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 ...
2 parents 05da1f6 + baf2f90 commit a48b087

File tree

340 files changed

+1323
-2093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

340 files changed

+1323
-2093
lines changed

Documentation/admin-guide/devices.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
1 char Memory devices
66
1 = /dev/mem Physical memory access
7-
2 = /dev/kmem Kernel virtual memory access
7+
2 = /dev/kmem OBSOLETE - replaced by /proc/kcore
88
3 = /dev/null Null device
99
4 = /dev/port I/O port access
1010
5 = /dev/zero Null byte source

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,6 +1835,18 @@
18351835
initcall functions. Useful for debugging built-in
18361836
modules and initcalls.
18371837

1838+
initramfs_async= [KNL]
1839+
Format: <bool>
1840+
Default: 1
1841+
This parameter controls whether the initramfs
1842+
image is unpacked asynchronously, concurrently
1843+
with devices being probed and
1844+
initialized. This should normally just work,
1845+
but as a debugging aid, one can get the
1846+
historical behaviour of the initramfs
1847+
unpacking being completed before device_ and
1848+
late_ initcalls.
1849+
18381850
initrd= [BOOT] Specify the location of the initial ramdisk
18391851

18401852
initrdmem= [KNL] Specify a physical address and size from which to

Documentation/dev-tools/gdb-kernel-debugging.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Examples of using the Linux-provided gdb helpers
114114
[ 0.000000] BIOS-e820: [mem 0x000000000009fc00-0x000000000009ffff] reserved
115115
....
116116

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

119119
(gdb) p $lx_current().pid
120120
$1 = 4998

MAINTAINERS

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3207,6 +3207,22 @@ F: Documentation/filesystems/bfs.rst
32073207
F: fs/bfs/
32083208
F: include/uapi/linux/bfs_fs.h
32093209

3210+
BITMAP API
3211+
M: Yury Norov <[email protected]>
3212+
R: Andy Shevchenko <[email protected]>
3213+
R: Rasmus Villemoes <[email protected]>
3214+
S: Maintained
3215+
F: include/asm-generic/bitops/find.h
3216+
F: include/linux/bitmap.h
3217+
F: lib/bitmap.c
3218+
F: lib/find_bit.c
3219+
F: lib/find_bit_benchmark.c
3220+
F: lib/test_bitmap.c
3221+
F: tools/include/asm-generic/bitops/find.h
3222+
F: tools/include/linux/bitmap.h
3223+
F: tools/lib/bitmap.c
3224+
F: tools/lib/find_bit.c
3225+
32103226
BLINKM RGB LED DRIVER
32113227
M: Jan-Simon Moeller <[email protected]>
32123228
S: Maintained

arch/alpha/include/asm/io.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,6 @@ extern void outsl (unsigned long port, const void *src, unsigned long count);
602602
*/
603603
#define xlate_dev_mem_ptr(p) __va(p)
604604

605-
/*
606-
* Convert a virtual cached pointer to an uncached pointer
607-
*/
608-
#define xlate_dev_kmem_ptr(p) p
609-
610605
#endif /* __KERNEL__ */
611606

612607
#endif /* __ALPHA_IO_H */

arch/alpha/kernel/pc873xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ static char *pc873xx_names[] = {
1313
static unsigned int base, model;
1414

1515

16-
unsigned int __init pc873xx_get_base()
16+
unsigned int __init pc873xx_get_base(void)
1717
{
1818
return base;
1919
}
2020

21-
char *__init pc873xx_get_model()
21+
char *__init pc873xx_get_model(void)
2222
{
2323
return pc873xx_names[model];
2424
}

arch/alpha/lib/csum_partial_copy.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/types.h>
1414
#include <linux/string.h>
1515
#include <linux/uaccess.h>
16+
#include <net/checksum.h>
1617

1718

1819
#define ldq_u(x,y) \

arch/arm/configs/dove_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ CONFIG_INPUT_EVDEV=y
6363
# CONFIG_MOUSE_PS2 is not set
6464
# CONFIG_SERIO is not set
6565
CONFIG_LEGACY_PTY_COUNT=16
66-
# CONFIG_DEVKMEM is not set
6766
CONFIG_SERIAL_8250=y
6867
CONFIG_SERIAL_8250_CONSOLE=y
6968
CONFIG_SERIAL_8250_RUNTIME_UARTS=2

arch/arm/configs/magician_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
7272
CONFIG_INPUT_MISC=y
7373
CONFIG_INPUT_UINPUT=m
7474
# CONFIG_SERIO is not set
75-
# CONFIG_DEVKMEM is not set
7675
CONFIG_SERIAL_PXA=y
7776
# CONFIG_LEGACY_PTYS is not set
7877
# CONFIG_HW_RANDOM is not set

arch/arm/configs/moxart_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CONFIG_INPUT_EVBUG=y
7979
# CONFIG_SERIO is not set
8080
# CONFIG_VT is not set
8181
# CONFIG_LEGACY_PTYS is not set
82-
# CONFIG_DEVKMEM is not set
8382
CONFIG_SERIAL_8250=y
8483
CONFIG_SERIAL_8250_CONSOLE=y
8584
CONFIG_SERIAL_8250_NR_UARTS=1

0 commit comments

Comments
 (0)