diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/ia64/kernel/setup.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
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 | ||