Skip to content

Commit a48b087

Browse files
torvaldstorvalds
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

+1-1
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

+12
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

+1-1
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

+16
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

-5
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

+2-2
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

+1
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

-1
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

-1
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

-1
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

‎arch/arm/configs/mps2_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ CONFIG_SMSC911X=y
6969
# CONFIG_VT is not set
7070
# CONFIG_LEGACY_PTYS is not set
7171
CONFIG_SERIAL_NONSTANDARD=y
72-
# CONFIG_DEVKMEM is not set
7372
CONFIG_SERIAL_MPS2_UART_CONSOLE=y
7473
CONFIG_SERIAL_MPS2_UART=y
7574
# CONFIG_HW_RANDOM is not set

‎arch/arm/configs/mvebu_v5_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_INPUT_EVDEV=y
100100
CONFIG_KEYBOARD_GPIO=y
101101
# CONFIG_INPUT_MOUSE is not set
102102
CONFIG_LEGACY_PTY_COUNT=16
103-
# CONFIG_DEVKMEM is not set
104103
CONFIG_SERIAL_8250=y
105104
CONFIG_SERIAL_8250_CONSOLE=y
106105
CONFIG_SERIAL_8250_RUNTIME_UARTS=2

‎arch/arm/configs/xcep_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ CONFIG_NET_ETHERNET=y
5353
# CONFIG_INPUT_KEYBOARD is not set
5454
# CONFIG_INPUT_MOUSE is not set
5555
# CONFIG_SERIO is not set
56-
# CONFIG_DEVKMEM is not set
5756
CONFIG_SERIAL_PXA=y
5857
CONFIG_SERIAL_PXA_CONSOLE=y
5958
# CONFIG_LEGACY_PTYS is not set

‎arch/arm/include/asm/bug.h

+1
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,6 @@ extern asmlinkage void c_backtrace(unsigned long fp, int pmode,
8888
struct mm_struct;
8989
void show_pte(const char *lvl, struct mm_struct *mm, unsigned long addr);
9090
extern void __show_regs(struct pt_regs *);
91+
extern void __show_regs_alloc_free(struct pt_regs *regs);
9192

9293
#endif

‎arch/arm/include/asm/io.h

-5
Original file line numberDiff line numberDiff line change
@@ -430,11 +430,6 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);
430430
*/
431431
#define xlate_dev_mem_ptr(p) __va(p)
432432

433-
/*
434-
* Convert a virtual cached pointer to an uncached pointer
435-
*/
436-
#define xlate_dev_kmem_ptr(p) p
437-
438433
#include <asm-generic/io.h>
439434

440435
#ifdef CONFIG_MMU

‎arch/arm/kernel/process.c

+11
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,17 @@ void arch_cpu_idle_exit(void)
9292
ledtrig_cpu(CPU_LED_IDLE_END);
9393
}
9494

95+
void __show_regs_alloc_free(struct pt_regs *regs)
96+
{
97+
int i;
98+
99+
/* check for r0 - r12 only */
100+
for (i = 0; i < 13; i++) {
101+
pr_alert("Register r%d information:", i);
102+
mem_dump_obj((void *)regs->uregs[i]);
103+
}
104+
}
105+
95106
void __show_regs(struct pt_regs *regs)
96107
{
97108
unsigned long flags;

‎arch/arm/kernel/traps.c

+1
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ static int __die(const char *str, int err, struct pt_regs *regs)
287287

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

‎arch/h8300/include/asm/bitops.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
#include <linux/compiler.h>
1111

12+
#include <asm-generic/bitops/fls.h>
13+
#include <asm-generic/bitops/__fls.h>
14+
#include <asm-generic/bitops/fls64.h>
15+
1216
#ifdef __KERNEL__
1317

1418
#ifndef _LINUX_BITOPS_H
@@ -173,8 +177,4 @@ static inline unsigned long __ffs(unsigned long word)
173177

174178
#endif /* __KERNEL__ */
175179

176-
#include <asm-generic/bitops/fls.h>
177-
#include <asm-generic/bitops/__fls.h>
178-
#include <asm-generic/bitops/fls64.h>
179-
180180
#endif /* _H8300_BITOPS_H */

‎arch/hexagon/configs/comet_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ CONFIG_NET_ETHERNET=y
3434
# CONFIG_SERIO is not set
3535
# CONFIG_CONSOLE_TRANSLATIONS is not set
3636
CONFIG_LEGACY_PTY_COUNT=64
37-
# CONFIG_DEVKMEM is not set
3837
# CONFIG_HW_RANDOM is not set
3938
CONFIG_SPI=y
4039
CONFIG_SPI_DEBUG=y

‎arch/hexagon/include/asm/io.h

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ static inline void *phys_to_virt(unsigned long address)
6464
* convert a physical pointer to a virtual kernel pointer for
6565
* /dev/mem access.
6666
*/
67-
#define xlate_dev_kmem_ptr(p) __va(p)
6867
#define xlate_dev_mem_ptr(p) __va(p)
6968

7069
/*

‎arch/ia64/include/asm/io.h

-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ extern void memset_io(volatile void __iomem *s, int c, long n);
277277
#define memcpy_fromio memcpy_fromio
278278
#define memcpy_toio memcpy_toio
279279
#define memset_io memset_io
280-
#define xlate_dev_kmem_ptr xlate_dev_kmem_ptr
281280
#define xlate_dev_mem_ptr xlate_dev_mem_ptr
282281
#include <asm-generic/io.h>
283282
#undef PCI_IOBASE

‎arch/ia64/include/asm/uaccess.h

-18
Original file line numberDiff line numberDiff line change
@@ -272,22 +272,4 @@ xlate_dev_mem_ptr(phys_addr_t p)
272272
return ptr;
273273
}
274274

275-
/*
276-
* Convert a virtual cached kernel memory pointer to an uncached pointer
277-
*/
278-
static __inline__ void *
279-
xlate_dev_kmem_ptr(void *p)
280-
{
281-
struct page *page;
282-
void *ptr;
283-
284-
page = virt_to_page((unsigned long)p);
285-
if (PageUncached(page))
286-
ptr = (void *)__pa(p) + __IA64_UNCACHED_OFFSET;
287-
else
288-
ptr = p;
289-
290-
return ptr;
291-
}
292-
293275
#endif /* _ASM_IA64_UACCESS_H */

‎arch/m68k/atari/time.c

-7
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,3 @@ int atari_tt_hwclk( int op, struct rtc_time *t )
317317

318318
return( 0 );
319319
}
320-
321-
/*
322-
* Local variables:
323-
* c-indent-level: 4
324-
* tab-width: 8
325-
* End:
326-
*/

‎arch/m68k/configs/amcore_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ CONFIG_DM9000=y
6060
# CONFIG_VT is not set
6161
# CONFIG_UNIX98_PTYS is not set
6262
# CONFIG_DEVMEM is not set
63-
# CONFIG_DEVKMEM is not set
6463
CONFIG_SERIAL_MCF=y
6564
CONFIG_SERIAL_MCF_BAUDRATE=115200
6665
CONFIG_SERIAL_MCF_CONSOLE=y

‎arch/m68k/include/asm/bitops.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,6 @@ static inline unsigned long ffz(unsigned long word)
440440

441441
#endif
442442

443-
#include <asm-generic/bitops/find.h>
444-
445443
#ifdef __KERNEL__
446444

447445
#if defined(CONFIG_CPU_HAS_NO_BITFIELDS)
@@ -525,10 +523,12 @@ static inline int __fls(int x)
525523
#define __clear_bit_unlock clear_bit_unlock
526524

527525
#include <asm-generic/bitops/ext2-atomic.h>
528-
#include <asm-generic/bitops/le.h>
529526
#include <asm-generic/bitops/fls64.h>
530527
#include <asm-generic/bitops/sched.h>
531528
#include <asm-generic/bitops/hweight.h>
529+
#include <asm-generic/bitops/le.h>
532530
#endif /* __KERNEL__ */
533531

532+
#include <asm-generic/bitops/find.h>
533+
534534
#endif /* _M68K_BITOPS_H */

‎arch/m68k/include/asm/io_mm.h

-5
Original file line numberDiff line numberDiff line change
@@ -397,11 +397,6 @@ static inline void isa_delay(void)
397397
*/
398398
#define xlate_dev_mem_ptr(p) __va(p)
399399

400-
/*
401-
* Convert a virtual cached pointer to an uncached pointer
402-
*/
403-
#define xlate_dev_kmem_ptr(p) p
404-
405400
#define readb_relaxed(addr) readb(addr)
406401
#define readw_relaxed(addr) readw(addr)
407402
#define readl_relaxed(addr) readl(addr)

‎arch/mips/include/asm/io.h

-5
Original file line numberDiff line numberDiff line change
@@ -564,11 +564,6 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size);
564564
*/
565565
#define xlate_dev_mem_ptr(p) __va(p)
566566

567-
/*
568-
* Convert a virtual cached pointer to an uncached pointer
569-
*/
570-
#define xlate_dev_kmem_ptr(p) p
571-
572567
void __ioread64_copy(void *to, const void __iomem *from, size_t count);
573568

574569
#endif /* _ASM_IO_H */

‎arch/openrisc/configs/or1ksim_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ CONFIG_MICREL_PHY=y
4343
# CONFIG_SERIO is not set
4444
# CONFIG_VT is not set
4545
# CONFIG_LEGACY_PTYS is not set
46-
# CONFIG_DEVKMEM is not set
4746
CONFIG_SERIAL_8250=y
4847
CONFIG_SERIAL_8250_CONSOLE=y
4948
CONFIG_SERIAL_OF_PLATFORM=y

‎arch/parisc/include/asm/io.h

-5
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,6 @@ extern void iowrite64be(u64 val, void __iomem *addr);
316316
*/
317317
#define xlate_dev_mem_ptr(p) __va(p)
318318

319-
/*
320-
* Convert a virtual cached pointer to an uncached pointer
321-
*/
322-
#define xlate_dev_kmem_ptr(p) p
323-
324319
extern int devmem_is_allowed(unsigned long pfn);
325320

326321
#endif

‎arch/parisc/include/asm/pdc_chassis.h

-1
Original file line numberDiff line numberDiff line change
@@ -365,4 +365,3 @@ void parisc_pdc_chassis_init(void);
365365
PDC_CHASSIS_EOM_SET )
366366

367367
#endif /* _PARISC_PDC_CHASSIS_H */
368-
/* vim: set ts=8 */

‎arch/powerpc/include/asm/io.h

-5
Original file line numberDiff line numberDiff line change
@@ -662,11 +662,6 @@ static inline void name at \
662662
*/
663663
#define xlate_dev_mem_ptr(p) __va(p)
664664

665-
/*
666-
* Convert a virtual cached pointer to an uncached pointer
667-
*/
668-
#define xlate_dev_kmem_ptr(p) p
669-
670665
/*
671666
* We don't do relaxed operations yet, at least not with this semantic
672667
*/

‎arch/s390/include/asm/io.h

-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ void *xlate_dev_mem_ptr(phys_addr_t phys);
2020
#define unxlate_dev_mem_ptr unxlate_dev_mem_ptr
2121
void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);
2222

23-
/*
24-
* Convert a virtual cached pointer to an uncached pointer
25-
*/
26-
#define xlate_dev_kmem_ptr(p) p
27-
2823
#define IO_SPACE_LIMIT 0
2924

3025
void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot);

‎arch/sh/configs/edosk7705_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ CONFIG_SH_PCLK_FREQ=31250000
2323
# CONFIG_INPUT is not set
2424
# CONFIG_SERIO is not set
2525
# CONFIG_VT is not set
26-
# CONFIG_DEVKMEM is not set
2726
# CONFIG_UNIX98_PTYS is not set
2827
# CONFIG_LEGACY_PTYS is not set
2928
# CONFIG_HW_RANDOM is not set

‎arch/sh/configs/se7206_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ CONFIG_SMC91X=y
7171
# CONFIG_INPUT is not set
7272
# CONFIG_SERIO is not set
7373
# CONFIG_VT is not set
74-
# CONFIG_DEVKMEM is not set
7574
CONFIG_SERIAL_SH_SCI=y
7675
CONFIG_SERIAL_SH_SCI_NR_UARTS=4
7776
CONFIG_SERIAL_SH_SCI_CONSOLE=y

‎arch/sh/configs/sh2007_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ CONFIG_INPUT_FF_MEMLESS=y
7575
# CONFIG_INPUT_MOUSE is not set
7676
# CONFIG_SERIO is not set
7777
CONFIG_VT_HW_CONSOLE_BINDING=y
78-
# CONFIG_DEVKMEM is not set
7978
CONFIG_SERIAL_SH_SCI=y
8079
CONFIG_SERIAL_SH_SCI_CONSOLE=y
8180
# CONFIG_LEGACY_PTYS is not set

0 commit comments

Comments
 (0)