diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /arch/sh/kernel/setup.c | |
parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'arch/sh/kernel/setup.c')
-rw-r--r-- | arch/sh/kernel/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 370d2cfa34eb..04a6004fccc4 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -103,12 +103,11 @@ static int __init early_parse_mem(char *p) | |||
103 | size = memparse(p, &p); | 103 | size = memparse(p, &p); |
104 | 104 | ||
105 | if (size > __MEMORY_SIZE) { | 105 | if (size > __MEMORY_SIZE) { |
106 | static char msg[] __initdata = KERN_ERR | 106 | printk(KERN_ERR |
107 | "Using mem= to increase the size of kernel memory " | 107 | "Using mem= to increase the size of kernel memory " |
108 | "is not allowed.\n" | 108 | "is not allowed.\n" |
109 | " Recompile the kernel with the correct value for " | 109 | " Recompile the kernel with the correct value for " |
110 | "CONFIG_MEMORY_SIZE.\n"; | 110 | "CONFIG_MEMORY_SIZE.\n"); |
111 | printk(msg); | ||
112 | return 0; | 111 | return 0; |
113 | } | 112 | } |
114 | 113 | ||
@@ -432,6 +431,7 @@ static const char *cpu_name[] = { | |||
432 | [CPU_SH7763] = "SH7763", [CPU_SH7770] = "SH7770", | 431 | [CPU_SH7763] = "SH7763", [CPU_SH7770] = "SH7770", |
433 | [CPU_SH7780] = "SH7780", [CPU_SH7781] = "SH7781", | 432 | [CPU_SH7780] = "SH7780", [CPU_SH7781] = "SH7781", |
434 | [CPU_SH7343] = "SH7343", [CPU_SH7785] = "SH7785", | 433 | [CPU_SH7343] = "SH7343", [CPU_SH7785] = "SH7785", |
434 | [CPU_SH7786] = "SH7786", | ||
435 | [CPU_SH7722] = "SH7722", [CPU_SHX3] = "SH-X3", | 435 | [CPU_SH7722] = "SH7722", [CPU_SHX3] = "SH-X3", |
436 | [CPU_SH5_101] = "SH5-101", [CPU_SH5_103] = "SH5-103", | 436 | [CPU_SH5_101] = "SH5-101", [CPU_SH5_103] = "SH5-103", |
437 | [CPU_MXG] = "MX-G", [CPU_SH7723] = "SH7723", | 437 | [CPU_MXG] = "MX-G", [CPU_SH7723] = "SH7723", |
@@ -448,7 +448,7 @@ EXPORT_SYMBOL(get_cpu_subtype); | |||
448 | /* Symbolic CPU flags, keep in sync with asm/cpu-features.h */ | 448 | /* Symbolic CPU flags, keep in sync with asm/cpu-features.h */ |
449 | static const char *cpu_flags[] = { | 449 | static const char *cpu_flags[] = { |
450 | "none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr", | 450 | "none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr", |
451 | "ptea", "llsc", "l2", "op32", NULL | 451 | "ptea", "llsc", "l2", "op32", "pteaex", NULL |
452 | }; | 452 | }; |
453 | 453 | ||
454 | static void show_cpuflags(struct seq_file *m, struct sh_cpuinfo *c) | 454 | static void show_cpuflags(struct seq_file *m, struct sh_cpuinfo *c) |