diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-24 20:48:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-24 21:06:19 +0100 |
| commit | 70f3522614e60b6125eff5f9dd7c887543812187 (patch) | |
| tree | 5e08ed970fb035feb4a99ac8526c74da0d445d01 /mm/debug.c | |
| parent | trace: events: neigh_update: print new state in string format (diff) | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-70f3522614e60b6125eff5f9dd7c887543812187.tar.xz linux-70f3522614e60b6125eff5f9dd7c887543812187.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three conflicts, one of which, for marvell10g.c is non-trivial and
requires some follow-up from Heiner or someone else.
The issue is that Heiner converted the marvell10g driver over to
use the generic c45 code as much as possible.
However, in 'net' a bug fix appeared which makes sure that a new
local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0
is cleared.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/debug.c')
| -rw-r--r-- | mm/debug.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/debug.c b/mm/debug.c index 0abb987dad9b..1611cf00a137 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -44,7 +44,7 @@ const struct trace_print_flags vmaflag_names[] = { void __dump_page(struct page *page, const char *reason) { - struct address_space *mapping = page_mapping(page); + struct address_space *mapping; bool page_poisoned = PagePoisoned(page); int mapcount; @@ -58,6 +58,8 @@ void __dump_page(struct page *page, const char *reason) goto hex_only; } + mapping = page_mapping(page); + /* * Avoid VM_BUG_ON() in page_mapcount(). * page->_mapcount space in struct page is used by sl[aou]b pages to |