diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 03:25:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 03:25:29 -0400 |
| commit | 8eb95f28f66b1a5461fdbcc9a1ee9068fb2cf2b6 (patch) | |
| tree | e42d0e004b07f86d38de930fc163f3ca7d121f9c /arch/ia64/kernel/setup.c | |
| parent | d7451fca18e2ec62641ae4bbfe946069f13765a3 (diff) | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
Merge commit 'v2.6.27' into timers/hpet
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index c27d5b2c182b..de636b215677 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -616,7 +616,9 @@ setup_arch (char **cmdline_p) | |||
| 616 | ia64_mca_init(); | 616 | ia64_mca_init(); |
| 617 | 617 | ||
| 618 | platform_setup(cmdline_p); | 618 | platform_setup(cmdline_p); |
| 619 | #ifndef CONFIG_IA64_HP_SIM | ||
| 619 | check_sal_cache_flush(); | 620 | check_sal_cache_flush(); |
| 621 | #endif | ||
| 620 | paging_init(); | 622 | paging_init(); |
| 621 | } | 623 | } |
| 622 | 624 | ||