diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 19:06:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 19:06:47 -0400 |
commit | 4adb18173aba217a7ce7f261427914d1350c4e18 (patch) | |
tree | 0c302c01a8d13717b35764a4f194ccd7043394d7 | |
parent | 3b9fa0931dd86a1fe5507311ee8031650f5d0e8c (diff) | |
parent | 41e46d6ab0ca1908bff4e77ad9eeb6bf7afeb5c0 (diff) |
Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
-rw-r--r-- | arch/arm/Kconfig | 20 | ||||
-rw-r--r-- | arch/arm/kernel/entry-armv.S | 14 | ||||
-rw-r--r-- | arch/arm/kernel/head.S | 3 | ||||
-rw-r--r-- | arch/arm/kernel/process.c | 25 | ||||
-rw-r--r-- | arch/arm/kernel/sys_arm.c | 2 | ||||
-rw-r--r-- | arch/arm/kernel/traps.c | 14 | ||||
-rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 3 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/mach-footbridge/Kconfig | 12 | ||||
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mm/Kconfig | 24 | ||||
-rw-r--r-- | include/asm-arm/arch-imx/imxfb.h | 35 | ||||
-rw-r--r-- | include/asm-arm/processor.h | 7 | ||||
-rw-r--r-- | include/asm-arm/thread_info.h | 6 |
14 files changed, 116 insertions, 53 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8bfcb37460fa..bf397a9f8ac2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -85,6 +85,7 @@ choice | |||
85 | config ARCH_CLPS7500 | 85 | config ARCH_CLPS7500 |
86 | bool "Cirrus-CL-PS7500FE" | 86 | bool "Cirrus-CL-PS7500FE" |
87 | select TIMER_ACORN | 87 | select TIMER_ACORN |
88 | select ISA | ||
88 | 89 | ||
89 | config ARCH_CLPS711X | 90 | config ARCH_CLPS711X |
90 | bool "CLPS711x/EP721x-based" | 91 | bool "CLPS711x/EP721x-based" |
@@ -96,6 +97,7 @@ config ARCH_CO285 | |||
96 | 97 | ||
97 | config ARCH_EBSA110 | 98 | config ARCH_EBSA110 |
98 | bool "EBSA-110" | 99 | bool "EBSA-110" |
100 | select ISA | ||
99 | help | 101 | help |
100 | This is an evaluation board for the StrongARM processor available | 102 | This is an evaluation board for the StrongARM processor available |
101 | from Digital. It has limited hardware on-board, including an onboard | 103 | from Digital. It has limited hardware on-board, including an onboard |
@@ -120,13 +122,16 @@ config ARCH_INTEGRATOR | |||
120 | 122 | ||
121 | config ARCH_IOP3XX | 123 | config ARCH_IOP3XX |
122 | bool "IOP3xx-based" | 124 | bool "IOP3xx-based" |
125 | select PCI | ||
123 | 126 | ||
124 | config ARCH_IXP4XX | 127 | config ARCH_IXP4XX |
125 | bool "IXP4xx-based" | 128 | bool "IXP4xx-based" |
126 | select DMABOUNCE | 129 | select DMABOUNCE |
130 | select PCI | ||
127 | 131 | ||
128 | config ARCH_IXP2000 | 132 | config ARCH_IXP2000 |
129 | bool "IXP2400/2800-based" | 133 | bool "IXP2400/2800-based" |
134 | select PCI | ||
130 | 135 | ||
131 | config ARCH_L7200 | 136 | config ARCH_L7200 |
132 | bool "LinkUp-L7200" | 137 | bool "LinkUp-L7200" |
@@ -155,6 +160,8 @@ config ARCH_RPC | |||
155 | 160 | ||
156 | config ARCH_SA1100 | 161 | config ARCH_SA1100 |
157 | bool "SA1100-based" | 162 | bool "SA1100-based" |
163 | select ISA | ||
164 | select DISCONTIGMEM | ||
158 | 165 | ||
159 | config ARCH_S3C2410 | 166 | config ARCH_S3C2410 |
160 | bool "Samsung S3C2410" | 167 | bool "Samsung S3C2410" |
@@ -165,6 +172,9 @@ config ARCH_S3C2410 | |||
165 | 172 | ||
166 | config ARCH_SHARK | 173 | config ARCH_SHARK |
167 | bool "Shark" | 174 | bool "Shark" |
175 | select ISA | ||
176 | select ISA_DMA | ||
177 | select PCI | ||
168 | 178 | ||
169 | config ARCH_LH7A40X | 179 | config ARCH_LH7A40X |
170 | bool "Sharp LH7A40X" | 180 | bool "Sharp LH7A40X" |
@@ -252,8 +262,6 @@ config ARM_AMBA | |||
252 | 262 | ||
253 | config ISA | 263 | config ISA |
254 | bool | 264 | bool |
255 | depends on FOOTBRIDGE_HOST || ARCH_SHARK || ARCH_CLPS7500 || ARCH_EBSA110 || ARCH_CDB89712 || ARCH_EDB7211 || ARCH_SA1100 || ARCH_MX1ADS | ||
256 | default y | ||
257 | help | 265 | help |
258 | Find out whether you have ISA slots on your motherboard. ISA is the | 266 | Find out whether you have ISA slots on your motherboard. ISA is the |
259 | name of a bus system, i.e. the way the CPU talks to the other stuff | 267 | name of a bus system, i.e. the way the CPU talks to the other stuff |
@@ -263,8 +271,6 @@ config ISA | |||
263 | 271 | ||
264 | config ISA_DMA | 272 | config ISA_DMA |
265 | bool | 273 | bool |
266 | depends on FOOTBRIDGE_HOST || ARCH_SHARK | ||
267 | default y | ||
268 | 274 | ||
269 | config ISA_DMA_API | 275 | config ISA_DMA_API |
270 | bool | 276 | bool |
@@ -272,7 +278,6 @@ config ISA_DMA_API | |||
272 | 278 | ||
273 | config PCI | 279 | config PCI |
274 | bool "PCI support" if ARCH_INTEGRATOR_AP | 280 | bool "PCI support" if ARCH_INTEGRATOR_AP |
275 | default y if ARCH_SHARK || FOOTBRIDGE_HOST || ARCH_IOP3XX || ARCH_IXP4XX || ARCH_IXP2000 | ||
276 | help | 281 | help |
277 | Find out whether you have a PCI motherboard. PCI is the name of a | 282 | Find out whether you have a PCI motherboard. PCI is the name of a |
278 | bus system, i.e. the way the CPU talks to the other stuff inside | 283 | bus system, i.e. the way the CPU talks to the other stuff inside |
@@ -300,7 +305,7 @@ menu "Kernel Features" | |||
300 | 305 | ||
301 | config SMP | 306 | config SMP |
302 | bool "Symmetric Multi-Processing (EXPERIMENTAL)" | 307 | bool "Symmetric Multi-Processing (EXPERIMENTAL)" |
303 | depends on EXPERIMENTAL && n | 308 | depends on EXPERIMENTAL #&& n |
304 | help | 309 | help |
305 | This enables support for systems with more than one CPU. If you have | 310 | This enables support for systems with more than one CPU. If you have |
306 | a system with only one CPU, like most personal computers, say N. If | 311 | a system with only one CPU, like most personal computers, say N. If |
@@ -340,8 +345,7 @@ config PREEMPT | |||
340 | 345 | ||
341 | config DISCONTIGMEM | 346 | config DISCONTIGMEM |
342 | bool | 347 | bool |
343 | depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) | 348 | default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) |
344 | default y | ||
345 | help | 349 | help |
346 | Say Y to support efficient handling of discontiguous physical memory, | 350 | Say Y to support efficient handling of discontiguous physical memory, |
347 | for architectures which are either NUMA (Non-Uniform Memory Access) | 351 | for architectures which are either NUMA (Non-Uniform Memory Access) |
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 080df907f242..4eb36155dc93 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
@@ -17,8 +17,8 @@ | |||
17 | 17 | ||
18 | #include <asm/glue.h> | 18 | #include <asm/glue.h> |
19 | #include <asm/vfpmacros.h> | 19 | #include <asm/vfpmacros.h> |
20 | #include <asm/hardware.h> @ should be moved into entry-macro.S | 20 | #include <asm/hardware.h> /* should be moved into entry-macro.S */ |
21 | #include <asm/arch/irqs.h> @ should be moved into entry-macro.S | 21 | #include <asm/arch/irqs.h> /* should be moved into entry-macro.S */ |
22 | #include <asm/arch/entry-macro.S> | 22 | #include <asm/arch/entry-macro.S> |
23 | 23 | ||
24 | #include "entry-header.S" | 24 | #include "entry-header.S" |
@@ -505,9 +505,9 @@ ENTRY(__switch_to) | |||
505 | mra r4, r5, acc0 | 505 | mra r4, r5, acc0 |
506 | stmia ip, {r4, r5} | 506 | stmia ip, {r4, r5} |
507 | #endif | 507 | #endif |
508 | #ifdef CONFIG_HAS_TLS_REG | 508 | #if defined(CONFIG_HAS_TLS_REG) |
509 | mcr p15, 0, r3, c13, c0, 3 @ set TLS register | 509 | mcr p15, 0, r3, c13, c0, 3 @ set TLS register |
510 | #else | 510 | #elif !defined(CONFIG_TLS_REG_EMUL) |
511 | mov r4, #0xffff0fff | 511 | mov r4, #0xffff0fff |
512 | str r3, [r4, #-15] @ TLS val at 0xffff0ff0 | 512 | str r3, [r4, #-15] @ TLS val at 0xffff0ff0 |
513 | #endif | 513 | #endif |
@@ -690,11 +690,7 @@ __kuser_cmpxchg: @ 0xffff0fc0 | |||
690 | 690 | ||
691 | __kuser_get_tls: @ 0xffff0fe0 | 691 | __kuser_get_tls: @ 0xffff0fe0 |
692 | 692 | ||
693 | #ifndef CONFIG_HAS_TLS_REG | 693 | #if !defined(CONFIG_HAS_TLS_REG) && !defined(CONFIG_TLS_REG_EMUL) |
694 | |||
695 | #ifdef CONFIG_SMP /* sanity check */ | ||
696 | #error "CONFIG_SMP without CONFIG_HAS_TLS_REG is wrong" | ||
697 | #endif | ||
698 | 694 | ||
699 | ldr r0, [pc, #(16 - 8)] @ TLS stored at 0xffff0ff0 | 695 | ldr r0, [pc, #(16 - 8)] @ TLS stored at 0xffff0ff0 |
700 | mov pc, lr | 696 | mov pc, lr |
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 171b3e811c71..4733877296d4 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/procinfo.h> | 19 | #include <asm/procinfo.h> |
20 | #include <asm/ptrace.h> | 20 | #include <asm/ptrace.h> |
21 | #include <asm/constants.h> | 21 | #include <asm/constants.h> |
22 | #include <asm/thread_info.h> | ||
22 | #include <asm/system.h> | 23 | #include <asm/system.h> |
23 | 24 | ||
24 | #define PROCINFO_MMUFLAGS 8 | 25 | #define PROCINFO_MMUFLAGS 8 |
@@ -131,7 +132,7 @@ __switch_data: | |||
131 | .long processor_id @ r4 | 132 | .long processor_id @ r4 |
132 | .long __machine_arch_type @ r5 | 133 | .long __machine_arch_type @ r5 |
133 | .long cr_alignment @ r6 | 134 | .long cr_alignment @ r6 |
134 | .long init_thread_union+8192 @ sp | 135 | .long init_thread_union + THREAD_START_SP @ sp |
135 | 136 | ||
136 | /* | 137 | /* |
137 | * The following fragment of code is executed with the MMU on, and uses | 138 | * The following fragment of code is executed with the MMU on, and uses |
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 26eacd3e5def..8f146a4b4752 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
@@ -256,8 +256,6 @@ static unsigned long *thread_info_head; | |||
256 | static unsigned int nr_thread_info; | 256 | static unsigned int nr_thread_info; |
257 | 257 | ||
258 | #define EXTRA_TASK_STRUCT 4 | 258 | #define EXTRA_TASK_STRUCT 4 |
259 | #define ll_alloc_task_struct() ((struct thread_info *) __get_free_pages(GFP_KERNEL,1)) | ||
260 | #define ll_free_task_struct(p) free_pages((unsigned long)(p),1) | ||
261 | 259 | ||
262 | struct thread_info *alloc_thread_info(struct task_struct *task) | 260 | struct thread_info *alloc_thread_info(struct task_struct *task) |
263 | { | 261 | { |
@@ -274,17 +272,16 @@ struct thread_info *alloc_thread_info(struct task_struct *task) | |||
274 | } | 272 | } |
275 | 273 | ||
276 | if (!thread) | 274 | if (!thread) |
277 | thread = ll_alloc_task_struct(); | 275 | thread = (struct thread_info *) |
276 | __get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER); | ||
278 | 277 | ||
279 | #ifdef CONFIG_MAGIC_SYSRQ | 278 | #ifdef CONFIG_DEBUG_STACK_USAGE |
280 | /* | 279 | /* |
281 | * The stack must be cleared if you want SYSRQ-T to | 280 | * The stack must be cleared if you want SYSRQ-T to |
282 | * give sensible stack usage information | 281 | * give sensible stack usage information |
283 | */ | 282 | */ |
284 | if (thread) { | 283 | if (thread) |
285 | char *p = (char *)thread; | 284 | memzero(thread, THREAD_SIZE); |
286 | memzero(p+KERNEL_STACK_SIZE, KERNEL_STACK_SIZE); | ||
287 | } | ||
288 | #endif | 285 | #endif |
289 | return thread; | 286 | return thread; |
290 | } | 287 | } |
@@ -297,7 +294,7 @@ void free_thread_info(struct thread_info *thread) | |||
297 | thread_info_head = p; | 294 | thread_info_head = p; |
298 | nr_thread_info += 1; | 295 | nr_thread_info += 1; |
299 | } else | 296 | } else |
300 | ll_free_task_struct(thread); | 297 | free_pages((unsigned long)thread, THREAD_SIZE_ORDER); |
301 | } | 298 | } |
302 | 299 | ||
303 | /* | 300 | /* |
@@ -350,7 +347,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long stack_start, | |||
350 | struct thread_info *thread = p->thread_info; | 347 | struct thread_info *thread = p->thread_info; |
351 | struct pt_regs *childregs; | 348 | struct pt_regs *childregs; |
352 | 349 | ||
353 | childregs = ((struct pt_regs *)((unsigned long)thread + THREAD_SIZE - 8)) - 1; | 350 | childregs = ((struct pt_regs *)((unsigned long)thread + THREAD_START_SP)) - 1; |
354 | *childregs = *regs; | 351 | *childregs = *regs; |
355 | childregs->ARM_r0 = 0; | 352 | childregs->ARM_r0 = 0; |
356 | childregs->ARM_sp = stack_start; | 353 | childregs->ARM_sp = stack_start; |
@@ -447,15 +444,17 @@ EXPORT_SYMBOL(kernel_thread); | |||
447 | unsigned long get_wchan(struct task_struct *p) | 444 | unsigned long get_wchan(struct task_struct *p) |
448 | { | 445 | { |
449 | unsigned long fp, lr; | 446 | unsigned long fp, lr; |
450 | unsigned long stack_page; | 447 | unsigned long stack_start, stack_end; |
451 | int count = 0; | 448 | int count = 0; |
452 | if (!p || p == current || p->state == TASK_RUNNING) | 449 | if (!p || p == current || p->state == TASK_RUNNING) |
453 | return 0; | 450 | return 0; |
454 | 451 | ||
455 | stack_page = 4096 + (unsigned long)p->thread_info; | 452 | stack_start = (unsigned long)(p->thread_info + 1); |
453 | stack_end = ((unsigned long)p->thread_info) + THREAD_SIZE; | ||
454 | |||
456 | fp = thread_saved_fp(p); | 455 | fp = thread_saved_fp(p); |
457 | do { | 456 | do { |
458 | if (fp < stack_page || fp > 4092+stack_page) | 457 | if (fp < stack_start || fp > stack_end) |
459 | return 0; | 458 | return 0; |
460 | lr = pc_pointer (((unsigned long *)fp)[-1]); | 459 | lr = pc_pointer (((unsigned long *)fp)[-1]); |
461 | if (!in_sched_functions(lr)) | 460 | if (!in_sched_functions(lr)) |
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c index ef32577da304..f897ce2ccf0d 100644 --- a/arch/arm/kernel/sys_arm.c +++ b/arch/arm/kernel/sys_arm.c | |||
@@ -302,7 +302,7 @@ long execve(const char *filename, char **argv, char **envp) | |||
302 | "b ret_to_user" | 302 | "b ret_to_user" |
303 | : | 303 | : |
304 | : "r" (current_thread_info()), | 304 | : "r" (current_thread_info()), |
305 | "Ir" (THREAD_SIZE - 8 - sizeof(regs)), | 305 | "Ir" (THREAD_START_SP - sizeof(regs)), |
306 | "r" (®s), | 306 | "r" (®s), |
307 | "Ir" (sizeof(regs)) | 307 | "Ir" (sizeof(regs)) |
308 | : "r0", "r1", "r2", "r3", "ip", "memory"); | 308 | : "r0", "r1", "r2", "r3", "ip", "memory"); |
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 3a001fe5540b..14df16b983f4 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
@@ -218,7 +218,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err) | |||
218 | tsk->comm, tsk->pid, tsk->thread_info + 1); | 218 | tsk->comm, tsk->pid, tsk->thread_info + 1); |
219 | 219 | ||
220 | if (!user_mode(regs) || in_interrupt()) { | 220 | if (!user_mode(regs) || in_interrupt()) { |
221 | dump_mem("Stack: ", regs->ARM_sp, 8192+(unsigned long)tsk->thread_info); | 221 | dump_mem("Stack: ", regs->ARM_sp, |
222 | THREAD_SIZE + (unsigned long)tsk->thread_info); | ||
222 | dump_backtrace(regs, tsk); | 223 | dump_backtrace(regs, tsk); |
223 | dump_instr(regs); | 224 | dump_instr(regs); |
224 | } | 225 | } |
@@ -450,9 +451,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) | |||
450 | 451 | ||
451 | case NR(set_tls): | 452 | case NR(set_tls): |
452 | thread->tp_value = regs->ARM_r0; | 453 | thread->tp_value = regs->ARM_r0; |
453 | #ifdef CONFIG_HAS_TLS_REG | 454 | #if defined(CONFIG_HAS_TLS_REG) |
454 | asm ("mcr p15, 0, %0, c13, c0, 3" : : "r" (regs->ARM_r0) ); | 455 | asm ("mcr p15, 0, %0, c13, c0, 3" : : "r" (regs->ARM_r0) ); |
455 | #else | 456 | #elif !defined(CONFIG_TLS_REG_EMUL) |
456 | /* | 457 | /* |
457 | * User space must never try to access this directly. | 458 | * User space must never try to access this directly. |
458 | * Expect your app to break eventually if you do so. | 459 | * Expect your app to break eventually if you do so. |
@@ -497,11 +498,14 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) | |||
497 | return 0; | 498 | return 0; |
498 | } | 499 | } |
499 | 500 | ||
500 | #if defined(CONFIG_CPU_32v6) && !defined(CONFIG_HAS_TLS_REG) | 501 | #ifdef CONFIG_TLS_REG_EMUL |
501 | 502 | ||
502 | /* | 503 | /* |
503 | * We might be running on an ARMv6+ processor which should have the TLS | 504 | * We might be running on an ARMv6+ processor which should have the TLS |
504 | * register, but for some reason we can't use it and have to emulate it. | 505 | * register but for some reason we can't use it, or maybe an SMP system |
506 | * using a pre-ARMv6 processor (there are apparently a few prototypes like | ||
507 | * that in existence) and therefore access to that register must be | ||
508 | * emulated. | ||
505 | */ | 509 | */ |
506 | 510 | ||
507 | static int get_tp_trap(struct pt_regs *regs, unsigned int instr) | 511 | static int get_tp_trap(struct pt_regs *regs, unsigned int instr) |
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index a39c6a42d68a..ad2d66c93a5c 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
@@ -5,6 +5,7 @@ | |||
5 | 5 | ||
6 | #include <asm-generic/vmlinux.lds.h> | 6 | #include <asm-generic/vmlinux.lds.h> |
7 | #include <linux/config.h> | 7 | #include <linux/config.h> |
8 | #include <asm/thread_info.h> | ||
8 | 9 | ||
9 | OUTPUT_ARCH(arm) | 10 | OUTPUT_ARCH(arm) |
10 | ENTRY(stext) | 11 | ENTRY(stext) |
@@ -103,7 +104,7 @@ SECTIONS | |||
103 | __data_loc = ALIGN(4); /* location in binary */ | 104 | __data_loc = ALIGN(4); /* location in binary */ |
104 | . = DATAADDR; | 105 | . = DATAADDR; |
105 | #else | 106 | #else |
106 | . = ALIGN(8192); | 107 | . = ALIGN(THREAD_SIZE); |
107 | __data_loc = .; | 108 | __data_loc = .; |
108 | #endif | 109 | #endif |
109 | 110 | ||
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index f6e676322ca9..45c930ccd064 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig | |||
@@ -10,6 +10,7 @@ config ARCH_AUTCPU12 | |||
10 | 10 | ||
11 | config ARCH_CDB89712 | 11 | config ARCH_CDB89712 |
12 | bool "CDB89712" | 12 | bool "CDB89712" |
13 | select ISA | ||
13 | help | 14 | help |
14 | This is an evaluation board from Cirrus for the CS89712 processor. | 15 | This is an evaluation board from Cirrus for the CS89712 processor. |
15 | The board includes 2 serial ports, Ethernet, IRDA, and expansion | 16 | The board includes 2 serial ports, Ethernet, IRDA, and expansion |
@@ -26,6 +27,8 @@ config ARCH_CLEP7312 | |||
26 | 27 | ||
27 | config ARCH_EDB7211 | 28 | config ARCH_EDB7211 |
28 | bool "EDB7211" | 29 | bool "EDB7211" |
30 | select ISA | ||
31 | select DISCONTIGMEM | ||
29 | help | 32 | help |
30 | Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211 | 33 | Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211 |
31 | evaluation board. | 34 | evaluation board. |
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index 1090c680b6dd..324d9edeec38 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig | |||
@@ -5,6 +5,9 @@ menu "Footbridge Implementations" | |||
5 | config ARCH_CATS | 5 | config ARCH_CATS |
6 | bool "CATS" | 6 | bool "CATS" |
7 | select FOOTBRIDGE_HOST | 7 | select FOOTBRIDGE_HOST |
8 | select ISA | ||
9 | select ISA_DMA | ||
10 | select PCI | ||
8 | help | 11 | help |
9 | Say Y here if you intend to run this kernel on the CATS. | 12 | Say Y here if you intend to run this kernel on the CATS. |
10 | 13 | ||
@@ -13,6 +16,9 @@ config ARCH_CATS | |||
13 | config ARCH_PERSONAL_SERVER | 16 | config ARCH_PERSONAL_SERVER |
14 | bool "Compaq Personal Server" | 17 | bool "Compaq Personal Server" |
15 | select FOOTBRIDGE_HOST | 18 | select FOOTBRIDGE_HOST |
19 | select ISA | ||
20 | select ISA_DMA | ||
21 | select PCI | ||
16 | ---help--- | 22 | ---help--- |
17 | Say Y here if you intend to run this kernel on the Compaq | 23 | Say Y here if you intend to run this kernel on the Compaq |
18 | Personal Server. | 24 | Personal Server. |
@@ -42,6 +48,9 @@ config ARCH_EBSA285_HOST | |||
42 | bool "EBSA285 (host mode)" | 48 | bool "EBSA285 (host mode)" |
43 | select ARCH_EBSA285 | 49 | select ARCH_EBSA285 |
44 | select FOOTBRIDGE_HOST | 50 | select FOOTBRIDGE_HOST |
51 | select ISA | ||
52 | select ISA_DMA | ||
53 | select PCI | ||
45 | help | 54 | help |
46 | Say Y here if you intend to run this kernel on the EBSA285 card | 55 | Say Y here if you intend to run this kernel on the EBSA285 card |
47 | in host ("central function") mode. | 56 | in host ("central function") mode. |
@@ -51,6 +60,9 @@ config ARCH_EBSA285_HOST | |||
51 | config ARCH_NETWINDER | 60 | config ARCH_NETWINDER |
52 | bool "NetWinder" | 61 | bool "NetWinder" |
53 | select FOOTBRIDGE_HOST | 62 | select FOOTBRIDGE_HOST |
63 | select ISA | ||
64 | select ISA_DMA | ||
65 | select PCI | ||
54 | help | 66 | help |
55 | Say Y here if you intend to run this kernel on the Rebel.COM | 67 | Say Y here if you intend to run this kernel on the Rebel.COM |
56 | NetWinder. Information about this machine can be found at: | 68 | NetWinder. Information about this machine can be found at: |
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ec85813ee5dc..cddd194ac6eb 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -4,6 +4,7 @@ menu "IMX Implementations" | |||
4 | config ARCH_MX1ADS | 4 | config ARCH_MX1ADS |
5 | bool "mx1ads" | 5 | bool "mx1ads" |
6 | depends on ARCH_IMX | 6 | depends on ARCH_IMX |
7 | select ISA | ||
7 | help | 8 | help |
8 | Say Y here if you are using the Motorola MX1ADS board | 9 | Say Y here if you are using the Motorola MX1ADS board |
9 | 10 | ||
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 27892e34b060..c4fc6be629de 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -410,17 +410,23 @@ config CPU_BPREDICT_DISABLE | |||
410 | help | 410 | help |
411 | Say Y here to disable branch prediction. If unsure, say N. | 411 | Say Y here to disable branch prediction. If unsure, say N. |
412 | 412 | ||
413 | config TLS_REG_EMUL | ||
414 | bool | ||
415 | default y if (SMP || CPU_32v6) && (CPU_32v5 || CPU_32v4 || CPU_32v3) | ||
416 | help | ||
417 | We might be running on an ARMv6+ processor which should have the TLS | ||
418 | register but for some reason we can't use it, or maybe an SMP system | ||
419 | using a pre-ARMv6 processor (there are apparently a few prototypes | ||
420 | like that in existence) and therefore access to that register must | ||
421 | be emulated. | ||
422 | |||
413 | config HAS_TLS_REG | 423 | config HAS_TLS_REG |
414 | bool | 424 | bool |
415 | depends on CPU_32v6 && !CPU_32v5 && !CPU_32v4 && !CPU_32v3 | 425 | depends on CPU_32v6 |
416 | default y | 426 | default y if !TLS_REG_EMUL |
417 | help | 427 | help |
418 | This selects support for the CP15 thread register. | 428 | This selects support for the CP15 thread register. |
419 | It is defined to be available on ARMv6 or later. However | 429 | It is defined to be available on ARMv6 or later. If a particular |
420 | if the kernel is configured to support multiple CPUs including | 430 | ARMv6 or later CPU doesn't support it then it must omc;ide "select |
421 | a pre-ARMv6 processors, or if a given ARMv6 processor doesn't | 431 | TLS_REG_EMUL" along with its other caracteristics. |
422 | implement the thread register for some reason, then access to | ||
423 | this register from user space must be trapped and emulated. | ||
424 | If user space is relying on the __kuser_get_tls code then | ||
425 | there should not be any impact. | ||
426 | 432 | ||
diff --git a/include/asm-arm/arch-imx/imxfb.h b/include/asm-arm/arch-imx/imxfb.h new file mode 100644 index 000000000000..2346d454ab9c --- /dev/null +++ b/include/asm-arm/arch-imx/imxfb.h | |||
@@ -0,0 +1,35 @@ | |||
1 | /* | ||
2 | * This structure describes the machine which we are running on. | ||
3 | */ | ||
4 | struct imxfb_mach_info { | ||
5 | u_long pixclock; | ||
6 | |||
7 | u_short xres; | ||
8 | u_short yres; | ||
9 | |||
10 | u_char bpp; | ||
11 | u_char hsync_len; | ||
12 | u_char left_margin; | ||
13 | u_char right_margin; | ||
14 | |||
15 | u_char vsync_len; | ||
16 | u_char upper_margin; | ||
17 | u_char lower_margin; | ||
18 | u_char sync; | ||
19 | |||
20 | u_int cmap_greyscale:1, | ||
21 | cmap_inverse:1, | ||
22 | cmap_static:1, | ||
23 | unused:29; | ||
24 | |||
25 | u_int pcr; | ||
26 | u_int pwmr; | ||
27 | u_int lscr1; | ||
28 | |||
29 | u_char * fixed_screen_cpu; | ||
30 | dma_addr_t fixed_screen_dma; | ||
31 | |||
32 | void (*lcd_power)(int); | ||
33 | void (*backlight_power)(int); | ||
34 | }; | ||
35 | void set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info); | ||
diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h index 4a9845997a75..7d4118e09054 100644 --- a/include/asm-arm/processor.h +++ b/include/asm-arm/processor.h | |||
@@ -23,8 +23,6 @@ | |||
23 | #include <asm/procinfo.h> | 23 | #include <asm/procinfo.h> |
24 | #include <asm/types.h> | 24 | #include <asm/types.h> |
25 | 25 | ||
26 | #define KERNEL_STACK_SIZE PAGE_SIZE | ||
27 | |||
28 | union debug_insn { | 26 | union debug_insn { |
29 | u32 arm; | 27 | u32 arm; |
30 | u16 thumb; | 28 | u16 thumb; |
@@ -87,8 +85,9 @@ unsigned long get_wchan(struct task_struct *p); | |||
87 | */ | 85 | */ |
88 | extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); | 86 | extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); |
89 | 87 | ||
90 | #define KSTK_EIP(tsk) (((unsigned long *)(4096+(unsigned long)(tsk)->thread_info))[1019]) | 88 | #define KSTK_REGS(tsk) (((struct pt_regs *)(THREAD_START_SP + (unsigned long)(tsk)->thread_info)) - 1) |
91 | #define KSTK_ESP(tsk) (((unsigned long *)(4096+(unsigned long)(tsk)->thread_info))[1017]) | 89 | #define KSTK_EIP(tsk) KSTK_REGS(tsk)->ARM_pc |
90 | #define KSTK_ESP(tsk) KSTK_REGS(tsk)->ARM_sp | ||
92 | 91 | ||
93 | /* | 92 | /* |
94 | * Prefetching support - only ARMv5. | 93 | * Prefetching support - only ARMv5. |
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h index a61618fb433c..66c585c50cf9 100644 --- a/include/asm-arm/thread_info.h +++ b/include/asm-arm/thread_info.h | |||
@@ -14,6 +14,10 @@ | |||
14 | 14 | ||
15 | #include <asm/fpstate.h> | 15 | #include <asm/fpstate.h> |
16 | 16 | ||
17 | #define THREAD_SIZE_ORDER 1 | ||
18 | #define THREAD_SIZE 8192 | ||
19 | #define THREAD_START_SP (THREAD_SIZE - 8) | ||
20 | |||
17 | #ifndef __ASSEMBLY__ | 21 | #ifndef __ASSEMBLY__ |
18 | 22 | ||
19 | struct task_struct; | 23 | struct task_struct; |
@@ -77,8 +81,6 @@ struct thread_info { | |||
77 | #define init_thread_info (init_thread_union.thread_info) | 81 | #define init_thread_info (init_thread_union.thread_info) |
78 | #define init_stack (init_thread_union.stack) | 82 | #define init_stack (init_thread_union.stack) |
79 | 83 | ||
80 | #define THREAD_SIZE 8192 | ||
81 | |||
82 | /* | 84 | /* |
83 | * how to get the thread information struct from C | 85 | * how to get the thread information struct from C |
84 | */ | 86 | */ |