[GIT PULL] sched/preempt fixes

[GIT PULL] sched/preempt fixes

[Frederic Weisbecker]

Ingo,

Please pull the sched/core branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
	sched/core

Thanks,
	Frederic
---

Frederic Weisbecker (3):
      m32r: Use generic PREEMPT config
      h8300: Use generic config PREEMPT definition
      xtensa: Use generic config PREEMPT definition


 arch/h8300/Kconfig.cpu |    4 +---
 arch/m32r/Kconfig      |   12 +-----------
 arch/xtensa/Kconfig    |   13 +------------
 3 files changed, 3 insertions(+), 26 deletions(-)

[PATCH 1/3] m32r: Use generic PREEMPT config

[Frederic Weisbecker]

Use the generic preempt config definition in m32r instead of
using a custom one.

This also makes it handle the new CONFIG_PREEMPT_COUNT that
need to be selected by CONFIG_PREEMPT.

Without that it breaks

  kernel/sched.c: In function 'preempt_schedule':
  kernel/sched.c:4364: error: implicit declaration of function 'add_preempt_count_notrace'
  kernel/sched.c:4366: error: implicit declaration of function 'sub_preempt_count_notrace'

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
---
 arch/m32r/Kconfig |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 85b44e8..b92b944 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -268,17 +268,7 @@ config SCHED_OMIT_FRAME_POINTER
         bool
         default y
 
-config PREEMPT
-	bool "Preemptible Kernel"
-	help
-	  This option reduces the latency of the kernel when reacting to
-	  real-time or interactive events by allowing a low priority process to
-	  be preempted even if it is in kernel mode executing a system call.
-	  This allows applications to run more reliably even when the system is
-	  under load.
-
-	  Say Y here if you are building a kernel for a desktop, embedded
-	  or real-time system.  Say N if you are unsure.
+source "kernel/Kconfig.preempt"
 
 config SMP
 	bool "Symmetric multi-processing support"
-- 
1.7.5.4

[PATCH 2/3] h8300: Use generic config PREEMPT definition

[Frederic Weisbecker]

So that it can handle the new CONFIG_PREEMPT_COUNT.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 arch/h8300/Kconfig.cpu |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/h8300/Kconfig.cpu b/arch/h8300/Kconfig.cpu
index d236ab4..15c2228 100644
--- a/arch/h8300/Kconfig.cpu
+++ b/arch/h8300/Kconfig.cpu
@@ -162,9 +162,7 @@ config H8300_TPU_CH
 	int "TPU channel"
 	depends on H8300_TPU
 
-config PREEMPT
-	bool "Preemptible Kernel"
-	default n
+source "kernel/Kconfig.preempt"
 
 source "mm/Kconfig"
 
-- 
1.7.5.4

[PATCH 3/3] xtensa: Use generic config PREEMPT definition

[Frederic Weisbecker]

So that it can handle the new CONFIG_PREEMPT_COUNT.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Chris Zankel <chris@zankel.net>
---
 arch/xtensa/Kconfig |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 5d43c1f..c346ccd 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -80,18 +80,7 @@ config XTENSA_UNALIGNED_USER
 
 	  Say Y here to enable unaligned memory access in user space.
 
-config PREEMPT
-	bool "Preemptible Kernel"
-	help
-          This option reduces the latency of the kernel when reacting to
-          real-time or interactive events by allowing a low priority process to
-          be preempted even if it is in kernel mode executing a system call.
-          Unfortunately the kernel code has some race conditions if both
-          CONFIG_SMP and CONFIG_PREEMPT are enabled, so this option is
-          currently disabled if you are building an SMP kernel.
-
-          Say Y here if you are building a kernel for a desktop, embedded
-          or real-time system.  Say N if you are unsure.
+source "kernel/Kconfig.preempt"
 
 config MATH_EMULATION
 	bool "Math emulation"
-- 
1.7.5.4

Re: [GIT PULL] sched/preempt fixes

[Ingo Molnar]

* Frederic Weisbecker <fweisbec@gmail.com> wrote:

> Ingo,
> 
> Please pull the sched/core branch that can be found at:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
> 	sched/core
> 
> Thanks,
> 	Frederic
> ---
> 
> Frederic Weisbecker (3):
>       m32r: Use generic PREEMPT config
>       h8300: Use generic config PREEMPT definition
>       xtensa: Use generic config PREEMPT definition
> 
> 
>  arch/h8300/Kconfig.cpu |    4 +---
>  arch/m32r/Kconfig      |   12 +-----------
>  arch/xtensa/Kconfig    |   13 +------------
>  3 files changed, 3 insertions(+), 26 deletions(-)

Pulled, thanks Frederic!

	Ingo

Re: [PATCH 1/3] m32r: Use generic PREEMPT config

[Hirokazu Takata]

From: Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH 1/3] m32r: Use generic PREEMPT config
Date: Tue, 05 Jul 2011 18:04:26 +0200
> Use the generic preempt config definition in m32r instead of
> using a custom one.
> 
> This also makes it handle the new CONFIG_PREEMPT_COUNT that
> need to be selected by CONFIG_PREEMPT.
> 
> Without that it breaks
> 
>   kernel/sched.c: In function 'preempt_schedule':
>   kernel/sched.c:4364: error: implicit declaration of function 'add_preempt_count_notrace'
>   kernel/sched.c:4366: error: implicit declaration of function 'sub_preempt_count_notrace'
> 
> Reported-by: Ingo Molnar <mingo@elte.hu>
> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Hirokazu Takata <takata@linux-m32r.org>

Acked-by: Hirokazu Takata <takata@linux-m32r.org>

Thank you.

> ---
>  arch/m32r/Kconfig |   12 +-----------
>  1 files changed, 1 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
> index 85b44e8..b92b944 100644
> --- a/arch/m32r/Kconfig
> +++ b/arch/m32r/Kconfig
> @@ -268,17 +268,7 @@ config SCHED_OMIT_FRAME_POINTER
>          bool
>          default y
>  
> -config PREEMPT
> -	bool "Preemptible Kernel"
> -	help
> -	  This option reduces the latency of the kernel when reacting to
> -	  real-time or interactive events by allowing a low priority process to
> -	  be preempted even if it is in kernel mode executing a system call.
> -	  This allows applications to run more reliably even when the system is
> -	  under load.
> -
> -	  Say Y here if you are building a kernel for a desktop, embedded
> -	  or real-time system.  Say N if you are unsure.
> +source "kernel/Kconfig.preempt"
>  
>  config SMP
>  	bool "Symmetric multi-processing support"
> -- 
> 1.7.5.4
>