linux-stable.git/arch/cris, branch v4.5

Merge branch 'akpm' (patches from Andrew)

2016-01-21T20:32:08+00:00

Merge third patch-bomb from Andrew Morton:
 "I'm pretty much done for -rc1 now:

   - the rest of MM, basically

   - lib/ updates

   - checkpatch, epoll, hfs, fatfs, ptrace, coredump, exit

   - cpu_mask simplifications

   - kexec, rapidio, MAINTAINERS etc, etc.

   - more dma-mapping cleanups/simplifications from hch"

* emailed patches from Andrew Morton : (109 commits)
  MAINTAINERS: add/fix git URLs for various subsystems
  mm: memcontrol: add "sock" to cgroup2 memory.stat
  mm: memcontrol: basic memory statistics in cgroup2 memory controller
  mm: memcontrol: do not uncharge old page in page cache replacement
  Documentation: cgroup: add memory.swap.{current,max} description
  mm: free swap cache aggressively if memcg swap is full
  mm: vmscan: do not scan anon pages if memcg swap limit is hit
  swap.h: move memcg related stuff to the end of the file
  mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
  mm: vmscan: pass memcg to get_scan_count()
  mm: memcontrol: charge swap to cgroup2
  mm: memcontrol: clean up alloc, online, offline, free functions
  mm: memcontrol: flatten struct cg_proto
  mm: memcontrol: rein in the CONFIG space madness
  net: drop tcp_memcontrol.c
  mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
  mm: memcontrol: allow to disable kmem accounting for cgroup2
  mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
  mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
  mm: memcontrol: separate kmem code from legacy tcp accounting code
  ...

Merge tag 'cris-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris

2016-01-21T19:33:36+00:00

Pull CRIS updates from Jesper Nilsson:
 "Just some fixups for section mismatches from Guenter"

* tag 'cris-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
  cris: Fix section mismatches in architecture startup code
  cris: debugport: Fix section mismatches

dma-mapping: always provide the dma_map_ops based implementation

2016-01-21T01:09:18+00:00

Move the generic implementation to  now that all
architectures support it and remove the HAVE_DMA_ATTR Kconfig symbol now
that everyone supports them.

[valentinrothberg@gmail.com: remove leftovers in Kconfig]
Signed-off-by: Christoph Hellwig 
Cc: "David S. Miller" 
Cc: Aurelien Jacquiot 
Cc: Chris Metcalf 
Cc: David Howells 
Cc: Geert Uytterhoeven 
Cc: Haavard Skinnemoen 
Cc: Hans-Christian Egtvedt 
Cc: Helge Deller 
Cc: James Hogan 
Cc: Jesper Nilsson 
Cc: Koichi Yasutake 
Cc: Ley Foon Tan 
Cc: Mark Salter 
Cc: Mikael Starvik 
Cc: Steven Miao 
Cc: Vineet Gupta 
Cc: Christian Borntraeger 
Cc: Joerg Roedel 
Cc: Sebastian Ott 
Signed-off-by: Valentin Rothberg 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

cris: convert to dma_map_ops

2016-01-21T01:09:18+00:00

Signed-off-by: Christoph Hellwig 
Cc: Mikael Starvik 
Cc: Jesper Nilsson 
Cc: Christian Borntraeger 
Cc: Joerg Roedel 
Cc: Sebastian Ott 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

cris: nand: remove useless mtd->priv = chip assignments

2015-12-18T21:22:11+00:00

mtd_to_nand() now uses the container_of() approach to transform an
mtd_info pointer into a nand_chip one. Drop useless mtd->priv
assignments from NAND controller drivers.

Signed-off-by: Boris Brezillon 
Acked-by: Jesper Nilsson 
Signed-off-by: Brian Norris

cris: nand: use the mtd instance embedded in struct nand_chip

2015-12-18T20:44:57+00:00

struct nand_chip now embeds an mtd device. Patch all drivers to make use
of this mtd instance instead of using the instance embedded in their
private struct or dynamically allocated.

Signed-off-by: Boris Brezillon 
Acked-by: Jesper Nilsson 
Signed-off-by: Brian Norris

cris: Fix section mismatches in architecture startup code

2015-12-15T13:03:19+00:00

Section mismatches can now result in build failures.
As result, cris:allnoconfig fails to build as follows.

WARNING: modpost: Found 7 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
FATAL: modpost: Section mismatches detected.
Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.

Part of the problem is that references from .text to .init.text
are not permitted, and such references are used in cris startup code.
Since references from .head.text to .init.text are permitted, move
cris startup code to a new section .head.text.

Signed-off-by: Guenter Roeck 
Signed-off-by: Jesper Nilsson

cris: debugport: Fix section mismatches

2015-12-15T13:03:11+00:00

Section mismatches can now cause build failures, such as for
cris:allnoconfig. Rename affected variables to end with _console
to make section mismatch checks happy.

Signed-off-by: Guenter Roeck 
Signed-off-by: Jesper Nilsson

cris: nand: make use of mtd_to_nand() where appropriate

2015-12-08T21:02:46+00:00

mtd_to_nand() was recently introduced to avoid direct accesses to the
mtd->priv field. Update all CRIS specific implementations to use this
helper.

Signed-off-by: Boris Brezillon 
Acked-by: Brian Norris 
Acked-by: Jesper Nilsson 
Signed-off-by: Brian Norris

cris: Drop reference to get_cmos_time()

2015-11-02T19:03:05+00:00

Function get_cmos_time() was removed with commit 657926a83df9 ("cris:
time: Cleanup of persistent clock stuff"). The remaining reference to
it may cause the following build error.

arch/cris/kernel/built-in.o:(___ksymtab+get_cmos_time+0x0):
	undefined reference to `get_cmos_time'
Makefile:946: recipe for target 'vmlinux' failed

Fixes: 657926a83df9 ("cris: time: Cleanup of persistent clock stuff")
Cc: Xunlei Pang 
Cc: Rabin Vincent 
Signed-off-by: Guenter Roeck 
Signed-off-by: Jesper Nilsson