Commit fa3a9f57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "20 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  m32r: fix build warning about putc
  mm: workingset: printk missing log level, use pr_info()
  mm: thp: refix false positive BUG in page_move_anon_rmap()
  mm: rmap: call page_check_address() with sync enabled to avoid racy check
  mm: thp: move pmd check inside ptl for freeze_page()
  vmlinux.lds: account for destructor sections
  gcov: add support for gcc version >= 6
  mm, meminit: ensure node is online before checking whether pages are uninitialised
  mm, meminit: always return a valid node from early_pfn_to_nid
  kasan/quarantine: fix bugs on qlist_move_cache()
  uapi: export lirc.h header
  madvise_free, thp: fix madvise_free_huge_pmd return value after splitting
  Revert "scripts/gdb: add documentation example for radix tree"
  Revert "scripts/gdb: add a Radix Tree Parser"
  scripts/gdb: Perform path expansion to lx-symbol's arguments
  scripts/gdb: add constants.py to .gitignore
  scripts/gdb: rebuild constants.py on dependancy change
  scripts/gdb: silence 'nothing to do' message
  kasan: add newline to messages
  mm, compaction: prevent VM_BUG_ON when terminating freeing scanner
parents 0a9cb481 9babed6a

Documentation/gdb-kernel-debugging.txt

+0 −21
Original line number Diff line number Diff line
@@ -139,27 +139,6 @@ Examples of using the Linux-provided gdb helpers 
      start_comm = "swapper/2\000\000\000\000\000\000"

    }



 o Dig into a radix tree data structure, such as the IRQ descriptors:

    (gdb) print (struct irq_desc)$lx_radix_tree_lookup(irq_desc_tree, 18)

    $6 = {

      irq_common_data = {

        state_use_accessors = 67584,

        handler_data = 0x0 <__vectors_start>,

        msi_desc = 0x0 <__vectors_start>,

        affinity = {{

            bits = {65535}

          }}

      },

      irq_data = {

        mask = 0,

        irq = 18,

        hwirq = 27,

        common = 0xee803d80,

        chip = 0xc0eb0854 <gic_data>,

        domain = 0xee808000,

        parent_data = 0x0 <__vectors_start>,

        chip_data = 0xc0eb0854 <gic_data>

      } <... trimmed ...>



List of commands and functions

------------------------------

arch/m32r/boot/compressed/m32r_sio.c

+5 −4
Original line number Diff line number Diff line
@@ -8,12 +8,13 @@ 


#include <asm/processor.h>



static void putc(char c);

static void m32r_putc(char c);



static int puts(const char *s)

{

	char c;

	while ((c = *s++)) putc(c);

	while ((c = *s++))

		m32r_putc(c);

	return 0;

}
@@ -41,7 +42,7 @@ static int puts(const char *s) 
#define BOOT_SIO0TXB	PLD_ESIO0TXB

#endif



static void putc(char c)

static void m32r_putc(char c)

{

	while ((*BOOT_SIO0STS & 0x3) != 0x3)

		cpu_relax();
@@ -61,7 +62,7 @@ static void putc(char c) 
#define SIO0TXB	(volatile unsigned short *)(0x00efd000 + 30)

#endif



static void putc(char c)

static void m32r_putc(char c)

{

	while ((*SIO0STS & 0x1) == 0)

		cpu_relax();

arch/x86/mm/kasan_init_64.c

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ static int kasan_die_handler(struct notifier_block *self, 
			     void *data)

{

	if (val == DIE_GPF) {

		pr_emerg("CONFIG_KASAN_INLINE enabled");

		pr_emerg("GPF could be caused by NULL-ptr deref or user memory access");

		pr_emerg("CONFIG_KASAN_INLINE enabled\n");

		pr_emerg("GPF could be caused by NULL-ptr deref or user memory access\n");

	}

	return NOTIFY_OK;

}

include/asm-generic/vmlinux.lds.h

+4 −0
Original line number Diff line number Diff line
@@ -542,15 +542,19 @@ 


#define INIT_TEXT							\

	*(.init.text)							\

	*(.text.startup)						\

	MEM_DISCARD(init.text)



#define EXIT_DATA							\

	*(.exit.data)							\

	*(.fini_array)							\

	*(.dtors)							\

	MEM_DISCARD(exit.data)						\

	MEM_DISCARD(exit.rodata)



#define EXIT_TEXT							\

	*(.exit.text)							\

	*(.text.exit)							\

	MEM_DISCARD(exit.text)



#define EXIT_CALL							\

include/linux/huge_mm.h

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static inline int split_huge_page(struct page *page) 
void deferred_split_huge_page(struct page *page);



void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,

		unsigned long address, bool freeze);

		unsigned long address, bool freeze, struct page *page);



#define split_huge_pmd(__vma, __pmd, __address)				\

	do {								\
@@ -102,7 +102,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, 
		if (pmd_trans_huge(*____pmd)				\

					|| pmd_devmap(*____pmd))	\

			__split_huge_pmd(__vma, __pmd, __address,	\

						false);			\

						false, NULL);		\

	}  while (0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE