2 files changed, 2 insertions, 34 deletions
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h
index 729aa107f64e..d767ff9f59b9 100644
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@ -129,6 +129,7 @@ extern void _cpu_idle(void);
 #define TIF_MEMDIE              7       /* OOM killer at work */
 #define TIF_NOTIFY_RESUME       8       /* callback before returning to user */
 #define TIF_SYSCALL_TRACEPOINT  9       /* syscall tracepoint instrumentation */
+#define TIF_POLLING_NRFLAG      10      /* idle is polling for TIF_NEED_RESCHED */
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
@@ -140,6 +141,7 @@ extern void _cpu_idle(void);
 #define _TIF_MEMDIE             (1<<TIF_MEMDIE)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
+#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 /* Work to do on any return to user space. */
 #define _TIF_ALLWORK_MASK \
@@ -162,7 +164,6 @@ extern void _cpu_idle(void);
 #ifdef __tilegx__
 #define TS_COMPAT               0x0001  /* 32-bit compatibility mode */
 #endif
-#define TS_POLLING              0x0004  /* in idle loop but not sleeping */
 #define TS_RESTORE_SIGMASK      0x0008  /* restore signal mask in do_signal */
 #ifndef __ASSEMBLY__
diff --git a/arch/tile/include/asm/topology.h b/arch/tile/include/asm/topology.h
index d15c0d8d550f..938311844233 100644
--- a/arch/tile/include/asm/topology.h
+++ b/arch/tile/include/asm/topology.h
@@ -44,39 +44,6 @@ static inline const struct cpumask *cpumask_of_node(int node)
 /* For now, use numa node -1 for global allocation. */
 #define pcibus_to_node(bus)             ((void)(bus), -1)
-/*
- * TILE architecture has many cores integrated in one processor, so we need
- * setup bigger balance_interval for both CPU/NODE scheduling domains to
- * reduce process scheduling costs.
- */
-/* sched_domains SD_CPU_INIT for TILE architecture */
-#define SD_CPU_INIT (struct sched_domain) {                             \
-        .min_interval           = 4,                                    \
-        .max_interval           = 128,                                  \
-        .busy_factor            = 64,                                   \
-        .imbalance_pct          = 125,                                  \
-        .cache_nice_tries       = 1,                                    \
-        .busy_idx               = 2,                                    \
-        .idle_idx               = 1,                                    \
-        .newidle_idx            = 0,                                    \
-        .wake_idx               = 0,                                    \
-        .forkexec_idx           = 0,                                    \
-                                                                        \
-        .flags                  = 1*SD_LOAD_BALANCE                     \
-                                | 1*SD_BALANCE_NEWIDLE                  \
-                                | 1*SD_BALANCE_EXEC                     \
-                                | 1*SD_BALANCE_FORK                     \
-                                | 0*SD_BALANCE_WAKE                     \
-                                | 0*SD_WAKE_AFFINE                      \
-                                | 0*SD_SHARE_CPUPOWER                   \
-                                | 0*SD_SHARE_PKG_RESOURCES              \
-                                | 0*SD_SERIALIZE                        \
-                                ,                                       \
-        .last_balance           = jiffies,                              \
-        .balance_interval       = 32,                                   \
-}
 /* By definition, we create nodes based on online memory. */
 #define node_has_online_mem(nid) 1

diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h index 729aa107f64e..d767ff9f59b9 100644 --- a/arch/tile/include/asm/thread_info.h +++ b/arch/tile/include/asm/thread_info.h
@@ -129,6 +129,7 @@ extern void _cpu_idle(void);
129	#define TIF_MEMDIE 7 /* OOM killer at work */	129	#define TIF_MEMDIE 7 /* OOM killer at work */
130	#define TIF_NOTIFY_RESUME 8 /* callback before returning to user */	130	#define TIF_NOTIFY_RESUME 8 /* callback before returning to user */
131	#define TIF_SYSCALL_TRACEPOINT 9 /* syscall tracepoint instrumentation */	131	#define TIF_SYSCALL_TRACEPOINT 9 /* syscall tracepoint instrumentation */
		132	#define TIF_POLLING_NRFLAG 10 /* idle is polling for TIF_NEED_RESCHED */
132		133
133	#define _TIF_SIGPENDING (1<<TIF_SIGPENDING)	134	#define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
134	#define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)	135	#define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
@@ -140,6 +141,7 @@ extern void _cpu_idle(void);
140	#define _TIF_MEMDIE (1<<TIF_MEMDIE)	141	#define _TIF_MEMDIE (1<<TIF_MEMDIE)
141	#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)	142	#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
142	#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)	143	#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
		144	#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
143		145
144	/* Work to do on any return to user space. */	146	/* Work to do on any return to user space. */
145	#define _TIF_ALLWORK_MASK \	147	#define _TIF_ALLWORK_MASK \
@@ -162,7 +164,6 @@ extern void _cpu_idle(void);
162	#ifdef __tilegx__	164	#ifdef __tilegx__
163	#define TS_COMPAT 0x0001 /* 32-bit compatibility mode */	165	#define TS_COMPAT 0x0001 /* 32-bit compatibility mode */
164	#endif	166	#endif
165	#define TS_POLLING 0x0004 /* in idle loop but not sleeping */
166	#define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal */	167	#define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal */
167		168
168	#ifndef __ASSEMBLY__	169	#ifndef __ASSEMBLY__


diff --git a/arch/tile/include/asm/topology.h b/arch/tile/include/asm/topology.h index d15c0d8d550f..938311844233 100644 --- a/arch/tile/include/asm/topology.h +++ b/arch/tile/include/asm/topology.h
@@ -44,39 +44,6 @@ static inline const struct cpumask *cpumask_of_node(int node)
44	/* For now, use numa node -1 for global allocation. */	44	/* For now, use numa node -1 for global allocation. */
45	#define pcibus_to_node(bus) ((void)(bus), -1)	45	#define pcibus_to_node(bus) ((void)(bus), -1)
46		46
47	/*
48	* TILE architecture has many cores integrated in one processor, so we need
49	* setup bigger balance_interval for both CPU/NODE scheduling domains to
50	* reduce process scheduling costs.
51	*/
52
53	/* sched_domains SD_CPU_INIT for TILE architecture */
54	#define SD_CPU_INIT (struct sched_domain) { \
55	.min_interval = 4, \
56	.max_interval = 128, \
57	.busy_factor = 64, \
58	.imbalance_pct = 125, \
59	.cache_nice_tries = 1, \
60	.busy_idx = 2, \
61	.idle_idx = 1, \
62	.newidle_idx = 0, \
63	.wake_idx = 0, \
64	.forkexec_idx = 0, \
65	\
66	.flags = 1*SD_LOAD_BALANCE \
67	\| 1*SD_BALANCE_NEWIDLE \
68	\| 1*SD_BALANCE_EXEC \
69	\| 1*SD_BALANCE_FORK \
70	\| 0*SD_BALANCE_WAKE \
71	\| 0*SD_WAKE_AFFINE \
72	\| 0*SD_SHARE_CPUPOWER \
73	\| 0*SD_SHARE_PKG_RESOURCES \
74	\| 0*SD_SERIALIZE \
75	, \
76	.last_balance = jiffies, \
77	.balance_interval = 32, \
78	}
79
80	/* By definition, we create nodes based on online memory. */	47	/* By definition, we create nodes based on online memory. */
81	#define node_has_online_mem(nid) 1	48	#define node_has_online_mem(nid) 1
82		49