litmus-rt.git/arch/score, branch linux-tip

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28T23:16:39+00:00

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)
  kbuild: convert `arch/tile' to the kconfig mainmenu upgrade
  README: cite nconfig
  Revert "kconfig: Temporarily disable dependency warnings"
  kconfig: Use PATH_MAX instead of 128 for path buffer sizes.
  kconfig: Fix realloc usage()
  kconfig: Propagate const
  kconfig: Don't go out from read config loop when you read new symbol
  kconfig: fix menuconfig on debian lenny
  kbuild: migrate all arch to the kconfig mainmenu upgrade
  kconfig: expand file names
  kconfig: use the file's name of sourced file
  kconfig: constify file name
  kconfig: don't emit warning upon rootmenu's prompt redefinition
  kconfig: replace KERNELVERSION usage by the mainmenu's prompt
  kconfig: delay gconf window initialization
  kconfig: expand by default the rootmenu's prompt
  kconfig: add a symbol string expansion helper
  kconfig: regen parser
  kconfig: implement the `mainmenu' directive
  kconfig: allow PACKAGE to be defined on the compiler's command-line
  ...

Fix up trivial conflict in arch/mn10300/Kconfig

ptrace: cleanup arch_ptrace() on score

2010-10-28T01:03:12+00:00

Remove unnecessary castings.

Signed-off-by: Namhyung Kim 
Cc: Chen Liqin 
Cc: Lennox Wu 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ptrace: change signature of arch_ptrace()

2010-10-28T01:03:10+00:00

Fix up the arguments to arch_ptrace() to take account of the fact that
@addr and @data are now unsigned long rather than long as of a preceding
patch in this series.

Signed-off-by: Namhyung Kim 
Cc: 
Acked-by: Roland McGrath 
Acked-by: David Howells 
Acked-by: Geert Uytterhoeven 
Acked-by: David S. Miller 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: remove pte_*map_nested()

2010-10-26T23:52:08+00:00

Since we no longer need to provide KM_type, the whole pte_*map_nested()
API is now redundant, remove it.

Signed-off-by: Peter Zijlstra 
Acked-by: Chris Metcalf 
Cc: David Howells 
Cc: Hugh Dickins 
Cc: Rik van Riel 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Steven Rostedt 
Cc: Russell King 
Cc: Ralf Baechle 
Cc: David Miller 
Cc: Paul Mackerras 
Cc: Benjamin Herrenschmidt 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

2010-10-12T13:09:06+00:00

We need to revert the temporary hack in 71ebc01, hence the merge.

Fix IRQ flag handling naming

2010-10-07T13:08:55+00:00

Fix the IRQ flag handling naming.  In linux/irqflags.h under one configuration,
it maps:

	local_irq_enable() -> raw_local_irq_enable()
	local_irq_disable() -> raw_local_irq_disable()
	local_irq_save() -> raw_local_irq_save()
	...

and under the other configuration, it maps:

	raw_local_irq_enable() -> local_irq_enable()
	raw_local_irq_disable() -> local_irq_disable()
	raw_local_irq_save() -> local_irq_save()
	...

This is quite confusing.  There should be one set of names expected of the
arch, and this should be wrapped to give another set of names that are expected
by users of this facility.

Change this to have the arch provide:

	flags = arch_local_save_flags()
	flags = arch_local_irq_save()
	arch_local_irq_restore(flags)
	arch_local_irq_disable()
	arch_local_irq_enable()
	arch_irqs_disabled_flags(flags)
	arch_irqs_disabled()
	arch_safe_halt()

Then linux/irqflags.h wraps these to provide:

	raw_local_save_flags(flags)
	raw_local_irq_save(flags)
	raw_local_irq_restore(flags)
	raw_local_irq_disable()
	raw_local_irq_enable()
	raw_irqs_disabled_flags(flags)
	raw_irqs_disabled()
	raw_safe_halt()

with type checking on the flags 'arguments', and then wraps those to provide:

	local_save_flags(flags)
	local_irq_save(flags)
	local_irq_restore(flags)
	local_irq_disable()
	local_irq_enable()
	irqs_disabled_flags(flags)
	irqs_disabled()
	safe_halt()

with tracing included if enabled.

The arch functions can now all be inline functions rather than some of them
having to be macros.

Signed-off-by: David Howells  [X86, FRV, MN10300]
Signed-off-by: Chris Metcalf  [Tile]
Signed-off-by: Michal Simek  [Microblaze]
Tested-by: Catalin Marinas  [ARM]
Acked-by: Thomas Gleixner 
Acked-by: Haavard Skinnemoen  [AVR]
Acked-by: Tony Luck  [IA-64]
Acked-by: Hirokazu Takata  [M32R]
Acked-by: Greg Ungerer  [M68K/M68KNOMMU]
Acked-by: Ralf Baechle  [MIPS]
Acked-by: Kyle McMartin  [PA-RISC]
Acked-by: Paul Mackerras  [PowerPC]
Acked-by: Martin Schwidefsky  [S390]
Acked-by: Chen Liqin  [Score]
Acked-by: Matt Fleming  [SH]
Acked-by: David S. Miller  [Sparc]
Acked-by: Chris Zankel  [Xtensa]
Reviewed-by: Richard Henderson  [Alpha]
Reviewed-by: Yoshinori Sato  [H8300]
Cc: starvik@axis.com [CRIS]
Cc: jesper.nilsson@axis.com [CRIS]
Cc: linux-cris-kernel@axis.com

kbuild: migrate all arch to the kconfig mainmenu upgrade

2010-09-20T02:54:11+00:00

Signed-off-by: Arnaud Lacombe 
Reviewed-by: Sam Ravnborg 
Reviewed-by: Michal Marek

Make do_execve() take a const filename pointer

2010-08-18T01:07:43+00:00

Make do_execve() take a const filename pointer so that kernel_execve() compiles
correctly on ARM:

arch/arm/kernel/sys_arm.c:88: warning: passing argument 1 of 'do_execve' discards qualifiers from pointer target type

This also requires the argv and envp arguments to be consted twice, once for
the pointer array and once for the strings the array points to.  This is
because do_execve() passes a pointer to the filename (now const) to
copy_strings_kernel().  A simpler alternative would be to cast the filename
pointer in do_execve() when it's passed to copy_strings_kernel().

do_execve() may not change any of the strings it is passed as part of the argv
or envp lists as they are some of them in .rodata, so marking these strings as
const should be fine.

Further kernel_execve() and sys_execve() need to be changed to match.

This has been test built on x86_64, frv, arm and mips.

Signed-off-by: David Howells 
Tested-by: Ralf Baechle 
Acked-by: Russell King 
Signed-off-by: Linus Torvalds

defconfig reduction

2010-08-14T20:26:53+00:00

Use the defconfig files generated by "make savedefconfig" for
remaining defconfig files.

Signed-off-by: Sam Ravnborg

score: fix dereference of NULL pointer in local_flush_tlb_page()

2010-08-12T15:43:29+00:00

Don't dereference vma if it's NULL.

Signed-off-by: Roel Kluin 
Cc: Chen Liqin 
Cc: Lennox Wu 
Cc: Arnd Bergmann 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds