diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 23:59:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 23:59:55 -0400 |
| commit | 92dd7ca0af8f769569bde98a83b4a8f4daec6ac5 (patch) | |
| tree | 9217bee214128a4a45b2e0a3d9784d05fea2c8fb /arch/arm/kernel/setup.c | |
| parent | 164cad9bacc2cf190493d2ee4918dc2869ba6f53 (diff) | |
| parent | da41119af78864d27ccbf505949df788d5e8aaf5 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 8cf733daa800..35b7273cfdb4 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -359,7 +359,8 @@ void cpu_init(void) | |||
| 359 | "I" (offsetof(struct stack, abt[0])), | 359 | "I" (offsetof(struct stack, abt[0])), |
| 360 | "I" (PSR_F_BIT | PSR_I_BIT | UND_MODE), | 360 | "I" (PSR_F_BIT | PSR_I_BIT | UND_MODE), |
| 361 | "I" (offsetof(struct stack, und[0])), | 361 | "I" (offsetof(struct stack, und[0])), |
| 362 | "I" (PSR_F_BIT | PSR_I_BIT | SVC_MODE)); | 362 | "I" (PSR_F_BIT | PSR_I_BIT | SVC_MODE) |
| 363 | : "r14"); | ||
| 363 | } | 364 | } |
| 364 | 365 | ||
| 365 | static struct machine_desc * __init setup_machine(unsigned int nr) | 366 | static struct machine_desc * __init setup_machine(unsigned int nr) |