linux-toradex.git/arch/c6x, branch v3.11

Merge branch 'akpm' (updates from Andrew Morton)

2013-07-04T00:12:13+00:00

Merge first patch-bomb from Andrew Morton:
 - various misc bits
 - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
   distracted.  There has been quite a bit of activity.
 - About half the MM queue
 - Some backlight bits
 - Various lib/ updates
 - checkpatch updates
 - zillions more little rtc patches
 - ptrace
 - signals
 - exec
 - procfs
 - rapidio
 - nbd
 - aoe
 - pps
 - memstick
 - tools/testing/selftests updates

* emailed patches from Andrew Morton : (445 commits)
  tools/testing/selftests: don't assume the x bit is set on scripts
  selftests: add .gitignore for kcmp
  selftests: fix clean target in kcmp Makefile
  selftests: add .gitignore for vm
  selftests: add hugetlbfstest
  self-test: fix make clean
  selftests: exit 1 on failure
  kernel/resource.c: remove the unneeded assignment in function __find_resource
  aio: fix wrong comment in aio_complete()
  drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
  drivers/memstick/host/r592.c: convert to module_pci_driver
  drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
  pps-gpio: add device-tree binding and support
  drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
  drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
  drivers/parport/share.c: use kzalloc
  Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
  aoe: update internal version number to v83
  aoe: update copyright date
  aoe: perform I/O completions in parallel
  ...

mm/c6x: prepare for removing num_physpages and simplify mem_init()

2013-07-03T23:07:35+00:00

Prepare for removing num_physpages and simplify mem_init().

Signed-off-by: Jiang Liu 
Cc: Mark Salter 
Cc: Aurelien Jacquiot 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

c6x: normalize global variables exported by vmlinux.lds

2013-07-03T23:07:34+00:00

Normalize global variables exported by vmlinux.lds to conform usage
guidelines from include/asm-generic/sections.h.

Use _text to mark the start of the kernel image including the head text,
and _stext to mark the start of the .text section.

This patch also fixes possible bugs due to current address layout that
[__init_begin, __init_end] is a sub-range of [_stext, _etext] and pages
within range [__init_begin, __init_end] will be freed by free_initmem().

Signed-off-by: Jiang Liu 
Cc: Mark Salter 
Cc: Aurelien Jacquiot 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: concentrate modification of totalram_pages into the mm core

2013-07-03T23:07:33+00:00

Concentrate code to modify totalram_pages into the mm core, so the arch
memory initialized code doesn't need to take care of it.  With these
changes applied, only following functions from mm core modify global
variable totalram_pages: free_bootmem_late(), free_all_bootmem(),
free_all_bootmem_node(), adjust_managed_page_count().

With this patch applied, it will be much more easier for us to keep
totalram_pages and zone->managed_pages in consistence.

Signed-off-by: Jiang Liu 
Acked-by: David Howells 
Cc: "H. Peter Anvin" 
Cc: "Michael S. Tsirkin" 
Cc: 
Cc: Arnd Bergmann 
Cc: Catalin Marinas 
Cc: Chris Metcalf 
Cc: Geert Uytterhoeven 
Cc: Ingo Molnar 
Cc: Jeremy Fitzhardinge 
Cc: Jianguo Wu 
Cc: Joonsoo Kim 
Cc: Kamezawa Hiroyuki 
Cc: Konrad Rzeszutek Wilk 
Cc: Marek Szyprowski 
Cc: Mel Gorman 
Cc: Michel Lespinasse 
Cc: Minchan Kim 
Cc: Rik van Riel 
Cc: Rusty Russell 
Cc: Tang Chen 
Cc: Tejun Heo 
Cc: Thomas Gleixner 
Cc: Wen Congyang 
Cc: Will Deacon 
Cc: Yasuaki Ishimatsu 
Cc: Yinghai Lu 
Cc: Russell King 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: enhance free_reserved_area() to support poisoning memory with zero

2013-07-03T23:07:32+00:00

Address more review comments from last round of code review.
1) Enhance free_reserved_area() to support poisoning freed memory with
   pattern '0'. This could be used to get rid of poison_init_mem()
   on ARM64.
2) A previous patch has disabled memory poison for initmem on s390
   by mistake, so restore to the original behavior.
3) Remove redundant PAGE_ALIGN() when calling free_reserved_area().

Signed-off-by: Jiang Liu 
Cc: Geert Uytterhoeven 
Cc: "H. Peter Anvin" 
Cc: "Michael S. Tsirkin" 
Cc: 
Cc: Arnd Bergmann 
Cc: Catalin Marinas 
Cc: Chris Metcalf 
Cc: David Howells 
Cc: Ingo Molnar 
Cc: Jeremy Fitzhardinge 
Cc: Jianguo Wu 
Cc: Joonsoo Kim 
Cc: Kamezawa Hiroyuki 
Cc: Konrad Rzeszutek Wilk 
Cc: Marek Szyprowski 
Cc: Mel Gorman 
Cc: Michel Lespinasse 
Cc: Minchan Kim 
Cc: Rik van Riel 
Cc: Rusty Russell 
Cc: Tang Chen 
Cc: Tejun Heo 
Cc: Thomas Gleixner 
Cc: Wen Congyang 
Cc: Will Deacon 
Cc: Yasuaki Ishimatsu 
Cc: Yinghai Lu 
Cc: Russell King 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: change signature of free_reserved_area() to fix building warnings

2013-07-03T23:07:32+00:00

Change signature of free_reserved_area() according to Russell King's
suggestion to fix following build warnings:

  arch/arm/mm/init.c: In function 'mem_init':
  arch/arm/mm/init.c:603:2: warning: passing argument 1 of 'free_reserved_area' makes integer from pointer without a cast [enabled by default]
    free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL);
    ^
  In file included from include/linux/mman.h:4:0,
                   from arch/arm/mm/init.c:15:
  include/linux/mm.h:1301:22: note: expected 'long unsigned int' but argument is of type 'void *'
   extern unsigned long free_reserved_area(unsigned long start, unsigned long end,

   mm/page_alloc.c: In function 'free_reserved_area':
>> mm/page_alloc.c:5134:3: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast [enabled by default]
   In file included from arch/mips/include/asm/page.h:49:0,
                    from include/linux/mmzone.h:20,
                    from include/linux/gfp.h:4,
                    from include/linux/mm.h:8,
                    from mm/page_alloc.c:18:
   arch/mips/include/asm/io.h:119:29: note: expected 'const volatile void *' but argument is of type 'long unsigned int'
   mm/page_alloc.c: In function 'free_area_init_nodes':
   mm/page_alloc.c:5030:34: warning: array subscript is below array bounds [-Warray-bounds]

Also address some minor code review comments.

Signed-off-by: Jiang Liu 
Reported-by: Arnd Bergmann 
Cc: "H. Peter Anvin" 
Cc: "Michael S. Tsirkin" 
Cc: 
Cc: Catalin Marinas 
Cc: Chris Metcalf 
Cc: David Howells 
Cc: Geert Uytterhoeven 
Cc: Ingo Molnar 
Cc: Jeremy Fitzhardinge 
Cc: Jianguo Wu 
Cc: Joonsoo Kim 
Cc: Kamezawa Hiroyuki 
Cc: Konrad Rzeszutek Wilk 
Cc: Marek Szyprowski 
Cc: Mel Gorman 
Cc: Michel Lespinasse 
Cc: Minchan Kim 
Cc: Rik van Riel 
Cc: Rusty Russell 
Cc: Tang Chen 
Cc: Tejun Heo 
Cc: Thomas Gleixner 
Cc: Wen Congyang 
Cc: Will Deacon 
Cc: Yasuaki Ishimatsu 
Cc: Yinghai Lu 
Cc: Russell King 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

arch: c6x: mm: include "asm/uaccess.h" to pass compiling

2013-07-03T23:07:22+00:00

Need include "asm/uaccess.h" to pass compiling.

The related error (with allmodconfig):

  arch/c6x/mm/init.c: In function `paging_init':
  arch/c6x/mm/init.c:46:2: error: implicit declaration of function `set_fs' [-Werror=implicit-function-declaration]
  arch/c6x/mm/init.c:46:9: error: `KERNEL_DS' undeclared (first use in this function)
  arch/c6x/mm/init.c:46:9: note: each undeclared identifier is reported only once for each function it appears in

Signed-off-by: Chen Gang 
Cc: 	[3.10.x]
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge branch 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2013-07-03T18:12:08+00:00

Pull "exotic" arch fixes from Geert Uytterhoeven:
 "This is a collection of several exotic architecture fixes, and a few
  other fixes for issues that were detected while doing the former"

* 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (35 commits)
  lib: Move fonts from drivers/video/console/ to lib/fonts/
  console/font: Refactor font support code selection logic
  Revert "staging/solo6x10: depend on CONFIG_FONTS"
  input: cros_ec_keyb_clear_keyboard() depends on CONFIG_PM_SLEEP
  score: Wire up asm-generic/xor.h
  score: Remove unneeded 
  openrisc: Wire up asm-generic/xor.h
  h8300/boot: Use POSIX "$((..))" instead of bashism "$[...]"
  h8300: Mark H83002 and H83048 CPU support broken
  h8300: Switch h8300 to drivers/Kconfig
  h8300: Limit timer channel ranges in Kconfig
  h8300: Wire up asm-generic/xor.h
  h8300: Fill the system call table using a CALL() macro
  h8300: Fix 
  h8300: Hardcode symbol prefixes in asm sources
  h8300: add missing definition for read_barries_depends()
  frv: head.S - Remove commented-out initialization code
  cris: Wire up asm-generic/vga.h
  parport: disable PC-style parallel port support on cris
  console: Disable VGA text console support on cris
  ...

consolidate io_remap_pfn_range definitions

2013-06-29T08:46:35+00:00

Signed-off-by: Al Viro

c6x: Wire up asm-generic/xor.h

2013-06-16T11:47:17+00:00

Signed-off-by: Geert Uytterhoeven 
Acked-by: Mark Salter 
Tested-by: Mark Salter