diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-24 18:12:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-24 18:12:33 -0700 |
| commit | bd8c540fe867c070810a3ef55541f41f7c189c9a (patch) | |
| tree | 277ece5c422c108be9a67822a7cae537f1c423ed /arch/ia64/kernel/setup.c | |
| parent | 035cfc61a523343fe0bee5ec54348e26f330a06c (diff) | |
| parent | e2569b7e572c0e6782380b3fdda901deb175d75a (diff) | |
| download | op-kernel-dev-bd8c540fe867c070810a3ef55541f41f7c189c9a.zip op-kernel-dev-bd8c540fe867c070810a3ef55541f41f7c189c9a.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte()
[IA64] Handle count==0 in sn2_ptc_proc_write()
[IA64] Fix boot failure on ia64/sn2
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index f48a809..4ae15c8 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -578,8 +578,6 @@ setup_arch (char **cmdline_p) cpu_init(); /* initialize the bootstrap CPU */ mmu_context_init(); /* initialize context_id bitmap */ - check_sal_cache_flush(); - #ifdef CONFIG_ACPI acpi_boot_init(); #endif @@ -607,6 +605,7 @@ setup_arch (char **cmdline_p) ia64_mca_init(); platform_setup(cmdline_p); + check_sal_cache_flush(); paging_init(); } |
