From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: David Howells <dhowells@redhat.com>, Tony Luck <tony.luck@intel.com>
Subject: [patch V2 03/31] task_allocator: Use config switches instead of magic defines
Date: Thu, 03 May 2012 09:02:48 -0000 [thread overview]
Message-ID: <20120503085034.032327158@linutronix.de> (raw)
In-Reply-To: 20120503083859.991965503@linutronix.de
[-- Attachment #1: task-alloc-use-config-switch.patch --]
[-- Type: text/plain, Size: 3941 bytes --]
Replace __HAVE_ARCH_TASK_ALLOCATOR and __HAVE_ARCH_THREAD_ALLOCATOR
with proper config switches.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Howells <dhowells@redhat.com>
Cc: Tony Luck <tony.luck@intel.com>
---
arch/Kconfig | 6 ++++++
arch/frv/Kconfig | 1 +
arch/frv/include/asm/thread_info.h | 2 --
arch/ia64/Kconfig | 2 ++
arch/ia64/include/asm/thread_info.h | 3 ---
kernel/fork.c | 6 +++---
6 files changed, 12 insertions(+), 8 deletions(-)
Index: tip/arch/Kconfig
===================================================================
--- tip.orig/arch/Kconfig
+++ tip/arch/Kconfig
@@ -219,4 +219,10 @@ config HAVE_CMPXCHG_DOUBLE
config ARCH_WANT_OLD_COMPAT_IPC
bool
+config ARCH_TASK_STRUCT_ALLOCATOR
+ bool
+
+config ARCH_THREAD_INFO_ALLOCATOR
+ bool
+
source "kernel/gcov/Kconfig"
Index: tip/arch/frv/Kconfig
===================================================================
--- tip.orig/arch/frv/Kconfig
+++ tip/arch/frv/Kconfig
@@ -9,6 +9,7 @@ config FRV
select GENERIC_IRQ_SHOW
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_CPU_DEVICES
+ select ARCH_THREAD_INFO_ALLOCATOR
config ZONE_DMA
bool
Index: tip/arch/frv/include/asm/thread_info.h
===================================================================
--- tip.orig/arch/frv/include/asm/thread_info.h
+++ tip/arch/frv/include/asm/thread_info.h
@@ -80,8 +80,6 @@ register struct thread_info *__current_t
#define current_thread_info() ({ __current_thread_info; })
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-
/* thread information allocation */
#ifdef CONFIG_DEBUG_STACK_USAGE
#define alloc_thread_info_node(tsk, node) \
Index: tip/arch/ia64/Kconfig
===================================================================
--- tip.orig/arch/ia64/Kconfig
+++ tip/arch/ia64/Kconfig
@@ -34,6 +34,8 @@ config IA64
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_IOMAP
select GENERIC_SMP_IDLE_THREAD
+ select ARCH_TASK_STRUCT_ALLOCATOR
+ select ARCH_THREAD_INFO_ALLOCATOR
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
Index: tip/arch/ia64/include/asm/thread_info.h
===================================================================
--- tip.orig/arch/ia64/include/asm/thread_info.h
+++ tip/arch/ia64/include/asm/thread_info.h
@@ -54,8 +54,6 @@ struct thread_info {
}, \
}
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-
#ifndef ASM_OFFSETS_C
/* how to get the thread information struct from C */
#define current_thread_info() ((struct thread_info *) ((char *) current + IA64_TASK_SIZE))
@@ -84,7 +82,6 @@ struct thread_info {
#endif
#define end_of_stack(p) (unsigned long *)((void *)(p) + IA64_RBS_OFFSET)
-#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
#define alloc_task_struct_node(node) \
({ \
struct page *page = alloc_pages_node(node, GFP_KERNEL | __GFP_COMP, \
Index: tip/kernel/fork.c
===================================================================
--- tip.orig/kernel/fork.c
+++ tip/kernel/fork.c
@@ -111,7 +111,7 @@ int nr_processes(void)
return total;
}
-#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
+#ifndef CONFIG_ARCH_TASK_STRUCT_ALLOCATOR
# define alloc_task_struct_node(node) \
kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node)
# define free_task_struct(tsk) \
@@ -119,7 +119,7 @@ int nr_processes(void)
static struct kmem_cache *task_struct_cachep;
#endif
-#ifndef __HAVE_ARCH_THREAD_INFO_ALLOCATOR
+#ifndef CONFIG_ARCH_THREAD_INFO_ALLOCATOR
static struct thread_info *alloc_thread_info_node(struct task_struct *tsk,
int node)
{
@@ -213,7 +213,7 @@ EXPORT_SYMBOL_GPL(__put_task_struct);
void __init fork_init(unsigned long mempages)
{
-#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
+#ifndef CONFIG_ARCH_TASK_STRUCT_ALLOCATOR
#ifndef ARCH_MIN_TASKALIGN
#define ARCH_MIN_TASKALIGN L1_CACHE_BYTES
#endif
next prev parent reply other threads:[~2012-05-03 9:11 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-03 9:02 [patch V2 00/31] init_task: Use a generic init_task variant Thomas Gleixner
2012-05-03 9:02 ` [patch V2 01/31] frv: Use correct size for task_struct allocation Thomas Gleixner
2012-05-05 18:46 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 02/31] frv: Use core allocator for task_struct Thomas Gleixner
2012-05-05 18:47 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` Thomas Gleixner [this message]
2012-05-03 9:02 ` [patch V2 04/31] init_task: Create generic init_task instance Thomas Gleixner
2012-05-05 18:49 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 05/31] alpha: Use generic init_task Thomas Gleixner
2012-05-05 18:50 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 06/31] arm: " Thomas Gleixner
2012-05-05 18:51 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 07/31] avr32: " Thomas Gleixner
2012-05-05 18:51 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 08/31] blackfin: " Thomas Gleixner
2012-05-05 18:52 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 10/31] cris: " Thomas Gleixner
2012-05-05 18:54 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 09/31] cx6: " Thomas Gleixner
2012-05-03 13:45 ` Mark Salter
2012-05-03 15:25 ` Thomas Gleixner
2012-05-05 18:53 ` [tip:smp/hotplug] c6x: " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 11/31] frv: " Thomas Gleixner
2012-05-05 18:55 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 12/31] h8300: " Thomas Gleixner
2012-05-05 18:56 ` [tip:smp/hotplug] h8300-use-generic-init_task tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 14/31] m32r: Use generic init_task Thomas Gleixner
2012-05-05 18:57 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 13/31] hexagon: Use generic idle_task Thomas Gleixner
2012-05-05 18:56 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 15/31] m68k: Use generic init_task Thomas Gleixner
2012-05-05 18:58 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 16/31] microblaze: " Thomas Gleixner
2012-05-05 18:59 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 17/31] mips: " Thomas Gleixner
2012-05-05 19:00 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 19/31] openrisc: " Thomas Gleixner
2012-05-05 19:01 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-08 9:37 ` [patch V2 19/31] " Jonas Bonn
2012-05-03 9:02 ` [patch V2 18/31] mn10300: " Thomas Gleixner
2012-05-05 19:01 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 21/31] powerpc: " Thomas Gleixner
2012-05-05 19:03 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 20/31] parisc: " Thomas Gleixner
2012-05-05 19:02 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 22/31] s390: " Thomas Gleixner
2012-05-03 10:00 ` Heiko Carstens
2012-05-05 19:04 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 23/31] score: " Thomas Gleixner
2012-05-05 19:05 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 26/31] tile: " Thomas Gleixner
2012-05-05 19:07 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 24/31] sh: " Thomas Gleixner
2012-05-05 19:06 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:02 ` [patch V2 25/31] sparc: " Thomas Gleixner
2012-05-05 19:06 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 27/31] um: " Thomas Gleixner
2012-05-05 19:09 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 28/31] unicore32: " Thomas Gleixner
2012-05-05 19:08 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 29/31] x86: " Thomas Gleixner
2012-05-05 19:10 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 30/31] xtensa: " Thomas Gleixner
2012-05-05 19:11 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-03 9:03 ` [patch V2 31/31] init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK Thomas Gleixner
2012-05-05 19:11 ` [tip:smp/hotplug] " tip-bot for Thomas Gleixner
2012-05-04 17:28 ` [patch V2 03/31] task_allocator: Use config switches instead of magic defines David Howells
2012-05-05 10:54 ` Thomas Gleixner
2012-05-04 17:30 ` [patch V2 02/31] frv: Use core allocator for task_struct David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120503085034.032327158@linutronix.de \
--to=tglx@linutronix.de \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).