diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-23 22:38:30 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-23 22:38:30 -0400 |
| commit | 9e41d9597e7825ec20d690013d32bcec5f3fe16a (patch) | |
| tree | ac6fea59e9a4a1c2183d6bbd6ffa760680673afb /arch/powerpc/include/asm/cputable.h | |
| parent | 77ecfe8d427f554fabbf258e9d789f1d4c3afd63 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/powerpc/include/asm/cputable.h')
| -rw-r--r-- | arch/powerpc/include/asm/cputable.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index fca161190db4..80f315e8a421 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h | |||
| @@ -242,9 +242,11 @@ extern const char *powerpc_base_platform; | |||
| 242 | /* We need to mark all pages as being coherent if we're SMP or we have a | 242 | /* We need to mark all pages as being coherent if we're SMP or we have a |
| 243 | * 74[45]x and an MPC107 host bridge. Also 83xx and PowerQUICC II | 243 | * 74[45]x and an MPC107 host bridge. Also 83xx and PowerQUICC II |
| 244 | * require it for PCI "streaming/prefetch" to work properly. | 244 | * require it for PCI "streaming/prefetch" to work properly. |
| 245 | * This is also required by 52xx family. | ||
| 245 | */ | 246 | */ |
| 246 | #if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) \ | 247 | #if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) \ |
| 247 | || defined(CONFIG_PPC_83xx) || defined(CONFIG_8260) | 248 | || defined(CONFIG_PPC_83xx) || defined(CONFIG_8260) \ |
| 249 | || defined(CONFIG_PPC_MPC52xx) | ||
| 248 | #define CPU_FTR_COMMON CPU_FTR_NEED_COHERENT | 250 | #define CPU_FTR_COMMON CPU_FTR_NEED_COHERENT |
| 249 | #else | 251 | #else |
| 250 | #define CPU_FTR_COMMON 0 | 252 | #define CPU_FTR_COMMON 0 |