diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/powerpc/kernel/setup_64.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index fd785f7a279b..6568406b2a30 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -545,7 +545,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 545 | 545 | ||
| 546 | #ifdef CONFIG_SWIOTLB | 546 | #ifdef CONFIG_SWIOTLB |
| 547 | if (ppc_swiotlb_enable) | 547 | if (ppc_swiotlb_enable) |
| 548 | swiotlb_init(); | 548 | swiotlb_init(1); |
| 549 | #endif | 549 | #endif |
| 550 | 550 | ||
| 551 | paging_init(); | 551 | paging_init(); |